Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rdbd9f64cc37fbae9e0a9cf30bc4a5e58ba2ea3cd -r6dd0be728c7aecc68b81505514f53d40b7401fda
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision dbd9f64cc37fbae9e0a9cf30bc4a5e58ba2ea3cd)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 6dd0be728c7aecc68b81505514f53d40b7401fda)
@@ -68,6 +68,8 @@
 #define SYRINGE_PUMP_RATE_ALARM_PERSISTENCE           3000                                  ///< Alarm persistence period (in ms) for syringe pump speed check alarms.
 #define SYRINGE_PUMP_DIR_ALARM_PERSISTENCE            3000                                  ///< Alarm persistence period (in ms) for syringe pump direction check alarms.
 #define SYRINGE_PUMP_OFF_ALARM_PERSISTENCE            1000                                  ///< Alarm persistence period (in ms) for syringe pump off check alarms.
+#define SYRINGE_PUMP_OFF_ERROR_MAX_CNT                5                                     ///< Maximum number of syringe pump not stopped errors within time window before alarm triggered. Do not exceed MAX_TIME_WINDOWED_COUNT.
+#define SYRINGE_PUMP_OFF_ERROR_TIME_WIN_MS            (1 * MS_PER_SECOND)                   ///< Time window for Syringe Pump not stopped error.
 
 #define STEPS_TO_MICROSTEPS( s )                      ( (s) * 32.0F )                       ///< Macro conversion from steps to microsteps.
 #define MICROSTEPS_TO_STEPS( m )                      ( (m) / 32.0F )                       ///< Macro conversion from microsteps to steps.
@@ -198,6 +200,7 @@
 static OVERRIDE_U32_T syringePumpADCReadCtr = {0, 0, 0, 0};                     ///< Syringe pump ADC read counter reported by FPGA.
 
 static BOOL requireSyringeDetection;                                            ///< Flag indicating whether syringe detection is required in the current state.
+static BOOL prevSyringeDetected;                                                ///< Flag saving last state of syringe detection
 
 static F32 syringePumpSetRate;                                                  ///< Set rate for syringe pump (in mL/hr).
 static F32 forceAtEndOfSeek;                                                    ///< Force sensor reading in Volts at the end of seek.
@@ -291,6 +294,7 @@
     syringePumpState = SYRINGE_PUMP_INIT_STATE;
     heparinDeliveryState = HEPARIN_STATE_OFF;
     requireSyringeDetection = FALSE;
+    prevSyringeDetected = FALSE;
     syringePumpSetRate = 0.0;
     syringePumpSetToggleTime = 0;
     syringePumpSafetyVolumeDelivered = 0.0;
@@ -328,8 +332,8 @@
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR, 0, SYRINGE_PUMP_OFF_ALARM_PERSISTENCE );
-    initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, 0, SYRINGE_PUMP_OFF_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, 0, SYRINGE_PUMP_RATE_ALARM_PERSISTENCE );
+    initTimeWindowedCount( TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR, SYRINGE_PUMP_OFF_ERROR_MAX_CNT, SYRINGE_PUMP_OFF_ERROR_TIME_WIN_MS );
 
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, ALARM_ID_HD_SYRINGE_PUMP_FPGA_ADC_FAULT,
                              SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS, SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS );
@@ -1024,8 +1028,6 @@
  *************************************************************************/
 static void execSyringePumpMonitor( void )
 {
-    BOOL prevSyringeDetected = isSyringeDetected();
-
     // Check if a new calibration is available
     if ( TRUE == isNewCalibrationRecordAvailable() )
     {
@@ -1102,7 +1104,6 @@
     syringePumpMeasForce.data = ( (F32)getFPGASyringePumpADCChannel0() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
 
     // Apply home offset to encoder position
-    syringePumpLastPosition = getSyringePumpPosition();
     syringePumpPosition.data = encPosition - syringePumpHomePositionOffset;
     // Calculate volume delivered from position
     syringePumpVolumeDelivered.data = (F32)( syringePumpPosition.data - syringePumpVolumeStartPosition ) / SYRINGE_ENCODER_COUNTS_PER_ML;
@@ -1160,12 +1161,6 @@
     // Execute syringe pump monitor
     execSyringePumpMonitor();
 
-    // Clear pump running while off alarm persistence if not in off state
-    if ( syringePumpState != SYRINGE_PUMP_OFF_STATE )
-    {
-        isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, FALSE );
-    }
-
     if ( syringePumpDACRetryCount > 0 )
     {
         syringePumpDACRetryTimer++;
@@ -1222,6 +1217,10 @@
 
     resetSyringePumpRequestFlags();
 
+    // Save syringe pump info for next time
+    syringePumpLastPosition = getSyringePumpPosition();
+    prevSyringeDetected = isSyringeDetected();
+
     // Publish syringe pump data on interval
     publishSyringePumpData();
 }
@@ -1295,7 +1294,7 @@
     SYRINGE_PUMP_STATE_T result = SYRINGE_PUMP_OFF_STATE;
 
     // Check position is not changing while stopped
-    if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, ( syringePumpLastPosition != getSyringePumpPosition() ) ) ) )
+    if ( ( syringePumpLastPosition != getSyringePumpPosition() ) && ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR ) ) )
     {
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )