X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fao_flight_test.c;h=b9e291cec1c2de71e9d53e52c04ea17cc93b34a8;hb=e45c47c52f9cc9c43b81148e0e58fdedb3af1eb8;hp=9bb03d682f55c3c97fe2de9da639fdee5aecdb2c;hpb=1ae3f467a1d7be2fc3b1a45ba12568a3a25a0099;p=fw%2Faltos

diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index 9bb03d68..b9e291ce 100644
--- 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))
@@ -180,6 +189,7 @@ struct ao_cmds {
 #define ao_xmemset(d,v,c) memset(d,v,c)
 #define ao_xmemcmp(d,s,c) memcmp(d,s,c)
 
+#define AO_NEED_ALTITUDE_TO_PRES 1
 #include "ao_convert.c"
 
 struct ao_config {
@@ -199,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;