Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -rd325999b7b3ea03b7e294cb8a0b97df93812fbe9 -r9226e7b5b52c30057e93453ced523f563fbd89fe --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision d325999b7b3ea03b7e294cb8a0b97df93812fbe9) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 9226e7b5b52c30057e93453ced523f563fbd89fe) @@ -57,7 +57,7 @@ static BOOL alarmIsActive[ NUM_OF_ALARM_IDS ]; ///< Array of current state of each alarm static BOOL alarmConditionIsActive[ NUM_OF_ALARM_IDS ]; ///< Array of flag indicates if an alarm condition is active static U32 alarmInfoPublicationTimerCounter; ///< Used to schedule alarm information publication to CAN bus. -static BOOL isAFlaultAlarmActive; ///< Boolean flag to indicate whether a DG fault alarm is active. +static BOOL isAFaultAlarmActive; ///< Boolean flag to indicate whether a DG fault alarm is active. /// Interval (in task intervals) at which to publish alarm information to CAN bus. static OVERRIDE_U32_T alarmInfoPublishInterval = { ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, ALARM_INFO_PUB_INTERVAL, 0 }; @@ -73,7 +73,7 @@ * The initAlarmMgmt function initializes the AlarmMgmt module. * @details Inputs: none * @details Outputs: alarmInfoPublicationTimerCounter, alarmLEDTimer, - * isAFlaultAlarmActive, alarmIsActive, alarmConditionIsActive + * isAFaultAlarmActive, alarmIsActive, alarmConditionIsActive * @return none *************************************************************************/ void initAlarmMgmt( void ) @@ -82,7 +82,7 @@ alarmInfoPublicationTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT; alarmLEDTimer = 0; - isAFlaultAlarmActive = FALSE; + isAFaultAlarmActive = FALSE; // initialize alarm states and start time stamps for ( alrm = ALARM_ID_NO_ALARM; alrm < NUM_OF_ALARM_IDS; alrm++ ) @@ -112,7 +112,7 @@ * @brief * The activateAlarm function activates a given alarm. * @details Inputs: none - * @details Outputs: alarmIsActive[] + * @details Outputs: alarmIsActive[], isAFaultAlarmActive * @param alarm ID of alarm to activate * @return none *************************************************************************/ @@ -131,7 +131,7 @@ if ( TRUE == ALARM_TABLE[ alarm ].alarmIsDGFault ) { // There is a DG fault alarm. - isAFlaultAlarmActive = TRUE; + isAFaultAlarmActive = TRUE; if ( TRUE == isTransitionToFaultRequired() ) { @@ -288,7 +288,7 @@ *************************************************************************/ BOOL isDGFaultAlarmActive( void ) { - return isAFlaultAlarmActive; + return isAFaultAlarmActive; } /*********************************************************************//**