Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rfc81a8aec8b013e2f8f6ee9022de0490d6428a4a -r31e778e30a996a0c75429c9a1e9fb34e5d9e373d
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision fc81a8aec8b013e2f8f6ee9022de0490d6428a4a)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 31e778e30a996a0c75429c9a1e9fb34e5d9e373d)
@@ -256,7 +256,6 @@
 static BOOL checkVolumeVsSafetyVolume( BOOL stopPump, F32 pctMargin );
 static BOOL checkForStall( BOOL stopPump );
 static void publishSyringePumpData( void );
-static BOOL processCalibrationData( void );
 
 /*********************************************************************//**
  * @brief
@@ -964,7 +963,8 @@
     if ( TRUE == isNewCalibrationRecordAvailable() )
     {
         // Get the new calibration data and check its validity
-        processCalibrationData();
+        getNVRecord2Driver( GET_CAL_HEPARIN_FORCE_SENSOR, (U08*)&forceSensorCalRecord, sizeof( HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T ),
+                            0, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD );
     }
 
     S32 encPosition = getFPGASyringePumpEncoderPosition();
@@ -1114,7 +1114,8 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
-    BOOL calStatus = processCalibrationData();
+    BOOL calStatus = getNVRecord2Driver( GET_CAL_HEPARIN_FORCE_SENSOR, (U08*)&forceSensorCalRecord, sizeof( HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T ),
+                                         0, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD );
 
     if ( TRUE == calStatus )
     {
@@ -1888,44 +1889,7 @@
     }
 }
 
-/*********************************************************************//**
- * @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: forceSensorCalRecord
- * @return TRUE if the calibration record is valid, otherwise FALSE
- *************************************************************************/
-static BOOL processCalibrationData( void )
-{
-    BOOL status = TRUE;
-
-    // Get the calibration record from NVDataMgmt
-    HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T calData = getHDHeparinForceSensorCalibrationRecord();
-
-    // 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 heparin force sensors data is not stored in the NV memory or it was corrupted.
-    if ( 0 == calData.hdHeparinForceSensor.calibrationTime )
-    {
-#ifndef SKIP_CAL_CHECK
-        activateAlarmNoData( ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD );
-        status = FALSE;
-#endif
-    }
-
-    // The calibration data was valid, update the local copy
-    forceSensorCalRecord.hdHeparinForceSensor.fourthOrderCoeff = calData.hdHeparinForceSensor.fourthOrderCoeff;
-    forceSensorCalRecord.hdHeparinForceSensor.thirdOrderCoeff  = calData.hdHeparinForceSensor.thirdOrderCoeff;
-    forceSensorCalRecord.hdHeparinForceSensor.secondOrderCoeff = calData.hdHeparinForceSensor.secondOrderCoeff;
-    forceSensorCalRecord.hdHeparinForceSensor.gain             = calData.hdHeparinForceSensor.gain;
-    forceSensorCalRecord.hdHeparinForceSensor.offset           = calData.hdHeparinForceSensor.offset;
-
-    return status;
-}
 
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/