Index: sources/view/dg/data/disinfect/VDisinfectStatesData.h
===================================================================
diff -u -rf38edd22f7b63694c21b83d6f4b69ea618390126 -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc
--- sources/view/dg/data/disinfect/VDisinfectStatesData.h	(.../VDisinfectStatesData.h)	(revision f38edd22f7b63694c21b83d6f4b69ea618390126)
+++ sources/view/dg/data/disinfect/VDisinfectStatesData.h	(.../VDisinfectStatesData.h)	(revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc)
@@ -50,24 +50,34 @@
     PROPERTY( bool   , heat                 , false ) ///< /* No FW enumeration yet */
     PROPERTY( bool   , chemical             , false ) ///< /* No FW enumeration yet */
 
+    // Water Flush state
+    STATE   ( bool   , flushNotRunning              , false ) ///< FLUSH_UI_STATE_NOT_RUNNING                       , Flush UI, not running state
+    STATE   ( bool   , flushDrainBeforeFlush        , false ) ///< FLUSH_UI_STATE_DRAIN_DEVICE                      , Flush UI, drain device state
+    STATE   ( bool   , flushFlushReservoirs         , false ) ///< FLUSH_UI_STATE_FLUSH_RESERVOIRS                  , Flush UI, flush reservoirs
+    STATE   ( bool   , flushDrainReservoirs         , false ) ///< FLUSH_UI_STATE_DRAIN_RESERVOIRS                  , Flush UI, drain reservoirs
+    STATE   ( bool   , flushRecirculatePath         , false ) ///< FLUSH_UI_STATE_FLUSH_RECIRCULATION_PATH          , Flush UI, flush recirculation path
+    STATE   ( bool   , flushCancel                  , false ) ///< FLUSH_UI_STATE_CANCEL_FLUSH                      , Flush UI, cancel flush state
+    STATE   ( bool   , flushComplete                , false ) ///< FLUSH_UI_STATE_COMPLETE                          , Flush UI, complete state
+
     // Heat disinfection state
-    STATE   ( bool   , heatNotRunning               , false ) ///< HEAT_DISINFECT_UI_STATE_NOT_RUNNING              , Heat disinfect UI, not running state
-    STATE   ( bool   , heatFlushBeforeDisinfect     , false ) ///< HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT   , Heat disinfect UI, flush before disinfect state
-    STATE   ( bool   , heatWaterHeatUp              , false ) ///< HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER            , Heat disinfect UI, heat up water state
-    STATE   ( bool   , heatDisinfect                , false ) ///< HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE         , Heat disinfect UI, disinfect device state
-    STATE   ( bool   , heatDeviceCoolDown           , false ) ///< HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE         , Heat disinfect UI, cool down device state
-    STATE   ( bool   , heatFlushAfterDisinfect      , false ) ///< HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT    , Heat disinfect UI, flush after disinfect state
-    STATE   ( bool   , heatCancel                   , false ) ///< HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT         , Heat disinfect UI, cancel disinfect state
-    STATE   ( bool   , heatComplete                 , false ) ///< HEAT_DISINFECT_UI_STATE_COMPLETE                 , Heat disinfect UI, complete state
+    STATE   ( bool   , heatNotRunning               , false ) ///< HEAT_DISINFECT_UI_STATE_NOT_RUNNING              , Heat disinfect UI     , not running state
+    STATE   ( bool   , heatFlushBeforeDisinfect     , false ) ///< HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT   , Heat disinfect UI     , flush before disinfect state
+    STATE   ( bool   , heatWaterHeatUp              , false ) ///< HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER            , Heat disinfect UI     , heat up water state
+    STATE   ( bool   , heatDisinfect                , false ) ///< HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE         , Heat disinfect UI     , disinfect device state
+    STATE   ( bool   , heatDeviceCoolDown           , false ) ///< HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE         , Heat disinfect UI     , cool down device state
+    STATE   ( bool   , heatFlushAfterDisinfect      , false ) ///< HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT    , Heat disinfect UI     , flush after disinfect state
+    STATE   ( bool   , heatCancel                   , false ) ///< HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT         , Heat disinfect UI     , cancel disinfect state
+    STATE   ( bool   , heatComplete                 , false ) ///< HEAT_DISINFECT_UI_STATE_COMPLETE                 , Heat disinfect UI     , complete state
 
-    STATE   ( bool   , chemicalNotRunning           , false ) ///< CHEM_DISINFECT_UI_STATE_NOT_RUNNING              , Chemical disinfect UI, not running state
-    STATE   ( bool   , chemicalFlushBeforeDisinfect , false ) ///< CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT   , Chemical disinfect UI, flush before disinfect state
-    STATE   ( bool   , chemicalMixWaterAndAcid      , false ) ///< CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID       , Chemical disinfect UI, mix water and acid state
-    STATE   ( bool   , chemicalRemoveAcid           , false ) ///< CHEM_DISINFECT_UI_STATE_REMOVE_ACID              , Chemical disinfect UI, remove acid state
-    STATE   ( bool   , chemicalDisinfect            , false ) ///< CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE         , Chemical disinfect UI, disinfect device state
-    STATE   ( bool   , chemicalFlushAfterDisinfect  , false ) ///< CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT    , Chemical disinfect UI, flush after disinfect state
-    STATE   ( bool   , chemicalCancel               , false ) ///< CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT         , Chemical disinfect UI, cancel disinfect state
-    STATE   ( bool   , chemicalComplete             , false ) ///< CHEM_DISINFECT_UI_STATE_COMPLETE                 , Chemical disinfect UI, complete state
+    // Chemical disinfection state
+    STATE   ( bool   , chemicalNotRunning           , false ) ///< CHEM_DISINFECT_UI_STATE_NOT_RUNNING              , Chemical disinfect UI , not running state
+    STATE   ( bool   , chemicalFlushBeforeDisinfect , false ) ///< CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT   , Chemical disinfect UI , flush before disinfect state
+    STATE   ( bool   , chemicalMixWaterAndAcid      , false ) ///< CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID       , Chemical disinfect UI , mix water and acid state
+    STATE   ( bool   , chemicalRemoveAcid           , false ) ///< CHEM_DISINFECT_UI_STATE_REMOVE_ACID              , Chemical disinfect UI , remove acid state
+    STATE   ( bool   , chemicalDisinfect            , false ) ///< CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE         , Chemical disinfect UI , disinfect device state
+    STATE   ( bool   , chemicalFlushAfterDisinfect  , false ) ///< CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT    , Chemical disinfect UI , flush after disinfect state
+    STATE   ( bool   , chemicalCancel               , false ) ///< CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT         , Chemical disinfect UI , cancel disinfect state
+    STATE   ( bool   , chemicalComplete             , false ) ///< CHEM_DISINFECT_UI_STATE_COMPLETE                 , Chemical disinfect UI , complete state
 
     VIEW_DEC(VDisinfectStates, DisinfectStatesData)
 };