Index: leahi.pro
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rd862dfcd402206e33b314c458e41c13b684a4565
--- leahi.pro	(.../leahi.pro)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ leahi.pro	(.../leahi.pro)	(revision d862dfcd402206e33b314c458e41c13b684a4565)
@@ -55,14 +55,23 @@
     sources \
     sources/device \
     sources/storage \
-    sources/gui \
     sources/canbus \
+    sources/model \
+    sources/model/td \
+    sources/model/td/data \
+    sources/model/td/alarm \
+    sources/view \
+    sources/view/td \
+    sources/view/td/data \
+    sources/view/confirm \
+    sources/view/settings \
+    \
+    sources/gui \
     sources/utility \
     sources/wifi \
     sources/bluetooth \
     sources/cloudsync \
     sources/abstract \
-    sources/model \
     sources/model/confirm \
     sources/model/settings \
     sources/model/ui/data \
@@ -85,9 +94,6 @@
     sources/model/dg/data/disinfect \
     sources/model/dg/adjustment \
     sources/model/dg/adjustment/settings \
-    sources/view \
-    sources/view/confirm \
-    sources/view/settings \
     sources/view/pretreatment \
     sources/view/ui/data \
     sources/view/hd/adjustment/common \
@@ -125,6 +131,11 @@
     \ # Controllers
     sources/ApplicationController.h \
     sources/device/DeviceController.h \
+    sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h \
+    sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.h \
+    sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h \
+    sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.h \
+    sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.h \
     sources/storage/Settings.h \
     sources/storage/TreatmentLog.h \
     sources/bluetooth/BluetoothInterface.h \
@@ -134,6 +145,10 @@
     sources/model/MAbstract.h \
     sources/model/MAbstractDynamic.h \
     sources/device/DeviceModels.h \
+    \ # ---------- Models - TD - Data                                           //// ----- @LEAHIZED
+    sources/model/td/data/MTDOpModeData.h \
+    \ # ---------- Views - TD - Data - States                                   //// ----- @LEAHIZED
+    sources/view/td/data/VTDOpModeData.h \
     \ # ---------- Models - confirm
     sources/model/confirm/MDuetConfirmHDi.h \
     \ # ---------- Models - POST
@@ -148,8 +163,6 @@
     sources/model/settings/MBluetooth.h \
     sources/model/ui/data/MUIBloodPressureData.h \
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \
-    sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \
-    sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \
@@ -160,7 +173,6 @@
     sources/model/hd/alarm/MAlarmCleared.h \
     sources/model/hd/alarm/MAlarmActiveList.h \
     \ # ---------- Models - States Data
-    sources/model/hd/data/MHDOperationModeData.h \
     sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \
     sources/model/hd/data/treatment/MTreatmentStatesData.h \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \
@@ -169,8 +181,6 @@
     sources/model/hd/adjustment/MAdjustPowerOff.h \
     sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
     \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h \
-    sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
@@ -218,7 +228,14 @@
     sources/model/hd/data/MHDAccelerometerData.h \
     sources/model/hd/data/MHDSyringePumpData.h \
     sources/model/hd/data/MHDAirBubbleData.h \
-    sources/model/hd/data/MHDAirTrapData.h \
+    sources/model/hd/data/MTDAirTrapData.h \
+    sources/model/hd/data/MTDBloodPumpData.h \
+    sources/model/hd/data/MTDVoltageData.h \
+    sources/model/hd/data/MTDTemperatureData.h \
+    sources/model/hd/data/MTDValvesData.h \
+    sources/model/hd/data/MTDBatteryData.h \
+    sources/model/hd/data/MTDSwitchesData.h \
+    sources/model/hd/data/MTDEjectorData.h \
     sources/model/hd/data/MHDBloodLeakData.h \
     sources/model/hd/data/MTreatmentRangesData.h \
     sources/model/hd/data/treatment/MTreatmentTimeData.h \
@@ -242,7 +259,6 @@
     sources/model/dg/adjustment/settings/MAdjustDGRequests.h \
     sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \
     \ # ---------- Models - DG - Adjustment - Settings
-    sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
     sources/model/dg/data/pretreatment/MDGFilterFlushData.h \
@@ -285,6 +301,12 @@
     \ # ---------- Views - POST
     sources/view/dg/data/post/VDGPOSTData.h \
     \ # ---------- Views - Settings
+    sources/view/hd/data/VTDBatteryData.h \
+    sources/view/hd/data/VTDBloodPumpData.h \
+    sources/view/hd/data/VTDEjectorData.h \
+    sources/view/hd/data/VTDSwitchesData.h \
+    sources/view/hd/data/VTDTemperatureData.h \
+    sources/view/hd/data/VTDValvesData.h \
     sources/view/settings/VDateTime.h \
     sources/view/settings/VSettings.h \
     sources/view/settings/VLocalization.h \
@@ -335,7 +357,6 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \
     \ # ---------- Views - HD - Data - States
-    sources/view/hd/data/VHDOperationModeData.h \
     sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \
     sources/view/hd/data/treatment/VHDTreatmentStatesData.h \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \
@@ -348,9 +369,10 @@
     sources/view/hd/data/VHDAccelerometerData.h \
     sources/view/hd/data/VHDSyringePumpData.h \
     sources/view/hd/data/VHDAirBubbleData.h \
-    sources/view/hd/data/VHDAirTrapData.h \
     sources/view/hd/data/VHDBloodLeakData.h \
     sources/view/hd/data/VTreatmentRanges.h \
+    sources/view/hd/data/VTDAirTrapData.h \
+    sources/view/hd/data/VTDVoltageData.h \
     sources/view/hd/data/treatment/VTreatmentTime.h \
     sources/view/hd/data/treatment/VTreatmentBloodFlow.h \
     sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \
@@ -401,16 +423,29 @@
     \ # Controllers
     sources/ApplicationController.cpp \
     sources/device/DeviceController.cpp \
+    sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \
+    sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.cpp \
+    sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \
+    sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp \
+    sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.cpp \
     sources/model/ui/data/MUIBloodPressureData.cpp \
     sources/storage/Settings.cpp \
     sources/storage/TreatmentLog.cpp \
+    sources/view/hd/data/VTDBatteryData.cpp \
+    sources/view/hd/data/VTDBloodPumpData.cpp \
+    sources/view/hd/data/VTDEjectorData.cpp \
+    sources/view/hd/data/VTDSwitchesData.cpp \
+    sources/view/hd/data/VTDTemperatureData.cpp \
+    sources/view/hd/data/VTDValvesData.cpp \
     sources/view/hd/data/post/VHDPOSTData.cpp \
     sources/bluetooth/BluetoothInterface.cpp \
     sources/cloudsync/CloudSyncController.cpp \
     \ # ---------- Models ----------
     sources/model/MAbstract.cpp \
     sources/model/MAbstractDynamic.cpp \
     sources/device/DeviceModels.cpp \
+    \ # ---------- Models - TD - Data - States
+    sources/model/td/data/MTDOpModeData.cpp \
     \ # ---------- Models - CONFIRM
     sources/model/confirm/MDuetConfirmHDi.cpp \
     \ # ---------- Models - POST
@@ -423,8 +458,6 @@
     sources/model/settings/MSettings.cpp \
     sources/model/settings/MBluetooth.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \
-    sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \
-    sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \
@@ -436,15 +469,12 @@
     sources/model/hd/alarm/MAlarmCleared.cpp \
     sources/model/hd/alarm/MAlarmActiveList.cpp \
     \ # ---------- Models - Data - States
-    sources/model/hd/data/MHDOperationModeData.cpp \
     sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/treatment/MTreatmentStatesData.cpp \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustPowerOff.cpp \
     \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp \
-    sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
@@ -483,7 +513,14 @@
     sources/model/hd/data/MHDAccelerometerData.cpp \
     sources/model/hd/data/MHDSyringePumpData.cpp \
     sources/model/hd/data/MHDAirBubbleData.cpp \
-    sources/model/hd/data/MHDAirTrapData.cpp \
+    sources/model/hd/data/MTDAirTrapData.cpp \
+    sources/model/hd/data/MTDBloodPumpData.cpp \
+    sources/model/hd/data/MTDVoltageData.cpp \
+    sources/model/hd/data/MTDTemperatureData.cpp \
+    sources/model/hd/data/MTDValvesData.cpp \
+    sources/model/hd/data/MTDBatteryData.cpp \
+    sources/model/hd/data/MTDSwitchesData.cpp \
+    sources/model/hd/data/MTDEjectorData.cpp \
     sources/model/hd/data/MHDBloodLeakData.cpp \
     sources/model/hd/data/MTreatmentRangesData.cpp \
     sources/model/hd/data/treatment/MTreatmentTimeData.cpp \
@@ -509,7 +546,6 @@
     sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \
     \ # ---------- Models - DG - Adjustment
     \ # ---------- Models - DG - Adjustment - Settings
-    sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \
     \ # ---------- Models - DG - Data - Pre-Treatment - Progress
@@ -546,6 +582,8 @@
     sources/view/VEventSpy.cpp \
     sources/view/VGeneralEvent.cpp \
     sources/device/DeviceView.cpp \
+    \ # ---------- Views - TD - States Data
+    sources/view/td/data/VTDOpModeData.cpp \
     \ # ---------- Views - CONFIRM
     sources/view/confirm/VConfirm.cpp \
     \ # ---------- Views - POST
@@ -601,16 +639,16 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \
     \ # ---------- Views - HD - States Data
-    sources/view/hd/data/VHDOperationModeData.cpp \
     sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \
     sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.cpp \
     sources/view/hd/data/VHDSyringePumpData.cpp \
     sources/view/hd/data/VHDAirBubbleData.cpp \
-    sources/view/hd/data/VHDAirTrapData.cpp \
     sources/view/hd/data/VHDBloodLeakData.cpp \
+    sources/view/hd/data/VTDAirTrapData.cpp \
+    sources/view/hd/data/VTDVoltageData.cpp \
     \ # ---------- Views - HD - Data - Pre-Treatment
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \