altos: Go back to recording sensor data in globals

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

diff --git a/src/core/ao.h b/src/core/ao.h
index 5e1fbb9d05d6a39ea91ec6ef368efa746ca0de2e..31ec468695dc436e90176d9a53252c9688a8d872 100644 (file)
--- 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
@@ -543,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
@@ -566,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:
  *
@@ -718,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;
@@ -976,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_ */