From b42d1db0e883cdc4381b86ae0afb5da9a23ecb29 Mon Sep 17 00:00:00 2001 From: mikeller Date: Fri, 17 Jul 2020 01:57:08 +1200 Subject: [PATCH] Fixed DEBUG builds. --- src/main/blackbox/blackbox.c | 16 ++++++++-------- src/main/blackbox/blackbox_fielddefs.h | 4 ++-- src/main/cli/settings.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index d2a912c11..f216659d8 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -227,10 +227,10 @@ static const blackboxDeltaFieldDefinition_t blackboxMainFields[] = { {"accSmooth", 0, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACC)}, {"accSmooth", 1, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACC)}, {"accSmooth", 2, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACC)}, - {"debug", 0, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG)}, - {"debug", 1, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG)}, - {"debug", 2, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG)}, - {"debug", 3, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG)}, + {"debug", 0, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG_LOG)}, + {"debug", 1, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG_LOG)}, + {"debug", 2, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG_LOG)}, + {"debug", 3, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(DEBUG_LOG)}, /* Motors only rarely drops under minthrottle (when stick falls below mincommand), so predict minthrottle for it and use *unsigned* encoding (which is large for negative numbers but more compact for positive ones): */ {"motor", 0, UNSIGNED, .Ipredict = PREDICT(MINMOTOR), .Iencode = ENCODING(UNSIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(AT_LEAST_MOTORS_1)}, /* Subsequent motors base their I-frame values on the first one, P-frame values on the average of last two frames: */ @@ -487,8 +487,8 @@ static bool testBlackboxConditionUncached(FlightLogFieldCondition condition) case CONDITION(ACC): return sensors(SENSOR_ACC) && isFieldEnabled(FIELD_SELECT(ACC)); - case CONDITION(DEBUG): - return (debugMode != DEBUG_NONE) && isFieldEnabled(FIELD_SELECT(DEBUG)); + case CONDITION(DEBUG_LOG): + return (debugMode != DEBUG_NONE) && isFieldEnabled(FIELD_SELECT(DEBUG_LOG)); case CONDITION(NEVER): return false; @@ -631,7 +631,7 @@ static void writeIntraframe(void) blackboxWriteSigned16VBArray(blackboxCurrent->accADC, XYZ_AXIS_COUNT); } - if (testBlackboxCondition(CONDITION(DEBUG))) { + if (testBlackboxCondition(CONDITION(DEBUG_LOG))) { blackboxWriteSigned16VBArray(blackboxCurrent->debug, DEBUG16_VALUE_COUNT); } @@ -780,7 +780,7 @@ static void writeInterframe(void) if (testBlackboxCondition(CONDITION(ACC))) { blackboxWriteMainStateArrayUsingAveragePredictor(offsetof(blackboxMainState_t, accADC), XYZ_AXIS_COUNT); } - if (testBlackboxCondition(CONDITION(DEBUG))) { + if (testBlackboxCondition(CONDITION(DEBUG_LOG))) { blackboxWriteMainStateArrayUsingAveragePredictor(offsetof(blackboxMainState_t, debug), DEBUG16_VALUE_COUNT); } diff --git a/src/main/blackbox/blackbox_fielddefs.h b/src/main/blackbox/blackbox_fielddefs.h index 338d2b582..f39cebdf5 100644 --- a/src/main/blackbox/blackbox_fielddefs.h +++ b/src/main/blackbox/blackbox_fielddefs.h @@ -51,7 +51,7 @@ typedef enum FlightLogFieldCondition { FLIGHT_LOG_FIELD_CONDITION_GYRO, FLIGHT_LOG_FIELD_CONDITION_ACC, - FLIGHT_LOG_FIELD_CONDITION_DEBUG, + FLIGHT_LOG_FIELD_CONDITION_DEBUG_LOG, FLIGHT_LOG_FIELD_CONDITION_NEVER, @@ -69,7 +69,7 @@ typedef enum FlightLogFieldSelect_e { // no more than 32 FLIGHT_LOG_FIELD_SELECT_RSSI, FLIGHT_LOG_FIELD_SELECT_GYRO, FLIGHT_LOG_FIELD_SELECT_ACC, - FLIGHT_LOG_FIELD_SELECT_DEBUG, + FLIGHT_LOG_FIELD_SELECT_DEBUG_LOG, FLIGHT_LOG_FIELD_SELECT_MOTOR, FLIGHT_LOG_FIELD_SELECT_GPS, FLIGHT_LOG_FIELD_SELECT_COUNT diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c index fb80fdde5..7e19c9572 100644 --- a/src/main/cli/settings.c +++ b/src/main/cli/settings.c @@ -795,7 +795,7 @@ const clivalue_t valueTable[] = { #if defined(USE_ACC) { "blackbox_disable_acc", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_ACC, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) }, #endif - { "blackbox_disable_debug", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_DEBUG, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) }, + { "blackbox_disable_debug", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_DEBUG_LOG, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) }, { "blackbox_disable_motors", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_MOTOR, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) }, #ifdef USE_GPS { "blackbox_disable_gps", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_GPS, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) },