Index: HDDefs.h
===================================================================
diff -u -ra000b2f3853b15600868922976d6db1c22970184 -r7b502f7e532b1b8c69b28f3dab7002cda4921990
--- HDDefs.h	(.../HDDefs.h)	(revision a000b2f3853b15600868922976d6db1c22970184)
+++ HDDefs.h	(.../HDDefs.h)	(revision 7b502f7e532b1b8c69b28f3dab7002cda4921990)
@@ -58,9 +58,9 @@
     POST_STATE_NVDATAMGMT,                              ///< Run NV Data Mgmt. test mode state
     POST_STATE_BLOOD_FLOW,                              ///< Run Blood Flow test mode state
     POST_STATE_DIALYSATE_FLOW,                          ///< Run Dialysate Flow test mode state
-    POST_STATE_ACCELEROMETER,                           ///< Run Accelerometer test mode state
     POST_STATE_VALVES,                                  ///< Run Valves test mode state
     POST_STATE_ALARM_LAMP,                              ///< Run alarm lamp test mode state
+    POST_STATE_ACCELEROMETER,                           ///< Run Accelerometer test mode state
     POST_STATE_STUCK_BUTTON,                            ///< Run stuck button test mode state
     POST_STATE_COMPLETED,                               ///< POST self-tests completed mode state
     POST_STATE_FAILED,                                  ///< POST self-tests failed mode state
@@ -128,9 +128,10 @@
 {
     HD_PRE_TREATMENT_START_STATE = 0,                                       ///< Start pre-treatment mode state
     HD_PRE_TREATMENT_WATER_SAMPLE_STATE,                                    ///< Water sample state
-    HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE,                               ///< Self tests with no cartridge state
+    HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,                            ///< Consumable self-tests state
+    HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE,                               ///< No cartridge self-tests state
     HD_PRE_TREATMENT_CART_INSTALL_STATE,                                    ///< Consumable and cartridge installation state
-    HD_PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self tests dry state
+    HD_PRE_TREATMENT_SELF_TEST_DRY_STATE,                                   ///< Self-tests when the cartridge is dry state
     HD_PRE_TREATMENT_PRIME_STATE,                                           ///< Prime blood and dialysate circuits and run wet self-tests state
     HD_PRE_TREATMENT_RECIRCULATE_STATE,                                     ///< Re-circulate blood and dialysate circuits state
     HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE,                              ///< Patient connection state
@@ -168,45 +169,66 @@
 /**@}*/
 
 /**
+ *  @addtogroup SelfTestConsumable
+ *  @{
+ */
+
+/// Enumeration of consumable self-tests sub-mode states.
+enum HD_Pre_Treatment_Consumable_Self_Test_States
+{
+    CONSUMABLE_SELF_TESTS_INSTALL_STATE = 0,                      ///< Consumable self-tests install state
+    CONSUMABLE_SELF_TESTS_FILL_CMD_STATE,                         ///< Send command to DG to fill reservoir state
+    CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE,              ///< Consumable self-tests water quality check state
+    CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE,                ///< Consumable self-tests bicarbonate concentrate pump check state
+    CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE,                  ///< Consumable self-tests acid concentrate pump check state
+    CONSUMABLE_SELF_TESTS_COMPLETE_STATE,                         ///< Consumable self-tests complete state
+    NUM_OF_CONSUMABLE_SELF_TESTS_STATES                           ///< Number of consumable install sub-mode states
+};
+/// Type for consumable self-tests states enumeration.
+typedef enum HD_Pre_Treatment_Consumable_Self_Test_States CONSUMABLE_SELF_TESTS_STATE_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.
+    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.
+    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;
@@ -247,9 +269,9 @@
 /// Enumeration of pre-treatment recirculate states.
 enum HD_Pre_Treatment_Recirc_States
 {
-    PRE_TREATMENT_RECIRC_STATE = 0,                                 ///< Pre-treatment recirculate state.
-    PRE_TREATMENT_RECIRC_STOPPED_STATE,                             ///< Pre-treatment recirculate stopped state.
-    NUM_OF_PRE_TREATMENT_RECIRC_STATES                              ///< Number of pre-treatment recirculate states.
+    PRE_TREATMENT_RECIRC_STATE = 0,                                 ///< Pre-treatment recirculate state
+    PRE_TREATMENT_RECIRC_STOPPED_STATE,                             ///< Pre-treatment recirculate stopped state
+    NUM_OF_PRE_TREATMENT_RECIRC_STATES                              ///< Number of pre-treatment recirculate states
 };
 ///< Type for HD pre-treatment recirculate sub-mode states enumeration
 typedef enum HD_Pre_Treatment_Recirc_States HD_PRE_TREATMENT_RECIRC_STATE_T;