Skip to content

Use new chainable controller exports API (backport #2350) - #2454

Open
mergify[bot] wants to merge 2 commits into
kiltedfrom
mergify/bp/kilted/pr-2350
Open

Use new chainable controller exports API (backport #2350)#2454
mergify[bot] wants to merge 2 commits into
kiltedfrom
mergify/bp/kilted/pr-2350

Conversation

@mergify

@mergify mergify Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

I've migrated the controllers to the new chainable controller export API, the older API needs to be deprecated soon.

Related to ros-controls/ros2_control#2988


This is an automatic backport of pull request #2350 done by Mergify.

(cherry picked from commit 8ad7d35)

# Conflicts:
#	diff_drive_controller/test/test_diff_drive_controller.cpp
#	mecanum_drive_controller/test/test_mecanum_drive_controller.cpp
#	omni_wheel_drive_controller/test/test_omni_wheel_drive_controller.cpp
#	steering_controllers_library/src/steering_controllers_library.cpp
#	steering_controllers_library/test/test_steering_controllers_library.cpp
@mergify mergify Bot added the conflicts label Jul 2, 2026
@mergify

mergify Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of 8ad7d35 has failed:

On branch mergify/bp/kilted/pr-2350
Your branch is up to date with 'origin/kilted'.

You are currently cherry-picking commit 8ad7d35.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   ackermann_steering_controller/test/test_ackermann_steering_controller.cpp
	modified:   ackermann_steering_controller/test/test_ackermann_steering_controller.hpp
	modified:   admittance_controller/include/admittance_controller/admittance_controller.hpp
	modified:   admittance_controller/src/admittance_controller.cpp
	modified:   bicycle_steering_controller/test/test_bicycle_steering_controller.cpp
	modified:   bicycle_steering_controller/test/test_bicycle_steering_controller.hpp
	modified:   chained_filter_controller/include/chained_filter_controller/chained_filter.hpp
	modified:   chained_filter_controller/src/chained_filter.cpp
	modified:   chained_filter_controller/test/test_chained_filter.cpp
	modified:   chained_filter_controller/test/test_multiple_chained_filter.cpp
	modified:   diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp
	modified:   diff_drive_controller/src/diff_drive_controller.cpp
	modified:   force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
	modified:   force_torque_sensor_broadcaster/src/force_torque_sensor_broadcaster.cpp
	modified:   imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp
	modified:   imu_sensor_broadcaster/src/imu_sensor_broadcaster.cpp
	modified:   mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp
	modified:   mecanum_drive_controller/src/mecanum_drive_controller.cpp
	modified:   mecanum_drive_controller/test/test_mecanum_drive_controller.hpp
	modified:   omni_wheel_drive_controller/include/omni_wheel_drive_controller/omni_wheel_drive_controller.hpp
	modified:   omni_wheel_drive_controller/src/omni_wheel_drive_controller.cpp
	modified:   pid_controller/include/pid_controller/pid_controller.hpp
	modified:   pid_controller/src/pid_controller.cpp
	modified:   pid_controller/test/test_pid_controller.cpp
	modified:   pid_controller/test/test_pid_controller.hpp
	modified:   pid_controller/test/test_pid_controller_dual_interface.cpp
	modified:   steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp
	modified:   steering_controllers_library/test/test_steering_controllers_library.hpp
	modified:   tricycle_steering_controller/test/test_tricycle_steering_controller.cpp
	modified:   tricycle_steering_controller/test/test_tricycle_steering_controller.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   diff_drive_controller/test/test_diff_drive_controller.cpp
	both modified:   mecanum_drive_controller/test/test_mecanum_drive_controller.cpp
	both modified:   omni_wheel_drive_controller/test/test_omni_wheel_drive_controller.cpp
	both modified:   steering_controllers_library/src/steering_controllers_library.cpp
	both modified:   steering_controllers_library/test/test_steering_controllers_library.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify

mergify Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@codecov

codecov Bot commented Jul 2, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 96.36015% with 19 lines in your changes missing coverage. Please review.
✅ Project coverage is 86.98%. Comparing base (019c595) to head (c513a8f).

Files with missing lines Patch % Lines
...dmittance_controller/src/admittance_controller.cpp 83.72% 0 Missing and 7 partials ⚠️
pid_controller/src/pid_controller.cpp 88.33% 6 Missing and 1 partial ⚠️
...iff_drive_controller/src/diff_drive_controller.cpp 92.00% 1 Missing and 1 partial ⚠️
..._drive_controller/src/mecanum_drive_controller.cpp 97.14% 0 Missing and 1 partial ⚠️
...ive_controller/src/omni_wheel_drive_controller.cpp 96.87% 0 Missing and 1 partial ⚠️
...llers_library/src/steering_controllers_library.cpp 95.83% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           kilted    #2454      +/-   ##
==========================================
+ Coverage   86.92%   86.98%   +0.05%     
==========================================
  Files         156      156              
  Lines       15583    15692     +109     
  Branches     1340     1341       +1     
==========================================
+ Hits        13545    13649     +104     
- Misses       1569     1572       +3     
- Partials      469      471       +2     
Flag Coverage Δ
unittests 86.98% <96.36%> (+0.05%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...roller/test/test_ackermann_steering_controller.cpp 100.00% <100.00%> (ø)
...roller/test/test_ackermann_steering_controller.hpp 88.39% <100.00%> (+0.10%) ⬆️
...ntroller/test/test_bicycle_steering_controller.cpp 100.00% <100.00%> (ø)
...ntroller/test/test_bicycle_steering_controller.hpp 85.71% <100.00%> (ø)
chained_filter_controller/src/chained_filter.cpp 79.36% <100.00%> (-0.33%) ⬇️
...ned_filter_controller/test/test_chained_filter.cpp 98.27% <100.00%> (ø)
...r_controller/test/test_multiple_chained_filter.cpp 98.03% <100.00%> (ø)
...ive_controller/test/test_diff_drive_controller.cpp 94.41% <100.00%> (+0.04%) ⬆️
...roadcaster/src/force_torque_sensor_broadcaster.cpp 90.15% <100.00%> (+0.46%) ⬆️
..._sensor_broadcaster/src/imu_sensor_broadcaster.cpp 83.78% <100.00%> (-2.74%) ⬇️
... and 16 more
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@christophfroehlich christophfroehlich left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@saikishor the ABI breaks are fine for us, right?

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.

2 participants