Resolved stash conflicts

controls/DataAnalysisTool/Tool/simplePlots.m

@@ -263,7 +263,7 @@ figure;
 offsetX = 0;
 offsetY = 0;
 
-ax1 = subplot(3, 1, 1);
+ax1 = subplot(4, 1, 1);
 plot(expData.Time.data, expData.OF_Integrate_X_Integrated.data - offsetX); hold on; grid minor
 plot(expData.Time.data, expData.VRPN_X_Constant.data);
 plot(expData.Time.data, expData.X_Setpoint_Constant.data);
@@ -272,7 +272,7 @@ xlabel('Time (s)');
 ylabel('Displacement (m)');
 hold off;
 
-ax2 = subplot(3, 1, 2);
+ax2 = subplot(4, 1, 2);
 plot(expData.Time.data, expData.OF_Integrate_Y_Integrated.data - offsetY); hold on; grid minor
 plot(expData.Time.data, expData.VRPN_Y_Constant.data);
 plot(expData.Time.data, expData.Y_Setpoint_Constant.data);
@@ -281,7 +281,7 @@ xlabel('Time (s)');
 ylabel('Displacement (m)');
 hold off;
 
-ax3 = subplot(3, 1, 3);
+ax3 = subplot(4, 1, 3);
 plot(expData.Time.data, expData.Lidar_Constant.data); hold on; grid minor
 plot(expData.Time.data, expData.VRPN_Alt_Constant.data);
 plot(expData.Time.data, expData.Alt_Setpoint_Constant.data);
@@ -290,10 +290,11 @@ xlabel('Time (s)');
 ylabel('Displacement (m)');
 hold off;
 
-linkaxes([ax1, ax2, ax3], 'x');
-
+ax4 = subplot(4, 1, 4);
+plot(expData.Time.data, expData.Flow_Quality_Constant.data);
+title('Flow Quality');
 
-linkaxes([ax1, ax2, ax3], 'x');
+linkaxes([ax1, ax2, ax3, ax4], 'x');
 %% Error Graphs
 figure;
 ax1 = subplot(2,1,1);
@@ -410,4 +411,4 @@ for n = 2:length(mag)
     else
         count = 0;
     end
-end
\ No newline at end of file
+end

groundStation/scripts/touch_down.sh

@@ -10,12 +10,12 @@ alt="$(echo "$(./getparam 'VRPN Alt' 0)" | grep -Eo "$regex")"
 while awk 'BEGIN { if ('$alt'>='$cut_off') {exit 1}}'; do
 	if (( $(bc <<< "$alt < -0.5") )); then
 		alt="$(echo "$(./getparam 'VRPN Alt' 0)" | grep -Eo "$regex")"
-		./setparam 'Alt Setpoint' 0 $( bc <<< "$alt + 0.15")
+		./setparam 'Alt Setpoint' 0 $( bc <<< "$alt + 0.25")
 	else
 		alt="$(echo "$(./getparam 'VRPN Alt' 0)" | grep -Eo "$regex")"
-		./setparam 'Alt Setpoint' 0 $( bc <<< "$alt + 0.25")
+		./setparam 'Alt Setpoint' 0 $( bc <<< "$alt + 0.35")
 	fi
-	sleep .5
+	sleep .1
 done
 
 #./setparam "Throttle trim" 0 0

groundStation/scripts/tuning.txt

-lat p -0.01
-lat i 0
-lat d -0.05
-long p 0.01
-long i 0
-long d 0.05