Index: MsgDefs.h
===================================================================
diff -u -r270c54fae643f806d3337d0d3eb94502bed0679d -r3d2c761d124ff546c5b31a1df9ec90f539b4daf6
--- MsgDefs.h	(.../MsgDefs.h)	(revision 270c54fae643f806d3337d0d3eb94502bed0679d)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision 3d2c761d124ff546c5b31a1df9ec90f539b4daf6)
@@ -179,6 +179,12 @@
     MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST = 0x8031,                                    ///< TD set operation mode request
     MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST = 0x8032,                             ///< TD set ejector motor speed request
     MSG_ID_TD_EJECTOR_COMMAND = 0x8033,                                             ///< TD ejector command
+    MSG_ID_TD_EJECTOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8034,                   ///< TD override request for ejector data publish interval
+    MSG_ID_TD_SET_AIR_TRAP_CONTROL = 0x8035,                                        ///< TD set air trap control to start or stop
+    MSG_ID_TD_HOME_BLOOD_PUMP = 0x8036,                                             ///< TD home blood pump request
+    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_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
Index: TDDefs.h
===================================================================
diff -u -r1c1f4fde88eefc4af45fc0dcc14e8fcd0be77712 -r3d2c761d124ff546c5b31a1df9ec90f539b4daf6
--- TDDefs.h	(.../TDDefs.h)	(revision 1c1f4fde88eefc4af45fc0dcc14e8fcd0be77712)
+++ TDDefs.h	(.../TDDefs.h)	(revision 3d2c761d124ff546c5b31a1df9ec90f539b4daf6)
@@ -84,9 +84,8 @@
 /// Enumeration of fault mode states.
 enum TD_Fault_States
 {
-    TD_FAULT_STATE_START = 0,                           ///< TD fault start state
-    TD_FAULT_STATE_RUN_NV_POSTS,                        ///< TD fault run NV posts state
-    TD_FAULT_STATE_COMPLETE,                            ///< TD fault run complete state
+    TD_FAULT_ENERGIZED_STATE = 0,                       ///< Fault mode energized state.
+    TD_FAULT_DEENERGIZED_STATE,                         ///< Fault mode deenergized state.
     NUM_OF_TD_FAULT_STATES                              ///< Number of fault mode states
 };
 typedef enum TD_Fault_States TD_FAULT_STATE_T;          ///< Type for TD fault states enumeration