Index: denali.pro
===================================================================
diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -r19092150c9343b729ad87be76805300417bfd68c
--- denali.pro	(.../denali.pro)	(revision 604a782b50c9fc749c3bd71485e285c1070f1e01)
+++ denali.pro	(.../denali.pro)	(revision 19092150c9343b729ad87be76805300417bfd68c)
@@ -52,25 +52,26 @@
     common/MsgDefs.h \
     \ # Main
     sources/main.h \
-    sources/model/MTreatmentParameters.h \
-    sources/model/MTreatmentParametersResp.h \
-    sources/storage/filesaver.h \
-    sources/model/MDGDebugText.h \
-    sources/model/MHDDebugText.h \
-    sources/storage/DriveWatcher.h \
     sources/Threads.h \
     sources/MainTimer.h \
+    sources/AlarmGenerator.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 \
+    sources/model/hd/alarm/MAlarmTriggered.h \
+    sources/model/hd/alarm/MAlarmCleared.h \
+    sources/model/hd/alarm/MAlarmClearedCondition.h \
     \ # ---------- Models - HD - Adjustment - In-Treatment
     sources/model/hd/adjustment/MTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.h \
@@ -79,6 +80,7 @@
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.h \
+    sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.h \
     sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.h \
     \ # ---------- Models - HD - Data
     sources/model/hd/data/MTreatmentTimeData.h \
@@ -89,6 +91,8 @@
     sources/model/hd/data/MTreatmentStatesData.h \
     sources/model/hd/data/MHDOperationModeData.h \
     sources/model/hd/data/MTreatmentSalineData.h \
+    sources/model/hd/data/MTreatmentHeparinData.h \
+    sources/model/hd/data/MPrimingData.h \
     \ # ---------- Models - DG - Data
     sources/model/dg/data/MDGDrainPumpData.h \
     sources/model/dg/data/MDGHeatersData.h \
@@ -113,10 +117,13 @@
     sources/gui/GuiView.h \
     sources/gui/GuiController.h \
     \ # ---------- Views ----------
-    sources/view/VCreateTreatment.h \
+    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
@@ -127,6 +134,7 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationConfirm.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h \
+    sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.h \
     sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.h \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VTreatmentTime.h \
@@ -137,6 +145,7 @@
     sources/view/hd/data/VTreatmentPressureOcclusion.h \
     sources/view/hd/data/VHDOperationModeData.h \
     sources/view/hd/data/VTreatmentSalineData.h \
+    sources/view/hd/data/VTreatmentHeparinData.h \
     sources/view/hd/data/VHDTreatmentStatesData.h \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGDrainPumpData.h \
@@ -152,6 +161,8 @@
     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 \
@@ -164,30 +175,35 @@
     \ # common
     \ # Main
     main.cpp \
-    sources/model/MTreatmentParameters.cpp \
-    sources/model/MTreatmentParametersResp.cpp \
     sources/Threads.cpp \
     sources/MainTimer.cpp \
+    sources/AlarmGenerator.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 \
+    sources/model/hd/alarm/MAlarmTriggered.cpp \
+    sources/model/hd/alarm/MAlarmCleared.cpp \
+    sources/model/hd/alarm/MAlarmClearedCondition.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 \
+    sources/model/hd/adjustment/MTreatmentAdjustHeparinResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustPressuresLimitsResponse.cpp \
     \ # ---------- Models - HD - Data
-    sources/model/MHDDebugText.cpp \
     sources/model/hd/data/MTreatmentTimeData.cpp \
     sources/model/hd/data/MTreatmentFlowsData.cpp \
     sources/model/hd/data/MTreatmentOutletFlowData.cpp \
@@ -196,8 +212,9 @@
     sources/model/hd/data/MTreatmentStatesData.cpp \
     sources/model/hd/data/MHDOperationModeData.cpp \
     sources/model/hd/data/MTreatmentSalineData.cpp \
+    sources/model/hd/data/MTreatmentHeparinData.cpp \
+    sources/model/hd/data/MPrimingData.cpp \
     \ # ---------- Models - DG - Data
-    sources/model/MDGDebugText.cpp \
     sources/model/dg/data/MDGDrainPumpData.cpp \
     sources/model/dg/data/MDGHeatersData.cpp \
     sources/model/dg/data/MDGLoadCellReadingsData.cpp \
@@ -220,9 +237,12 @@
     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 \
-    sources/view/VCreateTreatment.cpp \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.cpp \
     \ # ---------- Views - HD - Adjustment - In-Treatment
@@ -233,6 +253,7 @@
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentUltrafiltrationState.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \
+    sources/view/hd/adjustment/VTreatmentAdjustmentHeparin.cpp \
     sources/view/hd/adjustment/VTreatmentAdjustmentPressuresLimits.cpp \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VTreatmentTime.cpp \
@@ -243,6 +264,7 @@
     sources/view/hd/data/VTreatmentPressureOcclusion.cpp \
     sources/view/hd/data/VHDOperationModeData.cpp \
     sources/view/hd/data/VTreatmentSalineData.cpp \
+    sources/view/hd/data/VTreatmentHeparinData.cpp \
     sources/view/hd/data/VHDTreatmentStatesData.cpp \
     \ # ---------- Views - DG - Data
     sources/view/dg/data/VDGDrainPumpData.cpp \
@@ -259,7 +281,7 @@
     sources/storage/FileHandler.cpp \
     sources/storage/Logger.cpp \
     sources/storage/DriveWatcher.cpp \
-    sources/storage/filesaver.cpp \
+    sources/storage/FileSaver.cpp \
     \ # Utility
     sources/utility/crc.cpp \
     sources/utility/format.cpp \
@@ -404,7 +426,7 @@
 
 # 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 += \