Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -rd28c8c54ba1f74adf348d1db6f5bfe034628c812 -r71216b08590dd4b556c10b3384dddc26c8d29a99 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision d28c8c54ba1f74adf348d1db6f5bfe034628c812) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 71216b08590dd4b556c10b3384dddc26c8d29a99) @@ -44,10 +44,10 @@ D8_VALV = 2 # Valve Hydraulics Bypass (D8) D54_VALV = 3 # Valve Rinse Port (D54) D53_VALV = 4 # Valve Drain (D53) - D65_VALV = 5 # Valve DryBcarb Inlet (D65) + D34_VALV = 5 # Valve DryBcarb Inlet (D65) D64_VALV = 6 # Valve Purge 1 (D64) D31_VALV = 7 # Valve Pressure Test (D31) - D34_VALV = 8 # Valve Dialyzer Bypass (D34) + D65_VALV = 8 # Valve Dialyzer Bypass (D34) D35_VALV = 9 # Valve Dialyzer Inlet (D35) D40_VALV = 10 # Valve Dialyzer Outlet (D40) D47_VALV = 11 # Valve Dialysate Out Purge 2 (D47) @@ -258,10 +258,10 @@ self.d8_valv["state"] = self._binary_to_valve_state(vst[0] & 4) self.d54_valv["state"] = self._binary_to_valve_state(vst[0] & 8) self.d53_valv["state"] = self._binary_to_valve_state(vst[0] & 16) - self.d65_valv["state"] = self._binary_to_valve_state(vst[0] & 32) + self.d34_valv["state"] = self._binary_to_valve_state(vst[0] & 32) self.d64_valv["state"] = self._binary_to_valve_state(vst[0] & 64) self.d31_valv["state"] = self._binary_to_valve_state(vst[0] & 128) - self.d34_valv["state"] = self._binary_to_valve_state(vst[0] & 256) + self.d65_valv["state"] = self._binary_to_valve_state(vst[0] & 256) self.d35_valv["state"] = self._binary_to_valve_state(vst[0] & 512) self.d40_valv["state"] = self._binary_to_valve_state(vst[0] & 1024) self.d47_valv["state"] = self._binary_to_valve_state(vst[0] & 2048) @@ -376,10 +376,10 @@ @param bcv1: bool - valve state for D23_VALV (true=open, false=closed) @param bcv2: bool - valve state for D19_VALV (true=open, false=closed) @param bcv3: bool - valve state for D25_VALV (true=open, false=closed) - @param bcv4: bool - valve state for D26_VALV (true=open, false=closed) + @param bcv4: bool - valve state for D21_VALV (true=open, false=closed) @param bcv5: bool - valve state for D24_VALV (true=open, false=closed) @param bcv6: bool - valve state for D20_VALV (true=open, false=closed) - @param bcv7: bool - valve state for D21_VALV (true=open, false=closed) + @param bcv7: bool - valve state for D26_VALV (true=open, false=closed) @param bcv8: bool - valve state for D22_VALV (true=open, false=closed) @return: 1 if successful, zero otherwise """