Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -ref6283257df7c1f993d58fb934da57ea3e0a7067 -r173e5908bada098006b85c1267147a187d2eaef4
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision ef6283257df7c1f993d58fb934da57ea3e0a7067)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 173e5908bada098006b85c1267147a187d2eaef4)
@@ -91,6 +91,7 @@
 
 /// Expected position of empty in relation to home position.
 #define SYRINGE_PUMP_EMPTY_POS                        ( SYRINGE_ENCODER_COUNTS_PER_ML * 10.84F )
+
 /// Margin of error for empty position determination.
 #define SYRINGE_PUMP_EMPTY_POS_MARGIN                 ( SYRINGE_ENCODER_COUNTS_PER_ML * 0.5F )
 /// Minimum retract position.
@@ -155,6 +156,9 @@
 
 #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS        ( 2 * MS_PER_SECOND )                 ///< Syringe pump ADC FPGA error timeout in milliseconds.
 
+#define SYRINGE_PUMP_DAC_MAX_RETRIES                  5                                     ///< Syringe pump DAC retries to write.
+#define SYRINGE_PUMP_DAC_TIMER                        ( 200 / TASK_PRIORITY_INTERVAL )      ///< Syringe pump DAC timer between retries.
+
 /// Defined states for the syringe pump control state machine.
 typedef enum SyringePump_States
 {
@@ -227,6 +231,9 @@
 static U32  syringePumpStallRetryCount;                                         ///< Counts pump ramp up stall retries.
 static HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T forceSensorCalRecord;               ///< HD heparin force sensor calibration record.
 
+static U32 syringePumpDACRetryCount;
+static U32 syringePumpDACRetryTimer;
+
 // ********** private function prototypes **********
 
 static void resetSyringePumpRequestFlags( void );
@@ -313,6 +320,8 @@
 
     syringePumpStallCtr = 0;
     syringePumpStallRetryCount = 0;
+    syringePumpDACRetryCount = 0;
+    syringePumpDACRetryTimer = 0;
 
     // Initialize persistent alarms
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE );
@@ -1103,6 +1112,11 @@
         isPersistentAlarmTriggered( ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, FALSE );
     }
 
+    if ( syringePumpDACRetryCount > 0 )
+    {
+        syringePumpDACRetryTimer++;
+    }
+
     // Execute syringe pump control state machine
     switch ( syringePumpState )
     {
@@ -1261,14 +1275,17 @@
         sendTreatmentLogEventData( HEPARIN_START_RESUME_EVENT, 0.0, syringePumpSetRate );
         result = SYRINGE_PUMP_HEP_CONTINUOUS_STATE;
     }
-    else if ( TRUE == syringePumpDACVrefSetRequested )
+    else if ( TRUE == syringePumpDACVrefSetRequested  ||
+            ( syringePumpDACRetryCount > 0 && syringePumpDACRetryTimer > SYRINGE_PUMP_DAC_TIMER ) )
     {
         U16 vRef = (U16)( ( syringePumpDACVref / SYRINGE_PUMP_ADC_REF_V ) * SYRINGE_PUMP_DAC_FULL_SCALE_BITS );
 
         setFPGASyringePumpDACOutputLevel( vRef );
         setFPGASyringePumpADCandDACControlFlags( SYRINGE_PUMP_ADC_DAC_CONTROL_ENABLE_DAC );
         syringePumpDACVrefWriteInProgress = TRUE;
+
         result = SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE;
+
     }
 
     // If we are starting an active pump state, set direction and calculate target toggle time to achieve desired rate
@@ -1577,19 +1594,36 @@
     SYRINGE_PUMP_STATE_T result = SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE;
     U08 adcDACStatus = getSyringePumpADCandDACStatus();
 
-    // Wait for DAC setting write to EEPROM to complete
-    if ( ( adcDACStatus & SYRINGE_PUMP_ADC_DAC_ERROR_COUNT_DAC_WR_DONE ) != 0 )
+    // Check DAC write error
+    if ( ( adcDACStatus & SYRINGE_PUMP_DAC_WRITE_ERROR_BIT ) != 0 )
     {
+        syringePumpDACRetryCount++;
+
+        if ( syringePumpDACRetryCount > SYRINGE_PUMP_DAC_MAX_RETRIES )
+        {
+            syringePumpDACRetryCount = 0;
+            activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR );
+        }
+
         syringePumpDACVrefWriteInProgress = FALSE;
         // Switch back from DAC to ADC control
         setFPGASyringePumpADCandDACControlFlags( SYRINGE_PUMP_ADC_DAC_CONTROL_RD_DAC_ON_ADC | SYRINGE_PUMP_ADC_DAC_CONTROL_ENABLE_ADC );
         // Back to off state
         result = SYRINGE_PUMP_OFF_STATE;
     }
-    // Check DAC write error
-    else if ( ( adcDACStatus & SYRINGE_PUMP_DAC_WRITE_ERROR_BIT ) != 0 )
+
+    // Wait for DAC setting write to EEPROM to complete
+    else if ( ( adcDACStatus & SYRINGE_PUMP_ADC_DAC_ERROR_COUNT_DAC_WR_DONE ) != 0 )
     {
-        activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR );
+        // We're done and no error bit found.
+        // Clear retry attempts.
+        syringePumpDACRetryCount = 0;
+        syringePumpDACRetryTimer = 0;
+        syringePumpDACVrefWriteInProgress = FALSE;
+        // Switch back from DAC to ADC control
+        setFPGASyringePumpADCandDACControlFlags( SYRINGE_PUMP_ADC_DAC_CONTROL_RD_DAC_ON_ADC | SYRINGE_PUMP_ADC_DAC_CONTROL_ENABLE_ADC );
+        // Back to off state
+        result = SYRINGE_PUMP_OFF_STATE;
     }
 
     return result;