Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rf36eb9356d7891edcf36152f5fc3b86601aa52ae -r65ef67de657ff57e945832b972c3a13364efc600
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision f36eb9356d7891edcf36152f5fc3b86601aa52ae)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 65ef67de657ff57e945832b972c3a13364efc600)
@@ -1284,17 +1284,15 @@
         sendTreatmentLogEventData( HEPARIN_START_RESUME_EVENT, 0.0, syringePumpSetRate );
         result = SYRINGE_PUMP_HEP_CONTINUOUS_STATE;
     }
-    else if ( TRUE == syringePumpDACVrefSetRequested  ||
-            ( syringePumpDACRetryCount > 0 && syringePumpDACRetryTimer > SYRINGE_PUMP_DAC_TIMER ) )
+    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
@@ -1594,8 +1592,9 @@
  * The handleSyringePumpCalibrateForceSensorState function handles the
  * calibrate force sensor state of the syringe pump control state machine.
  * of the syringe pump control state machine.
- * @details Inputs: DAC status
+ * @details Inputs: DAC status, syringePumpDACRetryCount
  * @details Outputs: syringePumpDACVrefWriteInProgress, ADC read mode restored
+ * syringePumpDACRetryCount, syringePumpDACRetryTimer
  * @return next state
  *************************************************************************/
 static SYRINGE_PUMP_STATE_T handleSyringePumpCalibrateForceSensorState( void )