Index: drydemo.pro =================================================================== diff -u -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec -rc0b30f1fa82d0121706351057ab52b3bb1141459 --- drydemo.pro (.../drydemo.pro) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) +++ drydemo.pro (.../drydemo.pro) (revision c0b30f1fa82d0121706351057ab52b3bb1141459) @@ -1,10 +1,17 @@ -QT += qml quick serialbus concurrent charts bluetooth scxml # TODO clean up +QT += qml quick serialbus concurrent charts bluetooth scxml CONFIG += c++17 warn_on # CONFIG += disable-desktop # QMAKE_CXX = clazy QMAKE_CXXFLAGS += -Wall -Werror -Wextra -Wimplicit-fallthrough=3 # -save-temps # see .ii # -Wpedantic -Wconversion -Wshadow # these can't always be used, since it gives errors in Qt library. +# Leahi Digi Board +DEFINES += LEAHI_DIGI_BOARD + +TRANSLATIONS += \ + resources/translations/translation_es.ts \ + resources/translations/translation_de.ts + #CONFIG += disable_crc disable_crc { message( *** IMPORTANT : DISABLED CRC CHECK *** ) @@ -44,80 +51,33 @@ #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 INCLUDEPATH += \ - common \ sources \ - sources/device \ sources/storage \ - sources/gui \ sources/canbus \ sources/utility \ - sources/wifi \ - sources/bluetooth \ - sources/cloudsync \ sources/abstract \ sources/model \ - sources/model/confirm \ sources/model/settings \ - sources/model/ui/data \ - sources/model/hd/adjustment \ - sources/model/hd/adjustment/disinfect \ - sources/model/hd/adjustment/settings \ - sources/model/hd/adjustment/pretreatment \ - sources/model/hd/adjustment/treatment \ - sources/model/hd/adjustment/posttreatment \ - sources/model/hd/alarm \ - sources/model/hd/data \ - sources/model/hd/data/post \ - sources/model/hd/data/pretreatment \ - sources/model/hd/data/treatment \ - sources/model/hd/data/posttreatment \ - sources/model/hd/data/treatmentlog \ - sources/model/dg/data \ - sources/model/dg/data/post \ - sources/model/dg/data/pretreatment \ - sources/model/dg/data/disinfect \ - sources/model/dg/adjustment \ - sources/model/dg/adjustment/settings \ - sources/view \ - sources/view/confirm \ - sources/view/settings \ - sources/view/pretreatment \ - sources/view/ui/data \ - sources/view/hd/adjustment/common \ - sources/view/hd/adjustment \ - sources/view/hd/adjustment/pretreatment \ - sources/view/hd/adjustment/treatment \ - sources/view/hd/adjustment/posttreatment \ - sources/view/hd/adjustment/disinfect \ - sources/view/hd/alarm \ - sources/view/hd/data \ - sources/view/hd/data/post \ - sources/view/hd/data/pretreatment \ - sources/view/hd/data/treatment \ - sources/view/hd/data/posttreatment \ - sources/view/dg/data \ - sources/view/dg/data/post \ - sources/view/dg/data/pretreatment \ - sources/view/dg/data/disinfect HEADERS += \ \ # common - common/AlarmDefs.h \ - common/Compatible.h \ - common/DGDefs.h \ - common/HDDefs.h \ - common/MsgDefs.h \ \ # Main sources/main.h \ sources/Threads.h \ sources/MainTimer.h \ + sources/ApplicationPost.h \ # TODO clean up \ # Controllers + sources/ApplicationController.h \ + sources/storage/Settings.h \ + \ # sources/storage/TreatmentLog.h # TODO is this needed? \ # ---------- Models ---------- - sources/model/MAbstract.h \ - sources/model/MAbstractDynamic.h \ + \ # sources/model/MModel.h # TODO is this needed? + sources/model/MAbstract.h \ # TODO is this needed? + \ # sources/model/MAbstractDynamic.h # TODO is this needed? \ # ---------- Models - confirm \ # ---------- Models - POST \ # ---------- Models - settings + sources/model/settings/MSettings.h \ \ # ---------- Models - Alarm \ # ---------- Models - States Data \ # ---------- Models - HD - Adjustment @@ -139,6 +99,7 @@ sources/canbus/CanInterface.h \ sources/canbus/FrameInterface.h \ \ # Denali Message + sources/canbus/MessageGlobals.h \ sources/canbus/MessageAcknowModel.h \ sources/canbus/MessageBuilder.h \ sources/canbus/MessageInterpreter.h \ @@ -164,6 +125,9 @@ \ # ---------- Views - DG - States \ # ---------- Views - DG - Data \ # Storage + sources/storage/StorageGlobals.h \ + sources/storage/Logger.h \ + sources/storage/FileHandler.h \ \ # Utility sources/utility/crc.h \ sources/utility/format.h \ @@ -177,13 +141,16 @@ main.cpp \ sources/Threads.cpp \ sources/MainTimer.cpp \ + sources/ApplicationPost.cpp \ \ # Controllers + sources/ApplicationController.cpp \ + sources/storage/Settings.cpp \ \ # ---------- Models ---------- sources/model/MAbstract.cpp \ - sources/model/MAbstractDynamic.cpp \ \ # ---------- Models - CONFIRM \ # ---------- Models - POST \ # ---------- Models - settings + sources/model/settings/MSettings.cpp \ \ # ---------- Models - Alarm \ # ---------- Models - Data - States \ # ---------- Models - HD - Adjustment @@ -232,6 +199,9 @@ \ # ---------- Views - DG - States \ # ---------- Views - DG - Data \ # Storage + sources/storage/StorageGlobals.cpp \ + sources/storage/FileHandler.cpp \ + sources/storage/Logger.cpp \ \ # Utility sources/utility/crc.cpp \ sources/utility/format.cpp \ @@ -240,7 +210,7 @@ sources/utility/qrcodegen.cpp RESOURCES += \ - #drydemo.qrc + # This could be drydemo.qrc but not needed DEFINES += \ VER_MAJOR="\\\"${majorVersion}\\\"" \ @@ -251,134 +221,6 @@ VER_APPLY=\\\"$$system( touch -m main.cpp )\\\" \ VER_BRANCH=\\\"$$system( git rev-parse --abbrev-ref HEAD )\\\" -CodeCoverage { - message(Building with Squish Coco) - COVERAGE_OPTIONS += --cs-qt4 - COVERAGE_OPTIONS += --cs-exclude-path=build=testunits - COVERAGE_OPTIONS += --cs-exclude-file-regex=ui_.* - COVERAGE_OPTIONS += --cs-exclude-file-regex=moc_.* - COVERAGE_OPTIONS += --cs-exclude-file-regex=main.cpp - COVERAGE_OPTIONS += --cs-exclude-file-regex=qmlcache* - COVERAGE_OPTIONS += --cs-exclude-file-regex=tst_* - - QMAKE_CFLAGS += $$COVERAGE_OPTIONS - QMAKE_CXXFLAGS += $$COVERAGE_OPTIONS - QMAKE_LFLAGS += $$COVERAGE_OPTIONS - DEFINES += SQUISH_COCO_BULD -} - -tst_canbus { - message(Building with QtTest test case canbus) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_canbus.h\\\" \ - TEST_CLASS_NAME=tst_canbus - HEADERS += \ - unittests/tst_canbus.h - SOURCES += \ - unittests/tst_canbus.cpp -} - -tst_logging { - message(Building with QtTest test case logging) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_logging.h\\\" \ - TEST_CLASS_NAME=tst_logging - HEADERS += \ - unittests/tst_logging.h - SOURCES += \ - unittests/tst_logging.cpp -} - -tst_utilities { - message(Building with QtTest test case utilities) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_utilities.h\\\" \ - TEST_CLASS_NAME=tst_utilities - HEADERS += \ - unittests/tst_utilities.h - SOURCES += \ - unittests/tst_utilities.cpp -} - -tst_acknow { - message(Building with QtTest test case acknow) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_acknow.h\\\" \ - TEST_CLASS_NAME=tst_acknow - HEADERS += \ - unittests/tst_acknow.h - SOURCES += \ - unittests/tst_acknow.cpp -} - -tst_models { - message(Building with QtTest test case models) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_models.h\\\" \ - TEST_CLASS_NAME=tst_models - HEADERS += \ - unittests/tst_models.h - SOURCES += \ - unittests/tst_models.cpp -} - -tst_views { - message(Building with QtTest test case views) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_views.h\\\" \ - TEST_CLASS_NAME=tst_views - HEADERS += \ - unittests/tst_views.h - SOURCES += \ - unittests/tst_views.cpp -} - -tst_initializations { - message(Building with QtTest test case initializations) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_initializations.h\\\" \ - TEST_CLASS_NAME=tst_initializations - HEADERS += unittests/tst_initializations.h - SOURCES += unittests/tst_initializations.cpp -} - -tst_threads { - message(Building with QtTest test case threads) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_threads.h\\\" \ - TEST_CLASS_NAME=tst_threads - HEADERS += unittests/tst_threads.h - SOURCES += unittests/tst_threads.cpp -} - -tst_messaging { - message(Building with QtTest test case messaging) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_messaging.h\\\" \ - TEST_CLASS_NAME=tst_messaging - HEADERS += unittests/tst_messaging.h - SOURCES += unittests/tst_messaging.cpp -} - -tst_fileHandler { - message(Building with QtTest test case fileHandler) - QT += testlib - DEFINES += UNIT_TEST \ - TEST_CLASS_INCLUDE=\\\"unittests/tst_fileHandler.h\\\" \ - TEST_CLASS_NAME=tst_fileHandler - HEADERS += unittests/tst_fileHandler.h - SOURCES += unittests/tst_fileHandler.cpp -} - # Additional import path used to resolve QML modules in Qt Creator's code model QML_IMPORT_PATH = Index: drydemo.pro.user =================================================================== diff -u -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec -rc0b30f1fa82d0121706351057ab52b3bb1141459 --- drydemo.pro.user (.../drydemo.pro.user) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) +++ drydemo.pro.user (.../drydemo.pro.user) (revision c0b30f1fa82d0121706351057ab52b3bb1141459) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -60,16 +60,33 @@ ProjectExplorer.Project.PluginSettings + + true + false + true + true + true + true + + false + + + 0 + true true true Builtin.DefaultTidyAndClazy - 2 + 1 true + + true + + @@ -84,20 +101,35 @@ 0 0 - /home/denali/Projects/drydemo/../build-drydemo-Desktop_Qt_5_15_10_GCC_64bit-Debug - /home/denali/Projects/build-drydemo-Desktop_Qt_5_15_10_GCC_64bit-Debug + /home/denali/Projects/tmp/build/drydemo-Qt_5_15_10_GCC-Debug + /home/denali/Projects/tmp/build/drydemo-Qt_5_15_10_GCC-Debug true + "" 0 + /home/denali/Projects/application/imake.sh + %{sourceDir} + ProjectExplorer.ProcessStep + + + true QtProjectManager.QMakeBuildStep false - + true Qt4ProjectManager.MakeStep - 2 + + true + -b --tag denali >> denali + + sha256sum + %{buildDir} + ProjectExplorer.ProcessStep + + 4 Build Build ProjectExplorer.BuildSteps.Build @@ -121,22 +153,37 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 + 0 - /home/denali/Projects/drydemo/../build-drydemo-Desktop_Qt_5_15_10_GCC_64bit-Release - /home/denali/Projects/build-drydemo-Desktop_Qt_5_15_10_GCC_64bit-Release + /home/denali/Projects/tmp/build/drydemo-Qt_5_15_10_GCC-Release + /home/denali/Projects/tmp/build/drydemo-Qt_5_15_10_GCC-Release true + /home/denali/Projects/application/imake.sh + %{sourceDir} + ProjectExplorer.ProcessStep + + + true QtProjectManager.QMakeBuildStep false - + true Qt4ProjectManager.MakeStep - 2 + + true + -b --tag denali >> denali + + sha256sum + %{buildDir} + ProjectExplorer.ProcessStep + + 4 Build Build ProjectExplorer.BuildSteps.Build @@ -164,8 +211,8 @@ 0 - /home/denali/Projects/drydemo/../build-drydemo-Desktop_Qt_5_15_10_GCC_64bit-Profile - /home/denali/Projects/build-drydemo-Desktop_Qt_5_15_10_GCC_64bit-Profile + /home/denali/Projects/tmp/build/drydemo-Qt_5_15_10_GCC-Profile + /home/denali/Projects/tmp/build/drydemo-Qt_5_15_10_GCC-Profile true @@ -225,21 +272,364 @@ 2 + drydemo2 Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/drydemo/drydemo.pro /home/denali/Projects/drydemo/drydemo.pro + -L false true true false true - /home/denali/Projects/build-drydemo-Desktop_Qt_5_15_10_GCC_64bit-Debug + /home/denali/Projects/tmp/build/drydemo-Qt_5_15_10_GCC-Debug 1 + ProjectExplorer.Project.Target.1 + + GenericLinuxOsType + Qt 5.15.10 (iMX8) + Qt 5.15.10 (iMX8) + {ada4083c-13b6-4ac8-a486-71ff00b060da} + 1 + 0 + 0 + + 0 + /home/denali/Projects/tmp/build/leahi-Qt_5_15_10_iMX8-Debug + /home/denali/Projects/tmp/build/leahi-Qt_5_15_10_iMX8-Debug + + + true + /home/denali/Projects/application/imake.sh + %{sourceDir} + ProjectExplorer.ProcessStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + + true + -b --tag denali >> denali + sha256sum + %{buildDir} + ProjectExplorer.ProcessStep + + 4 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + 0 + + + /home/denali/Projects/tmp/build/leahi-Qt_5_15_10_iMX8-Release + /home/denali/Projects/tmp/build/leahi-Qt_5_15_10_iMX8-Release + + + true + 0 0 + /home/denali/Projects/application/imake.sh + %{sourceDir} + ProjectExplorer.ProcessStep + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + + true + -b --tag denali >> denali + sha256sum + %{buildDir} + ProjectExplorer.ProcessStep + + 4 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + -L + + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + + + 0 + /home/denali/Projects/tmp/build/leahi-Qt_5_15_10_iMX8-Profile + /home/denali/Projects/tmp/build/leahi-Qt_5_15_10_iMX8-Profile + + + true + QtProjectManager.QMakeBuildStep + false + + + + true + Qt4ProjectManager.MakeStep + + 2 + Build + Build + ProjectExplorer.BuildSteps.Build + + + + true + Qt4ProjectManager.MakeStep + clean + + 1 + Clean + Clean + ProjectExplorer.BuildSteps.Clean + + 2 + false + + false + + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + 0 + 0 + + 3 + + + + true + RemoteLinux.KillAppStep + + + + + + + + + true + 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-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 + /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-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 + + + 192.168.137.25 + 192.168.137.30 + 192.168.10.186 + 192.168.10.167 + 192.168.137.170 + 192.168.137.210 + 192.168.10.159 + 192.168.10.228 + 192.168.10.228 + 192.168.10.138 + 192.168.137.36 + 192.168.137.125 + 192.168.137.202 + 192.168.137.247 + 192.168.137.3 + 192.168.137.24 + 192.168.40.23 + 192.168.137.26 + 192.168.137.170 + 192.168.10.186 + + + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + /home/root + + + /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 + /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 + /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots + + + 2023-02-02T02:13:54.596 + 2023-02-02T02:30:48.337 + 2023-01-18T17:47:08.797 + 2023-02-02T19:40:15.813 + 2023-01-27T10:15:15.423 + 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-01T03:23:15.710 + 2023-02-02T02:07:25.922 + 2023-02-02T01:46:50.167 + 2023-02-02T02:26:33.738 + 2023-02-02T02:40:56.627 + 2023-02-02T02:05:29.947 + 2023-01-24T17:29:54.849 + 2023-02-01T05:00:56.449 + 2023-01-27T09:45:11.898 + 2023-01-18T20:13:36.296 + + + 2023-02-02T02:14:08.000 + 2023-02-02T02:31:01.000 + 2023-01-18T17:47:04.000 + 2023-02-02T19:39:36.000 + 2023-01-27T10:15:08.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-01T03:23:28.000 + 2023-02-02T02:07:21.000 + 2023-02-02T01:47:02.000 + 2023-02-02T02:26:46.000 + 2023-02-02T02:41:10.000 + 2023-02-02T02:05:42.000 + 2023-01-24T17:30:03.000 + 2023-02-01T05:00:51.000 + 2023-01-27T09:44:58.000 + 2023-01-18T20:13:33.000 + + + 2 + Deploy + Deploy + ProjectExplorer.BuildSteps.Deploy + + 1 + + false + DeployToGenericLinux + + 1 + + true + true + true + + 1 + + leahi (on %{Device:Name}) + RemoteLinuxRunConfiguration:/home/denali/Projects/application/leahi.pro + /home/denali/Projects/application/leahi.pro + 1 + false + true + false + true + :0 + + 1 + + + ProjectExplorer.Project.TargetCount - 1 + 2 ProjectExplorer.Project.Updater.FileVersion Index: drydemo.qrc =================================================================== diff -u -r581c95962cdb9ce7728e8def1e51556548d02244 -rc0b30f1fa82d0121706351057ab52b3bb1141459 --- drydemo.qrc (.../drydemo.qrc) (revision 581c95962cdb9ce7728e8def1e51556548d02244) +++ drydemo.qrc (.../drydemo.qrc) (revision c0b30f1fa82d0121706351057ab52b3bb1141459) @@ -26,6 +26,7 @@ sources/gui/qml/pages/settings/SettingsFactoryReset.qml sources/gui/qml/pages/settings/SettingsDecommission.qml sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml + sources/gui/qml/pages/settings/SettingsLocalization.qml sources/gui/qml/dialogs/ConfirmDialog.qml @@ -72,13 +73,18 @@ resources/images/DenaliDevice.png + sources/gui/qml/components/MainMenu.qml sources/gui/qml/components/TouchRect.qml sources/gui/qml/components/TitleText.qml + sources/gui/qml/components/ImageLogoD.qml sources/gui/qml/components/ScreenItem.qml sources/gui/qml/components/StackItem.qml + sources/gui/qml/components/ModalDialog.qml sources/gui/qml/components/USBButton.qml sources/gui/qml/components/TouchArea.qml sources/gui/qml/components/TextRect.qml + sources/gui/qml/components/Line.qml + sources/gui/qml/components/PlaceHolderText.qml sources/gui/qml/components/ProgressBar.qml sources/gui/qml/components/RangeMarker.qml sources/gui/qml/components/ProgressRect.qml @@ -90,16 +96,25 @@ sources/gui/qml/components/ProgressCircle.qml sources/gui/qml/components/Slider.qml sources/gui/qml/components/SliderCreateTreatment.qml + sources/gui/qml/components/GridSelection.qml sources/gui/qml/components/ProgressBarEx.qml sources/gui/qml/components/TickMarks.qml + sources/gui/qml/components/NotificationBar.qml + sources/gui/qml/components/NotificationBarSmall.qml sources/gui/qml/components/UltrafiltrationButton.qml + sources/gui/qml/components/ImageWave.qml + sources/gui/qml/components/ImageClock.qml + sources/gui/qml/components/ImageLogoDDarkTransparent.qml sources/gui/qml/components/RangeSlider.qml + sources/gui/qml/components/MuteButton.qml sources/gui/qml/components/UpDownButton.qml + sources/gui/qml/components/ImageText.qml sources/gui/qml/components/WaitDone.qml sources/gui/qml/components/TimeCircle.qml sources/gui/qml/components/TextEntry.qml sources/gui/qml/components/ScrollBar.qml sources/gui/qml/components/TimeEntry.qml + sources/gui/qml/components/Label.qml sources/gui/qml/components/SliderArrows.qml sources/gui/qml/components/QRCode.qml @@ -145,7 +160,6 @@ sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/numbers.qml sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/symbols.qml - sources/gui/qml/globals/Variables.qml sources/gui/qml/globals/Colors.qml Index: drydemostates.scxml =================================================================== diff -u -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec -rc0b30f1fa82d0121706351057ab52b3bb1141459 --- drydemostates.scxml (.../drydemostates.scxml) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) +++ drydemostates.scxml (.../drydemostates.scxml) (revision c0b30f1fa82d0121706351057ab52b3bb1141459) @@ -1,20 +1,3 @@ - - - - - - - - - - - - - - - - - - - + + Index: main.cpp =================================================================== diff -u -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec -rc0b30f1fa82d0121706351057ab52b3bb1141459 --- main.cpp (.../main.cpp) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) +++ main.cpp (.../main.cpp) (revision c0b30f1fa82d0121706351057ab52b3bb1141459) @@ -32,27 +32,30 @@ #include #include #include -#include #include #include #include -#include "Compatible.h" // Project +#include "FileHandler.h" #include "MainTimer.h" #include "CanInterface.h" #include "FrameInterface.h" #include "MessageAcknowModel.h" #include "MessageDispatcher.h" +#include "ApplicationController.h" +#include "Logger.h" +//AMIR +#include "Settings.h" + #include "Threads.h" -#include "drydemostates.h" - // kernel #include + /*! * \brief signalhandler * \details When application terminates it quits gracefully. @@ -77,14 +80,14 @@ const char *gFakeData_default = "00" ; bool gSendEmptyKeepAwake = false ; bool gFakeSeqAtBegin = false ; +bool gDisableUnhandledReport = false ; bool gDisableDialinUnhandled = false ; bool gDisableTimeout = false ; bool gDisableAlarmNoMinimize = false ; bool gDisableSDCFailLogStop = false ; bool gDisableCloudSyncFailStop = false ; bool gDisableCheckInLog = false ; -bool gDisableUnhandledReport = false ; bool gDisableAcknowLog = false ; bool gConsoleoutLogs = false ; @@ -101,6 +104,7 @@ bool gLogLongName = false ; bool gLogUpload = false ; bool gLogCompress = false ; +bool gLogUnhandledOnly = false ; QString gParserErrorText = ""; QString gStandard_tmp = QString("/%1/").arg("tmp"); @@ -113,50 +117,51 @@ * Usage: ./denali [options] * Denali * - * Options: - * -h, --help Displays help on commandline options. - * --help-all Displays help including Qt specific - * options. - * -v, --version Displays version information. - * -c, --canOut Show the Can Frame Output - * -m, --msgOut Show the Message Output - * -l, --logOut Show the Logs Output - * -0, --enable-keep-awake Enable send low priority, empty message - * on the CANBus just to keep UI board CAN - * driver awake - * -i, --fake-interval Test fake message interval(ms) - * -f, --fake-message Test fake message data - * will use default sequenced long fake - * message if set to 00(default) - * will used only if correct integer value - * assigned for interval option - * -b, --fake-message-seq-at-begin Test fake message sequence at the - * beginning of the frame - * -u, --disable-unhandled-report Disable unhandled messages report as an - * error in the log - * -d, --disable-dialin-unhandled Disable the Dialin messages logged as - * unhandled - * -q, --disable-timeout Disables HD communication timeout - * -a, --disable-alarm-no-minimize Disables alarm no minimize - * -S, --disable-sd-card-fail-log-stop disable-sd-card-fail-log-stop - * -C, --disable-cloudsync-fail-stop disable-cloudsync-fail-stop - * -k, --disable-check-in-log Disables Check-In Log - * -K, --disable-acknow-log Disables Acknowledgment Log - * -D, --enable-dry-demo Enables Dry-Demo Mode - * -A, --active-can-bus Sets the Active CANBus [Shall start with - * 'can' or 'vcan] - * -E, --enable-manufacturing Enables the manufacturing mode to - * configure the system for the first time. - * -R, --use-root-home In case the application is not in - * Manufacturing Setup but needs to use root - * home folder for configurations. - * -U, --enable-update-mode Enables the update mode to update only - * necessary files during the update and - * keep the rest. - * -x, --use-log-long-name Use the log long file name format - * _