Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r6e5e63c50a4e8806c2ad62fbbf66a8935f087a38 -r49533d4870aa10c1b20406dd5c013567fe854694
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 6e5e63c50a4e8806c2ad62fbbf66a8935f087a38)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 49533d4870aa10c1b20406dd5c013567fe854694)
@@ -367,7 +367,6 @@
                     accepted = TRUE;
                     heparinDeliveryState = HEPARIN_STATE_PAUSED;
                     stopSyringePump();
-                    sendTreatmentLogEventData( HEPARIN_PAUSE_RESUME_EVENT, HEPARIN_STATE_DISPENSING, HEPARIN_STATE_PAUSED );
                 }
                 else
                 {
@@ -380,7 +379,6 @@
                 {
                     accepted = TRUE;
                     startHeparinContinuous();
-                    sendTreatmentLogEventData( HEPARIN_PAUSE_RESUME_EVENT, HEPARIN_STATE_PAUSED, HEPARIN_STATE_DISPENSING );
                 }
                 else
                 {
@@ -1189,11 +1187,13 @@
     else if ( TRUE == syringePumpBolusRequested )
     {
         heparinDeliveryState = HEPARIN_STATE_INITIAL_BOLUS;
+        sendTreatmentLogEventData( HEPARIN_BOLUS_START_EVENT, 0.0, syringePumpSetRate );
         result = SYRINGE_PUMP_HEP_BOLUS_STATE;
     }
     else if ( TRUE == syringePumpContinuousRequested )
     {
         heparinDeliveryState = HEPARIN_STATE_DISPENSING;
+        sendTreatmentLogEventData( HEPARIN_START_RESUME_EVENT, 0.0, syringePumpSetRate );
         result = SYRINGE_PUMP_HEP_CONTINUOUS_STATE;
     }
     else if ( TRUE == syringePumpDACVrefSetRequested )
@@ -1446,6 +1446,7 @@
     if ( TRUE == stopPump )
     {
         stopSyringePump();
+        sendTreatmentLogEventData( HEPARIN_BOLUS_END_EVENT, syringePumpSetRate, 0.0 );
         result = SYRINGE_PUMP_OFF_STATE;
     }
 
@@ -1490,6 +1491,7 @@
     if ( TRUE == stopPump )
     {
         stopSyringePump();
+        sendTreatmentLogEventData( HEPARIN_STOP_PAUSE_EVENT, syringePumpSetRate, 0.0 );
         result = SYRINGE_PUMP_OFF_STATE;
     }