Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -rd2998e4771e53fd9fe97273de9a6f36d04fbb7b6 -rba2793fd2b970fc89af085f1dfe4e8b6fe408353
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision d2998e4771e53fd9fe97273de9a6f36d04fbb7b6)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision ba2793fd2b970fc89af085f1dfe4e8b6fe408353)
@@ -113,7 +113,10 @@
     MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B
     MSG_ID_DD_UF_DATA = 0x5C
     MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D
-    MSG_ID_DD_BLOOD_LEAK_DATA = 0x60
+    MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x5E
+    MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F
+    MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60
+    MSG_ID_DD_BLOOD_LEAK_DATA = 0x61
 
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
@@ -176,6 +179,9 @@
     MSG_ID_TD_BLOOD_FLOW_ALPHA_Y_INTERCEPT_OVERRIDE_REQUEST = 0x8037
     MSG_ID_TD_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST = 0x8038
     MSG_ID_TD_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST = 0x8039
+    MSG_ID_TD_SET_TEST_CONFIGURATION = 0x803A
+    MSG_ID_TD_GET_TEST_CONFIGURATION = 0x803B
+    MSG_ID_TD_RESET_ALL_TEST_CONFIGURATIONS = 0x803C
 
     MSG_ID_DD_TESTER_LOGIN_REQUEST = 0xA000
     MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001
@@ -240,15 +246,28 @@
     MSG_ID_DD_HEATERS_PWM_PERIOD_OVERRIDE_REQUEST = 0xA03C
     MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D
     MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E
-    MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA03F
-    MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA040
-    MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA041
+    MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0xA03F
+    MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA040
+    MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041
     MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042
-    MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xA043
+    MSG_ID_DD_SET_TEST_CONFIGURATION = 0xA043
+    MSG_ID_DD_GET_TEST_CONFIGURATION = 0xA044
+    MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0xA045
+    MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA047
+    MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST = 0xA048
+    MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST = 0xA049
+    MSG_ID_DD_BLOOD_LEAK_SET_EMBEDDED_MODE_CMD_REQUEST = 0xA04A
+    MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST = 0xA04B
+    MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C
+    MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D
+    MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E
 
     MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00
     MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01
     MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02
+    # Placeholder message
+    MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03
+    MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04
 
     MSG_ID_FP_TESTER_LOGIN_REQUEST = 0xB000
     MSG_ID_FP_SOFTWARE_RESET_REQUEST = 0xB001
@@ -295,6 +314,9 @@
     MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02A
     MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B
     MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C
+    MSG_ID_FP_SET_TEST_CONFIGURATION = 0xB02D
+    MSG_ID_FP_GET_TEST_CONFIGURATION = 0XB02E
+    MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS = 0XB02F
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2