Skip to content

Conversation

@christophfroehlich
Copy link
Contributor

@christophfroehlich christophfroehlich commented Dec 22, 2023

Fixes some items of #944:

  • turn compute_error_for_joint into a proper function & unit test
  • Convert assign_interface_from_point into member function

and minor changes

  • make reference_wrapper argument of assign_interface_from_point const
  • fix format warning of check_state_tolerance_per_joint
  • declare sort_to_local_joint_order as const member function

This is breaking ABI, I guess we should not backport this? Then I'd make a manual backport of the "fix format warning"

@codecov
Copy link

codecov bot commented Dec 22, 2023

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (2f7a755) 47.22% compared to head (8076b99) 47.22%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master     #945   +/-   ##
=======================================
  Coverage   47.22%   47.22%           
=======================================
  Files          41       41           
  Lines        3871     3871           
  Branches     1827     1827           
=======================================
  Hits         1828     1828           
  Misses        775      775           
  Partials     1268     1268           
Flag Coverage Δ
unittests 47.22% <94.11%> (ø)

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

Files Coverage Δ
...jectory_controller/joint_trajectory_controller.hpp 80.00% <100.00%> (+80.00%) ⬆️
...ory_controller/src/joint_trajectory_controller.cpp 47.11% <100.00%> (-0.29%) ⬇️
...include/joint_trajectory_controller/tolerances.hpp 55.00% <0.00%> (ø)

@mergify
Copy link
Contributor

mergify bot commented Jan 4, 2024

This pull request is in conflict. Could you fix it @christophfroehlich?

Copy link
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.

Thanks!

@christophfroehlich christophfroehlich enabled auto-merge (squash) January 22, 2024 22:21
@christophfroehlich christophfroehlich merged commit 833ed7f into ros-controls:master Jan 22, 2024
@christophfroehlich
Copy link
Contributor Author

@bmagyar @destogl what do you think of backporting this?

@christophfroehlich christophfroehlich deleted the jtc/cleanup branch January 22, 2024 23:09
@bmagyar
Copy link
Member

bmagyar commented Feb 2, 2024

Probably helps avoiding conflicts with other backports.

@bmagyar bmagyar added backport-humble Triggers PR backport to ROS 2 humble. backport-iron labels Feb 2, 2024
mergify bot pushed a commit that referenced this pull request Feb 2, 2024
* Convert lambdas to member functions

* Make member function const

* Add a test for compute_error function

* Make reference_wrapper argument const

* Iterate over error fields

(cherry picked from commit 833ed7f)

# Conflicts:
#	joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
#	joint_trajectory_controller/src/joint_trajectory_controller.cpp
mergify bot pushed a commit that referenced this pull request Feb 2, 2024
* Convert lambdas to member functions

* Make member function const

* Add a test for compute_error function

* Make reference_wrapper argument const

* Iterate over error fields

(cherry picked from commit 833ed7f)

# Conflicts:
#	joint_trajectory_controller/include/joint_trajectory_controller/tolerances.hpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-humble Triggers PR backport to ROS 2 humble.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants