Index: leahi_dialin/dd/modules/records.py =================================================================== diff -u -r85c58c9877633e4212e87dd992348fd6c1795a77 -r1e26622d7ef17d1f4d6587dbf62d6a2a561ebd18 --- leahi_dialin/dd/modules/records.py (.../records.py) (revision 85c58c9877633e4212e87dd992348fd6c1795a77) +++ leahi_dialin/dd/modules/records.py (.../records.py) (revision 1e26622d7ef17d1f4d6587dbf62d6a2a561ebd18) @@ -133,7 +133,7 @@ """ record_list = [] for service_member in dd_enum_repository.ServiceRecordFields: - record_list.append((service_member.name, service_member.datatype)) + record_list.append((service_member.name, service_member.datatype())) self.process_into_dict(dict_to_update = self.service_records, decoder_list = record_list, @@ -154,10 +154,10 @@ if sys_record.multichar_length > 1: for j in range(0, sys_record.multichar_length - 1): name = f'{sys_record.name}_{j}' - record_list.append((name, sys_record.datatype)) + record_list.append((name, sys_record.datatype())) else: name = sys_record.name - record_list.append((name, sys_record.datatype)) + record_list.append((name, sys_record.datatype())) result_payload = self.process_into_vars(decoder_list = record_list, message = message, start_from_byte = len(msg_list) * DataTypes.U32.size()) @@ -198,7 +198,7 @@ """ record_list = [] for member in dd_enum_repository.ServiceRecordFields: - record_list.append((member.name, member.datatype)) + record_list.append((member.name, member.datatype())) self.process_into_dict(dict_to_update = self.service_records, decoder_list = record_list, @@ -224,7 +224,7 @@ record_list = [] for member in dd_enum_repository.CalibRecordSensorFields: - record_list.append((self.CALIB_RECORDS_PRESSURE_SENSORS, sensor_name, member.name, member.datatype)) + record_list.append((self.CALIB_RECORDS_PRESSURE_SENSORS, sensor_name, member.name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -251,7 +251,7 @@ record_list = [] for member in dd_enum_repository.CalibRecordSensorFields: - record_list.append((self.CALIB_RECORDS_TEMPERATURE_SENSORS, sensor_name, member.name, member.datatype)) + record_list.append((self.CALIB_RECORDS_TEMPERATURE_SENSORS, sensor_name, member.name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -278,7 +278,7 @@ record_list = [] for member in dd_enum_repository.CalibRecordSensorFields: - record_list.append((self.CALIB_RECORDS_CONCENTRATE_PUMPS, sensor_name, member.name, member.datatype)) + record_list.append((self.CALIB_RECORDS_CONCENTRATE_PUMPS, sensor_name, member.name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -300,7 +300,7 @@ record_list = [] record_list.append((self.CALIB_RECORDS_DIALYSATE_PUMPS, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, 'target_speed', DataTypes.F32)) for member in dd_enum_repository.CalibRecordSensorFields: - record_list.append((self.CALIB_RECORDS_DIALYSATE_PUMPS, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, member.name, member.datatype)) + record_list.append((self.CALIB_RECORDS_DIALYSATE_PUMPS, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, member.name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -320,7 +320,7 @@ """ record_list = [] for member in dd_enum_repository.CalibRecordSensorFields: - record_list.append((self.CALIB_RECORDS_DIALYSATE_PUMPS, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, member.name, member.datatype)) + record_list.append((self.CALIB_RECORDS_DIALYSATE_PUMPS, dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name, member.name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -340,7 +340,7 @@ """ record_list = [] for member in dd_enum_repository.CalibRecordConcentrateFields: - record_list.append((self.CALIB_RECORDS_ACID_CONCENTRATE, member.name, member.datatype)) + record_list.append((self.CALIB_RECORDS_ACID_CONCENTRATE, member.name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -360,7 +360,7 @@ """ record_list = [] for member in dd_enum_repository.CalibRecordConcentrateFields: - record_list.append((self.CALIB_RECORDS_BICARB_CONCENTRATE, member.name, member.datatype)) + record_list.append((self.CALIB_RECORDS_BICARB_CONCENTRATE, member.name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -380,7 +380,7 @@ """ record_list = [] for member in dd_enum_repository.CalibRecordAccelerometerFields: - record_list.append((self.CALIB_RECORDS_ACCELEROMETER, member.name, member.datatype)) + record_list.append((self.CALIB_RECORDS_ACCELEROMETER, member.name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -400,7 +400,7 @@ """ record_list = [] for member in dd_enum_repository.CalibRecordBloodLeakFields: - record_list.append((self.CALIB_RECORDS_BLOOD_LEAK, member.name, member.datatype)) + record_list.append((self.CALIB_RECORDS_BLOOD_LEAK, member.name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -426,7 +426,7 @@ member = dd_enum_repository.InstitutionalRecordFields(record_id) record_list = [] - record_list.append((member.name, member.datatype)) + record_list.append((member.name, member.datatype())) self.process_into_dict(dict_to_update = self.institutional_records, decoder_list = record_list, @@ -447,7 +447,7 @@ """ record_list = [] for member in dd_enum_repository.UsageInformationRecordFields: - record_list.append((member.name, member.datatype)) + record_list.append((member.name, member.datatype())) self.process_into_dict(dict_to_update = self.service_records, decoder_list = record_list,