Index: HDDefs.h
===================================================================
diff -u -r6b86c55c480f9cd1fec87a8d6bbcb79c1969129e -r6b33183184fe83c23139834fc73910a8515796c2
--- HDDefs.h	(.../HDDefs.h)	(revision 6b86c55c480f9cd1fec87a8d6bbcb79c1969129e)
+++ HDDefs.h	(.../HDDefs.h)	(revision 6b33183184fe83c23139834fc73910a8515796c2)
@@ -645,8 +645,8 @@
  *  @{
  */
 
-/// Enumeration of event IDs.
-enum Event_List
+/// Enumeration of treatment event IDs.
+enum Tx_Event_List
 {
     BLOOD_FLOW_RATE_CHANGE_EVENT = 0,                                   ///< Blood flow rate change event
     DIALYSATE_FLOW_RATE_CHANGE_EVENT,                                   ///< Dialysate flow rate change event
@@ -660,10 +660,27 @@
     HEPARIN_PAUSE_RESUME_EVENT,                                         ///< Heparin pause/resume event
     SALINE_BOLUSES_CHANGE_EVENT,                                        ///< Saline boluses change event
     MID_TREATMENT_RINSE_BACK_EVENT,                                     ///< Mid treatment rinse-back event
+    NUM_OF_EVENT_IDS                                                    ///< Total number of treatment events
+};
+typedef enum Tx_Event_List TX_EVENT_ID_T;                               ///< Type for treatment event list enumeration
+
+/**@}*/
+
+/**
+ *  @addtogroup CommonHeader
+ *  @{
+ */
+
+/// Enumeration of event IDs.
+enum Event_List
+{
+    HD_EVENT_STARTUP = 0,                                               ///< Dialysate flow rate change event
+    HD_EVENT_OP_MODE_CHANGE,                                            ///< Op mode change event
+    HD_EVENT_SUB_MODE_CHANGE,                                           ///< Op sub-mode change event
     NUM_OF_EVENT_IDS                                                    ///< Total number of events
 };
 typedef enum Event_List EVENT_ID_T;                                     ///< Type for event list enumeration
 
 /**@}*/
-
+
 #endif
Index: MsgDefs.h
===================================================================
diff -u -r58471d24465d90cf8d2f1b6033c6c10b800ef5c8 -r6b33183184fe83c23139834fc73910a8515796c2
--- MsgDefs.h	(.../MsgDefs.h)	(revision 58471d24465d90cf8d2f1b6033c6c10b800ef5c8)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 6b33183184fe83c23139834fc73910a8515796c2)
@@ -193,6 +193,8 @@
     MSG_ID_DG_SWITCHES_DATA = 0xA1,                                     ///< DG switches data publish
     MSG_ID_HD_SWITCHES_DATA = 0xA2,                                     ///< HD switches data publish
     MSG_ID_HD_FANS_DATA = 0xA3,                                         ///< HD fans data publish
+    MSG_ID_HD_EVENT = 0xA4,                                             ///< HD general event
+    MSG_ID_DG_EVENT = 0xA5,                                             ///< DG general event
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing