Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -rc55d371408bdf962de525a47bc8541d5b43414a3 -r09302f3dffa9eb6c0637af5ec77c1274ecad1cf2
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision c55d371408bdf962de525a47bc8541d5b43414a3)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 09302f3dffa9eb6c0637af5ec77c1274ecad1cf2)
@@ -112,12 +112,10 @@
     execSwitches();
 #endif
 
-#ifndef DISABLE_HEATERS_AND_TEMPS
-    // Primary heaters state machine
-    execPrimaryHeaters();
-
-    // Trimmer heater state machine
-    execTrimmerHeater();
+#ifndef DISABLE_HEATERS_AND_TEMPS
+
+    // Heaters controller
+    execHeaters();
 #endif
     // run operation mode state machine
     execOperationModes();