altos: struct ao_log_mega doesn't have a ground temp value

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

diff --git a/src/core/ao_data.h b/src/core/ao_data.h
index 2b9ef5ace922e5f4e5c4809da63d5524a1cf7305..1153d433669facdfbd58790367d526d504c6a4a6 100644 (file)
--- a/src/core/ao_data.h
+++ b/src/core/ao_data.h
@@ -52,6 +52,8 @@
 #define AO_DATA_MMA655X 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)
 
 struct ao_data {
@@ -102,6 +104,8 @@ extern volatile __data uint8_t              ao_data_count;
                ao_sleep((void *) &ao_data_count);      \
        } while (0)
 
+#endif /* AO_DATA_RING */
+
 #if !HAS_BARO && HAS_MS5607
 
 /* Either an MS5607 or an MS5611 hooked to a SPI port
@@ -110,7 +114,12 @@ extern volatile __data uint8_t             ao_data_count;
 #define HAS_BARO       1
 
 typedef int32_t        pres_t;
-typedef int32_t alt_t;
+
+#ifndef AO_ALT_TYPE
+#define AO_ALT_TYPE    int32_t
+#endif
+
+typedef AO_ALT_TYPE    alt_t;
 
 #define ao_data_pres_cook(packet)      ao_ms5607_convert(&packet->ms5607_raw, &packet->ms5607_cooked)
 
@@ -135,6 +144,10 @@ typedef int16_t alt_t;
 
 #endif
 
+#if !HAS_BARO
+typedef int16_t alt_t;
+#endif
+
 /*
  * Need a few macros to pull data from the sensors:
  *