Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -rb4c343fde01f77b96c50d7f76e3f8f9d011b56a4 -re76c83e425e2cc692f65eb7a5cabc2163c8dfa2f
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision b4c343fde01f77b96c50d7f76e3f8f9d011b56a4)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision e76c83e425e2cc692f65eb7a5cabc2163c8dfa2f)
@@ -3078,18 +3078,21 @@
  *************************************************************************/
 U16 getFPGAD63LevelSensor( void )
 {
+    U08 result;
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        return ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D63_LEVEL_BIT );
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D63_LEVEL_BIT );
     }
     else
     {
-        return fpgaBeta19SensorReadings.fpgaD63LevelSensor;
+        result = fpgaBeta19SensorReadings.fpgaD63LevelSensor;
     }
 #else
-    return GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
+    result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
 #endif
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -3102,18 +3105,21 @@
  *************************************************************************/
 U16 getFPGAD98LevelSensor( void )
 {
+    U08 result;
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        return ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D98_LEVEL_BIT );
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D98_LEVEL_BIT );
     }
     else
     {
-        return fpgaBeta19SensorReadings.fpgaD98LevelSensor;
+        result = fpgaBeta19SensorReadings.fpgaD98LevelSensor;
     }
 #else
-    return GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
+    result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
 #endif
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -3126,18 +3132,21 @@
  *************************************************************************/
 U16 getFPGAD46LevelSensor( void )
 {
+    U08 result;
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        return ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D46_LEVEL_BIT );
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D46_LEVEL_BIT );
     }
     else
     {
-        return fpgaBeta19SensorReadings.fpgaD46LevelSensor;
+        result = fpgaBeta19SensorReadings.fpgaD46LevelSensor;
     }
 #else
-    return GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
+    result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
 #endif
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -3163,18 +3172,21 @@
  *************************************************************************/
 U08 getFPGAFloater2Status( void )
 {
+    U08 result;
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        return fpgaSensorReadings.fpgaConductiveLevelStatus;
+        result = fpgaSensorReadings.fpgaConductiveLevelStatus;
     }
     else
     {
-        return fpgaBeta19SensorReadings.fpgaFloater2Status;
+        result = fpgaBeta19SensorReadings.fpgaFloater2Status;
     }
 #else
-    return GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
+    result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus );
 #endif
+
+    return result;
 }
 
 /*********************************************************************//**