h3n3/NSPanel_HA_Blueprint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Blackymas/NSPanel_HA_Blueprint into dev

Browse Source
This commit is contained in:
Edward Firmo
2023-11-28 23:26:04 +01:00
parent 8469c5e6da 5e9abec9dd
commit 1126fa03b4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nspanel_esphome_addon_upload_tft.yaml
View File

@@ -13,11 +13,6 @@ substitutions:
# nextion_update_blank_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/raw/main/custom_configuration/nspanel_blank.tft" # nextion_update_blank_url: "https://github.com/Blackymas/NSPanel_HA_Blueprint/raw/main/custom_configuration/nspanel_blank.tft"
############################################## ##############################################
external_components:
- source: github://pr#5683 # Remove this when that pr is merged
components:
- nextion
button: button:
##### UPDATE TFT DISPLAY ##### ##### UPDATE TFT DISPLAY #####
- name: ${device_name} Update TFT display - name: ${device_name} Update TFT display

9
nspanel_esphome_core.yaml
View File

@@ -10,6 +10,11 @@ substitutions:
version: "4.2dev" version: "4.2dev"
############################# #############################
external_components:
- source: github://pr#5825 # Remove this when that pr is merged and released
components:
- nextion
##### ESPHOME CONFIGURATION ##### ##### ESPHOME CONFIGURATION #####
esphome: esphome:
name: ${device_name} name: ${device_name}
@@ -27,7 +32,7 @@ esphome:
timeout: 60s timeout: 60s
- wait_until: - wait_until:
condition: condition:
- lambda: !lambda return disp1->is_detected(); - lambda: !lambda return disp1->is_setup();
timeout: 20s timeout: 20s
- script.execute: exit_reparse - script.execute: exit_reparse
- wait_until: - wait_until:
@@ -1346,7 +1351,7 @@ switch:
on_turn_on: on_turn_on:
- wait_until: - wait_until:
condition: condition:
- lambda: !lambda return disp1->is_setup(); - lambda: !lambda return disp1->is_detected();
timeout: 20s timeout: 20s
- lambda: |- - lambda: |-
if (id(boot_sequence_completed)) { if (id(boot_sequence_completed)) {