Index: denali.pro
===================================================================
diff -u -r24f6fd0fa333f68f555f945385e7d4c2dd5ed656 -rb8dd541d377ad1e8d7b988ce0163d99bff53843f
--- denali.pro	(.../denali.pro)	(revision 24f6fd0fa333f68f555f945385e7d4c2dd5ed656)
+++ denali.pro	(.../denali.pro)	(revision b8dd541d377ad1e8d7b988ce0163d99bff53843f)
@@ -40,6 +40,7 @@
     sources/model/dg/data \
     sources/view \
     sources/view/hd/adjustment \
+    sources/view/hd/alarm \
     sources/view/hd/data \
     sources/view/dg/data
 
@@ -57,11 +58,11 @@
     sources/model/MDGDebugText.h \
     sources/model/MHDDebugText.h \
     sources/storage/DriveWatcher.h \
-    sources/threads.h \
-    sources/maintimer.h \
-    sources/applicationpost.h \
+    sources/Threads.h \
+    sources/MainTimer.h \
+    sources/ApplicationPost.h \
     \ # Controllers
-    sources/applicationcontroller.h \
+    sources/ApplicationController.h \
     \ # ---------- Models ----------
     sources/model/MModel.h \
     sources/model/MAbstract.h \
@@ -98,43 +99,43 @@
     sources/model/dg/data/MDGTemperaturesData.h \
     sources/model/dg/data/MDGValvesStatesData.h \
     \ # CANBus
-    sources/canbus/caninterface.h \
-    sources/canbus/frameinterface.h \
+    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 \
+    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 \
+    sources/gui/GuiGlobals.h \
+    sources/gui/GuiView.h \
+    sources/gui/GuiController.h \
     \ # ---------- Views ----------
     sources/view/VCreateTreatment.h \
     sources/view/VEventSpy.h \
-    sources/view/hd/data/VHDTreatmentStatesData.h \
-    sources/view/vview.h \
-    sources/view/vpoweroff.h \
+    sources/view/VView.h \
+    sources/view/VPowerOff.h \
     \ # ---------- Views - Alarm
-    sources/view/valarmstatus.h \
+    sources/view/hd/alarm/VAlarmStatus.h \
     \ # ---------- Views - HD - Adjustment - In-Treatment
-    sources/view/vtreatmentadjustmentresponsebase.h \
-    sources/view/vtreatmentadjustmentduration.h \
-    sources/view/vtreatmentadjustmentflows.h \
-    sources/view/vtreatmentadjustmentultrafiltrationstate.h \
-    sources/view/vtreatmentadjustmentultrafiltrationedit.h \
-    sources/view/vtreatmentadjustmentultrafiltrationconfirm.h \
+    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/vtreatmenttime.h \
-    sources/view/vtreatmentbloodflow.h \
-    sources/view/vtreatmentdialysateflow.h \
-    sources/view/vtreatmentultrafiltration.h \
-    sources/view/vtreatmentranges.h \
-    sources/view/vtreatmentpressureocclusion.h \
+    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 \
@@ -146,9 +147,9 @@
     sources/view/dg/data/VDGTemperaturesData.h \
     sources/view/dg/data/VDGValvesStatesData.h \
     \ # Storage
-    sources/storage/storageglobals.h \
-    sources/storage/filehandler.h \
-    sources/storage/logger.h \
+    sources/storage/StorageGlobals.h \
+    sources/storage/Logger.h \
+    sources/storage/FileHandler.h \
     \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
@@ -163,15 +164,11 @@
     main.cpp \
     sources/model/MTreatmentParameters.cpp \
     sources/model/MTreatmentParametersResp.cpp \
-    sources/storage/filesaver.cpp \
-    sources/model/MDGDebugText.cpp \
-    sources/model/MHDDebugText.cpp \
-    sources/storage/DriveWatcher.cpp \
-    sources/threads.cpp \
-    sources/maintimer.cpp \
-    sources/applicationpost.cpp \
+    sources/Threads.cpp \
+    sources/MainTimer.cpp \
+    sources/ApplicationPost.cpp \
     \ # Controllers
-    sources/applicationcontroller.cpp \
+    sources/ApplicationController.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
     sources/model/MPowerOff.cpp \
@@ -187,6 +184,7 @@
     sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
     sources/model/hd/adjustment/MTreatmentAdjustSalineResponse.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,6 +194,7 @@
     sources/model/hd/data/MHDOperationModeData.cpp \
     sources/model/hd/data/MTreatmentSalineData.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 \
@@ -206,41 +205,41 @@
     sources/model/dg/data/MDGTemperaturesData.cpp \
     sources/model/dg/data/MDGValvesStatesData.cpp \
     \ # CANBus
-    sources/canbus/caninterface.cpp \
-    sources/canbus/frameinterface.cpp \
+    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 \
+    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 \
-    sources/view/VCreateTreatment.cpp \
+    sources/gui/GuiGlobals.cpp \
+    sources/gui/GuiView.cpp \
+    sources/gui/GuiController.cpp \
     \ # ---------- Views ----------
     sources/view/VEventSpy.cpp \
-    sources/view/hd/data/VHDTreatmentStatesData.cpp \
-    sources/view/vpoweroff.cpp \
+    sources/view/VPowerOff.cpp \
+    sources/view/VCreateTreatment.cpp \
     \ # ---------- Views - Alarm
-    sources/view/valarmstatus.cpp \
+    sources/view/hd/alarm/VAlarmStatus.cpp \
     \ # ---------- Views - HD - Adjustment - In-Treatment
-    sources/view/vtreatmentadjustmentresponsebase.cpp \
-    sources/view/vtreatmentadjustmentduration.cpp \
-    sources/view/vtreatmentadjustmentflows.cpp \
-    sources/view/vtreatmentadjustmentultrafiltrationstate.cpp \
-    sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \
-    sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \
+    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/vtreatmenttime.cpp \
-    sources/view/vtreatmentbloodflow.cpp \
-    sources/view/vtreatmentdialysateflow.cpp \
-    sources/view/vtreatmentultrafiltration.cpp \
-    sources/view/vtreatmentranges.cpp \
-    sources/view/vtreatmentpressureocclusion.cpp \
+    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 \
@@ -252,9 +251,11 @@
     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/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 \
@@ -273,7 +274,8 @@
     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)
@@ -404,4 +406,5 @@
 else: unix:!android: target.path = /opt/$${TARGET}/bin
 !isEmpty(target.path): INSTALLS += target
 
-DISTFILES +=
+DISTFILES += \
+    README.md