Index: firmware/App/Controllers/AlarmAudio.c
===================================================================
diff -u -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd -r395522dffef1348e176564925656012f529c1910
--- firmware/App/Controllers/AlarmAudio.c	(.../AlarmAudio.c)	(revision a0d405d152c0f451ebf3c25e3c2cfa49a4db17cd)
+++ firmware/App/Controllers/AlarmAudio.c	(.../AlarmAudio.c)	(revision 395522dffef1348e176564925656012f529c1910)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    AlarmAudio.c
 *
-* @author  (last)      Sean
-* @date    (last)      30-Jul-2024
+* @author  (last)      Sean Nash
+* @date    (last)      18-Apr-2025
 *
-* @author  (original)  Sean
-* @date    (original)  30-Jul-2024
+* @author  (original)  Sean Nash
+* @date    (original)  15-Aug-2024
 *
 ***************************************************************************/
 
@@ -233,7 +233,7 @@
  *************************************************************************/
 U32 getAlarmAudioVolume( void )
 {
-    U32 result = alarmAudioVolumeLevel.data;
+    U32 result = getU32OverrideValue( &alarmAudioVolumeLevel );
 
 #ifndef _RELEASE_
     // Check the software configurations
@@ -243,11 +243,6 @@
 //    }
 #endif
 
-    if ( OVERRIDE_KEY == alarmAudioVolumeLevel.override )
-    {
-        result = alarmAudioVolumeLevel.ovData;
-    }
-
     return result;
 }
 
@@ -261,13 +256,8 @@
  *************************************************************************/
 F32 getAlarmAudioPrimaryHighGainCurrent( void )
 {
-    F32 result = alarmPrimaryAudioCurrentHG.data;
+    F32 result = getF32OverrideValue( &alarmPrimaryAudioCurrentHG );
 
-    if ( OVERRIDE_KEY == alarmPrimaryAudioCurrentHG.override )
-    {
-        result = alarmPrimaryAudioCurrentHG.ovData;
-    }
-
     return result;
 }
 
@@ -281,13 +271,8 @@
  *************************************************************************/
 F32 getAlarmAudioPrimaryLowGainCurrent( void )
 {
-    F32 result = alarmPrimaryAudioCurrentLG.data;
+    F32 result = getF32OverrideValue( &alarmPrimaryAudioCurrentLG );
 
-    if ( OVERRIDE_KEY == alarmPrimaryAudioCurrentLG.override )
-    {
-        result = alarmPrimaryAudioCurrentLG.ovData;
-    }
-
     return result;
 }
 
@@ -301,13 +286,8 @@
  *************************************************************************/
 F32 getAlarmAudioBackupCurrent( void )
 {
-    F32 result = alarmBackupAudioCurrent.data;
+    F32 result = getF32OverrideValue( &alarmBackupAudioCurrent );
 
-    if ( OVERRIDE_KEY == alarmBackupAudioCurrent.override )
-    {
-        result = alarmBackupAudioCurrent.ovData;
-    }
-
     return result;
 }