Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rc48a99d2d1c852adcc986253b6c420a90dab7bfe -rf5b02f03b6695c0c76fd8a4d902a13114e1a8aca
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision c48a99d2d1c852adcc986253b6c420a90dab7bfe)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision f5b02f03b6695c0c76fd8a4d902a13114e1a8aca)
@@ -24,16 +24,9 @@
 
 // ********** private definitions **********
 
-/// Enumeration of chem. disinfect mode states.
-typedef enum Chem_States
-{
-    CHEM_DISINFECT_STATE_START = 0,                                            ///< Start chemical disinfect mode state.
-    NUM_OF_CHEM_DISINFECT_STATES                                               ///< Number of chemical disinfect mode states.
-} CHEM_DISINFECT_STATE_T;
-
 // ********** private data **********
 
-static CHEM_DISINFECT_STATE_T chemState = CHEM_DISINFECT_STATE_START;          ///< Currently active chemical disinfect state.
+static DG_CHEM_DISINFECT_STATE_T chemState = DG_CHEM_DISINFECT_STATE_START;          ///< Currently active chemical disinfect state.
 
 // ********** private function prototypes **********
 
@@ -47,7 +40,7 @@
  *************************************************************************/
 void initChemicalDisinfectMode( void )
 {
-    chemState = CHEM_DISINFECT_STATE_START;
+    chemState = DG_CHEM_DISINFECT_STATE_START;
 }
 
 /*********************************************************************//**
@@ -70,21 +63,37 @@
  * @details
  * Inputs : none
  * Outputs : none
- * @return none
+ * @return current state.
  *************************************************************************/
-void execChemicalDisinfectMode( void )
+U32 execChemicalDisinfectMode( void )
 {
     // execute current chemical disinfect state
     switch ( chemState )
     {
-        case CHEM_DISINFECT_STATE_START:
+        case DG_CHEM_DISINFECT_STATE_START:
             break;
 
         default:
-            chemState = CHEM_DISINFECT_STATE_START;
             // TODO - s/w fault
+            chemState = DG_CHEM_DISINFECT_STATE_START;
             break;
     }
+
+    return chemState;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getCurrentChemicalDisinfectState function returns the current state of the \n
+ * chemical disinfect mode.
+ * @details
+ * Inputs : chemState
+ * Outputs : none
+ * @return the current state of chemical disinfect mode.
+ *************************************************************************/
+DG_CHEM_DISINFECT_STATE_T getCurrentChemicalDisinfectState( void )
+{
+    return chemState;
+}
+
 /**@}*/