Index: leahi.pro
===================================================================
diff -u -r50d6907ed1bef8273ad246a823073153016997e1 -rbe26185b3a27d8d9a897de22a2344b11f049e618
--- leahi.pro	(.../leahi.pro)	(revision 50d6907ed1bef8273ad246a823073153016997e1)
+++ leahi.pro	(.../leahi.pro)	(revision be26185b3a27d8d9a897de22a2344b11f049e618)
@@ -61,6 +61,7 @@
     sources/model/td/data \
     sources/model/td/data/treatment \
     sources/model/td/data/treatmentlog \
+    sources/model/td/data/pretreatment \
     sources/model/td/alarm \
     sources/model/td/adjustment \
     sources/model/td/adjustment/settings \
@@ -79,6 +80,7 @@
     sources/view/td \
     sources/view/td/data \
     sources/view/td/data/treatment \
+    sources/view/td/data/pretreatment \
     sources/view/td/adjustment/treatment \
     sources/view/td/adjustment/pretreatment \
     sources/view/td/adjustment/posttreatment \
@@ -155,6 +157,8 @@
     sources/model/confirm/MDuetConfirmTDi.h \
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \
+    sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \
+    sources/model/dd/adjustment/settings/MRoWaterModeResponse.h \
     sources/model/dd/data/MDDBloodLeakData.h \
     sources/model/dd/data/MDDConcentratePumpData.h \
     sources/model/dd/data/MDDConductivityData.h \
@@ -179,7 +183,12 @@
     sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \
+    sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h \
     sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.h \
@@ -193,8 +202,10 @@
     sources/model/td/data/MTDValvesData.h \
     sources/model/td/data/MTDVoltageData.h \
     sources/model/td/data/MWaterSampleData.h \
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.h \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
+    sources/model/td/data/treatment/MTreatmentHDFData.h \
     sources/model/td/data/treatment/MTreatmentIsolatedUFData.h \
     sources/model/td/data/treatment/MTreatmentParametersSetPointData.h \
     sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h \
@@ -261,8 +272,13 @@
     sources/view/fp/data/VFPROPumpData.h \
     sources/view/fp/data/VFPRORejectionPercentageData.h \
     sources/view/fp/data/VFPTemperatureData.h \
+    sources/view/settings/VAdjustRoWaterMode.h \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
     sources/view/settings/VAdvancedInstitutionalRecord.h \
+    sources/view/settings/VRoWaterMode.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.h \
     sources/view/settings/VCalibrationSettings.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
     sources/view/td/data/VTDAirBubbleData.h \
@@ -277,10 +293,13 @@
     sources/view/td/data/VTDVoltageData.h \
     sources/view/td/data/VTreatmentRanges.h \
     sources/view/td/data/VWaterSampleData.h \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.h \
     sources/view/td/data/treatment/VTreatmentBloodFlow.h \
     sources/view/td/data/treatment/VTreatmentBloodPrimeData.h \
+    sources/view/td/data/treatment/VTreatmentHDFData.h \
     sources/view/td/data/treatment/VTreatmentIsolatedUFData.h \
     sources/view/td/data/treatment/VTreatmentParametersSetPointData.h \
     sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \
@@ -301,6 +320,8 @@
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.h \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.h \
@@ -353,20 +374,16 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \
-    sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.h \
     sources/model/hd/alarm/MAlarmTriggered.h \
     sources/model/hd/alarm/MAlarmCleared.h \
     sources/model/hd/alarm/MAlarmActiveList.h \
     \ # ---------- Models - States Data
-    sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \
     \ # ---------- Models - HD - Adjustment
     sources/model/hd/adjustment/MAdjustRequestsBase.h \
     sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
-    \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \
@@ -449,7 +466,6 @@
     sources/view/settings/VAdjustmentServiceMode.h \
     sources/view/settings/VAdjustmentServiceDates.h \
     sources/view/settings/VAdjustmentDGCleaningUsage.h \
-    sources/view/settings/VDuetRoWaterDG.h \
     sources/view/settings/VCloudSync.h \
     sources/view/settings/VHDUsageInfo.h \
     sources/view/settings/VAdjustmentInstitutionalRecord.h \
@@ -477,7 +493,6 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \
     \ # ---------- Views - HD - Data - States
-    sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \
     \ # ---------- Views - HD - Data - Pre-Treatment - Progress
     sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \
@@ -528,6 +543,8 @@
     sources/model/confirm/MDuetConfirmTDi.cpp \
     sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \
     sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \
+    sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \
+    sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp \
     sources/model/dd/data/MDDBloodLeakData.cpp \
     sources/model/dd/data/MDDConcentratePumpData.cpp \
     sources/model/dd/data/MDDConductivityData.cpp \
@@ -553,6 +570,10 @@
     sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \
     sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \
     sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustIsolatedUFStateResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.cpp \
+    sources/model/td/adjustment/treatment/MTreatmentAdjustHDFStateResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustPressuresWideningResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsAlarmLimitsResponse.cpp \
     sources/model/td/data/MTDAirBubbleData.cpp \
@@ -565,8 +586,10 @@
     sources/model/td/data/MTDValvesData.cpp \
     sources/model/td/data/MTDVoltageData.cpp \
     sources/model/td/data/MWaterSampleData.cpp \
+    sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \
     sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
+    sources/model/td/data/treatment/MTreatmentHDFData.cpp \
     sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp \
     sources/model/td/data/treatment/MTreatmentParametersSetPointData.cpp \
     sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp \
@@ -650,20 +673,19 @@
     sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \
     sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \
-    sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \
     \ # ---------- Models - Alarm
     sources/model/hd/alarm/MAlarmStatusData.cpp \
     sources/model/hd/alarm/MAlarmMapping.cpp \
     sources/model/hd/alarm/MAlarmTriggered.cpp \
     sources/model/hd/alarm/MAlarmCleared.cpp \
     sources/model/hd/alarm/MAlarmActiveList.cpp \
     \ # ---------- Models - Data - States
-    sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \
     sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \
     \ # ---------- Models - TD - Adjustment - Settings
     sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \
     sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \
     sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \
+    sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \
     \ # ---------- Models - TD - Adjustment - Pre-Treatment
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
     sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
@@ -676,8 +698,6 @@
     sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
     \ # ---------- Models - DD - Adjustment - Settings
     sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \
-    \ # ---------- Models - HD - Adjustment - Settings
-    sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \
     \ # ---------- Models - HD - Adjustment - Pre-Treatment
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \
     sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \
@@ -740,8 +760,13 @@
     sources/view/VGeneralEvent.cpp \
     sources/device/DeviceView.cpp \
     \ # ---------- Views - TD - States Data
+    sources/view/settings/VAdjustRoWaterMode.cpp \
     sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
     sources/view/settings/VAdvancedInstitutionalRecord.cpp \
+    sources/view/settings/VRoWaterMode.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.cpp \
     sources/view/settings/VCalibrationSettings.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
     sources/view/td/data/VTDAirBubbleData.cpp \
@@ -756,10 +781,13 @@
     sources/view/td/data/VTDVoltageData.cpp \
     sources/view/td/data/VTreatmentRanges.cpp \
     sources/view/td/data/VWaterSampleData.cpp \
+    \ # ---------- Views - TD - Data - Pre-Treatment
+    sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \
     \ # ---------- Views - TD - Data - In-Treatment
     sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
     sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
     sources/view/td/data/treatment/VTreatmentBloodPrimeData.cpp \
+    sources/view/td/data/treatment/VTreatmentHDFData.cpp \
     sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp \
     sources/view/td/data/treatment/VTreatmentParametersSetPointData.cpp \
     sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \
@@ -780,6 +808,8 @@
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFDurationEdit.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFVolumeEdit.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFConfirm.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentIsolatedUFState.cpp \
+    sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentSetPoints.cpp \
@@ -812,7 +842,6 @@
     sources/view/settings/VAdjustmentAlarmVolume.cpp \
     sources/view/settings/VAdjustmentServiceMode.cpp \
     sources/view/settings/VAdjustmentServiceDates.cpp \
-    sources/view/settings/VDuetRoWaterDG.cpp \
     sources/view/settings/VCloudSync.cpp \
     sources/view/settings/VAdjustmentDGCleaningUsage.cpp \
     sources/view/settings/VHDUsageInfo.cpp \
@@ -838,7 +867,6 @@
     \ # ---------- Views - HD - Adjustment - Disinfection
     sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \
     \ # ---------- Views - HD - States Data
-    sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \
     sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \
     \ # ---------- Views - HD - Data
     sources/view/hd/data/VHDAccelerometerData.cpp \
Index: leahi.qrc
===================================================================
diff -u -r969fb65fb9857c0a6a84cb9f7d591d16de40e898 -rbe26185b3a27d8d9a897de22a2344b11f049e618
--- leahi.qrc	(.../leahi.qrc)	(revision 969fb65fb9857c0a6a84cb9f7d591d16de40e898)
+++ leahi.qrc	(.../leahi.qrc)	(revision be26185b3a27d8d9a897de22a2344b11f049e618)
@@ -44,7 +44,6 @@
         <file alias="UfVolumeAdjustment.qml">sources/gui/qml/dialogs/UfVolumeAdjustment.qml</file>
         <file alias="HeparinRxAdjustment.qml">sources/gui/qml/dialogs/HeparinRxAdjustment.qml</file>
         <file alias="AlarmDialog.qml">sources/gui/qml/dialogs/AlarmDialog.qml</file>
-        <file alias="PatientIdEntry.qml">sources/gui/qml/dialogs/PatientIdEntry.qml</file>
         <file alias="DryDemoDialog.qml">sources/gui/qml/dialogs/DryDemoDialog.qml</file>
         <file alias="ConfirmPasswordDialog.qml">sources/gui/qml/dialogs/ConfirmPasswordDialog.qml</file>
         <file alias="CalibrationDialog.qml">sources/gui/qml/dialogs/CalibrationDialog.qml</file>
@@ -342,6 +341,7 @@
         <file alias="TreatmentAdjustmentVitals.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml</file>
         <file alias="TreatmentAdjustmentVitalsInterval.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml</file>
         <file alias="TreatmentAdjustmentHDF.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml</file>
+        <file alias="TreatmentAdjustmentEndIsolatedUF.qml">sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentEndIsolatedUF.qml</file>
     </qresource>
     <qresource prefix="/pages/endtreatment">
         <file alias="EndTreatmentRinsebackStack.qml">sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml</file>
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r50d6907ed1bef8273ad246a823073153016997e1 -rbe26185b3a27d8d9a897de22a2344b11f049e618
--- sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision 50d6907ed1bef8273ad246a823073153016997e1)
+++ sources/gui/GuiGlobals.cpp	(.../GuiGlobals.cpp)	(revision be26185b3a27d8d9a897de22a2344b11f049e618)
@@ -49,7 +49,8 @@
 #include "VDateTime.h"
 #include "VAdjustmentAlarmVolume.h"
 #include "VBluetooth.h"
-#include "VDuetRoWaterDG.h"
+#include "VAdjustRoWaterMode.h"
+#include "VRoWaterMode.h"
 #include "VCloudSync.h"
 #include "VHDUsageInfo.h"
 #include "VAdjustmentInstitutionalRecord.h"
@@ -106,6 +107,7 @@
 #include "VTDTemperatureData.h"
 #include "VTreatmentTrends.h"
 #include "VWaterSampleData.h"
+#include "VTreatmentHDFData.h"
 // DG data
 #include "VDGDrainPumpData.h"
 #include "VDDHeatersData.h"
@@ -159,8 +161,12 @@
 #include "VTreatmentAdjustmentIsolatedUFConfirm.h"
 #include "VTreatmentAdjustmentIsolatedUFDurationEdit.h"
 #include "VTreatmentAdjustmentIsolatedUFVolumeEdit.h"
+#include "VTreatmentAdjustmentIsolatedUFState.h"
 #include "VTreatmentAdjustmentSetPoints.h"
 #include "VTreatmentAdjustmentVitalsAlarmLimits.h"
+#include "VTreatmentAdjustmentAutoSub.h"
+#include "VTreatmentAdjustmentHDFState.h"
+#include "VTreatmentAdjustmentHDF.h"
 // ----- Post-Treatment Adjustments
 #include "VPostTreatmentAdjustPatientDisconnectionConfirm.h"
 #include "VPostTreatmentAdjustDisposablesRemovalConfirm.h"
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r50d6907ed1bef8273ad246a823073153016997e1 -rbe26185b3a27d8d9a897de22a2344b11f049e618
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 50d6907ed1bef8273ad246a823073153016997e1)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision be26185b3a27d8d9a897de22a2344b11f049e618)
@@ -54,7 +54,8 @@
 import VDateTime                                            0.1
 import VAdjustmentAlarmVolume                               0.1
 import VBluetooth                                           0.1
-import VDuetRoWaterDG                                       0.1
+import VAdjustRoWaterMode                                   0.1
+import VRoWaterMode                                         0.1
 import VCloudSync                                           0.1
 import VHDUsageInfo                                         0.1
 import VInstitutionalRecord                                 0.1
@@ -87,6 +88,7 @@
 import VTreatmentRanges                                     0.1
 import VTreatmentHeparin                                    0.1
 import VTreatmentTrends                                     0.1
+import VTreatmentHDF                                        0.1
 
 // Pre-Treatment
 import VPreTreatmentAdjustmentInitTreatment                 0.1
@@ -144,6 +146,7 @@
 import VTreatmentAdjustmentIsolatedUFVolumeEdit             0.1
 import VTreatmentAdjustmentIsolatedUFConfirm                0.1
 import VTreatmentAdjustmentUltrafiltrationState             0.1
+import VTreatmentAdjustmentIsolatedUFState                  0.1
 import VTreatmentAdjustmentUltrafiltrationEdit              0.1
 import VTreatmentAdjustmentUltrafiltrationConfirm           0.1
 import VTreatmentAdjustmentPressuresLimits                  0.1
@@ -154,6 +157,9 @@
 import VTreatmentAdjustmentRinseback                        0.1
 import VTreatmentAdjustmentRecirculate                      0.1
 import VTreatmentAdjustmentEnd                              0.1
+import VTreatmentAdjustmentAutoSub                          0.1
+import VTreatmentAdjustmentHDFState                         0.1
+import VTreatmentAdjustmentHDF                              0.1
 // Post-Treatmnt
 import VPostTreatmentAdjustmentPatientDisconnectionConfirm  0.1
 import VPostTreatmentAdjustmentDisposablesRemovalConfirm    0.1
@@ -197,7 +203,8 @@
     VDateTime                                           { id: vDateTime                                             }
     VAdjustmentAlarmVolume                              { id: vAdjustmentAlarmVolume                                }
     VBluetooth                                          { id: vBluetooth                                            }
-    VDuetRoWaterDG                                      { id: vDuetRoWaterDG                                        }
+    VAdjustRoWaterMode                                  { id: vAdjustRoWaterMode                                    }
+    VRoWaterMode                                        { id: vRoWaterMode                                          }
     VCloudSync                                          { id: vCloudSync                                            }
     VHDUsageInfo                                        { id: vHDUsageInfo                                          }
     VAdjustmentInstitutionalRecord                      { id: vAdjustmentInstitutionalRecord                        }
@@ -261,6 +268,7 @@
     VTreatmentRecirculate                               { id: vTreatmentRecirculate                                 }
     VTreatmentStop                                      { id: vTreatmentStop                                        }
     VTreatmentHeparin                                   { id: vTreatmentHeparin                                     }
+    VTreatmentHDF                                       { id: vTreatmentHDF                                         }
 
     // ---- DD
     VDGDrainPump                                        { id: vDGDrainPump                                          }
@@ -322,6 +330,7 @@
     VTreatmentAdjustmentIsolatedUFDurationEdit          { id: vTreatmentAdjustmentIsolatedUFDurationEdit            }
     VTreatmentAdjustmentIsolatedUFVolumeEdit            { id: vTreatmentAdjustmentIsolatedUFVolumeEdit              }
     VTreatmentAdjustmentIsolatedUFConfirm               { id: vTreatmentAdjustmentIsolatedUFConfirm                 }
+    VTreatmentAdjustmentIsolatedUFState                 { id: vTreatmentAdjustmentIsolatedUFState                   }
     VTreatmentAdjustmentSaline                          { id: vTreatmentAdjustmentSaline                            }
     VTreatmentAdjustmentVitals                          { id: vTreatmentAdjustmentVitals                            }
     VTreatmentAdjustmentUltrafiltrationState            { id: vTreatmentAdjustmentUltrafiltrationState              }
@@ -333,6 +342,9 @@
     VTreatmentAdjustmentRinseback                       { id: vTreatmentAdjustmentRinseback                         }
     VTreatmentAdjustmentRecirculate                     { id: vTreatmentAdjustmentRecirculate                       }
     VTreatmentAdjustmentEnd                             { id: vTreatmentAdjustmentEnd                               }
+    VTreatmentAdjustmentAutoSub                         { id: vTreatmentAdjustmentAutoSub                           }
+    VTreatmentAdjustmentHDFState                        { id: vTreatmentAdjustmentHDFState                          }
+    VTreatmentAdjustmentHDF                             { id: vTreatmentAdjustmentHDF                               }
 
     // --- Post Treatment
     VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm   }
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r7bde5ac0646170a584dd5410fcf89fd9bc8b251c -rbe26185b3a27d8d9a897de22a2344b11f049e618
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 7bde5ac0646170a584dd5410fcf89fd9bc8b251c)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision be26185b3a27d8d9a897de22a2344b11f049e618)
@@ -74,6 +74,7 @@
     readonly property bool visibleAdvancedInstitutional :                           loggedIn
     readonly property bool visibleLocalization          :                           loggedIn
     readonly property bool visibleAdvancedModes         :                           loggedIn
+    readonly property bool visibleCalibrationSettings   :                           loggedIn
 
     readonly property string settingsTitle              : _GuiView.manufactSetup ? qsTr("Manufacturing Setup")  : _GuiView.updateSetup
                                                                                  ? qsTr("Software Update")      : qsTr("Device Settings")
@@ -100,6 +101,7 @@
         AdvancedInstitutional   ,
         FeatureConfigurations   ,
         AdvancedMode            ,
+        CalibrationSettings     ,
         Home
     }
     property var itemsText  : [
@@ -124,6 +126,7 @@
         qsTr("Advanced Institutional Settings"  ), // AdvancedInstitutional
         qsTr("Feature Configurations"           ), // FeatureConfigurations
         qsTr("Advanced Mode"                    ), // Advanced Modes
+        qsTr("Calibration Settings"             ), // Calibration Settings
         settingsTitle                            , // settings home
     ]
 
@@ -149,6 +152,7 @@
         visibleAdvancedInstitutional        , // AdvancedInstitutional
         visibleFeatureConfigurations        , // FeatureConfigurations
         visibleAdvancedModes                , // Advanced Modes
+        visibleCalibrationSettings          , // Calibration Settings
         false                               , // leave last and false align with settings home
     ]
 
@@ -260,6 +264,10 @@
                 push( _settingAdvancedMode )
                 break
 
+            case SettingsStack.CalibrationSettings:
+                push( _settingCalibrationSettings )
+                break
+
             default:
                 console.debug("Unknown Index", vIndex)
                 break
@@ -286,6 +294,7 @@
     SettingsLocalization            { id: _settingLocalization          }
     SettingsFeatureConfigurations   { id: _settingsFeatureConfigurations}
     SettingsAdvancedMode            { id: _settingAdvancedMode          }
+    SettingsCalibrationSettings     { id: _settingCalibrationSettings   }
 
     function gotoServiceMode( vservice ) {
         //DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)
Index: sources/view/VView.h
===================================================================
diff -u -r50d6907ed1bef8273ad246a823073153016997e1 -rbe26185b3a27d8d9a897de22a2344b11f049e618
--- sources/view/VView.h	(.../VView.h)	(revision 50d6907ed1bef8273ad246a823073153016997e1)
+++ sources/view/VView.h	(.../VView.h)	(revision be26185b3a27d8d9a897de22a2344b11f049e618)
@@ -139,7 +139,8 @@
     REGISTER_TYPE( VDateTime                                            ) \
     REGISTER_TYPE( VAdjustmentAlarmVolume                               ) \
     REGISTER_TYPE( VBluetooth                                           ) \
-    REGISTER_TYPE( VDuetRoWaterDG                                       ) \
+    REGISTER_TYPE( VAdjustRoWaterMode                                   ) \
+    REGISTER_TYPE( VRoWaterMode                                         ) \
     REGISTER_TYPE( VCloudSync                                           ) \
     REGISTER_TYPE( VHDUsageInfo                                         ) \
     REGISTER_TYPE( VAdjustmentInstitutionalRecord                       ) \
@@ -249,8 +250,13 @@
     REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFConfirm                ) \
     REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFDurationEdit           ) \
     REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFVolumeEdit             ) \
+    REGISTER_TYPE( VTreatmentAdjustmentIsolatedUFState                  ) \
     REGISTER_TYPE( VTreatmentAdjustmentSetPoints                        ) \
     REGISTER_TYPE( VTreatmentAdjustmentVitalsAlarmLimits                ) \
+    REGISTER_TYPE( VTreatmentHDF                                        ) \
+    REGISTER_TYPE( VTreatmentAdjustmentAutoSub                          ) \
+    REGISTER_TYPE( VTreatmentAdjustmentHDFState                         ) \
+    REGISTER_TYPE( VTreatmentAdjustmentHDF                              ) \
     REGISTER_TYPE( VTreatmentCreate                                     ) \
     REGISTER_TYPE( VTreatmentIsolatedUF                                 ) \
     REGISTER_TYPE( VTreatmentTrends                                     ) \