diff --git a/README.md b/README.md index 79024b5..4aa64ec 100644 --- a/README.md +++ b/README.md @@ -14,15 +14,15 @@ And the best thing is, the installation takes only a few minutes. The goal was to create a version that allows everyone to use the NSpanel fully local without having to deal with programming or reading hours of documentation - *AND YES WE DID IT!!!!* ;) -📕 Full documentation and installation is available here [NSPanel Configuration, Setup and HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki). +📕 Full documentation and installation is available here: [NSPanel Configuration, Setup and HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki). -📌 Step by Step - [Setup and Overview Video´s](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki) +📌 Step by Step - [Setup Video](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki) -🚀 How to create "Issues" when I have a problem [WIKI HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki) +🚀 How to create "Issues" when I have a problem: [WIKI HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki) -⭐ All Feature Requests can be found here [All Feature Request](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/new%20feature%20request) +⭐ All Feature Requests can be found here: [All Feature Request](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/new%20feature%20request) -🎉 Roadmap Roadmap can be found here [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) +🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) 💥 Please move pull request to DEV branch and not to main branch - thanks! @@ -46,9 +46,8 @@ The goal was to create a version that allows everyone to use the NSpanel fully l ![6 Lightsetting 3](https://user-images.githubusercontent.com/41958506/203654179-f7303b02-c886-4890-b976-cb498940a627.png) -![7 Thermostat](https://user-images.githubusercontent.com/41958506/203654189-4294b634-430f-423c-b170-9f1680f94b0e.png) -(Light color wheel and Thermostat) +(Light color wheel) ![8 Cover](https://user-images.githubusercontent.com/41958506/203654290-c6ec2f2f-7924-492c-914c-0d96dc3907e0.png) diff --git a/ReleaseNotes.md b/ReleaseNotes.md new file mode 100644 index 0000000..af0d0f6 --- /dev/null +++ b/ReleaseNotes.md @@ -0,0 +1,37 @@ +## General +This patch includes bug fixes only, with no new functionality implemented. + +You can see the list of changes below and decided what to update based on how you are affected by the different changes. + +There is compatibility between components with v4.0 and v4.0.1, then your system will work with no issues with a mix of those versions, althoug we recommend always updating all the components to the latest version available. + +### Instructions + _You can find the update procedures following here:_ +- [(EN) How To - All important thing you should know - Update](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki/(EN)-HowTo---All-important-thing-you-should-know#2-update-blueprint) +- [(DE) How To - Alle wichtigen Dinge die man wissen sollte - Update](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki/(DE)-HowTo---Alle-wichtigen-Dinge-die-man-wissen-sollte#2-update-blueprint) + + +  +## Overview of all changes + +| Change | Criticality | Page/area | Components affected | +| :-- | :--: | :--: | :--: | +| Incorrect button addressing on long press at buttonpage03 | Critical | `buttonpage03` | TFT (US model only) | +| Volume button not working | Medium | `media_player` | TFT | +| Fixes on instructions | Minor | N/A | Blueprint
GitHub page (docs) | +| Prevents media player crashing when called before `media_position_updated_at` is able to provide a value. | Minor | `media_player` | Blueprint | +| Add instructions to enforce a timezone selection in customizations | Minor | N/A | GitHub page (docs) | +| Translations to Dutch | Minor | `settings` | Blueprint | +| Translations to Finish (review) | Minor | All | Blueprint | +| Removed `display_current_brightness` messages from log | Minor | N/A | ESPHome | +| Version control to support patches | Minor | N/A | ESPHome | +| Support for flexible time format | Minor | `home` | Blueprint | +| Added date format for Finish | Minor | `home` | Blueprint | +| Reset sleep timer when brightness settings changes | Minor | All | ESPHome | + +## Special thanks to: +* @chpego + - Fixes on README.md and blueprint UI (#1059) + +## New Contributors +* @chpego diff --git a/docs/en/customization.md b/docs/en/customization.md index d251832..b26fd76 100644 --- a/docs/en/customization.md +++ b/docs/en/customization.md @@ -193,7 +193,7 @@ binary_sensor:   ### Button to upload `nspanel_blank.tft` -This can also be used for any other`alternative `tft` file you might want to use frequently: +This can also be used for any other alternative tft file you might want to use frequently: ```yaml button: @@ -213,7 +213,7 @@ button: id(disp1)->set_tft_url("${nextion_update_blank_url}"); id(disp1).upload_tft(); ``` -You also must add the url for the alternative `tft` in your substitutions, like this: +You also must add the url for the alternative tft in your substitutions, like this: ```yaml nextion_update_blank_url: "http://homeassistant.local:8123/local/nspanel/dev/nspanel_blank.tft" ``` @@ -241,4 +241,17 @@ time: sleep_duration: 7h ``` -You can find more ideas around this on [#955](https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/955). \ No newline at end of file +You can find more ideas around this on [#955](https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/955). + +  +### Enforce time zone +Until v3.4 (including), the time was coming from Home Assistant with it's timezone, so the Blueprint was sending the info with no transformation, to the panel. +From v4.0, the time reference still coming from HA (or optionally from a time server), but is calculated in ESPHome, which will try to detect the timezone from the server. +If your system is not showing the time in the correct timezone, it's probabily ESPHome not succeeding on finding your time zone. +You can easily force a timezone by adding this to your ESPHome settings: + +```yaml +time: + - id:!extend time_provider + timezone: "America/Cancun" +``` diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 78396ec..b649588 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -15,7 +15,7 @@ blueprint: And the best thing is, the installation takes only a few minutes. - The goal was to create a version that allows everyone to use the NSpanel fully local without having to deal with programming or reading hours of documentation - *AND YES WE DID IT!!!!* ;) + The goal was to create a version that allows everyone to use the NSPanel fully local without having to deal with programming or reading hours of documentation - *AND YES WE DID IT!!!!* ;) 📕 Full documentation and installation video is available here: [NSPanel Configuration, Setup and HowTo](https://github.com/Blackymas/NSPanel_HA_Blueprint/wiki). @@ -33,7 +33,7 @@ blueprint: 🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) - ℹ️ Version: v4.0 + ℹ️ Version: v4.0.1beta source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml domain: automation @@ -48,7 +48,7 @@ blueprint: description: > *SYSTEM settings* - *Please select the ESPHome device reated to the NSPanel to be controlled by this automation* + *Please select the ESPHome device related to the NSPanel to be controlled by this automation* default: [] selector: device: @@ -89,6 +89,8 @@ blueprint: value: '%A, %-d/%-m' - label: 'Weekday, M/D (ex. "Friday, 3/22")' value: '%A, %-m/%-d' + - label: 'Weekday D.M (ex. "Friday 22.3")' + value: '%A %-d.%-m' time_format: name: Time Format @@ -100,7 +102,7 @@ blueprint: selector: select: multiple: false - #custom_value: true + custom_value: true #mode: dropdown options: - label: 'HH:MM (ex. 08:30 and 20:30)' @@ -109,6 +111,8 @@ blueprint: value: '%-I:%M %p' - label: 'H:MM 24H (ex. 8:30 and 20:30)' value: '%-H:%M' + - label: 'H.MM 24H (ex. 8.30 and 20.30)' + value: '%-H.%M' delay: name: Delay to avoid synchronization problem @@ -138,7 +142,7 @@ blueprint: description: > *SYSTEM settings* - *Select your weather entity.*' + *Select your weather entity.* default: [] selector: entity: @@ -946,7 +950,7 @@ blueprint: description: > *SYSTEM settings* - *select what shold happen on hold*' + *Select what should happen on hold* default: 'Default' selector: &hardware-button-hold-selector select: @@ -986,7 +990,7 @@ blueprint: description: > *SYSTEM settings* - *Entity which should be switched*' + *Entity which should be switched* default: [] selector: *hardware-button-selector right_button_name: @@ -1005,7 +1009,7 @@ blueprint: description: > *SYSTEM settings* - *Select what shold happen on hold*' + *Select what should happen on hold* default: 'Default' selector: *hardware-button-hold-selector right_button_hold_custom_action: @@ -3583,7 +3587,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '4.0' + blueprint_version: '4.0.1beta' date_format_temp: !input 'date_format' #Avoid breaking change for existing users with legacy type format date_format: > @@ -4306,47 +4310,47 @@ variables: dim: Dim fi: #Finnish weekdays: - mon: Maanantai - tue: Tiistai - wed: Keskiviikko - thu: Torstai - fri: Perjantai - sat: Lauantai - sun: Sunnuntai + mon: maanantai + tue: tiistai + wed: keskiviikko + thu: torstai + fri: perjantai + sat: lauantai + sun: sunnuntai weekdays_short: - mon: Ma - tue: Ti - wed: Ke - thu: To - fri: Pe - sat: La - sun: Su + mon: ma + tue: ti + wed: ke + thu: to + fri: pe + sat: la + sun: su months: - jan: Tammikuu - feb: Helmikuu - mar: Maaliskuu - apr: Huhtikuu - may: Toukokuu - jun: Kesäkuu - jul: Heinäkuu - aug: Elokuu - sep: Syyskuu - oct: Lokakuu - nov: Marraskuu - dec: Joulukuu + jan: tammikuu + feb: helmikuu + mar: maaliskuu + apr: huhtikuu + may: toukokuu + jun: kesäkuu + jul: heinäkuu + aug: elokuu + sep: syyskuu + oct: lokakuu + nov: marraskuu + dec: joulukuu months_short: - jan: Tammi - feb: Helmi - mar: Maalis - apr: Huhti - may: Touko - jun: Kesä - jul: Heinä - aug: Elo - sep: Syys - oct: Loka - nov: Marras - dec: Joulu + jan: tammi + feb: helmi + mar: maalis + apr: huhti + may: touko + jun: kesä + jul: heinä + aug: elo + sep: syys + oct: loka + nov: marras + dec: joulu relative_day: today: Tänään tomorrow: Huomenna @@ -4359,8 +4363,8 @@ variables: "off": "Off" heat: lämpĂś please_confirm: Vahvista - unavailable: Unavailable - no_name: No name + unavailable: ei saatavilla + no_name: nimetĂśn alarm: home: Kotona away: Poissa @@ -4375,9 +4379,6 @@ variables: bright: Kirkas dimming: Himmennys dim: Himmeä - #Finnish is sometimes difficult language to get short words out of... :) - #Uudelleenkäynnistys could be shortened as "Uudelleenkäynn." (if there is room for that dot), 2nd best would be "Uud.käynnistys", lastly "Uud.käynn.". Then there is this non-official translation "Boottaus" (but I'd prefer not). - #If in current version there is this title (Brightness, Kirkkaus in Finnish) before those two sliders, you can use "Kirkas" and "Himmeä" for them. fr: #French weekdays: mon: Lundi @@ -5082,12 +5083,12 @@ variables: bypass: Omzeil disarm: Ontgrendel settings: - reboot: Reboot - sleep: Sleep - brightness: Brightness - bright: Bright - dimming: Dimming - dim: Dim + reboot: Herstarten + sleep: Slaap mode + brightness: Helderheid + bright: Helder + dimming: Dimmen #Not in use at the moment + dim: Gedimd pl: #Polish weekdays: mon: Poniedziałek @@ -7926,7 +7927,7 @@ action: media_artist: '{{ media_player.media_artist if media_player.media_artist is string and media_player.media_artist not in [null, None, "unknown", "unavailable"] else "" }}' media_duration: '{{ media_player.media_duration }}' media_position: '{{ media_player.media_position }}' #min(media_player.media_duration, media_player.media_position + (now() | as_timestamp - media_player.media_position_updated_at | as_timestamp | default(now() | as_timestamp))) }}' - media_position_delta: '{{ (now() | as_timestamp - media_player.media_position_updated_at | as_timestamp | default(now() | as_timestamp)) }}' + media_position_delta: '{{ (now() | as_timestamp - media_player.media_position_updated_at | as_timestamp | default(now() | as_timestamp)) if media_player.media_position_updated_at not in [None, none, "", "unknown", "unavailable", false, 0] and media_player.media_position_updated_at else 0 }}' supported_features: '{{ media_player.supported_features }}' continue_on_error: true - wait_template: '{{ states(currentpage) != page.media_player }}' diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index 9c0e896..23eb63a 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -8,7 +8,7 @@ substitutions: ##### DON'T CHANGE THIS ##### - version: "4.0" + version: "4.0.1beta" ############################# ##### WIFI SETUP ##### @@ -517,7 +517,7 @@ api: then: - lambda: |- if (not reboot.empty()) id(disp1).set_component_text_printf("settings.lbl_reboot", " %s", reboot.c_str()); - id(display_wrapped_text).execute("settings.lbl_brightness", brightness.c_str(), id(display_mode) == 2 ? 25 : 10); + id(disp1).set_component_text_printf("settings.lbl_brightness", " %s", brightness.c_str()); id(display_wrapped_text).execute("settings.lbl_bright", bright.c_str(), id(display_mode) == 2 ? 25 : 10); id(display_wrapped_text).execute("settings.lbl_dim", dim.c_str(), id(display_mode) == 2 ? 25 : 10); @@ -682,12 +682,12 @@ api: id(disp1).set_component_value("is_muted", (is_volume_muted) ? 1 : 0); if (supported_features & 8 and is_volume_muted) // unmute { - id(disp1).set_component_text_printf("bt_mute", "%s", "\uE57E"); // mdi:volume-low + id(disp1).set_component_text_printf("bt_mute", "%s", "\uEE07"); // mdi:volume-variant-off id(disp1).show_component("bt_mute"); } else if (supported_features & 8) // mute { - id(disp1).set_component_text_printf("bt_mute", "%s", "\uEE07"); // mdi:volume-variant-off + id(disp1).set_component_text_printf("bt_mute", "%s", "\uE57E"); // mdi:volume-low id(disp1).show_component("bt_mute"); } else id(disp1).hide_component("bt_mute"); @@ -975,7 +975,6 @@ binary_sensor: on_click: - button.press: restart_nspanel - ##### global variable to keep track on whether the Nextion display is ready or not. ## Delays initial info from HA to the display ##### - name: ${device_name} Nextion display id: nextion_init @@ -1072,15 +1071,6 @@ sensor: # Show panel's temperature if API or Wi-Fi are out - lambda: id(display_embedded_temp).execute(); - - name: ${device_name} Brightness - id: display_current_brightness - platform: nextion - variable_name: dim - internal: true - icon: mdi:tablet-dashboard - unit_of_measurement: '%' - accuracy_decimals : 0 - ###### Display Brightness GET VALUE FROM NSPanel SLIDER ##### - name: ${device_name} brightness Slider platform: nextion @@ -1094,7 +1084,6 @@ sensor: value: !lambda 'return int(x);' - lambda: |- id(timer_reset_all).execute("settings"); - id(display_current_brightness).update(); ###### Display DIM Brightness GET VALUE FROM NSPanel SLIDER ##### - name: ${device_name} dim brightness slider @@ -1109,7 +1098,6 @@ sensor: value: !lambda 'return int(x);' - lambda: |- id(timer_reset_all).execute("settings"); - id(display_current_brightness).update(); ##### START - TEXT SENSOR CONFIGURATION ##### text_sensor: @@ -1136,7 +1124,6 @@ text_sensor: ESP_LOGD("text_sensor.current_page", "New page: %s", x.c_str()); if (!id(entity_id).empty()) ESP_LOGD("text_sensor.current_page", "Entity shown: %s", id(entity_id).c_str()); id(timer_reset_all).execute(x.c_str()); - id(display_current_brightness).update(); ##### ESPhome version used to compile the app ##### - name: ${device_name} ESPhome Version @@ -1535,9 +1522,9 @@ switch: number: ##### SCREEN BRIGHTNESS ##### - - platform: template - name: ${device_name} Display Brightness + - name: ${device_name} Display Brightness id: display_brightness + platform: template entity_category: config unit_of_measurement: '%' min_value: 1 @@ -1551,14 +1538,18 @@ number: id(display_brightness_global) = int(x); id(disp1).send_command_printf("brightness=%i", int(x)); id(disp1).send_command_printf("settings.brightslider.val=%i", int(x)); - if (id(current_page).state != "screensaver") id(disp1).set_backlight_brightness(x/100); - if (id(current_page).state == "settings") id(disp1).set_component_text_printf("bright_text", "%i%%", int(x)); - id(display_current_brightness).update(); + if (id(current_page).state != "screensaver") + { + id(disp1).set_backlight_brightness(x/100); + id(timer_dim).execute(id(current_page).state.c_str(), int(id(timeout_dim).state)); + id(timer_sleep).execute(id(current_page).state.c_str(), int(id(timeout_sleep).state)); + if (id(current_page).state == "settings") id(disp1).set_component_text_printf("bright_text", "%i%%", int(x)); + } ##### SCREEN BRIGHTNESS DIMMED DOWN ##### - - platform: template - name: ${device_name} Display Brightness Dimdown + - name: ${device_name} Display Brightness Dimdown id: display_dim_brightness + platform: template entity_category: config unit_of_measurement: '%' min_value: 1 @@ -1572,7 +1563,12 @@ number: id(display_dim_brightness_global) = int(x); id(disp1).send_command_printf("brightness_dim=%i", int(x)); id(disp1).send_command_printf("settings.dimslider.val=%i", int(x)); - if (id(current_page).state == "settings") id(disp1).set_component_text_printf("dim_text", "%i%%", int(x)); + if (id(current_page).state != "screensaver" and id(is_dim_brightness)) + { + id(disp1).set_backlight_brightness(x/100); + id(timer_sleep).execute(id(current_page).state.c_str(), int(id(timeout_sleep).state)); + if (id(current_page).state == "settings") id(disp1).set_component_text_printf("dim_text", "%i%%", int(x)); + } ##### Temperature Correction ##### - name: ${device_name} Temperature Correction @@ -1634,8 +1630,11 @@ number: icon: mdi:timer unit_of_measurement: "s" set_action: - - lambda: id(timer_sleep).execute(id(current_page).state.c_str(), int(x)); + - lambda: |- + id(timer_dim).execute(id(current_page).state.c_str(), int(id(timeout_dim).state)); + id(timer_sleep).execute(id(current_page).state.c_str(), int(x)); +##### START - SELECT CONFIGURATION ##### select: - id: wakeup_page_name name: ${device_name} Wake-up page @@ -1753,7 +1752,6 @@ script: then: - lambda: |- ESP_LOGV("script.timer_dim", "Reset timer: %is", timeout); - id(display_current_brightness).update(); if (id(is_dim_brightness)) { if (page != "screensaver" and page != "boot") @@ -1763,21 +1761,18 @@ script: } id(is_dim_brightness) = false; } - id(display_current_brightness).update(); - if: condition: - lambda: !lambda return (timeout >= 1); then: - delay: !lambda return (timeout *1000); - lambda: |- - id(display_current_brightness).update(); - if (id(current_page).state != "screensaver" and id(current_page).state != "boot" and timeout >= 1 and id(display_current_brightness).state > id(display_dim_brightness_global)) + if (id(current_page).state != "screensaver" and id(current_page).state != "boot" and timeout >= 1) { ESP_LOGD("script.timer_dim", "Dimming the display to %i%%", id(display_dim_brightness_global)); id(disp1).send_command_printf("dim=%i", id(display_dim_brightness_global)); id(is_dim_brightness) = true; } - id(display_current_brightness).update(); - id: timer_sleep # Handle the sleep (go to screensaver page) after a timeout mode: restart parameters: @@ -2218,15 +2213,37 @@ script: then: - wait_until: condition: - - lambda: !lambda 'return (id(version_tft) == "${version}");' - - lambda: !lambda 'return (id(version_blueprint) == "${version}");' + - lambda: |- + auto compareVersions = [](const char* version1, const char* version2) -> bool + { + int major1 = 0, minor1 = 0; + int major2 = 0, minor2 = 0; + + sscanf(version1, "%d.%d", &major1, &minor1); + sscanf(version2, "%d.%d", &major2, &minor2); + + return (major1 == major2) && (minor1 == minor2); + }; + return (compareVersions("${version}", id(version_tft).c_str()) and compareVersions("${version}", id(version_blueprint).c_str())); + #- lambda: !lambda 'return (id(version_tft) == "${version}");' + #- lambda: !lambda 'return (id(version_blueprint) == "${version}");' timeout: 60s - lambda: |- + auto compareVersions = [](const char* version1, const char* version2) -> bool + { + int major1 = 0, minor1 = 0; + int major2 = 0, minor2 = 0; + + sscanf(version1, "%d.%d", &major1, &minor1); + sscanf(version2, "%d.%d", &major2, &minor2); + + return (major1 == major2) && (minor1 == minor2); + }; ESP_LOGD("script.check_versions", "ESPHome version: ${version}"); ESP_LOGD("script.check_versions", "TFT version: %s", id(version_tft).c_str()); - if (id(version_tft) != "${version}") ESP_LOGE("script.check_versions", "TFT version mismatch!"); + if (not compareVersions("${version}", id(version_tft).c_str())) ESP_LOGE("script.check_versions", "TFT version mismatch!"); ESP_LOGD("script.check_versions", "Blueprint version: %s", id(version_blueprint).c_str()); - if (id(version_blueprint) != "${version}") ESP_LOGE("script.check_versions", "Blueprint version mismatch!"); + if (not compareVersions("${version}", id(version_blueprint).c_str())) ESP_LOGE("script.check_versions", "Blueprint version mismatch!"); auto ha_event = new esphome::api::CustomAPIDevice(); ha_event->fire_homeassistant_event("esphome.nspanel_ha_blueprint", { diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index 9dcbf03..8d5665e 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index b2bb25e..e60cfcd 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt index 3bf8717..5a7546e 100644 --- a/nspanel_eu_code/boot.txt +++ b/nspanel_eu_code/boot.txt @@ -134,8 +134,8 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.0 - Max. Text Size : 8 + Text : 4.0.1beta + Max. Text Size : 9 Text esph_version Attributes diff --git a/nspanel_eu_code/media_player.txt b/nspanel_eu_code/media_player.txt index f1fb7c5..af5093a 100644 --- a/nspanel_eu_code/media_player.txt +++ b/nspanel_eu_code/media_player.txt @@ -223,7 +223,7 @@ Text bt_mute printh FF FF FF Touch Release Event - if(is_muted.val==1) + if(is_muted.val==0) { va0.txt="true" }else diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 49a644c..b549d7c 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 3841f64..fe74fc9 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt index 3bf8717..5a7546e 100644 --- a/nspanel_us_code/boot.txt +++ b/nspanel_us_code/boot.txt @@ -134,8 +134,8 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.0 - Max. Text Size : 8 + Text : 4.0.1beta + Max. Text Size : 9 Text esph_version Attributes diff --git a/nspanel_us_code/buttonpage03.txt b/nspanel_us_code/buttonpage03.txt index 1e7a3d4..6d70324 100644 --- a/nspanel_us_code/buttonpage03.txt +++ b/nspanel_us_code/buttonpage03.txt @@ -708,7 +708,7 @@ Timer click_timer Events Timer Event - lastclick.txt="{\"page\": \"buttonpage02\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage03\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 diff --git a/nspanel_us_code/media_player.txt b/nspanel_us_code/media_player.txt index 22ac87a..b736e76 100644 --- a/nspanel_us_code/media_player.txt +++ b/nspanel_us_code/media_player.txt @@ -223,7 +223,7 @@ Text bt_mute printh FF FF FF Touch Release Event - if(is_muted.val==1) + if(is_muted.val==0) { va0.txt="true" }else diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 59fd15f..1c0208e 100644 Binary files a/nspanel_us_land.HMI and b/nspanel_us_land.HMI differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 7646b7f..9ea982f 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt index 3bf8717..5a7546e 100644 --- a/nspanel_us_land_code/boot.txt +++ b/nspanel_us_land_code/boot.txt @@ -134,8 +134,8 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.0 - Max. Text Size : 8 + Text : 4.0.1beta + Max. Text Size : 9 Text esph_version Attributes diff --git a/nspanel_us_land_code/media_player.txt b/nspanel_us_land_code/media_player.txt index f1fb7c5..af5093a 100644 --- a/nspanel_us_land_code/media_player.txt +++ b/nspanel_us_land_code/media_player.txt @@ -223,7 +223,7 @@ Text bt_mute printh FF FF FF Touch Release Event - if(is_muted.val==1) + if(is_muted.val==0) { va0.txt="true" }else