From b51f0767a03f980fe47b610d380af000f2b9693b Mon Sep 17 00:00:00 2001 From: stevemacenski <stevenmacenski@gmail.com> Date: Mon, 13 Jan 2020 18:26:43 -0800 Subject: [PATCH] reset navigation namespace --- nav2_bringup/bringup/launch/nav2_localization_launch.py | 2 +- nav2_bringup/bringup/launch/nav2_navigation_launch.py | 2 +- nav2_bringup/bringup/params/nav2_params.yaml | 1 - nav2_bt_navigator/src/bt_navigator.cpp | 2 -- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/nav2_bringup/bringup/launch/nav2_localization_launch.py b/nav2_bringup/bringup/launch/nav2_localization_launch.py index 597f9fdd..bbf5e78b 100644 --- a/nav2_bringup/bringup/launch/nav2_localization_launch.py +++ b/nav2_bringup/bringup/launch/nav2_localization_launch.py @@ -64,7 +64,7 @@ def generate_launch_description(): SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'), DeclareLaunchArgument( - 'namespace', default_value='navigation', + 'namespace', default_value='', description='Top-level namespace'), DeclareLaunchArgument( diff --git a/nav2_bringup/bringup/launch/nav2_navigation_launch.py b/nav2_bringup/bringup/launch/nav2_navigation_launch.py index b7939a7f..7f82d661 100644 --- a/nav2_bringup/bringup/launch/nav2_navigation_launch.py +++ b/nav2_bringup/bringup/launch/nav2_navigation_launch.py @@ -71,7 +71,7 @@ def generate_launch_description(): SetEnvironmentVariable('RCUTILS_CONSOLE_STDOUT_LINE_BUFFERED', '1'), DeclareLaunchArgument( - 'namespace', default_value='navigation', + 'namespace', default_value='', description='Top-level namespace'), DeclareLaunchArgument( diff --git a/nav2_bringup/bringup/params/nav2_params.yaml b/nav2_bringup/bringup/params/nav2_params.yaml index 7d1bca3d..6445a187 100644 --- a/nav2_bringup/bringup/params/nav2_params.yaml +++ b/nav2_bringup/bringup/params/nav2_params.yaml @@ -49,7 +49,6 @@ amcl_rclcpp_node: bt_navigator: ros__parameters: use_sim_time: True - hi: true bt_xml_filename: "navigate_w_replanning_and_recovery.xml" plugin_lib_names: - nav2_compute_path_to_pose_action_bt_node diff --git a/nav2_bt_navigator/src/bt_navigator.cpp b/nav2_bt_navigator/src/bt_navigator.cpp index 49912224..24d8ea51 100644 --- a/nav2_bt_navigator/src/bt_navigator.cpp +++ b/nav2_bt_navigator/src/bt_navigator.cpp @@ -78,8 +78,6 @@ BtNavigator::on_configure(const rclcpp_lifecycle::State & /*state*/) // Get the libraries to pull plugins from plugin_lib_names_ = get_parameter("plugin_lib_names").as_string_array(); - bool hi = declare_parameter("hi").get<bool>(); - std::cout << hi << std::endl; // Create the class that registers our custom nodes and executes the BT bt_ = std::make_unique<nav2_behavior_tree::BehaviorTreeEngine>(plugin_lib_names_); -- GitLab