Index: sources/drydemo/StateController.h
===================================================================
diff -u -r4624d7657d342248336c1ff16edfae614c335728 -r0deaf8f3e192a0ecde953ab65efc1ded1c06269b
--- sources/drydemo/StateController.h	(.../StateController.h)	(revision 4624d7657d342248336c1ff16edfae614c335728)
+++ sources/drydemo/StateController.h	(.../StateController.h)	(revision 0deaf8f3e192a0ecde953ab65efc1ded1c06269b)
@@ -85,6 +85,8 @@
         float           bicartProgress;
         quint32         bicartDrainInProgress;
         quint32         bicartDepresInProgress;
+        // Treatment end
+        quint32         treatmentEndTimeoutAlarmCtr;
     };
 
     struct Treatment_HDF_vars {
@@ -208,12 +210,13 @@
     void onTreatmentRinsebackStateChange(bool active);
     void onTreatmentRecriculateStateChange(bool active);
     void onTreatmentEndStateChange(bool active);
+    void onPostTreatmentStateChange(bool active);
 
     // Helper methods
     void handleTDOpModeTransitionBroadcastData(const Can::TD_OP_MODE mode, const quint32 subMode, const Broadcast_Type BCType);
     void setTreatmentParametersFromUI(const QVariant &payload); // TODO move the implementation to pretx cpp
     void handleUIResponseMessage(const Can::Message_ID_Enum msgID, const quint32 acceptReject, const QVariantList &rejectReasons = {});
-    void resetDryDemoVariables();
+    void initializeDryDemoVariables();
     void handleBackToStandbyEvent(State_Status &status);
     quint32 extractU32DataFromReceivedMessage(const Can::Message_ID_Enum msgID, qint32 index);
     float extractF32DataFromReceivedMessage(const Can::Message_ID_Enum msgID, qint32 index);
@@ -242,7 +245,7 @@
     void handleBloodPrimeVolML(const bool resume, const float rampStepML, const bool hasFlowChanged, quint32 &currBloodFlowMLPM, float &accumBloodVolML);
 
     // Treatment methods
-    void setTreatmentParametersToDefault();
+    void initializeTreatmentParametersToDefault();
     void initializeTreatmentTimeAndUltrafiltration();
     void handleTreatmentSetpointsBroadcastData(const quint32 bloodFlowMLPM, const quint32 dialFlowMLPM, const float dialTempC, const Broadcast_Type BCType);
     void handleTreatmentStatesBroadcastData(const Broadcast_Type BCType);
@@ -301,5 +304,6 @@
     void handleRecircBroadcastData(const Broadcast_Type BCType);
 
     // Treatment end methods
-
+    void handleTreatmentEndRequestMessage(State_Status &status);
+    void handleTreatmentEndTimeout();
 };