From bb5d5d1d1eeb9e8371fc6dcaa645e595305e760d Mon Sep 17 00:00:00 2001 From: Hugo Chiang <31283897+DusKing1@users.noreply.github.com> Date: Sat, 1 Oct 2022 23:15:00 +0800 Subject: [PATCH] revert changes around `ACC` --- src/main/blackbox/blackbox.c | 14 +++++++------- src/main/blackbox/blackbox_fielddefs.h | 4 ++-- src/main/cli/settings.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index 3efc5f83b..552760f14 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -225,9 +225,9 @@ static const blackboxDeltaFieldDefinition_t blackboxMainFields[] = { {"gyroADC", 0, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(GYRO)}, {"gyroADC", 1, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(GYRO)}, {"gyroADC", 2, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(GYRO)}, - {"accSmooth", 0, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACCELERATE)}, - {"accSmooth", 1, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACCELERATE)}, - {"accSmooth", 2, SIGNED, .Ipredict = PREDICT(0), .Iencode = ENCODING(SIGNED_VB), .Ppredict = PREDICT(AVERAGE_2), .Pencode = ENCODING(SIGNED_VB), CONDITION(ACCELERATE)}, + {"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_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)}, @@ -485,8 +485,8 @@ static bool testBlackboxConditionUncached(FlightLogFieldCondition condition) case CONDITION(GYRO): return isFieldEnabled(FIELD_SELECT(GYRO)); - case CONDITION(ACCELERATE): - return sensors(SENSOR_ACC) && isFieldEnabled(FIELD_SELECT(ACCELERATE)); + case CONDITION(ACC): + return sensors(SENSOR_ACC) && isFieldEnabled(FIELD_SELECT(ACC)); case CONDITION(DEBUG_LOG): return (debugMode != DEBUG_NONE) && isFieldEnabled(FIELD_SELECT(DEBUG_LOG)); @@ -628,7 +628,7 @@ static void writeIntraframe(void) blackboxWriteSigned16VBArray(blackboxCurrent->gyroADC, XYZ_AXIS_COUNT); } - if (testBlackboxCondition(CONDITION(ACCELERATE))) { + if (testBlackboxCondition(CONDITION(ACC))) { blackboxWriteSigned16VBArray(blackboxCurrent->accADC, XYZ_AXIS_COUNT); } @@ -778,7 +778,7 @@ static void writeInterframe(void) if (testBlackboxCondition(CONDITION(GYRO))) { blackboxWriteMainStateArrayUsingAveragePredictor(offsetof(blackboxMainState_t, gyroADC), XYZ_AXIS_COUNT); } - if (testBlackboxCondition(CONDITION(ACCELERATE))) { + if (testBlackboxCondition(CONDITION(ACC))) { blackboxWriteMainStateArrayUsingAveragePredictor(offsetof(blackboxMainState_t, accADC), XYZ_AXIS_COUNT); } if (testBlackboxCondition(CONDITION(DEBUG_LOG))) { diff --git a/src/main/blackbox/blackbox_fielddefs.h b/src/main/blackbox/blackbox_fielddefs.h index 8ce26163c..f39cebdf5 100644 --- a/src/main/blackbox/blackbox_fielddefs.h +++ b/src/main/blackbox/blackbox_fielddefs.h @@ -50,7 +50,7 @@ typedef enum FlightLogFieldCondition { FLIGHT_LOG_FIELD_CONDITION_NOT_LOGGING_EVERY_FRAME, FLIGHT_LOG_FIELD_CONDITION_GYRO, - FLIGHT_LOG_FIELD_CONDITION_ACCELERATE,//ACC 与at32f43x的自动频率矫正 ACC 冲突 + FLIGHT_LOG_FIELD_CONDITION_ACC, FLIGHT_LOG_FIELD_CONDITION_DEBUG_LOG, FLIGHT_LOG_FIELD_CONDITION_NEVER, @@ -68,7 +68,7 @@ typedef enum FlightLogFieldSelect_e { // no more than 32 FLIGHT_LOG_FIELD_SELECT_ALTITUDE, FLIGHT_LOG_FIELD_SELECT_RSSI, FLIGHT_LOG_FIELD_SELECT_GYRO, - FLIGHT_LOG_FIELD_SELECT_ACCELERATE,//ACC 与at32f43x的 acc 自动频率矫正冲突 + FLIGHT_LOG_FIELD_SELECT_ACC, FLIGHT_LOG_FIELD_SELECT_DEBUG_LOG, FLIGHT_LOG_FIELD_SELECT_MOTOR, FLIGHT_LOG_FIELD_SELECT_GPS, diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c index 7e4b92def..7237b9d8f 100644 --- a/src/main/cli/settings.c +++ b/src/main/cli/settings.c @@ -830,7 +830,7 @@ const clivalue_t valueTable[] = { { "blackbox_disable_rssi", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_RSSI, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) }, { "blackbox_disable_gyro", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_GYRO, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) }, #if defined(USE_ACC) - { "blackbox_disable_acc", VAR_UINT32 | MASTER_VALUE | MODE_BITSET, .config.bitpos = FLIGHT_LOG_FIELD_SELECT_ACCELERATE, PG_BLACKBOX_CONFIG, offsetof(blackboxConfig_t, fields_disabled_mask) }, + { "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_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) },