Merge remote-tracking branch 'mjb/altoslib_mjb'

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

diff --git a/src/core/ao.h b/src/core/ao.h
index 861a0fd479dc70aed5863cafb3591ec5a088b07b..4f4779ecdef288d79ea920970e5a7bc67ed4eeec 100644 (file)
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -115,7 +115,10 @@ ao_start_scheduler(void);
 #define AO_PANIC_BT            11      /* Communications with bluetooth device failed */
 #define AO_PANIC_STACK         12      /* Stack overflow */
 #define AO_PANIC_SPI           13      /* SPI communication failure */
-#define AO_PANIC_SELF_TEST     14      /* Self test failure */
+#define AO_PANIC_SELF_TEST_CC1120      0x40 | 1        /* Self test failure */
+#define AO_PANIC_SELF_TEST_HMC5883     0x40 | 2        /* Self test failure */
+#define AO_PANIC_SELF_TEST_MPU6000     0x40 | 3        /* Self test failure */
+#define AO_PANIC_SELF_TEST_MS5607      0x40 | 4        /* Self test failure */
 
 /* Stop the operating system, beeping and blinking the reason */
 void
@@ -125,6 +128,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))
@@ -264,6 +274,26 @@ ao_cmd_filter(void);
  * ao_report.c
  */
 
+#define AO_RDF_INTERVAL_TICKS  AO_SEC_TO_TICKS(5)
+#define AO_RDF_LENGTH_MS       500
+#define AO_RDF_CONTINUITY_MS   32
+#define AO_RDF_CONTINUITY_PAUSE        96
+#define AO_RDF_CONTINUITY_TOTAL        ((AO_RDF_CONTINUITY_PAUSE + AO_RDF_CONTINUITY_MS) * 3 + AO_RDF_CONTINUITY_PAUSE)
+
+/* This assumes that we're generating a 1kHz tone, which
+ * modulates the carrier at 2kbps, or 250kBps
+ */
+#define AO_MS_TO_RDF_LEN(ms) ((ms) / 4)
+
+#define AO_RADIO_RDF_LEN       AO_MS_TO_RDF_LEN(AO_RDF_LENGTH_MS)
+#define AO_RADIO_CONT_TONE_LEN AO_MS_TO_RDF_LEN(AO_RDF_CONTINUITY_MS)
+#define AO_RADIO_CONT_PAUSE_LEN        AO_MS_TO_RDF_LEN(AO_RDF_CONTINUITY_PAUSE)
+#define AO_RADIO_CONT_TOTAL_LEN        AO_MS_TO_RDF_LEN(AO_RDF_CONTINUITY_TOTAL)
+
+/* returns a value 0-3 to indicate igniter continuity */
+uint8_t
+ao_report_igniter(void);
+
 void
 ao_report_init(void);
 
@@ -410,6 +440,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 */
@@ -467,6 +498,14 @@ 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
+ */
+#define AO_RSSI_FROM_RADIO(radio)      ((int16_t) ((int8_t) (radio) >> 1) - 74)
+#define AO_RADIO_FROM_RSSI(rssi)       (((int8_t) (rssi) + 74) << 1)
+
 /*
  * ao_radio_recv tacks on rssi and status bytes
  */
@@ -507,9 +546,6 @@ ao_telemetry_tiny_init(void);
  */
 
 extern __xdata uint8_t ao_radio_dma;
-extern __xdata uint8_t ao_radio_dma_done;
-extern __xdata uint8_t ao_radio_done;
-extern __xdata uint8_t ao_radio_mutex;
 
 #ifdef PKT_APPEND_STATUS_1_CRC_OK
 #define AO_RADIO_STATUS_CRC_OK PKT_APPEND_STATUS_1_CRC_OK
@@ -530,6 +566,9 @@ ao_radio_recv(__xdata void *d, uint8_t size) __reentrant;
 void
 ao_radio_recv_abort(void);
 
+void
+ao_radio_test(uint8_t on);
+
 /*
  * Compute the packet length as follows:
  *
@@ -538,10 +577,11 @@ ao_radio_recv_abort(void);
  * 2 * ms bits, or ms / 4 bytes
  */
 
-#define AO_MS_TO_RDF_LEN(ms) ((ms) > 255 * 4 ? 255 : ((ms) >> 2))
+void
+ao_radio_rdf(void);
 
 void
-ao_radio_rdf(uint8_t pkt_len);
+ao_radio_continuity(uint8_t c);
 
 void
 ao_radio_rdf_abort(void);
@@ -553,6 +593,8 @@ ao_radio_init(void);
  * ao_monitor.c
  */
 
+#if HAS_MONITOR
+
 extern const char const * const ao_state_names[];
 
 #define AO_MONITOR_RING        8
@@ -589,6 +631,8 @@ ao_monitor_enable(void);
 void
 ao_monitor_init(void) __reentrant;
 
+#endif
+
 /*
  * ao_stdio.c
  */
@@ -661,11 +705,24 @@ 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
+ */
+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
 
+extern __xdata uint8_t ao_config_aes_seq;
+
 struct ao_config {
        uint8_t         major;
        uint8_t         minor;
@@ -684,6 +741,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
@@ -697,6 +757,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);