X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fkernel%2Fao_log.h;h=ad28e5cac41a5a4d205485e168810f743478c195;hb=9fa46346d576081f99860cad96c91bcf63233649;hp=3354c2439bc2a06dbc647975781557155175f08a;hpb=9521dc63671b69065d27fc1ccba6d20cc90643cb;p=fw%2Faltos

diff --git a/src/kernel/ao_log.h b/src/kernel/ao_log.h
index 3354c243..ad28e5ca 100644
--- a/src/kernel/ao_log.h
+++ b/src/kernel/ao_log.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -46,9 +47,11 @@ extern __pdata enum ao_flight_state ao_log_state;
 #define AO_LOG_FORMAT_TELEMEGA_OLD	5	/* 32 byte typed telemega records */
 #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_TELEMINI2		8	/* 16-byte MS5607 baro only, 3.3V supply, cc1111 SoC */
 #define AO_LOG_FORMAT_TELEGPS		9	/* 32 byte telegps records */
 #define AO_LOG_FORMAT_TELEMEGA		10	/* 32 byte typed telemega records with 32 bit gyro cal */
+#define AO_LOG_FORMAT_DETHERM		11	/* 16-byte MS5607 baro only, no ADC */
+#define AO_LOG_FORMAT_TELEMINI3		12	/* 16-byte MS5607 baro only, 3.3V supply, stm32f042 SoC */
 #define AO_LOG_FORMAT_NONE		127	/* No log at all */
 
 extern __code uint8_t ao_log_format;
@@ -216,7 +219,7 @@ struct ao_log_mega {
 			int16_t		ground_accel_along;	/* 12 */
 			int16_t		ground_accel_across;	/* 14 */
 			int16_t		ground_accel_through;	/* 16 */
-			int16_t		pad			/* 18 */
+			int16_t		pad_18;			/* 18 */
 			int32_t		ground_roll;		/* 20 */
 			int32_t		ground_pitch;		/* 24 */
 			int32_t		ground_yaw;		/* 28 */