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.

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.3.12.dev #2367

Merged
merged 2 commits into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions esphome/nspanel_esphome_core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3151,14 +3151,10 @@ script:
ESP_LOGI("script.set_timezone", "Setting timezone: %s", timezone.c_str());
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();
}
Expand Down
27 changes: 12 additions & 15 deletions nspanel_blueprint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7944,7 +7944,7 @@
lock:
"on": ["unlocked"]
"off": ["locked"]
# yamllint enable rule:truthy rule:line-length rule:comments-indentation

Check warning on line 7947 in nspanel_blueprint.yaml

View workflow job for this annotation

GitHub Actions / Validate Blueprint YAML

7947:7 [comments-indentation] comment not indented like content

Check warning on line 7947 in nspanel_blueprint.yaml

View workflow job for this annotation

GitHub Actions / Code scan (YAML)

7947:7 [comments-indentation] comment not indented like content

- if: '{{ false }}' #### Global anchor repository ####
then:
Expand Down Expand Up @@ -8196,23 +8196,20 @@
qrcode: !input qrcode_value
home_indoor_temp_icon: !input home_indoor_temp_icon
timezone: !input timezone
timezone_code: >
{{
timezone.split('(')[1]|replace(')', '')
if timezone.split('(') | count > 0
else timezone
}}

##### Timezone #####
- if: '{{ timezone is string and timezone | length > 1 }}'
then:
- variables:
timezone_code: >
{{
timezone.split('(')[1]|replace(')', '')
if timezone.split('(') | count > 0
else timezone
}}
- *delay_default
- service: 'esphome.{{ nspanel_name }}_set_string'
data:
component: "timezone"
val: '{{ timezone_code }}'
continue_on_error: true
- *delay_default
- service: 'esphome.{{ nspanel_name }}_set_string'
data:
component: "timezone"
val: '{{ timezone_code }}'
continue_on_error: true

##### Home page #####
- *delay_default
Expand Down
2 changes: 1 addition & 1 deletion prebuilt/nspanel-esp32/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"chipFamily": "ESP32",
"ota": {
"path": "nspanel-esp32.ota.bin",
"md5": "535570dc8d4ad4661d4bef93df314749"
"md5": "d4cb0c8bdc8809f8802dc49541f3015a"
},
"parts": [
{
Expand Down
Binary file modified prebuilt/nspanel-esp32/nspanel-esp32.factory.bin
Binary file not shown.
Binary file modified prebuilt/nspanel-esp32/nspanel-esp32.ota.bin
Binary file not shown.
Binary file modified prebuilt/nspanel_esphome_prebuilt.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion prebuilt/nspanel_esphome_prebuilt.bin.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
535570dc8d4ad4661d4bef93df314749 prebuilt/nspanel_esphome_prebuilt.bin
d4cb0c8bdc8809f8802dc49541f3015a prebuilt/nspanel_esphome_prebuilt.bin
Binary file modified prebuilt/nspanel_esphome_prebuilt.factory.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion prebuilt/nspanel_esphome_prebuilt.factory.bin.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c4b148a85bfdcc295fb5e8d684976638 prebuilt/nspanel_esphome_prebuilt.factory.bin
93a7945b78c6f45ba470e32825b2567a prebuilt/nspanel_esphome_prebuilt.factory.bin
2 changes: 1 addition & 1 deletion prebuilt/nspanel_esphome_prebuilt.manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"chipFamily": "ESP32",
"ota": {
"path": "nspanel-esp32.ota.bin",
"md5": "535570dc8d4ad4661d4bef93df314749"
"md5": "d4cb0c8bdc8809f8802dc49541f3015a"
},
"parts": [
{
Expand Down
2 changes: 1 addition & 1 deletion prebuilt/wall-display-esp32/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"chipFamily": "ESP32",
"ota": {
"path": "wall-display-esp32.ota.bin",
"md5": "6fb3f43dfb1b516569d77746a726ab88"
"md5": "391baa1e618d74b8567cd02efe638e69"
},
"parts": [
{
Expand Down
Binary file modified prebuilt/wall-display-esp32/wall-display-esp32.factory.bin
Binary file not shown.
Binary file modified prebuilt/wall-display-esp32/wall-display-esp32.ota.bin
Binary file not shown.
Binary file modified prebuilt/wall_display.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion prebuilt/wall_display.bin.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6fb3f43dfb1b516569d77746a726ab88 prebuilt/wall_display.bin
391baa1e618d74b8567cd02efe638e69 prebuilt/wall_display.bin
Binary file modified prebuilt/wall_display.factory.bin
Binary file not shown.
2 changes: 1 addition & 1 deletion prebuilt/wall_display.factory.bin.md5
Original file line number Diff line number Diff line change
@@ -1 +1 @@
25677ea3fb0d876dfac0512aacc3057b prebuilt/wall_display.factory.bin
7f27de2296979005184c8f14521c923f prebuilt/wall_display.factory.bin
2 changes: 1 addition & 1 deletion prebuilt/wall_display.manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"chipFamily": "ESP32",
"ota": {
"path": "wall-display-esp32.ota.bin",
"md5": "6fb3f43dfb1b516569d77746a726ab88"
"md5": "391baa1e618d74b8567cd02efe638e69"
},
"parts": [
{
Expand Down