Index: DDDefs.h
===================================================================
diff -u -rc34df760b62569baefc61aca92500291d001d133 -re18e375cbca9764a87a7f82b22cd5b44f3cd1b7b
--- DDDefs.h	(.../DDDefs.h)	(revision c34df760b62569baefc61aca92500291d001d133)
+++ DDDefs.h	(.../DDDefs.h)	(revision e18e375cbca9764a87a7f82b22cd5b44f3cd1b7b)
@@ -294,16 +294,30 @@
 /// Enumeration of available DD commands.
 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
+    DD_CMD_NONE = 0,                               ///< Not a command
+    DD_CMD_GOTO_POST_GENERATE,                     ///< Command to request DD to transition to Post-Generate mode
+    DD_CMD_GOTO_STANDBY,                           ///< Command to request DD to transition to Standby mode
+    DD_CMD_START_DISINFECT_SKIP,                   ///< Command to skip disinfection
+    DD_CMD_START_DISINFECT_FLUSH,                  ///< Command to request DD to start flush
+    DD_CMD_START_DISINFECT_HEAT,                   ///< Command to request DD to start heat disinfection
+    DD_CMD_START_DISINFECT_HEAT_CITRIC,            ///< Command to request DD to start heat disinfection with citric
+    DD_CMD_START_DISINFECT_SUBSTITUTION_PORT,      ///< Command to request DD to start substitution port disinfection
+    NUM_OF_DD_COMMANDS                             ///< Number of DD commands
 };
-typedef enum DD_Command DD_COMMAND_T;          ///< Type for DD commands enumeration
+typedef enum DD_Command DD_COMMAND_T;              ///< Type for DD commands enumeration
 
+/// Enumeration of available disinfection selections.
+enum Disinfect_Selection
+{
+    DISINFECT_SEL_SKIP = 0,                        ///< Selection to skip disinfection
+    DISINFECT_SEL_FLUSH,                           ///< Selection for flush
+    DISINFECT_SEL_HEAT,                            ///< Selection for heat disinfection
+    DISINFECT_SEL_HEAT_CITRIC,                     ///< Selection for heat disinfection with citric
+    DISINFECT_SEL_SUBSTITUTION_PORT,               ///< Selection for substitution port disinfection
+    NUM_OF_DISINFECT_SELECTIONS                    ///< Number of disinfection selections
+};
+typedef enum Disinfect_Selection DISINFECT_SELECTION_T; ///< Type for disinfection selection enumeration
+
 /// Enumeration of general commands to DD sub-system.
 enum DD_General_Commands
 {