Index: firmware/App/Monitors/Level.c =================================================================== diff -u -r3643a2e648ab2b216fd08579e56bdc02fb94836d -rae88c96592543ce53f30a3a5a18964c5198d5250 --- firmware/App/Monitors/Level.c (.../Level.c) (revision 3643a2e648ab2b216fd08579e56bdc02fb94836d) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision ae88c96592543ce53f30a3a5a18964c5198d5250) @@ -15,6 +15,7 @@ * ***************************************************************************/ + #include "FpgaDD.h" #include "Level.h" #include "MessageSupport.h" @@ -28,6 +29,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 @@ -253,6 +257,7 @@ /*********************************************************************//** * @brief * The getFloaterLevelstatus function gets the floater level reported by FPGA + * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT if the current state is invalid. * @details \b Inputs: FPGA level sensor data * @details \b Outputs: level * @return level status @@ -265,7 +270,6 @@ if ( D6_LEVL == levelId ) { levelStatus = getFPGAD6LevelStatus(); - if ( getTestConfigStatus( TEST_CONFIG_ENABLE_BETA_1_0_HW ) != TRUE ) { // Beta 1.9 behavior @@ -294,15 +298,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 +317,7 @@ } } } + else if ( P25_LEVL == levelId ) { levelStatus = getFPGAP25FloaterState(); @@ -345,15 +350,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; }