Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r87d883239d8367b92840cade0802dc36d9c83d80 -r7a7bf19d0cf16745566956f45cef57f8eb5df445
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 87d883239d8367b92840cade0802dc36d9c83d80)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
@@ -221,7 +221,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 );
@@ -619,26 +618,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
@@ -1788,7 +1767,7 @@
 static void publishSyringePumpData( void )
 {
     // Publish syringe pump data on interval
-    if ( ++syringePumpDataPublicationTimerCounter >= getPublishSyringePumpDataInterval() )
+    if ( ++syringePumpDataPublicationTimerCounter >= getU32OverrideValue( &syringePumpDataPublishInterval ) )
     {
         SYRINGE_PUMP_DATA_PAYLOAD_T data;