Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rd6709b7cdfe6d32b48520065ae5f3bccbeec2a74 -rf36eb9356d7891edcf36152f5fc3b86601aa52ae
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision d6709b7cdfe6d32b48520065ae5f3bccbeec2a74)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision f36eb9356d7891edcf36152f5fc3b86601aa52ae)
@@ -156,8 +156,8 @@
 
 #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS        ( 2 * MS_PER_SECOND )                 ///< Syringe pump ADC FPGA error timeout in milliseconds.
 
-#define SYRINGE_PUMP_DAC_RETRIES                      5                                     ///< Syringe pump DAC retries to write
-#define SYRINGE_PUMP_DAC_TIMER                        ( 200 / TASK_PRIORITY_INTERVAL )       ///< Syringe pump DAC timer between retries
+#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
@@ -1606,11 +1606,9 @@
     // Check DAC write error
     if ( ( adcDACStatus & SYRINGE_PUMP_DAC_WRITE_ERROR_BIT ) != 0 )
     {
-
         syringePumpDACRetryCount++;
 
-
-        if ( syringePumpDACRetryCount > SYRINGE_PUMP_DAC_RETRIES )
+        if ( syringePumpDACRetryCount > SYRINGE_PUMP_DAC_MAX_RETRIES )
         {
             syringePumpDACRetryCount = 0;
             activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR );
@@ -1636,23 +1634,7 @@
         // Back to off state
         result = SYRINGE_PUMP_OFF_STATE;
     }
-/*
- *
- * #define SYRINGE_LENGTH 20
-static BOOL syringeTick;
-static U32 syringepumpDACstatus[SYRINGE_LENGTH];
-static U32 syringeReadingIDX = 0;
-    syringepumpDACstatus[syringeReadingIDX] = getSyringePumpADCandDACStatus();
-    syringeReadingIDX++;
-        syringepumpDACstatus[i] = 0xFFFF;
-    if (syringeReadingIDX == SYRINGE_LENGTH)
-    {
-        syringePumpDACVrefWriteInProgress = FALSE;
-        setFPGASyringePumpADCandDACControlFlags( SYRINGE_PUMP_ADC_DAC_CONTROL_RD_DAC_ON_ADC | SYRINGE_PUMP_ADC_DAC_CONTROL_ENABLE_ADC );
-        syringeReadingIDX = 0;
-        result = SYRINGE_PUMP_OFF_STATE;
-    }
-    */
+
     return result;
 }