Index: denali.pro
===================================================================
diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -rb3eb8bc9696c4db9867ad1cf13b47c455a94e0fe
--- denali.pro	(.../denali.pro)	(revision e125bd5cf13750eaf241d518b9c846139afaa81c)
+++ denali.pro	(.../denali.pro)	(revision b3eb8bc9696c4db9867ad1cf13b47c455a94e0fe)
@@ -48,6 +48,7 @@
     sources/gui \
     sources/canbus \
     sources/utility \
+    sources/wifi \
     sources/abstract \
     sources/model \
     sources/model/settings \
@@ -62,6 +63,7 @@
     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/pretreatment \
     sources/model/dg/data/disinfect \
@@ -97,18 +99,22 @@
     sources/AlarmGenerator.h \
     sources/ApplicationPost.h \
     \ # Controllers
-    sources/storage/Settings.h \
     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 \
     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 \
@@ -171,6 +177,10 @@
     sources/model/hd/data/treatment/MTreatmentRinsebackData.h \
     sources/model/hd/data/treatment/MTreatmentRecirculateData.h \
     sources/model/hd/data/treatment/MTreatmentBloodPrimeData.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
@@ -216,6 +226,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
@@ -309,17 +320,21 @@
     sources/AlarmGenerator.cpp \
     sources/ApplicationPost.cpp \
     \ # Controllers
-    sources/storage/Settings.cpp \
     sources/ApplicationController.cpp \
+    sources/storage/Settings.cpp \
+    sources/storage/TreatmentLog.cpp \
+    sources/wifi/WifiInterface.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
     \ # ---------- Models - settings
     sources/model/settings/MSettings.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 \
@@ -360,11 +375,6 @@
     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/MHDAccelerometerData.cpp \
     sources/model/hd/data/MTreatmentRangesData.cpp \
@@ -377,6 +387,14 @@
     sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \
     sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \
     sources/model/hd/data/treatment/MTreatmentBloodPrimeData.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 \
@@ -421,6 +439,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
@@ -509,12 +528,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 {