Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r8116b493a8085f28f85e5a9e8ead7e18d0dc77a8 -rd5b87d7dab8613f3963fb66f8833d210f127fa1f
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 8116b493a8085f28f85e5a9e8ead7e18d0dc77a8)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision d5b87d7dab8613f3963fb66f8833d210f127fa1f)
@@ -298,13 +298,6 @@
 
     for ( heater = DD_HEATERS_FIRST; heater < NUM_OF_DD_HEATERS; heater++ )
     {
-        // Check if the heater is requested to be off
-        if ( FALSE == heatersStatus[ heater ].heaterOnState )
-        {
-            // stop the heater
-            stopHeater( heater );
-        }
-
         switch( heatersStatus[ heater ].state )
         {
             case HEATER_EXEC_STATE_OFF:
@@ -329,6 +322,12 @@
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_HEATERS_INVALID_EXEC_STATE, heater );
                 break;
         }
+        // Check if the heater is requested to be off
+        if ( FALSE == heatersStatus[ heater ].heaterOnState )
+        {
+            // stop the heater
+            stopHeater( heater );
+        }
     }
 }
 
Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -r78842b478a83315eda5d877a99b16f3b899b7727 -rd5b87d7dab8613f3963fb66f8833d210f127fa1f
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 78842b478a83315eda5d877a99b16f3b899b7727)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision d5b87d7dab8613f3963fb66f8833d210f127fa1f)
@@ -74,6 +74,8 @@
 #define FPGA_ENABLE_BC_VALVES_PWM       0x00                    ///< FPGA enable Balancing chamber valves PWM.
 #define FPGA_ENABLE_UF_VALVES_PWM       0x00                    ///< FPGA enable Ultrafiltration valves PWM.
 
+#define FPGA_ADC_AUTO_READ_ENABLE       0x11                    ///< FPGA internal ADC auto read enable.
+
 #define CONCENTRATE_CAP_SWITCH_MASK     0x10                    ///< Concentrate cap switch bit mask.
 #define FPGA_CONC_PUMP_FAULT_BITS       0x03                    ///< Concentrate pump fault bits mask.
 #define FPGA_CPA_PARKED_BIT             0x04                    ///< Concentrate pump 1 parked status bit mask.
@@ -367,6 +369,7 @@
     fpgaActuatorSetPoints.fpgaBCValvePWMControl     = FPGA_ENABLE_BC_VALVES_PWM;
     fpgaActuatorSetPoints.fpgaUFValveControl        = FPGA_ENABLE_UF_VALVES_CONTROL;
     fpgaActuatorSetPoints.fpgaUFValvePWMControl     = FPGA_ENABLE_UF_VALVES_PWM;
+    fpgaActuatorSetPoints.fpgaADCControl            = FPGA_ADC_AUTO_READ_ENABLE;
 
     // initialize FPGA clock speed error time windowed count
     initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_COMM_FAILURES, MAX_FPGA_COMM_FAILURES, MAX_FPGA_COMM_FAILURES_WINDOW_MS);
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r9861a0e5ab609dfd56e6c612e41a91edbfda24af -rd5b87d7dab8613f3963fb66f8833d210f127fa1f
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 9861a0e5ab609dfd56e6c612e41a91edbfda24af)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision d5b87d7dab8613f3963fb66f8833d210f127fa1f)
@@ -89,7 +89,7 @@
     //execSwitches();
 
     // Heaters controller
-    //execHeatersControl();
+    execHeatersControl();
 
     // Monitor RAM error status
     //execRAMMonitor();
Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -rc408c29123e153d5a004b5b58bd455d01824f7f1 -rd5b87d7dab8613f3963fb66f8833d210f127fa1f
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision c408c29123e153d5a004b5b58bd455d01824f7f1)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision d5b87d7dab8613f3963fb66f8833d210f127fa1f)
@@ -86,7 +86,7 @@
     execDialysatePumpMonitor();
 
     // Heaters monitor
-    //execHeatersMonitor();
+    execHeatersMonitor();
 
     // Dialysate generation monitor
     execGenDialysateMonitor();