Index: sources/view/hd/data/VPreTreatmentStatesData.h
===================================================================
diff -u -r0a4abcc41defc031ae20dd79f9550619bc6c9806 -rc0c63c4b149dafea2b02e4cd31f223e392ff7818
--- sources/view/hd/data/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision 0a4abcc41defc031ae20dd79f9550619bc6c9806)
+++ sources/view/hd/data/VPreTreatmentStatesData.h	(.../VPreTreatmentStatesData.h)	(revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
@@ -44,6 +44,7 @@
 
     PROPERTY( quint8 , subMode                                  ,     0 ) ///< HD_PRE_TREATMENT_START_STATE                     , Start pre-treatment mode state
     PROPERTY( quint8 , waterSampleState                         ,     0 ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE              , Water sample state
+    PROPERTY( quint8 , selfTestConsumablesState                 ,     0 ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,     , Consumable self-tests state
     PROPERTY( quint8 , selfTestNoCartridgeState                 ,     0 ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE         , Self tests with no cartridge state
     PROPERTY( quint8 , installationState                        ,     0 ) ///< HD_PRE_TREATMENT_CART_INSTALL_STATE              , Consumable and cartridge installation state
     PROPERTY( quint8 , selfTestDryState                         ,     0 ) ///< HD_PRE_TREATMENT_SELF_TEST_DRY_STATE             , Self tests dry state
@@ -54,6 +55,7 @@
     // Start pre-treatment mode state
     PROPERTY( bool   , start                                    , false ) ///< HD_PRE_TREATMENT_START_STATE                     , Start pre-treatment mode state
     PROPERTY( bool   , waterSample                              , false ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE              , Water sample state
+    PROPERTY( bool   , selfTestConsumables                      , false ) ///< HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE,     , Consumable self-tests state
     PROPERTY( bool   , selfTestNoCartridge                      , false ) ///< HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE         , Self tests with no cartridge state
     PROPERTY( bool   , installation                             , false ) ///< HD_PRE_TREATMENT_CART_INSTALL_STATE              , Consumable and cartridge installation state
     PROPERTY( bool   , selfTestDry                              , false ) ///< HD_PRE_TREATMENT_SELF_TEST_DRY_STATE             , Self tests dry state
@@ -65,6 +67,13 @@
     PROPERTY( bool   , waterSample_setup                        , false ) ///< SAMPLE_WATER_SETUP_STATE                         , Sample water setup state of the sample water sub-mode state machine
     PROPERTY( bool   , waterSample_running                      , false ) ///< SAMPLE_WATER_STATE                               , Sample water state of the sample water sub-mode state machine
 
+    // Self tests consumables state
+    PROPERTY( bool   , selfTestConsumables_install              , false ) ///< CONSUMABLE_SELF_TESTS_INSTALL_STATE              , Consumable self-tests install state
+    STATE   ( bool   , selfTestConsumables_waterQuality         , false ) ///< CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE  , Consumable self-tests water quality check state
+    STATE   ( bool   , selfTestConsumables_biCarbPump           , false ) ///< CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE    , Consumable self-tests bicarbonate concentrate pump check state
+    STATE   ( bool   , selfTestConsumables_acidPump             , false ) ///< CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE      , Consumable self-tests acid concentrate pump check state
+    STATE   ( bool   , selfTestConsumables_complete             , false ) ///< CONSUMABLE_SELF_TESTS_COMPLETE_STATE             , Consumable self-tests complete state
+
     // Self tests with no cartridge state
     PROPERTY( bool   , selfTestNoCartridge_start                , false ) ///< NO_CART_SELF_TESTS_START_STATE                   , No cartridge self-tests starting state.
     PROPERTY( bool   , selfTestNoCartridge_waitDoorClose        , false ) ///< NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE     , Wait for door to be closed before running self-tests.