Get rid of all the ignition references

LeoRover · Apr 27, 2024 · 6fef309 · 6fef309
1 parent a04bbfe
commit 6fef309
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 31 deletions.
diff --git a/leo_gz_bringup/launch/leo_gz.launch.py b/leo_gz_bringup/launch/leo_gz.launch.py
@@ -70,7 +70,7 @@ def generate_launch_description():
         executable="parameter_bridge",
         name="clock_bridge",
         arguments=[
-            "/clock@rosgraph_msgs/msg/Clock[ignition.msgs.Clock",
+            "/clock@rosgraph_msgs/msg/Clock[gz.msgs.Clock",
         ],
         parameters=[
             {

diff --git a/leo_gz_bringup/launch/spawn_robot.launch.py b/leo_gz_bringup/launch/spawn_robot.launch.py
@@ -84,13 +84,13 @@ def spawn_robot(context: LaunchContext, namespace: LaunchConfiguration):
         executable="parameter_bridge",
         name=node_name_prefix + "parameter_bridge",
         arguments=[
-            robot_ns + "/cmd_vel@geometry_msgs/msg/Twist]ignition.msgs.Twist",
-            robot_ns + "/odom@nav_msgs/msg/Odometry[ignition.msgs.Odometry",
-            robot_ns + "/tf@tf2_msgs/msg/TFMessage[ignition.msgs.Pose_V",
-            robot_ns + "/imu/data_raw@sensor_msgs/msg/Imu[ignition.msgs.IMU",
+            robot_ns + "/cmd_vel@geometry_msgs/msg/Twist]gz.msgs.Twist",
+            robot_ns + "/odom@nav_msgs/msg/Odometry[gz.msgs.Odometry",
+            robot_ns + "/tf@tf2_msgs/msg/TFMessage[gz.msgs.Pose_V",
+            robot_ns + "/imu/data_raw@sensor_msgs/msg/Imu[gz.msgs.IMU",
             robot_ns
-            + "/camera/camera_info@sensor_msgs/msg/CameraInfo[ignition.msgs.CameraInfo",
-            robot_ns + "/joint_states@sensor_msgs/msg/JointState[ignition.msgs.Model",
+            + "/camera/camera_info@sensor_msgs/msg/CameraInfo[gz.msgs.CameraInfo",
+            robot_ns + "/joint_states@sensor_msgs/msg/JointState[gz.msgs.Model",
         ],
         parameters=[
             {

diff --git a/leo_gz_plugins/hooks/gz_sim_system_plugin_path.dsv b/leo_gz_plugins/hooks/gz_sim_system_plugin_path.dsv
@@ -1,2 +1 @@
-prepend-non-duplicate;IGN_GAZEBO_SYSTEM_PLUGIN_PATH;lib
 prepend-non-duplicate;GZ_SIM_SYSTEM_PLUGIN_PATH;lib
diff --git a/leo_gz_worlds/hooks/gz_sim_resource_path.dsv.in b/leo_gz_worlds/hooks/gz_sim_resource_path.dsv.in
@@ -1,2 +1 @@
-prepend-non-duplicate;IGN_GAZEBO_RESOURCE_PATH;share/@PROJECT_NAME@/worlds;share/@PROJECT_NAME@/models
 prepend-non-duplicate;GZ_SIM_RESOURCE_PATH;share/@PROJECT_NAME@/worlds;share/@PROJECT_NAME@/models
diff --git a/leo_gz_worlds/worlds/leo_empty.sdf b/leo_gz_worlds/worlds/leo_empty.sdf
@@ -10,21 +10,20 @@
     </physics>
 
     <plugin
-      filename="ignition-gazebo-physics-system"
-      name="ignition::gazebo::systems::Physics">
+      filename="gz-sim-physics-system"
+      name="gz::sim::systems::Physics">
     </plugin>
     <plugin
-      filename="ignition-gazebo-sensors-system"
-      name="ignition::gazebo::systems::Sensors">
-      <render_engine>ogre2</render_engine>
+      filename="gz-sim-sensors-system"
+      name="gz::sim::systems::Sensors">
     </plugin>
     <plugin
-      filename="ignition-gazebo-scene-broadcaster-system"
-      name="ignition::gazebo::systems::SceneBroadcaster">
+      filename="gz-sim-scene-broadcaster-system"
+      name="gz::sim::systems::SceneBroadcaster">
     </plugin>
     <plugin
-      filename="ignition-gazebo-user-commands-system"
-      name="ignition::gazebo::systems::UserCommands">
+      filename="gz-sim-user-commands-system"
+      name="gz::sim::systems::UserCommands">
     </plugin>
 
     <light name="sun" type="directional">

diff --git a/leo_gz_worlds/worlds/marsyard2020.sdf b/leo_gz_worlds/worlds/marsyard2020.sdf
@@ -10,21 +10,20 @@
     </physics>
 
     <plugin
-      filename="ignition-gazebo-physics-system"
-      name="ignition::gazebo::systems::Physics">
+      filename="gz-sim-physics-system"
+      name="gz::sim::systems::Physics">
     </plugin>
     <plugin
-      filename="ignition-gazebo-sensors-system"
-      name="ignition::gazebo::systems::Sensors">
-      <render_engine>ogre2</render_engine>
+      filename="gz-sim-sensors-system"
+      name="gz::sim::systems::Sensors">
     </plugin>
     <plugin
-      filename="ignition-gazebo-scene-broadcaster-system"
-      name="ignition::gazebo::systems::SceneBroadcaster">
+      filename="gz-sim-scene-broadcaster-system"
+      name="gz::sim::systems::SceneBroadcaster">
     </plugin>
     <plugin
-      filename="ignition-gazebo-user-commands-system"
-      name="ignition::gazebo::systems::UserCommands">
+      filename="gz-sim-user-commands-system"
+      name="gz::sim::systems::UserCommands">
     </plugin>
 
     <light name="sun" type="directional">

diff --git a/leo_gz_worlds/worlds/marsyard2021.sdf b/leo_gz_worlds/worlds/marsyard2021.sdf
@@ -11,13 +11,12 @@
     </physics>
 
     <plugin
-      filename="ignition-gazebo-physics-system"
+      filename="gz-sim-physics-system"
       name="gz::sim::systems::Physics">
     </plugin>
     <plugin
       filename="gz-sim-sensors-system"
       name="gz::sim::systems::Sensors">
-      <render_engine>ogre2</render_engine>
     </plugin>
     <plugin
       filename="gz-sim-scene-broadcaster-system"

diff --git a/leo_gz_worlds/worlds/marsyard2022.sdf b/leo_gz_worlds/worlds/marsyard2022.sdf
@@ -11,13 +11,12 @@
     </physics>
 
     <plugin
-      filename="ignition-gazebo-physics-system"
+      filename="gz-sim-physics-system"
       name="gz::sim::systems::Physics">
     </plugin>
     <plugin
       filename="gz-sim-sensors-system"
       name="gz::sim::systems::Sensors">
-      <render_engine>ogre2</render_engine>
     </plugin>
     <plugin
       filename="gz-sim-scene-broadcaster-system"