Index: firmware/App/Controllers/AlarmAudio.c
===================================================================
diff -u -r3a8cf075eb6f0d255f516ac26bac7fbaacfde14a -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd
--- firmware/App/Controllers/AlarmAudio.c	(.../AlarmAudio.c)	(revision 3a8cf075eb6f0d255f516ac26bac7fbaacfde14a)
+++ 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;