Index: cppcheck.err =================================================================== diff -u -r52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- cppcheck.err (.../cppcheck.err) (revision 52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775) +++ cppcheck.err (.../cppcheck.err) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -1,4 +1,4 @@ -02/06/2023 15:30 +02/08/2023 20:54 Behrouz NematiPour sources/storage/Logger.h:91:5: error: There is an unknown macro here somewhere. Configuration is required. If Q_ENUM is a macro then please configure it. [unknownMacro] Q_ENUM(LogType) Index: cppcheck.log =================================================================== diff -u -r52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- cppcheck.log (.../cppcheck.log) (revision 52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775) +++ cppcheck.log (.../cppcheck.log) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -1,4 +1,4 @@ -02/06/2023 15:30 +02/08/2023 20:54 Behrouz NematiPour Checking main.cpp ... Defines: @@ -24,7 +24,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -4/214 files checked 3% done +4/214 files checked 4% done Checking sources/MainTimer.cpp ... Defines: Undefines: @@ -174,7 +174,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -28/214 files checked 29% done +28/214 files checked 30% done Checking sources/model/dg/data/MDGAccelerometerData.cpp ... Defines: Undefines: @@ -216,7 +216,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -35/214 files checked 30% done +35/214 files checked 31% done Checking sources/model/dg/data/MDGOperationModeData.cpp ... Defines: Undefines: @@ -258,7 +258,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -42/214 files checked 31% done +42/214 files checked 32% done Checking sources/model/dg/data/post/MDGPostSingleResultData.cpp ... Defines: Undefines: @@ -354,7 +354,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -58/214 files checked 34% done +58/214 files checked 35% done Checking sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp ... Defines: Undefines: @@ -402,7 +402,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -66/214 files checked 35% done +66/214 files checked 36% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp ... Defines: Undefines: @@ -450,7 +450,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -74/214 files checked 36% done +74/214 files checked 37% done Checking sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp ... Defines: Undefines: @@ -486,7 +486,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -80/214 files checked 44% done +80/214 files checked 45% done Checking sources/model/hd/alarm/MAlarmStatusData.cpp ... Defines: Undefines: @@ -564,7 +564,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -93/214 files checked 46% done +93/214 files checked 47% done Checking sources/model/hd/data/post/MUIPostFinalResultHDRequest.cpp ... Defines: Undefines: @@ -606,7 +606,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -100/214 files checked 47% done +100/214 files checked 48% done Checking sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp ... Defines: Undefines: @@ -648,7 +648,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -107/214 files checked 48% done +107/214 files checked 49% done Checking sources/model/hd/data/treatment/MTreatmentSalineData.cpp ... Defines: Undefines: @@ -690,7 +690,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -114/214 files checked 49% done +114/214 files checked 50% done Checking sources/model/settings/MBluetooth.cpp ... Defines: Undefines: @@ -734,7 +734,7 @@ Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native Checking sources/storage/StorageGlobals.cpp: BUILD_FOR_TARGET... -121/214 files checked 54% done +121/214 files checked 55% done Checking sources/storage/TreatmentLog.cpp ... Defines: Undefines: @@ -772,7 +772,7 @@ Platform:Native Checking sources/view/VEventSpy.cpp: DEBUG_BCUFF_MIMIC... Checking sources/view/VEventSpy.cpp: SPY_MOUSE_EVENT... -127/214 files checked 57% done +127/214 files checked 58% done Checking sources/view/VGeneralEvent.cpp ... Defines: Undefines: @@ -826,7 +826,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -136/214 files checked 61% done +136/214 files checked 62% done Checking sources/view/dg/data/VDGOperationModeData.cpp ... Defines: Undefines: @@ -970,7 +970,7 @@ Undefines: Includes: -I.//sources/ -I.//sources/bluetooth/ -I.//sources/canbus/ -I.//sources/cloudsync/ -I.//sources/device/ -I.//sources/gui/ -I.//sources/model/ -I.//sources/storage/ -I.//sources/utility/ -I.//sources/view/ -I.//sources/wifi/ -I.//unittests/ Platform:Native -160/214 files checked 65% done +160/214 files checked 66% done Checking sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp ... Defines: Undefines: Index: denali.pro.user =================================================================== diff -u -r8b3412f64e23b66afa795a95ebc85107358e8070 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- denali.pro.user (.../denali.pro.user) (revision 8b3412f64e23b66afa795a95ebc85107358e8070) +++ denali.pro.user (.../denali.pro.user) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -459,16 +459,12 @@ RemoteLinux.DirectUploadStep /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali @@ -477,27 +473,33 @@ /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - 192.168.137.3 - 192.168.40.23 - 192.168.137.24 192.168.137.170 - 192.168.137.26 192.168.10.186 - 192.168.137.125 - 192.168.137.36 - 192.168.137.202 - 192.168.137.247 - 192.168.137.210 - 192.168.10.159 + 192.168.10.167 + 192.168.137.30 + 192.168.137.25 + 192.168.10.138 192.168.10.228 192.168.10.228 - 192.168.10.138 - 192.168.137.25 - 192.168.137.30 + 192.168.10.159 + 192.168.137.210 + 192.168.137.247 + 192.168.137.202 + 192.168.137.36 + 192.168.137.125 192.168.10.186 192.168.137.170 + 192.168.137.26 + 192.168.40.23 + 192.168.137.24 + 192.168.137.3 /home/root @@ -519,69 +521,73 @@ /home/root /home/root /home/root + /home/root /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots - 2023-02-02T02:40:56.627 - 2023-01-24T17:29:54.849 - 2023-02-02T02:05:29.947 + 2023-01-27T10:15:15.423 + 2023-01-18T17:47:08.797 + 2023-02-02T19:40:15.813 + 2023-02-02T02:30:48.337 + 2023-02-02T02:13:54.596 + 2023-02-02T09:06:00.862 + 2023-01-17T18:18:03.749 + 2023-01-17T18:06:25.579 + 2023-01-24T18:19:13.179 + 2023-02-02T01:52:20.307 + 2023-02-02T02:26:33.738 + 2023-02-02T01:46:50.167 + 2023-02-01T03:23:15.710 + 2023-02-02T02:07:25.922 + 2023-01-18T20:13:36.296 2023-01-27T09:45:11.898 2023-02-01T05:00:56.449 - 2023-01-18T20:13:36.296 - 2023-02-02T02:07:25.922 - 2023-02-01T03:23:15.710 - 2023-02-02T01:46:50.167 - 2023-02-02T02:26:33.738 - 2023-02-02T01:52:20.307 - 2023-01-24T18:19:13.179 - 2023-01-17T18:06:25.579 - 2023-01-17T18:18:03.749 - 2023-02-02T09:06:00.862 - 2023-02-02T02:13:54.596 - 2023-02-02T02:30:48.337 - 2023-01-18T17:47:08.797 - 2023-01-27T10:15:15.423 + 2023-01-24T17:29:54.849 + 2023-02-02T02:05:29.947 + 2023-02-02T02:40:56.627 - 2023-02-02T02:41:10.000 - 2023-01-24T17:30:03.000 - 2023-02-02T02:05:42.000 + 2023-01-27T10:15:08.000 + 2023-01-18T17:47:04.000 + 2023-02-02T19:39:36.000 + 2023-02-02T02:31:01.000 + 2023-02-02T02:14:08.000 + 2023-02-02T09:05:22.000 + 2023-01-17T18:17:25.000 + 2023-01-17T18:05:42.000 + 2023-01-24T18:18:58.000 + 2023-02-02T01:52:16.000 + 2023-02-02T02:26:46.000 + 2023-02-02T01:47:02.000 + 2023-02-01T03:23:28.000 + 2023-02-02T02:07:21.000 + 2023-01-18T20:13:33.000 2023-01-27T09:44:58.000 2023-02-01T05:00:51.000 - 2023-01-18T20:13:33.000 - 2023-02-02T02:07:21.000 - 2023-02-01T03:23:28.000 - 2023-02-02T01:47:02.000 - 2023-02-02T02:26:46.000 - 2023-02-02T01:52:16.000 - 2023-01-24T18:18:58.000 - 2023-01-17T18:05:42.000 - 2023-01-17T18:17:25.000 - 2023-02-02T09:05:22.000 - 2023-02-02T02:14:08.000 - 2023-02-02T02:31:01.000 - 2023-01-18T17:47:04.000 - 2023-01-27T10:15:08.000 + 2023-01-24T17:30:03.000 + 2023-02-02T02:05:42.000 + 2023-02-02T02:41:10.000 2 Index: en_US.udic =================================================================== diff -u -rfde18b0e9684a491bdef054b9057159ca36afad7 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- en_US.udic (.../en_US.udic) (revision fde18b0e9684a491bdef054b9057159ca36afad7) +++ en_US.udic (.../en_US.udic) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -212,3 +212,4 @@ txr nd pre +vcan Index: main.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- main.cpp (.../main.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ main.cpp (.../main.cpp) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -97,6 +97,11 @@ bool gConsoleoutFrameInterface = false ; bool gConsoleoutCanInterface = false ; +bool gBypassFault = false ; +bool gEnableDryDemo = false ; +QString gActiveCANBus = "can0"; + + /*! * \page CommandLineSwitches Denali Command Line Switches * \verbatim @@ -231,7 +236,22 @@ QCoreApplication::translate("main", "Enables Acknowledgment Log")); parser.addOption(optionEnableAcknowLog); + // --- -D : enable-dry-demo + QCommandLineOption optionEnableDryDemo(QStringList() << "D" << "enable-dry-demo", + QCoreApplication::translate("main", "Enables Dry-Demo Mode")); + parser.addOption(optionEnableDryDemo); + // --- -A : active-can-bus + QCommandLineOption optionActiveCANBus(QStringList() << "A" << "active-can-bus", + QCoreApplication::translate("main", "Sets the Active CANBus [Shall start with 'can' or 'vcan]"), + QCoreApplication::translate("main", "CANBus")); + parser.addOption(optionActiveCANBus); + + // --- -F : disable-fault-screen + QCommandLineOption optionBypassFault(QStringList() << "F" << "disable-fault-screen", + QCoreApplication::translate("main", "Enables UI to navigate to Home/Standby on fault")); + parser.addOption(optionBypassFault); + // --- parse command lines parser.process(*qApp); @@ -248,6 +268,17 @@ gEnableCheckInLog = parser.isSet(optionEnableCheckInLog ); gEnableAcknowLog = parser.isSet(optionEnableAcknowLog ); + gBypassFault = parser.isSet(optionBypassFault ); + gEnableDryDemo = parser.isSet(optionEnableDryDemo ); + + if ( parser.isSet(optionActiveCANBus ) ) { + QString value = parser.value(optionActiveCANBus); + if ( ! value.startsWith("-") && // if a value is not given for the switch then the next switch becomes the value of the previous one + ( value.startsWith("can") || value.startsWith("vcan") ) ) { // to be more precise + gActiveCANBus = value; + } + } + if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true; bool ok = false; Index: sources/canbus/CanInterface.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- sources/canbus/CanInterface.h (.../CanInterface.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/canbus/CanInterface.h (.../CanInterface.h) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -54,7 +54,7 @@ // constants const char *_canType = "socketcan"; - QString _canInterface = "can0"; + QString _canInterface = gActiveCANBus; // can0 by default, can be altered by -A(--active-can-bus) const int _canBitRate = 250000; // member variables Index: sources/gui/GuiView.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- sources/gui/GuiView.h (.../GuiView.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/GuiView.h (.../GuiView.h) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -78,6 +78,9 @@ PROPERTY(GuiStringIndexMap , exportList , {}) READONLY(GuiUint08IndexMap , exportListPercent , {}) + READONLY(bool , dryDemoMode , gEnableDryDemo ) + READONLY(bool , bypassFault , gBypassFault ) + public: explicit GuiView(QObject *parent = nullptr); Index: sources/gui/qml/PowerItem.qml =================================================================== diff -u -r86947a85f063efd28680ec590cdcf8855f8f6881 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision 86947a85f063efd28680ec590cdcf8855f8f6881) +++ sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -21,9 +21,6 @@ import Gui.View 0.1 import Gui.Actions 0.1 -// Confirm -import VConfirm 0.1 - // Qml imports import "qrc:/globals" import "qrc:/components" @@ -38,7 +35,6 @@ property bool isOpen: false - VConfirm { id: vConfirm } AutoHideInfo { id: _autoHideInfo } PowerOff { id: _powerOffDialog Index: sources/gui/qml/main.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- sources/gui/qml/main.qml (.../main.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/main.qml (.../main.qml) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -110,6 +110,9 @@ // Disinfection import VDisinfectAdjustDisinfect 0.1 +// Confirm +import VConfirm 0.1 + // Qml imports import "qrc:/globals" import "qrc:/pages" @@ -125,6 +128,8 @@ width : Variables.applicationWidth height: Variables.applicationHeight + VConfirm { id: vConfirm } + VHDPOSTData { id: vHDPOSTData } VDGPOSTData { id: vDGPOSTData } @@ -345,7 +350,16 @@ SDCProgressItem { id: _sdcProgressItem // TODO: disable this later. this is only for diagnostic purpose. onDoubleClicked : { - _diagnosticsDialog.open() + if ( _GuiView.dryDemoMode ) { + let dryDemoTempID = 99 + let id = vConfirm.id + vConfirm.id = dryDemoTempID + vConfirm.doConfirm( true ) + vConfirm.id = id + } + else { + _diagnosticsDialog.open() + } } } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -146,7 +146,9 @@ function onIsManagerChanged ( vValue ) { if( vValue ) _mainMenu.isManager () } function onIsSettingsChanged ( vValue ) { if( vValue ) _mainMenu.isSettings () } - function onFaultChanged ( vValue ) { page( _faultModeScreen , vValue && ! vSettings.noCANBus )} + function onFaultChanged ( vValue ) { page( _GuiView.bypassFault ? // If the -F (disable-fault-screen) set in CLI, + _mainHome : // go to home/standby screen + _faultModeScreen , vValue && ! vSettings.noCANBus )} function onServiceChanged ( vValue ) { page( _serviceModeScreen , vValue )} function onInitChanged ( vValue ) { page( _postModeScreen , vValue && ! vSettings.noCANBus ) if( vValue ) vHDPOSTData.reset() // better to reset on vinit = true because the rest makes the screen animation to run Index: sources/main.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- sources/main.h (.../main.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/main.h (.../main.h) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -98,6 +98,9 @@ extern bool gConsoleoutFrameInterface ; extern bool gConsoleoutCanInterface ; +extern bool gBypassFault ; +extern bool gEnableDryDemo ; +extern QString gActiveCANBus ; //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775 -re5bfc98faab0d165beb1d6f1eda32cceb06dbe20 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 52b9edb89c70c90d29ad4f6b3cd13b5cec3ce775) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision e5bfc98faab0d165beb1d6f1eda32cceb06dbe20) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 06-Feb-2023 + * \date (last) 08-Feb-2023 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 *