Index: dialin/common/msg_ids.py
===================================================================
diff -u -rf9d050431231651a00d780bcaf98ddf2dabedf93 -rb2c16c3c893565c8efbd3dd7d76fe11dfc27b389
--- dialin/common/msg_ids.py	(.../msg_ids.py)	(revision f9d050431231651a00d780bcaf98ddf2dabedf93)
+++ dialin/common/msg_ids.py	(.../msg_ids.py)	(revision b2c16c3c893565c8efbd3dd7d76fe11dfc27b389)
@@ -343,6 +343,8 @@
     MSG_ID_HD_DIAL_IN_SET_PWM = 0x8086
     MSG_ID_HD_DIAL_OUT_SET_PWM = 0x8087
     MSG_ID_DIALYSATE_INLET_PUMP_ROTOR_COUNT_OVERRIDE = 0x8088
+    MSG_ID_HD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE = 0x8089
+    MSG_ID_HD_AIR_PUMP_SET_STATE = 0x808A
 
     MSG_ID_DG_TESTER_LOGIN_REQUEST = 0xA000
     MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001
Index: dialin/hd/hemodialysis_device.py
===================================================================
diff -u -rfe051f80c87d4d43ff6c8c1a598eacd62f61c5f8 -rb2c16c3c893565c8efbd3dd7d76fe11dfc27b389
--- dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision fe051f80c87d4d43ff6c8c1a598eacd62f61c5f8)
+++ dialin/hd/hemodialysis_device.py	(.../hemodialysis_device.py)	(revision b2c16c3c893565c8efbd3dd7d76fe11dfc27b389)
@@ -17,6 +17,7 @@
 
 from .accelerometer import HDAccelerometer
 from .air_bubbles import HDAirBubbles
+from .air_pump import HDAirPump
 from .air_trap import HDAirTrap
 from .alarms import HDAlarms
 from .blood_flow import HDBloodFlow
@@ -132,6 +133,7 @@
         # Create command groups
         self.accel = HDAccelerometer(self.can_interface, self.logger)
         self.air_bubbles = HDAirBubbles(self.can_interface, self.logger)
+        self.air_pump = HDAirPump(self.can_interface, self.logger)
         self.air_trap = HDAirTrap(self.can_interface, self.logger)
         self.alarms = HDAlarms(self.can_interface, self.logger)
         self.blood_leak = HDBloodLeak(self.can_interface, self.logger)
Index: dialin/hd/sw_configs.py
===================================================================
diff -u -rf0cb1f298e3960769e0133172769deb9afe5a393 -rb2c16c3c893565c8efbd3dd7d76fe11dfc27b389
--- dialin/hd/sw_configs.py	(.../sw_configs.py)	(revision f0cb1f298e3960769e0133172769deb9afe5a393)
+++ dialin/hd/sw_configs.py	(.../sw_configs.py)	(revision b2c16c3c893565c8efbd3dd7d76fe11dfc27b389)
@@ -75,8 +75,8 @@
     SW_CONFIG_DISABLE_SWITCHES_MONITOR = 40
     SW_CONFIG_ENABLE_VBA_SPECIAL_POSITION_C = 41
     SW_CONFIG_DISABLE_SERVICE_AND_DISINFECT_CHECK = 42
+    SW_CONFIG_DISABLE_AIR_PUMP = 43
 
-
 class HDSoftwareConfigs(AbstractSubSystem):
     """
     @brief Hemodialysis Device (HD) Dialin API sub-class for HD software configurations related commands.