Index: leahi_dialin/td/modules/valves.py =================================================================== diff -u -r71216b08590dd4b556c10b3384dddc26c8d29a99 -rb0d9d887e826ed5f1acd355f0c568822412bf1bb --- leahi_dialin/td/modules/valves.py (.../valves.py) (revision 71216b08590dd4b556c10b3384dddc26c8d29a99) +++ leahi_dialin/td/modules/valves.py (.../valves.py) (revision b0d9d887e826ed5f1acd355f0c568822412bf1bb) @@ -24,7 +24,7 @@ from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.checks import check_broadcast_interval_override_ms -from leahi_dialin.utils.conversions import integer_to_bytearray +from leahi_dialin.utils.conversions import integer_to_bytearray, short_to_bytearray @unique @@ -157,7 +157,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_set_valve_position(self, valve: int, position: int, reset: int = NO_RESET) -> int: + def cmd_set_valve_position(self, valve: int, position: int) -> int: """ Constructs and sends the TD valves set position for a valve @@ -166,10 +166,10 @@ @param reset: integer - 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise """ - reset_value = integer_to_bytearray(reset) + vlv = integer_to_bytearray(valve) - pos = integer_to_bytearray(position) - payload = reset_value + pos + vlv + pos = short_to_bytearray(position) + payload = pos + vlv message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, message_id=MsgIds.MSG_ID_TD_PINCH_VALVE_SET_POSITION_REQUEST.value,