Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r7f463d8649e41b995e1a94cc001ffc50541cafb7 -reb02c56e88faeeda46ed62b1c0ec841dca0b9aba
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 7f463d8649e41b995e1a94cc001ffc50541cafb7)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision eb02c56e88faeeda46ed62b1c0ec841dca0b9aba)
@@ -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, short_to_bytearray
+from leahi_dialin.utils.conversions import integer_to_bytearray
 
 
 @unique
@@ -157,18 +157,19 @@
             self.logger.debug("Timeout!!!!")
             return False
 
-    def cmd_set_valve_position(self, valve: int, position: int) -> int:
+    def cmd_set_valve_position(self, valve: int, position: int, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the TD valves set position for a valve
 
         @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
         """
-
+        reset_value = integer_to_bytearray(reset)
         vlv = integer_to_bytearray(valve)
         pos = integer_to_bytearray(position)
-        payload = vlv + pos
+        payload = reset_value + 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,
@@ -184,17 +185,15 @@
             self.logger.debug("TD cmd_valve_override Timeout!!!")
             return False
 
-    def cmd_home_valve(self, valve: int, force_home: int, cartridge: int) -> int:
+    def cmd_home_valve(self, valve: 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
         """
-        vlv = integer_to_bytearray(valve)
-        frc = integer_to_bytearray(force_home)
-        cart = integer_to_bytearray(cartridge)
-        payload = vlv + frc + cart
+        payload = integer_to_bytearray(valve)
+
         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)