Index: firmware/App/HDCommon.h =================================================================== diff -u -r45ab2f69a7c566d8636c1d7aa9d9dac8c22bd0da -r85b5377e9aa9c04f95da0ae019a97febe44a0f10 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 45ab2f69a7c566d8636c1d7aa9d9dac8c22bd0da) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 85b5377e9aa9c04f95da0ae019a97febe44a0f10) @@ -25,7 +25,7 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 6 #define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 125 +#define HD_VERSION_BUILD 126 // ********** development build switches ********** Index: firmware/App/Modes/SelfTests.c =================================================================== diff -u -rdd9e3bea402ef6957991d91c0e5cbd5db61cd33a -r85b5377e9aa9c04f95da0ae019a97febe44a0f10 --- firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision dd9e3bea402ef6957991d91c0e5cbd5db61cd33a) +++ firmware/App/Modes/SelfTests.c (.../SelfTests.c) (revision 85b5377e9aa9c04f95da0ae019a97febe44a0f10) @@ -823,15 +823,14 @@ { DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE; - BUBBLE_STATUS_T const ADABubbleStatus = getBubbleStatus( ADA ); BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV ); -// if ( ( BUBBLE_DETECTED == ADABubbleStatus ) && ( BUBBLE_DETECTED == ADVBubbleStatus ) && -// ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) && -// ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) ) -// { + if ( ( BUBBLE_DETECTED == ADVBubbleStatus ) && + ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) ) && + ( AIR_TRAP_LEVEL_AIR == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) ) ) + { state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE; -// } + } // else // { // activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE ); @@ -1103,7 +1102,6 @@ if ( setupDisplacementVolume <= 0 ) { signalDialInPumpHardStop(); - selfTestBubble( ADA ); selfTestBubble( ADV ); state = WET_SELF_TESTS_BUBBLES_STATE; } @@ -1129,7 +1127,7 @@ { WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BUBBLES_STATE; - if ( ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADA ) ) && ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADV ) ) ) + if ( SELF_TEST_STATUS_PASSED == getBubbleSelfTestStatus( ADV ) ) { state = WET_SELF_TESTS_PRIME_CHECK_STATE; } @@ -1157,7 +1155,6 @@ WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_PRIME_CHECK_STATE; *result = SELF_TEST_STATUS_FAILED; - BUBBLE_STATUS_T const ADABubbleStatus = getBubbleStatus( ADA ); BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV ); #ifndef SKIP_AIR_BUBBLE_CHECK