From e0ebee168a775cbb137c640f7aa5849df33e66b0 Mon Sep 17 00:00:00 2001 From: Dan Nixon Date: Wed, 19 Jul 2017 09:37:34 +0100 Subject: [PATCH] Remove the ability to disable stage 2 failsafe --- src/main/fc/cli.c | 2 +- src/main/fc/config.c | 2 +- src/main/fc/config.h | 1 - src/main/fc/fc_core.c | 12 ++++-------- src/main/fc/fc_msp.c | 4 +--- src/main/io/ledstrip.c | 2 +- src/main/target/ALIENWHOOP/target.h | 4 ++-- src/main/target/COLIBRI_RACE/target.h | 2 +- 8 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c index 25d0c19544..b2b99a0dc6 100755 --- a/src/main/fc/cli.c +++ b/src/main/fc/cli.c @@ -165,7 +165,7 @@ static const char * const mixerNames[] = { // sync this with features_e static const char * const featureNames[] = { "RX_PPM", "", "INFLIGHT_ACC_CAL", "RX_SERIAL", "MOTOR_STOP", - "SERVO_TILT", "SOFTSERIAL", "GPS", "FAILSAFE", + "SERVO_TILT", "SOFTSERIAL", "GPS", "", "SONAR", "TELEMETRY", "", "3D", "RX_PARALLEL_PWM", "RX_MSP", "RSSI_ADC", "LED_STRIP", "DISPLAY", "OSD", "", "CHANNEL_FORWARDING", "TRANSPONDER", "AIRMODE", diff --git a/src/main/fc/config.c b/src/main/fc/config.c index 8fc0ce935f..c979df0707 100755 --- a/src/main/fc/config.c +++ b/src/main/fc/config.c @@ -114,7 +114,7 @@ pidProfile_t *currentPidProfile; PG_REGISTER_WITH_RESET_TEMPLATE(featureConfig_t, featureConfig, PG_FEATURE_CONFIG, 0); PG_RESET_TEMPLATE(featureConfig_t, featureConfig, - .enabledFeatures = DEFAULT_FEATURES | DEFAULT_RX_FEATURE | FEATURE_FAILSAFE + .enabledFeatures = DEFAULT_FEATURES | DEFAULT_RX_FEATURE ); PG_REGISTER_WITH_RESET_TEMPLATE(systemConfig_t, systemConfig, PG_SYSTEM_CONFIG, 0); diff --git a/src/main/fc/config.h b/src/main/fc/config.h index 3a49aeaf03..c697b82d32 100644 --- a/src/main/fc/config.h +++ b/src/main/fc/config.h @@ -39,7 +39,6 @@ typedef enum { FEATURE_SERVO_TILT = 1 << 5, FEATURE_SOFTSERIAL = 1 << 6, FEATURE_GPS = 1 << 7, - FEATURE_FAILSAFE = 1 << 8, FEATURE_SONAR = 1 << 9, FEATURE_TELEMETRY = 1 << 10, FEATURE_3D = 1 << 12, diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c index 7123697b1f..5b26c1f0d1 100644 --- a/src/main/fc/fc_core.c +++ b/src/main/fc/fc_core.c @@ -337,14 +337,10 @@ void processRx(timeUs_t currentTimeUs) updateRSSI(currentTimeUs); - if (feature(FEATURE_FAILSAFE)) { - - if (currentTimeUs > FAILSAFE_POWER_ON_DELAY_US && !failsafeIsMonitoring()) { - failsafeStartMonitoring(); - } - - failsafeUpdateState(); + if (currentTimeUs > FAILSAFE_POWER_ON_DELAY_US && !failsafeIsMonitoring()) { + failsafeStartMonitoring(); } + failsafeUpdateState(); const throttleStatus_e throttleStatus = calculateThrottleStatus(); @@ -427,7 +423,7 @@ void processRx(timeUs_t currentTimeUs) bool canUseHorizonMode = true; - if ((IS_RC_MODE_ACTIVE(BOXANGLE) || (feature(FEATURE_FAILSAFE) && failsafeIsActive())) && (sensors(SENSOR_ACC))) { + if ((IS_RC_MODE_ACTIVE(BOXANGLE) || failsafeIsActive()) && (sensors(SENSOR_ACC))) { // bumpless transfer to Level mode canUseHorizonMode = false; diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c index 7799082fb7..3903832de4 100644 --- a/src/main/fc/fc_msp.c +++ b/src/main/fc/fc_msp.c @@ -373,9 +373,7 @@ void initActiveBoxIds(void) } #endif - if (feature(FEATURE_FAILSAFE)) { - BME(BOXFAILSAFE); - } + BME(BOXFAILSAFE); if (mixerConfig()->mixerMode == MIXER_FLYING_WING || mixerConfig()->mixerMode == MIXER_AIRPLANE || mixerConfig()->mixerMode == MIXER_CUSTOM_AIRPLANE) { BME(BOXPASSTHRU); diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c index 69e4332f66..eb5d1840f6 100644 --- a/src/main/io/ledstrip.c +++ b/src/main/io/ledstrip.c @@ -539,7 +539,7 @@ static void applyLedWarningLayer(bool updateNow, timeUs_t *timer) warningFlags = 0; if (batteryConfig()->voltageMeterSource != VOLTAGE_METER_NONE && getBatteryState() != BATTERY_OK) warningFlags |= 1 << WARNING_LOW_BATTERY; - if (feature(FEATURE_FAILSAFE) && failsafeIsActive()) + if (failsafeIsActive()) warningFlags |= 1 << WARNING_FAILSAFE; if (!ARMING_FLAG(ARMED) && isArmingDisabled()) warningFlags |= 1 << WARNING_ARMING_DISABLED; diff --git a/src/main/target/ALIENWHOOP/target.h b/src/main/target/ALIENWHOOP/target.h index 7b17471928..771f07a41c 100644 --- a/src/main/target/ALIENWHOOP/target.h +++ b/src/main/target/ALIENWHOOP/target.h @@ -194,9 +194,9 @@ /* Defaults - What do we want out of the box? */ #if defined(BREADBOARD) -#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP ) +#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP) #else -#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP | FEATURE_FAILSAFE) // FEATURE_TELEMETRY changes bind pin from rx to tx +#define DEFAULT_FEATURES (FEATURE_RX_SERIAL | FEATURE_MOTOR_STOP) // FEATURE_TELEMETRY changes bind pin from rx to tx #endif #undef VTX_COMMON diff --git a/src/main/target/COLIBRI_RACE/target.h b/src/main/target/COLIBRI_RACE/target.h index e38884f8c9..4314cf9fad 100644 --- a/src/main/target/COLIBRI_RACE/target.h +++ b/src/main/target/COLIBRI_RACE/target.h @@ -117,7 +117,7 @@ #define RSSI_ADC_PIN PC2 #define EXTERNAL1_ADC_PIN PC3 -#define DEFAULT_FEATURES (FEATURE_FAILSAFE | FEATURE_AIRMODE | FEATURE_LED_STRIP) +#define DEFAULT_FEATURES (FEATURE_AIRMODE | FEATURE_LED_STRIP) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART2