X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_log.h;h=09f3118812ed64f5436b48d3252cad80c856575e;hb=4006effc538289c36a1563c1b717231991292c0c;hp=f6ab45209913ed73a76c8185d5e9d2300b995e30;hpb=7b0f9b25a56fa8b4aa1c2e9d79c43e6a97cab0c0;p=fw%2Faltos

diff --git a/src/core/ao_log.h b/src/core/ao_log.h
index f6ab4520..09f31188 100644
--- a/src/core/ao_log.h
+++ b/src/core/ao_log.h
@@ -44,8 +44,9 @@ extern __pdata enum ao_flight_state ao_log_state;
 #define AO_LOG_FORMAT_TELEMETRY		3	/* 32 byte ao_telemetry records */
 #define AO_LOG_FORMAT_TELESCIENCE	4	/* 32 byte typed telescience records */
 #define AO_LOG_FORMAT_TELEMEGA		5	/* 32 byte typed telemega records */
-#define AO_LOG_FORMAT_MINI		6	/* 16-byte MS5607 baro only */
+#define AO_LOG_FORMAT_EASYMINI		6	/* 16-byte MS5607 baro only, 3.0V supply */
 #define AO_LOG_FORMAT_TELEMETRUM	7	/* 16-byte typed telemetrum records */
+#define AO_LOG_FORMAT_TELEMINI		8	/* 16-byte MS5607 baro only, 3.3V supply */
 #define AO_LOG_FORMAT_NONE		127	/* No log at all */
 
 extern __code uint8_t ao_log_format;
@@ -252,8 +253,14 @@ struct ao_log_mega {
 			uint8_t		year;		/* 18 */
 			uint8_t		month;		/* 19 */
 			uint8_t		day;		/* 20 */
-			uint8_t		pad;		/* 21 */
-		} gps;	/* 22 */
+			uint8_t		course;		/* 21 */
+			uint16_t	ground_speed;	/* 22 */
+			int16_t		climb_rate;	/* 24 */
+			uint8_t		pdop;		/* 26 */
+			uint8_t		hdop;		/* 27 */
+			uint8_t		vdop;		/* 28 */
+			uint8_t		mode;		/* 29 */
+		} gps;	/* 30 */
 		/* AO_LOG_GPS_SAT */
 		struct {
 			uint16_t	channels;	/* 4 */
@@ -275,7 +282,8 @@ struct ao_log_metrum {
 			uint16_t	flight;		/* 4 */
 			int16_t		ground_accel;	/* 6 */
 			uint32_t	ground_pres;	/* 8 */
-		} flight;	/* 12 */
+			uint32_t	ground_temp;	/* 12 */
+		} flight;	/* 16 */
 		/* AO_LOG_STATE */
 		struct {
 			uint16_t	state;		/* 4 */