X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao.h;h=66c0881f7862cb01a949c4e8d1cca9be5d0da804;hb=3fe932206f40f4d6f83a4ef49e064109a7a3de92;hp=06daf48f98aa4af597bfe0a7344c6c665f7cdaf8;hpb=46407f7f3e4d2b6e74b3a2e90b38736a792cfc54;p=fw%2Faltos

diff --git a/src/core/ao.h b/src/core/ao.h
index 06daf48f..66c0881f 100644
--- 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,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
  */
@@ -527,9 +543,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
@@ -550,6 +563,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:
  *
@@ -574,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
@@ -610,6 +628,8 @@ ao_monitor_enable(void);
 void
 ao_monitor_init(void) __reentrant;
 
+#endif
+
 /*
  * ao_stdio.c
  */
@@ -682,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
@@ -690,10 +714,12 @@ 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;
@@ -712,6 +738,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
@@ -725,6 +754,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);