Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r44bd54e0202a15a0e38d7ccacd97669d0a14ab3c -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 44bd54e0202a15a0e38d7ccacd97669d0a14ab3c)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    SyringePump.c
 *
 * @author  (last)      Sean Nash
-* @date    (last)      30-Sep-2023
+* @date    (last)      10-Oct-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  04-Mar-2021
@@ -511,11 +511,11 @@
  *************************************************************************/
 void stopSyringePump( void )
 {
-    syringePumpSetRate = 0.0;
     setFPGASyringePumpStepToggleTime( SYRINGE_PUMP_MICROSTEP_TOGGLE_TIME_FOR_STOP );
     if ( ( syringePumpState != SYRINGE_PUMP_CONFIG_FORCE_SENSOR_STATE ) && ( syringePumpState != SYRINGE_PUMP_OFF_STATE ) )
     {
         syringePumpState = SYRINGE_PUMP_OFF_STATE;
+        syringePumpSetRate = 0.0;
     }
     if ( ( HEPARIN_STATE_INITIAL_BOLUS == heparinDeliveryState ) || ( HEPARIN_STATE_DISPENSING == heparinDeliveryState ) )
     {
@@ -528,6 +528,7 @@
             sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
         }
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
+        syringePumpSetRate = 0.0;
     }
 }
 
@@ -645,6 +646,8 @@
  *************************************************************************/
 BOOL startHeparinBolus( void )
 {
+    F32 bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+
     // If valid to start a bolus, kick it off
     if ( FALSE == isSyringePumpHome() )
     {
@@ -655,8 +658,12 @@
         if ( ( TRUE == isSyringeDetected() ) && ( TRUE == syringePumpPrimeCompleted ) &&
              ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( HEPARIN_STATE_STOPPED == heparinDeliveryState ) )
         {
-            syringePumpSetRate = getHeprinBolusTargetRate();
-            syringePumpBolusRequested = TRUE;
+            // if user set a Heparin bolus volume and not complete, start now
+            if ( ( bolusVol > 0.0F ) && ( getSyringePumpVolumeDelivered() < bolusVol ) )
+            {
+                syringePumpSetRate = getHeprinBolusTargetRate();
+                syringePumpBolusRequested = TRUE;
+            }
         }
     }
     else
@@ -1101,7 +1108,7 @@
                 clearAlarmCondition( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED );
             }
             // If no syringe detected and detection is required, trigger alarm condition
-            else if ( ( FALSE == isSyringeDetected() ) && ( TRUE == requireSyringeDetection ) )
+            else if ( FALSE == isSyringeDetected() )
             {
                 activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED );
             }