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

Fix psm/servo parameter conflict #266

Merged

Conversation

henningkayser
Copy link
Member

@henningkayser henningkayser commented Aug 28, 2020

All parameters are triggering the parameter callback in the PSM node, which results in the PSM rejecting parameters from moveit_servo. I'm not sure if this fix is a good long-term solution, but for now exclusive parameters in the PSM are declared for the private node. Eventually, we might want to reimplement the PSM as a composable node which would allow a cleaner separation.
Additionally, 0a98d55 should fix some warnings with the moveit_servo tests, @AdamPettinger does this make sense to you?

@codecov
Copy link

codecov bot commented Aug 28, 2020

Codecov Report

Merging #266 into master will increase coverage by 1.24%.
The diff coverage is 60.91%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #266      +/-   ##
==========================================
+ Coverage   46.63%   47.87%   +1.24%     
==========================================
  Files         122      155      +33     
  Lines       12740    15750    +3010     
==========================================
+ Hits         5941     7541    +1600     
- Misses       6799     8209    +1410     
Impacted Files Coverage Δ
...e/include/moveit/kinematics_base/kinematics_base.h 43.33% <ø> (ø)
...oveit_core/kinematics_base/src/kinematics_base.cpp 23.52% <0.00%> (+0.99%) ⬆️
...it/planning_scene_monitor/planning_scene_monitor.h 14.28% <ø> (ø)
...ude/moveit/robot_interaction/interaction_handler.h 0.00% <ø> (ø)
...clude/moveit/robot_interaction/kinematic_options.h 0.00% <ø> (ø)
...clude/moveit/robot_interaction/robot_interaction.h 0.00% <ø> (ø)
..._ros/robot_interaction/src/interaction_handler.cpp 0.00% <0.00%> (ø)
...bot_interaction/src/interactive_marker_helpers.cpp 0.00% <0.00%> (ø)
...it_ros/robot_interaction/src/kinematic_options.cpp 0.00% <0.00%> (ø)
...os/robot_interaction/src/kinematic_options_map.cpp 0.00% <ø> (ø)
... and 61 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 273da39...0a98d55. Read the comment docs.

Copy link
Contributor

@AdamPettinger AdamPettinger left a comment

Choose a reason for hiding this comment

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

In general not sure how to make different things sharing a node handle the parameters nicely, but using the private node seems reasonable to me.

Thanks for catching and fixing the intra-process communications in moveit_servo!

@@ -73,7 +73,8 @@ def generate_servo_test_description(*args,
package='moveit_servo',
plugin='moveit_servo::ServoServer',
name='servo_server',
parameters=[servo_params, robot_description, robot_description_semantic])
parameters=[servo_params, robot_description, robot_description_semantic],
extra_arguments=[{'use_intra_process_comm': True}])
Copy link
Contributor

Choose a reason for hiding this comment

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

Oops! Definitely meant to do this for the tests and forgot, thanks Henning!

@henningkayser henningkayser merged commit 8a198ef into moveit:master Aug 28, 2020
MikeWrock pushed a commit to MikeWrock/moveit2 that referenced this pull request Aug 15, 2022
@JensVanhooydonck
Copy link
Contributor

Sorry to comment on this closed issue. But how should one set the parameters moved to the private node? Shouldn't we set these values to the values of the current Node when declaring them?

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.

None yet

3 participants