Index: sources/view/hd/data/VHDOperationModeData.h
===================================================================
diff -u -r12e7b6dda53cf8db7707c7fa55dcf6137e7d6997 -r1da89b0452b8ef9448847618e75c118f3f58bd0c
--- sources/view/hd/data/VHDOperationModeData.h	(.../VHDOperationModeData.h)	(revision 12e7b6dda53cf8db7707c7fa55dcf6137e7d6997)
+++ sources/view/hd/data/VHDOperationModeData.h	(.../VHDOperationModeData.h)	(revision 1da89b0452b8ef9448847618e75c118f3f58bd0c)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file VHDOperationModeData.h
- * \author (last) Behrouz NematiPour
- * \date (last) 13-Aug-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 13-Aug-2020
+ * \file    VHDOperationModeData.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      28-Sep-2022
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  13-Aug-2020
  *
  */
 #pragma once
@@ -18,9 +18,9 @@
 #include <QObject>
 
 // Project
-#include "main.h" // Doxygen : don't remove
-#include "MModel.h"
+#include "main.h" // Doxygen : do not remove
 #include "VView.h"
+#include "MHDOperationModeData.h"
 #include "GuiGlobals.h"
 
 // namespace
@@ -38,15 +38,34 @@
 {
     Q_OBJECT
 
-    PROPERTY( quint32 , opMode , 0)
+    PROPERTY( quint32 , opMode                      ,     0 )
+    PROPERTY( quint32 , subMode                     ,     0 )
 
+    PROPERTY( bool    , fault                       , false ) ///< Fault mode
+    PROPERTY( bool    , service                     , false ) ///< Service mode
+    PROPERTY( bool    , init                        , false ) ///< Initialization & POST mode
+    PROPERTY( bool    , standby                     , false ) ///< Standby mode
+    PROPERTY( bool    , validateParameters          , false ) ///< Treatment Parameters mode
+    PROPERTY( bool    , preTreatment                , false ) ///< Pre-Treatment mode
+    PROPERTY( bool    , inTreatment                 , false ) ///< Treatment mode
+    PROPERTY( bool    , postTreatment               , false ) ///< Post-Treatment mode
+    PROPERTY( bool    , invalidMode                 , false ) ///< Not legal - an illegal mode transition occurred
+
+    // these are triggers but shall only be triggered when in standby mode.
+    PROPERTY( bool    , standbyStart                , false ) ///< Start standby                                     , STANDBY_START_STATE = 0
+    PROPERTY( bool    , standbyWaitTreatment        , false ) ///< Wait for treatment                                , STANDBY_WAIT_FOR_TREATMENT_STATE
+    PROPERTY( bool    , standbyWaitDisinfect        , false ) ///< Wait for disinfect                                , STANDBY_WAIT_FOR_DISINFECT_STATE
+
+    PROPERTY( bool    , home                        , false ) ///< Special Home mode // see in the cpp file.
+
+    PROPERTY( bool    , isTreatment                 , false )
+    PROPERTY( bool    , isManager                   , false )
+    PROPERTY( bool    , isSettings                  , false )
+
     Q_PROPERTY(QString text READ text NOTIFY opModeChanged)
 
     VIEW_DEC(VHDOperationMode, HDOperationModeData)
 
-private:
-    QString opModeText(GuiHDOpModes vEnum);
-
 public slots:
     QString text();
 };