Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -r037f0edb0b880130563058c809ba50308f2a63e9 -r54e58f64179ea382d2e2c403c8c3b9a15a612636
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 037f0edb0b880130563058c809ba50308f2a63e9)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 54e58f64179ea382d2e2c403c8c3b9a15a612636)
@@ -34,8 +34,14 @@
 
 // ********** Public definitions **********
 
-#pragma pack(push,1)
+typedef enum Heaters
+{
+    DG_PRIMARY_HEATER = 0,
+    DG_TRIMMER_HEATER,
+    NUM_OF_DG_HEATERS,
+} DG_HEATERS_T;
 
+#pragma pack(push,1)
 /// Target temperature data structure.
 typedef struct
 {
@@ -58,32 +64,29 @@
     F32 trimmerHeaterDC;                    ///< Trimmer heater DC
     F32 primaryTargetTemp;                  ///< Primary heaters target temperature
     F32 trimmerTargetTemp;                  ///< Trimmer heater target temperature
+    U32 primaryHeaterState;                 ///< Primary heater state
+    U32 trimmerHeaterState;                 ///< Trimmer heater state
 } HEATERS_DATA_T;
-
 #pragma pack(pop)
 
 // ********** Public function prototypes **********
 
 void initHeaters( void );
 
-void setPrimaryHeaterTargetTemperature( F32 targetTemp );
-void setTrimmerHeaterTargetTemperature( F32 targetTemp );
+void setHeaterTargetTemperature( DG_HEATERS_T heater, F32 targetTemperature );
 
-F32 getPrimaryHeaterTargetTemperature( void );
+BOOL startHeater( DG_HEATERS_T heater );
 
-BOOL startPrimaryHeater( void );
-BOOL startTrimmerHeater( void );
+F32 getHeaterTargetTemperature( DG_HEATERS_T heater );
 
-void stopPrimaryHeater( void );
-void stopTrimmerHeater( void );
+void stopHeater( DG_HEATERS_T heater );
 
+void execHeaters( void );
+
 void handleTrimmerHeaterCmd( TRIMMER_HEATER_CMD_T *heaterCmdPtr ); // handle trimmer heater control command from HD
 
 void execHeatersMonitor( void );
 
-void execPrimaryHeaters( void );
-void execTrimmerHeater( void );
-
 BOOL testSetHeatersPublishIntervalOverride( U32 value );
 BOOL testResetHeatersPublishIntervalOverride( void );