Index: sources/drydemo/DryDemoDefines.h
===================================================================
diff -u -r6c0428ed8c6430924d54d5a42c45c8ec0c16c7c2 -r4624d7657d342248336c1ff16edfae614c335728
--- sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision 6c0428ed8c6430924d54d5a42c45c8ec0c16c7c2)
+++ sources/drydemo/DryDemoDefines.h	(.../DryDemoDefines.h)	(revision 4624d7657d342248336c1ff16edfae614c335728)
@@ -3,8 +3,6 @@
 // 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
@@ -13,7 +11,7 @@
 #define REJECT_VALUE                   0
 #define NEARLY_ZERO                    0.00000001
 #define ONE_HUNDRED_PCT                100
-#define UI_CONFIRM_RESP_TIMOUT_MS      (SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
+#define UI_CONFIRM_RESP_TIMOUT_MS      (1 * SECONDS_PER_MINUTE * MILLISECONDS_PER_SECOND)
 #define RCVD_MSG_PAYLOAD_MIN_LEN       3
 #define RCVD_MSG_SQNC_MIN_LEN          2
 #define RCVD_MSG_MSG_ID_INDEX          0
@@ -24,9 +22,9 @@
 #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   300
+#define PRORGESS_TIME_BC_QUICK_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 NUN_OF_COUNTS_QUICK_BC_EMIT    (PRORGESS_TIME_BC_QUICK_INT_MS / QOBJECT_TIMER_TIMEOUT_MS)
 #define NUM_OF_COUNTS_TIMER_2_CONTROL  (PROGRESS_TIME_BC_INTERVAL_MS / QOBJECT_TIMER_TIMEOUT_MS)
 
 // Treatment params
@@ -134,6 +132,7 @@
 #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