Index: sources/drydemo/DryDemoDefines.h
===================================================================
diff -u -r8aa65ae1bbef5f6121783026efeeb99114c14414 -r6e845078107f7d15a3e471be421d5bce31fc51da
--- sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision 8aa65ae1bbef5f6121783026efeeb99114c14414)
+++ sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision 6e845078107f7d15a3e471be421d5bce31fc51da)
@@ -50,7 +50,8 @@
 #define DEF_TX_PARAM_BLOOD_FLOW_RATE_MLPM           400
 #define DEF_TX_PARAM_DIAL_FLOW_RATE_MLPM            350
 #define DEF_TX_PARAM_SALINE_BOLUS_VOL_ML            100
-#define DEF_TX_PARAM_RINSEBACK_FLOW_RATE_MLPM       250
+#define DEF_TX_PARAM_RINSEBACK_FLOW_RATE_MLPM       200
+#define DEF_TX_PARAM_RINSEBACK_VOLUME_ML            300
 #define DEF_TX_PARAM_ART_PRES_LIMIT_WIN_MMHG        120
 #define DEF_TX_PARAM_VEN_PRES_LIMIT_WIN_MMHG        100
 #define DEF_TX_PARAM_VEN_PRES_LIMIT_ASYM_WIN_MMHG   20
@@ -72,6 +73,7 @@
 #define INITIATE_TREATMENT             1
 #define ALLOW_DIALYSATE_DELIVER        1
 #define BYPASS_DIALYSATE_DELIVER       0
+#define TRIGGER_STOP_ALARM_TIME_MS     (2 * MILLISECONDS_PER_SECOND)
 
 // Treatment defines
 #define BLOOD_PRIME_VOLUME_ML          (106.6 + 40)
@@ -93,29 +95,33 @@
 #define UF_RUNNING_STATE               1
 
 // Rinseback defines
+#define RINSEBACK_FLOW_INTEGRATOR      1.0 / (SECONDS_PER_MINUTE * (MILLISECONDS_PER_SECOND / QOBJECT_TIMER_TIMEOUT_MS))
 #define RINSEBACK_MIN_FLOW_RATE_MLPM   100
-#define RINSEBACK_MAX_RLOW_RATE_MLPM   300
-#define RINSEBACK_ADJ_FLOW_RATE_MLPM   25
-#define RINSEBACK_BACK_MAX_TIME_S      (5 * SECONDS_PER_MINUTE)
-#define RINSEBACK_END_TREATMENT_SIGNAL 999
-#define RINSEBACK_STOP_INIT_STATE      0
-#define RINSEBACK_RUN_STATE            1
-#define RINSEBACK_PAUSE_STATE          2
-#define RINSEBACK_STOP_STATE           3
+#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_END_TREATMENT_SIGNAL 999  // TODO remove?
 
 // Fluid Bolus defines
 #define FLUID_BOLUS_START_CMD          1
 #define ENABLE_BOLUS                   1
 
+// Alarms
+#define ALARM_TABLE_PRIORITY_INDEX     0
+#define ALARM_TABLE_PROPERTIES_INDEX   1
+#define ALARM_NO_ALARM_PROPERTIES      0
+#define ALARM_STOP_TX_PROPERTIES       6
 
 enum User_Command_ID {
     CMD_NONE               = -1,
     CMD_STAND_BY           = 0,
     CMD_PRE_TX             = 1,
     CMD_BLOOD_PRIME        = 2,
     CMD_MAIN_TX            = 3,
+    CMD_RINSEBACK          = 4,
+    CMD_RICIRCULATE        = 5,
+    CMD_END_TX             = 6,
 
-    CMD_END_TX             = 11,
     CMD_DISINFECTION       = 12,
     CMD_HIGH_PRIO_ALARM    = 13,
     CMD_MEDIUM_PRIO_ALARM  = 14,
@@ -149,6 +155,26 @@
     DIALYSIS_UF_FLUID_BOLUS_STATE = 2,
 };
 
+enum Rinseback_States {
+    RINSEBACK_STOP_INIT_STATE           = 0,
+    RINSEBACK_RUN_STATE                 = 1,
+    RINSEBACK_PAUSED_STATE              = 2,
+    RINSEBACK_STOP_STATE                = 3,
+    RINSEBACK_RUN_ADDITIONAL_STATE      = 4,
+};
+
+enum Requested_Rinseback_User_Actions
+{
+    REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_START         = 0,
+    REQUESTED_USER_ACTION_RINSEBACK_INCREASE_RATE         = 1,
+    REQUESTED_USER_ACTION_RINSEBACK_DECREASE_RATE         = 2,
+    REQUESTED_USER_ACTION_RINSEBACK_PAUSE                 = 3,
+    REQUESTED_USER_ACTION_RINSEBACK_RESUME                = 4,
+    REQUESTED_USER_ACTION_RINSEBACK_ADDITIONAL            = 5,
+    REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_RECIRCULATE   = 6,
+    REQUESTED_USER_ACTION_RINSEBACK_END_TREATMENT         = 7,
+};
+
 enum State_Status {
     STATE_ON_ENTRY = 0,
     STATE_ON_ACTION,
@@ -160,6 +186,54 @@
     BC_IMMEDIATELY,
 };
 
+// Alarm related enums
+enum Alarm_Priorities {
+    ALARM_PRIORITY_NONE    = 0,
+    ALARM_PRIORITY_LOW     = 1,
+    ALARM_PRIORITY_MEDIUM  = 2,
+    ALARM_PRIORITY_HIGH    = 3,
+};
+
+enum Alarm_User_Actions {
+    ALARM_USER_ACTION_RESUME           =   0,
+    ALARM_USER_ACTION_RINSEBACK        =   1,
+    ALARM_USER_ACTION_END_TREATMENT    =   2,
+    ALARM_USER_ACTION_ACK              =   3,
+    ALARM_USER_ACTION_TEMPOARY_BREAK   =   4,
+};
+
+enum Alarm_List {
+    ALARM_ID_NO_ALARM                     = 0,
+    ALARM_ID_TD_TREATMENT_STOPPED_BY_USER = 96,
+};
+
+enum Generic_Confirm_Id
+{
+    GENERIC_CONFIRM_ID_NONE                 = 0,
+    GENERIC_CONFIRM_ID_SHUT_DOWN            = 1,
+    GENERIC_CONFIRM_ID_TREATMENT_END        = 2,
+    GENERIC_CONFIRM_ID_RINSEBACK            = 3,
+    GENERIC_CONFIRM_ID_TEMPORARY_BREAK      = 4,
+};
+
+enum Generic_Confirm_Command
+{
+    GENERIC_CONFIRM_CMD_REQUEST_OPEN    = 0,
+    GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE   = 1,
+    GENERIC_CONFIRM_CMD_REJECT          = 2,
+    GENERIC_CONFIRM_CMD_ACCEPT_CLOSE    = 3,
+};
+
+enum Confirmation_Status
+{
+    CONFIRMATION_REQUEST_STATUS_REJECTED = 0,
+    CONFIRMATION_REQUEST_STATUS_ACCEPTED,
+    CONFIRMATION_REQUEST_STATUS_TIMEOUT,
+    CONFIRMATION_REQUEST_STATUS_PENDING,
+    CONFIRMATION_REQUEST_STATUS_UNUSED,
+};
+
+// Reject reason enums
 enum Reject_Reasons {
     REQUEST_REJECT_REASON_NONE                              = 0,
     REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE           = 4,
@@ -170,6 +244,7 @@
     REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS                 = 14,
     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_CONFIRMATION_NOT_EXPECTED         = 58,
     REQUEST_REJECT_REASON_CONFIRMATION_MISMATCH             = 59,
 };