Fix page name on long_press of buttons pages

Solves #1535 Solves #1534 Solves #1511
2024-01-05 13:30:19 +01:00
parent a259d354b3
commit 68d921c1ee
38 changed files with 30 additions and 30 deletions
--- 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
--- a/advanced/hmi/nspanel_CJK_eu.HMI
+++ b/advanced/hmi/nspanel_CJK_eu.HMI
--- a/advanced/hmi/nspanel_CJK_eu.tft
+++ b/advanced/hmi/nspanel_CJK_eu.tft
--- 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
--- 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
--- 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
--- 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
--- a/advanced/hmi/nspanel_CJK_us.HMI
+++ b/advanced/hmi/nspanel_CJK_us.HMI
--- a/advanced/hmi/nspanel_CJK_us.tft
+++ b/advanced/hmi/nspanel_CJK_us.tft
--- 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
--- 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
--- 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
--- 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
--- a/advanced/hmi/nspanel_CJK_us_land.HMI
+++ b/advanced/hmi/nspanel_CJK_us_land.HMI
--- a/advanced/hmi/nspanel_CJK_us_land.tft
+++ b/advanced/hmi/nspanel_CJK_us_land.tft
--- 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
--- 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
--- 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
--- 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
--- a/advanced/hmi/nspanel_eu.HMI
+++ b/advanced/hmi/nspanel_eu.HMI
--- 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
--- 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
--- 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
--- 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
--- a/advanced/hmi/nspanel_us.HMI
+++ b/advanced/hmi/nspanel_us.HMI
--- 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
--- 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
--- 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
--- 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
--- a/advanced/hmi/nspanel_us_land.HMI
+++ b/advanced/hmi/nspanel_us_land.HMI
--- 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
--- 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
--- 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
--- 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
--- a/nspanel_esphome_prebuilt.bin
+++ b/nspanel_esphome_prebuilt.bin
--- a/nspanel_eu.tft
+++ b/nspanel_eu.tft
--- a/nspanel_us.tft
+++ b/nspanel_us.tft
--- a/nspanel_us_land.tft
+++ b/nspanel_us_land.tft