Index: firmware/App/Controllers/Heaters.h
===================================================================
diff -u -rf656b17f3d8d93b4fca49c9725e096e7eb55acc7 -r47205a5002f27add91d8548f31c8a6fa18993fea
--- firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision f656b17f3d8d93b4fca49c9725e096e7eb55acc7)
+++ firmware/App/Controllers/Heaters.h	(.../Heaters.h)	(revision 47205a5002f27add91d8548f31c8a6fa18993fea)
@@ -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
 {
@@ -59,29 +65,36 @@
     F32 primaryTargetTemp;                  ///< Primary heaters target temperature
     F32 trimmerTargetTemp;                  ///< Trimmer heater target temperature
 } 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 );
 
-BOOL startPrimaryHeater( void );
-BOOL startTrimmerHeater( void );
+BOOL startHeater( 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 );
+void setPrimaryHeaterTargetTemperature( F32 targetTemp ); // TODO remove
+void setTrimmerHeaterTargetTemperature( F32 targetTemp ); // TODO remove
 
+BOOL startPrimaryHeater( void ); // TODO remove
+BOOL startTrimmerHeater( void ); // TODO remove
+
+void stopPrimaryHeater( void ); // TODO remove
+void stopTrimmerHeater( void ); // TODO remove
+
+void execPrimaryHeaters( void ); // TODO remove
+void execTrimmerHeater( void );  // TODO remove
+
 BOOL testSetHeatersPublishIntervalOverride( U32 value );
 BOOL testResetHeatersPublishIntervalOverride( void );