Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -rb64c49fdcf2b6d95e61e63f8e258c4e600935bbd -r1b01b8c723dd1b04943e07eeda9e369b6d8e4afe
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision b64c49fdcf2b6d95e61e63f8e258c4e600935bbd)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 1b01b8c723dd1b04943e07eeda9e369b6d8e4afe)
@@ -17,6 +17,7 @@
 #include "gio.h"
 #include "lin.h"
 
+#include "Heaters.h"
 #include "OperationModes.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
@@ -45,20 +46,15 @@
     // run operation mode state machine
     execOperationModes();
 
-#ifdef CAN_TEST
-    {
-        static U32 canTestCtr = 0;
-        if ( ++canTestCtr >= 2 )
-        {
-            broadcastCANTest1LargeFrequentMessage();
-            canTestCtr = 0;
-        }
-    }
-#endif
-
     // manage data to be transmitted to other sub-systems
     execSystemCommTx();
 
+    // Primary heaters state machine
+    execPrimaryHeaters();
+
+    // Trimmer heater state machine
+    execTrimmerHeater();
+
     // toggle GPIO to indicate general task has executed
 //    gioToggleBit( gioPORTB, 1 );
 }