Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -rd5c94536929ded738e5c8d139d8c46b1d3e035ef -r9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision d5c94536929ded738e5c8d139d8c46b1d3e035ef)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 9b2aa25492c9286b9c1d5b0f4ce9e3676d9ade84)
@@ -3092,7 +3092,7 @@
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D63_LEVEL_BIT ) >> 1;
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT1 ) ) >> BIT1;
     }
     else
     {
@@ -3120,7 +3120,7 @@
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D98_LEVEL_BIT ) >> 2;
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT2 ) ) >> BIT2;
     }
     else
     {
@@ -3148,7 +3148,7 @@
 #if 1    // Remove when Beta 1.9 is obsolete
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
     {
-        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & FPGA_D46_LEVEL_BIT );
+        result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT ( BIT0 ) ) >> BIT0;
     }
     else
     {