Index: firmware/App/Controllers/AlarmAudio.c
===================================================================
diff -u -rabba5986eed8c2f702ca1ed70afd735a7f31db2a -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd
--- firmware/App/Controllers/AlarmAudio.c	(.../AlarmAudio.c)	(revision abba5986eed8c2f702ca1ed70afd735a7f31db2a)
+++ firmware/App/Controllers/AlarmAudio.c	(.../AlarmAudio.c)	(revision a0d405d152c0f451ebf3c25e3c2cfa49a4db17cd)
@@ -69,12 +69,11 @@
 
 // ********** private data **********
 
-/// Alarm audio attenuation level (0..4 where 0 = max volume and 4 = min volume).
-static OVERRIDE_U32_T alarmAudioVolumeLevel = { MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, MAX_ALARM_VOLUME_ATTENUATION, 0 };
+static OVERRIDE_U32_T alarmAudioVolumeLevel;                                    ///< Alarm audio attenuation level (0..4 where 0 = max volume and 4 = min volume).
 
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG = { 0.0, 0.0, 0.0, 0 };        ///< Alarm audio current (high gain) measured at ADC.
-static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG = { 0.0, 0.0, 0.0, 0 };        ///< Alarm audio current (low gain) measured at ADC.
-static OVERRIDE_F32_T alarmBackupAudioCurrent = { 0.0, 0.0, 0.0, 0 };           ///< Alarm backup audio current measured at ADC.
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentHG;                               ///< Alarm audio current (high gain) measured at ADC.
+static OVERRIDE_F32_T alarmPrimaryAudioCurrentLG;                               ///< Alarm audio current (low gain) measured at ADC.
+static OVERRIDE_F32_T alarmBackupAudioCurrent;                                  ///< Alarm backup audio current measured at ADC.
 
 static ALARM_AUDIO_SELF_TEST_STATE_T alarmAudioSelfTestState;                   ///< Current state of the alarm audio self tests.
 static U32 audioTestStartTime;                                                  ///< Start time of audio alarm current self-test.
@@ -96,6 +95,26 @@
     // Disable backup audio
     clrAlarmBuzzerSignal();
 
+    alarmAudioVolumeLevel.data = MAX_ALARM_VOLUME_ATTENUATION;
+    alarmAudioVolumeLevel.ovData = MAX_ALARM_VOLUME_ATTENUATION;
+    alarmAudioVolumeLevel.ovInitData = MAX_ALARM_VOLUME_ATTENUATION;
+    alarmAudioVolumeLevel.override = OVERRIDE_RESET;
+
+    alarmPrimaryAudioCurrentHG.data = 0.0;
+    alarmPrimaryAudioCurrentHG.ovData = 0.0;
+    alarmPrimaryAudioCurrentHG.ovInitData = 0.0;
+    alarmPrimaryAudioCurrentHG.override = OVERRIDE_RESET;
+
+    alarmPrimaryAudioCurrentLG.data = 0.0;
+    alarmPrimaryAudioCurrentLG.ovData = 0.0;
+    alarmPrimaryAudioCurrentLG.ovInitData = 0.0;
+    alarmPrimaryAudioCurrentLG.override = OVERRIDE_RESET;
+
+    alarmBackupAudioCurrent.data = 0.0;
+    alarmBackupAudioCurrent.ovData = 0.0;
+    alarmBackupAudioCurrent.ovInitData = 0.0;
+    alarmBackupAudioCurrent.override = OVERRIDE_RESET;
+
     alarmAudioTestToneRequested = FALSE;
     alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_START;
     audioTestStartTime = 0;
@@ -384,184 +403,78 @@
     alarmAudioSelfTestState = ALARM_AUDIO_SELF_TEST_STATE_START;
 }
 
-/*********************************************************************//**
- * @brief
- * The testSetAlarmAudioVolumeLevelOverride function sets the override for the
- * alarm audio volume.
- * @details \b Inputs: none
- * @details \b Outputs: alarmAudioVolumeLevel
- * @param volume Volume level (1..5) to set override to for alarm audio
- * @return TRUE if override is successful, FALSE if not
+
+/*************************************************************************
+ *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
-BOOL testSetAlarmAudioVolumeLevelOverride( U32 volume )
-{
-    BOOL result = FALSE;
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        alarmAudioVolumeLevel.ovData = MAX_ALARM_VOLUME_LEVEL - volume;
-        alarmAudioVolumeLevel.override = OVERRIDE_KEY;
-    }
 
-    return result;
-}
-
 /*********************************************************************//**
  * @brief
- * The testResetAlarmAudioVolumeLevelOverride function resets the override for
- * the alarm audio volume.
+ * The testAlarmAudioVolumeLevelOverride function sets the override for the
+ * alarm audio volume.
  * @details \b Inputs: none
  * @details \b Outputs: alarmAudioVolumeLevel
- * @return TRUE if override reset is successful, FALSE if not
+ * @param message Override message from Dialin which includes the alarm
+ * audio volume level to override to.
+ * @return TRUE if override is successful, FALSE if not
  *************************************************************************/
-BOOL testResetAlarmAudioVolumeLevelOverride( void )
+BOOL testAlarmAudioVolumeLevelOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = u32Override( message, &alarmAudioVolumeLevel, 0, MAX_ALARM_VOLUME_LEVEL - 1 );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        alarmAudioVolumeLevel.override = OVERRIDE_RESET;
-        alarmAudioVolumeLevel.ovData = alarmAudioVolumeLevel.ovInitData;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testSetPrimaryAlarmAudioCurrentHGOverride function sets the override
+ * The testPrimaryAlarmAudioCurrentHGOverride function sets the override
  * for the alarm audio current (high gain) in mA.
  * @details \b Inputs: none
  * @details \b Outputs: alarmPrimaryAudioCurrentHG
- * @param mA The milliamps measured from high gain channel of primary alarm audio
+ * @param message Override message from Dialin which includes the primary
+ * alarm audio current hgih gain (in mA) to override to.
  * @return TRUE if override is successful, FALSE if not
  *************************************************************************/
-BOOL testSetPrimaryAlarmAudioCurrentHGOverride( F32 mA )
+BOOL testPrimaryAlarmAudioCurrentHGOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &alarmPrimaryAudioCurrentHG );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        alarmPrimaryAudioCurrentHG.ovData = mA;
-        alarmPrimaryAudioCurrentHG.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetPrimaryAlarmAudioCurrentHGOverride function resets the override
- * for the alarm audio current (high gain).
- * @details \b Inputs: none
- * @details \b Outputs: alarmPrimaryAudioCurrentHG
- * @return TRUE if override reset is successful, FALSE if not
- *************************************************************************/
-BOOL testResetPrimaryAlarmAudioCurrentHGOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        alarmPrimaryAudioCurrentHG.override = OVERRIDE_RESET;
-        alarmPrimaryAudioCurrentHG.ovData = alarmPrimaryAudioCurrentHG.ovInitData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetPrimaryAlarmAudioCurrentLGOverride function sets the override
+ * The testPrimaryAlarmAudioCurrentLGOverride function sets the override
  * for the alarm audio current (low gain) in mA.
  * @details \b Inputs: none
  * @details \b Outputs: alarmPrimaryAudioCurrentLG
- * @param mA The milliamps measured from low gain channel of primary alarm audio
+ * @param message Override message from Dialin which includes the primary
+ * alarm audio current low gain (in mA) to override to.
  * @return TRUE if override is successful, FALSE if not
  *************************************************************************/
-BOOL testSetPrimaryAlarmAudioCurrentLGOverride( F32 mA )
+BOOL testPrimaryAlarmAudioCurrentLGOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &alarmPrimaryAudioCurrentLG );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        alarmPrimaryAudioCurrentLG.ovData = mA;
-        alarmPrimaryAudioCurrentLG.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetPrimaryAlarmAudioCurrentLGOverride function resets the override
- * for the alarm audio current (low gain).
- * @details \b Inputs: none
- * @details \b Outputs: alarmPrimaryAudioCurrentLG
- * @return TRUE if override reset is successful, FALSE if not
- *************************************************************************/
-BOOL testResetPrimaryAlarmAudioCurrentLGOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        alarmPrimaryAudioCurrentLG.override = OVERRIDE_RESET;
-        alarmPrimaryAudioCurrentLG.ovData = alarmPrimaryAudioCurrentLG.ovInitData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetBackupAlarmAudioCurrentOverride function sets the override for
+ * The testBackupAlarmAudioCurrentOverride function sets the override for
  * the alarm audio current (backup) in mA.
  * @details \b Inputs: none
  * @details \b Outputs: alarmBackupAudioCurrent
- * @param mA The milliamps measured from backup channel of primary alarm audio
+ * @param message Override message from Dialin which includes the backup
+ * alarm audio current (in mA) to override to.
  * @return TRUE if override is successful, FALSE if not
  *************************************************************************/
-BOOL testSetBackupAlarmAudioCurrentOverride( F32 mA )
+BOOL testBackupAlarmAudioCurrentOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &alarmBackupAudioCurrent );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        alarmBackupAudioCurrent.ovData = mA;
-        alarmBackupAudioCurrent.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The testResetBackupAlarmAudioCurrentOverride function resets the override
- * for the alarm audio current (backup).
- * @details \b Inputs: none
- * @details \b Outputs: alarmBackupAudioCurrent
- * @return TRUE if override reset is successful, FALSE if not
- *************************************************************************/
-BOOL testResetBackupAlarmAudioCurrentOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        alarmBackupAudioCurrent.override = OVERRIDE_RESET;
-        alarmBackupAudioCurrent.ovData = alarmBackupAudioCurrent.ovInitData;
-    }
-
-    return result;
-}
-
 /**@}*/