summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2019-04-21 18:14:05 -0700
committerKeith Packard <keithp@keithp.com>2019-04-21 18:16:41 -0700
commit188f9efadd480de872f86a8eb741e8738db84c6b (patch)
tree5bedb6afc0924625d1defae304be5cf9f0a8b14d
parent2c19d410f9d6ff1075ea2de0c0ad7b6a84e1e378 (diff)
altos: Add MAX6691 and ADS131A0X data to ring if present
Add these two devices as potential data sources to be added into the ring if available. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--src/kernel/ao_data.h19
1 files changed, 19 insertions, 0 deletions
diff --git a/src/kernel/ao_data.h b/src/kernel/ao_data.h
index abbace8e..f52e17e2 100644
--- a/src/kernel/ao_data.h
+++ b/src/kernel/ao_data.h
@@ -69,6 +69,13 @@
#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)
@@ -100,6 +107,12 @@ struct ao_data {
#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))
@@ -456,6 +469,12 @@ ao_data_fill(int head) {
#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);
ao_wakeup((void *) &ao_data_head);