Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -re9fecbf670ee581a251ce122fb2d5d3ae05f2758 -r15f9827c863812cfd1f891d22342103fe9a72abc
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision e9fecbf670ee581a251ce122fb2d5d3ae05f2758)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 15f9827c863812cfd1f891d22342103fe9a72abc)
@@ -197,10 +197,8 @@
 static S32 syringePumpLastPositions[ SYRINGE_PUMP_SPEED_CALC_BUFFER_LEN ];      ///< Last encoder positions for the syringe pump.
 static U32 syringePumpMotorSpeedCalcIdx;                                        ///< Index into 1 second buffer of syringe pump encoder positions.
 static U32 syringePumpSpeedCalcTimerCounter;                                    ///< Used to calculate measured rate from change in position over time.
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
 static MOTOR_DIR_T syringePumpControllerMeasuredDirection;                      ///< Measured direction of syringe pump per controller.
 static MOTOR_DIR_T syringePumpEncoderMeasuredDirection;                         ///< Measured direction of syringe pump per encoder position relative to previous.
-#endif
 
 static BOOL syringePumpRetractRequested;                                        ///< Flag indicates a retract operation is requested.
 static BOOL syringePumpSeekRequested;                                           ///< Flag indicates a plunger seek operation is requested.
@@ -277,10 +275,11 @@
     syringePumpVolumeStartPosition = 0;
     syringePumpHomePositionOffset = 0;
     syringePumpLastPosition = 0;
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
-    syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
-    syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
-#endif
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
+        syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
+    }
 
     syringePumpDataPublicationTimerCounter = 0;
     syringePumpSpeedCalcTimerCounter = 0;
@@ -476,15 +475,16 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
-#ifndef ALWAYS_ALLOW_SYRINGE_PUMP_CMDS
-    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
-#else
-    heparinDeliveryState = HEPARIN_STATE_STOPPED;
-    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
-#endif
+    if ( ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) ) ||
+           ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) ) == SW_CONFIG_ENABLE_VALUE )
     {
-        syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
-        syringePumpRetractRequested = TRUE;
+        heparinDeliveryState = HEPARIN_STATE_STOPPED;
+        if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
+        {
+            syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
+            syringePumpRetractRequested = TRUE;
+        }
+
     }
 
     return syringePumpRetractRequested;
@@ -568,9 +568,10 @@
     }
     else
     {
-#ifndef DISABLE_SYRINGE_PUMP
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD, tgtRate )
-#endif
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD, tgtRate )
+        }
     }
 
     return syringePumpBolusRequested;
@@ -598,9 +599,10 @@
     }
     else
     {
-#ifndef DISABLE_SYRINGE_PUMP
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_CONT_CMD, flowRate )
-#endif
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_CONT_CMD, flowRate )
+        }
     }
 
     return syringePumpContinuousRequested;
@@ -997,12 +999,13 @@
     calcSafetyVolumeDelivered();
     // Calculate measured rate (mL/hr)
     calcMeasRate();
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
-    // Get measured direction
-    syringePumpControllerMeasuredDirection = ( ( getSyringePumpEncoderStatus() & SYRINGE_PUMP_ENCODER_DIRECTION_BIT ) != 0 ? MOTOR_DIR_REVERSE : MOTOR_DIR_FORWARD );
-    // Calculate direction from encoder position relative to last
-    syringePumpEncoderMeasuredDirection = ( getSyringePumpPosition() - syringePumpLastPosition >= 0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
-#endif
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        // Get measured direction
+        syringePumpControllerMeasuredDirection = ( ( getSyringePumpEncoderStatus() & SYRINGE_PUMP_ENCODER_DIRECTION_BIT ) != 0 ? MOTOR_DIR_REVERSE : MOTOR_DIR_FORWARD );
+        // Calculate direction from encoder position relative to last
+        syringePumpEncoderMeasuredDirection = ( getSyringePumpPosition() - syringePumpLastPosition >= 0 ? MOTOR_DIR_FORWARD : MOTOR_DIR_REVERSE );
+    }
 
     // Check if syringe pump is on while BP is off
     {
@@ -1021,9 +1024,10 @@
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR,
                                                  ( ( getCurrentOperationMode() > MODE_INIT ) && ( lastSyringePumpADCReadCtr == getSyringePumpADCReadCounter() ) ) ) )
         {
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
-            activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
-#endif
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
+            }
         }
 
         lastSyringePumpADCReadCtr = getSyringePumpADCReadCounter();
@@ -1164,14 +1168,13 @@
 {
     SYRINGE_PUMP_STATE_T result = SYRINGE_PUMP_OFF_STATE;
 
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
     // Check position is not changing while stopped
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, ( syringePumpLastPosition != getSyringePumpPosition() ) ) )
+    if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, ( syringePumpLastPosition != getSyringePumpPosition() ) ) ) &&
+         ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE ) )
     {
             activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR );
             activateSafetyShutdown();
     }
-#endif
 
     // Check for request flags
     if ( TRUE == syringePumpRetractRequested )
@@ -1329,9 +1332,10 @@
         }
         else
         {
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM, syringeVol, txVolume );
-#endif
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM, syringeVol, txVolume );
+            }
         }
     }
 
@@ -1539,18 +1543,19 @@
 {
     BOOL result = stopPump;
 
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, ( syringePumpEncoderMeasuredDirection != expDir ) ) )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
     {
-        result = TRUE;
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, (U32)syringePumpEncoderMeasuredDirection, (U32)syringePumpState );
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, ( syringePumpEncoderMeasuredDirection != expDir ) ) )
+        {
+            result = TRUE;
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, (U32)syringePumpEncoderMeasuredDirection, (U32)syringePumpState );
+        }
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, ( syringePumpControllerMeasuredDirection != expDir ) ) )
+        {
+            result = TRUE;
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, (U32)syringePumpControllerMeasuredDirection, (U32)syringePumpState );
+        }
     }
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, ( syringePumpControllerMeasuredDirection != expDir ) ) )
-    {
-        result = TRUE;
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, (U32)syringePumpControllerMeasuredDirection, (U32)syringePumpState );
-    }
-#endif
 
     return result;
 }
@@ -1677,20 +1682,22 @@
 static BOOL checkMeasRate( BOOL stopPump, F32 pctMargin )
 {
     BOOL result = stopPump;
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
-    F32  rate = getSyringePumpMeasRate();
-    F32  max = MAX( rate, syringePumpSetRate );
-    F32  min = MIN( rate, syringePumpSetRate );
-    F32  error = ( max > 0.0 ? ( 1.0 - fabs( min / max ) ) : 0.0 );
-    F32  delta = max - min;
 
-    // Alarm on rate if off by more than 5% or 0.1 mL/hr, whichever is greater
-    if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, ( ( error > pctMargin ) && ( delta > SYRINGE_PUMP_MAX_RATE_ERROR_ML_HR ) ) ) )
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
     {
-        result = TRUE;
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, syringePumpSetRate, rate )
+        F32  rate = getSyringePumpMeasRate();
+        F32  max = MAX( rate, syringePumpSetRate );
+        F32  min = MIN( rate, syringePumpSetRate );
+        F32  error = ( max > 0.0 ? ( 1.0 - fabs( min / max ) ) : 0.0 );
+        F32  delta = max - min;
+
+        // Alarm on rate if off by more than 5% or 0.1 mL/hr, whichever is greater
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, ( ( error > pctMargin ) && ( delta > SYRINGE_PUMP_MAX_RATE_ERROR_ML_HR ) ) ) )
+        {
+            result = TRUE;
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, syringePumpSetRate, rate )
+        }
     }
-#endif
 
     return result;
 }