Merge remote-tracking branch 'mjb/altosdroid'

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

diff --git a/src/core/ao.h b/src/core/ao.h
index d6e27707d7137e7d9077ee6c887bdcad2af48648..ce0bf5d14289007dff1b602e750cdc7b23dec7f4 100644 (file)
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -299,10 +299,10 @@ ao_altitude_to_pa(alt_t alt);
  */
 
 uint8_t
-ao_spi_slave_recv(uint8_t *buf, uint8_t len);
+ao_spi_slave_recv(void *buf, uint16_t len);
 
 void
-ao_spi_slave_send(uint8_t *buf, uint8_t len);
+ao_spi_slave_send(void *buf, uint16_t len);
 
 void
 ao_spi_slave_init(void);
@@ -684,7 +684,7 @@ extern __xdata uint8_t ao_force_freq;
 #endif
 
 #define AO_CONFIG_MAJOR        1
-#define AO_CONFIG_MINOR        12
+#define AO_CONFIG_MINOR        13
 
 #define AO_AES_LEN 16
 
@@ -711,12 +711,17 @@ struct ao_config {
 #if AO_PYRO_NUM
        struct ao_pyro  pyro[AO_PYRO_NUM];      /* minor version 12 */
 #endif
+       uint16_t        aprs_interval;          /* minor version 13 */
 };
 
 #define AO_IGNITE_MODE_DUAL            0
 #define AO_IGNITE_MODE_APOGEE          1
 #define AO_IGNITE_MODE_MAIN            2
 
+#define AO_RADIO_ENABLE_CORE           1
+#define AO_RADIO_DISABLE_TELEMETRY     2
+#define AO_RADIO_DISABLE_RDF           4
+
 #define AO_PAD_ORIENTATION_ANTENNA_UP  0
 #define AO_PAD_ORIENTATION_ANTENNA_DOWN        1