Index: sources/view/hd/data/VPreTreatmentStatesData.cpp
===================================================================
diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -r99a56ec30f1ca4f401e744766bde4f6fac291752
--- sources/view/hd/data/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6)
+++ sources/view/hd/data/VPreTreatmentStatesData.cpp	(.../VPreTreatmentStatesData.cpp)	(revision 99a56ec30f1ca4f401e744766bde4f6fac291752)
@@ -64,19 +64,19 @@
     // Self tests with no cartridge state
     bool mSelfTestNoCartridge                       = vData.mSubMode                    == GuiPreTreatmentStates                    ::HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE           ;
     if ( mSelfTestNoCartridge ) {
-          selfTestNoCartridge_start                 ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_START_STATE                    );
-          selfTestNoCartridge_waitDoorClose         ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE      );
-          selfTestNoCartridge_occlusionSensors      ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE        );
-          selfTestNoCartridge_bloodFlowMeters       ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE        );
-          selfTestNoCartridge_dialysateFlowMeters   ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE    );
-          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_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                  );
-          selfTestNoCartridge_complete              ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_COMPLETE_STATE                 );
+          selfTestNoCartridge_start                 ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_START_STATE                   );
+          selfTestNoCartridge_waitDoorClose         ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE     );
+          selfTestNoCartridge_occlusionSensors      ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE       );
+          selfTestNoCartridge_bloodFlowMeters       ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE       );
+          selfTestNoCartridge_dialysateFlowMeters   ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_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_homeValves            ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_STATE             );
+          selfTestNoCartridge_homeSyringePump       ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE       );
+          selfTestNoCartridge_pumps                 ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_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                 );
+          selfTestNoCartridge_complete              ( vData.mSelfTestNoCartridgeState   == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_COMPLETE_STATE                );
     }
     selfTestNoCartridge(mSelfTestNoCartridge); // it's the main even so moved last to have all the sub-states updated prior to.