diff --git a/scripts/rx.sh b/scripts/rx.sh index 7d44029..c452d1d 100755 --- a/scripts/rx.sh +++ b/scripts/rx.sh @@ -53,7 +53,7 @@ input=( ' 'uvdar_filter' 'waitForRos; roslaunch uvdar_core uvdar_kalman.launch output_frame:='"$UAV_NAME"'/stable_origin ' - 'Trajectory' 'history -s rosservice call /'"$UAV_NAME"'/control_manager/stop_trajectory_tracking; rosservice call /'"$UAV_NAME"'/control_manager/goto_trajectory_start; history -s roslaunch uvdar_core load_trajectory.launch file:="trajectory_rx.txt"; + 'Trajectory' 'history -s rosservice call /'"$UAV_NAME"'/control_manager/stop_trajectory_tracking; rosservice call /'"$UAV_NAME"'/control_manager/start_trajectory_tracking; rosservice call /'"$UAV_NAME"'/control_manager/goto_trajectory_start; history -s roslaunch uvdar_core load_trajectory.launch file:="trajectory_rx.txt"; ' 'record' 'waitForRos; history -s rosbag record -O ~/rosbags/marlon/exp1/test.bag /'"$UAV_NAME"'/uvdar/adaptive_logging_back /'"$UAV_NAME"'/uvdar/adaptive_logging_left /uav1/uvdar/adaptive_logging_right /'"$UAV_NAME"'/uvdar/blinkers_seen_back /'"$UAV_NAME"'/uvdar/blinkers_seen_left /'"$UAV_NAME"'/uvdar/blinkers_seen_right /'"$UAV_NAME"'/control_manager/control_reference --duration=30s; ' diff --git a/scripts/tx.sh b/scripts/tx.sh index 29faf89..eda3c40 100755 --- a/scripts/tx.sh +++ b/scripts/tx.sh @@ -53,7 +53,7 @@ input=( ' 'load_sequence' 'waitForRos; history -s rosservice call /'"$UAV_NAME"'/uvdar_led_manager_node/select_sequences [0,1,2,3]; history -s rosservice call /'"$UAV_NAME"'/uvdar_led_manager_node/load_sequences; ' - 'Trajectory' 'history -s rosservice call /'"$UAV_NAME"'/control_manager/stop_trajectory_tracking; rosservice call /'"$UAV_NAME"'/control_manager/goto_trajectory_start; history -s roslaunch uvdar_core load_trajectory.launch file:="trajectory_tx.txt"; + 'Trajectory' 'history -s rosservice call /'"$UAV_NAME"'/control_manager/stop_trajectory_tracking; rosservice call /'"$UAV_NAME"'/control_manager/start_trajectory_tracking; rosservice call /'"$UAV_NAME"'/control_manager/goto_trajectory_start; history -s roslaunch uvdar_core load_trajectory.launch file:="trajectory_tx.txt"; ' # do NOT modify the command list below 'EstimDiag' 'waitForHw; rostopic echo /'"$UAV_NAME"'/estimation_manager/diagnostics