Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -rc65ad0538ff99c3e13d7d7866ac15e38a1ef6002 -r7a7bf19d0cf16745566956f45cef57f8eb5df445
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision c65ad0538ff99c3e13d7d7866ac15e38a1ef6002)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 7a7bf19d0cf16745566956f45cef57f8eb5df445)
@@ -157,8 +157,6 @@
 static U32  getAlarmStartTime( ALARM_ID_T alarmID );
 
 static void publishAlarmInfo( void );
-static U32 getPublishAlarmStatusInterval( void );
-static U32 getPublishAlarmInfoInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -232,7 +230,7 @@
     updateAlarmsFlags();
     updateAlarmsSilenceStatus();
     // Publish alarm status at interval
-    if ( ++alarmStatusPublicationTimerCounter >= getPublishAlarmStatusInterval() )
+    if ( ++alarmStatusPublicationTimerCounter >= getU32OverrideValue( &alarmStatusPublishInterval ) )
     {
         // Lamp and audio timing sync'd with broadcast so UI can stay in sync with lamp rhythm
         setAlarmLamp();
@@ -1124,7 +1122,7 @@
 static void publishAlarmInfo( void )
 {
     // Publish voltages monitor data on interval
-    if ( ++alarmInfoPublicationTimerCounter >= getPublishAlarmInfoInterval() )
+    if ( ++alarmInfoPublicationTimerCounter >= getU32OverrideValue( &alarmInfoPublishInterval ) )
     {
         ALARM_INFO_PAYLOAD_T data;
 
@@ -1141,46 +1139,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getPublishAlarmStatusInterval function gets the alarm status data
- * publication interval.
- * @details Inputs: alarmStatusPublishInterval
- * @details Outputs: none
- * @return the current alarm status publication interval (in task intervals).
- *************************************************************************/
-static U32 getPublishAlarmStatusInterval( void )
-{
-    U32 result = alarmStatusPublishInterval.data;
-
-    if ( OVERRIDE_KEY == alarmStatusPublishInterval.override )
-    {
-        result = alarmStatusPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The getPublishAlarmInfoInterval function gets the alarm information
- * publication interval.
- * @details Inputs: alarmInfoPublishInterval
- * @details Outputs: none
- * @return the current alarm information publication interval (in task intervals).
- *************************************************************************/
-static U32 getPublishAlarmInfoInterval( void )
-{
-    U32 result = alarmInfoPublishInterval.data;
-
-    if ( OVERRIDE_KEY == alarmInfoPublishInterval.override )
-    {
-        result = alarmInfoPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The getAlarmAudioVolume function gets the current alarm audio volume level.
  * @details Inputs: alarmAudioVolumeLevel
  * @details Outputs: none