Index: sources/drydemo/DryDemoDefines.h
===================================================================
diff -u -r4624d7657d342248336c1ff16edfae614c335728 -r0deaf8f3e192a0ecde953ab65efc1ded1c06269b
--- sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision 4624d7657d342248336c1ff16edfae614c335728)
+++ sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision 0deaf8f3e192a0ecde953ab65efc1ded1c06269b)
@@ -123,25 +123,27 @@
 #define RECIRC_WARN_BEFORE_TIMEOUT_MIN  10
 
 // Alarm defines
-#define ALARM_TABLE_PRIORITY_INDEX        0
-#define ALARM_TABLE_PROPERTIES_INDEX      1
-#define ALARM_TABLE_TX_PAUSE_INDEX        2
-#define ALARM_TRANS_TO_TX_PAUSE           1
-#define ALARM_NOT_TRANS_TO_TX_PAUSE       0
-#define TRIG_LOW_VEN_ALARM_TIMEOUT_MS     (3 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
-#define CLEAR_DIAL_PROPOR_TIMEOUT_MS      (10 * MILLISECONDS_PER_SECOND)
-#define ALARM_NO_ALARM_PROPERTIES         0
-#define ALARM_STOP_TX_PROPERTIES          6
-#define ALARM_USE_DEFAULT_PROPERTIES      -999
-#define ALARM_REPLACE_ACID_PROPERTIES     112
-#define ALARM_RECIRC_WARN_PROPERTIES      112
-#define ALARM_RECIR_TIMEOUT_RPOPERTIES    26
-#define ALARM_LOW_VENOUS_PROPERTIES       2
-#define ALARM_RECIRC_WARN_PROPERTIES      112
-#define ALARM_REPLACE_BICARB_PROPERTIES   112
-#define ALARM_DIAL_PROPOR_PROPERTIES      10
-#define ALARM_TX_MOD_CHNG_PROPERTIES      2
-#define ALARM_LOW_BICARB_PROPERTIES       112
+#define ALARM_TABLE_PRIORITY_INDEX              0
+#define ALARM_TABLE_PROPERTIES_INDEX            1
+#define ALARM_TABLE_TX_PAUSE_INDEX              2
+#define ALARM_TRANS_TO_TX_PAUSE                 1
+#define ALARM_NOT_TRANS_TO_TX_PAUSE             0
+#define TRIG_LOW_VEN_ALARM_TIMEOUT_MS           (3 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
+#define CLEAR_DIAL_PROPOR_TIMEOUT_MS            (10 * MILLISECONDS_PER_SECOND)
+#define ALARM_NO_ALARM_PROPERTIES               0
+#define ALARM_STOP_TX_PROPERTIES                6
+#define ALARM_USE_DEFAULT_PROPERTIES            -999
+#define ALARM_REPLACE_ACID_PROPERTIES           112
+#define ALARM_RECIRC_WARN_PROPERTIES            112
+#define ALARM_RECIR_TIMEOUT_RPOPERTIES          26
+#define ALARM_LOW_VENOUS_PROPERTIES             2
+#define ALARM_RECIRC_WARN_PROPERTIES            112
+#define ALARM_REPLACE_BICARB_PROPERTIES         112
+#define ALARM_DIAL_PROPOR_PROPERTIES            10
+#define ALARM_TX_MOD_CHNG_PROPERTIES            2
+#define ALARM_LOW_BICARB_PROPERTIES             112
+#define ALARM_TD_END_OF_TX_PROPERTIES           248
+#define ALARM_TD_END_OF_TX_TIMEOUT_PROPERTIES   88
 
 // Dry bicart defines
 #define DRY_BICART_DRIN_IN_PROGRESS       1
@@ -159,6 +161,9 @@
 #define HDF_CONTROL_INT_CTR               (4 * MILLISECONDS_PER_SECOND) / QOBJECT_TIMER_TIMEOUT_MS
 #define HDF_START_RATE_MLPM               50.0
 
+// Treatment end defines
+#define TREATMENT_END_TIMEOUT_ALARM_MS    10000 //(10 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
+
 enum User_Command_ID {
     CMD_NONE               = -1,
     CMD_STAND_BY           = 0,
@@ -167,8 +172,11 @@
     CMD_MAIN_TX            = 3,
     CMD_RINSEBACK          = 4,
     CMD_RICIRCULATE        = 5,
-    CMD_END_TX             = 6,
+    CMD_TX_STOP            = 6,
+    CMD_END_TX             = 7,
+    CMD_POST_TX            = 8,
 
+
     CMD_DISINFECTION       = 12,
     CMD_HIGH_PRIO_ALARM    = 13,
     CMD_MEDIUM_PRIO_ALARM  = 14,
@@ -225,11 +233,10 @@
     REQUESTED_USER_ACTION_RINSEBACK_DECREASE_RATE         = 2,
     REQUESTED_USER_ACTION_RINSEBACK_PAUSE                 = 3,
     REQUESTED_USER_ACTION_RINSEBACK_RESUME                = 4,
-    REQUESTED_USER_ACTION_RINSEBACK_END                   = 5,
-    REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL            = 6,
-    REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_RECIRCULATE   = 7,
-    REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT         = 8,
-    REQUESTED_USER_ACTION_RINSEBACK_BACK_TO_TREATMENT     = 9,
+    REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL            = 5,
+    REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_RECIRCULATE   = 6,
+    REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT         = 7,
+    REQUESTED_USER_ACTION_RINSEBACK_BACK_TO_TREATMENT     = 8,
 };
 
 enum Recirculate_States {
@@ -345,6 +352,8 @@
     ALARM_ID_DD_REPLACE_BICARB_CARTRIDGE               = 248,
     ALARM_ID_DD_REPLACE_ACID_CONCENTRATE               = 249,
     ALARM_ID_TD_DIALYSATE_PROPORTIONING_IN_PROGRESS    = 250,
+    ALARM_ID_TD_END_OF_TREATMENT                       = 251,
+    ALARM_ID_TD_END_OF_TREATMENT_TIMEOUT               = 252,
 };
 
 enum Generic_Confirm_Id {