Index: denali.pro =================================================================== diff -u -r9b34a391e7401e9a045270744902a20d0e66d650 -raa8f2c87c14c68d1fda6da2540d47144990a596c --- denali.pro (.../denali.pro) (revision 9b34a391e7401e9a045270744902a20d0e66d650) +++ denali.pro (.../denali.pro) (revision aa8f2c87c14c68d1fda6da2540d47144990a596c) @@ -50,9 +50,11 @@ sources/canbus \ sources/utility \ sources/wifi \ + sources/bluetooth \ 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 +77,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,10 +113,12 @@ \ # 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 \ \ # ---------- Models ---------- sources/model/MModel.h \ sources/model/MAbstract.h \ @@ -126,6 +131,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 \ @@ -252,8 +258,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 @@ -354,10 +361,12 @@ \ # 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 \ \ # ---------- Models ---------- sources/model/MAbstract.cpp \ sources/device/DeviceModels.cpp \ @@ -368,6 +377,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 \ @@ -489,8 +499,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