Index: sources/model/MModel.h
===================================================================
diff -u -r7710fea4486a639caaa3c510add0eac0bcd4ddcc -r58014dae52ee6357e88b9b03bcad457ddcb432e8
--- sources/model/MModel.h	(.../MModel.h)	(revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc)
+++ sources/model/MModel.h	(.../MModel.h)	(revision 58014dae52ee6357e88b9b03bcad457ddcb432e8)
@@ -31,6 +31,7 @@
 #include "MTreatmentStatesData.h"
 #include "MTreatmentSalineData.h"
 #include "MTreatmentHeparinData.h"
+#include "MTreatmentRinsebackData.h"
 
 #include "MDGDrainPumpData.h"
 #include "MDGHeatersData.h"
@@ -57,6 +58,8 @@
 #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
 #include "MTreatmentAdjustSalineResponse.h"
 #include "MTreatmentAdjustHeparinResponse.h"
+#include "MTreatmentAdjustRinsebackResponse.h"
+#include "MTreatmentAdjustRecirculateResponse.h"
 #include "MTreatmentAdjustPressuresLimitsResponse.h"
 #include "MPrimingData.h"
 #include "MStartTreatmentResponse.h"
@@ -192,6 +195,7 @@
     REGISTER_METATYPE(                                                    TreatmentStatesData ) \
     REGISTER_METATYPE(                                                    TreatmentSalineData ) \
     REGISTER_METATYPE(                                                   TreatmentHeparinData ) \
+    REGISTER_METATYPE(                                                 TreatmentRinsebackData ) \
     REGISTER_METATYPE(                                                    HDOperationModeData ) \
                                                                                                 \
     REGISTER_METATYPE(                                                        AlarmStatusData ) \
@@ -232,6 +236,8 @@
     REGISTER_METATYPE(                                AdjustUltrafiltrationConfirmRequestData ) \
     REGISTER_METATYPE(                                                AdjustSalineRequestData ) \
     REGISTER_METATYPE(                                               AdjustHeparinRequestData ) \
+    REGISTER_METATYPE(                                             AdjustRinsebackRequestData ) \
+    REGISTER_METATYPE(                                           AdjustRecirculateRequestData ) \
     REGISTER_METATYPE(                                       AdjustPressuresLimitsRequestData ) \
     REGISTER_METATYPE(                                   AdjustTreatmentParametersRequestData ) \
     /* Response     */                                                                          \
@@ -246,6 +252,8 @@
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
     REGISTER_METATYPE(                                               AdjustSalineResponseData ) \
     REGISTER_METATYPE(                                              AdjustHeparinResponseData ) \
+    REGISTER_METATYPE(                                            AdjustRinsebackResponseData ) \
+    REGISTER_METATYPE(                                          AdjustRecirculateResponseData ) \
     REGISTER_METATYPE(                                      AdjustPressuresLimitsResponseData ) \
     REGISTER_METATYPE(                                  AdjustTreatmentParametersResponseData ) \
 
@@ -275,6 +283,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentSalineData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                            TreatmentHeparinData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          TreatmentRinsebackData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDOperationModeData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 AlarmStatusData ) \
@@ -307,6 +316,8 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        EndTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustSalineResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       AdjustHeparinResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustRinsebackResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustRecirculateResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               AdjustPressuresLimitsResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustTreatmentParametersResponseData ) \
 
@@ -324,6 +335,8 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                        AdjustHeparinRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AdjustRinsebackRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                    AdjustRecirculateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustTreatmentParametersRequestData ) \
                                                                                                 \
@@ -362,6 +375,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentSalineData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                    TreatmentHeparinData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                  TreatmentRinsebackData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     HDOperationModeData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         AlarmStatusData ) \
@@ -394,6 +408,8 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                EndTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustSalineResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                               AdjustHeparinResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustRinsebackResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustRecirculateResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                       AdjustPressuresLimitsResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustTreatmentParametersResponseData ) \
 
@@ -410,6 +426,8 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                AdjustHeparinRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AdjustRinsebackRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                            AdjustRecirculateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustTreatmentParametersRequestData ) \
                                                                                                 \
@@ -432,6 +450,8 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                         AdjustHeparinRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AdjustRinsebackRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                     AdjustRecirculateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustTreatmentParametersRequestData ) \
                                                                                                 \
@@ -452,6 +472,8 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustSalineRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                         AdjustHeparinRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AdjustRinsebackRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                     AdjustRecirculateRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        StartTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      ConfirmTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          EndTreatmentRequestData ) \
@@ -477,6 +499,7 @@
     ACTION_RECEIVE_SIGNAL(                                                TreatmentStatesData ) \
     ACTION_RECEIVE_SIGNAL(                                                TreatmentSalineData ) \
     ACTION_RECEIVE_SIGNAL(                                               TreatmentHeparinData ) \
+    ACTION_RECEIVE_SIGNAL(                                             TreatmentRinsebackData ) \
     ACTION_RECEIVE_SIGNAL(                                                HDOperationModeData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                                    AlarmStatusData ) \
@@ -509,6 +532,8 @@
     ACTION_RECEIVE_SIGNAL(                              AdjustTreatmentParametersResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                           AdjustSalineResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                          AdjustHeparinResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                        AdjustRinsebackResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                      AdjustRecirculateResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                  AdjustPressuresLimitsResponseData ) \
 
 //--------------------------------------------------------------------------------//