Index: leahi_dialin/dd/modules/records.py
===================================================================
diff -u -r7a78412149082d6f87ccbeba64d1fbd06b88149d -re3c60dd439b2f996b0392951fd4461e8e37b8692
--- leahi_dialin/dd/modules/records.py	(.../records.py)	(revision 7a78412149082d6f87ccbeba64d1fbd06b88149d)
+++ leahi_dialin/dd/modules/records.py	(.../records.py)	(revision e3c60dd439b2f996b0392951fd4461e8e37b8692)
@@ -729,6 +729,7 @@
                 temperature_c_entry_name = f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConcentrateFields.BOTTLE_TEMPERATURE_C.name}'
                 calibration_time_entry_name = f'{group}__{sensor.name}__{dd_enum_repository.CalibRecordConcentrateFields.CALIBRATION_TIME.name}'
 
+                kwargs['sensor_enum'] = sensor
                 kwargs['msg_id'] = msg_id_pairing[group]
                 if concentrate_mix_ratio_entry_name in calibration_records and calibration_records[concentrate_mix_ratio_entry_name] is not None:
                     kwargs['concentrate_mix_ratio'] = calibration_records[concentrate_mix_ratio_entry_name]
@@ -934,16 +935,18 @@
                                            gain: float=0.0,
                                            offset: float=0.0,
                                            calibration_time: int = 0) -> int:
-        payload = integer_to_bytearray(sensor_enum.value)
+        payload_sensor = integer_to_bytearray(sensor_enum.value)
+        payload_content = b''
         if msg_id == MsgIds.MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP:
-            payload += float_to_bytearray(dialysate_pump_target_speed)
-        payload += float_to_bytearray(forth_order_coeff)
-        payload += float_to_bytearray(third_order_coeff)
-        payload += float_to_bytearray(second_order_coeff)
-        payload += float_to_bytearray(gain)
-        payload += float_to_bytearray(offset)
-        payload += integer_to_bytearray(calibration_time)
-        payload += unsigned_short_to_bytearray(self.crc16(payload))
+            payload_content += float_to_bytearray(dialysate_pump_target_speed)
+        payload_content += float_to_bytearray(forth_order_coeff)
+        payload_content += float_to_bytearray(third_order_coeff)
+        payload_content += float_to_bytearray(second_order_coeff)
+        payload_content += float_to_bytearray(gain)
+        payload_content += float_to_bytearray(offset)
+        payload_content += integer_to_bytearray(calibration_time)
+        payload_content += unsigned_short_to_bytearray(self.crc16(payload_content))
+        payload = payload_sensor + payload_content
 
         sensor_type = ''
         if msg_id == MsgIds.MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR:
@@ -966,19 +969,22 @@
 
 
     def cmd_set_calibration_records_concentrate(self,
+                                                sensor_enum: DialinEnum,
                                                 msg_id: MsgIds,
                                                 concentrate_mix_ratio: float=0.0,
                                                 volume_ml: float=0.0,
                                                 conductivity_uspcm: float=0.0,
                                                 temperature_c: float=0.0,
                                                 calibration_time: int = 0) -> int:
 
-        payload = float_to_bytearray(concentrate_mix_ratio)
-        payload += float_to_bytearray(volume_ml)
-        payload += float_to_bytearray(conductivity_uspcm)
-        payload += float_to_bytearray(temperature_c)
-        payload += integer_to_bytearray(calibration_time)
-        payload += unsigned_short_to_bytearray(self.crc16(payload))
+        payload_sensor = integer_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)
+        payload_content += float_to_bytearray(temperature_c)
+        payload_content += integer_to_bytearray(calibration_time)
+        payload_content += unsigned_short_to_bytearray(self.crc16(payload_content))
+        payload = payload_sensor + payload_content
 
         conc_type = ''
         if msg_id == MsgIds.MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE: