Index: denali.pro
===================================================================
diff -u -r9b54c54dbe75f2bd6d04ea73d48e1247682002e8 -r4489378415df8f8398f59a20ca637b39f2ed2613
--- denali.pro	(.../denali.pro)	(revision 9b54c54dbe75f2bd6d04ea73d48e1247682002e8)
+++ denali.pro	(.../denali.pro)	(revision 4489378415df8f8398f59a20ca637b39f2ed2613)
@@ -1,6 +1,7 @@
 QT += qml quick serialbus concurrent charts bluetooth
 CONFIG += c++17 warn_on
 # CONFIG += disable-desktop
+# QMAKE_CXX = clazy
 QMAKE_CXXFLAGS += -Wall -Werror -Wextra -Wimplicit-fallthrough=3 # -save-temps # see .ii
 # -Wpedantic -Wconversion -Wshadow # these can't always be used, since it gives errors in Qt library.
 
@@ -195,6 +196,7 @@
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \
+    sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h \
     \ # ---------- Models - HD - Adjustment - Disinfeection
     sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h \
     sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.h \
@@ -224,6 +226,8 @@
     sources/model/hd/data/treatment/MTreatmentRecirculateData.h \
     sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \
     sources/model/hd/data/treatment/MTreatmentStopData.h \
+    sources/model/hd/data/post/MHDRTCEpochData.h \
+    sources/model/hd/data/MHDUsageInfoResponse.h \
     \ # ---------- Models - HD - Data - Treatment Log
     sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h \
     sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h \
@@ -286,6 +290,7 @@
     sources/view/settings/VAdjustmentDGCleaningUsage.h \
     sources/view/settings/VDuetRoWaterDG.h \
     sources/view/settings/VCloudSync.h \
+    sources/view/settings/VHDUsageInfo.h \
     \ # ---------- Views - Alarm
     sources/view/hd/alarm/VAlarmStatus.h \
     sources/view/hd/alarm/VAlarmActiveList.h \
@@ -373,7 +378,8 @@
     \ # Utility
     sources/utility/crc.h \
     sources/utility/format.h \
-    sources/utility/types.h
+    sources/utility/types.h \
+    sources/utility/encryption.h
 
 SOURCES += \
     \ # common
@@ -460,6 +466,7 @@
     \ # ---------- Models - HD - Adjustment - Post-Treatment
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \
     sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \
+    sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp \
     \ # ---------- Models - HD - Adjustment - Disinfection
     sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp \
     sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp \
@@ -483,6 +490,8 @@
     sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \
     sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \
     sources/model/hd/data/treatment/MTreatmentStopData.cpp \
+    sources/model/hd/data/post/MHDRTCEpochData.cpp \
+    sources/model/hd/data/MHDUsageInfoResponse.cpp \
     \ # ---------- Models - HD - Data - Pre-Treatment
     sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
     sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \
@@ -549,6 +558,7 @@
     sources/view/settings/VDuetRoWaterDG.cpp \
     sources/view/settings/VCloudSync.cpp \
     sources/view/settings/VAdjustmentDGCleaningUsage.cpp \
+    sources/view/settings/VHDUsageInfo.cpp \
     \ # ---------- Views - HD - Adjustment
     sources/view/VAdjustmentResponseBase.cpp \
     \ # ---------- Views - HD - Adjustment - common
@@ -634,7 +644,8 @@
     \ # Utility
     sources/utility/crc.cpp \
     sources/utility/format.cpp \
-    sources/utility/types.cpp
+    sources/utility/types.cpp \
+    sources/utility/encryption.cpp
 
 RESOURCES += \
     denali.qrc
@@ -766,6 +777,16 @@
     SOURCES += unittests/tst_messaging.cpp
 }
 
+tst_fileHandler {
+    message(Building with QtTest test case fileHandler)
+    QT      += testlib
+    DEFINES += UNIT_TEST \
+        TEST_CLASS_INCLUDE=\\\"unittests/tst_fileHandler.h\\\" \
+        TEST_CLASS_NAME=tst_fileHandler
+    HEADERS += unittests/tst_fileHandler.h
+    SOURCES += unittests/tst_fileHandler.cpp
+}
+
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH =