Index: sources/canbus/messageglobals.h
===================================================================
diff -u -r44a85c96ab55e424866ec4cca0270aa218355f82 -rd2035a8728794afeefaa244bf8d1597926d945f5
--- sources/canbus/messageglobals.h	(.../messageglobals.h)	(revision 44a85c96ab55e424866ec4cca0270aa218355f82)
+++ sources/canbus/messageglobals.h	(.../messageglobals.h)	(revision d2035a8728794afeefaa244bf8d1597926d945f5)
@@ -44,50 +44,70 @@
  */
 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::AlarmSilenceReq            ,   5 * 4       }, // 5 parameters each 4bytes
-    {Gui::GuiActionType::AlarmSilenceRsp            ,   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::ID_PowerOff                        ,   1           },
+    {Gui::GuiActionType::ID_ShuttingDown                    ,   0           },
+    {Gui::GuiActionType::ID_KeepAlive                       , 255           }, // 0 => 255 to be able to run a multi-frame test.
 
+    // -----
+    {Gui::GuiActionType::ID_TreatmentTime                   ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_BloodFlow                       ,   7 * 4       }, // 7 parameters each 4bytes
+    {Gui::GuiActionType::ID_DialysateInletFlow              ,   7 * 4       }, // 7 parameters each 4bytes
+    {Gui::GuiActionType::ID_DialysateOutletFlow             ,   7 * 4       }, // 7 parameters each 4bytes
+    {Gui::GuiActionType::ID_PressureOcclusion               ,   5 * 4       }, // 5 parameters each 4bytes
+
     // ----
-    {Gui::GuiActionType::AlarmStatus                ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2bytes
+    {Gui::GuiActionType::ID_HDOperationModeData             ,   1 * 4       }, //  1 parameter  each 4bytes
 
     // ----
-    {Gui::GuiActionType::TreatmentRanges            ,   6 * 4       }, // 6 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGROPumpData                    ,   3 * 4       }, //  3 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGPressuresData                 ,   4 * 4       }, //  4 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGDrainPumpData                 ,   2 * 4       }, //  2 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGOperationModeData             ,   1 * 4       }, //  1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_DGReservoirData                 ,   3 * 4       }, //  3 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGValvesStatesData              ,   1 * 2       }, //  1 parameters each 2bytes
+    {Gui::GuiActionType::ID_DGHeatersData                   ,   3 * 4       }, //  3 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGLoadCellReadingsData          ,   4 * 4       }, //  4 parameters each 4bytes
+    {Gui::GuiActionType::ID_DGTemperaturesData              ,  12 * 4       }, // 12 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::AdjustBloodDialysateReq    ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::AdjustBloodDialysateRsp    ,   4 * 4       }, // 4 parameters each 4bytes
+    {Gui::GuiActionType::ID_AlarmStatus                     ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2bytes
+    {Gui::GuiActionType::ID_AlarmTriggered                  ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AlarmCleared                    ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AlarmSilenceReq                 ,   5 * 4       }, // 5 parameters each 4bytes
+    {Gui::GuiActionType::ID_AlarmSilenceRsp                 ,   5 * 4       }, // 5 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::AdjustDurationReq          ,   1 * 4       }, // 1 parameters each 4bytes
-    {Gui::GuiActionType::AdjustDurationRsp          ,   4 * 4       }, // 4 parameters each 4bytes
+    {Gui::GuiActionType::ID_TreatmentRanges                 ,   6 * 4       }, // 6 parameters each 4bytes
+    {Gui::GuiActionType::ID_TreatmentStates                 ,   3 * 4       }, // 3 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::AdjustUltrafiltrationStateReq  ,   1 * 4       }, // 1 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustBloodDialysateReq         ,   2 * 4       }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustBloodDialysateRsp         ,   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::ID_AdjustDurationReq               ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustDurationRsp               ,   4 * 4       }, // 4 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::AdjustUltrafiltrationConfirmReq    , 2 * 4 }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::AdjustUltrafiltrationConfirmRsp    , 5 * 4 },
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq   ,   1 * 4       }, // 1 parameter  each 4bytes
 
     // ----
-    {Gui::GuiActionType::CanBUSFaultCount           ,   1           },
-    {Gui::GuiActionType::String                     , 255           },
-    {Gui::GuiActionType::Acknow                     ,   0           },
-    {Gui::GuiActionType::AcknowGeneric              ,   1           },
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq    ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp    ,   8 * 4       }, // 8 parameters each 4bytes
 
+    // ----
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq , 2 * 4 }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp , 5 * 4 },
+
+    // ----
+    {Gui::GuiActionType::ID_CANBusFaultCount                ,   1           },
+    {Gui::GuiActionType::ID_RawData                         , 255           },
+    {Gui::GuiActionType::ID_Acknow                          ,   0           },
+    {Gui::GuiActionType::ID_AcknowGeneric                   ,   1           },
+
+    {Gui::GuiActionType::ID_HDDebugText                     ,   40 + 1      }, // ASCII text - 40 bytes + null term
+    {Gui::GuiActionType::ID_DGDebugText                     ,   40 + 1      }, // ASCII text - 40 bytes + null term
+
 };
 
 /*!
@@ -147,7 +167,7 @@
     eChlid_UI_HD    = 0x100, ///< UI => HD [Out]
 
     // UI lessens occasionally
-    eChlid_DG_UI    = eChlid_DG_Alarm, ///< No direct channel has been defined between DG&UI, May be required for logging
+    eChlid_DG_UI    = 0x070, ///< No direct channel has been defined between DG&UI, May be required for logging
     eChlid_UI_DG    = eChlid_UI_Sync , ///< No direct channel has been defined between DG&UI, May be required for logging
 };
 
@@ -158,7 +178,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::ID_Unknown;
     int                 length      = 0;
     QByteArray          head;
     QByteArray          data;