Index: sources/view/dd/data/VDDValvesStatesData.cpp
===================================================================
diff -u -rb8124d3043669fc9b63194f50fe75c7722d69aa7 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865
--- sources/view/dd/data/VDDValvesStatesData.cpp	(.../VDDValvesStatesData.cpp)	(revision b8124d3043669fc9b63194f50fe75c7722d69aa7)
+++ sources/view/dd/data/VDDValvesStatesData.cpp	(.../VDDValvesStatesData.cpp)	(revision a524ef99542bfa8d371835bc7c7d24c68ecf1865)
@@ -21,35 +21,52 @@
 
 void VDDValvesStates::onActionReceive(const DDValvesStatesData &vData)
 {
-    hydraulicsOutletValve        ( vData.mValvesStatus.at( GuiDDValves::D14_VALV  )); // Start of Hydraulics valve group
-    thermalDisinfectValve        ( vData.mValvesStatus.at( GuiDDValves::D52_VALV  ));
-    HydraulicsBypassValve        ( vData.mValvesStatus.at( GuiDDValves::D8_VALV   ));
-    rinsePortValve               ( vData.mValvesStatus.at( GuiDDValves::D54_VALV  ));
-    drainValve                   ( vData.mValvesStatus.at( GuiDDValves::D53_VALV  ));
-    dialyzerBypassValve          ( vData.mValvesStatus.at( GuiDDValves::D34_VALV  ));
-    purgeValve1                  ( vData.mValvesStatus.at( GuiDDValves::D64_VALV  ));
-    pressureTestValve            ( vData.mValvesStatus.at( GuiDDValves::D31_VALV  ));
-    dryBicarbInletValve          ( vData.mValvesStatus.at( GuiDDValves::D65_VALV  ));
-    dialyzerInletValve           ( vData.mValvesStatus.at( GuiDDValves::D35_VALV  ));
-    dialyzerOutletValve          ( vData.mValvesStatus.at( GuiDDValves::D40_VALV  ));
-    purgeValve2                  ( vData.mValvesStatus.at( GuiDDValves::D47_VALV  ));
-    hydraulicsInletValve         ( vData.mValvesStatus.at( GuiDDValves::D3_VALV   ));
-    waterInletValve              ( vData.mValvesStatus.at( GuiDDValves::DD_M4_VALV));
+    hydraulicsOutletValve        ( vData.mValvesStatus.at( GuiDDValves::D14_VALV        )); // Start of Hydraulics valve group
+    thermalDisinfectValve        ( vData.mValvesStatus.at( GuiDDValves::D52_VALV        ));
+    HydraulicsBypassValve        ( vData.mValvesStatus.at( GuiDDValves::D8_VALV         ));
+    rinsePortValve               ( vData.mValvesStatus.at( GuiDDValves::D54_VALV        ));
+    drainValve                   ( vData.mValvesStatus.at( GuiDDValves::D53_VALV        ));
+    dialyzerBypassValve          ( vData.mValvesStatus.at( GuiDDValves::D34_VALV        ));
+    purgeValve1                  ( vData.mValvesStatus.at( GuiDDValves::D64_VALV        ));
+    pressureTestValve            ( vData.mValvesStatus.at( GuiDDValves::D31_VALV        ));
+    dryBicarbInletValve          ( vData.mValvesStatus.at( GuiDDValves::D65_VALV        ));
+    dialyzerInletValve           ( vData.mValvesStatus.at( GuiDDValves::D35_VALV        ));
+    dialyzerOutletValve          ( vData.mValvesStatus.at( GuiDDValves::D40_VALV        ));
+    purgeValve2                  ( vData.mValvesStatus.at( GuiDDValves::D47_VALV        ));
+    hydraulicsInletValve         ( vData.mValvesStatus.at( GuiDDValves::D3_VALV         ));
+    dryBicarbValve               ( vData.mValvesStatus.at( GuiDDValves::D80_VALV        ));
+    deScalerValve                ( vData.mValvesStatus.at( GuiDDValves::D81_VALV        ));
+
     // 2 reserved flags are here... //
 
-    balancingChamberValve1       ( vData.mValvesStatus.at( GuiDDValves::D23_VALV  )); // Start of Balancing Chamber valve group
-    balancingChamberValve2       ( vData.mValvesStatus.at( GuiDDValves::D19_VALV  ));
-    balancingChamberValve3       ( vData.mValvesStatus.at( GuiDDValves::D25_VALV  ));
-    balancingChamberValve7       ( vData.mValvesStatus.at( GuiDDValves::D26_VALV  ));
-    balancingChamberValve5       ( vData.mValvesStatus.at( GuiDDValves::D24_VALV  ));
-    balancingChamberValve6       ( vData.mValvesStatus.at( GuiDDValves::D20_VALV  ));
-    balancingChamberValve4       ( vData.mValvesStatus.at( GuiDDValves::D21_VALV  ));
-    balancingChamberValve8       ( vData.mValvesStatus.at( GuiDDValves::D22_VALV  ));
+    balancingChamberValve1       ( vData.mValvesStatus.at( GuiDDValves::D23_VALV        )); // Start of Balancing Chamber valve group
+    balancingChamberValve2       ( vData.mValvesStatus.at( GuiDDValves::D19_VALV        ));
+    balancingChamberValve3       ( vData.mValvesStatus.at( GuiDDValves::D25_VALV        ));
+    balancingChamberValve4       ( vData.mValvesStatus.at( GuiDDValves::D21_VALV        ));
+    balancingChamberValve5       ( vData.mValvesStatus.at( GuiDDValves::D24_VALV        ));
+    balancingChamberValve6       ( vData.mValvesStatus.at( GuiDDValves::D20_VALV        ));
+    balancingChamberValve7       ( vData.mValvesStatus.at( GuiDDValves::D26_VALV        ));
+    balancingChamberValve8       ( vData.mValvesStatus.at( GuiDDValves::D22_VALV        ));
 
-    ultrafiltrationInletValve1   ( vData.mValvesStatus.at( GuiDDValves::D69_VALV  )); // Start of Ultrafiltration valve group
-    ultrafiltrationInletValve2   ( vData.mValvesStatus.at( GuiDDValves::D71_VALV  ));
-    ultrafiltrationOutletValve1  ( vData.mValvesStatus.at( GuiDDValves::D70_VALV  ));
-    ultrafiltrationOutletValve2  ( vData.mValvesStatus.at( GuiDDValves::D72_VALV  ));
+    spareValve0                  ( vData.mValvesStatus.at( GuiDDValves::D79_PMP_VALV    )); // Start of spare valve group
+    spareValve1                  ( vData.mValvesStatus.at( GuiDDValves::SPARE1_VALV     ));
+    spareValve2                  ( vData.mValvesStatus.at( GuiDDValves::SPARE2_VALV     ));
+    spareValve3                  ( vData.mValvesStatus.at( GuiDDValves::SPARE3_VALV     ));
+    spareValve4                  ( vData.mValvesStatus.at( GuiDDValves::SPARE4_VALV     ));
+    spareValve5                  ( vData.mValvesStatus.at( GuiDDValves::SPARE5_VALV     ));
+    spareValve6                  ( vData.mValvesStatus.at( GuiDDValves::SPARE6_VALV     ));
+    spareValve7                  ( vData.mValvesStatus.at( GuiDDValves::SPARE7_VALV     ));
+
+    ioValve0                    ( vData.mValvesStatus.at( GuiDDValves::M4_VALV          )); // start of IO Valves
+    ioValve1                    ( vData.mValvesStatus.at( GuiDDValves::M12_VALV         ));
+
+    fpValve0                    ( vData.mValvesStatus.at( GuiDDValves::P11_VALV         )); // start of FP Valves
+    fpValve1                    ( vData.mValvesStatus.at( GuiDDValves::P33_VALV         ));
+    fpValve2                    ( vData.mValvesStatus.at( GuiDDValves::P34_VALV         ));
+    fpValve3                    ( vData.mValvesStatus.at( GuiDDValves::P37_VALV         ));
+    fpValve4                    ( vData.mValvesStatus.at( GuiDDValves::P39_VALV         ));
+    fpValve5                    ( vData.mValvesStatus.at( GuiDDValves::P6_VALV          ));
+
     // 4 reserved flags are here... //
 
     valvesSensedState1           ( vData.mValvesSensedState1                       );