X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao.h;h=31ec468695dc436e90176d9a53252c9688a8d872;hb=07d9ba938f2742da1bce5d8df55cbc236207a981;hp=d4be3be436755a7d4642c19046647d114c122b2f;hpb=d90587535676f9492f0fde6b974353158104ef88;p=fw%2Faltos

diff --git a/src/core/ao.h b/src/core/ao.h
index d4be3be4..31ec4686 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
-#include "ao_pins.h"
+#include <ao_pins.h>
 #include <ao_arch.h>
 
 #define TRUE 1
@@ -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))
@@ -430,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 */
@@ -487,6 +498,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
  */
@@ -533,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
@@ -556,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:
  *
@@ -580,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
@@ -616,6 +631,8 @@ ao_monitor_enable(void);
 void
 ao_monitor_init(void) __reentrant;
 
+#endif
+
 /*
  * ao_stdio.c
  */
@@ -704,6 +721,8 @@ extern __xdata uint8_t ao_force_freq;
 
 #define AO_AES_LEN 16
 
+extern __xdata uint8_t ao_config_aes_seq;
+
 struct ao_config {
 	uint8_t		major;
 	uint8_t		minor;
@@ -962,12 +981,12 @@ ao_sqrt(uint32_t op);
 
 int32_t ao_freq_to_set(int32_t freq, int32_t cal) __reentrant;
 
-#include <ao_arch_funcs.h>
-
 /*
  * ao_ms5607.c
  */
 
 void ao_ms5607_init(void);
 
+#include <ao_arch_funcs.h>
+
 #endif /* _AO_H_ */