Index: firmware/App/Modes/TreatmentStop.c =================================================================== diff -u -rd28280f1054fc9ddf9304a11373dc9ee963425e3 -rd4bc221d9817b488c2dcd00868386d7036a5c9a1 --- firmware/App/Modes/TreatmentStop.c (.../TreatmentStop.c) (revision d28280f1054fc9ddf9304a11373dc9ee963425e3) +++ firmware/App/Modes/TreatmentStop.c (.../TreatmentStop.c) (revision d4bc221d9817b488c2dcd00868386d7036a5c9a1) @@ -7,8 +7,8 @@ * * @file TreatmentStop.c * -* @author (last) Sean Nash -* @date (last) 13-Jul-2022 +* @author (last) Dara Navaei +* @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 ) @@ -367,7 +368,7 @@ handleTreatmentStopBloodSittingTimer(); - result = handleTreatmentStopAlarmsAndSignals(result); + result = handleTreatmentStopAlarmsAndSignals( result ); return result; }