Index: MsgDefs.h
===================================================================
diff -u -rbfdf1fb5beb20010983457ab4588684c25f50c13 -r1fd4d31c01b66269e3b77d3a39a5bb6ac2f2d81e
--- MsgDefs.h	(.../MsgDefs.h)	(revision bfdf1fb5beb20010983457ab4588684c25f50c13)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 1fd4d31c01b66269e3b77d3a39a5bb6ac2f2d81e)
@@ -124,7 +124,11 @@
     MSG_ID_DD_UF_DATA = 0x5C,                                                       ///< DD ultrafiltration data
     MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D,                                            ///< FP Permeate tank broadcast data
     MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x5E,                                       ///< DD spent chamber fill broadcast data
-#ifdef __PUMPTEST__
+    MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F,                                     ///< UI solution infusion request
+    MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60,                                    ///< TD solution infusion response
+    MSG_ID_DD_BLOOD_LEAK_DATA = 0x61,                                               ///< DD blood leak data
+
+    #ifdef __PUMPTEST__
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0,                                      ///< DD piston pump data
 #endif
 
@@ -256,13 +260,21 @@
     MSG_ID_DD_HEATERS_PWM_PERIOD_OVERIDE_REQUEST = 0xA03C,                          ///< DD heaters PWM period override request
     MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D,                 ///< DD Pre generate dialysate mode data publish interval override request
     MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E,                ///< DD Post generate dialysate mode data publish interval override request
-    MSG_ID_DD_AVAILABLE_TO_USE_3 = 0xA03F,                                          ///< DD start pre-gen dialysate mode override request
+    MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0xA03F,                           ///< DD send blood embedded mode response
     MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA040,              ///< DD stop pre-gen dialysate mode override request
     MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041,                                          ///< DD stop gen dialysate mode override request
     MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042,                            ///< DD set/reset safety shutdown override request
     MSG_ID_DD_SET_TEST_CONFIGURATION = 0xA043,                                      ///< DD set test configuration
     MSG_ID_DD_GET_TEST_CONFIGURATION = 0xA044,                                      ///< DD get test configuration
     MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0xA045,                               ///< DD reset all the configurations
+    MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA047,           ///< DD blood leak data publish interval override request
+    MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST = 0xA048,                          ///< DD blood leak status override request
+    MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST = 0xA049,                     ///< DD blood leak set to embedded mode request
+    MSG_ID_DD_BLOOD_LEAK_SET_EMBEDDED_MODE_CMD_REQUEST = 0xA04A,                    ///< DD blood leak set embedded more command request
+    MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST = 0xA04B,              ///< DD blood leak embedded mode information override request
+    MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C,        ///< DD blood leak intensity moving average override request
+    MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D,          ///< DD blood leak zeroing interval in milliseconds override request
+    MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E,                                     ///< DD blood leak zero request
 
     MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000,                                        ///< First FP test message ID
     MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE,                ///< FP tester log-in