Index: sources/model/MModel.h
===================================================================
diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -rb80f8f84f21f86ad4c962a2c690447c572498e0b
--- sources/model/MModel.h	(.../MModel.h)	(revision 3c07dc803109f716937b692cb4a67a5324bb9ca3)
+++ sources/model/MModel.h	(.../MModel.h)	(revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
@@ -87,6 +87,7 @@
 #include "MAdjustTDVersionsRequest.h"
 #include "MAdjustTDVersionsResponse.h"
 #include "MAdjustDDVersionsResponse.h"
+#include "MAdjustFPVersionsResponse.h"
 #include "MAdjustTDSerialNumberResponse.h"
 #include "MAdjustDDSerialNumberResponse.h"
 #include "MAdjustHDServiceModeResponse.h"
@@ -115,6 +116,16 @@
 #include "MDDLevelData.h"
 #include "MDDBloodLeakData.h"
 
+// FP Data Messages
+#include "MFPValvesStatesData.h"
+#include "MFPROPumpData.h"
+#include "MFPPressuresData.h"
+#include "MFPLevelData.h"
+#include "MFPFlowData.h"
+#include "MFPConductivityData.h"
+#include "MFPTemperatureData.h"
+#include "MFPBoostPumpData.h"
+
 // Pre-Treatment
 #include "MPreTreatmentAdjustRequests.h"
 #include "MPreTreatmentAdjustInitTreatmentResponse.h"
@@ -236,8 +247,9 @@
  *
  *  06 -    In the MessageInterpreter add a line of handler in interpretMessage_<DG, HD> method
  *          and put the enum and model.
- *  \sa     MessageInterpreter::interpretMessage_HD
- *  \sa     MessageInterpreter::interpretMessage_DG
+ *  \sa     MessageInterpreter::interpretMessage_TD
+ *  \sa     MessageInterpreter::interpretMessage_DD
+ *  \sa     MessageInterpreter::interpretMessage_FP
  *  \sa     MessageInterpreter.cpp
  *
  * View :
@@ -382,6 +394,15 @@
     REGISTER_METATYPE(                                                     DDGenDialysateData ) \
     REGISTER_METATYPE(                                                            DDLevelData ) \
     REGISTER_METATYPE(                                                        DDBloodLeakData ) \
+    /*                                      FP Data                                          */ \
+    REGISTER_METATYPE(                                                     FPValvesStatesData ) \
+    REGISTER_METATYPE(                                                           FPROPumpData ) \
+    REGISTER_METATYPE(                                                        FPPressuresData ) \
+    REGISTER_METATYPE(                                                            FPLevelData ) \
+    REGISTER_METATYPE(                                                             FPFlowData ) \
+    REGISTER_METATYPE(                                                     FPConductivityData ) \
+    REGISTER_METATYPE(                                                      FPTemperatureData ) \
+    REGISTER_METATYPE(                                                        FPBoostPumpData ) \
                                                                                                 \
     REGISTER_METATYPE(                                                        HDDebugTextData ) \
     REGISTER_METATYPE(                                                        DGDebugTextData ) \
@@ -474,6 +495,7 @@
     REGISTER_METATYPE(                                            AdjustVersionsTDRequestData ) \
     REGISTER_METATYPE(                                           AdjustVersionsTDResponseData ) \
     REGISTER_METATYPE(                                           AdjustVersionsDDResponseData ) \
+    REGISTER_METATYPE(                                           AdjustVersionsFPResponseData ) \
     REGISTER_METATYPE(                                       AdjustSerialNumberTDResponseData ) \
     REGISTER_METATYPE(                                       AdjustSerialNumberDDResponseData ) \
     REGISTER_METATYPE(                                          AdjustServiceModeResponseData ) \
@@ -575,6 +597,15 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              DDGenDialysateData ) \
     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 ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                      FPFlowData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                              FPConductivityData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                               FPTemperatureData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 FPBoostPumpData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                                 DGDebugTextData ) \
@@ -619,6 +650,7 @@
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                     AdjustVersionsTDRequestData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustVersionsTDResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustVersionsDDResponseData ) \
+    ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                    AdjustVersionsFPResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustSerialNumberTDResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                AdjustSerialNumberDDResponseData ) \
     ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE,                   AdjustServiceModeResponseData ) \
@@ -782,6 +814,15 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                      DDGenDialysateData ) \
     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 ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                              FPFlowData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                      FPConductivityData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                       FPTemperatureData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                                         FPBoostPumpData ) \
                                                                                                 \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         HDDebugTextData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                                         DGDebugTextData ) \
@@ -826,6 +867,7 @@
     ACTION_RECEIVE_BRIDGE_DEFINITION(                             AdjustVersionsTDRequestData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustVersionsTDResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustVersionsDDResponseData ) \
+    ACTION_RECEIVE_BRIDGE_DEFINITION(                            AdjustVersionsFPResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustSerialNumberTDResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                        AdjustSerialNumberDDResponseData ) \
     ACTION_RECEIVE_BRIDGE_DEFINITION(                           AdjustServiceModeResponseData ) \
@@ -1094,6 +1136,15 @@
     ACTION_RECEIVE_SIGNAL(                                                 DDGenDialysateData ) \
     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 ) \
+    ACTION_RECEIVE_SIGNAL(                                                         FPFlowData ) \
+    ACTION_RECEIVE_SIGNAL(                                                 FPConductivityData ) \
+    ACTION_RECEIVE_SIGNAL(                                                  FPTemperatureData ) \
+    ACTION_RECEIVE_SIGNAL(                                                    FPBoostPumpData ) \
                                                                                                 \
     ACTION_RECEIVE_SIGNAL(                                                    HDDebugTextData ) \
     ACTION_RECEIVE_SIGNAL(                                                    DGDebugTextData ) \
@@ -1138,6 +1189,7 @@
     ACTION_RECEIVE_SIGNAL(                                        AdjustVersionsTDRequestData ) \
     ACTION_RECEIVE_SIGNAL(                                       AdjustVersionsTDResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                       AdjustVersionsDDResponseData ) \
+    ACTION_RECEIVE_SIGNAL(                                       AdjustVersionsFPResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustSerialNumberTDResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                   AdjustSerialNumberDDResponseData ) \
     ACTION_RECEIVE_SIGNAL(                                      AdjustServiceModeResponseData ) \