Index: App/Contollers/AlarmLamp.c
===================================================================
diff -u -r9aec79f151c686b730888c98f70f53ad958fe9b5 -r67c59954ab757ae9d57b3d80f2b3cb8087300be6
--- App/Contollers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 9aec79f151c686b730888c98f70f53ad958fe9b5)
+++ App/Contollers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 67c59954ab757ae9d57b3d80f2b3cb8087300be6)
@@ -34,7 +34,7 @@
 {
     U32          duration[NUM_OF_LAMP_STATES];   // in ms
     LAMP_STATE_T green[NUM_OF_LAMP_STATES];      // green lamp state 1 and 2
-    LAMP_STATE_T yellow[NUM_OF_LAMP_STATES];     // yellow lamp state 1 and 2
+    LAMP_STATE_T blue[NUM_OF_LAMP_STATES];       // blue lamp state 1 and 2
     LAMP_STATE_T red[NUM_OF_LAMP_STATES];        // red lamp state 1 and 2
 };
 
@@ -62,8 +62,8 @@
     { { 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
-    { { 1000, 1000 }, { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_OFF }, { LAMP_STATE_OFF, LAMP_STATE_OFF } },  // LAMP_PATTERN_MED_ALARM
-    { { 500, 500 },   { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_ON  }, { LAMP_STATE_OFF, LAMP_STATE_OFF } },  // LAMP_PATTERN_LOW_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
 };
 
@@ -203,8 +203,7 @@
             {
                 alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_YELLOW;
                 alarmLampSelfTestStepTimerCount = getMSTimerCount();
-                setCPLDLampRed( PIN_SIGNAL_LOW );
-                setCPLDLampYellow( PIN_SIGNAL_HIGH );
+                setCPLDLampGreen( PIN_SIGNAL_HIGH );  // green + red = yellow
             }
             break;
 
@@ -213,8 +212,7 @@
             {
                 alarmLampSelfTestState = ALARM_LAMP_SELF_TEST_STATE_GREEN;
                 alarmLampSelfTestStepTimerCount = getMSTimerCount();
-                setCPLDLampYellow( PIN_SIGNAL_LOW );
-                setCPLDLampGreen( PIN_SIGNAL_HIGH );
+                setCPLDLampRed( PIN_SIGNAL_LOW );
             }
             break;
 
@@ -254,24 +252,24 @@
 static void setAlarmLampToPatternStep( void )
 {
     PIN_SIGNAL_STATE_T green = PIN_SIGNAL_LOW;
-    PIN_SIGNAL_STATE_T yellow = PIN_SIGNAL_LOW;
+    PIN_SIGNAL_STATE_T blue = PIN_SIGNAL_LOW;
     PIN_SIGNAL_STATE_T red = PIN_SIGNAL_LOW;
 
     lampPatternStepTimer = 0;
     if ( lampPatterns[currentLampPattern].green[currentLampPatternStep] == LAMP_STATE_ON )
     {
         green = PIN_SIGNAL_HIGH;
     }
-    if ( lampPatterns[currentLampPattern].yellow[currentLampPatternStep] == LAMP_STATE_ON )
+    if ( lampPatterns[currentLampPattern].blue[currentLampPatternStep] == LAMP_STATE_ON )
     {
-        yellow = PIN_SIGNAL_HIGH;
+        blue = PIN_SIGNAL_HIGH;
     }
     if ( lampPatterns[currentLampPattern].red[currentLampPatternStep] == LAMP_STATE_ON )
     {
         red = PIN_SIGNAL_HIGH;
     }
 
     setCPLDLampGreen( green );
-    setCPLDLampYellow( yellow );
+    setCPLDLampBlue( blue );
     setCPLDLampRed( red );
 }