Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8a5e975
Add basic support for lbr-fri
kenichi-maeda Jan 29, 2026
7945ef3
Use lbr-fri-client-sdk from conda-forge
kenichi-maeda Jan 29, 2026
adcb8e5
Add support for different FRI versions
kenichi-maeda Jan 29, 2026
87bd48b
Remove host and run
kenichi-maeda Jan 29, 2026
1b379be
Merge branch 'RoboStack:main' into add-lbr-fri
kenichi-maeda Jan 30, 2026
2dfdaa4
Exclude fri 2.5 and 2.7
kenichi-maeda Feb 3, 2026
bb75ead
Fix kinematics-interface for win
kenichi-maeda Feb 4, 2026
5fd24e0
Unpin lbr-fri-client-sdk
kenichi-maeda Feb 4, 2026
4e0b94d
Clean up dependencies
kenichi-maeda Feb 4, 2026
f01d9ab
Fix win patch
kenichi-maeda Feb 5, 2026
952262f
Use libgz-sim7 for gz_ros2_control on Windows
kenichi-maeda Feb 23, 2026
222cb98
Switch gz/ign_ros2_control to libgz-sim7 on Windows
kenichi-maeda Feb 23, 2026
f743c3f
Use gz-sim7 on Windows for deps and CMake
kenichi-maeda Feb 23, 2026
57d87e9
Undefine windows interface macro in gz_ros2_control shim
kenichi-maeda Feb 23, 2026
1e16fe7
Fix lbr_fri_ros2 FRIClient SDK integration and patch gz_ros2_control …
kenichi-maeda Feb 25, 2026
1288e67
Merge branch 'RoboStack:main' into add-lbr-fri
kenichi-maeda Feb 25, 2026
5b4791d
Revert gz ros2 control patch
kenichi-maeda Feb 27, 2026
55570c4
Revert gz ros2 control patch completely
kenichi-maeda Feb 27, 2026
40a7caa
Enable full rebuild by ignoring cache
Tobias-Fischer Mar 3, 2026
6a30170
Merge branch 'RoboStack:main' into add-lbr-fri
kenichi-maeda Mar 5, 2026
58d8de1
Merge upstream updates
kenichi-maeda Mar 16, 2026
21d756c
Set IGNORE_CACHE_AND_DO_FULL_REBUILD to true
kenichi-maeda Mar 16, 2026
f72facd
Merge branch 'main' into add-lbr-fri
kenichi-maeda Mar 17, 2026
33a5e3d
Delete kinematics
kenichi-maeda Mar 17, 2026
0f58d21
Merge branch 'main' into add-lbr-fri
kenichi-maeda Mar 17, 2026
b344f96
Disable full rebuild by setting IGNORE_CACHE_AND_DO_FULL_REBUILD to '…
Tobias-Fischer Mar 17, 2026
37232d4
Remove kinematics_interface and kinematics_interface_kdl
Tobias-Fischer Mar 17, 2026
074302f
Revert windows changes
kenichi-maeda Mar 18, 2026
a677845
Merge branch 'main' into add-lbr-fri
Tobias-Fischer Mar 18, 2026
6905d5a
move lbr packages to non-win
Tobias-Fischer Mar 18, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,12 @@ libzenohcxx:
libhwloc:
- 2.12.2

lbr_fri_client_sdk:
- '1.11'
- '1.14'
- '1.15'
- '1.16'
- '1.17'

eigen_abi_devel:
- '3.4.0'
3 changes: 3 additions & 0 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -291,3 +291,6 @@ franka_example_controllers:
franka_ign_ros2_control:
add_host: ["ros-humble-urdf", "ros-humble-kdl-parser", "ros-humble-tf2-geometry-msgs", "ros-humble-tf2-eigen", "${{ 'libgl-devel' if linux }}"]
add_run: ["ros-humble-urdf", "ros-humble-kdl-parser", "ros-humble-tf2-geometry-msgs", "ros-humble-tf2-eigen"]
lbr_ros2_control:
add_host: ["ros-humble-kinematics-interface"]
add_run: ["ros-humble-kinematics-interface"]
10 changes: 5 additions & 5 deletions patch/ros-humble-kinematics-interface.patch
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/kinematics_interface/CMakeLists.txt b/kinematics_interface/CMakeLists.txt
index 27a6269..06549d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/kinematics_interface/CMakeLists.txt
+++ b/kinematics_interface/CMakeLists.txt
@@ -45,5 +45,5 @@ install(
)

ament_export_targets(export_kinematics_interface HAS_LIBRARY_TARGET)
-ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS})
+ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS} Eigen3)
ament_package()
ament_package()
2 changes: 2 additions & 0 deletions robostack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ flex:
robostack: [flex]
fmt:
robostack: [fmt]
fri_client_sdk:
robostack: [lbr-fri-client-sdk]
g++-static:
robostack: []
gawk:
Expand Down
79 changes: 79 additions & 0 deletions rosdistro_additional_recipes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,82 @@ wasm_cpp:
url: https://github.com/ros2wasm/rmw_wasm.git
version: 1.0.0
additional_folder: wasm_cpp
lbr_demos_advanced_cpp:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.4.3
additional_folder: lbr_demos/lbr_demos_advanced_cpp
lbr_demos_advanced_py:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.4.3
additional_folder: lbr_demos/lbr_demos_advanced_py
lbr_demos_cpp:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.4.3
additional_folder: lbr_demos/lbr_demos_cpp
lbr_demos_py:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.4.3
additional_folder: lbr_demos/lbr_demos_py
lbr_moveit:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.4.3
additional_folder: lbr_demos/lbr_moveit
lbr_moveit_cpp:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.4.3
additional_folder: lbr_demos/lbr_moveit_cpp
lbr_bringup:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.2.2
additional_folder: lbr_bringup
lbr_description:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.2.2
additional_folder: lbr_description
lbr_fri_ros2:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.2.2
additional_folder: lbr_fri_ros2
lbr_fri_ros2_stack:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.2.2
additional_folder: lbr_fri_ros2_stack
lbr_ros2_control:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 2.2.2
additional_folder: lbr_ros2_control
iiwa14_moveit_config:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 0.3.0
additional_folder: lbr_moveit_config/iiwa14_moveit_config
iiwa7_moveit_config:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 0.3.0
additional_folder: lbr_moveit_config/iiwa7_moveit_config
med14_moveit_config:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 0.3.0
additional_folder: lbr_moveit_config/med14_moveit_config
med7_moveit_config:
url: https://github.com/lbr-stack/lbr_fri_ros2_stack.git
rev: 2e932d4e062966afe216710a7cc2fe50a8099365
version: 0.3.0
additional_folder: lbr_moveit_config/med7_moveit_config
lbr_fri_idl:
url: https://github.com/lbr-stack/lbr_fri_idl.git
rev: e422bff2b3d70ec47853145b35645980df623a60
version: 1.5.0
20 changes: 20 additions & 0 deletions vinca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -509,3 +509,23 @@ packages_select_by_deps:
- mocap4r2_control
- mocap4r2_control_msgs
- pinocchio

# requested in https://github.com/RoboStack/ros-humble/issues/352
- lbr_bringup
- lbr_demos_advanced_cpp
- lbr_demos_advanced_py
- lbr_demos_cpp
- lbr_demos_py
- lbr_moveit
- lbr_moveit_cpp
- lbr_description
- lbr_fri_ros2
- lbr_fri_ros2_stack
- iiwa14_moveit_config
- iiwa7_moveit_config
- med14_moveit_config
- med7_moveit_config
- lbr_ros2_control
- lbr_fri_idl
- kinematics_interface
- kinematics_interface_kdl