Index: TDDefs.h
===================================================================
diff -u -rd1f00c0d4796ab9660986399705aea06907aa710 -r277bd9cf72d1e525830e82c68235058c475c97d6
--- TDDefs.h	(.../TDDefs.h)	(revision d1f00c0d4796ab9660986399705aea06907aa710)
+++ TDDefs.h	(.../TDDefs.h)	(revision 277bd9cf72d1e525830e82c68235058c475c97d6)
@@ -59,11 +59,10 @@
     POST_STATE_BLOOD_FLOW,                              ///< Run blood flow test state
     POST_STATE_VALVES,                                  ///< Run valves test state
     POST_STATE_SYRINGE_PUMP,                            ///< Run syringe pump test state
-    POST_STATE_PRES_OCCL,                               ///< Run pressure occlusion state
+    POST_STATE_PRESSURE,                                ///< Run pressure state
     POST_STATE_ALARM_AUDIO,                             ///< Run alarm audio test state
     POST_STATE_ALARM_LAMP,                              ///< Run alarm lamp test state
     POST_STATE_TEMPERATURES,                            ///< Run temperatures POST state
-    POST_STATE_FANS,                                    ///< Run fans POST state
     POST_STATE_STUCK_BUTTON,                            ///< Run stuck button test state
     POST_STATE_UI_POST,                                 ///< Check whether UI passed its POST tests
     POST_STATE_FW_COMPATIBILITY,                        ///< Run firmware compatibility test state
@@ -832,11 +831,11 @@
 /// Enumeration of generic confirmation request type from TD to UI.
 enum Generic_Confirm_Command
 {
-    GENERIC_CONFIRM_CMD_REQUEST_OPEN    = 0,                            ///< Generic Confirm command to display the confirmation
-    GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE   = 1,                            ///< Generic Confirm command to hide    the confirmation, due to timeout user confirmation
-    GENERIC_CONFIRM_CMD_REJECT          = 2,                            ///< Generic Confirm command to display the confirmation rejection in case the request in not valid/accepted anymore.
-    GENERIC_CONFIRM_CMD_ACCEPT_CLOSE    = 3,                            ///< Generic Confirm command to hide    the confirmation, due to accept  user confirmation.
-    NUM_OF_GENERIC_CONFIRM_COMMAND                                      ///< Total number of generic confirm commands
+    GENERIC_CONFIRM_CMD_REQUEST_OPEN         = 0,                            ///< Generic Confirm command to display the confirmation
+    GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE        = 1,                            ///< Generic Confirm command to hide    the confirmation, due to timeout user confirmation
+    GENERIC_CONFIRM_CMD_REJECT               = 2,                            ///< Generic Confirm command to display the confirmation rejection in case the request in not valid/accepted anymore.
+    GENERIC_CONFIRM_CMD_ACCEPT_CLOSE         = 3,                            ///< Generic Confirm command to hide    the confirmation, due to accept  user confirmation.
+    NUM_OF_GENERIC_CONFIRM_COMMAND                                           ///< Total number of generic confirm commands
 };
 typedef enum Generic_Confirm_Command GENERIC_CONFIRM_COMMAND_T;         ///< Type for generic confirm enumeration
 
@@ -851,8 +850,17 @@
 enum Generic_Confirm_Id
 {
     GENERIC_CONFIRM_ID_NONE = 0,                                        ///< Generic Confirm None
-    GENERIC_CONFIRM_ID_SHUT_DOWN,                                       ///< Shutdown user confirmation
+    GENERIC_CONFIRM_ID_POWER_OFF,                                       ///< Power Off, User confirmation
     GENERIC_CONFIRM_ID_TREATMENT_END,                                   ///< End treatment user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH,                       ///< Water flush stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT,                             ///< Heat disinfect stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL,                         ///< Chemical disinfect stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH,                   ///< Chemical disinfect flush stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_CHEM_FLUSH_SAMPLE_PASS_FAIL,           ///< Chemical disinfect sample flush pass/fail
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL,                      ///< Active cool stop user confirmation
+    GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE,               ///< RO permeate sample stop user confirmation
+    GENERIC_CONFIRM_ID_RO_PERMEATE_SAMPLE_STOP_OR_DISPENSE,             ///< RO permeate sample stop or dispense
+    GENERIC_CONFIRM_ID_SHUT_DOWN,                                       ///< Shutdown user confirmation
     GENERIC_CONFIRM_ID_RINSEBACK,                                       ///< Rinseback user confirmation
     GENERIC_CONFIRM_ID_TEMPORARY_BREAK,                                 ///< Temporary break user confirmation
     NUM_OF_GENERIC_CONFIRM_IDS,                                         ///< Total number of generic confirm IDs