diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml index 0661bc6..5408e56 100644 --- a/advanced/esphome/nspanel_esphome_core.yaml +++ b/advanced/esphome/nspanel_esphome_core.yaml @@ -2463,8 +2463,8 @@ script: then: - lambda: |- static const char *const TAG = "script.set_baud_rate"; - ESP_LOGW(TAG, "Baud rate changing from %i to %i bps", tf_uart->get_baud_rate(), baud_rate); - ESP_LOGW(TAG, "Flush UART"); + ESP_LOGD(TAG, "Baud rate changing from %i to %i bps", tf_uart->get_baud_rate(), baud_rate); + ESP_LOGD(TAG, "Flush UART"); - wait_until: condition: - lambda: !lambda return (tf_uart->available() < 1); @@ -2472,9 +2472,9 @@ script: - lambda: |- tf_uart->flush(); static const char *const TAG = "script.set_baud_rate"; - ESP_LOGW(TAG, "Sending instruction '%s=%i' to Nextion", definitive ? "bauds" : "baud", baud_rate); + ESP_LOGD(TAG, "Sending instruction '%s=%i' to Nextion", definitive ? "bauds" : "baud", baud_rate); disp1->send_command_printf("%s=%i", definitive ? "bauds" : "baud", baud_rate); - ESP_LOGW(TAG, "Flush UART"); + ESP_LOGD(TAG, "Flush UART"); - wait_until: condition: - lambda: !lambda return (tf_uart->available() < 1); @@ -2482,10 +2482,10 @@ script: - lambda: |- tf_uart->flush(); static const char *const TAG = "script.set_baud_rate"; - ESP_LOGW(TAG, "Set ESPHome new baud rate to %i bps", baud_rate); + ESP_LOGD(TAG, "Set ESPHome new baud rate to %i bps", baud_rate); tf_uart->set_baud_rate(baud_rate); tf_uart->load_settings(); - ESP_LOGW(TAG, "Baud rate is changet to %i bps", baud_rate); + ESP_LOGD(TAG, "Baud rate is changet to %i bps", baud_rate); - id: set_brightness mode: restart diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI index a5b12c9..766d208 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.HMI and b/advanced/hmi/nspanel_CJK_eu.HMI differ diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft index 2141702..2988955 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.tft and b/advanced/hmi/nspanel_CJK_eu.tft differ diff --git a/advanced/hmi/nspanel_CJK_eu_code/buttonpage01.txt b/advanced/hmi/nspanel_CJK_eu_code/buttonpage01.txt index 90c84e9..3d5cd4a 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/buttonpage01.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_eu_code/buttonpage02.txt b/advanced/hmi/nspanel_CJK_eu_code/buttonpage02.txt index 932bc71..05f8066 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/buttonpage02.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_eu_code/buttonpage03.txt b/advanced/hmi/nspanel_CJK_eu_code/buttonpage03.txt index 3f8d73c..1d3e055 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/buttonpage03.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_eu_code/buttonpage04.txt b/advanced/hmi/nspanel_CJK_eu_code/buttonpage04.txt index 4ae9d31..2997786 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/buttonpage04.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI index 0d41f6a..7cad689 100644 Binary files a/advanced/hmi/nspanel_CJK_us.HMI and b/advanced/hmi/nspanel_CJK_us.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us.tft b/advanced/hmi/nspanel_CJK_us.tft index be79007..f055e14 100644 Binary files a/advanced/hmi/nspanel_CJK_us.tft and b/advanced/hmi/nspanel_CJK_us.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_code/buttonpage01.txt b/advanced/hmi/nspanel_CJK_us_code/buttonpage01.txt index 90c84e9..3d5cd4a 100644 --- a/advanced/hmi/nspanel_CJK_us_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_CJK_us_code/buttonpage01.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_us_code/buttonpage02.txt b/advanced/hmi/nspanel_CJK_us_code/buttonpage02.txt index 932bc71..05f8066 100644 --- a/advanced/hmi/nspanel_CJK_us_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_CJK_us_code/buttonpage02.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_us_code/buttonpage03.txt b/advanced/hmi/nspanel_CJK_us_code/buttonpage03.txt index 3f8d73c..1d3e055 100644 --- a/advanced/hmi/nspanel_CJK_us_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_CJK_us_code/buttonpage03.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_us_code/buttonpage04.txt b/advanced/hmi/nspanel_CJK_us_code/buttonpage04.txt index 4ae9d31..2997786 100644 --- a/advanced/hmi/nspanel_CJK_us_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_CJK_us_code/buttonpage04.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI index fd42a09..54b0b74 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.HMI and b/advanced/hmi/nspanel_CJK_us_land.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us_land.tft b/advanced/hmi/nspanel_CJK_us_land.tft index f6518c9..34ed3d6 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.tft and b/advanced/hmi/nspanel_CJK_us_land.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage01.txt b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage01.txt index 90c84e9..3d5cd4a 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage01.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage02.txt b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage02.txt index 932bc71..05f8066 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage02.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage03.txt b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage03.txt index 3f8d73c..1d3e055 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage03.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage04.txt b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage04.txt index 4ae9d31..2997786 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/buttonpage04.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index 5ac2672..d284500 100644 Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ diff --git a/advanced/hmi/nspanel_eu_code/buttonpage01.txt b/advanced/hmi/nspanel_eu_code/buttonpage01.txt index 90c84e9..3d5cd4a 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage01.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_eu_code/buttonpage02.txt b/advanced/hmi/nspanel_eu_code/buttonpage02.txt index 932bc71..05f8066 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage02.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_eu_code/buttonpage03.txt b/advanced/hmi/nspanel_eu_code/buttonpage03.txt index 3f8d73c..1d3e055 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage03.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_eu_code/buttonpage04.txt b/advanced/hmi/nspanel_eu_code/buttonpage04.txt index 4ae9d31..2997786 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage04.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index 8926e0d..e1711f8 100644 Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ diff --git a/advanced/hmi/nspanel_us_code/buttonpage01.txt b/advanced/hmi/nspanel_us_code/buttonpage01.txt index 90c84e9..3d5cd4a 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage01.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us_code/buttonpage02.txt b/advanced/hmi/nspanel_us_code/buttonpage02.txt index 932bc71..05f8066 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage02.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us_code/buttonpage03.txt b/advanced/hmi/nspanel_us_code/buttonpage03.txt index 3f8d73c..1d3e055 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage03.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us_code/buttonpage04.txt b/advanced/hmi/nspanel_us_code/buttonpage04.txt index 4ae9d31..2997786 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage04.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index 2153dc7..4256277 100644 Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage01.txt b/advanced/hmi/nspanel_us_land_code/buttonpage01.txt index 90c84e9..3d5cd4a 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage01.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage02.txt b/advanced/hmi/nspanel_us_land_code/buttonpage02.txt index 932bc71..05f8066 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage02.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage03.txt b/advanced/hmi/nspanel_us_land_code/buttonpage03.txt index 3f8d73c..1d3e055 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage03.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage04.txt b/advanced/hmi/nspanel_us_land_code/buttonpage04.txt index 4ae9d31..2997786 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage04.txt @@ -713,7 +713,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \""+page_name.txt+"\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/nspanel_esphome_prebuilt.bin b/nspanel_esphome_prebuilt.bin index 2eb7800..ca28de3 100644 Binary files a/nspanel_esphome_prebuilt.bin and b/nspanel_esphome_prebuilt.bin differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 4e96b56..80aca0f 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 457118e..76bcdd8 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 6d060ec..6aee764 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ