Skip to content

Commit

Permalink
Merge pull request #2364 from Blackymas/v4.4.0.dev5
Browse files Browse the repository at this point in the history 
V4.4.0.dev5
  • Loading branch information
@edwardtfn
edwardtfn authored Nov 4, 2024
2 parents 2771322 + 7e3f9a0 commit 1dbb9e7
Show file tree
Hide file tree
Showing 83 changed files with 467 additions and 464 deletions.
27 changes: 15 additions & 12 deletions esphome/nspanel_esphome_core_datetime.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,21 @@ script:
then:
- lambda: |-
ESP_LOGI("script.set_timezone", "Setting timezone: %s", timezone.c_str());
- if:
condition:
- lambda: return (timezone != id(mui_timezone));
then:
- lambda: |-
id(mui_timezone) = timezone;
if (timezone.empty())
arch_restart(); // Restart when timezone is set to blank so it uses the one from ESPHome compiller
time_provider->set_timezone(timezone.c_str());
time_provider->call_setup();
time_provider->dump_config();
refresh_datetime->execute();
if (timezone != id(mui_timezone)) {
id(mui_timezone) = timezone;
if (timezone.empty())
arch_restart(); // Restart when timezone is set to blank so it uses the one from ESPHome compiller
size_t start = id(mui_timezone).find('<');
size_t end = id(mui_timezone).find('>');
if (start != std::string::npos && end != std::string::npos && end > start)
id(mui_timezone).replace(start, (end - start) + 1, "UTC");
if (id(mui_timezone).empty())
arch_restart(); // Restart when timezone is set to blank so it uses the one from ESPHome compiller
time_provider->set_timezone(id(mui_timezone).c_str());
time_provider->call_setup();
}
time_provider->dump_config();
refresh_datetime->execute();
- id: !extend set_var_string
then:
Expand Down
32 changes: 16 additions & 16 deletions hmi/dev/nspanel_CJK_eu_code/buttonpage01.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ Text button01text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button02text
Attributes
Expand All @@ -187,7 +187,7 @@ Text button02text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button03text
Attributes
Expand All @@ -197,7 +197,7 @@ Text button03text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button04text
Attributes
Expand All @@ -207,7 +207,7 @@ Text button04text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button05text
Attributes
Expand All @@ -217,7 +217,7 @@ Text button05text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button06text
Attributes
Expand All @@ -227,7 +227,7 @@ Text button06text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button07text
Attributes
Expand All @@ -237,7 +237,7 @@ Text button07text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button08text
Attributes
Expand All @@ -247,7 +247,7 @@ Text button08text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button01icon
Attributes
Expand Down Expand Up @@ -337,7 +337,7 @@ Text button01bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button02bri
Attributes
Expand All @@ -347,7 +347,7 @@ Text button02bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button03bri
Attributes
Expand All @@ -357,7 +357,7 @@ Text button03bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button04bri
Attributes
Expand All @@ -367,7 +367,7 @@ Text button04bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button05bri
Attributes
Expand All @@ -377,7 +377,7 @@ Text button05bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button06bri
Attributes
Expand All @@ -387,7 +387,7 @@ Text button06bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button07bri
Attributes
Expand All @@ -397,7 +397,7 @@ Text button07bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button08bri
Attributes
Expand All @@ -407,7 +407,7 @@ Text button08bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Button button_back
Attributes
Expand Down
32 changes: 16 additions & 16 deletions hmi/dev/nspanel_CJK_eu_code/buttonpage02.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ Text button01text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button02text
Attributes
Expand All @@ -187,7 +187,7 @@ Text button02text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button03text
Attributes
Expand All @@ -197,7 +197,7 @@ Text button03text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button04text
Attributes
Expand All @@ -207,7 +207,7 @@ Text button04text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button05text
Attributes
Expand All @@ -217,7 +217,7 @@ Text button05text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button06text
Attributes
Expand All @@ -227,7 +227,7 @@ Text button06text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button07text
Attributes
Expand All @@ -237,7 +237,7 @@ Text button07text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button08text
Attributes
Expand All @@ -247,7 +247,7 @@ Text button08text
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 22
Max. Text Size : 40

Text button01icon
Attributes
Expand Down Expand Up @@ -337,7 +337,7 @@ Text button01bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button02bri
Attributes
Expand All @@ -347,7 +347,7 @@ Text button02bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button03bri
Attributes
Expand All @@ -357,7 +357,7 @@ Text button03bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button04bri
Attributes
Expand All @@ -367,7 +367,7 @@ Text button04bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button05bri
Attributes
Expand All @@ -377,7 +377,7 @@ Text button05bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button06bri
Attributes
Expand All @@ -387,7 +387,7 @@ Text button06bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button07bri
Attributes
Expand All @@ -397,7 +397,7 @@ Text button07bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Text button08bri
Attributes
Expand All @@ -407,7 +407,7 @@ Text button08bri
Send Component ID : disabled
Associated Keyboard: none
Text :
Max. Text Size : 4
Max. Text Size : 10

Button button_back
Attributes
Expand Down
Loading

0 comments on commit 1dbb9e7

Please sign in to comment.