Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -ra303cd4258157a8fbcbd8af4dd2bbaadec1a736c -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision a303cd4258157a8fbcbd8af4dd2bbaadec1a736c)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
@@ -14,22 +14,15 @@
  *
  **************************************************************************/
 
-#include <Controllers/AlarmLamp.h>
 #include "gio.h"
 #include "lin.h"
 
-#include "Common.h"
 #include "OperationModes.h"
 #include "SystemComm.h"
+#include "SystemCommMessages.h"
 #include "WatchdogMgmt.h"
 #include "TaskGeneral.h"
 
-#ifdef RM46_EVAL_BOARD_TARGET
-    #include "CPLD.h"
-    #include "SystemCommMessages.h"
-    static BOOL lastUserPress = FALSE;
-#endif
-
 /*************************************************************************
  * @brief taskGeneral
  * The taskGeneral function handles the scheduled General Task interrupt.\n
@@ -52,22 +45,15 @@
     // run operation mode state machine
     execOperationModes();
 
-    // control alarm lamp
-    execAlarmLamp();
-
-#ifdef RM46_EVAL_BOARD_TARGET
-    if ( getUserButtonState() == PIN_SIGNAL_LOW )
+#ifdef CAN_TEST
     {
-        if ( lastUserPress == FALSE )
+        static U32 canTestCtr = 0;
+        if ( ++canTestCtr >= 2 )
         {
-            lastUserPress = TRUE;
-            setUserLED( FALSE );
+            broadcastCANTest1LargeFrequentMessage();
+            canTestCtr = 0;
         }
     }
-    else
-    {
-        lastUserPress = FALSE;
-    }
 #endif
 
     // manage data to be transmitted to other sub-systems