Index: firmware/App/Drivers/CPLD.c
===================================================================
diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -ra635fc9674913460c74831add7886c85d8aaf8f1
--- firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision eff7b1575f008f81b29ef906f6346fac6012d3ab)
+++ firmware/App/Drivers/CPLD.c	(.../CPLD.c)	(revision a635fc9674913460c74831add7886c85d8aaf8f1)
@@ -14,14 +14,20 @@
  *
  **************************************************************************/
 
-#include <Controllers/AlarmLamp.h>
-#include <Controllers/Buttons.h>
 #include "gio.h"
 #include "mibspi.h"
 
+#include "AlarmLamp.h"
+#include "Buttons.h"
 #include "WatchdogMgmt.h"
 #include "CPLD.h"
 
+//#ifdef _VECTORCAST_
+//    static mibspiBASE_t spi5;
+//    #undef mibspiREG5
+//    #define mibspiREG5 ((mibspiBASE_t *)&spi5)
+//#endif
+
 // ********** private definitions **********
 
 // GIO port A pin assignments for pins connected to CPLD
@@ -228,6 +234,10 @@
 {
     PIN_SIGNAL_STATE_T level = GET_OFF();
 
+#ifdef RM46_EVAL_BOARD_TARGET
+    level = (level == PIN_SIGNAL_LOW ? PIN_SIGNAL_HIGH : PIN_SIGNAL_LOW);
+#endif
+
     return level;
 }
 
@@ -245,6 +255,10 @@
 {
     PIN_SIGNAL_STATE_T level = GET_STOP();
 
+#ifdef RM46_EVAL_BOARD_TARGET
+    level = (level == PIN_SIGNAL_LOW ? PIN_SIGNAL_HIGH : PIN_SIGNAL_LOW);
+#endif
+
     return level;
 }