diff --git a/ReadMe.md b/ReadMe.md index 74f3af55..bafe6988 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,3 +1,6 @@ +# v1.0.6 +* 1.修改gt911驱动测试触摸乱触发现象 + # v1.0.5 * 1.场景界面添加弹窗警告用于提醒时间对的的可以手动更新 * 2.增加手动设置区域和时间 diff --git a/application/rt-thread/t3e-pro/components/FontEnum.h b/application/rt-thread/t3e-pro/components/FontEnum.h index 08f91aad..fd3c767b 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 105 +#define D_System_Ver 106 enum { diff --git a/application/rt-thread/t3e-pro/components/RTC_Clock/ESP32_Clock.c b/application/rt-thread/t3e-pro/components/RTC_Clock/ESP32_Clock.c index f35a2687..e019b7c1 100644 --- a/application/rt-thread/t3e-pro/components/RTC_Clock/ESP32_Clock.c +++ b/application/rt-thread/t3e-pro/components/RTC_Clock/ESP32_Clock.c @@ -302,7 +302,7 @@ void esp32Timeinit(void) } else { - LOG_I("esp32_thread create failure\n"); + LOG_I_LINE("esp32_thread create failure\n"); } } /********************************************************************* @@ -323,7 +323,7 @@ void esp32TimeTask(void *pvParameters) { ZIGEvent evt; - LOG_I("esp32TimeTask running start"); + LOG_I_LINE("esp32TimeTask running start"); while(1) { diff --git a/application/rt-thread/t3e-pro/components/custom/custom.c b/application/rt-thread/t3e-pro/components/custom/custom.c index 8d64e711..4e810f43 100644 --- a/application/rt-thread/t3e-pro/components/custom/custom.c +++ b/application/rt-thread/t3e-pro/components/custom/custom.c @@ -184,7 +184,7 @@ void custom_init(lv_ui *ui) } else { - LOG_I("custom_thread create failure\n"); + LOG_I_LINE("custom_thread create failure\n"); } //初始化继电器IO口 @@ -755,7 +755,7 @@ void custom_Task(void *pvParameter) { if(evt.buffStr)//接收到的是指针 用完释放内存 { - LOG_I("free receData.buffStr:%x",(uint32_t)evt.buffStr); + LOG_I_LINE("free receData.buffStr:%x",(uint32_t)evt.buffStr); free(evt.buffStr); evt.buffStr=NULL; } @@ -770,7 +770,7 @@ void custom_Task(void *pvParameter) { case ZIG_STATE_SUBDEVICE_UPDATE://更新设备界面的子对象 { - LOG_I("relay update sub device"); + LOG_I_LINE("relay update sub device"); //检查每一个checkbox的状态 //lv_obj_t *addsubdevicepage_gangcb//0 固定为选中 不需判断 @@ -875,66 +875,66 @@ void custom_Task(void *pvParameter) { if((i==0)&&nvs_SysInfo.subdevice_array[i])//场景开关1路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang1(&guider_ui,guider_ui.device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,170); y=y+170+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } if((i==1)&&nvs_SysInfo.subdevice_array[i])//场景开关2路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang2(&guider_ui,guider_ui.device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,170); y=y+170+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } if((i==2)&&nvs_SysInfo.subdevice_array[i])//场景开关3路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang3(&guider_ui,guider_ui.device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,170); y=y+170+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } if((i==3)&&nvs_SysInfo.subdevice_array[i])//场景开关4路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang4(&guider_ui,guider_ui.device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,170); y=y+170+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } if((i==4)&&nvs_SysInfo.subdevice_array[i])//场景开关6路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang6(&guider_ui,guider_ui.device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,250); y=y+250+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } else if((i==5)&&nvs_SysInfo.subdevice_array[i])//空调 { - LOG_I("create air before x=%d",y); + LOG_I_LINE("create air before x=%d",y); create_device_air(&guider_ui,guider_ui.device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,100); y=y+100+2;//2个空格的间隙 - LOG_I("create air after x=%d",y); + LOG_I_LINE("create air after x=%d",y); } else if((i==6)&&nvs_SysInfo.subdevice_array[i])//窗帘1 { - LOG_I("create projector before x=%d",y); + LOG_I_LINE("create projector before x=%d",y); create_device_projector(&guider_ui,guider_ui.device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,100); y=y+100+2;//2个空格的间隙 - LOG_I("create projector after x=%d",y); + LOG_I_LINE("create projector after x=%d",y); } } } @@ -943,7 +943,7 @@ void custom_Task(void *pvParameter) // case ZIG_STATE_Switch_langue://语言切换 // { - // LOG_I("Switch language"); + // LOG_I_LINE("Switch language"); // //删除language页 // if(guider_ui.langinfopage) // { @@ -964,19 +964,19 @@ void custom_Task(void *pvParameter) case ZIG_STATE_Switch_clock://开关的时钟切换 { - LOG_I("Switch clock+Switch and Switch"); + LOG_I_LINE("Switch clock+Switch and Switch"); //重新加载switch界面 #if defined(CONFIG_USER_RELAY_1) if(guider_ui.onoff1) { - LOG_I("del guider_ui.onoff1"); + LOG_I_LINE("del guider_ui.onoff1"); events_init_onoff1_remove(&guider_ui); lv_obj_del(guider_ui.onoff1); guider_ui.onoff1=NULL; } if(guider_ui.onofftime1) { - LOG_I("del guider_ui.onofftime1"); + LOG_I_LINE("del guider_ui.onofftime1"); events_init_onofftime1_remove(&guider_ui); lv_obj_del(guider_ui.onofftime1); guider_ui.onofftime1=NULL; @@ -984,25 +984,25 @@ void custom_Task(void *pvParameter) if(GET_nvs_Sys_Info_first()==FIRST_CLOCK) {//时钟+开关模式 - LOG_I("reload setup_scr_onofftime1"); + LOG_I_LINE("reload setup_scr_onofftime1"); setup_scr_onofftime1(&guider_ui); } else //if(GET_nvs_Sys_Info_first()==FIRST_SWITCH) {//开关模式 - LOG_I("reload setup_scr_onoff1"); + LOG_I_LINE("reload setup_scr_onoff1"); setup_scr_onoff1(&guider_ui); } #elif defined(CONFIG_USER_RELAY_2) if(guider_ui.onoff2) { - LOG_I("del guider_ui.onoff2"); + LOG_I_LINE("del guider_ui.onoff2"); events_init_onoff2_remove(&guider_ui); lv_obj_del(guider_ui.onoff2); guider_ui.onoff2=NULL; } if(guider_ui.onofftime2) { - LOG_I("del guider_ui.onofftime2"); + LOG_I_LINE("del guider_ui.onofftime2"); events_init_onofftime2_remove(&guider_ui); lv_obj_del(guider_ui.onofftime2); guider_ui.onofftime2=NULL; @@ -1010,25 +1010,25 @@ void custom_Task(void *pvParameter) if(GET_nvs_Sys_Info_first()==FIRST_CLOCK) {//时钟+开关模式 - LOG_I("reload setup_scr_onofftime2"); + LOG_I_LINE("reload setup_scr_onofftime2"); setup_scr_onofftime2(&guider_ui); } else //if(GET_nvs_Sys_Info_first()==FIRST_SWITCH) {//开关模式 - LOG_I("reload setup_scr_onoff2"); + LOG_I_LINE("reload setup_scr_onoff2"); setup_scr_onoff2(&guider_ui); } #elif defined(CONFIG_USER_RELAY_3) if(guider_ui.onoff3) { - LOG_I("del guider_ui.onoff4"); + LOG_I_LINE("del guider_ui.onoff4"); events_init_onoff3_remove(&guider_ui); lv_obj_del(guider_ui.onoff3); guider_ui.onoff3=NULL; } if(guider_ui.onofftime3) { - LOG_I("del guider_ui.onofftime3"); + LOG_I_LINE("del guider_ui.onofftime3"); events_init_onofftime3_remove(&guider_ui); lv_obj_del(guider_ui.onofftime3); guider_ui.onofftime3=NULL; @@ -1036,12 +1036,12 @@ void custom_Task(void *pvParameter) if(GET_nvs_Sys_Info_first()==FIRST_CLOCK) {//时钟+开关模式 - LOG_I("reload setup_scr_onofftime3"); + LOG_I_LINE("reload setup_scr_onofftime3"); setup_scr_onofftime3(&guider_ui); } else //if(GET_nvs_Sys_Info_first()==FIRST_SWITCH) {//开关模式 - LOG_I("reload setup_scr_onoff3"); + LOG_I_LINE("reload setup_scr_onoff3"); setup_scr_onoff3(&guider_ui); } #elif defined(CONFIG_USER_RELAY_4) @@ -1050,14 +1050,14 @@ void custom_Task(void *pvParameter) //lv_obj_del if(guider_ui.onoff4) { - LOG_I("del guider_ui.onoff4"); + LOG_I_LINE("del guider_ui.onoff4"); events_init_onoff4_remove(&guider_ui); lv_obj_del(guider_ui.onoff4); guider_ui.onoff4=NULL; } if(guider_ui.onofftime4) { - LOG_I("del guider_ui.onofftime4"); + LOG_I_LINE("del guider_ui.onofftime4"); events_init_onofftime4_remove(&guider_ui); lv_obj_del(guider_ui.onofftime4); guider_ui.onofftime4=NULL; @@ -1065,12 +1065,12 @@ void custom_Task(void *pvParameter) if(GET_nvs_Sys_Info_first()==FIRST_CLOCK) {//时钟+开关模式 - LOG_I("reload setup_scr_onofftime4"); + LOG_I_LINE("reload setup_scr_onofftime4"); setup_scr_onofftime4(&guider_ui); } else //if(GET_nvs_Sys_Info_first()==FIRST_SWITCH) {//开关模式 - LOG_I("reload setup_scr_onoff4"); + LOG_I_LINE("reload setup_scr_onoff4"); setup_scr_onoff4(&guider_ui); } #endif @@ -1096,18 +1096,18 @@ void custom_Task(void *pvParameter) // // int tm_isdst; //夏令时标志(大于0说明夏令时有效，等于0说明无效，小于0说明信息不可用) // // // //}; - LOG_I("now=%d",now); - LOG_I("zone:%d",tz_get()); - LOG_I("time==%d:%d:%d:%d:%02d:%02d:%02d:%02d:%02d", - timeinfo.tm_isdst, //是否为夏时制 - timeinfo.tm_yday, //一年过去的天数 - timeinfo.tm_wday, //星期，1对应星期一 - timeinfo.tm_year+1900, //年，距离1900年的差值，默认是70 - timeinfo.tm_mon+1, //日期：月，从0开始 0~11 - timeinfo.tm_mday, //日期：日，从1开始 - timeinfo.tm_hour, //小时 - timeinfo.tm_min, //分钟 - timeinfo.tm_sec); //秒钟 + // LOG_I_LINE("now=%d",now); + // LOG_I_LINE("zone:%d",tz_get()); + // LOG_I_LINE("time==%d:%d:%d:%d:%02d:%02d:%02d:%02d:%02d", + // timeinfo.tm_isdst, //是否为夏时制 + // timeinfo.tm_yday, //一年过去的天数 + // timeinfo.tm_wday, //星期，1对应星期一 + // timeinfo.tm_year+1900, //年，距离1900年的差值，默认是70 + // timeinfo.tm_mon+1, //日期：月，从0开始 0~11 + // timeinfo.tm_mday, //日期：日，从1开始 + // timeinfo.tm_hour, //小时 + // timeinfo.tm_min, //分钟 + // timeinfo.tm_sec); //秒钟 if((timeinfo.tm_min==59)&&(timeinfo.tm_sec==59))//每小时更新一次 { ZIGEvent evtstate; @@ -1302,7 +1302,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_CONFIG_NOT_JION://未入网 { - LOG_I("NOT_JION"); + LOG_I_LINE("NOT_JION"); if(guider_ui.smartinfopage) { @@ -1315,7 +1315,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_CONFIG_JOINING://入网中 {//改定时器周期为500ms - LOG_I("JOINING"); + LOG_I_LINE("JOINING"); guider_ui.screensaverflag=1; if(guider_ui.smartinfopage) @@ -1334,7 +1334,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_CONFIG_GATEWAY://已入网 {//改定时器周期为100ms - LOG_I("JOIN_GATEWAY"); + LOG_I_LINE("JOIN_GATEWAY"); if(guider_ui.smartinfopage) { @@ -1424,13 +1424,13 @@ void custom_Task(void *pvParameter) } else if(evt.event==ZIG_STATE_CONFIG_ERROR) { - LOG_I("JOIN_ERROR"); + LOG_I_LINE("JOIN_ERROR"); mbox1 = lv_msgbox_create(NULL, NULL, Menu_List[GET_nvs_Sys_Info_language()][MENU_LIST_smartconfigerror], btns_chs[GET_nvs_Sys_Info_language()], false); } else //if(evt.event==ZIG_STATE_CONFIG_TIMEOUT) { - LOG_I("JOIN_TIMEROUT"); + LOG_I_LINE("JOIN_TIMEROUT"); mbox1 = lv_msgbox_create(NULL, NULL, Menu_List[GET_nvs_Sys_Info_language()][MENU_LIST_smartconfigtimeout], btns_chs[GET_nvs_Sys_Info_language()], false); } @@ -1457,7 +1457,7 @@ void custom_Task(void *pvParameter) //-------------------------------更新显示的icon和文字 case ZIG_STATE_Update_icon_name: { - LOG_I("custom:dpid:%d",evt.length); + LOG_I_LINE("custom:dpid:%d",evt.length); //区分是设置哪个的 if((evt.length>=24)&&(evt.length<=27))//设置开关的(1~4路) {//app从0开始 t3e-pro从1开始 @@ -2163,14 +2163,14 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[0]) { - LOG_I("updata dimmerinfo name"); + LOG_I_LINE("updata dimmerinfo name"); if(strlen(nvs_SysInfo.downlights[0].Label)) { @@ -2179,7 +2179,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("dimmerinfo is not equal downlights[0]"); + LOG_I_LINE("dimmerinfo is not equal downlights[0]"); } } else if(evt.length==122) @@ -2195,14 +2195,14 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[1]) { - LOG_I("updata dimmerinfo name"); + LOG_I_LINE("updata dimmerinfo name"); if(strlen(nvs_SysInfo.downlights[1].Label)) { @@ -2211,7 +2211,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("dimmerinfo is not equal downlights[1]"); + LOG_I_LINE("dimmerinfo is not equal downlights[1]"); } } else if(evt.length==123) @@ -2227,14 +2227,14 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[2]) { - LOG_I("updata dimmerinfo name"); + LOG_I_LINE("updata dimmerinfo name"); if(strlen(nvs_SysInfo.downlights[2].Label)) { @@ -2243,7 +2243,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("dimmerinfo is not equal downlights[2]"); + LOG_I_LINE("dimmerinfo is not equal downlights[2]"); } } else if(evt.length==124) @@ -2259,14 +2259,14 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[3]) { - LOG_I("updata dimmerinfo name"); + LOG_I_LINE("updata dimmerinfo name"); if(strlen(nvs_SysInfo.downlights[3].Label)) { @@ -2275,7 +2275,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("dimmerinfo is not equal downlights[3]"); + LOG_I_LINE("dimmerinfo is not equal downlights[3]"); } } } @@ -2294,14 +2294,14 @@ void custom_Task(void *pvParameter) if(!guider_ui.curtaininfo)//是否存在 { - LOG_I("curtaininfo is not"); + LOG_I_LINE("curtaininfo is not"); break; } //是否匹配 Curatin_Info *curtain=(Curatin_Info *)guider_ui.curtaininfo->user_data; if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[0]) { - LOG_I("updata curtaininfo name"); + LOG_I_LINE("updata curtaininfo name"); if(strlen(nvs_SysInfo.curtains[0].Label)) { @@ -2310,7 +2310,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("curtaininfo is not equal curtains[0]"); + LOG_I_LINE("curtaininfo is not equal curtains[0]"); } } else if(evt.length==134) @@ -2326,14 +2326,14 @@ void custom_Task(void *pvParameter) if(!guider_ui.curtaininfo)//是否存在 { - LOG_I("curtaininfo is not"); + LOG_I_LINE("curtaininfo is not"); break; } //是否匹配 Curatin_Info *curtain=(Curatin_Info *)guider_ui.curtaininfo->user_data; if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[1]) { - LOG_I("updata curtaininfo name"); + LOG_I_LINE("updata curtaininfo name"); if(strlen(nvs_SysInfo.curtains[1].Label)) { @@ -2342,7 +2342,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("curtaininfo is not equal curtains[1]"); + LOG_I_LINE("curtaininfo is not equal curtains[1]"); } } else if(evt.length==135) @@ -2358,14 +2358,14 @@ void custom_Task(void *pvParameter) if(!guider_ui.curtaininfo)//是否存在 { - LOG_I("curtaininfo is not"); + LOG_I_LINE("curtaininfo is not"); break; } //是否匹配 Curatin_Info *curtain=(Curatin_Info *)guider_ui.curtaininfo->user_data; if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[2]) { - LOG_I("updata curtaininfo name"); + LOG_I_LINE("updata curtaininfo name"); if(strlen(nvs_SysInfo.curtains[2].Label)) { @@ -2374,7 +2374,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("curtaininfo is not equal curtains[2]"); + LOG_I_LINE("curtaininfo is not equal curtains[2]"); } } else if(evt.length==136) @@ -2390,14 +2390,14 @@ void custom_Task(void *pvParameter) if(!guider_ui.rollersinfo)//是否存在 { - LOG_I("rollersinfo is not"); + LOG_I_LINE("rollersinfo is not"); break; } //是否匹配 Curatin_Info *curtain=(Curatin_Info *)guider_ui.curtaininfo->user_data; if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[3]) { - LOG_I("updata rollersinfo name"); + LOG_I_LINE("updata rollersinfo name"); if(strlen(nvs_SysInfo.curtains[3].Label)) { @@ -2406,7 +2406,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("rollersinfo is not equal curtains[3]"); + LOG_I_LINE("rollersinfo is not equal curtains[3]"); } } } @@ -2416,7 +2416,7 @@ void custom_Task(void *pvParameter) #if defined(CONFIG_USER_RELAY_1)||defined(CONFIG_USER_RELAY_2)||defined(CONFIG_USER_RELAY_3)||defined(CONFIG_USER_RELAY_4) case ZIG_STATE_1on: { - LOG_I("1 on"); + LOG_I_LINE("1 on"); SET_nvs_Sys_Info_relay1(1); gpio_set_level(CONFIG_RELAY_1_OUT_PIN,1); nvs_eepom_sysInfo_update();//状态保存到本地，实现再次上电是否记忆的功能 @@ -2469,7 +2469,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_1off: { - LOG_I("1 off"); + LOG_I_LINE("1 off"); SET_nvs_Sys_Info_relay1(0); gpio_set_level(CONFIG_RELAY_1_OUT_PIN,0); nvs_eepom_sysInfo_update();//状态保存到本地，实现再次上电是否记忆的功能 @@ -2524,7 +2524,7 @@ void custom_Task(void *pvParameter) #if defined(CONFIG_USER_RELAY_2)||defined(CONFIG_USER_RELAY_3)||defined(CONFIG_USER_RELAY_4) case ZIG_STATE_2on: { - LOG_I("2 on"); + LOG_I_LINE("2 on"); SET_nvs_Sys_Info_relay2(1); gpio_set_level(CONFIG_RELAY_2_OUT_PIN,1); nvs_eepom_sysInfo_update();//状态保存到本地，实现再次上电是否记忆的功能 @@ -2567,7 +2567,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_2off: { - LOG_I("2 off"); + LOG_I_LINE("2 off"); SET_nvs_Sys_Info_relay2(0); gpio_set_level(CONFIG_RELAY_2_OUT_PIN,0); nvs_eepom_sysInfo_update();//状态保存到本地，实现再次上电是否记忆的功能 @@ -2607,7 +2607,7 @@ void custom_Task(void *pvParameter) #if defined(CONFIG_USER_RELAY_3)||defined(CONFIG_USER_RELAY_4) case ZIG_STATE_3on: { - LOG_I("3 on"); + LOG_I_LINE("3 on"); SET_nvs_Sys_Info_relay3(1); gpio_set_level(CONFIG_RELAY_3_OUT_PIN,1); nvs_eepom_sysInfo_update();//状态保存到本地，实现再次上电是否记忆的功能 @@ -2640,7 +2640,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_3off: { - LOG_I("3 off"); + LOG_I_LINE("3 off"); SET_nvs_Sys_Info_relay3(0); gpio_set_level(CONFIG_RELAY_3_OUT_PIN,0); nvs_eepom_sysInfo_update();//状态保存到本地，实现再次上电是否记忆的功能 @@ -2676,7 +2676,7 @@ void custom_Task(void *pvParameter) #if defined(CONFIG_USER_RELAY_4) case ZIG_STATE_4on: { - LOG_I("4 on"); + LOG_I_LINE("4 on"); SET_nvs_Sys_Info_relay4(1); gpio_set_level(CONFIG_RELAY_4_OUT_PIN,1); nvs_eepom_sysInfo_update();//状态保存到本地，实现再次上电是否记忆的功能 @@ -2697,7 +2697,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_4off: { - LOG_I("4 off"); + LOG_I_LINE("4 off"); SET_nvs_Sys_Info_relay4(0); gpio_set_level(CONFIG_RELAY_4_OUT_PIN,0); nvs_eepom_sysInfo_update();//状态保存到本地，实现再次上电是否记忆的功能 @@ -2721,7 +2721,7 @@ void custom_Task(void *pvParameter) //灯群1 case ZIG_STATE_light1_switch_led://开关 { - LOG_I("light1_switch:%d",evt.length); + LOG_I_LINE("light1_switch:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[0].status=evt.length; nvs_eepom_sysInfo_update(); @@ -2743,14 +2743,14 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[0]) { - LOG_I("dimmerinfo is equal downlights[0]"); + LOG_I_LINE("dimmerinfo is equal downlights[0]"); //改变按钮的状态 if(evt.length) @@ -2770,13 +2770,13 @@ void custom_Task(void *pvParameter) } else { - LOG_I("dimmerinfo is not equal downlights[0]"); + LOG_I_LINE("dimmerinfo is not equal downlights[0]"); } } break; case ZIG_STATE_light1_temp: //色温 { - LOG_I("light1_temp:%d",evt.length); + LOG_I_LINE("light1_temp:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[0].colortemperature=evt.length; nvs_eepom_sysInfo_update(); @@ -2786,27 +2786,27 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[0]) { - LOG_I("dimmerinfo is equal downlights[0]"); + LOG_I_LINE("dimmerinfo is equal downlights[0]"); lv_slider_set_value(guider_ui.dimmerinfo_tempslider, evt.length, LV_ANIM_OFF); lv_label_set_text_fmt(guider_ui.dimmerinfo_temppercentlabel,"%d%%",evt.length); } else { - LOG_I("dimmerinfo is not equal downlights[0]"); + LOG_I_LINE("dimmerinfo is not equal downlights[0]"); } } break; case ZIG_STATE_light1_bright: //亮度 { - LOG_I("light1_cold:%d",evt.length); + LOG_I_LINE("light1_cold:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[0].brightness=evt.length; nvs_eepom_sysInfo_update(); @@ -2816,28 +2816,28 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[0]) { - LOG_I("dimmerinfo is equal downlights[0]"); + LOG_I_LINE("dimmerinfo is equal downlights[0]"); lv_slider_set_value(guider_ui.dimmerinfo_coldslider, evt.length, LV_ANIM_OFF); lv_label_set_text_fmt(guider_ui.dimmerinfo_coldpercentlabel,"%d%%",evt.length); } else { - LOG_I("dimmerinfo is not equal downlights[0]"); + LOG_I_LINE("dimmerinfo is not equal downlights[0]"); } } break; //灯群2 case ZIG_STATE_light2_switch_led://开关 { - LOG_I("light2_switch:%d",evt.length); + LOG_I_LINE("light2_switch:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[1].status=evt.length; nvs_eepom_sysInfo_update(); @@ -2858,14 +2858,14 @@ void custom_Task(void *pvParameter) } if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[1]) { - LOG_I("dimmerinfo is equal downlights[1]"); + LOG_I_LINE("dimmerinfo is equal downlights[1]"); //改变按钮的状态 if(evt.length) @@ -2885,13 +2885,13 @@ void custom_Task(void *pvParameter) } else { - LOG_I("dimmerinfo is not equal downlights[1]"); + LOG_I_LINE("dimmerinfo is not equal downlights[1]"); } } break; case ZIG_STATE_light2_temp: //色温 { - LOG_I("light2_temp:%d",evt.length); + LOG_I_LINE("light2_temp:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[1].colortemperature=evt.length; nvs_eepom_sysInfo_update(); @@ -2900,27 +2900,27 @@ void custom_Task(void *pvParameter) lv_label_set_text_fmt(guider_ui.dimmer_group2_tempagelabel,"%d%%",evt.length); if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[1]) { - LOG_I("dimmerinfo is equal downlights[1]"); + LOG_I_LINE("dimmerinfo is equal downlights[1]"); lv_slider_set_value(guider_ui.dimmerinfo_tempslider, evt.length, LV_ANIM_OFF); lv_label_set_text_fmt(guider_ui.dimmerinfo_temppercentlabel,"%d%%",evt.length); } else { - LOG_I("dimmerinfo is not equal downlights[1]"); + LOG_I_LINE("dimmerinfo is not equal downlights[1]"); } } break; case ZIG_STATE_light2_bright: //亮度 { - LOG_I("light2_cold:%d",evt.length); + LOG_I_LINE("light2_cold:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[1].brightness=evt.length; nvs_eepom_sysInfo_update(); @@ -2930,28 +2930,28 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[1]) { - LOG_I("dimmerinfo is equal downlights[1]"); + LOG_I_LINE("dimmerinfo is equal downlights[1]"); lv_slider_set_value(guider_ui.dimmerinfo_coldslider, evt.length, LV_ANIM_OFF); lv_label_set_text_fmt(guider_ui.dimmerinfo_coldpercentlabel,"%d%%",evt.length); } else { - LOG_I("dimmerinfo is not equal downlights[1]"); + LOG_I_LINE("dimmerinfo is not equal downlights[1]"); } } break; //灯群3 case ZIG_STATE_light3_switch_led://开关 { - LOG_I("light3_switch:%d",evt.length); + LOG_I_LINE("light3_switch:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[2].status=evt.length; nvs_eepom_sysInfo_update(); @@ -2972,14 +2972,14 @@ void custom_Task(void *pvParameter) } if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[2]) { - LOG_I("dimmerinfo is equal downlights[2]"); + LOG_I_LINE("dimmerinfo is equal downlights[2]"); //改变按钮的状态 if(evt.length) @@ -2999,13 +2999,13 @@ void custom_Task(void *pvParameter) } else { - LOG_I("dimmerinfo is not equal downlights[2]"); + LOG_I_LINE("dimmerinfo is not equal downlights[2]"); } } break; case ZIG_STATE_light3_temp: //色温 { - LOG_I("light3_temp:%d",evt.length); + LOG_I_LINE("light3_temp:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[2].colortemperature=evt.length; nvs_eepom_sysInfo_update(); @@ -3014,27 +3014,27 @@ void custom_Task(void *pvParameter) lv_label_set_text_fmt(guider_ui.dimmer_group3_tempagelabel,"%d%%",evt.length); if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[2]) { - LOG_I("dimmerinfo is equal downlights[2]"); + LOG_I_LINE("dimmerinfo is equal downlights[2]"); lv_slider_set_value(guider_ui.dimmerinfo_tempslider, evt.length, LV_ANIM_OFF); lv_label_set_text_fmt(guider_ui.dimmerinfo_temppercentlabel,"%d%%",evt.length); } else { - LOG_I("dimmerinfo is not equal downlights[2]"); + LOG_I_LINE("dimmerinfo is not equal downlights[2]"); } } break; case ZIG_STATE_light3_bright: //亮度 { - LOG_I("light3_cold:%d",evt.length); + LOG_I_LINE("light3_cold:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[2].brightness=evt.length; nvs_eepom_sysInfo_update(); @@ -3043,28 +3043,28 @@ void custom_Task(void *pvParameter) lv_label_set_text_fmt(guider_ui.dimmer_group3_coldagelabel,"%d%%",evt.length); if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[2]) { - LOG_I("dimmerinfo is equal downlights[2]"); + LOG_I_LINE("dimmerinfo is equal downlights[2]"); lv_slider_set_value(guider_ui.dimmerinfo_coldslider, evt.length, LV_ANIM_OFF); lv_label_set_text_fmt(guider_ui.dimmerinfo_coldpercentlabel,"%d%%",evt.length); } else { - LOG_I("dimmerinfo is not equal downlights[2]"); + LOG_I_LINE("dimmerinfo is not equal downlights[2]"); } } break; //灯群4 case ZIG_STATE_light4_switch_led://开关 { - LOG_I("light4_switch:%d",evt.length); + LOG_I_LINE("light4_switch:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[3].status=evt.length; nvs_eepom_sysInfo_update(); @@ -3085,14 +3085,14 @@ void custom_Task(void *pvParameter) } if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[3]) { - LOG_I("dimmerinfo is equal downlights[3]"); + LOG_I_LINE("dimmerinfo is equal downlights[3]"); //改变按钮的状态 if(evt.length) @@ -3112,13 +3112,13 @@ void custom_Task(void *pvParameter) } else { - LOG_I("dimmerinfo is not equal downlights[3]"); + LOG_I_LINE("dimmerinfo is not equal downlights[3]"); } } break; case ZIG_STATE_light4_temp: //色温 { - LOG_I("light4_temp:%d",evt.length); + LOG_I_LINE("light4_temp:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[3].colortemperature=evt.length; nvs_eepom_sysInfo_update(); @@ -3128,27 +3128,27 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[3]) { - LOG_I("dimmerinfo is equal downlights[3]"); + LOG_I_LINE("dimmerinfo is equal downlights[3]"); lv_slider_set_value(guider_ui.dimmerinfo_tempslider, evt.length, LV_ANIM_OFF); lv_label_set_text_fmt(guider_ui.dimmerinfo_temppercentlabel,"%d%%",evt.length); } else { - LOG_I("dimmerinfo is not equal downlights[3]"); + LOG_I_LINE("dimmerinfo is not equal downlights[3]"); } } break; case ZIG_STATE_light4_bright: //亮度 { - LOG_I("light4_cold:%d",evt.length); + LOG_I_LINE("light4_cold:%d",evt.length); //更新 保存 nvs_SysInfo.downlights[3].brightness=evt.length; nvs_eepom_sysInfo_update(); @@ -3158,21 +3158,21 @@ void custom_Task(void *pvParameter) if(!guider_ui.dimmerinfo)//是否存在 { - LOG_I("dimmerinfo is not"); + LOG_I_LINE("dimmerinfo is not"); break; } //是否匹配 Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[3]) { - LOG_I("dimmerinfo is equal downlights[3]"); + LOG_I_LINE("dimmerinfo is equal downlights[3]"); lv_slider_set_value(guider_ui.dimmerinfo_coldslider, evt.length, LV_ANIM_OFF); lv_label_set_text_fmt(guider_ui.dimmerinfo_coldpercentlabel,"%d%%",evt.length); } else { - LOG_I("dimmerinfo is not equal downlights[3]"); + LOG_I_LINE("dimmerinfo is not equal downlights[3]"); } } break; @@ -3180,7 +3180,7 @@ void custom_Task(void *pvParameter) //窗帘1 case ZIG_STATE_Curtain1_status://状态 开/关/停 { //枚举值: open, stop, close 对应于: 0, 1, 2 - LOG_I("curtain1_status:%d",evt.length); + LOG_I_LINE("curtain1_status:%d",evt.length); nvs_SysInfo.curtains[0].status=evt.length; //改变按钮的状态 @@ -3204,7 +3204,7 @@ void custom_Task(void *pvParameter) if(animationtimer) { - LOG_I("curtain1 del old animationtimer\r\n"); + LOG_I_LINE("curtain1 del old animationtimer\r\n"); lv_timer_del(animationtimer); animationtimer=NULL; animcurtainposP=NULL; @@ -3212,15 +3212,15 @@ void custom_Task(void *pvParameter) if(!guider_ui.curtaininfo)//是否存在 { - LOG_I("curtaininfo is not"); + LOG_I_LINE("curtaininfo is not"); break; } //是否匹配 Curatin_Info *curtain=(Curatin_Info *)guider_ui.curtaininfo->user_data; if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[0]) { - LOG_I("curtaininfo is equal curtains[0]"); - LOG_I("curtain->pos=%d",curtain->pos); + LOG_I_LINE("curtaininfo is equal curtains[0]"); + LOG_I_LINE("curtain->pos=%d",curtain->pos); //非动画方式 if(curtain->status==1)//停 { @@ -3306,13 +3306,13 @@ void custom_Task(void *pvParameter) } else { - LOG_I("curtaininfo is not equal curtains[0]"); + LOG_I_LINE("curtaininfo is not equal curtains[0]"); } } break; case ZIG_STATE_Curtain1_value: //百分比 { - LOG_I("curtain1_status:%d",evt.length); + LOG_I_LINE("curtain1_status:%d",evt.length); // //更新 保存 // nvs_SysInfo.curtains[0].percentage=evt.length; // nvs_eepom_sysInfo_update(); @@ -3321,7 +3321,7 @@ void custom_Task(void *pvParameter) //窗帘2 case ZIG_STATE_Curtain2_status://状态 开/关/停 { - LOG_I("curtain2_status:%d",evt.length); + LOG_I_LINE("curtain2_status:%d",evt.length); //更新 保存 nvs_SysInfo.curtains[1].status=evt.length; @@ -3345,7 +3345,7 @@ void custom_Task(void *pvParameter) if(animationtimer) { - LOG_I("curtain2 del old animationtimer\r\n"); + LOG_I_LINE("curtain2 del old animationtimer\r\n"); lv_timer_del(animationtimer); animationtimer=NULL; animcurtainposP=NULL; @@ -3353,15 +3353,15 @@ void custom_Task(void *pvParameter) if(!guider_ui.curtaininfo)//是否存在 { - LOG_I("curtaininfo is not"); + LOG_I_LINE("curtaininfo is not"); break; } //是否匹配 Curatin_Info *curtain=(Curatin_Info *)guider_ui.curtaininfo->user_data; if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[1]) { - LOG_I("curtaininfo is equal curtains[1]"); - LOG_I("curtain->pos=%d",curtain->pos); + LOG_I_LINE("curtaininfo is equal curtains[1]"); + LOG_I_LINE("curtain->pos=%d",curtain->pos); //非动画方式 if(curtain->status==1)//停 { @@ -3447,7 +3447,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("curtaininfo is not equal curtains[1]"); + LOG_I_LINE("curtaininfo is not equal curtains[1]"); } } break; @@ -3458,7 +3458,7 @@ void custom_Task(void *pvParameter) //窗帘3 case ZIG_STATE_Curtain3_status://状态 开/关/停 { - LOG_I("curtain3_status:%d",evt.length); + LOG_I_LINE("curtain3_status:%d",evt.length); //更新 保存 nvs_SysInfo.curtains[2].status=evt.length; @@ -3482,7 +3482,7 @@ void custom_Task(void *pvParameter) if(animationtimer) { - LOG_I("curtain3 del old animationtimer\r\n"); + LOG_I_LINE("curtain3 del old animationtimer\r\n"); lv_timer_del(animationtimer); animationtimer=NULL; animcurtainposP=NULL; @@ -3490,15 +3490,15 @@ void custom_Task(void *pvParameter) if(!guider_ui.curtaininfo)//是否存在 { - LOG_I("curtaininfo is not"); + LOG_I_LINE("curtaininfo is not"); break; } //是否匹配 Curatin_Info *curtain=(Curatin_Info *)guider_ui.curtaininfo->user_data; if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[2]) { - LOG_I("curtaininfo is equal curtains[2]"); - LOG_I("curtain->pos=%d",curtain->pos); + LOG_I_LINE("curtaininfo is equal curtains[2]"); + LOG_I_LINE("curtain->pos=%d",curtain->pos); //非动画方式 if(curtain->status==1)//停 { @@ -3583,7 +3583,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("curtaininfo is not equal curtains[2]"); + LOG_I_LINE("curtaininfo is not equal curtains[2]"); } } break; @@ -3594,7 +3594,7 @@ void custom_Task(void *pvParameter) //窗帘4//用于控制卷帘 case ZIG_STATE_Curtain4_status://状态 开/关/停 { - LOG_I("curtain4_status:%d",evt.length); + LOG_I_LINE("curtain4_status:%d",evt.length); //更新 保存 nvs_SysInfo.curtains[3].status=evt.length; @@ -3618,7 +3618,7 @@ void custom_Task(void *pvParameter) if(animationtimer) { - LOG_I("curtain4 del old animationtimer\r\n"); + LOG_I_LINE("curtain4 del old animationtimer\r\n"); lv_timer_del(animationtimer); animationtimer=NULL; animcurtainposP=NULL; @@ -3626,15 +3626,15 @@ void custom_Task(void *pvParameter) if(!guider_ui.rollersinfo)//是否存在 { - LOG_I("rollersinfo is not"); + LOG_I_LINE("rollersinfo is not"); break; } //是否匹配 Curatin_Info *curtain=(Curatin_Info *)guider_ui.rollersinfo->user_data; if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[3]) { - LOG_I("rollersinfo is equal curtains[3]"); - LOG_I("curtain->pos=%d",curtain->pos); + LOG_I_LINE("rollersinfo is equal curtains[3]"); + LOG_I_LINE("curtain->pos=%d",curtain->pos); //非动画方式 if(curtain->status==1)//停 { @@ -3716,7 +3716,7 @@ void custom_Task(void *pvParameter) } else { - LOG_I("rollersinfo is not equal curtains[3]"); + LOG_I_LINE("rollersinfo is not equal curtains[3]"); } } break; @@ -3727,7 +3727,7 @@ void custom_Task(void *pvParameter) //------------------------------gang1 case ZIG_STATE_GANG11on: { - LOG_I("gang switch 1 on"); + LOG_I_LINE("gang switch 1 on"); SET_nvs_Sys_Info_Gang1relay1(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -3986,7 +3986,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG11off: { - LOG_I("gang switch 1 off"); + LOG_I_LINE("gang switch 1 off"); SET_nvs_Sys_Info_Gang1relay1(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4034,7 +4034,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG1_ALLon: { - LOG_I("gang switch all on"); + LOG_I_LINE("gang switch all on"); SET_nvs_Sys_Info_Gang1relay1(1); //全开全关只对设备界面的更新 详情界面不更新(因为当前不显示) if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4053,7 +4053,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG1_ALLoff: { - LOG_I("gang switch all off"); + LOG_I_LINE("gang switch all off"); SET_nvs_Sys_Info_Gang1relay1(0); //全开全关只对设备界面的更新 详情界面不更新(因为当前不显示) if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4073,7 +4073,7 @@ void custom_Task(void *pvParameter) //------------------------------gang2 case ZIG_STATE_GANG21on: { - LOG_I("gang switch 21 on"); + LOG_I_LINE("gang switch 21 on"); SET_nvs_Sys_Info_Gang2relay1(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4131,7 +4131,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG21off: { - LOG_I("gang switch 21 off"); + LOG_I_LINE("gang switch 21 off"); SET_nvs_Sys_Info_Gang2relay1(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4187,7 +4187,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG22on: { - LOG_I("gang switch 22 on"); + LOG_I_LINE("gang switch 22 on"); SET_nvs_Sys_Info_Gang2relay2(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4234,7 +4234,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG22off: { - LOG_I("gang switch 22 off"); + LOG_I_LINE("gang switch 22 off"); SET_nvs_Sys_Info_Gang2relay2(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4282,7 +4282,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG2_ALLon: { - LOG_I("gang switch 2 all on"); + LOG_I_LINE("gang switch 2 all on"); SET_nvs_Sys_Info_Gang2relay1(1); SET_nvs_Sys_Info_Gang2relay2(1); @@ -4305,7 +4305,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG2_ALLoff: { - LOG_I("gang switch 2 all off"); + LOG_I_LINE("gang switch 2 all off"); SET_nvs_Sys_Info_Gang2relay1(0); SET_nvs_Sys_Info_Gang2relay2(0); @@ -4329,7 +4329,7 @@ void custom_Task(void *pvParameter) //------------------------------gang3 case ZIG_STATE_GANG31on: { - LOG_I("gang switch 31 on"); + LOG_I_LINE("gang switch 31 on"); SET_nvs_Sys_Info_Gang3relay1(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4386,7 +4386,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG31off: { - LOG_I("gang switch 31 off"); + LOG_I_LINE("gang switch 31 off"); SET_nvs_Sys_Info_Gang3relay1(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4441,7 +4441,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG32on: { - LOG_I("gang switch 32 on"); + LOG_I_LINE("gang switch 32 on"); SET_nvs_Sys_Info_Gang3relay2(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4489,7 +4489,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG32off: { - LOG_I("gang switch 32 off"); + LOG_I_LINE("gang switch 32 off"); SET_nvs_Sys_Info_Gang3relay2(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4538,7 +4538,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG33on: { - LOG_I("gang switch 33 on"); + LOG_I_LINE("gang switch 33 on"); SET_nvs_Sys_Info_Gang3relay3(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4586,7 +4586,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG33off: { - LOG_I("gang switch 33 off"); + LOG_I_LINE("gang switch 33 off"); SET_nvs_Sys_Info_Gang3relay3(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4635,7 +4635,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG3_ALLon: { - LOG_I("gang switch 3 all on"); + LOG_I_LINE("gang switch 3 all on"); SET_nvs_Sys_Info_Gang3relay1(1); SET_nvs_Sys_Info_Gang3relay2(1); SET_nvs_Sys_Info_Gang3relay3(1); @@ -4662,7 +4662,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG3_ALLoff: { - LOG_I("gang switch 3 all off"); + LOG_I_LINE("gang switch 3 all off"); SET_nvs_Sys_Info_Gang3relay1(0); SET_nvs_Sys_Info_Gang3relay2(0); SET_nvs_Sys_Info_Gang3relay3(0); @@ -4691,7 +4691,7 @@ void custom_Task(void *pvParameter) //------------------------------gang4 case ZIG_STATE_GANG41on: { - LOG_I("gang switch 41 on"); + LOG_I_LINE("gang switch 41 on"); SET_nvs_Sys_Info_Gang4relay1(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4731,7 +4731,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG41off: { - LOG_I("gang switch 41 off"); + LOG_I_LINE("gang switch 41 off"); SET_nvs_Sys_Info_Gang4relay1(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4770,7 +4770,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG42on: { - LOG_I("gang switch 42 on"); + LOG_I_LINE("gang switch 42 on"); SET_nvs_Sys_Info_Gang4relay2(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4809,7 +4809,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG42off: { - LOG_I("gang switch 42 off"); + LOG_I_LINE("gang switch 42 off"); SET_nvs_Sys_Info_Gang4relay2(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4849,7 +4849,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG43on: { - LOG_I("gang switch 43 on"); + LOG_I_LINE("gang switch 43 on"); SET_nvs_Sys_Info_Gang4relay3(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4888,7 +4888,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG43off: { - LOG_I("gang switch 43 off"); + LOG_I_LINE("gang switch 43 off"); SET_nvs_Sys_Info_Gang4relay3(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4928,7 +4928,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG44on: { - LOG_I("gang switch 44 on"); + LOG_I_LINE("gang switch 44 on"); SET_nvs_Sys_Info_Gang4relay4(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -4967,7 +4967,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG44off: { - LOG_I("gang switch 44 off"); + LOG_I_LINE("gang switch 44 off"); SET_nvs_Sys_Info_Gang4relay4(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5007,7 +5007,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG4_ALLon: { - LOG_I("gang switch 4 all on"); + LOG_I_LINE("gang switch 4 all on"); SET_nvs_Sys_Info_Gang4relay1(1); SET_nvs_Sys_Info_Gang4relay2(1); SET_nvs_Sys_Info_Gang4relay3(1); @@ -5039,7 +5039,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG4_ALLoff: { - LOG_I("gang switch 4 all off"); + LOG_I_LINE("gang switch 4 all off"); SET_nvs_Sys_Info_Gang4relay1(0); SET_nvs_Sys_Info_Gang4relay2(0); SET_nvs_Sys_Info_Gang4relay3(0); @@ -5072,7 +5072,7 @@ void custom_Task(void *pvParameter) //场景开关6 case ZIG_STATE_GANG61on: { - LOG_I("gang switch 61 on"); + LOG_I_LINE("gang switch 61 on"); SET_nvs_Sys_Info_Gang6relay1(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5118,7 +5118,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG61off: { - LOG_I("gang switch 61 off"); + LOG_I_LINE("gang switch 61 off"); SET_nvs_Sys_Info_Gang6relay1(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5163,7 +5163,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG62on: { - LOG_I("gang switch 62 on"); + LOG_I_LINE("gang switch 62 on"); SET_nvs_Sys_Info_Gang6relay2(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5208,7 +5208,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG62off: { - LOG_I("gang switch 62 off"); + LOG_I_LINE("gang switch 62 off"); SET_nvs_Sys_Info_Gang6relay2(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5254,7 +5254,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG63on: { - LOG_I("gang switch 63 on"); + LOG_I_LINE("gang switch 63 on"); SET_nvs_Sys_Info_Gang6relay3(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5299,7 +5299,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG63off: { - LOG_I("gang switch 63 off"); + LOG_I_LINE("gang switch 63 off"); SET_nvs_Sys_Info_Gang6relay3(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5345,7 +5345,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG64on: { - LOG_I("gang switch 64 on"); + LOG_I_LINE("gang switch 64 on"); SET_nvs_Sys_Info_Gang6relay4(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5390,7 +5390,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG64off: { - LOG_I("gang switch 64 off"); + LOG_I_LINE("gang switch 64 off"); SET_nvs_Sys_Info_Gang6relay4(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5436,7 +5436,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG65on: { - LOG_I("gang switch 65 on"); + LOG_I_LINE("gang switch 65 on"); SET_nvs_Sys_Info_Gang6relay5(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5481,7 +5481,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG65off: { - LOG_I("gang switch 65 off"); + LOG_I_LINE("gang switch 65 off"); SET_nvs_Sys_Info_Gang6relay5(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5527,7 +5527,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG66on: { - LOG_I("gang switch 66 on"); + LOG_I_LINE("gang switch 66 on"); SET_nvs_Sys_Info_Gang6relay6(1); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5573,7 +5573,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG66off: { - LOG_I("gang switch 66 off"); + LOG_I_LINE("gang switch 66 off"); SET_nvs_Sys_Info_Gang6relay6(0); if(guider_ui.device)//更新设备界面的场景开关状态 @@ -5618,7 +5618,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG6_ALLon: { - LOG_I("gang switch 6 all on"); + LOG_I_LINE("gang switch 6 all on"); SET_nvs_Sys_Info_Gang6relay1(1); SET_nvs_Sys_Info_Gang6relay2(1); SET_nvs_Sys_Info_Gang6relay3(1); @@ -5657,7 +5657,7 @@ void custom_Task(void *pvParameter) break; case ZIG_STATE_GANG6_ALLoff: { - LOG_I("gang switch 6 all off"); + LOG_I_LINE("gang switch 6 all off"); SET_nvs_Sys_Info_Gang6relay1(0); SET_nvs_Sys_Info_Gang6relay2(0); SET_nvs_Sys_Info_Gang6relay3(0); @@ -5696,7 +5696,7 @@ void custom_Task(void *pvParameter) break; default: { - LOG_I( "event error!!!"); + LOG_I_LINE( "event error!!!"); } break; } @@ -5715,7 +5715,7 @@ void custom_tableview_event(lv_event_code_t code) case LV_EVENT_VALUE_CHANGED: {//提取滑到到哪一页 用于同步更新按键指示 uint16_t tab_cur=lv_tabview_get_tab_act(guider_ui.screen_main_tabview); - LOG_I("tabview page %d",tab_cur); + LOG_I_LINE("tabview page %d",tab_cur); if(tab_cur<=4) { custom_main_navi_status(tab_cur,LV_EVENT_CLICKED); @@ -5734,7 +5734,7 @@ void custom_main_navi_status(char key,lv_event_code_t code) { case 0:// { - LOG_I("navi_scene"); + LOG_I_LINE("navi_scene"); lv_img_set_src(guider_ui.screen_main_navi_scene_icon, LVGL_PATH(navi_scenes_icon_s_29x29.png)); lv_img_set_src(guider_ui.screen_main_navi_switch_icon, LVGL_PATH(navi_sw_icon_38x21.png)); @@ -5751,7 +5751,7 @@ void custom_main_navi_status(char key,lv_event_code_t code) break; case 1: // { - LOG_I("navi_switch"); + LOG_I_LINE("navi_switch"); lv_img_set_src(guider_ui.screen_main_navi_scene_icon, LVGL_PATH(navi_scenes_icon_29x29.png)); lv_img_set_src(guider_ui.screen_main_navi_switch_icon, LVGL_PATH(navi_sw_icon_s_38x21.png)); @@ -5768,7 +5768,7 @@ void custom_main_navi_status(char key,lv_event_code_t code) break; case 2: // { - LOG_I("navi_dimmer"); + LOG_I_LINE("navi_dimmer"); lv_img_set_src(guider_ui.screen_main_navi_scene_icon, LVGL_PATH(navi_scenes_icon_29x29.png)); lv_img_set_src(guider_ui.screen_main_navi_switch_icon, LVGL_PATH(navi_sw_icon_38x21.png)); @@ -5785,7 +5785,7 @@ void custom_main_navi_status(char key,lv_event_code_t code) break; case 3: // { - LOG_I("navi_cutain"); + LOG_I_LINE("navi_cutain"); lv_img_set_src(guider_ui.screen_main_navi_scene_icon, LVGL_PATH(navi_scenes_icon_29x29.png)); lv_img_set_src(guider_ui.screen_main_navi_switch_icon, LVGL_PATH(navi_sw_icon_38x21.png)); @@ -5803,7 +5803,7 @@ void custom_main_navi_status(char key,lv_event_code_t code) case 4: // { - LOG_I("navi_device"); + LOG_I_LINE("navi_device"); lv_img_set_src(guider_ui.screen_main_navi_scene_icon, LVGL_PATH(navi_scenes_icon_29x29.png)); lv_img_set_src(guider_ui.screen_main_navi_switch_icon, LVGL_PATH(navi_sw_icon_38x21.png)); @@ -5835,7 +5835,7 @@ static void mianinfo_restart_msgbox_callback(lv_event_t *event) if ((code == LV_EVENT_VALUE_CHANGED) && (msgbox != NULL)) { const char * txt = lv_msgbox_get_active_btn_text(msgbox); - LOG_I("click:%s\r\n",txt); + LOG_I_LINE("click:%s\r\n",txt); if( (strstr((const char *)txt,btns_chs[GET_nvs_Sys_Info_language()][0]) ) ) { @@ -5857,11 +5857,11 @@ static void mianinfo_factory_msgbox_callback(lv_event_t *event) if ((code == LV_EVENT_VALUE_CHANGED) && (msgbox != NULL)) { const char * txt = lv_msgbox_get_active_btn_text(msgbox); - LOG_I("click:%s\r\n",txt); + LOG_I_LINE("click:%s\r\n",txt); if( (strstr((const char *)txt,btns_chs[GET_nvs_Sys_Info_language()][0]) ) ) { - LOG_I("factory reset\r\n"); + LOG_I_LINE("factory reset\r\n"); disp_driver_backlight_set(0);//对flash写会禁止操作psram,造成RGB暂停刷新 rt_thread_mdelay(1000); @@ -5884,7 +5884,7 @@ void custom_mianinfo_key_status(char key,lv_event_code_t code) { if(code==LV_EVENT_CLICKED) { - LOG_I("restart"); + LOG_I_LINE("restart"); lv_obj_t * mbox1 = lv_msgbox_create(NULL,NULL, Menu_List[GET_nvs_Sys_Info_language()][MENU_LIST_System_Restartmsgbox], btns_chs[GET_nvs_Sys_Info_language()], false); lv_msgbox_t * mbox = (lv_msgbox_t *)mbox1; @@ -5908,7 +5908,7 @@ void custom_mianinfo_key_status(char key,lv_event_code_t code) { if(code==LV_EVENT_CLICKED) { - LOG_I("factory reset"); + LOG_I_LINE("factory reset"); lv_obj_t * mbox1 = lv_msgbox_create(NULL,NULL, Menu_List[GET_nvs_Sys_Info_language()][MENU_LIST_Restore_Factorymsgbox], btns_chs[GET_nvs_Sys_Info_language()], false); lv_msgbox_t * mbox = (lv_msgbox_t *)mbox1; @@ -6179,7 +6179,7 @@ void custom_datetime_key_status(char key,lv_event_code_t code) break; case 2://更改 { - LOG_I("custom_datetime_key_status"); + LOG_I_LINE("custom_datetime_key_status"); /* struct tm { @@ -6203,31 +6203,31 @@ void custom_datetime_key_status(char key,lv_event_code_t code) uint16_t sel_opt_idt=lv_dropdown_get_selected(guider_ui.datesetpage_yearddlist);//0~99 lv_dropdown_get_selected_str(guider_ui.datesetpage_yearddlist,str,sizeof(str)); int year=sel_opt_idt+2024;//0~99-->2024~2099 - LOG_I("year:%s---%d",str,year); + LOG_I_LINE("year:%s---%d",str,year); //timeinfo.tm_year=(int)((year)-1900); //月 sel_opt_idt=lv_dropdown_get_selected(guider_ui.datesetpage_moonddlist);//0~11 lv_dropdown_get_selected_str(guider_ui.datesetpage_moonddlist,str,sizeof(str)); int month=sel_opt_idt+1;//0~11-->1~12 - LOG_I("mon:%s---%d",str,month); + LOG_I_LINE("mon:%s---%d",str,month); //timeinfo.tm_mon=month-1; //日 sel_opt_idt=lv_dropdown_get_selected(guider_ui.datesetpage_sunddlist);//0~30 lv_dropdown_get_selected_str(guider_ui.datesetpage_sunddlist,str,sizeof(str)); int day=sel_opt_idt+1;//0~30-->1~31 - LOG_I("sun:%s---%d",str,sel_opt_idt+1); + LOG_I_LINE("sun:%s---%d",str,sel_opt_idt+1); //timeinfo.tm_mday=day-1; //时 sel_opt_idt=lv_dropdown_get_selected(guider_ui.datesetpage_hourddlist);//0~23 lv_dropdown_get_selected_str(guider_ui.datesetpage_hourddlist,str,sizeof(str)); int hour=sel_opt_idt; - LOG_I("hour:%s---%d",str,hour); + LOG_I_LINE("hour:%s---%d",str,hour); //timeinfo.tm_hour=hour; //分 sel_opt_idt=lv_dropdown_get_selected(guider_ui.datesetpage_minuteddlist);//0~59 lv_dropdown_get_selected_str(guider_ui.datesetpage_minuteddlist,str,sizeof(str)); int minute=sel_opt_idt; - LOG_I("min:%s---%d",str,minute); + LOG_I_LINE("min:%s---%d",str,minute); //timeinfo.tm_min=minute; //1 3 5 7 8 10 12 31天 //4 6 9 11 30天 @@ -6285,10 +6285,10 @@ void custom_datetime_key_status(char key,lv_event_code_t code) //时区 sel_opt_idt=lv_dropdown_get_selected(guider_ui.datesetpage_zoneddlist);//0~24 lv_dropdown_get_selected_str(guider_ui.datesetpage_zoneddlist,str,sizeof(str)); - LOG_I("zone:%s---%d",str,sel_opt_idt-12); + LOG_I_LINE("zone:%s---%d",str,sel_opt_idt-12); tz_set(sel_opt_idt-12); - LOG_I("new read zone:%d",tz_get()); + LOG_I_LINE("new read zone:%d",tz_get()); //UTC的起始时间为‌1970年1月1日 00:00:00‌（协调世界时） //标准时间戳通常指的是UTC（ 协调世界时 ）。时间戳以 1970年1月1日 零时（UTC）为起点 //标准时间戳：格林威治时间，以 1970.01.01 00:00:00 为起点到现在的总秒数。 @@ -6302,13 +6302,13 @@ void custom_datetime_key_status(char key,lv_event_code_t code) //设置的时间当本地时间 - // LOG_I("dateToEpoch:%d\r\n", dateToEpoch(2025, 7, 8, 18, 20, 0));//当地时间 1970开始计算的 - // LOG_I("dateToEpoch2:%d\r\n", dateToEpoch(2025, 7, 8, 18, 20, 0)-tz_get()*3600);//utc时间 + // LOG_I_LINE("dateToEpoch:%d\r\n", dateToEpoch(2025, 7, 8, 18, 20, 0));//当地时间 1970开始计算的 + // LOG_I_LINE("dateToEpoch2:%d\r\n", dateToEpoch(2025, 7, 8, 18, 20, 0)-tz_get()*3600);//utc时间 time_t Localtime=dateToEpoch(year, month, day, hour, minute, 0);//年月日转换为本地时间(1970开始计算的) - LOG_I("Localtime:%d\r\n", Localtime); + LOG_I_LINE("Localtime:%d\r\n", Localtime); time_t standardtime=Localtime-tz_get()*3600;//本地时间转换为UTC标准时间戳 - LOG_I("standardtime:%d\r\n",standardtime); + LOG_I_LINE("standardtime:%d\r\n",standardtime); //更新时间 更新的是utc时间 struct timeval tv; @@ -6857,7 +6857,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) { ZIGEvent evt; memset(&evt,0,sizeof(evt)); - // LOG_I("custom_scene_btn_event %d",key); + // LOG_I_LINE("custom_scene_btn_event %d",key); //停止动画 if(animationtimer) { @@ -6880,7 +6880,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) case 0: {//提取滑到到哪一页 用于同步更新页图标 uint16_t tab_cur=lv_tabview_get_tab_act(guider_ui.scene_tabview_1); - LOG_I("scene tabview1 page %d",tab_cur); + LOG_I_LINE("scene tabview1 page %d",tab_cur); if(tab_cur==1) { lv_img_set_src(guider_ui.scene_scenes_page_icon, LVGL_PATH(page_sw2_42x22.png)); @@ -6893,7 +6893,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) break; case 1: { - LOG_I("scene_btn 1"); + LOG_I_LINE("scene_btn 1"); //启动定时器 scenebarindex=0; @@ -6905,7 +6905,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) break; case 2: { - LOG_I("scene_btn 2"); + LOG_I_LINE("scene_btn 2"); scenebarindex=0; animationtimer = lv_timer_create(custom_scene_key2_timercb,80,NULL); @@ -6916,7 +6916,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) break; case 3: { - LOG_I("scene_btn 3"); + LOG_I_LINE("scene_btn 3"); scenebarindex=0; animationtimer = lv_timer_create(custom_scene_key3_timercb,80,NULL); @@ -6927,7 +6927,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) break; case 4: { - LOG_I("scene_btn 4"); + LOG_I_LINE("scene_btn 4"); scenebarindex=0; animationtimer = lv_timer_create(custom_scene_key4_timercb,80,NULL); @@ -6938,7 +6938,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) break; case 5: { - LOG_I("scene_btn 5"); + LOG_I_LINE("scene_btn 5"); scenebarindex=0; animationtimer = lv_timer_create(custom_scene_key5_timercb,80,NULL); @@ -6949,7 +6949,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) break; case 6: { - LOG_I("scene_btn 6"); + LOG_I_LINE("scene_btn 6"); scenebarindex=0; animationtimer = lv_timer_create(custom_scene_key6_timercb,80,NULL); @@ -6960,7 +6960,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) break; case 7: { - LOG_I("scene_btn 7"); + LOG_I_LINE("scene_btn 7"); scenebarindex=0; animationtimer = lv_timer_create(custom_scene_key7_timercb,80,NULL); @@ -6971,7 +6971,7 @@ void custom_scene_btn_event(char key,lv_event_code_t code) break; case 8: { - LOG_I("scene_btn 8"); + LOG_I_LINE("scene_btn 8"); scenebarindex=0; animationtimer = lv_timer_create(custom_scene_key8_timercb,80,NULL); @@ -6992,6 +6992,8 @@ void custom_onoff1_key_status(char key,lv_event_code_t code) evt.length=0; evt.buffStr=NULL; + LOG_I_LINE("custom_onoff1_key_status:%d",key); + switch(key) { case 1://第一路按键 @@ -7023,6 +7025,7 @@ void custom_onoff2_key_status(char key,lv_event_code_t code) evt.length=0; evt.buffStr=NULL; + LOG_I_LINE("custom_onoff2_key_status:%d",key); switch(key) { case 1://第一路按键 @@ -7072,6 +7075,8 @@ void custom_onoff3_key_status(char key,lv_event_code_t code) evt.length=0; evt.buffStr=NULL; + LOG_I_LINE("custom_onoff3_key_status:%d",key); + switch(key) { case 1://第一路按键 @@ -7139,6 +7144,8 @@ void custom_onoff4_key_status(char key,lv_event_code_t code) evt.length=0; evt.buffStr=NULL; + LOG_I_LINE("custom_onoff4_key_status:%d",key); + switch(key) { case 1://第一路按键 @@ -7237,13 +7244,13 @@ void custom_onofftime4_key_status(char key,lv_event_code_t code) //dimmer界面 void custom_dimmer_btn_event(char key,lv_event_code_t code) { - // LOG_I("custom_dimmer_btn_event %d",key); + // LOG_I_LINE("custom_dimmer_btn_event %d",key); switch (key) { case 0: {//提取滑到到哪一页 用于同步更新页图标 uint16_t tab_cur=lv_tabview_get_tab_act(guider_ui.dimmer_tabview_1); - LOG_I("dimmer tabview1 page %d",tab_cur); + LOG_I_LINE("dimmer tabview1 page %d",tab_cur); if(tab_cur==1) { lv_label_set_text(guider_ui.dimmer_pagelabel, Menu_List[GET_nvs_Sys_Info_language()][MENU_LIST_Dimmer2edpage]); @@ -7272,7 +7279,7 @@ void custom_dimmer_group1_event(char key,lv_event_code_t code) evt.event=ZIG_STATE_light1_temp; evt.length=lv_slider_get_value(guider_ui.dimmer_group1_slider_temp); evt.buffStr=NULL; - LOG_I("dimmer_group1_slider_temp=%d%%",evt.length); + LOG_I_LINE("dimmer_group1_slider_temp=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7283,7 +7290,7 @@ void custom_dimmer_group1_event(char key,lv_event_code_t code) evt.event=ZIG_STATE_light1_bright; evt.length=lv_slider_get_value(guider_ui.dimmer_group1_slider_cold); evt.buffStr=NULL; - LOG_I("dimmer_group1_slider_cold=%d%%",evt.length); + LOG_I_LINE("dimmer_group1_slider_cold=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7322,7 +7329,7 @@ void custom_dimmer_group2_event(char key,lv_event_code_t code) evt.event=ZIG_STATE_light2_temp; evt.length=lv_slider_get_value(guider_ui.dimmer_group2_slider_temp); evt.buffStr=NULL; - LOG_I("dimmer_group2_slider_temp=%d%%",evt.length); + LOG_I_LINE("dimmer_group2_slider_temp=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7333,7 +7340,7 @@ void custom_dimmer_group2_event(char key,lv_event_code_t code) evt.event=ZIG_STATE_light2_bright; evt.length=lv_slider_get_value(guider_ui.dimmer_group2_slider_cold); evt.buffStr=NULL; - LOG_I("dimmer_group2_slider_cold=%d%%",evt.length); + LOG_I_LINE("dimmer_group2_slider_cold=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7372,7 +7379,7 @@ void custom_dimmer_group3_event(char key,lv_event_code_t code) evt.event=ZIG_STATE_light3_temp; evt.length=lv_slider_get_value(guider_ui.dimmer_group3_slider_temp); evt.buffStr=NULL; - LOG_I("dimmer_group3_slider_temp=%d%%",evt.length); + LOG_I_LINE("dimmer_group3_slider_temp=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7383,7 +7390,7 @@ void custom_dimmer_group3_event(char key,lv_event_code_t code) evt.event=ZIG_STATE_light3_bright; evt.length=lv_slider_get_value(guider_ui.dimmer_group3_slider_cold); evt.buffStr=NULL; - LOG_I("dimmer_group3_slider_cold=%d%%",evt.length); + LOG_I_LINE("dimmer_group3_slider_cold=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7422,7 +7429,7 @@ void custom_dimmer_group4_event(char key,lv_event_code_t code) evt.event=ZIG_STATE_light4_temp; evt.length=lv_slider_get_value(guider_ui.dimmer_group4_slider_temp); evt.buffStr=NULL; - LOG_I("dimmer_group4_slider_temp=%d%%",evt.length); + LOG_I_LINE("dimmer_group4_slider_temp=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7433,7 +7440,7 @@ void custom_dimmer_group4_event(char key,lv_event_code_t code) evt.event=ZIG_STATE_light4_bright; evt.length=lv_slider_get_value(guider_ui.dimmer_group4_slider_cold); evt.buffStr=NULL; - LOG_I("dimmer_group4_slider_cold=%d%%",evt.length); + LOG_I_LINE("dimmer_group4_slider_cold=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7469,12 +7476,12 @@ static void custom_dimmerinfo_light1_status(char key,lv_event_code_t code) { case 0://色温 { - LOG_I("dimmerinfo_tempslider_temp=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); + LOG_I_LINE("dimmerinfo_tempslider_temp=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); evt.event=ZIG_STATE_light1_temp; evt.length=lv_slider_get_value(guider_ui.dimmerinfo_tempslider); evt.buffStr=NULL; - //LOG_I("dimmerinfo_tempslider=%d%%",evt.length); + //LOG_I_LINE("dimmerinfo_tempslider=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7482,11 +7489,11 @@ static void custom_dimmerinfo_light1_status(char key,lv_event_code_t code) break; case 1://亮度 { - LOG_I("dimmerinfo_coldslider=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); + LOG_I_LINE("dimmerinfo_coldslider=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); evt.event=ZIG_STATE_light1_bright; evt.length=lv_slider_get_value(guider_ui.dimmerinfo_coldslider); evt.buffStr=NULL; - //LOG_I("dimmerinfo_coldslider=%d%%",evt.length); + //LOG_I_LINE("dimmerinfo_coldslider=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7521,12 +7528,12 @@ static void custom_dimmerinfo_light2_status(char key,lv_event_code_t code) { case 0://色温 { - LOG_I("dimmerinfo_tempslider_temp=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); + LOG_I_LINE("dimmerinfo_tempslider_temp=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); evt.event=ZIG_STATE_light2_temp; evt.length=lv_slider_get_value(guider_ui.dimmerinfo_tempslider); evt.buffStr=NULL; - //LOG_I("dimmerinfo_tempslider=%d%%",evt.length); + //LOG_I_LINE("dimmerinfo_tempslider=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7534,11 +7541,11 @@ static void custom_dimmerinfo_light2_status(char key,lv_event_code_t code) break; case 1://亮度 { - LOG_I("dimmerinfo_coldslider=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); + LOG_I_LINE("dimmerinfo_coldslider=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); evt.event=ZIG_STATE_light2_bright; evt.length=lv_slider_get_value(guider_ui.dimmerinfo_coldslider); evt.buffStr=NULL; - //LOG_I("dimmerinfo_coldslider=%d%%",evt.length); + //LOG_I_LINE("dimmerinfo_coldslider=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7573,12 +7580,12 @@ static void custom_dimmerinfo_light3_status(char key,lv_event_code_t code) { case 0://色温 { - LOG_I("dimmerinfo_tempslider_temp=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); + LOG_I_LINE("dimmerinfo_tempslider_temp=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); evt.event=ZIG_STATE_light3_temp; evt.length=lv_slider_get_value(guider_ui.dimmerinfo_tempslider); evt.buffStr=NULL; - //LOG_I("dimmerinfo_tempslider=%d%%",evt.length); + //LOG_I_LINE("dimmerinfo_tempslider=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7586,11 +7593,11 @@ static void custom_dimmerinfo_light3_status(char key,lv_event_code_t code) break; case 1://亮度 { - LOG_I("dimmerinfo_coldslider=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); + LOG_I_LINE("dimmerinfo_coldslider=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); evt.event=ZIG_STATE_light3_bright; evt.length=lv_slider_get_value(guider_ui.dimmerinfo_coldslider); evt.buffStr=NULL; - //LOG_I("dimmerinfo_coldslider=%d%%",evt.length); + //LOG_I_LINE("dimmerinfo_coldslider=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7625,12 +7632,12 @@ static void custom_dimmerinfo_light4_status(char key,lv_event_code_t code) { case 0://色温 { - LOG_I("dimmerinfo_tempslider_temp=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); + LOG_I_LINE("dimmerinfo_tempslider_temp=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); evt.event=ZIG_STATE_light4_temp; evt.length=lv_slider_get_value(guider_ui.dimmerinfo_tempslider); evt.buffStr=NULL; - //LOG_I("dimmerinfo_tempslider=%d%%",evt.length); + //LOG_I_LINE("dimmerinfo_tempslider=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7638,11 +7645,11 @@ static void custom_dimmerinfo_light4_status(char key,lv_event_code_t code) break; case 1://亮度 { - LOG_I("dimmerinfo_coldslider=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); + LOG_I_LINE("dimmerinfo_coldslider=%d%%",lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); evt.event=ZIG_STATE_light4_bright; evt.length=lv_slider_get_value(guider_ui.dimmerinfo_coldslider); evt.buffStr=NULL; - //LOG_I("dimmerinfo_coldslider=%d%%",evt.length); + //LOG_I_LINE("dimmerinfo_coldslider=%d%%",evt.length); rt_mq_send(custom_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知ui改变状态 rt_mq_send(zig_rx_evt_queue,&evt, sizeof(ZIGEvent)); //通知zigbee发出群控命令 @@ -7673,42 +7680,42 @@ static void custom_dimmerinfo_light4_status(char key,lv_event_code_t code) void custom_dimmerinfo_status(char key,lv_event_code_t code) { Downlights_Info *downlight=(Downlights_Info *)guider_ui.dimmerinfo->user_data; - LOG_I("downlights[0] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[0]); - LOG_I("downlights[1] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[1]); - LOG_I("downlights[2] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[2]); - LOG_I("downlights[3] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[3]); + LOG_I_LINE("downlights[0] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[0]); + LOG_I_LINE("downlights[1] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[1]); + LOG_I_LINE("downlights[2] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[2]); + LOG_I_LINE("downlights[3] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[3]); - LOG_I("current downlight address=0x%x",(uint32_t)downlight); + LOG_I_LINE("current downlight address=0x%x",(uint32_t)downlight); if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[0]) { - LOG_I("is equal downlights[0]"); + LOG_I_LINE("is equal downlights[0]"); custom_dimmerinfo_light1_status(key,code); } else if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[1]) { - LOG_I("is equal downlights[1]"); + LOG_I_LINE("is equal downlights[1]"); custom_dimmerinfo_light2_status(key,code); } else if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[2]) { - LOG_I("is equal downlights[2]"); + LOG_I_LINE("is equal downlights[2]"); custom_dimmerinfo_light3_status(key,code); } else if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[3]) { - LOG_I("is equal downlights[3]"); + LOG_I_LINE("is equal downlights[3]"); custom_dimmerinfo_light4_status(key,code); } else { - LOG_I("is equal fail"); + LOG_I_LINE("is equal fail"); } } //curtain界面 void custom_curtain_btn_event(char key,lv_event_code_t code) { - // LOG_I("custom_dimmer_btn_event %d",key); + // LOG_I_LINE("custom_dimmer_btn_event %d",key); switch (key) { @@ -7729,7 +7736,7 @@ void custom_curtain_group1_event(char key,lv_event_code_t code) { case 0://开 { - LOG_I("custom_curtain_group1_event:open"); + LOG_I_LINE("custom_curtain_group1_event:open"); evt.event=ZIG_STATE_Curtain1_status; evt.length=0; @@ -7741,7 +7748,7 @@ void custom_curtain_group1_event(char key,lv_event_code_t code) break; case 1://停 { - LOG_I("custom_curtain_group1_event:pause"); + LOG_I_LINE("custom_curtain_group1_event:pause"); evt.event=ZIG_STATE_Curtain1_status; evt.length=1; @@ -7753,7 +7760,7 @@ void custom_curtain_group1_event(char key,lv_event_code_t code) break; case 2://关 { - LOG_I("custom_curtain_group1_event:close"); + LOG_I_LINE("custom_curtain_group1_event:close"); evt.event=ZIG_STATE_Curtain1_status; evt.length=2; @@ -7775,7 +7782,7 @@ void custom_curtain_group2_event(char key,lv_event_code_t code) { case 0://开 { - LOG_I("custom_curtain_group2_event:open"); + LOG_I_LINE("custom_curtain_group2_event:open"); evt.event=ZIG_STATE_Curtain2_status; evt.length=0; @@ -7787,7 +7794,7 @@ void custom_curtain_group2_event(char key,lv_event_code_t code) break; case 1://停 { - LOG_I("custom_curtain_group2_event:pause"); + LOG_I_LINE("custom_curtain_group2_event:pause"); evt.event=ZIG_STATE_Curtain2_status; evt.length=1; @@ -7799,7 +7806,7 @@ void custom_curtain_group2_event(char key,lv_event_code_t code) break; case 2://关 { - LOG_I("custom_curtain_group2_event:close"); + LOG_I_LINE("custom_curtain_group2_event:close"); evt.event=ZIG_STATE_Curtain2_status; evt.length=2; @@ -7821,7 +7828,7 @@ void custom_curtain_group3_event(char key,lv_event_code_t code) { case 0://开 { - LOG_I("custom_curtain_group3_event:open"); + LOG_I_LINE("custom_curtain_group3_event:open"); evt.event=ZIG_STATE_Curtain3_status; evt.length=0; @@ -7833,7 +7840,7 @@ void custom_curtain_group3_event(char key,lv_event_code_t code) break; case 1://停 { - LOG_I("custom_curtain_group3_event:pause"); + LOG_I_LINE("custom_curtain_group3_event:pause"); evt.event=ZIG_STATE_Curtain3_status; evt.length=1; @@ -7845,7 +7852,7 @@ void custom_curtain_group3_event(char key,lv_event_code_t code) break; case 2://关 { - LOG_I("custom_curtain_group3_event:close"); + LOG_I_LINE("custom_curtain_group3_event:close"); evt.event=ZIG_STATE_Curtain3_status; evt.length=2; @@ -7867,7 +7874,7 @@ void custom_curtain_group4_event(char key,lv_event_code_t code) { case 0://开 { - LOG_I("custom_curtain_group4_event:open"); + LOG_I_LINE("custom_curtain_group4_event:open"); evt.event=ZIG_STATE_Curtain4_status; evt.length=0; @@ -7879,7 +7886,7 @@ void custom_curtain_group4_event(char key,lv_event_code_t code) break; case 1://停 { - LOG_I("custom_curtain_group4_event:pause"); + LOG_I_LINE("custom_curtain_group4_event:pause"); evt.event=ZIG_STATE_Curtain4_status; evt.length=1; @@ -7891,7 +7898,7 @@ void custom_curtain_group4_event(char key,lv_event_code_t code) break; case 2://关 { - LOG_I("custom_curtain_group4_event:close"); + LOG_I_LINE("custom_curtain_group4_event:close"); evt.event=ZIG_STATE_Curtain4_status; evt.length=2; @@ -8075,36 +8082,36 @@ static void custom_curtaininfo_curtain3_status(char key,lv_event_code_t code) void custom_curtaininfo_status(char key,lv_event_code_t code) { Curatin_Info *curtain=(Curatin_Info *)guider_ui.curtaininfo->user_data; - LOG_I("curtains[0] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[0]); - LOG_I("curtains[1] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[1]); - LOG_I("curtains[2] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[2]); - LOG_I("curtains[3] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[3]); + LOG_I_LINE("curtains[0] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[0]); + LOG_I_LINE("curtains[1] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[1]); + LOG_I_LINE("curtains[2] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[2]); + LOG_I_LINE("curtains[3] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[3]); - LOG_I("current curtain address=0x%x",(uint32_t)curtain); + LOG_I_LINE("current curtain address=0x%x",(uint32_t)curtain); if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[0]) { - LOG_I("is equal curtains[0]"); + LOG_I_LINE("is equal curtains[0]"); custom_curtaininfo_curtain1_status(key,code); } else if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[1]) { - LOG_I("is equal curtains[1]"); + LOG_I_LINE("is equal curtains[1]"); custom_curtaininfo_curtain2_status(key,code); } else if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[2]) { - LOG_I("is equal curtains[2]"); + LOG_I_LINE("is equal curtains[2]"); custom_curtaininfo_curtain3_status(key,code); } // else if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[3]) // { - // LOG_I("is equal curtains[3]"); + // LOG_I_LINE("is equal curtains[3]"); // custom_rollersinfo_status(key,code); // } else { - LOG_I("is equal fail"); + LOG_I_LINE("is equal fail"); } } void custom_rollersinfo_status(char key,lv_event_code_t code) @@ -8169,7 +8176,7 @@ void custom_addsubdevicepage_status(char key,lv_event_code_t code) { case 1: { - LOG_I("click save subdevicepage"); + LOG_I_LINE("click save subdevicepage"); //启动重新显示 ZIGEvent evt; evt.event=ZIG_STATE_SUBDEVICE_UPDATE; @@ -8209,15 +8216,15 @@ void custom_gang1onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 1 long"); + // LOG_I_LINE("key 1 long"); // user_onoff_key_select=11;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 1 edit enter"); + // LOG_I_LINE("key 1 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 1 edit quit"); + // LOG_I_LINE("key 1 edit quit"); // } // } } @@ -8301,15 +8308,15 @@ void custom_gang2onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 1 long"); + // LOG_I_LINE("key 1 long"); // user_onoff_key_select=21;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 1 edit enter"); + // LOG_I_LINE("key 1 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 1 edit quit"); + // LOG_I_LINE("key 1 edit quit"); // } // } } @@ -8332,15 +8339,15 @@ void custom_gang2onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 2 long"); + // LOG_I_LINE("key 2 long"); // user_onoff_key_select=22;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 2 edit enter"); + // LOG_I_LINE("key 2 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 2 edit quit"); + // LOG_I_LINE("key 2 edit quit"); // } // } } @@ -8450,15 +8457,15 @@ void custom_gang3onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 1 long"); + // LOG_I_LINE("key 1 long"); // user_onoff_key_select=31;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 1 edit enter"); + // LOG_I_LINE("key 1 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 1 edit quit"); + // LOG_I_LINE("key 1 edit quit"); // } // } } @@ -8481,15 +8488,15 @@ void custom_gang3onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 2 long"); + // LOG_I_LINE("key 2 long"); // user_onoff_key_select=32;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 2 edit enter"); + // LOG_I_LINE("key 2 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 2 edit quit"); + // LOG_I_LINE("key 2 edit quit"); // } // } } @@ -8512,15 +8519,15 @@ void custom_gang3onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 3 long"); + // LOG_I_LINE("key 3 long"); // user_onoff_key_select=33;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 3 edit enter"); + // LOG_I_LINE("key 3 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 3 edit quit"); + // LOG_I_LINE("key 3 edit quit"); // } // } } @@ -8674,15 +8681,15 @@ void custom_gang4onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 1 long"); + // LOG_I_LINE("key 1 long"); // user_onoff_key_select=41;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 1 edit enter"); + // LOG_I_LINE("key 1 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 1 edit quit"); + // LOG_I_LINE("key 1 edit quit"); // } // } } @@ -8705,15 +8712,15 @@ void custom_gang4onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 2 long"); + // LOG_I_LINE("key 2 long"); // user_onoff_key_select=42;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 2 edit enter"); + // LOG_I_LINE("key 2 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 2 edit quit"); + // LOG_I_LINE("key 2 edit quit"); // } // } } @@ -8736,15 +8743,15 @@ void custom_gang4onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 3 long"); + // LOG_I_LINE("key 3 long"); // user_onoff_key_select=43;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 3 edit enter"); + // LOG_I_LINE("key 3 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 3 edit quit"); + // LOG_I_LINE("key 3 edit quit"); // } // } } @@ -8767,15 +8774,15 @@ void custom_gang4onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 4 long"); + // LOG_I_LINE("key 4 long"); // user_onoff_key_select=44;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 3 edit enter"); + // LOG_I_LINE("key 3 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 3 edit quit"); + // LOG_I_LINE("key 3 edit quit"); // } // } } @@ -8928,15 +8935,15 @@ void custom_gang6onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 1 long"); + // LOG_I_LINE("key 1 long"); // user_onoff_key_select=61;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 1 edit enter"); + // LOG_I_LINE("key 1 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 1 edit quit"); + // LOG_I_LINE("key 1 edit quit"); // } // } } @@ -8959,15 +8966,15 @@ void custom_gang6onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 2 long"); + // LOG_I_LINE("key 2 long"); // user_onoff_key_select=62;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 2 edit enter"); + // LOG_I_LINE("key 2 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 2 edit quit"); + // LOG_I_LINE("key 2 edit quit"); // } // } } @@ -8990,15 +8997,15 @@ void custom_gang6onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 3 long"); + // LOG_I_LINE("key 3 long"); // user_onoff_key_select=63;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 3 edit enter"); + // LOG_I_LINE("key 3 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 3 edit quit"); + // LOG_I_LINE("key 3 edit quit"); // } // } } @@ -9021,15 +9028,15 @@ void custom_gang6onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 4 long"); + // LOG_I_LINE("key 4 long"); // user_onoff_key_select=64;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 3 edit enter"); + // LOG_I_LINE("key 3 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 3 edit quit"); + // LOG_I_LINE("key 3 edit quit"); // } // } } @@ -9052,15 +9059,15 @@ void custom_gang6onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 5 long"); + // LOG_I_LINE("key 5 long"); // user_onoff_key_select=65;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 3 edit enter"); + // LOG_I_LINE("key 3 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 3 edit quit"); + // LOG_I_LINE("key 3 edit quit"); // } // } } @@ -9083,15 +9090,15 @@ void custom_gang6onoff_key_status(char key,lv_event_code_t code) } // else if(code==LV_EVENT_LONG_PRESSED)//长按触发 // { - // LOG_I("key 6 long"); + // LOG_I_LINE("key 6 long"); // user_onoff_key_select=66;//用于按键修改icon和名称 // if(!guider_ui.onoffiEdit) // { - // LOG_I("key 3 edit enter"); + // LOG_I_LINE("key 3 edit enter"); // setup_scr_onoffiEdit(&guider_ui); - // LOG_I("key 3 edit quit"); + // LOG_I_LINE("key 3 edit quit"); // } // } } @@ -9435,7 +9442,7 @@ void custom_Projector_key_status(char key,lv_event_code_t code) { if (lv_obj_has_state(guider_ui.device_projectorsw, LV_STATE_CHECKED)) { - LOG_I("on"); + LOG_I_LINE("on"); nvs_SysInfo.projector.onoff=1; @@ -9443,7 +9450,7 @@ void custom_Projector_key_status(char key,lv_event_code_t code) } else { - LOG_I("off"); + LOG_I_LINE("off"); nvs_SysInfo.projector.onoff=0; diff --git a/application/rt-thread/t3e-pro/components/generated/events_init.c b/application/rt-thread/t3e-pro/components/generated/events_init.c index ce76ca8b..366feb19 100644 --- a/application/rt-thread/t3e-pro/components/generated/events_init.c +++ b/application/rt-thread/t3e-pro/components/generated/events_init.c @@ -46,7 +46,7 @@ static void screen_main_navi_scene_btn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - //LOG_I("screen_main_navi_scene_btn_event_handler"); + //LOG_I_LINE("screen_main_navi_scene_btn_event_handler"); custom_main_navi_status(0,LV_EVENT_CLICKED); break; } @@ -61,7 +61,7 @@ static void screen_main_navi_switch_btn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - //LOG_I("screen_main_navi_switch_btn_event_handler"); + //LOG_I_LINE("screen_main_navi_switch_btn_event_handler"); custom_main_navi_status(1,LV_EVENT_CLICKED); break; } @@ -76,7 +76,7 @@ static void screen_main_navi_dimmer_btn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - //LOG_I("screen_main_navi_dimmer_btn_event_handler"); + //LOG_I_LINE("screen_main_navi_dimmer_btn_event_handler"); custom_main_navi_status(2,LV_EVENT_CLICKED); break; } @@ -91,7 +91,7 @@ static void screen_main_navi_cutain_btn_event_handler(lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - //LOG_I("screen_main_navi_cutain_btn_event_handler"); + //LOG_I_LINE("screen_main_navi_cutain_btn_event_handler"); custom_main_navi_status(3,LV_EVENT_CLICKED); break; } @@ -106,7 +106,7 @@ static void screen_main_navi_device_btn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - //LOG_I("screen_main_navi_device_btn_event_handler"); + //LOG_I_LINE("screen_main_navi_device_btn_event_handler"); custom_main_navi_status(4,LV_EVENT_CLICKED); break; } @@ -130,7 +130,7 @@ static void setting_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("settings_retrunbtn_event_handler"); + LOG_I_LINE("settings_retrunbtn_event_handler"); //重新加载screen_main界面 if(!guider_ui.screen_main) { @@ -157,7 +157,7 @@ static void setting_mainfobtn_1_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("setting_mainfobtn_1_event_handler"); + LOG_I_LINE("setting_mainfobtn_1_event_handler"); if(!guider_ui.mianinfopage) { @@ -177,7 +177,7 @@ static void setting_dispinfobtn_1_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("setting_dispinfobtn_1_event_handler"); + LOG_I_LINE("setting_dispinfobtn_1_event_handler"); if(!guider_ui.displayinfopage) { @@ -197,7 +197,7 @@ static void setting_dateinfobtn_1_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("setting_dateinfobtn_1_event_handler"); + LOG_I_LINE("setting_dateinfobtn_1_event_handler"); if(!guider_ui.dateinfopage) { @@ -217,7 +217,7 @@ static void setting_langinfobtn_1_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("setting_langinfobtn_1_event_handler"); + LOG_I_LINE("setting_langinfobtn_1_event_handler"); if(!guider_ui.langinfopage) { @@ -237,7 +237,7 @@ static void setting_smartconfibtn_1_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("setting_smartconfibtn_1_event_handler"); + LOG_I_LINE("setting_smartconfibtn_1_event_handler"); if(!guider_ui.smartinfopage) { @@ -257,7 +257,7 @@ static void setting_firstinfobtn_1_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("setting_firstinfobtn_1_event_handler"); + LOG_I_LINE("setting_firstinfobtn_1_event_handler"); if(!guider_ui.firstinfopage) { @@ -277,7 +277,7 @@ static void setting_firstinfobtn_1_event_handler (lv_event_t *e) // switch (code) { // case LV_EVENT_CLICKED: // { -// LOG_I("setting_relayinfobtn_1_event_handler"); +// LOG_I_LINE("setting_relayinfobtn_1_event_handler"); // if(!guider_ui.relayinfopage) // { @@ -308,7 +308,7 @@ static void mianinfopage_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("mianinfopage_retrunbtn_event_handler"); + LOG_I_LINE("mianinfopage_retrunbtn_event_handler"); if(!guider_ui.setting) { @@ -369,7 +369,7 @@ static void dateinfopage_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_RELEASED: { - LOG_I("dateinfopage_retrunbtn_event_handler"); + LOG_I_LINE("dateinfopage_retrunbtn_event_handler"); if(!guider_ui.setting) { @@ -395,7 +395,7 @@ static void dateinfopage_sw_1_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_VALUE_CHANGED: { - LOG_I("dateinfopage_sw_1_event_handler"); + LOG_I_LINE("dateinfopage_sw_1_event_handler"); custom_datetime_key_status(1,LV_EVENT_CLICKED); break; } @@ -410,7 +410,7 @@ static void dateinfopage_datebtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_RELEASED: { - LOG_I("dateinfopage_datebtn_event_handler"); + LOG_I_LINE("dateinfopage_datebtn_event_handler"); if(!guider_ui.datesetpage) { @@ -430,7 +430,7 @@ static void dateinfopage_timebtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_RELEASED: { - LOG_I("dateinfopage_timebtn_event_handler"); + LOG_I_LINE("dateinfopage_timebtn_event_handler"); if(!guider_ui.datesetpage) { @@ -457,7 +457,7 @@ static void datesetpage_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("datesetpage_retrunbtn_event_handler"); + LOG_I_LINE("datesetpage_retrunbtn_event_handler"); if(!guider_ui.dateinfopage) { @@ -483,7 +483,7 @@ static void datesetpage_changebtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("datesetpage_changebtn_event_handler"); + LOG_I_LINE("datesetpage_changebtn_event_handler"); custom_datetime_key_status(2,LV_EVENT_CLICKED); break; } @@ -498,7 +498,7 @@ static void datesetpage_cancelbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("datesetpage_cancelbtn_event_handler"); + LOG_I_LINE("datesetpage_cancelbtn_event_handler"); if(!guider_ui.dateinfopage) { @@ -530,7 +530,7 @@ static void langinfopage_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("langinfopage_retrunbtn_event_handler"); + LOG_I_LINE("langinfopage_retrunbtn_event_handler"); if(!guider_ui.setting) { @@ -591,7 +591,7 @@ static void displayinfopage_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("displayinfopage_retrunbtn_event_handler"); + LOG_I_LINE("displayinfopage_retrunbtn_event_handler"); if(!guider_ui.setting) { @@ -666,7 +666,7 @@ static void smartinfopage_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("smartinfopage_retrunbtn_event_handler"); + LOG_I_LINE("smartinfopage_retrunbtn_event_handler"); if(!guider_ui.setting) { @@ -711,7 +711,7 @@ static void firstinfopage_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("firstinfopage_retrunbtn_event_handler"); + LOG_I_LINE("firstinfopage_retrunbtn_event_handler"); if(!guider_ui.setting) { @@ -772,7 +772,7 @@ static void relayinfopage_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("relayinfopage_retrunbtn_event_handler"); + LOG_I_LINE("relayinfopage_retrunbtn_event_handler"); if(!guider_ui.setting) { @@ -802,7 +802,7 @@ static void scene_settings_btn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("scene_settings_btn_event_handler"); + LOG_I_LINE("scene_settings_btn_event_handler"); if(!guider_ui.setting) { @@ -824,7 +824,7 @@ static void scene_tabview_1_event_handler (lv_event_t *e) { case LV_EVENT_VALUE_CHANGED: { - //LOG_I("LV_EVENT_VALUE_CHANGED"); + //LOG_I_LINE("LV_EVENT_VALUE_CHANGED"); custom_scene_btn_event(0,LV_EVENT_VALUE_CHANGED); break; } @@ -1511,7 +1511,7 @@ static void dimmer_tabview_1_event_handler (lv_event_t *e) { case LV_EVENT_VALUE_CHANGED: { - //LOG_I("LV_EVENT_VALUE_CHANGED"); + //LOG_I_LINE("LV_EVENT_VALUE_CHANGED"); custom_dimmer_btn_event(0,LV_EVENT_VALUE_CHANGED); break; } @@ -1622,7 +1622,7 @@ static void dimmer_group2_slider_temp_event_handler (lv_event_t *e) } case LV_EVENT_RELEASED: { - //LOG_I("dimmer_group2_slider_temp=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group2_slider_temp)); + //LOG_I_LINE("dimmer_group2_slider_temp=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group2_slider_temp)); custom_dimmer_group2_event(0,LV_EVENT_RELEASED); } break; @@ -1642,7 +1642,7 @@ static void dimmer_group2_slider_cold_event_handler (lv_event_t *e) } case LV_EVENT_RELEASED: { - //LOG_I("dimmer_group2_slider_cold=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group2_slider_cold)); + //LOG_I_LINE("dimmer_group2_slider_cold=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group2_slider_cold)); custom_dimmer_group2_event(1,LV_EVENT_RELEASED); } break; @@ -1695,7 +1695,7 @@ static void dimmer_group3_slider_temp_event_handler (lv_event_t *e) } case LV_EVENT_RELEASED: { - //LOG_I("dimmer_group3_slider_temp=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group3_slider_temp)); + //LOG_I_LINE("dimmer_group3_slider_temp=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group3_slider_temp)); custom_dimmer_group3_event(0,LV_EVENT_RELEASED); } break; @@ -1715,7 +1715,7 @@ static void dimmer_group3_slider_cold_event_handler (lv_event_t *e) } case LV_EVENT_RELEASED: { - //LOG_I("dimmer_group3_slider_cold=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group3_slider_cold)); + //LOG_I_LINE("dimmer_group3_slider_cold=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group3_slider_cold)); custom_dimmer_group3_event(1,LV_EVENT_RELEASED); } break; @@ -1768,7 +1768,7 @@ static void dimmer_group4_slider_temp_event_handler (lv_event_t *e) } case LV_EVENT_RELEASED: { - //LOG_I("dimmer_group4_slider_temp=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group4_slider_temp)); + //LOG_I_LINE("dimmer_group4_slider_temp=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group4_slider_temp)); custom_dimmer_group4_event(0,LV_EVENT_RELEASED); } break; @@ -1788,7 +1788,7 @@ static void dimmer_group4_slider_cold_event_handler (lv_event_t *e) } case LV_EVENT_RELEASED: { - //LOG_I("dimmer_group4_slider_cold=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group4_slider_cold)); + //LOG_I_LINE("dimmer_group4_slider_cold=%d%%",(int)lv_slider_get_value(guider_ui.dimmer_group4_slider_cold)); custom_dimmer_group4_event(1,LV_EVENT_RELEASED); } break; @@ -1842,7 +1842,7 @@ static void dimmerinfo_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("dimmerinfo_retrunbtn_event_handler"); + LOG_I_LINE("dimmerinfo_retrunbtn_event_handler"); if(!nvs_SysInfo.downligths_scutkey) { //重新加载screen_main界面 @@ -1860,7 +1860,7 @@ static void dimmerinfo_retrunbtn_event_handler (lv_event_t *e) } else { - LOG_I("downligths_scutkey is 1,disable return"); + LOG_I_LINE("downligths_scutkey is 1,disable return"); } } break; @@ -1903,7 +1903,7 @@ static void dimmerinfo_coldslider_event_handler (lv_event_t *e) } case LV_EVENT_RELEASED: { - //LOG_I("dimmerinfo_coldslider=%d%%",(int)lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); + //LOG_I_LINE("dimmerinfo_coldslider=%d%%",(int)lv_slider_get_value(guider_ui.dimmerinfo_coldslider)); custom_dimmerinfo_status(1,LV_EVENT_RELEASED);//注意:和分组界面的冷暖顺序是反的 } break; @@ -1923,7 +1923,7 @@ static void dimmerinfo_tempslider_event_handler (lv_event_t *e) } case LV_EVENT_RELEASED: { - //LOG_I("dimmerinfo_tempslider=%d%%",(int)lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); + //LOG_I_LINE("dimmerinfo_tempslider=%d%%",(int)lv_slider_get_value(guider_ui.dimmerinfo_tempslider)); custom_dimmerinfo_status(0,LV_EVENT_RELEASED); } break; @@ -2243,7 +2243,7 @@ static void curtaininfo_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("curtaininfo_retrunbtn_event_handler"); + LOG_I_LINE("curtaininfo_retrunbtn_event_handler"); if(!nvs_SysInfo.curtain_scutkey) { //界面不在就立即删除动画 @@ -2268,7 +2268,7 @@ static void curtaininfo_retrunbtn_event_handler (lv_event_t *e) } else { - LOG_I("curtain_scutkey is 1,disable return"); + LOG_I_LINE("curtain_scutkey is 1,disable return"); } break; } @@ -2311,7 +2311,7 @@ static void curtaininfo_lockbtn_1_event_handler (lv_event_t *e) // } // case LV_EVENT_RELEASED: // { -// LOG_I("curtaininfo_slider_1=%d%%",(int)lv_slider_get_value(guider_ui.curtaininfo_slider_1)); +// LOG_I_LINE("curtaininfo_slider_1=%d%%",(int)lv_slider_get_value(guider_ui.curtaininfo_slider_1)); // //custom_Downlights_key_status(2,LV_EVENT_RELEASED); // } // break; @@ -2379,7 +2379,7 @@ static void rollersinfo_retrunbtn_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("rollersinfo_retrunbtn_event_handler"); + LOG_I_LINE("rollersinfo_retrunbtn_event_handler"); if(!nvs_SysInfo.curtain_scutkey) { //重新加载screen_main界面 @@ -2397,7 +2397,7 @@ static void rollersinfo_retrunbtn_event_handler (lv_event_t *e) } else { - LOG_I("curtain_scutkey is 1,disable return"); + LOG_I_LINE("curtain_scutkey is 1,disable return"); } } break; @@ -2487,7 +2487,7 @@ static void addsubdevicepage_btn_1_event_handler(lv_event_t *e) { case LV_EVENT_RELEASED: { - LOG_I("return subdevicepage"); + LOG_I_LINE("return subdevicepage"); if(animationtimer) { @@ -2556,7 +2556,7 @@ static void device_managebtn_event_handler(lv_event_t *e) { case LV_EVENT_CLICKED: { - LOG_I("click managebtn"); + LOG_I_LINE("click managebtn"); if(animationtimer) { @@ -3365,7 +3365,7 @@ static void screensaver_btn_1_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - LOG_I("screensaver_btn_1_event_handler"); + LOG_I_LINE("screensaver_btn_1_event_handler"); if(guider_ui.screensaver) { //lv_obj_clean(guider_ui.screensaver);//删除当前显示的界面的子对象 @@ -3374,7 +3374,7 @@ static void screensaver_btn_1_event_handler (lv_event_t *e) guider_ui.screensaverflag=0; disp_driver_backlight_set(GET_nvs_Sys_Info_backlight()); - LOG_I("quit screen saver"); + LOG_I_LINE("quit screen saver"); } break; } @@ -3417,11 +3417,11 @@ static void gangonoff_btn_1_event_handler(lv_event_t *e) // if(guider_ui.device)//界面是快捷模式的时候 如果系统重启 guider_ui.device是不存在的 需要创建 // {//存在说明是设置后没有重启过,无需重新创建guider_ui.device - // LOG_I( "guider_ui.device yes"); + // LOG_I_LINE( "guider_ui.device yes"); // } // else//设备界面的快捷模式 只能在设备界面设置,因此只需要考虑guider_ui.device对象是否存在,scene switch setting导航界面的根对象是否存在不用考虑 // {//不存在说明设置过后存在重启(设备快捷模式下的重启，scene switch device setting...等界面不会存在) - // LOG_I( "guider_ui.device no and new create guider_ui.device"); + // LOG_I_LINE( "guider_ui.device no and new create guider_ui.device"); // //取消设备快捷模式后的第一次返回 重新创建 并且指定到guider_ui.device界面 // setup_scr_device(&guider_ui); // lv_scr_load(guider_ui.device); @@ -3430,7 +3430,7 @@ static void gangonoff_btn_1_event_handler(lv_event_t *e) // } // else//快捷界面模式 返回键无效 // { - // LOG_I( "gangonoff_scutkey is 1,disable return"); + // LOG_I_LINE( "gangonoff_scutkey is 1,disable return"); // } #endif } @@ -3512,11 +3512,11 @@ static void gangonoff2_btn_1_event_handler(lv_event_t *e) // if(guider_ui.device)//界面是快捷模式的时候 如果系统重启 guider_ui.device是不存在的 需要创建 // {//存在说明是设置后没有重启过,无需重新创建guider_ui.device - // LOG_I( "guider_ui.device yes"); + // LOG_I_LINE( "guider_ui.device yes"); // } // else//设备界面的快捷模式 只能在设备界面设置,因此只需要考虑guider_ui.device对象是否存在,scene switch setting导航界面的根对象是否存在不用考虑 // {//不存在说明设置过后存在重启(设备快捷模式下的重启，scene switch device setting...等界面不会存在) - // LOG_I( "guider_ui.device no and new create guider_ui.device"); + // LOG_I_LINE( "guider_ui.device no and new create guider_ui.device"); // //取消设备快捷模式后的第一次返回 重新创建 并且指定到guider_ui.device界面 // setup_scr_device(&guider_ui); // lv_scr_load(guider_ui.device); @@ -3525,7 +3525,7 @@ static void gangonoff2_btn_1_event_handler(lv_event_t *e) // } // else//快捷界面模式 返回键无效 // { - // LOG_I( "gangonoff2_scutkey is 1,disable return"); + // LOG_I_LINE( "gangonoff2_scutkey is 1,disable return"); // } #endif @@ -3628,11 +3628,11 @@ static void gangonoff3_btn_1_event_handler(lv_event_t *e) // if(guider_ui.device)//界面是快捷模式的时候 如果系统重启 guider_ui.device是不存在的 需要创建 // {//存在说明是设置后没有重启过,无需重新创建guider_ui.device - // LOG_I( "guider_ui.device yes"); + // LOG_I_LINE( "guider_ui.device yes"); // } // else//设备界面的快捷模式 只能在设备界面设置,因此只需要考虑guider_ui.device对象是否存在,scene switch setting导航界面的根对象是否存在不用考虑 // {//不存在说明设置过后存在重启(设备快捷模式下的重启，scene switch device setting...等界面不会存在) - // LOG_I( "guider_ui.device no and new create guider_ui.device"); + // LOG_I_LINE( "guider_ui.device no and new create guider_ui.device"); // //取消设备快捷模式后的第一次返回 重新创建 并且指定到guider_ui.device界面 // setup_scr_device(&guider_ui); // lv_scr_load(guider_ui.device); @@ -3641,7 +3641,7 @@ static void gangonoff3_btn_1_event_handler(lv_event_t *e) // } // else//快捷界面模式 返回键无效 // { - // LOG_I( "gangonoff3_scutkey is 1,disable return"); + // LOG_I_LINE( "gangonoff3_scutkey is 1,disable return"); // } #endif @@ -3765,11 +3765,11 @@ static void gangonoff4_btn_1_event_handler(lv_event_t *e) // if(guider_ui.device)//界面是快捷模式的时候 如果系统重启 guider_ui.device是不存在的 需要创建 // {//存在说明是设置后没有重启过,无需重新创建guider_ui.device - // LOG_I( "guider_ui.device yes"); + // LOG_I_LINE( "guider_ui.device yes"); // } // else//设备界面的快捷模式 只能在设备界面设置,因此只需要考虑guider_ui.device对象是否存在,scene switch setting导航界面的根对象是否存在不用考虑 // {//不存在说明设置过后存在重启(设备快捷模式下的重启，scene switch device setting...等界面不会存在) - // LOG_I( "guider_ui.device no and new create guider_ui.device"); + // LOG_I_LINE( "guider_ui.device no and new create guider_ui.device"); // //取消设备快捷模式后的第一次返回 重新创建 并且指定到guider_ui.device界面 // setup_scr_device(&guider_ui); // lv_scr_load(guider_ui.device); @@ -3778,7 +3778,7 @@ static void gangonoff4_btn_1_event_handler(lv_event_t *e) // } // else//快捷界面模式 返回键无效 // { - // LOG_I( "gangonoff4_scutkey is 1,disable return"); + // LOG_I_LINE( "gangonoff4_scutkey is 1,disable return"); // } #endif @@ -3923,11 +3923,11 @@ static void gangonoff6_btn_1_event_handler(lv_event_t *e) // if(guider_ui.device)//界面是快捷模式的时候 如果系统重启 guider_ui.device是不存在的 需要创建 // {//存在说明是设置后没有重启过,无需重新创建guider_ui.device - // LOG_I( "guider_ui.device yes"); + // LOG_I_LINE( "guider_ui.device yes"); // } // else//设备界面的快捷模式 只能在设备界面设置,因此只需要考虑guider_ui.device对象是否存在,scene switch setting导航界面的根对象是否存在不用考虑 // {//不存在说明设置过后存在重启(设备快捷模式下的重启，scene switch device setting...等界面不会存在) - // LOG_I( "guider_ui.device no and new create guider_ui.device"); + // LOG_I_LINE( "guider_ui.device no and new create guider_ui.device"); // //取消设备快捷模式后的第一次返回 重新创建 并且指定到guider_ui.device界面 // setup_scr_device(&guider_ui); // lv_scr_load(guider_ui.device); @@ -3936,7 +3936,7 @@ static void gangonoff6_btn_1_event_handler(lv_event_t *e) // } // else//快捷界面模式 返回键无效 // { - // LOG_I( "gangonoff6_scutkey is 1,disable return"); + // LOG_I_LINE( "gangonoff6_scutkey is 1,disable return"); // } #endif @@ -4125,7 +4125,7 @@ static void aircontrol_retrunbtn_event_handler (lv_event_t *e) } else { - LOG_I("aircontrol_scutkey is 1,disable return"); + LOG_I_LINE("aircontrol_scutkey is 1,disable return"); } } break; @@ -4286,7 +4286,7 @@ static void projectorcontrol_retrunbtn_event_handler (lv_event_t *e) } else { - LOG_I("projector_scutkey is 1,disable return"); + LOG_I_LINE("projector_scutkey is 1,disable return"); } } break; diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo.c index 4094db13..ca6b27d5 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo.c @@ -20,28 +20,28 @@ void setup_scr_curtaininfo(lv_ui *ui,Curatin_Info *curtain) { nvs_SysInfo.curtain_scutkey=0; - LOG_I("curtaininfo:curtain[0] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[0]); - LOG_I("curtaininfo:curtain[1] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[1]); - LOG_I("curtaininfo:curtain[2] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[2]); - LOG_I("curtaininfo:curtain[3] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[3]); + LOG_I_LINE("curtaininfo:curtain[0] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[0]); + LOG_I_LINE("curtaininfo:curtain[1] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[1]); + LOG_I_LINE("curtaininfo:curtain[2] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[2]); + LOG_I_LINE("curtaininfo:curtain[3] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[3]); - LOG_I("curtaininfo:current curtain address=0x%x",(uint32_t)curtain); + LOG_I_LINE("curtaininfo:current curtain address=0x%x",(uint32_t)curtain); if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[0]) { - LOG_I("curtaininfo:is equal curtain[0]"); + LOG_I_LINE("curtaininfo:is equal curtain[0]"); } else if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[1]) { - LOG_I("curtaininfo:is equal curtain[1]"); + LOG_I_LINE("curtaininfo:is equal curtain[1]"); } else if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[2]) { - LOG_I("curtaininfo:is equal curtain[2]"); + LOG_I_LINE("curtaininfo:is equal curtain[2]"); } else //if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[3]) { - LOG_I("curtaininfo:is equal curtain[3]"); + LOG_I_LINE("curtaininfo:is equal curtain[3]"); } //Write codes curtaininfo @@ -468,7 +468,7 @@ void setup_scr_curtaininfo(lv_ui *ui,Curatin_Info *curtain) lv_obj_set_x(ui->curtaininfo_leftimg,curtain->pos*1.7-170);//关x+w-->x 100*1.7=170 lv_obj_set_x(ui->curtaininfo_rightimg, 212+(170-curtain->pos*1.7) );//关x+w-->x - LOG_I("curtain->pos=%d",curtain->pos); + LOG_I_LINE("curtain->pos=%d",curtain->pos); //Update current screen layout. lv_obj_update_layout(ui->curtaininfo); diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo2.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo2.c index 653f006e..d5aa4d30 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo2.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo2.c @@ -18,28 +18,28 @@ //新窗帘界面 void setup_scr_curtaininfo2(lv_ui *ui,Curatin_Info *curtain) { - LOG_I("curtaininfo:curtain[0] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[0]); - LOG_I("curtaininfo:curtain[1] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[1]); - LOG_I("curtaininfo:curtain[2] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[2]); - LOG_I("curtaininfo:curtain[3] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[3]); + LOG_I_LINE("curtaininfo:curtain[0] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[0]); + LOG_I_LINE("curtaininfo:curtain[1] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[1]); + LOG_I_LINE("curtaininfo:curtain[2] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[2]); + LOG_I_LINE("curtaininfo:curtain[3] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[3]); - LOG_I("curtaininfo:current curtain address=0x%x",(uint32_t)curtain); + LOG_I_LINE("curtaininfo:current curtain address=0x%x",(uint32_t)curtain); if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[0]) { - LOG_I("curtaininfo:is equal curtain[0]"); + LOG_I_LINE("curtaininfo:is equal curtain[0]"); } else if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[1]) { - LOG_I("curtaininfo:is equal curtain[1]"); + LOG_I_LINE("curtaininfo:is equal curtain[1]"); } else if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[2]) { - LOG_I("curtaininfo:is equal curtain[2]"); + LOG_I_LINE("curtaininfo:is equal curtain[2]"); } else //if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[3]) { - LOG_I("curtaininfo:is equal curtain[3]"); + LOG_I_LINE("curtaininfo:is equal curtain[3]"); } //Write codes curtaininfo diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_dateinfopage.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_dateinfopage.c index a7a70196..464949ce 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_dateinfopage.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_dateinfopage.c @@ -41,8 +41,8 @@ void setup_scr_dateinfopage(lv_ui *ui) time(&now); localtime_r(&now, &timeinfo); - LOG_I("timezone utc:%d",tz_get()); - LOG_I("time==%d:%d:%d:%d:%02d:%02d:%02d:%02d:%02d", + LOG_I_LINE("timezone utc:%d",tz_get()); + LOG_I_LINE("time==%d:%d:%d:%d:%02d:%02d:%02d:%02d:%02d", timeinfo.tm_isdst, //是否为夏时制 timeinfo.tm_yday, //一年过去的天数 timeinfo.tm_wday, //星期，1对应星期一 diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_datesetpage.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_datesetpage.c index 429477b3..fc36975f 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_datesetpage.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_datesetpage.c @@ -29,8 +29,8 @@ void setup_scr_datesetpage(lv_ui *ui) time(&now); localtime_r(&now, &timeinfo); - LOG_I("timezone utc:%d",tz_get()); - LOG_I("time==%d:%d:%d:%d:%02d:%02d:%02d:%02d:%02d", + LOG_I_LINE("timezone utc:%d",tz_get()); + LOG_I_LINE("time==%d:%d:%d:%d:%02d:%02d:%02d:%02d:%02d", timeinfo.tm_isdst, //是否为夏时制 timeinfo.tm_yday, //一年过去的天数 timeinfo.tm_wday, //星期，1对应星期一 @@ -200,7 +200,9 @@ void setup_scr_datesetpage(lv_ui *ui) //Write codes datesetpage_yearddlist ui->datesetpage_yearddlist = lv_dropdown_create(ui->datesetpage); - lv_dropdown_set_options(ui->datesetpage_yearddlist, "2024\n2025\n2026\n2027\n2028\n2029\n2030\n2031\n2032\n2033\n2034\n2035\n2036\n2037\n2038\n2039\n2040\n2041\n2042\n2043\n2044\n2045\n2046\n2047\n2048\n2049\n2050\n2051\n2052\n2053\n2054\n2055\n2056\n2057\n2058\n2059\n2060\n2061\n2062\n2063\n2064\n2065\n2066\n2067\n2068\n2069\n2070\n2071\n2072\n2073\n2074\n2075\n2076\n2077\n2078\n2079\n2080\n2081\n2082\n2083\n2084\n2085\n2086\n2087\n2088\n2089\n2090\n2091\n2092\n2093\n2094\n2095\n2096\n2097\n2098\n2099"); +// lv_dropdown_set_options(ui->datesetpage_yearddlist, "2024\n2025\n2026\n2027\n2028\n2029\n2030\n2031\n2032\n2033\n2034\n2035\n2036\n2037\n2038\n2039\n2040\n2041\n2042\n2043\n2044\n2045\n2046\n2047\n2048\n2049\n2050\n2051\n2052\n2053\n2054\n2055\n2056\n2057\n2058\n2059\n2060\n2061\n2062\n2063\n2064\n2065\n2066\n2067\n2068\n2069\n2070\n2071\n2072\n2073\n2074\n2075\n2076\n2077\n2078\n2079\n2080\n2081\n2082\n2083\n2084\n2085\n2086\n2087\n2088\n2089\n2090\n2091\n2092\n2093\n2094\n2095\n2096\n2097\n2098\n2099"); + lv_dropdown_set_options(ui->datesetpage_yearddlist, "2024\n2025\n2026\n2027\n2028\n2029\n2030\n2031\n2032\n2033\n2034\n2035\n2036\n2037"); + lv_obj_set_pos(ui->datesetpage_yearddlist, 39, 210); lv_obj_set_size(ui->datesetpage_yearddlist, 120, 35); //(timeinfo.tm_year+1900)-2004 @@ -360,7 +362,7 @@ void setup_scr_datesetpage(lv_ui *ui) lv_obj_set_pos(ui->datesetpage_sunddlist, 310, 210); lv_obj_set_size(ui->datesetpage_sunddlist, 80, 35); - LOG_I("tm_mday:%d",timeinfo.tm_mday-1); + LOG_I_LINE("tm_mday:%d",timeinfo.tm_mday-1); //timeinfo.tm_mday//日期：日，从1开始 ;所以-1转换 lv_dropdown_set_selected(ui->datesetpage_sunddlist,timeinfo.tm_mday-1); diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_device.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_device.c index 2a9d32ba..084b85ee 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_device.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_device.c @@ -3446,66 +3446,66 @@ void setup_scr_device(lv_ui *ui) { if((i==0)&&nvs_SysInfo.subdevice_array[i])//场景开关1路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang1(ui,ui->device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,170); y=y+170+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } if((i==1)&&nvs_SysInfo.subdevice_array[i])//场景开关2路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang2(ui,ui->device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,170); y=y+170+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } if((i==2)&&nvs_SysInfo.subdevice_array[i])//场景开关3路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang3(ui,ui->device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,170); y=y+170+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } if((i==3)&&nvs_SysInfo.subdevice_array[i])//场景开关4路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang4(ui,ui->device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,170); y=y+170+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } if((i==4)&&nvs_SysInfo.subdevice_array[i])//场景开关6路 { - LOG_I("create gang before x=%d",y); + LOG_I_LINE("create gang before x=%d",y); create_device_gang6(ui,ui->device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,250); y=y+250+2;//2个空格的间隙 - LOG_I("create gang after x=%d",y); + LOG_I_LINE("create gang after x=%d",y); } else if((i==5)&&nvs_SysInfo.subdevice_array[i])//空调 { - LOG_I("create air before x=%d",y); + LOG_I_LINE("create air before x=%d",y); create_device_air(ui,ui->device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,100); y=y+100+2;//2个空格的间隙 - LOG_I("create air after x=%d",y); + LOG_I_LINE("create air after x=%d",y); } else if((i==6)&&nvs_SysInfo.subdevice_array[i])//投影仪 { - LOG_I("create curtain before x=%d",y); + LOG_I_LINE("create curtain before x=%d",y); create_device_projector(ui,ui->device_cont_1,D_SUBDEVICE_X,y,D_SUBDEVICE_WIDTH,100); y=y+100+2;//2个空格的间隙 - LOG_I("create curtain after x=%d",y); + LOG_I_LINE("create curtain after x=%d",y); } } diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_dimmerinfo.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_dimmerinfo.c index 4735a110..cf091fea 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_dimmerinfo.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_dimmerinfo.c @@ -21,28 +21,28 @@ void setup_scr_dimmerinfo(lv_ui *ui,Downlights_Info *downlight) { nvs_SysInfo.downligths_scutkey=0; - LOG_I("dimmerinfo:downlights[0] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[0]); - LOG_I("dimmerinfo:downlights[1] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[1]); - LOG_I("dimmerinfo:downlights[2] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[2]); - LOG_I("dimmerinfo:downlights[3] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[3]); + LOG_I_LINE("dimmerinfo:downlights[0] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[0]); + LOG_I_LINE("dimmerinfo:downlights[1] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[1]); + LOG_I_LINE("dimmerinfo:downlights[2] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[2]); + LOG_I_LINE("dimmerinfo:downlights[3] address=0x%x",(uint32_t)&nvs_SysInfo.downlights[3]); - LOG_I("dimmerinfo:current downlight address=0x%x",(uint32_t)downlight); + LOG_I_LINE("dimmerinfo:current downlight address=0x%x",(uint32_t)downlight); if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[0]) { - LOG_I("dimmerinfo:is equal downlights[0]"); + LOG_I_LINE("dimmerinfo:is equal downlights[0]"); } else if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[1]) { - LOG_I("dimmerinfo:is equal downlights[1]"); + LOG_I_LINE("dimmerinfo:is equal downlights[1]"); } else if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[2]) { - LOG_I("dimmerinfo:is equal downlights[2]"); + LOG_I_LINE("dimmerinfo:is equal downlights[2]"); } else //if(downlight==(Downlights_Info *)&nvs_SysInfo.downlights[3]) { - LOG_I("dimmerinfo:is equal downlights[3]"); + LOG_I_LINE("dimmerinfo:is equal downlights[3]"); } //Write codes dimmerinfo diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_rollersinfo.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_rollersinfo.c index 619184b7..b4e39d8c 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_rollersinfo.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_rollersinfo.c @@ -20,28 +20,28 @@ void setup_scr_rollersinfo(lv_ui *ui,Curatin_Info *curtain) { nvs_SysInfo.curtain_scutkey=0; - LOG_I("rollersinfo:curtain[0] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[0]); - LOG_I("rollersinfo:curtain[1] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[1]); - LOG_I("rollersinfo:curtain[2] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[2]); - LOG_I("rollersinfo:curtain[3] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[3]); + LOG_I_LINE("rollersinfo:curtain[0] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[0]); + LOG_I_LINE("rollersinfo:curtain[1] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[1]); + LOG_I_LINE("rollersinfo:curtain[2] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[2]); + LOG_I_LINE("rollersinfo:curtain[3] address=0x%x",(uint32_t)&nvs_SysInfo.curtains[3]); - LOG_I("rollersinfo:current curtain address=0x%x",(uint32_t)curtain); + LOG_I_LINE("rollersinfo:current curtain address=0x%x",(uint32_t)curtain); if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[0]) { - LOG_I("rollersinfo:is equal curtain[0]"); + LOG_I_LINE("rollersinfo:is equal curtain[0]"); } else if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[1]) { - LOG_I("rollersinfo:is equal curtain[1]"); + LOG_I_LINE("rollersinfo:is equal curtain[1]"); } else if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[2]) { - LOG_I("rollersinfo:is equal curtain[2]"); + LOG_I_LINE("rollersinfo:is equal curtain[2]"); } else //if(curtain==(Curatin_Info *)&nvs_SysInfo.curtains[3]) { - LOG_I("rollersinfo:is equal curtain[3]"); + LOG_I_LINE("rollersinfo:is equal curtain[3]"); } //Write codes rollersinfo 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 e7db6add..38c885db 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 @@ -966,7 +966,7 @@ void setup_scr_scene(lv_ui *ui) lv_obj_set_style_img_opa(ui->scene_scenes_page_icon, 255, LV_PART_MAIN|LV_STATE_DEFAULT); uint16_t tab_cur=lv_tabview_get_tab_act(ui->scene_tabview_1); - //LOG_I("scene tabview1 page %d",tab_cur); + //LOG_I_LINE("scene tabview1 page %d",tab_cur); if(tab_cur==1) { lv_img_set_src(ui->scene_scenes_page_icon, LVGL_PATH(page_sw2_42x22.png)); diff --git a/application/rt-thread/t3e-pro/components/generated/setup_scr_setting.c b/application/rt-thread/t3e-pro/components/generated/setup_scr_setting.c index 365cd26a..321ec1f3 100644 --- a/application/rt-thread/t3e-pro/components/generated/setup_scr_setting.c +++ b/application/rt-thread/t3e-pro/components/generated/setup_scr_setting.c @@ -500,7 +500,7 @@ void setup_scr_setting(lv_ui *ui) lv_img_set_pivot(ui->setting_smartconfiimg_1, 0,0); lv_img_set_angle(ui->setting_smartconfiimg_1, 0); lv_obj_set_pos(ui->setting_smartconfiimg_1, 14, 202); - lv_obj_set_size(ui->setting_smartconfiimg_1, 30, 30); + lv_obj_set_size(ui->setting_smartconfiimg_1, 30, 24); //Write style for setting_smartconfiimg_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. lv_obj_set_style_img_opa(ui->setting_smartconfiimg_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT); diff --git a/application/rt-thread/t3e-pro/components/gui_guider.c b/application/rt-thread/t3e-pro/components/gui_guider.c index c8b4993d..28216898 100644 --- a/application/rt-thread/t3e-pro/components/gui_guider.c +++ b/application/rt-thread/t3e-pro/components/gui_guider.c @@ -603,23 +603,23 @@ void gui_guider_init(void) ////speech_uart_int(); //上电设置亮度 disp_driver_backlight_set(GET_nvs_Sys_Info_backlight()); - LOG_I("backlight:0x%d",GET_nvs_Sys_Info_backlight()); + LOG_I_LINE("backlight:0x%d",GET_nvs_Sys_Info_backlight()); - //创建任务 监控内存 - monitor_thread = rt_thread_create("monitor", //名称 - monitorTask, //线程代码 - RT_NULL, //参数 - 4096, //栈大小 - 11, //优先级 - 10); //时间片 - if (monitor_thread != RT_NULL) - { - rt_thread_startup(monitor_thread); //线程进入就绪态 - } - else - { - LOG_I("monitor_thread create failure\n"); - } + // //创建任务 监控内存 + // monitor_thread = rt_thread_create("monitor", //名称 + // monitorTask, //线程代码 + // RT_NULL, //参数 + // 4096, //栈大小 + // 11, //优先级 + // 10); //时间片 + // if (monitor_thread != RT_NULL) + // { + // rt_thread_startup(monitor_thread); //线程进入就绪态 + // } + // else + // { + // LOG_I_LINE("monitor_thread create failure\n"); + // } #else // #define IMG_SWICH_test "L:/rodata/lvgl_data/test1.png" diff --git a/application/rt-thread/t3e-pro/components/gui_guider.h b/application/rt-thread/t3e-pro/components/gui_guider.h index 21c6a9ca..26f79d68 100644 --- a/application/rt-thread/t3e-pro/components/gui_guider.h +++ b/application/rt-thread/t3e-pro/components/gui_guider.h @@ -35,6 +35,8 @@ extern "C" { //#include "guider_fonts.h" +#define LOG_I_LINE(fmt, ...) LOG_I("(%s@%d) " fmt, __FUNCTION__, __LINE__, ##__VA_ARGS__) + //rtthread 入口 void gui_guider_init(void); diff --git a/application/rt-thread/t3e-pro/components/mcu_sdk/src/protocol.c b/application/rt-thread/t3e-pro/components/mcu_sdk/src/protocol.c index 9862f106..7ede7b59 100644 --- a/application/rt-thread/t3e-pro/components/mcu_sdk/src/protocol.c +++ b/application/rt-thread/t3e-pro/components/mcu_sdk/src/protocol.c @@ -2436,7 +2436,7 @@ static unsigned char dp_download_scene_switch6_6_handle(unsigned short seq_num,c *****************************************************************************/ static unsigned char dp_download_scene_name_update_handle(unsigned short seq_num,const unsigned char value[], unsigned short length) { - LOG_I("scene_name_update:%d",length); + LOG_I_LINE("scene_name_update:%d",length); //示例:当前DP类型为RAW unsigned char ret; /* @@ -2473,7 +2473,7 @@ static unsigned char dp_download_scene_name_update_handle(unsigned short seq_num 校验和 5f */ //解析dp - LOG_I("name value dp:%d,font len:%d",value[0],value[1]); + LOG_I_LINE("name value dp:%d,font len:%d",value[0],value[1]); //区分是设置哪个的 if((value[0]>=24)&&(value[0]<=27))//设置开关的(1~4路) {//名字和icon都修改 @@ -2481,7 +2481,7 @@ static unsigned char dp_download_scene_name_update_handle(unsigned short seq_num { memset(nvs_SysInfo.relay1.Label,0,D_Relay_Label_MAX); memcpy(nvs_SysInfo.relay1.Label,&value[2],length-2); - LOG_I("switch name:%s",nvs_SysInfo.relay1.Label); + LOG_I_LINE("switch name:%s",nvs_SysInfo.relay1.Label); } else if(value[0]==25)//2路 { @@ -2503,7 +2503,7 @@ static unsigned char dp_download_scene_name_update_handle(unsigned short seq_num {//名字和icon都修改 memset(nvs_SysInfo.scen_array[value[0]-1].Label ,0,D_Scene_Label_MAX); memcpy(nvs_SysInfo.scen_array[value[0]-1].Label ,&value[2],length-2); - LOG_I("scene[%d] name:%s",value[0]-1,nvs_SysInfo.scen_array[value[0]-1].Label); + LOG_I_LINE("scene[%d] name:%s",value[0]-1,nvs_SysInfo.scen_array[value[0]-1].Label); } else if((value[0]>=142)&&(value[0]<=157))//场景开关（142~157） { @@ -2594,7 +2594,7 @@ static unsigned char dp_download_scene_name_update_handle(unsigned short seq_num { memset(nvs_SysInfo.downlights[0].Label,0,D_Downlights_Label_MAX); memcpy(nvs_SysInfo.downlights[0].Label,&value[2],length-2); - LOG_I("downlights name:%s",nvs_SysInfo.downlights[0].Label); + LOG_I_LINE("downlights name:%s",nvs_SysInfo.downlights[0].Label); } else if(value[0]==122)//灯组2 { @@ -2627,7 +2627,7 @@ static unsigned char dp_download_scene_name_update_handle(unsigned short seq_num { memset(nvs_SysInfo.curtains[0].Label,0,D_Curatin_Label_MAX); memcpy(nvs_SysInfo.curtains[0].Label,&value[2],length-2); - LOG_I("curtains name:%s",nvs_SysInfo.curtains[0].Label); + LOG_I_LINE("curtains name:%s",nvs_SysInfo.curtains[0].Label); } else if(value[0]==134)//窗帘组2 { @@ -2673,13 +2673,13 @@ static unsigned char dp_download_scene_picture_update_handle(unsigned short seq_ { //示例:当前DP类型为RAW unsigned char ret; - LOG_I("scene_picture_update %d",length); + LOG_I_LINE("scene_picture_update %d",length); /* //RAW type data processing */ //解析dp - LOG_I("pic value dp:%d,icon index:%d",value[0],value[2]); + LOG_I_LINE("pic value dp:%d,icon index:%d",value[0],value[2]); //区分是设置哪个的 if((value[0]>=24)&&(value[0]<=27))//设置开关的(1~4路) {//app从0开始 t3e-pro从1开始 @@ -2703,7 +2703,7 @@ static unsigned char dp_download_scene_picture_update_handle(unsigned short seq_ else if((value[0]>=1)&&(value[0]<=8))//首屏场景（1~8) {//名字和icon都修改 //nvs_SysInfo.scen_array[value[0]-1].icon=value[2]+1; - //LOG_I("scene[%d] icon:%s",value[0]-1,nvs_SysInfo.scen_array[value[0]-1].icon); + //LOG_I_LINE("scene[%d] icon:%s",value[0]-1,nvs_SysInfo.scen_array[value[0]-1].icon); } else if((value[0]>=142)&&(value[0]<=157))//场景开关（142~157） {//暂时不改图标 diff --git a/application/rt-thread/t3e-pro/components/mcu_sdk/src/system.c b/application/rt-thread/t3e-pro/components/mcu_sdk/src/system.c index 178736a1..043f7e72 100644 --- a/application/rt-thread/t3e-pro/components/mcu_sdk/src/system.c +++ b/application/rt-thread/t3e-pro/components/mcu_sdk/src/system.c @@ -16,8 +16,11 @@ #include "zigbee.h" #include "time.h" +#include "gui_guider.h" #define DBG_TAG "zig_system" +#define DBG_LVL DBG_LOG +#include extern const DOWNLOAD_CMD_S download_cmd[]; @@ -272,11 +275,11 @@ static unsigned char zigbee_data_point_handle(unsigned short seq_num,const unsig index = get_dowmload_dpid_index(dp_id); if(dp_type != download_cmd[index].dp_type){ - LOG_I("dp-id type error"); + LOG_I_LINE("dp-id type error"); return FALSE; } else{ - LOG_I("dp:%d-type:%d-seq_num:%d",download_cmd[index].dp_id,download_cmd[index].dp_type,seq_num); + LOG_I_LINE("dp:%d-type:%d-seq_num:%d",download_cmd[index].dp_id,download_cmd[index].dp_type,seq_num); ret = dp_download_handle(seq_num,dp_id,value + 4,dp_len); } diff --git a/application/rt-thread/t3e-pro/components/mcu_sdk/zigbee_fun.c b/application/rt-thread/t3e-pro/components/mcu_sdk/zigbee_fun.c index 7f6684f7..98c93e33 100644 --- a/application/rt-thread/t3e-pro/components/mcu_sdk/zigbee_fun.c +++ b/application/rt-thread/t3e-pro/components/mcu_sdk/zigbee_fun.c @@ -19,6 +19,7 @@ #include "nvs_eepom.h" #include "zigbee_fun.h" #include "zigbee.h" +#include "gui_guider.h" // #define TAG "zigbee_R" // #define TAGT "zigbee_T" @@ -26,8 +27,11 @@ #define DBG_TAG "zigbee" -#define DBG_LVL DBG_INFO +#define DBG_LVL DBG_LOG #include +#ifdef RT_USING_ULOG +#include +#endif //接收消息 rt_mq_t zig_rx_evt_queue = NULL; //定义一个队列返回变量 @@ -63,11 +67,11 @@ int zigbee_uart_int(void) char uart_name[]="uart3"; #endif - LOG_I("Try to open(%s)",uart_name); + LOG_I_LINE("Try to open(%s)",uart_name); serial = rt_device_find(uart_name); if (!serial) { - LOG_I("find %s failed!\n", uart_name); + LOG_I_LINE("find %s failed!\n", uart_name); return -RT_ERROR; } @@ -75,7 +79,7 @@ int zigbee_uart_int(void) // ASSERT(ret != RT_EOK, "open %s failed : %d !\n", uart_name, ret); if (ret != RT_EOK) { - LOG_I("open %s failed : %d !\n", uart_name, ret); + LOG_I_LINE("open %s failed : %d !\n", uart_name, ret); return -RT_ERROR; } //uart_config. @@ -106,7 +110,7 @@ int zigbee_uart_int(void) } else { - LOG_I("dynamic_thread create failure\n"); + LOG_I_LINE("dynamic_thread create failure\n"); } return RT_EOK; @@ -139,8 +143,8 @@ void zigbee_uart_sendByte(unsigned char value) void zigbee_uart_sendBytes(unsigned char *in, unsigned short len) { - //LOG_I("zigbee_uart_sendBytes\n"); - esp_log_buffer_hex(LOG_TAG,(const char *)in,len);//一行 32byte内容 + //LOG_I_LINE("zigbee_uart_sendBytes\n"); + esp_log_buffer_hex(DBG_TAG,(const char *)in,len);//一行 32byte内容 rt_device_write(serial, 0, in, len); } @@ -167,7 +171,7 @@ void zigbee_fun_task(void *pvParameter) // Configure a temporary buffer for the incoming data uint8_t *rxdata = (uint8_t *) malloc(ZIG_RX_BUF_SIZE); - LOG_I("zigbee_fun_task running"); + LOG_I_LINE("zigbee_fun_task running"); // for(;;) // { @@ -178,7 +182,7 @@ void zigbee_fun_task(void *pvParameter) for(;;) { // // rt_thread_mdelay(1000); -// // LOG_I("zigbee_fun_task"); +// // LOG_I_LINE("zigbee_fun_task"); // // zigbee_uart_service(); // // // const int rxBytes = uart_read_bytes(ZIG_UART_NUM, rxdata, ZIG_RX_BUF_SIZE,50 / portTICK_RATE_MS); @@ -188,11 +192,11 @@ void zigbee_fun_task(void *pvParameter) // // // // esp_log_buffer_hex(TAG,rxdata,rxBytes); // // //将接收到的数据发出去 -// // //LOG_I( "rx:%s", (char *)rxdata); +// // //LOG_I_LINE( "rx:%s", (char *)rxdata); // // } if(evt.buffStr)//接收到的是指针 用完释放内存 { - LOG_I("free receData.buffStr:%x",(uint32_t)evt.buffStr); + LOG_I_LINE("free receData.buffStr:%x",(uint32_t)evt.buffStr); free(evt.buffStr); evt.buffStr=NULL; } @@ -438,25 +442,25 @@ void zigbee_fun_task(void *pvParameter) break; case ZIG_STATE_SCENE_5: { - LOG_I("SCENE_5"); + LOG_I_LINE("SCENE_5"); mcu_dp_enum_update(DPID_SCENE_5,0); } break; case ZIG_STATE_SCENE_6: { - LOG_I("SCENE_6"); + LOG_I_LINE("SCENE_6"); mcu_dp_enum_update(DPID_SCENE_6,0); } break; case ZIG_STATE_SCENE_7: { - LOG_I("SCENE_7"); + LOG_I_LINE("SCENE_7"); mcu_dp_enum_update(DPID_SCENE_7,0); } break; case ZIG_STATE_SCENE_8: { - LOG_I("SCENE_8"); + LOG_I_LINE("SCENE_8"); mcu_dp_enum_update(DPID_SCENE_8,0); } break; @@ -770,126 +774,126 @@ void zigbee_fun_task(void *pvParameter) //空调 case ZIG_STATE_SCENE_AirconditionerON://空调开(可下发可上报) { - LOG_I("ZIG_STATE_SCENE_AirconditionerON"); + LOG_I_LINE("ZIG_STATE_SCENE_AirconditionerON"); mcu_dp_enum_update(DPID_SCENE_AIR_SWITCH,0); } break; case ZIG_STATE_SCENE_AirconditionerOFF://空调关(可下发可上报) { - LOG_I("ZIG_STATE_SCENE_AirconditionerOFF"); + LOG_I_LINE("ZIG_STATE_SCENE_AirconditionerOFF"); mcu_dp_enum_update(DPID_SCENE_AIR_SWITCH,1); } break; //设备界面的 case ZIG_STATE_SCENE_Airconditionercool://制冷(可下发可上报) { - LOG_I("ZIG_STATE_SCENE_Airconditionercool"); + LOG_I_LINE("ZIG_STATE_SCENE_Airconditionercool"); mcu_dp_enum_update(DPID_SCENE_AIR_MODE,nvs_SysInfo.airconditioner.mode); } break; case ZIG_STATE_SCENE_Airconditionerheat://制热(可下发可上报) { - LOG_I("ZIG_STATE_SCENE_Airconditionercool"); + LOG_I_LINE("ZIG_STATE_SCENE_Airconditionercool"); mcu_dp_enum_update(DPID_SCENE_AIR_MODE,nvs_SysInfo.airconditioner.mode); } break; case ZIG_STATE_SCENE_Airconditionermode://空调模式 {//AUTO, COOL, HEAT, DRY, FAN - LOG_I("ZIG_STATE_SCENE_Airconditionermode"); + LOG_I_LINE("ZIG_STATE_SCENE_Airconditionermode"); mcu_dp_enum_update(DPID_SCENE_AIR_MODE,nvs_SysInfo.airconditioner.mode); } break; case ZIG_STATE_SCENE_Airconditionerspeed://空调风速 {//AUTO, LOW, MEDIUM, HIGH - LOG_I("ZIG_STATE_SCENE_Airconditionerspeed"); + LOG_I_LINE("ZIG_STATE_SCENE_Airconditionerspeed"); mcu_dp_enum_update(DPID_SCENE_AIR_SPEED,nvs_SysInfo.airconditioner.speed); } break; case ZIG_STATE_SCENE_Airconditionerdirect://空调风向 {//AUTO, UP, MEDIUM, DOWN, LEFTORRIGHT - LOG_I("ZIG_STATE_SCENE_Airconditionerdirect"); + LOG_I_LINE("ZIG_STATE_SCENE_Airconditionerdirect"); mcu_dp_enum_update(DPID_SCENE_AIR_FAN,nvs_SysInfo.airconditioner.direct); } break; case ZIG_STATE_SCENE_Airconditionertempadd://增加1°(可下发可上报) case ZIG_STATE_SCENE_Airconditionertempsub://减少1°(可下发可上报) { - LOG_I("ZIG_STATE_SCENE_Airconditionertemp"); + LOG_I_LINE("ZIG_STATE_SCENE_Airconditionertemp"); mcu_dp_enum_update(DPID_SCENE_AIR_TEMP,nvs_SysInfo.airconditioner.temp); } break; //投影仪 case ZIG_STATE_SCENE_ProjectorON: { - LOG_I("ZIG_STATE_SCENE_ProjectorON"); + LOG_I_LINE("ZIG_STATE_SCENE_ProjectorON"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_SWITCH,0); } break; case ZIG_STATE_SCENE_ProjectorOFF: { - LOG_I("ZIG_STATE_SCENE_ProjectorOFF"); + LOG_I_LINE("ZIG_STATE_SCENE_ProjectorOFF"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_SWITCH,1); } break; case ZIG_STATE_SCENE_Projector_volume: { - LOG_I("ZIG_STATE_SCENE_Projector_volume"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_volume"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_VOLUME,nvs_SysInfo.projector.volume); } break; case ZIG_STATE_SCENE_Projector_quit: { - LOG_I("ZIG_STATE_SCENE_Projector_quit"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_quit"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_QUIT,0); } break; case ZIG_STATE_SCENE_Projector_return: { - LOG_I("ZIG_STATE_SCENE_Projector_return"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_return"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_RETURN,0); } break; case ZIG_STATE_SCENE_Projector_home: { - LOG_I("ZIG_STATE_SCENE_Projector_home"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_home"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_HOME,0); } break; case ZIG_STATE_SCENE_Projector_menu: { - LOG_I("ZIG_STATE_SCENE_Projector_menu"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_menu"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_MENU,0); } break; case ZIG_STATE_SCENE_Projector_up: { - LOG_I("ZIG_STATE_SCENE_Projector_up"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_up"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_DIRECTION,0); } break; case ZIG_STATE_SCENE_Projector_down: { - LOG_I("ZIG_STATE_SCENE_Projector_down"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_down"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_DIRECTION,1); } break; case ZIG_STATE_SCENE_Projector_left: { - LOG_I("ZIG_STATE_SCENE_Projector_left"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_left"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_DIRECTION,2); } break; case ZIG_STATE_SCENE_Projector_right: { - LOG_I("ZIG_STATE_SCENE_Projector_right"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_right"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_DIRECTION,3); } break; case ZIG_STATE_SCENE_Projector_sure: { - LOG_I("ZIG_STATE_SCENE_Projector_sure"); + LOG_I_LINE("ZIG_STATE_SCENE_Projector_sure"); mcu_dp_enum_update(DPID_SCENE_PROJECTOR_SURE,0); } break; @@ -897,52 +901,52 @@ void zigbee_fun_task(void *pvParameter) case ZIG_STATE_GANG11on: case ZIG_STATE_GANG1_ALLon: { - LOG_I("gang 1 on"); + LOG_I_LINE("gang 1 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH1_1,0);//enum:on(0) off(1) } break; case ZIG_STATE_GANG11off: case ZIG_STATE_GANG1_ALLoff: { - LOG_I("gang 1 off"); + LOG_I_LINE("gang 1 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH1_1,1); } break; //1路场景开关1 case ZIG_STATE_GANG21on: { - LOG_I("gang 21 on"); + LOG_I_LINE("gang 21 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH2_1,0); } break; case ZIG_STATE_GANG21off: { - LOG_I("gang 21 off"); + LOG_I_LINE("gang 21 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH2_1,1); } break; case ZIG_STATE_GANG22on: { - LOG_I("gang 22 on"); + LOG_I_LINE("gang 22 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH2_2,0); } break; case ZIG_STATE_GANG22off: { - LOG_I("gang 22 off"); + LOG_I_LINE("gang 22 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH2_2,1); } break; case ZIG_STATE_GANG2_ALLon: { - LOG_I("gang2 all on"); + LOG_I_LINE("gang2 all on"); mcu_dp_enum_update(DPID_SCENE_SWITCH2_1,0); mcu_dp_enum_update(DPID_SCENE_SWITCH2_1,0); } break; case ZIG_STATE_GANG2_ALLoff: { - LOG_I("gang2 all off"); + LOG_I_LINE("gang2 all off"); mcu_dp_enum_update(DPID_SCENE_SWITCH2_1,1); mcu_dp_enum_update(DPID_SCENE_SWITCH2_1,1); } @@ -951,43 +955,43 @@ void zigbee_fun_task(void *pvParameter) //3路场景开关 case ZIG_STATE_GANG31on: { - LOG_I("gang 31 on"); + LOG_I_LINE("gang 31 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH3_1,0); } break; case ZIG_STATE_GANG31off: { - LOG_I("gang 31 off"); + LOG_I_LINE("gang 31 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH3_1,1); } break; case ZIG_STATE_GANG32on: { - LOG_I("gang 32 on"); + LOG_I_LINE("gang 32 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH3_2,0); } break; case ZIG_STATE_GANG32off: { - LOG_I("gang 32 off"); + LOG_I_LINE("gang 32 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH3_2,1); } break; case ZIG_STATE_GANG33on: { - LOG_I("gang 33 on"); + LOG_I_LINE("gang 33 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH3_3,0); } break; case ZIG_STATE_GANG33off: { - LOG_I("gang 33 off"); + LOG_I_LINE("gang 33 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH3_3,1); } break; case ZIG_STATE_GANG3_ALLon: { - LOG_I("gang3 all on"); + LOG_I_LINE("gang3 all on"); mcu_dp_enum_update(DPID_SCENE_SWITCH3_1,0); mcu_dp_enum_update(DPID_SCENE_SWITCH3_2,0); mcu_dp_enum_update(DPID_SCENE_SWITCH3_3,0); @@ -995,7 +999,7 @@ void zigbee_fun_task(void *pvParameter) break; case ZIG_STATE_GANG3_ALLoff: { - LOG_I("gang3 all off"); + LOG_I_LINE("gang3 all off"); mcu_dp_enum_update(DPID_SCENE_SWITCH3_1,1); mcu_dp_enum_update(DPID_SCENE_SWITCH3_2,1); mcu_dp_enum_update(DPID_SCENE_SWITCH3_3,1); @@ -1004,55 +1008,55 @@ void zigbee_fun_task(void *pvParameter) //4路场景开关 case ZIG_STATE_GANG41on: { - LOG_I("gang 41 on"); + LOG_I_LINE("gang 41 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_1,0); } break; case ZIG_STATE_GANG41off: { - LOG_I("gang 41 off"); + LOG_I_LINE("gang 41 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_1,1); } break; case ZIG_STATE_GANG42on: { - LOG_I("gang 42 on"); + LOG_I_LINE("gang 42 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_2,0); } break; case ZIG_STATE_GANG42off: { - LOG_I("gang 42 off"); + LOG_I_LINE("gang 42 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_2,1); } break; case ZIG_STATE_GANG43on: { - LOG_I("gang 43 on"); + LOG_I_LINE("gang 43 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_3,0); } break; case ZIG_STATE_GANG43off: { - LOG_I("gang 43 off"); + LOG_I_LINE("gang 43 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_3,1); } break; case ZIG_STATE_GANG44on: { - LOG_I("gang 44 on"); + LOG_I_LINE("gang 44 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_4,0); } break; case ZIG_STATE_GANG44off: { - LOG_I("gang 44 off"); + LOG_I_LINE("gang 44 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_4,1); } break; case ZIG_STATE_GANG4_ALLon: { - LOG_I("gang4 all on"); + LOG_I_LINE("gang4 all on"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_1,0); mcu_dp_enum_update(DPID_SCENE_SWITCH4_2,0); mcu_dp_enum_update(DPID_SCENE_SWITCH4_3,0); @@ -1061,7 +1065,7 @@ void zigbee_fun_task(void *pvParameter) break; case ZIG_STATE_GANG4_ALLoff: { - LOG_I("gang4 all off"); + LOG_I_LINE("gang4 all off"); mcu_dp_enum_update(DPID_SCENE_SWITCH4_1,1); mcu_dp_enum_update(DPID_SCENE_SWITCH4_2,1); mcu_dp_enum_update(DPID_SCENE_SWITCH4_3,1); @@ -1071,79 +1075,79 @@ void zigbee_fun_task(void *pvParameter) //6路场景开关 case ZIG_STATE_GANG61on: { - LOG_I("gang 61 on"); + LOG_I_LINE("gang 61 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_1,0); } break; case ZIG_STATE_GANG61off: { - LOG_I("gang 61 off"); + LOG_I_LINE("gang 61 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_1,1); } break; case ZIG_STATE_GANG62on: { - LOG_I("gang 62 on"); + LOG_I_LINE("gang 62 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_2,0); } break; case ZIG_STATE_GANG62off: { - LOG_I("gang 62 off"); + LOG_I_LINE("gang 62 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_2,1); } break; case ZIG_STATE_GANG63on: { - LOG_I("gang 63 on"); + LOG_I_LINE("gang 63 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_3,0); } break; case ZIG_STATE_GANG63off: { - LOG_I("gang 63 off"); + LOG_I_LINE("gang 63 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_3,1); } break; case ZIG_STATE_GANG64on: { - LOG_I("gang 64 on"); + LOG_I_LINE("gang 64 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_4,0); } break; case ZIG_STATE_GANG64off: { - LOG_I("gang 64 off"); + LOG_I_LINE("gang 64 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_4,1); } break; case ZIG_STATE_GANG65on: { - LOG_I("gang 65 on"); + LOG_I_LINE("gang 65 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_5,0); } break; case ZIG_STATE_GANG65off: { - LOG_I("gang 65 off"); + LOG_I_LINE("gang 65 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_5,1); } break; case ZIG_STATE_GANG66on: { - LOG_I("gang 66 on"); + LOG_I_LINE("gang 66 on"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_6,0); } break; case ZIG_STATE_GANG66off: { - LOG_I("gang 66 off"); + LOG_I_LINE("gang 66 off"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_6,1); } break; case ZIG_STATE_GANG6_ALLon: { - LOG_I("gang6 all on"); + LOG_I_LINE("gang6 all on"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_1,0); mcu_dp_enum_update(DPID_SCENE_SWITCH6_2,0); mcu_dp_enum_update(DPID_SCENE_SWITCH6_3,0); @@ -1154,7 +1158,7 @@ void zigbee_fun_task(void *pvParameter) break; case ZIG_STATE_GANG6_ALLoff: { - LOG_I("gang6 all off"); + LOG_I_LINE("gang6 all off"); mcu_dp_enum_update(DPID_SCENE_SWITCH6_1,1); mcu_dp_enum_update(DPID_SCENE_SWITCH6_2,1); mcu_dp_enum_update(DPID_SCENE_SWITCH6_3,1); @@ -1167,7 +1171,7 @@ void zigbee_fun_task(void *pvParameter) default: { - LOG_I( "event error!!!"); + LOG_I_LINE( "event error!!!"); } break; } @@ -1178,14 +1182,15 @@ void zigbee_fun_task(void *pvParameter) int rxBytes = rt_device_read(serial, -1, rxdata, ZIG_RX_BUF_SIZE); if (rxBytes > 0) { - //rxdata[rxBytes] = 0;//在串口接收的数据增加结束符 - //LOG_I( "rx:%s", (char *)rxdata); - LOG_I("rxBytes:%d\r\n",rxBytes); - esp_log_buffer_hex(LOG_TAG,rxdata,rxBytes); - //ulog_hexdump(DBG_TAG,16,&rxdata,rxBytes); + // //rxdata[rxBytes] = 0;//在串口接收的数据增加结束符 + // //LOG_I_LINE( "rx:%s", (char *)rxdata); + // LOG_I_LINE("rxBytes:%d\r\n",rxBytes); + // esp_log_buffer_hex(LOG_TAG,rxdata,rxBytes); + // //ulog_hexdump(DBG_TAG,16,&rxdata,rxBytes); + LOG_HEX(DBG_TAG,16,rxdata,rxBytes); for(int rxBytesindex=0;rxBytesindex #endif - +extern void disp_driver_backlight_set(int brightness); int main(void) { #ifdef ULOG_USING_FILTER ulog_global_filter_lvl_set(ULOG_OUTPUT_LVL); #endif + + disp_driver_backlight_set(100); return 0; } diff --git a/bsp/peripheral/touch/gt911/src/gt911.c b/bsp/peripheral/touch/gt911/src/gt911.c index 9072abf8..8fa9e57d 100644 --- a/bsp/peripheral/touch/gt911/src/gt911.c +++ b/bsp/peripheral/touch/gt911/src/gt911.c @@ -193,6 +193,7 @@ static void gt911_touch_up(void *buf, int8_t id) read_data[id].y_coordinate = pre_y[id]; read_data[id].track_id = id; + pre_x[id] = -1; /* last point is none */ pre_y[id] = -1; pre_w[id] = -1; @@ -472,8 +473,8 @@ static int rt_hw_gt911_init(const char *name, struct rt_touch_config *cfg) rt_pin_write(*(rt_uint8_t *)cfg->user_data, PIN_HIGH); rt_thread_delay(5); - // rst input - rt_pin_mode(*(rt_uint8_t *)cfg->user_data, PIN_MODE_INPUT); + // // rst input + // rt_pin_mode(*(rt_uint8_t *)cfg->user_data, PIN_MODE_INPUT); //irq output 0 rt_pin_mode(cfg->irq_pin.pin, PIN_MODE_OUTPUT); diff --git a/d12x_t3e-pro_qang3_v1.0.6.img b/d12x_t3e-pro_qang3_v1.0.6.img new file mode 100644 index 00000000..a94d68d9 Binary files /dev/null and b/d12x_t3e-pro_qang3_v1.0.6.img differ diff --git a/d12x_t3e-pro_qang4_v1.0.6.img b/d12x_t3e-pro_qang4_v1.0.6.img new file mode 100644 index 00000000..190685bf Binary files /dev/null and b/d12x_t3e-pro_qang4_v1.0.6.img differ diff --git a/packages/artinchip/lvgl-ui/aic_drivers/lv_tpc_run.c b/packages/artinchip/lvgl-ui/aic_drivers/lv_tpc_run.c index ae6dff46..c6160471 100644 --- a/packages/artinchip/lvgl-ui/aic_drivers/lv_tpc_run.c +++ b/packages/artinchip/lvgl-ui/aic_drivers/lv_tpc_run.c @@ -76,7 +76,7 @@ static void touch_entry(void *parameter) /* touch panel control entry */ u16X = read_data[i].x_coordinate; u16Y = read_data[i].y_coordinate; - // rt_kprintf("[%d] %d %d\n", read_data[i].event, u16X, u16Y); + rt_kprintf("[%d] %d %d\n", read_data[i].event, u16X, u16Y); aic_touch_inputevent_cb(u16X, u16Y, read_data[i].event); } } 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 5ac36725..b601fe67 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/t3e_pro标准版_v1.0.5.zip b/t3e_pro标准版_v1.0.5.zip deleted file mode 100644 index 11d8c2c2..00000000 Binary files a/t3e_pro标准版_v1.0.5.zip and /dev/null 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 d0af2fab..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 @@ -1562,7 +1562,7 @@ CONFIG_AIC_DMA_DRV_TEST=y CONFIG_AIC_MTOP_DRV_TEST=y # CONFIG_AIC_AUDIO_DRV_TEST is not set # CONFIG_AIC_I2C_DRV_TEST is not set -# CONFIG_AIC_TP_DRV_TEST is not set +CONFIG_AIC_TP_DRV_TEST=y CONFIG_AIC_WDT_DRV_TEST=y CONFIG_AIC_TSEN_TEST=y # CONFIG_AIC_TSEN_HIGH_TEMP_ALARM_TEST is not set diff --git a/target/d12x/t3e-pro/pack/.image_cfg.json.tmp b/target/d12x/t3e-pro/pack/.image_cfg.json.tmp index 6386a1d9..feed8055 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.5", + "version": "1.0.6", "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 8e0b601d..20e814bd 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 36717f20..63cf7c3d 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.5", + "version": "1.0.6", "media": { "type": "spi-nor", "device_id": 0, diff --git a/target/d12x/t3e-pro/pinmux.c b/target/d12x/t3e-pro/pinmux.c index 409a72d5..5793b032 100644 --- a/target/d12x/t3e-pro/pinmux.c +++ b/target/d12x/t3e-pro/pinmux.c @@ -52,7 +52,7 @@ struct aic_pinmux aic_pinmux_config[] = { #endif #ifdef AIC_USING_CTP {1, PIN_PULL_DIS, 3, AIC_TOUCH_PANEL_RST_PIN}, - {1, PIN_PULL_DIS, 3, AIC_TOUCH_PANEL_INT_PIN}, + {1, PIN_PULL_UP, 3, AIC_TOUCH_PANEL_INT_PIN},//硬件没贴上拉电阻 芯片的上拉打开 #endif #if defined(AIC_USING_QSPI0) && !defined(AIC_SYSCFG_SIP_FLASH_ENABLE) /* qspi0 */ diff --git a/tools/env/tools/ConEmu/ConEmu.xml b/tools/env/tools/ConEmu/ConEmu.xml index 57bf40dd..eca981e2 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 bf29846f..aac7c5b0 100644 --- a/tools/env/tools/ConEmu/ConEmu/clink/profile/.history +++ b/tools/env/tools/ConEmu/ConEmu/clink/profile/.history @@ -142,3 +142,13 @@ me me bm me +me +me +me +bm +me +me +bm +me +me\ +me diff --git a/ui/luban-lite-t3e-pre-gui.zip b/ui/luban-lite-t3e-pre-gui.zip index 8c9ed60a..88fcbb1e 100644 Binary files a/ui/luban-lite-t3e-pre-gui.zip and b/ui/luban-lite-t3e-pre-gui.zip differ diff --git a/ui/luban-lite-t3e-pre-guisetting.zip b/ui/luban-lite-t3e-pre-guisetting.zip index 3cb60cca..34062961 100644 Binary files a/ui/luban-lite-t3e-pre-guisetting.zip and b/ui/luban-lite-t3e-pre-guisetting.zip differ diff --git a/ui/luban-lite-t3e-pre-navi_gui.zip b/ui/luban-lite-t3e-pre-navi_gui.zip index c0c04a15..601001dd 100644 Binary files a/ui/luban-lite-t3e-pre-navi_gui.zip and b/ui/luban-lite-t3e-pre-navi_gui.zip differ diff --git a/ui/luban-lite-t3e-pre_Device.zip b/ui/luban-lite-t3e-pre_Device.zip index 1c26a4eb..c79f6b16 100644 Binary files a/ui/luban-lite-t3e-pre_Device.zip and b/ui/luban-lite-t3e-pre_Device.zip differ diff --git a/ui/luban-lite-t3e-pre_Device_light.zip b/ui/luban-lite-t3e-pre_Device_light.zip index b1389e83..fa1d3d7e 100644 Binary files a/ui/luban-lite-t3e-pre_Device_light.zip and b/ui/luban-lite-t3e-pre_Device_light.zip differ