Index: sources/StateController.h
===================================================================
diff -u -r1ac0482d2e0a0baf9d9d7eb7f1223458bd3eced5 -r8dec5fecad6d0be26c22a427ed60c08a9753563a
--- sources/StateController.h	(.../StateController.h)	(revision 1ac0482d2e0a0baf9d9d7eb7f1223458bd3eced5)
+++ sources/StateController.h	(.../StateController.h)	(revision 8dec5fecad6d0be26c22a427ed60c08a9753563a)
@@ -28,6 +28,10 @@
     void timerEvent(QTimerEvent *) override;
 
 private:
+    // General defines
+    #define UI_MSG_DD_STATUS_INDEX         4
+    #define UI_MSG_BB_PAYLOAD_ID           0x63
+
     // Pre treatment defines
     #define DEFAULT_TIMEOUT_S              10
     #define TRANSITION_EVENT_INDEX         0
@@ -36,7 +40,6 @@
     #define IS_WAIT_NEEDED_INDEX           1
     #define NEXT_AUTO_TRANSITION_INDEX     2
     #define COUNT_DOWN_TIMER_INDEX         6
-    #define UI_MSG_BB_PAYLOAD_ID           0x63
     #define COUNTER_VAR_DEFAULT_VALUE      -1
 
     // Timer event defines
@@ -53,18 +56,19 @@
     #define TIME_REMAINING_S_INDEX         7
 
     enum User_Command_ID {
-        CMD_NONE      = -1,
-        CMD_TX_PARAMS = 0 ,
-        CMD_WATER_SAMPLE,
-        CMD_CONSUMABLES,
-        CMD_DISPOSABLES,
-        CMD_SYSTEM_PRIME,
-        CMD_BP_HR,
-        CMD_ULTRAFILTRATION,
-        CMD_CONNECTION,
-        CMD_START_TX,
-        CMD_END_TX,
-        CMD_DISINFECTION,
+        CMD_NONE               = -1,
+        CMD_TX_PARAMS          = 0 ,
+        CMD_WATER_SAMPLE       = 1,
+        CMD_CONSUMABLES        = 2,
+        CMD_DISPOSABLES        = 3,
+        CMD_SYSTEM_PRIME       = 4,
+        CMD_BP_HR              = 5,
+        CMD_ULTRAFILTRATION    = 6,
+        CMD_CONNECTION         = 7,
+        CMD_START_TX           = 8,
+        CMD_END_TX             = 9,
+        CMD_DISINFECTION       = 10,
+        NUM_OF_USER_CMDS,
     };
 
     enum Counter_Type {