Index: denali.pro =================================================================== diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- denali.pro (.../denali.pro) (revision e125bd5cf13750eaf241d518b9c846139afaa81c) +++ denali.pro (.../denali.pro) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -1,7 +1,7 @@ -QT += widgets qml quick serialbus concurrent +QT += qml quick serialbus concurrent charts bluetooth CONFIG += c++17 warn_on # CONFIG += disable-desktop -QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii +QMAKE_CXXFLAGS += -Wall -Werror -Wextra -Wimplicit-fallthrough=3 # -save-temps # see .ii #CONFIG += disable_crc disable_crc { @@ -44,13 +44,18 @@ 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/settings \ + sources/model/ui/data \ sources/model/hd/adjustment \ sources/model/hd/adjustment/disinfect \ sources/model/hd/adjustment/settings \ @@ -59,34 +64,42 @@ 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/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 \ @@ -96,19 +109,42 @@ sources/MainTimer.h \ sources/AlarmGenerator.h \ sources/ApplicationPost.h \ + sources/device/DeviceGlobals.h \ + sources/device/DeviceError.h \ \ # Controllers - sources/storage/Settings.h \ sources/ApplicationController.h \ + sources/device/DeviceController.h \ + sources/model/ui/data/MUIBloodPressureData.h \ + sources/storage/Settings.h \ + sources/storage/TreatmentLog.h \ + sources/view/hd/data/post/VHDPOSTData.h \ + sources/wifi/WifiInterface.h \ + sources/bluetooth/BluetoothInterface.h \ + sources/cloudsync/CloudSyncController.h \ \ # ---------- Models ---------- sources/model/MModel.h \ sources/model/MAbstract.h \ + sources/model/MAbstractDynamic.h \ + sources/device/DeviceModels.h \ + \ # ---------- Models - POST + sources/model/dg/data/post/MDGPostFinalResultData.h \ + sources/model/dg/data/post/MDGPostSingleResultData.h \ + sources/model/hd/data/post/MHDPostFinalResultData.h \ + sources/model/hd/data/post/MHDPostSingleResultData.h \ \ # ---------- Models - settings sources/model/settings/MSettings.h \ + sources/model/settings/MWifiNetwork.h \ + sources/model/settings/MBluetooth.h \ + sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \ + sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.h \ + sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \ + sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmClearedCondition.h \ + sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ @@ -120,13 +156,16 @@ sources/model/hd/adjustment/MAdjustPowerOff.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ \ # ---------- Models - HD - Adjustment - Settings + sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h \ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \ + sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \ @@ -160,7 +199,9 @@ sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.h \ + sources/model/hd/data/MHDGeneralEvent.h \ sources/model/hd/data/MHDAccelerometerData.h \ + sources/model/hd/data/MHDSyringePumpData.h \ sources/model/hd/data/MTreatmentRangesData.h \ sources/model/hd/data/treatment/MTreatmentTimeData.h \ sources/model/hd/data/treatment/MTreatmentFlowsData.h \ @@ -171,6 +212,11 @@ sources/model/hd/data/treatment/MTreatmentRinsebackData.h \ sources/model/hd/data/treatment/MTreatmentRecirculateData.h \ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \ + sources/model/hd/data/treatment/MTreatmentStopData.h \ + \ # ---------- Models - HD - Data - Treatment Log + sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h \ + sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h \ + sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h \ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ \ # ---------- Models - DG - Adjustment - Settings @@ -184,6 +230,7 @@ sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDebugText.h \ + sources/model/dg/data/MDGGeneralEvent.h \ sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ sources/model/dg/data/MDGLoadCellReadingsData.h \ @@ -212,14 +259,24 @@ sources/view/VEventSpy.h \ sources/view/VView.h \ sources/view/VPowerOff.h \ + sources/device/DeviceView.h \ + \ # ---------- Views - POST + sources/view/dg/data/post/VDGPOSTData.h \ \ # ---------- Views - Settings sources/view/settings/VDateTime.h \ sources/view/settings/VSettings.h \ + sources/view/settings/VBluetooth.h \ + sources/view/settings/VNetworkModel.h \ sources/view/settings/VAdjustmentVersions.h \ + sources/view/settings/VAdjustmentAlarmVolume.h \ + sources/view/settings/VAdjustmentService.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ + sources/view/hd/alarm/VAlarmActiveList.h \ \ # ---------- Views - HD - Adjustment sources/view/VAdjustmentResponseBase.h \ + \ # ---------- Views - HD - Adjustment - common + sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h \ \ # ---------- Views - HD - Adjustment - Pre-Treatment sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ @@ -261,6 +318,7 @@ sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.h \ + sources/view/hd/data/VHDSyringePumpData.h \ sources/view/hd/data/VTreatmentRanges.h \ sources/view/hd/data/treatment/VTreatmentTime.h \ sources/view/hd/data/treatment/VTreatmentBloodFlow.h \ @@ -272,6 +330,7 @@ sources/view/hd/data/treatment/VTreatmentRinsebackData.h \ sources/view/hd/data/treatment/VTreatmentRecirculateData.h \ sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h \ + sources/view/hd/data/treatment/VTreatmentStopData.h \ \ # ---------- Views - DG - Data - Pre-Treatment - Progress sources/view/dg/data/pretreatment/VDGFilterFlushData.h \ \ # ---------- Views - DG - Data - Disinfection - Progress @@ -293,8 +352,6 @@ sources/storage/StorageGlobals.h \ sources/storage/Logger.h \ sources/storage/FileHandler.h \ - sources/storage/FileSaver.h \ - sources/storage/DriveWatcher.h \ \ # Utility sources/utility/crc.h \ sources/utility/format.h \ @@ -308,18 +365,40 @@ sources/MainTimer.cpp \ sources/AlarmGenerator.cpp \ sources/ApplicationPost.cpp \ + sources/device/DeviceError.cpp \ \ # Controllers - sources/storage/Settings.cpp \ sources/ApplicationController.cpp \ + sources/device/DeviceController.cpp \ + sources/model/ui/data/MUIBloodPressureData.cpp \ + sources/storage/Settings.cpp \ + sources/storage/TreatmentLog.cpp \ + sources/view/hd/data/post/VHDPOSTData.cpp \ + sources/wifi/WifiInterface.cpp \ + sources/bluetooth/BluetoothInterface.cpp \ + sources/cloudsync/CloudSyncController.cpp \ \ # ---------- Models ---------- sources/model/MAbstract.cpp \ + sources/model/MAbstractDynamic.cpp \ + sources/device/DeviceModels.cpp \ + \ # ---------- Models - POST + sources/model/dg/data/post/MDGPostFinalResultData.cpp \ + sources/model/dg/data/post/MDGPostSingleResultData.cpp \ + sources/model/hd/data/post/MHDPostFinalResultData.cpp \ + sources/model/hd/data/post/MHDPostSingleResultData.cpp \ \ # ---------- Models - settings sources/model/settings/MSettings.cpp \ + sources/model/settings/MBluetooth.cpp \ + sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \ + sources/model/dg/adjustment/settings/MAdjustDGServiceResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustHDServiceResponse.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ + sources/model/hd/alarm/MAlarmMapping.cpp \ sources/model/hd/alarm/MAlarmTriggered.cpp \ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmClearedCondition.cpp \ + sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ @@ -329,12 +408,15 @@ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings + sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp \ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \ + sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \ @@ -360,13 +442,10 @@ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp \ sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.cpp \ \ # ---------- Models - HD - Data - \ # ---------- Models - HD - Data - Pre-Treatment - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ - sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ - sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ - \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.cpp \ + sources/model/hd/data/MHDGeneralEvent.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ + sources/model/hd/data/MHDSyringePumpData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ sources/model/hd/data/treatment/MTreatmentTimeData.cpp \ sources/model/hd/data/treatment/MTreatmentFlowsData.cpp \ @@ -377,6 +456,15 @@ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \ sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \ + sources/model/hd/data/treatment/MTreatmentStopData.cpp \ + \ # ---------- Models - HD - Data - Pre-Treatment + sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ + sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ + sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ + \ # ---------- Models - HD - Data - Treatment Log + sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp \ + sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ + sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \ \ # ---------- Models - DG - Adjustment \ # ---------- Models - DG - Adjustment - Settings sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \ @@ -389,6 +477,7 @@ sources/model/dg/data/disinfect/MDisinfectDGChemicalTimeData.cpp \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDebugText.cpp \ + sources/model/dg/data/MDGGeneralEvent.cpp \ sources/model/dg/data/MDGDrainPumpData.cpp \ sources/model/dg/data/MDGHeatersData.cpp \ sources/model/dg/data/MDGLoadCellReadingsData.cpp \ @@ -415,14 +504,24 @@ sources/view/VTreatmentCreate.cpp \ sources/view/VEventSpy.cpp \ sources/view/VPowerOff.cpp \ + sources/device/DeviceView.cpp \ + \ # ---------- Views - POST + sources/view/dg/data/post/VDGPOSTData.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ + sources/view/hd/alarm/VAlarmActiveList.cpp \ \ # ---------- Views - Settings sources/view/settings/VSettings.cpp \ sources/view/settings/VDateTime.cpp \ + sources/view/settings/VBluetooth.cpp \ + sources/view/settings/VNetworkModel.cpp \ sources/view/settings/VAdjustmentVersions.cpp \ + sources/view/settings/VAdjustmentAlarmVolume.cpp \ + sources/view/settings/VAdjustmentService.cpp \ \ # ---------- Views - HD - Adjustment sources/view/VAdjustmentResponseBase.cpp \ + \ # ---------- Views - HD - Adjustment - common + sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp \ \ # ---------- Views - HD - Adjustment - Pre-Treatment sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp \ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ @@ -460,6 +559,7 @@ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ + sources/view/hd/data/VHDSyringePumpData.cpp \ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ @@ -477,6 +577,7 @@ sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp \ sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \ sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \ + sources/view/hd/data/treatment/VTreatmentStopData.cpp \ \ # ---------- Views - DG - Data - Pre-Treatment - Progress sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp \ \ # ---------- Views - DG - Data - Disinfect - Progress @@ -498,8 +599,6 @@ sources/storage/StorageGlobals.cpp \ sources/storage/FileHandler.cpp \ sources/storage/Logger.cpp \ - sources/storage/DriveWatcher.cpp \ - sources/storage/FileSaver.cpp \ \ # Utility sources/utility/crc.cpp \ sources/utility/format.cpp \ @@ -509,12 +608,12 @@ denali.qrc DEFINES += \ - VER_MAJOR="\\\"${majorVersion}\\\"" \ - VER_MINOR="\\\"${minorVersion}\\\"" \ - VER_MICRO="\\\"${microVersion}\\\"" \ - VER_REVIS="\\\"${buildNumber}\\\"" \ - VER_REVIS_DEV=\\\"$$system( date "+%m%d%H%M" )\\\" \ - VER_APPLY=\\\"$$system( touch -m main.cpp )\\\" \ + VER_MAJOR="\\\"${majorVersion}\\\"" \ + VER_MINOR="\\\"${minorVersion}\\\"" \ + VER_MICRO="\\\"${microVersion}\\\"" \ + VER_REVIS="\\\"${buildNumber}\\\"" \ + VER_REVIS_DEV=\\\"$$system( date "+%m%d%H%M" )\\\" \ + VER_APPLY=\\\"$$system( touch -m main.cpp )\\\" \ VER_BRANCH=\\\"$$system( git rev-parse --abbrev-ref HEAD )\\\" CodeCoverage { @@ -647,4 +746,5 @@ !isEmpty(target.path): INSTALLS += target DISTFILES += \ - README.md + README.md \ + ui_build_history.log