From ec4904be2af7dc5a6ed74dc46edac5ea4bfb6aab Mon Sep 17 00:00:00 2001
From: Carl Delsey <carl.r.delsey@intel.com>
Date: Fri, 25 Oct 2019 18:14:39 -0700
Subject: [PATCH] Get spawn_robot installed correctly - Fix for multi-robot
test (#1306)
* Get spawn_robot installed correctly
* Removing default argument value.
Specifying a default argument value gives it a value if no argument
is specified. That is not correct in this case. The -t argument
should be None if -s is specified.
---
nav2_bringup/spawn_robot/package.xml | 2 --
nav2_bringup/spawn_robot/setup.py | 3 +--
nav2_bringup/spawn_robot/{src => }/spawn_robot/__init__.py | 0
nav2_bringup/spawn_robot/{src => }/spawn_robot/spawn_robot.py | 2 +-
4 files changed, 2 insertions(+), 5 deletions(-)
rename nav2_bringup/spawn_robot/{src => }/spawn_robot/__init__.py (100%)
rename nav2_bringup/spawn_robot/{src => }/spawn_robot/spawn_robot.py (98%)
diff --git a/nav2_bringup/spawn_robot/package.xml b/nav2_bringup/spawn_robot/package.xml
index af76328d..377292d5 100644
--- a/nav2_bringup/spawn_robot/package.xml
+++ b/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>
diff --git a/nav2_bringup/spawn_robot/setup.py b/nav2_bringup/spawn_robot/setup.py
index 252c6aea..7744636a 100644
--- a/nav2_bringup/spawn_robot/setup.py
+++ b/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',
diff --git a/nav2_bringup/spawn_robot/src/spawn_robot/__init__.py b/nav2_bringup/spawn_robot/spawn_robot/__init__.py
similarity index 100%
rename from nav2_bringup/spawn_robot/src/spawn_robot/__init__.py
rename to nav2_bringup/spawn_robot/spawn_robot/__init__.py
diff --git a/nav2_bringup/spawn_robot/src/spawn_robot/spawn_robot.py b/nav2_bringup/spawn_robot/spawn_robot/spawn_robot.py
similarity index 98%
rename from nav2_bringup/spawn_robot/src/spawn_robot/spawn_robot.py
rename to nav2_bringup/spawn_robot/spawn_robot/spawn_robot.py
index c72ffc8e..194a272c 100644
--- a/nav2_bringup/spawn_robot/src/spawn_robot/spawn_robot.py
+++ b/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)")
--
GitLab