Index: denali.pro =================================================================== diff -u -r9b34a391e7401e9a045270744902a20d0e66d650 -red9ea343a2a22623796045d9e1229a2cbfa8c970 --- denali.pro (.../denali.pro) (revision 9b34a391e7401e9a045270744902a20d0e66d650) +++ 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 { @@ -50,9 +50,12 @@ 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 \ @@ -75,6 +78,7 @@ 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 \ @@ -110,13 +114,17 @@ \ # Controllers 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 \ @@ -126,6 +134,7 @@ \ # ---------- 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 \ @@ -156,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 \ @@ -189,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 \ @@ -201,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 \ @@ -218,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 \ @@ -252,8 +265,9 @@ \ # ---------- Views - Settings sources/view/settings/VDateTime.h \ sources/view/settings/VSettings.h \ - sources/view/settings/VAdjustmentVersions.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 @@ -316,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 @@ -354,12 +369,16 @@ \ # Controllers 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 \ @@ -368,6 +387,7 @@ 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 \ @@ -396,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 \ @@ -422,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 \ @@ -434,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 \ @@ -454,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 \ @@ -489,8 +513,9 @@ \ # ---------- Views - Settings sources/view/settings/VSettings.cpp \ sources/view/settings/VDateTime.cpp \ - sources/view/settings/VAdjustmentVersions.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 @@ -552,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