diff --git a/CustomRobots/quadrotor/launch/quadrotor.launch.py b/CustomRobots/quadrotor/launch/quadrotor.launch.py index b9d2023c0..6c294ca3e 100644 --- a/CustomRobots/quadrotor/launch/quadrotor.launch.py +++ b/CustomRobots/quadrotor/launch/quadrotor.launch.py @@ -26,6 +26,7 @@ def launch_setup(context): gz_namespace = LaunchConfiguration("namespace") gz_entity = LaunchConfiguration("entity") gz_color = LaunchConfiguration("color") + gz_scale = LaunchConfiguration("scale") package_dir = get_package_share_directory("custom_robots") @@ -35,6 +36,7 @@ def launch_setup(context): namespace = gz_namespace.perform(context) entity = gz_entity.perform(context) color = gz_color.perform(context) + scale = gz_scale.perform(context) # ========================= # ROBOT DESCRIPTION (URDF) @@ -52,6 +54,7 @@ def launch_setup(context): "camera": "true" if sensor == "camera" else "false", "namespace": namespace, "color": color, + "scale": scale, }, ).toxml() @@ -175,6 +178,7 @@ def generate_launch_description(): DeclareLaunchArgument("namespace", default_value="drone"), DeclareLaunchArgument("entity", default_value="drone"), DeclareLaunchArgument("color", default_value=""), + DeclareLaunchArgument("scale", default_value="1.0"), ] return LaunchDescription( diff --git a/CustomRobots/quadrotor/models/quadrotor/quadrotor.urdf.xacro b/CustomRobots/quadrotor/models/quadrotor/quadrotor.urdf.xacro index dba755d8c..a6ecce517 100644 --- a/CustomRobots/quadrotor/models/quadrotor/quadrotor.urdf.xacro +++ b/CustomRobots/quadrotor/models/quadrotor/quadrotor.urdf.xacro @@ -7,11 +7,13 @@ + + - + diff --git a/CustomRobots/quadrotor/models/quadrotor/quadrotor_common.urdf.xacro b/CustomRobots/quadrotor/models/quadrotor/quadrotor_common.urdf.xacro index 47f2decf9..ad159b333 100644 --- a/CustomRobots/quadrotor/models/quadrotor/quadrotor_common.urdf.xacro +++ b/CustomRobots/quadrotor/models/quadrotor/quadrotor_common.urdf.xacro @@ -30,7 +30,7 @@ - + @@ -39,12 +39,12 @@ - + - + @@ -62,7 +62,8 @@ - + + @@ -74,12 +75,12 @@ - + - + @@ -87,31 +88,31 @@ - + - + - + - + - + - + - - - - + + + + diff --git a/database/worlds.sql b/database/worlds.sql index 4e2b2f833..f8ba1d636 100644 --- a/database/worlds.sql +++ b/database/worlds.sql @@ -334,8 +334,8 @@ COPY public.robots (id, name, launch_file_path, entity, extra_config, model_path 28 Dingo Low Noise /home/ws/src/CustomRobots/dingo/launch/dingo.launch.py do150 noise:=low namespace:=do150 dingo/model/dingo/dingo.urdf.xacro 29 Dingo Medium Noise /home/ws/src/CustomRobots/dingo/launch/dingo.launch.py do150 noise:=med namespace:=do150 dingo/model/dingo/dingo.urdf.xacro 30 Dingo High Noise /home/ws/src/CustomRobots/dingo/launch/dingo.launch.py do150 noise:=high namespace:=do150 dingo/model/dingo/dingo.urdf.xacro -31 Quadrotor Cat /home/ws/src/CustomRobots/quadrotor/launch/quadrotor.launch.py drone sensor:=camera namespace:=drone color:=Orange quadrotor/models/quadrotor/quadrotor.urdf.xacro -32 Quadrotor Mouse /home/ws/src/CustomRobots/quadrotor/launch/quadrotor.launch.py drone_mouse sensor:=camera namespace:=drone_mouse color:=Magenta quadrotor/models/quadrotor/quadrotor.urdf.xacro +31 Quadrotor Cat /home/ws/src/CustomRobots/quadrotor/launch/quadrotor.launch.py drone sensor:=camera namespace:=drone scale:=3.0 quadrotor/models/quadrotor/quadrotor.urdf.xacro +32 Quadrotor Mouse /home/ws/src/CustomRobots/quadrotor/launch/quadrotor.launch.py drone_mouse sensor:=camera namespace:=drone_mouse color:=Magenta scale:=3.0 quadrotor/models/quadrotor/quadrotor.urdf.xacro \. --