diff --git a/src/ezbot_descr_simul/launch/launch_sim.launch.py b/src/ezbot_descr_simul/launch/launch_sim.launch.py index 6ef073d..5570a94 100644 --- a/src/ezbot_descr_simul/launch/launch_sim.launch.py +++ b/src/ezbot_descr_simul/launch/launch_sim.launch.py @@ -5,6 +5,9 @@ from launch import LaunchDescription from launch.actions import IncludeLaunchDescription +from launch.actions import DeclareLaunchArgument +import launch_ros.actions +from launch.substitutions import LaunchConfiguration from launch.launch_description_sources import PythonLaunchDescriptionSource from launch_ros.actions import Node @@ -35,14 +38,25 @@ def generate_launch_description(): # Run the spawner node from the gazebo_ros package. The entity name doesn't really matter if you only have a single robot. spawn_entity = Node(package='gazebo_ros', executable='spawn_entity.py', arguments=['-topic', 'robot_description', - '-entity', 'EzBot'], + '-entity', 'EzBot', + '-x','1.0', + '-y','-1.0', + '-z', '1.0' ], output='screen') + #joystick = IncludeLaunchDescription( + # PythonLaunchDescriptionSource([os.path.join( + # get_package_share_directory(package_name),'launch','joystick.launch.py' + # )]), launch_arguments={'use_sim_time': 'true'}.items()) # Launch them all! return LaunchDescription([ + DeclareLaunchArgument( + 'world', + default_value=[os.path.join('ezbot_gazebo','worlds','table2024.world'), ''], + description='SDF world file'), rsp, gazebo, - spawn_entity, + spawn_entity ]) \ No newline at end of file diff --git a/src/ezbot_gazebo/worlds/table2024.world b/src/ezbot_gazebo/worlds/table2024.world index e329c97..361e437 100644 --- a/src/ezbot_gazebo/worlds/table2024.world +++ b/src/ezbot_gazebo/worlds/table2024.world @@ -56,20 +56,20 @@ 0.166667 - 0 0 0 0 -0 0 + -1 -1 0 0 -0 0 0 0 0 0 -0 0 - /home/vincent/ezBot/gazebo/Table2024/table2024.dae + ../../../gazebo/Table2024/table2024.dae 1 1 1 1 @@ -84,7 +84,7 @@ 0 0 0 0 -0 0 - /home/vincent/ezBot/gazebo/Table2024/table2024.dae + ../../../gazebo/Table2024/table2024.dae 1 1 1