Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
===================================================================
diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r38677167535b480612809a53d824b86e11b2e5f9
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision 38677167535b480612809a53d824b86e11b2e5f9)
@@ -86,22 +86,25 @@
     // Self tests dry state
     bool mSelfTestDry                               = vData.mSubMode                    == GuiPreTreatmentStates                    ::TD_PRE_TREATMENT_SELF_TEST_DRY_STATE                   ;
     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_usedCartridge                 ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE             );
-          selfTestDry_cartridgeLoaded               ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_CARTRIDGE_LOADED_CHECK_STATE           );
-          selfTestDry_pressureSensorsNormalSetup    ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_SETUP_STATE    );
-          selfTestDry_pressureSensorsVenousSetup    ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS_SETUP_STATE    );
-          selfTestDry_pressureSensorsVenous         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_VENOUS                );
-          selfTestDry_pressureSensorsArterialSetup  ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL_SETUP_STATE  );
-          selfTestDry_pressureSensorsArterial       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_ARTERIAL              );
-          selfTestDry_pressureSensorsDecay          ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_DECAY_STATE           );
-          selfTestDry_pressureSensorsStability      ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_STABILITY_STATE       );
-          selfTestDry_pressureSensorsNormal         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE          );
-          selfTestDry_syringePump                   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE               );
-          selfTestDry_syringePumpOcclusionDetection ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE );
-          selfTestDry_stopped                       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_STOPPED_STATE                          );
-          selfTestDry_complete                      ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_COMPLETE_STATE                         );
+          selfTestDry_start                           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_START_STATE                            );
+          selfTestDry_waitDoorClose                   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE              );
+          selfTestDry_usedTubeSetCheck                ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_USED_TUBE_SET_CHECK_STATE              );
+          selfTestDry_tubeSetLoadedCheck              ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_TUBE_SET_LOADED_CHECK_STATE            );
+          selfTestDry_tubeSetAuthentication           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_TUBE_SET_AUTHENTICATION_STATE          );
+          selfTestDry_syringePumpSeek                 ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_SEEK_STATE                );
+          selfTestDry_pressureSensorNormalSetup       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSOR_NORMAL_SETUP_STATE     );
+          selfTestDry_pressureSensorVenousSetup       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_VENOUS_SETUP_STATE            );
+          selfTestDry_venousPressureStabilization     ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_STABILIZATION_STATE    );
+          selfTestDry_venousPressureLeakCheck         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_LEAK_CHECK_STATE       );
+          selfTestDry_venousPressureRelief            ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_VENOUS_PRESSURE_RELIEF_STATE           );
+          selfTestDry_pressureArterialSetup           ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_ARTERIAL_SETUP_STATE          );
+          selfTestDry_arterialPressureStabilization   ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_STABILIZATION_STATE  );
+          selfTestDry_arterialPressureLeakCheck       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_LEAK_CHECK_STATE     );
+          selfTestDry_arterialPressureRelief          ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_ARTERIAL_PRESSURE_RELIEF_STATE         );
+          selfTestDry_syringePump                     ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE               );
+          selfTestDry_syringePumpOcclusionCheck       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_CHECK_STATE     );
+          selfTestDry_complete                        ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_COMPLETE_STATE                         );
+          selfTestDry_stopped                         ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_STOPPED_STATE                          );
     }
     selfTestDry(mSelfTestDry); // it's the main even so moved last to have all the sub-states updated prior to.