Index: sources/drydemo/DryDemoDefines.h
===================================================================
diff -u -rbb80bbccaf1c911be48493868c18c656d84b2ec1 -rfb3e70cb47f3d22f31f68358c1bda69cce9cd248
--- sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision bb80bbccaf1c911be48493868c18c656d84b2ec1)
+++ sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision fb3e70cb47f3d22f31f68358c1bda69cce9cd248)
@@ -21,7 +21,7 @@
 #define DEFAULT_TIMEOUT_S              10
 #define QOBJECT_TIMER_TIMEOUT_MS       100
 #define PROGRESS_TIME_BC_INTERVAL_MS   1000
-#define PRORGESS_TIME_BC_QART_INT_MS   250
+#define PRORGESS_TIME_BC_QART_INT_MS   300
 #define NUM_OF_COUNTS_TIMER_BC_EMIT    (PROGRESS_TIME_BC_INTERVAL_MS / QOBJECT_TIMER_TIMEOUT_MS)
 #define NUN_OF_COUNTS_QART_BC_EMIT     (PRORGESS_TIME_BC_QART_INT_MS / QOBJECT_TIMER_TIMEOUT_MS)
 #define NUM_OF_COUNTS_TIMER_2_CONTROL  (PROGRESS_TIME_BC_INTERVAL_MS / QOBJECT_TIMER_TIMEOUT_MS)
@@ -108,11 +108,18 @@
 #define FLUID_BOLUS_START_CMD          1
 #define ENABLE_BOLUS                   1
 
+// Recirc defines
+#define RECIRC_TIMEOUT_MIN             30
+#define RECIRC_WARN_BEFORE_TIMEOUT_MIN 10
+
 // 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
+#define ALARM_REPLACE_ACID_PROPERTIES  112
+#define ALARM_RECIRC_WARN_PROPERTIES   112
+#define ALARM_RECIR_TIMEOUT_RPOPERTIES 26
 
 enum User_Command_ID {
     CMD_NONE               = -1,
@@ -144,8 +151,7 @@
     TREAT_DIALYSIS_PAUSED_STATE  = 9,
 };
 
-enum Blood_Prime_States
-{
+enum Blood_Prime_States {
     BLOOD_PRIME_RAMP_STATE         = 0,
     BLOOD_PRIME_RUN_STATE          = 1,
     BLOOD_PRIME_PAUSED_STATE       = 2,
@@ -173,8 +179,7 @@
     RINSEBACK_RUN_ADDITIONAL_STATE      = 4,
 };
 
-enum Requested_Rinseback_User_Actions
-{
+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,
@@ -192,15 +197,20 @@
     TREATMENT_RECIRC_RECONNECT_PATIENT_STATE    = 3,
 };
 
-enum Requested_Treatment_Recirc_User_Actions
-{
+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 Treatment_End_States {
+    TREATMENT_END_WAIT_FOR_RINSEBACK_STATE  = 0,
+    TREATMENT_END_PAUSED_STATE              = 1,
+    TREATMENT_END_FLUID_BOLUS_STATE         = 2,
+};
+
 enum State_Status {
     STATE_ON_ENTRY = 0,
     STATE_ON_ACTION,
@@ -230,11 +240,13 @@
 
 enum Alarm_List {
     ALARM_ID_NO_ALARM                     = 0,
+    ALARM_ID_TD_REPLACE_ACID_JUG          = 88,
     ALARM_ID_TD_TREATMENT_STOPPED_BY_USER = 96,
+    ALARM_ID_TD_RECIRC_TIMEOUT_WARNING    = 199,
+    ALARM_ID_TD_RECIRC_TIMEOUT            = 200,
 };
 
-enum Generic_Confirm_Id
-{
+enum Generic_Confirm_Id {
     GENERIC_CONFIRM_ID_NONE                 = 0,
     GENERIC_CONFIRM_ID_SHUT_DOWN            = 1,
     GENERIC_CONFIRM_ID_TREATMENT_END        = 2,
@@ -243,16 +255,14 @@
     NUM_OF_GENERIC_CONFIRM_IDS              = 5,
 };
 
-enum Generic_Confirm_Command
-{
+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
-{
+enum Confirmation_Status {
     CONFIRMATION_REQUEST_STATUS_REJECTED = 0,
     CONFIRMATION_REQUEST_STATUS_ACCEPTED,
     CONFIRMATION_REQUEST_STATUS_TIMEOUT,