Index: sources/canbus/messageglobals.h
===================================================================
diff -u -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5
--- sources/canbus/messageglobals.h	(.../messageglobals.h)	(revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616)
+++ sources/canbus/messageglobals.h	(.../messageglobals.h)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
@@ -43,51 +43,62 @@
  */
 const QHash<Gui::GuiActionType ,quint8> payloadLen {
     // ----
-    {Gui::GuiActionType::PowerOff                   ,   1           },
-    {Gui::GuiActionType::PowerOffBroadcast          ,   0           },
-    {Gui::GuiActionType::KeepAlive                  , 255           }, // 0 => 255 to be able to run a multi-frame test.
-    {Gui::GuiActionType::BloodFlow                  ,   7 * 4       }, // 7 parameters each 4bytes
-    {Gui::GuiActionType::DialysateInletFlow         ,   7 * 4       }, // 7 parameters each 4bytes
-    {Gui::GuiActionType::DialysateOutletFlow        ,   7 * 4       }, // 7 parameters each 4bytes
-    {Gui::GuiActionType::TreatmentTime              ,   3 * 4       }, // 3 parameters each 4bytes
-    {Gui::GuiActionType::PressureOcclusion          ,   5 * 4       }, // 5 parameters each 4bytes
-    {Gui::GuiActionType::LoadCellReadings           ,   4 * 4       }, // 4 parameters each 4bytes
-    {Gui::GuiActionType::TemperatureSensors         ,  12 * 4       }, // 12 parameters each 4bytes
+    {Gui::GuiActionType::idPowerOff                   ,   1           },
+    {Gui::GuiActionType::idPowerOffBroadcast          ,   0           },
+    {Gui::GuiActionType::idKeepAlive                  , 255           }, // 0 => 255 to be able to run a multi-frame test.
 
+    // -----
+    {Gui::GuiActionType::idTreatmentTime              ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::idBloodFlow                  ,   7 * 4       }, // 7 parameters each 4bytes
+    {Gui::GuiActionType::idDialysateInletFlow         ,   7 * 4       }, // 7 parameters each 4bytes
+    {Gui::GuiActionType::idDialysateOutletFlow        ,   7 * 4       }, // 7 parameters each 4bytes
+    {Gui::GuiActionType::idPressureOcclusion          ,   5 * 4       }, // 5 parameters each 4bytes
+
     // ----
-    {Gui::GuiActionType::AlarmStatus                ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2bytes
-    {Gui::GuiActionType::AlarmTriggered             ,   1 * 4       }, // 1 parameters each 4bytes
-    {Gui::GuiActionType::AlarmCleared               ,   1 * 4       }, // 1 parameters each 4bytes
+    {Gui::GuiActionType::idDGROPumpData               ,   3 * 4       }, //  3 parameters each 4bytes
+    {Gui::GuiActionType::idDGPressuresData            ,   4 * 4       }, //  4 parameters each 4bytes
+    {Gui::GuiActionType::idDGDrainPumpData            ,   2 * 4       }, //  2 parameters each 4bytes
+    {Gui::GuiActionType::idDGOperationModeData        ,   1 * 4       }, //  1 parameter  each 4bytes
+    {Gui::GuiActionType::idDGReservoirData            ,   3 * 4       }, //  3 parameters each 4bytes
+    {Gui::GuiActionType::idDGValvesStatesData         ,   1 * 2       }, //  1 parameters each 2bytes
+    {Gui::GuiActionType::idDGHeatersData              ,   3 * 4       }, //  3 parameters each 4bytes
+    {Gui::GuiActionType::idDGLoadCellReadingsData     ,   4 * 4       }, //  4 parameters each 4bytes
+    {Gui::GuiActionType::idDGTemperaturesData         ,  12 * 4       }, // 12 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::TreatmentRanges            ,   6 * 4       }, // 6 parameters each 4bytes
-    {Gui::GuiActionType::TreatmentState             ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::idAlarmStatus                ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2bytes
+    {Gui::GuiActionType::idAlarmTriggered             ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::idAlarmCleared               ,   1 * 4       }, // 1 parameter  each 4bytes
 
     // ----
-    {Gui::GuiActionType::AdjustBloodDialysateReq    ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::AdjustBloodDialysateRsp    ,   4 * 4       }, // 4 parameters each 4bytes
+    {Gui::GuiActionType::idTreatmentRanges            ,   6 * 4       }, // 6 parameters each 4bytes
+    {Gui::GuiActionType::idTreatmentState             ,   3 * 4       }, // 3 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::AdjustDurationReq          ,   1 * 4       }, // 1 parameters each 4bytes
-    {Gui::GuiActionType::AdjustDurationRsp          ,   4 * 4       }, // 4 parameters each 4bytes
+    {Gui::GuiActionType::idAdjustBloodDialysateReq    ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::idAdjustBloodDialysateRsp    ,   4 * 4       }, // 4 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::AdjustUltrafiltrationStateReq  ,   1 * 4       }, // 1 parameters each 4bytes
+    {Gui::GuiActionType::idAdjustDurationReq          ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::idAdjustDurationRsp          ,   4 * 4       }, // 4 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::AdjustUltrafiltrationEditReq   ,   1 * 4       }, // 1 parameters each 4bytes
-    {Gui::GuiActionType::AdjustUltrafiltrationEditRsp   ,   8 * 4       }, // 8 parameters each 4bytes
+    {Gui::GuiActionType::idAdjustUltrafiltrationStateReq  ,   1 * 4       }, // 1 parameter  each 4bytes
 
     // ----
-    {Gui::GuiActionType::AdjustUltrafiltrationConfirmReq    , 2 * 4 }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::AdjustUltrafiltrationConfirmRsp    , 5 * 4 },
+    {Gui::GuiActionType::idAdjustUltrafiltrationEditReq   ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::idAdjustUltrafiltrationEditRsp   ,   8 * 4       }, // 8 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::CanBUSFaultCount           ,   1           },
-    {Gui::GuiActionType::String                     , 255           },
-    {Gui::GuiActionType::Acknow                     ,   0           },
-    {Gui::GuiActionType::AcknowGeneric              ,   1           },
+    {Gui::GuiActionType::idAdjustUltrafiltrationConfirmReq    , 2 * 4 }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::idAdjustUltrafiltrationConfirmRsp    , 5 * 4 },
 
+    // ----
+    {Gui::GuiActionType::idCANBusFaultCount           ,   1           },
+    {Gui::GuiActionType::idRawData                    , 255           },
+    {Gui::GuiActionType::idAcknow                     ,   0           },
+    {Gui::GuiActionType::idAcknowGeneric              ,   1           },
+
 };
 
 /*!
@@ -158,7 +169,7 @@
 struct Message { // TODO : Should be converted to MessageModel class // no time left for now !!!
     Can_Id              can_id;
     Sequence            sequence    = 0; // seq 0 is invalid
-    Gui::GuiActionType  actionId    = Gui::GuiActionType::Unknown;
+    Gui::GuiActionType  actionId    = Gui::GuiActionType::idUnknown;
     int                 length      = 0;
     QByteArray          head;
     QByteArray          data;