Index: firmware/App/Controllers/SyringePump.h
===================================================================
diff -u -rc3cf7af051c1ee070df90a9c072df16be48f478f -r9055124b17389e04131b44c00915c33c72db3ae6
--- firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision c3cf7af051c1ee070df90a9c072df16be48f478f)
+++ firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision 9055124b17389e04131b44c00915c33c72db3ae6)
@@ -19,6 +19,7 @@
 #define __SYRINGE_PUMP_H__
 
 #include "HDCommon.h"
+#include "HDDefs.h"
 
 /**
  *  @defgroup SyringePump SyringePump
@@ -36,9 +37,10 @@
 {
     SYRINGE_PUMP_OP_STOP = 0,
     SYRINGE_PUMP_OP_RETRACT = 1,
-    SYRINGE_PUMP_OP_SEEK_AND_PRIME = 2,
-    SYRINGE_PUMP_OP_BOLUS = 3,
-    SYRINGE_PUMP_OP_CONTINUOUS = 4,
+    SYRINGE_PUMP_OP_SEEK = 2,
+    SYRINGE_PUMP_OP_PRIME = 3,
+    SYRINGE_PUMP_OP_BOLUS = 4,
+    SYRINGE_PUMP_OP_CONTINUOUS = 5,
     NUM_OF_SYRINGE_PUMP_OPS
 } SYRINGE_PUMP_OPERATION_T;
 
@@ -54,6 +56,7 @@
 typedef struct
 {
     U32 syringePumpState;
+    U32 heparinDeliveryState;
     F32 syringePumpSetRate;
     F32 syringePumpMeasRate;
     S32 syringePumpPosition;
@@ -68,8 +71,14 @@
 void initSyringePump( void );
 void execSyringePump( void );
 
+BOOL userHeparinRequest( HEPARIN_CMD_T cmd );
+void setHeparinOff( void );
+void setHeparinStopped( void );
+void setHeparinCompleted( void );
+HEPARIN_STATE_T getHeparinState( void );
 void stopSyringePump( void );
 BOOL retractSyringePump( void );
+BOOL seekSyringePlunger( void );
 BOOL primeSyringePump( void );
 BOOL startHeparinBolus( void );
 BOOL startHeparinContinuous( void );