Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -r98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc -r42c029b1704455433cb095d2e76dcd540c1f0046 --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 98b945e7afb8a2c61b86bb11427fcae8c3e7e0bc) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 42c029b1704455433cb095d2e76dcd540c1f0046) @@ -100,7 +100,7 @@ objectName : "_disinfectHeat" header.stepNames : [ _root.disinfectTitle , _root.heatTitle ] title.text : _root.heatTitle - hasTimeCircle : true + hasTimeCircle : false timeCircleMinimum : 0 timeCircleMaximum : vDisinfectDGData.heatTimeTotal timeCircleProgressValue : vDisinfectDGData.heatTimeElapsed @@ -110,11 +110,13 @@ isComplete : vDisinfectStates.heatComplete completeText : qsTr("Heat Disinfection Complete!") checkListStepNames : [ - qsTr("Pre-Disinfect Flush" ), - qsTr("Heating Up the Fluid" ), - qsTr("Heat Disinfect" ), - qsTr("Cooling Down" ), - qsTr("Post-Disinfect Flush" ), + qsTr("Pre-Disinfect Flush" ), + qsTr("Heating Up the Fluid" ), + qsTr("Heat Disinfect Reservoir 1" ), + qsTr("Heat Disinfect Transition Hot Water" ), + qsTr("Heat Disinfect Reservoir 2" ), + qsTr("Cooling Down" ), + qsTr("Post-Disinfect Flush" ), ] } @@ -162,9 +164,11 @@ onHeatNotRunningEntered : { } onHeatFlushBeforeDisinfectEntered : { _disinfectHeat .checkList.setItem(0, vheatFlushBeforeDisinfect )} onHeatWaterHeatUpEntered : { _disinfectHeat .checkList.setItem(1, vheatWaterHeatUp )} - onHeatDisinfectEntered : { _disinfectHeat .checkList.setItem(2, vheatDisinfect )} - onHeatDeviceCoolDownEntered : { _disinfectHeat .checkList.setItem(3, vheatDeviceCoolDown )} - onHeatFlushAfterDisinfectEntered : { _disinfectHeat .checkList.setItem(4, vheatFlushAfterDisinfect )} + onHeatDisinfectR1Entered : { _disinfectHeat .checkList.setItem(2, vheatDisinfectR1 )} + onHeatTransitionHotWaterEntered : { _disinfectHeat .checkList.setItem(3, vheatTransitionHotWater )} + onHeatDisinfectR2Entered : { _disinfectHeat .checkList.setItem(4, vheatDisinfectR2 )} + onHeatDeviceCoolDownEntered : { _disinfectHeat .checkList.setItem(5, vheatDeviceCoolDown )} + onHeatFlushAfterDisinfectEntered : { _disinfectHeat .checkList.setItem(6, vheatFlushAfterDisinfect )} onHeatCancelEntered : { } onHeatCompleteEntered : { }