Index: denali.pro
===================================================================
diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r821bf955d0ba7e028bccfee7c04ca77cf80a0bd4
--- denali.pro	(.../denali.pro)	(revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16)
+++ denali.pro	(.../denali.pro)	(revision 821bf955d0ba7e028bccfee7c04ca77cf80a0bd4)
@@ -1,6 +1,6 @@
 QT += widgets qml quick serialbus concurrent
 CONFIG += c++17 warn_on
-QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii and .s files
+QMAKE_CXXFLAGS += -Wall -Werror -Wimplicit-fallthrough # -save-temps # see .ii
 
 #CONFIG  += disable_crc
 disable_crc {
@@ -14,6 +14,20 @@
     DEFINES += DISABLE_KEEP_ALIVE
 }
 
+# added this section to detect which compiler is running
+# to decide device dependent decisions
+# by defining a MACRO
+# and use that MACRO for conditional build
+message($$QMAKESPEC)
+linux-g++ {
+    message(Linux.g++)
+    DEFINES += BUILD_FOR_GCC
+}
+linux-oe-generic-g++ {
+    message(Linux.poky)
+    DEFINES += BUILD_FOR_POKY
+}
+
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings
 # depend on your compiler). Refer to the documentation for the
@@ -34,12 +48,14 @@
     sources/utility \
     sources/abstract \
     sources/model \
+    sources/model/settings \
     sources/model/hd/adjustment \
     sources/model/hd/alarm \
     sources/model/hd/data \
     sources/model/dg/data \
     sources/model/dg/adjustment \
     sources/view \
+    sources/view/settings \
     sources/view/hd/adjustment \
     sources/view/hd/alarm \
     sources/view/hd/data \
@@ -62,23 +78,31 @@
     \ # ---------- Models ----------
     sources/model/MModel.h \
     sources/model/MAbstract.h \
-    sources/model/MPowerOff.h \
-    sources/model/MStartTreatmentResponse.h \
-    sources/model/MTreatmentParametersResp.h \
-    sources/model/MDGDebugText.h \
-    sources/model/MHDDebugText.h \
+    \ # ---------- Models - settings
+    sources/model/settings/MSettings.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 \
     \ # ---------- Models - HD - Adjustment
-    sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.h \
+    sources/model/hd/adjustment/MAdjustRequestsBase.h \
+    sources/model/hd/adjustment/MAdjustPowerOff.h \
+    sources/model/hd/adjustment/MAdjustHDVersionsResponse.h \
+    \ # ---------- Models - HD - Adjustment - Pre-Treatment
+    sources/model/hd/adjustment/MPreTreatmentAdjustRequests.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \
+    sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.h \
     \ # ---------- Models - HD - Adjustment - In-Treatment
     sources/model/hd/adjustment/MTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h \
-    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \
@@ -89,24 +113,33 @@
     sources/model/hd/adjustment/MTreatmentAdjustRinsebackResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustEndResponse.h \
-    \ # ---------- Models - HD - Data
+    \ # ---------- Models - HD - States Data
     sources/model/hd/data/MHDOperationModeData.h \
+    sources/model/hd/data/MPreTreatmentStatesData.h \
+    sources/model/hd/data/MTreatmentStatesData.h \
+    \ # ---------- Models - HD - Data - Pre-Treatment - Progress
+    sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.h \
+    sources/model/hd/data/MPreTreatmentSelfTestDryData.h \
+    sources/model/hd/data/MPreTreatmentDisposablesPrimeData.h \
+    \ # ---------- Models - HD - Data
+    sources/model/hd/data/MHDDebugText.h \
     sources/model/hd/data/MHDAccelerometerData.h \
     sources/model/hd/data/MTreatmentTimeData.h \
     sources/model/hd/data/MTreatmentFlowsData.h \
     sources/model/hd/data/MTreatmentOutletFlowData.h \
     sources/model/hd/data/MTreatmentRangesData.h \
     sources/model/hd/data/MTreatmentPressureOcclusionData.h \
-    sources/model/hd/data/MTreatmentStatesData.h \
     sources/model/hd/data/MTreatmentSalineData.h \
     sources/model/hd/data/MTreatmentHeparinData.h \
     sources/model/hd/data/MTreatmentRinsebackData.h \
     sources/model/hd/data/MTreatmentRecirculateData.h \
     sources/model/hd/data/MTreatmentBloodPrimeData.h \
-    sources/model/hd/data/MPrimingData.h \
     \ # ---------- Models - DG - Adjustment
-    sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \
+    sources/model/dg/adjustment/MAdjustDGVersionsResponse.h \
+    \ # ---------- Models - DG - Data - Pre-Treatment - Progress
+    sources/model/dg/data/MDGFilterFlushData.h \
     \ # ---------- Models - DG - Data
+    sources/model/dg/data/MDGDebugText.h \
     sources/model/dg/data/MDGDrainPumpData.h \
     sources/model/dg/data/MDGHeatersData.h \
     sources/model/dg/data/MDGLoadCellReadingsData.h \
@@ -131,21 +164,29 @@
     sources/gui/GuiView.h \
     sources/gui/GuiController.h \
     \ # ---------- Views ----------
+    sources/storage/Settings.h \
     sources/view/VTreatmentCreate.h \
-    sources/view/VTreatmentBegin.h \
     sources/view/VEventSpy.h \
     sources/view/VView.h \
     sources/view/VPowerOff.h \
-    sources/view/VPriming.h \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.h \
     \ # ---------- Views - HD - Adjustment
     sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h \
+    \ # ---------- Views - HD - Adjustment - Pre-Treatment
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.h \
     \ # ---------- Views - HD - Adjustment - In-Treatment
     sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h \
-    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \
@@ -156,9 +197,15 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentEnd.h \
-    \ # ---------- Views - HD - Data
+    \ # ---------- Views - HD - Data - States
     sources/view/hd/data/VHDOperationModeData.h \
     sources/view/hd/data/VHDTreatmentStatesData.h \
+    sources/view/hd/data/VPreTreatmentStatesData.h \
+    \ # ---------- Views - HD - Data - Pre-Treatment - Progress
+    sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h \
+    sources/view/hd/data/VPreTreatmentSelfTestDryData.h \
+    sources/view/hd/data/VPreTreatmentDisposablesPrimeData.h \
+    \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.h \
     sources/view/hd/data/VTreatmentTime.h \
     sources/view/hd/data/VTreatmentBloodFlow.h \
@@ -171,6 +218,8 @@
     sources/view/hd/data/VTreatmentRinsebackData.h \
     sources/view/hd/data/VTreatmentRecirculateData.h \
     sources/view/hd/data/VTreatmentBloodPrimeData.h \
+    \ # ---------- Views - DG - Data - Pre-Treatment - Progress
+    sources/view/dg/data/VDGFilterFlushData.h \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGOperationModeData.h \
     sources/view/dg/data/VDGDrainPumpData.h \
@@ -191,7 +240,8 @@
     \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
-    sources/utility/types.h
+    sources/utility/types.h \
+    sources/view/settings/VSettings.h
 #    sources/configuration/display.h \
 #    sources/configuration/sound.h \
 #    sources/storage/settings.h \
@@ -208,22 +258,28 @@
     sources/ApplicationController.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
-    sources/model/MPowerOff.cpp \
-    sources/model/MHDDebugText.cpp \
-    sources/model/MStartTreatmentResponse.cpp \
-    sources/model/MTreatmentParametersResp.cpp \
-    sources/model/MDGDebugText.cpp \
+    \ # ---------- Models - settings
+    sources/model/settings/MSettings.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.cpp \
     sources/model/hd/alarm/MAlarmTriggered.cpp \
     sources/model/hd/alarm/MAlarmCleared.cpp \
     sources/model/hd/alarm/MAlarmClearedCondition.cpp \
+    \ # ---------- Models - HD - Adjustment
+    sources/model/hd/adjustment/MAdjustPowerOff.cpp \
+    sources/model/hd/adjustment/MAdjustHDVersionsResponse.cpp \
+    \ # ---------- Models - HD - Adjustment - Pre-Treatment
+    sources/model/hd/adjustment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustParametersValidationResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustWaterSampleResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \
+    sources/model/hd/adjustment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
     \ # ---------- Models - HD - Adjustment - In-Treatment
-    sources/model/hd/adjustment/MTreatmentAdjustHDVersionsResponse.cpp \
-    \ # ---------- Models - HD - Adjustment - In-Treatment
     sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \
-    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
@@ -235,23 +291,33 @@
     sources/model/hd/adjustment/MTreatmentAdjustRecirculateResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustEndResponse.cpp \
     \ # ---------- Models - HD - Data
-    sources/model/hd/data/MHDAccelerometerData.cpp \
+    \ # ---------- Models - HD - Data - Pre-Treatment
+    sources/model/hd/data/MPreTreatmentDisposablesPrimeData.cpp \
+    sources/model/hd/data/MPreTreatmentSelfTestNoCartridgeData.cpp \
+    sources/model/hd/data/MPreTreatmentSelfTestDryData.cpp \
+    \ # ---------- Models - HD - Data - States
     sources/model/hd/data/MHDOperationModeData.cpp \
+    sources/model/hd/data/MPreTreatmentStatesData.cpp \
+    sources/model/hd/data/MTreatmentStatesData.cpp \
+    \ # ---------- Models - HD - Data
+    sources/model/hd/data/MHDDebugText.cpp \
+    sources/model/hd/data/MHDAccelerometerData.cpp \
     sources/model/hd/data/MTreatmentTimeData.cpp \
     sources/model/hd/data/MTreatmentFlowsData.cpp \
     sources/model/hd/data/MTreatmentOutletFlowData.cpp \
     sources/model/hd/data/MTreatmentRangesData.cpp \
     sources/model/hd/data/MTreatmentPressureOcclusionData.cpp \
-    sources/model/hd/data/MTreatmentStatesData.cpp \
     sources/model/hd/data/MTreatmentSalineData.cpp \
     sources/model/hd/data/MTreatmentHeparinData.cpp \
     sources/model/hd/data/MTreatmentRinsebackData.cpp \
     sources/model/hd/data/MTreatmentRecirculateData.cpp \
     sources/model/hd/data/MTreatmentBloodPrimeData.cpp \
-    sources/model/hd/data/MPrimingData.cpp \
     \ # ---------- Models - DG - Adjustment
     sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.cpp \
+    \ # ---------- Models - DG - Data - Pre-Treatment - Progress
+    sources/model/dg/data/MDGFilterFlushData.cpp \
     \ # ---------- Models - DG - Data
+    sources/model/dg/data/MDGDebugText.cpp \
     sources/model/dg/data/MDGDrainPumpData.cpp \
     sources/model/dg/data/MDGHeatersData.cpp \
     sources/model/dg/data/MDGLoadCellReadingsData.cpp \
@@ -275,20 +341,28 @@
     sources/gui/GuiView.cpp \
     sources/gui/GuiController.cpp \
     \ # ---------- Views ----------
+    sources/storage/Settings.cpp \
     sources/view/VTreatmentCreate.cpp \
-    sources/view/VTreatmentBegin.cpp \
     sources/view/VEventSpy.cpp \
-    sources/view/VPriming.cpp \
     sources/view/VPowerOff.cpp \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.cpp \
     \ # ---------- Views - HD - Adjustment
     sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp \
+    \ # ---------- Views - HD - Adjustment - Pre-Treatment
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentInitTreatment.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentWaterSample.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentDisposablesPrime.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \
+    sources/view/hd/adjustment/VPreTreatmentAdjustmentStartTreatment.cpp \
     \ # ---------- Views - HD - Adjustment - In-Treatment
     sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp \
-    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationInit.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \
@@ -299,21 +373,31 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentRinseback.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentEnd.cpp \
+    \ # ---------- Views - HD - States Data
+    sources/view/hd/data/VHDOperationModeData.cpp \
+    sources/view/hd/data/VPreTreatmentStatesData.cpp \
+    sources/view/hd/data/VHDTreatmentStatesData.cpp \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.cpp \
+    \ # ---------- Views - HD - Data - Pre-Treament
+    sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.cpp \
+    sources/view/hd/data/VPreTreatmentSelfTestDryData.cpp \
+    sources/view/hd/data/VPreTreatmentDisposablesPrimeData.cpp \
+    \ # ---------- Views - HD - Data - In-Treament
     sources/view/hd/data/VTreatmentTime.cpp \
     sources/view/hd/data/VTreatmentBloodFlow.cpp \
     sources/view/hd/data/VTreatmentDialysateFlow.cpp \
     sources/view/hd/data/VTreatmentUltrafiltration.cpp \
     sources/view/hd/data/VTreatmentRanges.cpp \
     sources/view/hd/data/VTreatmentPressureOcclusion.cpp \
-    sources/view/hd/data/VHDOperationModeData.cpp \
     sources/view/hd/data/VTreatmentSalineData.cpp \
     sources/view/hd/data/VTreatmentHeparinData.cpp \
+    \ # ---------- Views - HD - Data - Post-Treament
+    sources/view/hd/data/VTreatmentBloodPrimeData.cpp \
     sources/view/hd/data/VTreatmentRinsebackData.cpp \
     sources/view/hd/data/VTreatmentRecirculateData.cpp \
-    sources/view/hd/data/VTreatmentBloodPrimeData.cpp \
-    sources/view/hd/data/VHDTreatmentStatesData.cpp \
+    \ # ---------- Views - DG - Data - Pre-Treatment - Progress
+    sources/view/dg/data/VDGFilterFlushData.cpp \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGDrainPumpData.cpp \
     sources/view/dg/data/VDGHeatersData.cpp \
@@ -334,7 +418,8 @@
     \ # Utility
     sources/utility/crc.cpp \
     sources/utility/format.cpp \
-    sources/utility/types.cpp
+    sources/utility/types.cpp \
+    sources/view/settings/VSettings.cpp
 
 
 RESOURCES += \