Index: sources/model/MModel.h
===================================================================
diff -u -r02a702c562dc3bd54de1471d6dbb263d06dd8bf5 -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7
--- sources/model/MModel.h	(.../MModel.h)	(revision 02a702c562dc3bd54de1471d6dbb263d06dd8bf5)
+++ sources/model/MModel.h	(.../MModel.h)	(revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7)
@@ -29,6 +29,7 @@
 #include "MTreatmentRangesData.h"
 #include "MTreatmentStatesData.h"
 #include "MTreatmentSalineData.h"
+#include "MTreatmentHeparinData.h"
 
 #include "MDGDrainPumpData.h"
 #include "MDGHeatersData.h"
@@ -52,11 +53,12 @@
 #include "MTreatmentAdjustUltrafiltrationStateResponse.h"
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
 #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
+#include "MTreatmentAdjustSalineResponse.h"
+#include "MTreatmentAdjustHeparinResponse.h"
+#include "MTreatmentAdjustPressuresLimitsResponse.h"
 #include "MPrimingData.h"
 #include "MStartTreatmentResponse.h"
 #include "MEndTreatmentResponse.h"
-#include "MTreatmentAdjustSalineResponse.h"
-#include "MTreatmentAdjustPressuresLimitsResponse.h"
 
 /*!
  * \page MessageFlow Message interpretation Flow
@@ -191,6 +193,7 @@
     REGISTER_METATYPE(                                                       AlarmClearedData ) \
     REGISTER_METATYPE(                                                    TreatmentStatesData ) \
     REGISTER_METATYPE(                                                    TreatmentSalineData ) \
+    REGISTER_METATYPE(                                                   TreatmentHeparinData ) \
     REGISTER_METATYPE(                                                    HDOperationModeData ) \
                                                                                                 \
     REGISTER_METATYPE(                                                           DGROPumpData ) \
@@ -220,6 +223,7 @@
     REGISTER_METATYPE(                                   AdjustUltrafiltrationEditRequestData ) \
     REGISTER_METATYPE(                                AdjustUltrafiltrationConfirmRequestData ) \
     REGISTER_METATYPE(                                                AdjustSalineRequestData ) \
+    REGISTER_METATYPE(                                               AdjustHeparinRequestData ) \
     REGISTER_METATYPE(                                       AdjustPressuresLimitsRequestData ) \
     REGISTER_METATYPE(                                   AdjustTreatmentParametersRequestData ) \
     /* Response     */                                                                          \
@@ -232,6 +236,7 @@
     REGISTER_METATYPE(                                  AdjustUltrafiltrationEditResponseData ) \
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
     REGISTER_METATYPE(                                               AdjustSalineResponseData ) \
+    REGISTER_METATYPE(                                              AdjustHeparinResponseData ) \
     REGISTER_METATYPE(                                      AdjustPressuresLimitsResponseData ) \
     REGISTER_METATYPE(                                  AdjustTreatmentParametersResponseData ) \
 
@@ -263,6 +268,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                AlarmClearedData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentSalineData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                            TreatmentHeparinData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             HDOperationModeData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                    DGROPumpData ) \
@@ -287,6 +293,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                      StartTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        EndTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustSalineResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       AdjustHeparinResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,               AdjustPressuresLimitsResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustTreatmentParametersResponseData ) \
 
@@ -302,6 +309,7 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     ConfirmTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                        AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,            AdjustTreatmentParametersRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                     AlarmAcknowledgeRequestData ) \
@@ -338,6 +346,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                        AlarmClearedData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentStatesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentSalineData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                    TreatmentHeparinData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     HDOperationModeData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                            DGROPumpData ) \
@@ -362,6 +371,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                              StartTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                EndTreatmentResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustSalineResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                               AdjustHeparinResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                       AdjustPressuresLimitsResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustTreatmentParametersResponseData ) \
 
@@ -376,6 +386,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                             ConfirmTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                        AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustTreatmentParametersRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                             AlarmAcknowledgeRequestData ) \
@@ -392,6 +403,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                      ConfirmTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          EndTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                         AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                 AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustTreatmentParametersRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AlarmSilenceRequestData ) \
@@ -406,6 +418,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                         AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                        StartTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                      ConfirmTreatmentRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          EndTreatmentRequestData ) \
@@ -428,6 +441,7 @@
     ACTION_RECEIVE_SIGNAL(                                                   AlarmClearedData ) \
     ACTION_RECEIVE_SIGNAL(                                                TreatmentStatesData ) \
     ACTION_RECEIVE_SIGNAL(                                                TreatmentSalineData ) \
+    ACTION_RECEIVE_SIGNAL(                                               TreatmentHeparinData ) \
     ACTION_RECEIVE_SIGNAL(                                                HDOperationModeData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                                       DGROPumpData ) \
@@ -454,6 +468,7 @@
     ACTION_RECEIVE_SIGNAL(                           AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_SIGNAL(                              AdjustTreatmentParametersResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                           AdjustSalineResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                          AdjustHeparinResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                  AdjustPressuresLimitsResponseData ) \
 
 //--------------------------------------------------------------------------------//