Index: leahi_dialin/common/alarm_defs.py =================================================================== diff -u -raf4e5fe9be4be627d61b4b4f75d0ed56c1ce4fa1 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/alarm_defs.py (.../alarm_defs.py) (revision af4e5fe9be4be627d61b4b4f75d0ed56c1ce4fa1) +++ leahi_dialin/common/alarm_defs.py (.../alarm_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -13,7 +13,11 @@ # @date (original) 31-Jul-2026 # ############################################################################ + +# Module import from enum import unique + +# Project import from leahi_dialin.utils.enums import AlarmEnum Index: leahi_dialin/common/alarm_priorities.py =================================================================== diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/alarm_priorities.py (.../alarm_priorities.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) +++ leahi_dialin/common/alarm_priorities.py (.../alarm_priorities.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -13,10 +13,14 @@ # @date (original) 05-Apr-2021 # ############################################################################ + +# Module import from enum import unique -from ..utils.enums import DialinEnum +# Project import +from leahi_dialin.utils.enums import DialinEnum + @unique class AlarmPriorities(DialinEnum): ALARM_PRIORITY_NONE = 0 # Indicates not an alarm or no alarms active at this time Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -reca9e15bc984af2b7f59eb38f3836ca354ee1251 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision eca9e15bc984af2b7f59eb38f3836ca354ee1251) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -14,9 +14,14 @@ # ############################################################################ +# Module import from enum import unique -from ..utils.enums import DialinEnum +# 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 # ================================================== Enum Creators: Operations Lvl 1 ================================================== @@ -1051,4 +1056,354 @@ 'RTD_RESISTANCE' : ['rtd resistance'], 'UNCOMPENSATED_COND' : ['uncompensated conductivity'], 'NUM_OF_RESISTANCE_ATTRIBUTES': [], -} \ No newline at end of file +} + + + +# ================================================== Enum Creators: Record Sub Fields ================================================== +@unique +class DDCalibRecordAccelerometerFields(RecordsBaseEnum): + ACCEL_X_OFFSET = (0, DataTypes.F32) # DD accelerometer X axis offset + ACCEL_Y_OFFSET = (1, DataTypes.F32) # DD accelerometer Y axis offset + ACCEL_Z_OFFSET = (2, DataTypes.F32) # DD accelerometer Z axis offset + CALIBRATION_TIME = (3, DataTypes.U32) # Calibration time + NUM_OF_CALIBRATION_RECORD_ACCELEROMETER_FIELDS = (4, DataTypes.NONE) # Number of Calibration Record Accelerometer's Fields + +DDCalibRecordAccelerometerFields._str_list = { + # Official Name : Accepted strings + 'ACCEL_X_OFFSET': [], + 'ACCEL_Y_OFFSET': [], + 'ACCEL_Z_OFFSET': [], + 'CALIBRATION_TIME': [], + 'NUM_OF_CALIBRATION_RECORD_ACCELEROMETER_FIELDS': [], +} + + +@unique +class DDCalibRecordBloodLeakFields(RecordsBaseEnum): + SET_POINT = (0, DataTypes.U16) # DD Blood leak sensor set point + CALIBRATION_TIME = (1, DataTypes.U32) # Calibration time + NUM_OF_CALIBRATION_RECORD_BLOOD_LEAK_FIELDS = (2, DataTypes.NONE) # Number of Calibration Record Accelerometer's Fields + +DDCalibRecordBloodLeakFields._str_list = { + # Official Name : Accepted strings + 'SET_POINT': [], + 'CALIBRATION_TIME': [], + 'NUM_OF_CALIBRATION_RECORD_BLOOD_LEAK_FIELDS': [], +} + + +@unique +class DDCalibRecordConcentrateFields(RecordsBaseEnum): + CONCENTRATE_MIX_RATIO = (0, DataTypes.F32) # Acid or Bicarb Concentrate mix ratio. + FULL_BOTTLE_VOLUME_ML = (1, DataTypes.F32) # Acid or Bicarb full bottle volume in milliliters. + CONDUCTIVITY_USPCM = (2, DataTypes.F32) # Acid or Bicarb conductivity in uS/cm. + BOTTLE_TEMPERATURE_C = (3, DataTypes.F32) # Acid or Bicarb bottle temperature in C. + CALIBRATION_TIME = (4, DataTypes.U32) # Calibration time + NUM_OF_CALIBRATION_RECORD_CONCENTRATE_FIELDS = (5, DataTypes.NONE) # Number of Calibration Record Acid and Bicarb Concentrate's Fields + +DDCalibRecordConcentrateFields._str_list = { + # Official Name : Accepted strings + 'CONCENTRATE_MIX_RATIO': [], + 'FULL_BOTTLE_VOLUME_ML': [], + 'CONDUCTIVITY_USPCM': [], + 'BOTTLE_TEMPERATURE_C': [], + 'CALIBRATION_TIME': [], + 'NUM_OF_CALIBRATION_RECORD_CONCENTRATE_FIELDS': [], +} + + +@unique +class DDCalibRecordConductivityFields(RecordsBaseEnum): + K_HIGH = (0, DataTypes.F32) # Cell Coefficient High + ALPHA_HIGH = (1, DataTypes.F32) # Temperature correction High + ETA_HIGH = (2, DataTypes.F32) # Resistance Scale Factor High + ZETA_HIGH = (3, DataTypes.F32) # Resistance Offset High + K_LOW = (4, DataTypes.F32) # Cell Coefficient Low + ALPHA_LOW = (5, DataTypes.F32) # Temperature correction Low + ETA_LOW = (6, DataTypes.F32) # Resistance Scale Factor Low + ZETA_LOW = (7, DataTypes.F32) # Resistance Offset Low + BETA = (8, DataTypes.F32) # Temperature Scale Factor + DELTA = (9, DataTypes.F32) # Temperature Offset + RSRVD_1 = (10, DataTypes.F32) # Reserved slot + RSRVD_2 = (11, DataTypes.F32) # Reserved slot + CALIBRATION_TIME = (12, DataTypes.U32) # Calibration time + NUM_OF_CALIBRATION_RECORD_CONDUCTIVITY_FIELDS = (13, DataTypes.NONE) # Number of Calibration Record Conductivity Fields + +DDCalibRecordConductivityFields._str_list = { + # Official Name : Accepted strings + 'K_HIGH': [], + 'ALPHA_HIGH': [], + 'ETA_HIGH': [], + 'ZETA_HIGH': [], + 'K_LOW': [], + 'ALPHA_LOW': [], + 'ETA_LOW': [], + 'ZETA_LOW': [], + 'BETA': [], + 'DELTA': [], + 'RSRVD_1': [], + 'RSRVD_2': [], + 'CALIBRATION_TIME': [], + 'NUM_OF_CALIBRATION_RECORD_CONCENTRATE_FIELDS': [], +} + + +@unique +class DDCalibRecordSensorFields(RecordsBaseEnum): + GAIN = (0, DataTypes.F32) # Sensor's Gain + OFFSET = (1, DataTypes.F32) # Sensor's Offset + CALIBRATION_TIME = (2, DataTypes.U32) # Sensor's Calibration time + NUM_OF_CALIBRATION_RECORD_SENSOR_FIELDS = (3, DataTypes.NONE) # Number of Calibration Record Sensor's Fields + +DDCalibRecordSensorFields._str_list = { + # Official Name : Accepted strings + 'GAIN': [], + 'OFFSET': [], + 'CALIBRATION_TIME': [], + 'NUM_OF_CALIBRATION_RECORD_SENSOR_FIELDS': [], +} + + +# ================================================== Enum Creators: Record Fields ================================================== +@unique +class DDSystemRecordFields(RecordsBaseEnum): + IS_RO_FEATURED = (0, DataTypes.BOOL) # Is RO featured or defeatured + IS_RO_BOOST_PUMP_ADDED = (1, DataTypes.BOOL) # Is RO have boost pump or not + TOP_LEVEL_PN = (2, DataTypes.U08, 10) # Top level part number + TOP_LEVEL_SN = (3, DataTypes.U08, 20) # Top level serial number + MFG_LOCATION = (4, DataTypes.U08) # Manufacturing Location + MFG_DATE = (5, DataTypes.U32) # Manufacturing Date + NUM_OF_SYSTEM_RECORD_FIELDS = (6, DataTypes.NONE) # Number of System Record Fields + +DDSystemRecordFields._str_list = { + # Official Name : Accepted strings + 'TOP_LEVEL_PN': ['pn', 'part number'], + 'TOP_LEVEL_SN': ['sn', 'serial number'], + 'MFG_LOCATION': ['location', 'manufacturing location'], + 'MFG_DATE': ['date', 'manufacturing date'], + 'NUM_OF_SYSTEM_RECORD_FIELDS': [], +} + + +@unique +class DDServiceRecordFields(RecordsBaseEnum): + IS_HDF_ONLINE_FLUID = (0, DataTypes.BOOL) # DD Is HDF Online + WATER_RECOVERY = (1, DataTypes.U32) # DD Water Recovery + SERVICE_LOC = (2, DataTypes.U08) # DD service location + LAST_SERVICE_EPOCH_DATE = (3, DataTypes.U32) # DD last service date in epoch + SERVICE_INTERVAL_SECONDS = (4, DataTypes.U32) # DD service interval in seconds + LAST_RESET_TIME_EPOCH = (5, DataTypes.U32) # Last time the record was reset in epoch + NUM_OF_SERVICE_RECORD_FIELDS = (6, DataTypes.NONE) # Number of Service Record Fields + +DDServiceRecordFields._str_list = { + # Official Name : Accepted strings + 'IS_HDF_ONLINE_FLUID': [], + 'WATER_RECOVERY': [], + 'SERVICE_LOC': [], + 'LAST_SERVICE_EPOCH_DATE': [], + 'SERVICE_INTERVAL_SECONDS': [], + 'LAST_RESET_TIME_EPOCH': [], + 'NUM_OF_SERVICE_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 + + +@unique +class DDInstitutionalRecordBasicFields(RecordsBaseEnum): + MIN_DIALYSATE_SYSTEM_FLOW_MLPM = (0, DataTypes.U32) # Min dialysate flow in mL/min + MAX_DIALYSATE_SYSTEM_FLOW_MLPM = (1, DataTypes.U32) # Max dialysate flow in mL/min + MIN_DIALYSATE_TEMP_C = (2, DataTypes.F32) # Min dialysate temperature in C + MAX_DIALYSATE_TEMP_C = (3, DataTypes.F32) # Max dialysate temperature in C + MIN_ACID_CONCENTRATE = (4, DataTypes.U32) # Min Acid concentrate + MAX_ACID_CONCENTRATE = (5, DataTypes.U32) # Max Acid concentrate + MIN_BICARB_CARTRIDGE_SIZE_G = (6, DataTypes.U32) # Min Bicarbonate cartridge size in grams + MAX_BICARB_CARTRIDGE_SIZE_G = (7, DataTypes.U32) # Max Bicarbonate cartridge size in grams + MIN_SODIUM_MEQPL = (8, DataTypes.U32) # Min sodium in mEq/L + MAX_SODIUM_MEQPL = (9, DataTypes.U32) # Max sodium in mEq/L + MIN_BICARBONATE_MEQPL = (10, DataTypes.U32) # Min bicarbonate in mEq/L + MAX_BICARBONATE_MEQPL = (11, DataTypes.U32) # Max bicarbonate in mEq/L + MIN_RO_REJECTION_RATIO_PCT = (12, DataTypes.F32) # Min RO rejection ratio in percent + DISINFECTION_FREQUENCY = (13, DataTypes.U32) # Disinfection days between cycles + DISINFECTION_CYCLE_TIME = (14, DataTypes.F32) # Disinfection Cycle Time + MIN_INLET_WATER_CIND_AKARN_LIMIT_USPCM = (15, DataTypes.F32) # Min inlet water conductivity alarm limit in uS/cm + MAX_INLET_WATER_CIND_AKARN_LIMIT_USPCM = (16, DataTypes.F32) # Max inlet water conductivity alarm limit in uS/cm + ACID_CONCENTRATE_JUG_SIZE_L = (17, DataTypes.F32) # acid concentrate jug size in Liters + MIN_ACID_ALARM_LIMIT_PCT = (18, DataTypes.F32) # Min acid alarm limit in percent + MIN_BICARB_ALARM_LIMIT_PCT = (19, DataTypes.F32) # Min bicarbonate alarm limit in percent + POST_TREAT_DRAIN_OPTION = (20, DataTypes.U32) # Dialysate Post Treatment Drain Option  + POST_TREAT_DRY_BICARB_OPTION = (21, DataTypes.U32) # Dry Bicarbonate Post Treatment Option  + CALIBRATION_TIME = (22, DataTypes.U32) # Calibration time in epoch. + NUM_OF_INSTITUTIONAL_RECORD_BASIC_FIELDS = (23, DataTypes.NONE) # Number of Institutional Record Basic Fields + +DDInstitutionalRecordBasicFields._str_list = { + # Official Name : Accepted strings + 'MIN_DIALYSATE_SYSTEM_FLOW_MLPM': [], + 'MAX_DIALYSATE_SYSTEM_FLOW_MLPM': [], + 'MIN_DIALYSATE_TEMP_C': [], + 'MAX_DIALYSATE_TEMP_C': [], + 'ACID_CONCENTRATE': [], + 'BICARB_CARTRIDGE_SIZE_G': [], + 'MIN_SODIUM_MEQPL': [], + 'MAX_SODIUM_MEQPL': [], + 'MIN_BICARBONATE_MEQPL': [], + 'MAX_BICARBONATE_MEQPL': [], + 'MIN_RO_REJECTION_RATIO_PCT': [], + 'DISINFECTION_FREQUENCY': [], + 'DISINFECTION_CYCLE_TIME': [], + 'MIN_INLET_WATER_CIND_AKARN_LIMIT_USPCM': [], + 'MAX_INLET_WATER_CIND_AKARN_LIMIT_USPCM': [], + 'ACID_CONCENTRATE_JUG_SIZE_L': [], + 'MIN_ACID_ALARM_LIMIT_PCT': [], + 'MIN_BICARB_ALARM_LIMIT_PCT': [], + 'POST_TREAT_DRAIN_OPTION': [], + 'POST_TREAT_DRY_BICARB_OPTION': [], + 'CALIBRATION_TIME': [], + 'NUM_OF_INSTITUTIONAL_RECORD_BASIC_FIELDS': [], +} + + +@unique +class DDInstitutionalRecordAdvancedFields(RecordsBaseEnum): + CALIBRATION_TIME = (0, DataTypes.U32) # Calibration time in epoch. + NUM_OF_INSTITUTIONAL_RECORD_ADVANCED_FIELDS = (1, DataTypes.NONE) # Number of Institutional Record Advanced Fields + +DDInstitutionalRecordAdvancedFields._str_list = { + # Official Name : Accepted strings + 'CALIBRATION_TIME': [], + 'NUM_OF_INSTITUTIONAL_RECORD_FIELDS': [], +} + + +@unique +class DDInstitutionalRecordAdditionalFields(RecordsBaseEnum): + CALIBRATION_TIME = (0, DataTypes.U32) # Calibration time in epoch. + NUM_OF_INSTITUTIONAL_RECORD_ADDITIONAL_FIELDS = (1, DataTypes.NONE) # Number of Institutional Record Additional Fields + +DDInstitutionalRecordAdditionalFields._str_list = { + # Official Name : Accepted strings + 'CALIBRATION_TIME': [], + 'NUM_OF_INSTITUTIONAL_RECORD_ADDITIONAL_FIELDS': [], +} + + +@unique +class DDUsageInformationRecordFields(RecordsBaseEnum): + RO_WATER_GEN_TOTAL_L = (0, DataTypes.F32) # Total RO water generated in liters. (Cannot be reset) + RO_WATER_GEN_SINCE_LAST_SERVICE_L = (1, DataTypes.F32) # RO water generated since last treatment in liters + LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH = (2, DataTypes.U32) # Last basic flush complete date in epoch. + LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH = (3, DataTypes.U32) # Last heat disinfect complete date in epoch. + LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH = (4, DataTypes.U32) # Last heat disinfect active cool complete date in epoch. + LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH = (5, DataTypes.U32) # Last filter flush complete date in epoch. + LAST_RESET_TIME_EPOCH = (6, DataTypes.U32) # Last time the record was reset in epoch. + NUM_OF_USAGE_INFO_RECORD_FIELDS = (7, DataTypes.NONE) # Number of Usage Information Record Fields + +DDUsageInformationRecordFields._str_list = { + # Official Name : Accepted strings + 'RO_WATER_GEN_TOTAL_L': [], + 'RO_WATER_GEN_SINCE_LAST_SERVICE_L': [], + 'LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH': [], + 'LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH': [], + 'LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH': [], + 'LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH': [], + 'LAST_RESET_TIME_EPOCH': [], + 'NUM_OF_USAGE_INFO_RECORD_FIELDS': [], +} Index: leahi_dialin/common/dd_defs_proxy.py =================================================================== diff -u -r436742844a3fbbb6a3b0bc81dc87bc6385c3e368 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision 436742844a3fbbb6a3b0bc81dc87bc6385c3e368) +++ leahi_dialin/common/dd_defs_proxy.py (.../dd_defs_proxy.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -20,79 +20,79 @@ class DD_Defs(): # Operation Modes - Lvl 1 - DDOpModes = dd_defs.DDOpModes + DDOpModes = dd_defs.DDOpModes # Operation Modes - Lvl 2 - DDFaultStates = dd_defs.DDFaultStates - DDServiceStates = dd_defs.DDServiceStates - DDInitStates = dd_defs.DDInitStates - DDStandbyStates = dd_defs.DDStandbyStates - DDPreGenDialysateStates = dd_defs.DDPreGenDialysateStates - DDGenDialysateModeStates = dd_defs.DDGenDialysateModeStates - DDPostGenDialysateStates = dd_defs.DDPostGenDialysateStates - DDHeatDisinfectStates = dd_defs.DDHeatDisinfectStates - DDHeaterCoolingStates = dd_defs.DDHeaterCoolingStates - DDROPermeateStates = dd_defs.DDROPermeateStates - DDNotLegalStates = dd_defs.DDNotLegalStates + DDFaultStates = dd_defs.DDFaultStates + DDServiceStates = dd_defs.DDServiceStates + DDInitStates = dd_defs.DDInitStates + DDStandbyStates = dd_defs.DDStandbyStates + DDPreGenDialysateStates = dd_defs.DDPreGenDialysateStates + DDGenDialysateModeStates = dd_defs.DDGenDialysateModeStates + DDPostGenDialysateStates = dd_defs.DDPostGenDialysateStates + DDHeatDisinfectStates = dd_defs.DDHeatDisinfectStates + DDHeaterCoolingStates = dd_defs.DDHeaterCoolingStates + DDROPermeateStates = dd_defs.DDROPermeateStates + DDNotLegalStates = dd_defs.DDNotLegalStates # Operation Modes - Lvl 3 - DDFaultNVDataStates = dd_defs.DDFaultNVDataStates - DDPreGenWetSelfTestStates = dd_defs.DDPreGenWetSelfTestStates + DDFaultNVDataStates = dd_defs.DDFaultNVDataStates + DDPreGenWetSelfTestStates = dd_defs.DDPreGenWetSelfTestStates # Events - DDEventList = dd_defs.DDEventList - DataTypes = generic_defs.DataTypes + DDEventList = dd_defs.DDEventList + DataTypes = generic_defs.DataTypes # Sensor Names - DDConcentratePumpNames = dd_defs.DDConcentratePumpNames - DDConductivitySensorNames = dd_defs.DDConductivitySensorNames - DDDialysatePumpNames = dd_defs.DDDialysatePumpNames - DDHeaterNames = dd_defs.DDHeaterNames - DDLevelSensorNames = dd_defs.DDLevelSensorNames - DDPistonPumpNames = dd_defs.DDPistonPumpNames - DDPressureSensorNames = dd_defs.DDPressureSensorNames - DDTemperatureSensorNames = dd_defs.DDTemperatureSensorNames - DDValveNames = dd_defs.DDValveNames - DDMonitoredVoltages = dd_defs.DDMonitoredVoltages - DDSubstitutionPumpNames = dd_defs.DDSubstitutionPumpNames + DDConcentratePumpNames = dd_defs.DDConcentratePumpNames + DDConductivitySensorNames = dd_defs.DDConductivitySensorNames + DDDialysatePumpNames = dd_defs.DDDialysatePumpNames + DDHeaterNames = dd_defs.DDHeaterNames + DDLevelSensorNames = dd_defs.DDLevelSensorNames + DDPistonPumpNames = dd_defs.DDPistonPumpNames + DDPressureSensorNames = dd_defs.DDPressureSensorNames + DDTemperatureSensorNames = dd_defs.DDTemperatureSensorNames + DDValveNames = dd_defs.DDValveNames + DDMonitoredVoltages = dd_defs.DDMonitoredVoltages + DDSubstitutionPumpNames = dd_defs.DDSubstitutionPumpNames # Sensor Attributes - DDBalancingChamberStates = dd_defs.DDBalancingChamberStates - DDBalancingChamberSwitchStates = dd_defs.DDBalancingChamberSwitchStates - DDBicarbChFillExecStates = dd_defs.DDBicarbChFillExecStates - DDBloodLeakStates = dd_defs.DDBloodLeakStates - DDConcentratePumpAttributes = dd_defs.DDConcentratePumpAttributes - DDConcentratePumpStates = dd_defs.DDConcentratePumpStates - DDDialysatePumpAttributes = dd_defs.DDDialysatePumpAttributes - DDDialysatePumpsStates = dd_defs.DDDialysatePumpsStates - DDDryBicartDrainExecStates = dd_defs.DDDryBicartDrainExecStates - DDDryBicartFillExecStates = dd_defs.DDDryBicartFillExecStates - DDHeaterStartStop = dd_defs.DDHeaterStartStop - DDHeaterAttributes = dd_defs.DDHeaterAttributes - DDHeaterExecState = dd_defs.DDHeaterExecState - DDPistonPumpAttributes = dd_defs.DDPistonPumpAttributes - DDSpentChFillExecState = dd_defs.DDSpentChFillExecState - DDValveStates = dd_defs.DDValveStates - DDCancelModes = dd_defs.DDCancelModes - DDSubstitutionPumpAttributes = dd_defs.DDSubstitutionPumpAttributes - DDConductivityResistanceAttributes = dd_defs.DDConductivityResistanceAttributes + DDBalancingChamberStates = dd_defs.DDBalancingChamberStates + DDBalancingChamberSwitchStates = dd_defs.DDBalancingChamberSwitchStates + DDBicarbChFillExecStates = dd_defs.DDBicarbChFillExecStates + DDBloodLeakStates = dd_defs.DDBloodLeakStates + DDConcentratePumpAttributes = dd_defs.DDConcentratePumpAttributes + DDConcentratePumpStates = dd_defs.DDConcentratePumpStates + DDDialysatePumpAttributes = dd_defs.DDDialysatePumpAttributes + DDDialysatePumpsStates = dd_defs.DDDialysatePumpsStates + DDDryBicartDrainExecStates = dd_defs.DDDryBicartDrainExecStates + DDDryBicartFillExecStates = dd_defs.DDDryBicartFillExecStates + DDHeaterStartStop = dd_defs.DDHeaterStartStop + DDHeaterAttributes = dd_defs.DDHeaterAttributes + DDHeaterExecState = dd_defs.DDHeaterExecState + DDPistonPumpAttributes = dd_defs.DDPistonPumpAttributes + DDSpentChFillExecState = dd_defs.DDSpentChFillExecState + DDValveStates = dd_defs.DDValveStates + DDCancelModes = dd_defs.DDCancelModes + DDSubstitutionPumpAttributes = dd_defs.DDSubstitutionPumpAttributes + DDConductivityResistanceAttributes = dd_defs.DDConductivityResistanceAttributes # Records - RecordTypes = generic_defs.RecordTypes - SystemRecordFields = generic_defs.SystemRecordFields - ServiceRecordFields = generic_defs.ServiceRecordFields - CalibrationRecordFields = generic_defs.get_calibration_record_fields() - InstitutionalRecordBasicFields = generic_defs.InstitutionalRecordBasicFields - InstitutionalRecordAdvancedFields = generic_defs.InstitutionalRecordAdvancedFields - InstitutionalRecordAdditionalFields = generic_defs.InstitutionalRecordAdditionalFields - UsageInformationRecordFields = generic_defs.UsageInformationRecordFields + RecordTypes = generic_defs.RecordTypes + DDSystemRecordFields = dd_defs.DDSystemRecordFields + DDServiceRecordFields = dd_defs.DDServiceRecordFields + DDCalibrationRecordFields = dd_defs.get_calibration_record_fields() + DDInstitutionalRecordBasicFields = dd_defs.DDInstitutionalRecordBasicFields + DDInstitutionalRecordAdvancedFields = dd_defs.DDInstitutionalRecordAdvancedFields + DDInstitutionalRecordAdditionalFields = dd_defs.DDInstitutionalRecordAdditionalFields + DDUsageInformationRecordFields = dd_defs.DDUsageInformationRecordFields # Record support - CalibRecordAccelerometerFields = generic_defs.CalibRecordAccelerometerFields - CalibRecordBloodLeakFields = generic_defs.CalibRecordBloodLeakFields - CalibRecordConcentrateFields = generic_defs.CalibRecordConcentrateFields - CalibRecordSensorFields = generic_defs.CalibRecordSensorFields - CalibRecordConductivityFields = generic_defs.CalibRecordConductivityFields + DDCalibRecordAccelerometerFields = dd_defs.DDCalibRecordAccelerometerFields + DDCalibRecordBloodLeakFields = dd_defs.DDCalibRecordBloodLeakFields + DDCalibRecordConcentrateFields = dd_defs.DDCalibRecordConcentrateFields + DDCalibRecordSensorFields = dd_defs.DDCalibRecordSensorFields + DDCalibRecordConductivityFields = dd_defs.DDCalibRecordConductivityFields dd_enum_repository = DD_Defs() Index: leahi_dialin/common/disp_defs.py =================================================================== diff -u -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/disp_defs.py (.../disp_defs.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) +++ leahi_dialin/common/disp_defs.py (.../disp_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -14,9 +14,11 @@ # ############################################################################ +# Module import from enum import unique -from ..utils.enums import DialinEnum +# Project import +from leahi_dialin.utils.enums import DialinEnum # ================================================== Enum Creators: Disposables ================================================== Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r81e359d6c7ced081bd4580ec3e6cc38939781c6a -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 81e359d6c7ced081bd4580ec3e6cc38939781c6a) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -14,10 +14,12 @@ # ############################################################################ +# Module import from enum import unique -from .dd_defs import DDConductivitySensorNames, DDEventList, DDPressureSensorNames, DDValveNames, DDLevelSensorNames -from ..utils.enums import DialinEnum +# Project imports +from leahi_dialin.common.dd_defs import DDConductivitySensorNames, DDEventList, DDPressureSensorNames, DDValveNames, DDLevelSensorNames +from leahi_dialin.utils.enums import DialinEnum # ================================================== Constants ================================================== Index: leahi_dialin/common/generic_defs.py =================================================================== diff -u -r436742844a3fbbb6a3b0bc81dc87bc6385c3e368 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/generic_defs.py (.../generic_defs.py) (revision 436742844a3fbbb6a3b0bc81dc87bc6385c3e368) +++ leahi_dialin/common/generic_defs.py (.../generic_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -14,12 +14,11 @@ # ############################################################################ +# Moudle imports from enum import unique -from ..utils.enums import DialinEnum -from .dd_defs import DDPressureSensorNames, DDTemperatureSensorNames, DDConcentratePumpNames, DDConductivitySensorNames, DDDialysatePumpNames -from .disp_defs import AcidTypes, BicarbTypes -from .fp_defs import FPPressureSensorNames +# Project imports +from leahi_dialin.utils.enums import DialinEnum # ================================================== Enum Creators: DataTypes ================================================== @@ -65,6 +64,8 @@ } + +# ================================================== Enum Creators: Alarms ================================================== @unique class AlarmLampPatterns(DialinEnum): OFF = 0 @@ -166,7 +167,7 @@ -# ================================================== Enum Creators: Record Base ================================================== +# ================================================== Enum Creators: Records ================================================== @unique class RecordsBaseEnum(DialinEnum): def __new__(cls, value, unpack_type, unpack_length: int=1): @@ -183,114 +184,7 @@ return self.unpack_length - -# ================================================== Enum Creators: Record Sub Fields ================================================== @unique -class CalibRecordAccelerometerFields(RecordsBaseEnum): - ACCEL_X_OFFSET = (0, DataTypes.F32) # DD accelerometer X axis offset - ACCEL_Y_OFFSET = (1, DataTypes.F32) # DD accelerometer Y axis offset - ACCEL_Z_OFFSET = (2, DataTypes.F32) # DD accelerometer Z axis offset - CALIBRATION_TIME = (3, DataTypes.U32) # Calibration time - NUM_OF_CALIBRATION_RECORD_ACCELEROMETER_FIELDS = (4, DataTypes.NONE) # Number of Calibration Record Accelerometer's Fields - -CalibRecordAccelerometerFields._str_list = { - # Official Name : Accepted strings - 'ACCEL_X_OFFSET': [], - 'ACCEL_Y_OFFSET': [], - 'ACCEL_Z_OFFSET': [], - 'CALIBRATION_TIME': [], - 'NUM_OF_CALIBRATION_RECORD_ACCELEROMETER_FIELDS': [], -} - - -@unique -class CalibRecordBloodLeakFields(RecordsBaseEnum): - SET_POINT = (0, DataTypes.U16) # DD Blood leak sensor set point - CALIBRATION_TIME = (1, DataTypes.U32) # Calibration time - NUM_OF_CALIBRATION_RECORD_BLOOD_LEAK_FIELDS = (2, DataTypes.NONE) # Number of Calibration Record Accelerometer's Fields - -CalibRecordBloodLeakFields._str_list = { - # Official Name : Accepted strings - 'SET_POINT': [], - 'CALIBRATION_TIME': [], - 'NUM_OF_CALIBRATION_RECORD_BLOOD_LEAK_FIELDS': [], -} - - -@unique -class CalibRecordConcentrateFields(RecordsBaseEnum): - CONCENTRATE_MIX_RATIO = (0, DataTypes.F32) # Acid or Bicarb Concentrate mix ratio. - FULL_BOTTLE_VOLUME_ML = (1, DataTypes.F32) # Acid or Bicarb full bottle volume in milliliters. - CONDUCTIVITY_USPCM = (2, DataTypes.F32) # Acid or Bicarb conductivity in uS/cm. - BOTTLE_TEMPERATURE_C = (3, DataTypes.F32) # Acid or Bicarb bottle temperature in C. - CALIBRATION_TIME = (4, DataTypes.U32) # Calibration time - NUM_OF_CALIBRATION_RECORD_CONCENTRATE_FIELDS = (5, DataTypes.NONE) # Number of Calibration Record Acid and Bicarb Concentrate's Fields - -CalibRecordConcentrateFields._str_list = { - # Official Name : Accepted strings - 'CONCENTRATE_MIX_RATIO': [], - 'FULL_BOTTLE_VOLUME_ML': [], - 'CONDUCTIVITY_USPCM': [], - 'BOTTLE_TEMPERATURE_C': [], - 'CALIBRATION_TIME': [], - 'NUM_OF_CALIBRATION_RECORD_CONCENTRATE_FIELDS': [], -} - - -@unique -class CalibRecordConductivityFields(RecordsBaseEnum): - K_HIGH = (0, DataTypes.F32) # Cell Coefficient High - ALPHA_HIGH = (1, DataTypes.F32) # Temperature correction High - ETA_HIGH = (2, DataTypes.F32) # Resistance Scale Factor High - ZETA_HIGH = (3, DataTypes.F32) # Resistance Offset High - K_LOW = (4, DataTypes.F32) # Cell Coefficient Low - ALPHA_LOW = (5, DataTypes.F32) # Temperature correction Low - ETA_LOW = (6, DataTypes.F32) # Resistance Scale Factor Low - ZETA_LOW = (7, DataTypes.F32) # Resistance Offset Low - BETA = (8, DataTypes.F32) # Temperature Scale Factor - DELTA = (9, DataTypes.F32) # Temperature Offset - RSRVD_1 = (10, DataTypes.F32) # Reserved slot - RSRVD_2 = (11, DataTypes.F32) # Reserved slot - CALIBRATION_TIME = (12, DataTypes.U32) # Calibration time - NUM_OF_CALIBRATION_RECORD_CONDUCTIVITY_FIELDS = (13, DataTypes.NONE) # Number of Calibration Record Conductivity Fields - -CalibRecordConductivityFields._str_list = { - # Official Name : Accepted strings - 'K_HIGH': [], - 'ALPHA_HIGH': [], - 'ETA_HIGH': [], - 'ZETA_HIGH': [], - 'K_LOW': [], - 'ALPHA_LOW': [], - 'ETA_LOW': [], - 'ZETA_LOW': [], - 'BETA': [], - 'DELTA': [], - 'RSRVD_1': [], - 'RSRVD_2': [], - 'CALIBRATION_TIME': [], - 'NUM_OF_CALIBRATION_RECORD_CONCENTRATE_FIELDS': [], -} - - -@unique -class CalibRecordSensorFields(RecordsBaseEnum): - GAIN = (0, DataTypes.F32) # Sensor's Gain - OFFSET = (1, DataTypes.F32) # Sensor's Offset - CALIBRATION_TIME = (2, DataTypes.U32) # Sensor's Calibration time - NUM_OF_CALIBRATION_RECORD_SENSOR_FIELDS = (3, DataTypes.NONE) # Number of Calibration Record Sensor's Fields - -CalibRecordSensorFields._str_list = { - # Official Name : Accepted strings - 'GAIN': [], - 'OFFSET': [], - 'CALIBRATION_TIME': [], - 'NUM_OF_CALIBRATION_RECORD_SENSOR_FIELDS': [], -} - - -# ================================================== Enum Creators: Record Fields ================================================== -@unique class RecordTypes(DialinEnum): SYSTEM_RECORD = 0 # System Record SERVICE_RECORD = 1 # System Record @@ -308,246 +202,3 @@ 'USAGE_INFORMATION_RECORD': [], 'NUM_OF_RECORD_TYPES': [], } - - -@unique -class SystemRecordFields(RecordsBaseEnum): - IS_RO_FEATURED = (0, DataTypes.BOOL) # Is RO featured or defeatured - IS_RO_BOOST_PUMP_ADDED = (1, DataTypes.BOOL) # Is RO have boost pump or not - TOP_LEVEL_PN = (2, DataTypes.U08, 10) # Top level part number - TOP_LEVEL_SN = (3, DataTypes.U08, 20) # Top level serial number - MFG_LOCATION = (4, DataTypes.U08) # Manufacturing Location - MFG_DATE = (5, DataTypes.U32) # Manufacturing Date - NUM_OF_SYSTEM_RECORD_FIELDS = (6, DataTypes.NONE) # Number of System Record Fields - -SystemRecordFields._str_list = { - # Official Name : Accepted strings - 'TOP_LEVEL_PN': ['pn', 'part number'], - 'TOP_LEVEL_SN': ['sn', 'serial number'], - 'MFG_LOCATION': ['location', 'manufacturing location'], - 'MFG_DATE': ['date', 'manufacturing date'], - 'NUM_OF_SYSTEM_RECORD_FIELDS': [], -} - - -@unique -class ServiceRecordFields(RecordsBaseEnum): - IS_HDF_ONLINE_FLUID = (0, DataTypes.BOOL) # DD Is HDF Online - WATER_RECOVERY = (1, DataTypes.U32) # DD Water Recovery - SERVICE_LOC = (2, DataTypes.U08) # DD service location - LAST_SERVICE_EPOCH_DATE = (3, DataTypes.U32) # DD last service date in epoch - SERVICE_INTERVAL_SECONDS = (4, DataTypes.U32) # DD service interval in seconds - LAST_RESET_TIME_EPOCH = (5, DataTypes.U32) # Last time the record was reset in epoch - NUM_OF_SERVICE_RECORD_FIELDS = (6, DataTypes.NONE) # Number of Service Record Fields - -ServiceRecordFields._str_list = { - # Official Name : Accepted strings - 'IS_HDF_ONLINE_FLUID': [], - 'WATER_RECOVERY': [], - 'SERVICE_LOC': [], - 'LAST_SERVICE_EPOCH_DATE': [], - 'SERVICE_INTERVAL_SECONDS': [], - 'LAST_RESET_TIME_EPOCH': [], - 'NUM_OF_SERVICE_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 CalibRecordSensorFields: - 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 CalibRecordSensorFields: - 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 CalibRecordSensorFields: - 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 CalibRecordSensorFields: - 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}__{CalibRecordSensorFields.CALIBRATION_TIME.name}'] = (i, CalibRecordSensorFields.CALIBRATION_TIME.datatype()) - i += 1 - else: - for field_name in CalibRecordSensorFields: - 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 CalibRecordConcentrateFields: - 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 CalibRecordConcentrateFields: - 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 CalibRecordAccelerometerFields: - if 'num_' in field_name.name.lower(): - continue - members[f'ACCEL__{field_name.name}'] = (i, field_name.datatype()) - i += 1 - for field_name in CalibRecordBloodLeakFields: - 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 CalibRecordConductivityFields: - 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 - CalibrationRecordFields = RecordsBaseEnum('CalibrationRecordFields', members,) - - # Setting the _str_list values for the enum - CalibrationRecordFields._str_list = {} - for member in members: - CalibrationRecordFields._str_list[member] = [] - - return CalibrationRecordFields - - -@unique -class InstitutionalRecordBasicFields(RecordsBaseEnum): - MIN_DIALYSATE_SYSTEM_FLOW_MLPM = (0, DataTypes.U32) # Min dialysate flow in mL/min - MAX_DIALYSATE_SYSTEM_FLOW_MLPM = (1, DataTypes.U32) # Max dialysate flow in mL/min - MIN_DIALYSATE_TEMP_C = (2, DataTypes.F32) # Min dialysate temperature in C - MAX_DIALYSATE_TEMP_C = (3, DataTypes.F32) # Max dialysate temperature in C - MIN_ACID_CONCENTRATE = (4, DataTypes.U32) # Min Acid concentrate - MAX_ACID_CONCENTRATE = (5, DataTypes.U32) # Max Acid concentrate - MIN_BICARB_CARTRIDGE_SIZE_G = (6, DataTypes.U32) # Min Bicarbonate cartridge size in grams - MAX_BICARB_CARTRIDGE_SIZE_G = (7, DataTypes.U32) # Max Bicarbonate cartridge size in grams - MIN_SODIUM_MEQPL = (8, DataTypes.U32) # Min sodium in mEq/L - MAX_SODIUM_MEQPL = (9, DataTypes.U32) # Max sodium in mEq/L - MIN_BICARBONATE_MEQPL = (10, DataTypes.U32) # Min bicarbonate in mEq/L - MAX_BICARBONATE_MEQPL = (11, DataTypes.U32) # Max bicarbonate in mEq/L - MIN_RO_REJECTION_RATIO_PCT = (12, DataTypes.F32) # Min RO rejection ratio in percent - DISINFECTION_FREQUENCY = (13, DataTypes.U32) # Disinfection days between cycles - DISINFECTION_CYCLE_TIME = (14, DataTypes.F32) # Disinfection Cycle Time - MIN_INLET_WATER_CIND_AKARN_LIMIT_USPCM = (15, DataTypes.F32) # Min inlet water conductivity alarm limit in uS/cm - MAX_INLET_WATER_CIND_AKARN_LIMIT_USPCM = (16, DataTypes.F32) # Max inlet water conductivity alarm limit in uS/cm - ACID_CONCENTRATE_JUG_SIZE_L = (17, DataTypes.F32) # acid concentrate jug size in Liters - MIN_ACID_ALARM_LIMIT_PCT = (18, DataTypes.F32) # Min acid alarm limit in percent - MIN_BICARB_ALARM_LIMIT_PCT = (19, DataTypes.F32) # Min bicarbonate alarm limit in percent - POST_TREAT_DRAIN_OPTION = (20, DataTypes.U32) # Dialysate Post Treatment Drain Option  - POST_TREAT_DRY_BICARB_OPTION = (21, DataTypes.U32) # Dry Bicarbonate Post Treatment Option  - CALIBRATION_TIME = (22, DataTypes.U32) # Calibration time in epoch. - NUM_OF_INSTITUTIONAL_RECORD_BASIC_FIELDS = (23, DataTypes.NONE) # Number of Institutional Record Basic Fields - -InstitutionalRecordBasicFields._str_list = { - # Official Name : Accepted strings - 'MIN_DIALYSATE_SYSTEM_FLOW_MLPM': [], - 'MAX_DIALYSATE_SYSTEM_FLOW_MLPM': [], - 'MIN_DIALYSATE_TEMP_C': [], - 'MAX_DIALYSATE_TEMP_C': [], - 'ACID_CONCENTRATE': [], - 'BICARB_CARTRIDGE_SIZE_G': [], - 'MIN_SODIUM_MEQPL': [], - 'MAX_SODIUM_MEQPL': [], - 'MIN_BICARBONATE_MEQPL': [], - 'MAX_BICARBONATE_MEQPL': [], - 'MIN_RO_REJECTION_RATIO_PCT': [], - 'DISINFECTION_FREQUENCY': [], - 'DISINFECTION_CYCLE_TIME': [], - 'MIN_INLET_WATER_CIND_AKARN_LIMIT_USPCM': [], - 'MAX_INLET_WATER_CIND_AKARN_LIMIT_USPCM': [], - 'ACID_CONCENTRATE_JUG_SIZE_L': [], - 'MIN_ACID_ALARM_LIMIT_PCT': [], - 'MIN_BICARB_ALARM_LIMIT_PCT': [], - 'POST_TREAT_DRAIN_OPTION': [], - 'POST_TREAT_DRY_BICARB_OPTION': [], - 'CALIBRATION_TIME': [], - 'NUM_OF_INSTITUTIONAL_RECORD_BASIC_FIELDS': [], -} - - -@unique -class InstitutionalRecordAdvancedFields(RecordsBaseEnum): - CALIBRATION_TIME = (0, DataTypes.U32) # Calibration time in epoch. - NUM_OF_INSTITUTIONAL_RECORD_ADVANCED_FIELDS = (1, DataTypes.NONE) # Number of Institutional Record Advanced Fields - -InstitutionalRecordAdvancedFields._str_list = { - # Official Name : Accepted strings - 'CALIBRATION_TIME': [], - 'NUM_OF_INSTITUTIONAL_RECORD_FIELDS': [], -} - - -@unique -class InstitutionalRecordAdditionalFields(RecordsBaseEnum): - CALIBRATION_TIME = (0, DataTypes.U32) # Calibration time in epoch. - NUM_OF_INSTITUTIONAL_RECORD_ADDITIONAL_FIELDS = (1, DataTypes.NONE) # Number of Institutional Record Additional Fields - -InstitutionalRecordAdditionalFields._str_list = { - # Official Name : Accepted strings - 'CALIBRATION_TIME': [], - 'NUM_OF_INSTITUTIONAL_RECORD_ADDITIONAL_FIELDS': [], -} - - -@unique -class UsageInformationRecordFields(RecordsBaseEnum): - RO_WATER_GEN_TOTAL_L = (0, DataTypes.F32) # Total RO water generated in liters. (Cannot be reset) - RO_WATER_GEN_SINCE_LAST_SERVICE_L = (1, DataTypes.F32) # RO water generated since last treatment in liters - LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH = (2, DataTypes.U32) # Last basic flush complete date in epoch. - LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH = (3, DataTypes.U32) # Last heat disinfect complete date in epoch. - LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH = (4, DataTypes.U32) # Last heat disinfect active cool complete date in epoch. - LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH = (5, DataTypes.U32) # Last filter flush complete date in epoch. - LAST_RESET_TIME_EPOCH = (6, DataTypes.U32) # Last time the record was reset in epoch. - NUM_OF_USAGE_INFO_RECORD_FIELDS = (7, DataTypes.NONE) # Number of Usage Information Record Fields - -UsageInformationRecordFields._str_list = { - # Official Name : Accepted strings - 'RO_WATER_GEN_TOTAL_L': [], - 'RO_WATER_GEN_SINCE_LAST_SERVICE_L': [], - 'LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH': [], - 'LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH': [], - 'LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH': [], - 'LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH': [], - 'LAST_RESET_TIME_EPOCH': [], - 'NUM_OF_USAGE_INFO_RECORD_FIELDS': [], -} Index: leahi_dialin/common/msg_defs.py =================================================================== diff -u -raf4e5fe9be4be627d61b4b4f75d0ed56c1ce4fa1 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/msg_defs.py (.../msg_defs.py) (revision af4e5fe9be4be627d61b4b4f75d0ed56c1ce4fa1) +++ leahi_dialin/common/msg_defs.py (.../msg_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -13,7 +13,11 @@ # @date (original) 31-Jul-2026 # ############################################################################ + +# Module import from enum import unique + +# Project import from leahi_dialin.utils.enums import DialinEnum Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -raf4e5fe9be4be627d61b4b4f75d0ed56c1ce4fa1 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision af4e5fe9be4be627d61b4b4f75d0ed56c1ce4fa1) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -13,7 +13,11 @@ # @date (original) 31-Jul-2026 # ############################################################################ + +# Module import from enum import unique + +# Project import from leahi_dialin.utils.enums import DialinEnum Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r43f69b19f03145572d88f5f3c0cc739503c6d647 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 43f69b19f03145572d88f5f3c0cc739503c6d647) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -14,9 +14,13 @@ # ############################################################################ +# Module import from enum import unique -from ..utils.enums import DialinEnum +# Project import +from leahi_dialin.common.dd_defs import DDInstitutionalRecordBasicFields +from leahi_dialin.common.generic_defs import DataTypes, RecordsBaseEnum +from leahi_dialin.utils.enums import DialinEnum # ================================================== Enum Creators: Operations Lvl 1 ================================================== @@ -1330,3 +1334,121 @@ 'HEPATITIS_B_NEGATIVE': ['negative'], 'NUM_OF_HEPATITIS_B_STATUS': [], } + + +# ================================================== Enum Creators: Record Sub Fields ================================================== + + + +# ================================================== Enum Creators: Record Fields ================================================== +@unique +class TDSystemRecordFields(RecordsBaseEnum): + TOP_LEVEL_PN = (0, DataTypes.U08, 10) # Top level part number + TOP_LEVEL_SN = (1, DataTypes.U08, 20) # Top level serial number + MFG_LOCATION = (2, DataTypes.U08) # Manufacturing Location + MFG_DATE = (3, DataTypes.U32) # Manufacturing Date + NUM_OF_SYSTEM_RECORD_FIELDS = (4, DataTypes.NONE) # Number of System Record Fields + +TDSystemRecordFields._str_list = { + # Official Name : Accepted strings + 'TOP_LEVEL_PN': ['pn', 'part number'], + 'TOP_LEVEL_SN': ['sn', 'serial number'], + 'MFG_LOCATION': ['location', 'manufacturing location'], + 'MFG_DATE': ['date', 'manufacturing date'], + 'NUM_OF_SYSTEM_RECORD_FIELDS': [], +} + + +@unique +class TDServiceRecordFields(RecordsBaseEnum): + SERVICE_LOC = (0, DataTypes.U08) # DD service location + LAST_SERVICE_EPOCH_DATE = (1, DataTypes.U32) # DD last service date in epoch + SERVICE_INTERVAL_SECONDS = (2, DataTypes.U32) # DD service interval in seconds + LAST_RESET_TIME_EPOCH = (3, DataTypes.U32) # Last time the record was reset in epoch + NUM_OF_SERVICE_RECORD_FIELDS = (4, DataTypes.NONE) # Number of Service Record Fields + +TDServiceRecordFields._str_list = { + # Official Name : Accepted strings + 'SERVICE_LOC': [], + 'LAST_SERVICE_EPOCH_DATE': [], + 'SERVICE_INTERVAL_SECONDS': [], + 'LAST_RESET_TIME_EPOCH': [], + 'NUM_OF_SERVICE_RECORD_FIELDS': [], +} + + +def get_calibration_record_fields() -> RecordsBaseEnum: + # Creating the enum members list + i = 0 + members = {} + members[f'NUM_OF_CALIBRATION_RECORD_FIELDS'] = (i, DataTypes.NONE) + + # Enum creation + TDCalibrationRecordFields = RecordsBaseEnum('TDCalibrationRecordFields', members,) + + # Setting the _str_list values for the enum + TDCalibrationRecordFields._str_list = {} + for member in members: + TDCalibrationRecordFields._str_list[member] = [] + + return TDCalibrationRecordFields + + +@unique +class TDInstitutionalRecordBasicFields(RecordsBaseEnum): + CALIBRATION_TIME = (0, DataTypes.U32) # Calibration time in epoch. + NUM_OF_INSTITUTIONAL_RECORD_BASIC_FIELDS = (1, DataTypes.NONE) # Number of Institutional Record Basic Fields + +TDInstitutionalRecordBasicFields._str_list = { + # Official Name : Accepted strings + 'CALIBRATION_TIME': [], + 'NUM_OF_INSTITUTIONAL_RECORD_BASIC_FIELDS': [], +} + + +@unique +class TDInstitutionalRecordAdvancedFields(RecordsBaseEnum): + CALIBRATION_TIME = (0, DataTypes.U32) # Calibration time in epoch. + NUM_OF_INSTITUTIONAL_RECORD_ADVANCED_FIELDS = (1, DataTypes.NONE) # Number of Institutional Record Advanced Fields + +TDInstitutionalRecordAdvancedFields._str_list = { + # Official Name : Accepted strings + 'CALIBRATION_TIME': [], + 'NUM_OF_INSTITUTIONAL_RECORD_ADVANCED_FIELDS': [], +} + + +@unique +class TDInstitutionalRecordAdditionalFields(RecordsBaseEnum): + CALIBRATION_TIME = (0, DataTypes.U32) # Calibration time in epoch. + NUM_OF_INSTITUTIONAL_RECORD_ADDITIONAL_FIELDS = (1, DataTypes.NONE) # Number of Institutional Record Additional Fields + +TDInstitutionalRecordAdditionalFields._str_list = { + # Official Name : Accepted strings + 'CALIBRATION_TIME': [], + 'NUM_OF_INSTITUTIONAL_RECORD_ADDITIONAL_FIELDS': [], +} + + +@unique +class TDUsageInformationRecordFields(RecordsBaseEnum): + RO_WATER_GEN_TOTAL_L = (0, DataTypes.F32) # Total RO water generated in liters. (Cannot be reset) + RO_WATER_GEN_SINCE_LAST_SERVICE_L = (1, DataTypes.F32) # RO water generated since last treatment in liters + LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH = (2, DataTypes.U32) # Last basic flush complete date in epoch. + LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH = (3, DataTypes.U32) # Last heat disinfect complete date in epoch. + LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH = (4, DataTypes.U32) # Last heat disinfect active cool complete date in epoch. + LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH = (5, DataTypes.U32) # Last filter flush complete date in epoch. + LAST_RESET_TIME_EPOCH = (6, DataTypes.U32) # Last time the record was reset in epoch. + NUM_OF_USAGE_INFO_RECORD_FIELDS = (7, DataTypes.NONE) # Number of Usage Information Record Fields + +TDUsageInformationRecordFields._str_list = { + # Official Name : Accepted strings + 'RO_WATER_GEN_TOTAL_L': [], + 'RO_WATER_GEN_SINCE_LAST_SERVICE_L': [], + 'LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH': [], + 'LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH': [], + 'LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH': [], + 'LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH': [], + 'LAST_RESET_TIME_EPOCH': [], + 'NUM_OF_USAGE_INFO_RECORD_FIELDS': [], +} Index: leahi_dialin/common/td_defs_proxy.py =================================================================== diff -u -r436742844a3fbbb6a3b0bc81dc87bc6385c3e368 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision 436742844a3fbbb6a3b0bc81dc87bc6385c3e368) +++ leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -21,101 +21,100 @@ class TD_Defs(): # Operation Modes - Lvl 1 - TDOpModes = td_defs.TDOpModes + TDOpModes = td_defs.TDOpModes # Operation Modes - Lvl 2 - TDFaultStates = td_defs.TDFaultStates - TDServiceStates = td_defs.TDServiceStates - TDInitStates = td_defs.TDInitStates - TDStandbyStates = td_defs.TDStandbyStates - TDTreatmentParamStates = td_defs.TDTreatmentParamStates - TDPreTreatmentModesStates = td_defs.TDPreTreatmentModesStates - TDTreatmentStates = td_defs.TDTreatmentStates - TDPostTreatmentStates = td_defs.TDPostTreatmentStates - TDNotLegalStates = td_defs.TDNotLegalStates + TDFaultStates = td_defs.TDFaultStates + TDServiceStates = td_defs.TDServiceStates + TDInitStates = td_defs.TDInitStates + TDStandbyStates = td_defs.TDStandbyStates + TDTreatmentParamStates = td_defs.TDTreatmentParamStates + TDPreTreatmentModesStates = td_defs.TDPreTreatmentModesStates + TDTreatmentStates = td_defs.TDTreatmentStates + TDPostTreatmentStates = td_defs.TDPostTreatmentStates + TDNotLegalStates = td_defs.TDNotLegalStates # Operation Modes - Lvl 3 # Pre-treatment - TDPreTreaSampleWaterStates = td_defs.TDPreTreaSampleWaterStates - TDPreTreaConsumableSelfTestStates = td_defs.TDPreTreaConsumableSelfTestStates - TDPreTreaNoCartSelfTestStates = td_defs.TDPreTreaNoCartSelfTestStates - TDPreTreaDrySelfTestStates = td_defs.TDPreTreaDrySelfTestStates - TDPreTreaPrimeStates = td_defs.TDPreTreaPrimeStates - TDPreTreaRecircStates = td_defs.TDPreTreaRecircStates - TDPreTreaPatientConnectStates = td_defs.TDPreTreaPatientConnectStates + TDPreTreaSampleWaterStates = td_defs.TDPreTreaSampleWaterStates + TDPreTreaConsumableSelfTestStates = td_defs.TDPreTreaConsumableSelfTestStates + TDPreTreaNoCartSelfTestStates = td_defs.TDPreTreaNoCartSelfTestStates + TDPreTreaDrySelfTestStates = td_defs.TDPreTreaDrySelfTestStates + TDPreTreaPrimeStates = td_defs.TDPreTreaPrimeStates + TDPreTreaRecircStates = td_defs.TDPreTreaRecircStates + TDPreTreaPatientConnectStates = td_defs.TDPreTreaPatientConnectStates # Treatment - TDTreaBloodPrimeStates = td_defs.TDTreaBloodPrimeStates - TDTreaDialysisStates = td_defs.TDTreaDialysisStates - TDTreaPausedStates = td_defs.TDTreaPausedStates - TDTreaRinsebackStates = td_defs.TDTreaRinsebackStates - TDTreaRecircStates = td_defs.TDTreaRecircStates - TDTreaBolusStates = td_defs.TDTreaBolusStates - TDTreaHeparinStates = td_defs.TDTreaHeparinStates - TDTreaEndStates = td_defs.TDTreaEndStates + TDTreaBloodPrimeStates = td_defs.TDTreaBloodPrimeStates + TDTreaDialysisStates = td_defs.TDTreaDialysisStates + TDTreaPausedStates = td_defs.TDTreaPausedStates + TDTreaRinsebackStates = td_defs.TDTreaRinsebackStates + TDTreaRecircStates = td_defs.TDTreaRecircStates + TDTreaBolusStates = td_defs.TDTreaBolusStates + TDTreaHeparinStates = td_defs.TDTreaHeparinStates + TDTreaEndStates = td_defs.TDTreaEndStates # Operation Modes - Lvl 4 - TDPreTreaSamplWaterUserActionStates = td_defs.TDPreTreaSamplWaterUserActionStates - TDWetSelfTestsStates = td_defs.TDWetSelfTestsStates - TDTreaBloodPrimeUserActionStates = td_defs.TDTreaBloodPrimeUserActionStates - TDTreaRinsebackUserActionStates = td_defs.TDTreaRinsebackUserActionStates - TDTreaRecircUserActionStates = td_defs.TDTreaRecircUserActionStates - TDTreaEndUserActionStates = td_defs.TDTreaEndUserActionStates + TDPreTreaSamplWaterUserActionStates = td_defs.TDPreTreaSamplWaterUserActionStates + TDWetSelfTestsStates = td_defs.TDWetSelfTestsStates + TDTreaBloodPrimeUserActionStates = td_defs.TDTreaBloodPrimeUserActionStates + TDTreaRinsebackUserActionStates = td_defs.TDTreaRinsebackUserActionStates + TDTreaRecircUserActionStates = td_defs.TDTreaRecircUserActionStates + TDTreaEndUserActionStates = td_defs.TDTreaEndUserActionStates # Events - TDEventList = td_defs.TDEventList - DataTypes = generic_defs.DataTypes + TDEventList = td_defs.TDEventList + DataTypes = generic_defs.DataTypes # Sensor Names - TDAirPumpNames = td_defs.TDAirPumpNames - TDAirTrapValveNames = td_defs.TDAirTrapValveNames - TDAirTrapLevelSensorNames = td_defs.TDAirTrapLevelSensorNames - TDAirBubbleDetectorNames = td_defs.TDAirBubbleDetectorNames - TDBatteryRegisterNames = td_defs.TDBatteryRegisterNames - TDEjectorNames = td_defs.TDEjectorNames - TDPressureSensorNames = td_defs.TDPressureSensorNames - TDTemperatureSensorNames = td_defs.TDTemperatureSensorNames - TDSwitchNames = td_defs.TDSwitchNames - TDValveNames = td_defs.TDValveNames - TDMonitoredVoltages = td_defs.TDMonitoredVoltages + TDAirPumpNames = td_defs.TDAirPumpNames + TDAirTrapValveNames = td_defs.TDAirTrapValveNames + TDAirTrapLevelSensorNames = td_defs.TDAirTrapLevelSensorNames + TDAirBubbleDetectorNames = td_defs.TDAirBubbleDetectorNames + TDBatteryRegisterNames = td_defs.TDBatteryRegisterNames + TDEjectorNames = td_defs.TDEjectorNames + TDPressureSensorNames = td_defs.TDPressureSensorNames + TDTemperatureSensorNames = td_defs.TDTemperatureSensorNames + TDSwitchNames = td_defs.TDSwitchNames + TDValveNames = td_defs.TDValveNames + TDMonitoredVoltages = td_defs.TDMonitoredVoltages # Sensor Attributes - TDAirPumpAttributes = td_defs.TDAirPumpAttributes - TDAirPumpStates = td_defs.TDAirPumpStates - TDAirTrapLevelSensorAttributes = td_defs.TDAirTrapLevelSensorAttributes - TDAirTrapState = td_defs.TDAirTrapState - TDBloodFlowMotorAttributes = td_defs.TDBloodFlowMotorAttributes - TDAirBubbleDetectorAttributes = td_defs.TDAirBubbleDetectorAttributes - TDEjectorAttributes = td_defs.TDEjectorAttributes - TDEjectorStates = td_defs.TDEjectorStates - TDPressureSensorAttributes = td_defs.TDPressureSensorAttributes - TDSwitchStatus = td_defs.TDSwitchStatus - TDValvePositions = td_defs.TDValvePositions - TDValveStates = td_defs.TDValveStates + TDAirPumpAttributes = td_defs.TDAirPumpAttributes + TDAirPumpStates = td_defs.TDAirPumpStates + TDAirTrapLevelSensorAttributes = td_defs.TDAirTrapLevelSensorAttributes + TDAirTrapState = td_defs.TDAirTrapState + TDBloodFlowMotorAttributes = td_defs.TDBloodFlowMotorAttributes + TDAirBubbleDetectorAttributes = td_defs.TDAirBubbleDetectorAttributes + TDEjectorAttributes = td_defs.TDEjectorAttributes + TDEjectorStates = td_defs.TDEjectorStates + TDPressureSensorAttributes = td_defs.TDPressureSensorAttributes + TDSwitchStatus = td_defs.TDSwitchStatus + TDValvePositions = td_defs.TDValvePositions + TDValveStates = td_defs.TDValveStates # Support - TDTreatmentParameters = td_defs.TDTreatmentParameters - TDTreatmentModalityTypes = td_defs.TDTreatmentModalityTypes - TDTreatmentHDFDilution = td_defs.TDTreatmentHDFDilution + TDTreatmentParameters = td_defs.TDTreatmentParameters + TDTreatmentModalityTypes = td_defs.TDTreatmentModalityTypes + TDTreatmentHDFDilution = td_defs.TDTreatmentHDFDilution # Alarms - AlarmLampPatterns = generic_defs.AlarmLampPatterns - AlarmPriorities = generic_defs.AlarmPriorities - AlarmProperties = generic_defs.AlarmProperties - AlarmResponseButtons = generic_defs.AlarmResponseButtons + AlarmLampPatterns = generic_defs.AlarmLampPatterns + AlarmPriorities = generic_defs.AlarmPriorities + AlarmProperties = generic_defs.AlarmProperties + AlarmResponseButtons = generic_defs.AlarmResponseButtons # Records - RecordTypes = generic_defs.RecordTypes - SystemRecordFields = generic_defs.SystemRecordFields - ServiceRecordFields = generic_defs.ServiceRecordFields - CalibrationRecordFields = generic_defs.get_calibration_record_fields() - InstitutionalRecordFields = generic_defs.InstitutionalRecordBasicFields - UsageInformationRecordFields = generic_defs.UsageInformationRecordFields + RecordTypes = generic_defs.RecordTypes + TDSystemRecordFields = td_defs.TDSystemRecordFields + TDServiceRecordFields = td_defs.TDServiceRecordFields + TDCalibrationRecordFields = td_defs.get_calibration_record_fields() + TDInstitutionalRecordBasicFields = td_defs.TDInstitutionalRecordBasicFields + TDInstitutionalRecordAdvancedFields = td_defs.TDInstitutionalRecordAdvancedFields + TDInstitutionalRecordAdditionalFields = td_defs.TDInstitutionalRecordAdditionalFields + TDUsageInformationRecordFields = td_defs.TDUsageInformationRecordFields # Record support - CalibRecordAccelerometerFields = generic_defs.CalibRecordAccelerometerFields - CalibRecordBloodLeakFields = generic_defs.CalibRecordBloodLeakFields - CalibRecordConcentrateFields = generic_defs.CalibRecordConcentrateFields - CalibRecordSensorFields = generic_defs.CalibRecordSensorFields + td_enum_repository = TD_Defs() Index: leahi_dialin/common/test_config_defs.py =================================================================== diff -u -rf68df233e134d59875838d6e5bb5eb725f28ee91 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision f68df233e134d59875838d6e5bb5eb725f28ee91) +++ leahi_dialin/common/test_config_defs.py (.../test_config_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -14,10 +14,13 @@ # ############################################################################ +# Module import from enum import unique -from ..utils.enums import DialinEnum +# Project import +from leahi_dialin.utils.enums import DialinEnum + @unique class DDFPTestConfigOptions(DialinEnum): TEST_CONFIG_DD_FP_ENABLE_BETA_1_HW = 0 # (DD & FP) Test configuration using Beta 1.0 Hardware Index: leahi_dialin/common/ui_defs.py =================================================================== diff -u -r79bad15ba2bde90518ba3951dfea61218b3e0b9d -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/common/ui_defs.py (.../ui_defs.py) (revision 79bad15ba2bde90518ba3951dfea61218b3e0b9d) +++ leahi_dialin/common/ui_defs.py (.../ui_defs.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -14,7 +14,7 @@ # ############################################################################ -from . import RequestRejectReasons +from leahi_dialin.common.msg_defs import RequestRejectReasons class EResponse: Index: leahi_dialin/dd/modules/records_get_responses.py =================================================================== diff -u -r436742844a3fbbb6a3b0bc81dc87bc6385c3e368 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/dd/modules/records_get_responses.py (.../records_get_responses.py) (revision 436742844a3fbbb6a3b0bc81dc87bc6385c3e368) +++ leahi_dialin/dd/modules/records_get_responses.py (.../records_get_responses.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -102,8 +102,8 @@ msg_list = [] msg_list.append((type(self).get_system_rec_ack, DataTypes.BOOL)) msg_list.append((type(self).get_system_rec_rr, DataTypes.U32)) - for member in dd_enum_repository.SystemRecordFields: - if member is not dd_enum_repository.SystemRecordFields.NUM_OF_SYSTEM_RECORD_FIELDS: + for member in dd_enum_repository.DDSystemRecordFields: + if member is not dd_enum_repository.DDSystemRecordFields.NUM_OF_SYSTEM_RECORD_FIELDS: msg_list.append((self.system_records, member.name, member.datatype(), member.multichar_length())) self.process_into_vars(decoder_list = msg_list, message = message) @@ -126,8 +126,8 @@ msg_list = [] msg_list.append((type(self).get_service_rec_ack, DataTypes.BOOL)) msg_list.append((type(self).get_service_rec_rr, DataTypes.U32)) - for member in dd_enum_repository.ServiceRecordFields: - if member is not dd_enum_repository.ServiceRecordFields.NUM_OF_SERVICE_RECORD_FIELDS: + for member in dd_enum_repository.DDServiceRecordFields: + if member is not dd_enum_repository.DDServiceRecordFields.NUM_OF_SERVICE_RECORD_FIELDS: msg_list.append((self.system_records, member.name, member.datatype())) self.process_into_vars(decoder_list = msg_list, message = message) @@ -150,9 +150,9 @@ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') sensor_id = LocalVars('sensor_id') - gain = LocalVars(dd_enum_repository.CalibRecordSensorFields.GAIN.name) - offset = LocalVars(dd_enum_repository.CalibRecordSensorFields.OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + gain = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.GAIN.name) + offset = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -193,9 +193,9 @@ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') sensor_id = LocalVars('sensor_id') - gain = LocalVars(dd_enum_repository.CalibRecordSensorFields.GAIN.name) - offset = LocalVars(dd_enum_repository.CalibRecordSensorFields.OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + gain = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.GAIN.name) + offset = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -233,9 +233,9 @@ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') sensor_id = LocalVars('sensor_id') - gain = LocalVars(dd_enum_repository.CalibRecordSensorFields.GAIN.name) - offset = LocalVars(dd_enum_repository.CalibRecordSensorFields.OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + gain = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.GAIN.name) + offset = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -273,7 +273,7 @@ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') target_speed = LocalVars('TARGET_SPEED') - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -307,9 +307,9 @@ """ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') - gain = LocalVars(dd_enum_repository.CalibRecordSensorFields.GAIN.name) - offset = LocalVars(dd_enum_repository.CalibRecordSensorFields.OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + gain = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.GAIN.name) + offset = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -346,11 +346,11 @@ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') conc_id = LocalVars('conc_id') - mix_ratio = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name) - volume = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name) - conductivity = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name) - temperature = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CALIBRATION_TIME.name) + mix_ratio = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name) + volume = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name) + conductivity = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name) + temperature = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -392,11 +392,11 @@ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') conc_id = LocalVars('conc_id') - mix_ratio = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name) - volume = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name) - conductivity = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name) - temperature = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CALIBRATION_TIME.name) + mix_ratio = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name) + volume = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name) + conductivity = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name) + temperature = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -437,10 +437,10 @@ """ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') - accel_x = LocalVars(dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_X_OFFSET.name) - accel_y = LocalVars(dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_Y_OFFSET.name) - accel_z = LocalVars(dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_Z_OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordAccelerometerFields.CALIBRATION_TIME.name) + accel_x = LocalVars(dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_X_OFFSET.name) + accel_y = LocalVars(dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_Y_OFFSET.name) + accel_z = LocalVars(dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_Z_OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordAccelerometerFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -475,8 +475,8 @@ """ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') - set_point = LocalVars(dd_enum_repository.CalibRecordBloodLeakFields.SET_POINT.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordBloodLeakFields.CALIBRATION_TIME.name) + set_point = LocalVars(dd_enum_repository.DDCalibRecordBloodLeakFields.SET_POINT.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordBloodLeakFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -508,19 +508,19 @@ acceptance = LocalVars('acceptance') reject_reason = LocalVars('reject_reason') sensor_id = LocalVars('sensor_id') - k_high = LocalVars(dd_enum_repository.CalibRecordConductivityFields.K_HIGH.name) - alpha_high = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ALPHA_HIGH.name) - eta_high = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ETA_HIGH.name) - zeta_high = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ZETA_HIGH.name) - k_low = LocalVars(dd_enum_repository.CalibRecordConductivityFields.K_LOW.name) - alpha_low = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ALPHA_LOW.name) - eta_low = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ETA_LOW.name) - zeta_low = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ZETA_LOW.name) - beta = LocalVars(dd_enum_repository.CalibRecordConductivityFields.BETA.name) - delta = LocalVars(dd_enum_repository.CalibRecordConductivityFields.DELTA.name) - rsrvd_1 = LocalVars(dd_enum_repository.CalibRecordConductivityFields.RSRVD_1.name) - rsrvd_2 = LocalVars(dd_enum_repository.CalibRecordConductivityFields.RSRVD_2.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordBloodLeakFields.CALIBRATION_TIME.name) + k_high = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.K_HIGH.name) + alpha_high = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ALPHA_HIGH.name) + eta_high = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ETA_HIGH.name) + zeta_high = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ZETA_HIGH.name) + k_low = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.K_LOW.name) + alpha_low = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ALPHA_LOW.name) + eta_low = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ETA_LOW.name) + zeta_low = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ZETA_LOW.name) + beta = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.BETA.name) + delta = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.DELTA.name) + rsrvd_1 = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.RSRVD_1.name) + rsrvd_2 = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.RSRVD_2.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordBloodLeakFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -581,8 +581,8 @@ msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) msg_list.append((reject_reason, DataTypes.U32)) - for member in dd_enum_repository.InstitutionalRecordBasicFields: - if member is not dd_enum_repository.InstitutionalRecordBasicFields.NUM_OF_INSTITUTIONAL_RECORD_BASIC_FIELDS: + for member in dd_enum_repository.DDInstitutionalRecordBasicFields: + if member is not dd_enum_repository.DDInstitutionalRecordBasicFields.NUM_OF_INSTITUTIONAL_RECORD_BASIC_FIELDS: msg_list.append((self.institutional_records, f'BASIC__{member.name}', member.datatype())) self.process_into_vars(decoder_list = msg_list, message = message) @@ -609,8 +609,8 @@ msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) msg_list.append((reject_reason, DataTypes.U32)) - for member in dd_enum_repository.InstitutionalRecordAdvancedFields: - if member is not dd_enum_repository.InstitutionalRecordAdvancedFields.NUM_OF_INSTITUTIONAL_RECORD_ADVANCED_FIELDS: + for member in dd_enum_repository.DDInstitutionalRecordAdvancedFields: + if member is not dd_enum_repository.DDInstitutionalRecordAdvancedFields.NUM_OF_INSTITUTIONAL_RECORD_ADVANCED_FIELDS: msg_list.append((self.institutional_records, f'ADV__{member.name}', member.datatype())) self.process_into_vars(decoder_list = msg_list, message = message) @@ -637,8 +637,8 @@ msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) msg_list.append((reject_reason, DataTypes.U32)) - for member in dd_enum_repository.InstitutionalRecordAdditionalFields: - if member is not dd_enum_repository.InstitutionalRecordAdditionalFields.NUM_OF_INSTITUTIONAL_RECORD_ADDITIONAL_FIELDS: + for member in dd_enum_repository.DDInstitutionalRecordAdditionalFields: + if member is not dd_enum_repository.DDInstitutionalRecordAdditionalFields.NUM_OF_INSTITUTIONAL_RECORD_ADDITIONAL_FIELDS: msg_list.append((self.institutional_records, f'ADD__{member.name}', member.datatype())) self.process_into_vars(decoder_list = msg_list, message = message) @@ -662,8 +662,8 @@ msg_list = [] msg_list.append((type(self).get_usage_info_rec_ack, DataTypes.BOOL)) msg_list.append((type(self).get_usage_info_rec_rr, DataTypes.U32)) - for member in dd_enum_repository.UsageInformationRecordFields: - if member is not dd_enum_repository.UsageInformationRecordFields.NUM_OF_USAGE_INFO_RECORD_FIELDS: + for member in dd_enum_repository.DDUsageInformationRecordFields: + if member is not dd_enum_repository.DDUsageInformationRecordFields.NUM_OF_USAGE_INFO_RECORD_FIELDS: msg_list.append((self.usage_info_records, member.name, member.datatype())) self.process_into_vars(decoder_list = msg_list, message = message) Index: leahi_dialin/dd/modules/records_set_requests.py =================================================================== diff -u -rb5a54373504779a1567a6055879741cb68004c45 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/dd/modules/records_set_requests.py (.../records_set_requests.py) (revision b5a54373504779a1567a6055879741cb68004c45) +++ leahi_dialin/dd/modules/records_set_requests.py (.../records_set_requests.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -139,7 +139,7 @@ # Make a dictionary to store all the send functions for later send send_data = [] checked = [] - for record_enum in dd_enum_repository.CalibrationRecordFields: + for record_enum in dd_enum_repository.DDCalibrationRecordFields: record_parts = record_enum.name.split('__') group = record_parts[0] @@ -169,9 +169,9 @@ kwargs = {} mapping = [ {'param_name': 'target_speed', 'entry_name': f'{group}__{sensor.name}__TARGET_SPEED' }, - {'param_name': dd_enum_repository.CalibRecordSensorFields.GAIN.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordSensorFields.GAIN.name}' }, - {'param_name': dd_enum_repository.CalibRecordSensorFields.OFFSET.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordSensorFields.OFFSET.name}' }, - {'param_name': dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordSensorFields.GAIN.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordSensorFields.GAIN.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name}' }, ] # Building the kwargs parameter list @@ -204,11 +204,11 @@ args = [] kwargs = {} mapping = [ - {'param_name': dd_enum_repository.CalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.CalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name}' }, - {'param_name': dd_enum_repository.CalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.CalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name}' }, - {'param_name': dd_enum_repository.CalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.CalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name}' }, - {'param_name': dd_enum_repository.CalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.CalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name}' }, - {'param_name': dd_enum_repository.CalibRecordConcentrateFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.CalibRecordConcentrateFields.CALIBRATION_TIME.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.DDCalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.DDCalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.DDCalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.DDCalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConcentrateFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{conc.name}__{dd_enum_repository.DDCalibRecordConcentrateFields.CALIBRATION_TIME.name}' }, ] # Building the kwargs parameter list @@ -231,10 +231,10 @@ args = [] kwargs = {} mapping = [ - {'param_name': dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_X_OFFSET.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_X_OFFSET.name}' }, - {'param_name': dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_Y_OFFSET.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_Y_OFFSET.name}' }, - {'param_name': dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_Z_OFFSET.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_Z_OFFSET.name}' }, - {'param_name': dd_enum_repository.CalibRecordAccelerometerFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.CalibRecordAccelerometerFields.CALIBRATION_TIME.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_X_OFFSET.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_X_OFFSET.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_Y_OFFSET.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_Y_OFFSET.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_Z_OFFSET.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_Z_OFFSET.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordAccelerometerFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDCalibRecordAccelerometerFields.CALIBRATION_TIME.name}' }, ] # Building the kwargs parameter list @@ -256,8 +256,8 @@ args = [] kwargs = {} mapping = [ - {'param_name': dd_enum_repository.CalibRecordBloodLeakFields.SET_POINT.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.CalibRecordBloodLeakFields.SET_POINT.name}' }, - {'param_name': dd_enum_repository.CalibRecordBloodLeakFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.CalibRecordBloodLeakFields.CALIBRATION_TIME.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordBloodLeakFields.SET_POINT.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDCalibRecordBloodLeakFields.SET_POINT.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordBloodLeakFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDCalibRecordBloodLeakFields.CALIBRATION_TIME.name}' }, ] # Building the kwargs parameter list @@ -281,19 +281,19 @@ args = [] kwargs = {} mapping = [ - {'param_name': dd_enum_repository.CalibRecordConductivityFields.K_HIGH.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.K_HIGH.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.K_LOW.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.K_LOW.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.ALPHA_HIGH.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.ALPHA_HIGH.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.ALPHA_LOW.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.ALPHA_LOW.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.ETA_HIGH.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.ETA_HIGH.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.ETA_LOW.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.ETA_LOW.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.ZETA_HIGH.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.ZETA_HIGH.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.ZETA_LOW.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.ZETA_LOW.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.BETA.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.BETA.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.DELTA.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.DELTA.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.RSRVD_1.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.RSRVD_1.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.RSRVD_2.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.RSRVD_2.name}' }, - {'param_name': dd_enum_repository.CalibRecordConductivityFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConductivityFields.CALIBRATION_TIME.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.K_HIGH.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.K_HIGH.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.K_LOW.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.K_LOW.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.ALPHA_HIGH.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.ALPHA_HIGH.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.ALPHA_LOW.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.ALPHA_LOW.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.ETA_HIGH.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.ETA_HIGH.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.ETA_LOW.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.ETA_LOW.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.ZETA_HIGH.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.ZETA_HIGH.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.ZETA_LOW.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.ZETA_LOW.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.BETA.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.BETA.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.DELTA.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.DELTA.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.RSRVD_1.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.RSRVD_1.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.RSRVD_2.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.RSRVD_2.name}' }, + {'param_name': dd_enum_repository.DDCalibRecordConductivityFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{sensor.name}__{dd_enum_repository.DDCalibRecordConductivityFields.CALIBRATION_TIME.name}' }, ] # Building the kwargs parameter list @@ -340,7 +340,7 @@ # Make a dictionary to store all the send functions for later send send_data = [] checked = [] - for record_enum in dd_enum_repository.InstitutionalRecordBasicFields: + for record_enum in dd_enum_repository.DDInstitutionalRecordBasicFields: record_parts = record_enum.name.split('__') group = record_parts[0] @@ -349,29 +349,29 @@ args = [] kwargs = {} mapping = [ - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_DIALYSATE_SYSTEM_FLOW_MLPM.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_DIALYSATE_SYSTEM_FLOW_MLPM.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MAX_DIALYSATE_SYSTEM_FLOW_MLPM.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MAX_DIALYSATE_SYSTEM_FLOW_MLPM.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_DIALYSATE_TEMP_C.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_DIALYSATE_TEMP_C.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MAX_DIALYSATE_TEMP_C.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MAX_DIALYSATE_TEMP_C.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_ACID_CONCENTRATE.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_ACID_CONCENTRATE.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MAX_ACID_CONCENTRATE.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MAX_ACID_CONCENTRATE.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_BICARB_CARTRIDGE_SIZE_G.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_BICARB_CARTRIDGE_SIZE_G.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MAX_BICARB_CARTRIDGE_SIZE_G.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MAX_BICARB_CARTRIDGE_SIZE_G.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_SODIUM_MEQPL.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_SODIUM_MEQPL.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MAX_SODIUM_MEQPL.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MAX_SODIUM_MEQPL.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_BICARBONATE_MEQPL.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_BICARBONATE_MEQPL.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MAX_BICARBONATE_MEQPL.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MAX_BICARBONATE_MEQPL.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_RO_REJECTION_RATIO_PCT.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_RO_REJECTION_RATIO_PCT.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.DISINFECTION_FREQUENCY.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.DISINFECTION_FREQUENCY.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.DISINFECTION_CYCLE_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.DISINFECTION_CYCLE_TIME.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_INLET_WATER_CIND_AKARN_LIMIT_USPCM.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_INLET_WATER_CIND_AKARN_LIMIT_USPCM.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MAX_INLET_WATER_CIND_AKARN_LIMIT_USPCM.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MAX_INLET_WATER_CIND_AKARN_LIMIT_USPCM.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.ACID_CONCENTRATE_JUG_SIZE_L.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.ACID_CONCENTRATE_JUG_SIZE_L.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_ACID_ALARM_LIMIT_PCT.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_ACID_ALARM_LIMIT_PCT.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.MIN_BICARB_ALARM_LIMIT_PCT.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.MIN_BICARB_ALARM_LIMIT_PCT.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.POST_TREAT_DRAIN_OPTION.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.POST_TREAT_DRAIN_OPTION.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.POST_TREAT_DRY_BICARB_OPTION.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.POST_TREAT_DRY_BICARB_OPTION.name}' }, - {'param_name': dd_enum_repository.InstitutionalRecordBasicFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordBasicFields.CALIBRATION_TIME.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_DIALYSATE_SYSTEM_FLOW_MLPM.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_DIALYSATE_SYSTEM_FLOW_MLPM.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_DIALYSATE_SYSTEM_FLOW_MLPM.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_DIALYSATE_SYSTEM_FLOW_MLPM.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_DIALYSATE_TEMP_C.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_DIALYSATE_TEMP_C.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_DIALYSATE_TEMP_C.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_DIALYSATE_TEMP_C.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_ACID_CONCENTRATE.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_ACID_CONCENTRATE.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_ACID_CONCENTRATE.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_ACID_CONCENTRATE.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_BICARB_CARTRIDGE_SIZE_G.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_BICARB_CARTRIDGE_SIZE_G.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_BICARB_CARTRIDGE_SIZE_G.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_BICARB_CARTRIDGE_SIZE_G.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_SODIUM_MEQPL.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_SODIUM_MEQPL.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_SODIUM_MEQPL.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_SODIUM_MEQPL.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_BICARBONATE_MEQPL.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_BICARBONATE_MEQPL.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_BICARBONATE_MEQPL.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_BICARBONATE_MEQPL.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_RO_REJECTION_RATIO_PCT.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_RO_REJECTION_RATIO_PCT.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.DISINFECTION_FREQUENCY.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.DISINFECTION_FREQUENCY.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.DISINFECTION_CYCLE_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.DISINFECTION_CYCLE_TIME.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_INLET_WATER_CIND_AKARN_LIMIT_USPCM.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_INLET_WATER_CIND_AKARN_LIMIT_USPCM.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_INLET_WATER_CIND_AKARN_LIMIT_USPCM.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MAX_INLET_WATER_CIND_AKARN_LIMIT_USPCM.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.ACID_CONCENTRATE_JUG_SIZE_L.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.ACID_CONCENTRATE_JUG_SIZE_L.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_ACID_ALARM_LIMIT_PCT.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_ACID_ALARM_LIMIT_PCT.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_BICARB_ALARM_LIMIT_PCT.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.MIN_BICARB_ALARM_LIMIT_PCT.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.POST_TREAT_DRAIN_OPTION.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.POST_TREAT_DRAIN_OPTION.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.POST_TREAT_DRY_BICARB_OPTION.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.POST_TREAT_DRY_BICARB_OPTION.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordBasicFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordBasicFields.CALIBRATION_TIME.name}' }, ] # Building the kwargs parameter list @@ -392,7 +392,7 @@ args = [] kwargs = {} mapping = [ - {'param_name': dd_enum_repository.InstitutionalRecordAdvancedFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordAdvancedFields.CALIBRATION_TIME.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordAdvancedFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordAdvancedFields.CALIBRATION_TIME.name}' }, ] # Building the kwargs parameter list @@ -413,7 +413,7 @@ args = [] kwargs = {} mapping = [ - {'param_name': dd_enum_repository.InstitutionalRecordAdditionalFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.InstitutionalRecordAdditionalFields.CALIBRATION_TIME.name}' }, + {'param_name': dd_enum_repository.DDInstitutionalRecordAdditionalFields.CALIBRATION_TIME.name.lower(), 'entry_name': f'{group}__{dd_enum_repository.DDInstitutionalRecordAdditionalFields.CALIBRATION_TIME.name}' }, ] # Building the kwargs parameter list Index: leahi_dialin/dd/modules/records_set_responses.py =================================================================== diff -u -r436742844a3fbbb6a3b0bc81dc87bc6385c3e368 -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/dd/modules/records_set_responses.py (.../records_set_responses.py) (revision 436742844a3fbbb6a3b0bc81dc87bc6385c3e368) +++ leahi_dialin/dd/modules/records_set_responses.py (.../records_set_responses.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -99,7 +99,7 @@ """ msg_list = [] msg_list.append((type(self).set_system_rec_ack, DataTypes.BOOL)) - for sys_rec in dd_enum_repository.SystemRecordFields: + for sys_rec in dd_enum_repository.DDSystemRecordFields: msg_list.append((self.set_system_rec_rr, sys_rec, DataTypes.U32)) self.process_into_vars(decoder_list = msg_list, message = message) @@ -122,7 +122,7 @@ """ msg_list = [] msg_list.append((type(self).set_service_rec_ack, DataTypes.BOOL)) - for ser_rec in dd_enum_repository.ServiceRecordFields: + for ser_rec in dd_enum_repository.DDServiceRecordFields: msg_list.append((self.set_service_rec_rr, ser_rec, DataTypes.U32)) self.process_into_vars(decoder_list = msg_list, message = message) @@ -145,7 +145,7 @@ """ msg_list = [] msg_list.append((type(self).set_institutional_rec_ack, DataTypes.BOOL)) - for inst_rec in dd_enum_repository.InstitutionalRecordBasicFields: + for inst_rec in dd_enum_repository.DDInstitutionalRecordBasicFields: msg_list.append((self.set_institutional_rec_rr, f'BASIC__{inst_rec}', DataTypes.U32)) self.process_into_vars(decoder_list = msg_list, message = message) @@ -168,7 +168,7 @@ """ msg_list = [] msg_list.append((type(self).set_institutional_rec_ack, DataTypes.BOOL)) - for inst_rec in dd_enum_repository.InstitutionalRecordAdvancedFields: + for inst_rec in dd_enum_repository.DDInstitutionalRecordAdvancedFields: msg_list.append((self.set_institutional_rec_rr, f'ADV__{inst_rec}', DataTypes.U32)) self.process_into_vars(decoder_list = msg_list, message = message) @@ -191,7 +191,7 @@ """ msg_list = [] msg_list.append((type(self).set_institutional_rec_ack, DataTypes.BOOL)) - for inst_rec in dd_enum_repository.InstitutionalRecordAdditionalFields: + for inst_rec in dd_enum_repository.DDInstitutionalRecordAdditionalFields: msg_list.append((self.set_institutional_rec_rr, f'ADD__{inst_rec}', DataTypes.U32)) self.process_into_vars(decoder_list = msg_list, message = message) @@ -214,7 +214,7 @@ """ msg_list = [] msg_list.append((type(self).set_usage_info_rec_ack, DataTypes.BOOL)) - for info_rec in dd_enum_repository.UsageInformationRecordFields: + for info_rec in dd_enum_repository.DDUsageInformationRecordFields: msg_list.append((self.set_usage_info_rec_rr, info_rec, DataTypes.U32)) self.process_into_vars(decoder_list = msg_list, message = message) @@ -238,9 +238,9 @@ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') sensor_id = LocalVars('sensor_id') - gain = LocalVars(dd_enum_repository.CalibRecordSensorFields.GAIN.name) - offset = LocalVars(dd_enum_repository.CalibRecordSensorFields.OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + gain = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.GAIN.name) + offset = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -280,9 +280,9 @@ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') sensor_id = LocalVars('sensor_id') - gain = LocalVars(dd_enum_repository.CalibRecordSensorFields.GAIN.name) - offset = LocalVars(dd_enum_repository.CalibRecordSensorFields.OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + gain = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.GAIN.name) + offset = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -319,9 +319,9 @@ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') pump_id = LocalVars('pump_id') - gain = LocalVars(dd_enum_repository.CalibRecordSensorFields.GAIN.name) - offset = LocalVars(dd_enum_repository.CalibRecordSensorFields.OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + gain = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.GAIN.name) + offset = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -358,7 +358,7 @@ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') target_speed = LocalVars('TARGET_SPEED') - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -390,9 +390,9 @@ """ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') - gain = LocalVars(dd_enum_repository.CalibRecordSensorFields.GAIN.name) - offset = LocalVars(dd_enum_repository.CalibRecordSensorFields.OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordSensorFields.CALIBRATION_TIME.name) + gain = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.GAIN.name) + offset = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordSensorFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -427,11 +427,11 @@ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') conc_id = LocalVars('conc_id') - mix_ratio = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name) - volume = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name) - conductivity = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name) - temperature = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CALIBRATION_TIME.name) + mix_ratio = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name) + volume = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name) + conductivity = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name) + temperature = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -472,11 +472,11 @@ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') conc_id = LocalVars('conc_id') - mix_ratio = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name) - volume = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name) - conductivity = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name) - temperature = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordConcentrateFields.CALIBRATION_TIME.name) + mix_ratio = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CONCENTRATE_MIX_RATIO.name) + volume = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.FULL_BOTTLE_VOLUME_ML.name) + conductivity = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CONDUCTIVITY_USPCM.name) + temperature = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordConcentrateFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -516,10 +516,10 @@ """ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') - accel_x = LocalVars(dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_X_OFFSET.name) - accel_y = LocalVars(dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_Y_OFFSET.name) - accel_z = LocalVars(dd_enum_repository.CalibRecordAccelerometerFields.ACCEL_Z_OFFSET.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordAccelerometerFields.CALIBRATION_TIME.name) + accel_x = LocalVars(dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_X_OFFSET.name) + accel_y = LocalVars(dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_Y_OFFSET.name) + accel_z = LocalVars(dd_enum_repository.DDCalibRecordAccelerometerFields.ACCEL_Z_OFFSET.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordAccelerometerFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -553,8 +553,8 @@ """ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') - set_point = LocalVars(dd_enum_repository.CalibRecordBloodLeakFields.SET_POINT.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordBloodLeakFields.CALIBRATION_TIME.name) + set_point = LocalVars(dd_enum_repository.DDCalibRecordBloodLeakFields.SET_POINT.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordBloodLeakFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) @@ -585,19 +585,19 @@ acceptance = LocalVars('acceptance') global_rr = LocalVars('GLOBAL') sensor_id = LocalVars('sensor_id') - k_high = LocalVars(dd_enum_repository.CalibRecordConductivityFields.K_HIGH.name) - alpha_high = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ALPHA_HIGH.name) - eta_high = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ETA_HIGH.name) - zeta_high = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ZETA_HIGH.name) - k_low = LocalVars(dd_enum_repository.CalibRecordConductivityFields.K_LOW.name) - alpha_low = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ALPHA_LOW.name) - eta_low = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ETA_LOW.name) - zeta_low = LocalVars(dd_enum_repository.CalibRecordConductivityFields.ZETA_LOW.name) - beta = LocalVars(dd_enum_repository.CalibRecordConductivityFields.BETA.name) - delta = LocalVars(dd_enum_repository.CalibRecordConductivityFields.DELTA.name) - rsrvd_1 = LocalVars(dd_enum_repository.CalibRecordConductivityFields.RSRVD_1.name) - rsrvd_2 = LocalVars(dd_enum_repository.CalibRecordConductivityFields.RSRVD_2.name) - calibration_time = LocalVars(dd_enum_repository.CalibRecordBloodLeakFields.CALIBRATION_TIME.name) + k_high = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.K_HIGH.name) + alpha_high = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ALPHA_HIGH.name) + eta_high = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ETA_HIGH.name) + zeta_high = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ZETA_HIGH.name) + k_low = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.K_LOW.name) + alpha_low = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ALPHA_LOW.name) + eta_low = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ETA_LOW.name) + zeta_low = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.ZETA_LOW.name) + beta = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.BETA.name) + delta = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.DELTA.name) + rsrvd_1 = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.RSRVD_1.name) + rsrvd_2 = LocalVars(dd_enum_repository.DDCalibRecordConductivityFields.RSRVD_2.name) + calibration_time = LocalVars(dd_enum_repository.DDCalibRecordBloodLeakFields.CALIBRATION_TIME.name) msg_list = [] msg_list.append((acceptance, DataTypes.BOOL)) Index: leahi_dialin/td/modules/records.py =================================================================== diff -u -r489ce5ef49041b863501b7fecd6e4716e7dcaa9f -rbe799e12803dba3054ff893b68f8b79a9dde440b --- leahi_dialin/td/modules/records.py (.../records.py) (revision 489ce5ef49041b863501b7fecd6e4716e7dcaa9f) +++ leahi_dialin/td/modules/records.py (.../records.py) (revision be799e12803dba3054ff893b68f8b79a9dde440b) @@ -8,7 +8,7 @@ # @file records.py # # @author (last) Zoltan Miskolci -# @date (last) 04-Aug-2026 +# @date (last) 05-Aug-2026 # @author (original) Zoltan Miskolci # @date (original) 04-May-2026 #