projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/micropeak-v2: Erase log space at end of BOOST_DELAY
[fw/altos]
/
src
/
kernel
/
ao_data.h
diff --git
a/src/kernel/ao_data.h
b/src/kernel/ao_data.h
index dda5de4c6638bc62161619c677f4a877c345c5b9..f52e17e2df01675562baab8df4f0c64a1251f72d 100644
(file)
--- a/
src/kernel/ao_data.h
+++ b/
src/kernel/ao_data.h
@@
-69,6
+69,13
@@
#define AO_DATA_ADXL375 0
#endif
#define AO_DATA_ADXL375 0
#endif
+#if HAS_MAX6691
+#include <ao_max6691.h>
+#define AO_DATA_MAX6691 (1 << 4)
+#else
+#define AO_DATA_MAX6691 0
+#endif
+
#ifdef AO_DATA_RING
#define AO_DATA_ALL (AO_DATA_ADC|AO_DATA_MS5607|AO_DATA_MPU6000|AO_DATA_HMC5883|AO_DATA_MMA655X|AO_DATA_MPU9250|AO_DATA_ADXL375)
#ifdef AO_DATA_RING
#define AO_DATA_ALL (AO_DATA_ADC|AO_DATA_MS5607|AO_DATA_MPU6000|AO_DATA_HMC5883|AO_DATA_MMA655X|AO_DATA_MPU9250|AO_DATA_ADXL375)
@@
-100,6
+107,12
@@
struct ao_data {
#if HAS_ADXL375
struct ao_adxl375_sample adxl375;
#endif
#if HAS_ADXL375
struct ao_adxl375_sample adxl375;
#endif
+#if HAS_MAX6691
+ struct ao_max6691_sample max6691;
+#endif
+#if HAS_ADS131A0X
+ struct ao_ads131a0x_sample ads131a0x;
+#endif
};
#define ao_data_ring_next(n) (((n) + 1) & (AO_DATA_RING - 1))
};
#define ao_data_ring_next(n) (((n) + 1) & (AO_DATA_RING - 1))
@@
-328,8
+341,6
@@
typedef int16_t accel_t;
#define HAS_ACCEL 1
#define HAS_ACCEL 1
-#define AO_ACCEL_INVERT 0
-
typedef int16_t accel_t;
/* MPU6000 is hooked up so that positive y is positive acceleration */
typedef int16_t accel_t;
/* MPU6000 is hooked up so that positive y is positive acceleration */
@@
-457,6
+468,12
@@
ao_data_fill(int head) {
#endif
#if HAS_ADXL375
ao_data_ring[head].adxl375 = ao_adxl375_current;
#endif
#if HAS_ADXL375
ao_data_ring[head].adxl375 = ao_adxl375_current;
+#endif
+#if HAS_MAX6691
+ ao_data_ring[head].max6691 = ao_max6691_current;
+#endif
+#if HAS_ADS131A0X
+ ao_data_ring[head].ads131a0x = ao_ads131a0x_current;
#endif
ao_data_ring[head].tick = ao_tick_count;
ao_data_head = ao_data_ring_next(head);
#endif
ao_data_ring[head].tick = ao_tick_count;
ao_data_head = ao_data_ring_next(head);