X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcore%2Fao_log.h;h=eaaca444e1b504f220a89729c982f54b60804613;hp=e585750f9a73c20def2d4b101119e2b162ac46fa;hb=46abd248fb2eb84f161672ffce121b2203d42be0;hpb=78423f3fc5164ea9fd428606419784c1700ad5c5

diff --git a/src/core/ao_log.h b/src/core/ao_log.h
index e585750f..eaaca444 100644
--- a/src/core/ao_log.h
+++ b/src/core/ao_log.h
@@ -138,17 +138,17 @@ ao_log_full(void);
 #define AO_LOG_POS_NONE		(~0UL)
 
 struct ao_log_record {
-	char			type;
-	uint8_t			csum;
-	uint16_t		tick;
+	char			type;				/* 0 */
+	uint8_t			csum;				/* 1 */
+	uint16_t		tick;				/* 2 */
 	union {
 		struct {
-			int16_t		ground_accel;
-			uint16_t	flight;
+			int16_t		ground_accel;		/* 4 */
+			uint16_t	flight;			/* 6 */
 		} flight;
 		struct {
-			int16_t		accel;
-			int16_t		pres;
+			int16_t		accel;			/* 4 */
+			int16_t		pres;			/* 6 */
 		} sensor;
 		struct {
 			int16_t		temp;
@@ -201,8 +201,7 @@ struct ao_log_mega {
 			uint16_t	flight;		/* 4 */
 			int16_t		ground_accel;	/* 6 */
 			uint32_t	ground_pres;	/* 8 */
-			uint32_t	ground_temp;	/* 12 */
-		} flight;				/* 16 */
+		} flight;				/* 12 */
 		struct {
 			uint16_t	state;
 			uint16_t	reason;
@@ -216,13 +215,17 @@ struct ao_log_mega {
 			int16_t		gyro_x;		/* 18 */
 			int16_t		gyro_y;		/* 20 */
 			int16_t		gyro_z;		/* 22 */
-		} sensor;	/* 24 */
+			int16_t		mag_x;		/* 24 */
+			int16_t		mag_y;		/* 26 */
+			int16_t		mag_z;		/* 28 */
+			int16_t		accel;		/* 30 */
+		} sensor;	/* 32 */
 		struct {
 			int16_t		v_batt;		/* 4 */
-			int16_t		v_pbatt;	/* 8 */
-			int16_t		n_sense;	/* 10 */
-			int16_t		sense[10];	/* 12 */
-		} volt;					/* 32 */
+			int16_t		v_pbatt;	/* 6 */
+			int16_t		n_sense;	/* 8 */
+			int16_t		sense[10];	/* 10 */
+		} volt;					/* 30 */
 		struct {
 			int32_t		latitude;	/* 4 */
 			int32_t		longitude;	/* 8 */