X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftest%2Fao_flight_test.c;h=1ab22e5b6acf4cd5af37d4e98b513b61b68fbb0f;hb=214a38eb2b084baec526aa42016eddb954038639;hp=1ee3ad2756fd9d79cf0d8ea28c656be5f3f2ba15;hpb=3d5db24708b37d86eac187169e2553a408dfeb83;p=fw%2Faltos

diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index 1ee3ad27..1ab22e5b 100644
--- a/src/test/ao_flight_test.c
+++ b/src/test/ao_flight_test.c
@@ -49,13 +49,13 @@ int ao_gps_new;
 #define HAS_MPU6000		1
 #define HAS_MMA655X		1
 #define HAS_HMC5883 		1
+#define HAS_BEEP		1
+#define AO_CONFIG_MAX_SIZE	1024
 
 struct ao_adc {
 	int16_t			sense[AO_ADC_NUM_SENSE];
 	int16_t			v_batt;
 	int16_t			v_pbatt;
-	int16_t			accel_ref;
-	int16_t			accel;
 	int16_t			temp;
 };
 #else
@@ -317,22 +317,8 @@ struct ao_ms5607_prom	ao_ms5607_prom;
 #include "ao_convert.c"
 #endif
 
-struct ao_config {
-	uint16_t	main_deploy;
-	int16_t		accel_plus_g;
-	int16_t		accel_minus_g;
-	uint8_t		pad_orientation;
-	uint16_t	apogee_lockout;
-#if TELEMEGA
-	struct ao_pyro	pyro[AO_PYRO_NUM];	/* minor version 12 */
-	int16_t		accel_zero_along;
-	int16_t		accel_zero_across;
-	int16_t		accel_zero_through;
-#endif
-};
-
-#define AO_PAD_ORIENTATION_ANTENNA_UP	0
-#define AO_PAD_ORIENTATION_ANTENNA_DOWN	1
+#include <ao_config.h>
+#include <ao_fake_flight.h>
 
 #define ao_config_get()
 
@@ -810,6 +796,7 @@ ao_sleep(void *wchan)
 					pyro->flags |= ao_pyro_values[j].flag;
 					if (ao_pyro_values[j].offset != NO_VALUE && i + 1 < nword) {
 						int16_t	val = strtoul(words[++i], NULL, 10);
+						printf("pyro %d condition %s value %d\n", p, words[i-1], val);
 						*((int16_t *) ((char *) pyro + ao_pyro_values[j].offset)) = val;
 					}
 				}
@@ -1003,6 +990,7 @@ void run_flight_fixed(char *name, FILE *f, int summary, char *info)
 	emulator_in = f;
 	emulator_info = info;
 	ao_summary = summary;
+
 	ao_flight_init();
 	ao_flight();
 }