Index: leahi_dialin/dd/modules/dialysate_pump.py
===================================================================
diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -r5d1444a2ef341b1ca053c81a4d4fddfacac6b33c
--- leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision fd7a25d8f068bcba594c01410a02a03f6afbcd59)
+++ leahi_dialin/dd/modules/dialysate_pump.py	(.../dialysate_pump.py)	(revision 5d1444a2ef341b1ca053c81a4d4fddfacac6b33c)
@@ -184,20 +184,18 @@
             self.logger.error("Timeout!!!!")
             return False
 
-    def cmd_dialysate_pump_target_speed_override(self, pump_id: int, speed: float) -> int:
+    def cmd_dialysate_pump_target_speed_override(self, pump_id: int, speed: float, reset: int = NO_RESET) -> int:
         """
         Constructs and sends the concentrate pump target speed override command
 
         @param pump_id: unsigned int - concentrate pump ID
-        @param speed:  float - target speed value to override concentrate pump with
+        @param speed:  float - target speed value to override pump with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = CP1 \n
-            1 = CP2 \n
         """
 
-        reset_byte_array = integer_to_bytearray(NO_RESET)
+        reset_byte_array = integer_to_bytearray(reset)
         speed_byte_array = float_to_bytearray(speed)
         pump_id_byte_array = integer_to_bytearray(pump_id)
         payload = reset_byte_array + speed_byte_array + pump_id_byte_array
@@ -219,20 +217,18 @@
             self.logger.error("Timeout!!!!")
             return False
 
-    def cmd_dialysate_pump_measured_speed_override(self, pump_id: int, speed: float) -> int:
+    def cmd_dialysate_pump_measured_speed_override(self, pump_id: int, speed: float, reset: int = NO_RESET) -> int:
         """
-        Constructs and sends the concentrate pump target speed override command
+        Constructs and sends the dialysate pump target speed override command
 
         @param pump_id: unsigned int - concentrate pump ID
-        @param speed:  float - target speed value to override concentrate pump with
+        @param speed:  float - target speed value to override pump with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = CP1 \n
-            1 = CP2 \n
         """
 
-        reset_byte_array = integer_to_bytearray(NO_RESET)
+        reset_byte_array = integer_to_bytearray(reset)
         speed_byte_array = float_to_bytearray(speed)
         pump_id_byte_array = integer_to_bytearray(pump_id)
         payload = reset_byte_array + speed_byte_array + pump_id_byte_array
@@ -254,20 +250,18 @@
             self.logger.error("Timeout!!!!")
             return False
 
-    def cmd_dialysate_pump_target_pressure_override(self, pump_id: int, pressure: float) -> int:
+    def cmd_dialysate_pump_target_pressure_override(self, pump_id: int, pressure: float, reset: int = NO_RESET) -> int:
         """
-        Constructs and sends the concentrate pump target speed override command
+        Constructs and sends the dialysate pump target speed override command
 
         @param pump_id: unsigned int - concentrate pump ID
-        @param pressure:  float - target speed value to override concentrate pump with
+        @param pressure:  float - target speed value to override dialysate pump with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = CP1 \n
-            1 = CP2 \n
         """
 
-        reset_byte_array = integer_to_bytearray(NO_RESET)
+        reset_byte_array = integer_to_bytearray(reset)
         pressure_byte_array = float_to_bytearray(pressure)
         pump_id_byte_array = integer_to_bytearray(pump_id)
         payload = reset_byte_array + pressure_byte_array + pump_id_byte_array
@@ -276,7 +270,7 @@
                                               message_id=MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_TARGET_PRESSURE_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
-        self.logger.debug("override target speed: " + str(speed) + " - for pump: " + str(pump_id))
+        self.logger.debug("override target speed: " + str(pressure) + " - for pump: " + str(pump_id))
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -289,20 +283,18 @@
             self.logger.error("Timeout!!!!")
             return False
 
-    def cmd_dialysate_pump_measured_current_override(self, pump_id: int, current: float) -> int:
+    def cmd_dialysate_pump_measured_current_override(self, pump_id: int, current: float, reset: int = NO_RESET) -> int:
         """
-        Constructs and sends the concentrate pump target speed override command
+        Constructs and sends the dialysate pump measured current override command
 
         @param pump_id: unsigned int - concentrate pump ID
-        @param current:  float - target speed value to override concentrate pump with
+        @param current:  float - target speed value to override dialysate pump with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = CP1 \n
-            1 = CP2 \n
         """
 
-        reset_byte_array = integer_to_bytearray(NO_RESET)
+        reset_byte_array = integer_to_bytearray(reset)
         current_byte_array = float_to_bytearray(current)
         pump_id_byte_array = integer_to_bytearray(pump_id)
         payload = reset_byte_array + current_byte_array + pump_id_byte_array
@@ -311,7 +303,7 @@
                                               message_id=MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_CURRENT_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
-        self.logger.debug("override target speed: " + str(speed) + " - for pump: " + str(pump_id))
+        self.logger.debug("override target speed: " + str(current) + " - for pump: " + str(pump_id))
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -324,20 +316,18 @@
             self.logger.error("Timeout!!!!")
             return False
 
-    def cmd_dialysate_pump_measured_direction_override(self, pump_id: int, direction: float) -> int:
+    def cmd_dialysate_pump_measured_direction_override(self, pump_id: int, direction: float, reset: int = NO_RESET) -> int:
         """
-        Constructs and sends the concentrate pump target speed override command
+        Constructs and sends the dialysate pump measured direction override command
 
         @param pump_id: unsigned int - concentrate pump ID
-        @param direction:  float - target speed value to override concentrate pump with
+        @param direction:  float - target speed value to override pump with
+        @param reset:  integer - 1 to reset a previous override, 0 to override
         @return: 1 if successful, zero otherwise
 
-        Concentrate pump IDs: \n
-            0 = CP1 \n
-            1 = CP2 \n
         """
 
-        reset_byte_array = integer_to_bytearray(NO_RESET)
+        reset_byte_array = integer_to_bytearray(reset)
         direction_byte_array = float_to_bytearray(direction)
         pump_id_byte_array = integer_to_bytearray(pump_id)
         payload = reset_byte_array + direction_byte_array + pump_id_byte_array
@@ -346,7 +336,7 @@
                                               message_id=MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_DIRECTION_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
-        self.logger.debug("override target speed: " + str(speed) + " - for pump: " + str(pump_id))
+        self.logger.debug("override target speed: " + str(direction) + " - for pump: " + str(pump_id))
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -357,4 +347,37 @@
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.error("Timeout!!!!")
+            return False
+
+    def cmd_dialysate_start_stop_override(self, pump_id: int, cmd: int, reset: int = NO_RESET) -> int:
+        """
+        Constructs and sends the dialysate pump start stop override command
+
+        @param pump_id: unsigned int - concentrate pump ID
+        @param cmd:  int - value to command the dialysate pump
+        @param reset:  integer - 1 to reset a previous override, 0 to override
+        @return: 1 if successful, zero otherwise
+
+        """
+
+        reset_byte_array = integer_to_bytearray(reset)
+        direction_byte_array = float_to_bytearray(cmd)
+        pump_id_byte_array = integer_to_bytearray(pump_id)
+        payload = reset_byte_array + direction_byte_array + pump_id_byte_array
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
+                                              message_id=MsgIds.MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST.value,
+                                              payload=payload)
+
+        self.logger.debug("setting " + str(cmd) + " - for pump: " + str(pump_id))
+
+        # Send message
+        received_message = self.can_interface.send(message)
+
+        # If there is content...
+        if received_message is not None:
+            # response payload is OK or not OK
+            return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
+        else:
+            self.logger.error("Timeout!!!!")
             return False
\ No newline at end of file