From 4c808f86c46b9bd19f685eff4bff1bff529956d1 Mon Sep 17 00:00:00 2001 From: Pakin Date: Tue, 14 Jan 2025 17:24:36 +0700 Subject: [PATCH] UAE_DUBAI: add percent calc --- .../uae_dubai/xml/page_brewing3Conti_blue.lxml | 17 +++++++++++++++++ inter/uae_dubai/xml/page_brewing3_blue.lxml | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml b/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml index a1cf0c3f..ad97e204 100644 --- a/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml +++ b/inter/uae_dubai/xml/page_brewing3Conti_blue.lxml @@ -373,6 +373,23 @@ Var ShowCountDownBrewing = CountDownBrewing + ; percent + If ShowCountDownAsPercent = 1 Then + Var XPercent = InitCNT - ShowCountDownBrewing + If ShowCountDownBrewing <= 5 Then + Var XPercent = 95 + If SetPercent100 = 1 Then + Var XPercent = 100 + EndIf + Else + Var XPercent = XPercent * 100 + DEBUGVAR XPercent + Var XPercent = XPercent / InitCNT + EndIf + + DEBUGVAR XPercent + EndIf + If Timeout > 540 Then SAVELOG "back_to_main from line > 217." diff --git a/inter/uae_dubai/xml/page_brewing3_blue.lxml b/inter/uae_dubai/xml/page_brewing3_blue.lxml index 57adf70c..48d65bcd 100644 --- a/inter/uae_dubai/xml/page_brewing3_blue.lxml +++ b/inter/uae_dubai/xml/page_brewing3_blue.lxml @@ -641,6 +641,7 @@ If MOVE_CUP_TO_DOOR = "true" Then Var MOVE_CUP_TO_DOOR = "false" + Var SetPercent100 = 1 EndIf If BREW_COUNT_DOWN_FROM_APP = "on" Then @@ -705,6 +706,23 @@ Var ShowCountDownBrewing = CountDownBrewing + ; percent + If ShowCountDownAsPercent = 1 Then + Var XPercent = InitCNT - ShowCountDownBrewing + If ShowCountDownBrewing <= 5 Then + Var XPercent = 95 + If SetPercent100 = 1 Then + Var XPercent = 100 + EndIf + Else + Var XPercent = XPercent * 100 + DEBUGVAR XPercent + Var XPercent = XPercent / InitCNT + EndIf + + DEBUGVAR XPercent + EndIf + If Timeout > 540 Then SAVELOG "back_to_main from line > 217."