Index: leahi_dialin/dd/modules/records.py =================================================================== diff -u -rdcd4a815c3a7994d4b78aaf9121c9cd4a51f45a9 -r1720ed52064e1795b62ebfe6be2ca22ba74a18a5 --- leahi_dialin/dd/modules/records.py (.../records.py) (revision dcd4a815c3a7994d4b78aaf9121c9cd4a51f45a9) +++ leahi_dialin/dd/modules/records.py (.../records.py) (revision 1720ed52064e1795b62ebfe6be2ca22ba74a18a5) @@ -169,14 +169,17 @@ @return: none """ # Get the sensor_id to identify the location of the payload + print(f'Pres cal msg recieved') + print(message) msg_list = [('sensor_id', DataTypes.U08)] result = self.process_into_vars(decoder_list = msg_list, message = message) sensor_name = dd_enum_repository.DDPressureSensorNames(result['sensor_id']).name record_list = [] for member in dd_enum_repository.CalibRecordSensorFields: - record_list.append((self.CALIB_RECORDS_PRESSURE_SENSORS, sensor_name, member.name, member.datatype())) + entry_name = f'PRES__{sensor_name}__{member.name}' + record_list.append((entry_name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -196,14 +199,16 @@ @return: none """ # Get the sensor_id to identify the location of the payload + print(f'Temp cal msg recieved') msg_list = [('sensor_id', DataTypes.U08)] result = self.process_into_vars(decoder_list = msg_list, message = message) sensor_name = dd_enum_repository.DDTemperatureSensorNames(result['sensor_id']).name record_list = [] for member in dd_enum_repository.CalibRecordSensorFields: - record_list.append((self.CALIB_RECORDS_TEMPERATURE_SENSORS, sensor_name, member.name, member.datatype())) + entry_name = f'TEMP__{sensor_name}__{member.name}' + record_list.append((entry_name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -230,7 +235,8 @@ record_list = [] for member in dd_enum_repository.CalibRecordSensorFields: - record_list.append((self.CALIB_RECORDS_CONCENTRATE_PUMPS, sensor_name, member.name, member.datatype())) + entry_name = f'CONC__{sensor_name}__{member.name}' + record_list.append((entry_name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -250,9 +256,10 @@ @return: none """ record_list = [] - record_list.append((self.CALIB_RECORDS_DIALYSATE_PUMPS, dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name, 'target_speed', DataTypes.F32)) + record_list.append((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())) + entry_name = f'DIAL__{dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name}__{member.name}' + record_list.append((entry_name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -272,7 +279,8 @@ """ 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())) + entry_name = f'DIAL__{dd_enum_repository.DDDialysatePumpNames.D48_PUMP.name}__{member.name}' + record_list.append((entry_name, member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -290,9 +298,14 @@ @param message: published data message @return: none """ + msg_list = [('sensor_id', DataTypes.U08)] + result = self.process_into_vars(decoder_list=msg_list, + message=message) + acid_type_name = disp_enum_repository.AcidTypes(result['sensor_id']).name + record_list = [] for member in dd_enum_repository.CalibRecordConcentrateFields: - record_list.append((self.CALIB_RECORDS_ACID_CONCENTRATE, member.name, member.datatype())) + record_list.append((f'ACCEL__{acid_type_name}__{member.name}', member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -310,9 +323,14 @@ @param message: published data message @return: none """ + msg_list = [('sensor_id', DataTypes.U08)] + result = self.process_into_vars(decoder_list=msg_list, + message=message) + bicarb_type_name = disp_enum_repository.BicarbTypes(result['sensor_id']).name + record_list = [] for member in dd_enum_repository.CalibRecordConcentrateFields: - record_list.append((self.CALIB_RECORDS_BICARB_CONCENTRATE, member.name, member.datatype())) + record_list.append((f'BICARB__{bicarb_type_name}__{member.name}', member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -332,7 +350,7 @@ """ record_list = [] for member in dd_enum_repository.CalibRecordAccelerometerFields: - record_list.append((self.CALIB_RECORDS_ACCELEROMETER, member.name, member.datatype())) + record_list.append((f'ACCEL__{member.name}', member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -352,7 +370,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((f'BLOOD_LEAK__{member.name}', member.datatype())) self.process_into_dict(dict_to_update = self.calibration_records, decoder_list = record_list, @@ -711,6 +729,7 @@ if calibration_records != {} and len(kwargs) == 2: continue + print(f'kwargs: {kwargs}') # Create the send data function send_data.append(partial(self.cmd_set_calibration_records_sensor, *args, **kwargs)) @@ -936,8 +955,11 @@ second_order_coeff: float=0.0, gain: float=0.0, offset: float=0.0, - calibration_time: int = 0) -> int: - payload_sensor = integer_to_bytearray(sensor_enum.value) + calibration_time: int = 1) -> int: + if isinstance(sensor_enum, fp_enum_repository.FPPressureSensorNames): + payload_sensor = byte_to_bytearray(sensor_enum.value + dd_enum_repository.DDPressureSensorNames.NUM_OF_PRESSURE_SENSORS.value) + else: + payload_sensor = byte_to_bytearray(sensor_enum.value) payload_content = b'' if msg_id == MsgIds.MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP: payload_content += float_to_bytearray(dialysate_pump_target_speed) @@ -977,9 +999,9 @@ volume_ml: float=0.0, conductivity_uspcm: float=0.0, temperature_c: float=0.0, - calibration_time: int = 0) -> int: + calibration_time: int = 1) -> int: - payload_sensor = integer_to_bytearray(sensor_enum.value) + payload_sensor = byte_to_bytearray(sensor_enum.value) payload_content = float_to_bytearray(concentrate_mix_ratio) payload_content += float_to_bytearray(volume_ml) payload_content += float_to_bytearray(conductivity_uspcm) @@ -1009,25 +1031,19 @@ accel_x_offset: float=0.0, accel_y_offset: float=0.0, accel_z_offset: float=0.0, - calibration_time: int = 0) -> int: + calibration_time: int = 1) -> int: payload = float_to_bytearray(accel_x_offset) payload += float_to_bytearray(accel_y_offset) payload += float_to_bytearray(accel_z_offset) payload += integer_to_bytearray(calibration_time) payload += unsigned_short_to_bytearray(self.crc16(payload)) - conc_type = '' - if msg_id == MsgIds.TBD: - conc_type = 'Acid' - elif msg_id == MsgIds.TBD: - conc_type = 'Bicarb' - return cmd_generic_override(payload = payload, reset = None, channel_id = CanChannels.dialin_to_dd_ch_id, msg_id = msg_id, - entity_name = f'DD {conc_type} Concentrate Calibration Record', + entity_name = f'DD Accelerometer Calibration Record', override_text = 'being set', logger = self.logger, can_interface = self.can_interface) @@ -1037,7 +1053,7 @@ def cmd_set_calibration_records_blood_leak(self, msg_id: MsgIds, set_point: float=0.0, - calibration_time: int = 0) -> int: + calibration_time: int = 1) -> int: payload = float_to_bytearray(set_point) payload += integer_to_bytearray(calibration_time)