Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rab57180655892575252175a4310d97a1c8c46e74 -r78cee9347b3766ac7c14d413ed848be758c7e9cd
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision ab57180655892575252175a4310d97a1c8c46e74)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 78cee9347b3766ac7c14d413ed848be758c7e9cd)
@@ -44,7 +44,7 @@
 
 // ********** private definitions **********
 
-#define DISINFECTS_DATA_PUB_INTERVAL          ( 4 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )    ///< Disinfects data publish interval in counts.
+#define DISINFECTS_DATA_PUB_INTERVAL          ( 1 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )    ///< Disinfects data publish interval in counts.
 
 // ********** private data **********
 
@@ -260,84 +260,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleStandbyWait4TreatmentState function handles the wait for
- * treatment state for standby mode.
- * @details Inputs: treatStartReqReceived
- * @details Outputs: treatment may be initiated
- * @return next standby state
- *************************************************************************/
-static HD_STANDBY_STATE_T handleStandbyWait4TreatmentState( void )
-{
-    HD_STANDBY_STATE_T result = STANDBY_WAIT_FOR_TREATMENT_STATE;
-
-    if ( TRUE == treatStartReqReceived )
-    {
-        // Initialize treatment modes before starting a new treatment
-        initTreatParamsMode();
-        initPreTreatmentMode();
-        initTreatmentMode();
-        initPostTreatmentMode();
-        // Start treatment workflow with treatment parameters mode
-        requestNewOperationMode( MODE_TPAR );
-        treatStartReqReceived = FALSE;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleStandbyDGFlushState function handles the DG flush state for
- * standby mode.
- * @details Inputs:
- * @details Outputs:
- * @return next standby state
- *************************************************************************/
-static HD_STANDBY_STATE_T handleStandbyDGFlushState( void )
-{
-    HD_STANDBY_STATE_T result = STANDBY_DG_FLUSH_IN_PROGRESS_STATE;
-
-    // TODO - implement w/ UI
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleStandbyDGHeatDisinfectState function handles the wait for
- * treatment state for standby mode.
- * @details Inputs:
- * @details Outputs:
- * @return next standby state
- *************************************************************************/
-static HD_STANDBY_STATE_T handleStandbyDGHeatDisinfectState( void )
-{
-    HD_STANDBY_STATE_T result = STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE;
-
-    // TODO - implement w/ UI
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The handleStandbyDGChemDisinfectState function handles the wait for
- * treatment state for standby mode.
- * @details Inputs:
- * @details Outputs:
- * @return next standby state
- *************************************************************************/
-static HD_STANDBY_STATE_T handleStandbyDGChemDisinfectState( void )
-{
-    HD_STANDBY_STATE_T result = STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE;
-
-    // TODO - implement w/ UI
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The signalUserInitiateTreatment function handles user initiation of a
  * treatment.
  * @details Inputs: none
@@ -576,8 +498,9 @@
         else if ( DG_MODE_FLUS == getDGOpMode() )
         {
             hasDisinfectCmdBeenSet = FALSE;
+            flushStartReqReceived = FALSE;
             dgDisinfectState = DG_DISINFECT_FLUSH_STATE;
-            currentStandbyState = STANDBY_DG_FLUSH_IN_PROGRESS_STATE;
+            state = STANDBY_DG_FLUSH_IN_PROGRESS_STATE;
         }
     }
     else if ( TRUE == heatDisinfectStartReqReceived )
@@ -590,8 +513,9 @@
         else if ( DG_MODE_HEAT == getDGOpMode() )
         {
             hasDisinfectCmdBeenSet = FALSE;
+            heatDisinfectStartReqReceived = FALSE;
             dgDisinfectState = DG_DISINFECT_HEAT_STATE;
-            currentStandbyState = STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE;
+            state = STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE;
         }
     }
     else if ( TRUE == chemDisinfectStartReqReceived )
@@ -604,8 +528,9 @@
         else if ( DG_MODE_CHEM == getDGOpMode() )
         {
             hasDisinfectCmdBeenSet = FALSE;
+            chemDisinfectStartReqReceived = FALSE;
             dgDisinfectState = DG_DISINFECT_CHEM_STATE;
-            currentStandbyState = STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE;
+            state = STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE;
         }
     }
 
@@ -627,7 +552,7 @@
     if ( getDGOpMode() != DG_MODE_FLUS )
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
-        currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
+        state = STANDBY_WAIT_FOR_TREATMENT_STATE;
     }
     publishDisinfectData();
 
@@ -649,7 +574,7 @@
     if ( getDGOpMode() != DG_MODE_HEAT )
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
-        currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
+        state = STANDBY_WAIT_FOR_TREATMENT_STATE;
     }
     publishDisinfectData();
 
@@ -671,7 +596,7 @@
     if ( getDGOpMode() != DG_MODE_CHEM )
     {
         dgDisinfectState = DG_DISINFECT_NOT_RUNNING_STATE;
-        currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE;
+        state = STANDBY_WAIT_FOR_TREATMENT_STATE;
     }
     publishDisinfectData();
 
@@ -696,15 +621,15 @@
         switch( currentStandbyState )
         {
             case STANDBY_DG_FLUSH_IN_PROGRESS_STATE:
-                data.disinfectDGState = state.flushUIState;
+                data.disinfectDGFlushState = state.flushUIState;
                 break;
 
             case STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE:
-                data.disinfectDGState = state.heatDisinfectUIState;
+                data.disinfectDGHeatState = state.heatDisinfectUIState;
                 break;
 
             case STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE:
-                data.disinfectDGState = state.chemDisinfectUIState;
+                data.disinfectDGChemState = state.chemDisinfectUIState;
                 break;
         }