Index: HDDefs.h
===================================================================
diff -u -rd82c9506c6d4993b087bb3baecd4ad50367d60f1 -r214c8f2c0bce8e14e8a46ea01221c11f16d75b52
--- HDDefs.h	(.../HDDefs.h)	(revision d82c9506c6d4993b087bb3baecd4ad50367d60f1)
+++ HDDefs.h	(.../HDDefs.h)	(revision 214c8f2c0bce8e14e8a46ea01221c11f16d75b52)
@@ -138,16 +138,23 @@
 };
 typedef enum HD_Pre_Treatment_Mode_States HD_PRE_TREATMENT_MODE_STATE_T;    ///< Type for HD pre-treatment mode states enumeration
 
+/**@}*/
+
+/**
+ *  @addtogroup SampleWater
+ *  @{
+ */
+
 /// Enumeration of sample water sub-mode states.
-enum Sample_Water_States
+enum HD_Pre_Treatment_Sample_Water_States
 {
     SAMPLE_WATER_SETUP_STATE = 0,                               ///< Sample water setup state of the sample water sub-mode state machine
     SAMPLE_WATER_STATE,                                         ///< Sample water state of the sample water sub-mode state machine
     NUM_OF_SAMPLE_WATER_STATES                                  ///< Number of sample water sub-mode states
 };
-typedef enum Sample_Water_States SAMPLE_WATER_STATE_T;          ///< Type for sample water states enumeration.
+/// Type for sample water states enumeration.
+typedef enum HD_Pre_Treatment_Sample_Water_States SAMPLE_WATER_STATE_T;
 
-
 /// Enumeration of user actions that may be requested from sample water sub-mode.
 enum Requested_Sample_Water_User_Actions
 {
@@ -157,6 +164,52 @@
 };
 /// Type for requested user actions enumeration.
 typedef enum Requested_Sample_Water_User_Actions REQUESTED_SAMPLE_WATER_USER_ACTIONS_T;
+
+/**@}*/
+
+/**
+ *  @addtogroup SelfTests
+ *  @{
+ */
+
+/// Enumeration of no cartridge self-tests sub-mode states.
+enum HD_Pre_Treatment_No_Cart_Self_Tests_States
+{
+    NO_CART_SELF_TESTS_START_STATE = 0,                     ///< No cartridge self-tests starting state.
+    NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,           ///< Wait for door to be closed before running self-tests.
+    NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE,             ///< No cartridge occlusion sensors self-test state.
+    NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE,             ///< No cartridge blood flow meter self-test state.
+    NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE,         ///< No cartridge dialysate flow meter self-test state.
+    NO_CART_SELF_TESTS_PUMPS_STATE,                         ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state.
+    NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE,                ///< No cartridge leak detectors self-test state.
+    NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE,             ///< No cartridge board temperature self-test state.
+    NO_CART_SELF_TESTS_DOOR_SWITCH_STATE,                   ///< No cartridge door switch self-test state.
+    NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE,         ///< No cartridge home valves and pumps self-test state.
+    NO_CART_SELF_TESTS_HOME_IDLE_STATE,                     ///< Wait for valves and pumps finish homing state.
+    NO_CART_SELF_TESTS_STOPPED_STATE,                       ///< No cart self-test stopped state.
+    NO_CART_SELF_TESTS_COMPLETE_STATE,                      ///< No cartridge self-test complete state.
+    NUM_OF_NO_CART_SELF_TESTS_STATES                        ///< Number of no cartridge self-tests states.
+};
+/// Type for no cartridge self-tests enumeration.
+typedef enum HD_Pre_Treatment_No_Cart_Self_Tests_States NO_CART_SELF_TESTS_STATE_T;
+
+/// Enumeration of dry self-tests sub-mode states.
+enum HD_Pre_Treatment_Dry_Self_Tests_States
+{
+    DRY_SELF_TESTS_START_STATE = 0,                         ///< Dry self-tests starting state.
+    DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE,               ///< Wait for door to close before executing self-tests.
+    DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE,                   ///< Bubble detectors dry self-test state.
+    DRY_SELF_TESTS_AIR_TRAP_STATE,                          ///< Air trap fill level ultrasonic sensor dry self-test state.
+    DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE,                 ///< Occlusion sensors dry self-test state.
+    DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE,            ///< Pressure sensors dry self-test setup valves and pump state.
+    DRY_SELF_TESTS_PRESSURE_SENSORS_STATE,                  ///< Pressure sensors verify pressure readings state.
+    DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE,           ///< Preassure sensors verify normal pressure readings state.
+    DRY_SELF_TESTS_STOPPED_STATE,                           ///< Dry self-test stopped state.
+    DRY_SELF_TESTS_COMPLETE_STATE,                          ///< Dry self-test complete state.
+    NUM_OF_DRY_SELF_TESTS_STATES                            ///< Number of dry self-tests states.
+};
+/// Type for dry self-tests enumeration.
+typedef enum HD_Pre_Treatment_Dry_Self_Tests_States DRY_SELF_TESTS_STATE_T;
 
 /**@}*/