Index: MsgDefs.h
===================================================================
diff -u -rf96f7c7b7c048f0d49eb7ccf476fd69378a1fafe -r35f81d848a7983f7272feab7bce35fb0be2d88d0
--- MsgDefs.h	(.../MsgDefs.h)	(revision f96f7c7b7c048f0d49eb7ccf476fd69378a1fafe)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 35f81d848a7983f7272feab7bce35fb0be2d88d0)
@@ -1,15 +1,15 @@
 
 /**************************************************************************
 *
-* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    MsgDefs.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Dec-2022
+* @date    (last)      03-Jan-2023
 *
 * @author  (original)  Sean
 * @date    (original)  27-Feb-2020
@@ -204,7 +204,7 @@
     MSG_ID_DG_SET_SERVICE_TIME = 0xAC,                                  ///< DG set service time
     MSG_ID_UI_INSTALLATION_CONFIRM_RESPONSE = 0xAD,                     ///< HD Confirm installation response
     MSG_ID_DG_FILL_MODE_DATA = 0xAE,                                    ///< DG broadcast of fill mode data such as used acid & bicarb volume
-    MSG_ID_DG_BAD_FILL_SUB_STATE = 0xAF,                                ///< DG broadcast of idle mode bad fill sub-state
+    MSG_ID_DG_GEN_IDLE_DATA = 0xAF,                                     ///< DG broadcast of Gen idle mode sub-state
     MSG_ID_UI_REQUEST_SERVICE_MODE = 0xB0,                              ///< UI request to HD to go to service mode
     MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST = 0xB1,                     ///< HD response to UI request to go to service mode
     MSG_ID_HD_REQUEST_UI_FINAL_POST_RESULT = 0xB2,                      ///< HD request to UI for final POST result
@@ -228,6 +228,7 @@
     MSG_ID_HD_CHEM_DISINFECT_FLUSH_CONFIRM_RESPONSE = 0xC4,             ///< HD response to confirmation of chemical disinfect flush start
     MSG_ID_DG_HEAT_DISINFECT_ACTIVE_COOL_DATA = 0xC5,                   ///< DG heat disinfect active cool data broadcast
     MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL = 0xC6,             ///< DG heat disinfect active cool start/stop command
+    MSG_ID_HD_AIR_PUMP_DATA = 0xC7,                                     ///< HD air pump data publish
 
 #ifdef EMC_TEST_BUILD
     MSG_ID_CAN_ERROR_COUNT = 0x999,  // test code in support of EMC testing
@@ -262,7 +263,7 @@
     MSG_ID_PRESSURE_VENOUS_OVERRIDE = 0x8018,                           ///< Venous pressure measured override request
     MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x8019,                      ///< Blood pump occlusion pressure measured override request
     MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE = 0x801A,                         ///< Blood pump rotor count override request
-    MSG_ID____AVAILABLE_11 = 0x801B,                                    ///< Message ID available
+    MSG_ID_HD_AIR_PUMP_SET_STATE = 0x801B,                              ///< HD set air pump state.
     MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE = 0x801C,                   ///< Pressure and occlusion broadcast interval override request
     MSG_ID_SET_RTC_DATE_TIME = 0x801D,                                  ///< RTC set date/time request
     MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE = 0x801E,               ///< Dialysate outlet flow broadcast interval override request
@@ -370,7 +371,7 @@
     MSG_ID_HD_BLOOD_PUMP_SET_PWM = 0x8085,                              ///< HD set blood pump to specific PWM duty cycle request
     MSG_ID_HD_DIAL_IN_SET_PWM = 0x8086,                                 ///< HD set dialysate inlet pump to specific PWM duty cycle request
     MSG_ID_HD_DIAL_OUT_SET_PWM = 0x8087,                                ///< HD set dialysate outlet pump to specific PWM duty cycle request
-    MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE = 0x8088,          ///< HD dialysate inlet pump rotor count override request
+    MSG_ID_HD_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE = 0x8088,       ///< HD dialysate inlet pump rotor count override request
     MSG_ID_HD_NV_RECORD_CRC_OVERRIDE = 0x8089,                          ///< HD non-volatile record CRC override
 
     MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000,                            ///< First DG test message ID
@@ -454,7 +455,7 @@
     MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0xA04F,            ///< DG set fans RPM alarm start time offset
     MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE = 0xA050,                  ///< DG used bicarb volume override in mL
     MSG_ID_FILL_MODE_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA051,           ///< DG used fill publish interval override request
-    MSG_ID_BAD_FILL_STATES_PUBLISH_INTERVAL_OVERRIDE = 0xA052,          ///< DG bad fill sub-states publish interval override request
+    MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE = 0xA052,              ///< DG gen idle sub-states publish interval override request
     MSG_ID_DG_GET_USAGE_INFO_RECORD = 0xA053,                           ///< DG get usage information record
     MSG_ID_DG_SET_USAGE_INFO_RECORD = 0xA054,                           ///< DG set usage information record
     MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055,                          ///< DG send usage information record