Index: firmware/App/Controllers/SyringePump.h
===================================================================
diff -u -r2bdd010a62ea113058640fc1e9c763dcf885c93c -r5b3be58e0b2dc2ffce534363f85023d03ca561ba
--- firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision 2bdd010a62ea113058640fc1e9c763dcf885c93c)
+++ firmware/App/Controllers/SyringePump.h	(.../SyringePump.h)	(revision 5b3be58e0b2dc2ffce534363f85023d03ca561ba)
@@ -31,9 +31,28 @@
 
 // ********** public definitions **********
 
-/// Payload record structure for the pressure & occlusions data message.
+/// Enumeration of syringe pump operations.
+typedef enum SyringePumpOperations
+{
+    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,
+    NUM_OF_SYRINGE_PUMP_OPS
+} SYRINGE_PUMP_OPERATION_T;
+
+/// Payload record structure for the syringe pump operation request message.
 typedef struct
 {
+    U32 syringePumpOp;
+    F32 rate;
+    F32 volume;
+} SYRINGE_PUMP_OP_PAYLOAD_T;
+
+/// Payload record structure for the syringe pump data message.
+typedef struct
+{
     U32 syringePumpState;
     F32 syringePumpSetRate;
     F32 syringePumpMeasRate;
@@ -44,16 +63,6 @@
     F32 syringePumpMeasForce;
 } SYRINGE_PUMP_DATA_PAYLOAD_T;
 
-/// Enumeration of syringe pump operations.
-typedef enum SyringePumpOperations
-{
-    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_OPERATION_T;
-
 // ********** public function prototypes **********
 
 void initSyringePump( void );
@@ -75,18 +84,18 @@
 
 BOOL testSetSyringePumpDataPublishIntervalOverride( U32 value );
 BOOL testResetSyringePumpDataPublishIntervalOverride( void );
-BOOL testSyringePumpOperationRequest( U32 op, F32 rate, F32 volume );
-BOOL testSetSyringePumpMeasuredRateOverride( U32 value );
+BOOL testSyringePumpOperationRequest( SYRINGE_PUMP_OP_PAYLOAD_T opParams );
+BOOL testSetSyringePumpMeasuredRateOverride( F32 value );
 BOOL testResetSyringePumpMeasuredRateOverride( void );
-BOOL testSetSyringePumpMeasuredForceOverride( U32 value );
+BOOL testSetSyringePumpMeasuredForceOverride( F32 value );
 BOOL testResetSyringePumpMeasuredForceOverride( void );
-BOOL testSetSyringePumpMeasuredSyringeDetectOverride( U32 value );
+BOOL testSetSyringePumpMeasuredSyringeDetectOverride( F32 value );
 BOOL testResetSyringePumpMeasuredSyringeDetectOverride( void );
-BOOL testSetSyringePumpMeasuredHomeOverride( U32 value );
+BOOL testSetSyringePumpMeasuredHomeOverride( F32 value );
 BOOL testResetSyringePumpMeasuredHomeOverride( void );
-BOOL testSetSyringePumpMeasuredPositionOverride( U32 value );
+BOOL testSetSyringePumpMeasuredPositionOverride( S32 value );
 BOOL testResetSyringePumpMeasuredPositionOverride( void );
-BOOL testSetSyringePumpMeasuredVolumeOverride( U32 value );
+BOOL testSetSyringePumpMeasuredVolumeOverride( F32 value );
 BOOL testResetSyringePumpMeasuredVolumeOverride( void );
 
 /**@}*/