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

Modified flight alarm code to set SystemAlarms to an "Uninitialised" value on startup.

Browse Source 
This means that any defined alarms that don't have their flight module compiled in will show uninitialised rather than OK

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2295 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
andrew 2010-12-27 07:30:36 +00:00 committed by andrew
parent 39cb30d56f
commit e7e0f6740b
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
flight/OpenPilot/System/alarms.c
View File

@ -46,7 +46,8 @@ static int32_t hasSeverity(SystemAlarmsAlarmOptions severity);
int32_t AlarmsInitialize(void)
{
lock = xSemaphoreCreateRecursiveMutex();
AlarmsClearAll();
//AlarmsClearAll();
AlarmsDefaultAll();
return 0;
}
@ -104,6 +105,28 @@ SystemAlarmsAlarmOptions AlarmsGet(SystemAlarmsAlarmElem alarm)
return alarms.Alarm[alarm];
}
/**
* Set an alarm to it's default value
* @param alarm The system alarm to be modified
* @return 0 if success, -1 if an error
*/
int32_t AlarmsDefault(SystemAlarmsAlarmElem alarm)
{
return AlarmsSet(alarm, SYSTEMALARMS_ALARM_DEFAULT);
}
/**
* Default all alarms
*/
void AlarmsDefaultAll()
{
uint32_t n;
for (n = 0; n < SYSTEMALARMS_ALARM_NUMELEM; ++n)
{
AlarmsDefault(n);
}
}
/**
* Clear an alarm
* @param alarm The system alarm to be modified
@ -115,7 +138,7 @@ int32_t AlarmsClear(SystemAlarmsAlarmElem alarm)
}
/**
* Clear all alarms
* Clear all alarms
*/
void AlarmsClearAll()
{

3
flight/OpenPilot/System/inc/alarms.h
View File

@ -29,10 +29,13 @@
#define ALARMS_H
#include "systemalarms.h"
#define SYSTEMALARMS_ALARM_DEFAULT SYSTEMALARMS_ALARM_UNINITIALISED
int32_t AlarmsInitialize(void);
int32_t AlarmsSet(SystemAlarmsAlarmElem alarm, SystemAlarmsAlarmOptions severity);
SystemAlarmsAlarmOptions AlarmsGet(SystemAlarmsAlarmElem alarm);
int32_t AlarmsDefault(SystemAlarmsAlarmElem alarm);
void AlarmsDefaultAll();
int32_t AlarmsClear(SystemAlarmsAlarmElem alarm);
void AlarmsClearAll();
int32_t AlarmsHasWarnings();