Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -r3b3833a0b1aed89f1ff66104519f658f5a41fa99 -rc85d9f0a8023fabdf1cd557965958d225e2b9085
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 3b3833a0b1aed89f1ff66104519f658f5a41fa99)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision c85d9f0a8023fabdf1cd557965958d225e2b9085)
@@ -38,6 +38,7 @@
 typedef enum Heaters
 {
     DD_PRIMARY_HEATER = 0,                      ///< DD primary heater
+    DD_HEATERS_FIRST = DD_PRIMARY_HEATER,       ///< First heater
     DD_TRIMMER_HEATER,                          ///< DD trimmer heater
     NUM_OF_DD_HEATERS,                          ///< Number of the heaters
 } DD_HEATERS_T;
@@ -51,10 +52,8 @@
     F32 trimmerTargetTemp;                      ///< Trimmer heater target temperature
     U32 primaryHeaterState;                     ///< Primary heater state
     U32 trimmerHeaterState;                     ///< Trimmer heater state
-    F32 primaryCalcTargetTemp;                  ///< Primary heater calculated target temperature
-    F32 trimmerCalcCurrentTemp;                 ///< Trimmer heater calculated current temperature
-    U32 primaryControlCounter;                  ///< Primary heater control count
-    U32 trimmerControlCounter;                  ///< Trimmer heater control count
+    U32 primaryControlCounter;                  ///< Primary heater control interval count
+    U32 trimmerControlCounter;                  ///< Trimmer heater control interval count
 } HEATERS_DATA_T;
 
 // ********** Public function prototypes **********
@@ -65,12 +64,11 @@
 F32  getHeaterTargetTemperature( DD_HEATERS_T heater );
 BOOL isHeaterOn( DD_HEATERS_T heater );
 void stopHeater( DD_HEATERS_T heater );
-void execHeaters( void );
+void execHeatersControl( void );
 void execHeatersMonitor( void );
 
 BOOL testHeatersDataPublishIntervalOverride( MESSAGE_T *message );
-BOOL testSetHeaterDutyCycleOverride( U32 heater, F32 value );
-BOOL testResetHeaterDutyCycleOverride( U32 heater );
+BOOL testHeaterDutyCycleOverride( MESSAGE_T *message );
 
 /**@}*/