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

This commit is contained in:
Pakin 2025-02-11 13:36:24 +07:00
commit 124a46b3d5
334 changed files with 56509 additions and 63546 deletions

View file

@ -1,5 +1,5 @@
total 143048
-rw-rw---- 1 root sdcard_rw 0 2025-01-06 15:28 sync_1.file
total 143868
-rw-rw---- 1 root sdcard_rw 0 2025-02-17 17:04 sync_1.file
-rw-rw---- 1 root sdcard_rw 3772465 2023-09-18 18:44 taobin_adv_00.mp4
-rw-rw---- 1 root sdcard_rw 2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
-rw-rw---- 1 root sdcard_rw 7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4
@ -12,11 +12,11 @@ total 143048
-rw-rw---- 1 root sdcard_rw 1422061 2024-08-19 16:55 taobin_adv_menu_08.mp4
-rw-rw---- 1 root sdcard_rw 7247421 2024-11-19 10:41 taobin_adv_menu_09.mp4
-rw-rw---- 1 root sdcard_rw 11866329 2024-09-02 15:56 taobin_adv_menu_10.mp4
-rw-rw---- 1 root sdcard_rw 1421871 2024-02-22 08:57 taobin_adv_menu_11.mp4
-rw-rw---- 1 root sdcard_rw 2292329 2025-01-30 17:39 taobin_adv_menu_11.mp4
-rw-rw---- 1 root sdcard_rw 1151618 2024-06-14 16:56 taobin_adv_menu_12.mp4
-rw-rw---- 1 root sdcard_rw 258907 2023-09-18 18:44 taobin_adv_menu_13.mp4
-rw-rw---- 1 root sdcard_rw 3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4
-rw-rw---- 1 root sdcard_rw 2557252 2024-11-20 14:06 taobin_adv_menu_15.mp4
-rw-rw---- 1 root sdcard_rw 2518504 2025-01-30 17:39 taobin_adv_menu_15.mp4
-rw-rw---- 1 root sdcard_rw 8680417 2024-10-07 15:33 taobin_adv_menu_16.mp4
-rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4
-rw-rw---- 1 root sdcard_rw 10038728 2024-11-19 11:49 taobin_adv_menu_18.mp4

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -273,28 +273,22 @@ PEPSI LYCHEE 12-05-02-0048 1 14 11 23 13 24 120 4:00 23
เอสเพรสโซ่ช็อต
Hot Thai Tea café Latte 12-01-01-0029 1 2 3 4 5 6 7 10 24 161 2:41 22
Hot Taiwanese Tea café Latte 12-01-01-0030 1 2 3 4 5 10 24 136 2:16 26
Hot Matcha café Latte 12-01-01-0031 1 2 3 4 5 8 9 7 24 140 2:20 19
Iced Thai Tea café Latte 12-01-02-0029 1 2 3 4 5 6 7 10 23 24 190 3:10 23
Iced Taiwanese Tea café Latte 12-01-02-0030 1 2 3 4 5 10 23 24 178 2:58 29
Iced Matcha café Latte 12-01-02-0031 1 2 3 4 5 8 9 7 23 24 204 3:24 25
Iced Thai Tea café Latte 12-01-03-0029 2 3 4 5 6 7 10 23 41 24 190 3:10 23
Iced Taiwanese Tea café Latte 12-01-03-0030 1 2 3 4 5 10 23 41 24 178 2:58 29
Iced Matcha café Latte 12-01-03-0031 2 3 4 5 8 9 7 23 41 24 204 3:24 25
Hot thai milk tea 12-02-01-0024 1 6 7 10 24 78 1:18 25
Hot Taiwanese Tea 12-02-01-0025 1 6 7 10 24 90 1:30 29
Hot matcha latte 12-02-01-0026 1 6 7 8 9 24 149 2:29 36
HOT MATCHA 12-02-01-0027 1 16 8 9 24 100 14:40 32
HOT MATCHA LIMENADE 12-02-01-0028 1 8 9 12 16 24 1 1 32
Iced Thai milk Tea 12-02-02-0024 1 6 7 10 23 24 165 2:45 40
Iced Taiwanese Tea 12-02-02-0025 1 6 7 10 23 24 104 1:44 25
Iced matcha latte 12-02-02-0026 1 6 7 8 9 23 24 175 2:55 34
ICED MATCHA 12-02-02-0027 1 16 8 9 23 24 100 15:40 32
ICED MATCHA LIMENADE 12-02-02-0028 1 8 9 12 23 24 1 1 32
Iced Thai milk Tea 12-02-03-0024 1 6 7 10 23 41 24 165 2:45 40
Iced Taiwanese Tea 12-02-03-0025 1 6 7 10 23 41 24 104 1:44 25
Iced matcha latte 12-02-03-0026 1 6 7 8 9 23 41 24 175 2:55 34
ICED MATCHA 12-02-03-0027 1 16 8 9 23 41 24 100 15:40 32
ICED MATCHA LIMENADE 12-02-03-0028 1 8 9 12 23 41 24 1 1 32
@ -653,7 +647,6 @@ Hot Taiwanese Tea café Latte 12-01-01-0009 1 2 3 4 5 10 24 136 2:16 26
Hot Thai Tea café Latte 12-01-01-0010 1 2 3 4 5 6 70 10 24 161 2:41 22
Hot Kokuto café Latte 12-01-01-0011 1 2 3 4 5 6 70 270 24 125 2:05 17
Hot Thai Tea café Latte 12-01-01-0029 1 2 3 4 5 6 70 10 24 161 2:41 22
Hot Taiwanese Tea café Latte 12-01-01-0030 1 2 3 4 5 10 24 136 2:16 26
Hot Matcha café Latte 12-01-01-0031 1 2 3 4 5 8 9 70 24 140 2:20 19
อเมริกาโนเมล่อนร้อน 12-01-01-0039 1 2 3 4 5 52 24 120 5:00 23
Iced Cafe Latte 12-01-02-0002 1 2 3 4 5 6 70 23 24 186 3:06 26
@ -670,8 +663,6 @@ Iced Kokuto café Latte 12-01-02-0008 1 2 3 4 5 6 70 270 23 24 186 3:06 23
Iced Kokuto café Latte 12-01-03-0008 2 3 4 5 6 70 270 23 41 24 186 3:06 23
Iced Thai Tea café Latte 12-01-02-0029 1 2 3 4 5 6 70 10 23 24 190 3:10 23
Iced Thai Tea café Latte 12-01-03-0029 2 3 4 5 6 70 10 23 41 24 190 3:10 23
Iced Taiwanese Tea café Latte 12-01-02-0030 1 2 3 4 5 10 23 24 178 2:58 29
Iced Taiwanese Tea café Latte 12-01-03-0030 1 2 3 4 5 10 23 41 24 178 2:58 29
Iced Matcha café Latte 12-01-02-0031 1 2 3 4 5 8 9 70 23 24 204 3:24 25
Iced Matcha café Latte 12-01-03-0031 2 3 4 5 8 9 70 23 41 24 204 3:24 25
อเมริกาโนเมล่อนเย็น 12-01-02-0039 1 2 3 4 5 52 23 24 120 6:00 23
@ -1224,3 +1215,77 @@ PEPSI EXTRA 12-05-02-0133 1 23 14 24 100 6:40 32
เพียงพบสบตารัก 12-03-03-0100 1 19 12 15 51 17 23 41 24 100 6:40 32
วิวาห์หวาน 12-03-03-0101 1 12 51 17 23 41 24 100 6:40 32
ดั่งรักนิรันด์ 12-03-03-0102 1 19 12 51 23 41 24 100 6:40 32
ฟรุตพันช์เย็น 12-05-02-0144 1 12 21 23 24 100 6:40 32
ฟรุตพันช์ปั่น 12-05-03-0144 1 12 21 23 41 24 100 6:40 32
ฟรุตพันช์ยูซุเย็น 12-05-02-0145 1 12 53 23 24 100 6:40 32
ฟรุตพันช์ยูซุปั่น 12-05-03-0145 1 12 53 23 41 24 100 6:40 32
ฟรุตพันช์บ๊วยเย็น 12-05-02-0146 1 12 33 23 24 100 6:40 32
ฟรุตพันช์บ๊วยปั่น 12-05-03-0146 1 12 33 23 41 24 100 6:40 32
STX On The Beach 11-99-05-0001 1 27 28 24 100 6:40 32
Noxious Nitrous 11-99-05-0002 1 27 28 24 100 7:40 32
Sea Level RISE 11-99-05-0003 1 27 28 24 100 8:40 32
Methane Bubbles 11-99-05-0004 1 27 28 24 100 9:40 32
My Carbon\nFootprint 11-99-05-0005 1 27 28 24 100 10:40 32
Fossil Fuel 11-99-05-0006 1 27 28 24 100 11:40 32
Stinky Sulphur 11-99-05-0007 1 27 28 24 100 12:40 32
Biofuel 11-99-05-0008 1 27 28 24 100 13:40 32
Coal Story Bro 11-99-05-0009 1 27 28 24 100 14:40 32
Bangkok\nUnderwater 11-99-05-0010 1 27 28 24 100 15:40 32
1 27 28 24 100 16:40 32
Druzhba Pipe 11-99-05-0012 1 27 28 24 100 17:40 32
2050 11-99-05-0013 1 27 28 24 100 18:40 32
Petrol Fumes 11-99-05-0017 1 27 28 24 100 19:40 32
Big Kid 11-99-05-0018 1 27 28 24 100 20:40 32
Tailpipe Emissions 11-99-05-0015 1 27 28 24 100 21:40 32
Greenwash 11-99-05-0014 1 27 28 24 100 22:40 32
1 27 28 24 100 23:40 32
Peach Smash 11-99-05-0019 1 27 28 24 100 0:40 32
Melon Fizz 11-99-05-0020 1 27 28 24 100 1:40 32
Yuzu Collins 11-99-05-0021 1 27 28 24 100 2:40 32
Gin Collins 11-99-05-0022 1 27 28 24 100 3:40 32
The Floral 11-99-05-0023 1 27 28 24 100 4:40 32
Combination 11-99-05-0024 1 27 28 24 100 5:40 32
Ume Ume 11-99-05-0025 1 27 28 24 100 6:40 32
Like Sex\non The Beach 11-99-05-0026 1 27 28 24 100 7:40 32
Plum Highball 11-99-05-0027 1 27 28 24 100 8:40 32
Draft Beer 11-99-05-0028 1 27 28 24 100 9:40 32
Iced Beer 11-99-05-0029 1 27 28 24 100 10:40 32
Summer Chill 11-99-05-0030 1 27 28 24 100 11:40 32
Neon Spark 11-99-05-0031 1 27 28 24 100 12:40 32
Yuzu Martini 11-99-05-0032 1 27 28 24 100 13:40 32
Strawberry Martini 11-99-05-0033 1 27 28 24 100 14:40 32
Russian Mojito 11-99-05-0034 1 27 28 24 100 15:40 32
Yuzu Highball 11-99-05-0035 1 27 28 24 100 16:40 32
Beachy Mint 11-99-05-0036 1 27 28 24 100 17:40 32
Black Menthe 11-99-05-0037 1 27 28 24 100 18:40 32
Wakeup Call 11-99-05-0038 1 27 28 24 100 19:40 32
Almost Umeshu 11-99-05-0039 1 27 28 24 100 20:40 32
Café Avec Liqueur 11-99-05-0040 1 27 28 24 100 21:40 32
Espresso Martini 11-99-05-0041 1 27 28 24 100 22:40 32
1 27 28 24 100 23:40 32
Mint Julep 11-99-05-0042 1 27 28 24 100 0:40 32
Highland Straw Fling 11-99-05-0043 1 27 28 24 100 1:40 32
Scotch Pineapple Sour 11-99-05-0044 1 27 28 24 100 2:40 32
Turtle Hole 11-99-05-0045 1 27 28 24 100 3:40 32
Azalea 11-99-05-0046 1 27 28 24 100 4:40 32
Turtle of BKK 11-99-05-0047 1 27 28 24 100 5:40 32
TAO Island Beach 11-99-05-0048 1 27 28 24 100 6:40 32
Yuzu Fizzy 11-99-05-0049 1 27 28 24 100 7:40 32
กาแฟชานมไต้หวันร้อน 12-01-01-0030 1 2 3 4 5 10 24 100 7:40 32
กาแฟชานมไต้หวันเย็น 12-01-02-0030 1 2 3 4 5 10 23 24 100 7:40 32
กาแฟชานมไต้หวันปั่น 12-01-03-0030 1 2 3 4 5 10 23 41 24 100 7:40 32
กาแฟชานมไต้หวันร้อน 12-21-01-0030 1 2 3 4 5 10 24 100 7:40 32
กาแฟชานมไต้หวันเย็น 12-21-02-0030 1 2 3 4 5 10 23 24 100 7:40 32
กาแฟชานมไต้หวันปั่น 12-21-03-0030 1 2 3 4 5 10 23 41 24 100 7:40 32
ชานมไต้หวันร้อน 12-02-01-0025 1 1 6 70 10 24 100 7:40 32
ชานมไต้หวันเย็น 12-02-02-0025 1 1 6 70 10 23 24 100 7:40 32
ชานมไต้หวันปั่น 12-02-03-0025 1 1 6 70 10 23 41 24 100 7:40 32
ชานมไต้หวันโกโก้ร้อน 12-02-01-0089 1 1 6 70 15 10 24 100 7:40 32
ชานมไต้หวันโกโก้เย็น 12-02-02-0089 1 1 6 70 15 10 23 24 100 7:40 32
ชานมไต้หวันโกโก้ปั่น 12-02-03-0089 1 1 6 70 15 10 23 41 24 100 7:40 32

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

View file

@ -1,2 +1,6 @@
~//project/cofffeemachineConfig/script/tb_send_file.sh 173249 ~/project/taobin_project/boxid/173249/FixPrice10Bath.ev /taobin_project/speical/call_from_topping.ev dc lo
~//project/cofffeemachineConfig/script/tb_send_file.sh 200001 ~/project/taobin_project/boxid/173249/FixPrice10Bath.ev /taobin_project/speical/call_from_topping.ev dc lo
mkdir /mnt/sdcard/coffeevending/taobin_project/speical

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 45 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 48 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 70 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 71 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 70 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 77 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 78 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 61 KiB

After

Width:  |  Height:  |  Size: 77 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 78 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
image/sleepmode/ok_bn.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
image/sleepmode/ok_bp.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
image/sleepmode/popup.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View file

@ -1,6 +1,3 @@
normal_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
normal_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
press_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
press_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
disable_eng=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
disable_thai=ROOT/taobin_project/inter/aus/image/event/winter_warmer_banner.png
normal_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
disable_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png
press_eng=ROOT/taobin_project/inter/aus/image/event/valentine_banner.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

Before After
Before After

Some files were not shown because too many files have changed in this diff Show more