Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r3f2b9de757500da37e0ed8881e4e906d94f3076c -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 3f2b9de757500da37e0ed8881e4e906d94f3076c)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -224,7 +224,6 @@
 
 static void resetSyringePumpRequestFlags( void );
 static void execSyringePumpMonitor( void );
-static U32 getPublishSyringePumpDataInterval( void );
 static S32 getSyringePumpPosition( void );
 static F32 getSyringePumpMeasRate( void );
 static F32 getSyringePumpSyringeDetectorV( void );
@@ -625,26 +624,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishSyringePumpDataInterval function gets the syringe pump data
- * publication interval.
- * @details Inputs: syringePumpDataPublishInterval
- * @details Outputs: none
- * @return the current syringe pump data publication interval (in task intervals).
- *************************************************************************/
-static U32 getPublishSyringePumpDataInterval( void )
-{
-    U32 result = syringePumpDataPublishInterval.data;
-
-    if ( OVERRIDE_KEY == syringePumpDataPublishInterval.override )
-    {
-        result = syringePumpDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The getSyringePumpVolumeDelivered function gets the current syringe pump
  * volume delivered.
  * @details Inputs: syringePumpVolumeDelivered
@@ -1837,7 +1816,7 @@
 static void publishSyringePumpData( void )
 {
     // Publish syringe pump data on interval
-    if ( ++syringePumpDataPublicationTimerCounter >= getPublishSyringePumpDataInterval() )
+    if ( ++syringePumpDataPublicationTimerCounter >= getU32OverrideValue( &syringePumpDataPublishInterval ) )
     {
         SYRINGE_PUMP_DATA_PAYLOAD_T data;