diff --git a/ReadMe.md b/ReadMe.md index bafe6988..9b122c45 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,5 +1,14 @@ # v1.0.6 * 1.修改gt911驱动测试触摸乱触发现象 +* +* 2.修复首屏场景8无法更新名字的问题 +* +* +* +* 3.修复上电记忆功能(原因:上电标记被提前取消了;改动:setup_scr_onoff1/2/3/4.c及setup_scr_onofftime1/2/3/4.c 文件最后位置屏蔽修改上电标记；改到custom_init()最后设置;因为先执行setup_ui(&guider_ui);后执行custom_init(&guider_ui);) +* +* +* # v1.0.5 * 1.场景界面添加弹窗警告用于提醒时间对的的可以手动更新 diff --git a/application/rt-thread/t3e-pro/components/custom/custom.c b/application/rt-thread/t3e-pro/components/custom/custom.c index 4e810f43..08e1235a 100644 --- a/application/rt-thread/t3e-pro/components/custom/custom.c +++ b/application/rt-thread/t3e-pro/components/custom/custom.c @@ -482,6 +482,23 @@ void custom_init(lv_ui *ui) } //======================================================================================= #endif + //取消上电标记 + if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 + {// + SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 + } + if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 + {// + SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 + } + if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 + {// + SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 + } + if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 + {// + SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 + } nvs_eepom_sysInfo_update(); } static void smartconfig_msgbox_callback(lv_event_t *event) @@ -1678,9 +1695,9 @@ void custom_Task(void *pvParameter) lv_label_set_text(guider_ui.scene_s7_label, Menu_List[GET_nvs_Sys_Info_language()][MENU_LIST_Scence23]); } } - else if(evt.length==6) + else if(evt.length==8) { - if( strlen((const char*)nvs_SysInfo.scen_array[6].Label) ) + if( strlen((const char*)nvs_SysInfo.scen_array[7].Label) ) { lv_label_set_text_fmt(guider_ui.scene_s8_label, "%s",nvs_SysInfo.scen_array[7].Label); } diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff1.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff1.c index 8b782e24..5d8e0402 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff1.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff1.c @@ -207,7 +207,24 @@ void setup_scr_onoff1(lv_ui *ui) //Update current screen layout. lv_obj_update_layout(ui->onoff1); - + // //取消上电标记 + // if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 + // } + // nvs_eepom_sysInfo_update(); //Init events for screen. events_init_onoff1(ui); } diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff2.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff2.c index 450edffb..69e6e23e 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff2.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff2.c @@ -340,24 +340,24 @@ void setup_scr_onoff2(lv_ui *ui) //Update current screen layout. lv_obj_update_layout(ui->onoff2); - //取消上电标记 - if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 - } - nvs_eepom_sysInfo_update(); + // //取消上电标记 + // if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 + // } + // nvs_eepom_sysInfo_update(); //Init events for screen. events_init_onoff2(ui); diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff3.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff3.c index 6a169351..ad765bde 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff3.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff3.c @@ -474,24 +474,24 @@ void setup_scr_onoff3(lv_ui *ui) //Update current screen layout. lv_obj_update_layout(ui->onoff3); - //取消上电标记 - if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 - } - nvs_eepom_sysInfo_update(); + // //取消上电标记 + // if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 + // } + // nvs_eepom_sysInfo_update(); //Init events for screen. events_init_onoff3(ui); } diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff4.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff4.c index 3f75248e..100549b8 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff4.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_onoff4.c @@ -607,24 +607,24 @@ void setup_scr_onoff4(lv_ui *ui) //Update current screen layout. lv_obj_update_layout(ui->onoff4); - //取消上电标记 - if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 - } - nvs_eepom_sysInfo_update(); + // //取消上电标记 + // if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 + // } + // nvs_eepom_sysInfo_update(); //Init events for screen. events_init_onoff4(ui); diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime1.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime1.c index b6b10706..291a6e96 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime1.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime1.c @@ -317,24 +317,24 @@ void setup_scr_onofftime1(lv_ui *ui) //Update current screen layout. lv_obj_update_layout(ui->onofftime1); - //取消上电标记 - if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 - } - nvs_eepom_sysInfo_update(); + // //取消上电标记 + // if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 + // } + // nvs_eepom_sysInfo_update(); //Init events for screen. events_init_onofftime1(ui); diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime2.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime2.c index 63595934..5e1cebc7 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime2.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime2.c @@ -437,24 +437,24 @@ void setup_scr_onofftime2(lv_ui *ui) //Update current screen layout. lv_obj_update_layout(ui->onofftime2); - //取消上电标记 - if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 - } - nvs_eepom_sysInfo_update(); + // //取消上电标记 + // if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 + // } + // nvs_eepom_sysInfo_update(); //Init events for screen. events_init_onofftime2(ui); diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime3.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime3.c index 63be7c0b..a9c05d18 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime3.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime3.c @@ -560,24 +560,24 @@ void setup_scr_onofftime3(lv_ui *ui) //Update current screen layout. lv_obj_update_layout(ui->onofftime3); - //取消上电标记 - if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 - } - nvs_eepom_sysInfo_update(); + // //取消上电标记 + // if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 + // } + // nvs_eepom_sysInfo_update(); //Init events for screen. events_init_onofftime3(ui); diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime4.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime4.c index ed0121aa..232534c6 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime4.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_onofftime4.c @@ -680,24 +680,24 @@ void setup_scr_onofftime4(lv_ui *ui) //Update current screen layout. lv_obj_update_layout(ui->onofftime4); - //取消上电标记 - if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 - } - if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 - {// - SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 - } - nvs_eepom_sysInfo_update(); + // //取消上电标记 + // if(GET_nvs_Sys_Info_relay1status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay1status(GET_nvs_Sys_Info_relay1status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay2status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay2status(GET_nvs_Sys_Info_relay2status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay3status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay3status(GET_nvs_Sys_Info_relay3status()&(~relayfirst_powerflag));//取消上电标记 + // } + // if(GET_nvs_Sys_Info_relay4status()&relayfirst_powerflag)//看看是不是上电 + // {// + // SET_nvs_Sys_Info_relay4status(GET_nvs_Sys_Info_relay4status()&(~relayfirst_powerflag));//取消上电标记 + // } + // nvs_eepom_sysInfo_update(); //Init events for screen. events_init_onofftime4(ui); diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_scene.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_scene.c index 38c885db..39bbf925 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_scene.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_scene.c @@ -885,7 +885,7 @@ void setup_scr_scene(lv_ui *ui) //Write codes scene_s8_label ui->scene_s8_label = lv_label_create(ui->scene_tabview_1_tab_2); - if( strlen((const char*)nvs_SysInfo.scen_array[6].Label) ) + if( strlen((const char*)nvs_SysInfo.scen_array[7].Label) ) { lv_label_set_text_fmt(ui->scene_s8_label, "%s",nvs_SysInfo.scen_array[7].Label); } 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..17a8a728 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.img b/d12x_t3e-pro_gang4_v1.0.6.img new file mode 100644 index 00000000..dbcaadcc Binary files /dev/null and b/d12x_t3e-pro_gang4_v1.0.6.img differ diff --git a/docs/gt911_q1.png b/docs/gt911_q1.png new file mode 100644 index 00000000..c10aab76 Binary files /dev/null and b/docs/gt911_q1.png differ diff --git a/docs/relay_power_q1.png b/docs/relay_power_q1.png new file mode 100644 index 00000000..7ee2f336 Binary files /dev/null and b/docs/relay_power_q1.png differ diff --git a/docs/relay_power_q2.png b/docs/relay_power_q2.png new file mode 100644 index 00000000..5820cb51 Binary files /dev/null and b/docs/relay_power_q2.png differ diff --git a/docs/relay_power_q3.png b/docs/relay_power_q3.png new file mode 100644 index 00000000..d9d3dfd1 Binary files /dev/null and b/docs/relay_power_q3.png differ diff --git a/docs/scene_q0.jpg b/docs/scene_q0.jpg new file mode 100644 index 00000000..309b0bc9 Binary files /dev/null and b/docs/scene_q0.jpg differ diff --git a/docs/scene_q1.png b/docs/scene_q1.png new file mode 100644 index 00000000..ae45fdb5 Binary files /dev/null and b/docs/scene_q1.png differ diff --git a/docs/scene_q2.png b/docs/scene_q2.png new file mode 100644 index 00000000..02895944 Binary files /dev/null and b/docs/scene_q2.png differ diff --git a/gt911固件更新20251009.zip b/gt911固件更新20251009.zip new file mode 100644 index 00000000..c98f4538 Binary files /dev/null and b/gt911固件更新20251009.zip 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 97eb556b..f78ef8c6 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 2a68f3b1..db25f83a 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=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 diff --git a/target/d12x/t3e-pro/pack/bootloader.bin b/target/d12x/t3e-pro/pack/bootloader.bin index ea69392f..ea757757 100644 Binary files a/target/d12x/t3e-pro/pack/bootloader.bin and b/target/d12x/t3e-pro/pack/bootloader.bin differ diff --git a/tools/env/tools/ConEmu/ConEmu.xml b/tools/env/tools/ConEmu/ConEmu.xml index 93ea3464..7b727f6f 100644 --- a/tools/env/tools/ConEmu/ConEmu.xml +++ b/tools/env/tools/ConEmu/ConEmu.xml @@ -1,7 +1,7 @@ - + @@ -259,9 +259,9 @@ - - - + + +