Add option to beep max height in feet rather than just meters

[fw/altos] / src / kernel / ao_data.h

diff --git a/src/kernel/ao_data.h b/src/kernel/ao_data.h
index b43a1cd498dd636a65c0c59c55bcf7af83090bbb..b49d6a558db2b3b2eb0e18d6c950f42f5e4e04b5 100644 (file)
--- a/src/kernel/ao_data.h
+++ b/src/kernel/ao_data.h
@@ -55,6 +55,13 @@
 #define AO_DATA_HMC5883        0
 #endif
 
+#if HAS_MMC5983
+#include <ao_mmc5983.h>
+#define AO_DATA_MMC5983        (1 << 3)
+#else
+#define AO_DATA_MMC5983        0
+#endif
+
 #if HAS_MMA655X
 #include <ao_mma655x.h>
 #define AO_DATA_MMA655X (1 << 4)
@@ -95,10 +102,10 @@ extern uint8_t                     ao_sensor_errors;
 
 #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|AO_DATA_BMX160)
+#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|AO_DATA_BMX160|AO_DATA_MMC5983)
 
 struct ao_data {
-       uint16_t                        tick;
+       AO_TICK_TYPE                    tick;
 #if HAS_ADC
        struct ao_adc                   adc;
 #endif
@@ -121,6 +128,9 @@ struct ao_data {
 #if HAS_HMC5883
        struct ao_hmc5883_sample        hmc5883;
 #endif
+#if HAS_MMC5983
+       struct ao_mmc5983_sample        mmc5983;
+#endif
 #if HAS_MMA655X
        uint16_t                        mma655x;
 #endif
@@ -172,6 +182,10 @@ extern volatile uint8_t            ao_data_count;
 
 #endif /* AO_DATA_RING */
 
+#define AO_ALT_TYPE    int32_t
+
+typedef AO_ALT_TYPE    alt_t;
+
 #if !HAS_BARO && HAS_MS5607
 
 /* Either an MS5607 or an MS5611 hooked to a SPI port
@@ -181,14 +195,10 @@ extern volatile uint8_t           ao_data_count;
 
 typedef int32_t        pres_t;
 
-#define AO_ALT_TYPE    int32_t
-
-typedef AO_ALT_TYPE    alt_t;
-
 #define ao_data_pres_cook(packet)      ao_ms5607_convert(&packet->ms5607_raw, &packet->ms5607_cooked)
 
 #define ao_data_pres(packet)   ((packet)->ms5607_cooked.pres)
-#define ao_data_temp(packet)   ((packet)->ms5607_cooked.temp)
+#define ao_data_temp(packet)   ((int16_t) (packet)->ms5607_cooked.temp)
 
 #define pres_to_altitude(p)    ao_pa_to_altitude(p)
 
@@ -321,9 +331,9 @@ typedef int16_t accel_t;
 #endif
 
 #if AO_MMA655X_INVERT
-#define ao_data_accel_raw(packet)              (AO_ACCEL_INVERT - (packet)->mma655x)
+#define ao_data_accel_raw(packet)              ((accel_t) (AO_ACCEL_INVERT - (packet)->mma655x))
 #else
-#define ao_data_accel_raw(packet)              ((packet)->mma655x)
+#define ao_data_accel_raw(packet)              ((accel_t) (packet)->mma655x)
 #endif
 #define ao_data_accel_invert(accel)            (AO_ACCEL_INVERT - (accel))
 
@@ -346,6 +356,13 @@ typedef int16_t    accel_t;
 #endif
 #define ao_data_accel_invert(accel)            (-(accel))
 
+#if USE_ADXL375_IMU
+#define ao_data_along(packet)                  ((packet)->adxl375.AO_ADXL375_AXIS)
+#define ao_data_across(packet)                 ((packet)->adxl375.AO_ADXL375_ACROSS_AXIS)
+#define ao_data_through(packet)                        ((packet)->adxl375.z)
+#define ao_data_accel_to_sample(accel)         ao_adxl375_accel_to_sample(accel)
+#endif
+
 #endif /* HAS_ADXL375 */
 
 #if !HAS_ACCEL && HAS_MPU6000
@@ -371,6 +388,7 @@ typedef int16_t angle_t;    /* in degrees */
 /* X axis is aligned in the other board axis (across) */
 /* Z axis is aligned perpendicular to the board (through) */
 
+#ifndef ao_data_along
 #define ao_data_along(packet)  ((packet)->mpu6000.accel_y)
 #define ao_data_across(packet) ((packet)->mpu6000.accel_x)
 #define ao_data_through(packet)        ((packet)->mpu6000.accel_z)
@@ -378,6 +396,7 @@ typedef int16_t angle_t;    /* in degrees */
 #define ao_data_roll(packet)   ((packet)->mpu6000.gyro_y)
 #define ao_data_pitch(packet)  ((packet)->mpu6000.gyro_x)
 #define ao_data_yaw(packet)    ((packet)->mpu6000.gyro_z)
+#endif
 
 static inline float ao_convert_gyro(float sensor)
 {
@@ -483,6 +502,14 @@ typedef int16_t ao_mag_t;          /* in raw sample units */
 
 #endif
 
+#if !HAS_MAG && HAS_MMC5983
+
+#define HAS_MAG                1
+
+typedef int16_t ao_mag_t;              /* in raw sample units */
+
+#endif
+
 #if !HAS_MAG && HAS_MPU9250
 
 #define HAS_MAG                1
@@ -516,6 +543,9 @@ ao_data_fill(int head) {
 #if HAS_HMC5883
                ao_data_ring[head].hmc5883 = ao_hmc5883_current;
 #endif
+#if HAS_MMC5983
+               ao_data_ring[head].mmc5983 = ao_mmc5983_current;
+#endif
 #if HAS_MPU6000
                ao_data_ring[head].mpu6000 = ao_mpu6000_current;
 #endif