Index: HDDefs.h
===================================================================
diff -u -r2286870bb6faeaaed144b43e7f1af253ba0e3689 -r3edbc03bdb83308817441da63d8ca3a07b41fa9c
--- HDDefs.h	(.../HDDefs.h)	(revision 2286870bb6faeaaed144b43e7f1af253ba0e3689)
+++ HDDefs.h	(.../HDDefs.h)	(revision 3edbc03bdb83308817441da63d8ca3a07b41fa9c)
@@ -52,6 +52,7 @@
 enum HD_POST_States
 {
     POST_STATE_START = 0,                               ///< Start initialize & POST mode state
+    POST_STATE_FW_COMPATIBILITY,                        ///< Run firmware compatibility test state
     POST_STATE_FW_INTEGRITY,                            ///< Run firmware integrity test state
     POST_STATE_BATTERY,                                 ///< Run battery SOC test state
     POST_STATE_WATCHDOG,                                ///< Run watchdog test state
@@ -66,7 +67,6 @@
     POST_STATE_ACCELEROMETER,                           ///< Run Accelerometer test state
     POST_STATE_STUCK_BUTTON,                            ///< Run stuck button test state
     POST_STATE_UI_POST,                                 ///< Check whether UI passed its POST tests
-    POST_STATE_FW_COMPATIBILITY,                        ///< Run firmware compatibility test state
     POST_STATE_FPGA,                                    ///< Run FPGA test state
     POST_STATE_COMPLETED,                               ///< POST self-tests completed state
     POST_STATE_FAILED,                                  ///< POST self-tests failed state
Index: MsgDefs.h
===================================================================
diff -u -r6058ce086760b8cb84cb023869068008ed61b9e3 -r3edbc03bdb83308817441da63d8ca3a07b41fa9c
--- MsgDefs.h	(.../MsgDefs.h)	(revision 6058ce086760b8cb84cb023869068008ed61b9e3)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 3edbc03bdb83308817441da63d8ca3a07b41fa9c)
@@ -166,7 +166,7 @@
     MSG_ID_DG_VOLTAGES_DATA = 0x86,                                     ///< DG voltages data publish
     MSG_ID_DG_CHEM_DISINFECT_DATA = 0x87,                               ///< DG chemical disinfect data publish
     MSG_ID_DG_SERIAL_NUMBER = 0x88,                                     ///< DG serial number
-    MSG_ID_UI_REQUEST_SYSTEM_USAGE_INFO = 0x89,                         ///< UI request for system usage information
+    MSG_ID_UI_REQUEST_HD_SERVICE_INFO = 0x89,                           ///< UI request for HD service schedule information
     MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0x8A,                             ///< HD service schedule data
     MSG_ID_HD_USAGE_DATA = 0x8B,                                        ///< HD usage data
     MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0x8C,                             ///< DG service schedule data
@@ -184,9 +184,13 @@
     MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0x98,               ///< HD active alarms list request response
     MSG_ID_HD_SERIAL_NUMBER = 0x99,                                     ///< HD serial number
     MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST = 0x9A,            ///< HD set standby disinfect submode request
-    MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE = 0x9B,           ///< HD set standby disinfect submode response
+    MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE = 0x9B,           ///< HD set standby disinfect submode response (NOTE: in the messages list these two are 0x9C and 0x9D)
 
+    MSG_ID_REQUEST_HD_USAGE_INFO = 0xA0,                                ///< HD request usage information
+    MSG_ID_REQUEST_DG_USAGE_INFO = 0xA1,                                ///< DG request usage information
+    MSG_ID_REQUEST_DG_SERVICE_INFO = 0xA2,                              ///< DG request service information
 
+
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
 #endif