Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd -r667feab319b14681a0330a715da7a1ba930b518d
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 667feab319b14681a0330a715da7a1ba930b518d)
@@ -196,10 +196,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.
@@ -276,13 +274,11 @@
     syringePumpVolumeStartPosition = 0;
     syringePumpHomePositionOffset = 0;
     syringePumpLastPosition = 0;
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
     {
         syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
         syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
     }
-#endif
 
     syringePumpDataPublicationTimerCounter = 0;
     syringePumpSpeedCalcTimerCounter = 0;
@@ -478,24 +474,19 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
-#ifndef ALWAYS_ALLOW_SYRINGE_PUMP_CMDS
     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
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
         if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
         {
             syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
             syringePumpRetractRequested = TRUE;
         }
 
-        return syringePumpRetractRequested;
-
     }
+
+    return syringePumpRetractRequested;
 }
 
 /*********************************************************************//**
@@ -578,12 +569,10 @@
     }
     else
     {
-#ifndef DISABLE_SYRINGE_PUMP
         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
     }
 
     return syringePumpBolusRequested;
@@ -611,12 +600,10 @@
     }
     else
     {
-#ifndef DISABLE_SYRINGE_PUMP
         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
     }
 
     return syringePumpContinuousRequested;
@@ -1013,15 +1000,13 @@
     calcSafetyVolumeDelivered();
     // Calculate measured rate (mL/hr)
     calcMeasRate();
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
     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
     {
@@ -1040,12 +1025,10 @@
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR,
                                                  ( ( getCurrentOperationMode() > MODE_INIT ) && ( lastSyringePumpADCReadCtr == getSyringePumpADCReadCounter() ) ) ) )
         {
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
             if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
             {
                 activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
             }
-#endif
         }
 
         lastSyringePumpADCReadCtr = getSyringePumpADCReadCounter();
@@ -1186,15 +1169,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 )
@@ -1352,12 +1333,10 @@
         }
         else
         {
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
             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
         }
     }
 
@@ -1568,7 +1547,6 @@
 {
     BOOL result = stopPump;
 
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
     {
         if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, ( syringePumpEncoderMeasuredDirection != expDir ) ) )
@@ -1582,7 +1560,6 @@
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, (U32)syringePumpControllerMeasuredDirection, (U32)syringePumpState );
         }
     }
-#endif
 
     return result;
 }
@@ -1691,7 +1668,7 @@
 static BOOL checkMeasRate( BOOL stopPump, F32 pctMargin )
 {
     BOOL result = stopPump;
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
+
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
     {
         F32  rate = getSyringePumpMeasRate();
@@ -1707,7 +1684,6 @@
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, syringePumpSetRate, rate )
         }
     }
-#endif
 
     return result;
 }