projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm32f4: Align stack to 8 bytes
[fw/altos]
/
src
/
test
/
ao_flight_test.c
diff --git
a/src/test/ao_flight_test.c
b/src/test/ao_flight_test.c
index 8fe3b5df466e6b9ee858bcfd10bf58ebd9878db1..6d007575c7f91d2871ce0a223f15ada7261890c9 100644
(file)
--- a/
src/test/ao_flight_test.c
+++ b/
src/test/ao_flight_test.c
@@
-119,11
+119,7
@@
struct ao_adc {
#endif
#endif
-#define __pdata
-#define __data
-#define __xdata
-#define __code
-#define __reentrant
+#define const
#define HAS_FLIGHT 1
#define HAS_IGNITE 1
#define HAS_FLIGHT 1
#define HAS_IGNITE 1
@@
-231,8
+227,8
@@
ao_gps_angle(void)
extern enum ao_flight_state ao_flight_state;
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;
volatile struct ao_data ao_data_ring[AO_DATA_RING];
volatile uint8_t ao_data_head;
@@
-305,7
+301,7
@@
struct ao_task {
#define AO_MS_TO_TICKS(ms) ((ms) / 10)
#define AO_SEC_TO_TICKS(s) ((s) * 100)
#define AO_MS_TO_TICKS(ms) ((ms) / 10)
#define AO_SEC_TO_TICKS(s) ((s) * 100)
-#define AO_FLIGHT_TEST
+#define AO_FLIGHT_TEST
1
int ao_flight_debug;
int ao_flight_debug;
@@
-362,7
+358,7
@@
struct ao_ms5607_prom ao_ms5607_prom;
struct ao_config ao_config;
struct ao_config ao_config;
-#define
DATA_TO_XDATA(x)
(x)
+#define
x
(x)
extern int16_t ao_ground_accel, ao_flight_accel;
extern int16_t ao_ground_accel, ao_flight_accel;
@@
-438,10
+434,6
@@
static uint16_t pyros_fired;
static struct ao_mpu6000_sample ao_ground_mpu6000;
#endif
static struct ao_mpu6000_sample ao_ground_mpu6000;
#endif
-#if HAS_ACCEL
-int ao_error_h_sq_avg;
-#endif
-
void
ao_test_exit(void)
{
void
ao_test_exit(void)
{