Index: TDDefs.h
===================================================================
diff -u -rcb36235b4b58396a6bd8e51bf5c65475a4fd50c3 -r6b7b39ca05636f3c413b46934e90ac315fa1fb75
--- TDDefs.h	(.../TDDefs.h)	(revision cb36235b4b58396a6bd8e51bf5c65475a4fd50c3)
+++ TDDefs.h	(.../TDDefs.h)	(revision 6b7b39ca05636f3c413b46934e90ac315fa1fb75)
@@ -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
@@ -853,12 +852,13 @@
 enum Generic_Confirm_Id
 {
     GENERIC_CONFIRM_ID_NONE = 0,                                        ///< Generic Confirm None
+    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_TREATMENT_END,                                   ///< End treatment user confirmation
     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