Merge remote-tracking branch 'mjb/master'

[fw/altos] / src / cc1111 / ao_pins.h

diff --git a/src/cc1111/ao_pins.h b/src/cc1111/ao_pins.h
index e28a7b65da256149e7a49de478bfa563644b1cd6..2f0e2884826107ba51ab49166ad3789827ca7e7c 100644 (file)
--- a/src/cc1111/ao_pins.h
+++ b/src/cc1111/ao_pins.h
@@ -163,6 +163,7 @@
        #define HAS_ADC                 1
        #define HAS_EEPROM              1
        #define HAS_LOG                 1
+       #define HAS_FORCE_FREQ          1
        #define USE_INTERNAL_FLASH      1
        #define HAS_DBG                 0
        #define IGNITE_ON_P2            0
@@ -559,4 +560,16 @@
 #define AO_IGNITER_FIRE_TIME   AO_MS_TO_TICKS(50)
 #define AO_IGNITER_CHARGE_TIME AO_MS_TO_TICKS(2000)
 
+struct ao_adc {
+       int16_t         accel;          /* accelerometer */
+       int16_t         pres;           /* pressure sensor */
+       int16_t         temp;           /* temperature sensor */
+       int16_t         v_batt;         /* battery voltage */
+       int16_t         sense_d;        /* drogue continuity sense */
+       int16_t         sense_m;        /* main continuity sense */
+#if HAS_ACCEL_REF
+       uint16_t        accel_ref;      /* acceleration reference */
+#endif
+};
+
 #endif /* _AO_PINS_H_ */