Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r1c628bfd5d6414b74b8cbd083f66839888a8236b
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 1c628bfd5d6414b74b8cbd083f66839888a8236b)
@@ -196,8 +196,10 @@
 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.
@@ -275,8 +277,10 @@
     syringePumpVolumeStartPosition = 0;
     syringePumpHomePositionOffset = 0;
     syringePumpLastPosition = 0;
+#ifndef DISABLE_SYRINGE_PUMP_ALARMS
     syringePumpControllerMeasuredDirection = MOTOR_DIR_FORWARD;
     syringePumpEncoderMeasuredDirection = MOTOR_DIR_FORWARD;
+#endif
 
     syringePumpDataPublicationTimerCounter = 0;
     syringePumpSpeedCalcTimerCounter = 0;
@@ -965,10 +969,12 @@
     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
 
     // Check if syringe pump is on while BP is off
     {
@@ -1619,13 +1625,13 @@
 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  delta = max - min;
     F32  error = ( max > 0.0 ? ( 1.0 - fabs( min / max ) ) : 0.0 );
+    F32  delta = max - min;
 
-#ifndef DISABLE_SYRINGE_PUMP_ALARMS
     // 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 ) ) ) )
     {