Index: firmware/App/Modes/Rinseback.c =================================================================== diff -u -r2a03f6c87706478406a4962d70f5bae2ccb57728 -r853ebb4569739cf4d0ea75b7d3c11571f0f3d000 --- firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 2a03f6c87706478406a4962d70f5bae2ccb57728) +++ firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 853ebb4569739cf4d0ea75b7d3c11571f0f3d000) @@ -281,6 +281,12 @@ rinsebackTimerCtr++; + // Check for user confirmation of end treatment + if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) ) + { + endTreatmentRequested = TRUE; + } + switch ( rinsebackState ) { case RINSEBACK_STOP_INIT_STATE: @@ -633,7 +639,9 @@ break; case REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT: - accepted = handleEndTreatmentUserAction( &rejReason ); + // Send message to UI to get user confirmation to end treatment - action initiated only upon receipt of user confirmation from UI + addConfirmationRequest( GENERIC_CONFIRM_ID_TREATMENT_END, GENERIC_CONFIRM_CMD_REQUEST_OPEN, 0 ); + accepted = TRUE; break; case REQUESTED_USER_ACTION_RINSEBACK_BACK_TO_TREATMENT: