Index: MsgDefs.h
===================================================================
diff -u -r7ead8e12e4ef918e82dd11e7e92bdca79eb7d82b -r6c87218d3df653c75fb2c92ed5ea4230cf597af6
--- MsgDefs.h	(.../MsgDefs.h)	(revision 7ead8e12e4ef918e82dd11e7e92bdca79eb7d82b)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 6c87218d3df653c75fb2c92ed5ea4230cf597af6)
@@ -129,9 +129,10 @@
     MSG_ID_DD_BLOOD_LEAK_DATA = 0x61,                                               ///< DD blood leak data
     MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x62,                                     ///< FP Inlet Pressure Check broadcast data
 
-#ifdef __PUMPTEST__
+    #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
@@ -192,6 +193,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
@@ -258,9 +262,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_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_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
@@ -269,11 +276,6 @@
     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
 
     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