Index: firmware/App/Drivers/LevelSensors.c
===================================================================
diff -u -re69d7ce1c9d88695e25e8ea94529dffdd8592434 -re24a98a344ba13ceb0663b415268a7e1dd5ce99e
--- firmware/App/Drivers/LevelSensors.c	(.../LevelSensors.c)	(revision e69d7ce1c9d88695e25e8ea94529dffdd8592434)
+++ firmware/App/Drivers/LevelSensors.c	(.../LevelSensors.c)	(revision e24a98a344ba13ceb0663b415268a7e1dd5ce99e)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2025 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    LevelSensors.c
 *
-* @author  (last)      Sean
-* @date    (last)      03-Oct-2024
+* @author  (last)      Sean Nash
+* @date    (last)      06-Jun-2025
 *
-* @author  (original)  Sean
-* @date    (original)  03-Oct-2024
+* @author  (original)  Sean Nash
+* @date    (original)  24-Oct-2024
 *
 ***************************************************************************/
 
@@ -65,7 +65,7 @@
 
 /*********************************************************************//**
  * @brief
- * The readLevelSensors function gets the current level sensor state
+ * The readAirTrapLevelSensors function gets the current level sensor state
  * for a all level sensors from the FPGA.
  * @note This function should be called periodically to maintain fresh
  * sensor readings for all level sensors.
@@ -74,15 +74,19 @@
  * airTrapLevelsDebounceStartTime[]
  * @return none
  *************************************************************************/
-void readLevelSensors( void )
+void readAirTrapLevelSensors( void )
 {
     BOOL lowAir, highAir;
     AIR_TRAP_LEVEL_SENSORS_T airTrapLevelSensor;
 
     // Get latest raw level sensor states from FPGA
+#ifndef TEST_AIR_TRAP_ALPHA_TESTING
     getFPGAAirTrapLevels( &lowAir, &highAir );
-    currentLevelStates[ H17_LEVL ].data = (U32)( FALSE == lowAir ? AIR_TRAP_LEVEL_FLUID : AIR_TRAP_LEVEL_AIR );
-    currentLevelStates[ H16_LEVL ].data = (U32)( FALSE == highAir ? AIR_TRAP_LEVEL_FLUID : AIR_TRAP_LEVEL_AIR );
+#else
+    getFPGAAirTrapLevels( &highAir, &lowAir );
+#endif
+    rawLevelStates[ H17_LEVL ].data = (U32)( FALSE == lowAir ? AIR_TRAP_LEVEL_FLUID : AIR_TRAP_LEVEL_AIR );
+    rawLevelStates[ H16_LEVL ].data = (U32)( FALSE == highAir ? AIR_TRAP_LEVEL_FLUID : AIR_TRAP_LEVEL_AIR );
 
     // Debounce raw air trap level sensor readings
     for( airTrapLevelSensor = AIR_TRAP_LEVEL_FIRST; airTrapLevelSensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS; airTrapLevelSensor++ )
@@ -120,11 +124,7 @@
 
     if ( sensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS )
     {
-        result = (AIR_TRAP_LEVELS_T)currentLevelStates[ sensor ].data;
-        if ( OVERRIDE_KEY == currentLevelStates[ sensor ].override )
-        {
-            result = (AIR_TRAP_LEVELS_T)currentLevelStates[ sensor ].ovData;
-        }
+        result = (AIR_TRAP_LEVELS_T)getU32OverrideValue( &currentLevelStates[ sensor ] );
     }
     else
     {
@@ -150,11 +150,7 @@
 
     if ( sensor < NUM_OF_AIR_TRAP_LEVEL_SENSORS )
     {
-        result = (AIR_TRAP_LEVELS_T)rawLevelStates[ sensor ].data;
-        if ( OVERRIDE_KEY == rawLevelStates[ sensor ].override )
-        {
-            result = (AIR_TRAP_LEVELS_T)rawLevelStates[ sensor ].ovData;
-        }
+        result = (AIR_TRAP_LEVELS_T)getU32OverrideValue( &rawLevelStates[ sensor ] );
     }
     else
     {