Index: firmware/App/Modes/Prime.c =================================================================== diff -u -r1d6c1c5544f09d5b38053cd4f91e8e64584dcdff -r4d19866d355b8e6c46627a3650b80ad9a18c1d07 --- firmware/App/Modes/Prime.c (.../Prime.c) (revision 1d6c1c5544f09d5b38053cd4f91e8e64584dcdff) +++ firmware/App/Modes/Prime.c (.../Prime.c) (revision 4d19866d355b8e6c46627a3650b80ad9a18c1d07) @@ -184,16 +184,14 @@ * The transitionToPrime function prepares for transition to prime sub-mode. * This function will reset anything required before the start of priming sequence. * @details Inputs: none - * @details Outputs: currentPrimeState, wetSelfTestsResult, - * primeStartReqReceived, reservoirFilledStatus[], bubbleClearEnded, - * primeDialyzerBubbleClearState + * @details Outputs: currentPrimeState, wetSelfTestsResult, primeStartReqReceived, + * reservoirFilledStatus[], bubbleClearEnded, primeDialyzerBubbleClearState * @return none *************************************************************************/ void transitionToPrime( void ) { primeStartTime = getMSTimerCount(); primeFirstPurgePass = TRUE; - primeDialyzerBubbleClearState = PRIME_BUBBLE_CLEAR_READY_STATE; setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE ); setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE ); @@ -217,10 +215,13 @@ resetPrimeFlags(); - if ( TRUE == getTestConfigStatus( TEST_CONFIG_USE_WET_CARTRIDGE ) ) + if ( getTestConfigStatus( TEST_CONFIG_USE_WET_CARTRIDGE ) != TRUE ) { - // If the use wet cartridge test configuration has been enabled skip the dialyzer - // bubble clear + bubbleClearEnded = FALSE; + primeDialyzerBubbleClearState = PRIME_BUBBLE_CLEAR_READY_STATE; + } + else + { // if using a wet cartridge, we do not want to do the bubble clearing of dialyzer in blood side prime states bubbleClearEnded = TRUE; primeDialyzerBubbleClearState = PRIME_BUBBLE_CLEAR_COMPLETE_STATE; } @@ -599,7 +600,10 @@ purgeAirValvesBloodPumpControl(); purgeAirTimeOutStartTime = getMSTimerCount(); primeSalineDialyzerBubbleClearStartTime = getMSTimerCount(); - primeDialyzerBubbleClearState = PRIME_BUBBLE_CLEAR_READY_STATE; + if ( getTestConfigStatus( TEST_CONFIG_USE_WET_CARTRIDGE ) != TRUE ) + { + primeDialyzerBubbleClearState = PRIME_BUBBLE_CLEAR_READY_STATE; + } if ( TRUE == doesAlarmStatusIndicateStop() ) { @@ -610,7 +614,6 @@ return state; } - /*********************************************************************//** * @brief * The handlePrimePurgeAirState function checks for air trap level and moves