Index: leahi_dialin/common/generic_defs.py
===================================================================
diff -u -r1ce41b0e543f91b5e620c0d91758564cefaad9a8 -r2b9fd919d9b982d95ce0b79012f0b663408596e2
--- leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision 1ce41b0e543f91b5e620c0d91758564cefaad9a8)
+++ leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision 2b9fd919d9b982d95ce0b79012f0b663408596e2)
@@ -107,7 +107,7 @@
 
 @unique
 class CalibRecordBloodLeakFields(RecordsBaseEnum):
-    SET_POINT                                   = (0, DataTypes.F32)        # DD Blood leak sensor set point
+    SET_POINT                                   = (0, DataTypes.U16)        # DD Blood leak sensor set point
     CALIBRATION_TIME                            = (3, DataTypes.U32)        # Calibration time
     CRC                                         = (4, DataTypes.U16)        # CRC
     NUM_OF_CALIBRATION_RECORD_BLOOD_LEAK_FIELDS = (5, DataTypes.NONE)       # Number of Calibration Record Accelerometer's Fields
Index: leahi_dialin/dd/modules/records.py
===================================================================
diff -u -raf9b4577e642d3dbf476bddc091fb62251c5bf55 -r2b9fd919d9b982d95ce0b79012f0b663408596e2
--- leahi_dialin/dd/modules/records.py	(.../records.py)	(revision af9b4577e642d3dbf476bddc091fb62251c5bf55)
+++ leahi_dialin/dd/modules/records.py	(.../records.py)	(revision 2b9fd919d9b982d95ce0b79012f0b663408596e2)
@@ -292,12 +292,14 @@
         @return: none
         """
         record_list = []
-        record_list.append((f'DIAL__{dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name}__TARGET_SPEED', DataTypes.F32))
-        for member in dd_enum_repository.CalibRecordSensorFields:
-            if member == dd_enum_repository.CalibRecordSensorFields.NUM_OF_CALIBRATION_RECORD_SENSOR_FIELDS:
-                continue
-            entry_name = f'DIAL__{dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name}__{member.name}'
-            record_list.append((entry_name, member.datatype()))
+        record_list.append((f'DIAL__{dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name}__TARGET_SPEED',     DataTypes.F32))
+        record_list.append((f'DIAL__{dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name}__CALIBRATION_TIME', DataTypes.U32))
+        record_list.append((f'DIAL__{dd_enum_repository.DDDialysatePumpNames.D12_PUMP.name}__CRC',              DataTypes.U16))
+        # for member in dd_enum_repository.CalibRecordSensorFields:
+        #     if member == dd_enum_repository.CalibRecordSensorFields.NUM_OF_CALIBRATION_RECORD_SENSOR_FIELDS:
+        #         continue
+        #     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,
@@ -351,7 +353,8 @@
 
         self.process_into_dict(dict_to_update = self.calibration_records,
                                decoder_list = record_list,
-                               message = message)
+                               message = message,
+                               start_from_byte = len(msg_list) * msg_list[0][1].size())
 
         self.calibration_records_timestamp = timestamp
 
@@ -378,7 +381,8 @@
 
         self.process_into_dict(dict_to_update = self.calibration_records,
                                decoder_list = record_list,
-                               message = message)
+                               message = message,
+                               start_from_byte = len(msg_list) * msg_list[0][1].size())
 
         self.calibration_records_timestamp = timestamp
 
@@ -833,7 +837,7 @@
                     kwargs['dialysate_pump_target_speed'] = calibration_records[target_speed_entry_name]
 
                 if fourth_order_coeff_entry_name in calibration_records and calibration_records[fourth_order_coeff_entry_name] is not None:
-                    kwargs['forth_order_coeff'] = calibration_records[fourth_order_coeff_entry_name]
+                    kwargs['fourth_order_coeff'] = calibration_records[fourth_order_coeff_entry_name]
 
                 if third_order_coeff_entry_name in calibration_records and calibration_records[third_order_coeff_entry_name] is not None:
                     kwargs['third_order_coeff'] = calibration_records[third_order_coeff_entry_name]
@@ -1185,10 +1189,10 @@
 
     def cmd_set_calibration_records_blood_leak(self,
                                                msg_id: MsgIds,
-                                               set_point: float=0.0,
+                                               set_point: int=0,
                                                calibration_time: int = 1) -> int:
 
-        payload = float_to_bytearray(set_point)
+        payload = unsigned_short_to_bytearray(set_point)
         payload += integer_to_bytearray(calibration_time)
         payload += unsigned_short_to_bytearray(self.crc16(payload))