Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r173e5908bada098006b85c1267147a187d2eaef4 -rb3a7b408db8f17514fbd013ad19722e0efed6094
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 173e5908bada098006b85c1267147a187d2eaef4)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision b3a7b408db8f17514fbd013ad19722e0efed6094)
@@ -7,8 +7,8 @@
 *
 * @file    SyringePump.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-Oct-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      19-Oct-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  04-Mar-2021
@@ -1275,17 +1275,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
@@ -1585,8 +1583,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 )