Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r97a2c7209c0ad50894ed885a3503a78242a8f885 -r4303b7eba0a3fcb76d8a930aadcca3e0b19d47d3
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 97a2c7209c0ad50894ed885a3503a78242a8f885)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 4303b7eba0a3fcb76d8a930aadcca3e0b19d47d3)
@@ -134,35 +134,35 @@
                 break;
 
             case D63_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
                 }
                 break;
 
             case D98_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH  : LEVEL_STATE_LOW;
                 }
                 break;
 
             case D46_LEVL:
-                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+                if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
                 {
-                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD46LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW;
+                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
                 }
                 else
                 {
-                    currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW );
+                    currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD46LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW;
                 }
                 break;
 
@@ -206,6 +206,10 @@
                         SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D46_LEVL_CHANGE, (U32)status[ level ].data, (U32)currentLevelStatus );
                         break;
 
+                    case P25_LEVL:
+                        SEND_EVENT_WITH_2_U32_DATA( FP_EVENT_P25_LEVL_CHANGE, (U32)status[ level ].data, (U32)currentLevelStatus );
+                        break;
+
 #ifndef _VECTORCAST_
                     default:
                         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_LEVEL_SELECTED, level);
@@ -442,44 +446,42 @@
     {
        levelStatus = getFPGAD6LevelStatus();
 
-       if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) &&
-            ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) )
+       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
        {
            // Beta 1.9 behavior
            currentLevelStatus = getLevelStateBeta19( levelStatus );
        }
-       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
+       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
        {
-           // Beta 2.0 behavior
-           currentLevelStatus = getLevelState( levelStatus );
+           // Beta 1.0 behavior
+           currentLevelStatus = getLevelStateBeta10( levelStatus );
        }
        else
        {
-           // Beta 1.0 behavior
-           currentLevelStatus = getLevelStateBeta10( levelStatus );
+           // Beta 2.0 behavior
+           currentLevelStatus = getLevelState( levelStatus );
        }
     }
 
     else if ( P25_LEVL == levelId )
     {
        levelStatus = getFPGAP25FloaterState();
 
-       if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) &&
-            ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) )
+       if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
        {
            // Beta 1.9 behavior
            currentLevelStatus = getLevelStateBeta19( levelStatus );
        }
-       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE )
-      {
-          // Beta 2.0 behavior
-          currentLevelStatus = getLevelState( levelStatus );
-      }
-       else
+       else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
        {
            // Beta 1.0 behavior
            currentLevelStatus = getLevelStateBeta10( levelStatus );
        }
+       else
+       {
+           // Beta 2.0 behavior
+           currentLevelStatus = getLevelState( levelStatus );
+       }
     }
 
     else