Merge branch 'master' into mm-ms5611

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 8 insertions, 9 deletions

diff --git a/src/core/ao_log.h b/src/core/ao_log.h
index 04abeb7e..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;