diff --git a/xml/menu_board.xml b/xml/menu_board.xml
index 4a2b3adf..8221415d 100644
--- a/xml/menu_board.xml
+++ b/xml/menu_board.xml
@@ -15,6 +15,7 @@
Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf"
+ Var RobotoBlack = "ROOT/taobin_project/font/Roboto/Roboto-Black.ttf"
1000
diff --git a/xml/menu_brewing.xml b/xml/menu_brewing.xml
index 8d7c1753..ff3708ce 100644
--- a/xml/menu_brewing.xml
+++ b/xml/menu_brewing.xml
@@ -16,19 +16,53 @@
Var CountDownBrewing = CountDownBrewing - 1
; run test;
- If CountDownBrewing = 40 Then
- Open "ROOT/taobin_project/xml/menu_drinkok.xml"
- EndIf
+ ;If CountDownBrewing = 40 Then
+ ; Open "ROOT/taobin_project/xml/menu_drinkok.xml"
+ ;EndIf
Var ShowCountDownBrewing = CountDownBrewing
- Refresh
+
+ If MachineStage = "drink-success" Then
+ Open "ROOT/taobin_project/xml/menu_drinkok.xml"
+ EndIf
+ Refresh
TimerReset
-
-
+
+
+
+ If MachineStage = "make-drink" Then
+ Var Timeout = 0
+ Var ProcessText = ""
+ EndIf
+
+ If MachineStage = "prepar-cup" Then
+ Var Timeout = 0
+ Var ProcessText = ""
+ EndIf
+
+ If MachineStage = "ice-out" Then
+ Var Timeout = 0
+ Var ProcessText = ""
+ EndIf
+
+ If MachineStage = "brewing" Then
+ Var Timeout = 0
+ Var ProcessText = ""
+ EndIf
+
+ If MachineStage = "drink-success" Then
+ Open "ROOT/taobin_project/xml/menu_drinkok.xml"
+ EndIf
+
+ If MachineStage = "drink-failed" Then
+ Open "ROOT/taobin_project/xml/menu_drinkfail.xml"
+ EndIf
+
+
0
0
@@ -39,9 +73,16 @@
751
413
- "ROOT/taobin_project/image/page_thankyou/img2.png"
+ "ROOT/taobin_project/image/page_doing/img2.png"
+
+ 237
+ 1323
+ "ROOT/taobin_project/image/page_doing/text1.png"
+
+
+
808
480
@@ -51,6 +92,24 @@
ShowCountDownBrewing
-
+
+ 0
+ 1367
+ 1080
+ 72
+ Center
+ RobotoBlack
+ 0x513C2F
+ MachineStage
+
+;BrewingTextThai
+
+
+ 182
+ 700
+ GIFShowProcess
+
+
+
diff --git a/xml/menu_catalog_choose_drink1.pml b/xml/menu_catalog_choose_drink1.pml
index f99f4337..3c93ea2a 100644
--- a/xml/menu_catalog_choose_drink1.pml
+++ b/xml/menu_catalog_choose_drink1.pml
@@ -10,6 +10,7 @@
bt_pic.append('b#_sala.png')
bt_pic.append('b#_iced_lemonade_soda.png')
bt_pic.append('b#_hot_milk_caramel.png')
+ bt_pic.append('b#_iced_cola.png')
@@ -18,6 +19,7 @@
product_code.append('11-99-02-0020')
product_code.append('11-99-02-0017')
product_code.append('11-99-01-0017')
+ product_code.append('11-99-02-0018')
menu_count = len( bt_pic)
?>
diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml
index 71a1e676..523af815 100644
--- a/xml/menu_catalog_choose_drink1.xml
+++ b/xml/menu_catalog_choose_drink1.xml
@@ -308,6 +308,50 @@
0x322B26
$11-99-01-0017.Name2
+ ; button i=5 11-99-02-0018
+
+
+ 226
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0018.Price
+
+
+ 208
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 60
+ 1113
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-02-0018.Name2
+
diff --git a/xml/menu_drinkfail.xml b/xml/menu_drinkfail.xml
new file mode 100644
index 00000000..d1266eaa
--- /dev/null
+++ b/xml/menu_drinkfail.xml
@@ -0,0 +1,47 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var LidState = "Enable"
+ Var StarwState = "Enable"
+
+
+ 5000
+
+ Open "ROOT/taobin_project/xml/menu_back_to_main.xml"
+
+
+
+
+
+ 0
+ 0
+ "ROOT/taobin_project/image/page2/ad_blank1.png"
+
+
+
+
+ 182
+ 700
+ GIFShowProcess
+
+
+
+
+
+
+
diff --git a/xml/menu_drinkok.xml b/xml/menu_drinkok.xml
index e70445b0..fbfc3099 100644
--- a/xml/menu_drinkok.xml
+++ b/xml/menu_drinkok.xml
@@ -10,9 +10,14 @@
Var StarwState = "Enable"
- 5000
+ 1000
- Open "ROOT/taobin_project/xml/menu_back_to_main.xml"
+
+ If HaveCup = "false" Then
+ Open "ROOT/taobin_project/xml/menu_back_to_main.xml"
+ EndIf
+ TimerReset
+
diff --git a/xml/menu_lid_straw.xml b/xml/menu_lid_straw.xml
index 2b034f7c..e951bb1c 100644
--- a/xml/menu_lid_straw.xml
+++ b/xml/menu_lid_straw.xml
@@ -63,6 +63,12 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
+ If StarwState = "Press" Then
+ Machine Straw
+ EndIf
+ If LidState = "Press" Then
+ Machine Lid
+ EndIf
Open "ROOT/taobin_project/xml/menu_brewing.xml"
@@ -76,8 +82,6 @@
"ROOT/taobin_project/image/page_lid_straw/bn_straw.png"
"ROOT/taobin_project/image/page_lid_straw/bp_straw.png"
- Var StarwState = "PressForever"
- Refresh
@@ -89,8 +93,6 @@
"ROOT/taobin_project/image/page_lid_straw/bn_lid.png"
"ROOT/taobin_project/image/page_lid_straw/bp_lid.png"
- Var LidState = "PressForever"
- Refresh
@@ -102,12 +104,18 @@
50
50
StarwState
+ "No"
"ROOT/taobin_project/image/page_lid_straw/cb_straw_nch.png"
"ROOT/taobin_project/image/page_lid_straw/cb_straw_ch.png"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var StarwState = "PressForever"
+ SAVELOG StarwState
+ If StarwState = "Press" Then
+ Var StarwState = "Enable"
+ Else
+ Var StarwState = "Press"
+ EndIf
Refresh
@@ -120,12 +128,18 @@
50
50
LidState
+ "No"
"ROOT/taobin_project/image/page_lid_straw/cb_lid_nch.png"
"ROOT/taobin_project/image/page_lid_straw/cb_lid_ch.png"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var LidState = "PressForever"
+ SAVELOG LidState
+ If LidState = "Press" Then
+ Var LidState = "Enable"
+ Else
+ Var LidState = "Press"
+ EndIf
Refresh
@@ -148,6 +162,11 @@
+
+ 182
+ 700
+ GIFShowProcess
+
diff --git a/xml/menu_list.xml b/xml/menu_list.xml
index b2a1d238..c155d58b 100644
--- a/xml/menu_list.xml
+++ b/xml/menu_list.xml
@@ -4,21 +4,10 @@
- Var menu_status = "run"
-
-
-
- If VendingClass = "coffeeInthanin01" Then
- Open "ROOT/xml/menu_list_inthanin.xml"
- Else
- Open "ROOT/xml/menu_list_original2.xml"
- EndIf
-
-
- 10000
+ 60000
;Var menu_status = "stop"
diff --git a/xml/menu_list_original.xml b/xml/menu_list_original.xml
index 9858afd5..28ef4ac6 100644
--- a/xml/menu_list_original.xml
+++ b/xml/menu_list_original.xml
@@ -2,231 +2,5 @@
1080
1920
-
-
- Var menu_status = "run"
-
- If VendingClass = "coffeeInthanin01" Then
- Open "ROOT/xml/menu_list_inthanin.xml"
- EndIf
-
- If Menu_list_LN = "TH" Then
- Var Menu1BN_FN = "ROOT/image/BN_Drink.bmp"
- Var Menu1BP_FN = "ROOT/image/BP_Drink.bmp"
- Var Menu2BN_FN = "ROOT/image/BN_Member.bmp"
- Var Menu2BP_FN = "ROOT/image/BP_Member.bmp"
- Var Menu3BN_FN = "ROOT/image/BN_Topup.bmp"
- Var Menu3BP_FN = "ROOT/image/BP_Topup.bmp"
- Var Menu4BN_FN = "ROOT/image/BN_Product.bmp"
- Var Menu4BP_FN = "ROOT/image/BP_Product.bmp"
- Var Menu5BN_FN = "ROOT/image/BN_Etc.bmp"
- Var Menu5BP_FN = "ROOT/image/BP_Etc.bmp"
- Var Menu6BN_FN = "ROOT/image/BN_Problem.bmp"
- Var Menu6BP_FN = "ROOT/image/BP_Problem.bmp"
- Else
- Var Menu1BN_FN = "ROOT/image/BN_Drink_ENG.bmp"
- Var Menu1BP_FN = "ROOT/image/BP_Drink_ENG.bmp"
- Var Menu2BN_FN = "ROOT/image/BN_Member_ENG.bmp"
- Var Menu2BP_FN = "ROOT/image/BP_Member_ENG.bmp"
- Var Menu3BN_FN = "ROOT/image/BN_Topup_ENG.bmp"
- Var Menu3BP_FN = "ROOT/image/BP_Topup_ENG.bmp"
- Var Menu4BN_FN = "ROOT/image/BN_Product_ENG.bmp"
- Var Menu4BP_FN = "ROOT/image/BP_Product_ENG.bmp"
- Var Menu5BN_FN = "ROOT/image/BN_Etc_ENG.bmp"
- Var Menu5BP_FN = "ROOT/image/BP_Etc_ENG.bmp"
- Var Menu6BN_FN = "ROOT/image/BN_Problem_ENG.bmp"
- Var Menu6BP_FN = "ROOT/image/BP_Problem_ENG.bmp"
- EndIf
-
-
-
- 60000
-
- ;Var menu_status = "stop"
-
- Open "/mnt/sdcard/coffeevending/xml/menu_list_original.xml"
-
- TimerReset
- Refresh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xml/menu_payment_cash.xml b/xml/menu_payment_cash.xml
index 9ffe2b57..fa0c3094 100644
--- a/xml/menu_payment_cash.xml
+++ b/xml/menu_payment_cash.xml
@@ -335,6 +335,9 @@
0
"ROOT/taobin_project/image/page2/ad_blank1.png"
+ Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
+ Var MachineStage = "make-drink"
+ Var BrewingTextThai = "เตรียมแก้ว"
Open "ROOT/taobin_project/xml/menu_thankyou.xml"
diff --git a/xml/z_android.pml b/xml/z_android.pml
new file mode 100644
index 00000000..c969f16f
--- /dev/null
+++ b/xml/z_android.pml
@@ -0,0 +1 @@
+
\ No newline at end of file