Index: sources/drydemo/DryDemoDefines.h
===================================================================
diff -u -r6e845078107f7d15a3e471be421d5bce31fc51da -ra271469db538bfc35eba9a56308760893ecbc68e
--- sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision 6e845078107f7d15a3e471be421d5bce31fc51da)
+++ sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision a271469db538bfc35eba9a56308760893ecbc68e)
@@ -4,16 +4,18 @@
 // General defines
 #define UI_MSG_BB_STATUS_INDEX         4
 #define UI_MSG_BB_PAYLOAD_ID           0x63
+#define UI_CONFIRM_MSG_TIMESTAMP_INDEX 0
+#define UI_CONFIRM_MSG_STATUS_INDEX    1
 #define SECONDS_PER_MINUTE             60
 #define MINUTES_PER_HOUR               60
 #define MILLISECONDS_PER_SECOND        1000
 #define MILLILITERS_PER_LITER          1000
 #define ACCEPT_VALUE                   1
 #define REJECT_VALUE                   0
 #define NEARLY_ZERO                    0.00000001
-#define CONFIRM_CMD_ACCEPT_CLOSE       3  // TODo remove
 #define PASS_RESULT                    1  // TODO remove
 #define DEVICE_ID                      1234
+#define UI_CONFIRM_RESP_TIMOUT_MS      (SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
 
 // Timer event defines
 #define DEFAULT_TIMEOUT_S              10
@@ -100,6 +102,8 @@
 #define RINSEBACK_MAX_RLOW_RATE_MLPM   500
 #define RINSEBACK_ADJ_FLOW_RATE_MLPM   10
 #define RINSEBACK_BACK_MAX_TIME_MS     (5 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
+#define RINSEBACK_ADDITION_VOL_ML      50
+#define RINSEBACK_MAX_ADDITION_TIME_MS (25 * MILLISECONDS_PER_SECOND)
 #define RINSEBACK_END_TREATMENT_SIGNAL 999  // TODO remove?
 
 // Fluid Bolus defines
@@ -175,6 +179,22 @@
     REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT         = 7,
 };
 
+enum Recirculate_States {
+    TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE   = 0,
+    TREATMENT_RECIRC_RECIRC_STATE               = 1,
+    TREATMENT_RECIRC_STOPPED_STATE              = 2,
+    TREATMENT_RECIRC_RECONNECT_PATIENT_STATE    = 3,
+};
+
+enum Requested_Treatment_Recirc_User_Actions
+{
+    REQUESTED_USER_ACTION_TX_RECIRC_RECONNECT           = 0,
+    REQUESTED_USER_ACTION_TX_RECIRC_CONFIRM_RECONNECT   = 1,
+    REQUESTED_USER_ACTION_TX_RECIRC_RESUME_RC           = 2,
+    REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT       = 3,
+    REQUESTED_USER_ACTION_TX_RECIRC_CONFIRM_DISCONNECT  = 4,
+};
+
 enum State_Status {
     STATE_ON_ENTRY = 0,
     STATE_ON_ACTION,
@@ -214,6 +234,7 @@
     GENERIC_CONFIRM_ID_TREATMENT_END        = 2,
     GENERIC_CONFIRM_ID_RINSEBACK            = 3,
     GENERIC_CONFIRM_ID_TEMPORARY_BREAK      = 4,
+    NUM_OF_GENERIC_CONFIRM_IDS              = 5,
 };
 
 enum Generic_Confirm_Command
@@ -245,6 +266,8 @@
     REQUEST_REJECT_REASON_UF_NOT_PAUSED                     = 15,
     REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE                = 17,
     REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE  = 21,
+    REQUEST_REJECT_REASON_ALARM_IS_ACTIVE                   = 22,
+    REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED            = 24,
     REQUEST_REJECT_REASON_CONFIRMATION_NOT_EXPECTED         = 58,
     REQUEST_REJECT_REASON_CONFIRMATION_MISMATCH             = 59,
 };