X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_log.h;h=97bfdc3273076cf0ab80272fb6e4fee88e31c156;hb=a87698663f8a5ced468755068a0468755d8f2746;hp=9e8f995e5d16df794f864723dedca4558c746cc6;hpb=c29f65a5696df66efb7e84e3ae8a3ea4b1f1494c;p=fw%2Faltos

diff --git a/src/kernel/ao_log.h b/src/kernel/ao_log.h
index 9e8f995e..97bfdc32 100644
--- a/src/kernel/ao_log.h
+++ b/src/kernel/ao_log.h
@@ -56,6 +56,8 @@ extern enum ao_flight_state ao_log_state;
 #define AO_LOG_FORMAT_EASYMINI2		14	/* 16-byte MS5607 baro only, 3.3V supply, stm32f042 SoC */
 #define AO_LOG_FORMAT_TELEMEGA_3	15	/* 32 byte typed telemega records with 32 bit gyro cal and mpu9250 */
 #define AO_LOG_FORMAT_EASYMEGA_2	16	/* 32 byte typed telemega records with 32 bit gyro cal, mpu9250 rotated 90° and adxl375 */
+#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_NONE		127	/* No log at all */
 
 /* Return the flight number from the given log slot, 0 if none, -slot on failure */
@@ -338,6 +340,33 @@ struct ao_log_firetwo {
 	} u;	/* 32 */
 };
 
+struct ao_log_telestatic {
+	char			type;			/* 0 */
+	uint8_t			csum;			/* 1 */
+	uint16_t		tick;			/* 2 */
+	union {						/* 4 */
+		/* AO_LOG_FLIGHT */
+		struct {
+			uint16_t	flight;		/* 4 */
+		} flight;	/* 6 */
+		/* AO_LOG_STATE */
+		struct {
+			uint16_t	state;		/* 4 */
+			uint16_t	reason;		/* 6 */
+		} state;	/* 8 */
+		/* AO_LOG_SENSOR */
+		struct {
+			uint32_t	pressure;	/* 4 */
+			uint32_t	pressure2;	/* 8 */
+			uint32_t	thrust;		/* 12 */
+			uint32_t	mass;		/* 16 */
+			uint16_t	t_low;		/* 20 */
+			uint16_t	t_high[4];	/* 22 */
+		} sensor;	/* 30 */
+		uint8_t		align[28];		/* 4 */
+	} u;	/* 32 */
+};
+
 struct ao_log_metrum {
 	char			type;			/* 0 */
 	uint8_t			csum;			/* 1 */
@@ -511,6 +540,10 @@ typedef struct ao_log_record ao_log_type;
 #define AO_LOG_UNCOMMON	1
 #endif
 
+#if AO_LOG_FORMAT == AO_LOG_FORMAT_MICROPEAK2
+#define AO_LOG_UNCOMMON	1
+#endif
+
 #ifndef AO_LOG_UNCOMMON
 extern ao_log_type ao_log_data;