Index: sources/main.h
===================================================================
diff -u -ra5c75192af33a9284e4b4886df0c337ba6fcc9f9 -rc30ee08fbc73ee5fcd54a7bf0e996eb6a067b7a7
--- sources/main.h	(.../main.h)	(revision a5c75192af33a9284e4b4886df0c337ba6fcc9f9)
+++ sources/main.h	(.../main.h)	(revision c30ee08fbc73ee5fcd54a7bf0e996eb6a067b7a7)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2019-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    main.h
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      08-Nov-2022
+ * \date    (last)      18-Jul-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  28-Oct-2019
  *
@@ -91,14 +91,19 @@
 extern bool       gDisableSDCFailLogStop    ;
 extern bool       gDisableCloudSyncFailStop ;
 
-extern bool       gEnableCheckInLog         ;
-extern bool       gEnableAcknowLog          ;
+extern bool       gDisableCheckInLog        ;
+extern bool       gDisableAcknowLog         ;
 
 extern bool       gConsoleoutLogs           ;
 extern bool       gConsoleoutFrameInterface ;
 extern bool       gConsoleoutCanInterface   ;
 
+extern bool       gEnableDryDemo            ;
+extern QString    gActiveCANBus             ;
+extern bool       gEnableManufacturing      ;
+extern bool       gUseRootHome              ;
 
+
 //--------------------------------------------------------------------------------//
 //--------------------------------------------------------------------------------//
 #define SKIPPER_DEF(X)                      \
@@ -120,6 +125,14 @@
     if ( !ok ) LOG_DEBUG("incorrect configuration value for " #vVARIABLE);                  \
 }
 //--------------------------------------------------------------------------------//
+#define FROMVARIANT_WITHRETURN(vVARIABLE, vGROUP, vKEY, vCONVERSION, vOVERALL_OK)           \
+{                                                                                           \
+    bool ok = false;                                                                        \
+    vVARIABLE( _Settings.value(mCategory, vGROUP, vKEY).to##vCONVERSION(&ok) );             \
+    if ( !ok ) LOG_DEBUG("incorrect configuration value for " #vVARIABLE);                  \
+    vOVERALL_OK = vOVERALL_OK && ok;                                                        \
+}
+//--------------------------------------------------------------------------------//
 #define PROPERTY_SLOT(          vTYPE ,    vVARIABLE )                  \
     protected :                                                         \
         /*! \brief   Property setter
@@ -299,14 +312,14 @@
 //--------------------------------------------------------------------------------//
 #define VALUESET(      vTYPE , vVARIABLE , vDEFVALUE            )       \
         PROPERTY(      vTYPE , vVARIABLE , vDEFVALUE            )       \
-        PROPERTY(       bool , vVARIABLE##Set  , false          )
+        PROPERTY(       bool , vVARIABLE##Set       , false     )
 //--------------------------------------------------------------------------------//
 #define RANGESET(      vTYPE , vVARIABLE      , vDEFVALUE       )       \
         READONLY(      vTYPE , vVARIABLE##Min , vDEFVALUE       )       \
         READONLY(      vTYPE , vVARIABLE##Max , vDEFVALUE       )       \
         READONLY(      vTYPE , vVARIABLE##Res , vDEFVALUE       )       \
-        READONLY(      vTYPE , vVARIABLE##Def , vDEFVALUE       )       \
-        READONLY(      vTYPE , vVARIABLE##Gap , vDEFVALUE       )
+        READONLY(      vTYPE , vVARIABLE##Def , vDEFVALUE       )
+
 //--------------------------------------------------------------------------------//
 #define CONSTANT(      vTYPE , vVARIABLE , vDEFVALUE            )       \
     /*! \brief   Qt Constant Property declaration