Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
@@ -53,16 +53,16 @@
 
 // ********** private data **********
 
-DATA_DECL( LAMP_PATTERN_T, LampPattern, currentLampPattern, LAMP_PATTERN_OFF, LAMP_PATTERN_FAULT );
-static LAMP_PATTERN_T pendingLampPattern = LAMP_PATTERN_OFF;
+DATA_DECL( LAMP_PATTERN_T, LampPattern, currentLampPattern, LAMP_PATTERN_MANUAL, LAMP_PATTERN_FAULT );
+static LAMP_PATTERN_T pendingLampPattern = LAMP_PATTERN_MANUAL;
 static U32 currentLampPatternStep = 0;
 static U32 lampPatternStepTimer = 0;
 
 const struct LampPatterns lampPatterns[ NUM_OF_LAMP_PATTERNS ] = {
     { { 500, 500 },   { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } },  // LAMP_PATTERN_OFF
     { { 500, 500 },   { LAMP_STATE_ON,  LAMP_STATE_ON  }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } },  // LAMP_PATTERN_OK
-    { { 500, 500 },   { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_OFF } },  // LAMP_PATTERN_FAULT
-    { { 500, 500 },   { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_OFF } },  // LAMP_PATTERN_HIGH_ALARM
+    { { 250, 250 },   { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_OFF } },  // LAMP_PATTERN_FAULT
+    { { 250, 250 },   { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_OFF } },  // LAMP_PATTERN_HIGH_ALARM
     { { 1000, 1000 }, { LAMP_STATE_ON,  LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_OFF } },  // LAMP_PATTERN_MED_ALARM
     { { 500, 500 },   { LAMP_STATE_ON,  LAMP_STATE_ON  }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_ON  } },  // LAMP_PATTERN_LOW_ALARM
     { { 0, 0 },       { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } }   // LAMP_PATTERN_MANUAL
@@ -86,7 +86,7 @@
  *************************************************************************/
 void initAlarmLamp( void )
 {
-    pendingLampPattern = LAMP_PATTERN_OFF;
+    pendingLampPattern = LAMP_PATTERN_MANUAL;
     currentLampPatternStep = 0;
     lampPatternStepTimer = 0;
 
@@ -218,6 +218,7 @@
             {
                 alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_COMPLETE;
                 setCPLDLampGreen( PIN_SIGNAL_LOW );
+                requestAlarmLampPattern( LAMP_PATTERN_OK );
                 result = SELF_TEST_STATUS_PASSED;
             }
             break;