From 017dad004f85d96d207ef30bb18b0e2e8cc2c008 Mon Sep 17 00:00:00 2001
From: Naoya Yamaguchi <708yamaguchi@gmail.com>
Date: Thu, 15 Jul 2021 18:05:20 +0900
Subject: [PATCH 1/5] Revert "Speedup control loop and map update loop in
move_base"
This reverts commit 6b726e7eebc77abff3b6c513f138345797d7e8eb.
---
.../fetch_move_base_common_params.yaml | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_common_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_common_params.yaml
index 30e9553358..9da82ce6e2 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_common_params.yaml
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_common_params.yaml
@@ -2,27 +2,21 @@ move_base:
controller_frequency: 20.0
global_costmap:
inflater:
- inflation_radius: 0.7 # 0.7
+ inflation_radius: 1.0 # 0.7
cost_scaling_factor: 10.0 # 10.0
obstacles:
min_obstacle_height: 0.05
footprint_padding: 0.05
- # By reducing update/publish_frequency, move_base control loop rate will be improved
- # https://moriokalab.com/news/84
- update_frequency: 1.0
- publish_frequency: 0.5
+ publish_frequency: 1.0
local_costmap:
inflater:
- inflation_radius: 0.35 # 0.7
+ inflation_radius: 1.0 # 0.7
cost_scaling_factor: 10.0 # 25.0 default 10, increasing factor decrease the cost value
obstacles:
min_obstacle_height: 0.05
# default 5 (http://wiki.ros.org/navigation/Tutorials/Navigation%20Tuning%20Guide)
footprint_padding: 0.05
- # By reducing update/publish_frequency, move_base control loop rate will be improved
- # https://moriokalab.com/news/84
- update_frequency: 1.0
- publish_frequency: 0.5
+ update_frequency: 5.0
base_global_planner: global_planner/GlobalPlanner
base_local_planner: teb_local_planner/TebLocalPlannerROS
# base_local_planner: base_local_planner/TrajectoryPlannerROS
@@ -59,8 +53,6 @@ move_base:
teb_autosize: True
dt_ref: 0.3
dt_hysteresis: 0.1
- # By reducing max_samples, move_base control loop rate will be improved
- max_samples: 50 # default 500
global_plan_overwrite_orientation: True
max_global_plan_lookahead_dist: 3.0
feasibility_check_no_poses: 5
@@ -79,7 +71,7 @@ move_base:
yaw_goal_tolerance: 0.1
free_goal_vel: False
# Obstacles
- min_obstacle_dist: 0.4 # Enough value not to go too close to obstacle
+ min_obstacle_dist: 0.1
include_costmap_obstacles: True
costmap_obstacles_behind_robot_dist: 1.0
obstacle_poses_afected: 30
From f48d0f9d2f99f969ad756deeaa659ba2048fb8a2 Mon Sep 17 00:00:00 2001
From: Naoya Yamaguchi <708yamaguchi@gmail.com>
Date: Thu, 15 Jul 2021 18:05:41 +0900
Subject: [PATCH 2/5] Use fetchrobotics's move_base param by default
---
.../jsk_fetch_startup/launch/fetch_bringup.launch | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
index 362ac7d279..a38a29738a 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
@@ -2,6 +2,7 @@
+
@@ -214,10 +215,12 @@
-
-
+
+
+
+
From ee68d81e54c7473ba52ccb6eb5ff078f8047ce8e Mon Sep 17 00:00:00 2001
From: Naoya Yamaguchi <708yamaguchi@gmail.com>
Date: Thu, 15 Jul 2021 18:06:14 +0900
Subject: [PATCH 3/5] Do not clear costmap when returning from kitchen
---
.../jsk_fetch_startup/euslisp/navigation-utils.l | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l b/jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l
index 477d911beb..1698a0fc4a 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l
+++ b/jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l
@@ -137,11 +137,13 @@
(if is-charging :charging :discharging)))
-(defun go-to-spot (name &optional (relative-coords (make-coords)) &key (undock-rotate nil))
+(defun go-to-spot (name &optional (relative-coords (make-coords))
+ &key (undock-rotate nil) (clear-costmap t))
;; undock if fetch is docking
(unless (boundp '*ri*)
(require :fetch-interface "package://fetcheus/fetch-interface.l")
(fetch-init))
+ (if clear-costmap (send *ri* :clear-costmap))
(let ((undock-success nil))
(block go-to-spot-undock
(dotimes (i 3)
@@ -170,14 +172,14 @@
(frame-id (cdr ret)))
(when relative-coords
(setq goal-pose (send goal-pose :transform relative-coords :world)))
- (send *ri* :clear-costmap)
(send *ri* :move-to goal-pose :frame-id frame-id)))
-(defun auto-dock (&key (n-trial 1))
+(defun auto-dock (&key (n-trial 1) (clear-costmap t))
(let ((success nil))
(dotimes (i n-trial)
- (when (go-to-spot *dock-spot* (make-coords :pos #f(-800 0 0)))
+ (when (go-to-spot *dock-spot* (make-coords :pos #f(-800 0 0))
+ :clear-costmap clear-costmap)
(ros::ros-info "arrived at the dock.")
(setq success (dock))
(when success (return-from auto-dock success))))
@@ -349,7 +351,7 @@
(report-move-to-sink-front-failure))
;; go back from dock
(report-auto-dock)
- (setq success-auto-dock (auto-dock :n-trial n-dock-trial))
+ (setq success-auto-dock (auto-dock :n-trial n-dock-trial :clear-costmap nil))
;; turn off light
(if (and success-auto-dock (not initial-light-on))
(room-light-off :control-switchbot control-switchbot))
@@ -420,7 +422,7 @@
'(lambda (userdata)
(report-auto-dock)
(let* ((n-trial (cdr (assoc 'n-dock-trial userdata)))
- (success (auto-dock :n-trial n-trial)))
+ (success (auto-dock :n-trial n-trial :clear-costmap nil)))
(setf (cdr (assoc 'success-auto-dock userdata)) success)
success)))
(:room-light-off
From 78abf9b5ee02b765fae831c21a5f07076bb785ef Mon Sep 17 00:00:00 2001
From: Naoya Yamaguchi <708yamaguchi@gmail.com>
Date: Thu, 15 Jul 2021 19:08:04 +0900
Subject: [PATCH 4/5] Seperate fetch15 move_base param and fetch1075 move_base
param
---
.../launch/fetch_bringup.launch | 16 +++++++---------
.../fetch_amcl_common_params.yaml | 0
.../fetch_amcl_indigo_params.yaml | 0
.../fetch_amcl_melodic_params.yaml | 0
.../fetch1075/fetch_move_base_common_params.yaml | 0
.../fetch_move_base_indigo_params.yaml | 0
.../fetch_move_base_melodic_params.yaml | 0
.../fetch15/fetch_amcl_common_params.yaml | 7 +++++++
.../fetch15/fetch_amcl_indigo_params.yaml | 8 ++++++++
.../fetch15/fetch_amcl_melodic_params.yaml | 7 +++++++
.../fetch_move_base_common_params.yaml | 0
.../fetch15/fetch_move_base_indigo_params.yaml | 3 +++
.../fetch_move_base_melodic_params.yaml | 0
.../supervisor_scripts/jsk-fetch-startup.conf | 2 +-
14 files changed, 33 insertions(+), 10 deletions(-)
rename jsk_fetch_robot/jsk_fetch_startup/launch/navigation/{ => fetch1075}/fetch_amcl_common_params.yaml (100%)
rename jsk_fetch_robot/jsk_fetch_startup/launch/navigation/{ => fetch1075}/fetch_amcl_indigo_params.yaml (100%)
rename jsk_fetch_robot/jsk_fetch_startup/launch/navigation/{ => fetch1075}/fetch_amcl_melodic_params.yaml (100%)
create mode 100644 jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_move_base_common_params.yaml
rename jsk_fetch_robot/jsk_fetch_startup/launch/navigation/{ => fetch1075}/fetch_move_base_indigo_params.yaml (100%)
create mode 100644 jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_move_base_melodic_params.yaml
create mode 100644 jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_common_params.yaml
create mode 100644 jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_indigo_params.yaml
create mode 100644 jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_melodic_params.yaml
rename jsk_fetch_robot/jsk_fetch_startup/launch/navigation/{ => fetch15}/fetch_move_base_common_params.yaml (100%)
create mode 100644 jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_move_base_indigo_params.yaml
rename jsk_fetch_robot/jsk_fetch_startup/launch/navigation/{ => fetch15}/fetch_move_base_melodic_params.yaml (100%)
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
index a38a29738a..6abf8e6196 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
@@ -1,8 +1,8 @@
+
-
@@ -211,16 +211,14 @@
+ file="$(find jsk_fetch_startup)/launch/navigation/$(arg hostname)/fetch_amcl_common_params.yaml" />
+ file="$(find jsk_fetch_startup)/launch/navigation/$(arg hostname)/fetch_amcl_$(env ROS_DISTRO)_params.yaml" />
-
-
-
-
+
+
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_amcl_common_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_amcl_common_params.yaml
similarity index 100%
rename from jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_amcl_common_params.yaml
rename to jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_amcl_common_params.yaml
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_amcl_indigo_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_amcl_indigo_params.yaml
similarity index 100%
rename from jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_amcl_indigo_params.yaml
rename to jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_amcl_indigo_params.yaml
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_amcl_melodic_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_amcl_melodic_params.yaml
similarity index 100%
rename from jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_amcl_melodic_params.yaml
rename to jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_amcl_melodic_params.yaml
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_move_base_common_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_move_base_common_params.yaml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_indigo_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_move_base_indigo_params.yaml
similarity index 100%
rename from jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_indigo_params.yaml
rename to jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_move_base_indigo_params.yaml
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_move_base_melodic_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch1075/fetch_move_base_melodic_params.yaml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_common_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_common_params.yaml
new file mode 100644
index 0000000000..0d91503d3e
--- /dev/null
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_common_params.yaml
@@ -0,0 +1,7 @@
+amcl:
+ update_min_a: 0.05 # update filter every 0.05 [rad] rotation
+ update_min_d: 0.1 # update filter every 0.1 [m] translation
+ odom_alpha1: 0.1 # rotation noise per rotation
+ odom_alpha2: 0.05 # rotation noise per translation
+ odom_alpha3: 0.05 # translation noise per translation
+ odom_alpha4: 0.1 # translation noise per rotation
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_indigo_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_indigo_params.yaml
new file mode 100644
index 0000000000..415958d1d2
--- /dev/null
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_indigo_params.yaml
@@ -0,0 +1,8 @@
+amcl:
+ kld_err: 0.1
+ kld_z: 0.5
+ laser_z_hit: 0.9
+ laser_z_rand: 0.5
+ laser_sigma_hit: 0.1
+ laser_likelihood_max_dist: 4.0
+ resample_interval: 1
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_melodic_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_melodic_params.yaml
new file mode 100644
index 0000000000..e9afd45afc
--- /dev/null
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_amcl_melodic_params.yaml
@@ -0,0 +1,7 @@
+amcl:
+ update_min_a: 0.05 # update filter every 0.05 [rad] rotation
+ update_min_d: 0.1 # update filter every 0.1 [m] translation
+ odom_alpha1: 0.01 # rotation noise per rotation
+ odom_alpha2: 0.01 # rotation noise per translation
+ odom_alpha3: 0.01 # translation noise per translation
+ odom_alpha4: 0.01 # translation noise per rotation
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_common_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_move_base_common_params.yaml
similarity index 100%
rename from jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_common_params.yaml
rename to jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_move_base_common_params.yaml
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_move_base_indigo_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_move_base_indigo_params.yaml
new file mode 100644
index 0000000000..3858131bf6
--- /dev/null
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_move_base_indigo_params.yaml
@@ -0,0 +1,3 @@
+move_base:
+ global_costmap:
+ update_frequency: 2.0
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_melodic_params.yaml b/jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_move_base_melodic_params.yaml
similarity index 100%
rename from jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch_move_base_melodic_params.yaml
rename to jsk_fetch_robot/jsk_fetch_startup/launch/navigation/fetch15/fetch_move_base_melodic_params.yaml
diff --git a/jsk_fetch_robot/jsk_fetch_startup/supervisor_scripts/jsk-fetch-startup.conf b/jsk_fetch_robot/jsk_fetch_startup/supervisor_scripts/jsk-fetch-startup.conf
index b0553995f0..8d5fe6f077 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/supervisor_scripts/jsk-fetch-startup.conf
+++ b/jsk_fetch_robot/jsk_fetch_startup/supervisor_scripts/jsk-fetch-startup.conf
@@ -1,5 +1,5 @@
[program:jsk-fetch-startup]
-command=/bin/bash -c ". /opt/ros/roscore_poststart.bash && . /home/fetch/ros/melodic/devel/setup.bash && rosrun jsk_fetch_startup setup_audio.bash && if [ -d /usr/vt ]; then VOICE_TEXT=true; else VOICE_TEXT=false; fi && roslaunch jsk_fetch_startup fetch_bringup.launch boot_sound:=true use_voice_text:=$VOICE_TEXT --wait"
+command=/bin/bash -c ". /opt/ros/roscore_poststart.bash && . /home/fetch/ros/melodic/devel/setup.bash && rosrun jsk_fetch_startup setup_audio.bash && if [ -d /usr/vt ]; then VOICE_TEXT=true; else VOICE_TEXT=false; fi && roslaunch jsk_fetch_startup fetch_bringup.launch hostname:=$(hostname) boot_sound:=true use_voice_text:=$VOICE_TEXT --wait"
stopsignal=TERM
directory=/home/fetch/ros/melodic
autostart=true
From 93ee6634313c4eefae5998b45bf73584244c6b11 Mon Sep 17 00:00:00 2001
From: Naoya Yamaguchi <708yamaguchi@gmail.com>
Date: Thu, 15 Jul 2021 19:41:45 +0900
Subject: [PATCH 5/5] Relay move_base plan names
---
.../apps/go_to_kitchen/go_to_kitchen.app | 9 +++------
.../jsk_fetch_startup/config/jsk_startup.rviz | 6 +++---
.../config/jsk_startup_record.rviz | 6 +++---
.../config/lightweight_navigation.rviz | 6 +++---
.../launch/fetch_bringup.launch | 19 +++++++++++++++++++
.../launch/rosbag_record.launch | 6 +++---
6 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/jsk_fetch_robot/jsk_fetch_startup/apps/go_to_kitchen/go_to_kitchen.app b/jsk_fetch_robot/jsk_fetch_startup/apps/go_to_kitchen/go_to_kitchen.app
index 7b4a532e61..42c0249b11 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/apps/go_to_kitchen/go_to_kitchen.app
+++ b/jsk_fetch_robot/jsk_fetch_startup/apps/go_to_kitchen/go_to_kitchen.app
@@ -71,12 +71,9 @@ plugins:
- /odom
- /odom_combined
- /cmd_vel
- - /move_base/NavFnROS/plan
- - /move_base/TrajectoryPlannerROS/global_plan
- - /move_base/TrajectoryPlannerROS/local_plan
- - /move_base/GlobalPlanner/plan
- - /move_base/TebLocalPlannerROS/global_plan
- - /move_base/TebLocalPlannerROS/local_plan
+ - /move_base/navigation_plan_viz
+ - /move_base/global_plan_viz
+ - /move_base/local_plan_viz
- /move_base/global_costmap/footprint
- /spots_marker_array
- /spots_pictogram
diff --git a/jsk_fetch_robot/jsk_fetch_startup/config/jsk_startup.rviz b/jsk_fetch_robot/jsk_fetch_startup/config/jsk_startup.rviz
index 31e9f88dd3..09718f32a3 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/config/jsk_startup.rviz
+++ b/jsk_fetch_robot/jsk_fetch_startup/config/jsk_startup.rviz
@@ -240,7 +240,7 @@ Visualization Manager:
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
- Topic: /move_base/NavfnROS/plan
+ Topic: /move_base/navigation_plan_viz
Unreliable: false
Value: true
- Alpha: 1
@@ -263,7 +263,7 @@ Visualization Manager:
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
- Topic: /move_base/TebLocalPlannerROS/global_plan
+ Topic: /move_base/global_plan_viz
Unreliable: false
Value: true
- Alpha: 1
@@ -286,7 +286,7 @@ Visualization Manager:
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
- Topic: /move_base/TebLocalPlannerROS/local_plan
+ Topic: /move_base/local_plan_viz
Unreliable: false
Value: true
- Alpha: 1
diff --git a/jsk_fetch_robot/jsk_fetch_startup/config/jsk_startup_record.rviz b/jsk_fetch_robot/jsk_fetch_startup/config/jsk_startup_record.rviz
index eeca426e6d..8b162425f0 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/config/jsk_startup_record.rviz
+++ b/jsk_fetch_robot/jsk_fetch_startup/config/jsk_startup_record.rviz
@@ -258,7 +258,7 @@ Visualization Manager:
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
- Topic: /move_base/NavfnROS/plan
+ Topic: /move_base/navigation_plan_viz
Unreliable: false
Value: true
- Alpha: 1
@@ -281,7 +281,7 @@ Visualization Manager:
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
- Topic: /move_base/TebLocalPlannerROS/global_plan
+ Topic: /move_base/global_plan_viz
Unreliable: false
Value: true
- Alpha: 1
@@ -304,7 +304,7 @@ Visualization Manager:
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
- Topic: /move_base/TebLocalPlannerROS/local_plan
+ Topic: /move_base/local_plan_viz
Unreliable: false
Value: true
- Alpha: 1
diff --git a/jsk_fetch_robot/jsk_fetch_startup/config/lightweight_navigation.rviz b/jsk_fetch_robot/jsk_fetch_startup/config/lightweight_navigation.rviz
index b20c38ab8f..c582d3e44b 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/config/lightweight_navigation.rviz
+++ b/jsk_fetch_robot/jsk_fetch_startup/config/lightweight_navigation.rviz
@@ -235,7 +235,7 @@ Visualization Manager:
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
- Topic: /move_base/NavfnROS/plan
+ Topic: /move_base/navigation_plan_viz
Unreliable: false
Value: true
- Alpha: 1
@@ -258,7 +258,7 @@ Visualization Manager:
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
- Topic: /move_base/TrajectoryPlannerROS/global_plan
+ Topic: /move_base/global_plan_viz
Unreliable: false
Value: true
- Alpha: 1
@@ -281,7 +281,7 @@ Visualization Manager:
Radius: 0.029999999329447746
Shaft Diameter: 0.10000000149011612
Shaft Length: 0.10000000149011612
- Topic: /move_base/TrajectoryPlannerROS/local_plan
+ Topic: /move_base/local_plan_viz
Unreliable: false
Value: true
- Alpha: 1
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
index 6abf8e6196..14adf7fc14 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
@@ -208,6 +208,25 @@
+
+
+
+
+
+
+