Index: leahi_dialin/td/modules/valves.py =================================================================== diff -u -rb0d9d887e826ed5f1acd355f0c568822412bf1bb -r7f463d8649e41b995e1a94cc001ffc50541cafb7 --- leahi_dialin/td/modules/valves.py (.../valves.py) (revision b0d9d887e826ed5f1acd355f0c568822412bf1bb) +++ leahi_dialin/td/modules/valves.py (.../valves.py) (revision 7f463d8649e41b995e1a94cc001ffc50541cafb7) @@ -163,13 +163,12 @@ @param valve: integer - Valve number. Defined in ValvesEnum class @param position: integer - Position number: Defined in ValvesPositions class - @param reset: integer - 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise """ vlv = integer_to_bytearray(valve) - pos = short_to_bytearray(position) - payload = pos + vlv + pos = integer_to_bytearray(position) + payload = vlv + pos message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, message_id=MsgIds.MSG_ID_TD_PINCH_VALVE_SET_POSITION_REQUEST.value, @@ -185,15 +184,17 @@ self.logger.debug("TD cmd_valve_override Timeout!!!") return False - def cmd_home_valve(self, valve: int) -> int: + def cmd_home_valve(self, valve: int, force_home: int, cartridge: int) -> int: """ Constructs and sends the TD valves home command @param valve: integer - Valve number. Defined in ValvesEnum class @returns 1 if successful, zero otherwise """ - payload = integer_to_bytearray(valve) - + vlv = integer_to_bytearray(valve) + frc = integer_to_bytearray(force_home) + cart = integer_to_bytearray(cartridge) + payload = vlv + frc + cart message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_td_ch_id, message_id=MsgIds.MSG_ID_TD_PINCH_VALVE_HOME_REQUEST.value, payload=payload)