Index: HDDefs.h
===================================================================
diff -u -rba8bfa859b21b843e365da5c378f8acfabfcfd2b -r01ed3842b4ee776b8d81a3b47a9cf0063469c97c
--- HDDefs.h	(.../HDDefs.h)	(revision ba8bfa859b21b843e365da5c378f8acfabfcfd2b)
+++ HDDefs.h	(.../HDDefs.h)	(revision 01ed3842b4ee776b8d81a3b47a9cf0063469c97c)
@@ -149,8 +149,9 @@
 /// Enumeration of sample water sub-mode 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
+    SAMPLE_WATER_SETUP_STATE = 0,                               ///< Sample water setup (flush filter) state
+    SAMPLE_WATER_STATE,                                         ///< Sample water state, receiving sample water commands from the user
+    SAMPLE_WATER_COMPLETE_STATE,                                ///< Sample water complete state
     NUM_OF_SAMPLE_WATER_STATES                                  ///< Number of sample water sub-mode states
 };
 /// Type for sample water states enumeration.
@@ -205,7 +206,7 @@
     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_START_HOMING_STATE,                  ///< No cartridge start home valves and pumps 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
@@ -220,8 +221,7 @@
 {
     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_USED_CARTRIDGE_CHECK_STATE,              ///< Bubble detectors 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