X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fkernel%2Fao_log.h;h=26ff444088f52f2805a3d2b4b496e1a3893ff1ce;hb=a0aad75a2a54cd9d478cc44159d7d01b549f806e;hp=0ab574483993dd50a537d9b95e45c55b00fc77bc;hpb=0800970a4c9c6ed38bb76bfed6374093ca16b459;p=fw%2Faltos

diff --git a/src/kernel/ao_log.h b/src/kernel/ao_log.h
index 0ab57448..26ff4440 100644
--- a/src/kernel/ao_log.h
+++ b/src/kernel/ao_log.h
@@ -57,6 +57,9 @@ extern enum ao_flight_state ao_log_state;
 #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_TELEMEGA_4	19	/* 32 byte typed telemega records with 32 bit gyro cal and Bmx160 */
+#define AO_LOG_FORMAT_EASYMOTOR		20	/* ? byte typed easymotor records with pressure sensor and adxl375 */
 #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 */
@@ -94,10 +97,6 @@ ao_log(void);
 uint8_t
 ao_log_scan(void);
 
-/* Return the position of the start of the given log slot */
-uint32_t
-ao_log_pos(uint8_t slot);
-
 /* Start logging to eeprom */
 void
 ao_log_start(void);
@@ -503,7 +502,7 @@ struct ao_log_gps {
 	} u;
 };
 
-#if AO_LOG_FORMAT == AO_LOG_FOMAT_TELEMEGA_OLD || AO_LOG_FORMAT == AO_LOG_FORMAT_TELEMEGA || AO_LOG_FORMAT == AO_LOG_FORMAT_TELEMEGA_3 || AO_LOG_FORMAT == AO_LOG_FORMAT_EASYMEGA_2
+#if AO_LOG_FORMAT == AO_LOG_FOMAT_TELEMEGA_OLD || AO_LOG_FORMAT == AO_LOG_FORMAT_TELEMEGA || AO_LOG_FORMAT == AO_LOG_FORMAT_TELEMEGA_3 || AO_LOG_FORMAT == AO_LOG_FORMAT_EASYMEGA_2 || AO_LOG_FORMAT == AO_LOG_FORMAT_TELEMEGA_4
 typedef struct ao_log_mega ao_log_type;
 #endif
 
@@ -519,6 +518,10 @@ typedef struct ao_log_firetwo ao_log_type;
 typedef struct ao_log_mini ao_log_type;
 #endif
 
+#if AO_LOG_FORMAT == AO_LOG_FORMAT_EASYMOTOR
+typedef struct ao_log_motor ao_log_type;
+#endif 
+
 #if AO_LOG_FORMAT == AO_LOG_FORMAT_TELEGPS
 typedef struct ao_log_gps ao_log_type;
 #endif
@@ -539,6 +542,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;