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

nspanel_esphome_addon_upload_tft.yaml

@@ -13,11 +13,6 @@ substitutions:
   # 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:
   ##### UPDATE TFT DISPLAY #####
   - name: ${device_name} Update TFT display

nspanel_esphome_core.yaml

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