Update admittance_controller to use shared 6D robot description#2173
Update admittance_controller to use shared 6D robot description#2173naitikpahwa18 wants to merge 2 commits intoros-controls:masterfrom
Conversation
There was a problem hiding this comment.
Pull request overview
This PR updates admittance_controller tests to consume the shared 6D robot URDF/SRDF description from the ros2_control_test_assets package, removing the duplicated local copy.
Changes:
- Switched
test_admittance_controller.hppto includeros2_control_test_assets/test_asset_6d_robot_description.hpp. - Removed the local
admittance_controller/test/test_asset_6d_robot_description.hppcopy. - Updated
ros2_controllers.rolling.reposto reference aros2_controlfeature branch for CI testing.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| ros2_controllers.rolling.repos | Temporarily pins ros2_control dependency to a feature branch for CI validation. |
| admittance_controller/test/test_asset_6d_robot_description.hpp | Removes duplicated 6D robot description header from this package. |
| admittance_controller/test/test_admittance_controller.hpp | Uses the shared ros2_control_test_assets 6D robot description header. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| type: git | ||
| url: https://github.com/ros-controls/ros2_control.git | ||
| version: master | ||
| version: move-6d-robot-450 |
There was a problem hiding this comment.
ros2_controllers.rolling.repos is now pinned to a feature branch (move-6d-robot-450). Since this file is used by others to reproduce/consume the rolling source workspace, it should not reference a temporary PR branch; please revert this back to master (or a specific released tag/commit) before merging and rely on CI overrides for temporary testing.
There was a problem hiding this comment.
This was done temporarily as suggested by @christophfroehlich so the semi-binary builds can pick up the ros2_control branch. I’ll revert it back to master before merging.
…olling.repos Signed-off-by: Naitik Pahwa <naitikpahwa18@users.noreply.github.com>
Signed-off-by: Naitik Pahwa <naitikpahwa18@users.noreply.github.com>
6354a66 to
fc11398
Compare
Description
Updates
admittance_controllerto use the 6D robot description fromros2_control_test_assetspackage instead of maintaining a local copy.Related Issues
Fixes #450
Changes
test_admittance_controller.hppto useros2_control_test_assets/test_asset_6d_robot_description.hpptest_asset_6d_robot_description.hppfromadmittance_controller/test/ros2_controllers.rolling.reposto point to my ros2_control PR branch for CI testing (will be reverted before merge)Additional context
This PR should be merged in coordination with ros-controls/ros2_control#3032