Fixed launch files for mars rover (space-ros#46)

jasmeet0915 · Sep 6, 2024 · 8e24abc · 8e24abc
1 parent bbed18f
commit 8e24abc
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/custom_gz_plugins/launch/demo_world.launch.py b/custom_gz_plugins/launch/demo_world.launch.py
@@ -22,15 +22,15 @@ def generate_launch_description():
            ':'.join([environ.get('GZ_SIM_SYSTEM_PLUGIN_PATH', default=''),
                      environ.get('LD_LIBRARY_PATH', default='')]),
            'GZ_SIM_RESOURCE_PATH':
-           ':'.join([mars_rover_demos_path])}
+           ':'.join([mars_rover_demos_path, mars_rover_models_path + '/models'])}
 
     urdf_model_path = os.path.join(mars_rover_models_path, 'models', 'curiosity_path',
         'urdf', 'curiosity_mars_rover.xacro.urdf')
 
     doc = xacro.process_file(urdf_model_path)
     robot_description = {'robot_description': doc.toxml()}
 
-    decalare_world_name_arg = DeclareLaunchArgument('world_name', default_value='mars_gale_crater_patch1.sdf',
+    declare_world_name_arg = DeclareLaunchArgument('world_name', default_value='mars_gale_crater_patch1.sdf',
                                                     description='Name of the world file to launch in Gazebo')
     world_name = LaunchConfiguration('world_name')
 

diff --git a/mars_rover/launch/mars_rover.launch.py b/mars_rover/launch/mars_rover.launch.py
@@ -27,7 +27,7 @@ def generate_launch_description():
            ':'.join([environ.get('GZ_SIM_SYSTEM_PLUGIN_PATH', default=''),
                      environ.get('LD_LIBRARY_PATH', default='')]),
            'GZ_SIM_RESOURCE_PATH':
-           ':'.join([mars_rover_demos_path])}
+           ':'.join([mars_rover_demos_path, mars_rover_models_path + '/models'])}
 
     urdf_model_path = os.path.join(mars_rover_models_path, 'models', 'curiosity_path',
         'urdf', 'curiosity_mars_rover.xacro')

diff --git a/mars_rover/nodes/move_arm b/mars_rover/nodes/move_arm
diff --git a/mars_rover/nodes/move_mast b/mars_rover/nodes/move_mast
diff --git a/mars_rover/nodes/move_wheel b/mars_rover/nodes/move_wheel
diff --git a/mars_rover/nodes/run_demo b/mars_rover/nodes/run_demo