Index: sources/drydemo/StateControllerTreatment.cpp
===================================================================
diff -u -r4624d7657d342248336c1ff16edfae614c335728 -r0deaf8f3e192a0ecde953ab65efc1ded1c06269b
--- sources/drydemo/StateControllerTreatment.cpp	(.../StateControllerTreatment.cpp)	(revision 4624d7657d342248336c1ff16edfae614c335728)
+++ sources/drydemo/StateControllerTreatment.cpp	(.../StateControllerTreatment.cpp)	(revision 0deaf8f3e192a0ecde953ab65efc1ded1c06269b)
@@ -80,7 +80,7 @@
     //qDebug() << "Current" << currBloodFlowMLPM << _treatmentParams.bloodFlowRateMLPM << controlCounter << accumBloodVolML;
 }
 
-void StateController::setTreatmentParametersToDefault()
+void StateController::initializeTreatmentParametersToDefault()
 {
     // TODO complete the list as we go
     _treatmentParams.finalConfirmation        = true;
@@ -698,9 +698,28 @@
     handleUIResponseMessage(ID_TD_DRY_BICART_DISCONNECT_RESP, ACCEPT_VALUE);
 }
 
+// TREATMENT END
+void StateController::handleTreatmentEndRequestMessage(State_Status &status)
+{
+    if (_treatmentRcvdMessages[ID_TD_END_TREATMENT_RQST].isNull()) { return; }
 
+    _treatmentStatus.stateTransitionEvent = "T_TE_2_RB";
+    status                                = STATE_ON_EXIT;
 
+    _treatmentRcvdMessages[ID_TD_END_TREATMENT_RQST].clear();
+    handleUIResponseMessage(ID_TD_END_TREATMENT_RESP, ACCEPT_VALUE);
+}
 
+void StateController::handleTreatmentEndTimeout()
+{
+    quint32 elapsedTimeMS = (_elapsedTimeCtr - _treatmentStatus.treatmentEndTimeoutAlarmCtr) * QOBJECT_TIMER_TIMEOUT_MS;
 
+    if (elapsedTimeMS == TREATMENT_END_TIMEOUT_ALARM_MS) {
+        triggerAnAlarm(ALARM_ID_TD_END_OF_TREATMENT_TIMEOUT);
+    }
+}
 
 
+
+
+