Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r410054cfec7aee839266233249413b08b368fbd3 --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 410054cfec7aee839266233249413b08b368fbd3) @@ -7,22 +7,22 @@ # # @file concentrate_pumps.py # -# @author (last) Micahel Garthwaite -# @date (last) 07-Mar-2023 +# @author (last) Zoltan Miskolci +# @date (last) 07-Jan-2026 # @author (original) Micahel Garthwaite # @date (original) 29-Oct-2020 # ############################################################################ + import struct -from enum import unique from logging import Logger -from .constants import RESET, NO_RESET +from leahi_dialin.common.constants import NO_RESET +from leahi_dialin.common.dd_defs import DDConcentratePumpsEnum, DDConcentratePumpAttributesEnum from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import DDConcentratePumpsEnum, DDConcentratePumpsStates, DDConcentratePumpAttributesEnum -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 @@ -85,6 +85,7 @@ self.dd_concentrate_pump_timestamp = 0.0 + @publish(["msg_id_dd_conc_pump_data", "dd_concentrate_pumps", "dd_concentrate_pump_timestamp"]) def _handler_concentrate_pumps_sync(self, message, timestamp=0.0): """ @@ -94,7 +95,6 @@ @param message: published concentrate pumps' data message @return: None """ - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0] self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.MEASURED_SPEED.name] = ( @@ -148,6 +148,7 @@ self.dd_concentrate_pump_timestamp = timestamp + def cmd_concentrate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the concentrate pump data broadcast interval override command @@ -160,31 +161,16 @@ @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_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'DD Concentrate 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_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override DD concentrate pump data broadcast 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_concentrate_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 @@ -194,29 +180,22 @@ @return: 1 if successful, zero otherwise """ - 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 - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_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_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST, + entity_name = f'DD {DDConcentratePumpsEnum(pump_id).name} Concentrate Pump target speed', + override_text = str(speed), + logger = self.logger, + can_interface = self.can_interface) - self.logger.debug("override concentrate pump target speed: " + str(speed) + " - for concentrate 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 - def cmd_concentrate_pump_measured_speed_override(self, pump_id: int, speed: float, reset: int = NO_RESET) -> int: """ Constructs and sends the concentrate pump measured speed override command @@ -227,32 +206,22 @@ @return: 1 if successful, zero otherwise """ - 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 - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_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_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST, + entity_name = f'DD {DDConcentratePumpsEnum(pump_id).name} Concentrate Pump measured speed', + override_text = str(speed), + logger = self.logger, + can_interface = self.can_interface) - if reset == RESET: - self.logger.debug("reset back to normal value for concentrate pump: " + str(pump_id)) - else: - self.logger.debug("override concentrate pump measured speed: " + str(speed) + " - for concentrate 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 - def cmd_concentrate_pump_parked_status_override(self, pump_id: int, status: int, reset: int = NO_RESET) -> int: """ Constructs and sends the concentrate pump parked state override command @@ -263,32 +232,22 @@ @return: 1 if successful, zero otherwise """ - reset_byte_array = integer_to_bytearray(reset) status_byte_array = integer_to_bytearray(status) pump_id_byte_array = integer_to_bytearray(pump_id) payload = reset_byte_array + status_byte_array + pump_id_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARKED_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_CONCENTRATE_PUMP_PARKED_OVERRIDE_REQUEST, + entity_name = f'DD {DDConcentratePumpsEnum(pump_id).name} Concentrate Pump parked status', + override_text = str(status), + logger = self.logger, + can_interface = self.can_interface) - if reset == RESET: - self.logger.debug("reset parked status back to normal for concentrate pump park status: " + str(pump_id)) - else: - self.logger.debug("override parked status to: " + str(status) + " - for concentrate 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 - def cmd_concentrate_pump_park_fault_state_override(self, pump_id: int, status: int, reset: int = NO_RESET) -> int: """ Constructs and sends the concentrate pump park fault state override command @@ -299,32 +258,22 @@ @return: 1 if successful, zero otherwise """ - reset_byte_array = integer_to_bytearray(reset) status_byte_array = integer_to_bytearray(status) pump_id_byte_array = integer_to_bytearray(pump_id) payload = reset_byte_array + status_byte_array + pump_id_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARK_FAULT_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_CONCENTRATE_PUMP_PARK_FAULT_OVERRIDE_REQUEST, + entity_name = f'DD {DDConcentratePumpsEnum(pump_id).name} Concentrate Pump parked fault state', + override_text = str(status), + logger = self.logger, + can_interface = self.can_interface) - if reset == RESET: - self.logger.debug("reset park fault status back to normal for concentrate pump park fault: " + str(pump_id)) - else: - self.logger.debug("override park fault status to: " + str(status) + " - for concentrate 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 - def cmd_concentrate_pump_park_command(self, pump_id: int) -> int: """ Constructs and sends the concentrate pump park command @@ -333,26 +282,19 @@ @return: 1 if successful, zero otherwise """ - payload = integer_to_bytearray(pump_id) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARK_REQUEST_OVERRIDE_REQUEST.value, - payload=payload) - self.logger.debug("park concentrate pump: " + str(pump_id)) + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARK_REQUEST_OVERRIDE_REQUEST, + entity_name = f'DD {DDConcentratePumpsEnum(pump_id).name} Concentrate Pump to zeroing', + override_text = 'Active', + logger = self.logger, + can_interface = self.can_interface) - # 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_concentrate_set_start_stop(self, pump_id: int, command: int, speed: float, volume: float ) -> int: """ Constructs and sends the concentrate pump start stop command @@ -364,26 +306,18 @@ @return: 1 if successful, zero otherwise """ - pmp = integer_to_bytearray(pump_id) cmd = integer_to_bytearray(command) spd = float_to_bytearray(speed) vlm = float_to_bytearray(volume) payload = pmp + cmd + spd + vlm - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("setting " + str(spd) + " - for concentrate 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 + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST, + entity_name = f'DD {DDConcentratePumpsEnum(pump_id).name} Concentrate Pump speed', + override_text = str(spd), + logger = self.logger, + can_interface = self.can_interface)