Index: sources/model/MModel.h
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -ra524ef99542bfa8d371835bc7c7d24c68ecf1865
--- sources/model/MModel.h	(.../MModel.h)	(revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/model/MModel.h	(.../MModel.h)	(revision a524ef99542bfa8d371835bc7c7d24c68ecf1865)
@@ -52,6 +52,7 @@
 #include "MTreatmentPressureOcclusionData.h"
 #include "MTreatmentRangesData.h"
 #include "MTreatmentSalineData.h"
+#include "MTreatmentVitalsData.h"
 #include "MTreatmentHeparinData.h"
 #include "MTreatmentRinsebackData.h"
 #include "MTreatmentRecirculateData.h"
@@ -117,7 +118,6 @@
 #include "MDDBloodLeakData.h"
 
 // FP Data Messages
-#include "MFPValvesStatesData.h"
 #include "MFPROPumpData.h"
 #include "MFPPressuresData.h"
 #include "MFPLevelData.h"
@@ -150,6 +150,7 @@
 #include "MTreatmentAdjustUltrafiltrationEditResponse.h"
 #include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
 #include "MTreatmentAdjustSalineResponse.h"
+#include "MTreatmentAdjustVitalsResponse.h"
 #include "MTreatmentAdjustHeparinResponse.h"
 #include "MTreatmentAdjustRinsebackResponse.h"
 #include "MTreatmentAdjustRecirculateResponse.h"
@@ -349,6 +350,7 @@
     REGISTER_METATYPE(                                                           PowerOffData ) \
     REGISTER_METATYPE(                                                    TreatmentRangesData ) \
     REGISTER_METATYPE(                                                    TreatmentSalineData ) \
+    REGISTER_METATYPE(                                                    TreatmentVitalsData ) \
     REGISTER_METATYPE(                                                   TreatmentHeparinData ) \
     REGISTER_METATYPE(                                                 TreatmentRinsebackData ) \
     REGISTER_METATYPE(                                               TreatmentRecirculateData ) \
@@ -395,7 +397,6 @@
     REGISTER_METATYPE(                                                            DDLevelData ) \
     REGISTER_METATYPE(                                                        DDBloodLeakData ) \
     /*                                      FP Data                                          */ \
-    REGISTER_METATYPE(                                                     FPValvesStatesData ) \
     REGISTER_METATYPE(                                                           FPROPumpData ) \
     REGISTER_METATYPE(                                                        FPPressuresData ) \
     REGISTER_METATYPE(                                                            FPLevelData ) \
@@ -448,6 +449,7 @@
     REGISTER_METATYPE(                                   AdjustUltrafiltrationEditRequestData ) \
     REGISTER_METATYPE(                                AdjustUltrafiltrationConfirmRequestData ) \
     REGISTER_METATYPE(                                                AdjustSalineRequestData ) \
+    REGISTER_METATYPE(                                                AdjustVitalsRequestData ) \
     REGISTER_METATYPE(                                               AdjustHeparinRequestData ) \
     REGISTER_METATYPE(                                             AdjustRinsebackRequestData ) \
     REGISTER_METATYPE(                                           AdjustRecirculateRequestData ) \
@@ -487,6 +489,7 @@
     REGISTER_METATYPE(                                  AdjustUltrafiltrationEditResponseData ) \
     REGISTER_METATYPE(                               AdjustUltrafiltrationConfirmResponseData ) \
     REGISTER_METATYPE(                                               AdjustSalineResponseData ) \
+    REGISTER_METATYPE(                                               AdjustVitalsResponseData ) \
     REGISTER_METATYPE(                                              AdjustHeparinResponseData ) \
     REGISTER_METATYPE(                                            AdjustRinsebackResponseData ) \
     REGISTER_METATYPE(                                          AdjustRecirculateResponseData ) \
@@ -554,6 +557,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                    PowerOffData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentRangesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentSalineData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                             TreatmentVitalsData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                            TreatmentHeparinData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                          TreatmentRinsebackData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        TreatmentRecirculateData ) \
@@ -598,7 +602,6 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                     DDLevelData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DDBloodLeakData ) \
     /*                                      FP Data                                          */ \
-    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              FPValvesStatesData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                    FPROPumpData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 FPPressuresData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                     FPLevelData ) \
@@ -642,6 +645,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,           AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,        AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustSalineResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                        AdjustVitalsResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                       AdjustHeparinResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustRinsebackResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustRecirculateResponseData ) \
@@ -681,6 +685,7 @@
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,         AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,              AdjustParametersConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                         AdjustVitalsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                        AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                      AdjustRinsebackRequestData ) \
     ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE,                    AdjustRecirculateRequestData ) \
@@ -771,6 +776,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                            PowerOffData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentRangesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentSalineData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                     TreatmentVitalsData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                    TreatmentHeparinData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                  TreatmentRinsebackData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                TreatmentRecirculateData ) \
@@ -815,7 +821,6 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                             DDLevelData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DDBloodLeakData ) \
     /*                                      FP Data                                          */ \
-    ACTION_RECEIVE_BRIDGE_DEFINITION(                                      FPValvesStatesData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                            FPROPumpData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         FPPressuresData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                             FPLevelData ) \
@@ -859,6 +864,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                   AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustSalineResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                AdjustVitalsResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                               AdjustHeparinResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustRinsebackResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustRecirculateResponseData ) \
@@ -921,6 +927,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                    AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                 AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION(                                 AdjustVitalsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                                AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                              AdjustRinsebackRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION(                            AdjustRecirculateRequestData ) \
@@ -981,6 +988,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(             AdjustUltrafiltrationEditRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(          AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                          AdjustVitalsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                         AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                       AdjustRinsebackRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT(                     AdjustRecirculateRequestData ) \
@@ -1042,6 +1050,7 @@
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(          AdjustUltrafiltrationConfirmRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                 AdjustPressuresLimitsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustSalineRequestData ) \
+    ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                          AdjustVitalsRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                         AdjustHeparinRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                       AdjustRinsebackRequestData ) \
     ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC(                     AdjustRecirculateRequestData ) \
@@ -1092,6 +1101,7 @@
     ACTION_RECEIVE_SIGNAL(                                                       PowerOffData ) \
     ACTION_RECEIVE_SIGNAL(                                                TreatmentRangesData ) \
     ACTION_RECEIVE_SIGNAL(                                                TreatmentSalineData ) \
+    ACTION_RECEIVE_SIGNAL(                                                TreatmentVitalsData ) \
     ACTION_RECEIVE_SIGNAL(                                               TreatmentHeparinData ) \
     ACTION_RECEIVE_SIGNAL(                                             TreatmentRinsebackData ) \
     ACTION_RECEIVE_SIGNAL(                                           TreatmentRecirculateData ) \
@@ -1137,7 +1147,6 @@
     ACTION_RECEIVE_SIGNAL(                                                        DDLevelData ) \
     ACTION_RECEIVE_SIGNAL(                                                    DDBloodLeakData ) \
     /*                                      FP Data                                          */ \
-    ACTION_RECEIVE_SIGNAL(                                                 FPValvesStatesData ) \
     ACTION_RECEIVE_SIGNAL(                                                       FPROPumpData ) \
     ACTION_RECEIVE_SIGNAL(                                                    FPPressuresData ) \
     ACTION_RECEIVE_SIGNAL(                                                        FPLevelData ) \
@@ -1181,6 +1190,7 @@
     ACTION_RECEIVE_SIGNAL(                              AdjustUltrafiltrationEditResponseData ) \
     ACTION_RECEIVE_SIGNAL(                           AdjustUltrafiltrationConfirmResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                           AdjustSalineResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                           AdjustVitalsResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                          AdjustHeparinResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                        AdjustRinsebackResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                      AdjustRecirculateResponseData ) \