Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -ra58f91b077c8131bea3dbde0fc338adb113fc9f3
--- sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/canbus/MessageGlobals.h	(.../MessageGlobals.h)	(revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
@@ -113,8 +113,6 @@
     {Gui::GuiActionType::ID_AlarmStatus                             ,   4 * 4 + 2   }, // 4 parameters each 4bytes + 1 parameter 2bytes
     {Gui::GuiActionType::ID_AlarmTriggered                          ,   8 * 4       }, // 5 parameters each 4bytes
     {Gui::GuiActionType::ID_AlarmCleared                            ,   1 * 4       }, // 1 parameter  each 4bytes
-    {Gui::GuiActionType::ID_AlarmClearedConditionReq                ,   1 * 4       }, // 1 parameter  each 4bytes // the same message 63:0x3F00
-    {Gui::GuiActionType::ID_AlarmClearedConditionRsp                ,   1 * 4       }, // 1 parameter  each 4bytes // the same message 63:0x3F00
     {Gui::GuiActionType::ID_AlarmSilenceReq                         ,   1 * 4       }, // 1 parameter  each 1bytes
     {Gui::GuiActionType::ID_AlarmUserActionReq                      ,   1 * 4       }, // 1 parameter  each 4bytes
     {Gui::GuiActionType::ID_AlarmActiveListReq                      ,   0 * 4       }, // 0 parameter  each 4bytes
@@ -318,35 +316,41 @@
 
     // Broadcasts
     //// Alarm
-    eChlid_HD_Alarm = 0x001, ///< HD alarm broadcast
-    eChlid_DG_Alarm = 0x002, ///< DG alarm broadcast
+    eChlid_TD_Alarm = 0x001, ///< TD alarm broadcast
+    eChlid_DD_Alarm = 0x002, ///< DD alarm broadcast
+    eChlid_FP_Alarm = 0x003, ///< FP alarm broadcast
     eChlid_UI_Alarm = 0x004, ///< UI alarm broadcast [Out]
     //// Sync
-    eChlid_HD_Sync  = 0x040, ///< HD sync  broadcast
-    eChlid_DG_Sync  = 0x080, ///< DG sync  broadcast
-    eChlid_UI_Sync  = 0x200, ///< UI sync  broadcast [Out]
+    eChlid_TD_Sync  = 0x100, ///< HD sync  broadcast
+    eChlid_DD_Sync  = 0x101, ///< DD sync  broadcast
+    eChlid_FP_Sync  = 0x102, ///< DD sync  broadcast
+    eChlid_UI_Sync  = 0x103, ///< UI sync  broadcast [Out]
 
     // UI not listening
-    eChlid_HD_DG    = 0x008, ///< HD => DG
-    eChlid_DG_HD    = 0x010, ///< DG => HD
+    eChlid_TD_DD    = 0x010, ///< TD => DD
+    eChlid_DD_TD    = 0x011, ///< DD => TD
+    eChlid_DD_FP    = 0x021, ///< DD => FP
+    eChlid_FP_DD    = 0x020, ///< FP => DD
 
     // UI is  listening
-    eChlid_HD_UI    = 0x020, ///< HD => UI
-    eChlid_UI_HD    = 0x100, ///< UI => HD [Out]
+    eChlid_TD_UI    = 0x040, ///< TD => UI
+    eChlid_UI_TD    = 0x041, ///< UI => TD [Out]
 
     // UI listens occasionally
-    eChlid_DG_UI    = 0x070, ///< DG => UI
-    eChlid_UI_DG    = 0x110, ///< UI => DG [Out]
+    eChlid_DD_UI    = eChlid_DD_Sync    , ///< DD => UI
+    eChlid_UI_DD    = eChlid_UI_Sync    , ///< UI => DD [Out]
 
     // Dialing channel has been requested by V&V team for CANBus testing
     // and clarify the source of the unexpected channel message
     // UI still does not do anything with the messages on these channels.
-    eDialin_HD      = 0x400, ///< dialin => HD
-    eHD_Dialin      = 0x401, ///< HD => dialin
-    eDialin_DG      = 0x402, ///< dialin => DG
-    eDG_Dialin      = 0x403, ///< DG => dialin
-    eDialin_UI      = 0x404, ///< dialin => UI
-    eUI_Dialin      = 0x405, ///< UI => dialin
+    eDialin_TD      = 0x400, ///< dialin => TD
+    eTD_Dialin      = 0x401, ///< TD => dialin
+    eDialin_DD      = 0x402, ///< dialin => DD
+    eDD_Dialin      = 0x403, ///< DD => dialin
+    eDialin_FP      = 0x404, ///< dialin => FP
+    eFP_Dialin      = 0x405, ///< FP => dialin
+    eDialin_UI      = 0x406, ///< dialin => UI
+    eUI_Dialin      = 0x407, ///< UI => dialin
 };
 
 /*!
@@ -355,9 +359,10 @@
  */
 enum Can_Source {
     eCan_Unknown    = -1,
-    eCan_HD         =  0,
-    eCan_DG         =  1,
-    eCan_DI         =  2,
+    eCan_TD         =  0,
+    eCan_DD         =  1,
+    eCan_FP         =  2,
+    eCan_DI         =  3,
 };
 
 /*!
@@ -374,20 +379,16 @@
     bool                initialized = false;
 
     bool isEmpty   () {
-        // disabled coco begin validated:Has been validated manually.
         // Since the crc is part of the data and there is no message without crc
         // initialized flag and data.length() == 0 became the same.
         // It is preferred to keep it as is so that the initialization is independent of data.
         return !initialized || !data.length();
-        // disabled coco end
     }
     bool isComplete() {
-        // disabled coco begin validated:Has been validated manually.
         // Since the crc is part of the data and there is no message without crc
         // then a message would never be empty.
         // It is preferred to keep it as is so that the initialization is independent of data.
         return !isEmpty() && data.length() == length;
-        // disabled coco end
     }
 };