X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=4116be65ae13f22aef242957363d4b2ffa42147b;hp=02e10ec0fdad31b1f4ec3a02c799718af72af7f0;hb=fee46389b70a624ab5b1128a8b4c3083c7747bcb;hpb=0f2cbd41332b1b63865c5f1a4e749419b469853a

diff --git a/src/ao.h b/src/ao.h
index 02e10ec0..4116be65 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -21,6 +21,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <stddef.h>
 #include "cc1111.h"
 
 #define TRUE 1
@@ -121,6 +122,10 @@ ao_timer_isr(void) interrupt 9;
 void
 ao_timer_init(void);
 
+/* Initialize the hardware clock. Must be called first */
+void
+ao_clock_init(void);
+
 /*
  * ao_adc.c
  */
@@ -419,14 +424,6 @@ ao_ee_init(void);
  * ao_log.c
  */
 
-/* Structure containing GPS position, either lat or lon */
-
-struct ao_gps_pos {
-	uint8_t	degrees;
-	uint8_t	minutes;
-	uint16_t minutes_fraction;	/* in units of 1/10000 minutes */
-};
-
 /*
  * The data log is recorded in the eeprom as a sequence
  * of data packets.
@@ -461,6 +458,7 @@ struct ao_gps_pos {
 #define AO_LOG_GPS_LAT		'N'
 #define AO_LOG_GPS_LON		'W'
 #define AO_LOG_GPS_ALT		'H'
+#define AO_LOG_GPS_SAT		'V'
 
 #define AO_LOG_POS_NONE		(~0UL)
 
@@ -495,12 +493,17 @@ struct ao_log_record {
 			uint8_t		second;
 			uint8_t		flags;
 		} gps_time;
-		struct ao_gps_pos gps_latitude;
-		struct ao_gps_pos gps_longitude;
+		int32_t		gps_latitude;
+		int32_t		gps_longitude;
 		struct {
 			int16_t		altitude;
 			uint16_t	unused;
 		} gps_altitude;
+		struct {
+			uint16_t	svid;
+			uint8_t		state;
+			uint8_t		c_n;
+		} gps_sat;
 		struct {
 			uint16_t	d0;
 			uint16_t	d1;
@@ -664,6 +667,12 @@ ao_serial_getchar(void) __critical;
 void
 ao_serial_putchar(char c) __critical;
 
+#define AO_SERIAL_SPEED_4800	0
+#define AO_SERIAL_SPEED_57600	1
+
+void
+ao_serial_set_speed(uint8_t speed);
+
 void
 ao_serial_init(void);
 
@@ -675,26 +684,47 @@ ao_serial_init(void);
 #define AO_GPS_NUM_SAT_SHIFT	(0)
 
 #define AO_GPS_VALID		(1 << 4)
-#define AO_GPS_LONGITUDE_MASK	(1 << 5)
-#define AO_GPS_LONGITUDE_EAST	(0 << 5)
-#define AO_GPS_LONGITUDE_WEST	(1 << 5)
-
-#define AO_GPS_LATITUDE_MASK	(1 << 6)
-#define AO_GPS_LATITUDE_NORTH	(0 << 6)
-#define AO_GPS_LATITUDE_SOUTH	(1 << 6)
+#define AO_GPS_RUNNING		(1 << 5)
 
 struct ao_gps_data {
 	uint8_t			hour;
 	uint8_t			minute;
 	uint8_t			second;
 	uint8_t			flags;
-	struct ao_gps_pos	latitude;
-	struct ao_gps_pos	longitude;
-	int16_t			altitude;
+	int32_t			latitude;	/* degrees * 10⁷ */
+	int32_t			longitude;	/* degrees * 10⁷ */
+	int16_t			altitude;	/* m */
+	uint16_t		ground_speed;	/* cm/s */
+	uint8_t			course;		/* degrees / 2 */
+	uint8_t			hdop;		/* * 5 */
+	int16_t			climb_rate;	/* cm/s */
+	uint16_t		h_error;	/* m */
+	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;
+};
+
+struct ao_gps_tracking_data {
+	uint8_t			channels;
+	struct ao_gps_sat_data	sats[12];
 };
 
 extern __xdata uint8_t ao_gps_mutex;
 extern __xdata struct ao_gps_data ao_gps_data;
+extern __xdata struct ao_gps_tracking_data ao_gps_tracking_data;
 
 void
 ao_gps(void);
@@ -702,6 +732,9 @@ ao_gps(void);
 void
 ao_gps_print(__xdata struct ao_gps_data *gps_data);
 
+void
+ao_gps_tracking_print(__xdata struct ao_gps_tracking_data *gps_tracking_data);
+
 void
 ao_gps_init(void);
 
@@ -732,6 +765,7 @@ struct ao_telemetry {
 	struct ao_adc		adc;
 	struct ao_gps_data	gps;
 	char			callsign[AO_MAX_CALLSIGN];
+	struct ao_gps_tracking_data	gps_tracking;
 };
 
 /* Set delay between telemetry reports (0 to disable) */
@@ -743,6 +777,9 @@ struct ao_telemetry {
 void
 ao_telemetry_set_interval(uint16_t interval);
 
+void
+ao_rdf_set(uint8_t rdf);
+
 void
 ao_telemetry_init(void);
 
@@ -762,6 +799,12 @@ struct ao_radio_recv {
 void
 ao_radio_recv(__xdata struct ao_radio_recv *recv) __reentrant;
 
+void
+ao_radio_rdf(int ms);
+
+void
+ao_radio_rdf_abort(void);
+
 void
 ao_radio_init(void);