修复首屏场景8及上电记忆
@@ -1,5 +1,14 @@
|
||||
# v1.0.6
|
||||
* 1.修改gt911驱动测试触摸乱触发现象
|
||||
* <img src="docs/gt911_q1.png">
|
||||
* 2.修复首屏场景8无法更新名字的问题
|
||||
* <img src="docs/scene_q0.jpg">
|
||||
* <img src="docs/scene_q1.png">
|
||||
* <img src="docs/scene_q2.png">
|
||||
* 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);)
|
||||
* <img src="docs/relay_power_q1.png">
|
||||
* <img src="docs/relay_power_q2.png">
|
||||
* <img src="docs/relay_power_q3.png">
|
||||
|
||||
# v1.0.5
|
||||
* 1.场景界面添加弹窗警告用于提醒时间对的的可以手动更新
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
BIN
d12x_t3e-pro_gang3_v1.0.6.img
Normal file
BIN
d12x_t3e-pro_gang4_v1.0.6.img
Normal file
BIN
docs/gt911_q1.png
Normal file
|
After Width: | Height: | Size: 101 KiB |
BIN
docs/relay_power_q1.png
Normal file
|
After Width: | Height: | Size: 98 KiB |
BIN
docs/relay_power_q2.png
Normal file
|
After Width: | Height: | Size: 114 KiB |
BIN
docs/relay_power_q3.png
Normal file
|
After Width: | Height: | Size: 90 KiB |
BIN
docs/scene_q0.jpg
Normal file
|
After Width: | Height: | Size: 309 KiB |
BIN
docs/scene_q1.png
Normal file
|
After Width: | Height: | Size: 73 KiB |
BIN
docs/scene_q2.png
Normal file
|
After Width: | Height: | Size: 91 KiB |
BIN
gt911固件更新20251009.zip
Normal file
@@ -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
|
||||
|
||||
8
tools/env/tools/ConEmu/ConEmu.xml
vendored
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<key name="Software">
|
||||
<key name="ConEmu">
|
||||
<key name=".Vanilla" modified="2025-10-09 18:24:20" build="180206">
|
||||
<key name=".Vanilla" modified="2025-10-10 14:01:54" build="180206">
|
||||
<value name="StartType" type="hex" data="02"/>
|
||||
<value name="CmdLine" type="string" data=""/>
|
||||
<value name="StartTasksFile" type="string" data=""/>
|
||||
@@ -259,9 +259,9 @@
|
||||
<value name="Cascaded" type="hex" data="01"/>
|
||||
<value name="IntegralSize" type="hex" data="00"/>
|
||||
<value name="WindowMode" type="dword" data="0000051f"/>
|
||||
<value name="ConWnd X" type="long" data="963"/>
|
||||
<value name="ConWnd Y" type="long" data="196"/>
|
||||
<value name="LastMonitor" type="string" data="0,0,3840,2060"/>
|
||||
<value name="ConWnd X" type="long" data="492"/>
|
||||
<value name="ConWnd Y" type="long" data="260"/>
|
||||
<value name="LastMonitor" type="string" data="0,0,1920,1040"/>
|
||||
<value name="ConWnd Width" type="dword" data="00000071"/>
|
||||
<value name="ConWnd Height" type="dword" data="00000027"/>
|
||||
<value name="16bit Height" type="ulong" data="0"/>
|
||||
|
||||