Index: MsgDefs.h
===================================================================
diff -u -rab31e00d2dcd65b55b1934d7178fcd1e20be56e4 -r5240dd31524f1c2aecb60013a3c5e117898eb746
--- MsgDefs.h	(.../MsgDefs.h)	(revision ab31e00d2dcd65b55b1934d7178fcd1e20be56e4)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 5240dd31524f1c2aecb60013a3c5e117898eb746)
@@ -86,12 +86,11 @@
     MSG_ID_DG_HEAT_DISINFECT_DATA = 0x37,                               ///< DG heat disinfection publish data
     MSG_ID_UI_START_TREATMENT = 0x38,                                   ///< UI user request to initiate a treatment
     MSG_ID_HD_START_TREATMENT_RESPONSE = 0x39,                          ///< HD response to user request to initiate a treatment
-    MSG_ID_HD_VALVES_DATA = 0x3A,                                       ///< HD broadcast of valves
+    MSG_ID_HD_VALVES_DATA = 0x3A,                                       ///< HD broadcast of valves data
     MSG_ID_UI_USER_CONFIRM_TREATMENT_PARAMS = 0x3B,                     ///< UI user confirmation of treatment parameters
     MSG_ID_UI_TREATMENT_END_REQUEST = 0x3C,                             ///< UI user treatment end request
     MSG_ID_HD_TREATMENT_END_RESPONSE = 0x3D,                            ///< HD response to user request to end treatment
-
-    MSG_ID_TEMP_FAST_HD_VALVES_REMOVE_LATER = 0x6D,                     ///< TODO REMOVE FOR FAST TESING ONLY
+    MSG_ID_HD_AIR_TRAP_DATA = 0x3E,                                     ///< HD broadcase of air trap data
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
 #endif
@@ -147,8 +146,11 @@
     MSG_ID_HD_SET_PARAMETER_TREATMENT_PARAMETER = 0x802D,               ///< Set a treatment parameter (will change actual setting, not an override)
     MSG_ID_HD_VALVES_HOME = 0x802E,                                     ///< Home an HD Valve
     MSG_ID_HD_VALVES_POSITION_OVERRIDE = 0x802F,                        ///< Set an HD valve to a position in counts
-    MSG_ID_HD_VALVES_SET_AIR_TRAP_VALVE = 0x8030,                     ///< Set the HD blood trap valve status
+    MSG_ID_HD_VALVES_SET_AIR_TRAP_VALVE = 0x8030,                       ///< Set the HD blood trap valve status
     MSG_ID_HD_VALVES_SET_PWM_OVERRIDE = 0x8031,                         ///< Set an HD valve PWM
+    MSG_ID_HD_AIR_TRAP_SEND_INTERVAL_OVERRIDE = 0x8032,                 ///< HD air trap data broadcast interval override request
+    MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE = 0x8033,                  ///< HD air trap level sensor override request
+    MSG_ID_HD_SOFTWARE_RESET_REQUEST = 0x8034,                          ///< HD reset request
 
     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
@@ -184,6 +186,7 @@
     MSG_ID_HEAT_DISINFECT_R2_TO_R1_DURATION_MINS = 0xA01F,              ///< Heat disinfection reservoir 2 to reservoir 1 duration in minutes
     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_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