Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rc14a0220256e92a6339a444a3e1bc85e159ccce3 -r62ac3a90e1a370a6423379360651d221eabf3bb2
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision c14a0220256e92a6339a444a3e1bc85e159ccce3)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 62ac3a90e1a370a6423379360651d221eabf3bb2)
@@ -429,7 +429,12 @@
  *************************************************************************/
 BOOL retractSyringePump( void )
 {
+#ifndef ALWAYS_ALLOW_SYRINGE_PUMP_CMDS
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
+#else
+    heparinDeliveryState = HEPARIN_STATE_STOPPED;
+    if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) )
+#endif
     {
         syringePumpSetRate = SYRINGE_PUMP_RETRACT_RATE;
         syringePumpRetractRequested = TRUE;
@@ -825,11 +830,13 @@
 
     if ( syringePumpDACVrefWriteInProgress != TRUE )
     {
+#ifndef USING_DEBUGGER
         // Check ADC read is fresh
-        if ( lastSyringePumpADCReadCtr == adcReadCtr )  // TODO - add persistence
+        if ( ( getCurrentOperationMode() > MODE_INIT ) && ( lastSyringePumpADCReadCtr == adcReadCtr ) ) // TODO - add persistence or time window
         {
-            // activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );  // TODO - restore when issue with read counter resolved
+            activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
         }
+#endif
         lastSyringePumpADCReadCtr = adcReadCtr;
 
         //  Check encoder direction error.  // TODO check direction in states
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r52eb90069c08c77065a8ae0fd30544640110093e -r62ac3a90e1a370a6423379360651d221eabf3bb2
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 52eb90069c08c77065a8ae0fd30544640110093e)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 62ac3a90e1a370a6423379360651d221eabf3bb2)
@@ -25,13 +25,14 @@
 #define HD_VERSION_MAJOR        0
 #define HD_VERSION_MINOR        5
 #define HD_VERSION_MICRO        0
-#define HD_VERSION_BUILD        9007
+#define HD_VERSION_BUILD        9008
 
 // ********** development build switches **********
 
 // TODO - remove build switches before release
 #ifndef _RELEASE_
 #ifndef _VECTORCAST_
+//    #define USING_DEBUGGER                  1           // Want to be able to use the debugger and have break points
 //    #define BOARD_WITH_NO_HARDWARE          1
 //    #define RUN_WITHOUT_DG                  1           // Run HD w/o DG
 //    #define SIMULATE_UI                     1           // Build w/o requirement that UI be there
@@ -50,6 +51,7 @@
     #define DISABLE_PUMP_SPEED_CHECKS       1           // Do not error on HD pump speed checks
     #define DISABLE_PUMP_DIRECTION_CHECKS   1           // Do not error on HD pump direction checks
     #define DISABLE_SYRINGE_PUMP            1           // Disable syringe pump functionality
+//    #define ALWAYS_ALLOW_SYRINGE_PUMP_CMDS  1           // Allow syringe pump commands at any time except when pump is busy
     #define DISABLE_PRESSURE_CHECKS         1           // Do not error on HD pressure checks
 //    #define DISABLE_UF_ALARMS               1           // Do not error on HD ultrafiltration checks
     #define DISABLE_VALVE_ALARMS            1           // Do not error on HD valve position