pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

fix Conflict merge

Browse source
This commit is contained in:
miggaze 2021-11-10 15:46:37 +07:00
commit cea1107abf
60 changed files with 4728 additions and 183 deletions
Download patch file Download diff file Expand all files Collapse all files

13
xml/page_brewing3.xml
View file

@ -262,10 +262,19 @@
Var Timeout = Timeout + 1
If CountDownBrewing > 0 Then
Var CountDownBrewing = CountDownBrewing - 1
If MOVE_CUP_TO_DOOR = "true" Then
Var MOVE_CUP_TO_DOOR = "false"
EndIf
If BREW_COUNT_DOWN_FROM_APP = "on" Then
Var CountDownBrewing = BREW_CNT
Else
If CountDownBrewing > 0 Then
Var CountDownBrewing = CountDownBrewing - 1
EndIf
Endif
If Simulation = "true" Then
If CountDownBrewing = 0 Then
;Open "ROOT/taobin_project/xml/page_drinkok.xml"