Index: denali.pro =================================================================== diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -r7077e38c74db9cccb5496ffefcf8936c0916de76 --- denali.pro (.../denali.pro) (revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e) +++ denali.pro (.../denali.pro) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) @@ -48,6 +48,7 @@ sources/gui \ sources/canbus \ sources/utility \ + sources/wifi \ sources/abstract \ sources/model \ sources/model/settings \ @@ -100,11 +101,13 @@ sources/ApplicationController.h \ sources/storage/Settings.h \ sources/storage/TreatmentLog.h \ + sources/wifi/WifiInterface.h \ \ # ---------- Models ---------- sources/model/MModel.h \ sources/model/MAbstract.h \ \ # ---------- Models - settings sources/model/settings/MSettings.h \ + sources/model/settings/MWifiNetwork.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ @@ -217,6 +220,7 @@ sources/view/settings/VDateTime.h \ sources/view/settings/VSettings.h \ sources/view/settings/VAdjustmentVersions.h \ + sources/view/settings/VNetworkModel.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ \ # ---------- Views - HD - Adjustment @@ -313,6 +317,7 @@ sources/ApplicationController.cpp \ sources/storage/Settings.cpp \ sources/storage/TreatmentLog.cpp \ + sources/wifi/WifiInterface.cpp \ \ # ---------- Models ---------- sources/model/MAbstract.cpp \ \ # ---------- Models - settings @@ -424,6 +429,7 @@ sources/view/settings/VSettings.cpp \ sources/view/settings/VDateTime.cpp \ sources/view/settings/VAdjustmentVersions.cpp \ + sources/view/settings/VNetworkModel.cpp \ \ # ---------- Views - HD - Adjustment sources/view/VAdjustmentResponseBase.cpp \ \ # ---------- Views - HD - Adjustment - Pre-Treatment @@ -512,12 +518,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 {