Skip to content

Add 6D robot description to ros2_control_test_assets#3032

Merged
christophfroehlich merged 5 commits intoros-controls:masterfrom
naitikpahwa18:move-6d-robot-450
Apr 15, 2026
Merged

Add 6D robot description to ros2_control_test_assets#3032
christophfroehlich merged 5 commits intoros-controls:masterfrom
naitikpahwa18:move-6d-robot-450

Conversation

@naitikpahwa18
Copy link
Copy Markdown
Contributor

@naitikpahwa18 naitikpahwa18 commented Feb 16, 2026

Description

Adds test_asset_6d_robot_description.hpp to ros2_control_test_assets package to make it reusable across multiple controllers.

Related Issues

Part of fix for ros-controls/ros2_controllers#450

Additional context

This PR should be merged in coordination with the ros-controls/ros2_controllers#2173

Signed-off-by: Naitik Pahwa <naitikpahwa18@users.noreply.github.com>
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

Adds a new reusable test asset header to ros2_control_test_assets that provides a 6-DOF robot URDF and matching SRDF as embedded string constants, intended for reuse across multiple controller test suites.

Changes:

  • Added test_asset_6d_robot_description.hpp containing valid_6d_robot_urdf and valid_6d_robot_srdf string assets.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

naitikpahwa18 and others added 2 commits February 18, 2026 16:35
…_asset_6d_robot_description.hpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Naitik Pahwa <naitikpahwa18@users.noreply.github.com>
Copy link
Copy Markdown
Member

@destogl destogl left a comment

Choose a reason for hiding this comment

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

I think we should switch to another robot description that we are using in the ros2_control_demos. Here it is: https://github.com/ros-controls/ros2_control_demos/tree/master/ros2_control_demo_description/r6bot

@christophfroehlich, @bmagyar and @saikishor should we copy this description or move it here and then reference it always from test assets? Or is maintaining two copies OK in this case?

christophfroehlich and others added 2 commits April 15, 2026 19:48
Co-authored-by: Dr. Denis <denis.stogl@b-robotized.com>
Copy link
Copy Markdown
Member

@christophfroehlich christophfroehlich left a comment

Choose a reason for hiding this comment

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

@destogl I don't think it is a good idea to use the r6bot from the demos here unless we copy it. Moving the full description package incl. meshes will bloat this repo, and we can't make the demos a dependency of the test assets package. We can merge this as it is, because the kuka description was already in admittance_controller. If we need to, we can always copy the r6bot here and replace it.

@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 15, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.09%. Comparing base (7c5e767) to head (bc48177).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #3032   +/-   ##
=======================================
  Coverage   89.08%   89.09%           
=======================================
  Files         160      160           
  Lines       19751    19750    -1     
  Branches     1597     1597           
=======================================
  Hits        17596    17596           
- Misses       1488     1490    +2     
+ Partials      667      664    -3     
Flag Coverage Δ
unittests 89.09% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.
see 4 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@christophfroehlich christophfroehlich added backport-jazzy Triggers PR backport to ROS 2 jazzy. backport-kilted Triggers PR backport to ROS 2 kilted. labels Apr 15, 2026
@christophfroehlich christophfroehlich merged commit 0870f0e into ros-controls:master Apr 15, 2026
18 of 21 checks passed
mergify Bot pushed a commit that referenced this pull request Apr 15, 2026
mergify Bot pushed a commit that referenced this pull request Apr 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-jazzy Triggers PR backport to ROS 2 jazzy. backport-kilted Triggers PR backport to ROS 2 kilted.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants