projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Use BMI088 as z-axis accel as needed
[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 804f1f94bcc6beba2a029ec8398ba1e27f036fde..fc1dfa8fe6b759b1def1caccc3ffdfa78429210b 100644
(file)
--- a/
src/test/ao_flight_test.c
+++ b/
src/test/ao_flight_test.c
@@
-19,6
+19,7
@@
#define _GNU_SOURCE
#include <stdint.h>
#define _GNU_SOURCE
#include <stdint.h>
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
@@
-58,6
+59,7
@@
int ao_gps_new;
#define HAS_MMA655X 1
#define HAS_HMC5883 1
#define HAS_BEEP 1
#define HAS_MMA655X 1
#define HAS_HMC5883 1
#define HAS_BEEP 1
+#define HAS_BARO 1
#define AO_CONFIG_MAX_SIZE 1024
#define AO_MMA655X_INVERT 0
#define AO_CONFIG_MAX_SIZE 1024
#define AO_MMA655X_INVERT 0
@@
-75,6
+77,7
@@
struct ao_adc {
#define HAS_MMA655X 1
#define AO_MMA655X_INVERT 0
#define HAS_BEEP 1
#define HAS_MMA655X 1
#define AO_MMA655X_INVERT 0
#define HAS_BEEP 1
+#define HAS_BARO 1
#define AO_CONFIG_MAX_SIZE 1024
struct ao_adc {
#define AO_CONFIG_MAX_SIZE 1024
struct ao_adc {
@@
-116,6
+119,7
@@
struct ao_adc {
#define HAS_ACCEL 1
#define HAS_ACCEL_REF 0
#endif
#define HAS_ACCEL 1
#define HAS_ACCEL_REF 0
#endif
+#define HAS_BARO 1
#endif
#endif
@@
-386,7
+390,7
@@
typedef int16_t accel_t;
uint16_t ao_serial_number;
int16_t ao_flight_number;
uint16_t ao_serial_number;
int16_t ao_flight_number;
-extern
uint16_t
ao_sample_tick;
+extern
AO_TICK_TYPE
ao_sample_tick;
#if HAS_BARO
extern alt_t ao_sample_height;
#if HAS_BARO
extern alt_t ao_sample_height;
@@
-400,8
+404,8
@@
extern alt_t ao_sample_alt;
double ao_sample_qangle;
double ao_sample_qangle;
-
int
ao_sample_prev_tick;
-
uint16_t
prev_tick;
+
AO_TICK_TYPE
ao_sample_prev_tick;
+
AO_TICK_TYPE
prev_tick;
#include "ao_kalman.c"
#include "ao_kalman.c"