From 9ebb66fbce4a5f900e67aec4e720d6cc1a4112ed Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Sat, 12 Apr 2014 22:00:26 +0200 Subject: [PATCH] OP-1302 filter out telemetry alarms --- flight/libraries/alarms.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/flight/libraries/alarms.c b/flight/libraries/alarms.c index 5dc3cda2e..7f2688a73 100644 --- a/flight/libraries/alarms.c +++ b/flight/libraries/alarms.c @@ -244,7 +244,7 @@ static int32_t hasSeverity(SystemAlarmsAlarmOptions severity) // Go through alarms and check if any are of the given severity or higher for (uint32_t n = 0; n < SYSTEMALARMS_ALARM_NUMELEM; ++n) { - if (cast_struct_to_array(alarms, alarms.Actuator)[n] >= severity) { + if (n != SYSTEMALARMS_ALARM_TELEMETRY && cast_struct_to_array(alarms, alarms.Actuator)[n] >= severity) { xSemaphoreGiveRecursive(lock); return 1; } @@ -272,7 +272,8 @@ SystemAlarmsAlarmOptions AlarmsGetHighestSeverity() // Go through alarms and find the highest severity uint32_t n = 0; while (n < SYSTEMALARMS_ALARM_NUMELEM && highest != SYSTEMALARMS_ALARM_CRITICAL) { - if (cast_struct_to_array(alarmsData, alarmsData.Actuator)[n] > highest) { + if (n != SYSTEMALARMS_ALARM_TELEMETRY && + cast_struct_to_array(alarmsData, alarmsData.Actuator)[n] > highest) { highest = cast_struct_to_array(alarmsData, alarmsData.Actuator)[n]; } n++;