Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -r8359a016f75bc716effb3d37d770680b01b38790 -r1f2bf6d939eb4033dbedb7d7005494cc12fccbc6 --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 8359a016f75bc716effb3d37d770680b01b38790) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 1f2bf6d939eb4033dbedb7d7005494cc12fccbc6) @@ -7,101 +7,88 @@ # # @file concentrate_pumps.py # -# @author (last) Micahel Garthwaite -# @date (last) 07-Mar-2023 +# @author (last) Zoltan Miskolci +# @date (last) 04-May-2026 # @author (original) Micahel Garthwaite # @date (original) 29-Oct-2020 # ############################################################################ -import struct -from enum import unique + +# Module imports from logging import Logger -from .constants import RESET, 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 +# Project imports +from leahi_dialin.common.constants import NO_RESET +from leahi_dialin.common import dd_enum_repository +from leahi_dialin.common.generic_defs import DataTypes +from leahi_dialin.common.msg_defs import MsgIds +from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override +from leahi_dialin.protocols.CAN import CanMessenger, CanChannels +from leahi_dialin.utils.abstract_classes import AbstractSubSystem +from leahi_dialin.utils.base import publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray -@unique -class ConcentratePumpsEnum(DialinEnum): - D11_CP1_ACID = 0 - D10_CP2_BICARB = 1 - D76_UF = 2 - -@unique -class DDConcentratePumpsStates(DialinEnum): - CONCENTRATE_PUMP_OFF_STATE = 0 - CONCENTRATE_PUMP_RAMP_TO_TARGET_SPEED_STATE = 1 - CONCENTRATE_PUMP_CONTROL_TARGET_SPEED_STATE = 2 - - class DDConcentratePumps(AbstractSubSystem): """ Dialin API sub-class for concentrate pumps related commands. """ - def __init__(self, can_interface, logger: Logger): + def __init__(self, can_interface: CanMessenger, logger: Logger): """ - - @param can_interface: Denali Can Messenger object + @param can_interface: Can Messenger object """ super().__init__() self.can_interface = can_interface self.logger = logger if self.can_interface is not None: - channel_id = DenaliChannels.dd_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self._handler_concentrate_pumps_sync) + self.can_interface.register_receiving_publication_function(channel_id = CanChannels.dd_sync_broadcast_ch_id, + message_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_DATA.value, + function = self._handler_concentrate_pumps_sync) + self.dd_concentrate_pump_timestamp = 0.0 #: The timestamp of the last message - self.d10_current_state = 0 - self.d10_current_set_speed = 0.0 - self.d10_measured_speed = 0.0 - self.d10_target_speed = 0.0 - self.d10_pulse_us = 0.0 - self.d10_target_rev_count = 0 - self.d10_measured_rev_count = 0 - self.d10_parked = False - self.d10_park_fault = False + #: The Concentrate Pumps data in dictionary format + self.dd_concentrate_pumps = { + dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name: { + dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name: 0, + dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name: 0, + dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name: 0, + dd_enum_repository.DDConcentratePumpAttributes.PARKED.name: False, + dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name: False + }, + dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name: { + dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name: 0, + dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name: 0, + dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name: 0, + dd_enum_repository.DDConcentratePumpAttributes.PARKED.name: False, + dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name: False + }, + dd_enum_repository.DDConcentratePumpNames.D76_UF.name: { + dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name: 0, + dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name: 0.0, + dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name: 0, + dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name: 0, + dd_enum_repository.DDConcentratePumpAttributes.PARKED.name: None, # D76 doesn't utilize this attribute + dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name: None # D76 doesn't utilize this attribute + } + } - self.d11_current_state = 0 - self.d11_current_set_speed = 0.0 - self.d11_measured_speed = 0.0 - self.d11_target_speed = 0.0 - self.d11_pulse_us = 0.0 - self.d11_target_rev_count = 0 - self.d11_measured_rev_count = 0 - self.d11_parked = False - self.d11_park_fault = False - self.d76_current_state = 0 - self.d76_current_set_speed = 0.0 - self.d76_measured_speed = 0.0 - self.d76_target_speed = 0.0 - self.d76_pulse_us = 0.0 - self.d76_target_rev_count = 0 - self.d76_measured_rev_count = 0 - - self.dd_concentrate_pump_timestamp = 0.0 - - @publish(["dd_concentrate_pump_timestamp", - "d11_cp1_current_set_speed", "d11_cp1_measured_speed", "d11_cp1_target_speed", - "d10_cp2_current_set_speed", "d10_cp2_measured_speed", "d10_cp2_target_speed", - "d11_cp1_current_state", "d10_cp2_current_state", - "d11_cp1_target_rev_count", "d10_cp2_target_rev_count", - "d11_cp1_measured_rev_count", "d10_cp2_measured_rev_count", - "d11_cp1_parked", "d10_cp2_parked", - "d11_cp1_park_fault", "d10_cp2_park_fault", - "d76_current_state","d76_current_set_speed", - "d76_measured_speed","d76_target_speed", - "d76_pulse_us","d76_target_rev_count", - "d76_measured_rev_count"]) + @publish(["msg_id_dd_conc_pump_data", "dd_concentrate_pumps", "dd_concentrate_pump_timestamp"]) def _handler_concentrate_pumps_sync(self, message, timestamp=0.0): """ Handles published concentrate pumps' data messages. Concentrate pumps' speed data are captured @@ -110,60 +97,39 @@ @param message: published concentrate pumps' data message @return: None """ + sensor_list =[] + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.PARKED.name, DataTypes.BOOL)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.PARKED.name, DataTypes.BOOL)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name, DataTypes.BOOL)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name, dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name, DataTypes.BOOL)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name, DataTypes.F32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name, DataTypes.U32)) + sensor_list.append((dd_enum_repository.DDConcentratePumpNames.D76_UF.name, dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name, DataTypes.F32)) - self.d11_current_set_speed = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.d11_measured_speed = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.d10_current_set_speed = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.d10_cp2_measured_speed = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.d11_target_rev_count = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.d11_measured_rev_count = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.d10_target_rev_count = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.d10_measured_rev_count = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.d11_current_state = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.d10_current_state = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.d11_pulse_us = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.d10_pulse_us = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - self.d11_target_speed = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.d10_target_speed = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] - self.d11_parked = True if struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] == 1 else False - self.d10_parked = True if struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] == 1 else False - self.d11_park_fault = True if struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] == 1 else False - self.d10_park_fault = True if struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] == 1 else False - self.d76_target_speed = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] - self.d76_current_set_speed = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20]))[0] - self.d76_measured_speed = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_21:MsgFieldPositions.END_POS_FIELD_21]))[0] - self.d76_target_rev_count = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_22:MsgFieldPositions.END_POS_FIELD_22]))[0] - self.d76_measured_rev_count = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_23:MsgFieldPositions.END_POS_FIELD_23]))[0] - self.d76_current_state = struct.unpack('i', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_24:MsgFieldPositions.END_POS_FIELD_24]))[0] - self.d76_pulse_us = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_25:MsgFieldPositions.END_POS_FIELD_25]))[0] - + self.process_into_dict(dict_to_update = self.dd_concentrate_pumps, + decoder_list = sensor_list, + message = message) 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 @@ -174,65 +140,41 @@ @param ms: integer - interval (in ms) to override with @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 = CanChannels.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 @param pump_id: unsigned int - concentrate pump ID @param speed: float - target speed value to override concentrate pump with @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 = CanChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST, + entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(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 @@ -241,34 +183,23 @@ @param speed: float - measured speed value to override concentrate pump 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) 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 = CanChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST, + entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(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 @@ -277,34 +208,23 @@ @param status: unsigned int - 1 = parked, 0 = not parked @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) 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 = CanChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARKED_OVERRIDE_REQUEST, + entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(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 @@ -313,62 +233,43 @@ @param status: unsigned int - 1 = fault, 0 = no fault @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) 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 = CanChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARK_FAULT_OVERRIDE_REQUEST, + entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(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 @param pump_id: unsigned int - concentrate pump ID @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 = CanChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PARK_REQUEST_OVERRIDE_REQUEST, + entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(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 @@ -378,28 +279,19 @@ @param speed: float - ml/min to set the speed to @param volume: float - the volume to set to @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 = CanChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST, + entity_name = f'DD {dd_enum_repository.DDConcentratePumpNames(pump_id).name} Concentrate Pump speed', + override_text = str(spd), + logger = self.logger, + can_interface = self.can_interface)