X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_flight.c;h=883098ed9bdebbb08ff1a29432861b3c34ab6fc6;hb=7e9c34487b8e63c17be78e36fec18d5d761a98c9;hp=10f6eb204a5da75a8ed0698b9c740c6af1adbf30;hpb=9cc485e9454af7c09c0b35e7ae4d1c718158a38e;p=fw%2Faltos

diff --git a/src/kernel/ao_flight.c b/src/kernel/ao_flight.c
index 10f6eb20..883098ed 100644
--- a/src/kernel/ao_flight.c
+++ b/src/kernel/ao_flight.c
@@ -102,15 +102,6 @@ uint8_t			ao_flight_force_idle;
 
 #define abs(a)	((a) < 0 ? -(a) : (a))
 
-#if 0
-static bool accel_plus_g_failed;
-static bool accel_minus_g_failed;
-static bool accel_plus_failed;
-static bool accel_minus_failed;
-
-static char *btos(bool x) { return x? "true" : "false"; }
-#endif
-
 void
 ao_flight(void)
 {
@@ -144,16 +135,6 @@ ao_flight(void)
 #endif
 				)
 			{
-#if 0
-				if (ao_config.accel_plus_g == 0)
-					accel_plus_g_failed = true;
-				if (ao_config.accel_minus_g == 0)
-					accel_minus_g_failed = true;
-				if (ao_ground_accel < (accel_t) ao_config.accel_plus_g - ACCEL_NOSE_UP)
-					accel_plus_failed = true;
-				if (ao_ground_accel > (accel_t) ao_config.accel_minus_g + ACCEL_NOSE_UP)
-					accel_minus_failed = true;
-#endif
 				/* Detected an accel value outside -1.5g to 1.5g
 				 * (or uncalibrated values), so we go into invalid mode
 				 */
@@ -220,21 +201,11 @@ ao_flight(void)
 
 			break;
 
-#if 0
+#if DEBUG_ACCEL_ONLY
 		case ao_flight_invalid:
-			printf("+g? %s -g? %s +? %s -? %s +g %d -g %d ga %d +g-NU %d -g+NU %d\n",
-			       btos(accel_plus_g_failed),
-			       btos(accel_minus_g_failed),
-			       btos(accel_plus_failed),
-			       btos(accel_minus_failed),
-			       ao_config.accel_plus_g,
-			       ao_config.accel_minus_g,
-			       ao_ground_accel,
-			       ao_config.accel_plus_g - ACCEL_NOSE_UP,
-			       ao_config.accel_minus_g + ACCEL_NOSE_UP);
-			break;
 		case ao_flight_idle:
-			printf("+g %d ga %d sa %d accel %ld speed %ld\n", ao_config.accel_plus_g, ao_ground_accel, ao_sample_accel, ao_accel, ao_speed);
+			printf("+g %d ga %d sa %d accel %ld speed %ld\n",
+			       ao_config.accel_plus_g, ao_ground_accel, ao_sample_accel, ao_accel, ao_speed);
 			break;
 #endif