Index: leahi_dialin/dd/dialysate_delivery.py =================================================================== diff -u -r79697500614904bafb56f3d33e368b954ba78f7d -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision 79697500614904bafb56f3d33e368b954ba78f7d) +++ leahi_dialin/dd/dialysate_delivery.py (.../dialysate_delivery.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -41,7 +41,7 @@ from .proxies.td_proxy import TDProxy from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions -from ..common.dd_defs import DDOpModes +from ..common.dd_defs import dd_enum_repository from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from ..utils.base import AbstractSubSystem, publish, LogManager from ..utils.checks import check_broadcast_interval_override_ms @@ -105,7 +105,7 @@ self.dd_op_mode_timestamp = 0.0 self.dd_debug_events_timestamp = 0.0 self.dd_version_response_timestamp = 0.0 - self.dd_operation_mode = DDOpModes.MODE_INIT.value + self.dd_operation_mode = dd_enum_repository.DDOpModes.MODE_INIT.value self.dd_operation_sub_mode = 0 self.dd_logged_in = False self.dd_set_logged_in_status(False) Index: leahi_dialin/dd/modules/alarms.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/dd/modules/alarms.py (.../alarms.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -17,7 +17,7 @@ from logging import Logger from .constants import RESET, NO_RESET -from leahi_dialin.common.dd_defs import DDEventDataType +from leahi_dialin.common.dd_defs import dd_enum_repository 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 @@ -67,8 +67,8 @@ self.alarm_data_type = dict() # Loop through the list of the event data type enum and update the dictionary - for data_type in DDEventDataType: - event_data_type = DDEventDataType(data_type).name + for data_type in dd_enum_repository.DDEventDataTypes: + event_data_type = dd_enum_repository.DDEventDataTypes(data_type).name struct_unpack_type = None # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is @@ -96,13 +96,13 @@ data_typ_1 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) # Get the corresponding structure format - struct_data_type_1 = self.alarm_data_type[DDEventDataType(data_typ_1[0]).name] + struct_data_type_1 = self.alarm_data_type[dd_enum_repository.DDEventDataTypes(data_typ_1[0]).name] # Get the data value by unpacking the data type data_1 = struct.unpack(struct_data_type_1, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) data_typ_2 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) # Get the corresponding structure format - struct_data_type_2 = self.alarm_data_type[DDEventDataType(data_typ_2[0]).name] + struct_data_type_2 = self.alarm_data_type[dd_enum_repository.DDEventDataTypes(data_typ_2[0]).name] # Get the data value by unpacking the data type data_2 = struct.unpack(struct_data_type_2, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) Index: leahi_dialin/dd/modules/blood_leak.py =================================================================== diff -u -r776be9fb446685fb492a2b7bd6faf4eac7dfe714 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision 776be9fb446685fb492a2b7bd6faf4eac7dfe714) +++ leahi_dialin/dd/modules/blood_leak.py (.../blood_leak.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -5,7 +5,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import DDBloodLeakStates +from leahi_dialin.common.dd_defs import dd_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum from leahi_dialin.utils.conversions import integer_to_bytearray, bytearray_to_byte, bytearray_to_integer, \ @@ -60,7 +60,7 @@ self.dd_blood_leak_status_timestamp = 0.0 self.dd_blood_leak_emb_mode_response_timestamp = 0.0 self.blood_leak_status = self.NO_BLOOD_LEAK_DETECTED - self.blood_leak_state = DDBloodLeakStates.BLOOD_LEAK_INIT_STATE.value + self.blood_leak_state = dd_enum_repository.DDBloodLeakStates.BLOOD_LEAK_INIT_STATE.value self.blood_leak_emb_mode_cmds = dict() self.blood_leak_error_persistent_ctr = 0 self.blood_leak_serial_comm_state = 0 Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import DDConcentratePumpsEnum, DDConcentratePumpsStates, DDConcentratePumpAttributesEnum +from leahi_dialin.common.dd_defs import dd_enum_repository 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 @@ -48,38 +48,38 @@ self._handler_concentrate_pumps_sync) self.dd_concentrate_pumps = { - DDConcentratePumpsEnum.D10_CP2_BICARB.name: { - DDConcentratePumpAttributesEnum.CURRENT_STATE.name: 0, - DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name: 0.0, - DDConcentratePumpAttributesEnum.MEASURED_SPEED.name: 0.0, - DDConcentratePumpAttributesEnum.TARGET_SPEED.name: 0.0, - DDConcentratePumpAttributesEnum.PULSE_US.name: 0.0, - DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name: 0, - DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name: 0, - DDConcentratePumpAttributesEnum.PARKED.name: False, - DDConcentratePumpAttributesEnum.PARK_FAULT.name: False + 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 }, - DDConcentratePumpsEnum.D11_CP1_ACID.name: { - DDConcentratePumpAttributesEnum.CURRENT_STATE.name: 0, - DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name: 0.0, - DDConcentratePumpAttributesEnum.MEASURED_SPEED.name: 0.0, - DDConcentratePumpAttributesEnum.TARGET_SPEED.name: 0.0, - DDConcentratePumpAttributesEnum.PULSE_US.name: 0.0, - DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name: 0, - DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name: 0, - DDConcentratePumpAttributesEnum.PARKED.name: False, - DDConcentratePumpAttributesEnum.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 }, - DDConcentratePumpsEnum.D76_UF.name: { - DDConcentratePumpAttributesEnum.CURRENT_STATE.name: 0, - DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name: 0.0, - DDConcentratePumpAttributesEnum.MEASURED_SPEED.name: 0.0, - DDConcentratePumpAttributesEnum.TARGET_SPEED.name: 0.0, - DDConcentratePumpAttributesEnum.PULSE_US.name: 0.0, - DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name: 0, - DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name: 0, - DDConcentratePumpAttributesEnum.PARKED.name: None, # D76 doesn't utilize this attribute - DDConcentratePumpAttributesEnum.PARK_FAULT.name: None # D76 doesn't utilize this attribute + 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 } } @@ -95,55 +95,55 @@ @return: None """ - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.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] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.MEASURED_SPEED.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.CURRENT_STATE.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.CURRENT_STATE.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.PULSE_US.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.PULSE_US.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.TARGET_SPEED.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.TARGET_SPEED.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.PARKED.name] = \ + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.PARKED.name] = \ True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] == 1 else False - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.PARKED.name] = \ + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.PARKED.name] = \ True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] == 1 else False - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D11_CP1_ACID.name][DDConcentratePumpAttributesEnum.PARK_FAULT.name] = \ + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D11_CP1_ACID.name][dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name] = \ True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] == 1 else False - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D10_CP2_BICARB.name][DDConcentratePumpAttributesEnum.PARK_FAULT.name] = \ + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D10_CP2_BICARB.name][dd_enum_repository.DDConcentratePumpAttributes.PARK_FAULT.name] = \ True if struct.unpack('I', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] == 1 else False - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.TARGET_SPEED.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.CURRENT_SET_SPEED.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_SET_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.MEASURED_SPEED.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_21:MsgFieldPositions.END_POS_FIELD_21])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.TARGET_REV_COUNT.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.TARGET_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_22:MsgFieldPositions.END_POS_FIELD_22])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.MEASURED_REV_COUNT.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.MEASURED_REV_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_23:MsgFieldPositions.END_POS_FIELD_23])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.CURRENT_STATE.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.CURRENT_STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_24:MsgFieldPositions.END_POS_FIELD_24])))[0] - self.dd_concentrate_pumps[DDConcentratePumpsEnum.D76_UF.name][DDConcentratePumpAttributesEnum.PULSE_US.name] = ( + self.dd_concentrate_pumps[dd_enum_repository.DDConcentratePumpNames.D76_UF.name][dd_enum_repository.DDConcentratePumpAttributes.PULSE_US.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_25:MsgFieldPositions.END_POS_FIELD_25])))[0] self.dd_concentrate_pump_timestamp = timestamp Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -r7c0309a22098e7c4b0ef1599fc737f6f8929b9ac -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 7c0309a22098e7c4b0ef1599fc737f6f8929b9ac) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -15,11 +15,11 @@ ############################################################################ import struct from logging import Logger -from enum import unique from .constants import RESET, NO_RESET +from leahi_dialin.common.dd_defs import dd_enum_repository +from leahi_dialin.common.global_vars import GlobalVariables from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import DDConductivitySensorsEnum 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 @@ -50,12 +50,14 @@ self._handler_conductivity_sensors_sync) self.dd_conductivity = { - DDConductivitySensorsEnum.D17_COND.name: 0.0, - DDConductivitySensorsEnum.D27_COND.name: 0.0, - DDConductivitySensorsEnum.D29_COND.name: 0.0, - DDConductivitySensorsEnum.D43_COND.name: 0.0, - DDConductivitySensorsEnum.D74_COND.name: 0.0 + dd_enum_repository.DDConductivitySensorNames.D17_COND.name: 0.0, + dd_enum_repository.DDConductivitySensorNames.D27_COND.name: 0.0, + dd_enum_repository.DDConductivitySensorNames.D29_COND.name: 0.0, + dd_enum_repository.DDConductivitySensorNames.D43_COND.name: 0.0, + dd_enum_repository.DDConductivitySensorNames.D74_COND.name: 0.0 } + if GlobalVariables.NEXT_GEN_HW: + self.fp_temperatures[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = 0.0 self.dd_conductivity_timestamp = 0.0 @@ -69,21 +71,25 @@ @return: None """ - self.dd_conductivity[DDConductivitySensorsEnum.D17_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D17_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.dd_conductivity[DDConductivitySensorsEnum.D27_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D27_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.dd_conductivity[DDConductivitySensorsEnum.D29_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D29_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.dd_conductivity[DDConductivitySensorsEnum.D43_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D43_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.dd_conductivity[DDConductivitySensorsEnum.D74_COND.name] = struct.unpack('f', bytearray( + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D74_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + if GlobalVariables.NEXT_GEN_HW: + self.dd_conductivity[dd_enum_repository.DDConductivitySensorNames.D98_COND.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] + self.dd_conductivity_timestamp = timestamp def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: @@ -155,7 +161,7 @@ str_res = "reset back to normal" else: str_res = str(conductivity) + " microsiemens/cm" - self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum(sensor_index).name + self.logger.debug("override conductivity sensor value for sensor " + dd_enum_repository.DDConductivitySensorNames(sensor_index).name + ": " + str_res) # Send message @@ -196,7 +202,7 @@ str_res = "reset back to normal" else: str_res = str(counter) - self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum[str(sensor_index)].name + self.logger.debug("override conductivity sensor value for sensor " + dd_enum_repository.DDConductivitySensorNames[str(sensor_index)].name + ": " + str_res) # Send message @@ -234,7 +240,7 @@ str_res = "reset back to normal" else: str_res = str(counter) - self.logger.debug("override conductivity sensor value for sensor " + DDConductivitySensorsEnum[str(sensor_index)].name + self.logger.debug("override conductivity sensor value for sensor " + dd_enum_repository.DDConductivitySensorNames[str(sensor_index)].name + ": " + str_res) # Send message Index: leahi_dialin/dd/modules/dialysate_pump.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import DDDialysatePumpsEnum, DDDialysatePumpAttributesEnum, DDDialysatePumpsStates +from leahi_dialin.common.dd_defs import dd_enum_repository 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 @@ -50,29 +50,29 @@ self._handler_dialysate_pumps_sync) self.dd_dialysate_pumps = { - DDDialysatePumpsEnum.D12_PUMP.name: { - DDDialysatePumpAttributesEnum.TARGET_RPM.name: 0.0, - DDDialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0, - DDDialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0, - DDDialysatePumpAttributesEnum.STATE.name: 0.0, - DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0, - DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0, - DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0, - DDDialysatePumpAttributesEnum.CONTROL.name: 0.0, - DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0, - DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0 + dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name: { + dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.STATE.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name: 0.0 }, - DDDialysatePumpsEnum.D48_PUMP.name: { - DDDialysatePumpAttributesEnum.TARGET_RPM.name: 0.0, - DDDialysatePumpAttributesEnum.MEASURED_SPEED.name: 0.0, - DDDialysatePumpAttributesEnum.CURRENT_SPEED.name: 0.0, - DDDialysatePumpAttributesEnum.STATE.name: 0.0, - DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name: 0.0, - DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name: 0.0, - DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name: 0.0, - DDDialysatePumpAttributesEnum.CONTROL.name: 0.0, - DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name: 0.0, - DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name: 0.0 + dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name: { + dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.STATE.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name: 0.0, + dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name: 0.0 } } @@ -88,54 +88,54 @@ @return: None """ - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_RPM.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_RPM.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.TARGET_RPM.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_SPEED.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_SPEED.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.MEASURED_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.CURRENT_SPEED.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.CURRENT_SPEED.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.CURRENT_SPEED.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.STATE.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.STATE.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.TARGET_PRESSURE.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.TARGET_PRESSURE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_PRESSURE.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.MEASURED_PRESSURE.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_CURRENT.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.MEASURED_CURRENT.name] = ( struct.unpack('f', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.CONTROL.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.CONTROL.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.CONTROL.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.DIRECTION_ERROR_COUNT.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.DIRECTION_ERROR_COUNT.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D12_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19])))[0] - self.dd_dialysate_pumps[DDDialysatePumpsEnum.D48_PUMP.name][DDDialysatePumpAttributesEnum.MEASURED_DIRECTION.name] = ( + self.dd_dialysate_pumps[dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name][dd_enum_repository.DDDialysatePumpAttributes.MEASURED_DIRECTION.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20])))[0] self.dd_dialysate_pump_timestamp = timestamp Index: leahi_dialin/dd/modules/events.py =================================================================== diff -u -r7d9d004527efeccb91958b440abdff08c2c52648 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/modules/events.py (.../events.py) (revision 7d9d004527efeccb91958b440abdff08c2c52648) +++ leahi_dialin/dd/modules/events.py (.../events.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -16,7 +16,7 @@ import struct from logging import Logger -from leahi_dialin.common import * +from leahi_dialin.common.dd_defs import dd_enum_repository from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish @@ -59,26 +59,26 @@ self._dd_event_data_type = dict() # Dictionary of the mode as key and the sub mode states enum class as the value - self._dd_op_mode_2_sub_mode = {DDOpModes.MODE_FAUL.name: DDFaultStates, - DDOpModes.MODE_SERV.name: DDServiceModesStates, - DDOpModes.MODE_INIT.name: DDInitStates, - DDOpModes.MODE_STAN.name: DDStandByModeStates, - DDOpModes.MODE_PREG.name: DDPreGenDialysateStates, - DDOpModes.MODE_GEND.name: DDGenDialysateModeStates, - DDOpModes.MODE_POSG.name: DDPostGenDialysateState, - DDOpModes.MODE_HEAT.name: DDHeatersState, - DDOpModes.MODE_HCOL.name: DDHeatersCoolingStates, - DDOpModes.MODE_ROPS.name: DDROPermeateStates, - DDOpModes.MODE_NLEG.name: DDNotLegalStates} + self._dd_op_mode_2_sub_mode = {dd_enum_repository.DDOpModes.MODE_FAUL.name: dd_enum_repository.DDFaultStates, + dd_enum_repository.DDOpModes.MODE_SERV.name: dd_enum_repository.DDServiceModesStates, + dd_enum_repository.DDOpModes.MODE_INIT.name: dd_enum_repository.DDInitStates, + dd_enum_repository.DDOpModes.MODE_STAN.name: dd_enum_repository.DDStandByModeStates, + dd_enum_repository.DDOpModes.MODE_PREG.name: dd_enum_repository.DDPreGenDialysateStates, + dd_enum_repository.DDOpModes.MODE_GEND.name: dd_enum_repository.DDGenDialysateModeStates, + dd_enum_repository.DDOpModes.MODE_POSG.name: dd_enum_repository.DDPostGenDialysateState, + dd_enum_repository.DDOpModes.MODE_HEAT.name: dd_enum_repository.DDHeatersState, + dd_enum_repository.DDOpModes.MODE_HCOL.name: dd_enum_repository.DDHeatersCoolingStates, + dd_enum_repository.DDOpModes.MODE_ROPS.name: dd_enum_repository.DDROPermeateStates, + dd_enum_repository.DDOpModes.MODE_NLEG.name: dd_enum_repository.DDNotLegalStates} # Loop through the list of the DD events enums and initial the event dictionary. Each event is a key in the # dictionary and the value is a list. - for event in DDEventList: - self._dd_event_dictionary[DDEventList(event).name] = [] + for event in dd_enum_repository.DDEventList: + self._dd_event_dictionary[dd_enum_repository.DDEventList(event).name] = [] # Loop through the list of the event data type enum and update the dictionary - for data_type in DDEventDataType: - event_data_type = DDEventDataType(data_type).name + for data_type in dd_enum_repository.DDEventDataTypes: + event_data_type = dd_enum_repository.DDEventDataTypes(data_type).name struct_unpack_type = None # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is @@ -101,14 +101,14 @@ @returns the requested DD event number """ - list_length = len(self._dd_event_dictionary[DDEventList(event_id).name]) + list_length = len(self._dd_event_dictionary[dd_enum_repository.DDEventList(event_id).name]) if list_length == 0: event = [] elif event_number > list_length: - event = self._dd_event_dictionary[DDEventList(event_id).name][list_length - 1] + event = self._dd_event_dictionary[dd_enum_repository.DDEventList(event_id).name][list_length - 1] else: - event = self._dd_event_dictionary[DDEventList(event_id).name][list_length - event_number - 1] + event = self._dd_event_dictionary[dd_enum_repository.DDEventList(event_id).name][list_length - event_number - 1] return event @@ -133,18 +133,18 @@ list_of_events = [] # If there are not enough event lists send all the events that are available - if len(self._dd_event_dictionary[DDEventList(event_id).name]) <= number_of_events: - list_of_events = self._dd_event_dictionary[DDEventList(event_id).name] + if len(self._dd_event_dictionary[dd_enum_repository.DDEventList(event_id).name]) <= number_of_events: + list_of_events = self._dd_event_dictionary[dd_enum_repository.DDEventList(event_id).name] else: # Get the all the events - complete_list = self._dd_event_dictionary[DDEventList(event_id).name] + complete_list = self._dd_event_dictionary[dd_enum_repository.DDEventList(event_id).name] # Since the last are located at the end of the list, iterate backwards for the defined # event messages for i in range(len(complete_list) - 1, len(complete_list) - number_of_events - 1, -1): list_of_events.append(complete_list[i]) if number_of_events == 0: - list_of_events = self._dd_event_dictionary[DDEventList(event_id).name] + list_of_events = self._dd_event_dictionary[dd_enum_repository.DDEventList(event_id).name] return list_of_events @@ -166,11 +166,11 @@ event_id = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - if event_id == DDEventList.DD_EVENT_OPERATION_STATUS.value: + if event_id == dd_enum_repository.DDEventList.DD_EVENT_OPERATION_STATUS.value: # Get the data type event_data_type_1 = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - struct_data_type = self._dd_event_data_type[DDEventDataType(event_data_type_1).name] + struct_data_type = self._dd_event_data_type[dd_enum_repository.DDEventDataTypes(event_data_type_1).name] op_mode = struct.unpack(' int: Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r6e0b0571d3f4064c8d7bb2b737e326c460780759 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 6e0b0571d3f4064c8d7bb2b737e326c460780759) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -19,7 +19,7 @@ from .constants import NO_RESET, RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import COND_SENSOR_INDEX_OFFSET, PRES_SENSOR_INDEX_OFFSET, DDTemperaturesNames +from leahi_dialin.common.dd_defs import dd_enum_repository 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 @@ -39,24 +39,24 @@ # Dictionary of the temperature sensors self.dd_temperatures_timestamp = 0.0 self.dd_temperatures = { - DDTemperaturesNames.D1_TEMP.name: 0.0, - DDTemperaturesNames.D78_TEMP.name: 0.0, - DDTemperaturesNames.D4_TEMP.name: 0.0, - DDTemperaturesNames.D50_TEMP.name: 0.0, - DDTemperaturesNames.BRD_TEMP.name: 0.0, - DDTemperaturesNames.D16_TEMP.name: 0.0, - DDTemperaturesNames.D28_TEMP.name: 0.0, - DDTemperaturesNames.D30_TEMP.name: 0.0, - DDTemperaturesNames.D44_TEMP.name: 0.0, - DDTemperaturesNames.D75_TEMP.name: 0.0, - DDTemperaturesNames.D4_AVG_TEMP.name: 0.0, - DDTemperaturesNames.D50_AVG_TEMP.name: 0.0, - DDTemperaturesNames.D28_AVG_TEMP.name: 0.0, - DDTemperaturesNames.D30_AVG_TEMP.name: 0.0, - DDTemperaturesNames.D66_TEMP.name: 0.0, - DDTemperaturesNames.D51_TEMP.name: 0.0, - DDTemperaturesNames.D18_TEMP.name: 0.0, - DDTemperaturesNames.D41_TEMP.name: 0.0 + dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D4_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D50_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D16_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D28_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D30_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D44_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D75_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name: 0.0, + dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0 } if self.can_interface is not None: @@ -73,61 +73,61 @@ @param message: published DD temperature sensors data message @returns none """ - self.dd_temperatures[DDTemperaturesNames.D1_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.dd_temperatures[DDTemperaturesNames.D78_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.dd_temperatures[DDTemperaturesNames.D4_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D4_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.dd_temperatures[DDTemperaturesNames.D50_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D50_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.dd_temperatures[DDTemperaturesNames.BRD_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.dd_temperatures[DDTemperaturesNames.D16_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D16_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.dd_temperatures[DDTemperaturesNames.D28_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D28_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.dd_temperatures[DDTemperaturesNames.D30_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D30_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.dd_temperatures[DDTemperaturesNames.D44_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D44_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.dd_temperatures[DDTemperaturesNames.D75_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D75_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.dd_temperatures[DDTemperaturesNames.D4_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] - self.dd_temperatures[DDTemperaturesNames.D50_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0] - self.dd_temperatures[DDTemperaturesNames.D28_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.dd_temperatures[DDTemperaturesNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] - self.dd_temperatures[DDTemperaturesNames.D9_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D9_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] - self.dd_temperatures[DDTemperaturesNames.D66_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] - self.dd_temperatures[DDTemperaturesNames.D51_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0] - self.dd_temperatures[DDTemperaturesNames.D18_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0] - self.dd_temperatures[DDTemperaturesNames.D41_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0] self.dd_temperatures_timestamp = timestamp @@ -184,16 +184,16 @@ value = float_to_bytearray(sensor_value) # DD Conductivity Sensors' Temperature Reading Override - if DDTemperaturesNames.D16_TEMP.value <= sensor_index <= DDTemperaturesNames.D75_TEMP.value: - index = integer_to_bytearray((sensor_index - COND_SENSOR_INDEX_OFFSET)) + if dd_enum_repository.DDTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_CONDUCTIVITY_SENSOR.value: + index = integer_to_bytearray((sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value)) payload = rst + value + index message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST.value, payload=payload) # DD Pressure Sensors' Temperature Reading Override - elif DDTemperaturesNames.D9_TEMP.value <= sensor_index < DDTemperaturesNames.NUM_OF_TEMP_SENSORS.value: - index = integer_to_bytearray((sensor_index - PRES_SENSOR_INDEX_OFFSET)) + elif dd_enum_repository.DDTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_PRESSURE_SENSOR.value: + index = integer_to_bytearray((sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value)) payload = rst + value + index message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST.value, @@ -207,7 +207,7 @@ message_id=MsgIds.MSG_ID_DD_TEMPERATURE_SENSOR_MEASURED_TEMPERATURE_OVERRIDE_REQUEST.value, payload=payload) - self.logger.debug("Setting sensor {} to {} C".format(DDTemperaturesNames(sensor_index).name, sensor_value)) + self.logger.debug("Setting sensor {} to {} C".format(dd_enum_repository.DDTemperatureSensorNames(sensor_index).name, sensor_value)) # Send message received_message = self.can_interface.send(message) @@ -327,15 +327,15 @@ Constraints: Must be logged into DD. - @param sensor: unsigned int - sensor ID, use the index of DDTemperaturesNames + @param sensor: unsigned int - sensor ID, use the index of dd_enum_repository.DDTemperatureSensorNames @param temperature: float - temperature to override the sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ rst = integer_to_bytearray(reset) tmp = float_to_bytearray(temperature) - idx = integer_to_bytearray(sensor - PRES_SENSOR_INDEX_OFFSET) + idx = integer_to_bytearray(sensor - dd_enum_repository.DDTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value) payload = rst + tmp + idx message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -rfa63b92d3d3a3f2870833583bff12729e180e2d1 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision fa63b92d3d3a3f2870833583bff12729e180e2d1) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -21,7 +21,7 @@ from .constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds -from leahi_dialin.common.dd_defs import DDValveStates, DDValveNames +from leahi_dialin.common.dd_defs import dd_enum_repository 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 @@ -65,46 +65,46 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_valves_states_data, self._handler_valves_sync) self.valve_states_all = 0x00000000 - self.d14_valv = {"id": DDValveNames.D14_VALV.value, "state": DEENERGIZED} - self.d52_valv = {"id": DDValveNames.D52_VALV.value, "state": DEENERGIZED} - self.d8_valv = {"id": DDValveNames.D8_VALV.value, "state": DEENERGIZED} - self.d54_valv = {"id": DDValveNames.D54_VALV.value, "state": DEENERGIZED} - self.d53_valv = {"id": DDValveNames.D53_VALV.value, "state": DEENERGIZED} - self.d34_valv = {"id": DDValveNames.D34_VALV.value, "state": DEENERGIZED} - self.d64_valv = {"id": DDValveNames.D64_VALV.value, "state": DEENERGIZED} - self.d31_valv = {"id": DDValveNames.D31_VALV.value, "state": DEENERGIZED} - self.d65_valv = {"id": DDValveNames.D65_VALV.value, "state": DEENERGIZED} - self.d35_valv = {"id": DDValveNames.D35_VALV.value, "state": DEENERGIZED} - self.d40_valv = {"id": DDValveNames.D40_VALV.value, "state": DEENERGIZED} - self.d47_valv = {"id": DDValveNames.D47_VALV.value, "state": DEENERGIZED} - self.d3_valv = {"id": DDValveNames.D3_VALV.value, "state": DEENERGIZED} - self.d80_valv = {"id": DDValveNames.D80_VALV.value, "state": DEENERGIZED} - self.d81_valv = {"id": DDValveNames.D81_VALV.value, "state": DEENERGIZED} - self.rsvrd1 = {"id": DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} + self.d14_valv = {"id": dd_enum_repository.DDValveNames.D14_VALV.value, "state": DEENERGIZED} + self.d52_valv = {"id": dd_enum_repository.DDValveNames.D52_VALV.value, "state": DEENERGIZED} + self.d8_valv = {"id": dd_enum_repository.DDValveNames.D8_VALV.value, "state": DEENERGIZED} + self.d54_valv = {"id": dd_enum_repository.DDValveNames.D54_VALV.value, "state": DEENERGIZED} + self.d53_valv = {"id": dd_enum_repository.DDValveNames.D53_VALV.value, "state": DEENERGIZED} + self.d34_valv = {"id": dd_enum_repository.DDValveNames.D34_VALV.value, "state": DEENERGIZED} + self.d64_valv = {"id": dd_enum_repository.DDValveNames.D64_VALV.value, "state": DEENERGIZED} + self.d31_valv = {"id": dd_enum_repository.DDValveNames.D31_VALV.value, "state": DEENERGIZED} + self.d65_valv = {"id": dd_enum_repository.DDValveNames.D65_VALV.value, "state": DEENERGIZED} + self.d35_valv = {"id": dd_enum_repository.DDValveNames.D35_VALV.value, "state": DEENERGIZED} + self.d40_valv = {"id": dd_enum_repository.DDValveNames.D40_VALV.value, "state": DEENERGIZED} + self.d47_valv = {"id": dd_enum_repository.DDValveNames.D47_VALV.value, "state": DEENERGIZED} + self.d3_valv = {"id": dd_enum_repository.DDValveNames.D3_VALV.value, "state": DEENERGIZED} + self.d80_valv = {"id": dd_enum_repository.DDValveNames.D80_VALV.value, "state": DEENERGIZED} + self.d81_valv = {"id": dd_enum_repository.DDValveNames.D81_VALV.value, "state": DEENERGIZED} + self.rsvrd1 = {"id": dd_enum_repository.DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} - self.d23_valv = {"id": DDValveNames.D23_VALV.value, "state": DEENERGIZED} - self.d19_valv = {"id": DDValveNames.D19_VALV.value, "state": DEENERGIZED} - self.d25_valv = {"id": DDValveNames.D25_VALV.value, "state": DEENERGIZED} - self.d21_valv = {"id": DDValveNames.D26_VALV.value, "state": DEENERGIZED} - self.d24_valv = {"id": DDValveNames.D24_VALV.value, "state": DEENERGIZED} - self.d20_valv = {"id": DDValveNames.D20_VALV.value, "state": DEENERGIZED} - self.d26_valv = {"id": DDValveNames.D21_VALV.value, "state": DEENERGIZED} - self.d22_valv = {"id": DDValveNames.D22_VALV.value, "state": DEENERGIZED} + self.d23_valv = {"id": dd_enum_repository.DDValveNames.D23_VALV.value, "state": DEENERGIZED} + self.d19_valv = {"id": dd_enum_repository.DDValveNames.D19_VALV.value, "state": DEENERGIZED} + self.d25_valv = {"id": dd_enum_repository.DDValveNames.D25_VALV.value, "state": DEENERGIZED} + self.d21_valv = {"id": dd_enum_repository.DDValveNames.D26_VALV.value, "state": DEENERGIZED} + self.d24_valv = {"id": dd_enum_repository.DDValveNames.D24_VALV.value, "state": DEENERGIZED} + self.d20_valv = {"id": dd_enum_repository.DDValveNames.D20_VALV.value, "state": DEENERGIZED} + self.d26_valv = {"id": dd_enum_repository.DDValveNames.D21_VALV.value, "state": DEENERGIZED} + self.d22_valv = {"id": dd_enum_repository.DDValveNames.D22_VALV.value, "state": DEENERGIZED} - self.d79_pmp_valv = {"id": DDValveNames.D79_PMP_VALV.value, "state": DEENERGIZED} - self.spare1_valv = {"id": DDValveNames.SPARE1_VALV.value, "state": DEENERGIZED} - self.spare2_valv = {"id": DDValveNames.SPARE2_VALV.value, "state": DEENERGIZED} - self.spare3_valv = {"id": DDValveNames.SPARE3_VALV.value, "state": DEENERGIZED} - self.spare4_valv = {"id": DDValveNames.SPARE4_VALV.value, "state": DEENERGIZED} - self.spare5_valv = {"id": DDValveNames.SPARE5_VALV.value, "state": DEENERGIZED} - self.spare6_valv = {"id": DDValveNames.SPARE6_VALV.value, "state": DEENERGIZED} - self.spare7_valv = {"id": DDValveNames.SPARE7_VALV.value, "state": DEENERGIZED} + self.d79_pmp_valv = {"id": dd_enum_repository.DDValveNames.D79_PMP_VALV.value, "state": DEENERGIZED} + self.d83_valv = {"id": dd_enum_repository.DDValveNames.D83_VALV.value, "state": DEENERGIZED} + self.d91_valv = {"id": dd_enum_repository.DDValveNames.D91_VALV.value, "state": DEENERGIZED} + self.spare3_valv = {"id": dd_enum_repository.DDValveNames.SPARE3_VALV.value, "state": DEENERGIZED} + self.spare4_valv = {"id": dd_enum_repository.DDValveNames.SPARE4_VALV.value, "state": DEENERGIZED} + self.spare5_valv = {"id": dd_enum_repository.DDValveNames.SPARE5_VALV.value, "state": DEENERGIZED} + self.d100_valv = {"id": dd_enum_repository.DDValveNames.D100_VALV.value, "state": DEENERGIZED} + self.spare7_valv = {"id": dd_enum_repository.DDValveNames.SPARE7_VALV.value, "state": DEENERGIZED} # NOTE: The len function counts the enums with the same number only once. This is not the case in the DD valves # class because each valve must have a unique ID. - self.valve_states_enum = [0 for _ in range(len(DDValveNames))] + self.valve_states_enum = [0 for _ in range(len(dd_enum_repository.DDValveNames))] - for valve in DDValveNames.__members__: + for valve in dd_enum_repository.DDValveNames.__members__: self.valves_sensed_states[valve] = '' def get_valve_states(self): @@ -141,12 +141,12 @@ self.d22_valv.get("state", None), self.d79_pmp_valv.get("state", None), - self.spare1_valv.get("state", None), - self.spare2_valv.get("state", None), + self.d83_valv.get("state", None), + self.d91_valv.get("state", None), self.spare3_valv.get("state", None), self.spare4_valv.get("state", None), self.spare5_valv.get("state", None), - self.spare6_valv.get("state", None), + self.d100_valv.get("state", None), self.spare7_valv.get("state", None) ] @@ -208,11 +208,11 @@ "d22_valv", "d79_pmp_valv", "spare1_valv", - "spare2_valv", + "d91_valv", "spare3_valv", "spare4_valv", "spare5_valv", - "spare6_valv", + "d100_valv", "spare7_valv", "valve_states_enum", "valves_sensed_states", @@ -261,18 +261,18 @@ spv = struct.unpack('B', bytearray(message['message'][self.START_POS_SPARE_VALVES_STATES:self.END_POS_SPARE_VALVES_STATES])) self.d79_pmp_valv["state"] = self._binary_to_valve_state(bcv[0] & 1) self.spare1_valv["state"] = self._binary_to_valve_state(bcv[0] & 2) - self.spare2_valv["state"] = self._binary_to_valve_state(bcv[0] & 4) + self.d91_valv["state"] = self._binary_to_valve_state(bcv[0] & 4) self.spare3_valv["state"] = self._binary_to_valve_state(bcv[0] & 8) self.spare4_valv["state"] = self._binary_to_valve_state(bcv[0] & 16) self.spare5_valv["state"] = self._binary_to_valve_state(bcv[0] & 32) - self.spare6_valv["state"] = self._binary_to_valve_state(bcv[0] & 64) + self.d100_valv["state"] = self._binary_to_valve_state(bcv[0] & 64) self.spare7_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) start = self.END_POS_SPARE_VALVES_STATES end = start + 1 for valve_id in self.valves_sensed_states: valve_state_number = struct.unpack('B', bytearray(message['message'][start:end]))[0] - self.valves_sensed_states[valve_id] = DDValveNames(valve_state_number).name + self.valves_sensed_states[valve_id] = dd_enum_repository.DDValveNames(valve_state_number).name start = end end += 1 Index: leahi_dialin/dd/modules/voltages.py =================================================================== diff -u -r7ce778dc51b7dba5a7a7ca14244ed7eea7bf029d -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 7ce778dc51b7dba5a7a7ca14244ed7eea7bf029d) +++ leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -22,7 +22,7 @@ from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray from leahi_dialin.utils.checks import check_broadcast_interval_override_ms from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.dd_defs import DDMonitoredVoltages +from leahi_dialin.common.dd_defs import dd_enum_repository class DDVoltages(AbstractSubSystem): @@ -44,7 +44,7 @@ self.msg_id_dd_voltages_data = MsgIds.MSG_ID_DD_VOLTAGES_DATA.value self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_dd_voltages_data, self._handler_monitored_voltages_sync) - self.monitored_voltages = [0.0] * DDMonitoredVoltages.NUM_OF_MONITORED_VOLTAGE_LINES.value + self.monitored_voltages = [0.0] * dd_enum_repository.DDMonitoredVoltages.NUM_OF_MONITORED_VOLTAGE_LINES.value self.dd_voltages_timestamp = 0.0 @@ -75,14 +75,14 @@ vfp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) - self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_1_2V.value] = v12[0] - self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_3_3V.value] = v33[0] - self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value] = v5l[0] - self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_24V_1.value] = v24_1[0] - self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_24V_2.value] = v24_2[0] - self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.value] = vfc[0] - self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.value] = vfa[0] - self.monitored_voltages[DDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.value] = vfp[0] + self.monitored_voltages[dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_1_2V.value] = v12[0] + self.monitored_voltages[dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_3_3V.value] = v33[0] + self.monitored_voltages[dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value] = v5l[0] + self.monitored_voltages[dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_24V_1.value] = v24_1[0] + self.monitored_voltages[dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_24V_2.value] = v24_2[0] + self.monitored_voltages[dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.value] = vfc[0] + self.monitored_voltages[dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.value] = vfa[0] + self.monitored_voltages[dd_enum_repository.DDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.value] = vfp[0] self.dd_voltages_timestamp = timestamp @@ -91,7 +91,7 @@ Constructs and sends the DD monitored voltage override command Constraints: Must be logged into DD. - Given signal must be valid member of DDMonitoredVoltages enum + Given signal must be valid member of dd_enum_repository.DDMonitoredVoltages enum @param signal: integer - ID of signal to override @param volts: float - value (in volts) to override signal with Index: leahi_dialin/td/modules/air_pump.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDAirPumpNames, TDAirPumpAttributes +from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -49,9 +49,9 @@ self._handler_air_pump_sync) self.td_air_pump = { - TDAirPumpNames.H12_AIR_PUMP.name: { - TDAirPumpAttributes.STATE.name: 0, - TDAirPumpAttributes.POWER.name: 0 + td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name: { + td_enum_repository.TDAirPumpAttributes.STATE.name: 0, + td_enum_repository.TDAirPumpAttributes.POWER.name: 0 } } @@ -70,8 +70,8 @@ app = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) - self.td_air_pump[TDAirPumpNames.H12_AIR_PUMP.name][TDAirPumpAttributes.STATE.name] = aps[0] - self.td_air_pump[TDAirPumpNames.H12_AIR_PUMP.name][TDAirPumpAttributes.POWER.name] = app[0] + self.td_air_pump[td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name][td_enum_repository.TDAirPumpAttributes.STATE.name] = aps[0] + self.td_air_pump[td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name][td_enum_repository.TDAirPumpAttributes.POWER.name] = app[0] self.td_air_pump_timestamp = timestamp def cmd_air_pump_set_state(self, state: int, power: int) -> int: Index: leahi_dialin/td/modules/air_trap.py =================================================================== diff -u -r43fec7787f9a4115d19deeb5cbc1d7bbf23134fe -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 43fec7787f9a4115d19deeb5cbc1d7bbf23134fe) +++ leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -19,7 +19,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDAirTrapValves, TDAirTrapLevelSensors, TDAirTrapLevelSensorsAttributes, TDAirTrapState +from leahi_dialin.common.td_defs import td_enum_repository 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 @@ -53,18 +53,18 @@ self._handler_air_trap_sync) self.air_trap_level_sensors = { - TDAirTrapLevelSensors.H17_LEVEL.name: { - TDAirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL, - TDAirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL + td_enum_repository.TDAirTrapLevelSensorNames.H17_LEVEL.name: { + td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL, + td_enum_repository.TDAirTrapLevelSensorAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL }, - TDAirTrapLevelSensors.H16_LEVEL.name: { - TDAirTrapLevelSensorsAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL, - TDAirTrapLevelSensorsAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL + td_enum_repository.TDAirTrapLevelSensorNames.H16_LEVEL.name: { + td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name: self.AIR_DETECTED_AT_LEVEL, + td_enum_repository.TDAirTrapLevelSensorAttributes.RAW.name: self.AIR_DETECTED_AT_LEVEL } } self.air_trap_valve_states = { - TDAirTrapValves.H13_VALV.name: 0, - TDAirTrapValves.H20_VALV.name: 0 + td_enum_repository.TDAirTrapValveNames.H13_VALV.name: 0, + td_enum_repository.TDAirTrapValveNames.H20_VALV.name: 0 } self.air_control = 0 self.td_air_trap_timestamp = 0.0 @@ -98,12 +98,12 @@ controlling = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) - self.air_trap_level_sensors[TDAirTrapLevelSensors.H17_LEVEL.name][TDAirTrapLevelSensorsAttributes.LEVEL.name] = lower[0] - self.air_trap_level_sensors[TDAirTrapLevelSensors.H16_LEVEL.name][TDAirTrapLevelSensorsAttributes.LEVEL.name] = upper[0] - self.air_trap_level_sensors[TDAirTrapLevelSensors.H17_LEVEL.name][TDAirTrapLevelSensorsAttributes.RAW.name] = raw_lower[0] - self.air_trap_level_sensors[TDAirTrapLevelSensors.H16_LEVEL.name][TDAirTrapLevelSensorsAttributes.RAW.name] = raw_upper[0] - self.air_trap_valve_states[TDAirTrapValves.H13_VALV.name] = h13_vlv_st[0] - self.air_trap_valve_states[TDAirTrapValves.H20_VALV.name] = h20_vlv_st[0] + self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H17_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name] = lower[0] + self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H16_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name] = upper[0] + self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H17_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.RAW.name] = raw_lower[0] + self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H16_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.RAW.name] = raw_upper[0] + self.air_trap_valve_states[td_enum_repository.TDAirTrapValveNames.H13_VALV.name] = h13_vlv_st[0] + self.air_trap_valve_states[td_enum_repository.TDAirTrapValveNames.H20_VALV.name] = h20_vlv_st[0] self.air_control = controlling[0] self.td_air_trap_timestamp = timestamp @@ -219,8 +219,8 @@ self.logger.debug("Timeout!!!!") return False - def cmd_set_td_air_trap_valve(self, valve: int = TDAirTrapValves.H13_VALV.value, - valve_state: int = TDAirTrapState.STATE_CLOSED.value) -> int: + def cmd_set_td_air_trap_valve(self, valve: int = td_enum_repository.TDAirTrapValveNames.H13_VALV.value, + valve_state: int = td_enum_repository.TDAirTrapState.STATE_CLOSED.value) -> int: """ Constructs and sends an open/close command to the TD air trap valves. Index: leahi_dialin/td/modules/alarms.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/td/modules/alarms.py (.../alarms.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -20,7 +20,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDEventDataType +from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -137,8 +137,8 @@ self.alarm_state_button_blockers = [False] * self.AlarmResponseButtons.NUM_OF_TD_ALARM_RESPONSE_BUTTONS.value # Loop through the list of the event data type enum and update the dictionary - for data_type in TDEventDataType: - event_data_type = TDEventDataType(data_type).name + for data_type in td_enum_repository.TDEventDataTypes: + event_data_type = td_enum_repository.TDEventDataTypes(data_type).name struct_unpack_type = None # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is @@ -195,13 +195,13 @@ data_typ_1 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) # Get the corresponding structure format - struct_data_type_1 = self.alarm_data_type[TDEventDataType(data_typ_1[0]).name] + struct_data_type_1 = self.alarm_data_type[td_enum_repository.TDEventDataTypes(data_typ_1[0]).name] # Get the data value by unpacking the data type data_1 = struct.unpack(struct_data_type_1, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) data_typ_2 = struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) # Get the corresponding structure format - struct_data_type_2 = self.alarm_data_type[TDEventDataType(data_typ_2[0]).name] + struct_data_type_2 = self.alarm_data_type[td_enum_repository.TDEventDataTypes(data_typ_2[0]).name] # Get the data value by unpacking the data type data_2 = struct.unpack(struct_data_type_2, bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) Index: leahi_dialin/td/modules/blood_flow.py =================================================================== diff -u -r7c8e829c563547ee50c517f1d6b84cb800b72027 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision 7c8e829c563547ee50c517f1d6b84cb800b72027) +++ leahi_dialin/td/modules/blood_flow.py (.../blood_flow.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -19,7 +19,7 @@ from .constants import PUMP_CONTROL_MODE_CLOSED_LOOP, PUMP_CONTROL_MODE_OPEN_LOOP from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDBloodFlowMotorAttributes +from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -46,15 +46,15 @@ self._handler_blood_flow_sync) self.td_blood_flow_timestamp = 0.0 self.h4_motor = { - TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name: 0, - TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name: 0.0, - TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name: 0.0, - TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name: 0.0, - TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE : 0.0, - TDBloodFlowMotorAttributes.SET_RPM.name: 0.0, - TDBloodFlowMotorAttributes.ROTOR_COUNT.name: 0, - TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name: 0, - TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name: 0, + td_enum_repository.TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name: 0, + td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name: 0.0, + td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name: 0.0, + td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name: 0.0, + td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE : 0.0, + td_enum_repository.TDBloodFlowMotorAttributes.SET_RPM.name: 0.0, + td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_COUNT.name: 0, + td_enum_repository.TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name: 0, + td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name: 0, } @publish(["msg_id_td_blood_pump_data", "h4_motor", "td_blood_flow_timestamp"]) @@ -67,23 +67,23 @@ @return: none """ - self.h4_motor[TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name] = struct.unpack('i', bytearray( + self.h4_motor[td_enum_repository.TDBloodFlowMotorAttributes.SET_BLOOD_FLOW_RATE.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name] = struct.unpack('f', bytearray( + self.h4_motor[td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_FLOW_RATE.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name] = struct.unpack('f', bytearray( + self.h4_motor[td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_ROTOR_SPEED.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name] = struct.unpack('f', bytearray( + self.h4_motor[td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_SPEED.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name] = struct.unpack('f', bytearray( + self.h4_motor[td_enum_repository.TDBloodFlowMotorAttributes.MEASURED_BLOOD_PUMP_TORQUE.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.SET_RPM.name] = struct.unpack('f', bytearray( + self.h4_motor[td_enum_repository.TDBloodFlowMotorAttributes.SET_RPM.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.ROTOR_COUNT.name] = struct.unpack('I', bytearray( + self.h4_motor[td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_COUNT.name] = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name] = struct.unpack('I', bytearray( + self.h4_motor[td_enum_repository.TDBloodFlowMotorAttributes.PRES_BLOOD_FLOW_RATE.name] = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.h4_motor[TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name] = struct.unpack('I', bytearray( + self.h4_motor[td_enum_repository.TDBloodFlowMotorAttributes.ROTOR_HALL_STATE.name] = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] self.td_blood_flow_timestamp = timestamp Index: leahi_dialin/td/modules/bubble_detector.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -18,7 +18,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDAirBubbleDetectorNames, TDAirBubbleDetectorAttributes +from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray @@ -61,11 +61,11 @@ self.td_air_bubbles_timestamp = 0.0 self.h18_bubble_detector = { - TDAirBubbleDetectorNames.H18_ADV.name: { + td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name: { # Initialize status of ADV air bubble detectors to fluid (no air bubble) detected - TDAirBubbleDetectorAttributes.STATUS.name: self.FLUID_DETECTED_STATUS, + td_enum_repository.TDAirBubbleDetectorAttributes.STATUS.name: self.FLUID_DETECTED_STATUS, # Initialize state of ADV air bubble detectors state machine to normal - TDAirBubbleDetectorAttributes.STATE.name: self.AIR_BUBBLE_NORMAL_STATE + td_enum_repository.TDAirBubbleDetectorAttributes.STATE.name: self.AIR_BUBBLE_NORMAL_STATE } } @@ -78,9 +78,9 @@ @return: None """ - self.h18_bubble_detector[TDAirBubbleDetectorNames.H18_ADV.name][TDAirBubbleDetectorAttributes.STATUS.name] = ( + self.h18_bubble_detector[td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name][td_enum_repository.TDAirBubbleDetectorAttributes.STATUS.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])))[0] - self.h18_bubble_detector[TDAirBubbleDetectorNames.H18_ADV.name][TDAirBubbleDetectorAttributes.STATE.name] = ( + self.h18_bubble_detector[td_enum_repository.TDAirBubbleDetectorNames.H18_ADV.name][td_enum_repository.TDAirBubbleDetectorAttributes.STATE.name] = ( struct.unpack('i', bytearray(message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])))[0] self.td_air_bubbles_timestamp = timestamp Index: leahi_dialin/td/modules/events.py =================================================================== diff -u -r7d9d004527efeccb91958b440abdff08c2c52648 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/events.py (.../events.py) (revision 7d9d004527efeccb91958b440abdff08c2c52648) +++ leahi_dialin/td/modules/events.py (.../events.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -16,7 +16,7 @@ import struct from logging import Logger -from leahi_dialin.common import * +from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish @@ -59,24 +59,24 @@ self._td_event_data_type = dict() # Dictionary of the mode as key and the sub mode states enum class as the value - self._td_op_mode_2_sub_mode = {TDOpModes.MODE_FAUL.name: TDFaultStates, - TDOpModes.MODE_SERV.name: TDServiceStates, - TDOpModes.MODE_INIT.name: TDInitStates, - TDOpModes.MODE_STAN.name: TDStandbyStates, - TDOpModes.MODE_TPAR.name: TDTreatmentParamStates, - TDOpModes.MODE_PRET.name: TDPreTreatmentModesStates, - TDOpModes.MODE_TREA.name: TDTreatmentStates, - TDOpModes.MODE_POST.name: TDPostTreatmentStates, - TDOpModes.MODE_NLEG.name: TDNotLegalStates} + self._td_op_mode_2_sub_mode = {td_enum_repository.TDOpModes.MODE_FAUL.name: td_enum_repository.TDFaultStates, + td_enum_repository.TDOpModes.MODE_SERV.name: td_enum_repository.TDServiceStates, + td_enum_repository.TDOpModes.MODE_INIT.name: td_enum_repository.TDInitStates, + td_enum_repository.TDOpModes.MODE_STAN.name: td_enum_repository.TDStandbyStates, + td_enum_repository.TDOpModes.MODE_TPAR.name: td_enum_repository.TDTreatmentParamStates, + td_enum_repository.TDOpModes.MODE_PRET.name: td_enum_repository.TDPreTreatmentModesStates, + td_enum_repository.TDOpModes.MODE_TREA.name: td_enum_repository.TDTreatmentStates, + td_enum_repository.TDOpModes.MODE_POST.name: td_enum_repository.TDPostTreatmentStates, + td_enum_repository.TDOpModes.MODE_NLEG.name: td_enum_repository.TDNotLegalStates} # Loop through the list of the TD events enums and initial the event dictionary. Each event is a key in the # dictionary and the value is a list. - for event in TDEventList: - self._td_event_dictionary[TDEventList(event).name] = [] + for event in td_enum_repository.TDEventList: + self._td_event_dictionary[td_enum_repository.TDEventList(event).name] = [] # Loop through the list of the event data type enum and update the dictionary - for data_type in TDEventDataType: - event_data_type = TDEventDataType(data_type).name + for data_type in td_enum_repository.TDEventDataTypes: + event_data_type = td_enum_repository.TDEventDataTypes(data_type).name struct_unpack_type = None # If U32 is in the data type enum (i.e. EVENT_DATA_TYPE_U32), then the key is the enum and the value is @@ -99,14 +99,14 @@ @returns the requested TD event number """ - list_length = len(self._td_event_dictionary[TDEventList(event_id).name]) + list_length = len(self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name]) if list_length == 0: event = [] elif event_number > list_length: - event = self._td_event_dictionary[TDEventList(event_id).name][list_length - 1] + event = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name][list_length - 1] else: - event = self._td_event_dictionary[TDEventList(event_id).name][list_length - event_number - 1] + event = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name][list_length - event_number - 1] return event @@ -131,18 +131,18 @@ list_of_events = [] # If there are not enough event lists send all the events that are available - if len(self._td_event_dictionary[TDEventList(event_id).name]) <= number_of_events: - list_of_events = self._td_event_dictionary[TDEventList(event_id).name] + if len(self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name]) <= number_of_events: + list_of_events = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name] else: # Get the all the events - complete_list = self._td_event_dictionary[TDEventList(event_id).name] + complete_list = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name] # Since the last are located at the end of the list, iterate backwards for the defined # event messages for i in range(len(complete_list) - 1, len(complete_list) - number_of_events - 1, -1): list_of_events.append(complete_list[i]) if number_of_events == 0: - list_of_events = self._td_event_dictionary[TDEventList(event_id).name] + list_of_events = self._td_event_dictionary[td_enum_repository.TDEventList(event_id).name] return list_of_events @@ -164,11 +164,11 @@ event_id = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - if event_id == TDEventList.TD_EVENT_OPERATION_STATUS.value: + if event_id == td_enum_repository.TDEventList.TD_EVENT_OPERATION_STATUS.value: # Get the data type event_data_type_1 = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - struct_data_type = self._td_event_data_type[TDEventDataType(event_data_type_1).name] + struct_data_type = self._td_event_data_type[td_enum_repository.TDEventDataTypes(event_data_type_1).name] op_mode = struct.unpack(' int: Index: leahi_dialin/td/modules/switches.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/switches.py (.../switches.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/td/modules/switches.py (.../switches.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -20,7 +20,7 @@ from leahi_dialin.utils.conversions import integer_to_bytearray from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDSwitchStatus, TDSwitchesNames +from leahi_dialin.common.td_defs import td_enum_repository from .constants import RESET, NO_RESET from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum @@ -48,7 +48,7 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_switches_data, self._handler_switches_sync) - self.td_switches_status = {TDSwitchesNames.H9_FRONT_DOOR.name: TDSwitchStatus.CLOSED.value} + self.td_switches_status = {td_enum_repository.TDSwitchNames.H9_FRONT_DOOR.name: td_enum_repository.TDSwitchStatus.CLOSED.value} self.td_switches_timestamp = 0.0 @publish(["msg_id_td_switches_data", "td_switches_status", "td_switches_timestamp"]) @@ -62,7 +62,7 @@ front_door = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.td_switches_status[TDSwitchesNames.H9_FRONT_DOOR.name] = TDSwitchStatus(front_door).value + self.td_switches_status[td_enum_repository.TDSwitchNames.H9_FRONT_DOOR.name] = td_enum_repository.TDSwitchStatus(front_door).value self.td_switches_timestamp = timestamp def cmd_switch_status_override(self, switch: int, status: int, reset: int = NO_RESET) -> int: @@ -93,7 +93,7 @@ # If there is no content... if received_message is not None: - self.logger.debug("Switch " + str(TDSwitchesNames(switch).name) + " to: " + + self.logger.debug("Switch " + str(td_enum_repository.TDSwitchNames(switch).name) + " to: " + str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] Index: leahi_dialin/td/modules/temperature_sensors.py =================================================================== diff -u -r6e0b0571d3f4064c8d7bb2b737e326c460780759 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 6e0b0571d3f4064c8d7bb2b737e326c460780759) +++ leahi_dialin/td/modules/temperature_sensors.py (.../temperature_sensors.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -4,7 +4,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDTemperatureSensorNames +from leahi_dialin.common.td_defs import td_enum_repository from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.checks import check_broadcast_interval_override_ms @@ -30,7 +30,7 @@ self.msg_id_td_temperature_data = MsgIds.MSG_ID_TD_TEMPERATURE_DATA.value self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_temperature_data, self._handler_temperature_sync) - self.td_temperatures_status = {TDTemperatureSensorNames.H23_TEMP.name: 0.0} + self.td_temperatures_status = {td_enum_repository.TDTemperatureSensorNames.H23_TEMP.name: 0.0} self.td_temperature_timestamp = 0.0 @publish(["msg_id_td_temperature_data", @@ -48,7 +48,7 @@ baro = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.td_temperatures_status[TDTemperatureSensorNames.H23_TEMP.name] = baro + self.td_temperatures_status[td_enum_repository.TDTemperatureSensorNames.H23_TEMP.name] = baro self.td_temperature_timestamp = timestamp def cmd_temperature_sensor_override(self, sensor: int, temperature: float, reset: int = NO_RESET) -> int: Index: leahi_dialin/td/modules/treatment.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/td/modules/treatment.py (.../treatment.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -18,7 +18,7 @@ from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDTreatmentParameters +from leahi_dialin.common.td_defs import td_enum_repository 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 @@ -307,10 +307,10 @@ """ idx = integer_to_bytearray(tx_param_id) - if tx_param_id <= TDTreatmentParameters.TREATMENT_PARAM_RINSEBACK_VOLUME.value: + if tx_param_id <= td_enum_repository.TDTreatmentParameters.TREATMENT_PARAM_RINSEBACK_VOLUME.value: tpv = integer_to_bytearray(tx_param_value) - elif tx_param_id >= TDTreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE.value: + elif tx_param_id >= td_enum_repository.TDTreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE.value: tpv = float_to_bytearray(tx_param_value) else: Index: leahi_dialin/td/modules/valves.py =================================================================== diff -u -r175101bed0d998f3e0c6ff24d90603acb0106e4d -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/valves.py (.../valves.py) (revision 175101bed0d998f3e0c6ff24d90603acb0106e4d) +++ leahi_dialin/td/modules/valves.py (.../valves.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -21,7 +21,7 @@ from .constants import NO_RESET from leahi_dialin.common import MsgIds -from leahi_dialin.common.td_defs import TDValvesEnum, TDValvesPositions, TDValvesStates +from leahi_dialin.common.td_defs import td_enum_repository 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 @@ -80,8 +80,8 @@ self.td_valves_timestamp = 0.0 # A dictionary of the valves with the status - self.valves_status = {TDValvesEnum.H1_VALV.name: {}, - TDValvesEnum.H19_VALV.name: {}} + self.valves_status = {td_enum_repository.TDValveNames.H1_VALV.name: {}, + td_enum_repository.TDValveNames.H19_VALV.name: {}} @publish(["msg_id_td_valves_data", "valves_status", "td_valves_timestamp"]) def _handler_valves_sync(self, message: dict, timestamp=0.0) -> None: @@ -111,11 +111,11 @@ message['message'][self.START_MAX_HOMING_ENC:self.END_MAX_HOMING_ENC]))[0] # To make sure values of the enums are not out of range - if TDValvesEnum.has_value(vlv_id) and TDValvesPositions.has_value(pos_id) and TDValvesStates.has_value(pos_id): - vlv_name = TDValvesEnum(vlv_id).name + if td_enum_repository.TDValveNames.has_value(vlv_id) and td_enum_repository.TDValvePositions.has_value(pos_id) and td_enum_repository.TDValveStates.has_value(pos_id): + vlv_name = td_enum_repository.TDValveNames(vlv_id).name # Update the valves dictionary - self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': TDValvesPositions(pos_id).name, 'PosCnt': pos_cnt, - 'Cmd': cmd_pos, 'State': TDValvesStates(state_id).name, 'PosA': pos_a, + self.valves_status[vlv_name] = {'Valve': vlv_name, 'PosID': td_enum_repository.TDValvePositions(pos_id).name, 'PosCnt': pos_cnt, + 'Cmd': cmd_pos, 'State': td_enum_repository.TDValveStates(state_id).name, 'PosA': pos_a, 'PosB': pos_b, 'PosC': pos_c, 'PosD': pos_d, 'Max_homing_enc': max_homing_enc} self.td_valves_timestamp = timestamp @@ -157,8 +157,8 @@ """ Constructs and sends the TD valves set position for a valve - @param valve: integer - Valve number. Defined in TDValvesEnum class - @param position: integer - Position number: Defined in TDValvesPositions class + @param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class + @param position: integer - Position number: Defined in td_enum_repository.TDValvePositions class @returns 1 if successful, zero otherwise """ @@ -184,7 +184,7 @@ """ Constructs and sends the TD valves home command - @param valve: integer - Valve number. Defined in TDValvesEnum class + @param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class @param force_home: integer - 1 to force valve to home position, 0 for normal homing @param cartridge: integer - 1 to use cartridge settings, 0 to use settings for system use without cartridge @returns 1 if successful, zero otherwise @@ -211,7 +211,7 @@ """ Constructs and sends the TD valves set position for a valve - @@param valve: integer - Valve number. Defined in TDValvesEnum class + @@param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class @param position_count: integer value @param reset: integer - 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise @@ -230,7 +230,7 @@ # If there is content... if received_message is not None: - self.logger.debug("Setting {} position to {} ".format(str(TDValvesEnum(valve).name), position_count)) + self.logger.debug("Setting {} position to {} ".format(str(td_enum_repository.TDValveNames(valve).name), position_count)) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -242,7 +242,7 @@ """ Constructs and sends the TD valves set position for a valve - @@param valve: integer - Valve number. Defined in TDValvesEnum class + @@param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class @param status: integer value @param reset: integer - 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise @@ -261,7 +261,7 @@ # If there is content... if received_message is not None: - self.logger.debug("Setting {} status to {} ".format(str(TDValvesEnum(valve).name), status)) + self.logger.debug("Setting {} status to {} ".format(str(td_enum_repository.TDValveNames(valve).name), status)) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] @@ -274,7 +274,7 @@ Constructs and sends a given valve to change position by a given number of encoder counts. - @@param valve: integer - Valve number. Defined in TDValvesEnum class + @@param valve: integer - Valve number. Defined in td_enum_repository.TDValveNames class @param count: integer value @returns 1 if successful, zero otherwise """ @@ -291,7 +291,7 @@ # If there is content... if received_message is not None: - self.logger.debug("Setting {} position by {} ".format(str(TDValvesEnum(valve).name), counts)) + self.logger.debug("Setting {} position by {} ".format(str(td_enum_repository.TDValveNames(valve).name), counts)) # response payload is OK or not OK return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] Index: leahi_dialin/td/modules/voltages.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/modules/voltages.py (.../voltages.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/td/modules/voltages.py (.../voltages.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -23,7 +23,7 @@ from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray from leahi_dialin.utils.checks import check_broadcast_interval_override_ms from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.td_defs import TDMonitoredVoltages +from leahi_dialin.common.td_defs import td_enum_repository class TDVoltages(AbstractSubSystem): @@ -45,7 +45,7 @@ self.msg_id_td_voltages_data = MsgIds.MSG_ID_TD_VOLTAGES_DATA.value self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_voltages_data, self._handler_monitored_voltages_sync) - self.monitored_voltages = [0.0] * TDMonitoredVoltages.NUM_OF_MONITORED_VOLTAGE_LINES.value + self.monitored_voltages = [0.0] * td_enum_repository.TDMonitoredVoltages.NUM_OF_MONITORED_VOLTAGE_LINES.value self.td_voltages_timestamp = 0.0 @@ -82,25 +82,25 @@ vfp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_1_2V.value] = v12[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_3_3V.value] = v33[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value] = v5l[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_5V_SENSORS.value] = v5s[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_24V.value] = v24[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_24V_REGEN.value] = v24g[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_FPGA_REF_V.value] = vfr[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_PBA_REF_V.value] = vpr[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.value] = vfc[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.value] = vfa[0] - self.monitored_voltages[TDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.value] = vfp[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_1_2V.value] = v12[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_3_3V.value] = v33[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_5V_LOGIC.value] = v5l[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_5V_SENSORS.value] = v5s[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_24V.value] = v24[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_24V_REGEN.value] = v24g[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_FPGA_REF_V.value] = vfr[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_PBA_REF_V.value] = vpr[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_FPGA_VCC_V.value] = vfc[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_FPGA_AUX_V.value] = vfa[0] + self.monitored_voltages[td_enum_repository.TDMonitoredVoltages.MONITORED_LINE_FPGA_PVN_V.value] = vfp[0] self.td_voltages_timestamp = timestamp def cmd_monitored_voltage_override(self, signal: int = 0, volts: float = 0.0, reset: int = NO_RESET) -> int: """ Constructs and sends the TD monitored voltage override command Constraints: Must be logged into TD. - Given signal must be valid member of TDMonitoredVoltages enum + Given signal must be valid member of td_enum_repository.TDMonitoredVoltages enum @param signal: integer - ID of signal to override @param volts: float - value (in volts) to override signal with Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -r76bd18ef10a248d1375dbca242ed3123281041b2 -rd27c40205e18118f4689f62463a266da1f91dba6 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 76bd18ef10a248d1375dbca242ed3123281041b2) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision d27c40205e18118f4689f62463a266da1f91dba6) @@ -36,7 +36,7 @@ from .proxies.ui_proxy import UIProxy from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions -from ..common.td_defs import TDOpModes +from ..common.td_defs import td_enum_repository from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from ..utils.base import AbstractSubSystem, publish, LogManager from ..utils.checks import check_broadcast_interval_override_ms @@ -106,7 +106,7 @@ self.td_debug_events_timestamp = 0.0 self.ui_version_info_response_timestamp = 0.0 self.td_version_response_timestamp = 0.0 - self.td_operation_mode = TDOpModes.MODE_INIT.value + self.td_operation_mode = td_enum_repository.TDOpModes.MODE_INIT.value self.td_operation_sub_mode = 0 self.td_logged_in = False self.td_set_logged_in_status(False)