Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r857ba6276d20d39763fb7d291891270e87035481 -rcb9c48c7c307690dcafcfd16ef412fe660291692
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 857ba6276d20d39763fb7d291891270e87035481)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision cb9c48c7c307690dcafcfd16ef412fe660291692)
@@ -100,6 +100,7 @@
             ID_AdjustVersionsTDReq                      = 0x1500, // 21     // ID_TDVersionsRxq - TD Version request  received    //// ----- @LEAHIZED
             ID_AdjustVersionsTDRsp                      = 0x0E00, // 14     //// ----- @LEAHIZED
             ID_AdjustVersionsDDRsp                      = 0x0F00, // 15     //// ----- @LEAHIZED
+            ID_AdjustVersionsFPRsp                      = 0x5A00, // 90     //// ----- @LEAHIZED
             ID_AdjustSerialTDRsp                        = 0x5100, // 81     //// ----- @LEAHIZED
             ID_AdjustSerialDDRsp                        = 0x5200, // 82     //// ----- @LEAHIZED
 
@@ -140,6 +141,7 @@
             ID_Recirculate                              = 0x5A00, // 90
             ID_BloodPrime                               = 0x5900, // 89
             ID_TreatmentStop                            = 0x4900, // 73
+            ID_Vitals                                   = 0x6500, // 101
 
             // Alarm Messages
             ID_AlarmStatus                              = 0x0100, // 01     //// ----- @LEAHIZED
@@ -164,7 +166,7 @@
             ID_DGFilterFlushData                        = 0x600F, // ??     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustWaterSampleReq                     = 0x5D00, // 93
             ID_AdjustWaterSampleRsp                     = 0x5E00, // 94
-            ID_AdjustWaterSampleResultReq               = 0x5F00, // 95  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+            ID_AdjustWaterSampleResultReq               = 0x5F0F, // 95     //// ----- @CRAPIZED: had to change to avoid duplication
             // Pre-Treatment Consumables Installation Confirm
             ID_AdjustConsumablesConfirmReq              = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment SelfTest NoCartridge Progress Data
@@ -173,14 +175,14 @@
             ID_AdjustDisposablesConfirmReq              = 0x6200, // 98  // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             ID_AdjustDisposablesConfirmRsp              = 0xAD00, // 173 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
             // Pre-Treatment SelfTest Dry Progress Data
-            ID_SelfTestDryData                          = 0x6300, // 99
+            ID_SelfTestDryData                          = 0x630F, // 99     //// ----- @CRAPIZED: had to change to avoid duplication
             // Pre-Treatment Disposable Priming
             ID_AdjustDisposablesPrimeReq                = 0x3C0F, // 60     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustDisposablesPrimeRsp                = 0x3D0F, // 61     //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DisposablesPrimeData                     = 0x43FF, // ??     //// ----- @CRAPIZED - FFed
             // Pre-Treatment Patient Connection Begin
-            ID_AdjustPatientConnectionBeginReq          = 0x6400, // 100
-            ID_AdjustPatientConnectionBeginRsp          = 0x6500, // 101
+            ID_AdjustPatientConnectionBeginReq          = 0x640F, // 100    //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_AdjustPatientConnectionBeginRsp          = 0x650F, // 101   //// ----- @CRAPIZED: had to change to avoid duplication
             // Pre-Treatment Ultrafiltration initial volume
             ID_AdjustUltrafiltrationInitReq             = 0x4F0F, // 79  //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustUltrafiltrationInitRsp             = 0x5000, // 80
@@ -209,6 +211,16 @@
             ID_DDGenDialysateData                       = 0x2F00, // 47     //// ----- @LEAHIZED
             ID_DDBloodLeakData                          = 0x6000, // 96     //// ----- TODO: Payload subject to change given FW implementation
 
+            // FP Data Messages
+            ID_FPValvesStatesData                       = 0x3100, // 49     //// ----- @LEAHIZED
+            ID_FPROPumpData                             = 0x3200, // 50     //// ----- @LEAHIZED
+            ID_FPPressuresData                          = 0x3400, // 52     //// ----- @LEAHIZED
+            ID_FPLevelData                              = 0x3500, // 53     //// ----- @LEAHIZED
+            ID_FPFlowSensorData                         = 0x3600, // 54     //// ----- @LEAHIZED
+            ID_FPConductivityData                       = 0x3700, // 55     //// ----- @LEAHIZED
+            ID_FPTemperaturesData                       = 0x3900, // 57     //// ----- @LEAHIZED
+            ID_FPROBoosterPumpData                      = 0x5000, // 80     //// ----- @LEAHIZED
+
             // HD Data Messages
             ID_HDAccelerometerData                      = 0x3300, // 51
             ID_HDSyringePumpData                        = 0x6900, // 105
@@ -234,9 +246,12 @@
             ID_AdjustPressuresLimitsReq                 = 0x470F, // 70 //// ----- @CRAPIZED: had to change to avoid duplication
             ID_AdjustPressuresLimitsRsp                 = 0x480F, // 71 //// ----- @CRAPIZED: had to change to avoid duplication
 
-            ID_AdjustSalineReq                          = 0x1200, // 18
-            ID_AdjustSalineRsp                          = 0x1400, // 20
+            ID_AdjustSalineReq                          = 0x5F00, // 95
+            ID_AdjustSalineRsp                          = 0x6000, // 96
 
+            ID_AdjustVitalsReq                          = 0x6300, // 99
+            ID_AdjustVitalsRsp                          = 0x6400, // 100
+
             ID_AdjustHeparinReq                         = 0x4B00, // 75
             ID_AdjustHeparinRsp                         = 0x4C00, // 76
 
@@ -389,6 +404,9 @@
         Q_ENUM(DD_Disinfect_States)
         Q_ENUM(DD_Heat_UI_States)
         Q_ENUM(DD_Valves)
+
+        #include "FPDefs.h"
+        Q_ENUM(FP_Valves)
     };
 
     // to be able to use the enum as signal/slot parameter
@@ -464,6 +482,9 @@
     // DD Valves
     typedef GuiActions::DD_Valves                                       GuiDDValves;
 
+    // FP Valves
+    typedef GuiActions::FP_Valves                                       GuiFPValves;
+
     typedef QMap        <quint32, QString>                              GuiStringIndexMap;
     typedef QPair       <quint32, QString>                              GuiStringIndexMapItem;
     typedef QMapIterator<quint32, QString>                              GuiStringIndexMapIterator;