From 4b3391ee01993e97cc8a566363581108d1f291da Mon Sep 17 00:00:00 2001 From: Steve Macenski Date: Mon, 24 May 2021 14:14:16 -0700 Subject: [PATCH] Galactic sync 1 : All commits before May 24 (#2363) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * reset all goal checkers on cleanup state (#2354) * Fix map_saver_cli arguments not parsed well (#2362) Fixes #2358 * bumping to 1.0.2 for re-release with updates Co-authored-by: Carlos Andrés Álvarez Restrepo --- nav2_amcl/package.xml | 2 +- nav2_behavior_tree/package.xml | 2 +- nav2_bringup/bringup/package.xml | 2 +- nav2_bringup/nav2_gazebo_spawner/package.xml | 2 +- nav2_bt_navigator/package.xml | 2 +- nav2_common/package.xml | 2 +- nav2_controller/package.xml | 2 +- nav2_controller/src/nav2_controller.cpp | 3 ++- nav2_core/package.xml | 2 +- nav2_costmap_2d/package.xml | 2 +- nav2_dwb_controller/costmap_queue/package.xml | 2 +- nav2_dwb_controller/dwb_core/package.xml | 2 +- nav2_dwb_controller/dwb_critics/package.xml | 2 +- nav2_dwb_controller/dwb_msgs/package.xml | 2 +- nav2_dwb_controller/dwb_plugins/package.xml | 2 +- nav2_dwb_controller/nav2_dwb_controller/package.xml | 2 +- nav2_dwb_controller/nav_2d_msgs/package.xml | 2 +- nav2_dwb_controller/nav_2d_utils/package.xml | 2 +- nav2_lifecycle_manager/package.xml | 2 +- nav2_map_server/package.xml | 2 +- nav2_map_server/src/map_saver/main_cli.cpp | 4 ++-- nav2_msgs/package.xml | 2 +- nav2_navfn_planner/package.xml | 2 +- nav2_planner/package.xml | 2 +- nav2_recoveries/package.xml | 2 +- nav2_regulated_pure_pursuit_controller/package.xml | 2 +- nav2_rviz_plugins/package.xml | 2 +- nav2_smac_planner/package.xml | 2 +- nav2_system_tests/package.xml | 2 +- nav2_util/package.xml | 2 +- nav2_voxel_grid/package.xml | 2 +- nav2_waypoint_follower/package.xml | 2 +- navigation2/package.xml | 2 +- 33 files changed, 35 insertions(+), 34 deletions(-) diff --git a/nav2_amcl/package.xml b/nav2_amcl/package.xml index 04cb0dc75b0..7f3a6c09a57 100644 --- a/nav2_amcl/package.xml +++ b/nav2_amcl/package.xml @@ -2,7 +2,7 @@ nav2_amcl - 1.0.1 + 1.0.2

amcl is a probabilistic localization system for a robot moving in diff --git a/nav2_behavior_tree/package.xml b/nav2_behavior_tree/package.xml index a03a580694e..ee071f0318a 100644 --- a/nav2_behavior_tree/package.xml +++ b/nav2_behavior_tree/package.xml @@ -2,7 +2,7 @@ nav2_behavior_tree - 1.0.1 + 1.0.2 TODO Michael Jeronimo Carlos Orduno diff --git a/nav2_bringup/bringup/package.xml b/nav2_bringup/bringup/package.xml index f65aa5c9999..233219ecf2d 100644 --- a/nav2_bringup/bringup/package.xml +++ b/nav2_bringup/bringup/package.xml @@ -2,7 +2,7 @@ nav2_bringup - 1.0.1 + 1.0.2 Bringup scripts and configurations for the Nav2 stack Michael Jeronimo Steve Macenski diff --git a/nav2_bringup/nav2_gazebo_spawner/package.xml b/nav2_bringup/nav2_gazebo_spawner/package.xml index a792c309d70..c0d6c2518bf 100644 --- a/nav2_bringup/nav2_gazebo_spawner/package.xml +++ b/nav2_bringup/nav2_gazebo_spawner/package.xml @@ -2,7 +2,7 @@ nav2_gazebo_spawner - 1.0.1 + 1.0.2 Package for spawning a robot model into Gazebo for Nav2 lkumarbe lkumarbe diff --git a/nav2_bt_navigator/package.xml b/nav2_bt_navigator/package.xml index 214dac4e0d9..4c574461f63 100644 --- a/nav2_bt_navigator/package.xml +++ b/nav2_bt_navigator/package.xml @@ -2,7 +2,7 @@ nav2_bt_navigator - 1.0.1 + 1.0.2 TODO Michael Jeronimo Apache-2.0 diff --git a/nav2_common/package.xml b/nav2_common/package.xml index 84777e5d942..27133ed1dd6 100644 --- a/nav2_common/package.xml +++ b/nav2_common/package.xml @@ -2,7 +2,7 @@ nav2_common - 1.0.1 + 1.0.2 Common support functionality used throughout the navigation 2 stack Carl Delsey Apache-2.0 diff --git a/nav2_controller/package.xml b/nav2_controller/package.xml index ed3c295910a..1a0c0c49411 100644 --- a/nav2_controller/package.xml +++ b/nav2_controller/package.xml @@ -2,7 +2,7 @@ nav2_controller - 1.0.1 + 1.0.2 Controller action interface Carl Delsey Apache-2.0 diff --git a/nav2_controller/src/nav2_controller.cpp b/nav2_controller/src/nav2_controller.cpp index 82781aab30e..1c13117d5be 100644 --- a/nav2_controller/src/nav2_controller.cpp +++ b/nav2_controller/src/nav2_controller.cpp @@ -256,6 +256,8 @@ ControllerServer::on_cleanup(const rclcpp_lifecycle::State & state) it->second->cleanup(); } controllers_.clear(); + + goal_checkers_.clear(); costmap_ros_->on_cleanup(state); // Release any allocated resources @@ -264,7 +266,6 @@ ControllerServer::on_cleanup(const rclcpp_lifecycle::State & state) vel_publisher_.reset(); speed_limit_sub_.reset(); action_server_.reset(); - goal_checkers_[current_goal_checker_]->reset(); return nav2_util::CallbackReturn::SUCCESS; } diff --git a/nav2_core/package.xml b/nav2_core/package.xml index c2a1055b0e7..90ca83f4686 100644 --- a/nav2_core/package.xml +++ b/nav2_core/package.xml @@ -2,7 +2,7 @@ nav2_core - 1.0.1 + 1.0.2 A set of headers for plugins core to the Nav2 stack Steve Macenski Carl Delsey diff --git a/nav2_costmap_2d/package.xml b/nav2_costmap_2d/package.xml index 41b6bb7d6aa..bf68213862a 100644 --- a/nav2_costmap_2d/package.xml +++ b/nav2_costmap_2d/package.xml @@ -2,7 +2,7 @@ nav2_costmap_2d - 1.0.1 + 1.0.2 This package provides an implementation of a 2D costmap that takes in sensor data from the world, builds a 2D or 3D occupancy grid of the data (depending diff --git a/nav2_dwb_controller/costmap_queue/package.xml b/nav2_dwb_controller/costmap_queue/package.xml index 73cd21b9f70..69d0f4cd97a 100644 --- a/nav2_dwb_controller/costmap_queue/package.xml +++ b/nav2_dwb_controller/costmap_queue/package.xml @@ -1,7 +1,7 @@ costmap_queue - 1.0.1 + 1.0.2 The costmap_queue package David V. Lu!! BSD-3-Clause diff --git a/nav2_dwb_controller/dwb_core/package.xml b/nav2_dwb_controller/dwb_core/package.xml index f0e22edb623..1d9bf24bf19 100644 --- a/nav2_dwb_controller/dwb_core/package.xml +++ b/nav2_dwb_controller/dwb_core/package.xml @@ -2,7 +2,7 @@ dwb_core - 1.0.1 + 1.0.2 TODO Carl Delsey BSD-3-Clause diff --git a/nav2_dwb_controller/dwb_critics/package.xml b/nav2_dwb_controller/dwb_critics/package.xml index 73472b38fc2..f5e0d9ec32d 100644 --- a/nav2_dwb_controller/dwb_critics/package.xml +++ b/nav2_dwb_controller/dwb_critics/package.xml @@ -1,7 +1,7 @@ dwb_critics - 1.0.1 + 1.0.2 The dwb_critics package David V. Lu!! BSD-3-Clause diff --git a/nav2_dwb_controller/dwb_msgs/package.xml b/nav2_dwb_controller/dwb_msgs/package.xml index 56d4f9a39bb..a090afc197b 100644 --- a/nav2_dwb_controller/dwb_msgs/package.xml +++ b/nav2_dwb_controller/dwb_msgs/package.xml @@ -2,7 +2,7 @@ dwb_msgs - 1.0.1 + 1.0.2 Message/Service definitions specifically for the dwb_core David V. Lu!! BSD-3-Clause diff --git a/nav2_dwb_controller/dwb_plugins/package.xml b/nav2_dwb_controller/dwb_plugins/package.xml index a00989a96fc..704519f94b9 100644 --- a/nav2_dwb_controller/dwb_plugins/package.xml +++ b/nav2_dwb_controller/dwb_plugins/package.xml @@ -1,7 +1,7 @@ dwb_plugins - 1.0.1 + 1.0.2 Standard implementations of the GoalChecker and TrajectoryGenerators for dwb_core diff --git a/nav2_dwb_controller/nav2_dwb_controller/package.xml b/nav2_dwb_controller/nav2_dwb_controller/package.xml index ca04a91de55..f753482507b 100644 --- a/nav2_dwb_controller/nav2_dwb_controller/package.xml +++ b/nav2_dwb_controller/nav2_dwb_controller/package.xml @@ -2,7 +2,7 @@ nav2_dwb_controller - 1.0.1 + 1.0.2 ROS2 controller (DWB) metapackage diff --git a/nav2_dwb_controller/nav_2d_msgs/package.xml b/nav2_dwb_controller/nav_2d_msgs/package.xml index 3313ab1d659..7ef9bf112e3 100644 --- a/nav2_dwb_controller/nav_2d_msgs/package.xml +++ b/nav2_dwb_controller/nav_2d_msgs/package.xml @@ -2,7 +2,7 @@ nav_2d_msgs - 1.0.1 + 1.0.2 Basic message types for two dimensional navigation, extending from geometry_msgs::Pose2D. David V. Lu!! BSD-3-Clause diff --git a/nav2_dwb_controller/nav_2d_utils/package.xml b/nav2_dwb_controller/nav_2d_utils/package.xml index 9abbb9aca44..1e144a17f1b 100644 --- a/nav2_dwb_controller/nav_2d_utils/package.xml +++ b/nav2_dwb_controller/nav_2d_utils/package.xml @@ -2,7 +2,7 @@ nav_2d_utils - 1.0.1 + 1.0.2 A handful of useful utility functions for nav_2d packages. David V. Lu!! BSD-3-Clause diff --git a/nav2_lifecycle_manager/package.xml b/nav2_lifecycle_manager/package.xml index 6d00815fe93..edfab23dbe5 100644 --- a/nav2_lifecycle_manager/package.xml +++ b/nav2_lifecycle_manager/package.xml @@ -2,7 +2,7 @@ nav2_lifecycle_manager - 1.0.1 + 1.0.2 A controller/manager for the lifecycle nodes of the Navigation 2 system Michael Jeronimo Apache-2.0 diff --git a/nav2_map_server/package.xml b/nav2_map_server/package.xml index 2f855245c5c..8494068296a 100644 --- a/nav2_map_server/package.xml +++ b/nav2_map_server/package.xml @@ -2,7 +2,7 @@ nav2_map_server - 1.0.1 + 1.0.2 Refactored map server for ROS2 Navigation diff --git a/nav2_map_server/src/map_saver/main_cli.cpp b/nav2_map_server/src/map_saver/main_cli.cpp index 89c95e057ea..09cf039f441 100644 --- a/nav2_map_server/src/map_saver/main_cli.cpp +++ b/nav2_map_server/src/map_saver/main_cli.cpp @@ -108,10 +108,10 @@ ARGUMENTS_STATUS parse_arguments( save_parameters.map_file_name = *it; break; case COMMAND_FREE_THRESH: - save_parameters.free_thresh = atoi(it->c_str()); + save_parameters.free_thresh = atof(it->c_str()); break; case COMMAND_OCCUPIED_THRESH: - save_parameters.occupied_thresh = atoi(it->c_str()); + save_parameters.occupied_thresh = atof(it->c_str()); break; case COMMAND_IMAGE_FORMAT: save_parameters.image_format = *it; diff --git a/nav2_msgs/package.xml b/nav2_msgs/package.xml index 9993d41fee0..1034692fd9f 100644 --- a/nav2_msgs/package.xml +++ b/nav2_msgs/package.xml @@ -2,7 +2,7 @@ nav2_msgs - 1.0.1 + 1.0.2 Messages and service files for the Nav2 stack Michael Jeronimo Steve Macenski diff --git a/nav2_navfn_planner/package.xml b/nav2_navfn_planner/package.xml index f5a047951a1..c32aaff470c 100644 --- a/nav2_navfn_planner/package.xml +++ b/nav2_navfn_planner/package.xml @@ -2,7 +2,7 @@ nav2_navfn_planner - 1.0.1 + 1.0.2 TODO Steve Macenski Carlos Orduno diff --git a/nav2_planner/package.xml b/nav2_planner/package.xml index d518684cdb1..3bd3bb81a3d 100644 --- a/nav2_planner/package.xml +++ b/nav2_planner/package.xml @@ -2,7 +2,7 @@ nav2_planner - 1.0.1 + 1.0.2 TODO Steve Macenski Apache-2.0 diff --git a/nav2_recoveries/package.xml b/nav2_recoveries/package.xml index a54fa9ca4ce..9cafd7eaea9 100644 --- a/nav2_recoveries/package.xml +++ b/nav2_recoveries/package.xml @@ -2,7 +2,7 @@ nav2_recoveries - 1.0.1 + 1.0.2 TODO Carlos Orduno Steve Macenski diff --git a/nav2_regulated_pure_pursuit_controller/package.xml b/nav2_regulated_pure_pursuit_controller/package.xml index 3c2298f376c..bf0b07dfc68 100644 --- a/nav2_regulated_pure_pursuit_controller/package.xml +++ b/nav2_regulated_pure_pursuit_controller/package.xml @@ -2,7 +2,7 @@ nav2_regulated_pure_pursuit_controller - 1.0.1 + 1.0.2 Regulated Pure Pursuit Controller Steve Macenski Shrijit Singh diff --git a/nav2_rviz_plugins/package.xml b/nav2_rviz_plugins/package.xml index 38f9a06dc3f..bb0fcb2ec6a 100644 --- a/nav2_rviz_plugins/package.xml +++ b/nav2_rviz_plugins/package.xml @@ -2,7 +2,7 @@ nav2_rviz_plugins - 1.0.1 + 1.0.2 Navigation 2 plugins for rviz Michael Jeronimo Apache-2.0 diff --git a/nav2_smac_planner/package.xml b/nav2_smac_planner/package.xml index d85684ff070..b1c7ee13084 100644 --- a/nav2_smac_planner/package.xml +++ b/nav2_smac_planner/package.xml @@ -2,7 +2,7 @@ nav2_smac_planner - 1.0.1 + 1.0.2 Smac global planning plugin Steve Macenski Apache-2.0 diff --git a/nav2_system_tests/package.xml b/nav2_system_tests/package.xml index 92ebaf52398..09fb13f983d 100644 --- a/nav2_system_tests/package.xml +++ b/nav2_system_tests/package.xml @@ -2,7 +2,7 @@ nav2_system_tests - 1.0.1 + 1.0.2 TODO Carlos Orduno Apache-2.0 diff --git a/nav2_util/package.xml b/nav2_util/package.xml index 7f366f628a8..406e38fedb3 100644 --- a/nav2_util/package.xml +++ b/nav2_util/package.xml @@ -2,7 +2,7 @@ nav2_util - 1.0.1 + 1.0.2 TODO Michael Jeronimo Mohammad Haghighipanah diff --git a/nav2_voxel_grid/package.xml b/nav2_voxel_grid/package.xml index 6a1c4cf0ca9..879b3e85ce7 100644 --- a/nav2_voxel_grid/package.xml +++ b/nav2_voxel_grid/package.xml @@ -2,7 +2,7 @@ nav2_voxel_grid - 1.0.1 + 1.0.2 voxel_grid provides an implementation of an efficient 3D voxel grid. The occupancy grid can support 3 different representations for the state of a cell: marked, free, or unknown. Due to the underlying implementation relying on bitwise and and or integer operations, the voxel grid only supports 16 different levels per voxel column. However, this limitation yields raytracing and cell marking performance in the grid comparable to standard 2D structures making it quite fast compared to most 3D structures. diff --git a/nav2_waypoint_follower/package.xml b/nav2_waypoint_follower/package.xml index 3dab3577bf2..9dfdec25ba2 100644 --- a/nav2_waypoint_follower/package.xml +++ b/nav2_waypoint_follower/package.xml @@ -2,7 +2,7 @@ nav2_waypoint_follower - 1.0.1 + 1.0.2 A waypoint follower navigation server Steve Macenski Apache-2.0 diff --git a/navigation2/package.xml b/navigation2/package.xml index 96b4ca70cc7..7e2622fc114 100644 --- a/navigation2/package.xml +++ b/navigation2/package.xml @@ -2,7 +2,7 @@ navigation2 - 1.0.1 + 1.0.2 ROS2 Navigation Stack