Index: firmware/App/Controllers/Fans.c =================================================================== diff -u -r94a190522ce398399c7b93c59f788d7666ec0060 -reeb4e9c7c8ca2bc41168353c3d30f311080972b2 --- firmware/App/Controllers/Fans.c (.../Fans.c) (revision 94a190522ce398399c7b93c59f788d7666ec0060) +++ firmware/App/Controllers/Fans.c (.../Fans.c) (revision eeb4e9c7c8ca2bc41168353c3d30f311080972b2) @@ -53,7 +53,6 @@ #define FANS_MAX_ALLOWED_RPM_OUT_OF_RANGE_INTERVAL ( 3 * MS_PER_SECOND ) ///< Fans max allowed RPM out of range time interval. #define FANS_MAX_ALLOWED_RPM 5500 ///< Fans max allowed RPM value. #define FANS_MIN_ALLOWED_RPM 150 ///< Fans max allowed RPM value. -#define FANS_MONITOR_INTERVAL_COUNT ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Fans monitor time interval in counts. #define FANS_MIN_RPM_OUT_OF_RANGE_TOL 0.25 ///< Fans min RPM out of range tolerance. #define FANS_MAX_RPM_OUT_OF_RANGE_TOL 0.5 ///< Fans max RPM out of range tolerance. @@ -77,10 +76,10 @@ static FANS_EXEC_STATES_T fansExecState = FANS_EXEC_STATE_WAIT_FOR_POST_STATE; ///< Fans exec state. static U32 fansControlCounter = 0; ///< Fans control interval counter. static U32 fansPublishCounter = 0; ///< Fans data publish interval counter. -static U32 fansMonitorCounter = 0; ///< Fans monitor interval counter. static BOOL isPOSTComplete = FALSE; ///< Flag that indicates whether POST is complete or not. static BOOL hasAlarmBeenRaised = FALSE; ///< Flag that indicates whether the RPM out of range alarm been raise. -static U32 rpmAlarmStartTimer = 0; ///< RPM out of range alarm start timer when the alarm is raised. +static OVERRIDE_U32_T rpmAlarmStartTimeOffset = { 0, 0, 0, 0 }; ///< RPM out of range alarm start time offset. +static U32 rpmAlarmStartTime = 0; ///< RPM alarm start time. /// Temperature to duty cycle conversion slope (duty cycle not in percent) static const F32 SLOPE = ( FANS_MAX_DUTY_CYCLE - FANS_MIN_DUTY_CYCLE ) / ( MAX_ALLOWED_AMBINET_TEMPERATURE - MIN_ALLOWED_AMBIENT_TEMPERATURE ); @@ -95,32 +94,36 @@ static void setInletFansDutyCycle( F32 pwm ); static void setOutletFansDutyCycle( F32 pwm ); -static F32 getMaximumTemperature( void ); +static F32 getMaximumTemperature( void ); static void convertTogglePeriod2RPM( void ); static void monitorFans( void ); +static U32 getRPMAlarmStartTimeOffset( void ); static void publishFansData( void ); /*********************************************************************//** * @brief * The initFans function initializes the fans module. * @details Inputs: none * @details Outputs: fansExecState, fansControlCounter, fansPublishCounter, - * fansMonitorCounter, isPOSTComplete, hasAlarmBeenRaised, rpmAlarmStartTimer, - * fansStatus + * isPOSTComplete, hasAlarmBeenRaised, rpmAlarmStartTime, + * fansStatus, rpmAlarmStartTimeOffset * @return none *************************************************************************/ void initFans( void ) { FAN_NAMES_T fan; // Initialize the variables - fansExecState = FANS_EXEC_STATE_WAIT_FOR_POST_STATE; - fansControlCounter = 0; - fansPublishCounter = 0; - fansMonitorCounter = 0; - isPOSTComplete = FALSE; - hasAlarmBeenRaised = FALSE; - rpmAlarmStartTimer = 0; + fansExecState = FANS_EXEC_STATE_WAIT_FOR_POST_STATE; + fansControlCounter = 0; + fansPublishCounter = 0; + isPOSTComplete = FALSE; + hasAlarmBeenRaised = FALSE; + rpmAlarmStartTime = 0; + rpmAlarmStartTimeOffset.data = 0; + rpmAlarmStartTimeOffset.ovData = 0; + rpmAlarmStartTimeOffset.ovInitData = 0; + rpmAlarmStartTimeOffset.override = OVERRIDE_RESET; // Initialize the fans for ( fan = FAN_INLET_1; fan < NUM_OF_FANS_NAMES; fan++ ) @@ -369,7 +372,7 @@ // Loop through the sensors and thermistors for ( thermistor = THERMISTOR_ONBOARD_NTC; thermistor < NUM_OF_THERMISTORS; thermistor++ ) { - temperature = getThermistorTemperatureValue( thermistor ); + temperature = getThermistorTemperatureValue( thermistor ); maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); } @@ -432,53 +435,73 @@ /*********************************************************************//** * @brief * The monitorFans function monitors the fans for RPM. - * @details Inputs: fansMonitorCounter, rpmAlarmStartTimer, hasAlarmBeenRaised - * @details Outputs: fansMonitorCounter, rpmAlarmStartTimer, hasAlarmBeenRaised + * @details Inputs: rpmAlarmStartTimer, hasAlarmBeenRaised + * @details Outputs: rpmAlarmStartTimer, hasAlarmBeenRaised * @return none *************************************************************************/ static void monitorFans( void ) { FAN_NAMES_T fan; + F32 rpm = 0.0; + BOOL isAlarmTriggered = FALSE; + BOOL isFanRPMOutOfRange = FALSE; - if ( ++fansMonitorCounter >= FANS_MONITOR_INTERVAL_COUNT ) + // The RPM is expected to be 5500 @ 100% duty cycle + // The nominal RPM = duty cycle * 5500 / 1.0 + // The RPM tolerance is -25% to +50% of the nominal RPM + F32 fansNominalRPM = fansStatus.dutyCycle * FANS_MAX_ALLOWED_RPM; + F32 fansMinAllowedRPM = fansNominalRPM - ( fansNominalRPM * FANS_MIN_RPM_OUT_OF_RANGE_TOL ); + F32 fansMaxAllowedRPM = fansNominalRPM + ( fansNominalRPM * FANS_MAX_RPM_OUT_OF_RANGE_TOL ); + + for ( fan = FAN_INLET_1; fan < NUM_OF_FANS_NAMES; fan++ ) { - // If the fans alarm has been raise already, do not raise again - if ( FALSE == hasAlarmBeenRaised ) - { - BOOL isFanRPMOutOfRange; + rpm = getMeasuredFanRPM( fan ); + isFanRPMOutOfRange |= ( ( rpm < fansMinAllowedRPM ) || ( rpm > fansMaxAllowedRPM ) ? TRUE : FALSE ); + } - // The RPM is expected to be 5500 @ 100% duty cycle - // The nominal RPM = duty cycle * 5500 / 1.0 - // The RPM tolerance is -25% to +50% of the nominal RPM - F32 fansNominalRPM = fansStatus.dutyCycle * FANS_MAX_ALLOWED_RPM; - F32 fansMinAllowedRPM = fansNominalRPM - ( fansNominalRPM * FANS_MIN_RPM_OUT_OF_RANGE_TOL ); - F32 fansMaxAllowedRPM = fansNominalRPM + ( fansNominalRPM * FANS_MAX_RPM_OUT_OF_RANGE_TOL ); + // If the fans alarm has been raised already, do not raise again + if ( FALSE == hasAlarmBeenRaised ) + { + isAlarmTriggered = isPersistentAlarmTriggered( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, isFanRPMOutOfRange ); - for ( fan = FAN_INLET_1; fan < NUM_OF_FANS_NAMES; fan++ ) - { - isFanRPMOutOfRange = ( getMeasuredFanRPM( fan ) < fansMinAllowedRPM ) || ( getMeasuredFanRPM( fan ) > fansMaxAllowedRPM ); - checkPersistentAlarm( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, isFanRPMOutOfRange, getMeasuredFanRPM( fan ), FANS_MAX_ALLOWED_RPM ); - - // If the RPM out of range alarm has been raised, do not raise it again, until its alarm silence time has been elapsed - hasAlarmBeenRaised = ( TRUE == isAlarmActive( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE ) ? TRUE : FALSE ); - - // If the alarm has been raised and the alarm start timer is 0, start the timer - if ( ( TRUE == hasAlarmBeenRaised ) && ( 0 == rpmAlarmStartTimer ) ) - { - rpmAlarmStartTimer = getMSTimerCount(); - } - } + if ( TRUE == isAlarmTriggered ) + { + SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, rpm ) + // Set the alarm flag to TRUE + hasAlarmBeenRaised = TRUE; } - // If the alarm has been raised the silence the alarm time has elapsed, get ready to raise the alarm in case the RPM was out of range - // Once the alarm is raised, it is not raised again for 24 hours - else if ( ( TRUE == hasAlarmBeenRaised ) && ( TRUE == didTimeout( rpmAlarmStartTimer, SECONDS_IN_A_DAY ) ) ) + // If the alarm has been raised but the start time of the alarm has not been set, set the alarm start timer + if ( ( TRUE == hasAlarmBeenRaised ) && ( 0 == rpmAlarmStartTime ) ) { - hasAlarmBeenRaised = FALSE; - rpmAlarmStartTimer = 0; + rpmAlarmStartTime = getMSTimerCount(); } + } + // If the alarm has been raised the silence the alarm time has elapsed, get ready to raise the alarm in case the RPM was out of range + // Once the alarm is raised, it is not raised again for 24 hours + else if ( ( TRUE == hasAlarmBeenRaised ) && ( ( calcTimeSince( rpmAlarmStartTime ) + getRPMAlarmStartTimeOffset() ) >= SECONDS_IN_A_DAY * MS_PER_SECOND ) ) + { + hasAlarmBeenRaised = FALSE; + rpmAlarmStartTime = 0; + } +} - fansMonitorCounter = 0; +/*********************************************************************//** + * @brief + * The getRPMAlarmStartTimeOffset function gets the RPM alarm start time offset in MS. + * @details Inputs: rpmAlarmStartTimeOffset + * @details Outputs: none + * @return the RPM alarm start time offset + *************************************************************************/ +static U32 getRPMAlarmStartTimeOffset( void ) +{ + U32 startTime = rpmAlarmStartTimeOffset.data; + + if ( OVERRIDE_KEY == rpmAlarmStartTimeOffset.override ) + { + startTime = rpmAlarmStartTimeOffset.ovData; } + + return startTime; } /*********************************************************************//** @@ -614,4 +637,53 @@ return result; } +/*********************************************************************//** + * @brief + * The testSetFanRPMAlarmStartTimeOffsetOverride function overrides the RPM alarm + * start time offset. + * @details Inputs: none + * @details Outputs: rpmAlarmStartTimeOffset + * @param hours hours to override + * @param minutes minutes to override + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +BOOL testSetFanRPMAlarmStartTimeOffsetOverride( U32 hours, U32 minutes ) +{ + BOOL result = FALSE; + + if ( TRUE == isTestingActivated() ) + { + rpmAlarmStartTimeOffset.ovData = ( ( hours * MIN_PER_HOUR * SEC_PER_MIN ) + ( minutes * SEC_PER_MIN ) ) * MS_PER_SECOND; + rpmAlarmStartTimeOffset.override = OVERRIDE_KEY; + + result = TRUE; + } + + return result; +} + +/*********************************************************************//** + * @brief + * The testResetFanRPMAlarmStartTimeOffsetOverride function resets the RPM alarm + * start time offset override. + * @details Inputs: none + * @details Outputs: rpmAlarmStartTimeOffset + * @return TRUE if override successful, FALSE if not + *************************************************************************/ +BOOL testResetFanRPMAlarmStartTimeOffsetOverride( void ) +{ + BOOL result = FALSE; + + if ( TRUE == isTestingActivated() ) + { + rpmAlarmStartTimeOffset.override = OVERRIDE_RESET; + rpmAlarmStartTimeOffset.ovData = 0; + rpmAlarmStartTimeOffset.data = 0; + + result = TRUE; + } + + return result; +} + /**@}*/