Index: DDDefs.h
===================================================================
diff -u -rdf0b360f1a0f5a23ac46b4baaddf7103791cc920 -rd8aab4af568e74f6b7f86cfbca774f61a4388fd1
--- DDDefs.h	(.../DDDefs.h)	(revision df0b360f1a0f5a23ac46b4baaddf7103791cc920)
+++ DDDefs.h	(.../DDDefs.h)	(revision d8aab4af568e74f6b7f86cfbca774f61a4388fd1)
@@ -373,15 +373,9 @@
     D3_VALV,                                      ///< Valve Hydraulics Inlet (D3)
     // For standalone DD system, may need to control IO valve.
     DD_M4_VALV,                                   ///< Valve Water Inlet (M4)
-#ifdef __PUMPTEST__
-    UF1,                                          ///< UF1 valve
-    UF2,                                          ///< UF2 valve
-    LAST_HYD_VALVE = UF2,                         ///< End of Hydraulics valve of group
-#else
     LAST_HYD_VALVE = DD_M4_VALV,                  ///< End of Hydraulics valve of group
     RSRVD_SPACE1,                                 ///< This space has been reserved
     RSRVD_SPACE2,                                 ///< This space has been reserved
-#endif
     FIRST_BC_VALVE,                               ///< Start of Balancing Chamber valve group
     D23_VALV = FIRST_BC_VALVE,                    ///< Balancing chamber Valve 1 (D23)
     D19_VALV,                                     ///< Balancing chamber Valve 2 (D19)
Index: MsgDefs.h
===================================================================
diff -u -r8b2c53095fcf9330980a15273b9c3607f5ab5473 -rd8aab4af568e74f6b7f86cfbca774f61a4388fd1
--- MsgDefs.h	(.../MsgDefs.h)	(revision 8b2c53095fcf9330980a15273b9c3607f5ab5473)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision d8aab4af568e74f6b7f86cfbca774f61a4388fd1)
@@ -123,6 +123,10 @@
     MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B,                                   ///< TD treatment paused timer data.
     MSG_ID_DD_UF_DATA = 0x5C,                                                       ///< DD ultrafiltration data
     MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D,                                            ///< FP Permeate tank broadcast data
+    MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x5E,                                     ///< FP Inlet Pressure Check broadcast data
+    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
 
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
@@ -252,13 +256,29 @@
     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_AVAILABLE_TO_USE_2 = 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
+<<<<<<< HEAD
     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
+#ifdef __PUMPTEST__
+    MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00,                   ///< DD piston pump data publish interval override request
+    MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01,                     ///< DD piston pump start/stop override request
+    MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02,            ///< DD piston pump fill after dispense control
+#endif
+>>>>>>> staging
 
     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
@@ -309,6 +329,8 @@
     MSG_ID_FP_SET_TEST_CONFIGURATION = 0xB02D,                                      ///< FP set test configuration
     MSG_ID_FP_GET_TEST_CONFIGURATION = 0xB02E,                                      ///< FP get test configuration
     MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS = 0xB02F,                               ///< FP reset all the configurations
+    MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB030,                ///< FP inlet pressure check data publish interval override request
+    MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB031,                      ///< FP inlet pressure check time override request
 
     MSG_ID_TD_DEBUG_EVENT = 0xFFF1,                                                 ///< TD debug event text to be logged in event log
     MSG_ID_DD_DEBUG_EVENT = 0xFFF2,                                                 ///< DD debug event text to be logged in event log