Index: MsgDefs.h
===================================================================
diff -u -rdf6fa99309430229fd1f0faeb62eca9f4e0129b8 -r492866e5b01bc92d3c9d91768ade7be4c5e52717
--- MsgDefs.h	(.../MsgDefs.h)	(revision df6fa99309430229fd1f0faeb62eca9f4e0129b8)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 492866e5b01bc92d3c9d91768ade7be4c5e52717)
@@ -107,7 +107,6 @@
     // service/test CAN messages
     MSG_ID_FIRST_TESTER_MESSAGE = 0x8000,                               ///< First HD test message ID
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TESTER_MESSAGE,          ///< HD tester log-in
-    MSG_ID_HD_MESSAGE = 0x8001,                                         ///< Obsolete - TODO - remove when all references to this ID are deleted
     MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0x8001,                      ///< Dialysate outlet flow set point override request
     MSG_ID_OFF_BUTTON_STATE_OVERRIDE = 0x8002,                          ///< Off button override request
     MSG_ID_STOP_BUTTON_STATE_OVERRIDE = 0x8003,                         ///< Stop button override request
@@ -165,6 +164,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
@@ -207,6 +208,7 @@
     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