Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rde1c5ec969a5529cbdb7e66a4168fc11b9b3e58a -r16d6398acc1c6cf604d9dc993b27c94d895132e9
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision de1c5ec969a5529cbdb7e66a4168fc11b9b3e58a)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 16d6398acc1c6cf604d9dc993b27c94d895132e9)
@@ -199,7 +199,6 @@
 static OVERRIDE_U32_T syringePumpDataPublishInterval = { SYRINGE_PUMP_DATA_PUB_INTERVAL, SYRINGE_PUMP_DATA_PUB_INTERVAL, 0, 0 };
 static OVERRIDE_F32_T syringePumpMeasRate = { 0.0, 0.0, 0.0, 0 };               ///< Measured rate for syringe pump (in mL/hr).
 static OVERRIDE_F32_T syringePumpMeasForce = { 0.0, 0.0, 0.0, 0 };              ///< Measured driver force (in V).
-static OVERRIDE_F32_T syringePumpMeasSyringeDetectionSwitch = { 0, 0, 0, 0 };   ///< Measured syringe detect switch (in V).
 static OVERRIDE_F32_T syringePumpMeasHome = { 0.0, 0.0, 0.0, 0 };               ///< Measured optical home (in V).
 static OVERRIDE_S32_T syringePumpPosition = { 0, 0, 0, 0 };                     ///< Encoder based position (in steps).
 static OVERRIDE_F32_T syringePumpVolumeDelivered = { 0.0, 0.0, 0.0, 0 };        ///< Measured volume delivered (in mL).
@@ -273,7 +272,6 @@
 
 static S32 getSyringePumpPosition( void );
 static F32 getSyringePumpMeasRate( void );
-static F32 getSyringePumpSyringeDetectorV( void );
 static F32 getSyringePumpHomeDetectorV( void );
 static F32 getSyringePumpForceV( void );
 static F32 getHeparinBolusTargetRate( void );
@@ -1068,17 +1066,6 @@
 
     // Get latest ADC data and convert to V
     syringePumpMeasHome.data = ( (F32)getFPGASyringePumpADCChannel2() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
-#ifndef _RELEASE_
-//    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_DISABLE_VALUE )
-    {
-        syringePumpMeasSyringeDetectionSwitch.data = 0.0;  // if syringe pump disabled, always report no detection
-    }
-//    else
-#endif
-    {
-        syringePumpMeasSyringeDetectionSwitch.data = ( (F32)getFPGASyringePumpADCChannel1() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
-    }
-
     syringePumpMeasForce.data = ( (F32)getFPGASyringePumpADCChannel0() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
 
     // Apply home offset to encoder position
@@ -1666,19 +1653,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getSyringePumpSyringeDetectorV function gets the current syringe pump
- * syringe detect signal.
- * @details \b Inputs: syringePumpMeasSyringeDetectionSwitch
- * @details \b Outputs: none
- * @return the current syringe pump syringe detect signal (in V).
- *************************************************************************/
-static F32 getSyringePumpSyringeDetectorV( void )
-{
-    return getF32OverrideValue( &syringePumpMeasSyringeDetectionSwitch );
-}
-
-/*********************************************************************//**
- * @brief
  * The getSyringePumpHomeDetectorV function gets the current syringe pump
  * home detect signal.
  * @details \b Inputs: syringePumpMeasHome
@@ -2149,7 +2123,6 @@
         data.syringePumpMeasForce = getSyringePumpForceV();
         data.syringePumpMeasHome = getSyringePumpHomeDetectorV();
         data.syringePumpMeasRate = getSyringePumpMeasRate();
-        data.syringePumpMeasSwitch = getSyringePumpSyringeDetectorV();
         data.syringePumpPosition = getSyringePumpPosition();
         data.syringePumpSetRate = syringePumpSetRate;
         data.syringePumpState = (U32)syringePumpState;
@@ -2290,22 +2263,6 @@
 
 /*********************************************************************//**
  * @brief
- * The testSyringePumpMeasuredSyringeDetectOverride function overrides the measured
- * syringe detect analog signal of the syringe pump.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpMeasSyringeDetectionSwitch
- * @param value override syringe pump measured syringe detection signal with this value (in V)
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testSyringePumpMeasuredSyringeDetectOverride( MESSAGE_T *message )
-{
-    BOOL result = f32Override( message, &syringePumpMeasSyringeDetectionSwitch );
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testSyringePumpMeasuredHomeOverride function overrides the measured
  * home analog signal of the syringe pump.
  * @details \b Inputs: syringePumpMeasHome