Index: sources/main.h =================================================================== diff -u -rd3412ddbb51dca3768ce29182d331e5274e9e745 -rc30ee08fbc73ee5fcd54a7bf0e996eb6a067b7a7 --- sources/main.h (.../main.h) (revision d3412ddbb51dca3768ce29182d331e5274e9e745) +++ sources/main.h (.../main.h) (revision c30ee08fbc73ee5fcd54a7bf0e996eb6a067b7a7) @@ -7,7 +7,7 @@ * * \file main.h * \author (last) Behrouz NematiPour - * \date (last) 10-Feb-2023 + * \date (last) 18-Jul-2023 * \author (original) Behrouz NematiPour * \date (original) 28-Oct-2019 * @@ -91,16 +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) \ @@ -122,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 @@ -301,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