rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next

Browse Source
This commit is contained in:
Alessio Morale 2015-04-20 12:10:31 +02:00
commit 19bb4d8016
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
flight/modules/ManualControl/armhandler.c
View File

@ -35,7 +35,9 @@
#include <flightstatus.h>
#include <flightmodesettings.h>
#include <stabilizationdesired.h>
#ifndef PIOS_EXCLUDE_ADVANCED_FEATURES
#include <statusvtolland.h>
#endif
// Private constants
#define ARMED_THRESHOLD 0.50f
@ -341,6 +343,7 @@ static bool forcedDisArm(void)
return true;
}
#ifndef PIOS_EXCLUDE_ADVANCED_FEATURES
// check landing state if active
FlightStatusData flightStatus;
FlightStatusGet(&flightStatus);
@ -351,7 +354,7 @@ static bool forcedDisArm(void)
return true;
}
}
#endif
return false;
}