Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -r00a8328d166a8a8a0f47e0d19b38396dbaaf06ae -r99e596082b87afd73b06dae039d51e4a67cc5913 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 00a8328d166a8a8a0f47e0d19b38396dbaaf06ae) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) @@ -71,30 +71,30 @@ // Prime blood and dialysate circuits and run wet self-tests state bool mPrime = vData.mSubMode == GuiPreTreatmentStates ::TD_PRE_TREATMENT_PRIME_STATE ; if ( mPrime ) { - prime_waitUserStart ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WAIT_FOR_USER_START_STATE ); - prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_SETUP_STATE ); - prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_PURGE_AIR_STATE ); - prime_salineCirculateBloodCircuit ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE ); - prime_reservoirOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); - prime_dialysateDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_DIALYZER_STATE ); - prime_salineDialyzerSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_SETUP_STATE ); - prime_salineDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_STATE ); - prime_reservoirTwoFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE ); - prime_dialysateBypass ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_BYPASS_STATE ); - prime_wetSelfTests ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WET_SELF_TESTS_STATE ); - prime_pause ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_PAUSE ); - prime_complete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_COMPLETE ); +// prime_waitUserStart ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WAIT_FOR_USER_START_STATE ); +// prime_salineSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_SETUP_STATE ); +// prime_salinePurgeAir ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_PURGE_AIR_STATE ); +// prime_salineCirculateBloodCircuit ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE ); +// prime_reservoirOneFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE ); +// prime_dialysateDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_DIALYZER_STATE ); +// prime_salineDialyzerSetup ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_SETUP_STATE ); +// prime_salineDialyzer ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_SALINE_DIALYZER_STATE ); +// prime_reservoirTwoFillComplete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE ); +// prime_dialysateBypass ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_DIALYSATE_BYPASS_STATE ); +// prime_wetSelfTests ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_WET_SELF_TESTS_STATE ); +// prime_pause ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_PAUSE ); +// prime_complete ( vData.mPrimeState == GuiPreTreatmentPrimeStates ::TD_PRIME_COMPLETE ); - prime__BloodCircuit ( _prime_salineSetup || - _prime_salinePurgeAir || - _prime_salineCirculateBloodCircuit); - prime__DialysateCircuit ( _prime_reservoirOneFillComplete || - _prime_dialysateDialyzer || - _prime_salineDialyzerSetup || - _prime_salineDialyzer || - _prime_reservoirTwoFillComplete || - _prime_dialysateBypass ); - prime__WetSelfTests ( _prime_wetSelfTests ); +// prime__BloodCircuit ( _prime_salineSetup || +// _prime_salinePurgeAir || +// _prime_salineCirculateBloodCircuit); +// prime__DialysateCircuit ( _prime_reservoirOneFillComplete || +// _prime_dialysateDialyzer || +// _prime_salineDialyzerSetup || +// _prime_salineDialyzer || +// _prime_reservoirTwoFillComplete || +// _prime_dialysateBypass ); +// prime__WetSelfTests ( _prime_wetSelfTests ); }