diff --git a/application/rt-thread/t3e-pro/components/FontEnum.c b/application/rt-thread/t3e-pro/components/FontEnum.c index e2791fab..57dccad5 100644 --- a/application/rt-thread/t3e-pro/components/FontEnum.c +++ b/application/rt-thread/t3e-pro/components/FontEnum.c @@ -101,8 +101,7 @@ const char Menu_List[LANG_MAX][MENU_LIST_MAX][80]= "存储", "硬件版本", "分辨率", - "系统版本", - "触摸版本", + "系统版本", "智能配网", "自动", "请您选择应用场景", @@ -170,6 +169,7 @@ const char Menu_List[LANG_MAX][MENU_LIST_MAX][80]= "删除网络", "系统信息", "软件版本",//软件版本 + "触摸版本", "其它",//其它 "场景开关1", "场景开关1-1", diff --git a/bsp/peripheral/touch/gt911/src/gt911.c b/bsp/peripheral/touch/gt911/src/gt911.c index c4875ef7..b523f39e 100644 --- a/bsp/peripheral/touch/gt911/src/gt911.c +++ b/bsp/peripheral/touch/gt911/src/gt911.c @@ -23,22 +23,22 @@ static struct rt_i2c_client gt911_client; /* hardware section */ static rt_uint8_t GT911_CFG_TBL[] = { - 0x62,0xE0,0x01,0xE0,0x01,0x01,0xF5,0x00,0x01,0xC8,0x28,0x0F, - 0x50,0x3C,0x03,0x05,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x16, - 0x18,0x1E,0x14,0x85,0x25,0x0A,0x9B,0x9D,0x7C,0x06,0x00,0x00, - 0x00,0x00,0x01,0x2D,0x00,0x01,0x00,0x00,0x00,0x03,0x64,0x32, - 0x00,0x00,0x00,0x50,0x7D,0x94,0xC5,0x02,0x07,0x00,0x00,0x04, - 0x99,0x53,0x00,0x8D,0x5B,0x00,0x82,0x64,0x00,0x77,0x6D,0x00, - 0x6E,0x77,0x00,0x6E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x6C,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,0xC8,0xCA,0xB5,0x06,0x00,0x00, + 0x01,0x22,0x00,0x10,0x00,0x01,0x00,0x00,0x00,0x03,0x64,0x32, + 0x00,0x00,0x00,0xAA,0xE6,0xDE,0xC5,0x02,0x07,0x00,0x00,0x04, + 0x8D,0xAF,0x00,0x86,0xBA,0x00,0x81,0xC5,0x00,0x7B,0xD2,0x00, + 0x76,0xDF,0x00,0x77,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,0x16,0x18,0x1A,0x1C,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0x06, + 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, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x27,0x01 + 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, + 0xFF,0xFF,0xFF,0xFF,0x96,0x01, }; static rt_err_t gt911_write_reg(struct rt_i2c_client *dev, rt_uint8_t *data, @@ -362,7 +362,7 @@ static rt_err_t gt911_control(struct rt_touch_device *touch, int cmd, void *arg) gt911_get_config_version(>911_client, ®ver, 1); LOG_I("Config version:%d",regver); - if(regver<98) + if(regver!=0x6C) { LOG_I("update touch config"); diff --git a/d12x_t3e-pro_gang3_v1.0.6.bin b/d12x_t3e-pro_gang3_v1.0.6.bin new file mode 100644 index 00000000..1ec8dfde Binary files /dev/null and b/d12x_t3e-pro_gang3_v1.0.6.bin differ diff --git a/d12x_t3e-pro_gang3_v1.0.6.img b/d12x_t3e-pro_gang3_v1.0.6.img new file mode 100644 index 00000000..0ef78084 Binary files /dev/null and b/d12x_t3e-pro_gang3_v1.0.6.img differ diff --git a/d12x_t3e-pro_gang4_v1.0.6.bin b/d12x_t3e-pro_gang4_v1.0.6.bin new file mode 100644 index 00000000..ac3c2eaf Binary files /dev/null and b/d12x_t3e-pro_gang4_v1.0.6.bin differ diff --git a/d12x_t3e-pro_gang4_v1.0.6.img b/d12x_t3e-pro_gang4_v1.0.6.img new file mode 100644 index 00000000..4912871e Binary files /dev/null and b/d12x_t3e-pro_gang4_v1.0.6.img 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 new file mode 100644 index 00000000..b168aec2 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid65_v1.0.6.img 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 new file mode 100644 index 00000000..4a3628a2 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid66_v1.0.6.bin 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 new file mode 100644 index 00000000..66308ff4 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid66_v1.0.6.img 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 new file mode 100644 index 00000000..76b06ef5 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid67_v1.0.6.bin 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 new file mode 100644 index 00000000..26624689 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid67_v1.0.6.img 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 new file mode 100644 index 00000000..7e9030a5 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid69_v1.0.6.bin 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 new file mode 100644 index 00000000..7ade34d4 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid69_v1.0.6.img 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 new file mode 100644 index 00000000..05f63dcb Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6A_v1.0.6_102501.bin 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 new file mode 100644 index 00000000..e0a65929 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6A_v1.0.6_102501.img 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 new file mode 100644 index 00000000..a1c732a4 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_永251027.bin 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 new file mode 100644 index 00000000..18cfacdb Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_永251027.img 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 new file mode 100644 index 00000000..6fbaa181 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_黄251027.bin 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 new file mode 100644 index 00000000..68a414d8 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6B_v1.0.6_黄251027.img 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 new file mode 100644 index 00000000..7b5ebdc3 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_永251029.bin 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 new file mode 100644 index 00000000..9a939bb2 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_永251029.img 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 new file mode 100644 index 00000000..ee595b30 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_黄251029.bin 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 new file mode 100644 index 00000000..15f0dbc5 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid6C_v1.0.6_黄251029.img 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 new file mode 100644 index 00000000..309a2649 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid_v1.0.6.bin 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 new file mode 100644 index 00000000..9a911a19 Binary files /dev/null and b/old/d12x_t3e-pro_gang3_touchid_v1.0.6.img 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 new file mode 100644 index 00000000..50907cfb Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid65_v1.0.6.img 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 new file mode 100644 index 00000000..ba0fda4d Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid66_v1.0.6.bin 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 new file mode 100644 index 00000000..6addd066 Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid66_v1.0.6.img 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 new file mode 100644 index 00000000..083687f2 Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid69_v1.0.6.bin 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 new file mode 100644 index 00000000..e8afb519 Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid69_v1.0.6.img 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 new file mode 100644 index 00000000..ad2ac65c Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid6A_v1.0.6_102501.bin 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 new file mode 100644 index 00000000..371dc70a Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid6A_v1.0.6_102501.img 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 new file mode 100644 index 00000000..9fcee172 Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid6B_v1.0.6_黄251027.bin 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 new file mode 100644 index 00000000..47836ca9 Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid6B_v1.0.6_黄251027.img 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 new file mode 100644 index 00000000..d1f1a86e Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_huang251029.img 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 new file mode 100644 index 00000000..9e080566 Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_永251029.bin 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 new file mode 100644 index 00000000..4b9825d6 Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_永251029.img 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 new file mode 100644 index 00000000..4ca53dbc Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_黄251029.bin 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 new file mode 100644 index 00000000..d1f1a86e Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid6C_v1.0.6_黄251029.img 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 new file mode 100644 index 00000000..2ebeed76 Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid_v1.0.6.bin 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 new file mode 100644 index 00000000..de5b6e01 Binary files /dev/null and b/old/d12x_t3e-pro_gang4_touchid_v1.0.6.img 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 960927b7..abb1444a 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/target/configs/d12x_t3e-pro_rt-thread_t3e-pro_defconfig b/target/configs/d12x_t3e-pro_rt-thread_t3e-pro_defconfig index db25f83a..2a68f3b1 100644 --- a/target/configs/d12x_t3e-pro_rt-thread_t3e-pro_defconfig +++ b/target/configs/d12x_t3e-pro_rt-thread_t3e-pro_defconfig @@ -793,8 +793,8 @@ CONFIG_CONFIG_LANAGUAGE_CHS=y # CONFIG_CONFIG_LANAGUAGE_CHT is not set # CONFIG_CONFIG_USER_RELAY_1 is not set # CONFIG_CONFIG_USER_RELAY_2 is not set -# CONFIG_CONFIG_USER_RELAY_3 is not set -CONFIG_CONFIG_USER_RELAY_4=y +CONFIG_CONFIG_USER_RELAY_3=y +# CONFIG_CONFIG_USER_RELAY_4 is not set CONFIG_CONFIG_DEVICE_SCR_ACT_JUMP=y CONFIG_CONFIG_OBJICT_IMAGE=y CONFIG_CONFIG_USER_MENU_TABLEVEW=y diff --git a/target/d12x/t3e-pro/pack/.image_cfg.json.tmp b/target/d12x/t3e-pro/pack/.image_cfg.json.tmp index feed8055..ee6305de 100644 --- a/target/d12x/t3e-pro/pack/.image_cfg.json.tmp +++ b/target/d12x/t3e-pro/pack/.image_cfg.json.tmp @@ -42,7 +42,7 @@ "env": { "file": "env.bin", "attr": ["mtd", "optional"], - "part": ["env","env_r"] + "part": ["env"] }, "os": { "file": "d12x_os.itb", diff --git a/target/d12x/t3e-pro/pack/bootloader.bin b/target/d12x/t3e-pro/pack/bootloader.bin index 67ca8164..a447854e 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 63cf7c3d..e169e9d6 100644 --- a/target/d12x/t3e-pro/pack/image_cfg.json +++ b/target/d12x/t3e-pro/pack/image_cfg.json @@ -42,7 +42,7 @@ "env": { "file": "env.bin", "attr": ["mtd", "optional"], - "part": ["env","env_r"] + "part": ["env"] }, "os": { "file": "d12x_os.itb", diff --git a/target/d13x/kunlunpi88-nor/pinmux.c b/target/d13x/kunlunpi88-nor/pinmux.c index 33f383ee..6fd77893 100644 --- a/target/d13x/kunlunpi88-nor/pinmux.c +++ b/target/d13x/kunlunpi88-nor/pinmux.c @@ -271,6 +271,8 @@ struct aic_pinmux aic_pinmux_config[] = { {1, PIN_PULL_DIS, 3, AIC_TOUCH_PANEL_RST_PIN}, {1, PIN_PULL_DIS, 3, AIC_TOUCH_PANEL_INT_PIN}, #endif + {1, PIN_PULL_DIS, 3, "PU.0"}, + {1, PIN_PULL_DIS, 3, "PU.1"}, }; uint32_t aic_pinmux_config_size = ARRAY_SIZE(aic_pinmux_config); diff --git a/tools/env/tools/ConEmu/ConEmu.xml b/tools/env/tools/ConEmu/ConEmu.xml index 7b727f6f..a2ec639c 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 9c0119d8..21c0ee2e 100644 --- a/tools/env/tools/ConEmu/ConEmu/clink/profile/.history +++ b/tools/env/tools/ConEmu/ConEmu/clink/profile/.history @@ -153,3 +153,32 @@ me me\ me me +me +me +me +me +bm +me +me\ +me +me +me +me +me +me +me +me +me +me +me +me +me +me +me +me +me +me +me +me +me +me