Index: firmware/App/Controllers/SyringePump.h
===================================================================
diff -u -r16d6398acc1c6cf604d9dc993b27c94d895132e9 -rc1e18c14a172586f47ebcf027bce9669beded986
--- firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision 16d6398acc1c6cf604d9dc993b27c94d895132e9)
+++ firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision c1e18c14a172586f47ebcf027bce9669beded986)
@@ -45,14 +45,14 @@
 /// Enumeration of syringe pump operations.
 typedef enum SyringePumpOperations
 {
-    SYRINGE_PUMP_OP_STOP = 0,                       ///< Syringe pump stopped - no operation.
-    SYRINGE_PUMP_OP_RETRACT = 1,                    ///< Syringe pump retract operation.  Retract to home postion.
-    SYRINGE_PUMP_OP_SEEK = 2,                       ///< Syringe pump seek operation.  Seek syringe plunger.
-    SYRINGE_PUMP_OP_PRIME = 3,                      ///< Syringe pump prime operation.  Prime Heparin line.
-    SYRINGE_PUMP_OP_BOLUS = 4,                      ///< Syringe pump bolus operation.  Deliver bolus volume of Heparin.
+    SYRINGE_PUMP_OP_STOP       = 0,                 ///< Syringe pump stopped - no operation.
+    SYRINGE_PUMP_OP_RETRACT    = 1,                 ///< Syringe pump retract operation.  Retract to home postion.
+    SYRINGE_PUMP_OP_SEEK       = 2,                 ///< Syringe pump seek operation.  Seek syringe plunger.
+    SYRINGE_PUMP_OP_PRIME      = 3,                 ///< Syringe pump prime operation.  Prime Heparin line.
+    SYRINGE_PUMP_OP_BOLUS      = 4,                 ///< Syringe pump bolus operation.  Deliver bolus volume of Heparin.
     SYRINGE_PUMP_OP_CONTINUOUS = 5,                 ///< Syringe pump continuous dispense operation.  Deliver Heparin at set rate.
-    SYRINGE_PUMP_OP_PRELOAD = 6,                    ///< Syringe pump preload operation.
-    NUM_OF_SYRINGE_PUMP_OPS = 7                     ///< Number of syringe pump operation.
+    SYRINGE_PUMP_OP_PRELOAD    = 6,                 ///< Syringe pump preload operation.
+    NUM_OF_SYRINGE_PUMP_OPS    = 7                  ///< Number of syringe pump operation.
 } SYRINGE_PUMP_OPERATION_T;
 
 /// Payload record structure for the syringe pump operation request message.
@@ -81,33 +81,33 @@
 /// Heparin publish data structure
 typedef struct
 {
-    F32 syringePumpVolumeDelivered;     ///< Syringe pump volume delivered.
-    F32 syringePumpVolumeRequired;      ///< Syringe pump volume required for therapy.
+    F32 syringePumpVolumeDelivered;                 ///< Syringe pump volume delivered.
+    F32 syringePumpVolumeRequired;                  ///< Syringe pump volume required for therapy.
 } SYRINGE_PUMP_VOLUME_DATA_T;
 
 // Begin TODO: Move to NVM
 /// TD heparin force sensor calibration record
 typedef struct
 {
-    F32 tdHeparinForceSensorDACVoltage;                                                                         ///< TD heparin force sensor calibration data.
-    U32 calibrationTime;                                                                                        ///< Calibration time.
-    U16 crc;                                                                                                    ///< CRC for the TD heparin pump calibration payload.
+    F32 tdHeparinForceSensorDACVoltage;             ///< TD heparin force sensor calibration data.
+    U32 calibrationTime;                            ///< Calibration time.
+    U16 crc;                                        ///< CRC for the TD heparin pump calibration payload.
 } TD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T;
 
 /// TD available NV data to get
 typedef enum td_nv_commands
 {
-    GET_CAL_HEPARIN_FORCE_SENSOR,                                                                              ///< Get heparin force sensor calibration data.
-    NUM_OF_NV_TD_DATA                                                                                          ///< Number of non-volatile data.
+    GET_CAL_HEPARIN_FORCE_SENSOR,                  ///< Get heparin force sensor calibration data.
+    NUM_OF_NV_TD_DATA                              ///< Number of non-volatile data.
 } NV_DATA_T;
 
 #ifndef _RELEASE_
 /// Software configuration enums
 typedef enum software_configurations
 {
-    SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS,                                                                     ///< Software configuration disable syringe pump alarms.
-    SW_CONFIG_DISABLE_SYRINGE_PUMP,                                                                            ///< Software configuration disable syringe pump.
-    NUM_OF_SW_CONFIGS                                                                                          ///< Number of software configurations.
+    SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS,         ///< Software configuration disable syringe pump alarms.
+    SW_CONFIG_DISABLE_SYRINGE_PUMP,                ///< Software configuration disable syringe pump.
+    NUM_OF_SW_CONFIGS                              ///< Number of software configurations.
 } SOFTWARE_CONFIG_T;
 #endif
 // End TODO: Move to NVM
@@ -116,7 +116,6 @@
 
 void initSyringePump( void );
 void execSyringePump( void );
-
 SELF_TEST_STATUS_T execSyringePumpSelfTest( void );
 
 BOOL userHeparinRequest( HEPARIN_CMD_T cmd );
@@ -134,7 +133,6 @@
 BOOL startHeparinBolus( void );
 BOOL startHeparinContinuous( void );
 BOOL setSyringePumpDACVref( void );
-void syringeDetectionRequired( BOOL req );
 void syringePumpVerifyForceSensorDACCalibration( void );
 
 BOOL isSyringePumpHome( void );
@@ -157,8 +155,8 @@
 BOOL testSyringePumpEncoderStatusOverride( MESSAGE_T *message );
 BOOL testSyringePumpADCandDACStatusOverride( MESSAGE_T *message );
 BOOL testSyringePumpADCReadCounterOverride( MESSAGE_T *message );
-BOOL testSyringePumpDACVrefOverride( MESSAGE_T *message  );
 BOOL testHeparinBolusTargetRateOverride( MESSAGE_T *message );
+BOOL testCalibrateForceSensor( MESSAGE_T *message  );
 
 /**@}*/