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 Index: DD_Valves/loader.py =================================================================== diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -r6b4653fcf93a52eae110e8ccaf83c306e84b64ad --- DD_Valves/loader.py (.../loader.py) (revision 767c7999a57c41783d0269ec5ba296caf5278295) +++ DD_Valves/loader.py (.../loader.py) (revision 6b4653fcf93a52eae110e8ccaf83c306e84b64ad) @@ -46,9 +46,9 @@ self.cbDialyzerOutlet = self.find_widget(QtWidgets.QCheckBox , 'cbDialyzerOutlet' ) self.cbPurgeValve2 = self.find_widget(QtWidgets.QCheckBox , 'cbPurgeValve2' ) self.cbHydraulicsInlet = self.find_widget(QtWidgets.QCheckBox , 'cbHydraulicsInlet' ) - self.cbWaterInlet = self.find_widget(QtWidgets.QCheckBox , 'cbWaterInlet' ) + self.cbValveDryBicard = self.find_widget(QtWidgets.QCheckBox , 'cbValveDryBicard' ) + self.cdValveDeScaler = self.find_widget(QtWidgets.QCheckBox , 'cdValveDeScaler' ) self.cbReservedSpace1 = self.find_widget(QtWidgets.QCheckBox , 'cbReservedSpace1' ) - self.cbReservedSpace2 = self.find_widget(QtWidgets.QCheckBox , 'cbReservedSpace2' ) self.cbBalancingChamber1 = self.find_widget(QtWidgets.QCheckBox , 'cbBalancingChamber1' ) self.cbBalancingChamber2 = self.find_widget(QtWidgets.QCheckBox , 'cbBalancingChamber2' ) @@ -59,15 +59,25 @@ self.cbBalancingChamber4 = self.find_widget(QtWidgets.QCheckBox , 'cbBalancingChamber4' ) self.cbBalancingChamber8 = self.find_widget(QtWidgets.QCheckBox , 'cbBalancingChamber8' ) - self.cbUltrafiltrationInlet1 = self.find_widget(QtWidgets.QCheckBox , 'cbUltrafiltrationInlet1' ) - self.cbUltrafiltrationInlet2 = self.find_widget(QtWidgets.QCheckBox , 'cbUltrafiltrationInlet2' ) - self.cbUltrafiltrationOutlet1 = self.find_widget(QtWidgets.QCheckBox , 'cbUltrafiltrationOutlet1' ) - self.cbUltrafiltrationOutlet2 = self.find_widget(QtWidgets.QCheckBox , 'cbUltrafiltrationOutlet2' ) - self.cbReservedSpace3 = self.find_widget(QtWidgets.QCheckBox , 'cbReservedSpace3' ) # The Reserved values aren't used but are initialized per payload structure - self.cbReservedSpace4 = self.find_widget(QtWidgets.QCheckBox , 'cbReservedSpace4' ) - self.cbReservedSpace5 = self.find_widget(QtWidgets.QCheckBox , 'cbReservedSpace5' ) - self.cbReservedSpace6 = self.find_widget(QtWidgets.QCheckBox , 'cbReservedSpace6' ) + self.cbSpareValve0 = self.find_widget(QtWidgets.QCheckBox , 'cbSpareValve0' ) + self.cbSpareValve1 = self.find_widget(QtWidgets.QCheckBox , 'cbSpareValve1' ) + self.cbSpareValve2 = self.find_widget(QtWidgets.QCheckBox , 'cbSpareValve2' ) + self.cbSpareValve3 = self.find_widget(QtWidgets.QCheckBox , 'cbSpareValve3' ) + self.cbSpareValve4 = self.find_widget(QtWidgets.QCheckBox , 'cbSpareValve4' ) + self.cbSpareValve5 = self.find_widget(QtWidgets.QCheckBox , 'cbSpareValve5' ) + self.cbSpareValve6 = self.find_widget(QtWidgets.QCheckBox , 'cbSpareValve6' ) + self.cbSpareValve7 = self.find_widget(QtWidgets.QCheckBox , 'cbSpareValve7' ) + self.cbIOValve0 = self.find_widget(QtWidgets.QCheckBox , 'cbIOValve0' ) + self.cbIOValve1 = self.find_widget(QtWidgets.QCheckBox , 'cbIOValve1' ) + + self.cbFPValve0 = self.find_widget(QtWidgets.QCheckBox , 'cbFPValve0' ) + self.cbFPValve1 = self.find_widget(QtWidgets.QCheckBox , 'cbFPValve1' ) + self.cbFPValve2 = self.find_widget(QtWidgets.QCheckBox , 'cbFPValve2' ) + self.cbFPValve3 = self.find_widget(QtWidgets.QCheckBox , 'cbFPValve3' ) + self.cbFPValve4 = self.find_widget(QtWidgets.QCheckBox , 'cbFPValve4' ) + self.cbFPValve5 = self.find_widget(QtWidgets.QCheckBox , 'cbFPValve5' ) + self.sbValvesSensedState1 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState1' ) self.sbValvesSensedState2 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState2' ) self.sbValvesSensedState3 = self.find_widget(QtWidgets.QSpinBox , 'sbValvesSensedState3' ) @@ -124,9 +134,9 @@ self.cbDialyzerOutlet .setChecked(False) self.cbPurgeValve2 .setChecked(False) self.cbHydraulicsInlet .setChecked(False) - self.cbWaterInlet .setChecked(False) + self.cbValveDryBicard .setChecked(False) + self.cdValveDeScaler .setChecked(False) self.cbReservedSpace1 .setChecked(False) - self.cbReservedSpace2 .setChecked(False) self.cbBalancingChamber1 .setChecked(False) self.cbBalancingChamber2 .setChecked(False) self.cbBalancingChamber3 .setChecked(False) @@ -135,14 +145,22 @@ self.cbBalancingChamber6 .setChecked(False) self.cbBalancingChamber4 .setChecked(False) self.cbBalancingChamber8 .setChecked(False) - self.cbUltrafiltrationInlet1 .setChecked(False) - self.cbUltrafiltrationInlet2 .setChecked(False) - self.cbUltrafiltrationOutlet1 .setChecked(False) - self.cbUltrafiltrationOutlet2 .setChecked(False) - self.cbReservedSpace3 .setChecked(False) # The Reserved values aren't used but are initialized per payload structure - self.cbReservedSpace4 .setChecked(False) - self.cbReservedSpace5 .setChecked(False) - self.cbReservedSpace6 .setChecked(False) + self.cbSpareValve0 .setChecked(False) + self.cbSpareValve1 .setChecked(False) + self.cbSpareValve2 .setChecked(False) + self.cbSpareValve3 .setChecked(False) + self.cbSpareValve4 .setChecked(False) + self.cbSpareValve5 .setChecked(False) + self.cbSpareValve6 .setChecked(False) + self.cbSpareValve7 .setChecked(False) + self.cbIOValve0 .setChecked(False) + self.cbIOValve1 .setChecked(False) + self.cbFPValve0 .setChecked(False) + self.cbFPValve1 .setChecked(False) + self.cbFPValve2 .setChecked(False) + self.cbFPValve3 .setChecked(False) + self.cbFPValve4 .setChecked(False) + self.cbFPValve5 .setChecked(False) self.sbValvesSensedState1 .setValue(0) self.sbValvesSensedState2 .setValue(0) self.sbValvesSensedState3 .setValue(0) @@ -191,21 +209,37 @@ D40_VALV = self.cbDialyzerOutlet .isChecked() D47_VALV = self.cbPurgeValve2 .isChecked() D3_VALV = self.cbHydraulicsInlet .isChecked() - M4_VALV = self.cbWaterInlet .isChecked() + D80_VALV = self.cbValveDryBicard .isChecked() + D81_VALV = self.cdValveDeScaler .isChecked() RSRVD_SPACE1 = self.cbReservedSpace1 .isChecked() - RSRVD_SPACE2 = self.cbReservedSpace2 .isChecked() - D23_VALV = self.cbBalancingChamber1 .isChecked() - D19_VALV = self.cbBalancingChamber2 .isChecked() - D25_VALV = self.cbBalancingChamber3 .isChecked() - D26_VALV = self.cbBalancingChamber7 .isChecked() - D24_VALV = self.cbBalancingChamber5 .isChecked() - D20_VALV = self.cbBalancingChamber6 .isChecked() - D21_VALV = self.cbBalancingChamber4 .isChecked() - D22_VALV = self.cbBalancingChamber8 .isChecked() - D69_VALV = self.cbUltrafiltrationInlet1 .isChecked() - D71_VALV = self.cbUltrafiltrationInlet2 .isChecked() - D70_VALV = self.cbUltrafiltrationOutlet1 .isChecked() - D72_VALV = self.cbUltrafiltrationOutlet2 .isChecked() + + D23_VALV = self.cbBalancingChamber1 .isChecked() + D19_VALV = self.cbBalancingChamber2 .isChecked() + D25_VALV = self.cbBalancingChamber3 .isChecked() + D21_VALV = self.cbBalancingChamber4 .isChecked() + D24_VALV = self.cbBalancingChamber5 .isChecked() + D20_VALV = self.cbBalancingChamber6 .isChecked() + D26_VALV = self.cbBalancingChamber7 .isChecked() + D22_VALV = self.cbBalancingChamber8 .isChecked() + + D79_PMP_VALV = self.cbSpareValve0 .isChecked() + SPARE1_VALV = self.cbSpareValve1 .isChecked() + SPARE2_VALV = self.cbSpareValve2 .isChecked() + SPARE3_VALV = self.cbSpareValve3 .isChecked() + SPARE4_VALV = self.cbSpareValve4 .isChecked() + SPARE5_VALV = self.cbSpareValve5 .isChecked() + SPARE6_VALV = self.cbSpareValve6 .isChecked() + SPARE7_VALV = self.cbSpareValve7 .isChecked() + M4_VALV = self.cbIOValve0 .isChecked() + M12_VALV = self.cbIOValve1 .isChecked() + + P11_VALV = self.cbFPValve0 .isChecked() + P33_VALV = self.cbFPValve1 .isChecked() + P34_VALV = self.cbFPValve2 .isChecked() + P37_VALV = self.cbFPValve3 .isChecked() + P39_VALV = self.cbFPValve4 .isChecked() + P6_VALV = self.cbFPValve5 .isChecked() + valvesensedState = [ self.sbValvesSensedState1 .value() , self.sbValvesSensedState2 .value() , @@ -238,33 +272,45 @@ ] self.dd_interface.dd_valves( - D14_VALV , - D52_VALV , - D8_VALV , - D54_VALV , - D53_VALV , - D34_VALV , - D64_VALV , - D31_VALV , - D65_VALV , - D35_VALV , - D40_VALV , - D47_VALV , - D3_VALV , - M4_VALV , - RSRVD_SPACE1 , - RSRVD_SPACE2 , - D23_VALV , - D19_VALV , - D25_VALV , - D26_VALV , - D24_VALV , - D20_VALV , - D21_VALV , - D22_VALV , - D69_VALV , - D71_VALV , - D70_VALV , - D72_VALV , + D14_VALV , + D52_VALV , + D8_VALV , + D54_VALV , + D53_VALV , + D34_VALV , + D64_VALV , + D31_VALV , + D65_VALV , + D35_VALV , + D40_VALV , + D47_VALV , + D3_VALV , + D80_VALV , + D81_VALV , + RSRVD_SPACE1 , + D23_VALV , + D19_VALV , + D25_VALV , + D21_VALV , + D24_VALV , + D20_VALV , + D26_VALV , + D22_VALV , + D79_PMP_VALV , + SPARE1_VALV , + SPARE2_VALV , + SPARE3_VALV , + SPARE4_VALV , + SPARE5_VALV , + SPARE6_VALV , + SPARE7_VALV , + M4_VALV , + M12_VALV , + P11_VALV , + P33_VALV , + P34_VALV , + P37_VALV , + P39_VALV , + P6_VALV , valvesensedState ) \ No newline at end of file