Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -r8ee6a4ee6ae356143104f93551d10d7a875eaad1 -rd3819286869611f9c02add72a0f8e321598fdf42
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 8ee6a4ee6ae356143104f93551d10d7a875eaad1)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision d3819286869611f9c02add72a0f8e321598fdf42)
@@ -33,7 +33,6 @@
 // ********** private function prototypes **********
 
 static void publishSwitchesData( void );
-static U32 getPublishSwitchesDataInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -160,7 +159,7 @@
  *************************************************************************/
 static void publishSwitchesData( void )
 {
-    if ( ++switchesDataPublicationCounter > getPublishSwitchesDataInterval() )
+    if ( ++switchesDataPublicationCounter > getU32OverrideValue( &switchesDataPublishInterval ) )
     {
         SWITCHES_DATA_T data;
 
@@ -174,27 +173,7 @@
     }
 }
 
-/*********************************************************************//**
- * @brief
- * The getPublishSwitchesDataInterval function returns the data
- * publication interval either from the data or from the override.
- * @details Inputs: switchesDataPublishInterval
- * @details Outputs: none
- * @return data publish interval
- *************************************************************************/
-static U32 getPublishSwitchesDataInterval( void )
-{
-    U32 result = switchesDataPublishInterval.data;
 
-    if ( OVERRIDE_KEY == switchesDataPublishInterval.override )
-    {
-        result = switchesDataPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/