Skip to content

Update admittance_controller to use shared 6D robot description #2173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
naitikpahwa18 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update admittance_controller to use shared 6D robot description #2173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80da713
Update admittance_controller & Temporary change to ros2_controllers.r…
naitikpahwa18 Feb 16, 2026
fc11398
Pre-commit
naitikpahwa18 Feb 16, 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
2 changes: 1 addition & 1 deletion admittance_controller/test/test_admittance_controller.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
#include "rclcpp/node_interfaces/node_interfaces.hpp"
#endif
#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
#include "ros2_control_test_assets/test_asset_6d_robot_description.hpp"
#include "semantic_components/force_torque_sensor.hpp"
#include "test_asset_6d_robot_description.hpp"
#include "tf2_ros/transform_broadcaster.hpp"

// TODO(anyone): replace the state and command message types
Expand Down
311 changes: 0 additions & 311 deletions admittance_controller/test/test_asset_6d_robot_description.hpp
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ros2_controllers.rolling.repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ repositories:
ros2_control:
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 •
edited
Loading

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.

realtime_tools:
type: git
url: https://github.com/ros-controls/realtime_tools.git
Expand Down