altos: Clean up flight data definitions

[fw/altos] / src / test / ao_flight_test.c

diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index a4ef8dc097c4bb127f6a47f25a9db2fa64c5f177..b9e291cec1c2de71e9d53e52c04ea17cc93b34a8 100644 (file)
--- a/src/test/ao_flight_test.c
+++ b/src/test/ao_flight_test.c
@@ -54,6 +54,15 @@ struct ao_adc {
 #define __code
 #define __reentrant
 
+#define HAS_FLIGHT 1
+#define HAS_IGNITE 1
+#define HAS_USB 1
+#define HAS_GPS 1
+#ifndef HAS_ACCEL
+#define HAS_ACCEL 1
+#define HAS_ACCEL_REF 0
+#endif
+
 #include <ao_data.h>
 
 #define to_fix16(x) ((int16_t) ((x) * 65536.0 + 0.5))
@@ -200,24 +209,17 @@ struct ao_config ao_config;
 
 #define DATA_TO_XDATA(x) (x)
 
-#define HAS_FLIGHT 1
-#define HAS_IGNITE 1
-#define HAS_ADC 1
-#define HAS_USB 1
-#define HAS_GPS 1
-#ifndef HAS_ACCEL
-#define HAS_ACCEL 1
-#define HAS_ACCEL_REF 0
-#endif
 
 #define GRAVITY 9.80665
 extern int16_t ao_ground_accel, ao_flight_accel;
 extern int16_t ao_accel_2g;
 
+typedef int16_t        accel_t;
+
 extern uint16_t        ao_sample_tick;
 
 extern int16_t ao_sample_height;
-extern int16_t ao_sample_accel;
+extern accel_t ao_sample_accel;
 extern int32_t ao_accel_scale;
 extern int16_t ao_ground_height;
 extern int16_t ao_sample_alt;