Index: leahi_dialin/dd/modules/rinse_pump.py =================================================================== diff -u -rfa63b92d3d3a3f2870833583bff12729e180e2d1 -rc4579da3bd8c483e8675f2894901d3dcdbea7b99 --- leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision fa63b92d3d3a3f2870833583bff12729e180e2d1) +++ leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision c4579da3bd8c483e8675f2894901d3dcdbea7b99) @@ -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_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + self.d79_pump_rpm = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.dd_rinse_pump_timestamp = timestamp @@ -99,4 +105,68 @@ 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_pct: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends the rinse pump PWM override request + Constraints: + Must be logged into DD. + Given interval must be non-zero and less than 100. + + @param pwm_pct: float - PWM in percent + @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) + float_pct_byte_array = float_to_bytearray(pwm_pct) + payload = reset_byte_array + float_pct_byte_array + + 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 to {}%.".format(pwm_pct)) + + # 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 + + def cmd_rinse_pump_on_off_request(self, on_off: int) -> int: + """ + Constructs and sends the rinse pump On/Off request + Constraints: + Must be logged into DD. + Given interval must be 0 (Off) or 1 (On) + + @param on_off: integer - On/Off value + @return: 1 if successful, zero otherwise + """ + + on_off_byte_array = integer_to_bytearray(on_off) + payload = on_off_byte_array + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, + message_id=MsgIds.MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST.value, + payload=payload) + + self.logger.debug("Setting DD Rinse Pump to {}".format(on_off)) + + # 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