From bd04f4d22b00e8dad8b2d34b6ac2e8010c5f05cf Mon Sep 17 00:00:00 2001 From: borisbstyle Date: Thu, 18 Aug 2016 01:19:30 +0200 Subject: [PATCH] coding style // refactor --- src/main/blackbox/blackbox.c | 22 ++++++++++------------ src/main/io/serial_cli.c | 1 - 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c index d829f9babb..b9d60e1c10 100644 --- a/src/main/blackbox/blackbox.c +++ b/src/main/blackbox/blackbox.c @@ -930,15 +930,15 @@ void stopInTestMode(void) */ bool inMotorTestMode(void) { static uint32_t resetTime = 0; - uint16_t activeMinimumCommand = (feature(FEATURE_3D) ? masterConfig.flight3DConfig.neutral3d : masterConfig.escAndServoConfig.mincommand); + uint16_t inactiveMotorCommand = (feature(FEATURE_3D) ? masterConfig.flight3DConfig.neutral3d : masterConfig.escAndServoConfig.mincommand); int i; - bool motorsNotAtMin = false; + bool atLeastOneMotorActivated = false; // set disarmed motor values - for (i = 0; i < MAX_SUPPORTED_MOTORS; i++) - motorsNotAtMin |= (motor_disarmed[i] != activeMinimumCommand); + for (i = 0; i < MAX_SUPPORTED_MOTORS; i++) + atLeastOneMotorActivated |= (motor_disarmed[i] != inactiveMotorCommand); - if(motorsNotAtMin) { + if(atLeastOneMotorActivated) { resetTime = millis() + 5000; // add 5 seconds return true; } else { @@ -1625,14 +1625,12 @@ void handleBlackbox(void) if(masterConfig.blackbox_on_motor_test) { // Handle Motor Test Mode if(inMotorTestMode()) { - if(blackboxState==BLACKBOX_STATE_STOPPED) { + if(blackboxState==BLACKBOX_STATE_STOPPED) startInTestMode(); - } - } else { - if(blackboxState!=BLACKBOX_STATE_STOPPED) { - stopInTestMode(); - } - } + } else { + if(blackboxState!=BLACKBOX_STATE_STOPPED) + stopInTestMode(); + } } } } diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c index 98c92a69ca..e463b26398 100644 --- a/src/main/io/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -886,7 +886,6 @@ const clivalue_t valueTable[] = { { "blackbox_rate_denom", VAR_UINT8 | MASTER_VALUE, &masterConfig.blackbox_rate_denom, .config.minmax = { 1, 32 } }, { "blackbox_device", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.blackbox_device, .config.lookup = { TABLE_BLACKBOX_DEVICE } }, { "blackbox_on_motor_test", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.blackbox_on_motor_test, .config.lookup = { TABLE_OFF_ON } }, - #endif #ifdef VTX