Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r3a87ca0e2a722318216623d7e1f4c354c58c506c -rc85d9f0a8023fabdf1cd557965958d225e2b9085
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 3a87ca0e2a722318216623d7e1f4c354c58c506c)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision c85d9f0a8023fabdf1cd557965958d225e2b9085)
@@ -19,6 +19,8 @@
 #include "lin.h"
 
 #include "ConcentratePumps.h"
+#include "DialysatePumps.h"
+#include "Heaters.h"
 #include "Messaging.h"
 #include "OperationModes.h"
 #include "SystemCommDD.h"
@@ -67,23 +69,20 @@
     // manage data received from other sub-systems
     execSystemCommRx();
 
-#ifndef BOARD_WITH_NO_HARDWARE
     // monitor concentrate pumps
     execConcentratePumpMonitor();
 
     // Monitor DG voltages
     ///execVoltagesMonitor();
-#endif
 
     // run operation mode state machine
     execOperationModes();
 
-#ifndef BOARD_WITH_NO_HARDWARE
     // Monitor thermistors state machine
     //execThermistors();
 
-    // manage drain pump
-    // execDrainPumpController();
+    // manage dialysate pump
+    execDialysatePumpController();
 
     // manage concentrate pumps
     execConcentratePumpController();
@@ -92,11 +91,10 @@
     //execSwitches();
 
     // Heaters controller
-    //execHeaters();
+    execHeatersControl();
 
     // Monitor RAM error status
-     //execRAMMonitor();
-#endif
+    //execRAMMonitor();
 
     // Run non-volatile data management state machine that sends the data record
     // to Dialin