diff --git a/xml/menu_gen.py b/xml/menu_gen.py
index 59e73015..4a37c118 100644
--- a/xml/menu_gen.py
+++ b/xml/menu_gen.py
@@ -51,7 +51,7 @@
out_xml( '\t 27 \r\n')
out_xml( '\t KanitTTF \r\n')
out_xml( '\t 0xB78F24 \r\n')
- out_xml( '\t "Free" \r\n')
+ out_xml( '\t "Free!" \r\n')
out_xml( '\t\r\n')
out_xml( '\t\r\n')
else:
diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml
index 146bb542..910eb5cf 100644
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@@ -394,7 +394,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -423,7 +423,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -452,7 +452,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -481,7 +481,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -510,7 +510,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -539,7 +539,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -568,7 +568,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -597,7 +597,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -626,7 +626,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -655,7 +655,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index 29ae772c..99077027 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -484,7 +484,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -513,7 +513,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -542,7 +542,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -571,7 +571,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -600,7 +600,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -629,7 +629,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -658,7 +658,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -687,7 +687,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -716,7 +716,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -745,7 +745,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -774,7 +774,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -803,7 +803,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -832,7 +832,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -861,7 +861,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
diff --git a/xml/page_catalog_choose_drink2_ext.xml b/xml/page_catalog_choose_drink2_ext.xml
index acdbeba1..57f604b0 100644
--- a/xml/page_catalog_choose_drink2_ext.xml
+++ b/xml/page_catalog_choose_drink2_ext.xml
@@ -577,7 +577,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -606,7 +606,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -635,7 +635,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -664,7 +664,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -693,7 +693,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -722,7 +722,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -751,7 +751,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -780,7 +780,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -809,7 +809,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -838,7 +838,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -867,7 +867,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -896,7 +896,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -925,7 +925,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -954,7 +954,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -983,7 +983,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -1012,7 +1012,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -1041,7 +1041,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -1070,7 +1070,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index 66aebcd9..ce7b2160 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -302,7 +302,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -331,7 +331,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -360,7 +360,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -389,7 +389,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -418,7 +418,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -447,7 +447,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml
index ef2d74c7..7c157195 100644
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@@ -258,7 +258,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -287,7 +287,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -316,7 +316,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -345,7 +345,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml
index 26f0dc23..086a1b89 100644
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@@ -350,7 +350,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -379,7 +379,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -408,7 +408,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -437,7 +437,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -466,7 +466,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -495,7 +495,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -524,7 +524,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -553,7 +553,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index bbbd6b30..38f62c68 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -304,7 +304,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -333,7 +333,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -362,7 +362,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -391,7 +391,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -420,7 +420,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
@@ -449,7 +449,7 @@
27
KanitTTF
0xB78F24
- "Free"
+ "Free!"
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index 37d737af..61f1c470 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -317,52 +317,52 @@
Else
- If GetPayInfoFlag = 0 Then
+ If GetPayInfoFlag = 0 Then
- VendingQR OFF
+ VendingQR OFF
-
- Var CodeNumber = TelephoneNumber
- Var RemainAmount = 0
- PrepareDrink SelectDrink SelectSugarID
+
+ Var CodeNumber = TelephoneNumber
+ Var RemainAmount = 0
+ PrepareDrink SelectDrink SelectSugarID
- Var SessionID2 = SelectSlot + ":"
- Var SessionID2 = SessionID2 + sugarID
- Var SessionID2 = SessionID2 + "000"
+ Var SessionID2 = SelectSlot + ":"
+ Var SessionID2 = SessionID2 + sugarID
+ Var SessionID2 = SessionID2 + "000"
- Var CreditAmount1 = ""
- Var ServiceAmountFlow = ""
- Var TelephoneNumber = "0899999999"
- Var ServiceType = "coffee"
- Var ECommerce = ""
- Var ECommerce = ECommerce + PriceDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + DiscountDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SessionID2
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + SelectDrink
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + "C00"
- Var ECommerce = ECommerce + "/"
- Var ECommerce = ECommerce + CodeNumber
- Var ServiceParameter = "max"
- Var ServiceCharge = 0
- Var AccountType = "new"
- Var testservice = "kbank"
- Var tc = ""
- Var GetScore = ""
- Var OperatorName = ""
- Var SessionID = ""
+ Var CreditAmount1 = ""
+ Var ServiceAmountFlow = ""
+ Var TelephoneNumber = "0899999999"
+ Var ServiceType = "coffee"
+ Var ECommerce = ""
+ Var ECommerce = ECommerce + PriceDrink
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + DiscountDrink
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + SessionID2
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + SelectDrink
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + "C00"
+ Var ECommerce = ECommerce + "/"
+ Var ECommerce = ECommerce + CodeNumber
+ Var ServiceParameter = "max"
+ Var ServiceCharge = 0
+ Var AccountType = "new"
+ Var testservice = "kbank"
+ Var tc = ""
+ Var GetScore = ""
+ Var OperatorName = ""
+ Var SessionID = ""
- GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
- Var Timeout = 0
- Var GetPayInfoFlag = 1
- Var TelephoneNumber = CodeNumber
- Var CodeChannel = 1
- Open "/media/bt/xml/page_page4-CodeWaiting.xml"
- EndIf
+ GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+ Var Timeout = 0
+ Var GetPayInfoFlag = 1
+ Var TelephoneNumber = CodeNumber
+ Var CodeChannel = 1
+ Open "ROOT/taobin_project/xml/page_show_point.xml"
+ EndIf
EndIf
diff --git a/xml/page_show_point.xml b/xml/page_show_point.xml
new file mode 100644
index 00000000..e69de29b
diff --git a/xml/page_topping_alter.xml b/xml/page_topping_alter.xml
index fc53e7c1..47a1208d 100644
--- a/xml/page_topping_alter.xml
+++ b/xml/page_topping_alter.xml
@@ -57,8 +57,8 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open PreviseXMLFileName2
- ;Open "ROOT/taobin_project/xml/page_catalog.xml"
+ ;Open PreviseXMLFileName2
+ Open "ROOT/taobin_project/xml/page_catalog.xml"
diff --git a/xml/page_topping_with_barista.xml b/xml/page_topping_with_barista.xml
index 0ec77f5b..12578f36 100644
--- a/xml/page_topping_with_barista.xml
+++ b/xml/page_topping_with_barista.xml
@@ -144,8 +144,8 @@
SoundVolume
SAVELOG PreviseOfPreviseXMLFileName2
- Open PreviseOfPreviseXMLFileName2
- ;Open "ROOT/taobin_project/xml/page_catalog.xml"
+ ;Open PreviseOfPreviseXMLFileName2
+ Open "ROOT/taobin_project/xml/page_catalog.xml"
diff --git a/xml/page_upgradeMCU.xml b/xml/page_upgradeMCU.xml
deleted file mode 100644
index 62b0d91f..00000000
--- a/xml/page_upgradeMCU.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
- 1080
- 1312
- pUpgradeBG
- SoundVolume
-
-
- Var Timeout = 0
- TopView "hide"
-
-
- 1000
-
- Var Timeout = Timeout + 1
-
- If MachineStage = "mcu-upgrade" Then
-
- Else
- Open "ROOT/xml/page_board.xml"
- EndIf
-
-
- If Timeout > 300 Then
- Open "ROOT/xml/page_board.xml"
- EndIf
- Refresh
- TimerReset
-
-
-
-
- 183
- 350
- pUpgradeGIF
-
-
-
- 395
- 250
-300
- Center
- 30
- fontType1
- 0x000000
- "กำลังอัพเกรดMCU"
-
-
-
-
-
-
-