X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=22e8785f2f6a57518628d4a53a794b4a83324819;hp=2e2fb589f1916dd20304c3a2cfe82ade5092ed4f;hb=144db05f6b286a0450d486f69ce192632a2c0656;hpb=b428faf74ae145126ec1da972028fcfe0b4b2b18

diff --git a/src/ao.h b/src/ao.h
index 2e2fb589..22e8785f 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -106,6 +106,7 @@ ao_start_scheduler(void);
 #define AO_PANIC_EE		4	/* Mis-using eeprom API */
 #define AO_PANIC_LOG		5	/* Failing to read/write log data */
 #define AO_PANIC_CMD		6	/* Too many command sets registered */
+#define AO_PANIC_STDIO		7	/* Too many stdio handlers registered */
 
 /* Stop the operating system, beeping and blinking the reason */
 void
@@ -116,8 +117,9 @@ ao_panic(uint8_t reason);
  */
 
 /* Our timer runs at 100Hz */
-#define AO_MS_TO_TICKS(ms)	((ms) / 10)
-#define AO_SEC_TO_TICKS(s)	((s) * 100)
+#define AO_HERTZ		100
+#define AO_MS_TO_TICKS(ms)	((ms) / (1000 / AO_HERTZ))
+#define AO_SEC_TO_TICKS(s)	((s) * AO_HERTZ)
 
 /* Returns the current time in ticks */
 uint16_t
@@ -290,6 +292,12 @@ ao_usb_putchar(char c);
 char
 ao_usb_getchar(void);
 
+/* Poll for a charcter on the USB input queue.
+ * returns AO_READ_AGAIN if none are available
+ */
+char
+ao_usb_pollchar(void);
+
 /* Flush the USB output queue */
 void
 ao_usb_flush(void);
@@ -873,9 +881,24 @@ ao_monitor_init(uint8_t led, uint8_t monitoring) __reentrant;
  * ao_stdio.c
  */
 
+#define AO_READ_AGAIN	((char) -1)
+
+struct ao_stdio {
+	char	(*pollchar)(void);
+	void	(*putchar)(char c) __reentrant;
+	void	(*flush)(void);
+};
+
 void
 flush(void);
 
+extern __xdata uint8_t ao_stdin_ready;
+
+void
+ao_add_stdio(char (*pollchar)(void),
+	     void (*putchar)(char) __reentrant,
+	     void (*flush)(void));
+
 /*
  * ao_ignite.c
  */
@@ -906,16 +929,17 @@ ao_igniter_init(void);
  */
 
 #define AO_CONFIG_MAJOR	1
-#define AO_CONFIG_MINOR	1
+#define AO_CONFIG_MINOR	2
 
 struct ao_config {
 	uint8_t		major;
 	uint8_t		minor;
 	uint16_t	main_deploy;
-	int16_t		accel_zero_g;
+	int16_t		accel_plus_g;
 	uint8_t		radio_channel;
 	char		callsign[AO_MAX_CALLSIGN + 1];
 	uint8_t		apogee_delay;
+	int16_t		accel_minus_g;
 };
 
 extern __xdata struct ao_config ao_config;
@@ -981,6 +1005,7 @@ struct ao_fifo {
  */
 
 #define AO_PACKET_MAX	8
+#define AO_PACKET_SYN		(uint8_t) 0xff
 
 struct ao_packet {
 	uint8_t		addr;
@@ -996,7 +1021,42 @@ struct ao_packet_recv {
 	uint8_t			status;
 };
 
+extern __xdata struct ao_packet_recv ao_rx_packet;
+extern __xdata struct ao_packet ao_tx_packet;
+extern __xdata struct ao_task	ao_packet_task;
+extern __xdata uint8_t ao_packet_enable;
+extern __xdata uint8_t ao_packet_master_sleeping;
+extern __pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
+
+void
+ao_packet_send(void);
+
+uint8_t
+ao_packet_recv(void);
+
+void
+ao_packet_flush(void);
+
+void
+ao_packet_putchar(char c) __reentrant;
+
+char
+ao_packet_pollchar(void) __critical;
+
+/* ao_packet_master.c */
+
+void
+ao_packet_master_init(void);
+
+/* ao_packet_slave.c */
+
+void
+ao_packet_slave_start(void);
+
+void
+ao_packet_slave_stop(void);
+
 void
-ao_packet_init(void);
+ao_packet_slave_init(void);
 
 #endif /* _AO_H_ */