altos: Add DATA_TO_XDATA to linux test harness

[fw/altos] / src / ao_flight_test.c

diff --git a/src/ao_flight_test.c b/src/ao_flight_test.c
index 83c630160b03068068aab1cfb1983f9031d7378f..e0cfa47a2a8e3ecc11ffed2c87b36c39e7a4eae6 100644 (file)
--- a/src/ao_flight_test.c
+++ b/src/ao_flight_test.c
@@ -22,6 +22,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define AO_HERTZ       100
+
 #define AO_ADC_RING    64
 #define ao_adc_ring_next(n)    (((n) + 1) & (AO_ADC_RING - 1))
 #define ao_adc_ring_prev(n)    (((n) - 1) & (AO_ADC_RING - 1))
@@ -144,12 +146,15 @@ ao_altitude_to_pres(int16_t alt) __reentrant
 
 struct ao_config {
        uint16_t        main_deploy;
-       int16_t         accel_zero_g;
+       int16_t         accel_plus_g;
+       int16_t         accel_minus_g;
 };
 
 #define ao_config_get()
 
-struct ao_config ao_config = { 250, 16000 };
+struct ao_config ao_config = { 250, 15937, 16467 };
+
+#define DATA_TO_XDATA(x) (x)
 
 #include "ao_flight.c"
 
@@ -214,7 +219,7 @@ ao_sleep(void *wchan)
                                type = words[0][0];
                                tick = strtoul(words[1], NULL, 16);
                                a = strtoul(words[2], NULL, 16);
-                               b = strtoul(words[2], NULL, 16);
+                               b = strtoul(words[3], NULL, 16);
                        } else if (nword >= 36 && strcmp(words[0], "CALL") == 0) {
                                tick = atoi(words[10]);
                                if (!ao_flight_started) {