Index: leahi_dialin/dd/modules/rinse_pump.py =================================================================== diff -u -r0a01371d0edb6d84a3b086ef229f38e080519530 -r410054cfec7aee839266233249413b08b368fbd3 --- leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision 0a01371d0edb6d84a3b086ef229f38e080519530) +++ leahi_dialin/dd/modules/rinse_pump.py (.../rinse_pump.py) (revision 410054cfec7aee839266233249413b08b368fbd3) @@ -7,22 +7,24 @@ # # @file rinse_pump.py # -# @author (last) Jonny Paguio -# @date (last) 13-Oct-2025 +# @author (last) Zoltan Miskolci +# @date (last) 07-Jan-2026 # @author (original) Jonny Paguio # @date (original) 13-Oct-2025 # ############################################################################ + import struct from logging import Logger -from .constants import RESET, NO_RESET +from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -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.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override +from leahi_dialin.protocols.CAN import DenaliChannels +from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray + class DDRinsePump(AbstractSubSystem): """ Rinse Pump @@ -51,6 +53,7 @@ self.d79_pump_rpm = 0 self.dd_rinse_pump_timestamp = 0 + @publish(["msg_id_dd_rinse_pump_data", "d79_state", "d79_pump_pwm", "d79_pump_rpm", "dd_rinse_pump_timestamp"]) @@ -61,7 +64,6 @@ @param message: published rinse pump data message @return: None """ - 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( @@ -71,6 +73,7 @@ self.dd_rinse_pump_timestamp = timestamp + def cmd_rinse_pump_data_publish_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the rinse pump data publish interval override command @@ -82,31 +85,16 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ + return cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'DD Rinse Pump', + logger = self.logger, + can_interface = self.can_interface) - if not check_broadcast_interval_override_ms(ms): - return False - reset_byte_array = integer_to_bytearray(reset) - ms_byte_array = integer_to_bytearray(ms) - payload = reset_byte_array + ms_byte_array - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override DD Rinse Pump data publish interval") - - # 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_pwm_percent_override(self, pwm_pct: float, reset: int = NO_RESET) -> int: """ Constructs and sends the rinse pump PWM override request @@ -118,28 +106,21 @@ @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) + return cmd_generic_override( + payload = payload, + reset = reset, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST, + entity_name = f'DD Rinse Pump PWM', + override_text = str(pwm_pct), + logger = self.logger, + can_interface = self.can_interface) + - 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 @@ -150,23 +131,15 @@ @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 + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST, + entity_name = f'DD Rinse Pump state', + override_text = 'On' if on_off == 1 else 'Off', + logger = self.logger, + can_interface = self.can_interface)