Index: sources/StateController.h
===================================================================
diff -u -r8dec5fecad6d0be26c22a427ed60c08a9753563a -raf84a44034a877134a53b6b48b016d409f843380
--- sources/StateController.h	(.../StateController.h)	(revision 8dec5fecad6d0be26c22a427ed60c08a9753563a)
+++ sources/StateController.h	(.../StateController.h)	(revision af84a44034a877134a53b6b48b016d409f843380)
@@ -31,6 +31,9 @@
     // General defines
     #define UI_MSG_DD_STATUS_INDEX         4
     #define UI_MSG_BB_PAYLOAD_ID           0x63
+    #define COUNTER_VAR_DEFAULT_VALUE      -1
+    #define PRESC_TIME_DEFAULT_VALUE       -1
+    #define MINUTES_TO_SECONDS             60
 
     // Pre treatment defines
     #define DEFAULT_TIMEOUT_S              10
@@ -40,7 +43,6 @@
     #define IS_WAIT_NEEDED_INDEX           1
     #define NEXT_AUTO_TRANSITION_INDEX     2
     #define COUNT_DOWN_TIMER_INDEX         6
-    #define COUNTER_VAR_DEFAULT_VALUE      -1
 
     // Timer event defines
     #define QOBJECT_TIMER_TIMEOUT_MS       100
@@ -49,11 +51,12 @@
     #define NUM_OF_COUNTS_TO_BC_MSG        3
 
     // Treatment defines
-    #define DEFAULT_TX_PRESCRIBED_DUR_S    ((4 * 60) + 30) * 60
-    #define DEFAULT_TX_ELAPSED_TIME_S      (2 * 60) * 60
+    #define DEFAULT_TX_PRESCRIBED_DUR_S    ((4 * 60) + 30) * MINUTES_TO_SECONDS
+    #define DEFAULT_TX_ELAPSED_TIME_S      (2 * 60) * MINUTES_TO_SECONDS
     #define TIME_PRESCRIBED_S_INDEX        5
     #define TIME_ELAPSED_S_INDEX           6
     #define TIME_REMAINING_S_INDEX         7
+    #define DEFAULT_UF_VOLUME_L            2.0
 
     enum User_Command_ID {
         CMD_NONE               = -1,
@@ -84,6 +87,7 @@
     quint16 _timerBroadcastCount;
     bool _hasUserConfirmedToProceed;
     int _currentCounterValue;
+    int _prescribedTreatmentTimeS;
     User_Command_ID _dryDemoCurrentCmd;
     drydemoXMLstates _dryDemo;