Index: firmware/App/Monitors/Level.c =================================================================== diff -u -r9c0f227670dcf68439c5ea86768d116cc6f9585e -r345bab099a097189ba750b618072d44ff1153203 --- firmware/App/Monitors/Level.c (.../Level.c) (revision 9c0f227670dcf68439c5ea86768d116cc6f9585e) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision 345bab099a097189ba750b618072d44ff1153203) @@ -28,6 +28,9 @@ */ // ********** private definitions ********** +#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 #define FPGA_LEVEL_EMPTY 3 ///< Floater empty level status #define FPGA_LEVEL_LOW 2 ///< Floater low level status #define FPGA_LEVEL_MEDIUM 0 ///< Floater medium level status @@ -265,7 +268,6 @@ if ( D6_LEVL == levelId ) { levelStatus = getFPGAD6LevelStatus(); - if ( getTestConfigStatus( TEST_CONFIG_ENABLE_BETA_1_0_HW ) != TRUE ) { // Beta 1.9 behavior @@ -294,15 +296,15 @@ else { // Beta 1.0 behavior - if ( FPGA_LEVEL_LOW == levelStatus ) + if ( FPGA_B1_HW_LEVEL_LOW == levelStatus ) { currentLevelStatus = LEVEL_STATE_LOW; } - else if ( FPGA_LEVEL_MEDIUM == levelStatus ) + else if ( FPGA_B1_HW_LEVEL_MEDIUM == levelStatus ) { currentLevelStatus = LEVEL_STATE_MEDIUM; } - else if ( FPGA_LEVEL_HIGH == levelStatus ) + else if ( FPGA_B1_HW_LEVEL_HIGH == levelStatus ) { currentLevelStatus = LEVEL_STATE_HIGH; } @@ -313,6 +315,7 @@ } } } + else if ( P25_LEVL == levelId ) { levelStatus = getFPGAP25FloaterState(); @@ -345,15 +348,15 @@ else { // Beta 1.0 behavior - if ( FPGA_LEVEL_LOW == levelStatus ) + if ( FPGA_B1_HW_LEVEL_LOW == levelStatus ) { currentLevelStatus = LEVEL_STATE_LOW; } - else if ( FPGA_LEVEL_MEDIUM == levelStatus ) + else if ( FPGA_B1_HW_LEVEL_MEDIUM == levelStatus ) { currentLevelStatus = LEVEL_STATE_MEDIUM; } - else if ( FPGA_LEVEL_HIGH == levelStatus ) + else if ( FPGA_B1_HW_LEVEL_HIGH == levelStatus ) { currentLevelStatus = LEVEL_STATE_HIGH; }