Index: DDDefs.h
===================================================================
diff -u -r78128d9126978673733e2e1b24e88ac72f6a3571 -rc34df760b62569baefc61aca92500291d001d133
--- DDDefs.h	(.../DDDefs.h)	(revision 78128d9126978673733e2e1b24e88ac72f6a3571)
+++ DDDefs.h	(.../DDDefs.h)	(revision c34df760b62569baefc61aca92500291d001d133)
@@ -36,6 +36,7 @@
     DD_MODE_GEND,                       ///< Generate Dialysate mode
     DD_MODE_POSG,                       ///< Post Dialysate Generation mode
     DD_MODE_HEAT,                       ///< Heat Disinfect mode
+    DD_MODE_FLUS,                       ///< Flush mode
     DD_MODE_HCOL,                       ///< Heat Disinfect cooling mode
     DD_MODE_ROPS,                       ///< RO permeate sample mode
     DD_MODE_UPDT,                       ///< Update mode
@@ -294,6 +295,11 @@
 enum DD_Command
 {
     DD_CMD_NONE = 0,                           ///< Not a command
+    DD_CMD_START_FLUSH,                             ///< Command to request DD to start flush
+    DD_CMD_START_DISINFECT_HEAT,
+    DD_CMD_START_DISINFECT_CITRIC_DD,
+    DD_CMD_START_DISINFECT_CITRIC_DD_IOFP,
+    DD_CMD_START_DISINFECT_SUBSTITUTION_PORT,
     NUM_OF_DD_COMMANDS                         ///< Number of DD commands
 };
 typedef enum DD_Command DD_COMMAND_T;          ///< Type for DD commands enumeration
Index: MsgDefs.h
===================================================================
diff -u -r45c1cc8e31e29746b7bf66dfabd3fd41d93c0af8 -rc34df760b62569baefc61aca92500291d001d133
--- MsgDefs.h	(.../MsgDefs.h)	(revision 45c1cc8e31e29746b7bf66dfabd3fd41d93c0af8)
+++ MsgDefs.h	(.../MsgDefs.h)	(revision c34df760b62569baefc61aca92500291d001d133)
@@ -270,6 +270,13 @@
     MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE_RESPONSE = 0x126,                       ///< DD NVM Set Bicarbonate Concentrate Calibration Record Response
     MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR_RESPONSE = 0x127,                             ///< DD NVM Set Accelerometer Sensor Calibration Record Response.
     MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0x128,                        ///< DD NVM Set Blood Leak Sensor Calibration Record Response.
+    MSG_ID_TD_DD_REQUEST_SERVICE_RECORD_FROM_TD = 0x129,                             ///< TD request for DD service record information.
+    MSG_ID_TD_DD_USAGE_INFO_REQUEST = 0x12A,                                         ///< TD request for DD usage information.
+    MSG_ID_TD_DD_FLUSH_REQUEST = 0x12B,                                              ///< TD request to start DD flush mode.
+    MSG_ID_TD_DD_HEAT_DISINFECT_REQUEST = 0x12C,                                     ///< TD request to start DD heat disinfect mode.
+    MSG_ID_TD_DD_HEAT_DISINFECT_ACTIVE_COOL_REQUEST = 0x12D,                         ///< TD request to start DD heat disinfect mode with active cooling.
+    MSG_ID_UI_DISINFECT_REQUEST = 0xCE,                                              ///< UI request to start the selected disinfection or flush operation.
+    MSG_ID_TD_DISINFECT_RESPONSE = 0xCF,                                             ///< TD response to the UI disinfection selection request.
 
     // service/test CAN messages
     MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000,                                        ///< First TD test message ID
Index: TDDefs.h
===================================================================
diff -u -r611e0745966384c3f0a9144446dd9e7da7cdcf7f -rc34df760b62569baefc61aca92500291d001d133
--- TDDefs.h	(.../TDDefs.h)	(revision 611e0745966384c3f0a9144446dd9e7da7cdcf7f)
+++ TDDefs.h	(.../TDDefs.h)	(revision c34df760b62569baefc61aca92500291d001d133)
@@ -103,8 +103,8 @@
     STANDBY_START_STATE = 0,                                     ///< Start standby (home actuators).
     STANDBY_WAIT_FOR_TREATMENT_STATE,                            ///< Wait for treatment.
     STANDBY_WAIT_FOR_DISINFECT_STATE,                            ///< Wait for UI to send disinfect option.
-    STANDBY_WAIT_FOR_DG_CLEANING_MODE_CMD_RESPONSE_STATE,        ///< Wait for DD cleaning mode command response state.
-    STANDBY_WAIT_FOR_DG_CLEANING_MODE_TO_START_STATE,            ///< Wait for DD cleaning mode to start state.
+    STANDBY_WAIT_FOR_DD_CLEANING_MODE_CMD_RESPONSE_STATE,        ///< Wait for DD cleaning mode command response state.
+    STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE,            ///< Wait for DD cleaning mode to start state.
     STANDBY_CLEANING_MODE_IN_PROGRESS_STATE,                     ///< Cleaning mode in progress state.
     NUM_OF_STANDBY_STATES                                        ///< Number of standby states (sub-modes).
 };
@@ -368,7 +368,7 @@
     TD_POST_TREATMENT_AUTO_EJECT_STATE,                                 ///< Auto eject state
     TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE,                         ///< Disposable removal state
     TD_POST_TREATMENT_VERIFY_STATE,                                     ///< Verify cartridge removed, syringe removed, and reservoirs drained state
-    TD_POST_TREATMENT_DISINFECTION_STATE,
+    TD_POST_TREATMENT_DISINFECTION_STATE,                               ///<
     NUM_OF_TD_POST_TREATMENT_STATES                                     ///< Number of post-treatment mode states
 };
 typedef enum TD_Post_Treatment_Mode_States TD_POST_TREATMENT_STATE_T;  ///< Type for TD post treatment mode states enumeration