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

LP-293 make use of NELEMENTS() macro instead of defining own version NELEM()

Browse Source
This commit is contained in:
Vladimir Zidar 2016-04-24 02:03:50 +02:00
parent 85fa65a514
commit 1f0bf155ce
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flight/libraries/alarms.c
View File

@ -38,8 +38,6 @@
#define PIOS_ALARM_GRACETIME 1000
#endif // PIOS_ALARM_GRACETIME
#define NELEM(x) ((sizeof(x) / sizeof((x)[0])))
// Private types
// Private variables
@ -328,7 +326,7 @@ size_t AlarmString(SystemAlarmsData *alarm, char *buffer, size_t buffer_size, Sy
{
size_t pos = 0;
PIOS_STATIC_ASSERT(NELEM(systemalarms_alarm_names) == SYSTEMALARMS_ALARM_NUMELEM);
PIOS_STATIC_ASSERT(NELEMENTS(systemalarms_alarm_names) == SYSTEMALARMS_ALARM_NUMELEM);
for (unsigned severity = SYSTEMALARMS_ALARM_ERROR; severity >= level; --severity) {
// should we prepend severity level here? No, not for now.
@ -349,13 +347,13 @@ size_t AlarmString(SystemAlarmsData *alarm, char *buffer, size_t buffer_size, Sy
switch (i) {
case SYSTEMALARMS_ALARM_SYSTEMCONFIGURATION:
if (alarm->ExtendedAlarmStatus.SystemConfiguration < NELEM(systemalarms_extendedalarmstatus_names)) {
if (alarm->ExtendedAlarmStatus.SystemConfiguration < NELEMENTS(systemalarms_extendedalarmstatus_names)) {
current_msg = systemalarms_extendedalarmstatus_names[alarm->ExtendedAlarmStatus.SystemConfiguration];
}
break;
case SYSTEMALARMS_ALARM_BOOTFAULT:
if (alarm->ExtendedAlarmStatus.BootFault < NELEM(systemalarms_extendedalarmstatus_names)) {
if (alarm->ExtendedAlarmStatus.BootFault < NELEMENTS(systemalarms_extendedalarmstatus_names)) {
current_msg = systemalarms_extendedalarmstatus_names[alarm->ExtendedAlarmStatus.BootFault];
}
break;