Index: sources/view/hd/data/VHDOperationModeData.h
===================================================================
diff -u -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac -r3c10146198b48da18d2e8b242e0605461fdc92e8
--- sources/view/hd/data/VHDOperationModeData.h	(.../VHDOperationModeData.h)	(revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac)
+++ sources/view/hd/data/VHDOperationModeData.h	(.../VHDOperationModeData.h)	(revision 3c10146198b48da18d2e8b242e0605461fdc92e8)
@@ -55,10 +55,21 @@
     PROPERTY( bool    , standbyStart                , false ) ///< Start standby                                     , STANDBY_START_STATE = 0
     PROPERTY( bool    , standbyWaitTreatment        , false ) ///< Wait for treatment                                , STANDBY_WAIT_FOR_TREATMENT_STATE
     PROPERTY( bool    , standbyWaitDisinfect        , false ) ///< Wait for disinfect                                , STANDBY_WAIT_FOR_DISINFECT_STATE
-    PROPERTY( bool    , standbyDGFlush              , false ) ///< DG flush operation is in progress                 , STANDBY_DG_FLUSH_IN_PROGRESS_STATE
-    PROPERTY( bool    , standbyDGDisinfectHeat      , false ) ///< DG heat disinfection operation is in progress     , STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE
-    PROPERTY( bool    , standbyDGDisinfectChemical  , false ) ///< DG chemical disinfection operation is in progress , STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE
 
+    // disinfection sub-states
+    PROPERTY( bool    , standbyDGDisinfectFlushWaitResponse     , false ) ///< Wait for DG flush command response.                  , STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE,
+    PROPERTY( bool    , standbyDGDisinfectFlushWaitStart        , false ) ///< Wait for DG flush to start.                          , STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE,
+    PROPERTY( bool    , standbyDGDisinfectFlushInProgress       , false ) ///< DG flush operation is in progress                    , STANDBY_DG_FLUSH_IN_PROGRESS_STATE,
+
+    PROPERTY( bool    , standbyDGDisinfectHeatWaitResponse      , false ) ///< Wait for DG heat disinfect command response          , STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_CMD_RESPONSE_STATE,
+    PROPERTY( bool    , standbyDGDisinfectHeatWaitStart         , false ) ///< Wait for DG heat disinfect to start.                 , STANDBY_WAIT_FOR_DG_HEAT_DISINFECT_TO_START_STATE,
+    PROPERTY( bool    , standbyDGDisinfectHeatInProgress        , false ) ///< DG heat disinfect operation is in progress.          , STANDBY_DG_HEAT_DISINFECT_IN_PROGRESS_STATE,
+
+    PROPERTY( bool    , standbyDGDisinfectChemicalWaitResponse  , false ) ///< Wait for DG chemical disinfect command response.     , STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_CMD_RESPONSE_STATE,
+    PROPERTY( bool    , standbyDGDisinfectChemicalWaitStart     , false ) ///< Wait for DG chemical disinfect to start.             , STANDBY_WAIT_FOR_DG_CHEM_DISINFECT_TO_START_STATE,
+    PROPERTY( bool    , standbyDGDisinfectChemicalInProgress    , false ) ///< DG chemical disinfect operation is in progress       , STANDBY_DG_CHEM_DISINFECT_IN_PROGRESS_STATE,
+
+
     PROPERTY( bool    , home                        , false ) ///< Special Home mode // see in the cpp file.
 
     PROPERTY( bool    , isTreatment                 , false )