diff --git a/src/main/config/config.c b/src/main/config/config.c index df4ab41fa4..30b3e5f00b 100755 --- a/src/main/config/config.c +++ b/src/main/config/config.c @@ -491,7 +491,7 @@ static void resetConf(void) masterConfig.inputFilteringMode = INPUT_FILTERING_DISABLED; - masterConfig.retarded_arm = 0; + masterConfig.retarded_arm = 0; // FIXME: cleanup retarded arm masterConfig.disarm_kill_switch = 1; masterConfig.auto_disarm_delay = 5; masterConfig.small_angle = 25; diff --git a/src/main/io/rc_controls.c b/src/main/io/rc_controls.c index bf694adb96..b8a4c95934 100644 --- a/src/main/io/rc_controls.c +++ b/src/main/io/rc_controls.c @@ -182,15 +182,6 @@ void processRcStickPositions(rxConfig_t *rxConfig, throttleStatus_e throttleStat rcDelayCommand = 0; // reset so disarm tone will repeat } } - // Disarm on roll (only when retarded_arm is enabled) - if (retarded_arm && (rcSticks == THR_LO + YAW_CE + PIT_CE + ROL_LO)) { - if (ARMING_FLAG(ARMED)) - mwDisarm(); - else { - beeper(BEEPER_DISARM_REPEAT); // sound tone while stick held - rcDelayCommand = 0; // reset so disarm tone will repeat - } - } } if (ARMING_FLAG(ARMED)) { diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c index 9456c677ed..efae91f6f4 100644 --- a/src/main/io/serial_cli.c +++ b/src/main/io/serial_cli.c @@ -503,7 +503,6 @@ const clivalue_t valueTable[] = { { "motor_pwm_rate", VAR_UINT16 | MASTER_VALUE, &masterConfig.motor_pwm_rate, .config.minmax = { 50, 32000 }, 0 }, { "servo_pwm_rate", VAR_UINT16 | MASTER_VALUE, &masterConfig.servo_pwm_rate, .config.minmax = { 50, 498 }, 0 }, - { "retarded_arm", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.retarded_arm, .config.lookup = { TABLE_OFF_ON }, 0 }, { "disarm_kill_switch", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, &masterConfig.disarm_kill_switch, .config.lookup = { TABLE_OFF_ON }, 0 }, { "auto_disarm_delay", VAR_UINT8 | MASTER_VALUE, &masterConfig.auto_disarm_delay, .config.minmax = { 0, 60 }, 0 }, { "small_angle", VAR_UINT8 | MASTER_VALUE, &masterConfig.small_angle, .config.minmax = { 0, 180 }, 0 },