From a87fc341f2bb994fbc5d05a10675193df54d5954 Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Sun, 24 Sep 2023 15:15:20 +0200 Subject: [PATCH] Beta testing v4.0.1 (#1089) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Exclude Nextion2Text Exclude Nextion2Text * Fix validation issue * Time engine on ESPHome * Time engine on ESPHome * Notification page bigger hotspot Added hotspots around the buttons (Accept & Clear) on Notification page to make easier to click on those. Solves #907 * Boot page retry comm The boot page will retry communication with the blueprint once a minute to avoid the situation where that page is shown until the automation is reloaded. * Fix call to screen page Fixes the call to screen page on US panel. Reconciliate the US landscape model from EU model. * Fix fan page `button_on` Fixing rounding on that button. * Fixed Fan page rounding * Prevents boot sequence in other pages * Physical relay local control We are trying to make your panel as autonomous as possible by moving some of the controls from the Blueprint to ESPHome. This will reduce the load in your network and Home Assistant, but also will make a more reliable system capable to do it's core functionality even when the network is unavailable or Home Assistant is restarting. With this version, the following engines have been moved to your panel (local control): - Physical relay control (when hardware left button is connected to relay 1 or right button to relay 2) Solves #910 * Embedded climate (#917) * Performance improvements The main focus here was to reduce the number of calls between Home Assistant and ESPHome, moving logic as much as possible to TFT and ESPHome. - Service calls moved to ESPHome (in preparation for Alarm Control Panel) - Page change informed via event call instead of `nspanel_event` sensor (which still in use by other calls, but might be possible to remove in the future) * Draft embedded climate This adds an initial version of an embedded climate/thermostat (heating only for now) with support for local control even with Wi-Fi out. Solves #646 Solves #263 * Update ReleaseNotes.md * Fix climate slider Fix for climate slider opening in an incorrect position and sending only the integer part of the new target temperature * Moving home page to ESPHome In progress... * Fix translations - Dutch * Embedded chip 3 Home page - Chip 3 will be controlled locally when embedded climate is enable. * Fixed buttons bar Fixed buttons bar managed on ESPHome when embedded climate is visible. * Update ReleaseNotes.md * Services back to the Blueprint Moving service calls back to the blueprint as latest HA requires user's permissions to call HA services from ESPHome. This still have to be used for Alarm calls due to security concerns. * Update ReleaseNotes.md * support to hidden ssid (#908) Supports hidden ssid with the use of substitutions `wifi_hidden: "true"`. This can be breaking change for users with custom/advanced wifi settings. Solves #906 * Update nspanel_esphome.yaml * Removed `restore_state` There is some incomplete work related to alarms on this commit, but the focus here is to fix `restore_state` on ESPHome v2023.7.0. This solves #939 * US model - Fan page - Redistribute icons Redistributed icons on Fan page on US model in order to improve usability. Based on feedback from https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/791#discussioncomment-6338706 * Align `nspanel_us_land` Apply all changes from EU to US_Land * Fix relays chips Fix relay status indication on chips. Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/926#issuecomment-1627660273 * Fix "invalid variable" for "api" Fix error "Nextion invalid variable name" when setting `api`. * Default embedded climate to relay_0 * Fix issue with `restore_state` and ESPHome v2023.7.0 (#941) Solves #939 * Fix translations - Italian Based on https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-6511043 * Fix `set_temperature` for climate Solves #957 * Fix `fan.turn_off` call Removed timer call from fan stop button. This solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/791#discussioncomment-6494535 * Call a `fan.turn_off` when percentage is 0% Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/791#discussioncomment-6621756 * Fix call for fan stop button Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/791#discussioncomment-6622377 * Icons on ESPHome Move icons from TFT/HMI to ESPHome to prevent error on Nextion2Text. * Updated translations - Spanish Based on https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-6548961 * Make home page sensor's icons consistent Make icon selection consistent with chips where the entity's icon is used in case a icon is not set in the blueprint settings. Solves #963 * Updated translations - Slovenian Based on: - https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-6665723 - https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/829#discussioncomment-6665751 * dutch (#974) * small ducht translations small ducht translations * Dutch translations --------- Co-authored-by: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> * Add-on support (#977) Moved climate settings to an add-on. Updated documentation. * Fixed link to addon climate docs * Fix change brightness when sleeping Prevents the panel to change screen brightness when sleeping. Solves #975 * Standardize HA service calls * Bump version to `4.0 dev` * Create customization.md This will reduce the need for: - #920 - #662 - #833 * Clean-up for customizations Clean up ESPHome in order to make easier the use of customizations. * Create Alarm page * Add page Alarm * Add Alarm docs Update docs to reflect the current state (new features & changes) * Creating "install.md" and update add-ons instructions * Add Alarm page buttons pics * Add link to Alarm on page Home * Create Alarm page * Alarm button font color * Add `keyb_num` page * Alarm Control Panel with PIN (#982) Implements an Alarm Control Panel page on NSPanel. Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/66 Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/227 Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/672 Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/299#discussioncomment-4874612 Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/64#issuecomment-1566204490 Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/718 * Fix alarm without pin not working Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/pull/930#issuecomment-1680981977 * Alarm page UI Fixed close button Disabled buttons are darker * Move Entities button to ESPHome Move logic behind Entities button (Home page) from Blueprint to ESPHome in order to gain performance on creating home page. * Human readable Uptime (#986) * Human readable Uptime * Uptime from Frenck code * Uptime with Frenck code * Updated Human Readable Uptime * Removed trailing spaces * Renamed sensor to "Last started" Sensor renamed Update moved to the boot process Clean-up --------- Co-authored-by: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Co-authored-by: Edward Firmo * Update alarm icon & color * Revert `fast_connect` back to `false` * Extended chars on buttons pages (#988) Replaces #740 Probably solves #664 Probably solves #738 Probably solves #987 * Removed `fast_connect` * Support to `code_arm_required` Only shows the alarm PIN keyboard if a code is required for arming (or when disarming). * Update alarm icon on home page Refresh icon when alarm state changes. * Fix alarm icon not updating on home page * Home buttons new format - Alarm Modernise the button Alarm flow on page Home to improve performance. * Home buttons new format - Entities Modernise the button "Entities" flow on page Home to improve performance. * Home buttons new format - QRcode Modernise the button "QRcode" flow on page Home to improve performance. * Home buttons new format - Notification Modernise the button "Notification" flow on page Home to improve performance. I haven't moved the code from the Blueprint to ESPHome yet, as I will leave this for when we rebuild the Notification flow in the near future (hopefully), so the performance gains may not be perceived now. Just aligning with other buttons format. * Adding screenshots * Delete ReleaseNotes.md Moved to the release * New entity filter format This new format was released with HA v2023.4 and the old one will be deprecated soon. * Fix Alarm page bypass icon * Bump version to 4.0 * Rename `addon_climate_heat` * Simplify climate substitutions * Add support for `addon_climate_cool` * Removed `${verbose_log}` Use logger level `VERBOSE` instead * Fix script call * Clean up general entities & fallback Store inputs into variables only when needed. Removed fallback mode - Replaced by ESPHome local control when the relay is assigned to the button in the blueprint. * Phase out sensor `nspanel_event` (partially) This sensor is being replaced by event calls. * uptime sensors (#998) * Create ReleaseNotes.md * Fix Climate page when embedded climate And also added a lot of logs which should be removed later as it takes from memory. Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6835260 * Move brightness control to global var Clean up page Home * Alarm page translations - Finnish https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-6857262 * Exported pics * Clean-up TFT - Removed a bunch of unused pics - Changed page indicator to new format (which will allow future development to hide unused pages) - Standardized close button in most pages * Fixed background pics - Entities pages - Weather pages * Standardize close button * Add "Alarm" section * Support to wake-up page on `wake_up_display` service This changes the behavior of a service introduced by #734. * Optimize `wake_up_display` service * Fix icon font sizes 10 and 64 Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/960#issuecomment-1701903604 And also remove all the unnecessary `wait_until` * Fix Settings page element ids Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/960#issuecomment-1702109668 * Add translation keys for `settings` page #1002 * Update settings page when brightness changes on HA Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/960#issuecomment-1702149796 * Clean-up page settings * update docs (#1003) * updated docs * Update ReleaseNotes.md --------- Co-authored-by: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> * Clean-up Cover page I'm preparing this page to have icons changing based on the device_class selected to a cover. * Clean-up boot delay * Enable `current_page` sensor by default Otherwise the system won´t update values unless the page is reloaded. * Use `current_page` in blueprint conditions One more step towards the phase out of `nspanelevent`. * Move `script.refresh_colors` to `service.global_settings` As this is called from a single point, there's no meaning of having a separated script. * Fix climate icon update Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6891454 * Fix button show on climate page Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6891335 * Visual improvements on climate page - Add friendly name when embedded - Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6891465 - Make disable icons a bit darker - Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6893440 - Add space for page title in EU an US Land versions - Reset page timer when pressing/releasing on the slider - Partially solves #990 * Don't update values when page home is not visible To reduce load on Home Assistant and the network * Cleanup boot sequence Move some functionalities to ESPHome * Display internal sensor value when wifi is out Before it was showing on home page only when API was out. This adds a test for WiFi. * Fix `default_target_temperature` It also updates the page home when thermostat status changes (for the chips). Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6897727 * Adding ID to components missing it * Renamed `wake_up_display` to `wake_up` * Re-arrange commands list * Add service `set_component_color` Deprecates the following services: - `send_command_font_color` - `send_command_background_color` * Fix button pages not showing * Adjusted time for HW long click * Fixed buttons on settings page * Minor adjustments to page climate And replace font 10 to size 48 (it was 64 since a few days ago). * Updates to breaking changes list * Page settings redesign Clean up the UI of settings page. Prepare for translations. * Enable translations of Settings page * Notification word-wrap For EU and US_LAND only, for now. * Notifications page rebuilt - Notification button processed on ESPHome (as all the info is there) - Added word-wrap for main text - Expanded text size - Handling display mode (used to define the number of chars per line on Notifications) - Versioning handling - As a consequence of the previous item. * Word-wrap buttons pages Taking advantage of the algorithm created for notifications. * Word-wrap for Alarm page * Version mismatch notication * Fix ESPHome not starting with older TFT * Rebuilt home page status bar update * Updated translations - Italian Based on https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/1002#discussioncomment-6926846 Thanks @MaiPiu * Fix `Nextion reported variable name invalid!` * Fix `Nextion variable invalid` * Handle `embedded_indoor_temperature` Internal temperature display will be handled locally (ESPHome) when no other sensor is selected. * Review temperature correction engine * Fix display climate chip * update `temp_nspanel` when correction changes * Fix `Fan` page not open with long press HW button Solves #1007 * Minor adjustments on settings page * version 4.0 ready for release * Clean-up docs * Improve version notification * Disable restore `notification_unread` This must be changed to a binary sensor in the future. * Beta v4.0 (#1012) * Create ReleaseNotes.md (#879) * Create ReleaseNotes.md * sensor display precision * Filter devices to esp32 only (#881) * Filter devices to esp32 only Show only ESP32 devices when selecting the panel * Filtered device list * Sensor display precision (#880) Now the values shown in your panel will follow the [sensor display precision](https://www.home-assistant.io/blog/2023/03/01/release-20233/#sensor-display-precision) provided by Home Assistant. => If you have problems with a value exceeding the available space in your panel, please reduce the number of decimals using Home Assistant [sensor display precision](https://www.home-assistant.io/blog/2023/03/01/release-20233/#sensor-display-precision). * New language selector (#882) * New language selector * Update ReleaseNotes.md * Update ReleaseNotes.md * Remove `settings_entity` (#887) * Remove `settings_entity` - Bump version to 3.5_dev - Removed references to pictures removed from TFT - Removed code related to closing settings pages - Removed trigger `settings_entity` * Removed `set_settings_entity` service - Bump version to 3.5_dev - Removed `set_settings_entity` service - BREAKING CHANGE - Removed `settings_entity` text-sensor - BREAKING CHANGE - Added service `open_entity_settings_page` - BREAKING CHANGE * Removed `settings_entity` - Bump version to 3.5_dev - Removed old climate page (climate_backup) - Removed pics related to old climate page (ids 16-47, 80-83, 95-96 and 125(US only)) - Enforces brightness on any page change (this allows wake-up on settings page with long press on physical buttons) - Pending removing code from Blueprint - Added `entity` variable on pages `climate`, `lightsettings` and `coversettings` - Added `entity` info to `nspanelevent` on pages `climate`, `lightsettings` and `coversettings` - Added `back_page` variable on pages `climate`, `lightsettings` and `coversettings` (default: home) - Moving to TFT close page logic on pages `climate`, `lightsettings` and `coversettings` - Pending changes on Blueprint and ESPHome - Standardized name for `page_label` on pages `climate`, `lightsettings` and `coversettings` - Standardized settings page names: `climate`, `cover` and `light` (Removed `settings` from page name) * Removed `settings_entity` * Removed `settings_entity` * Removed `settings_entity` * Move `entity` variable to home page (#889) * Move `entity` variable to home page This will enable future development of a fallback climate * Move `entity` variable to home page * Move `entity` variable to home page * Move `entity` variable to home page * Move `entity` variable to home page * Use `en` as fallback language (#891) * Use `en` as fallback language Uses English if a non valid language is selected (like when using legacy language selection). * Use `en` as fallback language * Create `nspanel_us_land.tft` (#890) * Create `nspanel_us_land.tft' Add `nspanel_us_land.tft' for US panel on landscape mode, fixing the offset on the touch screen when using `nspanel_eu.tft` into a US panel. Hides the hardware buttons labels, as Nextion cannot support rotated text. * Created `nspanel_us_land.tft` * Created `nspanel_us_land.tft` solves #390 solves #432 solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/299#discussioncomment-4933716 * Created `nspanel_us_land.tft` * Created `nspanel_us_land.tft` * Fix "Button confirmation page not working correctly" Solves #883 * Supports weather forecast with `datetime` not string This adds support to weather integrations where the `datetime` field under `forecast` attribute is provided as a `datetime` type. This was seen on Météo-France, while all other weather integrations tested so far used a `text` field for `datetime`. This solves #893 * Wifi icon to indicate when API offline This changes the behavior of Wifi icon: How it was before: - Wifi icon was visible only when the wifi was connected, nothing was shown when wifi was not connected. How it is now: - Wifi icon will have 3 states: - Wifi & API connected: Gray wifi icon - Wifi disconnected: Red wifi-off icon - Wifi connected, but API disconnected (HA is out?): Red api-off icon * API status indication on the panel * Limit light & cover to supported settings (#896) * Limit light to supported settings When showing light settings, only the supported features will be shown for each light. * Limit light to supported settings * Limit light to supported settings * Limit light to supported settings * Limit light to supported settings * Limit light to supported settings This partially solves #635 * Limits covers to supported settings Only show cover settings when `set_position` is supported. This solves #635 * Limits covers to supported settings * Update instructions.md * Add Fan speed settings page (#897) * Add Fan speed settings page Add an initial fan speed control page for fans supporting speed control. Add speed (%) info in the buttons pages. Solves #404 Solves #791 Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/718#discussioncomment-5786106 * Add Fan speed settings page * Add Fan speed settings page * Add Fan speed settings page * Add Fan speed settings page * Add Fan speed settings page * Fix name on confirmation page Fix the entity name on the confirmation page. The new order is: 1. Name set on the blueprint settings 2. Entity's `friendly_name` attribute 3. Entity's `name` attribute 4. Entity's `entity_id` Solves #501 * Select wake-up page (#898) * Select wake-up page Users will be able to select the wake-up page on the blueprint inputs. This selected page will be shown after a boot (after the boot page) and with a touch in the screen when on screen saver page. After showing this wake-up page, all the previous behavior for closing the page (with a click or after a timeout) will be the same. Solves #576 Solves #612 Solves #801 Probably improves for https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/718#discussioncomment-5715670 * Select wake-up page * Fan update engine Change the fan update engine to follow the same patter as other settings pages. * Update ReleaseNotes.md * Adding vertical bars pics * Panel offline mode (#900) * Panel offline mode Introduces "offline mode" for the panel, which will be used later with a fallback climate. Pages that are depending on the blueprint (buttons pages, entity pages, settings pages, etc) won't be shown when the API is disconnected. * Panel offline mode * Panel offline mode * Panel offline mode * Panel offline mode * "Jump to settings" on tft Moved "Jump to settings page" routine from ESPHome to TFT in order to reduce complexity. * Exclude Nextion2Text Exclude Nextion2Text * Fix validation issue * Time engine on ESPHome * Time engine on ESPHome * Notification page bigger hotspot Added hotspots around the buttons (Accept & Clear) on Notification page to make easier to click on those. Solves #907 * Boot page retry comm The boot page will retry communication with the blueprint once a minute to avoid the situation where that page is shown until the automation is reloaded. * Fix call to screen page Fixes the call to screen page on US panel. Reconciliate the US landscape model from EU model. * Fix fan page `button_on` Fixing rounding on that button. * Fixed Fan page rounding * Prevents boot sequence in other pages * Physical relay local control We are trying to make your panel as autonomous as possible by moving some of the controls from the Blueprint to ESPHome. This will reduce the load in your network and Home Assistant, but also will make a more reliable system capable to do it's core functionality even when the network is unavailable or Home Assistant is restarting. With this version, the following engines have been moved to your panel (local control): - Physical relay control (when hardware left button is connected to relay 1 or right button to relay 2) Solves #910 * Embedded climate (#917) * Performance improvements The main focus here was to reduce the number of calls between Home Assistant and ESPHome, moving logic as much as possible to TFT and ESPHome. - Service calls moved to ESPHome (in preparation for Alarm Control Panel) - Page change informed via event call instead of `nspanel_event` sensor (which still in use by other calls, but might be possible to remove in the future) * Draft embedded climate This adds an initial version of an embedded climate/thermostat (heating only for now) with support for local control even with Wi-Fi out. Solves #646 Solves #263 * Update ReleaseNotes.md * Fix climate slider Fix for climate slider opening in an incorrect position and sending only the integer part of the new target temperature * Moving home page to ESPHome In progress... * Fix translations - Dutch * Embedded chip 3 Home page - Chip 3 will be controlled locally when embedded climate is enable. * Fixed buttons bar Fixed buttons bar managed on ESPHome when embedded climate is visible. * Update ReleaseNotes.md * Services back to the Blueprint Moving service calls back to the blueprint as latest HA requires user's permissions to call HA services from ESPHome. This still have to be used for Alarm calls due to security concerns. * Update ReleaseNotes.md * support to hidden ssid (#908) Supports hidden ssid with the use of substitutions `wifi_hidden: "true"`. This can be breaking change for users with custom/advanced wifi settings. Solves #906 * Update nspanel_esphome.yaml * Removed `restore_state` There is some incomplete work related to alarms on this commit, but the focus here is to fix `restore_state` on ESPHome v2023.7.0. This solves #939 * US model - Fan page - Redistribute icons Redistributed icons on Fan page on US model in order to improve usability. Based on feedback from https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/791#discussioncomment-6338706 * Align `nspanel_us_land` Apply all changes from EU to US_Land * Fix relays chips Fix relay status indication on chips. Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/926#issuecomment-1627660273 * Fix "invalid variable" for "api" Fix error "Nextion invalid variable name" when setting `api`. * Default embedded climate to relay_0 * Fix translations - Italian Based on https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-6511043 * Fix `set_temperature` for climate Solves #957 * Fix `fan.turn_off` call Removed timer call from fan stop button. This solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/791#discussioncomment-6494535 * Call a `fan.turn_off` when percentage is 0% Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/791#discussioncomment-6621756 * Fix call for fan stop button Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/791#discussioncomment-6622377 * Icons on ESPHome Move icons from TFT/HMI to ESPHome to prevent error on Nextion2Text. * Updated translations - Spanish Based on https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-6548961 * Make home page sensor's icons consistent Make icon selection consistent with chips where the entity's icon is used in case a icon is not set in the blueprint settings. Solves #963 * Updated translations - Slovenian Based on: - https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-6665723 - https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/829#discussioncomment-6665751 * dutch (#974) * small ducht translations small ducht translations * Dutch translations --------- Co-authored-by: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> * Add-on support (#977) Moved climate settings to an add-on. Updated documentation. * Fixed link to addon climate docs * Fix change brightness when sleeping Prevents the panel to change screen brightness when sleeping. Solves #975 * Standardize HA service calls * Bump version to `4.0 dev` * Create customization.md This will reduce the need for: - #920 - #662 - #833 * Clean-up for customizations Clean up ESPHome in order to make easier the use of customizations. * Create Alarm page * Add page Alarm * Add Alarm docs Update docs to reflect the current state (new features & changes) * Creating "install.md" and update add-ons instructions * Add Alarm page buttons pics * Add link to Alarm on page Home * Create Alarm page * Alarm button font color * Add `keyb_num` page * Alarm Control Panel with PIN (#982) Implements an Alarm Control Panel page on NSPanel. Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/66 Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/227 Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/672 Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/299#discussioncomment-4874612 Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/64#issuecomment-1566204490 Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/718 * Fix alarm without pin not working Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/pull/930#issuecomment-1680981977 * Alarm page UI Fixed close button Disabled buttons are darker * Move Entities button to ESPHome Move logic behind Entities button (Home page) from Blueprint to ESPHome in order to gain performance on creating home page. * Human readable Uptime (#986) * Human readable Uptime * Uptime from Frenck code * Uptime with Frenck code * Updated Human Readable Uptime * Removed trailing spaces * Renamed sensor to "Last started" Sensor renamed Update moved to the boot process Clean-up --------- Co-authored-by: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Co-authored-by: Edward Firmo * Update alarm icon & color * Revert `fast_connect` back to `false` * Extended chars on buttons pages (#988) Replaces #740 Probably solves #664 Probably solves #738 Probably solves #987 * Removed `fast_connect` * Support to `code_arm_required` Only shows the alarm PIN keyboard if a code is required for arming (or when disarming). * Update alarm icon on home page Refresh icon when alarm state changes. * Fix alarm icon not updating on home page * Home buttons new format - Alarm Modernise the button Alarm flow on page Home to improve performance. * Home buttons new format - Entities Modernise the button "Entities" flow on page Home to improve performance. * Home buttons new format - QRcode Modernise the button "QRcode" flow on page Home to improve performance. * Home buttons new format - Notification Modernise the button "Notification" flow on page Home to improve performance. I haven't moved the code from the Blueprint to ESPHome yet, as I will leave this for when we rebuild the Notification flow in the near future (hopefully), so the performance gains may not be perceived now. Just aligning with other buttons format. * Adding screenshots * Delete ReleaseNotes.md Moved to the release * New entity filter format This new format was released with HA v2023.4 and the old one will be deprecated soon. * Fix Alarm page bypass icon * Bump version to 4.0 * Rename `addon_climate_heat` * Simplify climate substitutions * Add support for `addon_climate_cool` * Removed `${verbose_log}` Use logger level `VERBOSE` instead * Fix script call * Clean up general entities & fallback Store inputs into variables only when needed. Removed fallback mode - Replaced by ESPHome local control when the relay is assigned to the button in the blueprint. * Phase out sensor `nspanel_event` (partially) This sensor is being replaced by event calls. * uptime sensors (#998) * Create ReleaseNotes.md * Fix Climate page when embedded climate And also added a lot of logs which should be removed later as it takes from memory. Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6835260 * Move brightness control to global var Clean up page Home * Alarm page translations - Finnish https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-6857262 * Exported pics * Clean-up TFT - Removed a bunch of unused pics - Changed page indicator to new format (which will allow future development to hide unused pages) - Standardized close button in most pages * Fixed background pics - Entities pages - Weather pages * Standardize close button * Add "Alarm" section * Support to wake-up page on `wake_up_display` service This changes the behavior of a service introduced by #734. * Optimize `wake_up_display` service * Fix icon font sizes 10 and 64 Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/960#issuecomment-1701903604 And also remove all the unnecessary `wait_until` * Fix Settings page element ids Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/960#issuecomment-1702109668 * Add translation keys for `settings` page #1002 * Update settings page when brightness changes on HA Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/960#issuecomment-1702149796 * Clean-up page settings * update docs (#1003) * updated docs * Update ReleaseNotes.md --------- Co-authored-by: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> * Clean-up Cover page I'm preparing this page to have icons changing based on the device_class selected to a cover. * Clean-up boot delay * Enable `current_page` sensor by default Otherwise the system won´t update values unless the page is reloaded. * Use `current_page` in blueprint conditions One more step towards the phase out of `nspanelevent`. * Move `script.refresh_colors` to `service.global_settings` As this is called from a single point, there's no meaning of having a separated script. * Fix climate icon update Partially solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6891454 * Fix button show on climate page Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6891335 * Visual improvements on climate page - Add friendly name when embedded - Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6891465 - Make disable icons a bit darker - Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6893440 - Add space for page title in EU an US Land versions - Reset page timer when pressing/releasing on the slider - Partially solves #990 * Don't update values when page home is not visible To reduce load on Home Assistant and the network * Cleanup boot sequence Move some functionalities to ESPHome * Display internal sensor value when wifi is out Before it was showing on home page only when API was out. This adds a test for WiFi. * Fix `default_target_temperature` It also updates the page home when thermostat status changes (for the chips). Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6897727 * Adding ID to components missing it * Renamed `wake_up_display` to `wake_up` * Re-arrange commands list * Add service `set_component_color` Deprecates the following services: - `send_command_font_color` - `send_command_background_color` * Fix button pages not showing * Adjusted time for HW long click * Fixed buttons on settings page * Minor adjustments to page climate And replace font 10 to size 48 (it was 64 since a few days ago). * Updates to breaking changes list * Page settings redesign Clean up the UI of settings page. Prepare for translations. * Enable translations of Settings page * Notification word-wrap For EU and US_LAND only, for now. * Notifications page rebuilt - Notification button processed on ESPHome (as all the info is there) - Added word-wrap for main text - Expanded text size - Handling display mode (used to define the number of chars per line on Notifications) - Versioning handling - As a consequence of the previous item. * Word-wrap buttons pages Taking advantage of the algorithm created for notifications. * Word-wrap for Alarm page * Version mismatch notication * Fix ESPHome not starting with older TFT * Rebuilt home page status bar update * Updated translations - Italian Based on https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/1002#discussioncomment-6926846 Thanks @MaiPiu * Fix `Nextion reported variable name invalid!` * Fix `Nextion variable invalid` * Handle `embedded_indoor_temperature` Internal temperature display will be handled locally (ESPHome) when no other sensor is selected. * Review temperature correction engine * Fix display climate chip * update `temp_nspanel` when correction changes * Fix `Fan` page not open with long press HW button Solves #1007 * Minor adjustments on settings page * version 4.0 ready for release * Clean-up docs --------- Co-authored-by: bkbartk Co-authored-by: w00zy * Fix Fan page button colors when opening Solves #1017 * Translations (#1023) * Translations * Update nspanel_blueprint.yaml I've changed `brightness` for now as the new design isn't implemented yet, but that string is already in use with the current design. --------- Co-authored-by: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> * Adjustments to settings page * Fix entity info when calling detailed pages Solves #1022 * Added `media_player` page (hidden) * New "Confirm" pop-up This also removes the sensor "NSPanel Event" * Fix pages not updating values Solves #1026 * Media player - Buttons - Added code to buttons on media_player page. - Clean-up: - Moved wake-up select from Blueprint to ESPHome component - Removed `switch.xxxxx_confirmation_message` * Fix logging for global_settings It was logging wakeup_page, which is deprecated * Improved version notification * Removed trailing spaces * Notification for `sensor.xxxxx_current_page` missing This might be a common issue for users migrating from v3.4 to v3.5. This information is part of the release notes, but I believe it worth having a guide to support closely any user who miss that in the release notes. * Simplify `touchevent` engine The touch event is used only for the sleeping engine (it will be used for dimming later) and it was transferring all the json info with page name, component, entity, etc. This was replaced by a simple random integer with no meaning other than "the screen was touched, reset the timer". * Media player first buttons actions * Fix unknown service: `media_player.null` * Media Player control You will be able to add a Media Player entity to any of the buttons pages and with a long press you will see the media player page. * Remove dimming timer for now The funcionality isn't completed. * Home page - Custom buttons On the blueprint you can now set up to 3 buttons to be shown on Home page. It will show the detailed settings page, so the entity must be compatible. * Fix Media player missing parameters Possibly solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/1030#discussioncomment-6984573 * Prevents calls to `media_player.null` * Remove `entity` info from pages on TFT Since v3.4, the info about entity_id shown was going all the way to Nextion and then sent back in the json return, however this requires a long (100-char) global var and the way it was implemented, it was one of those per settings page, as climate should be also recorded at the same time in case the embedded climate was installed. This was taking too much memory, so I've moved this info to a global variable (string) in ESPHome. There is now lots of space for code cleaning (and still pending to do the same with climate entity, as it could be only a bool to inform if embedded), but this brings the functionality. This enabled the return to global for some components, so it probably solves #1031 * Prototyping `power` page Thanks @Floppe for doing the design #838 * Prototyping `power` page * New sleep flow * Removed trailing spaces * Fix empty page climate * Fix names on button pages Fix names when a name is not provided in the blueprint settings. * Fix call to sleep routine when timeout changes Solves #1037 * Replace `confirm` var on buttons pages Simpler and saves some memory. * Clean-up * Align the code for the 3 timers * Extend domains supported by home page custom buttons Based on #1034 * Fix error when btn_label is `None` * Fix `Variable invalid` on buttons pages * Fix constructor of Entity pages * Fallback even when button is assigned to another entity Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/1013#issuecomment-1720107844 * Add inputs for media player refresh time * Adjustments to Media Player refresh interval default values * Use panel's events to reset timers Possibly solves #1040 Possibly solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-7020153 * State based colors to home page custom buttons * Fix alarm not changing status Do not clear `entity_id` when opening keyboard page, so the info can be used when sending commands. Solves #1039 * Missing `nspanel_us.tft` * add `touchevents` to pages `media_player` and `confirm` To avoid panel going back to Home page while user is playing with the page. Solves #1040 * Media player minor layout changes * Media player - Volume timer & icon size Volume timer changed from 1000 to 500ms Icon change from font 9 to 10 * Media player roll back font 9 and timer 1s * Don't send to Nextion obsolete volume settings If the volume is the same as the last one sent to the screen, don't send again, so if changes are being made on the screen it didn't receive the update all the time, making the slider unresponsive. * Media player - Layout improvement - Removed button "Stop" - Increase touch area for buttons - Redistributed buttons on page * Add touchevents to page climate Possibly solves #995 * Resolve validation * Correct playing time based on `updated_at` attribute * Prepare for when attribute is not available * Fix attribute `media_position` * Fix time duration when HA isn't updating position * Fix climate page not opening when offline Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/995#discussioncomment-6834067 * Clean-up release notes * Clean up code - Removed commented out lines - Removed temporary logs Getting prepared to release * Bump version to 4.0beta To reduce the chance of an obsolete file in use after the release. * Change version to 4.0dev To differentiate from beta. * Added missing translations (#1047) * Added missing translations Added missing translations for the Swedish translation. * Caption first char --------- Co-authored-by: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> * Translations to Slovak on Settings page * Refresh docs * Update nspanel_blank.md * Update nspanel_blank.md * Add screensaver to `nspanel_blank.tft` And build a new tft with latest firmware and url for instructions. * Update nspanel_blank.md * Fix to Slovenian translation https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/1002#discussioncomment-7041796 * Settings page - Translations to French From https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/1002#discussioncomment-7045452 * Alarm page - Translations to French https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-7046479 * Add customization for display sleeping/awake Probably solves #1035 * Customizations - Blank TFT button Probably solves #1048 * Customizations - Deep sleep Solves #955 * Customization - Deep sleep - Fix broken link * Translations - Slovak - https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/829#discussioncomment-7054153 - https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/940#discussioncomment-7054142 * New versioning - not implemented * Bump version to `4.0b2` * v4.0 release * Chpego patch 1 (#1059) * Update nspanel_blueprint.yaml fix some typo * Update nspanel_blueprint.yaml * Update README.md * Update nspanel_blueprint.yaml * Update nspanel_blueprint.yaml * Started Release Notes for v4.1 --------- Co-authored-by: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> * Prevents media player crash with `media_position_updated_at` Prevents media player crashing when called before `media_position_updated_at` is able to provide a value. I believe this solves #1062. * timezone * Settings page translations - Dutch https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/1002#discussioncomment-7073055 * Typo * Removed `display_current_brightness` I've removed this sensor as it was spamming the logs and taking memory without providing real benefit. * Ignore different patch versions Change the versioning control to major and minor only, ignoring differences on the patch version. So components with different patch versions should be able to work with each other as soon the major and minor versions are the same. This same logic was implemented on the blueprint before the 4.0 release. * Code clean-up * Flexible time format selected Solves https://github.com/Blackymas/NSPanel_HA_Blueprint/issues/1083#issuecomment-1732228103 * Removed obsolete thermostat page pic Based on https://github.com/Blackymas/NSPanel_HA_Blueprint/discussions/1076#discussioncomment-7085967 * Add date format for Finnish * Fix `buttonpage03` long press pointing to page 2 * Fix mute volume not working Solves #1079 items 2 and 3 * Reset sleep timer when brightness settings changes Solves #1087 Also removes limit to 10char on "Brightness" on Settings page. * Bump version to `4.0.1dev` * Update ReleaseNotes.md Preparing for patch release. * Review translations - Finish Solves #1083 * Update ReleaseNotes.md * Remove trailing space * v4.0.1beta --------- Co-authored-by: bkbartk Co-authored-by: w00zy Co-authored-by: w00zy <52609940+WZYProjects@users.noreply.github.com> Co-authored-by: Erik Larsson Co-authored-by: chpego <38792705+chpego@users.noreply.github.com> --- README.md | 13 ++- ReleaseNotes.md | 37 ++++++++ docs/en/customization.md | 19 +++- nspanel_blueprint.yaml | 119 +++++++++++++------------- nspanel_esphome.yaml | 87 +++++++++++-------- nspanel_eu.HMI | Bin 20387572 -> 20387572 bytes nspanel_eu.tft | Bin 7442752 -> 7442752 bytes nspanel_eu_code/boot.txt | 4 +- nspanel_eu_code/media_player.txt | 2 +- nspanel_us.HMI | Bin 20870573 -> 20870573 bytes nspanel_us.tft | Bin 7516104 -> 7516100 bytes nspanel_us_code/boot.txt | 4 +- nspanel_us_code/buttonpage03.txt | 2 +- nspanel_us_code/media_player.txt | 2 +- nspanel_us_land.HMI | Bin 14767051 -> 14767051 bytes nspanel_us_land.tft | Bin 7442752 -> 7442752 bytes nspanel_us_land_code/boot.txt | 4 +- nspanel_us_land_code/media_player.txt | 2 +- 18 files changed, 181 insertions(+), 114 deletions(-) create mode 100644 ReleaseNotes.md 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 9dcbf036753476364c9be0dbd4a8caf4e82ab6fd..8d5665e851cc94514e0a595fd05880ded55bf291 100644 GIT binary patch delta 2037 zcmd_oi&Io(7{~E*&YlA-B(1P1Xb>v`o9GIOw=P0=ElIkm7-HNiO9%wy#7eF0qf~gI zRynCyW-3;i(3&UdLP`*Hvr@B6!7M3CVk^2+_IqGw-2Q`RdS^c0dCz;^oq1;G^zAxs z>;o~OL97y8xw6SsD+Y*ydz;uKg$r2=3vAOX?!$rF?Gq6z_c*fD>Bvptr;9~PMSA57S z7loPPT4t+4`U1Rcb>aSQr7yNq8hFN0q~<36oFt*pCft`rWZBoDNH+!y*#u#PBZ8Rx{+p5 zD&0i0D2;BWTj*B0jc%veG>7I=I?bayD1+uxCM}>lDT}fxhjJ;8?xMTt9$HBE(tWgu z@~MFCr$Q>C#Z=CLtAjy_sOU%t%qU~=lF4a!<6enqp zt;@|d`-&AkBSt+EtczM%h@|&!FDoBf*<>q)C3=&sY|3F}aZ!#rWpG~d&ei2JZ?@08 zoj&uX`^=l;GjFcXy!k%!77WfShHJ}$N{9K`60`G4vb3yug=W#HCEC@s|C;zjupUvg zW0s_^o}^BWk|Wzkl;Jz^qn?m%0#U?p;*@IH`IlSTD7TUh&H}i9i@4;)TQa` zYwPUNxx>oLMim}_a{OupCxEB|HL;!edYcD`6F^hBZ(PkHZt- zg0-*?YCwZ0VLfbsjZh1l;3;?-Hp4Tp1)hbiuno3D9qfST;CXlfcET=r5q3j8G{8&X zhCT2y>;)ZOfql>jufl8aI=lf*@Fwhs1JDd_K?}6P+t3E>@D98S@4@@<0UU%6;UoAM z4#8nK0-wN9_!K^aWAHf~hZE2Nop2JqfK%`#dIu=WRAk|l zb3Vt!8OjOagmTQB3pm3#!#QD`aLx$MNX~_v2u>vDB2E;?!WqSh=8WdVaAG-e94qHy k&KOQSXDnwN$Hp1YN#G=MF5yhzBylE+O_`08#F~tM06~BNB>(^b delta 2870 zcmeIyX;@TM7zglkX9E;*L~ub&Bu(6gMcfd9R1i^c#n4~?Bll&LK}Hrq=O`&6)F2nr z5=|M>Pzm!Um4t*!X;Qg_U=fvRWsZsEn*EP+@lN0R*oW@({QmRaa}J01+_}(J-t5o@ zoNon}%bAiCYST{6p5rR_an-V(%MuqY*Mvt-BH~pLq9Y|r+*D>Nb~pqF`VzvO%qPTB zu52FAEMxcV^68aAWcaks?N=r_w#tIUIX}$hb;Vp=e&raaZSvp%HgU2mM=Tmu^8mg4 z$vuXA{S8FUHaW%Sb}P$;jV=*u+poIW2BIrw4a}(& zoGX+){rvv9z@#veIq_Itxvod8y&~?`)fiKW$6lkoXO6um2QrX@0+gT<>^<%7Uitqq z{j0}hRD0#9y*QA892B4gm7w;rvt0TwET~j_O*>6T(a|)3j-i2cEDfT;G=x4+$IlV}8;OsCLD8bznlX>>ZBL1)rgG@8z)FVGk|ht8!h(pVZtwKSe4&_p_q zzC@Gg%XB_nKo`)I&juHehA)ju}&CDh=W)!(n#Zr1&iEZ^57d9QeBk( z8lQQ7d`*3F3g2=g*`LqeyTPUCSh7;kI;LE35}ZR*U1h?}($usrIn|mJSS?g*Qb(Ov z9xSgq5nye0t=LqHO|!8!%{JOJJJY7wIGbj*Hq9=uX?CI5tZsI?i_rVx>KZ3Lc$Tgk zuX9VO<j=Y050%@%@^D=-?|sQUH>>@z32H*3#154%gd~df{O)*! z?VY<3GD>BAggtCdQP_`=ba72*oT7ctT%00R9G7`Z<7@q%j%SfO!=;Ipqn}QYYk|^u zQiwF(G+z3CVi&E_r(`z zav~v*#X2HM8lSL0s)H62a!*_{av33iiS=-uG_FY|L?!O;pQXn?esNLKYC@dEiB+kD zIEwXJgVgndbV4G(ypEZ%@CIzoPZ44C}Zkty)@D^Sl%8xx%>MB?snfuDE_fsoMUHRCT!nnPM1l8Ioc`%tbsI0hYZMswU7nbunyLP5h!ecjgSMcz$VxXxv&ND zU@PQ90lW&Yfe8v>8x#Q##jqV-haIpJ-hek@7nHzm*aL6DUf2hvV1_by8}`Eicn8Yi zARL0jPyz2kB^-hG;3x?2J{*H8_y9hHkKi~|!^cnqC!iKSfjT$|r{FZy!>8~WoPo3O zIh=zA_yWF!ui!jffQxVmzJ^A)3{B7sSKu4?7FystXoc_L2lx@L!cTAwuEWpp3;YT< z;5WDl7Ptk!!)<7TJMahm33uTh+=mD75FWu_@Hkgn#pMGF84EcJ1q&q$6$?8S_ADG& zbYRhug(HhjESy+$W}#-$g@rSVt}I+wxU%TRqC1NoEPAqVW6_I+JB!{do?+34g$Iki zEIe5}%c38P{w$tjF@S{^i-9Z#u^7x^2#cXCG%UPX_^|M0;m2Ya3x5{FxoU0I2(Bph EZ+a<`TmS$7 diff --git a/nspanel_eu.tft b/nspanel_eu.tft index b2bb25e5d84bd6f54584704feaffc88b0b51ec5a..e60cfcd54e0ef1593f862915e2e5da271459332a 100644 GIT binary patch delta 294 zcmWN=MNR`@7=Ym^723hw-L15^7I$~2w57N$H~^40`R_qO!U0HU(ao&bvL1HqxdBPT z_au+``e`@i6E>2t?&F2!BMLEtl6Hjy{HzvLc4EPG5d(KBdQ_^32fV n=f8h$UDMv3n&wf7*oC~5SMplk$Xj_Q?~O$4A@J=8zL{VDlG1q4 delta 294 zcmW;5MNUIe7=Y1RYOfEMV#VE|xE6PJ*Wx~B0_02XJ{Yk8(l_X&Blhr^F=q!P4SzVv ziM@R~WAYgX2{>`##)B6FA0~+;kxUAyq>)YrnPlN7n;deFBP=%tT-1_&|85W|cx${6EJFv%3t%rMIw^DMB) z63eWx${Oozu*nwN?6Auo`y6n{5yzZ-gkNlr`lq!WwzPfv`t1m6GkPY^Ei-!Y^K1B& hdUq>j=y>E(Udd~DBX8xMyq6DFJn|U&ay|LIfj{oPbn^fJ 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 49a644c563cdb7deea3b1d936a8fd4997d283ba1..b549d7cf77251db03b9cffd36526095fab713491 100644 GIT binary patch delta 2760 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 R6wyya6fMuS_op3C{s;dnYBK-; diff --git a/nspanel_us.tft b/nspanel_us.tft index 3841f64dbeeabef3f7a39d616d55e32ed40c144c..fe74fc932f7fa1bee21f82e4668a5c6a9b7685fb 100644 GIT binary patch delta 4300 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 delta 1499 zcmd_o`A<|=6bJBoXBa?f%($R2S``zcMhi2eMn$YE?sea=Dh#!?fXh=9QSpiL#Q|6B zs8>SLRLjcr!!o0i`Ox_LKl&& ziONPHo<6rd>>X)sdFHFMC%P!+b+V;4B5=tEYplbYdl_L*b#XkLwdx4zO%Ivf+2wls z;?%L}A|{rdzW+j!EM0`-?Q+tnB5|;Q=h?8Q&1D(Tm_7J#hTHCO+a+1ZN&#e}K*Mbh z%5U^)_P+1W-)3lbkH&Fm9EZknXdH*eacCTeW)I3~d>0ygnmuMFhF~ZnF$_@{j*l?{ zBQXl2F$QB1jd2){37CjUn2ag-1XD2$(=h`xF$=RX2XiqG^AUpu_!JAV2#XPmIJgmy z&#(la;|nasmqvchVHH**8Edc>DOiV8tj7jyL>e}o(*v_?Y0j=UqSTfr zx>}TO|qK0<7;yzH6NPl(oB$>xad&+YW*aUTiM%AY4RZ@oWH zG@7z>Zx7}8cU^!g%U^4^4Gee0yOg_LFI6Lpw}u)K)hV@YY~^Jau0*zcj!|Es=Q)f* zpI&TJ&;BngRdMm=Gu4!1c2LW9nIT5>HZ!%oj8M1ZlSAbIC8N!L(yC-)a;SP-qIZ;o zR9Ieeu5m5bJa3WRm2>*~Q0aQJO&(Cr5}qCSs_~{&=B*T$ky&7txARnX+f3=Sg|<=# zfih_uc_@prX*=zpowSQ~(;mv9z4R4%X&>#U1ElC69im)1Oh@P_{?K zfRza;ImTe0nY3Ry{?TiVw26ODYwfW%6w%jojEdq4$PmN$@H4_FV~jJwBvVW?!z^>mv%n%t zEVIHYYpk=uCR=Q?!!CR5bHE`-9CJc|;791$bhy32@MAzJGh`_9^ySCmQF=5i&kQ|! n{u_7dn)YVbG?z+5F65=WlGpM^-pV_9ZzLiQzAxK%{O|oAmMeM0 delta 294 zcmW;5MNUIe7=Y1RD!e}2-Q6h;h2mP=-3rBJ2|&K&?t>8vAbo>QI${rx8FN+uNy8sb za$>I^&X|0{K>|)(xbcvPffth`l1U+zG}6f+lPt2yA(uSzDWH%diYcL#GRmo-k}9gH zp_V%8X`qoNnrWexHrnygK_^{w(?c(P^fQ2;L52u0%m|~5G0p^&Ofk(2v&<1>o&^?J zVwn|IS!10IHrZmE9d_Acp92m#;+PXo-$T!~NBz^<4q4hhd--zsv>82@VatqOeE%9= irQY0189E-hlvnav-pE^dC-3Eh6^}dyK3zXSfA|mb4|XR2 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