Index: dialin/common/msg_defs.py
===================================================================
diff -u -rfaa74a12aa90127df9e5047e4e329d58d5eb8713 -r3559c80a045fc8cb5f2d994930284b435f939caf
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision faa74a12aa90127df9e5047e4e329d58d5eb8713)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 3559c80a045fc8cb5f2d994930284b435f939caf)
@@ -85,6 +85,13 @@
     MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0x41                 # HD response to user request to pause or resume UF
     MSG_ID_DG_CONCENTRATE_PUMP_DATA = 0x42                      # DG broadcast of concentrate pump data
     MSG_ID_DG_PRIMING_STATUS_DATA = 0x43                        # HD priming status during cartridge prime
+    MSG_ID_DG_UV_REACTORS_DATA = 0x44                           # DG broadcast UV reactors data
+    MSG_ID_DG_THERMISTORS_DATA = 0x45                           # DG broadcast thermistors data
+    MSG_ID_UI_PRESSURE_LIMITS_CHANGE_REQUEST = 0x46             # DG broadcast thermistors data
+    MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE = 0x47            # DG broadcast thermistors data
+    MSG_ID_DG_FANS_DATA = 0x48                                  # DG broadcast fans data
+    MSG_ID_HD_CALIBRATION_DATA = 0x49                           # HD broadcast calibration data
+    MSG_ID_DG_CALIBRATION_DATA = 0x4A                           # DG broadcast calibration data
 
     MSG_ID_CAN_ERROR_COUNT = 0x999                              # test code in support of EMC testing
 
@@ -149,6 +156,8 @@
     MSG_ID_BLOOD_PUMP_HOME_CMD = 0x8037                         # Blood pump home command
     MSG_ID_DIAL_IN_PUMP_HOME_CMD = 0x8038                       # Dialysate inlet pump home command
     MSG_ID_DIAL_OUT_PUMP_HOME_CMD = 0x8039                      # Dialysate outlet pump home command
+    MSG_ID_SUPER_CLEAR_ALARMS_CMD = 0x803A                      # Clears all alarms (even if non-recoverable or fault)
+    MSG_ID_HD_REQUEST_CALIBRATION_DATA = 0x803B                 # Requests calibration data from HD
 
     MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000                     # First DG test message ID
     MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE  # DG tester log-in
@@ -185,7 +194,13 @@
     MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN = 0xA020          # Heat disinfection number of cycles to run
     MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0xA021    # Heat disinfection data publish interval override request
     MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022                   # DG reset request
-    MSG_ID_HD_VALVES_SET_BLOOD_TRAP_VALVE = 0x8030              # HD valves set blood trap valve state
+    MSG_ID_DG_OPERATION_MODE_REQUEST = 0xA023                   # DG operation mode request
+    MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024      # Concentrate pumps' target speed override request
+    MSG_ID_UV_REACTORS_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA025  # UV reactors data publish interval override
+    MSG_ID_CONCENTRATE_PUMP_STATE_CHANGE_REQUEST = 0xA026       # Concentrate pumps' state change request (on / off)
+    MSG_ID_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE = 0xA027  # Concentrate pumps' data publish interval override request
+    MSG_ID_DG_START_STOP_UV_REACTORS_OVERRIDE = 0xA028          # DG start/stop UV reactors override request
+    MSG_ID_DG_REQUEST_CALIBRATION_DATA = 0xA029                 # Requests calibration data from DG
 
     MSG_ID_HD_DEBUG_EVENT = 0xFFF1                              # HD debug event text to be logged in event log
     MSG_ID_DG_DEBUG_EVENT = 0xFFF2                              # DG debug event text to be logged in event log
Index: dialin/hd/alarms.py
===================================================================
diff -u -rcd9d98248537d10d9cf188307ae2237c8cf8e6e4 -r3559c80a045fc8cb5f2d994930284b435f939caf
--- dialin/hd/alarms.py	(.../alarms.py)	(revision cd9d98248537d10d9cf188307ae2237c8cf8e6e4)
+++ dialin/hd/alarms.py	(.../alarms.py)	(revision 3559c80a045fc8cb5f2d994930284b435f939caf)
@@ -237,7 +237,7 @@
         payload = rst + sta + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_ALARM_STATE_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_ALARM_STATE_OVERRIDE.value,
                                               payload=payload)
 
         # Send message
@@ -273,7 +273,7 @@
         payload = rst + ms + alm
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_ALARM_TIME_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_ALARM_TIME_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("override alarm time since activated")
@@ -321,7 +321,7 @@
         payload = rst + pat
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
-                                              message_id=MsgIds.MSG_ID_HD_ALARM_LAMP_OVERRIDE.value,
+                                              message_id=MsgIds.MSG_ID_ALARM_LAMP_PATTERN_OVERRIDE.value,
                                               payload=payload)
 
         self.logger.debug("Override Alarm Lamp Pattern")