From 643e9db68045244f6c59c17c079dcd9d1cf7445f Mon Sep 17 00:00:00 2001
From: ucart <ucart_groundstation@iastate.edu>
Date: Thu, 13 Apr 2017 22:26:52 -0500
Subject: [PATCH] updates to takeoff and touchdown scripts
---
groundStation/scripts/take_off.sh | 4 ++--
groundStation/scripts/touch_down.sh | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/groundStation/scripts/take_off.sh b/groundStation/scripts/take_off.sh
index 956374e9c..a1c34e277 100755
--- a/groundStation/scripts/take_off.sh
+++ b/groundStation/scripts/take_off.sh
@@ -1,7 +1,7 @@
#! /bin/bash
#./setsource "T trim add" "summand 1" "zero" 0
-./setsource 14 0 45 0
+./setsource 14 0 46 0
#./setparam "Throttle trim" 0 135000
./setparam 13 0 135000
@@ -13,4 +13,4 @@ sleep 2
#./setparam "Throttle trim" 0 145000
./setparam 13 0 150000
#./setparam "Alt Setpoint" 0 -0.88
-./setparam 11 0 -0.88
+./setparam 11 0 -0.5
diff --git a/groundStation/scripts/touch_down.sh b/groundStation/scripts/touch_down.sh
index 57b5e04aa..3bfb41533 100755
--- a/groundStation/scripts/touch_down.sh
+++ b/groundStation/scripts/touch_down.sh
@@ -1,20 +1,20 @@
#! /bin/bash
-cut_off="-0.2"
+cut_off="-0.25"
regex='[+-]?[0-9]+\.?[0-9]*$'
-alt="$(echo "$(./getparam 33 0)" | grep -Eo "$regex")"
+alt="$(echo "$(./getparam 'VRPN Alt' 0)" | grep -Eo "$regex")"
while awk 'BEGIN { if ('$alt'>='$cut_off') {exit 1}}'; do
- alt="$(echo "$(./getparam 33 0)" | grep -Eo "$regex")"
- ./setparam 11 0 $( bc <<< "$alt - 0.01")
+ alt="$(echo "$(./getparam 'VRPN Alt' 0)" | grep -Eo "$regex")"
+ ./setparam 'Alt Setpoint' 0 $( bc <<< "$alt + 0.1")
echo "$alt too high"
sleep .5
done
#./setparam "Throttle trim" 0 0
-./setparam 13 0 0
+./setparam 'Throttle trim' 0 0
#./setsource "T trim add" "summand 1" "zero" 0
-./setsource 14 0 45 0
+./setsource 'T trim add' 'summand 1' 'zero' 0
--
GitLab