rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

fixed safety check for throttle low, needed for arming on switch, too, but not for disarming

Browse Source
This commit is contained in:
Corvus Corax 2013-07-18 14:10:33 +02:00
parent 7b5bf53200
commit 9ba1fbdccc
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
flight/modules/ManualControl/manualcontrol.c
View File

@ -1038,8 +1038,19 @@ static void processArm(ManualControlCommandData *cmd, ManualControlSettingsData
{
bool lowThrottle = cmd->Throttle <= 0;
if (settings->Arming == MANUALCONTROLSETTINGS_ARMING_ACCESSORY2) {
lowThrottle = true;
/**
* do NOT check throttle if disarming via switch, must be instant
*/
switch (settings->Arming) {
case MANUALCONTROLSETTINGS_ARMING_ACCESSORY0:
case MANUALCONTROLSETTINGS_ARMING_ACCESSORY1:
case MANUALCONTROLSETTINGS_ARMING_ACCESSORY2:
if (!armSwitch) {
lowThrottle = true;
}
break;
default:
break;
}
if (forcedDisArm()) {