Index: firmware/App/Monitors/Level.c =================================================================== diff -u -r046bc2b62cf942b7e846fa5bff698b94238edf24 -rdeba34e5074da9ac97d8bcbe995f554eec5c70ed --- firmware/App/Monitors/Level.c (.../Level.c) (revision 046bc2b62cf942b7e846fa5bff698b94238edf24) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision deba34e5074da9ac97d8bcbe995f554eec5c70ed) @@ -29,6 +29,7 @@ // ********** private definitions ********** #define LEVEL_SENSOR_VALUE_LOW 0U ///< Level sensor digital low value (0 = low, non-zero = high). +#define LEVEL_SENSOR_VALUE_HIGH 0U ///< Level sensor digital low value (1 = no liquid, zero liquid ). #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 @@ -136,7 +137,7 @@ case D63_LEVL: if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) { - currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD63LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH; + currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW; } else { @@ -147,7 +148,7 @@ case D98_LEVL: if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) { - currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD98LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH; + currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW; } else { @@ -468,9 +469,10 @@ LEVEL_STATE_T getBicarbChamberLevelStatus( void ) { LEVEL_STATE_T status = LEVEL_STATE_ILLEGAL; - LEVEL_STATE_T upperlevel = getLevelStatus( D63_LEVL ); - LEVEL_STATE_T lowerlevel = getLevelStatus( D98_LEVL ); + LEVEL_STATE_T upperlevel = getLevelStatus( D98_LEVL ); + LEVEL_STATE_T lowerlevel = getLevelStatus( D63_LEVL ); + if ( ( lowerlevel == LEVEL_STATE_LOW ) && ( upperlevel == LEVEL_STATE_LOW ) ) { status = LEVEL_STATE_LOW;