renamed rosbuild workspace for consistency

73f8d204 · Rodrigo Ventura · 7f22b8fa · 73f8d204 · 73f8d204 · 73f8d204
Commit 73f8d204 authored Apr 21, 2016 by Rodrigo Ventura
385 changed files
--- a/rosbuild/README.txt
+++ b/rosbuild/README.txt
--- a/rosbuild/omni_driver/10-socrob.rules
+++ b/rosbuild/omni_driver/10-socrob.rules
--- a/rosbuild/omni_driver/CMakeLists.txt
+++ b/rosbuild/omni_driver/CMakeLists.txt
--- a/rosbuild/omni_driver/Makefile
+++ b/rosbuild/omni_driver/Makefile
--- a/rosbuild/omni_driver/dump.py
+++ b/rosbuild/omni_driver/dump.py
--- a/rosbuild/omni_driver/manifest.xml
+++ b/rosbuild/omni_driver/manifest.xml
--- a/rosbuild/omni_driver/src/BinaryHelpers.hpp
+++ b/rosbuild/omni_driver/src/BinaryHelpers.hpp
--- a/rosbuild/omni_driver/src/FtdiDevice.cpp
+++ b/rosbuild/omni_driver/src/FtdiDevice.cpp
--- a/rosbuild/omni_driver/src/FtdiDevice.hpp
+++ b/rosbuild/omni_driver/src/FtdiDevice.hpp
--- a/rosbuild/omni_driver/src/TimeStamp.cpp
+++ b/rosbuild/omni_driver/src/TimeStamp.cpp
--- a/rosbuild/omni_driver/src/TimeStamp.hpp
+++ b/rosbuild/omni_driver/src/TimeStamp.hpp
--- a/rosbuild/omni_driver/src/motors.cpp
+++ b/rosbuild/omni_driver/src/motors.cpp
--- a/rosbuild/omni_odometry/CMakeLists.txt
+++ b/rosbuild/omni_odometry/CMakeLists.txt
--- a/rosbuild/omni_odometry/Makefile
+++ b/rosbuild/omni_odometry/Makefile
--- a/rosbuild/omni_odometry/calibrate.py
+++ b/rosbuild/omni_odometry/calibrate.py
--- a/rosbuild/omni_odometry/exciter.py
+++ b/rosbuild/omni_odometry/exciter.py
--- a/rosbuild/omni_odometry/hand_calib.py
+++ b/rosbuild/omni_odometry/hand_calib.py
--- a/rosbuild/omni_odometry/manifest.xml
+++ b/rosbuild/omni_odometry/manifest.xml
--- a/rosbuild/omni_odometry/src/joydrive.cpp
+++ b/rosbuild/omni_odometry/src/joydrive.cpp
--- a/rosbuild/omni_odometry/src/motion_node.cpp
+++ b/rosbuild/omni_odometry/src/motion_node.cpp
--- a/rosbuild/omni_odometry/src/odometry_node.cpp
+++ b/rosbuild/omni_odometry/src/odometry_node.cpp
--- a/rosbuild/omni_wheel_tf/CMakeLists.txt
+++ b/rosbuild/omni_wheel_tf/CMakeLists.txt
--- a/rosbuild/omni_wheel_tf/Makefile
+++ b/rosbuild/omni_wheel_tf/Makefile
--- a/rosbuild/omni_wheel_tf/launch/tf.launch
+++ b/rosbuild/omni_wheel_tf/launch/tf.launch
--- a/rosbuild/omni_wheel_tf/manifest.xml
+++ b/rosbuild/omni_wheel_tf/manifest.xml
--- a/rosbuild/omni_wheel_tf/src/publish_jointstate.cpp
+++ b/rosbuild/omni_wheel_tf/src/publish_jointstate.cpp
--- a/rosbuild/scout_config/cobot_rviz.rviz
+++ b/rosbuild/scout_config/cobot_rviz.rviz
--- a/rosbuild/scout_config/gen_stage_world.py
+++ b/rosbuild/scout_config/gen_stage_world.py
--- a/rosbuild/scout_config/manifest.xml
+++ b/rosbuild/scout_config/manifest.xml
--- a/rosbuild/scout_config/mbot.yaml
+++ b/rosbuild/scout_config/mbot.yaml
--- a/rosbuild/scout_config/mbot_ISR_6thfloor.rviz
+++ b/rosbuild/scout_config/mbot_ISR_6thfloor.rviz
--- a/rosbuild/scout_config/mbot_common_costmap_params.yaml
+++ b/rosbuild/scout_config/mbot_common_costmap_params.yaml
--- a/rosbuild/scout_config/mbot_move_base_params.yaml
+++ b/rosbuild/scout_config/mbot_move_base_params.yaml
--- a/rosbuild/scout_config/mbot_shape-1px_1mm-c336_236.pgm
+++ b/rosbuild/scout_config/mbot_shape-1px_1mm-c336_236.pgm
--- a/rosbuild/scout_config/mbot_shape-1px_1mm-c336_236.yaml
+++ b/rosbuild/scout_config/mbot_shape-1px_1mm-c336_236.yaml
--- a/rosbuild/scout_config/mbot_shape-1px_5mm-c67_47.pgm
+++ b/rosbuild/scout_config/mbot_shape-1px_5mm-c67_47.pgm
--- a/rosbuild/scout_config/mbot_shape-1px_5mm-c67_47.yaml
+++ b/rosbuild/scout_config/mbot_shape-1px_5mm-c67_47.yaml
--- a/rosbuild/scout_config/mbot_shell_shape-1px_5mm-c72_64.pgm
+++ b/rosbuild/scout_config/mbot_shell_shape-1px_5mm-c72_64.pgm
--- a/rosbuild/scout_config/mbot_shell_shape-1px_5mm-c72_64.yaml
+++ b/rosbuild/scout_config/mbot_shell_shape-1px_5mm-c72_64.yaml
--- a/rosbuild/scout_config/mbot_stage-EPFL-v02cr_nav.world
+++ b/rosbuild/scout_config/mbot_stage-EPFL-v02cr_nav.world
--- a/rosbuild/scout_config/mbot_stage-EPFLcompleteMapRetouched.world
+++ b/rosbuild/scout_config/mbot_stage-EPFLcompleteMapRetouched.world
--- a/rosbuild/scout_config/mbot_stage-isr6-v03cr.world
+++ b/rosbuild/scout_config/mbot_stage-isr6-v03cr.world
--- a/rosbuild/scout_config/mbot_stage-isr6-v03cr_obstacles.world
+++ b/rosbuild/scout_config/mbot_stage-isr6-v03cr_obstacles.world
--- a/rosbuild/scout_config/mbot_stage.world.inc
+++ b/rosbuild/scout_config/mbot_stage.world.inc
--- a/rosbuild/scout_config/omni.yaml
+++ b/rosbuild/scout_config/omni.yaml
--- a/rosbuild/scout_config/omni_nav.rviz
+++ b/rosbuild/scout_config/omni_nav.rviz
--- a/rosbuild/scout_config/scout.yaml
+++ b/rosbuild/scout_config/scout.yaml
--- a/rosbuild/scout_config/scout_move_base_params.yaml
+++ b/rosbuild/scout_config/scout_move_base_params.yaml
--- a/rosbuild/scout_config/simulation_omni.yaml
+++ b/rosbuild/scout_config/simulation_omni.yaml
--- a/rosbuild/scout_diagnostics/config.py
+++ b/rosbuild/scout_diagnostics/config.py
--- a/rosbuild/scout_diagnostics/diag
+++ b/rosbuild/scout_diagnostics/diag
--- a/rosbuild/scout_diagnostics/diagapp.py
+++ b/rosbuild/scout_diagnostics/diagapp.py
--- a/rosbuild/scout_diagnostics/manifest.xml
+++ b/rosbuild/scout_diagnostics/manifest.xml
--- a/rosbuild/scout_diagnostics/mbot_logger.py
+++ b/rosbuild/scout_diagnostics/mbot_logger.py
--- a/rosbuild/scout_diagnostics/mbot_parse.py
+++ b/rosbuild/scout_diagnostics/mbot_parse.py
--- a/rosbuild/scout_diagnostics/traf.py
+++ b/rosbuild/scout_diagnostics/traf.py
--- a/rosbuild/scout_driver/CMakeLists.txt
+++ b/rosbuild/scout_driver/CMakeLists.txt
--- a/rosbuild/scout_driver/Makefile
+++ b/rosbuild/scout_driver/Makefile
--- a/rosbuild/scout_driver/manifest.xml
+++ b/rosbuild/scout_driver/manifest.xml
--- a/rosbuild/scout_driver/src/joydrive.cpp
+++ b/rosbuild/scout_driver/src/joydrive.cpp
--- a/rosbuild/scout_driver/src/keydrive.cpp
+++ b/rosbuild/scout_driver/src/keydrive.cpp
--- a/rosbuild/scout_driver/src/motors.cpp
+++ b/rosbuild/scout_driver/src/motors.cpp
--- a/rosbuild/scout_driver/src/scout_move_base_interface.cpp
+++ b/rosbuild/scout_driver/src/scout_move_base_interface.cpp
--- a/rosbuild/scout_driver/src/scout_move_base_interface_simulation.cpp
+++ b/rosbuild/scout_driver/src/scout_move_base_interface_simulation.cpp
--- a/rosbuild/scout_driver/src/sensors.cpp
+++ b/rosbuild/scout_driver/src/sensors.cpp
--- a/rosbuild/scout_gui/CMakeLists.txt
+++ b/rosbuild/scout_gui/CMakeLists.txt
--- a/rosbuild/scout_gui/Makefile
+++ b/rosbuild/scout_gui/Makefile
--- a/rosbuild/scout_gui/dummy_navigator.py
+++ b/rosbuild/scout_gui/dummy_navigator.py
--- a/rosbuild/scout_gui/main.py
+++ b/rosbuild/scout_gui/main.py
--- a/rosbuild/scout_gui/manifest.xml
+++ b/rosbuild/scout_gui/manifest.xml
--- a/rosbuild/scout_gui/media/IST_A_RGB_Pos_cropped.jpg
+++ b/rosbuild/scout_gui/media/IST_A_RGB_Pos_cropped.jpg
--- a/rosbuild/scout_gui/media/LARSyS_raster.png
+++ b/rosbuild/scout_gui/media/LARSyS_raster.png
--- a/rosbuild/scout_gui/media/isr_logo_edited_transparency.png
+++ b/rosbuild/scout_gui/media/isr_logo_edited_transparency.png
--- a/rosbuild/scout_gui/media/isr_logo_edited_transparency_cropped.png
+++ b/rosbuild/scout_gui/media/isr_logo_edited_transparency_cropped.png
--- a/rosbuild/scout_gui/media/qrcode.png
+++ b/rosbuild/scout_gui/media/qrcode.png
--- a/rosbuild/scout_gui/xskype.py
+++ b/rosbuild/scout_gui/xskype.py
--- a/rosbuild/scout_ipcam/CMakeLists.txt
+++ b/rosbuild/scout_ipcam/CMakeLists.txt
--- a/rosbuild/scout_ipcam/Makefile
+++ b/rosbuild/scout_ipcam/Makefile
--- a/rosbuild/scout_ipcam/README.txt
+++ b/rosbuild/scout_ipcam/README.txt
--- a/rosbuild/scout_ipcam/ipol_monarch.launch
+++ b/rosbuild/scout_ipcam/ipol_monarch.launch
--- a/rosbuild/scout_ipcam/main_monarch_iw.launch
+++ b/rosbuild/scout_ipcam/main_monarch_iw.launch
--- a/rosbuild/scout_ipcam/manifest.xml
+++ b/rosbuild/scout_ipcam/manifest.xml
--- a/rosbuild/scout_ipcam/streamer
+++ b/rosbuild/scout_ipcam/streamer
--- a/rosbuild/scout_ipcam/streamer.py
+++ b/rosbuild/scout_ipcam/streamer.py
--- a/rosbuild/scout_ipcam/streamer_v2.launch
+++ b/rosbuild/scout_ipcam/streamer_v2.launch
--- a/rosbuild/scout_launch/manifest.xml
+++ b/rosbuild/scout_launch/manifest.xml
--- a/rosbuild/scout_launch/mbot/2hokuyo.launch
+++ b/rosbuild/scout_launch/mbot/2hokuyo.launch
--- a/rosbuild/scout_launch/mbot/amcl.launch
+++ b/rosbuild/scout_launch/mbot/amcl.launch
--- a/rosbuild/scout_launch/mbot/amcl_simulation.launch
+++ b/rosbuild/scout_launch/mbot/amcl_simulation.launch
--- a/rosbuild/scout_launch/mbot/camera.launch
+++ b/rosbuild/scout_launch/mbot/camera.launch
--- a/rosbuild/scout_launch/mbot/gmapping.launch
+++ b/rosbuild/scout_launch/mbot/gmapping.launch
--- a/rosbuild/scout_launch/mbot/hokuyo.launch
+++ b/rosbuild/scout_launch/mbot/hokuyo.launch
--- a/rosbuild/scout_launch/mbot/joystick.launch
+++ b/rosbuild/scout_launch/mbot/joystick.launch
--- a/rosbuild/scout_launch/mbot/main.launch
+++ b/rosbuild/scout_launch/mbot/main.launch
--- a/rosbuild/scout_launch/mbot/move_base.launch
+++ b/rosbuild/scout_launch/mbot/move_base.launch
--- a/rosbuild/scout_launch/mbot/stage_simulation.launch
+++ b/rosbuild/scout_launch/mbot/stage_simulation.launch
--- a/rosbuild/scout_launch/omni/amcl.launch
+++ b/rosbuild/scout_launch/omni/amcl.launch
--- a/rosbuild/scout_launch/omni/fisheye_track.launch
+++ b/rosbuild/scout_launch/omni/fisheye_track.launch
--- a/rosbuild/scout_launch/omni/fsms_robotica2014.launch
+++ b/rosbuild/scout_launch/omni/fsms_robotica2014.launch
--- a/rosbuild/scout_launch/omni/gmapping.launch
+++ b/rosbuild/scout_launch/omni/gmapping.launch
--- a/rosbuild/scout_launch/omni/hector_slam.launch
+++ b/rosbuild/scout_launch/omni/hector_slam.launch
--- a/rosbuild/scout_launch/omni/main.launch
+++ b/rosbuild/scout_launch/omni/main.launch
--- a/rosbuild/scout_launch/omni/mini-robotica2014.launch
+++ b/rosbuild/scout_launch/omni/mini-robotica2014.launch
--- a/rosbuild/scout_launch/omni/motion.launch
+++ b/rosbuild/scout_launch/omni/motion.launch
--- a/rosbuild/scout_launch/omni/navigation.launch
+++ b/rosbuild/scout_launch/omni/navigation.launch
--- a/rosbuild/scout_launch/omni/robotica2014.launch
+++ b/rosbuild/scout_launch/omni/robotica2014.launch
--- a/rosbuild/scout_launch/omni/scan_matching.launch
+++ b/rosbuild/scout_launch/omni/scan_matching.launch
--- a/rosbuild/scout_launch/omni/temperature.launch
+++ b/rosbuild/scout_launch/omni/temperature.launch
--- a/rosbuild/scout_launch/scout/advanced.launch
+++ b/rosbuild/scout_launch/scout/advanced.launch
--- a/rosbuild/scout_launch/scout/amcl-from-bag.launch
+++ b/rosbuild/scout_launch/scout/amcl-from-bag.launch
--- a/rosbuild/scout_launch/scout/amcl.launch
+++ b/rosbuild/scout_launch/scout/amcl.launch
--- a/rosbuild/scout_launch/scout/ar_pose_cobot.launch
+++ b/rosbuild/scout_launch/scout/ar_pose_cobot.launch
--- a/rosbuild/scout_launch/scout/bell_recog.launch
+++ b/rosbuild/scout_launch/scout/bell_recog.launch
--- a/rosbuild/scout_launch/scout/camera.launch
+++ b/rosbuild/scout_launch/scout/camera.launch
--- a/rosbuild/scout_launch/scout/dialog.launch
+++ b/rosbuild/scout_launch/scout/dialog.launch
--- a/rosbuild/scout_launch/scout/gmapping-from-bag.launch
+++ b/rosbuild/scout_launch/scout/gmapping-from-bag.launch
--- a/rosbuild/scout_launch/scout/gmapping.launch
+++ b/rosbuild/scout_launch/scout/gmapping.launch
--- a/rosbuild/scout_launch/scout/hector_slam.launch
+++ b/rosbuild/scout_launch/scout/hector_slam.launch
--- a/rosbuild/scout_launch/scout/hokuyo.launch
+++ b/rosbuild/scout_launch/scout/hokuyo.launch
--- a/rosbuild/scout_launch/scout/katana_cobot.launch
+++ b/rosbuild/scout_launch/scout/katana_cobot.launch
--- a/rosbuild/scout_launch/scout/katana_control_keyboard.launch
+++ b/rosbuild/scout_launch/scout/katana_control_keyboard.launch
--- a/rosbuild/scout_launch/scout/kinect.launch
+++ b/rosbuild/scout_launch/scout/kinect.launch
--- a/rosbuild/scout_launch/scout/main.launch
+++ b/rosbuild/scout_launch/scout/main.launch
--- a/rosbuild/scout_launch/scout/model.launch
+++ b/rosbuild/scout_launch/scout/model.launch
--- a/rosbuild/scout_launch/scout/move_base.launch
+++ b/rosbuild/scout_launch/scout/move_base.launch
--- a/rosbuild/scout_launch/scout/ric14-main.launch
+++ b/rosbuild/scout_launch/scout/ric14-main.launch
--- a/rosbuild/scout_launch/scout/scout-remote.launch
+++ b/rosbuild/scout_launch/scout/scout-remote.launch
--- a/rosbuild/scout_launch/scout/scout.launch
+++ b/rosbuild/scout_launch/scout/scout.launch
--- a/rosbuild/scout_launch/scout/sick.launch
+++ b/rosbuild/scout_launch/scout/sick.launch
--- a/rosbuild/scout_launch/scout/stage.launch
+++ b/rosbuild/scout_launch/scout/stage.launch
--- a/rosbuild/scout_map_editor/editor
+++ b/rosbuild/scout_map_editor/editor
--- a/rosbuild/scout_map_editor/mapapp.py
+++ b/rosbuild/scout_map_editor/mapapp.py
--- a/rosbuild/scout_maps/EPFL-sections.gif
+++ b/rosbuild/scout_maps/EPFL-sections.gif
--- a/rosbuild/scout_maps/EPFL-sections.pgm
+++ b/rosbuild/scout_maps/EPFL-sections.pgm
--- a/rosbuild/scout_maps/EPFL-sections.yaml
+++ b/rosbuild/scout_maps/EPFL-sections.yaml
--- a/rosbuild/scout_maps/EPFL-sections_nav.yaml
+++ b/rosbuild/scout_maps/EPFL-sections_nav.yaml
--- a/rosbuild/scout_maps/EPFL-v02cr.pgm
+++ b/rosbuild/scout_maps/EPFL-v02cr.pgm
--- a/rosbuild/scout_maps/EPFL-v02cr.xcf.bz2
+++ b/rosbuild/scout_maps/EPFL-v02cr.xcf.bz2
--- a/rosbuild/scout_maps/EPFL-v02cr.yaml
+++ b/rosbuild/scout_maps/EPFL-v02cr.yaml
--- a/rosbuild/scout_maps/EPFL-v02cr_nav.pgm
+++ b/rosbuild/scout_maps/EPFL-v02cr_nav.pgm
--- a/rosbuild/scout_maps/EPFL-v02cr_nav.yaml
+++ b/rosbuild/scout_maps/EPFL-v02cr_nav.yaml
--- a/rosbuild/scout_maps/EPFL-v03cr.pgm
+++ b/rosbuild/scout_maps/EPFL-v03cr.pgm
--- a/rosbuild/scout_maps/EPFL-v03cr.yaml
+++ b/rosbuild/scout_maps/EPFL-v03cr.yaml
--- a/rosbuild/scout_maps/EPFL-v03cr_nav.pgm
+++ b/rosbuild/scout_maps/EPFL-v03cr_nav.pgm
--- a/rosbuild/scout_maps/EPFL-v03cr_nav.yaml
+++ b/rosbuild/scout_maps/EPFL-v03cr_nav.yaml
--- a/rosbuild/scout_maps/EPFLcompleteMapRetouched.pgm
+++ b/rosbuild/scout_maps/EPFLcompleteMapRetouched.pgm
--- a/rosbuild/scout_maps/EPFLcompleteMapRetouched.yaml
+++ b/rosbuild/scout_maps/EPFLcompleteMapRetouched.yaml
--- a/rosbuild/scout_maps/EPFLcompleteMapRetouched_zones.gif
+++ b/rosbuild/scout_maps/EPFLcompleteMapRetouched_zones.gif
--- a/rosbuild/scout_maps/EPFLcompleteMapRetouched_zones.xcf
+++ b/rosbuild/scout_maps/EPFLcompleteMapRetouched_zones.xcf
--- a/rosbuild/scout_maps/EPFLcompleteMapRetouched_zones.yaml
+++ b/rosbuild/scout_maps/EPFLcompleteMapRetouched_zones.yaml
--- a/rosbuild/scout_maps/at_home_testbed.pgm
+++ b/rosbuild/scout_maps/at_home_testbed.pgm
--- a/rosbuild/scout_maps/at_home_testbed.yaml
+++ b/rosbuild/scout_maps/at_home_testbed.yaml
--- a/rosbuild/scout_maps/corredor.pgm
+++ b/rosbuild/scout_maps/corredor.pgm
--- a/rosbuild/scout_maps/corredor.yaml
+++ b/rosbuild/scout_maps/corredor.yaml
--- a/rosbuild/scout_maps/ipol-2r-nav.pgm
+++ b/rosbuild/scout_maps/ipol-2r-nav.pgm
--- a/rosbuild/scout_maps/ipol-2r-nav.yaml
+++ b/rosbuild/scout_maps/ipol-2r-nav.yaml
--- a/rosbuild/scout_maps/ipol-2r.pgm
+++ b/rosbuild/scout_maps/ipol-2r.pgm
--- a/rosbuild/scout_maps/ipol-2r.rooms
+++ b/rosbuild/scout_maps/ipol-2r.rooms
--- a/rosbuild/scout_maps/ipol-2r.yaml
+++ b/rosbuild/scout_maps/ipol-2r.yaml
--- a/rosbuild/scout_maps/ipolMapNoObstacles.pgm
+++ b/rosbuild/scout_maps/ipolMapNoObstacles.pgm
--- a/rosbuild/scout_maps/ipolMapNoObstacles.yaml
+++ b/rosbuild/scout_maps/ipolMapNoObstacles.yaml
--- a/rosbuild/scout_maps/isr6-v03.pgm
+++ b/rosbuild/scout_maps/isr6-v03.pgm
--- a/rosbuild/scout_maps/isr6-v03.yaml
+++ b/rosbuild/scout_maps/isr6-v03.yaml
--- a/rosbuild/scout_maps/isr6-v03c.pgm
+++ b/rosbuild/scout_maps/isr6-v03c.pgm
--- a/rosbuild/scout_maps/isr6-v03c.rooms
+++ b/rosbuild/scout_maps/isr6-v03c.rooms
--- a/rosbuild/scout_maps/isr6-v03c.yaml
+++ b/rosbuild/scout_maps/isr6-v03c.yaml
--- a/rosbuild/scout_maps/isr6-v03cr.pgm
+++ b/rosbuild/scout_maps/isr6-v03cr.pgm
--- a/rosbuild/scout_maps/isr6-v03cr.rooms
+++ b/rosbuild/scout_maps/isr6-v03cr.rooms
--- a/rosbuild/scout_maps/isr6-v03cr.yaml
+++ b/rosbuild/scout_maps/isr6-v03cr.yaml
--- a/rosbuild/scout_maps/isr6-v03cr_obstacles.pgm
+++ b/rosbuild/scout_maps/isr6-v03cr_obstacles.pgm
--- a/rosbuild/scout_maps/isr6-v03cr_zones.gif
+++ b/rosbuild/scout_maps/isr6-v03cr_zones.gif
--- a/rosbuild/scout_maps/isr6-v03cr_zones.yaml
+++ b/rosbuild/scout_maps/isr6-v03cr_zones.yaml
--- a/rosbuild/scout_maps/isr6-v04.pgm
+++ b/rosbuild/scout_maps/isr6-v04.pgm
--- a/rosbuild/scout_maps/isr6-v04.yaml
+++ b/rosbuild/scout_maps/isr6-v04.yaml
--- a/rosbuild/scout_maps/isr6-v04c.pgm
+++ b/rosbuild/scout_maps/isr6-v04c.pgm
--- a/rosbuild/scout_maps/isr6-v04c.yaml
+++ b/rosbuild/scout_maps/isr6-v04c.yaml
--- a/rosbuild/scout_maps/isr7-v01.pgm
+++ b/rosbuild/scout_maps/isr7-v01.pgm
--- a/rosbuild/scout_maps/isr7-v01.yaml
+++ b/rosbuild/scout_maps/isr7-v01.yaml
--- a/rosbuild/scout_maps/isr7-v01c.pgm
+++ b/rosbuild/scout_maps/isr7-v01c.pgm
--- a/rosbuild/scout_maps/isr7-v01c.yaml
+++ b/rosbuild/scout_maps/isr7-v01c.yaml
--- a/rosbuild/scout_maps/isr8-v01.pgm
+++ b/rosbuild/scout_maps/isr8-v01.pgm
--- a/rosbuild/scout_maps/isr8-v01.yaml
+++ b/rosbuild/scout_maps/isr8-v01.yaml
--- a/rosbuild/scout_maps/isr8-v01c.pgm
+++ b/rosbuild/scout_maps/isr8-v01c.pgm
--- a/rosbuild/scout_maps/isr8-v01c.yaml
+++ b/rosbuild/scout_maps/isr8-v01c.yaml
--- a/rosbuild/scout_maps/isr8-v02.pgm
+++ b/rosbuild/scout_maps/isr8-v02.pgm
--- a/rosbuild/scout_maps/isr8-v02.rooms
+++ b/rosbuild/scout_maps/isr8-v02.rooms
--- a/rosbuild/scout_maps/isr8-v02.yaml
+++ b/rosbuild/scout_maps/isr8-v02.yaml
--- a/rosbuild/scout_maps/isr8-v02cr.pgm
+++ b/rosbuild/scout_maps/isr8-v02cr.pgm
--- a/rosbuild/scout_maps/isr8-v02cr.rooms
+++ b/rosbuild/scout_maps/isr8-v02cr.rooms
--- a/rosbuild/scout_maps/isr8-v02cr.yaml
+++ b/rosbuild/scout_maps/isr8-v02cr.yaml
--- a/rosbuild/scout_maps/isr8-v03.pgm
+++ b/rosbuild/scout_maps/isr8-v03.pgm
--- a/rosbuild/scout_maps/isr8-v03.yaml
+++ b/rosbuild/scout_maps/isr8-v03.yaml
--- a/rosbuild/scout_maps/isr8-v03cr_full.pgm
+++ b/rosbuild/scout_maps/isr8-v03cr_full.pgm
--- a/rosbuild/scout_maps/isr8-v03cr_full.yaml
+++ b/rosbuild/scout_maps/isr8-v03cr_full.yaml
--- a/rosbuild/scout_maps/isr8-v03cr_poles.pgm
+++ b/rosbuild/scout_maps/isr8-v03cr_poles.pgm
--- a/rosbuild/scout_maps/isr8-v03cr_poles.yaml
+++ b/rosbuild/scout_maps/isr8-v03cr_poles.yaml
--- a/rosbuild/scout_maps/isr8-v04.pgm
+++ b/rosbuild/scout_maps/isr8-v04.pgm
--- a/rosbuild/scout_maps/isr8-v04.yaml
+++ b/rosbuild/scout_maps/isr8-v04.yaml
--- a/rosbuild/scout_maps/isr8-v04cr-nav.pgm
+++ b/rosbuild/scout_maps/isr8-v04cr-nav.pgm
--- a/rosbuild/scout_maps/isr8-v04cr-nav.yaml
+++ b/rosbuild/scout_maps/isr8-v04cr-nav.yaml
--- a/rosbuild/scout_maps/isr8-v04cr.pgm
+++ b/rosbuild/scout_maps/isr8-v04cr.pgm
--- a/rosbuild/scout_maps/isr8-v04cr.yaml
+++ b/rosbuild/scout_maps/isr8-v04cr.yaml
--- a/rosbuild/scout_maps/isr8-v05cr-nav.pgm
+++ b/rosbuild/scout_maps/isr8-v05cr-nav.pgm
--- a/rosbuild/scout_maps/isr8-v05cr-nav.yaml
+++ b/rosbuild/scout_maps/isr8-v05cr-nav.yaml
--- a/rosbuild/scout_maps/isr8-v05cr.pgm
+++ b/rosbuild/scout_maps/isr8-v05cr.pgm
--- a/rosbuild/scout_maps/isr8-v05cr.yaml
+++ b/rosbuild/scout_maps/isr8-v05cr.yaml
--- a/rosbuild/scout_maps/isr8-v06cr_gamearea.pgm
+++ b/rosbuild/scout_maps/isr8-v06cr_gamearea.pgm
--- a/rosbuild/scout_maps/isr8-v06cr_gamearea.yaml
+++ b/rosbuild/scout_maps/isr8-v06cr_gamearea.yaml
--- a/rosbuild/scout_maps/isr8-v06cr_nav_gamearea.pgm
+++ b/rosbuild/scout_maps/isr8-v06cr_nav_gamearea.pgm
--- a/rosbuild/scout_maps/isr8-v06cr_nav_gamearea.yaml
+++ b/rosbuild/scout_maps/isr8-v06cr_nav_gamearea.yaml
--- a/rosbuild/scout_maps/isr8-v07cr_nav_new_gamearea.pgm
+++ b/rosbuild/scout_maps/isr8-v07cr_nav_new_gamearea.pgm
--- a/rosbuild/scout_maps/isr8-v07cr_nav_new_gamearea.yaml
+++ b/rosbuild/scout_maps/isr8-v07cr_nav_new_gamearea.yaml
--- a/rosbuild/scout_maps/isr8-v07cr_new_gamearea.pgm
+++ b/rosbuild/scout_maps/isr8-v07cr_new_gamearea.pgm
--- a/rosbuild/scout_maps/isr8-v07cr_new_gamearea.yaml
+++ b/rosbuild/scout_maps/isr8-v07cr_new_gamearea.yaml
--- a/rosbuild/scout_maps/manifest.xml
+++ b/rosbuild/scout_maps/manifest.xml
--- a/rosbuild/scout_maps/map2.pgm
+++ b/rosbuild/scout_maps/map2.pgm
--- a/rosbuild/scout_maps/map2.yaml
+++ b/rosbuild/scout_maps/map2.yaml
--- a/rosbuild/scout_maps/map6PisoHector+Gmapping30mLaser.pgm
+++ b/rosbuild/scout_maps/map6PisoHector+Gmapping30mLaser.pgm
--- a/rosbuild/scout_maps/map6PisoHector+Gmapping30mLaser.yaml
+++ b/rosbuild/scout_maps/map6PisoHector+Gmapping30mLaser.yaml
--- a/rosbuild/scout_maps/map6PisoHector+Gmapping30mLaser_crop.pgm
+++ b/rosbuild/scout_maps/map6PisoHector+Gmapping30mLaser_crop.pgm
--- a/rosbuild/scout_maps/map6PisoHector+Gmapping30mLaser_crop.yaml
+++ b/rosbuild/scout_maps/map6PisoHector+Gmapping30mLaser_crop.yaml
--- a/rosbuild/scout_maps/pc1-v01.pgm
+++ b/rosbuild/scout_maps/pc1-v01.pgm
--- a/rosbuild/scout_maps/pc1-v01.yaml
+++ b/rosbuild/scout_maps/pc1-v01.yaml
--- a/rosbuild/scout_maps/pc1-v02.pgm
+++ b/rosbuild/scout_maps/pc1-v02.pgm
--- a/rosbuild/scout_maps/pc1-v02.rooms
+++ b/rosbuild/scout_maps/pc1-v02.rooms
--- a/rosbuild/scout_maps/pc1-v02.yaml
+++ b/rosbuild/scout_maps/pc1-v02.yaml
--- a/rosbuild/scout_maps/pc1-v03.pgm
+++ b/rosbuild/scout_maps/pc1-v03.pgm
--- a/rosbuild/scout_maps/pc1-v03.yaml
+++ b/rosbuild/scout_maps/pc1-v03.yaml
--- a/rosbuild/scout_maps/pc1-v03r.pgm
+++ b/rosbuild/scout_maps/pc1-v03r.pgm
--- a/rosbuild/scout_maps/pc1-v03r.rooms
+++ b/rosbuild/scout_maps/pc1-v03r.rooms
--- a/rosbuild/scout_maps/pc1-v03r.yaml
+++ b/rosbuild/scout_maps/pc1-v03r.yaml
--- a/rosbuild/scout_maps/pc1-v03rr.pgm
+++ b/rosbuild/scout_maps/pc1-v03rr.pgm
--- a/rosbuild/scout_maps/pc1-v03rr.rooms
+++ b/rosbuild/scout_maps/pc1-v03rr.rooms
--- a/rosbuild/scout_maps/pc1-v03rr.yaml
+++ b/rosbuild/scout_maps/pc1-v03rr.yaml
--- a/rosbuild/scout_maps/robotica2014-home-1.pgm
+++ b/rosbuild/scout_maps/robotica2014-home-1.pgm
--- a/rosbuild/scout_maps/robotica2014-home-1.rooms
+++ b/rosbuild/scout_maps/robotica2014-home-1.rooms
--- a/rosbuild/scout_maps/robotica2014-home-1.yaml
+++ b/rosbuild/scout_maps/robotica2014-home-1.yaml
--- a/rosbuild/scout_maps/robotica2014-home-1cr.pgm
+++ b/rosbuild/scout_maps/robotica2014-home-1cr.pgm
--- a/rosbuild/scout_maps/robotica2014-home-1cr.rooms
+++ b/rosbuild/scout_maps/robotica2014-home-1cr.rooms
--- a/rosbuild/scout_maps/robotica2014-home-1cr.yaml
+++ b/rosbuild/scout_maps/robotica2014-home-1cr.yaml
--- a/rosbuild/scout_maps/robotica2014-home-2.pgm
+++ b/rosbuild/scout_maps/robotica2014-home-2.pgm
--- a/rosbuild/scout_maps/robotica2014-home-2.rooms
+++ b/rosbuild/scout_maps/robotica2014-home-2.rooms
--- a/rosbuild/scout_maps/robotica2014-home-2.yaml
+++ b/rosbuild/scout_maps/robotica2014-home-2.yaml
--- a/rosbuild/scout_maps/robotica2014-home-2cr-nav.pgm
+++ b/rosbuild/scout_maps/robotica2014-home-2cr-nav.pgm
--- a/rosbuild/scout_maps/robotica2014-home-2cr-nav.rooms
+++ b/rosbuild/scout_maps/robotica2014-home-2cr-nav.rooms
--- a/rosbuild/scout_maps/robotica2014-home-2cr-nav.yaml
+++ b/rosbuild/scout_maps/robotica2014-home-2cr-nav.yaml
--- a/rosbuild/scout_maps/robotica2014-home-2cr.pgm
+++ b/rosbuild/scout_maps/robotica2014-home-2cr.pgm
--- a/rosbuild/scout_maps/robotica2014-home-2cr.rooms
+++ b/rosbuild/scout_maps/robotica2014-home-2cr.rooms
--- a/rosbuild/scout_maps/robotica2014-home-2cr.yaml
+++ b/rosbuild/scout_maps/robotica2014-home-2cr.yaml
--- a/rosbuild/scout_maps/rockincamp14-1.pgm
+++ b/rosbuild/scout_maps/rockincamp14-1.pgm
--- a/rosbuild/scout_maps/rockincamp14-1.rooms
+++ b/rosbuild/scout_maps/rockincamp14-1.rooms
--- a/rosbuild/scout_maps/rockincamp14-1.yaml
+++ b/rosbuild/scout_maps/rockincamp14-1.yaml
--- a/rosbuild/scout_maps/rockincamp14-1cr.pgm
+++ b/rosbuild/scout_maps/rockincamp14-1cr.pgm
--- a/rosbuild/scout_maps/rockincamp14-1cr.rooms
+++ b/rosbuild/scout_maps/rockincamp14-1cr.rooms
--- a/rosbuild/scout_maps/rockincamp14-1cr.yaml
+++ b/rosbuild/scout_maps/rockincamp14-1cr.yaml
--- a/rosbuild/scout_maps/rockincamp14-2.pgm
+++ b/rosbuild/scout_maps/rockincamp14-2.pgm
--- a/rosbuild/scout_maps/rockincamp14-2.rooms
+++ b/rosbuild/scout_maps/rockincamp14-2.rooms
--- a/rosbuild/scout_maps/rockincamp14-2.yaml
+++ b/rosbuild/scout_maps/rockincamp14-2.yaml
--- a/rosbuild/scout_maps/rockincamp14-2cr.pgm
+++ b/rosbuild/scout_maps/rockincamp14-2cr.pgm
--- a/rosbuild/scout_maps/rockincamp14-2cr.rooms
+++ b/rosbuild/scout_maps/rockincamp14-2cr.rooms
--- a/rosbuild/scout_maps/rockincamp14-2cr.yaml
+++ b/rosbuild/scout_maps/rockincamp14-2cr.yaml
--- a/rosbuild/scout_maps/sala.pgm
+++ b/rosbuild/scout_maps/sala.pgm
--- a/rosbuild/scout_maps/sala.yaml
+++ b/rosbuild/scout_maps/sala.yaml
--- a/rosbuild/scout_maps/sala_corredor.pgm
+++ b/rosbuild/scout_maps/sala_corredor.pgm
--- a/rosbuild/scout_maps/sala_corredor.yaml
+++ b/rosbuild/scout_maps/sala_corredor.yaml
--- a/rosbuild/scout_maps/sala_corredor_crop.pgm
+++ b/rosbuild/scout_maps/sala_corredor_crop.pgm
--- a/rosbuild/scout_maps/sala_corredor_crop.yaml
+++ b/rosbuild/scout_maps/sala_corredor_crop.yaml
--- a/rosbuild/scout_maps/uc3m_1.3.C12_2014-12.pgm
+++ b/rosbuild/scout_maps/uc3m_1.3.C12_2014-12.pgm
--- a/rosbuild/scout_maps/uc3m_1.3.C12_2014-12.yaml
+++ b/rosbuild/scout_maps/uc3m_1.3.C12_2014-12.yaml
--- a/rosbuild/scout_msgs/CMakeLists.txt
+++ b/rosbuild/scout_msgs/CMakeLists.txt
--- a/rosbuild/scout_msgs/Makefile
+++ b/rosbuild/scout_msgs/Makefile
--- a/rosbuild/scout_msgs/action/DialogueControl.action
+++ b/rosbuild/scout_msgs/action/DialogueControl.action
--- a/rosbuild/scout_msgs/action/GuiAct.action
+++ b/rosbuild/scout_msgs/action/GuiAct.action
--- a/rosbuild/scout_msgs/action/HeadingControl.action
+++ b/rosbuild/scout_msgs/action/HeadingControl.action
--- a/rosbuild/scout_msgs/action/NavigationByName.action
+++ b/rosbuild/scout_msgs/action/NavigationByName.action
--- a/rosbuild/scout_msgs/action/NavigationByTarget.action
+++ b/rosbuild/scout_msgs/action/NavigationByTarget.action
--- a/rosbuild/scout_msgs/action/NavigationByVelRef.action
+++ b/rosbuild/scout_msgs/action/NavigationByVelRef.action
--- a/rosbuild/scout_msgs/manifest.xml
+++ b/rosbuild/scout_msgs/manifest.xml
--- a/rosbuild/scout_msgs/msg/OmniEncodersMsg.msg
+++ b/rosbuild/scout_msgs/msg/OmniEncodersMsg.msg
--- a/rosbuild/scout_msgs/msg/OmniMotorsMsg.msg
+++ b/rosbuild/scout_msgs/msg/OmniMotorsMsg.msg
--- a/rosbuild/scout_msgs/msg/OmniTemperatures.msg
+++ b/rosbuild/scout_msgs/msg/OmniTemperatures.msg
--- a/rosbuild/scout_msgs/msg/ScoutBatteryMsg.msg
+++ b/rosbuild/scout_msgs/msg/ScoutBatteryMsg.msg
--- a/rosbuild/scout_msgs/msg/ScoutLocalizationMsg.msg
+++ b/rosbuild/scout_msgs/msg/ScoutLocalizationMsg.msg
--- a/rosbuild/scout_msgs/msg/ScoutMotionMsg.msg
+++ b/rosbuild/scout_msgs/msg/ScoutMotionMsg.msg
--- a/rosbuild/scout_msgs/msg/ScoutMotorsMsg.msg
+++ b/rosbuild/scout_msgs/msg/ScoutMotorsMsg.msg
--- a/rosbuild/scout_msgs/msg/ScoutSonarsMsg.msg
+++ b/rosbuild/scout_msgs/msg/ScoutSonarsMsg.msg
--- a/rosbuild/scout_msgs/msg/StargazerRawMsg.msg
+++ b/rosbuild/scout_msgs/msg/StargazerRawMsg.msg
--- a/rosbuild/scout_msgs/srv/ASRSrv.srv
+++ b/rosbuild/scout_msgs/srv/ASRSrv.srv
--- a/rosbuild/scout_msgs/srv/GuidanceSrv.srv
+++ b/rosbuild/scout_msgs/srv/GuidanceSrv.srv
--- a/rosbuild/scout_msgs/srv/LocalizationSrv.srv
+++ b/rosbuild/scout_msgs/srv/LocalizationSrv.srv
--- a/rosbuild/scout_msgs/srv/ScoutMotionSrv.srv
+++ b/rosbuild/scout_msgs/srv/ScoutMotionSrv.srv
--- a/rosbuild/scout_msgs/srv/SpeechSrv.srv
+++ b/rosbuild/scout_msgs/srv/SpeechSrv.srv
--- a/rosbuild/scout_msgs/srv/TeleOpSrv.srv
+++ b/rosbuild/scout_msgs/srv/TeleOpSrv.srv
--- a/rosbuild/scout_msgs/srv/ViewerSrv.srv
+++ b/rosbuild/scout_msgs/srv/ViewerSrv.srv
--- a/rosbuild/scout_navigation/CMakeLists.txt
+++ b/rosbuild/scout_navigation/CMakeLists.txt
--- a/rosbuild/scout_navigation/Makefile
+++ b/rosbuild/scout_navigation/Makefile
--- a/rosbuild/scout_navigation/alib_arbiter.py
+++ b/rosbuild/scout_navigation/alib_arbiter.py
--- a/rosbuild/scout_navigation/common.py
+++ b/rosbuild/scout_navigation/common.py
--- a/rosbuild/scout_navigation/dump.py
+++ b/rosbuild/scout_navigation/dump.py
--- a/rosbuild/scout_navigation/dwa3d_bag_analyser.py
+++ b/rosbuild/scout_navigation/dwa3d_bag_analyser.py
--- a/rosbuild/scout_navigation/dwa_bag_analyser.py
+++ b/rosbuild/scout_navigation/dwa_bag_analyser.py
--- a/rosbuild/scout_navigation/dwa_debug.py
+++ b/rosbuild/scout_navigation/dwa_debug.py
--- a/rosbuild/scout_navigation/dwa_viewer.py
+++ b/rosbuild/scout_navigation/dwa_viewer.py
--- a/rosbuild/scout_navigation/dwa_viewer_new.py
+++ b/rosbuild/scout_navigation/dwa_viewer_new.py
--- a/rosbuild/scout_navigation/execmon.py
+++ b/rosbuild/scout_navigation/execmon.py
--- a/rosbuild/scout_navigation/field_viewer.py
+++ b/rosbuild/scout_navigation/field_viewer.py
--- a/rosbuild/scout_navigation/get_dumps.sh
+++ b/rosbuild/scout_navigation/get_dumps.sh
--- a/rosbuild/scout_navigation/guidance_fmm.py
+++ b/rosbuild/scout_navigation/guidance_fmm.py
--- a/rosbuild/scout_navigation/guidance_move_base.py
+++ b/rosbuild/scout_navigation/guidance_move_base.py
--- a/rosbuild/scout_navigation/load_dumps.py
+++ b/rosbuild/scout_navigation/load_dumps.py
--- a/rosbuild/scout_navigation/loc_monitor.py
+++ b/rosbuild/scout_navigation/loc_monitor.py
--- a/rosbuild/scout_navigation/loc_supervisor.py
+++ b/rosbuild/scout_navigation/loc_supervisor.py
--- a/rosbuild/scout_navigation/locations.py
+++ b/rosbuild/scout_navigation/locations.py
--- a/rosbuild/scout_navigation/manifest.xml
+++ b/rosbuild/scout_navigation/manifest.xml
--- a/rosbuild/scout_navigation/mbot_stress.py
+++ b/rosbuild/scout_navigation/mbot_stress.py
--- a/rosbuild/scout_navigation/motion.py
+++ b/rosbuild/scout_navigation/motion.py
--- a/rosbuild/scout_navigation/mpcnav.py
+++ b/rosbuild/scout_navigation/mpcnav.py
--- a/rosbuild/scout_navigation/mpctest.py
+++ b/rosbuild/scout_navigation/mpctest.py
--- a/rosbuild/scout_navigation/navgoal.py
+++ b/rosbuild/scout_navigation/navgoal.py
--- a/rosbuild/scout_navigation/navigator
+++ b/rosbuild/scout_navigation/navigator
--- a/rosbuild/scout_navigation/navigator.py
+++ b/rosbuild/scout_navigation/navigator.py
--- a/rosbuild/scout_navigation/navtest.py
+++ b/rosbuild/scout_navigation/navtest.py
--- a/rosbuild/scout_navigation/parameters.py
+++ b/rosbuild/scout_navigation/parameters.py
--- a/rosbuild/scout_navigation/planner.py
+++ b/rosbuild/scout_navigation/planner.py
--- a/rosbuild/scout_navigation/proxy
+++ b/rosbuild/scout_navigation/proxy
--- a/rosbuild/scout_navigation/proxy.py
+++ b/rosbuild/scout_navigation/proxy.py
--- a/rosbuild/scout_navigation/sandbox.py
+++ b/rosbuild/scout_navigation/sandbox.py
--- a/rosbuild/scout_navigation/sandbox2.py
+++ b/rosbuild/scout_navigation/sandbox2.py
--- a/rosbuild/scout_navigation/save_scan.py
+++ b/rosbuild/scout_navigation/save_scan.py
--- a/rosbuild/scout_navigation/shape.py
+++ b/rosbuild/scout_navigation/shape.py
--- a/rosbuild/scout_navigation/sonar_virtual_lidar.py
+++ b/rosbuild/scout_navigation/sonar_virtual_lidar.py
--- a/rosbuild/scout_navigation/test_costmap.py
+++ b/rosbuild/scout_navigation/test_costmap.py
--- a/rosbuild/scout_navigation/tests.py
+++ b/rosbuild/scout_navigation/tests.py
--- a/rosbuild/scout_odometry/CMakeLists.txt
+++ b/rosbuild/scout_odometry/CMakeLists.txt
--- a/rosbuild/scout_odometry/Makefile
+++ b/rosbuild/scout_odometry/Makefile
--- a/rosbuild/scout_odometry/include/fix_angle.hpp
+++ b/rosbuild/scout_odometry/include/fix_angle.hpp
--- a/rosbuild/scout_odometry/launch/odometry.launch
+++ b/rosbuild/scout_odometry/launch/odometry.launch
--- a/rosbuild/scout_odometry/manifest.xml
+++ b/rosbuild/scout_odometry/manifest.xml
--- a/rosbuild/scout_odometry/src/odometry_node.cpp
+++ b/rosbuild/scout_odometry/src/odometry_node.cpp
--- a/rosbuild/scout_odometry/src/virtual_ticks.cpp
+++ b/rosbuild/scout_odometry/src/virtual_ticks.cpp
--- a/rosbuild/scout_scripts/check_scan.py
+++ b/rosbuild/scout_scripts/check_scan.py
--- a/rosbuild/scout_scripts/filter4slam.py
+++ b/rosbuild/scout_scripts/filter4slam.py
--- a/rosbuild/scout_scripts/fullhalt.sh
+++ b/rosbuild/scout_scripts/fullhalt.sh
--- a/rosbuild/scout_scripts/goto.sh
+++ b/rosbuild/scout_scripts/goto.sh
--- a/rosbuild/scout_scripts/katana_configuration/80-katana-arm.rules
+++ b/rosbuild/scout_scripts/katana_configuration/80-katana-arm.rules
--- a/rosbuild/scout_scripts/katana_configuration/update_ttyS0
+++ b/rosbuild/scout_scripts/katana_configuration/update_ttyS0
--- a/rosbuild/scout_scripts/katana_driver-v2.patch
+++ b/rosbuild/scout_scripts/katana_driver-v2.patch
--- a/rosbuild/scout_scripts/katana_driver.patch
+++ b/rosbuild/scout_scripts/katana_driver.patch
--- a/rosbuild/scout_scripts/katana_driver.url
+++ b/rosbuild/scout_scripts/katana_driver.url
--- a/rosbuild/scout_scripts/manifest.xml
+++ b/rosbuild/scout_scripts/manifest.xml
--- a/rosbuild/scout_scripts/mbot_disable_charging.sh
+++ b/rosbuild/scout_scripts/mbot_disable_charging.sh
--- a/rosbuild/scout_scripts/monarch_merge.sh
+++ b/rosbuild/scout_scripts/monarch_merge.sh
--- a/rosbuild/scout_scripts/play4gmapping.sh
+++ b/rosbuild/scout_scripts/play4gmapping.sh
--- a/rosbuild/scout_scripts/scout-env.sh
+++ b/rosbuild/scout_scripts/scout-env.sh
--- a/rosbuild/scout_scripts/set-ddns.sh
+++ b/rosbuild/scout_scripts/set-ddns.sh
--- a/rosbuild/scout_scripts/setloc.sh
+++ b/rosbuild/scout_scripts/setloc.sh
--- a/rosbuild/scout_scripts/setupTouchScreen.sh
+++ b/rosbuild/scout_scripts/setupTouchScreen.sh
--- a/rosbuild/scout_scripts/stage-release-hydro.HOWTO_PATCH
+++ b/rosbuild/scout_scripts/stage-release-hydro.HOWTO_PATCH
--- a/rosbuild/scout_scripts/stage-release-hydro.bash
+++ b/rosbuild/scout_scripts/stage-release-hydro.bash
--- a/rosbuild/scout_scripts/stage-release-hydro.patch
+++ b/rosbuild/scout_scripts/stage-release-hydro.patch
--- a/rosbuild/scout_scripts/video_streamer.sh
+++ b/rosbuild/scout_scripts/video_streamer.sh
--- a/rosbuild/scout_scripts/wifi.py
+++ b/rosbuild/scout_scripts/wifi.py
--- a/rosbuild/scout_speech/CMakeLists.txt
+++ b/rosbuild/scout_speech/CMakeLists.txt
--- a/rosbuild/scout_speech/Makefile
+++ b/rosbuild/scout_speech/Makefile
--- a/rosbuild/scout_speech/manifest.xml
+++ b/rosbuild/scout_speech/manifest.xml
--- a/rosbuild/scout_speech/say
+++ b/rosbuild/scout_speech/say
--- a/rosbuild/scout_speech/server
+++ b/rosbuild/scout_speech/server
--- a/rosbuild/scout_speech/speech.py
+++ b/rosbuild/scout_speech/speech.py
--- a/rosbuild/scout_webconsole/CMakeLists.txt
+++ b/rosbuild/scout_webconsole/CMakeLists.txt
--- a/rosbuild/scout_webconsole/Makefile
+++ b/rosbuild/scout_webconsole/Makefile
--- a/rosbuild/scout_webconsole/manifest.xml
+++ b/rosbuild/scout_webconsole/manifest.xml
--- a/rosbuild/scout_webconsole/server
+++ b/rosbuild/scout_webconsole/server
--- a/rosbuild/scout_webconsole/server.py
+++ b/rosbuild/scout_webconsole/server.py
--- a/rosbuild/scout_webconsole/static/console.js
+++ b/rosbuild/scout_webconsole/static/console.js
--- a/rosbuild/scout_webconsole/static/home_mbot.html
+++ b/rosbuild/scout_webconsole/static/home_mbot.html
--- a/rosbuild/scout_webconsole/static/home_scout.html
+++ b/rosbuild/scout_webconsole/static/home_scout.html
--- a/rosbuild/scout_webconsole/static/icon_down.png
+++ b/rosbuild/scout_webconsole/static/icon_down.png
--- a/rosbuild/scout_webconsole/static/icon_left.png
+++ b/rosbuild/scout_webconsole/static/icon_left.png
--- a/rosbuild/scout_webconsole/static/icon_right.png
+++ b/rosbuild/scout_webconsole/static/icon_right.png
--- a/rosbuild/scout_webconsole/static/icon_sleft.png
+++ b/rosbuild/scout_webconsole/static/icon_sleft.png
--- a/rosbuild/scout_webconsole/static/icon_sright.png
+++ b/rosbuild/scout_webconsole/static/icon_sright.png
--- a/rosbuild/scout_webconsole/static/icon_stop.png
+++ b/rosbuild/scout_webconsole/static/icon_stop.png
--- a/rosbuild/scout_webconsole/static/icon_up.png
+++ b/rosbuild/scout_webconsole/static/icon_up.png
--- a/rosbuild/scout_webconsole/static/jquery.js
+++ b/rosbuild/scout_webconsole/static/jquery.js
--- a/rosbuild/scout_webconsole/static/main.css
+++ b/rosbuild/scout_webconsole/static/main.css