Index: DD_Valves/interface.ui
===================================================================
diff -u -re7b4045c9d6c393b170de62a7ca6f0d9d7894cb5 -r6b4653fcf93a52eae110e8ccaf83c306e84b64ad
--- DD_Valves/interface.ui (.../interface.ui) (revision e7b4045c9d6c393b170de62a7ca6f0d9d7894cb5)
+++ DD_Valves/interface.ui (.../interface.ui) (revision 6b4653fcf93a52eae110e8ccaf83c306e84b64ad)
@@ -6,8 +6,8 @@
0
0
- 1202
- 714
+ 1076
+ 525
@@ -18,7 +18,7 @@
- 1202
+ 0
0
@@ -38,371 +38,287 @@
&6 DD info/&A Valves
- -
-
-
-
- 0
- 0
-
-
-
-
- 352
- 0
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
-background-color: rgb(200, 115, 17);
-
-
- Valve Status
-
-
- Qt::AlignCenter
-
-
-
-
-
-
- 2
-
+
-
-
-
-
- 0
- 0
-
-
-
-
- 352
- 0
-
-
-
-
- 10
-
-
-
- color: rgb(238, 238, 236);
-background-color: rgb(229, 98, 23)
-
-
- 27 : [0x1B00] : DD Valves
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- Send
-
-
-
- -
-
-
- reset
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
-
-
+
-
-
+
+
+
+ 0
+ 0
+
+
- 230
+ 352
0
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(229, 98, 23)
+
- Purge Valve 1 (D64)
+ 27 : [0x1B00] : DD Valves
+
+ Qt::AlignCenter
+
-
-
+
-
+ Send
+ -
+
+
+ reset
+
+
+
- -
-
-
-
-
+
-
+
+
-
+
230
0
- RESERVED SPACE 4
+ Spare Valve 3
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Balancing Chamber 7 (D26)
+ IO Valve 0 (M4)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
+
+
+
+
+
+ -
+
230
0
- RESERVED SPACE 5
+ Thermal Disinfect (D52)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Hydraulics Outlet (D14)
+ Balancing Chamber 3 (D25)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
+
+
+
+
+
+ -
+
230
0
- Balancing Chamber 5 (D24)
+ FP Valve 4 (P39)
- -
-
+
-
+
+
+
+ 230
+ 0
+
+
-
+ Spare Valve 1
-
-
- -
-
-
-
-
+
-
+
230
0
- Hydraulics Bypass (D8)
+ Valve De-scaler (D81)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Balancing Chamber 2 (D19)
+ FP Valve 5 (P6)
- -
-
-
-
-
-
-
-
-
- -
-
-
-
-
+
-
+
230
0
- RESERVED SPACE 6
+ Hydraulics Outlet (D14)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
+
+
+
+
+
+ -
+
230
0
- Ultrafiltration Inlet 1 (D69)
+ Balancing Chamber 4 (D21)
- -
-
-
-
-
-
-
-
-
- -
-
-
-
-
+
-
+
230
0
- RESERVED SPACE 1
+ FP Valve 2 (P34)
- -
-
+
-
+
-
-
- -
-
-
-
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
@@ -415,42 +331,60 @@
- -
-
+
-
+
+
+
+ 230
+ 0
+
+
+ Drain (D53)
+
+
+
+ -
+
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Water Inlet (M4)
+ Spare Valve 5
- -
-
+
-
+
+
+
+ 230
+ 0
+
+
+ Balancing Chamber 2 (D19)
+
+
+
+ -
+
+
-
-
- -
-
-
-
+
-
@@ -463,766 +397,776 @@
- -
-
+
-
+
+
+
+ 230
+ 0
+
+
+ Balancing Chamber 8 (D22)
+
+
+
+ -
+
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Pressure Test (D31)
+ Valve Dry Bicarb (D80)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Ultrafiltration Inlet 2 (D71)
+ IO Valve 1 (M12)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
230
0
- RESERVED SPACE 3
+ Spare Valve 7
- -
-
+
-
+
+
+
+ 230
+ 0
+
+
+ Hydraulics Bypass (D8)
+
+
+
+ -
+
+
-
-
- -
-
-
-
-
+
-
+
+
+
+
+
+
+ -
+
230
0
- RESERVED SPACE 2
+ FP Valve 0 (P11)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Balancing Chamber 3 (D25)
+ FP Valve 3 (P37)
- -
-
+
-
+
+
+
+ 230
+ 0
+
+
-
+ Balancing Chamber 7 (D26)
-
-
- -
-
-
-
-
+
-
+
230
0
- Ultrafiltration Outlet 2 (D72)
+ Dialyzer Inlet (D35)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Hydraulics Inlet (D3)
+ Balancing Chamber 6 (D20)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Balancing Chamber 4 (D21)
+ Pressure Test (D31)
- -
-
+
-
+
+
+
+ 230
+ 0
+
+
+ Spare Valve 2
+
+
+
+ -
+
+
-
-
- -
-
-
-
-
+
-
+
+
+
+
+
+
+ -
+
230
0
- Balancing Chamber 1 (D23)
+ Balancing Chamber 5 (D24)
- -
-
+
-
+
+
+
+ 230
+ 0
+
+
-
+ Spare Valve 4
-
-
- -
-
-
-
-
+
-
+
230
0
- Dialyzer Outlet (D40)
+ Purge Valve 2 (D47)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+ -
+
230
0
- Drain (D53)
+ Balancing Chamber 1 (D23)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
+
+
+
+
+
+ -
+
230
0
- Ultrafiltration Outlet 1 (D70)
+ RESERVED SPACE 1
- -
-
+
-
+
+
+
+ 230
+ 0
+
+
-
+ Hydraulics Inlet (D3)
-
-
- -
-
-
-
-
+
-
+
230
0
- Dry Bicarb Inlet (D65)
+ Purge Valve 1 (D64)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Thermal Disinfect (D52)
+ Spare Valve 6
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Dialyzer Inlet (D35)
+ FP Valve 1 (P33)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Balancing Chamber 6 (D20)
+ Dialyzer Outlet (D40)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
230
0
- Balancing Chamber 8 (D22)
+ Spare Valve 0 (D79)
- -
-
+
-
+
-
-
- -
-
-
-
-
+
-
+
+
+
+
+
+
+ -
+
230
0
- Purge Valve 2 (D47)
+ Dry Bicarb Inlet (D65)
- -
-
+
-
+
-
-
- -
-
-
-
-
-
-
-
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 352
+ 0
+
+
+
+
+ 10
+
+
+
+ color: rgb(238, 238, 236);
+background-color: rgb(200, 115, 17);
+
+
+ Valve Status
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
-
+
+
+ 255
+
+
+
+ -
+
+
+ 255
+
+
+
+ -
+
200
0
- Valve Sensed State 1
+ Valve Sensed State 22
- -
+
-
255
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 4
+ Valve Sensed State 2
- -
-
-
- 255
-
-
-
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 27
+ Valve Sensed State 8
- -
-
-
- 255
-
-
-
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 25
+ Valve Sensed State 6
- -
-
-
- 255
-
-
-
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 7
+ Valve Sensed State 3
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 20
+ Valve Sensed State 5
- -
-
+
-
+
255
-
-
- -
-
-
-
-
-
-
- 200
- 0
-
+
-
+
+
+ 255
-
- Valve Sensed State 16
-
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 10
+ Valve Sensed State 1
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 17
+ Valve Sensed State 15
- -
-
-
- 255
-
-
-
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 11
+ Valve Sensed State 4
- -
-
-
- 255
-
-
-
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 18
+ Valve Sensed State 7
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
+
+ 255
+
+
+
+ -
+
200
0
- Valve Sensed State 26
+ Valve Sensed State 28
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 28
+ Valve Sensed State 21
- -
-
+
-
+
255
-
-
- -
-
-
-
+
-
@@ -1235,349 +1179,313 @@
- -
+
-
255
-
-
- -
-
-
-
-
-
-
- 200
- 0
-
+
-
+
+
+ 255
-
- Valve Sensed State 23
+
+
+ -
+
+
+ 255
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
+
+ 255
+
+
+
+ -
+
+
+ 255
+
+
+
+ -
+
200
0
- Valve Sensed State 5
+ Valve Sensed State 13
- -
-
-
- 255
+
-
+
+
+
+ 200
+ 0
+
+
+ Valve Sensed State 12
+
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 22
+ Valve Sensed State 11
- -
-
-
- 255
+
-
+
+
+
+ 200
+ 0
+
+
+ Valve Sensed State 10
+
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 2
+ Valve Sensed State 9
- -
-
-
- 255
-
-
-
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 21
+ Valve Sensed State 20
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 3
+ Valve Sensed State 19
- -
-
+
-
+
255
-
-
- -
-
-
-
-
-
-
- 200
- 0
-
+
-
+
+
+ 255
-
- Valve Sensed State 24
+
+
+ -
+
+
+ 255
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 13
+ Valve Sensed State 18
- -
-
-
- 255
+
-
+
+
+
+ 200
+ 0
+
+
+ Valve Sensed State 17
+
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 15
+ Valve Sensed State 16
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 9
+ Valve Sensed State 27
- -
-
-
- 255
-
-
-
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 6
+ Valve Sensed State 26
- -
-
+
-
+
255
-
-
- -
-
-
-
-
-
-
- 200
- 0
-
+
-
+
+
+ 255
-
- Valve Sensed State 8
+
+
+ -
+
+
+ 255
- -
-
+
-
+
255
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 12
+ Valve Sensed State 25
- -
-
-
- 255
+
-
+
+
+
+ 200
+ 0
+
+
+ Valve Sensed State 24
+
-
-
- -
-
-
-
-
+
-
+
200
0
- Valve Sensed State 19
+ Valve Sensed State 23
- -
-
-
- 255
-
-
-
@@ -1598,9 +1506,9 @@
cbDialyzerOutlet
cbPurgeValve2
cbHydraulicsInlet
- cbWaterInlet
+ cbValveDryBicard
+ cdValveDeScaler
cbReservedSpace1
- cbReservedSpace2
cbBalancingChamber1
cbBalancingChamber2
cbBalancingChamber3
@@ -1609,14 +1517,10 @@
cbBalancingChamber6
cbBalancingChamber4
cbBalancingChamber8
- cbUltrafiltrationInlet1
- cbUltrafiltrationInlet2
- cbUltrafiltrationOutlet1
- cbUltrafiltrationOutlet2
- cbReservedSpace3
- cbReservedSpace4
- cbReservedSpace5
- cbReservedSpace6
+ cbSpareValve0
+ cbSpareValve6
+ cbSpareValve7
+ cbIOValve0
sbValvesSensedState1
sbValvesSensedState2
sbValvesSensedState3