diff --git a/config/gz_bridge.yaml b/config/gz_bridge.yaml index f0cf516..6924d6c 100644 --- a/config/gz_bridge.yaml +++ b/config/gz_bridge.yaml @@ -3,7 +3,12 @@ gz_type_name: "gz.msgs.Clock" direction: GZ_TO_ROS -- topic_name: "/rgbd_camera/image" +- topic_name: "/inner_rgbd_camera/image" + ros_type_name: "sensor_msgs/msg/Image" + gz_type_name: "gz.msgs.Image" + direction: GZ_TO_ROS + +- topic_name: "/outer_rgbd_camera/image" ros_type_name: "sensor_msgs/msg/Image" gz_type_name: "gz.msgs.Image" direction: GZ_TO_ROS diff --git a/urdf/aubo_i5.urdf.xacro b/urdf/aubo_i5.urdf.xacro index 93c177f..87eec1e 100644 --- a/urdf/aubo_i5.urdf.xacro +++ b/urdf/aubo_i5.urdf.xacro @@ -11,6 +11,7 @@ + @@ -242,15 +243,20 @@ - - - - - + + + + + + - - + + + + + + diff --git a/urdf/ros2_control.xacro b/urdf/ros2_control.xacro index 34ba3ff..2827d67 100644 --- a/urdf/ros2_control.xacro +++ b/urdf/ros2_control.xacro @@ -4,7 +4,7 @@ - gz_ros2_control/GazeboSimSystem + gz_ros2_control/GazeboSimSystem mock_components/GenericSystem @@ -19,7 +19,9 @@ - + + 0.0 + @@ -28,7 +30,14 @@ - + + + 0.5 + + + + + @@ -37,7 +46,14 @@ - + + + 1.75 + + + + + @@ -45,7 +61,14 @@ - + + + 0.0 + + + + + @@ -53,7 +76,14 @@ - + + + 1.57 + + + + + @@ -61,7 +91,14 @@ - + + + 0.0 + + + + + diff --git a/urdf/sensors.xacro b/urdf/sensors.xacro index 54fb9ac..fec0b7f 100644 --- a/urdf/sensors.xacro +++ b/urdf/sensors.xacro @@ -30,8 +30,8 @@ 1.047 - 1920 - 1080 + 640 + 480 0.1 diff --git a/world/world.sdf b/world/world.sdf index 1ec27bd..6fda47d 100644 --- a/world/world.sdf +++ b/world/world.sdf @@ -1,4 +1,4 @@ - + @@ -66,5 +66,83 @@ + + true + 0.5 0 0.1 0 0 0 + + + + + + 0.3 0.3 0.2 + + + + + + + 0.3 0.3 0.2 + + + + 0.6 0.3 0.3 1 + 0.6 0.3 0.3 1 + + + + + + 0.5 0 0.252 0 0 0 + + + 0.05 + 0 0 0 0 0 0 + + 3.2083e-05 + 0 + 0 + 3.2083e-05 + 0 + 1.0e-05 + + + + + + + 0.01 + 0.05 + + + + + + 0.001 + 0.01 + + + + + 10.0 + 10.0 + + + + + + + + + 0.01 + 0.05 + + + + 0.3 0.3 0.6 1 + 0.3 0.3 0.6 1 + + + +