Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -rc85d9f0a8023fabdf1cd557965958d225e2b9085 -rf14371c9c14b461a50d7b08336e2e5fbed16f360
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision c85d9f0a8023fabdf1cd557965958d225e2b9085)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision f14371c9c14b461a50d7b08336e2e5fbed16f360)
@@ -37,38 +37,53 @@
 /// Name of DD heaters
 typedef enum Heaters
 {
-    DD_PRIMARY_HEATER = 0,                      ///< DD primary heater
-    DD_HEATERS_FIRST = DD_PRIMARY_HEATER,       ///< First heater
-    DD_TRIMMER_HEATER,                          ///< DD trimmer heater
+    D5_HEAT = 0,                                ///< DD primary heater
+    DD_HEATERS_FIRST = D5_HEAT,                 ///< First heater
+    D45_HEAT,                                   ///< DD trimmer heater
     NUM_OF_DD_HEATERS,                          ///< Number of the heaters
 } DD_HEATERS_T;
 
 /// Heaters data structure.
 typedef struct
 {
-    F32 mainPrimayHeaterDC;                     ///< Main primary heater DC
-    F32 trimmerHeaterDC;                        ///< Trimmer heater DC
-    F32 primaryTargetTemp;                      ///< Primary heater target temperature
-    F32 trimmerTargetTemp;                      ///< Trimmer heater target temperature
-    U32 primaryHeaterState;                     ///< Primary heater state
-    U32 trimmerHeaterState;                     ///< Trimmer heater state
-    U32 primaryControlCounter;                  ///< Primary heater control interval count
-    U32 trimmerControlCounter;                  ///< Trimmer heater control interval count
+    F32 d5_HeaterDC;                              ///< Main primary heater Duty Cycle
+    F32 d45_HeaterDC;                             ///< Trimmer heater Duty Cycle
+    F32 d5_HeaterTargetTemp;                      ///< Primary heater target temperature
+    F32 d45_HeaterTargetTemp;                     ///< Trimmer heater target temperature
+    U32 d5_HeaterState;                           ///< Primary heater state
+    U32 d45_HeaterState;                          ///< Trimmer heater state
+    U32 d5_HeaterControlCounter;                  ///< Primary heater control interval count
+    U32 d45_HeaterControlCounter;                 ///< Trimmer heater control interval count
+#ifdef __HEATERS_DEBUG__
+    F32 dbg1;
+    F32 dbg2;
+    F32 dbg3;
+    F32 dbg4;
+    F32 dbg5;
+    F32 dbg6;
+    F32 dbg7;
+    F32 dbg8;
+    F32 dbg9;
+#endif
 } HEATERS_DATA_T;
 
 // ********** Public function prototypes **********
 
 void initHeaters( void );
 BOOL setHeaterTargetTemperature( DD_HEATERS_T heater, F32 targetTemperature );
-BOOL startHeater( DD_HEATERS_T heater );
+void startHeater( DD_HEATERS_T heater );
 F32  getHeaterTargetTemperature( DD_HEATERS_T heater );
+void signalHeaterControlOnQDUpdate( DD_HEATERS_T heater );
 BOOL isHeaterOn( DD_HEATERS_T heater );
 void stopHeater( DD_HEATERS_T heater );
 void execHeatersControl( void );
 void execHeatersMonitor( void );
 
 BOOL testHeatersDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testHeaterDutyCycleOverride( MESSAGE_T *message );
+BOOL testHeaterTargetTemperatureOverride( MESSAGE_T *message );
+BOOL testHeaterPWMPeriodOverride( MESSAGE_T *message );
+BOOL testHeaterStartStopOverride( MESSAGE_T *message );
 
 /**@}*/