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

groundStation/scripts/bypass_kill_switch.sh

@@ -4,10 +4,18 @@ if [ -z "$1" ]; then
 		echo "No argument supplied"
 		exit 0
 fi
-cd ..
+#cd ..
+
+
+./setsource 35 1 38 0
+./setsource 35 2 38 0
+./setsource 35 3 38 0
+
+./setsource 35 0 13 0
+
 while true ; do
-	./setparam 37 0 $1
+	./setparam 13 0 $(( $1 + 1 ))
 	sleep 0.4
-	./setparam 37 0 $(( $1 - 1 ))
+	./setparam 13 0 $(( $1 - 1 ))
 	sleep 0.4
 done

groundStation/scripts/rate_controller.sh

@@ -45,9 +45,3 @@
 ./setparam "Y vel PID" "kd" -0.02
 
 ./setparam "y vel" "alpha" 0.88
-
-./setparam "x val clamp" 0 -1
-./setparam "x val clamp" 1 1
-
-./setparam "y val clamp" 0 -1
-./setparam "y val clamp" 1 1

groundStation/scripts/take_off.sh

 #! /bin/bash
 
-./setsource "T trim add" "summand 1" "zero" 0
-./setparam "Throttle trim" *wind up value here*
-
-sleep(1);
-
-./setsource "T trim add" "summand 1" "Altitude PID" "Correction"
-./setparam "Throttle trim" *hover value here*
-
-./setparam "Alt Setpoint" 0 -0.3
+#./setsource "T trim add" "summand 1" "zero" 0
+./setsource 14 0 38 0
+#./setparam "Throttle trim" 0 135000
+./setparam 13 0 135000
+
+sleep 2
+
+#./setsource "T trim add" "summand 1" "Altitude PID" "Correction"
+./setsource 14 0 8 0
+#./setparam "Throttle trim" 0 145000 
+./setparam 13 0 150000
+#./setparam "Alt Setpoint" 0 -0.3
+./setparam 11 0 -0.5