Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rc1b9ac0dbf2196280895d2e440dd7ac288ac8424 -r3c9724b7e07c1a82d0e7fd653a99d7cb96d06e5a
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision c1b9ac0dbf2196280895d2e440dd7ac288ac8424)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 3c9724b7e07c1a82d0e7fd653a99d7cb96d06e5a)
@@ -177,7 +177,7 @@
  * The execTreatmentEnd function executes the Treatment End sub-mode
  * state machine.
  * @details Inputs: treatmentEndState
- * @details Outputs: treatmentEndState
+ * @details Outputs: treatmentEndState, txEndAlarmEndTreatmentRequested
  * @return none
  *************************************************************************/
 void execTreatmentEnd( void )
@@ -186,6 +186,12 @@
 
     txEndTimerCtr++;
 
+    // Check for user confirmation of end treatment
+    if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) )
+    {
+        txEndAlarmEndTreatmentRequested = TRUE;
+    }
+
     switch ( treatmentEndState )
     {
         case TREATMENT_END_WAIT_FOR_RINSEBACK_STATE:
@@ -352,7 +358,8 @@
  *************************************************************************/
 void signalTreatmentEndAlarmEndTxUserAction( void )
 {
-    txEndAlarmEndTreatmentRequested = TRUE;
+    // 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 );
 }
 
 /*********************************************************************//**