Index: App/Contollers/AlarmLamp.c
===================================================================
diff -u -radd7eb956a7d2c124434541e1f06ca5ae158716f -r1748019d93f9e95a125b0c6181c695b17fb63241
--- App/Contollers/AlarmLamp.c	(.../AlarmLamp.c)	(revision add7eb956a7d2c124434541e1f06ca5ae158716f)
+++ App/Contollers/AlarmLamp.c	(.../AlarmLamp.c)	(revision 1748019d93f9e95a125b0c6181c695b17fb63241)
@@ -46,11 +46,11 @@
 
 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_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
+    { { 500, 500 },   { LAMP_STATE_OFF, LAMP_STATE_OFF }, { LAMP_STATE_ON,  LAMP_STATE_ON  }, { LAMP_STATE_OFF, LAMP_STATE_OFF } },  // 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
 };
 
Index: App/Drivers/CPLD.c
===================================================================
diff -u -rad8ad611c910747eef92336a30b6520a83409532 -r1748019d93f9e95a125b0c6181c695b17fb63241
--- App/Drivers/CPLD.c	(.../CPLD.c)	(revision ad8ad611c910747eef92336a30b6520a83409532)
+++ App/Drivers/CPLD.c	(.../CPLD.c)	(revision 1748019d93f9e95a125b0c6181c695b17fb63241)
@@ -48,15 +48,15 @@
 #define TGL_OFF_REQ()      gioToggleBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN)
 #define SET_WD_PET()       gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
 #define SET_OFF_REQ()      gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_HIGH )
-#define SET_GREEN()        mibspiREG5->PC4 |= GREEN_SPI5_PORT_MASK
-#define SET_YELLOW()       mibspiREG5->PC4 |= RED_SPI5_PORT_MASK
-#define SET_RED()          mibspiREG5->PC4 |= YELLOW_SPI5_PORT_MASK
+#define SET_GREEN()        mibspiREG5->PC3 |= GREEN_SPI5_PORT_MASK
+#define SET_YELLOW()       mibspiREG5->PC3 |= YELLOW_SPI5_PORT_MASK
+#define SET_RED()          mibspiREG5->PC3 |= RED_SPI5_PORT_MASK
 
 #define CLR_WD_PET()       gioSetBit( gioPORTB, WD_PET_GIO_PORT_PIN, PIN_SIGNAL_LOW )
 #define CLR_OFF_REQ()      gioSetBit( gioPORTB, OFF_REQUEST_GIO_PORT_PIN, PIN_SIGNAL_LOW )
-#define CLR_GREEN()        mibspiREG5->PC5 |= GREEN_SPI5_PORT_MASK
-#define CLR_YELLOW()       mibspiREG5->PC5 |= YELLOW_SPI5_PORT_MASK
-#define CLR_RED()          mibspiREG5->PC5 |= RED_SPI5_PORT_MASK
+#define CLR_GREEN()        mibspiREG5->PC3 &= ~GREEN_SPI5_PORT_MASK
+#define CLR_YELLOW()       mibspiREG5->PC3 &= ~YELLOW_SPI5_PORT_MASK
+#define CLR_RED()          mibspiREG5->PC3 &= ~RED_SPI5_PORT_MASK
 
 /*************************************************************************
  * @brief initCPLD