Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r40f46e196349e3dd730048a354df8bbb2e40407d -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
@@ -277,8 +277,11 @@
     syringePumpHomePositionOffset = 0;
     syringePumpLastPosition = 0;
 #ifndef DISABLE_SYRINGE_PUMP_ALARMS
-    syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
-    syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
+        syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
+    }
 #endif
 
     syringePumpDataPublicationTimerCounter = 0;
@@ -476,17 +479,23 @@
 BOOL retractSyringePump( void )
 {
 #ifndef ALWAYS_ALLOW_SYRINGE_PUMP_CMDS
-    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
+    if ( ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) ) ||
+           ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_SYRINGE_PUMP_CMDS ) ) == SW_CONFIG_ENABLE_VALUE )
+    {
 #else
     heparinDeliveryState = HEPARIN_STATE_STOPPED;
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
 #endif
-    {
-        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;
+        return syringePumpRetractRequested;
+
+    }
 }
 
 /*********************************************************************//**
@@ -570,7 +579,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 )
+        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 )
+        }
 #endif
     }
 
@@ -600,7 +612,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 )
+        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 )
+        }
 #endif
     }
 
@@ -999,10 +1014,13 @@
     // 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 );
+    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 );
+    }
 #endif
 
     // Check if syringe pump is on while BP is off
@@ -1023,7 +1041,10 @@
                                                  ( ( getCurrentOperationMode() > MODE_INIT ) && ( lastSyringePumpADCReadCtr == getSyringePumpADCReadCounter() ) ) ) )
         {
 #ifndef DISABLE_SYRINGE_PUMP_ALARMS
-            activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
+            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
+            }
 #endif
         }
 
@@ -1167,7 +1188,8 @@
 
 #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();
@@ -1331,7 +1353,10 @@
         else
         {
 #ifndef DISABLE_SYRINGE_PUMP_ALARMS
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM, syringeVol, txVolume );
+            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 );
+            }
 #endif
         }
     }
@@ -1544,16 +1569,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;
@@ -1664,17 +1692,20 @@
 {
     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