Index: firmware/App/Drivers/BubbleDetector.c
===================================================================
diff -u -r961784c895cb8f551a2623cd02dcbfe42d04b7c2 -r395522dffef1348e176564925656012f529c1910
--- firmware/App/Drivers/BubbleDetector.c	(.../BubbleDetector.c)	(revision 961784c895cb8f551a2623cd02dcbfe42d04b7c2)
+++ firmware/App/Drivers/BubbleDetector.c	(.../BubbleDetector.c)	(revision 395522dffef1348e176564925656012f529c1910)
@@ -1,16 +1,16 @@
 /**************************************************************************
 *
-* 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    BubbleDetector.c
 *
-* @author  (last)      Sean
-* @date    (last)      22-Aug-2024
+* @author  (last)      Sean Nash
+* @date    (last)      18-Apr-2025
 *
-* @author  (original)  Sean
+* @author  (original)  Sean Nash
 * @date    (original)  22-Aug-2024
 *
 ***************************************************************************/
@@ -83,11 +83,7 @@
 
     if ( sensor < NUM_OF_BUBBLE_DETECTORS )
     {
-        result = (BUBBLE_STATE_T)currentBubbleState[ sensor ].data;
-        if ( OVERRIDE_KEY == currentBubbleState[ sensor ].override )
-        {
-            result = (BUBBLE_STATE_T)currentBubbleState[ sensor ].ovData;
-        }
+        result = (BUBBLE_STATE_T)getU32OverrideValue( &currentBubbleState[ sensor ] );
     }
     else
     {