X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao.h;h=29ad26031d9733cfe7409b31127c06c53698ec41;hp=ce0bf5d14289007dff1b602e750cdc7b23dec7f4;hb=bb9fdef607728cc326a82aa632e59724f272e53b;hpb=760b1f02c178c600226f39b5e66d8cbadbf4a29b

diff --git a/src/core/ao.h b/src/core/ao.h
index ce0bf5d1..29ad2603 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -43,8 +43,16 @@
 #define HAS_TASK	1
 #endif
 
+#ifndef AO_PORT_TYPE
+#define AO_PORT_TYPE uint8_t
+#endif
+
+typedef AO_PORT_TYPE ao_port_t;
+
 #if HAS_TASK
 #include <ao_task.h>
+#else
+#include <ao_notask.h>
 #endif
 
 /*
@@ -65,6 +73,9 @@
 #define AO_PANIC_STACK		12	/* Stack overflow */
 #define AO_PANIC_SPI		13	/* SPI communication failure */
 #define AO_PANIC_CRASH		14	/* Processor crashed */
+#define AO_PANIC_BUFIO		15	/* Mis-using bufio API */
+#define AO_PANIC_EXTI		16	/* Mis-using exti API */
+#define AO_PANIC_FAST_TIMER	17	/* Mis-using fast timer API */
 #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 */
@@ -93,7 +104,7 @@ extern volatile __data AO_TICK_TYPE ao_tick_count;
 #define AO_SEC_TO_TICKS(s)	((s) * AO_HERTZ)
 
 /* Returns the current time in ticks */
-uint16_t
+AO_TICK_TYPE
 ao_time(void);
 
 /* Suspend the current task until ticks time has passed */
@@ -143,6 +154,9 @@ extern __pdata uint32_t ao_cmd_lex_u32;
 extern __pdata char	ao_cmd_lex_c;
 extern __pdata enum ao_cmd_status ao_cmd_status;
 
+void
+ao_put_string(__code char *s);
+
 void
 ao_cmd_lex(void);
 
@@ -168,7 +182,7 @@ void
 ao_cmd_hex(void);
 
 void
-ao_cmd_decimal(void);
+ao_cmd_decimal(void) __reentrant;
 
 /* Read a single hex nibble off stdin. */
 uint8_t
@@ -293,6 +307,17 @@ ao_altitude_to_pa(alt_t alt);
 #include <ao_serial.h>
 #endif
 
+/*
+ * ao_convert_volt.c
+ *
+ * Convert ADC readings to decivolts
+ */
+
+int16_t
+ao_battery_decivolt(int16_t adc);
+
+int16_t
+ao_ignite_decivolt(int16_t adc);
 
 /*
  * ao_spi_slave.c
@@ -328,6 +353,10 @@ ao_spi_slave(void);
 #define AO_GPS_DATE_VALID	(1 << 6)
 #define AO_GPS_COURSE_VALID	(1 << 7)
 
+#define AO_GPS_NEW_DATA		1
+#define AO_GPS_NEW_TRACKING	2
+
+extern __xdata uint8_t ao_gps_new;
 extern __pdata uint16_t ao_gps_tick;
 extern __xdata uint8_t ao_gps_mutex;
 extern __xdata struct ao_telemetry_location ao_gps_data;
@@ -373,6 +402,9 @@ ao_gps_print(__xdata struct ao_gps_orig *gps_data);
 void
 ao_gps_tracking_print(__xdata struct ao_gps_tracking_orig *gps_tracking_data);
 
+void
+ao_gps_show(void) __reentrant;
+
 void
 ao_gps_init(void);
 
@@ -507,6 +539,8 @@ ao_telemetry_tiny_init(void);
 
 extern __xdata uint8_t	ao_radio_dma;
 
+extern __xdata int8_t	ao_radio_rssi;
+
 #ifdef PKT_APPEND_STATUS_1_CRC_OK
 #define AO_RADIO_STATUS_CRC_OK	PKT_APPEND_STATUS_1_CRC_OK
 #else
@@ -514,17 +548,28 @@ extern __xdata uint8_t	ao_radio_dma;
 #define AO_RADIO_STATUS_CRC_OK	AO_FEC_DECODE_CRC_OK
 #endif
 
+#ifndef HAS_RADIO_RECV
+#define HAS_RADIO_RECV HAS_RADIO
+#endif
+#ifndef HAS_RADIO_XMIT
+#define HAS_RADIO_XMIT HAS_RADIO
+#endif
+
 void
 ao_radio_general_isr(void) ao_arch_interrupt(16);
 
+#if HAS_RADIO_XMIT
 void
 ao_radio_send(const __xdata void *d, uint8_t size) __reentrant;
+#endif
 
+#if HAS_RADIO_RECV
 uint8_t
-ao_radio_recv(__xdata void *d, uint8_t size) __reentrant;
+ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout) __reentrant;
 
 void
 ao_radio_recv_abort(void);
+#endif
 
 void
 ao_radio_test(uint8_t on);
@@ -532,7 +577,26 @@ ao_radio_test(uint8_t on);
 typedef int16_t (*ao_radio_fill_func)(uint8_t *buffer, int16_t len);
 
 void
-ao_radio_send_lots(ao_radio_fill_func fill);
+ao_radio_send_aprs(ao_radio_fill_func fill);
+
+/*
+ * ao_radio_pa
+ */
+
+#if HAS_RADIO_AMP
+void
+ao_radio_pa_on(void);
+
+void
+ao_radio_pa_off(void);
+
+void
+ao_radio_pa_init(void);
+#else
+#define ao_radio_pa_on()
+#define ao_radio_pa_off()
+#define ao_radio_pa_init()
+#endif
 
 /*
  * Compute the packet length as follows:
@@ -607,7 +671,7 @@ ao_monitor_init(void) __reentrant;
 #define AO_READ_AGAIN	(-1)
 
 struct ao_stdio {
-	int	(*pollchar)(void);
+	int	(*_pollchar)(void);	/* Called with interrupts blocked */
 	void	(*putchar)(char c) __reentrant;
 	void	(*flush)(void);
 	uint8_t	echo;
@@ -655,6 +719,8 @@ struct ao_ignition {
 	uint8_t firing;
 };
 
+extern __code char * __code ao_igniter_status_names[];
+
 extern __xdata struct ao_ignition ao_ignition[2];
 
 enum ao_igniter_status
@@ -684,7 +750,7 @@ extern __xdata uint8_t ao_force_freq;
 #endif
 
 #define AO_CONFIG_MAJOR	1
-#define AO_CONFIG_MINOR	13
+#define AO_CONFIG_MINOR	15
 
 #define AO_AES_LEN 16
 
@@ -712,6 +778,17 @@ struct ao_config {
 	struct ao_pyro	pyro[AO_PYRO_NUM];	/* minor version 12 */
 #endif
 	uint16_t	aprs_interval;		/* minor version 13 */
+#if HAS_RADIO_POWER
+	uint8_t		radio_power;		/* minor version 14 */
+#endif
+#if HAS_RADIO_AMP
+	uint8_t		radio_amp;		/* minor version 14 */
+#endif
+#if HAS_GYRO
+	int16_t		accel_zero_along;	/* minor version 15 */
+	int16_t		accel_zero_across;	/* minor version 15 */
+	int16_t		accel_zero_through;	/* minor version 15 */
+#endif
 };
 
 #define AO_IGNITE_MODE_DUAL		0