diff --git a/cob_bringup/CMakeLists.txt b/cob_bringup/CMakeLists.txt index 3348bc795..093a6699e 100644 --- a/cob_bringup/CMakeLists.txt +++ b/cob_bringup/CMakeLists.txt @@ -16,7 +16,7 @@ if(CATKIN_ENABLE_TESTING) endif() ### INSTALL ### -install(DIRECTORY components controllers drivers robots tools +install(DIRECTORY components controllers drivers modules robots tools DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) diff --git a/cob_bringup/drivers/laser_scan_filter.launch b/cob_bringup/drivers/laser_scan_filter.launch index 1acbae89a..5b4c0cd4e 100644 --- a/cob_bringup/drivers/laser_scan_filter.launch +++ b/cob_bringup/drivers/laser_scan_filter.launch @@ -1,12 +1,11 @@ - - + - + $(arg scan_intervals) diff --git a/cob_bringup/drivers/sick_lms1xx.launch b/cob_bringup/drivers/sick_lms1xx.launch index 5ce20df91..fcde7d284 100644 --- a/cob_bringup/drivers/sick_lms1xx.launch +++ b/cob_bringup/drivers/sick_lms1xx.launch @@ -1,24 +1,31 @@ - + + + + - + + + $(arg host) + $(arg inverted) + $(arg frame_id) - - - - + + + + + - - + diff --git a/cob_bringup/drivers/sick_s300.launch b/cob_bringup/drivers/sick_s300.launch index 7ca1d1135..946020dda 100644 --- a/cob_bringup/drivers/sick_s300.launch +++ b/cob_bringup/drivers/sick_s300.launch @@ -1,24 +1,33 @@ - + + + + + - + + + $(arg port) + $(arg inverted) + $(arg scan_id) + $(arg frame_id) - - - - + + + + + - - + diff --git a/cob_bringup/modules/cob4-b3.launch b/cob_bringup/modules/cob4-b3.launch new file mode 100644 index 000000000..25f25a46a --- /dev/null +++ b/cob_bringup/modules/cob4-b3.launch @@ -0,0 +1,5 @@ + + + + + diff --git a/cob_bringup/modules/cob4-b4.launch b/cob_bringup/modules/cob4-b4.launch new file mode 100644 index 000000000..25f25a46a --- /dev/null +++ b/cob_bringup/modules/cob4-b4.launch @@ -0,0 +1,5 @@ + + + + + diff --git a/cob_bringup/modules/cob4-b5.launch b/cob_bringup/modules/cob4-b5.launch new file mode 100644 index 000000000..2e14db3a7 --- /dev/null +++ b/cob_bringup/modules/cob4-b5.launch @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cob_bringup/modules/cob4-b6.launch b/cob_bringup/modules/cob4-b6.launch new file mode 100644 index 000000000..25f25a46a --- /dev/null +++ b/cob_bringup/modules/cob4-b6.launch @@ -0,0 +1,5 @@ + + + + + diff --git a/cob_bringup/modules/cob4-b7.launch b/cob_bringup/modules/cob4-b7.launch new file mode 100644 index 000000000..2e14db3a7 --- /dev/null +++ b/cob_bringup/modules/cob4-b7.launch @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cob_bringup/modules/cob4-b8.launch b/cob_bringup/modules/cob4-b8.launch new file mode 100644 index 000000000..2e14db3a7 --- /dev/null +++ b/cob_bringup/modules/cob4-b8.launch @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cob_bringup/modules/raw3-b1.launch b/cob_bringup/modules/raw3-b1.launch new file mode 100644 index 000000000..6304ba6da --- /dev/null +++ b/cob_bringup/modules/raw3-b1.launch @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/cob_bringup/modules/raw3-b3.launch b/cob_bringup/modules/raw3-b3.launch new file mode 100644 index 000000000..6304ba6da --- /dev/null +++ b/cob_bringup/modules/raw3-b3.launch @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/cob_bringup/modules/raw3-b5.launch b/cob_bringup/modules/raw3-b5.launch new file mode 100644 index 000000000..de20fd2dc --- /dev/null +++ b/cob_bringup/modules/raw3-b5.launch @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/cob_bringup/robots/cob4-2.xml b/cob_bringup/robots/cob4-2.xml index 91f616c0c..50821c6d5 100644 --- a/cob_bringup/robots/cob4-2.xml +++ b/cob_bringup/robots/cob4-2.xml @@ -12,6 +12,8 @@ + + @@ -38,27 +40,16 @@ - - - - - - + - - - - - - + + - - + - diff --git a/cob_bringup/robots/cob4-3.xml b/cob_bringup/robots/cob4-3.xml index 0827845d9..1a0f88903 100644 --- a/cob_bringup/robots/cob4-3.xml +++ b/cob_bringup/robots/cob4-3.xml @@ -6,6 +6,8 @@ + + @@ -26,6 +28,10 @@ + + + + diff --git a/cob_bringup/robots/cob4-4.xml b/cob_bringup/robots/cob4-4.xml index 77db2c397..cbb8af510 100644 --- a/cob_bringup/robots/cob4-4.xml +++ b/cob_bringup/robots/cob4-4.xml @@ -7,6 +7,8 @@ + + @@ -27,6 +29,10 @@ + + + + diff --git a/cob_bringup/robots/cob4-5.xml b/cob_bringup/robots/cob4-5.xml index 0098b54cb..0307cb860 100644 --- a/cob_bringup/robots/cob4-5.xml +++ b/cob_bringup/robots/cob4-5.xml @@ -12,6 +12,8 @@ + + @@ -38,27 +40,16 @@ - - - - - - + - - - - - - + + - - + - diff --git a/cob_bringup/robots/cob4-6.xml b/cob_bringup/robots/cob4-6.xml index 6c720949d..32e294c5b 100644 --- a/cob_bringup/robots/cob4-6.xml +++ b/cob_bringup/robots/cob4-6.xml @@ -7,6 +7,8 @@ + + @@ -27,6 +29,10 @@ + + + + diff --git a/cob_bringup/robots/cob4-7.xml b/cob_bringup/robots/cob4-7.xml index 6633c8fef..7ac8617ec 100644 --- a/cob_bringup/robots/cob4-7.xml +++ b/cob_bringup/robots/cob4-7.xml @@ -12,6 +12,8 @@ + + @@ -38,6 +40,10 @@ + + + + @@ -46,21 +52,6 @@ - - - - - - - - - - - - - - - diff --git a/cob_bringup/robots/raw3-1.xml b/cob_bringup/robots/raw3-1.xml index ba274a96c..187045d7b 100644 --- a/cob_bringup/robots/raw3-1.xml +++ b/cob_bringup/robots/raw3-1.xml @@ -10,6 +10,8 @@ + + @@ -45,16 +47,10 @@ - - - - - - - - + + diff --git a/cob_bringup/robots/raw3-3.xml b/cob_bringup/robots/raw3-3.xml index be3cd37cd..280fc7f8c 100644 --- a/cob_bringup/robots/raw3-3.xml +++ b/cob_bringup/robots/raw3-3.xml @@ -10,6 +10,8 @@ + + @@ -36,16 +38,10 @@ - - - - - - - - + + diff --git a/cob_bringup/robots/raw3-5.xml b/cob_bringup/robots/raw3-5.xml index 6c0ad9e54..927ed1efe 100644 --- a/cob_bringup/robots/raw3-5.xml +++ b/cob_bringup/robots/raw3-5.xml @@ -7,6 +7,8 @@ + + @@ -30,14 +32,7 @@ - - - - - - - - + @@ -64,7 +59,6 @@ - diff --git a/cob_hardware_config/CMakeLists.txt b/cob_hardware_config/CMakeLists.txt index eeb1bbba2..12f392624 100644 --- a/cob_hardware_config/CMakeLists.txt +++ b/cob_hardware_config/CMakeLists.txt @@ -18,7 +18,7 @@ if(CATKIN_ENABLE_TESTING) endif() ### INSTALL ### -install(DIRECTORY robots test +install(DIRECTORY components robots test DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} ) diff --git a/cob_hardware_config/components/sick_lms1xx/sick_lms1xx.yaml b/cob_hardware_config/components/sick_lms1xx/sick_lms1xx.yaml new file mode 100644 index 000000000..4aa8df13a --- /dev/null +++ b/cob_hardware_config/components/sick_lms1xx/sick_lms1xx.yaml @@ -0,0 +1,3 @@ +angle_resolution: 0.25 #deg +scan_frequency: 25 #hz +set_config: false diff --git a/cob_hardware_config/robots/raw3-3/config/base_laser_rear.yaml b/cob_hardware_config/components/sick_s300/sick_s300.yaml similarity index 56% rename from cob_hardware_config/robots/raw3-3/config/base_laser_rear.yaml rename to cob_hardware_config/components/sick_s300/sick_s300.yaml index 4adc524b0..808357da4 100644 --- a/cob_hardware_config/robots/raw3-3/config/base_laser_rear.yaml +++ b/cob_hardware_config/components/sick_s300/sick_s300.yaml @@ -1,9 +1,4 @@ -port: /dev/ttyUSB0 baud: 500000 scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: base_laser_rear_link publish_frequency: 12 -scan_intervals: [[-2.0, 2.0]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/cob4-2/config/base_laser_front.yaml b/cob_hardware_config/robots/cob4-2/config/base_laser_front.yaml deleted file mode 100644 index 2b6a53b70..000000000 --- a/cob_hardware_config/robots/cob4-2/config/base_laser_front.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScanFront -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: /base_laser_front_link -publish_frequency: 12 -scan_intervals: [[-1.5, 1.5]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/cob4-2/config/base_laser_left.yaml b/cob_hardware_config/robots/cob4-2/config/base_laser_left.yaml deleted file mode 100644 index 93039c115..000000000 --- a/cob_hardware_config/robots/cob4-2/config/base_laser_left.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScanLeft -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: /base_laser_left_link -publish_frequency: 12 -scan_intervals: [[-1.5, 1.5]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/cob4-2/config/base_laser_right.yaml b/cob_hardware_config/robots/cob4-2/config/base_laser_right.yaml deleted file mode 100644 index 39770bd4e..000000000 --- a/cob_hardware_config/robots/cob4-2/config/base_laser_right.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScanRight -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 8 -frame_id: /base_laser_right_link -publish_frequency: 12 -scan_intervals: [[-1.5, 1.5]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/cob4-5/config/base_laser_front.yaml b/cob_hardware_config/robots/cob4-5/config/base_laser_front.yaml deleted file mode 100644 index 2b6a53b70..000000000 --- a/cob_hardware_config/robots/cob4-5/config/base_laser_front.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScanFront -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: /base_laser_front_link -publish_frequency: 12 -scan_intervals: [[-1.5, 1.5]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/cob4-5/config/base_laser_left.yaml b/cob_hardware_config/robots/cob4-5/config/base_laser_left.yaml deleted file mode 100644 index 93039c115..000000000 --- a/cob_hardware_config/robots/cob4-5/config/base_laser_left.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScanLeft -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: /base_laser_left_link -publish_frequency: 12 -scan_intervals: [[-1.5, 1.5]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/cob4-5/config/base_laser_right.yaml b/cob_hardware_config/robots/cob4-5/config/base_laser_right.yaml deleted file mode 100644 index 39770bd4e..000000000 --- a/cob_hardware_config/robots/cob4-5/config/base_laser_right.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScanRight -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 8 -frame_id: /base_laser_right_link -publish_frequency: 12 -scan_intervals: [[-1.5, 1.5]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/cob4-7/config/base_laser_front.yaml b/cob_hardware_config/robots/cob4-7/config/base_laser_front.yaml deleted file mode 100644 index 2b6a53b70..000000000 --- a/cob_hardware_config/robots/cob4-7/config/base_laser_front.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScanFront -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: /base_laser_front_link -publish_frequency: 12 -scan_intervals: [[-1.5, 1.5]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/cob4-7/config/base_laser_left.yaml b/cob_hardware_config/robots/cob4-7/config/base_laser_left.yaml deleted file mode 100644 index 93039c115..000000000 --- a/cob_hardware_config/robots/cob4-7/config/base_laser_left.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScanLeft -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: /base_laser_left_link -publish_frequency: 12 -scan_intervals: [[-1.5, 1.5]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/cob4-7/config/base_laser_right.yaml b/cob_hardware_config/robots/cob4-7/config/base_laser_right.yaml deleted file mode 100644 index 39770bd4e..000000000 --- a/cob_hardware_config/robots/cob4-7/config/base_laser_right.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScanRight -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 8 -frame_id: /base_laser_right_link -publish_frequency: 12 -scan_intervals: [[-1.5, 1.5]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/raw3-1/config/base_laser_front.yaml b/cob_hardware_config/robots/raw3-1/config/base_laser_front.yaml deleted file mode 100644 index c69a181c3..000000000 --- a/cob_hardware_config/robots/raw3-1/config/base_laser_front.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScan0 -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: base_laser_front_link -publish_frequency: 12 -scan_intervals: [[-2.0, 2.0]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/raw3-1/config/base_laser_rear.yaml b/cob_hardware_config/robots/raw3-1/config/base_laser_rear.yaml deleted file mode 100644 index 64c170eba..000000000 --- a/cob_hardware_config/robots/raw3-1/config/base_laser_rear.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyScan1 -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: base_laser_rear_link -publish_frequency: 12 -scan_intervals: [[-2.0, 2.0]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/raw3-3/config/base_laser_front.yaml b/cob_hardware_config/robots/raw3-3/config/base_laser_front.yaml deleted file mode 100644 index 1f1b855b0..000000000 --- a/cob_hardware_config/robots/raw3-3/config/base_laser_front.yaml +++ /dev/null @@ -1,9 +0,0 @@ -port: /dev/ttyUSB1 -baud: 500000 -scan_duration: 0.025 #no info about that in SICK-docu, but 0.025 is believable and looks good in rviz -scan_cycle_time: 0.040 #SICK-docu says S300 scans every 40ms -inverted: false -scan_id: 7 -frame_id: base_laser_front_link -publish_frequency: 12 -scan_intervals: [[-2.0, 2.0]] #[rad] these intervals are included to the scan diff --git a/cob_hardware_config/robots/raw3-5/config/base_laser_front.yaml b/cob_hardware_config/robots/raw3-5/config/base_laser_front.yaml deleted file mode 100644 index 27075848f..000000000 --- a/cob_hardware_config/robots/raw3-5/config/base_laser_front.yaml +++ /dev/null @@ -1,7 +0,0 @@ -host: 141.3.80.116 -angle_resolution: 0.25 #deg -scan_frequency: 25 #hz -inverted: true -frame_id: base_laser_front_link -scan_intervals: [[-2.0, 2.0]] #[rad] these intervals are included to the scan -set_config: false diff --git a/cob_hardware_config/robots/raw3-5/config/base_laser_rear.yaml b/cob_hardware_config/robots/raw3-5/config/base_laser_rear.yaml deleted file mode 100644 index 187a2efda..000000000 --- a/cob_hardware_config/robots/raw3-5/config/base_laser_rear.yaml +++ /dev/null @@ -1,7 +0,0 @@ -host: 141.3.80.115 -angle_resolution: 0.25 #deg -scan_frequency: 25 #hz -inverted: true -frame_id: base_laser_rear_link -scan_intervals: [[-2.0, 2.0]] #[rad] these intervals are included to the scan -set_config: false