Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca)
@@ -24,16 +24,9 @@
 
 // ********** private definitions **********
 
-/// Enumeration of heat disinfection mode states.
-typedef enum Heat_States
-{
-    HEAT_DISINFECT_STATE_START = 0,                                         ///< Start heat disinfect mode state.
-    NUM_OF_HEAT_DISINFECT_STATES                                            ///< Number of heat disinfect mode states.
-} HEAT_DISINFECT_STATE_T;
-
 // ********** private data **********
 
-static HEAT_DISINFECT_STATE_T heatState = HEAT_DISINFECT_STATE_START;       ///< Currently active heat disinfect state.
+static DG_HEAT_DISINFECT_STATE_T heatState = DG_HEAT_DISINFECT_STATE_START;       ///< Currently active heat disinfect state.
 
 // ********** private function prototypes **********
 
@@ -47,7 +40,7 @@
  *************************************************************************/
 void initHeatDisinfectMode( void )
 {
-    heatState = HEAT_DISINFECT_STATE_START;
+    heatState = DG_HEAT_DISINFECT_STATE_START;
 }
 
 /*********************************************************************//**
@@ -69,21 +62,37 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @return none
+ * @return current state.
  *************************************************************************/
-void execHeatDisinfectMode( void )
+U32 execHeatDisinfectMode( void )
 {
     // execute current heat disinfect state
     switch ( heatState )
     {
-        case HEAT_DISINFECT_STATE_START:
+        case DG_HEAT_DISINFECT_STATE_START:
             break;
 
         default:
-            heatState = HEAT_DISINFECT_STATE_START;
             // TODO - s/w fault
+            heatState = DG_HEAT_DISINFECT_STATE_START;
             break;
     }
+
+    return heatState;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getCurrentHeatDisinfectState function returns the current state of the \n
+ * heat disinfect mode.
+ * @details
+ * Inputs : heatState
+ * Outputs : none
+ * @return the current state of heat disinfect mode.
+ *************************************************************************/
+DG_HEAT_DISINFECT_STATE_T getCurrentHeatDisinfectState( void )
+{
+    return heatState;
+}
+
 /**@}*/