Index: App/Contollers/AlarmLamp.c =================================================================== diff -u -rda32ce10db35ffba9532f44d0227954cbd60413f -radd7eb956a7d2c124434541e1f06ca5ae158716f --- App/Contollers/AlarmLamp.c (.../AlarmLamp.c) (revision da32ce10db35ffba9532f44d0227954cbd60413f) +++ App/Contollers/AlarmLamp.c (.../AlarmLamp.c) (revision add7eb956a7d2c124434541e1f06ca5ae158716f) @@ -76,8 +76,8 @@ } /************************************************************************* - * @brief ExecuteAlarmLamp - * The ExecuteAlarmLamp function executes the alarm lamp service for the \n + * @brief execAlarmLamp + * The execAlarmLamp function executes the alarm lamp service for the \n * current lamp pattern. * @details * Inputs : pendingLampPattern, currentLampPattern, lampPatternStepTimer, \n @@ -86,7 +86,7 @@ * @param none * @return none *************************************************************************/ -void ExecuteAlarmLamp( void ) +void execAlarmLamp( void ) { // if starting a new lamp pattern, reset pattern variables if ( pendingLampPattern != currentLampPattern ) @@ -121,15 +121,15 @@ } /************************************************************************* - * @brief RequestLampPattern - * The RequestLampPattern function sets a request for a new lamp pattern. + * @brief requestAlarmLampPattern + * The requestAlarmLampPattern function sets a request for a new lamp pattern. * @details * Inputs : none * Outputs : pendingLampPattern * @param lampPattern : new lamp pattern * @return none *************************************************************************/ -void RequestLampPattern( LAMP_PATTERN_T lampPattern ) +void requestAlarmLampPattern( LAMP_PATTERN_T lampPattern ) { if ( lampPattern < NUM_OF_LAMP_PATTERNS ) { @@ -142,6 +142,21 @@ } /************************************************************************* + * @brief getCurrentAlarmLampPattern + * The getCurrentAlarmLampPattern function gets the current alarm lamp \n + * pattern in effect. + * @details + * Inputs : currentLampPattern + * Outputs : none + * @param none + * @return currentLampPattern + *************************************************************************/ +LAMP_PATTERN_T getCurrentAlarmLampPattern( void ) +{ + return currentLampPattern; +} + +/************************************************************************* * @brief setAlarmLampToPatternStep * The setAlarmLampToPatternStep function sets the lamps according to the \n * current lamp pattern and lamp pattern step. @@ -151,7 +166,7 @@ * @param lampPattern : new lamp pattern * @return none *************************************************************************/ -void setAlarmLampToPatternStep( void ) +static void setAlarmLampToPatternStep( void ) { PIN_SIGNAL_STATE_T green = PIN_SIGNAL_LOW; PIN_SIGNAL_STATE_T yellow = PIN_SIGNAL_LOW;