Merge remote-tracking branch 'mjb/master'

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

diff --git a/src/core/ao.h b/src/core/ao.h
index eb2d47cf063d68e62cc41bdbce3af40c1b095d00..5e1fbb9d05d6a39ea91ec6ef368efa746ca0de2e 100644 (file)
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -125,6 +125,13 @@ ao_panic(uint8_t reason);
  * ao_timer.c
  */
 
+#ifndef AO_TICK_TYPE
+#define AO_TICK_TYPE   uint16_t
+#define AO_TICK_SIGNED int16_t
+#endif
+
+extern volatile __data AO_TICK_TYPE ao_tick_count;
+
 /* Our timer runs at 100Hz */
 #define AO_HERTZ               100
 #define AO_MS_TO_TICKS(ms)     ((ms) / (1000 / AO_HERTZ))
@@ -430,6 +437,7 @@ ao_gps_report_mega_init(void);
  * ao_telemetry_orig.c
  */
 
+#if LEGACY_MONITOR
 struct ao_adc_orig {
        uint16_t        tick;           /* tick when the sample was read */
        int16_t         accel;          /* accelerometer */
@@ -487,6 +495,8 @@ struct ao_telemetry_tiny_recv {
        uint8_t                         status;
 };
 
+#endif /* LEGACY_MONITOR */
+
 /* Unfortunately, we've exposed the CC1111 rssi units as the 'usual' method
  * for reporting RSSI. So, now we use these values everywhere
  */
@@ -580,6 +590,8 @@ ao_radio_init(void);
  * ao_monitor.c
  */
 
+#if HAS_MONITOR
+
 extern const char const * const ao_state_names[];
 
 #define AO_MONITOR_RING        8
@@ -616,6 +628,8 @@ ao_monitor_enable(void);
 void
 ao_monitor_init(void) __reentrant;
 
+#endif
+
 /*
  * ao_stdio.c
  */
@@ -688,6 +702,10 @@ ao_igniter_init(void);
  * ao_config.c
  */
 
+#if AO_PYRO_NUM
+#include <ao_pyro.h>
+#endif
+
 #if HAS_FORCE_FREQ
 /*
  * Set this to force the frequency to 434.550MHz
@@ -696,7 +714,7 @@ extern __xdata uint8_t ao_force_freq;
 #endif
 
 #define AO_CONFIG_MAJOR        1
-#define AO_CONFIG_MINOR        11
+#define AO_CONFIG_MINOR        12
 
 #define AO_AES_LEN 16
 
@@ -718,6 +736,9 @@ struct ao_config {
        uint8_t         aes_key[AO_AES_LEN];    /* minor version 9 */
        uint32_t        frequency;              /* minor version 10 */
        uint16_t        apogee_lockout;         /* minor version 11 */
+#if AO_PYRO_NUM
+       struct ao_pyro  pyro[AO_PYRO_NUM];      /* minor version 12 */
+#endif
 };
 
 #define AO_IGNITE_MODE_DUAL            0
@@ -731,6 +752,12 @@ extern __xdata struct ao_config ao_config;
 
 #define AO_CONFIG_MAX_SIZE     128
 
+void
+_ao_config_edit_start(void);
+
+void
+_ao_config_edit_finish(void);
+
 void
 ao_config_get(void);