Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r0a1f091c869a5a2f68f06390fc35192a0eb7edbc -reb312be9dab95907142103419bc1804713789e8d --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 0a1f091c869a5a2f68f06390fc35192a0eb7edbc) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision eb312be9dab95907142103419bc1804713789e8d) @@ -513,11 +513,11 @@ D20_VALV = 21 # Balancing chamber Valve 6 (D20) D26_VALV = 22 # Balancing chamber Valve 7 (D26) D22_VALV = 23 # Balancing chamber Valve 8 (D22) - D79_PMP_VALV = 24 # D79 pump mapped to Spare Valve 0 + D88_D79_VALV = 24 # D88 Valve (2.0+) or D79 pump valve (1.0-1.9) mapped to Spare Valve 0 D83_VALV = 25 # D83 De-scaler Valve mapped to Spare Valve 1 D91_VALV = 26 # D91 De-scaler Valve mapped to Spare Valve 2 - SPARE3_VALV = 27 # Spare Valve 3 - SPARE4_VALV = 28 # Spare Valve 4 + D104_VALV = 27 # D104 Valve mapped to Spare Valve 3 + D95_VALV = 28 # D95 Valve mapped to Spare Valve 4 SPARE5_VALV = 29 # Spare Valve 5 D100_VALV = 30 # D100 De-scaler Valve mapped to Spare Valve 6 SPARE7_VALV = 31 # Spare Valve 7 @@ -549,11 +549,11 @@ 'D20_VALV': ['d20'], 'D26_VALV': ['d26'], 'D22_VALV': ['d22'], - 'D79_PMP_VALV': ['d79'], + 'D88_D79_VALV': ['d79', 'd79_valv', 'd79_pmp_valv', 'd88', 'd88_valv'], 'D83_VALV': ['d83'], 'D91_VALV': ['d91'], - 'SPARE3_VALV': ['spare3'], - 'SPARE4_VALV': ['spare4'], + 'D104_VALV': ['d104'], + 'D95_VALV': ['d95'], 'SPARE5_VALV': ['spare5'], 'D100_VALV': ['d100'], 'SPARE7_VALV': ['spare7'], Index: leahi_dialin/common/test_config_defs.py =================================================================== diff -u -r62640bb1dfcb4279d31719ca933c3ce69bfb46be -reb312be9dab95907142103419bc1804713789e8d --- leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision 62640bb1dfcb4279d31719ca933c3ce69bfb46be) +++ leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision eb312be9dab95907142103419bc1804713789e8d) @@ -20,25 +20,25 @@ @unique class DDFPTestConfigOptions(DialinEnum): - TEST_CONFIG_DD_FP_ENABLE_BETA_1_HW = 0 # (DD & FP) Test configuration using Beta 1 Hardware - TEST_CONFIG_DD_DISABLE_BC_PRES_ALARM = 1 # (DD) Test configuration disabling BC pressure alarms - TEST_CONFIG_DD_ENABLE_DRY_BICARB = 2 # (DD) Test configuration enable Dry Bicarb usage - TEST_CONFIG_DD_ENABLE_D79_PWM_CONTROL = 3 # (DD) Test configuration to switch to PWM control for D79 - TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH = 4 # (FP) Test configuration to skip pre-gen flush - TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP = 5 # (DD) Test configuration to use Diener 1000 pump for D48 - TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL = 6 # (DD) Test configuration to enable Chamber H Fill - TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS = 7 # (DD) Test configuration to disable DD conductivity alarms - TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS = 8 # (FP) Test configuration to disable FP conductivity alarms - TEST_CONFIG_DD_ENABLE_DOSING_OPEN_LOOP_CONTROL = 9 # (DD) Test configuration to switch to open loop control for concentrate dosing - TEST_CONFIG_DD_ENABLE_UF_TEMP_COMP = 10 # (DD) Test configuration to enable Ultrafiltration temperature compensation - TEST_CONFIG_DD_RUN_SOLO = 11 # (DD) Test configuration to run DD alone without the other subsystems - TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW = 12 # (DD) Test configuration to run DD alone without the other subsystems - TEST_CONFIG_DD_DRY_BICART_TEST = 13 # (DD) Test configuration to test drybicart initial fill from pre-gen - NUM_OF_TEST_CONFIGS = 14 # Number of Test Configs + TEST_CONFIG_DD_FP_ENABLE_BETA_1_HW = 0 # (DD & FP) Test configuration using Beta 1.0 Hardware + TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW = 1 # (DD & FP) Test configuration using Beta 2.0 Hardware + TEST_CONFIG_DD_DISABLE_BC_PRES_ALARM = 2 # (DD) Test configuration disabling BC pressure alarms + TEST_CONFIG_DD_ENABLE_DRY_BICARB = 3 # (DD) Test configuration enable Dry Bicarb usage + TEST_CONFIG_FP_SKIP_PRE_GEN_FLUSH = 4 # (FP) Test configuration to skip pre-gen flush + TEST_CONFIG_DD_ENABLE_DIENER_1000_PUMP = 5 # (DD) Test configuration to use Diener 1000 pump for D48 + TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL = 6 # (DD) Test configuration to enable Chamber H Fill + TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS = 7 # (DD) Test configuration to disable DD conductivity alarms + TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS = 8 # (FP) Test configuration to disable FP conductivity alarms + TEST_CONFIG_DD_ENABLE_DOSING_OPEN_LOOP_CONTROL = 9 # (DD) Test configuration to switch to open loop control for concentrate dosing + TEST_CONFIG_DD_ENABLE_UF_TEMP_COMP = 10 # (DD) Test configuration to enable Ultrafiltration temperature compensation + TEST_CONFIG_DD_RUN_SOLO = 11 # (DD) Test configuration to run DD alone without the other subsystems + TEST_CONFIG_DD_DRY_BICART_TEST = 12 # (DD) Test configuration to test drybicart initial fill from pre-gen + NUM_OF_TEST_CONFIGS = 13 # Number of Test Configs DDFPTestConfigOptions._str_list = {} @unique class TDTestConfigOptions(DialinEnum): - TEST_CONFIG_ENABLE_BETA_1_HW = 0 # Test configuration using Beta 1 Hardware - NUM_OF_TEST_CONFIGS = 1 # Number of Test Configs + TEST_CONFIG_ENABLE_BETA_1_HW = 0 # Test configuration using Beta 1 Hardware + TEST_CONFIG_SKIP_BLOOD_PRIME = 1 # Test configuration to skip blood priming + NUM_OF_TEST_CONFIGS = 2 # Number of Test Configs TDTestConfigOptions._str_list = {} Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r62640bb1dfcb4279d31719ca933c3ce69bfb46be -reb312be9dab95907142103419bc1804713789e8d --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 62640bb1dfcb4279d31719ca933c3ce69bfb46be) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision eb312be9dab95907142103419bc1804713789e8d) @@ -90,11 +90,11 @@ self.d26_valv = {"id": dd_enum_repository.DDValveNames.D26_VALV.value, "state": DEENERGIZED} self.d22_valv = {"id": dd_enum_repository.DDValveNames.D22_VALV.value, "state": DEENERGIZED} - self.d79_pmp_valv = {"id": dd_enum_repository.DDValveNames.D79_PMP_VALV.value, "state": DEENERGIZED} + self.d88_d79_valv = {"id": dd_enum_repository.DDValveNames.D88_D79_VALV.value, "state": DEENERGIZED} self.d83_valv = {"id": dd_enum_repository.DDValveNames.D83_VALV.value, "state": DEENERGIZED} self.d91_valv = {"id": dd_enum_repository.DDValveNames.D91_VALV.value, "state": DEENERGIZED} - self.spare3_valv = {"id": dd_enum_repository.DDValveNames.SPARE3_VALV.value, "state": DEENERGIZED} - self.spare4_valv = {"id": dd_enum_repository.DDValveNames.SPARE4_VALV.value, "state": DEENERGIZED} + self.d104_valv = {"id": dd_enum_repository.DDValveNames.D104_VALV.value, "state": DEENERGIZED} + self.d95_valv = {"id": dd_enum_repository.DDValveNames.D95_VALV.value, "state": DEENERGIZED} self.spare5_valv = {"id": dd_enum_repository.DDValveNames.SPARE5_VALV.value, "state": DEENERGIZED} self.d100_valv = {"id": dd_enum_repository.DDValveNames.D100_VALV.value, "state": DEENERGIZED} self.spare7_valv = {"id": dd_enum_repository.DDValveNames.SPARE7_VALV.value, "state": DEENERGIZED} @@ -140,11 +140,11 @@ self.d26_valv.get("state", None), self.d22_valv.get("state", None), - self.d79_pmp_valv.get("state", None), + self.d88_d79_valv.get("state", None), self.d83_valv.get("state", None), self.d91_valv.get("state", None), - self.spare3_valv.get("state", None), - self.spare4_valv.get("state", None), + self.d104_valv.get("state", None), + self.d95_valv.get("state", None), self.spare5_valv.get("state", None), self.d100_valv.get("state", None), self.spare7_valv.get("state", None) @@ -207,13 +207,13 @@ "d20_valv", "d26_valv", "d22_valv", - "d79_pmp_valv", - "D83_valv", - "D91_valv", - "spare3_valv", - "spare4_valv", + "d88_d79_valv", + "d83_valv", + "d91_valv", + "d104_valv", + "d95_valv", "spare5_valv", - "D100_valv", + "d100_valv", "spare7_valv", "valve_states_enum", "valves_sensed_states", @@ -259,11 +259,11 @@ self.d22_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) spv = struct.unpack('B', bytearray(message['message'][self.START_POS_SPARE_VALVES_STATES:self.END_POS_SPARE_VALVES_STATES])) - self.d79_pmp_valv["state"] = self._binary_to_valve_state(spv[0] & 1) + self.d88_d79_valv["state"] = self._binary_to_valve_state(spv[0] & 1) self.d83_valv["state"] = self._binary_to_valve_state(spv[0] & 2) self.d91_valv["state"] = self._binary_to_valve_state(spv[0] & 4) - self.spare3_valv["state"] = self._binary_to_valve_state(spv[0] & 8) - self.spare4_valv["state"] = self._binary_to_valve_state(spv[0] & 16) + self.d104_valv["state"] = self._binary_to_valve_state(spv[0] & 8) + self.d95_valv["state"] = self._binary_to_valve_state(spv[0] & 16) self.spare5_valv["state"] = self._binary_to_valve_state(spv[0] & 32) self.d100_valv["state"] = self._binary_to_valve_state(spv[0] & 64) self.spare7_valv["state"] = self._binary_to_valve_state(spv[0] & 128)