Index: firmware/App/Modes/TreatmentStop.c =================================================================== diff -u -r254faac62b851c393c5df753eade2dc880b83247 -r46b163d19c65e8c21db7b0247bbb1af0dba1ece5 --- firmware/App/Modes/TreatmentStop.c (.../TreatmentStop.c) (revision 254faac62b851c393c5df753eade2dc880b83247) +++ firmware/App/Modes/TreatmentStop.c (.../TreatmentStop.c) (revision 46b163d19c65e8c21db7b0247bbb1af0dba1ece5) @@ -8,7 +8,7 @@ * @file TreatmentStop.c * * @author (last) Dara Navaei -* @date (last) 23-May-2022 +* @date (last) 10-Aug-2022 * * @author (original) Sean * @date (original) 15-Jan-2020 @@ -90,6 +90,7 @@ // Set user alarm recovery actions allowed in this sub-mode setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE ); + if ( TRUE == getRinsebackCompleted() ) { // block rinseback action if already done setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE ); @@ -256,8 +257,8 @@ static TREATMENT_STOP_STATE_T handleTreatmentStopAlarmsAndSignals( TREATMENT_STOP_STATE_T state ) { TREATMENT_STOP_STATE_T result = state; - bool bloodRecircBlocked = isBloodRecircBlocked(); - bool dialysateRecircBlocked = isDialysateRecircBlocked(); + BOOL bloodRecircBlocked = isBloodRecircBlocked(); + BOOL dialysateRecircBlocked = isDialysateRecircBlocked(); // Both unblocked and not in recirculate both state if ( (TREATMENT_STOP_RECIRC_STATE != state) && ( FALSE == dialysateRecircBlocked )