From 1464549525c3897bb4dd7abee54b770b5c30c7a8 Mon Sep 17 00:00:00 2001 From: Bob Long Date: Wed, 22 May 2024 22:12:18 -0500 Subject: [PATCH] LogStructure cleanup --- libraries/AP_ESC_Telem/LogStructure.h | 12 ++++-------- libraries/AP_Logger/LogStructure.h | 2 -- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/libraries/AP_ESC_Telem/LogStructure.h b/libraries/AP_ESC_Telem/LogStructure.h index d4a053e0e7..3f065e5d1c 100644 --- a/libraries/AP_ESC_Telem/LogStructure.h +++ b/libraries/AP_ESC_Telem/LogStructure.h @@ -3,9 +3,7 @@ #include #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 index 4c193b6da0..43dd08d7d8 100644 --- 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,