Index: firmware/App/Controllers/AlarmLamp.c =================================================================== diff -u -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd --- firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a) +++ firmware/App/Controllers/AlarmLamp.c (.../AlarmLamp.c) (revision a0d405d152c0f451ebf3c25e3c2cfa49a4db17cd) @@ -61,9 +61,8 @@ #define POST_LAMP_STEP_TIME_MS 1000 ///< Duration (in ms) for each alarm lamp self-test step. // ********** private data ********** - -/// Current alarm lamp pattern (overrideable). -static OVERRIDE_U32_T currentLampPattern = { LAMP_PATTERN_MANUAL, LAMP_PATTERN_FAULT, LAMP_PATTERN_FAULT, 0 }; + +static OVERRIDE_U32_T currentLampPattern; ///< Current alarm lamp pattern (overrideable). static LAMP_PATTERN_T pendingLampPattern = LAMP_PATTERN_MANUAL; ///< Pending alarm lamp pattern. static U32 currentLampPatternStep = 0; ///< Current alarm lamp pattern step. static U32 lampPatternStepTimer = 0; ///< Timer counter for current alarm lamp pattern step. @@ -95,7 +94,11 @@ * @return none *************************************************************************/ void initAlarmLamp( void ) -{ +{ + currentLampPattern.data = LAMP_PATTERN_MANUAL; + currentLampPattern.ovData = LAMP_PATTERN_FAULT; + currentLampPattern.ovInitData = LAMP_PATTERN_FAULT; + currentLampPattern.override = OVERRIDE_RESET; pendingLampPattern = LAMP_PATTERN_MANUAL; currentLampPatternStep = 0; lampPatternStepTimer = 0;