first commit

ReadMe.md

@@ -9,6 +9,8 @@
 *  <img src="docs/relay_power_q1.png">
 *  <img src="docs/relay_power_q2.png">
 *  <img src="docs/relay_power_q3.png">
+* 3.增加显示触摸屏配置版本
+*  <img src="docs/gt911_config.jpg">
 
 # v1.0.5
 * 1.场景界面添加弹窗警告用于提醒时间对的的可以手动更新

application/rt-thread/t3e-pro/components/FontEnum.c

@@ -102,6 +102,7 @@ const char Menu_List[LANG_MAX][MENU_LIST_MAX][80]=
 		"硬件版本",
 		"分辨率",
 		"系统版本",
+		"触摸版本",		
 		"智能配网",
 		"自动",
 		"请您选择应用场景",
@@ -392,7 +393,8 @@ const char Menu_List[LANG_MAX][MENU_LIST_MAX][80]=
 		"Modify network",
 		"Forget network",
 		"System information",//"系统信息",
-		"Software version",//软件版本
+		"Software version",  //软件版本
+		"Touch version",     //触摸版本		
 		"Others",//其它
 		"Scene 1 Gang Switch",
 		"Switch 1-1",

application/rt-thread/t3e-pro/components/FontEnum.h

@@ -93,7 +93,7 @@ enum
 		MENU_LIST_Storage,								//内存
 		MENU_LIST_HARDWARE,								//硬件版本
 		MENU_LIST_Screen,								//分辨率
-		MENU_LIST_SystemVer,							//系统版本
+		MENU_LIST_SystemVer,							//系统版本	
 		MENU_LIST_Intelnetwork,							//智能配网
 		MENU_LIST_Automatic,							//自动
 		MENU_LIST_scenario,								//请您选择应用场景
@@ -153,7 +153,8 @@ enum
 		MENU_LIST_Smartconfig_Modifynetwork,//修改密码
 		MENU_LIST_Smartconfig_Forgetnetwork,//删除网络
 		MENU_LIST_SYSTEMINFO,//系统信息
-		MENU_LIST_SoftwareVer,//软件版本0
+		MENU_LIST_SoftwareVer,//软件版本
+		MENU_LIST_TOUCHVer,		//触摸版本	
 		MENU_LIST_System_Other,//其它
 		MENU_LIST_GANG1_NAME,		//场景开关1
 		MENU_LIST_GANG11,

application/rt-thread/t3e-pro/components/generated/setup_scr_mianinfopage.c

@@ -166,6 +166,13 @@ void setup_scr_mianinfopage(lv_ui *ui)
 	mianinfopage_list_1_text=lv_list_add_text(ui->mianinfopage_list_1, Menu_List[GET_nvs_Sys_Info_language()][MENU_LIST_SystemVer]);
 	lv_obj_add_style(mianinfopage_list_1_text, &style_mianinfopage_list_1_extra_texts_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
 //---------------------------
+	extern rt_uint8_t regver;
+	sprintf(tempbuff,"%s:%X",Menu_List[GET_nvs_Sys_Info_language()][MENU_LIST_TOUCHVer],regver);
+	mianinfopage_list_1_btn = lv_list_add_btn(ui->mianinfopage_list_1, LV_SYMBOL_HOME, (const char *)tempbuff);
+	//ui->mianinfopage_list_1_item3 = mianinfopage_list_1_btn;
+	lv_obj_add_style(mianinfopage_list_1_btn, &style_mianinfopage_list_1_extra_btns_main_default, LV_PART_MAIN|LV_STATE_DEFAULT);
+	lv_obj_add_state(mianinfopage_list_1_btn, LV_STATE_DISABLED);//状态固定
+
 	sprintf(tempbuff,"%s:%s",Menu_List[GET_nvs_Sys_Info_language()][MENU_LIST_HARDWARE],D_System_Hardware);
 	mianinfopage_list_1_btn = lv_list_add_btn(ui->mianinfopage_list_1, LV_SYMBOL_HOME, (const char *)tempbuff);
 	//ui->mianinfopage_list_1_item3 = mianinfopage_list_1_btn;

bsp/peripheral/touch/gt911/src/gt911.c

@@ -354,12 +354,12 @@ exit_:
 
     return read_num;
 }
+rt_uint8_t regver;
 
 static rt_err_t gt911_control(struct rt_touch_device *touch, int cmd, void *arg)
 {  
     LOG_I("gt911_control cmd:%x",cmd);
 
-    rt_uint8_t regver;
     gt911_get_config_version(&gt911_client, &regver, 1);
     LOG_I("Config version:%d",regver);
     if(regver<98)

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=y
-# CONFIG_CONFIG_USER_RELAY_4 is not set
+# CONFIG_CONFIG_USER_RELAY_3 is not set
+CONFIG_CONFIG_USER_RELAY_4=y
 CONFIG_CONFIG_DEVICE_SCR_ACT_JUMP=y
 CONFIG_CONFIG_OBJICT_IMAGE=y
 CONFIG_CONFIG_USER_MENU_TABLEVEW=y

tools/env/tools/ConEmu/ConEmu/clink/profile/.history

@@ -152,3 +152,4 @@ bm
 me
 me\
 me
+me