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

Merge branch 'nosave_while_armed' into revo

Browse Source
This commit is contained in:
James Cotton 2012-07-22 02:13:25 -05:00
commit 42501d6312
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/System/systemmod.c
View File

@ -216,8 +216,19 @@ static void objectUpdatedCb(UAVObjEvent * ev)
ObjectPersistenceGet(&objper); ObjectPersistenceGet(&objper);
int retval = 1; int retval = 1;
// Execute action FlightStatusData flightStatus;
if (objper.Operation == OBJECTPERSISTENCE_OPERATION_LOAD) { FlightStatusGet(&flightStatus);
// When this is called because of this method don't do anything
if (objper.Operation == OBJECTPERSISTENCE_OPERATION_ERROR ||
objper.Operation == OBJECTPERSISTENCE_OPERATION_COMPLETED) {
return;
}
// Execute action if disarmed
if(flightStatus.Armed != FLIGHTSTATUS_ARMED_DISARMED) {
retval = -1;
} else if (objper.Operation == OBJECTPERSISTENCE_OPERATION_LOAD) {
if (objper.Selection == OBJECTPERSISTENCE_SELECTION_SINGLEOBJECT) { if (objper.Selection == OBJECTPERSISTENCE_SELECTION_SINGLEOBJECT) {
// Get selected object // Get selected object
obj = UAVObjGetByID(objper.ObjectID); obj = UAVObjGetByID(objper.ObjectID);