Index: leahi_dialin/td/modules/valves.py
===================================================================
diff -u -r71216b08590dd4b556c10b3384dddc26c8d29a99 -r7f463d8649e41b995e1a94cc001ffc50541cafb7
--- leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 71216b08590dd4b556c10b3384dddc26c8d29a99)
+++ leahi_dialin/td/modules/valves.py	(.../valves.py)	(revision 7f463d8649e41b995e1a94cc001ffc50541cafb7)
@@ -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,19 +157,18 @@
             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
 
         @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 = reset_value + pos + vlv
+        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)