diff --git a/GT911-1060-V109终版触摸固件.cfg b/GT911-1060-V109终版触摸固件.cfg new file mode 100644 index 00000000..abed6aa5 --- /dev/null +++ b/GT911-1060-V109终版触摸固件.cfg @@ -0,0 +1 @@ +0x6D,0xE0,0x01,0xE0,0x01,0x05,0xF5,0x00,0x22,0x0F,0x28,0x0F,0x5A,0x3C,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x06,0x18,0x1A,0x1E,0x14,0x85,0x25,0x0A,0x78,0x7A,0x0C,0x08,0x00,0x00,0x00,0x21,0x01,0x10,0x00,0x01,0x00,0x00,0x00,0x03,0x64,0x32,0x00,0x00,0x00,0x64,0x96,0xDE,0xD5,0x02,0x07,0x00,0x00,0x04,0x8E,0x68,0x00,0x85,0x71,0x00,0x7E,0x7A,0x00,0x77,0x84,0x00,0x70,0x90,0x00,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x04,0x06,0x08,0x0A,0x0C,0x0E,0x10,0x12,0x14,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x08,0x06,0x04,0x02,0x00,0x1D,0x1E,0x1F,0x20,0x21,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xEE,0x01 \ No newline at end of file diff --git a/ReadMe.md b/ReadMe.md index bc8851ad..a58369a4 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,3 +1,6 @@ +# v1.0.7 +* 1.增加非标准时区 + # v1.0.6 * 1.修改gt911驱动测试触摸乱触发现象 * diff --git a/application/rt-thread/t3e-pro/components/FontEnum.h b/application/rt-thread/t3e-pro/components/FontEnum.h index 0202777f..55b84a40 100644 --- a/application/rt-thread/t3e-pro/components/FontEnum.h +++ b/application/rt-thread/t3e-pro/components/FontEnum.h @@ -11,7 +11,7 @@ #define D_System_Storage "16MB+8MB" #define D_System_Hardware "1.0" #define D_System_Screen "480*480" -#define D_System_Ver 106 +#define D_System_Ver 107 enum { diff --git a/kernel/d12x_t3e-pro_gang3_displayid_v1.0.6.img b/kernel/d12x_t3e-pro_gang3_displayid_v1.0.6.img deleted file mode 100644 index 8023d744..00000000 Binary files a/kernel/d12x_t3e-pro_gang3_displayid_v1.0.6.img and /dev/null differ diff --git a/kernel/d12x_t3e-pro_gang4_displayid_v1.0.6.bin b/kernel/d12x_t3e-pro_gang4_displayid_v1.0.6.bin deleted file mode 100644 index 866ca8da..00000000 Binary files a/kernel/d12x_t3e-pro_gang4_displayid_v1.0.6.bin and /dev/null differ diff --git a/kernel/d12x_t3e-pro_gang4_displayid_v1.0.6.img b/kernel/d12x_t3e-pro_gang4_displayid_v1.0.6.img deleted file mode 100644 index 4ea74806..00000000 Binary files a/kernel/d12x_t3e-pro_gang4_displayid_v1.0.6.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_displayid_v1.0.6.bin b/old/d12x_t3e-pro_gang3_displayid_v1.0.6.bin deleted file mode 100644 index 83888d91..00000000 Binary files a/old/d12x_t3e-pro_gang3_displayid_v1.0.6.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid65_v1.0.6.img b/old/d12x_t3e-pro_gang3_touchid65_v1.0.6.img deleted file mode 100644 index b168aec2..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid65_v1.0.6.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid66_v1.0.6.bin b/old/d12x_t3e-pro_gang3_touchid66_v1.0.6.bin deleted file mode 100644 index 4a3628a2..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid66_v1.0.6.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid66_v1.0.6.img b/old/d12x_t3e-pro_gang3_touchid66_v1.0.6.img deleted file mode 100644 index 66308ff4..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid66_v1.0.6.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid67_v1.0.6.bin b/old/d12x_t3e-pro_gang3_touchid67_v1.0.6.bin deleted file mode 100644 index 76b06ef5..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid67_v1.0.6.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid67_v1.0.6.img b/old/d12x_t3e-pro_gang3_touchid67_v1.0.6.img deleted file mode 100644 index 26624689..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid67_v1.0.6.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid69_v1.0.6.bin b/old/d12x_t3e-pro_gang3_touchid69_v1.0.6.bin deleted file mode 100644 index 7e9030a5..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid69_v1.0.6.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid69_v1.0.6.img b/old/d12x_t3e-pro_gang3_touchid69_v1.0.6.img deleted file mode 100644 index 7ade34d4..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid69_v1.0.6.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6A_v1.0.6_102501.bin b/old/d12x_t3e-pro_gang3_touchid6A_v1.0.6_102501.bin deleted file mode 100644 index 05f63dcb..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6A_v1.0.6_102501.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6A_v1.0.6_102501.img b/old/d12x_t3e-pro_gang3_touchid6A_v1.0.6_102501.img deleted file mode 100644 index e0a65929..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6A_v1.0.6_102501.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_永251027.bin b/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_永251027.bin deleted file mode 100644 index a1c732a4..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_永251027.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_永251027.img b/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_永251027.img deleted file mode 100644 index 18cfacdb..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_永251027.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_黄251027.bin b/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_黄251027.bin deleted file mode 100644 index 6fbaa181..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_黄251027.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_黄251027.img b/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_黄251027.img deleted file mode 100644 index 68a414d8..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_黄251027.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_永251029.bin b/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_永251029.bin deleted file mode 100644 index 7b5ebdc3..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_永251029.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_永251029.img b/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_永251029.img deleted file mode 100644 index 9a939bb2..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_永251029.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_黄251029.bin b/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_黄251029.bin deleted file mode 100644 index ee595b30..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_黄251029.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_黄251029.img b/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_黄251029.img deleted file mode 100644 index 15f0dbc5..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_黄251029.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid_v1.0.6.bin b/old/d12x_t3e-pro_gang3_touchid_v1.0.6.bin deleted file mode 100644 index 309a2649..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid_v1.0.6.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang3_touchid_v1.0.6.img b/old/d12x_t3e-pro_gang3_touchid_v1.0.6.img deleted file mode 100644 index 9a911a19..00000000 Binary files a/old/d12x_t3e-pro_gang3_touchid_v1.0.6.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid65_v1.0.6.img b/old/d12x_t3e-pro_gang4_touchid65_v1.0.6.img deleted file mode 100644 index 50907cfb..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid65_v1.0.6.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid66_v1.0.6.bin b/old/d12x_t3e-pro_gang4_touchid66_v1.0.6.bin deleted file mode 100644 index ba0fda4d..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid66_v1.0.6.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid66_v1.0.6.img b/old/d12x_t3e-pro_gang4_touchid66_v1.0.6.img deleted file mode 100644 index 6addd066..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid66_v1.0.6.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid69_v1.0.6.bin b/old/d12x_t3e-pro_gang4_touchid69_v1.0.6.bin deleted file mode 100644 index 083687f2..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid69_v1.0.6.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid69_v1.0.6.img b/old/d12x_t3e-pro_gang4_touchid69_v1.0.6.img deleted file mode 100644 index e8afb519..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid69_v1.0.6.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid6A_v1.0.6_102501.bin b/old/d12x_t3e-pro_gang4_touchid6A_v1.0.6_102501.bin deleted file mode 100644 index ad2ac65c..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid6A_v1.0.6_102501.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid6A_v1.0.6_102501.img b/old/d12x_t3e-pro_gang4_touchid6A_v1.0.6_102501.img deleted file mode 100644 index 371dc70a..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid6A_v1.0.6_102501.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid6B_v1.0.6_黄251027.bin b/old/d12x_t3e-pro_gang4_touchid6B_v1.0.6_黄251027.bin deleted file mode 100644 index 9fcee172..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid6B_v1.0.6_黄251027.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid6B_v1.0.6_黄251027.img b/old/d12x_t3e-pro_gang4_touchid6B_v1.0.6_黄251027.img deleted file mode 100644 index 47836ca9..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid6B_v1.0.6_黄251027.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_huang251029.img b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_huang251029.img deleted file mode 100644 index d1f1a86e..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_huang251029.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_永251029.bin b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_永251029.bin deleted file mode 100644 index 9e080566..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_永251029.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_永251029.img b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_永251029.img deleted file mode 100644 index 4b9825d6..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_永251029.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_黄251029.bin b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_黄251029.bin deleted file mode 100644 index 4ca53dbc..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_黄251029.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_黄251029.img b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_黄251029.img deleted file mode 100644 index d1f1a86e..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_黄251029.img and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid_v1.0.6.bin b/old/d12x_t3e-pro_gang4_touchid_v1.0.6.bin deleted file mode 100644 index 2ebeed76..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid_v1.0.6.bin and /dev/null differ diff --git a/old/d12x_t3e-pro_gang4_touchid_v1.0.6.img b/old/d12x_t3e-pro_gang4_touchid_v1.0.6.img deleted file mode 100644 index de5b6e01..00000000 Binary files a/old/d12x_t3e-pro_gang4_touchid_v1.0.6.img and /dev/null differ diff --git a/packages/artinchip/lvgl-ui/aic_widgets/aic_canvas/libaic_canvas_v8_e907f.a b/packages/artinchip/lvgl-ui/aic_widgets/aic_canvas/libaic_canvas_v8_e907f.a index 080c5157..219804a5 100644 Binary files a/packages/artinchip/lvgl-ui/aic_widgets/aic_canvas/libaic_canvas_v8_e907f.a and b/packages/artinchip/lvgl-ui/aic_widgets/aic_canvas/libaic_canvas_v8_e907f.a differ diff --git a/d12x_t3e-pro_touchid6D_v1.0.6.zip b/t3e-pro标准版_v1.0.7.zip similarity index 81% rename from d12x_t3e-pro_touchid6D_v1.0.6.zip rename to t3e-pro标准版_v1.0.7.zip index c37deda8..cbf6b8cd 100644 Binary files a/d12x_t3e-pro_touchid6D_v1.0.6.zip and b/t3e-pro标准版_v1.0.7.zip differ diff --git a/target/d12x/t3e-pro/pack/.image_cfg.json.tmp b/target/d12x/t3e-pro/pack/.image_cfg.json.tmp index ee6305de..75cc1ef2 100644 --- a/target/d12x/t3e-pro/pack/.image_cfg.json.tmp +++ b/target/d12x/t3e-pro/pack/.image_cfg.json.tmp @@ -15,7 +15,7 @@ "info": { // Header information about image "platform": "d12x", "product": "t3e-pro", - "version": "1.0.6", + "version": "1.0.7", "media": { "type": "spi-nor", "device_id": 0, diff --git a/target/d12x/t3e-pro/pack/bootloader.bin b/target/d12x/t3e-pro/pack/bootloader.bin index 1ea505db..9bcf5fd4 100644 Binary files a/target/d12x/t3e-pro/pack/bootloader.bin and b/target/d12x/t3e-pro/pack/bootloader.bin differ diff --git a/target/d12x/t3e-pro/pack/image_cfg.json b/target/d12x/t3e-pro/pack/image_cfg.json index e169e9d6..fbf7c2af 100644 --- a/target/d12x/t3e-pro/pack/image_cfg.json +++ b/target/d12x/t3e-pro/pack/image_cfg.json @@ -15,7 +15,7 @@ "info": { // Header information about image "platform": "d12x", "product": "t3e-pro", - "version": "1.0.6", + "version": "1.0.7", "media": { "type": "spi-nor", "device_id": 0, diff --git a/tools/env/tools/ConEmu/ConEmu.xml b/tools/env/tools/ConEmu/ConEmu.xml index bf514a9d..27a86b45 100644 --- a/tools/env/tools/ConEmu/ConEmu.xml +++ b/tools/env/tools/ConEmu/ConEmu.xml @@ -1,7 +1,7 @@ - + @@ -259,8 +259,8 @@ - - + + diff --git a/tools/env/tools/ConEmu/ConEmu/clink/profile/.history b/tools/env/tools/ConEmu/ConEmu/clink/profile/.history index 5a226633..fe254214 100644 --- a/tools/env/tools/ConEmu/ConEmu/clink/profile/.history +++ b/tools/env/tools/ConEmu/ConEmu/clink/profile/.history @@ -193,3 +193,11 @@ me me me me +bm +me +me +me +me +me +bm +me diff --git a/字体制作及字库/常用汉字 - 副本.txt b/字体制作及字库/常用汉字 - 副本.txt new file mode 100644 index 00000000..07d732e3 --- /dev/null +++ b/字体制作及字库/常用汉字 - 副本.txt @@ -0,0 +1,3 @@ + +"! "#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~®©ÄÖÜäöüß¡¢£¤¥¦§¨ª«¬-¯°±²³µ¶·¸¹º»¼½¾¿ÀÁÂÃÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕ×ØÙÚÛÝÞàáâãåæçèéêëìíîïðñòóôõ÷øùúûýþÿñÑáéíóúÄäÖöÜüẞßпфктшсхцчщбвгджзлмнрйаоуыэяёюиеъьìí¿" +星期一二三四五六七日年月日时分秒 \ No newline at end of file