Skip to content
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.

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

Use the .hpp headers from realtime_tools package (backport #1406) #1427

Merged
merged 3 commits into from
Dec 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 16, 2024

@christophfroehlich mentioned about the update here : ros-controls/realtime_tools#206 (comment)

This PR addressed the same


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

Copy link
Contributor Author

mergify bot commented Dec 16, 2024

Cherry-pick of cd73055 has failed:

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

You are currently cherry-picking commit cd73055.
  (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:   admittance_controller/include/admittance_controller/admittance_controller.hpp
	modified:   force_torque_sensor_broadcaster/include/force_torque_sensor_broadcaster/force_torque_sensor_broadcaster.hpp
	modified:   forward_command_controller/include/forward_command_controller/forward_controllers_base.hpp
	modified:   gpio_controllers/include/gpio_controllers/gpio_command_controller.hpp
	modified:   gripper_controllers/include/gripper_controllers/gripper_action_controller.hpp
	modified:   imu_sensor_broadcaster/include/imu_sensor_broadcaster/imu_sensor_broadcaster.hpp
	modified:   joint_trajectory_controller/include/joint_trajectory_controller/joint_trajectory_controller.hpp
	modified:   pid_controller/include/pid_controller/pid_controller.hpp
	modified:   pose_broadcaster/include/pose_broadcaster/pose_broadcaster.hpp
	modified:   range_sensor_broadcaster/include/range_sensor_broadcaster/range_sensor_broadcaster.hpp

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   diff_drive_controller/include/diff_drive_controller/diff_drive_controller.hpp
	both modified:   joint_state_broadcaster/include/joint_state_broadcaster/joint_state_broadcaster.hpp
	deleted by us:   mecanum_drive_controller/include/mecanum_drive_controller/mecanum_drive_controller.hpp
	deleted by us:   mecanum_drive_controller/include/mecanum_drive_controller/odometry.hpp
	deleted by us:   parallel_gripper_controller/include/parallel_gripper_controller/parallel_gripper_action_controller.hpp
	both modified:   steering_controllers_library/include/steering_controllers_library/steering_controllers_library.hpp
	both modified:   tricycle_controller/include/tricycle_controller/tricycle_controller.hpp

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

Copy link

codecov bot commented Dec 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 66.72%. Comparing base (7a2ad46) to head (ce2b104).
Report is 2 commits behind head on humble.

Additional details and impacted files
@@            Coverage Diff             @@
##           humble    #1427      +/-   ##
==========================================
+ Coverage   66.70%   66.72%   +0.02%     
==========================================
  Files         113      113              
  Lines       13216    13216              
  Branches     8152     8151       -1     
==========================================
+ Hits         8816     8819       +3     
+ Misses       1442     1436       -6     
- Partials     2958     2961       +3     
Flag Coverage Δ
unittests 66.72% <ø> (+0.02%) ⬆️

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

Files with missing lines Coverage Δ
...de/diff_drive_controller/diff_drive_controller.hpp 100.00% <ø> (ø)
...rd_command_controller/forward_controllers_base.hpp 100.00% <ø> (ø)
...jectory_controller/joint_trajectory_controller.hpp 100.00% <ø> (ø)
...steering_controllers_library/steering_odometry.hpp 100.00% <ø> (ø)
...nclude/tricycle_controller/tricycle_controller.hpp 100.00% <ø> (ø)

... and 3 files with indirect coverage changes

@bmagyar bmagyar merged commit b76f45d into humble Dec 17, 2024
10 of 13 checks passed
@bmagyar bmagyar deleted the mergify/bp/humble/pr-1406 branch December 17, 2024 06:33
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.

3 participants