Index: HDDefs.h
===================================================================
diff -u -r47bd28a9d7d5ebcc31f00436e3e1039b7309b68a -r01c50667ec8135098adb6442639fd2044a2161ec
--- HDDefs.h	(.../HDDefs.h)	(revision 47bd28a9d7d5ebcc31f00436e3e1039b7309b68a)
+++ HDDefs.h	(.../HDDefs.h)	(revision 01c50667ec8135098adb6442639fd2044a2161ec)
@@ -60,8 +60,8 @@
     POST_STATE_BLOOD_FLOW,                              ///< Run Blood Flow test mode state
     POST_STATE_DIALYSATE_FLOW,                          ///< Run Dialysate Flow test mode state
     POST_STATE_ACCELEROMETER,                           ///< Run Accelerometer test mode state
-    POST_STATE_STUCK_BUTTON,                            ///< Run stuck button test mode state
     POST_STATE_VALVES,                                  ///< Run Valves test mode state
+    POST_STATE_STUCK_BUTTON,                            ///< Run stuck button test mode state
     POST_STATE_COMPLETED,                               ///< POST self-tests completed mode state
     POST_STATE_FAILED,                                  ///< POST self-tests failed mode state
     NUM_OF_POST_STATES                                  ///< Number of initialize & POST mode states
Index: MsgDefs.h
===================================================================
diff -u -r732e712953445b4dff085f152ab58471ce1a6c28 -r01c50667ec8135098adb6442639fd2044a2161ec
--- MsgDefs.h	(.../MsgDefs.h)	(revision 732e712953445b4dff085f152ab58471ce1a6c28)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 01c50667ec8135098adb6442639fd2044a2161ec)
@@ -106,7 +106,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
@@ -164,7 +163,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_DG_START_STOP_UV_REACTORS_OVERRIDE = 0x803A,                 ///< DG start/stop UV reactors override request
+    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
@@ -206,6 +206,8 @@
     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