Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -re59287e5915e01c44af22fc54eafc29cb0f6c2c0 -ra069eb423b26296eb95214e18383c81adae07497
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision e59287e5915e01c44af22fc54eafc29cb0f6c2c0)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision a069eb423b26296eb95214e18383c81adae07497)
@@ -151,7 +151,6 @@
 static void setROPumpControlSignalDutyCycle( F32 dutyCycle );
 static void stopROPump( void );
 static void publishROPumpData( void );
-static BOOL processCalibrationData( void );
 
 /*********************************************************************//**
  * @brief
@@ -321,7 +320,7 @@
 
 /*********************************************************************//**
  * @brief
- * The execROPumpMonitor function executes the RO pump monitor.  The RO flow
+ * The execROPumpMonitor function executes the RO pump monitor. The RO flow
  * sensor is read, filtered, converted to L/min and calibrated.
  * @details Inputs: measuredFlowReadingsSum, flowFilterCounter,
  * measuredROFlowRateLPM, measuredROFlowRateLPM, roPumpState,
@@ -347,8 +346,8 @@
     // Check if a new calibration is available
     if ( TRUE == isNewCalibrationRecordAvailable() )
     {
-        // Get the new calibration data and check its validity
-        processCalibrationData();
+        getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ),
+                            NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD );
     }
 
     // Read flow at the control set
@@ -492,7 +491,8 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
-    BOOL calStatus = processCalibrationData();
+    BOOL calStatus = getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ),
+                                         NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD );
 
     if ( TRUE == calStatus )
     {
@@ -796,48 +796,6 @@
 
 /*********************************************************************//**
  * @brief
- * The processCalibrationData function gets the calibration data and makes
- * sure it is valid by checking the calibration date. The calibration date
- * should not be 0.
- * @details Inputs: none
- * @details Outputs: flowSensorsCalRecord
- * @return TRUE if the calibration record is valid, otherwise FALSE
- *************************************************************************/
-static BOOL processCalibrationData( void )
-{
-    BOOL status = TRUE;
-    U32 sensor;
-
-    // Get the calibration record from NVDataMgmt
-    DG_FLOW_SENSORS_CAL_RECORD_T calData = getDGFlowSensorsCalibrationRecord();
-
-    for ( sensor = 0; sensor < NUM_OF_CAL_DATA_FLOW_SENSORS; sensor++ )
-    {
-#ifndef SKIP_CAL_CHECK
-        // Check if the calibration data that was received from NVDataMgmt is legitimate
-        // The calibration date item should not be zero. If the calibration date is 0,
-        // then the flow sensors data is not stored in the NV memory or it was corrupted.
-        if ( 0 == calData.flowSensors[ sensor ].calibrationTime )
-        {
-
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD, (U32)sensor );
-            status = FALSE;
-        }
-#endif
-
-        // The calibration data was valid, update the local copy
-        flowSensorsCalRecord.flowSensors[ sensor ].fourthOrderCoeff = calData.flowSensors[ sensor ].fourthOrderCoeff;
-        flowSensorsCalRecord.flowSensors[ sensor ].thirdOrderCoeff  = calData.flowSensors[ sensor ].thirdOrderCoeff;
-        flowSensorsCalRecord.flowSensors[ sensor ].secondOrderCoeff = calData.flowSensors[ sensor ].secondOrderCoeff;
-        flowSensorsCalRecord.flowSensors[ sensor ].gain             = calData.flowSensors[ sensor ].gain;
-        flowSensorsCalRecord.flowSensors[ sensor ].offset           = calData.flowSensors[ sensor ].offset;
-    }
-
-    return status;
-}
-
-/*********************************************************************//**
- * @brief
  * The publishROPumpData function publishes RO pump data at the set interval.
  * @details Inputs: roPumpDataPublicationTimerCounter
  * @details Outputs: roPumpDataPublicationTimerCounter