do powder sch

inc/remove_cup_button.inc

@@ -1,6 +1,6 @@
 Machine RemoveCup
 Machine DoorLidOpen
-Var buttonRemoveCup = "Invisible"
+Var buttonRemoveCup = "Disable2"
 
 ; protect value update too slow.
 Var DoorCupPosition = "-"

inc/remove_cup_step.inc

@@ -125,19 +125,19 @@ If HaveCup = "true" Then
 
 Else
     If buttonRemoveCup = "Enable" Then
-        Var buttonRemoveCup = "Invisible"
+        Var buttonRemoveCup = "Disable"
     EndIf
 EndIf
 
 If DoorCupPosition = "bottom" Then
 
 Else
-    Var buttonRemoveCup = "Invisible"
+    Var buttonRemoveCup = "Disable2"
     Var CoundUpDelayCertainStage = 0
 EndIf
 
 If CupArmMove = "true" Then
-    Var buttonRemoveCup = "Invisible"
+    Var buttonRemoveCup = "Disable"
     If show_eng = "true" Then
         Var MachineErrorDetailAll = "Please wait."
     Else
@@ -153,6 +153,12 @@ Else
                         Var buttonRemoveCup = "Enable"
                     EndIf
                 EndIf
+                 If buttonRemoveCup = "Disable" Then
+                    Var CoundUpDelayCertainStage = CoundUpDelayCertainStage + 1
+                    If CoundUpDelayCertainStage > 8 Then
+                        Var buttonRemoveCup = "Enable"
+                    EndIf
+                EndIf
             EndIf
         EndIf
     EndIf

inter/tha/hardware/powder_schedule_v2.ev

@@ -0,0 +1,124 @@
+
+
+
+
+DEBUGVAR LastTimeUseChannel10InMinute
+DEBUGVAR CurrentXMLFileName0
+SAVELOG "powder schedule version 2.01"
+
+DEBUGVAR PowderPayPushLowScheduleTurnOn10
+
+If SystemTimeHourInt = 3 Then
+    If SystemTimeMinuteInt = 30 Then
+        ; idle 
+        ; and time match
+        
+        If PowderStatus = "" Then
+            Var PowderStatus = "tricker"
+            Var PowderTestStep = 1
+            
+        EndIf
+    EndIf
+    If PowderStatus = "tricker" Then
+        If SystemTimeMinuteInt = 60 Then
+            ; idle 
+            ; and time match
+            
+            Var PowderStatus = "" 
+            Var PowderTestStep = 0
+            SAVELOG "PowderScheduleGrind reset reset reset"
+        EndIf
+    EndIf
+EndIf
+
+If PowderTestStep = 1 Then
+    If CurrentXMLFileName0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then
+        Var PowderTestStep = 0
+        Var PowderScheduleGrind = "start"
+        SAVELOG "PowderScheduleGrind start start start"
+    EndIf
+
+EndIf
+DEBUGVAR PowderStatus
+DEBUGVAR PowderTestStep
+
+; setvar PowderScheduleGrind start
+
+If PowderScheduleGrind = "" Then
+
+Else
+    DEBUGVAR PowderScheduleGrind
+    DEBUGVAR PowderDriverToLowPositionResult
+
+    If PowderScheduleGrind = "start" Then 
+    
+        Var PowderScheduleGrind = "powder-run"
+        
+    EndIf
+
+    Var StringCMD = "powder-set-time-for-low-push-stage=1,"
+
+    If PowderPayPushLowScheduleTurnOn1 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=1,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn2 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=2,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn3 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=3,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn4 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=4,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn5 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=5,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn6 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=6,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn7 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=7,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn8 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=8,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn9 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=9,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn10 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=10,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+    If PowderPayPushLowScheduleTurnOn11 = 1 Then
+        Var StringCMD = StringCMD + "powder-set-channel-for-low-push-stage=11,powder-low-push=xml,##wait=result-d6-all,"
+    EndIf
+
+
+    If PowderScheduleGrind = "powder-run" Then
+        Var PowderScheduleGrind = "wait-low-test"
+        DEBUGVAR StringCMD
+        __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
+
+        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 = ""
+            EndIf
+            Var PowderDriverToLowPositionResult = ""
+        EndIf
+
+    EndIf
+    
+
+EndIf

ui/lang.tsv

@@ -255,7 +255,8 @@
 		Font=Kanit,Type=Medium,Size=36,Color=0xEE8C62,LineHeight=46	Font=Kanit,Type=Medium,Size=36,Color=0xEE8C62,LineHeight=46
 002020		Adjust Recipe	ปรับสูตร
 002021		Add up an extra yummy topping [(max 2)###Font=KanitLight,Size=13]	เพิ่มส่วนผสมพิเศษ [(เลือกสูงสุด 2 ข้อ)###Font=KanitLight,Size=13]
-		D.I.Y. your cup, your style [(max 1)###Font=KanitLight,Size=13]	เพิ่่มไซรัปฉ่ำๆ D.I.Y ความอร่อยได้เลย  [(เลือกสูงสุด 1 ข้อ)###Font=KanitLight,Size=13]
+002022		D.I.Y. your cup, your style [(max 1)###Font=KanitLight,Size=13]	เพิ่่มไซรัปฉ่ำๆ D.I.Y ความอร่อยได้เลย  [(เลือกสูงสุด 1 ข้อ)###Font=KanitLight,Size=13]
+
 		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
 002030		Sweetness	ความหวาน
 002031		Espresso Shot	เอสเพรสโซ่ช็อต
@@ -1157,7 +1158,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@@ -1170,7 +1171,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดบด
+1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด

xml/page_remove_cup.xml

@@ -170,6 +170,8 @@
 <X> 212 </X>
 <Y> 1661 </Y>
 <Filename> Var( DirImage + "/bn_door_open.png" ) </Filename>
+<FilenameDisable> Var( DirImage + "/bd_door_open.png" ) </FilenameDisable>
+<FilenameDisable2> Var( DirImage + "/bd_door_open_rem.png" ) </FilenameDisable2>
 <FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>

xml/page_topping_select8.xml

@@ -3589,8 +3589,8 @@
 <X> 52 </X>
 <Y> 680 </Y>
 <Width> 1080 </Width>
-<Height> 880 </Height>
+<Height> 1080 </Height>
-<ScrollHeight> 880 </ScrollHeight>
+<ScrollHeight> 1080 </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 1 </Column>