Skip to content

Commit 04b22ee

Browse files
committed
Cleaning code
1 parent 6ec1155 commit 04b22ee

File tree

2 files changed

+0
-127
lines changed

2 files changed

+0
-127
lines changed

CustomRobots/roomba_robot/models/roombaROS/model.sdf

Lines changed: 0 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,10 @@
22
<sdf version="1.5">
33
<model name="roombaROS">
44

5-
<!-- <plugin name="gazebo_ros_state" filename="libgazebo_ros_state.so">
6-
<ros>
7-
<namespace>/gazebo</namespace>
8-
</ros>
9-
<update_rate>1.0</update_rate>
10-
</plugin> -->
11-
125
<plugin name="gz::sim::systems::Contact" filename="gz-sim-contact-system"></plugin>
136

147
<link name="base">
158

16-
<!-- <inertial>
17-
<pose>0.001453 -0.000453 0.029787 0 0 0</pose>
18-
<inertia>
19-
<ixx>0.058640</ixx>
20-
<ixy>0.000124</ixy>
21-
<ixz>0.000615</ixz>
22-
<iyy>0.058786</iyy>
23-
<iyz>0.000014</iyz>
24-
<izz>1.532440</izz>
25-
</inertia>
26-
<mass>2.234000</mass>
27-
</inertial> -->
28-
299
<inertial>
3010
<mass>1.0</mass>
3111
<inertia>
@@ -39,7 +19,6 @@
3919
<pose>0 0 0.047800 0 0 0</pose>
4020
<geometry>
4121
<mesh>
42-
<scale>0.1 0.1 0.1</scale>
4322
<uri>model://roombaROS/meshes/create_body.dae</uri>
4423
</mesh>
4524
</geometry>
@@ -49,7 +28,6 @@
4928
<pose>0 0 0.047800 0 0 0</pose>
5029
<geometry>
5130
<mesh>
52-
<scale>0.1 0.1 0.1</scale>
5331
<uri>model://roombaROS/meshes/create_body.dae</uri>
5432
</mesh>
5533
</geometry>
@@ -59,7 +37,6 @@
5937
<pose>-0.01 0 0.03 0 0 0</pose>
6038
<geometry>
6139
<mesh>
62-
<scale>0.1 0.1 0.1</scale>
6340
<uri>model://roombaROS/meshes/right_bumper.dae</uri>
6441
</mesh>
6542
</geometry>
@@ -69,7 +46,6 @@
6946
<pose>-0.01 0 0.03 0 0 0</pose>
7047
<geometry>
7148
<mesh>
72-
<scale>0.1 0.1 0.1</scale>
7349
<uri>model://roombaROS/meshes/center_bumper.dae</uri>
7450
</mesh>
7551
</geometry>
@@ -79,7 +55,6 @@
7955
<pose>-0.01 0 0.03 0 0 0</pose>
8056
<geometry>
8157
<mesh>
82-
<scale>0.1 0.1 0.1</scale>
8358
<uri>model://roombaROS/meshes/left_bumper.dae</uri>
8459
</mesh>
8560
</geometry>
@@ -238,21 +213,6 @@
238213
</ray>
239214
</sensor>
240215

241-
<!-- <sensor name="right_bumper" type="contact">
242-
<always_on>true</always_on>
243-
<update_rate>20.0</update_rate>
244-
<contact>
245-
<collision>right_bumper_collision</collision>
246-
</contact>
247-
<plugin name="gazebo_ros_right_bumper_controller" filename="libgazebo_ros_bumper.so">
248-
<bumperTopicName>/roombaROS/events/right_bumper</bumperTopicName>
249-
<ros>
250-
<remapping>/bumper_states:=/roombaROS/events/right_bumper</remapping>
251-
</ros>
252-
<frameName>right_bumper_sensor</frameName>
253-
</plugin>
254-
</sensor> -->
255-
256216
<sensor name="right_bumper" type="contact">
257217
<always_on>true</always_on>
258218
<update_rate>20.0</update_rate>
@@ -262,21 +222,6 @@
262222
</contact>
263223
</sensor>
264224

265-
<!-- <sensor name="center_bumper" type="contact">
266-
<always_on>true</always_on>
267-
<update_rate>20.0</update_rate>
268-
<contact>
269-
<collision>center_bumper_collision</collision>
270-
</contact>
271-
<plugin name="gazebo_ros_center_bumper_controller" filename="libgazebo_ros_bumper.so">
272-
<bumperTopicName>/roombaROS/events/center_bumper</bumperTopicName>
273-
<ros>
274-
<remapping>/bumper_states:=/roombaROS/events/center_bumper</remapping>
275-
</ros>
276-
<frameName>center_bumper_sensor</frameName>
277-
</plugin>
278-
</sensor> -->
279-
280225
<sensor name="center_bumper" type="contact">
281226
<always_on>true</always_on>
282227
<update_rate>20.0</update_rate>
@@ -286,21 +231,6 @@
286231
</contact>
287232
</sensor>
288233

289-
<!-- <sensor name="left_bumper" type="contact">
290-
<always_on>true</always_on>
291-
<update_rate>20.0</update_rate>
292-
<contact>
293-
<collision>left_bumper_collision</collision>
294-
</contact>
295-
<plugin name="gazebo_ros_left_bumper_controller" filename="libgazebo_ros_bumper.so">
296-
<bumperTopicName>/roombaROS/events/left_bumper</bumperTopicName>
297-
<ros>
298-
<remapping>/bumper_states:=/roombaROS/events/left_bumper</remapping>
299-
</ros>
300-
<frameName>left_bumper_sensor</frameName>
301-
</plugin>
302-
</sensor> -->
303-
304234
<sensor name="left_bumper" type="contact">
305235
<always_on>true</always_on>
306236
<update_rate>20.0</update_rate>
@@ -457,35 +387,6 @@
457387
<max_contacts>10</max_contacts>
458388
</collision>
459389

460-
<!-- <sensor name='laser' type='ray'>
461-
<ray>
462-
<scan>
463-
<horizontal>
464-
<samples>180</samples>
465-
<resolution>1.000000</resolution>
466-
<min_angle>-1.570000</min_angle>
467-
<max_angle>1.570000</max_angle>
468-
</horizontal>
469-
</scan>
470-
<range>
471-
<min>0.080000</min>
472-
<max>10.000000</max>
473-
<resolution>0.010000</resolution>
474-
</range>
475-
</ray>
476-
<update_rate>20.000000</update_rate>
477-
<always_on>1</always_on>
478-
<visualize>1</visualize>
479-
<plugin name="gazebo_ros_head_hokuyo_controller" filename="libgazebo_ros_ray_sensor.so">
480-
<ros>
481-
<remapping>~/out:=/roombaROS/laser/scan</remapping>
482-
</ros>
483-
<output_type>sensor_msgs/LaserScan</output_type>
484-
<frameName>laser</frameName>
485-
<update_rate>20.000000</update_rate>
486-
</plugin>
487-
</sensor> -->
488-
489390
<sensor name='laser' type='gpu_lidar'>
490391
<lidar>
491392
<scan>
@@ -542,32 +443,8 @@
542443
<joint name='joint_laser' type='fixed'>
543444
<parent>base</parent>
544445
<child>laser</child>
545-
<!-- <axis>
546-
<xyz>0.000000 0.000000 0.000000</xyz>
547-
<limit>
548-
<lower>0.000000</lower>
549-
<upper>0.000000</upper>
550-
</limit>
551-
</axis> -->
552446
</joint>
553447

554-
<!-- <plugin name="differential_drive_controller" filename="libgazebo_ros_planar_move.so">
555-
<alwaysOn>true</alwaysOn>
556-
<updateRate>10</updateRate>
557-
<leftJoint>right_wheel_joint</leftJoint>
558-
<rightJoint>left_wheel_joint</rightJoint>
559-
<wheelSeparation>0.5380</wheelSeparation>
560-
<wheelDiameter>0.2410</wheelDiameter>
561-
<torque>20</torque>
562-
<commandTopic>/cmd_vel</commandTopic>
563-
<odometryTopic>roombaROS/odom</odometryTopic>
564-
<odometryFrame>odom</odometryFrame>
565-
<odometryRate>20.0</odometryRate>
566-
<robotBaseFrame>base</robotBaseFrame>
567-
<publishWheelTF>true</publishWheelTF>
568-
<publishWheelJointState>true</publishWheelJointState>
569-
</plugin> -->
570-
571448
<plugin filename="gz-sim-diff-drive-system" name="gz::sim::systems::DiffDrive">
572449
<left_joint>left_wheel_joint</left_joint>
573450
<right_joint>right_wheel_joint</right_joint>

Worlds/roomba_1_house_harmonic.world

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
<uri>model://house_int2</uri>
3737
<pose>0 0 0 0 0 0</pose>
3838
</include>
39-
40-
<!-- <include>
41-
<uri>model://ground_plane_sincolor</uri>
42-
</include> -->
4339

4440
<light type="directional" name="sun">
4541
<cast_shadows>1</cast_shadows>

0 commit comments

Comments
 (0)