Index: leahi_dialin/dd/modules/rinse_pump.py
===================================================================
diff -u -r42064e6cae7bbfd89bcebafc14e9d5865c53cb8e -r9c785697827d1a21021b48b57d5a14f157856ec2
--- leahi_dialin/dd/modules/rinse_pump.py	(.../rinse_pump.py)	(revision 42064e6cae7bbfd89bcebafc14e9d5865c53cb8e)
+++ leahi_dialin/dd/modules/rinse_pump.py	(.../rinse_pump.py)	(revision 9c785697827d1a21021b48b57d5a14f157856ec2)
@@ -47,10 +47,12 @@
                                                                        self._handler_rinse_pump_sync)
 
         self.d79_state = 0
+        self.d79_pump_pwm = 0.0
+        self.d79_pump_rpm = 0
         self.dd_rinse_pump_timestamp = 0
 
     @publish(["msg_id_dd_rinse_pump_data",
-              "d79_state",
+              "d79_state", "d79_pump_pwm", "d79_pump_rpm",
               "dd_rinse_pump_timestamp"])
     def _handler_rinse_pump_sync(self, message, timestamp=0.0):
         """
@@ -62,6 +64,10 @@
 
         self.d79_state = struct.unpack('I', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        self.d79_pump_pwm = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        self.d79_pump_rpm = struct.unpack('I', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
 
         self.dd_rinse_pump_timestamp = timestamp
 
@@ -99,4 +105,36 @@
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]
         else:
             self.logger.error("Timeout!!!!")
-            return False
\ No newline at end of file
+            return False
+
+    def cmd_rinse_pump_pwm_percent_override(self, pwm_percent: int, reset: int = NO_RESET) -> int:
+        """
+        Constructs and sends the rinse pump pwm percent override command
+        Constraints:
+            Must be logged into DD.
+
+        @param pwm_percent:  integer - percentage to override the pwm with
+        @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)
+        pwm = integer_to_bytearray(pwm_percent)
+        payload = reset_byte_array + pwm
+
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id,
+                                              message_id=MsgIds.MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST.value,
+                                              payload=payload)
+
+        self.logger.debug("override DD Rinse Pump PWM percentage")
+
+        # 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