Index: dialin/common/msg_defs.py
===================================================================
diff -u -r80501868a8f9a2c145945bbebb486fb3a32edfb2 -rc8ab70ecfe3130fa98bc1626d905f323d7f4c7f3
--- dialin/common/msg_defs.py	(.../msg_defs.py)	(revision 80501868a8f9a2c145945bbebb486fb3a32edfb2)
+++ dialin/common/msg_defs.py	(.../msg_defs.py)	(revision c8ab70ecfe3130fa98bc1626d905f323d7f4c7f3)
@@ -1,6 +1,5 @@
 import enum
 
-
 class MsgIds(enum.Enum):
     MSG_ID_UNUSED = 0                                           # Zero is an undefined (un-used) message ID)
     MSG_ID_OFF_BUTTON_PRESS = 1                                 # HD/UI off button interactions
@@ -60,6 +59,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 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_HD_AIR_TRAP_DATA = 0x003E                            # HD broadcast of air trap data
 
     MSG_ID_CAN_ERROR_COUNT = 0x999                              # test code in support of EMC testing
 
@@ -111,6 +115,14 @@
     MSG_ID_HD_ACCEL_SET_CALIBRATION = 0x802A                    # HD accelerometer set calibration factors request
     MSG_ID_HD_BLOOD_FLOW_SET_CALIBRATION = 0x802B               # Blood flow set calibration factors request
     MSG_ID_HD_DIALYSATE_FLOW_SET_CALIBRATION = 0x802C           # Dialysate flow set calibration factors request
+    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_PWM_OVERRIDE = 0x8031                  # Set an HD valve PWM
+    MSG_ID_DG_AIR_TRAP_DATA_BROADCAST_INTERVAL_OVERRIDE = 0x8032  # HD air trap data broadcast interval override request
+    MSG_ID_DG_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
@@ -146,6 +158,7 @@
     MSG_ID_HEAT_DISINFECT_RSRVR2_TO_RSRVR1_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
Index: dialin/dg/dialysate_generator.py
===================================================================
diff -u -rc7effef22561b1c003184091240009e379835f74 -rc8ab70ecfe3130fa98bc1626d905f323d7f4c7f3
--- dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision c7effef22561b1c003184091240009e379835f74)
+++ dialin/dg/dialysate_generator.py	(.../dialysate_generator.py)	(revision c8ab70ecfe3130fa98bc1626d905f323d7f4c7f3)
@@ -316,7 +316,7 @@
 
         """
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
                                               message_id=self.MSG_ID_DG_SOFTWARE_RESET_REQUEST)
 
         self.logger.debug("requesting DG software reset")
Index: dialin/hd/air_trap.py
===================================================================
diff -u -r615852271ed083494ef644c55536c5dad1b25c83 -rc8ab70ecfe3130fa98bc1626d905f323d7f4c7f3
--- dialin/hd/air_trap.py	(.../air_trap.py)	(revision 615852271ed083494ef644c55536c5dad1b25c83)
+++ dialin/hd/air_trap.py	(.../air_trap.py)	(revision c8ab70ecfe3130fa98bc1626d905f323d7f4c7f3)
@@ -29,11 +29,6 @@
     Hemodialysis Delivery (HD) Dialin API sub-class for air trap related commands.
     """
 
-    # Air trap message IDs
-    MSG_ID_HD_AIR_TRAP_DATA = 0x003E
-    MSG_ID_DG_AIR_TRAP_LEVEL_SENSOR_OVERRIDE = 0x8033
-    MSG_ID_DG_AIR_TRAP_DATA_BROADCAST_INTERVAL_OVERRIDE = 0x8032
-
     # Air trap broadcast message field positions
     START_POS_LOWER_LEVEL = DenaliMessage.PAYLOAD_START_INDEX
     END_POS_LOWER_LEVEL = START_POS_LOWER_LEVEL + 4
@@ -130,7 +125,7 @@
         idx = integer_to_bytearray(sensor)
         payload = rst + det + idx
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_DG_AIR_TRAP_LEVEL_SENSOR_OVERRIDE,
                                               payload=payload)
 
@@ -163,7 +158,7 @@
         mis = integer_to_bytearray(ms)
         payload = rst + mis
 
-        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id,
+        message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id,
                                               message_id=self.MSG_ID_DG_AIR_TRAP_DATA_BROADCAST_INTERVAL_OVERRIDE,
                                               payload=payload)