Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V4.4.0.dev5 #2364

Merged
merged 4 commits into from
Nov 4, 2024
Merged

V4.4.0.dev5 #2364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
229b9ff
Pre-built firmware update: 11645696136
actions-user Nov 2, 2024
33bc685
Increase field length for Thai support
edwardtfn Nov 3, 2024
eff3380
Cleanup POSIX timezone name before sending to ESP
edwardtfn Nov 4, 2024
7e3f9a0
Merge branch 'dev' of https://github.com/Blackymas/NSPanel_HA_Bluepri…
edwardtfn Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions esphome/nspanel_esphome_core_datetime.yaml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading