Skip to content

Commit e6d4821

Browse files
committed
Merge branch 'dev-humble-fri-msgs' into dev-humble-launch
2 parents 5c20aa8 + 79f8e32 commit e6d4821

File tree

6 files changed

+58
-14
lines changed

6 files changed

+58
-14
lines changed

README.md

+6-5
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,21 @@ Full documentation available [here](https://lbr-stack.readthedocs.io/en/latest).
3838

3939
```shell
4040
source /opt/ros/humble/setup.bash
41+
export FRI_CLIENT_VERSION=1.15
4142
mkdir -p lbr-stack/src && cd lbr-stack
42-
vcs import src --input https://raw.githubusercontent.com/lbr-stack/lbr_fri_ros2_stack/humble/lbr_fri_ros2_stack/repos.yaml
43+
vcs import src --input https://raw.githubusercontent.com/lbr-stack/lbr_fri_ros2_stack/humble/lbr_fri_ros2_stack/fri-${FRI_CLIENT_VERSION}.repos
4344
rosdep install --from-paths src -i -r -y
4445
```
4546

47+
> [!NOTE]
48+
> FRI client is cloned from [fri](https://github.com/lbr-stack/fri) and must be available as branch, refer [README](https://github.com/lbr-stack/fri?tab=readme-ov-file#contributing).
49+
4650
3. Build
4751

4852
```shell
49-
colcon build --symlink-install --cmake-args -DFRI_CLIENT_VERSION=1.15 --no-warn-unused-cli # replace by your FRI client version
53+
colcon build --symlink-install
5054
```
5155

52-
> [!NOTE]
53-
> FRI client is added as external CMake project via [fri_vendor](https://github.com/lbr-stack/fri_vendor) and must be available as branch, refer [README](https://github.com/lbr-stack/fri?tab=readme-ov-file#contributing).
54-
5556
4. Launch the simulation via
5657

5758
```shell

lbr_fri_ros2_stack/fri-1.14.repos

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
repositories:
2+
fri:
3+
type: git
4+
url: https://github.com/lbr-stack/fri
5+
version: fri-1.14
6+
lbr_fri_msgs:
7+
type: git
8+
url: https://github.com/lbr-stack/lbr_fri_msgs
9+
version: fri-1
10+
lbr_fri_ros2_stack:
11+
type: git
12+
url: https://github.com/lbr-stack/lbr_fri_ros2_stack
13+
version: humble

lbr_fri_ros2_stack/fri-1.15.repos

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
repositories:
2+
fri:
3+
type: git
4+
url: https://github.com/lbr-stack/fri
5+
version: fri-1.15
6+
lbr_fri_msgs:
7+
type: git
8+
url: https://github.com/lbr-stack/lbr_fri_msgs
9+
version: fri-1
10+
lbr_fri_ros2_stack:
11+
type: git
12+
url: https://github.com/lbr-stack/lbr_fri_ros2_stack
13+
version: humble

lbr_fri_ros2_stack/fri-1.16.repos

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
repositories:
2+
fri:
3+
type: git
4+
url: https://github.com/lbr-stack/fri
5+
version: fri-1.16
6+
lbr_fri_msgs:
7+
type: git
8+
url: https://github.com/lbr-stack/lbr_fri_msgs
9+
version: fri-1
10+
lbr_fri_ros2_stack:
11+
type: git
12+
url: https://github.com/lbr-stack/lbr_fri_ros2_stack
13+
version: humble

lbr_fri_ros2_stack/fri-2.5.repos

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
repositories:
2+
fri:
3+
type: git
4+
url: https://github.com/lbr-stack/fri
5+
version: fri-2.5
6+
lbr_fri_msgs:
7+
type: git
8+
url: https://github.com/lbr-stack/lbr_fri_msgs
9+
version: fri-2
10+
lbr_fri_ros2_stack:
11+
type: git
12+
url: https://github.com/lbr-stack/lbr_fri_ros2_stack
13+
version: humble

lbr_fri_ros2_stack/repos.yaml

-9
This file was deleted.

0 commit comments

Comments
 (0)