Index: MsgDefs.h
===================================================================
diff -u -rc96e354133bda28fef7c673c8d876915c0f59c36 -r353390594dddfd95da8101ccb1fa3c9f246d6f4f
--- MsgDefs.h	(.../MsgDefs.h)	(revision c96e354133bda28fef7c673c8d876915c0f59c36)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 353390594dddfd95da8101ccb1fa3c9f246d6f4f)
@@ -149,15 +149,40 @@
     MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0x75,                        ///< UI request treatment log data message
     MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0x76,                       ///< HD response to UI treatment log data request
     MSG_ID_HD_POST_TREATMENT_STATE = 0x77,                              ///< HD broadcast of post-treatment state
-    MSG_ID_DG_START_STOP_CHEM_DISINFECT = 0x78,                         ///< DG start/stop chemical disinfect
+    MSG_ID_DG_START_STOP_CHEM_DISINFECT = 0x78,                         ///< DG start/stop chemical disinfection
     MSG_ID_DG_START_STOP_FLUSH = 0x79,                                  ///< DG start/stop flush mode
     MSG_ID_DG_FLUSH_DATA = 0x7A,                                        ///< DG flush data publish
     MSG_ID_HD_VOLTAGES_DATA = 0x7B,                                     ///< HD voltages data publish
     MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0x7C,                   ///< HD response to UI set alarm audio volume request
     MSG_ID_HD_ALARM_INFORMATION = 0x7D,                                 ///< HD alarm information broadcast message
+    MSG_ID_HD_STANDBY_STATE = 0x7E,                                     ///< HD broadcast of standby state
+    MSG_ID_UI_DISINFECT_REQUEST = 0x7F,                                 ///< UI disinfection selection
+    MSG_ID_HD_DISINFECT_RESPONSE = 0x80,                                ///< HD response to disinfection selection
+    MSG_ID_UI_CHEM_DISINFECT_CONFIRM = 0x81,                            ///< UI confirmation of chemical disinfection start
+    MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE = 0x82,                   ///< HD response to confirmation of chemical disinfection start
+    MSG_ID_DG_FLUSH_TIME_DATA = 0x83,                                   ///< DG broadcast of flush mode time data
+    MSG_ID_DG_HEAT_DISINFECT_TIME_DATA = 0x84,                          ///< DG broadcast of heat disinfection mode time data
+    MSG_ID_DG_CHEM_DISINFECT_TIME_DATA = 0x85,                          ///< DG broadcast of chemical disinfection mode time data
     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_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
+    MSG_ID_DG_USAGE_DATA = 0x8D,                                        ///< DG usage data
+    MSG_ID_HD_POST_SINGLE_TEST_RESULT = 0x8E,                           ///< HD POST single test result
+    MSG_ID_HD_POST_FINAL_TEST_RESULT = 0x8F,                            ///< HD POST final test result
+    MSG_ID_DG_POST_SINGLE_TEST_RESULT = 0x90,                           ///< DG POST single test result
+    MSG_ID_DG_POST_FINAL_TEST_RESULT = 0x91,                            ///< DG POST final test result
+    MSG_ID_UI_POST_FINAL_TEST_RESULT = 0x92,                            ///< UI POST final test result
     MSG_ID_HD_BUBBLES_DATA = 0x93,                                      ///< HD broadcast of air bubble detectors data
+    MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA = 0x94,                       ///< HD broadcast of treatment log period data
+    MSG_ID_HD_TREATMENT_LOG_ALARM_EVENT = 0x95,                         ///< HD treatment log alarm event
+    MSG_ID_HD_TREATMENT_LOG_EVENT = 0x96,                               ///< HD treatment log event
+    MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0x97,                        ///< UI active alarms list request
+    MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0x98,               ///< HD active alarms list request response
+    MSG_ID_HD_SERIAL_NUMBER = 0x99,                                     ///< HD serial number
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
@@ -325,6 +350,7 @@
     MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0xA03F,               ///< DG fluid leak state broadcast interval override request
     MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0xA040,              ///< DG fluid leak state detector override request
     MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041,                 ///< DG flush mode data publish interval override
+    MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0xA042,                  ///< DG filter flush time period override
 
     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
@@ -372,6 +398,10 @@
     REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED = 31,                      ///< Heparin cannot be resumed if not paused
     REQUEST_REJECT_REASON_DG_COMM_LOST = 32,                            ///< Treatment cannot initiate if DG comm is lost
     REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE = 33,                      ///< Post-treatment reservoirs drain not complete
+    REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE = 34,            ///< Treatment cannot initiate if DG is not in standby idle state
+    REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT = 35,                  ///< Request message not formatted properly
+    REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME = 36,                    ///< Given date/time is invalid
+    REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED = 37,        ///< Treatment cannot initiate if an alarm with no new treatment property has triggered before
     NUM_OF_REQUEST_REJECT_REASONS                                       ///< Number of settings change reject codes
 };
 typedef enum Request_Reject_Reasons REQUEST_REJECT_REASON_CODE_T;       ///< Type for settings change rejection reason codes enumeration