diff --git a/esphome/nspanel_esphome_core_page_boot.yaml b/esphome/nspanel_esphome_core_page_boot.yaml index a50c711c2..1923a0440 100644 --- a/esphome/nspanel_esphome_core_page_boot.yaml +++ b/esphome/nspanel_esphome_core_page_boot.yaml @@ -20,10 +20,21 @@ script: - lambda: |- ESP_LOGI("script.boot_log", "%s: %s", category.c_str(), log_message.c_str()); if (current_page->state == "boot"){ - disp1->send_command_printf("log_body.txt+=\"%s: %s\\r\"", category.c_str(), log_message.c_str()); - disp1->send_command("click log_box,1"); + std::string combined_log = category + ": " + log_message; + if (combined_log.length() > 40) { + combined_log = combined_log.substr(0, 40); + } + disp1->send_command_printf("log_body.txt+=\"%s\\r\"", combined_log.c_str()); + boot_log_scroll->execute(); } + - id: boot_log_scroll + mode: restart + then: + - delay: 1s + - lambda: |- + disp1->send_command("click log_box,1"); + - id: !extend boot_progress then: - lambda: |- diff --git a/hmi/dev/nspanel_CJK_eu_code/boot.txt b/hmi/dev/nspanel_CJK_eu_code/boot.txt index a10792e24..e309a7a4d 100644 --- a/hmi/dev/nspanel_CJK_eu_code/boot.txt +++ b/hmi/dev/nspanel_CJK_eu_code/boot.txt @@ -101,7 +101,7 @@ Text log_body Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 800 + Max. Text Size : 1000 Text initializing Attributes @@ -270,6 +270,7 @@ Text log_box substr log_body.txt,log_body.txt,log_start_pos.val+2,log_len.val-log_start_pos.val-2 } log_line_count.val-- + doevents } Text log_title @@ -324,11 +325,11 @@ Timer tm_esphome printh 00 printh FF FF FF counter.val++ - if(counter.val>30) + if(counter.val>360) { rest } - sys0=counter.val%10 + sys0=counter.val%60 if(sys0==0) { bauds=115200 diff --git a/hmi/dev/nspanel_CJK_us_code/boot.txt b/hmi/dev/nspanel_CJK_us_code/boot.txt index f3dd06941..e651e0fc6 100644 --- a/hmi/dev/nspanel_CJK_us_code/boot.txt +++ b/hmi/dev/nspanel_CJK_us_code/boot.txt @@ -101,7 +101,7 @@ Text log_body Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 800 + Max. Text Size : 1000 Text initializing Attributes @@ -270,6 +270,7 @@ Text log_box substr log_body.txt,log_body.txt,log_start_pos.val+2,log_len.val-log_start_pos.val-2 } log_line_count.val-- + doevents } Text log_title @@ -324,11 +325,11 @@ Timer tm_esphome printh 00 printh FF FF FF counter.val++ - if(counter.val>30) + if(counter.val>360) { rest } - sys0=counter.val%10 + sys0=counter.val%60 if(sys0==0) { bauds=115200 diff --git a/hmi/dev/nspanel_CJK_us_land_code/boot.txt b/hmi/dev/nspanel_CJK_us_land_code/boot.txt index a10792e24..e309a7a4d 100644 --- a/hmi/dev/nspanel_CJK_us_land_code/boot.txt +++ b/hmi/dev/nspanel_CJK_us_land_code/boot.txt @@ -101,7 +101,7 @@ Text log_body Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 800 + Max. Text Size : 1000 Text initializing Attributes @@ -270,6 +270,7 @@ Text log_box substr log_body.txt,log_body.txt,log_start_pos.val+2,log_len.val-log_start_pos.val-2 } log_line_count.val-- + doevents } Text log_title @@ -324,11 +325,11 @@ Timer tm_esphome printh 00 printh FF FF FF counter.val++ - if(counter.val>30) + if(counter.val>360) { rest } - sys0=counter.val%10 + sys0=counter.val%60 if(sys0==0) { bauds=115200 diff --git a/hmi/dev/nspanel_eu_code/boot.txt b/hmi/dev/nspanel_eu_code/boot.txt index a10792e24..e309a7a4d 100644 --- a/hmi/dev/nspanel_eu_code/boot.txt +++ b/hmi/dev/nspanel_eu_code/boot.txt @@ -101,7 +101,7 @@ Text log_body Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 800 + Max. Text Size : 1000 Text initializing Attributes @@ -270,6 +270,7 @@ Text log_box substr log_body.txt,log_body.txt,log_start_pos.val+2,log_len.val-log_start_pos.val-2 } log_line_count.val-- + doevents } Text log_title @@ -324,11 +325,11 @@ Timer tm_esphome printh 00 printh FF FF FF counter.val++ - if(counter.val>30) + if(counter.val>360) { rest } - sys0=counter.val%10 + sys0=counter.val%60 if(sys0==0) { bauds=115200 diff --git a/hmi/dev/nspanel_us_code/boot.txt b/hmi/dev/nspanel_us_code/boot.txt index f3dd06941..e651e0fc6 100644 --- a/hmi/dev/nspanel_us_code/boot.txt +++ b/hmi/dev/nspanel_us_code/boot.txt @@ -101,7 +101,7 @@ Text log_body Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 800 + Max. Text Size : 1000 Text initializing Attributes @@ -270,6 +270,7 @@ Text log_box substr log_body.txt,log_body.txt,log_start_pos.val+2,log_len.val-log_start_pos.val-2 } log_line_count.val-- + doevents } Text log_title @@ -324,11 +325,11 @@ Timer tm_esphome printh 00 printh FF FF FF counter.val++ - if(counter.val>30) + if(counter.val>360) { rest } - sys0=counter.val%10 + sys0=counter.val%60 if(sys0==0) { bauds=115200 diff --git a/hmi/dev/nspanel_us_land_code/boot.txt b/hmi/dev/nspanel_us_land_code/boot.txt index a10792e24..e309a7a4d 100644 --- a/hmi/dev/nspanel_us_land_code/boot.txt +++ b/hmi/dev/nspanel_us_land_code/boot.txt @@ -101,7 +101,7 @@ Text log_body Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 800 + Max. Text Size : 1000 Text initializing Attributes @@ -270,6 +270,7 @@ Text log_box substr log_body.txt,log_body.txt,log_start_pos.val+2,log_len.val-log_start_pos.val-2 } log_line_count.val-- + doevents } Text log_title @@ -324,11 +325,11 @@ Timer tm_esphome printh 00 printh FF FF FF counter.val++ - if(counter.val>30) + if(counter.val>360) { rest } - sys0=counter.val%10 + sys0=counter.val%60 if(sys0==0) { bauds=115200 diff --git a/hmi/nspanel_CJK_eu.HMI b/hmi/nspanel_CJK_eu.HMI index 508d3f013..1a30601d9 100644 Binary files a/hmi/nspanel_CJK_eu.HMI and b/hmi/nspanel_CJK_eu.HMI differ diff --git a/hmi/nspanel_CJK_eu.tft b/hmi/nspanel_CJK_eu.tft index 28bb07e14..5055ea145 100644 Binary files a/hmi/nspanel_CJK_eu.tft and b/hmi/nspanel_CJK_eu.tft differ diff --git a/hmi/nspanel_CJK_us.HMI b/hmi/nspanel_CJK_us.HMI index 491bf813f..16864f733 100644 Binary files a/hmi/nspanel_CJK_us.HMI and b/hmi/nspanel_CJK_us.HMI differ diff --git a/hmi/nspanel_CJK_us.tft b/hmi/nspanel_CJK_us.tft index 1d913dd29..420a3140e 100644 Binary files a/hmi/nspanel_CJK_us.tft and b/hmi/nspanel_CJK_us.tft differ diff --git a/hmi/nspanel_CJK_us_land.HMI b/hmi/nspanel_CJK_us_land.HMI index 5fe25b4b4..a8c9dc400 100644 Binary files a/hmi/nspanel_CJK_us_land.HMI and b/hmi/nspanel_CJK_us_land.HMI differ diff --git a/hmi/nspanel_CJK_us_land.tft b/hmi/nspanel_CJK_us_land.tft index 963ab6cf8..96d5235f6 100644 Binary files a/hmi/nspanel_CJK_us_land.tft and b/hmi/nspanel_CJK_us_land.tft differ diff --git a/hmi/nspanel_eu.HMI b/hmi/nspanel_eu.HMI index 27938346e..9ffa37c7f 100644 Binary files a/hmi/nspanel_eu.HMI and b/hmi/nspanel_eu.HMI differ diff --git a/hmi/nspanel_eu.tft b/hmi/nspanel_eu.tft index 13e1a2426..0cacb8105 100644 Binary files a/hmi/nspanel_eu.tft and b/hmi/nspanel_eu.tft differ diff --git a/hmi/nspanel_us.HMI b/hmi/nspanel_us.HMI index 4c4071d33..a9e0896d4 100644 Binary files a/hmi/nspanel_us.HMI and b/hmi/nspanel_us.HMI differ diff --git a/hmi/nspanel_us.tft b/hmi/nspanel_us.tft index 0d37f1187..2dd0178b5 100644 Binary files a/hmi/nspanel_us.tft and b/hmi/nspanel_us.tft differ diff --git a/hmi/nspanel_us_land.HMI b/hmi/nspanel_us_land.HMI index 29bd25164..956ff3ab2 100644 Binary files a/hmi/nspanel_us_land.HMI and b/hmi/nspanel_us_land.HMI differ diff --git a/hmi/nspanel_us_land.tft b/hmi/nspanel_us_land.tft index 20153bc73..3d9b7cbab 100644 Binary files a/hmi/nspanel_us_land.tft and b/hmi/nspanel_us_land.tft differ