Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -r7c9f9588d709e4b394b05499224bfafe5abefdf9 -re053a222c52e84f31503ed106cf64c2ca920029e
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 7c9f9588d709e4b394b05499224bfafe5abefdf9)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision e053a222c52e84f31503ed106cf64c2ca920029e)
@@ -75,6 +75,10 @@
     GET_CAL_TEMPERATURE_SESNORS,                                                                               ///< Get temperature sensors calibration data.
     GET_CAL_ACCEL_SENSORS,                                                                                     ///< Get accelerometers calibration data.
     GET_CAL_HEPARIN_FORCE_SENSOR,                                                                              ///< Get heparin force sensor calibration data.
+    GET_CAL_PUMPS,                                                                                             ///< Get pumps calibration data.
+    GET_CAL_PRESSURE_SENSORS,                                                                                  ///< Get pressure sensors calibration data.
+    GET_CAL_OCCLUSION_SESNSORS,                                                                                ///< Get occlusion sensors calibration data.
+    GET_CAL_VALVES,                                                                                            ///< Get valves calibration data.
     GET_SYS_RECORD,                                                                                            ///< Get system record data.
     GET_SRV_RECORD,                                                                                            ///< Get service record data.
     NUM_OF_NV_HD_DATA                                                                                          ///< Number of non-volatile data.
@@ -103,19 +107,9 @@
 typedef enum hd_occlusion_sensors
 {
     CAL_DATA_BLOOD_PUMP_OCCLUSION_SENSOR = 0,                                                                   ///< Blood pump occlusion sensor.
-    CAL_DATA_DIALYSATE_INLET_PUMP_OCCLUSION_SENSOR,                                                             ///< Dialysate inlet occlusion sensor.
-    CAL_DATA_DIALYSATE_OUTLET_PUMP_OCCLUSION_SENSOR,                                                            ///< Dialysate outlet occlusion sensor.
     NUM_OF_CAL_DATA_OCCLUSION_SENSORS,                                                                          ///< Number of occlusion sensors.
 } CAL_DATA_HD_OCCLUSION_SENSORS_T;
 
-/// HD flow sensors enumeration.
-typedef enum hd_flow_sensors
-{
-    CAL_DATA_HD_BLOOD_FLOW_SENSOR = 0,                                                                          ///< Blood flow sensor.
-    CAL_DATA_HD_DIALYSATE_FLOW_SENSOR,                                                                          ///< Dialyzer flow sensor.
-    NUM_OF_CAL_DATA_HD_FLOW_SENSORS,                                                                            ///< Number of HD flow sensors.
-} CAL_DATA_HD_FLOW_SENSORS_T;
-
 /// HD pressure sensors enumeration.
 typedef enum hd_pressure_sensors
 {
@@ -127,10 +121,11 @@
 /// HD temperature sensors enumeration.
 typedef enum hd_temperature_sensors
 {
-    CAL_DATA_HD_BOARD_TEMP_SENSOR_1 = 0,                                                                        ///< Board temperature sensor 1.
-    CAL_DATA_HD_BOARD_TEMP_SENSOR_2,                                                                            ///< Board temperature sensor 2.
-    CAL_DATA_HD_BOARD_TEMP_SENSOR_3,                                                                            ///< Board temperature sensor 3.
-    CAL_DATA_HD_POWER_SUPPLY_TEMP_SENSOR,                                                                       ///< Power supply temperature sensor.
+    CAL_DATA_HD_THERMISTOR_ONBOARD_NTC = 0,                                                                     ///< Onboard NTC thermistor.
+    CAL_DATA_HD_THERMISTOR_POWER_SUPPLY_1,                                                                      ///< Power supply 1 therimstor.
+    CAL_DATA_HD_TEMPSENSOR_FPGA_BOARD,                                                                          ///< FPGA board temperature sensor.
+    CAL_DATA_HD_TEMPSENSOR_VENOUS_PRESSURE,                                                                     ///< Venous pressure sensor temperature sensor.
+    CAL_DATA_HD_TEMPSENSOR_PBA_ADC,                                                                             ///< PBA ADC Temperature sensor.
     NUM_OF_CAL_DATA_HD_TEMP_SENSORS,                                                                            ///< Number of HD temperature sensors.
 } CAL_DATA_HD_TEMEPERATURE_SENSORS_T;
 
@@ -184,12 +179,6 @@
     POLYNOMIAL_CAL_PAYLOAD_T hdOcclusionSensors[ NUM_OF_CAL_DATA_OCCLUSION_SENSORS ];                           ///< HD occlusion sensors calibration data.
 } HD_OCCLUSION_SENSORS_CAL_RECORD_T;
 
-/// HD flow sensors calibration record
-typedef struct
-{
-    POLYNOMIAL_CAL_PAYLOAD_T hdFlowSensors[ NUM_OF_CAL_DATA_HD_FLOW_SENSORS ];                                  ///< HD flow sensors calibration data.
-} HD_FLOW_SENSORS_CAL_RECORD_T;
-
 /// HD pressure sensors calibration record
 typedef struct
 {