diff --git a/gazebo_sim/config/costmap_common_params.yaml b/gazebo_sim/config/costmap_common_params.yaml index de05e19..d569971 100644 --- a/gazebo_sim/config/costmap_common_params.yaml +++ b/gazebo_sim/config/costmap_common_params.yaml @@ -6,4 +6,4 @@ inflation_radius: 0.5 observation_sources: laser_scan_kinect -laser_scan_kinect: {sensor_frame: camera_depth_frame, data_type: LaserScan, topic: /scan, marking: true, clearing: true} +laser_scan_kinect: {sensor_frame: qt_pi/laser, data_type: LaserScan, topic: /qt_pi/scan, marking: true, clearing: true} diff --git a/gazebo_sim/config/global_costmap_params.yaml b/gazebo_sim/config/global_costmap_params.yaml index 5ed0b4d..090b274 100644 --- a/gazebo_sim/config/global_costmap_params.yaml +++ b/gazebo_sim/config/global_costmap_params.yaml @@ -4,3 +4,5 @@ global_costmap: update_frequency: 5.0 static_map: false rolling_window: true + width: 100 + height: 100 diff --git a/gazebo_sim/launch/gazebo_sim.launch b/gazebo_sim/launch/gazebo_sim.launch index 2c1b212..cb606b8 100644 --- a/gazebo_sim/launch/gazebo_sim.launch +++ b/gazebo_sim/launch/gazebo_sim.launch @@ -1,10 +1,9 @@ - + + - - - + \ No newline at end of file diff --git a/gazebo_sim/launch/gmapping.launch b/gazebo_sim/launch/gmapping.launch index a7a7317..03482e0 100644 --- a/gazebo_sim/launch/gmapping.launch +++ b/gazebo_sim/launch/gmapping.launch @@ -1,8 +1,10 @@ + - - + + + \ No newline at end of file diff --git a/gazebo_sim/launch/move_base_amcl.launch b/gazebo_sim/launch/move_base_amcl.launch index 0a118c8..573d3ee 100644 --- a/gazebo_sim/launch/move_base_amcl.launch +++ b/gazebo_sim/launch/move_base_amcl.launch @@ -1,9 +1,17 @@ + + + + - + - + + + + + diff --git a/gazebo_sim/launch/move_base.launch b/gazebo_sim/launch/move_base_gmapping.launch similarity index 90% rename from gazebo_sim/launch/move_base.launch rename to gazebo_sim/launch/move_base_gmapping.launch index 27849ff..f138dcf 100644 --- a/gazebo_sim/launch/move_base.launch +++ b/gazebo_sim/launch/move_base_gmapping.launch @@ -1,7 +1,9 @@ - - + + + + diff --git a/gazebo_sim/launch/static_tf.launch b/gazebo_sim/launch/static_tf.launch index e350868..1735590 100644 --- a/gazebo_sim/launch/static_tf.launch +++ b/gazebo_sim/launch/static_tf.launch @@ -1,3 +1,3 @@ - + \ No newline at end of file diff --git a/gazebo_sim/map/frames.gv b/gazebo_sim/map/frames.gv new file mode 100644 index 0000000..8108a1a --- /dev/null +++ b/gazebo_sim/map/frames.gv @@ -0,0 +1,8 @@ +digraph G { +"qt_pi/odom" -> "qt_pi/base_link"[label="Broadcaster: /gazebo\nAverage rate: 30.199 Hz\nMost recent transform: 604.007 ( 0.018 sec old)\nBuffer length: 4.967 sec\n"]; +"qt_pi/base_link" -> "qt_pi/laser"[label="Broadcaster: /laser_frame\nAverage rate: 30.419 Hz\nMost recent transform: 604.039 ( -0.014 sec old)\nBuffer length: 4.964 sec\n"]; +edge [style=invis]; + subgraph cluster_legend { style=bold; color=black; label ="view_frames Result"; +"Recorded at time: 604.025"[ shape=plaintext ] ; + }->"qt_pi/odom"; +} \ No newline at end of file diff --git a/gazebo_sim/map/frames.pdf b/gazebo_sim/map/frames.pdf new file mode 100644 index 0000000..dc087d8 Binary files /dev/null and b/gazebo_sim/map/frames.pdf differ diff --git a/gazebo_sim/map/playground.pgm b/gazebo_sim/map/playground.pgm new file mode 100644 index 0000000..f4af84d Binary files /dev/null and b/gazebo_sim/map/playground.pgm differ diff --git a/gazebo_sim/map/playground.yaml b/gazebo_sim/map/playground.yaml new file mode 100644 index 0000000..bd22da1 --- /dev/null +++ b/gazebo_sim/map/playground.yaml @@ -0,0 +1,6 @@ +image: playground.pgm +resolution: 0.050000 +origin: [-4.000000, -13.000000, 0.000000] +negate: 0 +occupied_thresh: 0.65 +free_thresh: 0.196 diff --git a/gazebo_sim/worlds/qt_pi_laser.world b/gazebo_sim/worlds/qt_pi_laser.world new file mode 100644 index 0000000..be5f509 --- /dev/null +++ b/gazebo_sim/worlds/qt_pi_laser.world @@ -0,0 +1,2061 @@ + + + + 1 + 0 0 10 0 -0 0 + 0.8 0.8 0.8 1 + 0.2 0.2 0.2 1 + + 1000 + 0.9 + 0.01 + 0.001 + + -0.5 0.1 -0.9 + + + 1 + + + + + 0 0 1 + 100 100 + + + + + + 100 + 50 + + + + + + + + + + + 10 + + + 0 + + + 0 0 1 + 100 100 + + + + + + + 0 + 0 + 0 + + + 0 0 -9.8 + 6e-06 2.3e-05 -4.2e-05 + + + 0.001 + 1 + 1000 + + + 0.4 0.4 0.4 1 + 0.7 0.7 0.7 1 + 1 + + + + EARTH_WGS84 + 0 + 0 + 0 + 0 + + + -1.25415 -0.788564 0 0 -0 0 + + + + + 26.75 0.15 2.5 + + + 0 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0 0 1.25 0 -0 0 + + + 26.75 0.15 2.5 + + + + + 1 1 1 1 + + + 0.007886 -3.91706 0 0 -0 0 + 0 + 0 + 0 + + + + + + 8 0.15 2.5 + + + 0 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0 0 1.25 0 -0 0 + + + 8 0.15 2.5 + + + + + 1 1 1 1 + + + 13.3079 0.007941 0 0 -0 1.5708 + 0 + 0 + 0 + + + + + + 26.75 0.15 2.5 + + + 0 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0 0 1.25 0 -0 0 + + + 26.75 0.15 2.5 + + + + + 1 1 1 1 + + + 0.007886 3.93294 0 0 -0 3.14159 + 0 + 0 + 0 + + + -9.18476 0.019386 0 0 0 -1.5708 + + -3.12221 0 1.25 0 -0 0 + + + 1.75558 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 1.75558 0.15 2.5 + + + -3.12221 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0.438191 0 1.25 0 -0 0 + + + 3.56521 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 3.56521 0.15 2.5 + + + 0.438191 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 3.5604 0 1.25 0 -0 0 + + + 0.879203 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 0.879203 0.15 2.5 + + + 3.5604 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + -1.79442 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + -1.79442 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 2.6708 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + 2.6708 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + 0 + 0 + 0 + + + + + + 4.25 0.15 2.5 + + + 0 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0 0 1.25 0 -0 0 + + + 4.25 0.15 2.5 + + + + + 1 1 1 1 + + + -11.2579 -1.35252 0 0 -0 3.14159 + 0 + 0 + 0 + + + -6.89009 -0.019386 0 0 0 -1.5708 + + -2.05546 0 1.25 0 -0 0 + + + 3.88908 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 3.88908 0.15 2.5 + + + -2.05546 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 2.39454 0 1.25 0 -0 0 + + + 3.21092 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 3.21092 0.15 2.5 + + + 2.39454 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0.339077 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + 0.339077 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + 0 + 0 + 0 + + + -2.84009 1.17017 0 0 -0 0 + + -2.27097 0 1.25 0 -0 0 + + + 3.70805 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 3.70805 0.15 2.5 + + + -2.27097 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 2.30403 0 1.25 0 -0 0 + + + 3.64195 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 3.64195 0.15 2.5 + + + 2.30403 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0.033055 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + 0.033055 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + 0 + 0 + 0 + + + 1.21568 0.006434 0 0 -0 1.5708 + + -2.30688 0 1.25 0 -0 0 + + + 3.38624 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 3.38624 0.15 2.5 + + + -2.30688 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 2.14312 0 1.25 0 -0 0 + + + 3.71376 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 3.71376 0.15 2.5 + + + 2.14312 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + -0.163762 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + -0.163762 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + 0 + 0 + 0 + + + + + + 5 0.15 2.5 + + + 0 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0 0 1.25 0 -0 0 + + + 5 0.15 2.5 + + + + + 1 1 1 1 + + + 3.62057 -1.58539 0 0 -0 0 + 0 + 0 + 0 + + + 6.04557 -2.76039 0 0 0 -1.5708 + + -0.84415 0 1.25 0 -0 0 + + + 0.811701 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 0.811701 0.15 2.5 + + + -0.84415 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0.85585 0 1.25 0 -0 0 + + + 0.788299 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 0.788299 0.15 2.5 + + + 0.85585 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0.011701 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + 0.011701 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + 0 + 0 + 0 + + + 3.40806 1.10972 0 0 -0 1.5708 + + -2.20336 0 1.25 0 -0 0 + + + 1.09329 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 1.09329 0.15 2.5 + + + -2.20336 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0.181127 0 1.25 0 -0 0 + + + 1.87567 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 1.87567 0.15 2.5 + + + 0.181127 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 2.38448 0 1.25 0 -0 0 + + + 0.731036 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 0.731036 0.15 2.5 + + + 2.38448 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + -1.20671 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + -1.20671 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 1.56896 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + 1.56896 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + 0 + 0 + 0 + + + + + + 4.5 0.15 2.5 + + + 0 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0 0 1.25 0 -0 0 + + + 4.5 0.15 2.5 + + + + + 1 1 1 1 + + + 5.60318 1.67301 0 0 -0 0 + 0 + 0 + 0 + + + 7.77818 2.72301 0 0 -0 1.5708 + + -0.729206 0 1.25 0 -0 0 + + + 0.791587 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 0.791587 0.15 2.5 + + + -0.729206 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0.845794 0 1.25 0 -0 0 + + + 0.558413 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 0.558413 0.15 2.5 + + + 0.845794 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0.116587 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + 0.116587 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + 0 + 0 + 0 + + + 10.5278 0.085507 0 0 0 -0.523599 + + -0.945166 0 1.25 0 -0 0 + + + 4.60967 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 4.60967 0.15 2.5 + + + -0.945166 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 2.75483 0 1.25 0 -0 0 + + + 0.990333 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 0.990333 0.15 2.5 + + + 2.75483 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 1.80967 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + 1.80967 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + 0 + 0 + 0 + + + 10.3472 -1.82517 0 0 0 -1.5708 + + -0.985004 0 1.25 0 -0 0 + + + 2.27999 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 2.27999 0.15 2.5 + + + -0.985004 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 1.59 0 1.25 0 -0 0 + + + 1.07001 0.15 2.5 + + + + + 1 1 1 1 + + + + + + 1.07001 0.15 2.5 + + + 1.59 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0.604992 0 2.25 0 -0 0 + + + 0.9 0.15 0.5 + + + + + 1 1 1 1 + + + + + + 0.9 0.15 0.5 + + + 0.604992 0 2.25 0 -0 0 + 10 + + + + + + + + + + + + + + 0 + 0 + 0 + + + + + + 8 0.15 2.5 + + + 0 0 1.25 0 -0 0 + 10 + + + + + + + + + + + + + + + 0 0 1.25 0 -0 0 + + + 8 0.15 2.5 + + + + + 1 1 1 1 + + + -13.2921 0.007941 0 0 0 -1.5708 + 0 + 0 + 0 + + 1 + + + + 0 0 0.1 0 -0 0 + + 20 + 0.1 0 -0.05 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + + + 0.4 0.2 0.1 + + + 10 + + + + + + + + + + + + + + + + + 0.4 0.2 0.1 + + + + + 0.15 0 -0.05 0 -0 0 + + + 0.05 + + + + + 0 + 0.01 + + + + 0 + 0.001 + + + + + 0 + 0 + 1 + 1 + + + + + + + 10 + + + 0.15 0 -0.05 0 -0 0 + + + 0.05 + + + + 0 + 0 + 0 + + + -0.1 0.2 0.1 0 -0 0 + + 5 + 0 0 0 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + + + + 10 + 10 + + + + + + + 0 + 0.01 + + + + 0 + 0.001 + + + + + + 0.1 + + + 10 + + + + + 0.1 + + + + 0 + 0 + 0 + + + -0.1 -0.2 0.1 0 -0 0 + + 5 + 0 0 0 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + + + + 10 + 10 + + + + + + + 0 + 0.01 + + + + 0 + 0.001 + + + + + + 0.1 + + + 10 + + + + + 0.1 + + + + 0 + 0 + 0 + + + 0 0 0 0 -0 0 + left_wheel + chassis + + 0 1 0 + 0 + + -1e+16 + 1e+16 + + + 0 + 0 + + + + + 0 0 0 0 -0 0 + right_wheel + chassis + + 0 1 0 + 0 + + -1e+16 + 1e+16 + + + 0 + 0 + + + + + + 0.1 + 0 0 0 0 -0 0 + + 1 + 0 + 0 + 1 + 0 + 1 + + + + + + model://hokuyo/meshes/hokuyo.dae + + + + + 0 0 -0.0145 0 -0 0 + + + 0.05 0.05 0.041 + + + 10 + + + + + + + + + + + + + + + 0 0 0.0205 0 -0 0 + + + 0.021 + 0.029 + + + 10 + + + + + + + + + + + + + + + 0.01 0 0.0175 0 -0 0 + + + + 640 + 1 + -2.26889 + 2.2689 + + + 1 + 0 + 0 + + + + 0.08 + 10 + 0.01 + + + + scan + laser + 1 + qt_pi + 15 + + 15 + 1 + + 0.2 0 0.2 0 -0 0 + 0 + 0 + 0 + + + hokuyo::link + chassis + + + 1 + 30 + left_wheel_hinge + qt_pi + right_wheel_hinge + 0.4 + 0.2 + 0 + 5 + cmd_vel + odom + base_link + odom + 1 + 1 + 1 + 0 + 0 + + -0.306574 -6.64995 0 0 -0 0 + + + 65 341000000 + 65 969333035 + 1554402610 693687615 + 65341 + + 0 0 0 0 -0 0 + 1 1 1 + + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + + 0 0 0 0 -0 0 + 1 1 1 + + 0.007886 -3.91706 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 13.3079 0.007941 0 0 -0 1.5708 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 0.007886 3.93294 0 0 -0 3.14159 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + -9.18476 0.019386 0 0 0 -1.5708 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + -11.2579 -1.35252 0 0 -0 3.14159 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + -6.89009 -0.019386 0 0 0 -1.5708 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + -2.84009 1.17017 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 1.21568 0.006434 0 0 -0 1.5708 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 3.62057 -1.58539 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 6.04557 -2.76039 0 0 0 -1.5708 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 3.40806 1.10972 0 0 -0 1.5708 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 5.60318 1.67301 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 7.77818 2.72301 0 0 -0 1.5708 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 10.5278 0.085507 0 0 0 -0.523599 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + 10.3472 -1.82517 0 0 0 -1.5708 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + -13.2921 0.007941 0 0 0 -1.5708 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + 0 0 0 0 -0 0 + + + + -0 0 0 0 0 0 + 1 1 1 + + 0 0 0.1 0 0 0 + 0 -0 -0 0 0 0 + 0 -0 -0 0 -0 0 + 0 -0 -0 0 -0 0 + + + 0.2 0 0.2 0 0 0 + 0 -0 -0 0 0 0 + 0 -0 0 0 -0 0 + 0 -0 0 0 -0 0 + + + -0.1 0.2 0.1 0 0 0 + 0 -0 0 0 0 0 + 0 -0 -0 0 -0 0 + 0 -0 -0 0 -0 0 + + + -0.1 -0.2 0.1 0 0 0 + -0 -0 -0 0 -0 0 + -0 -0 -0 0 -0 0 + -0 -0 -0 0 -0 0 + + + + 0 0 10 0 -0 0 + + + + + -4.72192 -0.583216 33.7134 -0 1.5418 0.060154 + orbit + perspective + + + + \ No newline at end of file