Index: NVDataMgmt.c
===================================================================
diff -u -r1797ae184a55396ff3464cead47f16bac9dda84c -rf853004049bc4701d911701e48768cd17189faea
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 1797ae184a55396ff3464cead47f16bac9dda84c)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision f853004049bc4701d911701e48768cd17189faea)
@@ -20,8 +20,8 @@
 #include <string.h>      // For memcpy
 #include <math.h>        // For ceilf function
 
-#include "system.h"
-#include "F021.h"
+#include "system.h"      // For fapi operations
+#include "F021.h"        // For fapi operations
 
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
@@ -1283,6 +1283,11 @@
             for ( i = 0; i < NUM_OF_CAL_DATA_HD_TEMP_SENSORS; i++ )
                 isNVDataValid |= ( 0 == hdCalibrationRecord.hdCalibrationGroups.tempSensorsCalRecord.hdTemperatureSensors[ i ].calibrationTime ? FALSE : TRUE );
             break;
+
+        case GET_CAL_ACCEL_SENSORS:
+            nvDataStartPtr = (U08*)&hdCalibrationRecord.hdCalibrationGroups.accelerometerSensorCalRecord;
+            isNVDataValid  = ( 0 == hdCalibrationRecord.hdCalibrationGroups.accelerometerSensorCalRecord.calibrationTime ? FALSE : TRUE );
+            break;
 #endif
 
 #ifdef _DG_
@@ -1321,10 +1326,46 @@
                 isNVDataValid |= ( 0 == dgCalibrationRecord.dgCalibrationGroups.bicarbConcentratesRecord.bicarbConcentrate[ i ].calibrationTime ? FALSE : TRUE );
             break;
 
+        case GET_CAL_ACCEL_SENSORS:
+            nvDataStartPtr = (U08*)&dgCalibrationRecord.dgCalibrationGroups.accelerometerSensorCalRecord;
+            isNVDataValid  = ( 0 == dgCalibrationRecord.dgCalibrationGroups.accelerometerSensorCalRecord.calibrationTime ? FALSE : TRUE );
+            break;
+
+        case GET_CAL_CONDUCTIVITY_SENSORS:
+            nvDataStartPtr = (U08*)&dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord;
+            nvDataLength   = sizeof( dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord );
+            for ( i = 0; i < numOfSnsrs2Check; i++ )
+                isNVDataValid |= ( 0 == dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord.condSensors[ i ].calibrationTime ? FALSE : TRUE );
+            break;
+
+        case GET_CAL_TEMP_SENSORS:
+            nvDataStartPtr = (U08*)&dgCalibrationRecord.dgCalibrationGroups.tempSensorsCalRecord;
+            nvDataLength   = sizeof( dgCalibrationRecord.dgCalibrationGroups.tempSensorsCalRecord );
+            for ( i = 0; i < numOfSnsrs2Check; i++ )
+                isNVDataValid |= ( 0 == dgCalibrationRecord.dgCalibrationGroups.tempSensorsCalRecord.tempSensors[ i ].calibrationTime ? FALSE : TRUE );
+            break;
+
+        case GET_CAL_RSRVRS_VOL_RECORD:
+            nvDataStartPtr = (U08*)&dgCalibrationRecord.dgCalibrationGroups.reservoirVolumesRecord;
+            nvDataLength   = sizeof( dgCalibrationRecord.dgCalibrationGroups.reservoirVolumesRecord );
+            for ( i = 0; i < numOfSnsrs2Check; i++ )
+                isNVDataValid |= ( 0 == dgCalibrationRecord.dgCalibrationGroups.reservoirVolumesRecord.reservoir[ i ].calibrationTime ? FALSE : TRUE );
+            break;
+
         case GET_INF_HEATERS_RECORD:
             nvDataStartPtr = (U08*)&dgHeatersInfoGroup.dgHeatersInfo;
             nvDataLength   = sizeof( dgHeatersInfoGroup.dgHeatersInfo );
             break;
+
+        case GET_SYS_RECORD:
+            nvDataStartPtr = (U08*)&dgSystemGroup.dgSystemRecord;
+            nvDataLength   = sizeof( dgSystemGroup.dgSystemRecord );
+            break;
+
+        case GET_SRV_RECORD:
+            nvDataStartPtr = (U08*)&dgServiceGroup.dgServiceRecord;
+            nvDataLength   = sizeof( dgServiceGroup.dgServiceRecord );
+            break;
 #endif
     }
 
@@ -1360,32 +1401,6 @@
 #ifdef _DG_
 /*********************************************************************//**
  * @brief
- * The getDGPressureSensorsCalibrationRecord function returns the DG pressure
- * sensors record.
- * @details Inputs: none
- * @details Outputs: none
- * @return DG pressure sensors calibration record
- *************************************************************************/
-DG_PRES_SENSORS_CAL_RECORD_T getDGPressureSensorsCalibrationRecord( void )
-{
-    return dgCalibrationRecord.dgCalibrationGroups.presSensorsCalRecord;
-}
-
-/*********************************************************************//**
- * @brief
- * The getDGConducitivitySensorsCalibrationRecord function returns the DG
- * conductivity sensors calibration record.
- * @details Inputs: none
- * @details Outputs: none
- * @return DG conductivity sensors calibration record
- *************************************************************************/
-DG_COND_SENSORS_CAL_RECORD_T getDGConducitivitySensorsCalibrationRecord( void )
-{
-    return dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord;
-}
-
-/*********************************************************************//**
- * @brief
  * The getDGROPumpRecord function returns the DG RO pump calibration record.
  * @details Inputs: none
  * @details Outputs: none
@@ -1437,19 +1452,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getDGPreROPurgeVolumeRecord function returns the DG pre RO purge
- * volume record.
- * @details Inputs: none
- * @details Outputs: none
- * @return DG pre RO purge volume record
- *************************************************************************/
-DG_PRE_RO_PURGE_VOLUME_T getDGPreROPurgeVolumeRecord( void )
-{
-    return dgCalibrationRecord.dgCalibrationGroups.preROPurgeVolumeRecord;
-}
-
-/*********************************************************************//**
- * @brief
  * The getDGReservoirsVolumeRecord function returns the DG reservoirs
  * volume record.
  * @details Inputs: none
@@ -1487,43 +1489,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getDGAccelerometerSensorCalibrationRecord function returns the DG
- * accelerometer sensor calibration record.
- * @details Inputs: none
- * @details Outputs: none
- * @return DG accelerometer sensor calibration record
- *************************************************************************/
-DG_ACCEL_SENSOR_CAL_RECORD_T getDGAccelerometerSensorCalibrationRecord( void )
-{
-    return dgCalibrationRecord.dgCalibrationGroups.accelerometerSensorCalRecord;
-}
-
-/*********************************************************************//**
- * @brief
- * The getDGSystemRecord function returns the DG systems record.
- * @details Inputs: none
- * @details Outputs: none
- * @return DG systems record
- *************************************************************************/
-DG_SYSTEM_RECORD_T getDGSystemRecord( void )
-{
-    return dgSystemGroup.dgSystemRecord;
-}
-
-/*********************************************************************//**
- * @brief
- * The getDGServiceRecord function returns the DG service record.
- * @details Inputs: none
- * @details Outputs: none
- * @return DG service record
- *************************************************************************/
-DG_SERVICE_RECORD_T getDGServiceRecord( void )
-{
-    return dgServiceGroup.dgServiceRecord;
-}
-
-/*********************************************************************//**
- * @brief
  * The getDGScheduledRunsRecord function returns the DG scheduled runs record.
  * @details Inputs: none
  * @details Outputs: none
@@ -1629,19 +1594,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getHDAccelerometerSensorCalibrationRecord function returns the HD
- * accelerometer sensor calibration record.
- * @details Inputs: none
- * @details Outputs: none
- * @return HD heparin force sensor calibration record
- *************************************************************************/
-HD_ACCELEROMETER_SENSOR_CAL_RECORD_T getHDAccelerometerSensorCalibrationRecord( void )
-{
-    return hdCalibrationRecord.hdCalibrationGroups.accelerometerSensorCalRecord;
-}
-
-/*********************************************************************//**
- * @brief
  * The getHDSystemRecord function returns the HD system record.
  * @details Inputs: none
  * @details Outputs: none