X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fao.h;h=f266ac64844e4808033b67263d195080c6c509bc;hb=3ee279ba76c2a79d142c466f19ef758cf4c01d70;hp=65a594c0529ebd8413d1fd6592f3c878673cf6f2;hpb=ca5d323a3d206050d95f52a61e92c69e1f54e7b5;p=fw%2Faltos

diff --git a/src/ao.h b/src/ao.h
index 65a594c0..f266ac64 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -107,6 +107,7 @@ ao_start_scheduler(void);
 #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 */
+#define AO_PANIC_REBOOT		8	/* Reboot failed */
 
 /* Stop the operating system, beeping and blinking the reason */
 void
@@ -117,8 +118,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
@@ -291,6 +293,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);
@@ -343,6 +351,9 @@ ao_cmd_hex(void);
 void
 ao_cmd_decimal(void);
 
+uint8_t
+ao_match_word(__code char *word);
+
 struct ao_cmds {
 	char		cmd;
 	void		(*func)(void);
@@ -542,11 +553,11 @@ ao_log_data(struct ao_log_record *log);
 void
 ao_log_flush(void);
 
-/* Log dumping API:
- * ao_log_dump_first() - get first log record
- * ao_log_dump_next()  - get next log record
+/* We record flight numbers in the first record of
+ * the log. Tasks may wait for this to be initialized
+ * by sleeping on this variable.
  */
-extern __xdata struct ao_log_record ao_log_dump;
+extern __xdata uint16_t ao_flight_number;
 
 /* Retrieve first log record for the current flight */
 uint8_t
@@ -777,15 +788,19 @@ ao_gps_report_init(void);
  */
 
 #define AO_MAX_CALLSIGN		8
+#define AO_TELEMETRY_VERSION	2
 
 struct ao_telemetry {
 	uint8_t			addr;
+	uint16_t		flight;
 	uint8_t			flight_state;
 	int16_t			flight_accel;
 	int16_t			ground_accel;
 	int32_t			flight_vel;
 	int16_t			flight_pres;
 	int16_t			ground_pres;
+	int16_t			accel_plus_g;
+	int16_t			accel_minus_g;
 	struct ao_adc		adc;
 	struct ao_gps_data	gps;
 	char			callsign[AO_MAX_CALLSIGN];
@@ -922,16 +937,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;