Skip to content

Commit f94267f

Browse files
authored
Merge pull request #693 from JdeRobot/gz-plugin-odometry
Gz plugin odometry
2 parents 670bfd8 + 91c3ec2 commit f94267f

4 files changed

Lines changed: 18 additions & 37 deletions

File tree

CustomRobots/roomba_robot/models/roombaROS/model.sdf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -461,15 +461,15 @@
461461
</plugin>
462462

463463
<plugin filename="libNoisyOdometryPlugin.so" name="custom_plugins::NoisyOdometryPlugin">
464-
<ros_topic>/roombaROS/odom_noisy</ros_topic>
464+
<ros_topic>/odom_noisy</ros_topic>
465465
<gz_cmd_vel_topic>/roombaROS/cmd_vel</gz_cmd_vel_topic>
466466
<frame_id>odom</frame_id>
467-
<child_frame_id>base_footprint</child_frame_id>
467+
<child_frame_id>base</child_frame_id>
468468

469-
<alpha1>0.002</alpha1>
470-
<alpha2>0.002</alpha2>
471-
<alpha3>0.001</alpha3>
472-
<alpha4>0.001</alpha4>
469+
<alpha1>0.01</alpha1>
470+
<alpha2>0.01</alpha2>
471+
<alpha3>0.005</alpha3>
472+
<alpha4>0.005</alpha4>
473473
</plugin>
474474

475475
</model>

CustomRobots/roomba_robot/models/roombaROS_cam/model.sdf

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -629,15 +629,15 @@
629629
</plugin>
630630

631631
<plugin filename="libNoisyOdometryPlugin.so" name="custom_plugins::NoisyOdometryPlugin">
632-
<ros_topic>/roombaROS/odom_noisy</ros_topic>
632+
<ros_topic>/odom_noisy</ros_topic>
633633
<gz_cmd_vel_topic>/roombaROS/cmd_vel</gz_cmd_vel_topic>
634634
<frame_id>odom</frame_id>
635-
<child_frame_id>base_footprint</child_frame_id>
635+
<child_frame_id>base</child_frame_id>
636636

637-
<alpha1>0.002</alpha1>
638-
<alpha2>0.002</alpha2>
639-
<alpha3>0.001</alpha3>
640-
<alpha4>0.001</alpha4>
637+
<alpha1>0.01</alpha1>
638+
<alpha2>0.01</alpha2>
639+
<alpha3>0.005</alpha3>
640+
<alpha4>0.005</alpha4>
641641
</plugin>
642642

643643
</model>

CustomRobots/roomba_robot/params/roombaROS.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
1-
# gz topic published by DiffDrive plugin
2-
- ros_topic_name: "odom"
1+
- ros_topic_name: "/odom"
32
gz_topic_name: "/roombaROS/odom"
43
ros_type_name: "nav_msgs/msg/Odometry"
54
gz_type_name: "gz.msgs.Odometry"
65
direction: GZ_TO_ROS
76

8-
- ros_topic_name: "odom_noisy"
9-
gz_topic_name: "/roombaROS/odom_noisy"
10-
ros_type_name: "nav_msgs/msg/Odometry"
11-
gz_type_name: "gz.msgs.Odometry"
12-
direction: GZ_TO_ROS
13-
14-
# gz topic subscribed to by DiffDrive plugin
15-
- ros_topic_name: "cmd_vel"
7+
- ros_topic_name: "/cmd_vel"
168
gz_topic_name: "/roombaROS/cmd_vel"
179
ros_type_name: "geometry_msgs/msg/Twist"
1810
gz_type_name: "gz.msgs.Twist"
1911
direction: ROS_TO_GZ
2012

21-
# gz topic published by Sensors plugin (LIDAR)
2213
- ros_topic_name: "/roombaROS/laser/scan"
2314
gz_topic_name: "/roombaROS/laser/scan"
2415
ros_type_name: "sensor_msgs/msg/LaserScan"
@@ -41,4 +32,4 @@
4132
gz_topic_name: "/roombaROS/events/left_bumper"
4233
ros_type_name: "ros_gz_interfaces/msg/Contacts"
4334
gz_type_name: "gz.msgs.Contacts"
44-
direction: GZ_TO_ROS
35+
direction: GZ_TO_ROS

CustomRobots/roomba_robot/params/roombaROS_cam.yaml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
1-
# gz topic published by DiffDrive plugin
2-
- ros_topic_name: "odom"
1+
- ros_topic_name: "/odom"
32
gz_topic_name: "/roombaROS/odom"
43
ros_type_name: "nav_msgs/msg/Odometry"
54
gz_type_name: "gz.msgs.Odometry"
65
direction: GZ_TO_ROS
76

8-
- ros_topic_name: "odom_noisy"
9-
gz_topic_name: "/roombaROS/odom_noisy"
10-
ros_type_name: "nav_msgs/msg/Odometry"
11-
gz_type_name: "gz.msgs.Odometry"
12-
direction: GZ_TO_ROS
13-
14-
# gz topic subscribed to by DiffDrive plugin
15-
- ros_topic_name: "cmd_vel"
7+
- ros_topic_name: "/cmd_vel"
168
gz_topic_name: "/roombaROS/cmd_vel"
179
ros_type_name: "geometry_msgs/msg/Twist"
1810
gz_type_name: "gz.msgs.Twist"
1911
direction: ROS_TO_GZ
2012

21-
# gz topic published by Sensors plugin (LIDAR)
2213
- ros_topic_name: "/roombaROS/laser/scan"
2314
gz_topic_name: "/roombaROS/laser/scan"
2415
ros_type_name: "sensor_msgs/msg/LaserScan"
@@ -43,9 +34,8 @@
4334
gz_type_name: "gz.msgs.Contacts"
4435
direction: GZ_TO_ROS
4536

46-
# gz topic published by Sensors plugin (Camera)
4737
- ros_topic_name: "/camera/camera_info"
4838
gz_topic_name: "/camera/camera_info"
4939
ros_type_name: "sensor_msgs/msg/CameraInfo"
5040
gz_type_name: "gz.msgs.CameraInfo"
51-
direction: GZ_TO_ROS
41+
direction: GZ_TO_ROS

0 commit comments

Comments
 (0)