Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -raf8d98b36b427e2b5f4d6659fcf3b58ee79eab6a -rb008b560dd9891bc3ef8545f148fc4cccb835e82 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision af8d98b36b427e2b5f4d6659fcf3b58ee79eab6a) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision b008b560dd9891bc3ef8545f148fc4cccb835e82) @@ -111,7 +111,7 @@ STATE ( bool , prime_salineSetup , false ) ///< HD_PRIME_SALINE_SETUP_STATE , Saline setup state STATE ( bool , prime_salinePurgeAir , false ) ///< HD_PRIME_SALINE_PURGE_AIR_STATE , Saline purge air state STATE ( bool , prime_salineCirculateBloodCircuit , false ) ///< HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE , Circulate blood circuit state - STATE ( bool , prime_reservoiOneFillComplete , false ) ///< HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE , Wait for reservoir 1 fill complete + STATE ( bool , prime_reservoirOneFillComplete , false ) ///< HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE , Wait for reservoir 1 fill complete STATE ( bool , prime_dialysateDialyzer , false ) ///< HD_PRIME_DIALYSATE_DIALYZER_STATE , Dialysate dialyzer fluid path state STATE ( bool , prime_salineDialyzerSetup , false ) ///< HD_PRIME_SALINE_DIALYZER_SETUP_STATE , Saline dialyzer setup state STATE ( bool , prime_salineDialyzer , false ) ///< HD_PRIME_SALINE_DIALYZER_STATE , Saline dialyzer fluid path state @@ -121,6 +121,11 @@ STATE ( bool , prime_pause , false ) ///< HD_PRIME_PAUSE , Prime pause state, waits to be resumed STATE ( bool , prime_complete , false ) ///< HD_PRIME_COMPLETE , Prime complete state + STATE ( bool , prime__BloodCircuit , false ) ///< bundled/cobined states to be used with the corresponding States on the related UI screen. + STATE ( bool , prime__DialysateCircuit , false ) ///< bundled/cobined states to be used with the corresponding States on the related UI screen. + STATE ( bool , prime__WetSelfTests , false ) ///< bundled/cobined states to be used with the corresponding States on the related UI screen. + + // Re-circulate blood and dialysate circuits state PROPERTY( bool , recirculate_start , false ) ///< PRE_TREATMENT_RECIRC_STATE , Pre-treatment recirculate state. PROPERTY( bool , recirculate_stopped , false ) ///< PRE_TREATMENT_RECIRC_STOPPED_STATE , Pre-treatment recirculate stopped state.