Groot monitoring support back ported to jazzy#5762
Groot monitoring support back ported to jazzy#5762SteveMacenski merged 15 commits intoros-navigation:jazzyfrom
Conversation
|
@mikeslembrouckZYGO, all pull requests must be targeted towards the |
|
@mikeslembrouckZYGO, is this ready for review? Also, I am assuming you have fully tested this feature locally, yes? Check CI, build is failing https://app.circleci.com/pipelines/github/ros-navigation/navigation2/17032/workflows/0544ffeb-6829-43f9-9729-7b577c72a917/jobs/50044 |
Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
Signed-off-by: mikeslembrouckZYGO <mike.slembrouck@zygo.be> Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
Removed tests related to WaypointStatus from JsonTest class. Signed-off-by: mikeslembrouckZYGO <mike.slembrouck@zygo.be> Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
4323626 to
36b8585
Compare
I've tested the feature locally and the build succeed, so it's ready for review yes. Thx! |
mini-1235
left a comment
There was a problem hiding this comment.
Please fix the following item.
In the main branch, we also do BT::RegisterJsonDefinition, is that not needed in this PR?
nav2_behavior_tree/include/nav2_behavior_tree/behavior_tree_engine.hpp
Outdated
Show resolved
Hide resolved
Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
|
You can actually keep the params in |
Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
Ah yes, It should be ok now |
mini-1235
left a comment
There was a problem hiding this comment.
I don't think nav_msgs::msg::Goals is the correct type, could you please go through all bt nodes and make sure it register the correct type?
Otherwise LGTM
nav2_behavior_tree/include/nav2_behavior_tree/plugins/action/navigate_through_poses_action.hpp
Outdated
Show resolved
Hide resolved
...havior_tree/include/nav2_behavior_tree/plugins/condition/globally_updated_goal_condition.hpp
Show resolved
Hide resolved
nav2_behavior_tree/include/nav2_behavior_tree/plugins/condition/goal_updated_condition.hpp
Outdated
Show resolved
Hide resolved
nav2_behavior_tree/include/nav2_behavior_tree/plugins/decorator/goal_updated_controller.hpp
Outdated
Show resolved
Hide resolved
| @@ -362,4 +364,3 @@ docking_server: | |||
| k_delta: 2.0 | |||
| v_linear_min: 0.15 | |||
| v_linear_max: 0.15 | |||
There was a problem hiding this comment.
Oh, I think there was a space here instead of newline, please add the line back without space
|
Also, per https://www.behaviortree.dev/docs/tutorial-basics/tutorial_11_groot2, let's include behaviortree_cpp/json_export.h in the files that you do |
…:PoseStamped>` instead of `nav_msgs::msg::Goals` Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
…export functionality Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
|
Please don't touch other header files, keep the original order |
Sure, I just followed the include order of the kilted branch, which seemed at bit more cleaned up. Should I revert the order? |
|
Yes, please revert |
Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
Signed-off-by: mikeslembrouckZYGO <mike.slembrouck@zygo.be>
Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be>
…lembrouckZYGO/navigation2.git into feature/jazzy/groot-monitoring
Done |
mini-1235
left a comment
There was a problem hiding this comment.
LGTM. Thanks for reiterating
* Groot monitoring support back ported to jazzy Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * add test_json_utils to CMakeLists.txt Signed-off-by: mikeslembrouckZYGO <mike.slembrouck@zygo.be> Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Remove WaypointStatus tests from JsonTest Removed tests related to WaypointStatus from JsonTest class. Signed-off-by: mikeslembrouckZYGO <mike.slembrouck@zygo.be> Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Add JSON parsing support for key conversion in bt_utils Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Add Groot monitoring support in system tests and parameters Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Fix uncrustify and flake8 errors Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Fix extra blank line in nav_to_pose_tester_node.py Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Remove unused Groot-related code and parameters Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Add JSON type registration for ports in behavior tree plugins Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Update JSON type registration to use `std::vector<geometry_msgs::msg::PoseStamped>` instead of `nav_msgs::msg::Goals` Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Include `json_export` header in behavior tree plugins to enable JSON export functionality Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Revert header include order Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> * Remove unnecessary blank line in header file Signed-off-by: mikeslembrouckZYGO <mike.slembrouck@zygo.be> * Remove extra blank lines Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> --------- Signed-off-by: Mike Slembrouck <mike.slembrouck@zygo.be> Signed-off-by: mikeslembrouckZYGO <mike.slembrouck@zygo.be>
Basic Info
Description of contribution in a few bullet points
Description of documentation updates required from your changes
nav2_params.yamlconfiguration:enable_groot_monitoring: falsegroot_server_port: 1667Description of how this change was tested
Future work that may be required in bullet points
For Maintainers:
backport-*.