diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 62cf6fee..15b9f48a 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -853,6 +853,7 @@ If FrontDoorVersionInt > 19999 Then TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES EndIf If BREW_CNT = 0 Then diff --git a/xml/page_NewBrewing3Conti.xml b/xml/page_NewBrewing3Conti.xml index d7800cfb..a69d4cac 100644 --- a/xml/page_NewBrewing3Conti.xml +++ b/xml/page_NewBrewing3Conti.xml @@ -310,6 +310,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES EndIf If CountDownBrewing = 0 Then diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index bbac391b..64f96289 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -932,7 +932,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES EndIf DEBUGVAR EnableDoubleCupNoError diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 1202a41c..ab4be42f 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -398,7 +398,7 @@ If FrontDoorVersionInt > 19999 Then TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" - LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES EndIf diff --git a/xml/page_test_color.xml b/xml/page_test_color.xml index be8de5c5..b0be7a7b 100644 --- a/xml/page_test_color.xml +++ b/xml/page_test_color.xml @@ -35,6 +35,13 @@ Var bn_off = TestColorImageDir + "bn_off.png" Var bp_off = TestColorImageDir + "bp_off.png" + Var bn_10s = TestColorImageDir + "bn_10s.png" + Var bp_10s = TestColorImageDir + "bp_10s.png" + Var bn_20s = TestColorImageDir + "bn_20s.png" + Var bp_20s = TestColorImageDir + "bp_20s.png" + Var bn_60s = TestColorImageDir + "bn_60s.png" + Var bp_60s = TestColorImageDir + "bp_60s.png" + Var bn_toggle_off = TestColorImageDir + "btn_toggle_off.png" Var bn_toggle_on = TestColorImageDir + "btn_toggle_on.png" @@ -181,7 +188,7 @@ Var LEDv4Toggle[41] = "Enable" Var LEDv4Toggle[42] = "Enable" - + Var PlayTestLEDv4 = "false" @@ -189,7 +196,36 @@ Var Timeout = Timeout + 1 - If Timeout > 60 Then + DEBUGVAR CountDownBrewing + DEBUGVAR LEDv4PlaylistStatus + DEBUGVAR PlayTestLEDv4 + DEBUGVAR LEDv4CountDownValue + + DEBUGVAR GEN4_POS + + + If CountDownBrewing > 0 Then + Var CountDownBrewing = CountDownBrewing - 1 + Else + If PlayTestLEDv4 = "true" Then + LEDv4Playlist "reset" "-" "-" + EndIf + Var PlayTestLEDv4 = "false" + EndIf + + If PlayTestLEDv4 = "true" Then + ; check-playlist-state + If LEDv4PlaylistStatus = "Ready" Then + LEDv4Playlist "play" "-" "-" + EndIf + + If LEDv4PlaylistStatus = "Running" Then + LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + EndIf + + EndIf + + If Timeout > 120 Then Open "ROOT/taobin_project/xml/vending_info.xml" EndIf @@ -2241,4 +2277,26 @@ Var Timeout = 0 + + + diff --git a/xml/process/ledv4_process.ev b/xml/process/ledv4_process.ev index 7c42ec57..558e2079 100644 --- a/xml/process/ledv4_process.ev +++ b/xml/process/ledv4_process.ev @@ -17,7 +17,7 @@ If FrontDoorVersionInt > 19999 Then Else ; If LEDv4PlaylistStatus = "Running" Then - + LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES Else LEDv4Playlist "pause" "processEv" "_notReady" EndIf diff --git a/xml/process/temp_ledv4_page_thankyou.ev b/xml/process/temp_ledv4_page_thankyou.ev index e07f29d0..c3925516 100644 --- a/xml/process/temp_ledv4_page_thankyou.ev +++ b/xml/process/temp_ledv4_page_thankyou.ev @@ -9,5 +9,4 @@ If FrontDoorVersionInt > 19999 Then SAVELOG "LEDv4.PageThankYou" - Var EndIf \ No newline at end of file