Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r0d41ec2fd13ad36c344b6a8a7c2b88ef18e057b7 -r0bdafdb1821e164a8416ea4b47be946f13239b5a --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 0d41ec2fd13ad36c344b6a8a7c2b88ef18e057b7) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 0bdafdb1821e164a8416ea4b47be946f13239b5a) @@ -7,23 +7,24 @@ # # @file gen_dialysate.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.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 DDGenDialysate(AbstractSubSystem): """ Gen Dialysate @@ -59,6 +60,7 @@ self.targetQd = 0.0 self.dd_gen_dialysate_timestamp = 0 + @publish(["msg_id_dd_gen_dialysate_mode_data", "execution_state", "dialysate_delivery_in_progress", "d6_level", @@ -98,6 +100,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] self.dd_gen_dialysate_timestamp = timestamp + def cmd_gen_dialysate_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the gen dialysate data broadcast interval override command @@ -110,30 +113,16 @@ @return: 1 if successful, zero otherwise """ - if not check_broadcast_interval_override_ms(ms): - return False + return cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST, + module_name = 'DD Gen Dialysate', + logger = self.logger, + can_interface = self.can_interface) - 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_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override DD Gen Dialysate 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_dialysate_delivery_in_progress_override(self, in_progress: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dialysate delivery in progress override command @@ -148,27 +137,17 @@ inprog = integer_to_bytearray(in_progress) payload = reset_byte_array + inprog - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_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_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST, + entity_name = f'DD Dialysate Delivery in progress', + override_text = str(in_progress), + logger = self.logger, + can_interface = self.can_interface) - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(in_progress) - self.logger.debug("override dialysate delivery in progress to " + ": " + str_res) - # 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_dialysate_delivery_good_to_deliver_override(self, delivery: int, reset: int = NO_RESET) -> int: """ Constructs and sends the dialysate delivery good to deliver override command @@ -183,27 +162,17 @@ dev = integer_to_bytearray(delivery) payload = reset_byte_array + dev - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_DIAL_DELIVERY_GOOD_TO_DELIVER_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_DIAL_DELIVERY_GOOD_TO_DELIVER_OVERRIDE_REQUEST, + entity_name = f'DD Dialysate Delivery is good to deliver', + override_text = str(delivery), + logger = self.logger, + can_interface = self.can_interface) - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(delivery) - self.logger.debug("override dialysate good to delivery to " + ": " + str_res) - # 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_hydraulics_chamber_target_temperature_override(self, temperature: float, reset: int = NO_RESET) -> int: """ Constructs and sends the hydraulic fluid temperature override command @@ -218,27 +187,17 @@ tmp = float_to_bytearray(temperature) payload = reset_byte_array + tmp - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_HYD_CHAMBER_TARGET_TEMP_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_HYD_CHAMBER_TARGET_TEMP_OVERRIDE_REQUEST, + entity_name = f'DD Hydraulics Chamber target Temperature', + override_text = str(temperature), + logger = self.logger, + can_interface = self.can_interface) - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(temperature) - self.logger.debug("override hydraulic fluid temperature to " + ": " + str_res) - # 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_dialysate_delivery_set_state_override(self, state: int) -> int: """ Constructs and sends the set execution state override command @@ -252,23 +211,20 @@ sts = integer_to_bytearray(state) payload = sts - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_GEND_EXEC_STATE_OVERRIDE_REQUEST.value, - payload=payload) - # Send message - received_message = self.can_interface.send(message) + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_GEND_EXEC_STATE_OVERRIDE_REQUEST, + entity_name = f'DD Dialysate Delivery set state', + override_text = str(state), + logger = self.logger, + can_interface = self.can_interface) - # 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_stop_gen_mode_override(self, state: int, reset: int = NO_RESET) -> int: """ - Constructs and sends start pre gen mode override request + Constructs and sends stop gen mode override request @param state: int - value to override state @param reset: integer - 1 to reset a previous override, 0 to override @@ -280,18 +236,12 @@ interval_value = integer_to_bytearray(state) payload = reset_value + interval_value - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("Sending {} start pre gen mode override".format(state)) - # Send message - received_message = self.can_interface.send(message) - - # If there is content in message - if received_message is not None: - # Response payload is OK or not - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False \ No newline at end of file + return cmd_generic_override( + payload = payload, + reset = reset, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST, + entity_name = f'DD Dialysate Delivery pre gen mode', + override_text = str(state), + logger = self.logger, + can_interface = self.can_interface)