X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=30511c8c2f7c49326e73bb9c02412ccb4bf237dc;hp=6836e0103a7a155a9011387522a0a05e9c7b96d2;hb=527d7c803ed9597b210634018cb2eb9d048d9846;hpb=e59520e343c2573b1b92c0b3c4aaa93e51bc55d3

diff --git a/src/ao.h b/src/ao.h
index 6836e010..30511c8c 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
@@ -423,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.
@@ -499,8 +492,8 @@ 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;
@@ -679,22 +672,21 @@ 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)
 
 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 */
 };
 
 extern __xdata uint8_t ao_gps_mutex;