Index: sources/canbus/messageglobals.h
===================================================================
diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r90bcc276f2a879169fef20e9168711cf906c0e54
--- sources/canbus/messageglobals.h	(.../messageglobals.h)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
+++ sources/canbus/messageglobals.h	(.../messageglobals.h)	(revision 90bcc276f2a879169fef20e9168711cf906c0e54)
@@ -43,61 +43,61 @@
  */
 const QHash<Gui::GuiActionType ,quint8> payloadLen {
     // ----
-    {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::ID_PowerOff                   ,   1           },
+    {Gui::GuiActionType::ID_PowerOffBroadcast          ,   0           },
+    {Gui::GuiActionType::ID_KeepAlive                  , 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::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::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::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::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::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::idTreatmentRanges            ,   6 * 4       }, // 6 parameters each 4bytes
-    {Gui::GuiActionType::idTreatmentState             ,   3 * 4       }, // 3 parameters each 4bytes
+    {Gui::GuiActionType::ID_TreatmentRanges            ,   6 * 4       }, // 6 parameters each 4bytes
+    {Gui::GuiActionType::ID_TreatmentState             ,   3 * 4       }, // 3 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::idAdjustBloodDialysateReq    ,   2 * 4       }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::idAdjustBloodDialysateRsp    ,   4 * 4       }, // 4 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::idAdjustDurationReq          ,   1 * 4       }, // 1 parameter  each 4bytes
-    {Gui::GuiActionType::idAdjustDurationRsp          ,   4 * 4       }, // 4 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::idAdjustUltrafiltrationStateReq  ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq  ,   1 * 4       }, // 1 parameter  each 4bytes
 
     // ----
-    {Gui::GuiActionType::idAdjustUltrafiltrationEditReq   ,   1 * 4       }, // 1 parameter  each 4bytes
-    {Gui::GuiActionType::idAdjustUltrafiltrationEditRsp   ,   8 * 4       }, // 8 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq   ,   1 * 4       }, // 1 parameter  each 4bytes
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp   ,   8 * 4       }, // 8 parameters each 4bytes
 
     // ----
-    {Gui::GuiActionType::idAdjustUltrafiltrationConfirmReq    , 2 * 4 }, // 2 parameters each 4bytes
-    {Gui::GuiActionType::idAdjustUltrafiltrationConfirmRsp    , 5 * 4 },
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq    , 2 * 4 }, // 2 parameters each 4bytes
+    {Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp    , 5 * 4 },
 
     // ----
-    {Gui::GuiActionType::idCANBusFaultCount           ,   1           },
-    {Gui::GuiActionType::idRawData                    , 255           },
-    {Gui::GuiActionType::idAcknow                     ,   0           },
-    {Gui::GuiActionType::idAcknowGeneric              ,   1           },
+    {Gui::GuiActionType::ID_CANBusFaultCount           ,   1           },
+    {Gui::GuiActionType::ID_RawData                    , 255           },
+    {Gui::GuiActionType::ID_Acknow                     ,   0           },
+    {Gui::GuiActionType::ID_AcknowGeneric              ,   1           },
 
 };
 
@@ -169,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::idUnknown;
+    Gui::GuiActionType  actionId    = Gui::GuiActionType::ID_Unknown;
     int                 length      = 0;
     QByteArray          head;
     QByteArray          data;