Skip to content

Update admittance_controller to use shared 6D robot description#2173

Open
naitikpahwa18 wants to merge 2 commits intoros-controls:masterfrom
naitikpahwa18:ros2_control/move-6d-robot
Open

Update admittance_controller to use shared 6D robot description#2173
naitikpahwa18 wants to merge 2 commits intoros-controls:masterfrom
naitikpahwa18:ros2_control/move-6d-robot

Conversation

@naitikpahwa18
Copy link
Copy Markdown

Description

Updates admittance_controller to use the 6D robot description from ros2_control_test_assets package instead of maintaining a local copy.

Related Issues

Fixes #450

Changes

  • Updated include path in test_admittance_controller.hpp to use ros2_control_test_assets/test_asset_6d_robot_description.hpp
  • Removed local copy of test_asset_6d_robot_description.hpp from admittance_controller/test/
  • Temporarily updated ros2_controllers.rolling.repos to 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

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.hpp to include ros2_control_test_assets/test_asset_6d_robot_description.hpp.
  • Removed the local admittance_controller/test/test_asset_6d_robot_description.hpp copy.
  • Updated ros2_controllers.rolling.repos to reference a ros2_control feature 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
Copy link

Copilot AI Feb 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Author

@naitikpahwa18 naitikpahwa18 Feb 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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>
@destogl destogl force-pushed the ros2_control/move-6d-robot branch from 6354a66 to fc11398 Compare March 28, 2026 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[AdmittanceController] Move the fiel with 6d robot description to the test_asset_package.

3 participants