LogStructure cleanup

CarbonixUAV · May 23, 2024 · 1464549 · 1464549
1 parent 6963beb
commit 1464549
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/libraries/AP_ESC_Telem/LogStructure.h b/libraries/AP_ESC_Telem/LogStructure.h
@@ -3,9 +3,7 @@
 #include <AP_Logger/LogStructure.h>
 
 #define LOG_IDS_FROM_ESC_TELEM                  \
-    LOG_ESC_MSG
-
-#define LOG_IDS_FROM_EXTESC_TELEM               \
+    LOG_ESC_MSG,                                \
     LOG_EXTESC_MSG
 
 // @LoggerMessage: ESC
@@ -34,10 +32,6 @@ struct PACKED log_Esc {
     float error_rate;
 };
 
-#define LOG_STRUCTURE_FROM_ESC_TELEM \
-    { LOG_ESC_MSG, sizeof(log_Esc), \
-      "ESC",  "QBeeffcfcf", "TimeUS,Instance,RPM,RawRPM,Volt,Curr,Temp,CTot,MotTemp,Err", "s#qqvAOaO%", "F-BB--BCB-" , true },
-
 // @LoggerMessage: ESCX
 // @Description: Extended telemetry feedback received from ESCs
 // @Field: TimeUS: microseconds since system startup
@@ -54,6 +48,8 @@ struct PACKED log_ExtEsc {
     uint8_t flags;
 };
 
-#define LOG_STRUCTURE_FROM_EXTESC_TELEM \
+#define LOG_STRUCTURE_FROM_ESC_TELEM \
+    { LOG_ESC_MSG, sizeof(log_Esc), \
+      "ESC",  "QBeeffcfcf", "TimeUS,Instance,RPM,RawRPM,Volt,Curr,Temp,CTot,MotTemp,Err", "s#qqvAOaO%", "F-BB--BCB-" , true }, \
     { LOG_EXTESC_MSG, sizeof(log_ExtEsc), \
       "ESCX", "QBBBB", "TimeUS,Instance,inpct,outpct,flags", "s#---%", "F----" , true },
diff --git a/libraries/AP_Logger/LogStructure.h b/libraries/AP_Logger/LogStructure.h
@@ -1286,7 +1286,6 @@ LOG_STRUCTURE_FROM_AVOIDANCE \
     { LOG_TERRAIN_MSG, sizeof(log_TERRAIN), \
       "TERR","QBLLHffHHf","TimeUS,Status,Lat,Lng,Spacing,TerrH,CHeight,Pending,Loaded,ROfs", "s-DU-mm--m", "F-GG-00--0", true }, \
 LOG_STRUCTURE_FROM_ESC_TELEM \
-LOG_STRUCTURE_FROM_EXTESC_TELEM \
     { LOG_CSRV_MSG, sizeof(log_CSRV), \
       "CSRV","QBfffB","TimeUS,Id,Pos,Force,Speed,Pow", "s#---%", "F-0000", true }, \
     { LOG_CSVI_MSG, sizeof(log_CSVI), \
@@ -1383,7 +1382,6 @@ enum LogMessages : uint8_t {
     LOG_CSVI_MSG,
     LOG_TEMP_MSG,
     LOG_IDS_FROM_ESC_TELEM,
-    LOG_IDS_FROM_EXTESC_TELEM,
     LOG_IDS_FROM_BATTMONITOR,
     LOG_IDS_FROM_HAL_CHIBIOS,