Index: leahi_dialin/common/generic_defs.py =================================================================== diff -u -rc1bff8da59cff294d67d90dd1e1f102dd5b65466 -r1ce41b0e543f91b5e620c0d91758564cefaad9a8 --- leahi_dialin/common/generic_defs.py (.../generic_defs.py) (revision c1bff8da59cff294d67d90dd1e1f102dd5b65466) +++ leahi_dialin/common/generic_defs.py (.../generic_defs.py) (revision 1ce41b0e543f91b5e620c0d91758564cefaad9a8) @@ -19,6 +19,7 @@ from ..utils.enums import DialinEnum from .dd_defs import DDPressureSensorNames, DDTemperatureSensorNames, DDConcentratePumpNames, DDDialysatePumpNames from .disp_defs import AcidTypes, BicarbTypes +from .fp_defs import FPPressureSensorNames # ================================================== Enum Creators: DataTypes ================================================== @@ -245,9 +246,19 @@ 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