Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -ra0f593777c16b10a829049634603f0f7985ec618 -r7018ce34507b82e374b92f9ca47794a56c441489
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision a0f593777c16b10a829049634603f0f7985ec618)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 7018ce34507b82e374b92f9ca47794a56c441489)
@@ -90,7 +90,8 @@
 #define FIVE_PCT_OVER_ALLOWANCE                       1.05                                  ///< Allow 5 percent over target before alarming on over travel.
 
 /// Expected position of empty in relation to home position.
-#define SYRINGE_PUMP_EMPTY_POS                        ( SYRINGE_ENCODER_COUNTS_PER_ML * 10.84 )
+#define SYRINGE_PUMP_EMPTY_POS                        ( SYRINGE_ENCODER_COUNTS_PER_ML * 10.84 )  ///< get syringe volume from home to empty (11 mL is placeholder)
+
 /// Margin of error for empty position determination.
 #define SYRINGE_PUMP_EMPTY_POS_MARGIN                 ( SYRINGE_ENCODER_COUNTS_PER_ML * 0.5 )
 /// Minimum retract position.
@@ -255,7 +256,6 @@
 static BOOL checkVolumeVsSafetyVolume( BOOL stopPump, F32 pctMargin );
 static BOOL checkForStall( BOOL stopPump );
 static void publishSyringePumpData( void );
-static BOOL processCalibrationData( void );
 
 /*********************************************************************//**
  * @brief
@@ -961,7 +961,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();
@@ -1052,18 +1053,18 @@
     {
         isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, FALSE );
     }
+
+    // Execute syringe pump control state machine
+    switch ( syringePumpState )
+    {
+        case SYRINGE_PUMP_INIT_STATE:
+            syringePumpState = handleSyringePumpInitState();
+            break;
+
+        case SYRINGE_PUMP_OFF_STATE:
+            syringePumpState = handleSyringePumpOffState();
+            break;
 
-    // Execute syringe pump control state machine
-    switch ( syringePumpState )
-    {
-        case SYRINGE_PUMP_INIT_STATE:
-            syringePumpState = handleSyringePumpInitState();
-            break;
-
-        case SYRINGE_PUMP_OFF_STATE:
-            syringePumpState = handleSyringePumpOffState();
-            break;
-
         case SYRINGE_PUMP_RETRACT_STATE:
             syringePumpState = handleSyringePumpRetractState();
             break;
@@ -1111,7 +1112,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 )
     {
@@ -1896,45 +1898,8 @@
         syringePumpDataPublicationTimerCounter = 0;
     }
 }
+
 
-/*********************************************************************//**
- * @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
  *************************************************************************/