Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +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

4
src/main/interface/msp.c
View file

@ -875,7 +875,7 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
case MSP_ARMING_CONFIG:
sbufWriteU8(dst, armingConfig()->auto_disarm_delay);
sbufWriteU8(dst, armingConfig()->disarm_kill_switch);
sbufWriteU8(dst, 0);
sbufWriteU8(dst, imuConfig()->small_angle);
break;
@ -1414,7 +1414,7 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
break;
case MSP_SET_ARMING_CONFIG:
armingConfigMutable()->auto_disarm_delay = sbufReadU8(src);
armingConfigMutable()->disarm_kill_switch = sbufReadU8(src);
sbufReadU8(src); // reserved
if (sbufBytesRemaining(src)) {
imuConfigMutable()->small_angle = sbufReadU8(src);
}

1
src/main/interface/settings.c
View file

@ -568,7 +568,6 @@ const clivalue_t valueTable[] = {
// PG_ARMING_CONFIG
{ "auto_disarm_delay", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, 60 }, PG_ARMING_CONFIG, offsetof(armingConfig_t, auto_disarm_delay) },
{ "disarm_kill_switch", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_ARMING_CONFIG, offsetof(armingConfig_t, disarm_kill_switch) },
{ "gyro_cal_on_first_arm", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_OFF_ON }, PG_ARMING_CONFIG, offsetof(armingConfig_t, gyro_cal_on_first_arm) },