X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao.h;h=f57537033caf029d89eec35dfb281569ae4de5aa;hb=489a68ba8e3bc360e2e8fc887e4c4b840b5a0dd3;hp=64f33f0b2c18a938320204709cd7e1e9173373fa;hpb=8e74cf6d1c70a7a17d01c20f6831571245392498;p=fw%2Faltos

diff --git a/src/ao.h b/src/ao.h
index 64f33f0b..f5753703 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -107,6 +107,7 @@ ao_start_scheduler(void);
 #define AO_PANIC_REBOOT		8	/* Reboot failed */
 #define AO_PANIC_FLASH		9	/* Invalid flash part (or wrong blocksize) */
 #define AO_PANIC_USB		10	/* Trying to send USB packet while busy */
+#define AO_PANIC_BT		11	/* Communications with bluetooth device failed */
 
 /* Stop the operating system, beeping and blinking the reason */
 void
@@ -403,6 +404,14 @@ ao_cmd_register(__code struct ao_cmds *cmds);
 void
 ao_cmd_init(void);
 
+#if HAS_CMD_FILTER
+/*
+ * Provided by an external module to filter raw command lines
+ */
+uint8_t
+ao_cmd_filter(void);
+#endif
+
 /*
  * ao_dma.c
  */
@@ -927,6 +936,9 @@ ao_serial_set_stdin(uint8_t stdin);
 void
 ao_serial_putchar(char c) __critical;
 
+void
+ao_serial_drain(void) __critical;
+
 #define AO_SERIAL_SPEED_4800	0
 #define AO_SERIAL_SPEED_9600	1
 #define AO_SERIAL_SPEED_19200	2
@@ -1024,12 +1036,13 @@ void
 ao_gps_report_init(void);
 
 /*
- * ao_telemetry.c
+ * ao_telemetry_orig.c
  */
 
 #define AO_MAX_CALLSIGN			8
+#define AO_MAX_TELEMETRY		128
 
-struct ao_telemetry {
+struct ao_telemetry_orig {
 	uint16_t		serial;
 	uint16_t		flight;
 	uint8_t			flight_state;
@@ -1067,10 +1080,15 @@ struct ao_telemetry_tiny {
 /*
  * ao_radio_recv tacks on rssi and status bytes
  */
-struct ao_telemetry_recv {
-	struct ao_telemetry	telemetry;
-	int8_t			rssi;
-	uint8_t			status;
+
+struct ao_telemetry_raw_recv {
+	uint8_t			packet[AO_MAX_TELEMETRY + 2];
+};
+
+struct ao_telemetry_orig_recv {
+	struct ao_telemetry_orig	telemetry_orig;
+	int8_t				rssi;
+	uint8_t				status;
 };
 
 struct ao_telemetry_tiny_recv {
@@ -1092,7 +1110,7 @@ void
 ao_rdf_set(uint8_t rdf);
 
 void
-ao_telemetry_init(void);
+ao_telemetry_orig_init(void);
 
 void
 ao_telemetry_tiny_init(void);
@@ -1148,7 +1166,7 @@ void
 ao_monitor(void);
 
 #define AO_MONITORING_OFF	0
-#define AO_MONITORING_FULL	1
+#define AO_MONITORING_ORIG	1
 #define AO_MONITORING_TINY	2
 
 void
@@ -1167,14 +1185,22 @@ struct ao_stdio {
 	char	(*pollchar)(void);
 	void	(*putchar)(char c) __reentrant;
 	void	(*flush)(void);
+	uint8_t	echo;
 };
 
+extern __xdata struct ao_stdio ao_stdios[];
+extern __data int8_t ao_cur_stdio;
+extern __data int8_t ao_num_stdios;
+
 void
 flush(void);
 
 extern __xdata uint8_t ao_stdin_ready;
 
-void
+uint8_t
+ao_echo(void);
+
+int8_t
 ao_add_stdio(char (*pollchar)(void),
 	     void (*putchar)(char) __reentrant,
 	     void (*flush)(void)) __reentrant;
@@ -1347,6 +1373,18 @@ ao_packet_slave_init(uint8_t enable);
 
 /* ao_btm.c */
 
+/* If bt_link is on P2, this interrupt is shared by USB, so the USB
+ * code calls this function. Otherwise, it's a regular ISR.
+ */
+
+void
+ao_btm_isr(void)
+#if BT_LINK_ON_P1
+	__interrupt 15
+#endif
+	;
+
+
 void
 ao_btm_init(void);