Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -rcfa8ae21594d3471c37079eb708761fe9a047776 -rf66ffb2807dae4ad719d41520bc8c3739210bfd0
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision cfa8ae21594d3471c37079eb708761fe9a047776)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision f66ffb2807dae4ad719d41520bc8c3739210bfd0)
@@ -28,6 +28,7 @@
  */
 
 // ********** private definitions **********
+#define LEVEL_SENSOR_VALUE_LOW              0U                                                      ///< Level sensor digital low value (0 = low, non-zero = high).
 #define FPGA_B1_HW_LEVEL_LOW                5                                                       ///< Floater low level status for Beta 1.0
 #define FPGA_B1_HW_LEVEL_MEDIUM             4                                                       ///< Floater medium level status for Beta 1.0
 #define FPGA_B1_HW_LEVEL_HIGH               6                                                       ///< Floater high level status for Beta 1.0
@@ -70,9 +71,6 @@
 static void publishLevelsData( void );
 static BOOL processLevelCount( U16 count );
 static LEVEL_STATE_T readFloaterLevelstatus( LEVEL_T levelId );
-static LEVEL_STATE_T getLevelState( U32 levelStatus );
-static LEVEL_STATE_T getLevelStateBeta19( U32 levelStatus );
-static LEVEL_STATE_T getLevelStateBeta10( U32 levelStatus );
 
 /*********************************************************************//**
  * @brief
@@ -135,33 +133,33 @@
             case D63_LEVL:
                 if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
                 {
-                    currentLevelStatus = ( 0U == getFPGAD63LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
+                    currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD63LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
+                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_VALUE_LOW ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
                 }
                 break;
 
             case D98_LEVL:
                 if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
                 {
-                    currentLevelStatus = ( 0U == getFPGAD98LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
+                    currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD98LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
+                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_VALUE_LOW ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
                 }
                 break;
 
             case D46_LEVL:
                 if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
                 {
-                    currentLevelStatus = ( 0U == getFPGAD46LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
+                    currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD46LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH;
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
+                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_VALUE_LOW ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
                 }
                 break;
 
@@ -321,14 +319,14 @@
 
 /*********************************************************************//**
  * @brief
- * The getLevelState function maps the raw floater/level status reported
+ * The getLevelStateBeta20 function maps the raw floater/level status reported
  * by FPGA to the corresponding LEVEL_STATE_T for Beta 2.0 hardware.
  * @details \b Inputs: levelStatus
  * @details \b Outputs: none
  * @param levelStatus Raw FPGA level status value
  * @return mapped level state
  *************************************************************************/
-static LEVEL_STATE_T getLevelState( U32 levelStatus )
+static LEVEL_STATE_T getLevelStateBeta20( U32 levelStatus )
 {
     LEVEL_STATE_T currentLevelStatus = LEVEL_STATE_ILLEGAL;
 
@@ -417,7 +415,7 @@
        else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
        {
            // Beta 2.0 behavior
-           currentLevelStatus = getLevelState( levelStatus );
+           currentLevelStatus = getLevelStateBeta20( levelStatus );
        }
        else
        {
@@ -439,7 +437,7 @@
        else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
       {
           // Beta 2.0 behavior
-          currentLevelStatus = getLevelState( levelStatus );
+          currentLevelStatus = getLevelStateBeta20( levelStatus );
       }
        else
        {