Index: firmware/App/Services/NVRecordsDD.c
===================================================================
diff -u -r3b7c92408ac36d501987a526bca1dab2bc9782eb -rbeb95e3e8f85740707704d7089db8b3ec8574bbd
--- firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision 3b7c92408ac36d501987a526bca1dab2bc9782eb)
+++ firmware/App/Services/NVRecordsDD.c	(.../NVRecordsDD.c)	(revision beb95e3e8f85740707704d7089db8b3ec8574bbd)
@@ -1237,6 +1237,66 @@
     return ddInstitutionalGroup.ddInstitutionalRecord.minInletWaterCondAlarmLimitUSPCM;
 }
 
+POLYNOMIAL_CAL_PAYLOAD_T getPressureSensorCalRecord( U08 snsrIdx)
+{
+    if ( snsrIdx < NUM_OF_PRESSURE_SENSORS )
+    {
+        return ( ddCalibrationGroup.ddCalibrationRecord.presSensorsCalRecord.pressureSensors[ snsrIdx ] );
+    }
+}
+
+POLYNOMIAL_CAL_PAYLOAD_T getTemperatureSensorCalRecord( U08 snsrIdx)
+{
+    if ( snsrIdx < NUM_OF_TEMPERATURE_SENSORS )
+    {
+        return ( ddCalibrationGroup.ddCalibrationRecord.tempSensorsCalRecord.tempSensors[ snsrIdx ] );
+    }
+}
+
+POLYNOMIAL_CAL_PAYLOAD_T getConcPumpCalRecord( U08 pumpIdx)
+{
+    if ( pumpIdx < NUM_OF_CONCENTRATE_PUMPS )
+    {
+        return ( ddCalibrationGroup.ddCalibrationRecord.concentratePumpsRecord.concentratePumps[ pumpIdx ] );
+    }
+}
+
+DD_D12_DIALYSATE_PUMP_RECORD_T getD12PumpCalRecord( void )
+{
+    return ( ddCalibrationGroup.ddCalibrationRecord.d12DialysatePumpRecord );
+}
+DD_D48_DIALYSATE_PUMP_RECORD_T getD48PumpCalRecord( void )
+{
+    return ( ddCalibrationGroup.ddCalibrationRecord.d48DialysatePumpRecord );
+}
+
+DD_ACID_CONCENTRATE_T getAcidConcentrateCalRecord( U08 acidIdx)
+{
+    if ( acidIdx < NUM_OF_ACID_TYPE )
+    {
+        return ( ddCalibrationGroup.ddCalibrationRecord.acidConcentratesRecord.acidConcentrate[ acidIdx ] );
+    }
+}
+
+DD_BICARB_CONCENTRATE_T getBicarbConcentrateCalRecord( U08 bicarbIdx)
+{
+    if ( bicarbIdx < NUM_OF_BICARB_TYPE )
+    {
+        return ( ddCalibrationGroup.ddCalibrationRecord.bicarbConcentratesRecord.bicarbConcentrate[ bicarbIdx ] );
+    }
+}
+
+DD_ACCEL_SENSOR_CAL_RECORD_T getAccelSensorCalRecord( void )
+{
+    return ( ddCalibrationGroup.ddCalibrationRecord.accelerometerSensorCalRecord );
+}
+
+DD_BLOOD_LEAK_SENSOR_CAL_RECORD_T getBloodLeakSensorCalRecord( void )
+{
+    return ( ddCalibrationGroup.ddCalibrationRecord.bloodLeakSensorCalRecord );
+}
+
+
 /*********************************************************************//**
  * @brief
  * The getNVMRecord function copies the requested non-volatile
@@ -1267,59 +1327,59 @@
         case GET_CAL_PRESSURE_SENOSRS:
             nvDataStartPtr = (U08*)&ddCalibrationGroup.ddCalibrationRecord.presSensorsCalRecord;
             nvDataLength   = sizeof( ddCalibrationGroup.ddCalibrationRecord.presSensorsCalRecord );
-            for ( i = 0; i < numOfSnsrs2Check; i++ )
-                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.presSensorsCalRecord.pressureSensors[ i ].calibrationTime ? TRUE : FALSE );
+//            for ( i = 0; i < numOfSnsrs2Check; i++ )
+//                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.presSensorsCalRecord.pressureSensors[ i ].calibrationTime ? TRUE : FALSE );
             break;
 
         case GET_CAL_TEMP_SENSORS:
             nvDataStartPtr = (U08*)&ddCalibrationGroup.ddCalibrationRecord.tempSensorsCalRecord;
             nvDataLength   = sizeof( ddCalibrationGroup.ddCalibrationRecord.tempSensorsCalRecord );
-            for ( i = 0; i < numOfSnsrs2Check; i++ )
-                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.tempSensorsCalRecord.tempSensors[ i ].calibrationTime ? TRUE : FALSE );
+//            for ( i = 0; i < numOfSnsrs2Check; i++ )
+//                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.tempSensorsCalRecord.tempSensors[ i ].calibrationTime ? TRUE : FALSE );
             break;
 
         case GET_CAL_CONCENTRATE_PUMPS_RECORD:
             nvDataStartPtr = (U08*)&ddCalibrationGroup.ddCalibrationRecord.concentratePumpsRecord;
             nvDataLength   = sizeof( ddCalibrationGroup.ddCalibrationRecord.concentratePumpsRecord );
-            for ( i = 0; i < numOfSnsrs2Check; i++ )
-                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.concentratePumpsRecord.concentratePumps[ i ].calibrationTime ? TRUE : FALSE );
+//            for ( i = 0; i < numOfSnsrs2Check; i++ )
+//                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.concentratePumpsRecord.concentratePumps[ i ].calibrationTime ? TRUE : FALSE );
             break;
 
         case GET_CAL_D12_PUMP_RECORD:
             nvDataStartPtr = (U08*)&ddCalibrationGroup.ddCalibrationRecord.d12DialysatePumpRecord;
             nvDataLength   = sizeof( ddCalibrationGroup.ddCalibrationRecord.d12DialysatePumpRecord );
-            isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.d12DialysatePumpRecord.calibrationTime ? TRUE : FALSE );
+//            isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.d12DialysatePumpRecord.calibrationTime ? TRUE : FALSE );
             break;
 
         case GET_CAL_D48_PUMP_RECORD:
             nvDataStartPtr = (U08*)&ddCalibrationGroup.ddCalibrationRecord.d48DialysatePumpRecord;
             nvDataLength   = sizeof( ddCalibrationGroup.ddCalibrationRecord.d48DialysatePumpRecord );
-            isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.d48DialysatePumpRecord.d48DialysatePump.calibrationTime ? TRUE : FALSE );
+//            isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.d48DialysatePumpRecord.d48DialysatePump.calibrationTime ? TRUE : FALSE );
             break;
 
         case GET_CAL_ACID_CONCENTREATES:
             nvDataStartPtr = (U08*)&ddCalibrationGroup.ddCalibrationRecord.acidConcentratesRecord;
             nvDataLength   = sizeof( ddCalibrationGroup.ddCalibrationRecord.acidConcentratesRecord );
-            for ( i = 0; i < numOfSnsrs2Check; i++ )
-                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.acidConcentratesRecord.acidConcentrate[ i ].calibrationTime ? TRUE : FALSE );
+//            for ( i = 0; i < numOfSnsrs2Check; i++ )
+//                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.acidConcentratesRecord.acidConcentrate[ i ].calibrationTime ? TRUE : FALSE );
             break;
 
         case GET_CAL_BICARB_CONCENTRATES:
             nvDataStartPtr = (U08*)&ddCalibrationGroup.ddCalibrationRecord.bicarbConcentratesRecord;
             nvDataLength   = sizeof( ddCalibrationGroup.ddCalibrationRecord.bicarbConcentratesRecord );
-            for ( i = 0; i < numOfSnsrs2Check; i++ )
-                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.bicarbConcentratesRecord.bicarbConcentrate[ i ].calibrationTime ? TRUE : FALSE );
+//            for ( i = 0; i < numOfSnsrs2Check; i++ )
+//                isNVDataInvalid |= ( 0 == ddCalibrationGroup.ddCalibrationRecord.bicarbConcentratesRecord.bicarbConcentrate[ i ].calibrationTime ? TRUE : FALSE );
             break;
 
         case GET_CAL_ACCEL_SENSORS:
             nvDataStartPtr  = (U08*)&ddCalibrationGroup.ddCalibrationRecord.accelerometerSensorCalRecord;
-            isNVDataInvalid = ( 0 == ddCalibrationGroup.ddCalibrationRecord.accelerometerSensorCalRecord.calibrationTime ? TRUE : FALSE );
+//            isNVDataInvalid = ( 0 == ddCalibrationGroup.ddCalibrationRecord.accelerometerSensorCalRecord.calibrationTime ? TRUE : FALSE );
             break;
 
         case GET_CAL_BLOOD_LEAK_SENSOR:
             nvDataStartPtr  = (U08*)&ddCalibrationGroup.ddCalibrationRecord.bloodLeakSensorCalRecord;
             nvDataLength    = sizeof( ddCalibrationGroup.ddCalibrationRecord.bloodLeakSensorCalRecord );
-            isNVDataInvalid = ( 0 == ddCalibrationGroup.ddCalibrationRecord.bloodLeakSensorCalRecord.calibrationTime ? TRUE : FALSE );
+//            isNVDataInvalid = ( 0 == ddCalibrationGroup.ddCalibrationRecord.bloodLeakSensorCalRecord.calibrationTime ? TRUE : FALSE );
             break;
 
         case GET_SYSTEM_RECORD: