diff options
| author | Bdale Garbee <bdale@gag.com> | 2019-01-02 22:23:04 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2019-01-02 22:23:04 -0700 |
| commit | b340cbf1403a5f5b181a215935f713a50da8e5e4 (patch) | |
| tree | 8c0d2afbe8168c29584e0d568b80353fdf555883 /src/test/ao_flight_test.c | |
| parent | 1da4b57545233f2f2afd350bd8aed4ef7bb0c844 (diff) | |
| parent | 95ffec073b0758801df04a77eca0bd2bc6e57e35 (diff) | |
Merge branch 'branch-1.9' into debian
Diffstat (limited to 'src/test/ao_flight_test.c')
| -rw-r--r-- | src/test/ao_flight_test.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c index 746a6814..6d007575 100644 --- a/src/test/ao_flight_test.c +++ b/src/test/ao_flight_test.c @@ -119,11 +119,7 @@ struct ao_adc { #endif -#define __pdata -#define __data -#define __xdata -#define __code -#define __reentrant +#define const #define HAS_FLIGHT 1 #define HAS_IGNITE 1 @@ -231,8 +227,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; @@ -362,7 +358,7 @@ struct ao_ms5607_prom ao_ms5607_prom; struct ao_config ao_config; -#define DATA_TO_XDATA(x) (x) +#define x (x) extern int16_t ao_ground_accel, ao_flight_accel; |