Index: sources/view/dd/data/VDDValvesStatesData.cpp
===================================================================
diff -u -r3d13050e0319cf30a1686b58c8f2328f6860910a -r47b25a76644ca44b81b5a4a728346f8e72e1dc3b
--- sources/view/dd/data/VDDValvesStatesData.cpp	(.../VDDValvesStatesData.cpp)	(revision 3d13050e0319cf30a1686b58c8f2328f6860910a)
+++ sources/view/dd/data/VDDValvesStatesData.cpp	(.../VDDValvesStatesData.cpp)	(revision 47b25a76644ca44b81b5a4a728346f8e72e1dc3b)
@@ -21,34 +21,66 @@
 
 void VDDValvesStates::onActionReceive(const DDValvesStatesData &vData)
 {
-    valveStates_VRF  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VRF  ));
-    valveStates_VRI  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VRI  ));
-    valveStates_RES  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_RES  ));
-    valveStates_VRO  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VRO  ));
-    valveStates_VPO  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VPO  ));
-    valveStates_VBF  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VBF  ));
-    valveStates_VRC  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VRC  ));
-    valveStates_VDR  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VDR  ));
-    valveStates_VPI  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VPI  ));
-    valveStates_VSP  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VSP  ));
-    valveStates_VR1  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VR1  ));
-    valveStates_VR2  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VR2  ));
-    valveStates_VPD  ( vData.mStates.at( DDValvesStatesFlag::eFlag_ValveStates_VPD  ));
+    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));
+    // 2 reserved flags are here... //
 
-    valveStatus_VRF  ( vData.mVRf  );
-    valveStatus_VRI  ( vData.mVRi  );
-    valveStatus_RES  ( vData.mRes  );
-    valveStatus_VRO  ( vData.mVRo  );
-    valveStatus_VPO  ( vData.mVPo  );
-    valveStatus_VBF  ( vData.mVBf  );
-    valveStatus_VRC  ( vData.mVRc  );
-    valveStatus_VDR  ( vData.mVDr  );
-    valveStatus_VPI  ( vData.mVPi  );
-    valveStatus_VSP  ( vData.mVSP  );
-    valveStatus_VR1  ( vData.mVR1  );
-    valveStatus_VR2  ( vData.mVR2  );
-    valveStatus_VPD  ( vData.mVPd  );
+    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  ));
 
+    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  ));
+    // 4 reserved flags are here... //
+
+    valvesSensedState1           ( vData.mValvesSensedState1                       );
+    valvesSensedState2           ( vData.mValvesSensedState2                       );
+    valvesSensedState3           ( vData.mValvesSensedState3                       );
+    valvesSensedState4           ( vData.mValvesSensedState4                       );
+    valvesSensedState5           ( vData.mValvesSensedState5                       );
+    valvesSensedState6           ( vData.mValvesSensedState6                       );
+    valvesSensedState7           ( vData.mValvesSensedState7                       );
+    valvesSensedState8           ( vData.mValvesSensedState8                       );
+    valvesSensedState9           ( vData.mValvesSensedState9                       );
+    valvesSensedState10          ( vData.mValvesSensedState10                      );
+    valvesSensedState11          ( vData.mValvesSensedState11                      );
+    valvesSensedState12          ( vData.mValvesSensedState12                      );
+    valvesSensedState13          ( vData.mValvesSensedState13                      );
+    valvesSensedState14          ( vData.mValvesSensedState14                      );
+    valvesSensedState15          ( vData.mValvesSensedState15                      );
+    valvesSensedState16          ( vData.mValvesSensedState16                      );
+    valvesSensedState17          ( vData.mValvesSensedState17                      );
+    valvesSensedState18          ( vData.mValvesSensedState18                      );
+    valvesSensedState19          ( vData.mValvesSensedState19                      );
+    valvesSensedState20          ( vData.mValvesSensedState20                      );
+    valvesSensedState21          ( vData.mValvesSensedState21                      );
+    valvesSensedState22          ( vData.mValvesSensedState22                      );
+    valvesSensedState23          ( vData.mValvesSensedState23                      );
+    valvesSensedState24          ( vData.mValvesSensedState24                      );
+    valvesSensedState25          ( vData.mValvesSensedState25                      );
+    valvesSensedState26          ( vData.mValvesSensedState26                      );
+    valvesSensedState27          ( vData.mValvesSensedState27                      );
+    valvesSensedState28          ( vData.mValvesSensedState28                      );
+
     // Trigger should be the last
-    refresh(true);
+//    refresh(true);
 }