Skip to content

Commit

Permalink
Use PSRAM with Nextion Upload TFT
Browse files Browse the repository at this point in the history
Helps with the following:
- #1983
- #1946
- #1815
  • Loading branch information
edwardtfn committed Apr 16, 2024
1 parent 7da53ef commit 94d51c4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
9 changes: 5 additions & 4 deletions esphome/nspanel_esphome_core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ substitutions:
invalid_cooldown: "100ms"
bytes_per_char: "1"
##### DON'T CHANGE THIS ######
version: "4.3.5d1"
version: "4.3.5.dev1"
##############################

##### External components #####
Expand All @@ -34,9 +34,10 @@ external_components:
- source:
type: git
url: https://github.com/edwardtfn/esphome
ref: nextion-v432
ref: nextion-23 # nextion-v432
components:
- nextion # Change this when that PR#6192 gets released (2024.4?)
- nextion # Change this when that PR#6192 gets released (2024.5?)
- psram
refresh: 300s
- source:
type: git
Expand Down Expand Up @@ -2668,7 +2669,7 @@ script:
#if ESPHOME_LOG_LEVEL > ESPHOME_LOG_LEVEL_DEBUG
ESP_LOGV("script.refresh_hardware_buttons_bars", "Page: %s", current_page->state.c_str());
ESP_LOGV("script.refresh_hardware_buttons_bars", "Page id: %i", get_page_id(current_page->state.c_str()));
ESP_LOGV("script.refresh_hardware_buttons_bars", "buttons_bars_pages: %i", id(buttons_bars_pages));
ESP_LOGV("script.refresh_hardware_buttons_bars", "buttons_bars_pages: %" PRIu32, id(buttons_bars_pages));
ESP_LOGV("script.refresh_hardware_buttons_bars", "relay_settings: %i", id(relay_settings));
ESP_LOGV("script.refresh_hardware_buttons_bars", "button_mask: %i", button_mask);
#endif
Expand Down
14 changes: 7 additions & 7 deletions nspanel_blueprint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ blueprint:
description: >
# NSPanel Configuration via Blueprint: Complete UI-Based Setup

**Version**: v4.3.4
**Version**: v4.3.5.dev1


This project enables comprehensive configuration of your NSPanel through a Blueprint featuring a user interface.
Expand Down Expand Up @@ -3833,7 +3833,7 @@ trigger_variables:
group06: !input utilities_page01_group06_line_reference

variables:
blueprint_version: '4.3.4'
blueprint_version: '4.3.5.dev1'
pages:
current: '{{ states(currentpage) }}'
home: "home"
Expand Down Expand Up @@ -4730,7 +4730,7 @@ action:
else ("sensor." ~ device_name ~ "_esphome_version")
%}
{{
trigger.event.data.esphome_version
version(trigger.event.data.esphome_version)
if
trigger is defined and
trigger.event is defined and
Expand All @@ -4739,9 +4739,9 @@ action:
trigger.event.data.esphome_version is string and trigger.event.data.esphome_version | length > 0
else
(
states(esphome_version_sensor)
version(states(esphome_version_sensor))
if has_value(esphome_version_sensor)
else "0.0.0"
else version("0.0.0")
)
}}
date_format_temp: !input 'date_format'
Expand Down Expand Up @@ -8249,7 +8249,7 @@ action:
timezone: !input timezone

##### Timezone #####
- if: '{{ timezone is string and timezone | length > 1 }}'
- if: '{{ timezone is string and timezone | length > 1 and esphome_version >= "4.3.4" }}'
then:
- variables:
timezone_code: >
Expand Down Expand Up @@ -8441,7 +8441,7 @@ action:
climate_friendly_name: '{{ state_attr(climate, "friendly_name") if climate_entity_id_valid else "" }}'
hw_buttons_bars_pages: !input hw_buttons_bars_pages

- if: '{{ not climate_entity_id_valid }}'
- if: '{{ esphome_version >= "4.3.4" }}'
then:
- *delay_default
- service: 'esphome.{{ nspanel_name }}_set_bool'
Expand Down

0 comments on commit 94d51c4

Please sign in to comment.