Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -rf267c42c91fd6e22db80e19039b8993582de51e9 -r1d44cf33cf4461b81b19a8ab0e402c609649786b
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision f267c42c91fd6e22db80e19039b8993582de51e9)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 1d44cf33cf4461b81b19a8ab0e402c609649786b)
@@ -17,7 +17,11 @@
 #include "gio.h"
 #include "lin.h"
 
+#include "DrainPump.h"
+#include "Heaters.h"
 #include "OperationModes.h"
+#include "Reservoirs.h"
+#include "ROPump.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
 #include "WatchdogMgmt.h"
@@ -42,9 +46,46 @@
     // manage data received from other sub-systems
     execSystemCommRx();
 
+#ifndef CAN_TEST
+    // manage RO pump
+    execROPumpController();
+
+    // manage drain pump
+    execDrainPumpController();
+
+    // manage time-based reservoir tasks
+    execReservoirs();
+
+#ifndef DISABLE_HEATERS_AND_TEMPS
+    // Primary heaters state machine
+    execPrimaryHeaters();
+
+    // Trimmer heater state machine
+    execTrimmerHeater();
+#endif
+#endif
     // run operation mode state machine
     execOperationModes();
 
+#ifdef CAN_TEST
+    {   // send test msg every 100ms
+        static U32 canTestCtr = 0;
+        static U32 canTestMsgCtr = 0;
+        if ( ++canTestCtr >= 2 )
+        {
+            if ( ++canTestMsgCtr <= 23076)
+            {
+                broadcastCANTest1LargeFrequentMessage();
+            }
+            else
+            {
+                canTestMsgCtr = 23076+1;
+            }
+            canTestCtr = 0;
+        }
+    }
+#endif
+
     // manage data to be transmitted to other sub-systems
     execSystemCommTx();