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 =