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

OP-886 Fixes to styles, used enum for ExtendedAlarmStatus

Browse Source 
Conflicts:
	flight/Libraries/inc/sanitycheck.h
	shared/uavobjectdefinition/systemalarms.xml
This commit is contained in:
Alessio Morale 2013-04-20 13:59:25 +02:00
parent 220b4b5042
commit dd37c31a07
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flight/Libraries/inc/sanitycheck.h
View File

@ -26,9 +26,17 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include <systemalarms.h>
#ifndef SANITYCHECK_H #ifndef SANITYCHECK_H
#define SANITYCHECK_H #define SANITYCHECK_H
#define SANITYCHECK_STATUS_ERROR_NONE SYSTEMALARMS_EXTENDEDALARMSTATUS_NONE
#define SANITYCHECK_STATUS_ERROR_FLIGHTMODE SYSTEMALARMS_EXTENDEDALARMSTATUS_FLIGHTMODE
#define BOOTFAULT_STATUS_ERROR_NONE SYSTEMALARMS_EXTENDEDALARMSTATUS_NONE
#define BOOTFAULT_STATUS_ERROR_REQUIRE_REBOOT SYSTEMALARMS_EXTENDEDALARMSTATUS_REBOOTREQUIRED
#if (SYSTEMALARMS_EXTENDEDALARMSTATUS_NUMELEM != SYSTEMALARMS_EXTENDEDALARMSUBSTATUS_NUMELEM) || \ #if (SYSTEMALARMS_EXTENDEDALARMSTATUS_NUMELEM != SYSTEMALARMS_EXTENDEDALARMSUBSTATUS_NUMELEM) || \
(SYSTEMALARMS_EXTENDEDALARMSUBSTATUS_NUMELEM > SYSTEMALARMS_ALARM_NUMELEM) (SYSTEMALARMS_EXTENDEDALARMSUBSTATUS_NUMELEM > SYSTEMALARMS_ALARM_NUMELEM)
#error Incongruent SystemAlarms. Please revise the UAVO definition in systemalarms.xml #error Incongruent SystemAlarms. Please revise the UAVO definition in systemalarms.xml

1
flight/Libraries/sanitycheck.c
View File

@ -35,7 +35,6 @@
// UAVOs // UAVOs
#include <manualcontrolsettings.h> #include <manualcontrolsettings.h>
#include <systemalarms.h>
#include <systemsettings.h> #include <systemsettings.h>
/**************************** /****************************