Index: MsgDefs.h
===================================================================
diff -u -r339a42dfb1c7ebd43df0393ed8ef972291b8b233 -r7fc2917f51b089d21122bfd4869039df8a13386f
--- MsgDefs.h	(.../MsgDefs.h)	(revision 339a42dfb1c7ebd43df0393ed8ef972291b8b233)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 7fc2917f51b089d21122bfd4869039df8a13386f)
@@ -128,9 +128,7 @@
     MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60,                                    ///< TD solution infusion response
     MSG_ID_DD_BLOOD_LEAK_DATA = 0x61,                                               ///< DD blood leak data
     MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x62,                                       ///< 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
@@ -191,6 +189,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
@@ -260,6 +261,10 @@
     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_AVAILABLE_1 = 0xA046,                                                    ///< Msg ID not used - available for use.
     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
@@ -320,8 +325,11 @@
     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_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02D,                ///< FP inlet pressure check data publish interval override request
-    MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB02E,                      ///< FP inlet pressure check time override 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_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