Index: sources/drydemo/DryDemoDefines.h
===================================================================
diff -u -rc52253ab5fc73e9b59d9cd99eada3d526d799987 -r38521851fd3271aa9a8965067d15daaba0db4b2e
--- sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision c52253ab5fc73e9b59d9cd99eada3d526d799987)
+++ sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision 38521851fd3271aa9a8965067d15daaba0db4b2e)
@@ -1,6 +1,5 @@
 #pragma once
 
-// TODO REMOVE
 // General defines
 #define UI_MSG_BB_STATUS_INDEX         4
 #define UI_MSG_BB_PAYLOAD_ID           0x63
@@ -13,7 +12,6 @@
 #define ACCEPT_VALUE                   1
 #define REJECT_VALUE                   0
 #define NEARLY_ZERO                    0.00000001
-#define PASS_RESULT                    1  // TODO remove
 #define DEVICE_ID                      1234
 #define UI_CONFIRM_RESP_TIMOUT_MS      (SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
 #define RCVD_MSG_MSG_ID_INDEX          0
@@ -60,14 +58,25 @@
 #define DEF_TX_DIASTOLIC_PRESSURE                   80
 #define DEF_TX_HEART_BEAT                           100
 
-// Arterial /Venous limits
+// Arterial /Venous limits & Baro
+#define DEF_BARO_PRES_PSI               14.2
+#define DEF_ART_LONG_FILT_PRES_MMHG     0.0
+#define DEF_VEN_LONG_FILT_PRES_MMHG     0.0
+#define DEF_TMP_LONG_FILT_PRES_MMHG     0.0
 #define MIN_ART_PRES_LIMIT_MMHG        -300.0
 #define MAX_ART_PRES_LIMIT_MMHG         100.0
 #define MIN_VEN_PRES_LIMIT_MMHG         20.0
 #define MAX_VEN_PRES_LIMIT_MMHG         400.0
-#define MAX_TMP_PRES_LIMIT_MMHG         100.0
 #define MIN_TMP_PRES_LIMIT_MMHG        -500.0
-#define OCCLUSION_STABLE_TIME_COUNT     (10 * MILLISECONDS_PER_SECOND) / QOBJECT_TIMER_TIMEOUT_MS
+#define MAX_TMP_PRES_LIMIT_MMHG         100.0
+#define SHORT_MOVING_AVG_SIZE           MILLISECONDS_PER_SECOND / QOBJECT_TIMER_TIMEOUT_MS
+#define PRES_LIMIT_SHORT_STABE_TIME_MS  (10 * MILLISECONDS_PER_SECOND)
+#define PRES_LIMIT_STABE_TIME_MS        (60 * MILLISECONDS_PER_SECOND)
+#define PRES_LIMIT_RESTABILIZE_TIME_MS  (15 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
+#define ART_PRES_LIMIT_WINDOW_MMHG      50
+#define VEN_PRES_LIMIT_WINDOW_MMHG      50
+#define VEN_PRES_LIMIT_ASYMM_MMHG       35
+#define TMP_PRES_LIMIT_WINDOW_MMHG      20
 
 // Initiate treatment
 #define INITIATE_TREATMENT             1
@@ -213,6 +222,21 @@
     TREATMENT_END_FLUID_BOLUS_STATE         = 2,
 };
 
+// Pressure limits
+enum Pressure_Limits_States {
+    PRESSURE_LIMITS_STATE_OFF               = 0,
+    PRESSURE_LIMITS_STATE_IDLE              = 1,
+    PRESSURE_LIMITS_STATE_WIDE              = 2,
+    PRESSURE_LIMITS_STATE_STABILIZATION     = 3,
+    PRESSURE_LIMITS_STATE_STABLE            = 4,
+};
+
+enum Pressure_Stabilization_Periods {
+    STABILIZATION_PERIOD_OFF                = 0,
+    USE_SHORT_STABILIZATION_PERIOD          = 1,
+    USE_NORMAL_STABILIZATION_PERIOD         = 2,
+};
+
 enum State_Status {
     STATE_ON_ENTRY = 0,
     STATE_ON_ACTION,
@@ -233,11 +257,11 @@
 };
 
 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,
+    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 {