X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Flib%2Fao-eeprom-read.h;h=e4a9b0ccba23b171bea671a4d2407bf0ed45a618;hp=aaf6d3d68032de922e5f20e6fccb509af71eed08;hb=HEAD;hpb=083464b52c835c09a66c06a87246fcd138748a5d

diff --git a/ao-tools/lib/ao-eeprom-read.h b/ao-tools/lib/ao-eeprom-read.h
index aaf6d3d6..01c2ef35 100644
--- a/ao-tools/lib/ao-eeprom-read.h
+++ b/ao-tools/lib/ao-eeprom-read.h
@@ -45,7 +45,9 @@
 #define AO_LOG_FORMAT_TELESTATIC	17	/* 32 byte typed telestatic records */
 #define AO_LOG_FORMAT_MICROPEAK2	18	/* 2-byte baro values with header */
 #define AO_LOG_FORMAT_TELEMEGA_4	19	/* 32 byte typed telemega records with 32 bit gyro cal and Bmx160 */
-#define AO_LOG_FORMAT_EASYMOTOR		20	/* 16 byte typed easymotor records */
+#define AO_LOG_FORMAT_EASYMOTOR		20	/* 16 byte typed easymotor records with pressure sensor and adxl375 */
+#define AO_LOG_FORMAT_TELEMEGA_5	21	/* 32 byte typed telemega records with 32 bit gyro cal, mpu6000 and mmc5983 */
+#define AO_LOG_FORMAT_TELEMEGA_6	22	/* 32 byte typed telemega records with 32 bit gyro cal, bmi088 and mmc5983 */
 #define AO_LOG_FORMAT_NONE		127	/* No log at all */
 
 enum ao_pyro_flag {
@@ -466,37 +468,6 @@ struct ao_log_mini {
 	} u;						/* 16 */
 };							/* 16 */
 
-struct ao_log_motor {
-	char			type;			/* 0 */
-	uint8_t			csum;			/* 1 */
-	uint16_t		tick;			/* 2 */
-	union {						/* 4 */
-		/* AO_LOG_FLIGHT */
-		struct {
-			uint16_t	flight;			/* 4 */
-			int16_t		ground_accel;		/* 6 */
-			int16_t		ground_accel_along;	/* 8 */
-			int16_t		ground_accel_across;	/* 10 */
-			int16_t		ground_accel_through;	/* 12 */
-			int16_t		ground_motor_pressure;	/* 14 */
-		} flight;					/* 16 */
-		/* AO_LOG_STATE */
-		struct {
-			uint16_t	state;			/* 4 */
-			uint16_t	reason;			/* 6 */
-		} state;
-		/* AO_LOG_SENSOR */
-		struct {
-			uint16_t	pressure;		/* 4 */
-			uint16_t	v_batt;			/* 6 */
-			int16_t		accel;			/* 8 */
-			int16_t		accel_across;		/* 10 */
-			int16_t		accel_along;		/* 12 */
-			int16_t		accel_through;		/* 14 */
-		} sensor;					/* 16 */
-	} u;
-};
-
 #define ao_log_pack24(dst,value) do {		\
 		(dst)[0] = (value);		\
 		(dst)[1] = (value) >> 8;	\
@@ -547,6 +518,37 @@ struct ao_log_gps {
 	} u;
 };
 
+struct ao_log_motor {
+	char			type;			/* 0 */
+	uint8_t			csum;			/* 1 */
+	uint16_t		tick;			/* 2 */
+	union {						/* 4 */
+		/* AO_LOG_FLIGHT */
+		struct {
+			uint16_t	flight;			/* 4 */
+			int16_t		ground_accel;		/* 6 */
+			int16_t		ground_accel_along;	/* 8 */
+			int16_t		ground_accel_across;	/* 10 */
+			int16_t		ground_accel_through;	/* 12 */
+			int16_t		ground_motor_pressure;	/* 14 */
+		} flight;					/* 16 */
+		/* AO_LOG_STATE */
+		struct {
+			uint16_t	state;			/* 4 */
+			uint16_t	reason;			/* 6 */
+		} state;
+		/* AO_LOG_SENSOR */
+		struct {
+			uint16_t	pressure;		/* 4 */
+			uint16_t	v_batt;			/* 6 */
+			int16_t		accel;			/* 8 */
+			int16_t		accel_across;		/* 10 */
+			int16_t		accel_along;		/* 12 */
+			int16_t		accel_through;		/* 14 */
+		} sensor;					/* 16 */
+	} u;
+};
+
 struct ao_eeprom {
 	struct ao_config	config;
 	struct ao_ms5607_prom	ms5607_prom;