diff --git a/groundStation/scripts/take_off.sh b/groundStation/scripts/take_off.sh index 167bd866daa757cb7f4f0b442c29c1f1eb3bc39e..649f5499bf4a51c493f416231e25a8351f2c3555 100755 --- a/groundStation/scripts/take_off.sh +++ b/groundStation/scripts/take_off.sh @@ -10,7 +10,7 @@ sleep 2 ./setsource "T trim add" "summand 1" "Altitude PID" "Correction" #./setsource 14 0 8 0 -./setparam "Throttle trim" 0 0.45 +./setparam "Throttle trim" 0 0.5 #./setparam 13 0 0.45 ./setparam "Alt Setpoint" 0 -0.88 #./setparam 11 0 -0.5 diff --git a/groundStation/scripts/touch_down.sh b/groundStation/scripts/touch_down.sh index 3bfb41533c077cfd5b998d59a62615bd24b53fa7..79a4bc11dc49dce027e4438eae05aa819b512c78 100755 --- a/groundStation/scripts/touch_down.sh +++ b/groundStation/scripts/touch_down.sh @@ -1,6 +1,6 @@ #! /bin/bash -cut_off="-0.25" +cut_off="-0.15" regex='[+-]?[0-9]+\.?[0-9]*$' @@ -8,9 +8,13 @@ regex='[+-]?[0-9]+\.?[0-9]*$' alt="$(echo "$(./getparam 'VRPN Alt' 0)" | grep -Eo "$regex")" while awk 'BEGIN { if ('$alt'>='$cut_off') {exit 1}}'; do - alt="$(echo "$(./getparam 'VRPN Alt' 0)" | grep -Eo "$regex")" - ./setparam 'Alt Setpoint' 0 $( bc <<< "$alt + 0.1") - echo "$alt too high" + if (( $(bc <<< "$alt < -0.5") )); then + alt="$(echo "$(./getparam 'VRPN Alt' 0)" | grep -Eo "$regex")" + ./setparam 'Alt Setpoint' 0 $( bc <<< "$alt + 0.15") + else + alt="$(echo "$(./getparam 'VRPN Alt' 0)" | grep -Eo "$regex")" + ./setparam 'Alt Setpoint' 0 $( bc <<< "$alt + 0.25") + fi sleep .5 done