Index: App/Tasks/TaskGeneral.c
===================================================================
diff -u -rc91e9da338d92432930d3589a4055ebbb404c6cb -r29f1ba03faefd982327916590818a260a3e4aa48
--- App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision c91e9da338d92432930d3589a4055ebbb404c6cb)
+++ App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 29f1ba03faefd982327916590818a260a3e4aa48)
@@ -24,13 +24,11 @@
 #include "WatchdogMgmt.h"
 #include "TaskGeneral.h"
 
-// ***************************** TEST CODE ******************************
-// TODO - remove later
-#if 1
-#include "CPLD.h"
-static BOOL lastUserPress = FALSE;
+#ifdef RM46_EVAL_BOARD_TARGET
+    #include "CPLD.h"
+    #include "SystemCommMessages.h"
+    static BOOL lastUserPress = FALSE;
 #endif
-// ************************** END TEST CODE ******************************
 
 /*************************************************************************
  * @brief taskGeneral
@@ -45,9 +43,7 @@
  *************************************************************************/
 void taskGeneral( void )
 {
-// ***************************** TEST CODE ******************************
-// TODO - remove later
-#if 1
+#ifdef RM46_EVAL_BOARD_TARGET
     if ( getUserButtonState() == PIN_SIGNAL_LOW )
     {
         if ( lastUserPress == FALSE )
@@ -62,7 +58,6 @@
         lastUserPress = FALSE;
     }
 #endif
-// ************************** END TEST CODE ******************************
 
     // manage data received from other sub-systems
     execSystemCommRx();