X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftest%2Fao_flight_test.c;h=ff480e2db9fd7ff7890ebbc46f309870c51e9c64;hp=746a681463ab4d2238f3f457c3470b9e15fcc07b;hb=8be4e3b8faac362665641e98a1df1e1e8a681b7a;hpb=e56e1dc20b3bf18073766da4e26e97d9e1d419fc

diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index 746a6814..ff480e2d 100644
--- a/src/test/ao_flight_test.c
+++ b/src/test/ao_flight_test.c
@@ -119,17 +119,22 @@ struct ao_adc {
 
 #endif
 
-#define __pdata
-#define __data
-#define __xdata
-#define __code
-#define __reentrant
+#define const
 
 #define HAS_FLIGHT 1
 #define HAS_IGNITE 1
 #define HAS_USB 1
 #define HAS_GPS 1
 
+int16_t
+ao_time(void);
+
+void
+ao_dump_state(void);
+
+#define ao_tick_count	(ao_time())
+#define ao_wakeup(wchan) ao_dump_state()
+
 #include <ao_data.h>
 #include <ao_log.h>
 #include <ao_telemetry.h>
@@ -231,8 +236,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;
@@ -241,7 +246,6 @@ int	ao_summary = 0;
 #define ao_led_on(l)
 #define ao_led_off(l)
 #define ao_timer_set_adc_interval(i)
-#define ao_wakeup(wchan) ao_dump_state()
 #define ao_cmd_register(c)
 #define ao_usb_disable()
 #define ao_telemetry_set_interval(x)
@@ -319,9 +323,6 @@ char *emulator_info;
 double emulator_error_max = 4;
 double emulator_height_error_max = 20;	/* noise in the baro sensor */
 
-void
-ao_dump_state(void);
-
 void
 ao_sleep(void *wchan);
 
@@ -335,10 +336,6 @@ struct ao_cmds {
 	const char	*help;
 };
 
-#define ao_xmemcpy(d,s,c) memcpy(d,s,c)
-#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
 #if TELEMEGA || TELEMETRUM_V2 || EASYMINI
 #include "ao_convert_pa.c"
@@ -362,9 +359,6 @@ struct ao_ms5607_prom	ao_ms5607_prom;
 
 struct ao_config ao_config;
 
-#define DATA_TO_XDATA(x) (x)
-
-
 extern int16_t ao_ground_accel, ao_flight_accel;
 extern int16_t ao_accel_2g;
 
@@ -658,6 +652,7 @@ ao_insert(void)
 #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 "
+			       "avg_accel %8.3f "
 #endif
 			       "\n",
 			       time,
@@ -684,7 +679,8 @@ ao_insert(void)
 			       ao_data_static.hmc5883.x,
 			       ao_data_static.hmc5883.y,
 			       ao_data_static.hmc5883.z,
-			       ao_mag_angle
+			       ao_mag_angle,
+			       ao_coast_avg_accel / 16.0
 #endif
 				);
 #endif