Index: leahi.pro
===================================================================
diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4
--- leahi.pro	(.../leahi.pro)	(revision d862dfcd402206e33b314c458e41c13b684a4565)
+++ leahi.pro	(.../leahi.pro)	(revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4)
@@ -131,6 +131,10 @@
     \ # Controllers
     sources/ApplicationController.h \
     sources/device/DeviceController.h \
+    sources/model/dg/data/MDDConductivityData.h \
+    sources/model/dg/data/MDDGenDialysateData.h \
+    sources/model/hd/data/treatment/MTreatmentSetPointData.h \
+    sources/model/hd/data/treatment/MTreatmentUltrafiltrationData.h \
     sources/model/dg/adjustment/settings/MAdjustDDSerialNumberResponse.h \
     sources/model/dg/adjustment/settings/MAdjustDDVersionsResponse.h \
     sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.h \
@@ -229,7 +233,6 @@
     sources/model/hd/data/MHDSyringePumpData.h \
     sources/model/hd/data/MHDAirBubbleData.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 \
@@ -276,7 +279,6 @@
     sources/model/dg/data/MDGTemperaturesData.h \
     sources/model/dg/data/MDGValvesStatesData.h \
     sources/model/dg/data/MDGAccelerometerData.h \
-    sources/model/dg/data/MDGConductivityData.h \
     \ # CANBus
     sources/canbus/CanInterface.h \
     sources/canbus/FrameInterface.h \
@@ -299,14 +301,16 @@
     \ # ---------- Views - CONFIRM
     sources/view/confirm/VConfirm.h \
     \ # ---------- Views - POST
+    sources/view/dg/data/VDDGenDialysateData.h \
     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/hd/data/treatment/VTreatmentSetPointData.h \
+    sources/view/hd/data/treatment/VTreatmentUltrafiltrationData.h \
     sources/view/settings/VDateTime.h \
     sources/view/settings/VSettings.h \
     sources/view/settings/VLocalization.h \
@@ -376,7 +380,6 @@
     sources/view/hd/data/treatment/VTreatmentTime.h \
     sources/view/hd/data/treatment/VTreatmentBloodFlow.h \
     sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \
-    sources/view/hd/data/treatment/VTreatmentUltrafiltration.h \
     sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h \
     sources/view/hd/data/treatment/VTreatmentSalineData.h \
     sources/view/hd/data/treatment/VTreatmentHeparinData.h \
@@ -399,7 +402,7 @@
     sources/view/dg/data/VDGTemperaturesData.h \
     sources/view/dg/data/VDGValvesStatesData.h \
     sources/view/dg/data/VDGAccelerometerData.h \
-    sources/view/dg/data/VDGConductivityData.h \
+    sources/view/dg/data/VDDConductivityData.h \
     \ # Storage
     sources/storage/StorageGlobals.h \
     sources/storage/Logger.h \
@@ -428,11 +431,15 @@
     sources/model/hd/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \
     sources/model/hd/adjustment/settings/MAdjustTDVersionsRequest.cpp \
     sources/model/hd/adjustment/settings/MAdjustTDVersionsResponse.cpp \
+    sources/model/dg/data/MDDConductivityData.cpp \
+    sources/model/dg/data/MDDGenDialysateData.cpp \
+    sources/model/hd/data/treatment/MTreatmentSetPointData.cpp \
+    sources/model/hd/data/treatment/MTreatmentUltrafiltrationData.cpp \
     sources/model/ui/data/MUIBloodPressureData.cpp \
     sources/storage/Settings.cpp \
     sources/storage/TreatmentLog.cpp \
+    sources/view/dg/data/VDDGenDialysateData.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 \
@@ -514,7 +521,6 @@
     sources/model/hd/data/MHDSyringePumpData.cpp \
     sources/model/hd/data/MHDAirBubbleData.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 \
@@ -564,7 +570,6 @@
     sources/model/dg/data/MDGTemperaturesData.cpp \
     sources/model/dg/data/MDGValvesStatesData.cpp \
     sources/model/dg/data/MDGAccelerometerData.cpp \
-    sources/model/dg/data/MDGConductivityData.cpp \
     \ # CANBus
     sources/canbus/CanInterface.cpp \
     sources/canbus/FrameInterface.cpp \
@@ -592,6 +597,8 @@
     sources/view/hd/alarm/VAlarmStatus.cpp \
     sources/view/hd/alarm/VAlarmActiveList.cpp \
     \ # ---------- Views - Settings
+    sources/view/hd/data/treatment/VTreatmentSetPointData.cpp \
+    sources/view/hd/data/treatment/VTreatmentUltrafiltrationData.cpp \
     sources/view/settings/VSettings.cpp \
     sources/view/settings/VLocalization.cpp \
     sources/view/settings/VDateTime.cpp \
@@ -658,7 +665,6 @@
     sources/view/hd/data/treatment/VTreatmentTime.cpp \
     sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp \
     sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \
-    sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp \
     sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp \
     sources/view/hd/data/treatment/VTreatmentSalineData.cpp \
     sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \
@@ -682,7 +688,7 @@
     sources/view/dg/data/VDGTemperaturesData.cpp \
     sources/view/dg/data/VDGValvesStatesData.cpp \
     sources/view/dg/data/VDGAccelerometerData.cpp \
-    sources/view/dg/data/VDGConductivityData.cpp \
+    sources/view/dg/data/VDDConductivityData.cpp \
     \ # Storage
     sources/storage/StorageGlobals.cpp \
     sources/storage/FileHandler.cpp \