Index: MsgDefs.h
===================================================================
diff -u -r4dacf41ce596f5f8f5ef0c2499bd2cefec740fc9 -rbfdf1fb5beb20010983457ab4588684c25f50c13
--- MsgDefs.h	(.../MsgDefs.h)	(revision 4dacf41ce596f5f8f5ef0c2499bd2cefec740fc9)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision bfdf1fb5beb20010983457ab4588684c25f50c13)
@@ -121,11 +121,13 @@
     MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59,                                              ///< FP Pre Generate Permeate Defeatured broadcast data
     MSG_ID_FP_VERSION_RESPONSE = 0x5A,                                              ///< FP FW Version response
     MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B,                                   ///< TD treatment paused timer data.
-    MSG_ID_FP_PERMEATE_TANK_DATA = 0x5C,                                            ///< FP Permeate tank broadcast data
-
+    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_DD_PISTON_PUMP_CONTROL_DATA = 0xF0,                                      ///< DD piston pump data
 #endif
+
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
     MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE,                   ///< TD tester log-in
@@ -186,6 +188,9 @@
     MSG_ID_TD_BLOOD_FLOW_ALPHA_Y_INTERCEPT_OVERRIDE_REQUEST = 0x8037,               ///< TD override request for blood flow alpha Y intercept
     MSG_ID_TD_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST = 0x8038,                     ///< TD override request for blood flow wear A term
     MSG_ID_TD_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST = 0x8039,                     ///< TD override request for blood flow wear B term
+    MSG_ID_TD_SET_TEST_CONFIGURATION = 0x803A,                                      ///< TD set test configuration
+    MSG_ID_TD_GET_TEST_CONFIGURATION = 0x803B,                                      ///< TD get test configuration
+    MSG_ID_TD_RESET_ALL_TEST_CONFIGURATIONS = 0x803C,                               ///< TD reset all the configurations
 
     MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000,                                        ///< First DD test message ID
     MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE,                ///< DD tester log-in
@@ -230,7 +235,7 @@
     MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA027,                    ///< DD TD CAN Communication status override request
     MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST = 0xA028,                             ///< DD operation mode status override request
     MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST = 0xA029,                         ///< DD set new operation mode override request
-    MSG_ID_DD_AVAILABLE_TO_USE_1 = 0xA02A,                                          ///< DD start gen dialysate mode override request
+    MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E,                            ///< DD ultrafiltration data publish interval override request
     MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02B,                 ///< DD dialysate pumps start/stop override request
     MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02C,                     ///< DD generate dialysate mode data publish interval override request
     MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02D,               ///< DD Concentrate pumps start/stop override request
@@ -252,14 +257,12 @@
     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_AVAILABLE_TO_USE_2 = 0xA040,                                          ///< DD stop pre-gen dialysate mode override request
+    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
-#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
+    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_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
@@ -307,6 +310,9 @@
     MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02A,             ///< FP Permeate Tank data publish interval override request
     MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B,                                ///< FP Alarm State override request
     MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C,                              ///< FP alarm clear request
+    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_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