Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -r34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943 --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 34b64ff2d8a64f4b7b60b80bb7cf4c36845e5943) @@ -14,8 +14,6 @@ # ############################################################################ -import struct - # Project imports from .modules.alarms import DDAlarms from .modules.balancing_chamber import DDBalancingChamber @@ -45,7 +43,7 @@ from ..common.constants import NO_RESET from ..common import dd_enum_repository from ..common.generic_defs import DataTypes -from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions +from ..common.msg_defs import MsgIds, MsgFieldPositions from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from leahi_dialin.utils.abstract_classes import AbstractSubSystem @@ -192,8 +190,7 @@ msg_list.append(('self.dd_operation_sub_mode', DataTypes.U32)) self.process_into_vars(decoder_list = msg_list, - message = message) - + message = message) self.dd_op_mode_timestamp = timestamp @@ -225,8 +222,8 @@ self.logger.debug(f'DD VERSION: {self.dd_version}') if all([len(each) > 0 for each in [result['fpga_id'], result['fpga_major'], result['fpga_minor'], result['fpga_lab']]]): - self.dd_version = f"v{result['fpga_id']}.{result['fpga_major']}.{result['fpga_minor']}-{result['fpga_lab']}" - self.logger.debug(f'DD VERSION: {self.dd_version}') + self.dd_fpga_version = f"v{result['fpga_id']}.{result['fpga_major']}.{result['fpga_minor']}-{result['fpga_lab']}" + self.logger.debug(f'DD FPGA VERSION: {self.dd_fpga_version}') """ major = struct.unpack(DataTypes.U08.unpack_attrib(), bytearray( @@ -256,7 +253,6 @@ self.dd_fpga_version = f"v{fpga_id[0]}.{fpga_major[0]}.{fpga_minor[0]}-{fpga_lab[0]}" self.logger.debug(f"DD FPGA VERSION: {self.dd_fpga_version}") """ - self.dd_version_response_timestamp = timestamp