Index: RODefs.h
===================================================================
diff -u -rb0eae01186e2262b46b949ee8fd5fbb12af6f538 -r05452614f8c8149a58072624de75b6064d745b50
--- RODefs.h	(.../RODefs.h)	(revision b0eae01186e2262b46b949ee8fd5fbb12af6f538)
+++ RODefs.h	(.../RODefs.h)	(revision 05452614f8c8149a58072624de75b6064d745b50)
@@ -12,23 +12,19 @@
 /// Enumeration of operation modes.  These are in order of priority (highest to lowest).
 enum RO_Op_Modes
 {
-    MODE_FAUL = 0,                       ///< Fault mode
-    MODE_SERV,                           ///< Service mode
-    MODE_INIT,                           ///< Initialization & POST mode
-    MODE_STAN,                           ///< Standby mode
-    MODE_TPAR,                           ///< Treatment Parameters mode
-    MODE_PRET,                           ///< Pre-Treatment mode
-    MODE_TREA,                           ///< Treatment mode
-    MODE_POST,                           ///< Post-Treatment mode
-    MODE_NLEG,                           ///< Not legal - an illegal mode transition occurred
-    NUM_OF_MODES                         ///< Number of TD operation modes
+    RO_MODE_FAUL = 0,                       ///< Fault mode
+    RO_MODE_SERV,                           ///< Service mode
+    RO_MODE_INIT,                           ///< Initialization & POST mode
+    RO_MODE_STAN,                           ///< Standby mode
+    RO_MODE_NLEG,                           ///< Not legal - an illegal mode transition occurred
+    NUM_OF_RO_MODES                         ///< Number of TD operation modes
 };
 typedef enum RO_Op_Modes RO_OP_MODE_T;  ///< Type for RO operation modes enumeration
 
 /**@}*/
 
 /**
- *  @addtogroup HDInitAndPOSTMode
+ *  @addtogroup ROInitAndPOSTMode
  *  @{
  */
 
@@ -40,16 +36,7 @@
     POST_STATE_NVDATAMGMT,                              ///< Run NV Data Mgmt. test state
     POST_STATE_WATCHDOG,                                ///< Run watchdog test state
     POST_STATE_SAFETY_SHUTDOWN,                         ///< Run safety shutdown test state
-    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_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
     POST_STATE_FPGA,                                    ///< Run FPGA test state
     POST_STATE_COMPLETED,                               ///< POST self-tests completed state