Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rb3f0f9afa498c5892f39745c36b9762ec957a468 -r34290f9fb980b41d888c0d1d543a0a9a17d3d309
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision b3f0f9afa498c5892f39745c36b9762ec957a468)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 34290f9fb980b41d888c0d1d543a0a9a17d3d309)
@@ -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
 
@@ -161,10 +162,10 @@
             ID_TreatmentRanges                          = 0x4300, // 67     //// ----- @LEAHIZED
 
             // Pre-Treatment Water Sample
-            ID_DGFilterFlushData                        = 0x6000, // 96
+            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
@@ -192,25 +193,39 @@
             ID_AdjustStartTreatmentRsp                  = 0x7200, // 114
 
             // DG Data Messages
-            ID_DGROPumpData                             = 0x1F0F, // 31  //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_DGPressuresData                          = 0x2000, // 32
-            ID_DGDrainPumpData                          = 0x2400, // 36
-            ID_DGOperationModeData                      = 0x2700, // 39
-            ID_DGReservoirData                          = 0x2800, // 40
-            ID_DGValvesStatesData                       = 0x2A00, // 42
-            ID_DGHeatersData                            = 0x2C00, // 44
+            ID_DGROPumpData                             = 0x1F0F, // 31   //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_DGDrainPumpData                          = 0x240F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_DGOperationModeData                      = 0x270F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_DGReservoirData                          = 0x280F, // ??   //// ----- @CRAPIZED: had to change to avoid duplication
             ID_DGLoadCellReadingsData                   = 0x0C00, // 12
-            ID_DGTemperaturesData                       = 0x2D00, // 45
-            ID_DDLevelData                              = 0x2900, // 41    //// ----- @LEAHIZED
             ID_DGAccelerometerData                      = 0x3400, // 52
+            ID_DDValvesStatesData                       = 0x1B00, // 27     //// ----- @LEAHIZED
+            ID_DDPressuresData                          = 0x1C00, // 28     //// ----- @LEAHIZED
             ID_DDConductivityData                       = 0x1F00, // 31     //// ----- @LEAHIZED
+            ID_DDConcentratePumpData                    = 0x2500, // 37     //// ----- @LEAHIZED
+            ID_DDTemperaturesData                       = 0x2600, // 38     //// ----- @LEAHIZED
+            ID_DDDialysatePumpData                      = 0x2700, // 39     //// ----- @LEAHIZED
+            ID_DDHeatersData                            = 0x2800, // 40     //// ----- @LEAHIZED
+            ID_DDLevelData                              = 0x2900, // 41     //// ----- @LEAHIZED
             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
             ID_HDBloodLeakData                          = 0x6C00, // 108
-            ID_HDAirBubbleData                          = 0x9300, // 147
+            ID_TDAirBubbleData                          = 0x1E00, // 30   //// ----- @LEAHIZED
+            ID_TDAirPumpData                            = 0x2000, // 32   //// ----- @LEAHIZED
             ID_TDAirTrapData                            = 0x2A00, // 42   //// ----- @LEAHIZED
             ID_TDVoltageData                            = 0x1D00, // 29   //// ----- @LEAHIZED
             ID_TDValvesData                             = 0x2B00, // 43   //// ----- @LEAHIZED
@@ -230,8 +245,8 @@
             ID_AdjustPressuresLimitsReq                 = 0x4600, // 70
             ID_AdjustPressuresLimitsRsp                 = 0x4700, // 71
 
-            ID_AdjustSalineReq                          = 0x1200, // 18
-            ID_AdjustSalineRsp                          = 0x1400, // 20
+            ID_AdjustSalineReq                          = 0x5F00, // 95
+            ID_AdjustSalineRsp                          = 0x6000, // 96
 
             ID_AdjustHeparinReq                         = 0x4B00, // 75
             ID_AdjustHeparinRsp                         = 0x4C00, // 76
@@ -384,6 +399,10 @@
         Q_ENUM(DD_Op_Modes)
         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
@@ -456,6 +475,12 @@
     typedef GuiActions::DD_Disinfect_States                             GuiDisinfectDGStates;
     typedef GuiActions::DD_Heat_UI_States                               GuiDisinfectDGHeatStates;
 
+    // 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;