Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r90f9b4334fd2c3e51dbe204b3b5e224ce5e88588 -ra2fa62e46c84b41ff9fbab0964b0ff14c029c09c --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 90f9b4334fd2c3e51dbe204b3b5e224ce5e88588) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision a2fa62e46c84b41ff9fbab0964b0ff14c029c09c) @@ -83,10 +83,10 @@ self.d23_valv = {"id": dd_enum_repository.DDValveNames.D23_VALV.value, "state": DEENERGIZED} self.d19_valv = {"id": dd_enum_repository.DDValveNames.D19_VALV.value, "state": DEENERGIZED} self.d25_valv = {"id": dd_enum_repository.DDValveNames.D25_VALV.value, "state": DEENERGIZED} - self.d21_valv = {"id": dd_enum_repository.DDValveNames.D26_VALV.value, "state": DEENERGIZED} + self.d21_valv = {"id": dd_enum_repository.DDValveNames.D21_VALV.value, "state": DEENERGIZED} self.d24_valv = {"id": dd_enum_repository.DDValveNames.D24_VALV.value, "state": DEENERGIZED} self.d20_valv = {"id": dd_enum_repository.DDValveNames.D20_VALV.value, "state": DEENERGIZED} - self.d26_valv = {"id": dd_enum_repository.DDValveNames.D21_VALV.value, "state": DEENERGIZED} + 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} @@ -361,7 +361,7 @@ can_interface = self.can_interface) - def cmd_bc_valves_override(self, bcv1: bool, bcv2: bool, bcv3: bool, bcv4: bool, bcv5: bool, bcv6: bool, bcv7: bool, bcv8: bool) -> int: + def cmd_bc_valves_override(self, bcv1: bool, bcv2: bool, bcv3: bool, bcv4: bool, bcv5: bool, bcv6: bool, bcv7: bool, bcv8: bool, reset: int = NO_RESET) -> int: """ Constructs and sends the balancing chamber valve states override command. Constraints: @@ -376,31 +376,34 @@ @param bcv6: bool - valve state for D20_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) + @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ + rst = integer_to_bytearray(reset) valve = 0 if bcv1: valve = valve | 0x1 if bcv2: valve = valve | 0x2 if bcv3: valve = valve | 0x4 - if bcv7: + if bcv4: valve = valve | 0x8 if bcv5: valve = valve | 0x10 if bcv6: valve = valve | 0x20 - if bcv4: + if bcv7: valve = valve | 0x40 if bcv8: valve = valve | 0x80 - payload = integer_to_bytearray(valve) + vlv = integer_to_bytearray(valve) + payload = rst + vlv return cmd_generic_override( payload = payload, - reset = NO_RESET, + reset = reset, channel_id = DenaliChannels.dialin_to_dd_ch_id, msg_id = MsgIds.MSG_ID_DD_BC_VALVE_STATES_OVERRIDE_REQUEST, entity_name = f'DD Balancing Chamber Valves state',