Merge branch 'master' of git.ece.iastate.edu:danc/MicroCART_17-18

groundStation/scripts/take_off.sh

 #! /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

groundStation/scripts/touch_down.sh

 #! /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