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

diff --git a/src/ao.h b/src/ao.h
index f266ac64..096a4d80 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -330,6 +330,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;
 
@@ -493,6 +494,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)
 
@@ -535,9 +537,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;
@@ -720,8 +727,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;
@@ -737,18 +748,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;
 };
 
@@ -834,6 +835,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);
 
@@ -937,17 +943,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;