wen/luban-lite-t3e-pro
1
0
Fork 0
mirror of https://gitee.com/Vancouver2017/luban-lite-t3e-pro.git synced 2025-12-15 10:58:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

first commit

Browse Source
This commit is contained in:
wen
2025-09-30 13:08:23 +08:00
parent ec83999cef
commit 015a4f689d
38 changed files with 628 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/rt-thread/t3e-pro/components/FontEnum.h
View File

@@ -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
{

4
application/rt-thread/t3e-pro/components/RTC_Clock/ESP32_Clock.c
View File

@@ -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)
{

695
application/rt-thread/t3e-pro/components/custom/custom.c
View File

File diff suppressed because it is too large Load Diff

130
application/rt-thread/t3e-pro/components/generated/events_init.c
View File

@@ -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;

20
application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo.c
View File

@@ -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);

18
application/rt-thread/t3e-pro/components/generated/setup_scr_curtaininfo2.c
View File

@@ -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

4
application/rt-thread/t3e-pro/components/generated/setup_scr_dateinfopage.c
View File

@@ -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对应星期一

10
application/rt-thread/t3e-pro/components/generated/setup_scr_datesetpage.c
View File

@@ -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);

28
application/rt-thread/t3e-pro/components/generated/setup_scr_device.c
View File

@@ -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);
}
}

18
application/rt-thread/t3e-pro/components/generated/setup_scr_dimmerinfo.c
View File

@@ -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

18
application/rt-thread/t3e-pro/components/generated/setup_scr_rollersinfo.c
View File

@@ -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

2
application/rt-thread/t3e-pro/components/generated/setup_scr_scene.c
View File

@@ -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));

2
application/rt-thread/t3e-pro/components/generated/setup_scr_setting.c
View File

@@ -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);

32
application/rt-thread/t3e-pro/components/gui_guider.c
View File

@@ -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"

2
application/rt-thread/t3e-pro/components/gui_guider.h
View File

@@ -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);

18
application/rt-thread/t3e-pro/components/mcu_sdk/src/protocol.c
View File

@@ -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）
{//暂时不改图标

7
application/rt-thread/t3e-pro/components/mcu_sdk/src/system.c
View File

@@ -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 <rtdbg.h>
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);
}

169
application/rt-thread/t3e-pro/components/mcu_sdk/zigbee_fun.c
View File

@@ -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 <rtdbg.h>
#ifdef RT_USING_ULOG
#include <ulog.h>
#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<rxBytes;rxBytesindex++)
{
//LOG_I("rxBytesindex:%d",rxBytesindex);
//LOG_I_LINE("rxBytesindex:%d",rxBytesindex);
//uart_receive_input(ch);//#error "please call this fuction in the interrupt fuction of serial receive, and delete this line"
uart_receive_input(rxdata[rxBytesindex]);//#error "please call this fuction in the interrupt fuction of serial receive, and delete this line"
}

4
application/rt-thread/t3e-pro/main.c
View File

@@ -10,11 +10,13 @@
#ifdef RT_USING_ULOG
#include <ulog.h>
#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;
}