Index: sources/model/MModel.h
===================================================================
diff -u -r61a9a75c5b5ed003dc326ec3cc138a8f0e78c1e0 -rd82d6c9dbf4b10a90a1e5e742e9c31400c547358
--- sources/model/MModel.h	(.../MModel.h)	(revision 61a9a75c5b5ed003dc326ec3cc138a8f0e78c1e0)
+++ sources/model/MModel.h	(.../MModel.h)	(revision d82d6c9dbf4b10a90a1e5e742e9c31400c547358)
@@ -53,6 +53,7 @@
 #include "MTreatmentSalineData.h"
 #include "MTreatmentVitalsData.h"
 #include "MTreatmentHDFData.h"
+#include "MTreatmentDryBicartDisconnectData.h"
 #include "MTreatmentHeparinData.h"
 #include "MTreatmentRinsebackData.h"
 #include "MTreatmentRecirculateData.h"
@@ -62,7 +63,7 @@
 #include "MTreatmentIsolatedUFData.h"
 #include "MTreatmentParametersSetPointData.h"
 #include "MHDAccelerometerData.h"
-#include "MHDSyringePumpData.h"
+#include "MTDSyringePumpData.h"
 #include "MHDBloodLeakData.h"
 #include "MHDRTCEpochData.h"
 #include "MHDUsageInfoResponse.h"
@@ -178,6 +179,7 @@
 #include "MTreatmentAdjustAutoSubResponse.h"
 #include "MTreatmentAdjustHDFResponse.h"
 #include "MTreatmentAdjustHDFStateResponse.h"
+#include "MTreatmentAdjustDryBicartDisconnectResponse.h"
 
 // Post-Treatment
 #include "MPostTreatmentAdjustRequests.h"
@@ -378,14 +380,15 @@
     REGISTER_METATYPE(                                                    TreatmentVitalsData ) \
     REGISTER_METATYPE(                                                       TreatmentHDFData ) \
     REGISTER_METATYPE(                                                   TreatmentHeparinData ) \
+    REGISTER_METATYPE(                                       TreatmentDryBicartDisconnectData ) \
     REGISTER_METATYPE(                                                 TreatmentRinsebackData ) \
     REGISTER_METATYPE(                                               TreatmentRecirculateData ) \
     REGISTER_METATYPE(                                                TreatmentBloodPrimeData ) \
     REGISTER_METATYPE(                                                      TreatmentStopData ) \
     REGISTER_METATYPE(                                           TreatmentUltrafiltrationData ) \
     REGISTER_METATYPE(                                                TreatmentIsolatedUFData ) \
     REGISTER_METATYPE(                                        TreatmentParametersSetPointData ) \
-    REGISTER_METATYPE(                                                      HDSyringePumpData ) \
+    REGISTER_METATYPE(                                                      TDSyringePumpData ) \
     REGISTER_METATYPE(                                                    HDAccelerometerData ) \
     REGISTER_METATYPE(                                                        HDBloodLeakData ) \
     REGISTER_METATYPE(                                                          TDAirTrapData ) \
@@ -497,6 +500,7 @@
     REGISTER_METATYPE(                                           AdjustRecirculateRequestData ) \
     REGISTER_METATYPE(                                          AdjustTreatmentEndRequestData ) \
     REGISTER_METATYPE(                                       AdjustPressuresLimitsRequestData ) \
+    REGISTER_METATYPE(                                   AdjustDryBicartDisconnectRequestData ) \
     REGISTER_METATYPE(                                     AdjustPressuresWideningRequestData ) \
     REGISTER_METATYPE(                                             AdjustVersionsResponseData ) \
     REGISTER_METATYPE(                                              AdjustVersionsRequestData ) \
@@ -546,6 +550,7 @@
     REGISTER_METATYPE(                                               AdjustSalineResponseData ) \
     REGISTER_METATYPE(                                               AdjustVitalsResponseData ) \
     REGISTER_METATYPE(                                              AdjustHeparinResponseData ) \
+    REGISTER_METATYPE(                                  AdjustDryBicartDisconnectResponseData ) \
     REGISTER_METATYPE(                                            AdjustRinsebackResponseData ) \
     REGISTER_METATYPE(                                          AdjustRecirculateResponseData ) \
     REGISTER_METATYPE(                                         AdjustTreatmentEndResponseData ) \
@@ -625,14 +630,15 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentVitalsData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                TreatmentHDFData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                            TreatmentHeparinData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                TreatmentDryBicartDisconnectData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          TreatmentRinsebackData ) \
     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,                         TreatmentIsolatedUFData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                 TreatmentParametersSetPointData ) \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               HDSyringePumpData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               TDSyringePumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDAccelerometerData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDBloodLeakData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 TDAirBubbleData ) \
@@ -728,6 +734,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustSalineResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustVitalsResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       AdjustHeparinResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustDryBicartDisconnectResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustRinsebackResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustRecirculateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                  AdjustTreatmentEndResponseData ) \
@@ -792,6 +799,7 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                    AdjustRecirculateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                   AdjustTreatmentEndRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustPressuresLimitsRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustDryBicartDisconnectRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustPressuresWideningRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AdjustVersionsResponseData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                       AdjustVersionsRequestData ) \
@@ -883,14 +891,15 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentVitalsData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                        TreatmentHDFData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                    TreatmentHeparinData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                        TreatmentDryBicartDisconnectData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                  TreatmentRinsebackData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                TreatmentRecirculateData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                 TreatmentBloodPrimeData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                       TreatmentStopData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                            TreatmentUltrafiltrationData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                 TreatmentIsolatedUFData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                         TreatmentParametersSetPointData ) \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                       HDSyringePumpData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                       TDSyringePumpData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     HDAccelerometerData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDBloodLeakData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         TDAirBubbleData ) \
@@ -986,6 +995,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustSalineResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustVitalsResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                               AdjustHeparinResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustDryBicartDisconnectResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustRinsebackResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustRecirculateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                          AdjustTreatmentEndResponseData ) \
@@ -1073,6 +1083,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                            AdjustRecirculateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                           AdjustTreatmentEndRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdjustPressuresLimitsRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustDryBicartDisconnectRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                      AdjustPressuresWideningRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AdjustVersionsResponseData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                               AdjustVersionsRequestData ) \
@@ -1152,6 +1163,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                     AdjustRecirculateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                    AdjustTreatmentEndRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdjustPressuresLimitsRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustDryBicartDisconnectRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(               AdjustPressuresWideningRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AdjustVersionsResponseData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                        AdjustVersionsRequestData ) \
@@ -1225,6 +1237,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(            AdjustIsolatedUFVolumeEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(               AdjustIsolatedUFConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdjustPressuresLimitsRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(             AdjustDryBicartDisconnectRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(               AdjustPressuresWideningRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustVitalsRequestData ) \
@@ -1284,14 +1297,15 @@
     ACTION_RECEIVE_SIGNAL(                                                TreatmentVitalsData ) \
     ACTION_RECEIVE_SIGNAL(                                                   TreatmentHDFData ) \
     ACTION_RECEIVE_SIGNAL(                                               TreatmentHeparinData ) \
+    ACTION_RECEIVE_SIGNAL(                                   TreatmentDryBicartDisconnectData ) \
     ACTION_RECEIVE_SIGNAL(                                             TreatmentRinsebackData ) \
     ACTION_RECEIVE_SIGNAL(                                           TreatmentRecirculateData ) \
     ACTION_RECEIVE_SIGNAL(                                            TreatmentBloodPrimeData ) \
     ACTION_RECEIVE_SIGNAL(                                                  TreatmentStopData ) \
     ACTION_RECEIVE_SIGNAL(                                       TreatmentUltrafiltrationData ) \
     ACTION_RECEIVE_SIGNAL(                                            TreatmentIsolatedUFData ) \
     ACTION_RECEIVE_SIGNAL(                                    TreatmentParametersSetPointData ) \
-    ACTION_RECEIVE_SIGNAL(                                                  HDSyringePumpData ) \
+    ACTION_RECEIVE_SIGNAL(                                                  TDSyringePumpData ) \
     ACTION_RECEIVE_SIGNAL(                                                HDAccelerometerData ) \
     ACTION_RECEIVE_SIGNAL(                                                    HDBloodLeakData ) \
     ACTION_RECEIVE_SIGNAL(                                                      TDAirTrapData ) \
@@ -1388,6 +1402,7 @@
     ACTION_RECEIVE_SIGNAL(                                           AdjustSalineResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                           AdjustVitalsResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                          AdjustHeparinResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                              AdjustDryBicartDisconnectResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                        AdjustRinsebackResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                      AdjustRecirculateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                     AdjustTreatmentEndResponseData ) \