Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -red2e81c8f4618d08b2842d47b4897c5990f5cb76 -rcfa8ae21594d3471c37079eb708761fe9a047776
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision ed2e81c8f4618d08b2842d47b4897c5990f5cb76)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision cfa8ae21594d3471c37079eb708761fe9a047776)
@@ -3072,18 +3072,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;
 }
 
 /*********************************************************************//**
@@ -3096,18 +3099,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;
 }
 
 /*********************************************************************//**
@@ -3120,18 +3126,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;
 }
 
 /*********************************************************************//**
@@ -3157,18 +3166,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;
 }
 
 /*********************************************************************//**