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

diff --git a/src/ao.h b/src/ao.h
index 22e8785f..2c6eb2b9 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -107,6 +107,8 @@ 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 */
+#define AO_PANIC_FLASH		9	/* Invalid flash part (or wrong blocksize) */
 
 /* Stop the operating system, beeping and blinking the reason */
 void
@@ -329,6 +331,7 @@ enum ao_cmd_status {
 };
 
 extern __xdata uint16_t ao_cmd_lex_i;
+extern __xdata uint32_t ao_cmd_lex_u32;
 extern __xdata char	ao_cmd_lex_c;
 extern __xdata enum ao_cmd_status ao_cmd_status;
 
@@ -350,6 +353,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);
@@ -489,6 +495,7 @@ ao_ee_init(void);
 #define AO_LOG_GPS_LON		'W'
 #define AO_LOG_GPS_ALT		'H'
 #define AO_LOG_GPS_SAT		'V'
+#define AO_LOG_GPS_DATE		'Y'
 
 #define AO_LOG_POS_NONE		(~0UL)
 
@@ -531,9 +538,14 @@ struct ao_log_record {
 		} gps_altitude;
 		struct {
 			uint16_t	svid;
-			uint8_t		state;
+			uint8_t		unused;
 			uint8_t		c_n;
 		} gps_sat;
+		struct {
+			uint8_t		year;
+			uint8_t		month;
+			uint8_t		day;
+		} gps_date;
 		struct {
 			uint16_t	d0;
 			uint16_t	d1;
@@ -549,11 +561,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
@@ -606,6 +618,7 @@ extern __pdata int16_t			ao_ground_pres;
 extern __pdata int16_t			ao_ground_accel;
 extern __pdata int16_t			ao_min_pres;
 extern __pdata uint16_t			ao_launch_time;
+extern __xdata uint8_t			ao_flight_force_idle;
 
 /* Flight thread */
 void
@@ -716,8 +729,12 @@ ao_serial_init(void);
 
 #define AO_GPS_VALID		(1 << 4)
 #define AO_GPS_RUNNING		(1 << 5)
+#define AO_GPS_DATE_VALID	(1 << 6)
 
 struct ao_gps_data {
+	uint8_t			year;
+	uint8_t			month;
+	uint8_t			day;
 	uint8_t			hour;
 	uint8_t			minute;
 	uint8_t			second;
@@ -733,18 +750,8 @@ struct ao_gps_data {
 	uint16_t		v_error;	/* m */
 };
 
-#define SIRF_SAT_STATE_ACQUIRED			(1 << 0)
-#define SIRF_SAT_STATE_CARRIER_PHASE_VALID	(1 << 1)
-#define SIRF_SAT_BIT_SYNC_COMPLETE		(1 << 2)
-#define SIRF_SAT_SUBFRAME_SYNC_COMPLETE		(1 << 3)
-#define SIRF_SAT_CARRIER_PULLIN_COMPLETE	(1 << 4)
-#define SIRF_SAT_CODE_LOCKED			(1 << 5)
-#define SIRF_SAT_ACQUISITION_FAILED		(1 << 6)
-#define SIRF_SAT_EPHEMERIS_AVAILABLE		(1 << 7)
-
 struct ao_gps_sat_data {
 	uint8_t		svid;
-	uint8_t		state;
 	uint8_t		c_n_1;
 };
 
@@ -784,15 +791,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];
@@ -826,6 +837,11 @@ extern __xdata uint8_t ao_radio_mutex;
 void
 ao_radio_general_isr(void) interrupt 16;
 
+void
+ao_radio_get(void);
+
+#define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
+
 void
 ao_radio_set_telemetry(void);
 
@@ -929,17 +945,18 @@ ao_igniter_init(void);
  */
 
 #define AO_CONFIG_MAJOR	1
-#define AO_CONFIG_MINOR	2
+#define AO_CONFIG_MINOR	3
 
 struct ao_config {
 	uint8_t		major;
 	uint8_t		minor;
 	uint16_t	main_deploy;
-	int16_t		accel_plus_g;
+	int16_t		accel_plus_g;		/* changed for minor version 2 */
 	uint8_t		radio_channel;
 	char		callsign[AO_MAX_CALLSIGN + 1];
-	uint8_t		apogee_delay;
-	int16_t		accel_minus_g;
+	uint8_t		apogee_delay;		/* minor version 1 */
+	int16_t		accel_minus_g;		/* minor version 2 */
+	uint32_t	radio_cal;		/* minor version 3 */
 };
 
 extern __xdata struct ao_config ao_config;