Index: denali.pro
===================================================================
diff -u -r2d09ae36f6b791e0415a87b6f14f582d4b434d7d -r7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab
--- denali.pro	(.../denali.pro)	(revision 2d09ae36f6b791e0415a87b6f14f582d4b434d7d)
+++ denali.pro	(.../denali.pro)	(revision 7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab)
@@ -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 and .s files
 
 #CONFIG  += disable_crc
 disable_crc {
@@ -14,8 +14,6 @@
     DEFINES += DISABLE_KEEP_ALIVE
 }
 
-DEFINES += "\"QT_MESSAGE_PATTERN=[%{type}] (%{file}:%{line}) - %{message}\""
-
 # 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
@@ -30,142 +28,250 @@
 INCLUDEPATH += \
     common \
     sources \
-    sources/model \
-    sources/view \
     sources/storage \
     sources/gui \
     sources/canbus \
     sources/utility \
-    sources/abstract
+    sources/abstract \
+    sources/model \
+    sources/model/hd/adjustment \
+    sources/model/hd/alarm \
+    sources/model/hd/data \
+    sources/model/dg/data \
+    sources/view \
+    sources/view/hd/adjustment \
+    sources/view/hd/alarm \
+    sources/view/hd/data \
+    sources/view/dg/data
 
 HEADERS += \
+    \ # common
     common/AlarmDefs.h \
     common/DGDefs.h \
     common/HDDefs.h \
     common/MsgDefs.h \
+    \ # Main
     sources/main.h \
-    sources/maintimer.h \
-    sources/model/mloadcellreadings.h \
-    sources/model/mtemperaturesensors.h \
-    sources/model/mtreatmentadjustblooddialysateresponse.h \
-    sources/model/mtreatmentadjustdurationresponse.h \
-    sources/model/mtreatmentadjustrequests.h \
-    sources/model/mtreatmentadjustultrafiltrationconfirmresponse.h \
-    sources/model/mtreatmentadjustultrafiltrationstateresponse.h \
-    sources/model/mtreatmentadjustultrafiltrationeditresponse.h \
-    sources/model/mtreatmentparameters.h \
-    sources/model/mtreatmentparametersresp.h \
-    sources/model/mtreatmentpressureocclusion.h \
-    sources/model/mtreatmentranges.h \
-    sources/storage/filesaver.h \
-    sources/threads.h \
-    sources/applicationcontroller.h \
-    sources/applicationpost.h \
-    sources/canbus/caninterface.h \
-    sources/canbus/frameinterface.h \
-    sources/canbus/messageacknowmodel.h \
-    sources/canbus/messagebuilder.h \
-    sources/canbus/messagedispatcher.h \
-    sources/canbus/messageglobals.h \
-    sources/canbus/messageinterpreter.h \
-#    sources/configuration/display.h \
-#    sources/configuration/sound.h \
-    sources/gui/guiglobals.h \
-    sources/gui/guiview.h \
-    sources/gui/guicontroller.h \
-    sources/model/malarmstatus.h \
-    sources/model/mmodel.h \
-    sources/model/mpoweroff.h \
-    sources/model/mtreatmentflows.h \
-    sources/model/mtreatmentoutletflow.h \
-    sources/model/mtreatmenttime.h \
-    sources/view/VCreateTreatment.h \
-    sources/view/vloadcellreadings.h \
-    sources/view/vtemperaturesensors.h \
-    sources/view/vtreatmentadjustmentduration.h \
-    sources/view/vtreatmentadjustmentflows.h \
-    sources/view/vtreatmentadjustmentresponsebase.h \
-    sources/view/vtreatmentadjustmentultrafiltrationconfirm.h \
-    sources/view/vtreatmentadjustmentultrafiltrationedit.h \
-    sources/view/vtreatmentadjustmentultrafiltrationstate.h \
-    sources/view/vtreatmentpressureocclusion.h \
-    sources/view/vtreatmentranges.h \
-    sources/view/vview.h \
-    sources/view/vpoweroff.h \
-    sources/view/vtreatmentbloodflow.h \
-    sources/view/vtreatmentdialysateflow.h \
-    sources/view/vtreatmenttime.h \
-    sources/view/vtreatmentultrafiltration.h \
-    sources/view/valarmstatus.h \
-    sources/storage/filehandler.h \
-    sources/storage/logger.h \
-    sources/storage/storageglobals.h \
-    sources/storage/usbwatcher.h \
-#    sources/storage/settings.h \
+    sources/Threads.h \
+    sources/MainTimer.h \
+    sources/ApplicationPost.h \
+    \ # Controllers
+    sources/ApplicationController.h \
+    \ # ---------- Models ----------
+    sources/model/MModel.h \
+    sources/model/MAbstract.h \
+    sources/model/MPowerOff.h \
+    sources/model/MEndTreatmentResponse.h \
+    sources/model/MStartTreatmentResponse.h \
+    sources/model/MTreatmentParametersResp.h \
+    sources/model/MDGDebugText.h \
+    sources/model/MHDDebugText.h \
+    \ # ---------- Models - Alarm
+    sources/model/hd/alarm/MAlarmCleared.h \
+    sources/model/hd/alarm/MAlarmTriggered.h \
+    sources/model/hd/alarm/MAlarmStatusData.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/MTreatmentAdjustUltrafiltrationStateResponse.h \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \
+    sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \
+    \ # ---------- Models - HD - Data
+    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/MHDOperationModeData.h \
+    sources/model/hd/data/MTreatmentSalineData.h \
+    sources/model/hd/data/MPrimingData.h \
+    \ # ---------- Models - DG - Data
+    sources/model/dg/data/MDGDrainPumpData.h \
+    sources/model/dg/data/MDGHeatersData.h \
+    sources/model/dg/data/MDGLoadCellReadingsData.h \
+    sources/model/dg/data/MDGOperationModeData.h \
+    sources/model/dg/data/MDGPressuresData.h \
+    sources/model/dg/data/MDGReservoirData.h \
+    sources/model/dg/data/MDGROPumpData.h \
+    sources/model/dg/data/MDGTemperaturesData.h \
+    sources/model/dg/data/MDGValvesStatesData.h \
+    \ # CANBus
+    sources/canbus/CanInterface.h \
+    sources/canbus/FrameInterface.h \
+    \ # Denali Message
+    sources/canbus/MessageGlobals.h \
+    sources/canbus/MessageAcknowModel.h \
+    sources/canbus/MessageBuilder.h \
+    sources/canbus/MessageInterpreter.h \
+    sources/canbus/MessageDispatcher.h \
+    \ # Gui
+    sources/gui/GuiGlobals.h \
+    sources/gui/GuiView.h \
+    sources/gui/GuiController.h \
+    \ # ---------- Views ----------
+    sources/view/VTreatmentCreate.h \
+    sources/view/VTreatmentEnd.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 - In-Treatment
+    sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.h \
+    sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h \
+    sources/view/hd/adjustment/VTreatmentAdjustmentFlows.h \
+    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.h \
+    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \
+    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \
+    sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \
+    \ # ---------- Views - HD - Data
+    sources/view/hd/data/VTreatmentTime.h \
+    sources/view/hd/data/VTreatmentBloodFlow.h \
+    sources/view/hd/data/VTreatmentDialysateFlow.h \
+    sources/view/hd/data/VTreatmentUltrafiltration.h \
+    sources/view/hd/data/VTreatmentRanges.h \
+    sources/view/hd/data/VTreatmentPressureOcclusion.h \
+    sources/view/hd/data/VHDOperationModeData.h \
+    sources/view/hd/data/VTreatmentSalineData.h \
+    sources/view/hd/data/VHDTreatmentStatesData.h \
+    \ # ---------- Views - DG - Data
+    sources/view/dg/data/VDGDrainPumpData.h \
+    sources/view/dg/data/VDGHeatersData.h \
+    sources/view/dg/data/VDGLoadCellReadingsData.h \
+    sources/view/dg/data/VDGOperationModeData.h \
+    sources/view/dg/data/VDGPressuresData.h \
+    sources/view/dg/data/VDGROPumpData.h \
+    sources/view/dg/data/VDGReservoirData.h \
+    sources/view/dg/data/VDGTemperaturesData.h \
+    sources/view/dg/data/VDGValvesStatesData.h \
+    \ # Storage
+    sources/storage/StorageGlobals.h \
+    sources/storage/Logger.h \
+    sources/storage/FileHandler.h \
+    sources/storage/FileSaver.h \
+    sources/storage/DriveWatcher.h \
+    \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
     sources/utility/types.h
+#    sources/configuration/display.h \
+#    sources/configuration/sound.h \
+#    sources/storage/settings.h \
 
 SOURCES += \
+    \ # common
+    \ # Main
     main.cpp \
-    sources/maintimer.cpp \
-    sources/model/mloadcellreadings.cpp \
-    sources/model/mtemperaturesensors.cpp \
-    sources/model/mtreatmentadjustblooddialysateresponse.cpp \
-    sources/model/mtreatmentadjustdurationresponse.cpp \
-    sources/model/mtreatmentadjustultrafiltrationconfirmresponse.cpp \
-    sources/model/mtreatmentadjustultrafiltrationstateresponse.cpp \
-    sources/model/mtreatmentadjustultrafiltrationeditresponse.cpp \
-    sources/model/mtreatmentparameters.cpp \
-    sources/model/mtreatmentparametersresp.cpp \
-    sources/model/mtreatmentpressureocclusion.cpp \
-    sources/model/mtreatmentranges.cpp \
-    sources/storage/filesaver.cpp \
-    sources/threads.cpp \
-    sources/applicationcontroller.cpp \
-    sources/applicationpost.cpp \
-    sources/canbus/caninterface.cpp \
-    sources/canbus/frameinterface.cpp \
-    sources/canbus/messageacknowmodel.cpp \
-    sources/canbus/messagebuilder.cpp \
-    sources/canbus/messagedispatcher.cpp \
-    sources/canbus/messageinterpreter.cpp \
-#    sources/configuration/display.cpp \
-#    sources/configuration/sound.cpp \
-    sources/gui/guiglobals.cpp \
-    sources/gui/guiview.cpp \
-    sources/gui/guicontroller.cpp \
-    sources/model/mpoweroff.cpp \
-    sources/model/mtreatmentflows.cpp \
-    sources/model/mtreatmentoutletflow.cpp \
-    sources/model/mtreatmenttime.cpp \
-    sources/model/malarmstatus.cpp \
-    sources/view/VCreateTreatment.cpp \
-    sources/view/vloadcellreadings.cpp \
-    sources/view/vpoweroff.cpp \
-    sources/view/vtemperaturesensors.cpp \
-    sources/view/vtreatmentadjustmentduration.cpp \
-    sources/view/vtreatmentadjustmentflows.cpp \
-    sources/view/vtreatmentadjustmentresponsebase.cpp \
-    sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \
-    sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \
-    sources/view/vtreatmentadjustmentultrafiltrationstate.cpp \
-    sources/view/vtreatmentbloodflow.cpp \
-    sources/view/vtreatmentdialysateflow.cpp \
-    sources/view/vtreatmentpressureocclusion.cpp \
-    sources/view/vtreatmentranges.cpp \
-    sources/view/vtreatmentultrafiltration.cpp \
-    sources/view/vtreatmenttime.cpp \
-    sources/view/valarmstatus.cpp \
-    sources/storage/filehandler.cpp \
-    sources/storage/logger.cpp \
-    sources/storage/storageglobals.cpp \
-    sources/storage/usbwatcher.cpp \
-#    sources/storage/settings.cpp \
+    sources/Threads.cpp \
+    sources/MainTimer.cpp \
+    sources/ApplicationPost.cpp \
+    \ # Controllers
+    sources/ApplicationController.cpp \
+    \ # ---------- Models ----------
+    sources/model/MAbstract.cpp \
+    sources/model/MPowerOff.cpp \
+    sources/model/MHDDebugText.cpp \
+    sources/model/MEndTreatmentResponse.cpp \
+    sources/model/MStartTreatmentResponse.cpp \
+    sources/model/MTreatmentParametersResp.cpp \
+    sources/model/MDGDebugText.cpp \
+    \ # ---------- Models - Alarm
+    sources/model/hd/alarm/MAlarmCleared.cpp \
+    sources/model/hd/alarm/MAlarmTriggered.cpp \
+    sources/model/hd/alarm/MAlarmStatusData.cpp \
+    \ # ---------- Models - HD - Adjustment - In-Treatment
+    sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp \
+    sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
+    sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
+    sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.cpp \
+    \ # ---------- Models - HD - Data
+    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/MHDOperationModeData.cpp \
+    sources/model/hd/data/MTreatmentSalineData.cpp \
+    sources/model/hd/data/MPrimingData.cpp \
+    \ # ---------- Models - DG - Data
+    sources/model/dg/data/MDGDrainPumpData.cpp \
+    sources/model/dg/data/MDGHeatersData.cpp \
+    sources/model/dg/data/MDGLoadCellReadingsData.cpp \
+    sources/model/dg/data/MDGOperationModeData.cpp \
+    sources/model/dg/data/MDGPressuresData.cpp \
+    sources/model/dg/data/MDGReservoirData.cpp \
+    sources/model/dg/data/MDGROPumpData.cpp \
+    sources/model/dg/data/MDGTemperaturesData.cpp \
+    sources/model/dg/data/MDGValvesStatesData.cpp \
+    \ # CANBus
+    sources/canbus/CanInterface.cpp \
+    sources/canbus/FrameInterface.cpp \
+    \ # Denali Message
+    sources/canbus/MessageAcknowModel.cpp \
+    sources/canbus/MessageBuilder.cpp \
+    sources/canbus/MessageDispatcher.cpp \
+    sources/canbus/MessageInterpreter.cpp \
+    \ # Gui
+    sources/gui/GuiGlobals.cpp \
+    sources/gui/GuiView.cpp \
+    sources/gui/GuiController.cpp \
+    \ # ---------- Views ----------
+    sources/view/VTreatmentCreate.cpp \
+    sources/view/VTreatmentEnd.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 - In-Treatment
+    sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp \
+    sources/view/hd/adjustment/VTreatmentAdjustmentDuration.cpp \
+    sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp \
+    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \
+    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \
+    sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \
+    sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \
+    \ # ---------- Views - HD - Data
+    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/VHDTreatmentStatesData.cpp \
+    \ # ---------- Views - DG - Data
+    sources/view/dg/data/VDGDrainPumpData.cpp \
+    sources/view/dg/data/VDGHeatersData.cpp \
+    sources/view/dg/data/VDGLoadCellReadingsData.cpp \
+    sources/view/dg/data/VDGOperationModeData.cpp \
+    sources/view/dg/data/VDGPressuresData.cpp \
+    sources/view/dg/data/VDGROPumpData.cpp \
+    sources/view/dg/data/VDGReservoirData.cpp \
+    sources/view/dg/data/VDGTemperaturesData.cpp \
+    sources/view/dg/data/VDGValvesStatesData.cpp \
+    \ # Storage
+    sources/storage/StorageGlobals.cpp \
+    sources/storage/FileHandler.cpp \
+    sources/storage/Logger.cpp \
+    sources/storage/DriveWatcher.cpp \
+    sources/storage/FileSaver.cpp \
+    \ # Utility
     sources/utility/crc.cpp \
     sources/utility/format.cpp \
     sources/utility/types.cpp
 
+
 RESOURCES += \
     denali.qrc
 
@@ -174,11 +280,9 @@
     VER_MINOR="\\\"${minorVersion}\\\""                 \
     VER_MICRO="\\\"${microVersion}\\\""                 \
     VER_REVIS="\\\"${buildNumber}\\\""                  \
-    VER_MAJOR_DEV=\\\"0\\\"                             \
-    VER_MINOR_DEV=\\\"0\\\"                             \
-    VER_MICRO_DEV=\\\"0\\\"                             \
     VER_REVIS_DEV=\\\"$$system( date "+%m%d%H%M" )\\\"  \
-    VER_APPLY=\\\"$$system( touch -m main.cpp)\\\"
+    VER_APPLY=\\\"$$system( touch -m main.cpp )\\\"     \
+    VER_BRANCH=\\\"$$system( git rev-parse --abbrev-ref HEAD )\\\"
 
 CodeCoverage {
     message(Building with Squish Coco)
@@ -306,7 +410,8 @@
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin
-else: unix:!android: target.path = /opt/$${TARGET}/bin
+else: unix:!android: target.path = /home/root
 !isEmpty(target.path): INSTALLS += target
 
-DISTFILES +=
+DISTFILES += \
+    README.md