Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rea73bfe6fbeae8e42c7c22a68338aed6fa340914 -r9848d793638e2f613678e60ea7c0f1e7bc31d9eb
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision ea73bfe6fbeae8e42c7c22a68338aed6fa340914)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9848d793638e2f613678e60ea7c0f1e7bc31d9eb)
@@ -8,7 +8,7 @@
 * @file    SyringePump.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      31-Mar-2022
+* @date    (last)      15-Jun-2022
 *
 * @author  (original)  Sean Nash
 * @date    (original)  04-Mar-2021
@@ -367,6 +367,7 @@
                     accepted = TRUE;
                     heparinDeliveryState = HEPARIN_STATE_PAUSED;
                     stopSyringePump();
+                    sendTreatmentLogEventData( HEPARIN_START_RESUME_EVENT, HEPARIN_STATE_DISPENSING, HEPARIN_STATE_PAUSED );
                 }
                 else
                 {
@@ -379,6 +380,7 @@
                 {
                     accepted = TRUE;
                     startHeparinContinuous();
+                    sendTreatmentLogEventData( HEPARIN_START_RESUME_EVENT, HEPARIN_STATE_PAUSED, HEPARIN_STATE_DISPENSING );
                 }
                 else
                 {
@@ -489,6 +491,10 @@
         heparinDeliveryState = HEPARIN_STATE_STOPPED;
     }
 #endif
+    if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
+    {
+        heparinDeliveryState = HEPARIN_STATE_STOPPED;
+    }
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
     {
         {
@@ -510,6 +516,10 @@
  *************************************************************************/
 BOOL seekSyringePlunger( void )
 {
+    if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
+    {
+        heparinDeliveryState = HEPARIN_STATE_STOPPED;
+    }
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( TRUE == isSyringeDetected() ) &&
          ( TRUE == syringePumpPositionKnown ) && ( heparinDeliveryState != HEPARIN_STATE_OFF ) )
     {
@@ -529,6 +539,10 @@
  *************************************************************************/
 BOOL primeSyringePump( void )
 {
+    if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
+    {
+        heparinDeliveryState = HEPARIN_STATE_STOPPED;
+    }
     if ( ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) && ( TRUE == isSyringeDetected() ) &&
          ( heparinDeliveryState != HEPARIN_STATE_OFF ) && ( TRUE == syringePumpPlungerFound ) )
     {
@@ -587,6 +601,7 @@
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, (F32)SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD, syringePumpSetRate )
         }
+
     }
 
     return syringePumpBolusRequested;
@@ -605,6 +620,10 @@
 
     if ( ( flowRate >= MIN_HEPARIN_CONTINUOUS_RATE ) && ( flowRate <= MAX_HEPARIN_CONTINUOUS_RATE ) && ( FALSE == isSyringePumpHome() ) )
     {
+        if ( MODE_SERV == getCurrentOperationMode() )       // Allow syringe pump operations in Service Mode.
+        {
+            heparinDeliveryState = HEPARIN_STATE_STOPPED;
+        }
         if ( ( TRUE == isSyringeDetected() ) && ( SYRINGE_PUMP_OFF_STATE == syringePumpState ) &&
              ( ( HEPARIN_STATE_STOPPED == heparinDeliveryState ) || ( HEPARIN_STATE_PAUSED == heparinDeliveryState ) ) )
         {
@@ -939,6 +958,11 @@
     syringePumpMeasHome.data = ( (F32)getFPGASyringePumpADCChannel2() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
     syringePumpMeasSyringeDetectionSwitch.data = ( (F32)getFPGASyringePumpADCChannel1() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS;
 
+    // Log syringe detect switch changes
+    if ( prevSyringeDetected !=  isSyringeDetected() )
+    {
+        sendTreatmentLogEventData( SYRINGE_DETECTION_SWITCH_CHANGED_EVENT, (F32)prevSyringeDetected, (F32)isSyringeDetected() );
+    }
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP_ALARMS ) != SW_CONFIG_ENABLE_VALUE )
 #endif
@@ -976,7 +1000,7 @@
     syringePumpLastPosition = getSyringePumpPosition();
     syringePumpPosition.data = encPosition - syringePumpHomePositionOffset;
     // Calculate volume delivered from position
-    syringePumpVolumeDelivered.data = (F32)(syringePumpPosition.data - syringePumpVolumeStartPosition) / SYRINGE_ENCODER_COUNTS_PER_ML;
+    syringePumpVolumeDelivered.data = (F32)( syringePumpPosition.data - syringePumpVolumeStartPosition ) / SYRINGE_ENCODER_COUNTS_PER_ML;
     calcSafetyVolumeDelivered();
     // Calculate measured rate (mL/hr)
     calcMeasRate();