Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r9e88617fa7eef0fd2ccc9a69facbf07437777490 -r9b76d1db3897adf5fec100526a8987d43483401e --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 9e88617fa7eef0fd2ccc9a69facbf07437777490) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 9b76d1db3897adf5fec100526a8987d43483401e) @@ -48,7 +48,7 @@ #define SUPERVISOR_ALARM_KEY 0xD2C3B4A5 ///< 32-bit key required for clear all alarms request. #define LOWEST_ALARM_SUB_RANK 999 ///< Lowest alarm sub-rank that can be set. -#define ALARM_BLOCKED_LIMIT_AC_RECOVERY 10 ///< Alarm rank above which alarms are blocked by alarmStatus.alarmsBlockedTimer, last unblockable alarm +#define ALARM_BLOCKED_LIMIT_AC_RECOVERY 10 ///< Alarm rank limit, alarms at and above this limit are blocked by alarmStatus.alarmsBlockedTimer #define ALARM_NOT_BLOCKED 0 ///< Alarm blocked timer value that indicates no alarm block // *** This declaration will cause a compiler error if ALARM_TABLE does not have same # of alarms as the Alarm_List enumeration. @@ -266,7 +266,7 @@ alarmStatus.alarmsBlockedTimer = ALARM_BLOCK_COUNT_AFTER_AC_RETURN; } // if the block timer is 0 OR we have an unblockable alarm - if (( ALARM_NOT_BLOCKED == alarmStatus.alarmsBlockedTimer ) || ( ALARM_TABLE[ alarm ].alarmSubRank <= ALARM_BLOCKED_LIMIT_AC_RECOVERY ) ) + if (( ALARM_NOT_BLOCKED == alarmStatus.alarmsBlockedTimer ) || ( ALARM_TABLE[ alarm ].alarmSubRank < ALARM_BLOCKED_LIMIT_AC_RECOVERY ) ) { // No need to do anything if alarm is already active, but if condition was cleared then re-trigger alarm if ( ( FALSE == alarmIsActive[ alarm ] ) ||