Index: firmware/App/Controllers/AlarmLamp.c
===================================================================
diff -u -ra0d405d152c0f451ebf3c25e3c2cfa49a4db17cd -r395522dffef1348e176564925656012f529c1910
--- firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.c)	(revision a0d405d152c0f451ebf3c25e3c2cfa49a4db17cd)
+++ firmware/App/Controllers/AlarmLamp.c	(.../AlarmLamp.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    AlarmLamp.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)  01-Aug-2024
 *
 ***************************************************************************/
 
@@ -182,13 +182,8 @@
  *************************************************************************/
 LAMP_PATTERN_T getCurrentAlarmLampPattern( void )
 {
-    LAMP_PATTERN_T result = (LAMP_PATTERN_T)currentLampPattern.data;
+    LAMP_PATTERN_T result = (LAMP_PATTERN_T)getU32OverrideValue( &currentLampPattern );
 
-    if ( OVERRIDE_KEY == currentLampPattern.override )
-    {
-        result = (LAMP_PATTERN_T)currentLampPattern.ovData;
-    }
-
     return result;
 }