Index: sources/model/MModel.h
===================================================================
diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -r57f4e55fd9102dce870271ec379d44aa478128fe
--- sources/model/MModel.h	(.../MModel.h)	(revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 57f4e55fd9102dce870271ec379d44aa478128fe)
@@ -57,8 +57,6 @@
 #include "MTreatmentRecirculateData.h"
 #include "MTreatmentBloodPrimeData.h"
 #include "MTreatmentStopData.h"
-#include "MTreatmentUltrafiltrationData.h"
-#include "MTreatmentParametersSetPointData.h"
 #include "MHDAccelerometerData.h"
 #include "MHDSyringePumpData.h"
 #include "MHDBloodLeakData.h"
@@ -67,6 +65,7 @@
 #include "MHDUsageInfoResponse.h"
 #include "MTDAirTrapData.h"
 #include "MTDVoltageData.h"
+#include "MTDBloodPumpData.h"
 #include "MTDValvesData.h"
 #include "MTDBatteryData.h"
 #include "MTDSwitchesData.h"
@@ -107,8 +106,8 @@
 #include "MDGTemperaturesData.h"
 #include "MDGValvesStatesData.h"
 #include "MDGAccelerometerData.h"
-#include "MDDConductivityData.h"
-#include "MDDGenDialysateData.h"
+#include "MDGConductivityData.h"
+#include "MDDLevelData.h"
 
 // Pre-Treatment
 #include "MPreTreatmentAdjustRequests.h"
@@ -311,10 +310,6 @@
     REGISTER_METATYPE(                                             DeviceUSBMountResponseData ) \
     REGISTER_METATYPE(                                             DeviceWifiListRequestData  ) \
     REGISTER_METATYPE(                                             DeviceWifiListResponseData ) \
-    REGISTER_METATYPE(                                             DeviceWifiInfoRequestData  ) \
-    REGISTER_METATYPE(                                             DeviceWifiInfoResponseData ) \
-    REGISTER_METATYPE(                                          DeviceWifiConnectRequestData  ) \
-    REGISTER_METATYPE(                                          DeviceWifiConnectResponseData ) \
     /*                                      Settings                                         */ \
     REGISTER_METATYPE(                                                           SettingsData ) \
     REGISTER_METATYPE(                                                          BluetoothData ) \
@@ -337,13 +332,12 @@
     REGISTER_METATYPE(                                               TreatmentRecirculateData ) \
     REGISTER_METATYPE(                                                TreatmentBloodPrimeData ) \
     REGISTER_METATYPE(                                                      TreatmentStopData ) \
-    REGISTER_METATYPE(                                           TreatmentUltrafiltrationData ) \
-    REGISTER_METATYPE(                                        TreatmentParametersSetPointData ) \
     REGISTER_METATYPE(                                                      HDSyringePumpData ) \
     REGISTER_METATYPE(                                                    HDAccelerometerData ) \
     REGISTER_METATYPE(                                                        HDBloodLeakData ) \
     REGISTER_METATYPE(                                                          TDAirTrapData ) \
     REGISTER_METATYPE(                                                          TDVoltageData ) \
+    REGISTER_METATYPE(                                                        TDBloodPumpData ) \
     REGISTER_METATYPE(                                                           TDValvesData ) \
     REGISTER_METATYPE(                                                          TDBatteryData ) \
     REGISTER_METATYPE(                                                         TDSwitchesData ) \
@@ -370,8 +364,8 @@
     REGISTER_METATYPE(                                                 DGLoadCellReadingsData ) \
     REGISTER_METATYPE(                                                     DGTemperaturesData ) \
     REGISTER_METATYPE(                                                    DGAccelerometerData ) \
-    REGISTER_METATYPE(                                                     DDConductivityData ) \
-    REGISTER_METATYPE(                                                     DDGenDialysateData ) \
+    REGISTER_METATYPE(                                                     DGConductivityData ) \
+    REGISTER_METATYPE(                                                            DDLevelData ) \
                                                                                                 \
     REGISTER_METATYPE(                                                        HDDebugTextData ) \
     REGISTER_METATYPE(                                                        DGDebugTextData ) \
@@ -527,14 +521,13 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        TreatmentRecirculateData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                         TreatmentBloodPrimeData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               TreatmentStopData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    TreatmentUltrafiltrationData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 TreatmentParametersSetPointData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               HDSyringePumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDAccelerometerData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDBloodLeakData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDAirBubbleData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDAirTrapData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDVoltageData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 TDBloodPumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               TDTemperatureData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                   TDEjectorData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                  TDSwitchesData ) \
@@ -558,8 +551,8 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          DGLoadCellReadingsData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DGTemperaturesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             DGAccelerometerData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DDConductivityData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DDGenDialysateData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DGConductivityData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                     DDLevelData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDebugTextData ) \
@@ -729,14 +722,13 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                TreatmentRecirculateData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                 TreatmentBloodPrimeData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                       TreatmentStopData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                            TreatmentUltrafiltrationData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                         TreatmentParametersSetPointData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                       HDSyringePumpData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     HDAccelerometerData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDBloodLeakData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDAirBubbleData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDAirTrapData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDVoltageData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         TDBloodPumpData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                            TDValvesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                           TDBatteryData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                          TDSwitchesData ) \
@@ -760,8 +752,8 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                  DGLoadCellReadingsData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                      DGTemperaturesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     DGAccelerometerData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                      DDConductivityData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                      DDGenDialysateData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                      DGConductivityData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                             DDLevelData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGDebugTextData ) \
@@ -1035,13 +1027,12 @@
     ACTION_RECEIVE_SIGNAL(                                           TreatmentRecirculateData ) \
     ACTION_RECEIVE_SIGNAL(                                            TreatmentBloodPrimeData ) \
     ACTION_RECEIVE_SIGNAL(                                                  TreatmentStopData ) \
-    ACTION_RECEIVE_SIGNAL(                                       TreatmentUltrafiltrationData ) \
-    ACTION_RECEIVE_SIGNAL(                                    TreatmentParametersSetPointData ) \
     ACTION_RECEIVE_SIGNAL(                                                  HDSyringePumpData ) \
     ACTION_RECEIVE_SIGNAL(                                                HDAccelerometerData ) \
     ACTION_RECEIVE_SIGNAL(                                                    HDBloodLeakData ) \
     ACTION_RECEIVE_SIGNAL(                                                      TDAirTrapData ) \
     ACTION_RECEIVE_SIGNAL(                                                      TDVoltageData ) \
+    ACTION_RECEIVE_SIGNAL(                                                    TDBloodPumpData ) \
     ACTION_RECEIVE_SIGNAL(                                                       TDValvesData ) \
     ACTION_RECEIVE_SIGNAL(                                                      TDBatteryData ) \
     ACTION_RECEIVE_SIGNAL(                                                     TDSwitchesData ) \
@@ -1067,8 +1058,8 @@
     ACTION_RECEIVE_SIGNAL(                                             DGLoadCellReadingsData ) \
     ACTION_RECEIVE_SIGNAL(                                                 DGTemperaturesData ) \
     ACTION_RECEIVE_SIGNAL(                                                DGAccelerometerData ) \
-    ACTION_RECEIVE_SIGNAL(                                                 DDConductivityData ) \
-    ACTION_RECEIVE_SIGNAL(                                                 DDGenDialysateData ) \
+    ACTION_RECEIVE_SIGNAL(                                                 DGConductivityData ) \
+    ACTION_RECEIVE_SIGNAL(                                                        DDLevelData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                                    HDDebugTextData ) \
     ACTION_RECEIVE_SIGNAL(                                                    DGDebugTextData ) \