From 396b3034b4055e7dbd0da7ba6618792efb4f64d0 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 20 Apr 2024 18:45:21 +0200 Subject: [PATCH] Added modified launch file and rx script --- launch/rw_three_sided_marlon_v2.launch | 400 ++++++++++++++++++++ scripts/rx.sh | 2 +- scripts/two_drones/config/world_config.yaml | 2 +- 3 files changed, 402 insertions(+), 2 deletions(-) create mode 100644 launch/rw_three_sided_marlon_v2.launch diff --git a/launch/rw_three_sided_marlon_v2.launch b/launch/rw_three_sided_marlon_v2.launch new file mode 100644 index 0000000..9332ffe --- /dev/null +++ b/launch/rw_three_sided_marlon_v2.launch @@ -0,0 +1,400 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ["$(arg calibrations_folder)/masks/$(arg mrs_id)_$(arg left).png", "$(arg calibrations_folder)/masks/$(arg mrs_id)_$(arg right).png", "$(arg calibrations_folder)/masks/default_back.png"] + + ["camera_left", "camera_right", "camera_back"] + ["points_seen_left", "points_seen_right", "points_seen_back"] + + ["blinkers_seen_left", "blinkers_seen_right", "blinkers_seen_back"] + ["adaptive_logging_left", "adaptive_logging_right", "adaptive_logging_back"] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [$(arg id1), $(arg id2), $(arg id3), $(arg id4), $(arg id5), $(arg id6), $(arg id7), $(arg id8), $(arg id9), $(arg id10), $(arg id11), $(arg id12), $(arg id13), $(arg id14), $(arg id15), $(arg id16), $(arg id17), $(arg id18), $(arg id19), $(arg id20), $(arg id21)] + + + + + + + + + + + + + + + + + + + + + + + + + ["camera_left", "camera_right", "camera_back"] + ["points_seen_left", "points_seen_right", "points_seen_back"] + ["blinkers_seen_left", "blinkers_seen_right", "blinkers_seen_back"] + ["estimated_framerate_left", "estimated_framerate_right", "estimated_framerate_back"] + + ["ami_logging_left", "ami_logging_right", "ami_logging_back"] + ["ami_all_seq_info_left", "ami_all_seq_info_right", "ami_all_seq_info_back"] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [$(arg id1), $(arg id2), $(arg id3), $(arg id4), $(arg id5), $(arg id6), $(arg id7), $(arg id8), $(arg id9), $(arg id10), $(arg id11), $(arg id12), $(arg id13), $(arg id14), $(arg id15), $(arg id16), $(arg id17), $(arg id18), $(arg id19), $(arg id20), $(arg id21)] + + + + + + + ["blinkers_seen_left", "blinkers_seen_right", "blinkers_seen_back"] + ["estimated_framerate_left", "estimated_framerate_right", "estimated_framerate_back"] + ["$(arg uav_name)/uvcam_left", "$(arg uav_name)/uvcam_right", "$(arg uav_name)/uvcam_back"] + + + + + + + + + ["$(arg calibrations_folder)/camera_calibrations/calib_results_bf_uv_$(arg left).txt", "$(arg calibrations_folder)/camera_calibrations/calib_results_bf_uv_$(arg right).txt", "$(arg calibrations_folder)/camera_calibrations/calib_results_bf_uv_$(arg back).txt"] + + + + + + + + + diff --git a/scripts/rx.sh b/scripts/rx.sh index e5e6cfb..7d44029 100755 --- a/scripts/rx.sh +++ b/scripts/rx.sh @@ -49,7 +49,7 @@ input=( ' 'AutoStart' 'waitForHw; roslaunch mrs_uav_autostart automatic_start.launch ' - 'uvdar_observer' 'waitForRos; roslaunch uvdar_core rw_three_sided_marlon.launch + 'uvdar_observer' 'waitForRos; roslaunch uvdar_core rw_three_sided_marlon_v2.launch ' 'uvdar_filter' 'waitForRos; roslaunch uvdar_core uvdar_kalman.launch output_frame:='"$UAV_NAME"'/stable_origin ' diff --git a/scripts/two_drones/config/world_config.yaml b/scripts/two_drones/config/world_config.yaml index 9b55067..00e01ee 100644 --- a/scripts/two_drones/config/world_config.yaml +++ b/scripts/two_drones/config/world_config.yaml @@ -7,7 +7,7 @@ world_origin: safety_area: - enabled: true + enabled: false horizontal: