Index: sources/view/hd/data/VPreTreatmentStatesData.cpp
===================================================================
diff -u -rc0c63c4b149dafea2b02e4cd31f223e392ff7818 -rbd01334f257c35b96b7b232beacbcd7fae60c852
--- sources/view/hd/data/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision c0c63c4b149dafea2b02e4cd31f223e392ff7818)
+++ sources/view/hd/data/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision bd01334f257c35b96b7b232beacbcd7fae60c852)
@@ -72,7 +72,7 @@
           selfTestNoCartridge_pumps                 ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PUMPS_STATE                    );
           selfTestNoCartridge_leakDetectors         ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE           );
           selfTestNoCartridge_boardTemperature      ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE        );
-          selfTestNoCartridge_doorSwitch            ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_DOOR_SWITCH_STATE              );
+          selfTestNoCartridge_startHoming           ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_START_HOMING_STATE             );
           selfTestNoCartridge_homeValvesAndPumps    ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE    );
           selfTestNoCartridge_homeIdle              ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_IDLE_STATE                );
           selfTestNoCartridge_stopped               ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_STOPPED_STATE                  );
@@ -95,8 +95,7 @@
     if ( mSelfTestDry ) {
           selfTestDry_start                         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_START_STATE                        );
           selfTestDry_waitDoorClose                 ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE          );
-          selfTestDry_bubbleDetector                ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE              );
-          selfTestDry_airTrap                       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_AIR_TRAP_STATE                     );
+          selfTestDry_usedCartridge                 ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE         );
           selfTestDry_occlusionSensors              ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE            );
           selfTestDry_pressureSensorsSetup          ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE       );
           selfTestDry_pressureSensors               ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_STATE             );