From 6ba95706865840182d519847cd0411244acd8317 Mon Sep 17 00:00:00 2001 From: stibipet Date: Fri, 2 Feb 2024 14:59:09 +0100 Subject: [PATCH 1/2] update simulation script for 2 drones --- scripts/two_drones/session.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/two_drones/session.yml b/scripts/two_drones/session.yml index 7ca80ee..91bbbb4 100644 --- a/scripts/two_drones/session.yml +++ b/scripts/two_drones/session.yml @@ -25,8 +25,8 @@ windows: - spawn: layout: tiled panes: - - waitForGazebo; rosservice call /mrs_drone_spawner/spawn "1 $UAV_TYPE --pos-file $(rospack find uvdar_core)/scripts/position1.csv --enable-rangefinder --enable-ground-truth --enable-dual-uv-cameras --enable-back-uv-camera --uvcam_calib_file \"$(rospack find uvdar_core)/config/ocamcalib/calib_results_bf_uv_fe.txt\"" - - waitForGazebo; sleep 12; rosservice call /mrs_drone_spawner/spawn "2 $UAV_TYPE --pos-file $(rospack find uvdar_core)/scripts/position2.csv --enable-rangefinder --enable-ground-truth --enable-uv-leds --uvled_s 0 1 2 3" + - waitForGazebo; rosservice call /mrs_drone_spawner/spawn "1 --$UAV_TYPE --pos-file $(rospack find uvdar_core)/scripts/position1.csv --enable-rangefinder --enable-ground-truth --enable-dual-uv-cameras calib_file:=$(rospack find uvdar_core)/config/ocamcalib/calib_results_bf_uv_fe.txt --enable-back-uv-camera calib_file:=$(rospack find uvdar_core)/config/ocamcalib/calib_results_bf_uv_fe.txt" + - waitForGazebo; sleep 12; rosservice call /mrs_drone_spawner/spawn "2 $UAV_TYPE --pos-file $(rospack find uvdar_core)/scripts/position2.csv --enable-rangefinder --enable-ground-truth --enable-uv-leds signal_id:=[0,1,2,3]" - hw_api: layout: tiled panes: From 518dcb18e6e6200bf0c41fc6a97a903249075b2c Mon Sep 17 00:00:00 2001 From: stibipet Date: Fri, 2 Feb 2024 15:02:14 +0100 Subject: [PATCH 2/2] fix UAV TYPE --- scripts/two_drones/session.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/two_drones/session.yml b/scripts/two_drones/session.yml index 91bbbb4..0be57e6 100644 --- a/scripts/two_drones/session.yml +++ b/scripts/two_drones/session.yml @@ -26,7 +26,7 @@ windows: layout: tiled panes: - waitForGazebo; rosservice call /mrs_drone_spawner/spawn "1 --$UAV_TYPE --pos-file $(rospack find uvdar_core)/scripts/position1.csv --enable-rangefinder --enable-ground-truth --enable-dual-uv-cameras calib_file:=$(rospack find uvdar_core)/config/ocamcalib/calib_results_bf_uv_fe.txt --enable-back-uv-camera calib_file:=$(rospack find uvdar_core)/config/ocamcalib/calib_results_bf_uv_fe.txt" - - waitForGazebo; sleep 12; rosservice call /mrs_drone_spawner/spawn "2 $UAV_TYPE --pos-file $(rospack find uvdar_core)/scripts/position2.csv --enable-rangefinder --enable-ground-truth --enable-uv-leds signal_id:=[0,1,2,3]" + - waitForGazebo; sleep 12; rosservice call /mrs_drone_spawner/spawn "2 --$UAV_TYPE --pos-file $(rospack find uvdar_core)/scripts/position2.csv --enable-rangefinder --enable-ground-truth --enable-uv-leds signal_id:=[0,1,2,3]" - hw_api: layout: tiled panes: