Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rbe799e12803dba3054ff893b68f8b79a9dde440b -rb7d86216a91c9fbf74af7c6233ed0b6eaf74cd75 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision b7d86216a91c9fbf74af7c6233ed0b6eaf74cd75) @@ -18,8 +18,6 @@ from enum import unique # Project imports -from leahi_dialin.common.disp_defs import AcidTypes, BicarbTypes -from leahi_dialin.common.fp_defs import FPPressureSensorNames from leahi_dialin.common.generic_defs import RecordsBaseEnum, DataTypes from leahi_dialin.utils.enums import DialinEnum @@ -1208,105 +1206,6 @@ } -def get_calibration_record_fields() -> RecordsBaseEnum: - # Creating the enum members list - i = 0 - members = {} - for pres_sensor in DDPressureSensorNames: - if 'num_' in pres_sensor.name.lower(): - continue - for field_name in DDCalibRecordSensorFields: - if 'num_' in field_name.name.lower(): - continue - members[f'PRES__{pres_sensor.name}__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for pres_sensor in FPPressureSensorNames: - if 'num_' in pres_sensor.name.lower(): - continue - for field_name in DDCalibRecordSensorFields: - if 'num_' in field_name.name.lower(): - continue - members[f'PRES__{pres_sensor.name}__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for temp_sensor in DDTemperatureSensorNames: - if 'num_' in temp_sensor.name.lower(): - continue - elif temp_sensor.value >= DDTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value: - continue - for field_name in DDCalibRecordSensorFields: - if 'num_' in field_name.name.lower(): - continue - members[f'TEMP__{temp_sensor.name}__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for conc_pump in DDConcentratePumpNames: - if 'num_' in conc_pump.name.lower(): - continue - for field_name in DDCalibRecordSensorFields: - if 'num_' in field_name.name.lower(): - continue - members[f'CONC__{conc_pump.name}__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for dial_pump in DDDialysatePumpNames: - if 'num_' in dial_pump.name.lower(): - continue - elif 'd12' in dial_pump.name.lower(): - members[f'DIAL__{dial_pump.name}__TARGET_SPEED'] = (i, DataTypes.F32) - i += 1 - members[f'DIAL__{dial_pump.name}__{DDCalibRecordSensorFields.CALIBRATION_TIME.name}'] = (i, DDCalibRecordSensorFields.CALIBRATION_TIME.datatype()) - i += 1 - else: - for field_name in DDCalibRecordSensorFields: - if 'num_' in field_name.name.lower(): - continue - members[f'DIAL__{dial_pump.name}__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for acid in AcidTypes: - if 'num_' in acid.name.lower(): - continue - for field_name in DDCalibRecordConcentrateFields: - if 'num_' in field_name.name.lower(): - continue - members[f'ACID__{acid.name}__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for bicarb in BicarbTypes: - if 'num_' in bicarb.name.lower(): - continue - for field_name in DDCalibRecordConcentrateFields: - if 'num_' in field_name.name.lower(): - continue - members[f'BICARB__{bicarb.name}__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for field_name in DDCalibRecordAccelerometerFields: - if 'num_' in field_name.name.lower(): - continue - members[f'ACCEL__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for field_name in DDCalibRecordBloodLeakFields: - if 'num_' in field_name.name.lower(): - continue - members[f'BLOOD_LEAK__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for cond_sensor in DDConductivitySensorNames: - if 'num_' in cond_sensor.name.lower(): - continue - for field_name in DDCalibRecordConductivityFields: - if 'num_' in field_name.name.lower(): - continue - members[f'COND__{cond_sensor.name}__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - members[f'NUM_OF_CALIBRATION_RECORD_FIELDS'] = (i, DataTypes.NONE) - - # Enum creation - DDCalibrationRecordFields = RecordsBaseEnum('DDCalibrationRecordFields', members,) - - # Setting the _str_list values for the enum - DDCalibrationRecordFields._str_list = {} - for member in members: - DDCalibrationRecordFields._str_list[member] = [] - - return DDCalibrationRecordFields - - @unique class DDInstitutionalRecordBasicFields(RecordsBaseEnum): MIN_DIALYSATE_SYSTEM_FLOW_MLPM = (0, DataTypes.U32) # Min dialysate flow in mL/min Index: leahi_dialin/common/dd_defs_proxy.py =================================================================== diff -u -rbe799e12803dba3054ff893b68f8b79a9dde440b -rb7d86216a91c9fbf74af7c6233ed0b6eaf74cd75 --- leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) +++ leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision b7d86216a91c9fbf74af7c6233ed0b6eaf74cd75) @@ -15,6 +15,7 @@ ############################################################################ from . import dd_defs +from . import fp_defs from . import generic_defs @@ -81,7 +82,7 @@ RecordTypes = generic_defs.RecordTypes DDSystemRecordFields = dd_defs.DDSystemRecordFields DDServiceRecordFields = dd_defs.DDServiceRecordFields - DDCalibrationRecordFields = dd_defs.get_calibration_record_fields() + DDCalibrationRecordFields = fp_defs.get_calibration_record_fields() DDInstitutionalRecordBasicFields = dd_defs.DDInstitutionalRecordBasicFields DDInstitutionalRecordAdvancedFields = dd_defs.DDInstitutionalRecordAdvancedFields DDInstitutionalRecordAdditionalFields = dd_defs.DDInstitutionalRecordAdditionalFields Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -rbe799e12803dba3054ff893b68f8b79a9dde440b -rb7d86216a91c9fbf74af7c6233ed0b6eaf74cd75 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision b7d86216a91c9fbf74af7c6233ed0b6eaf74cd75) @@ -18,7 +18,10 @@ from enum import unique # Project imports -from leahi_dialin.common.dd_defs import DDConductivitySensorNames, DDEventList, DDPressureSensorNames, DDValveNames, DDLevelSensorNames +from leahi_dialin.common.disp_defs import AcidTypes, BicarbTypes +from leahi_dialin.common.dd_defs import DDConcentratePumpNames, DDConductivitySensorNames, DDDialysatePumpNames, DDEventList, DDLevelSensorNames, DDPressureSensorNames, DDTemperatureSensorNames, DDValveNames, \ + DDCalibRecordSensorFields, DDCalibRecordAccelerometerFields, DDCalibRecordBloodLeakFields, DDCalibRecordConcentrateFields, DDCalibRecordConductivityFields +from leahi_dialin.common.generic_defs import RecordsBaseEnum, DataTypes from leahi_dialin.utils.enums import DialinEnum @@ -648,3 +651,104 @@ 'VALVE_STATE_OPEN': ['open', 'on'], 'NUM_OF_VALVE_STATES': [], } + + + +# ================================================== Enum Creators: Record Fields ================================================== +def get_calibration_record_fields() -> RecordsBaseEnum: + # Creating the enum members list + i = 0 + members = {} + for pres_sensor in DDPressureSensorNames: + if 'num_' in pres_sensor.name.lower(): + continue + for field_name in DDCalibRecordSensorFields: + if 'num_' in field_name.name.lower(): + continue + members[f'PRES__{pres_sensor.name}__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + for pres_sensor in FPPressureSensorNames: + if 'num_' in pres_sensor.name.lower(): + continue + for field_name in DDCalibRecordSensorFields: + if 'num_' in field_name.name.lower(): + continue + members[f'PRES__{pres_sensor.name}__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + for temp_sensor in DDTemperatureSensorNames: + if 'num_' in temp_sensor.name.lower(): + continue + elif temp_sensor.value >= DDTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value: + continue + for field_name in DDCalibRecordSensorFields: + if 'num_' in field_name.name.lower(): + continue + members[f'TEMP__{temp_sensor.name}__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + for conc_pump in DDConcentratePumpNames: + if 'num_' in conc_pump.name.lower(): + continue + for field_name in DDCalibRecordSensorFields: + if 'num_' in field_name.name.lower(): + continue + members[f'CONC__{conc_pump.name}__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + for dial_pump in DDDialysatePumpNames: + if 'num_' in dial_pump.name.lower(): + continue + elif 'd12' in dial_pump.name.lower(): + members[f'DIAL__{dial_pump.name}__TARGET_SPEED'] = (i, DataTypes.F32) + i += 1 + members[f'DIAL__{dial_pump.name}__{DDCalibRecordSensorFields.CALIBRATION_TIME.name}'] = (i, DDCalibRecordSensorFields.CALIBRATION_TIME.datatype()) + i += 1 + else: + for field_name in DDCalibRecordSensorFields: + if 'num_' in field_name.name.lower(): + continue + members[f'DIAL__{dial_pump.name}__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + for acid in AcidTypes: + if 'num_' in acid.name.lower(): + continue + for field_name in DDCalibRecordConcentrateFields: + if 'num_' in field_name.name.lower(): + continue + members[f'ACID__{acid.name}__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + for bicarb in BicarbTypes: + if 'num_' in bicarb.name.lower(): + continue + for field_name in DDCalibRecordConcentrateFields: + if 'num_' in field_name.name.lower(): + continue + members[f'BICARB__{bicarb.name}__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + for field_name in DDCalibRecordAccelerometerFields: + if 'num_' in field_name.name.lower(): + continue + members[f'ACCEL__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + for field_name in DDCalibRecordBloodLeakFields: + if 'num_' in field_name.name.lower(): + continue + members[f'BLOOD_LEAK__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + for cond_sensor in DDConductivitySensorNames: + if 'num_' in cond_sensor.name.lower(): + continue + for field_name in DDCalibRecordConductivityFields: + if 'num_' in field_name.name.lower(): + continue + members[f'COND__{cond_sensor.name}__{field_name.name}'] = (i, field_name.datatype()) + i += 1 + members[f'NUM_OF_CALIBRATION_RECORD_FIELDS'] = (i, DataTypes.NONE) + + # Enum creation + DDCalibrationRecordFields = RecordsBaseEnum('DDCalibrationRecordFields', members,) + + # Setting the _str_list values for the enum + DDCalibrationRecordFields._str_list = {} + for member in members: + DDCalibrationRecordFields._str_list[member] = [] + + return DDCalibrationRecordFields Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rbe799e12803dba3054ff893b68f8b79a9dde440b -rb7d86216a91c9fbf74af7c6233ed0b6eaf74cd75 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision b7d86216a91c9fbf74af7c6233ed0b6eaf74cd75) @@ -379,6 +379,8 @@ MSG_ID_TD_BATTERY_I2C_STATUS_OVERRIDE_REQUEST = 0x8068 # TD battery I2C status override. + MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999 # TD training test override request + MSG_ID_DD_TESTER_LOGIN_REQUEST = 0xA000 # DD tester log-in MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001 # DD reset request MSG_ID_DD_SEND_TEST_CONFIGURATION = 0xA002 # DD send test configuration to Dialin @@ -499,6 +501,9 @@ MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA075 # DD Treatment parameters override request MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xA076 # DD NVM Record CRC override Request + MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 # DD alarm state override request + MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04 # DD stop general dialysate mode override request + MSG_ID_FP_TESTER_LOGIN_REQUEST = 0xB000 # FP tester log-in MSG_ID_FP_SOFTWARE_RESET_REQUEST = 0xB001 # FP reset request MSG_ID_FP_SEND_TEST_CONFIGURATION = 0xB002 # FP send test configuration to Dialin Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r489ce5ef49041b863501b7fecd6e4716e7dcaa9f -rb7d86216a91c9fbf74af7c6233ed0b6eaf74cd75 --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 489ce5ef49041b863501b7fecd6e4716e7dcaa9f) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision b7d86216a91c9fbf74af7c6233ed0b6eaf74cd75) @@ -496,7 +496,7 @@ payload = payload, reset = NO_RESET, channel_id = CanChannels.dialin_to_fp_ch_id, - msg_id = MsgIds.MSG_ID_FP_SET_OP_SUB_MODE_REQUEST, + msg_id = MsgIds.MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST, entity_name = 'FP Operation Sub Mode', override_text = new_sub_mode_enum.name, logger = self.logger, Index: leahi_dialin/td/proxies/ui_proxy.py =================================================================== diff -u -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09 -rb7d86216a91c9fbf74af7c6233ed0b6eaf74cd75 --- leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09) +++ leahi_dialin/td/proxies/ui_proxy.py (.../ui_proxy.py) (revision b7d86216a91c9fbf74af7c6233ed0b6eaf74cd75) @@ -53,7 +53,7 @@ function = self._handler_tx_parameters_val_resp_sync) self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, - message_id = MsgIds.MSG_ID_TD_RESP_ULTRAFILTRATION_VOLUME_TO_VALIDATE.value, + message_id = MsgIds.MSG_ID_TD_TREATMENT_UF_VOLUME_VALIDATE_RESPONSE.value, function = self._handler_uf_val_resp_sync) self.can_interface.register_receiving_publication_function(channel_id = CanChannels.td_to_ui_ch_id, @@ -516,7 +516,7 @@ cmd_generic_override(payload = payload, reset = None, channel_id = CanChannels.ui_to_td_ch_id, - msg_id = MsgIds.MSG_ID_UI_ULTRAFILTRATION_VOLUME_TO_VALIDATE, + msg_id = MsgIds.MSG_ID_UI_TREATMENT_UF_VOLUME_VALIDATE_REQUEST, entity_name = 'Validate UI Ultrafiltration Volume', override_text = 'N/A', logger = self.logger, Index: leahi_dialin/ui/td_messaging.py =================================================================== diff -u -r489ce5ef49041b863501b7fecd6e4716e7dcaa9f -rb7d86216a91c9fbf74af7c6233ed0b6eaf74cd75 --- leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision 489ce5ef49041b863501b7fecd6e4716e7dcaa9f) +++ leahi_dialin/ui/td_messaging.py (.../td_messaging.py) (revision b7d86216a91c9fbf74af7c6233ed0b6eaf74cd75) @@ -1523,7 +1523,7 @@ message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.td_to_ui_ch_id, - message_id=msg_ids.MsgIds.MSG_ID_TD_UI_CONFIRMATION_REQUEST.value, + message_id=msg_ids.MsgIds.MSG_ID_TD_UI_GENERIC_CONFIRMATION_REQUEST.value, payload=payload) self.can_interface.send(message, 0) @@ -1622,7 +1622,7 @@ message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.td_to_ui_ch_id, - message_id=msg_ids.MsgIds.MSG_ID_TD_SETUP_CONNECTION_CONFIRM_RESPONSE.value, + message_id=msg_ids.MsgIds.MSG_ID_TD_SETUP_TUBING_SET_CONNECTIONS_CONFIRM_RESPONSE.value, payload=payload) self.can_interface.send(message, 0) @@ -1743,7 +1743,7 @@ message = CAN.CanMessage.build_message( channel_id=CAN.CanChannels.td_to_ui_ch_id, - message_id=msg_ids.MsgIds.MSG_ID_TD_ADJUST_PATIENT_DISCONNECT_CONFIRM_RESPONSE.value, + message_id=msg_ids.MsgIds.MSG_ID_TD_PATIENT_DISCONNECT_CONFIRM_RESPONSE.value, payload=payload) self.can_interface.send(message, 0)