husarion_office_gz -> husarion_gz_worlds

husarion · May 6, 2024 · 3bdfbc2 · 3bdfbc2
1 parent f973218
commit 3bdfbc2
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,7 @@ log
 rosbot_hardware_interfaces/
 ros_components_description/
 rosbot_controllers/
-husarion/husarion_office_gz
+husarion_gz_worlds
 gazebosim/gz_ros2_control
 diff_drive_controller
 imu_sensor_broadcaster

diff --git a/rosbot/rosbot_simulation.repos b/rosbot/rosbot_simulation.repos
@@ -1,5 +1,5 @@
 repositories:
-  husarion/husarion_office_gz:
+  husarion_gz_worlds:
     type: git
-    url: https://github.com/husarion/husarion_office_gz
+    url: https://github.com/husarion/husarion_gz_worlds
     version: main
diff --git a/rosbot_gazebo/launch/simulation.launch.py b/rosbot_gazebo/launch/simulation.launch.py
@@ -135,7 +135,7 @@ def generate_launch_description():
         ),
     )
 
-    world_package = FindPackageShare("husarion_office_gz")
+    world_package = FindPackageShare("husarion_gz_worlds")
     world_file = PathJoinSubstitution([world_package, "worlds", "husarion_world.sdf"])
     declare_world_arg = DeclareLaunchArgument(
         "world", default_value=world_file, description="SDF world file"

diff --git a/rosbot_gazebo/package.xml b/rosbot_gazebo/package.xml
@@ -20,7 +20,7 @@
   <exec_depend>launch</exec_depend>
   <exec_depend>launch_ros</exec_depend>
 
-  <exec_depend>husarion_office_gz</exec_depend>
+  <exec_depend>husarion_gz_worlds</exec_depend>
   <exec_depend>ros_gz_sim</exec_depend>
   <!-- Ignition dependency is specified in the ros_gz_sim package,
     version can chosen using GZ_VERSION (or IGNITION_VERSION) env variable,

diff --git a/rosbot_gazebo/test/test_diff_drive_simulation.py b/rosbot_gazebo/test/test_diff_drive_simulation.py
@@ -47,7 +47,7 @@ def generate_test_description():
             "headless": "True",
             "world": PathJoinSubstitution(
                 [
-                    FindPackageShare("husarion_office_gz"),
+                    FindPackageShare("husarion_gz_worlds"),
                     "worlds",
                     "empty_with_plugins.sdf",
                 ]

diff --git a/rosbot_gazebo/test/test_mecanum_simulation.py b/rosbot_gazebo/test/test_mecanum_simulation.py
@@ -48,7 +48,7 @@ def generate_test_description():
             "headless": "True",
             "world": PathJoinSubstitution(
                 [
-                    FindPackageShare("husarion_office_gz"),
+                    FindPackageShare("husarion_gz_worlds"),
                     "worlds",
                     "empty_with_plugins.sdf",
                 ]

diff --git a/rosbot_gazebo/test/test_multirobot_diff_drive_simulation.py b/rosbot_gazebo/test/test_multirobot_diff_drive_simulation.py
@@ -38,7 +38,7 @@ def generate_test_description():
             "launch",
             "rosbot_gazebo",
             "simulation.launch.py",
-            (f'world:={FindPackageShare("husarion_office_gz")}' "/worlds/empty_with_plugins.sdf"),
+            (f'world:={FindPackageShare("husarion_gz_worlds")}' "/worlds/empty_with_plugins.sdf"),
             "robots:=robot1={y: -4.0}; robot2={y: 0.0};",
             "headless:=True",
         ],

diff --git a/rosbot_gazebo/test/test_multirobot_mecanum_simulation.py b/rosbot_gazebo/test/test_multirobot_mecanum_simulation.py
@@ -38,7 +38,7 @@ def generate_test_description():
             "launch",
             "rosbot_gazebo",
             "simulation.launch.py",
-            (f'world:={FindPackageShare("husarion_office_gz")}' "/worlds/empty_with_plugins.sdf"),
+            (f'world:={FindPackageShare("husarion_gz_worlds")}' "/worlds/empty_with_plugins.sdf"),
             "robots:=robot1={y: -4.0}; robot2={y: 0.0};",
             "mecanum:=True",
             "headless:=True",

diff --git a/rosbot_gazebo/test/test_namespaced_diff_drive_simulation.py b/rosbot_gazebo/test/test_namespaced_diff_drive_simulation.py
@@ -47,7 +47,7 @@ def generate_test_description():
             "headless": "True",
             "world": PathJoinSubstitution(
                 [
-                    FindPackageShare("husarion_office_gz"),
+                    FindPackageShare("husarion_gz_worlds"),
                     "worlds",
                     "empty_with_plugins.sdf",
                 ]

diff --git a/rosbot_gazebo/test/test_namespaced_mecanum_simulation.py b/rosbot_gazebo/test/test_namespaced_mecanum_simulation.py
@@ -47,7 +47,7 @@ def generate_test_description():
             "mecanum": "True",
             "world": PathJoinSubstitution(
                 [
-                    FindPackageShare("husarion_office_gz"),
+                    FindPackageShare("husarion_gz_worlds"),
                     "worlds",
                     "empty_with_plugins.sdf",
                 ]