Merge branch 'master' of github.com:ros-planning/navigation2 into mult_control

nav2_bringup/spawn_robot/package.xml

@@ -8,8 +8,6 @@
   <maintainer email="lalit.kumar.begani@intel.com">lkumarbe</maintainer>
   <license>Apache-2.0</license>
 
-  <buildtool_depend>ament_cmake</buildtool_depend>
-
   <exec_depend>rclpy</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 

nav2_bringup/spawn_robot/setup.py

@@ -4,8 +4,7 @@ PACKAGE_NAME = 'spawn_robot'
 
 setup(
     name=PACKAGE_NAME,
-    version='1.0.0',
-    package_dir={'': 'src'},
+    version='0.2.4',
     packages=[PACKAGE_NAME],
     data_files=[
         ('share/ament_index/resource_index/packages',

nav2_bringup/spawn_robot/src/spawn_robot/spawn_robot.py → nav2_bringup/spawn_robot/spawn_robot/spawn_robot.py

@@ -38,7 +38,7 @@ def main():
                         help='the z component of the initial position [meters]')
 
     group = parser.add_mutually_exclusive_group(required=True)
-    group.add_argument('-t', '--turtlebot_type', type=str, default='waffle',
+    group.add_argument('-t', '--turtlebot_type', type=str,
                        choices=['waffle', 'burger'])
     group.add_argument('-s', '--sdf', type=str,
                        help="the path to the robot's model file (sdf)")