Merge branch 'master' of https://github.com/ros-planning/navigation2 …

…into spin_recovery
gimait · Mar 21, 2020 · 8d5fa2e · 8d5fa2e
2 parents 4286923 + 19e5b41
commit 8d5fa2e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/nav2_behavior_tree/include/nav2_behavior_tree/bt_action_node.hpp b/nav2_behavior_tree/include/nav2_behavior_tree/bt_action_node.hpp
@@ -149,15 +149,12 @@ class BtActionNode : public BT::CoroActionNode
     switch (result_.code) {
       case rclcpp_action::ResultCode::SUCCEEDED:
         on_success();
-        setStatus(BT::NodeStatus::IDLE);
         return BT::NodeStatus::SUCCESS;
 
       case rclcpp_action::ResultCode::ABORTED:
-        setStatus(BT::NodeStatus::IDLE);
         return BT::NodeStatus::FAILURE;
 
       case rclcpp_action::ResultCode::CANCELED:
-        setStatus(BT::NodeStatus::IDLE);
         return BT::NodeStatus::SUCCESS;
 
       default:

diff --git a/tools/build_all.sh b/tools/build_all.sh
@@ -7,11 +7,11 @@
 # set at the time we start the last step, the ros1_bridge build.
 
 if [ "$ROS2_DISTRO" = "" ]; then
-	export ROS2_DISTRO=dashing
+  export ROS2_DISTRO=eloquent
 fi
-if [ "$ROS2_DISTRO" != "dashing" ]; then
-	echo "ROS2_DISTRO variable must be set to dashing"
-	exit 1
+if [ "$ROS2_DISTRO" != "eloquent" ]; then
+  echo "ROS2_DISTRO variable must be set to eloquent"
+  exit 1
 fi
 
 set -e

diff --git a/tools/initial_ros_setup.sh b/tools/initial_ros_setup.sh
@@ -4,10 +4,10 @@ ENABLE_BUILD=true
 ENABLE_ROS2=true
 
 if [ "$ROS2_DISTRO" = "" ]; then
-  export ROS2_DISTRO=dashing
+  export ROS2_DISTRO=eloquent
 fi
-if [ "$ROS2_DISTRO" != "dashing" ]; then
-  echo "ROS2_DISTRO variable must be set to dashing"
+if [ "$ROS2_DISTRO" != "eloquent" ]; then
+  echo "ROS2_DISTRO variable must be set to eloquent"
   exit 1
 fi
 
@@ -24,7 +24,7 @@ for opt in "$@" ; do
     *)
       echo "Invalid option: $opt"
       echo "Valid options:"
-      echo "--no-ros2       Uses the binary distribution of ROS2 dashing"
+      echo "--no-ros2       Uses the binary distribution of ROS2 eloquent"
       echo "--download-only Skips the build step and only downloads the code"
       exit 1
     ;;