Merge branch 'aux_failsafe' into betaflight

Conflicts: src/main/config/config.c
2025-07-25 17:25:20 +03:00 · 2015-09-25 15:34:57 +02:00 · 2015-09-25 15:34:57 +02:00 · b9e16ef243
commit b9e16ef243
parent f39ca7add6 bc7dfb5ff5
2 changed files with 3 additions and 6 deletions
--- a/src/main/rx/rx.c
+++ b/src/main/rx/rx.c
@ -378,16 +378,13 @@ static uint16_t getRxfailValue(uint8_t channel)
    switch(channelFailsafeConfiguration->mode) {
        case RX_FAILSAFE_MODE_AUTO:
            switch (channel) {
-                case ROLL:
-                case PITCH:
-                case YAW:
-                    return rxConfig->midrc;
-
                case THROTTLE:
                    if (feature(FEATURE_3D))
                        return rxConfig->midrc;
                    else
                        return rxConfig->rx_min_usec;
+                default:
+                    return rxConfig->midrc;
            }
            /* no break */