Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-15 04:15:44 +03:00
Code Issues Wiki Activity

remove setting which disallow disarming on throttle above low

Browse source
This commit is contained in:
Steffen Windoffer 2018-01-30 23:48:54 +01:00
parent 69297d0dc2
commit 45a6588eaf
5 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/fc/rc_controls.c
View file

@ -79,11 +79,10 @@ PG_RESET_TEMPLATE(rcControlsConfig_t, rcControlsConfig,
.yaw_control_reversed = false,
);
PG_REGISTER_WITH_RESET_TEMPLATE(armingConfig_t, armingConfig, PG_ARMING_CONFIG, 0);
PG_REGISTER_WITH_RESET_TEMPLATE(armingConfig_t, armingConfig, PG_ARMING_CONFIG, 1);
PG_RESET_TEMPLATE(armingConfig_t, armingConfig,
.gyro_cal_on_first_arm = 0, // TODO - Cleanup retarded arm support
.disarm_kill_switch = 1,
.auto_disarm_delay = 5
);
@ -129,7 +128,7 @@ throttleStatus_e calculateThrottleStatus(void)
rcDelayMs -= (t); \
doNotRepeat = false; \
}
void processRcStickPositions(throttleStatus_e throttleStatus)
void processRcStickPositions()
{
// time the sticks are maintained
static int16_t rcDelayMs;
@ -178,11 +177,7 @@ void processRcStickPositions(throttleStatus_e throttleStatus)
if (ARMING_FLAG(ARMED) && rxIsReceivingSignal() && !failsafeIsActive() ) {
rcDisarmTicks++;
if (rcDisarmTicks > 3) {
if (armingConfig()->disarm_kill_switch) {
disarm();
} else if (throttleStatus == THROTTLE_LOW) {
disarm();
}
disarm();
}
}
}