Index: dialin/common/dg_defs.py
===================================================================
diff -u -rf8e8a2028269c7d914f30d28b6be993e74388534 -rbc39c08a5a630d797c3358f1b58c720e02bbdbf1
--- dialin/common/dg_defs.py	(.../dg_defs.py)	(revision f8e8a2028269c7d914f30d28b6be993e74388534)
+++ dialin/common/dg_defs.py	(.../dg_defs.py)	(revision bc39c08a5a630d797c3358f1b58c720e02bbdbf1)
@@ -263,10 +263,20 @@
 
 @unique
 class DGEventList(DialinEnum):
-    DG_EVENT_STARTUP = 0
-    DG_EVENT_OP_MODE_CHANGE = 1
-    DG_EVENT_SUB_MODE_CHANGE = 2
-    NUM_OF_DG_EVENT_IDS = 3
+    DG_EVENT_STARTUP = 0                            # DG startup event
+    DG_EVENT_OP_MODE_CHANGE = 1                     # DG Op mode change event
+    DG_EVENT_SUB_MODE_CHANGE = 2                    # DG Op sub-mode change event
+    DG_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE = 3      # DG concentrate cap switch change
+    DG_EVENT_DIALYSATE_CAP_SWITCH_CHANGE = 4        # DG dialysate cap switch change
+    DG_EVENT_CPU_RAM_ERROR_STATUS = 5               # DG processor RAM error
+    DG_EVENT_CAL_RECORD_UPDATE = 6                  # DG new calibration record updated
+    DG_EVENT_SYSTEM_RECORD_UPDATE = 7               # DG new system record has been updated
+    DG_EVENT_SERVICE_UPDATE = 8                     # DG new service record has been updated
+    DG_EVENT_USAGE_INFO_UPDATE = 9                  # DG new usage information has been updated
+    DG_EVENT_SW_CONFIG_UPDATE = 10                  # DG new software configuration has been updated
+    DG_EVENT_SCHEDULED_RUNS_UPDATE = 11             # DG new scheduled runs information has been updated
+    DG_EVENT_HEATERS_INFO_UPDATE = 12               # DG new heaters information has been updated
+    NUM_OF_DG_EVENT_IDS = 13                        # Total number of DG events
 
 
 @unique
Index: dialin/common/hd_defs.py
===================================================================
diff -u -r875bce283a91757d2e80647987b8276514bd376b -rbc39c08a5a630d797c3358f1b58c720e02bbdbf1
--- dialin/common/hd_defs.py	(.../hd_defs.py)	(revision 875bce283a91757d2e80647987b8276514bd376b)
+++ dialin/common/hd_defs.py	(.../hd_defs.py)	(revision bc39c08a5a630d797c3358f1b58c720e02bbdbf1)
@@ -331,7 +331,22 @@
     HD_EVENT_STARTUP                                        =  0    # HD startup event
     HD_EVENT_OP_MODE_CHANGE                                 =  1    # HD Op mode change event
     HD_EVENT_SUB_MODE_CHANGE                                =  2    # HD Op sub-mode change event
-    NUM_OF_EVENT_IDS                                        =  3    # Total number of HD events
+    HD_EVENT_DRY_SELF_TEST_CARTRIDGE_RESULT                 =  3    # HD dry self test cartridge result
+    HD_EVENT_DRY_SELF_TEST_PRESSURE_RESULT                  =  4    # HD dry self test pressure result
+    HD_EVENT_WET_SELF_TEST_DISPLACEMENT_RESULT              =  5    # HD wet self test displacement result
+    HD_EVENT_CPU_RAM_ERROR_STATUS                           =  6    # HD CPU RAM error status
+    HD_EVENT_CAL_RECORD_UPDATE                              =  7    # HD new calibration record updated
+    HD_EVENT_SYSTEM_RECORD_UPDATE                           =  8    # HD new system record has been updated
+    HD_EVENT_SERVICE_UPDATE                                 =  9    # HD new service record has been updated
+    HD_EVENT_USAGE_INFO_UPDATE                              = 10    # HD new usage information has been updated
+    HD_EVENT_SW_CONFIG_UPDATE                               = 11    # HD new software configuration has been updated
+    HD_EVENT_BUTTON                                         = 12    # HD button pressed/released
+    HD_EVENT_SAFETY_LINE                                    = 13    # HD safety line pulled/released
+    HD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES                 = 14    # HD reservoir 1 load cells start values
+    HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES                   = 15    # HD reservoir 2 load cells end values
+    HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES                 = 16    # HD reservoir 2 load cells start values
+    HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES                   = 17    # HD reservoir 2 load cells end values
+    NUM_OF_EVENT_IDS                                        = 18    # Total number of HD events
 
 
 @unique