Index: denali.pro =================================================================== diff -u -raa8f2c87c14c68d1fda6da2540d47144990a596c -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- denali.pro (.../denali.pro) (revision aa8f2c87c14c68d1fda6da2540d47144990a596c) +++ denali.pro (.../denali.pro) (revision ed9ea343a2a22623796045d9e1229a2cbfa8c970) @@ -1,7 +1,7 @@ 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 { @@ -51,6 +51,7 @@ sources/utility \ sources/wifi \ sources/bluetooth \ + sources/cloudsync \ sources/abstract \ sources/model \ sources/model/settings \ @@ -119,9 +120,11 @@ 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 \ @@ -162,6 +165,7 @@ 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 \ @@ -195,6 +199,7 @@ 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 \ @@ -207,6 +212,7 @@ 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 \ @@ -224,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 \ @@ -323,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 @@ -367,8 +375,10 @@ 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 \ @@ -406,6 +416,7 @@ 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 \ @@ -432,6 +443,7 @@ sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.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 \ @@ -444,6 +456,7 @@ 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 \ @@ -464,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 \ @@ -563,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