Index: firmware/App/Modes/ModePreTreat.c =================================================================== diff -u -rcb93c23a573d69d251ba0a42098600bdb37a3b4f -r8091f0c55008b0704793a533e38728fae1c7df9b --- firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision cb93c23a573d69d251ba0a42098600bdb37a3b4f) +++ firmware/App/Modes/ModePreTreat.c (.../ModePreTreat.c) (revision 8091f0c55008b0704793a533e38728fae1c7df9b) @@ -1022,9 +1022,6 @@ { HD_PRE_TREATMENT_PAT_CONN_STATE_T nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE; - // Look for cartridge door to open (indicating user inverting dialyzer) - handlePatientConnectionDoorOpened(); - // If UF volume set by user, move on to next state if ( TRUE == setUFVolStatus ) { @@ -1053,9 +1050,6 @@ if ( ( TRUE == doorOpened ) && ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) ) { - setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); - cmdStartDGTrimmerHeater(); - doorClosedRequired( TRUE, TRUE ); nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE; } @@ -1075,7 +1069,10 @@ { HD_PRE_TREATMENT_PAT_CONN_STATE_T nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE; - if ( TRUE == patientConnectionConfirm ) + // Look for cartridge door to open and then close (indicating user inverted dialyzer) + handlePatientConnectionDoorOpened(); + + if ( ( TRUE == patientConnectionConfirm ) && ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) ) { doorClosedRequired( TRUE, TRUE ); nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_TREATMENT_START_STATE;