Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r7eb5bff2692849858ac28db1b440d403302ccfbc -r67697eb4ca0296ad472b19b4534bea0aea1e759a
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 7eb5bff2692849858ac28db1b440d403302ccfbc)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 67697eb4ca0296ad472b19b4534bea0aea1e759a)
@@ -7,8 +7,8 @@
 *
 * @file    SyringePump.c
 *
-* @author  (last)      Darren Cox
-* @date    (last)      19-Sep-2023
+* @author  (last)      Sean Nash
+* @date    (last)      30-Sep-2023
 *
 * @author  (original)  Sean Nash
 * @date    (original)  04-Mar-2021
@@ -66,7 +66,7 @@
 #define SYRINGE_PUMP_PRIME_RATE                       635.0F                                ///< Prime rate is 0.5 mm ^ 2 x PI x 450 mm = 0.353 mL / 2s = 635 mL/hr.
 #define SYRINGE_PUMP_MAX_RATE                         11000.0F                              ///< Maximum rate of the syringe pump (in mL/hr).
 
-#define SYRINGE_PUMP_RATE_ALARM_PERSISTENCE           3000                                  ///< Alarm persistence period (in ms) for syringe pump speed check alarms.
+#define SYRINGE_PUMP_RATE_ALARM_PERSISTENCE           6000                                  ///< Alarm persistence period (in ms) for syringe pump speed check alarms.
 #define SYRINGE_PUMP_DIR_ALARM_PERSISTENCE            3000                                  ///< Alarm persistence period (in ms) for syringe pump direction check alarms.
 #define SYRINGE_PUMP_OFF_ALARM_PERSISTENCE            1000                                  ///< Alarm persistence period (in ms) for syringe pump off check alarms.
 #define SYRINGE_PUMP_OFF_ERROR_MAX_CNT                5                                     ///< Maximum number of syringe pump not stopped errors within time window before alarm triggered. Do not exceed MAX_TIME_WINDOWED_COUNT.
@@ -166,10 +166,12 @@
 #define SYRINGE_PUMP_STALL_SPEED_THRESHOLD            0.05F                                 ///< Minimum syringe pump speed to be considered not stalled.
 
 #define SYRINGE_PUMP_ADC_FPGA_ERROR_TIMEOUT_MS        ( 2 * MS_PER_SECOND )                 ///< Syringe pump ADC FPGA error timeout in milliseconds.
+
 #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.
 #define SYRINGE_PUMP_OCCLUSION_PERSISTENCE            50                                    ///< Syringe pump occlusion persistence timer in milliseconds.
 #define SYRINGE_PUMP_EMPTY_FORCE_COUNT                5                                     ///< Syringe pump empty force voltage count persistence.
+
 /// Defined states for the syringe pump control state machine.
 typedef enum SyringePump_States
 {
@@ -250,10 +252,10 @@
 static U32  syringePumpStallRetryCount;                                         ///< Counts pump ramp up stall retries.
 static HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T forceSensorCalRecord;               ///< HD heparin force sensor calibration record.
 
-static U32 syringePumpDACRetryCount;
-static U32 syringePumpDACRetryTimer;
+static U32 syringePumpDACRetryCount;                                            ///< Counter for DAC set retries.
+static U32 syringePumpDACRetryTimer;                                            ///< Timer for DAC set retries.
 
-static U32 syringePumpEmptyForceCount;
+static U32 syringePumpEmptyForceCount;                                          ///< Counter for empty syringe detection.
 
 // ********** private function prototypes **********
 
@@ -349,6 +351,7 @@
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR, 0, SYRINGE_PUMP_DIR_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR, 0, SYRINGE_PUMP_OFF_ALARM_PERSISTENCE );
     initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, 0, SYRINGE_PUMP_RATE_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION, 0, SYRINGE_PUMP_OCCLUSION_PERSISTENCE);
     initTimeWindowedCount( TIME_WINDOWED_COUNT_SYRINGE_PUMP_OFF_ERROR, SYRINGE_PUMP_OFF_ERROR_MAX_CNT, SYRINGE_PUMP_OFF_ERROR_TIME_WIN_MS );
 
     initFPGAPersistentAlarm( FPGA_PERS_ERROR_SYRINGE_PUMP_ADC, ALARM_ID_HD_SYRINGE_PUMP_FPGA_ADC_FAULT,
@@ -645,6 +648,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 +660,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
@@ -2600,7 +2609,6 @@
  * @details Inputs: heprinBolusTargetRate
  * @details Outputs: heprinBolusTargetRate
  * @param: value : override heprinBolusTargetRate (in mL/hour)
- * @param: value : override heprinBolusTargetRate (in mL/hour)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
 BOOL testSetHeprinBolusTargetRateOverride( F32 value )