Index: firmware/App/Controllers/Fans.c =================================================================== diff -u -rf68e01a2daee6cb88bb54816aee56668d662bcd4 -r9ce06772b2f651c57144327e6cbf886e2bc22dee --- firmware/App/Controllers/Fans.c (.../Fans.c) (revision f68e01a2daee6cb88bb54816aee56668d662bcd4) +++ firmware/App/Controllers/Fans.c (.../Fans.c) (revision 9ce06772b2f651c57144327e6cbf886e2bc22dee) @@ -111,8 +111,7 @@ fansMonitorCounter = 0; // Initialize a persistent alarm for fans RPM out of range - initPersistentAlarm( PERSISTENT_ALARM_FANS_RPM_OUT_RANGE, ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, - TRUE, FANS_MAX_ALLOWED_RPM_OUT_OF_RANGE_INTERVAL, FANS_MAX_ALLOWED_RPM_OUT_OF_RANGE_INTERVAL ); + initPersistentAlarm( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, FANS_MAX_ALLOWED_RPM_OUT_OF_RANGE_INTERVAL, FANS_MAX_ALLOWED_RPM_OUT_OF_RANGE_INTERVAL ); } /*********************************************************************//** @@ -482,15 +481,8 @@ /*for ( fan = FAN_INLET_1; fan < NUM_OF_FANS_NAMES; fan++ ) { - // Call persistent alarm if a fan's RPM is out of range - if ( fansStatus.rpm[ fan ] >= FANS_MAX_ALLOWED_RPM ) - { - checkPersistentAlarm( PERSISTENT_ALARM_FANS_RPM_OUT_RANGE, TRUE, fansStatus.rpm[ fan ], FANS_MAX_ALLOWED_RPM ); - } - else if ( fansStatus.rpm[ fan ] <= FANS_MIN_ALLOWED_RPM ) - { - checkPersistentAlarm( PERSISTENT_ALARM_FANS_RPM_OUT_RANGE, TRUE, fansStatus.rpm[ fan ], FANS_MIN_ALLOWED_RPM ); - } + BOOL const fanRpmOutOfRange = ( fansStatus.rpm[ fan ] >= FANS_MAX_ALLOWED_RPM ) && ( fansStatus.rpm[ fan ] <= FANS_MIN_ALLOWED_RPM ); + checkPersistentAlarm( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, fanRpmOutOfRange, fansStatus.rpm[ fan ], FANS_MAX_ALLOWED_RPM ); }*/ fansMonitorCounter = 0;