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

Merge remote-tracking branch 'origin/corvuscorax/onboardlogging' into thread/OP-1119_Flight_Side_Logs_Plugin

Browse Source
This commit is contained in:
Fredrik Arvidsson 2013-11-30 23:37:52 +01:00
commit f37f6540a9
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flight/modules/Logging/Logging.c
View File

@ -91,23 +91,29 @@ static void StatusUpdatedCb(__attribute__((unused)) UAVObjEvent *ev)
static void FlightStatusUpdatedCb(__attribute__((unused)) UAVObjEvent *ev) static void FlightStatusUpdatedCb(__attribute__((unused)) UAVObjEvent *ev)
{ {
FlightStatusGet(&flightstatus); FlightStatusGet(&flightstatus);
switch (settings.LoggingEnabled) { if (settings.LoggingEnabled == DEBUGLOGSETTINGS_LOGGINGENABLED_ONLYWHENARMED) {
case DEBUGLOGSETTINGS_LOGGINGENABLED_ALWAYS: if (flightstatus.Armed != FLIGHTSTATUS_ARMED_ARMED) {
PIOS_DEBUGLOG_Enable(1); PIOS_DEBUGLOG_Printf("FlightStatus Disarmed: On board Logging disabled.");
break; PIOS_DEBUGLOG_Enable(0);
case DEBUGLOGSETTINGS_LOGGINGENABLED_ONLYWHENARMED: } else {
PIOS_DEBUGLOG_Enable(flightstatus.Armed == FLIGHTSTATUS_ARMED_ARMED); PIOS_DEBUGLOG_Enable(1);
break; PIOS_DEBUGLOG_Printf("FlightStatus Armed: On board logging enabled.");
default: }
PIOS_DEBUGLOG_Enable(0);
} }
} }
static void SettingsUpdatedCb(__attribute__((unused)) UAVObjEvent *ev) static void SettingsUpdatedCb(__attribute__((unused)) UAVObjEvent *ev)
{ {
DebugLogSettingsGet(&settings); DebugLogSettingsGet(&settings);
FlightStatusUpdatedCb(NULL); if (settings.LoggingEnabled == DEBUGLOGSETTINGS_LOGGINGENABLED_ALWAYS) {
PIOS_DEBUGLOG_Printf("On board logging enabled."); PIOS_DEBUGLOG_Enable(1);
PIOS_DEBUGLOG_Printf("On board logging enabled.");
} else if (settings.LoggingEnabled == DEBUGLOGSETTINGS_LOGGINGENABLED_DISABLED) {
PIOS_DEBUGLOG_Printf("On board logging disabled.");
PIOS_DEBUGLOG_Enable(0);
} else {
FlightStatusUpdatedCb(NULL);
}
} }
static void ControlUpdatedCb(__attribute__((unused)) UAVObjEvent *ev) static void ControlUpdatedCb(__attribute__((unused)) UAVObjEvent *ev)