Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r9a96522e0a94724a13c2c9c8f60cf8d18ebde218 -r1cfa9cbcd9ae84a8df767c7777ff3beca067aaa8
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9a96522e0a94724a13c2c9c8f60cf8d18ebde218)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 1cfa9cbcd9ae84a8df767c7777ff3beca067aaa8)
@@ -68,7 +68,6 @@
 #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_ADC_READ_PERSISTENCE             100                                   ///< Syringe pump ADC stale read alarm persistence time (in ms).
 
 #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.
@@ -155,6 +154,8 @@
 #define SYRINGE_PUMP_RAMP_STALL_RETRIES               3                                     ///< Syringe pump ramp stall retries allowed.
 #define SYRINGE_PUMP_STALL_SPEED_THRESHOLD            0.05F                                 ///< Minimum syringe pump speed to be considered not stalled.
 
+#define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS        ( 2 * MS_PER_SECOND )                 ///< Syringe pump ADC FPGA error timeout in milliseconds.
+
 /// Defined states for the syringe pump control state machine.
 typedef enum SyringePump_States
 {
@@ -223,8 +224,6 @@
 static BOOL syringePumpDACVrefWriteInProgress;                                  ///< Flag indicates DAC Vref write is in progress.
 static F32  syringePumpDACVref;                                                 ///< DAC Vref setting for force sensor.
 
-static U08  lastSyringePumpADCReadCtr;                                          ///< Remember last ADC read counter to check new reads are fresh.
-
 static U32  syringePumpStallCtr;                                                ///< Counts time when position is not changing during ramp.
 static U32  syringePumpStallRetryCount;                                         ///< Counts pump ramp up stall retries.
 static HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T forceSensorCalRecord;               ///< HD heparin force sensor calibration record.
@@ -306,8 +305,6 @@
     syringePumpPrimeCompleted = FALSE;
     syringePumpRampUpPct = 0.0;
 
-    lastSyringePumpADCReadCtr = 0;
-
     // Zero pump position counts buffer
     syringePumpMotorSpeedCalcIdx = 0;
     for ( i = 0; i < SYRINGE_PUMP_SPEED_CALC_BUFFER_LEN; i++ )
@@ -319,13 +316,15 @@
     syringePumpStallRetryCount = 0;
 
     // Initialize persistent alarms
-    initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR, 0, SYRINGE_PUMP_ADC_READ_PERSISTENCE );
     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 );
 
+    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 );
+
     // Reset request flags
     resetSyringePumpRequestFlags();
 }
@@ -1070,22 +1069,15 @@
         }
     }
 
-    if ( syringePumpDACVrefWriteInProgress != TRUE )
+    if ( ( FALSE == syringePumpDACVrefWriteInProgress ) && ( getCurrentOperationMode() > MODE_INIT ) )
     {
-        // Check ADC read is fresh (takes FPGA a while to configure ADC so don't check until after init/POST mode
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR,
-                                                 ( ( getCurrentOperationMode() > MODE_INIT ) && ( lastSyringePumpADCReadCtr == getSyringePumpADCReadCounter() ) ) ) )
-        {
 #ifndef _RELEASE_
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
-            {
-                activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
-            }
+        {
+            checkFPGAPersistentAlarms( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, getSyringePumpADCandDACStatus(), getSyringePumpADCReadCounter() );
         }
 
-        lastSyringePumpADCReadCtr = getSyringePumpADCReadCounter();
-
         // Check pump status
         if ( getSyringePumpStatus() != 0 )
         {