Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -radd1665bb756188ddca1b7e26728a6a80598d0da -reb02c56e88faeeda46ed62b1c0ec841dca0b9aba
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision add1665bb756188ddca1b7e26728a6a80598d0da)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision eb02c56e88faeeda46ed62b1c0ec841dca0b9aba)
@@ -97,19 +97,14 @@
     MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA = 0x4A
     MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x4B
     MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x4C
-    MSG_ID_RO_PRE_GEN_WATER_MODE_DATA = 0x4D
     MSG_ID_TD_EJECTOR_DATA = 0x4E
-    MSG_ID_TD_TREATMENT_SET_POINTS = 0x4F
-    MSG_ID_RO_BOOST_PUMP_DATA = 0x50
-    MSG_ID_TD_SERIAL_RESPONSE = 0x51
-    MSG_ID_DD_SERIAL_RESPONSE = 0x52
-    MSG_ID_TD_TEMPERATURE_DATA = 0x53
-    MSG_ID_TD_BATTERY_DATA = 0x54
+    MSG_ID_TD_TREATMENT_SET_POINTS_DATA = 0x4F
+    MSG_ID_DD_SERIAL_RESPONSE = 0x88
+    MSG_ID_TD_TEMPERATURE_DATA = 0x91
+    MSG_ID_TD_BATTERY_DATA = 0x94
+    MSG_ID_TD_SERIAL_RESPONSE = 0x99
 
-    MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
-
-
-    MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000
+    MSG_ID_TESTER_LOGIN_REQUEST = 0x8000
     MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001
     MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002
     MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST = 0x8003
@@ -156,14 +151,8 @@
     MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST = 0x802C
     MSG_ID_TD_REQ_CURRENT_TREATMENT_PARAMETERS = 0x802D
     MSG_ID_TD_RSP_CURRENT_TREATMENT_PARAMETERS = 0x802E
-    MSG_ID_TD_SET_TREATMENT_PARAMETER = 0x802F
-    MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8030
-    MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST = 0x8031
-    MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST = 0x8032
-    MSG_ID_TD_EJECTOR_COMMAND = 0x8033
-    MSG_ID_TD_EJECTOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8034
-    MSG_ID_TD_SET_AIR_TRAP_CONTROL = 0x8035
-    MSG_ID_TD_HOME_BLOOD_PUMP_REQUEST = 0x8036
+    MSG_ID_TD_OP_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x802F
+    MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST = 0x8030
 
     MSG_ID_DD_TESTER_LOGIN_REQUEST = 0xA000
     MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001
@@ -236,7 +225,7 @@
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01
     MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02
 
-    MSG_ID_RO_TESTER_LOGIN_REQUEST = 0xB000
+    MSG_ID_FIRST_RO_TESTER_MESSAGE = 0xB000
     MSG_ID_RO_SOFTWARE_RESET_REQUEST = 0xB001
     MSG_ID_RO_SEND_TEST_CONFIGURATION = 0xB002
     MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB003
@@ -264,10 +253,6 @@
     MSG_ID_RO_TEMPERATURE_OVERRIDE_REQUEST = 0xB019
     MSG_ID_RO_FILTERED_FLOW_RATE_OVERRIDE_REQUEST = 0xB01A
     MSG_ID_RO_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST = 0xB01B
-    MSG_ID_RO_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01C
-    MSG_ID_RO_SET_OP_MODE_REQUEST = 0xB01D
-    MSG_ID_RO_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01E
-    MSG_ID_RO_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01F
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2