Index: firmware/App/Monitors/Level.c =================================================================== diff -u -rf66ffb2807dae4ad719d41520bc8c3739210bfd0 -rb9a6c61d168d8aad9314f05b749645c73158b621 --- firmware/App/Monitors/Level.c (.../Level.c) (revision f66ffb2807dae4ad719d41520bc8c3739210bfd0) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision b9a6c61d168d8aad9314f05b749645c73158b621) @@ -71,6 +71,9 @@ 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 @@ -319,14 +322,14 @@ /*********************************************************************//** * @brief - * The getLevelStateBeta20 function maps the raw floater/level status reported + * The getLevelState 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 getLevelStateBeta20( U32 levelStatus ) +static LEVEL_STATE_T getLevelState( U32 levelStatus ) { LEVEL_STATE_T currentLevelStatus = LEVEL_STATE_ILLEGAL; @@ -415,7 +418,7 @@ else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { // Beta 2.0 behavior - currentLevelStatus = getLevelStateBeta20( levelStatus ); + currentLevelStatus = getLevelState( levelStatus ); } else { @@ -437,7 +440,7 @@ else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { // Beta 2.0 behavior - currentLevelStatus = getLevelStateBeta20( levelStatus ); + currentLevelStatus = getLevelState( levelStatus ); } else {