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

Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
Ittipat Lusuk 2025-05-16 10:27:13 +07:00
commit a84338bff4
10 changed files with 296 additions and 280 deletions
Download patch file Download diff file Expand all files Collapse all files

27
inter/tha/hardware/powder_schedule_v2.ev
View file

@ -10,27 +10,28 @@ DEBUGVAR PowderPayPushLowScheduleTurnOn10
If SystemTimeHourInt = 3 Then
If SystemTimeMinuteInt = 30 Then
; idle
; idle
; and time match
; setvar PowderStatus tricker
If PowderStatus = "" Then
Var PowderStatus = "tricker"
Var PowderTestStep = 1
EndIf
EndIf
If PowderStatus = "tricker" Then
If SystemTimeMinuteInt = 60 Then
; idle
; idle
; and time match
Var PowderStatus = ""
Var PowderStatus = ""
Var PowderTestStep = 0
SAVELOG "PowderScheduleGrind reset reset reset"
EndIf
EndIf
EndIf
; setvarint PowderTestStep 1
If PowderTestStep = 1 Then
If CurrentXMLFileName0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then
Var PowderTestStep = 0
@ -50,10 +51,10 @@ Else
DEBUGVAR PowderScheduleGrind
DEBUGVAR PowderDriverToLowPositionResult
If PowderScheduleGrind = "start" Then
If PowderScheduleGrind = "start" Then
Var PowderScheduleGrind = "powder-run"
EndIf
Var StringCMD = "powder-set-time-for-low-push-stage=1,"
@ -99,9 +100,9 @@ Else
__CMD "CLI" "arm_id=1,arm_position=posi_ice_e" "-" "-"
__CMD "CLI_QUEUE" StringCMD "-" "-"
DEBUGVAR PowderScheduleGrind
EndIf
If PowderScheduleGrind = "wait-low-test" Then
DEBUGVAR PowderDriverToLowPositionResult
If PowderDriverToLowPositionResult = "" Then
@ -110,7 +111,7 @@ Else
If PowderDriverToLowPositionResult = "pass" Then
SAVELOG " Powder driver low test channel pass pass pass pass pass pass pass pass pass "
Var PowderScheduleGrind = ""
Else
SAVELOG " Powder driver low test channel error "
Var PowderScheduleGrind = ""
@ -119,6 +120,6 @@ Else
EndIf
EndIf
EndIf

2
inter/tha/menu/lang.tsv
View file

@ -1274,7 +1274,7 @@
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง
1300010 Draw back หมุนกลับ
1300011 Grind beans บดถั่ว
1300011 Grind beans บดเมล็ดถั่ว
1300012 Grind sizes ขนาดบด
1300013 Standard มาตรฐาน
1300014 Result ผลลัพธ์

Can't render this file because it has a wrong number of fields in line 22.

4
inter/tha/xml/multi/control_and_lang_swith.ev
View file

@ -93,8 +93,8 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr
Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"
Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
TabMenuLock 15
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
TabMenuVisibleInst 99

13
inter/tha/xml/multi/tab_menu.lxml
View file

@ -75,6 +75,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu0Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_tao_pun.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_tao_pun.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -90,6 +91,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu1Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -110,6 +112,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu2Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_coffee2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_coffee2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -125,6 +128,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu3Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_tea2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_tea2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -143,6 +147,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu4Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_cho_ca2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_cho_ca2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -159,6 +164,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu7Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_protein2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_protein2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -173,6 +179,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu11Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_appfast2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_appfast2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -189,6 +196,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu21Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_forkid2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_forkid2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -206,6 +214,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu22Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_health.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_health.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -220,6 +229,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu8Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_cocktail.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_cocktail.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -233,6 +243,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu61Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_Pepsi_7up.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_Pepsi_7up.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -247,6 +258,7 @@
<Button>
<Layout> "linear" </Layout>
<State> Menu62Selected </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_sodada2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_sodada2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -261,6 +273,7 @@
<Button>
<Layout> "linear" </Layout>
<State> MenuVSelected2 </State>
<Mode> "No" </Mode>
<Filename> Var( DirImageAlter + "/bn_vending2.png") </Filename>
<FilenamePress> Var( DirImageAlter + "/bp_vending2.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>