Index: sources/view/dg/data/disinfect/VDisinfectStatesData.cpp
===================================================================
diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc
--- sources/view/dg/data/disinfect/VDisinfectStatesData.cpp	(.../VDisinfectStatesData.cpp)	(revision e125bd5cf13750eaf241d518b9c846139afaa81c)
+++ sources/view/dg/data/disinfect/VDisinfectStatesData.cpp	(.../VDisinfectStatesData.cpp)	(revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc)
@@ -27,51 +27,49 @@
  */
 void VDisinfectStates::onActionReceive(const DisinfectStatesData &vData)
 {
-    subMode                 ( vData.mSubMode        );
-    flushState              ( vData.mFlushStates    );
-    heatState               ( vData.mHeatStates     );
-    chemicalState           ( vData.mChemicalStates );
+    subMode                             ( vData.mSubMode        );
+    flushState                          ( vData.mFlushStates    );
+    heatState                           ( vData.mHeatStates     );
+    chemicalState                       ( vData.mChemicalStates );
 
     // Flush Mode
-    bool mFlush             = vData.mSubMode    == GuiDisinfectDGStates     ::DG_DISINFECT_STATE_FLUSH                              ;
+    bool mFlush                         = vData.mSubMode     == GuiDisinfectDGStates      ::DG_DISINFECT_STATE_FLUSH                                   ;
     if ( mFlush ) {
-        /* No FW implementation yet */
+        flushNotRunning                 ( vData.mFlushStates == GuiDisinfectDGFlushStates ::FLUSH_UI_STATE_NOT_RUNNING                              );
+        flushDrainBeforeFlush           ( vData.mFlushStates == GuiDisinfectDGFlushStates ::FLUSH_UI_STATE_DRAIN_DEVICE                             );
+        flushFlushReservoirs            ( vData.mFlushStates == GuiDisinfectDGFlushStates ::FLUSH_UI_STATE_FLUSH_RESERVOIRS                         );
+        flushDrainReservoirs            ( vData.mFlushStates == GuiDisinfectDGFlushStates ::FLUSH_UI_STATE_DRAIN_RESERVOIRS                         );
+        flushRecirculatePath            ( vData.mFlushStates == GuiDisinfectDGFlushStates ::FLUSH_UI_STATE_FLUSH_RECIRCULATION_PATH                 );
+        flushCancel                     ( vData.mFlushStates == GuiDisinfectDGFlushStates ::FLUSH_UI_STATE_CANCEL_FLUSH                             );
+        flushComplete                   ( vData.mFlushStates == GuiDisinfectDGFlushStates ::FLUSH_UI_STATE_COMPLETE                                 );
     }
     flush( mFlush );
 
     // Heat Mode
-    bool mHeat              = vData.mSubMode    == GuiDisinfectDGStates     ::DG_DISINFECT_STATE_HEAT                                ;
+    bool mHeat                          = vData.mSubMode    == GuiDisinfectDGStates     ::DG_DISINFECT_STATE_HEAT                                    ;
     if ( mHeat ) {
-        start               ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_START                         );
-        drainR1             ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_DRAIN_R1                      );
-        drainR2             ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_DRAIN_R2                      );
-        flushDrain          ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN                   );
-        flushCirculation    ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_FLUSH_CIRCULATION             );
-        flushR1R2           ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_FLUSH_R1_AND_R2               );
-        flushR2DrainR1      ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_FLUSH_R2_AND_DRAIN_R1         );
-        flushDrainR2        ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R2                );
-        flushDrainR1        ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_FLUSH_DRAIN_R1                );
-        fillWithWater       ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_FILL_WITH_WATER               );
-        disinfectR1R2       ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_DISINFECT_R1_TO_R2            );
-        fillR2WithHotWater  ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER        );
-        disinfectR2R1       ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1            );
-        cooldownHeaters     ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS             );
-        cooldownRoFilter    ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER           );
-        mixDrainR1          ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1                  );
-        mixDrainR2          ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2                  );
-        rinseR1ToR2         ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_RINSE_R1_TO_R2                );
-        rinseR2ToR1DrainR1  ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1   );
-        rinseCirculation    ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_RINSE_CIRCULATION             );
-        cancelBasicPath     ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH             );
-        cancelWaterPath     ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH             );
-        complete            ( vData.mHeatStates == GuiDisinfectDGHeatStates ::DG_HEAT_DISINFECT_STATE_COMPLETE                      );
+        heatNotRunning                  ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_NOT_RUNNING                       );
+        heatFlushBeforeDisinfect        ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT            );
+        heatWaterHeatUp                 ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER                     );
+        heatDisinfect                   ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_DISINFECT_DEVICE                  );
+        heatDeviceCoolDown              ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_COOL_DOWN_DEVICE                  );
+        heatFlushAfterDisinfect         ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT             );
+        heatCancel                      ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_CANCEL_DISINFECT                  );
+        heatComplete                    ( vData.mHeatStates == GuiDisinfectDGHeatStates ::HEAT_DISINFECT_UI_STATE_COMPLETE                          );
     }
     heat( mHeat );
 
     // Chemical Mode
-    bool mChemical          = vData.mSubMode    == GuiDisinfectDGStates     ::DG_DISINFECT_STATE_CHEM                                ;
+    bool mChemical                      = vData.mSubMode        == GuiDisinfectDGStates     ::DG_DISINFECT_STATE_CHEM                                ;
     if ( mChemical ) {
-        /* No FW implementation yet */
+        chemicalNotRunning              ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_NOT_RUNNING               );
+        chemicalFlushBeforeDisinfect    ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_FLUSH_BEFORE_DISINFECT    );
+        chemicalMixWaterAndAcid         ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_MIX_WATER_AND_ACID        );
+        chemicalRemoveAcid              ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_REMOVE_ACID               );
+        chemicalDisinfect               ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_DISINFECT_DEVICE          );
+        chemicalFlushAfterDisinfect     ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_FLUSH_AFTER_DISINFECT     );
+        chemicalCancel                  ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_CANCEL_DISINFECT          );
+        chemicalComplete                ( vData.mChemicalStates == GuiDisinfectDGChemicalStates ::CHEM_DISINFECT_UI_STATE_COMPLETE                  );
     }
     chemical( mChemical );