projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Define AO_LOG_FORMAT in */ao_pins.h. Use in ao_cmd.c
[fw/altos]
/
src
/
kernel
/
ao_data.h
diff --git
a/src/kernel/ao_data.h
b/src/kernel/ao_data.h
index d62852efd69cdc707a7dacf8c49e2f898e18514c..9a3b389c073dd6a291b6776faeb69829533b6ad5 100644
(file)
--- a/
src/kernel/ao_data.h
+++ b/
src/kernel/ao_data.h
@@
-41,6
+41,13
@@
#define AO_DATA_MPU6000 0
#endif
#define AO_DATA_MPU6000 0
#endif
+#if HAS_MPU9250
+#include <ao_mpu9250.h>
+#define AO_DATA_MPU9250 (1 << 2)
+#else
+#define AO_DATA_MPU9250 0
+#endif
+
#if HAS_HMC5883
#include <ao_hmc5883.h>
#define AO_DATA_HMC5883 (1 << 3)
#if HAS_HMC5883
#include <ao_hmc5883.h>
#define AO_DATA_HMC5883 (1 << 3)
@@
-57,7
+64,7
@@
#ifdef AO_DATA_RING
#ifdef AO_DATA_RING
-#define AO_DATA_ALL (AO_DATA_ADC|AO_DATA_MS5607|AO_DATA_MPU6000|AO_DATA_HMC5883|AO_DATA_MMA655X)
+#define AO_DATA_ALL (AO_DATA_ADC|AO_DATA_MS5607|AO_DATA_MPU6000|AO_DATA_HMC5883|AO_DATA_MMA655X
|AO_DATA_MPU9250
)
struct ao_data {
uint16_t tick;
struct ao_data {
uint16_t tick;
@@
-74,6
+81,9
@@
struct ao_data {
int16_t z_accel;
#endif
#endif
int16_t z_accel;
#endif
#endif
+#if HAS_MPU9250
+ struct ao_mpu9250_sample mpu9250;
+#endif
#if HAS_HMC5883
struct ao_hmc5883_sample hmc5883;
#endif
#if HAS_HMC5883
struct ao_hmc5883_sample hmc5883;
#endif