X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fao_flight_test.c;h=6d007575c7f91d2871ce0a223f15ada7261890c9;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hp=2d862f82a944f5663281273bbcf52b1c45b859a7;hpb=a2097545dec62cd0970725bf690128dad6baf22e;p=fw%2Faltos

diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index 2d862f82..6d007575 100644
--- a/src/test/ao_flight_test.c
+++ b/src/test/ao_flight_test.c
@@ -119,11 +119,7 @@ struct ao_adc {
 
 #endif
 
-#define __pdata
-#define __data
-#define __xdata
-#define __code
-#define __reentrant
+#define const
 
 #define HAS_FLIGHT 1
 #define HAS_IGNITE 1
@@ -231,8 +227,8 @@ ao_gps_angle(void)
 
 extern enum ao_flight_state ao_flight_state;
 
-#define FALSE 0
-#define TRUE 1
+#define false 0
+#define true 1
 
 volatile struct ao_data ao_data_ring[AO_DATA_RING];
 volatile uint8_t ao_data_head;
@@ -305,7 +301,7 @@ struct ao_task {
 #define AO_MS_TO_TICKS(ms)	((ms) / 10)
 #define AO_SEC_TO_TICKS(s)	((s) * 100)
 
-#define AO_FLIGHT_TEST
+#define AO_FLIGHT_TEST	1
 
 int	ao_flight_debug;
 
@@ -362,7 +358,7 @@ struct ao_ms5607_prom	ao_ms5607_prom;
 
 struct ao_config ao_config;
 
-#define DATA_TO_XDATA(x) (x)
+#define x (x)
 
 
 extern int16_t ao_ground_accel, ao_flight_accel;
@@ -438,10 +434,6 @@ static uint16_t	pyros_fired;
 static struct ao_mpu6000_sample	ao_ground_mpu6000;
 #endif
 
-#if HAS_ACCEL
-int ao_error_h_sq_avg;
-#endif
-
 void
 ao_test_exit(void)
 {
@@ -504,7 +496,7 @@ ao_insert(void)
 	ao_data_ring[ao_data_head] = ao_data_static;
 	if (ao_flight_state != ao_flight_startup) {
 #if HAS_ACCEL
-		double  accel = ((ao_flight_ground_accel - ao_data_accel_cook(&ao_data_static)) * GRAVITY * 2.0) /
+		double  accel = ((ao_flight_ground_accel - ao_data_accel(&ao_data_static)) * GRAVITY * 2.0) /
 			(ao_config.accel_minus_g - ao_config.accel_plus_g);
 #else
 		double	accel = 0.0;
@@ -515,7 +507,12 @@ ao_insert(void)
 			tick_offset = -ao_data_static.tick;
 		if ((prev_tick - ao_data_static.tick) > 0x400)
 			tick_offset += 65536;
-		simple_speed += accel * (ao_data_static.tick - prev_tick) / 100.0;
+		if (prev_tick) {
+			int ticks = ao_data_static.tick - prev_tick;
+			if (ticks < 0)
+				ticks += 65536;
+			simple_speed += accel * ticks / 100.0;
+		}
 		prev_tick = ao_data_static.tick;
 		time = (double) (ao_data_static.tick + tick_offset) / 100;
 
@@ -653,7 +650,7 @@ ao_insert(void)
 
 #if 1
 			printf("%7.2f height %8.2f accel %8.3f accel_speed %8.3f "
-			       "state %-8.8s k_height %8.2f k_speed %8.3f k_accel %8.3f avg_height %5d drogue %4d main %4d error %5d"
+			       "state %d k_height %8.2f k_speed %8.3f k_accel %8.3f avg_height %5d drogue %4d main %4d error %5d"
 #if TELEMEGA
 			       " angle %5d "
 			       "accel_x %8.3f accel_y %8.3f accel_z %8.3f gyro_x %8.3f gyro_y %8.3f gyro_z %8.3f mag_x %8d mag_y %8d, mag_z %8d mag_angle %4d "
@@ -663,7 +660,7 @@ ao_insert(void)
 			       height,
 			       accel,
 			       simple_speed > -100.0 ? simple_speed : -100.0,
-			       ao_state_names[ao_flight_state],
+			       ao_flight_state * 10,
 			       ao_k_height / 65536.0,
 			       ao_k_speed / 65536.0 / 16.0,
 			       ao_k_accel / 65536.0 / 16.0,