Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rcb9c48c7c307690dcafcfd16ef412fe660291692 -ra524ef99542bfa8d371835bc7c7d24c68ecf1865
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision cb9c48c7c307690dcafcfd16ef412fe660291692)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision a524ef99542bfa8d371835bc7c7d24c68ecf1865)
@@ -212,7 +212,7 @@
             ID_DDBloodLeakData                          = 0x6000, // 96     //// ----- TODO: Payload subject to change given FW implementation
 
             // FP Data Messages
-            ID_FPValvesStatesData                       = 0x3100, // 49     //// ----- @LEAHIZED
+            ID_FPValvesStatesData                       = 0x310F, // 49     //// ----- @OBSOLETE. REMOVE?
             ID_FPROPumpData                             = 0x3200, // 50     //// ----- @LEAHIZED
             ID_FPPressuresData                          = 0x3400, // 52     //// ----- @LEAHIZED
             ID_FPLevelData                              = 0x3500, // 53     //// ----- @LEAHIZED
@@ -238,7 +238,7 @@
 
             // In-Treatment Adjustables
             ID_AdjustDurationReq                        = 0x160F, // 22 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_AdjustDurationRsp                        = 0x1B00, // 27
+            ID_AdjustDurationRsp                        = 0x1B0F, // 27 //// ----- @CRAPIZED: had to change to avoid duplication
 
             ID_AdjustBloodDialysateReq                  = 0x1700, // 23
             ID_AdjustBloodDialysateRsp                  = 0x1800, // 24
@@ -406,7 +406,6 @@
         Q_ENUM(DD_Valves)
 
         #include "FPDefs.h"
-        Q_ENUM(FP_Valves)
     };
 
     // to be able to use the enum as signal/slot parameter
@@ -482,9 +481,6 @@
     // 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;
@@ -525,4 +521,4 @@
     void registerQmlTypes();
 
     bool startGui();
-}
+    }