Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r9888b5cfd349830ed220cd1e65c608140c85bd85 -rdcd360fb4dc37db2dcbeb7fb14fb327fe68235f4
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 9888b5cfd349830ed220cd1e65c608140c85bd85)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision dcd360fb4dc37db2dcbeb7fb14fb327fe68235f4)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file TaskGeneral.c
+* @file    TaskGeneral.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 25-Aug-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      12-Sep-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -113,12 +113,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();