Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp
===================================================================
diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -ra7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa
--- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision 54c4136d95375116e6daf23b7d4179159cf13d0c)
+++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision a7dd3f0c4be47bc29b0ef93a15e4fe47af0c64fa)
@@ -87,21 +87,24 @@
 
 
     // Self tests dry state
-    bool mSelfTestDry                               = vData.mSubMode                    == GuiPreTreatmentStates                    ::HD_PRE_TREATMENT_SELF_TEST_DRY_STATE               ;
+    bool mSelfTestDry                               = vData.mSubMode                    == GuiPreTreatmentStates                    ::HD_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_occlusionSensors              ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE            );
-          selfTestDry_pressureSensorsSetup          ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE       );
-          selfTestDry_pressureSensorsPressurized    ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_PRESSURE_SENSORS_PRESSURIZED_STATE );
-          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_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_occlusionSensors              ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_OCCLUSION_SENSORS_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_stopped                       ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_STOPPED_STATE                          );
+          selfTestDry_complete                      ( vData.mSelfTestDryState           == GuiPreTreatmentSelfTestDryStates         ::DRY_SELF_TESTS_COMPLETE_STATE                         );
     }
     selfTestDry(mSelfTestDry); // it's the main even so moved last to have all the sub-states updated prior to.