Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r025612ad77fe630889a364586de54bffe5262d56 -r0803f828b81e046166457564650acf6a9bbd3cc6
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 025612ad77fe630889a364586de54bffe5262d56)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 0803f828b81e046166457564650acf6a9bbd3cc6)
@@ -88,6 +88,9 @@
     // Monitor DG voltages
     execVoltagesMonitor();
 
+    // run operation mode state machine
+    execOperationModes();
+
     // Monitor thermistors state machine
     execThermistors();
 
@@ -113,13 +116,8 @@
     execSwitches();
 #endif
 
-#ifndef DISABLE_HEATERS_AND_TEMPS
-
     // Heaters controller
     execHeaters();
-#endif
-    // run operation mode state machine
-    execOperationModes();
 
     // Run non-volatile data management state machine that sends the data record
     // to Dialin