From dd874c0c3f4049166f6a266b8204a6b6ea0536ba Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Thu, 16 May 2024 10:21:56 +0200
Subject: [PATCH] Use libraries from ESPHome v2024.5.0

---
 docs/version_compatibility.md          |  3 ++-
 esphome/nspanel_esphome_core.yaml      | 27 ++++----------------------
 prebuilt/nspanel_esphome_prebuilt.yaml |  3 +--
 3 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/docs/version_compatibility.md b/docs/version_compatibility.md
index 20e8279..55fa2d1 100644
--- a/docs/version_compatibility.md
+++ b/docs/version_compatibility.md
@@ -3,7 +3,8 @@
 <!-- markdownlint-disable MD013 MD033 -->
 | NSPanel_HA_Blueprint<br><sub><sup>Version</sup></sub> | Home Assistant<br><sub><sup>Min version</sup></sub> | ESPHome<br><sub><sup>Min version</sup></sub> |
 | :--: | :--: | :--: |
-| v4.3.3+ | 2024.3.0 | 2023.12.0 |
+| v4.3.8+ | 2024.3.0 | 2024.5.0 |
+| v4.3.3<br>v4.3.4<br>v4.3.5<br>v4.3.6<br>v4.3.7 | 2024.3.0 | 2023.12.0 |
 | v4.3.2<br>v4.3.1 | 2024.3.0 | 2024.3.0 |
 | v4.3.0 | 2024.3.0 | 2023.12.0 |
 | v4.2.2+ | 2023.12.0 | 2023.12.0 |
diff --git a/esphome/nspanel_esphome_core.yaml b/esphome/nspanel_esphome_core.yaml
index eabdb7e..df8e39d 100644
--- a/esphome/nspanel_esphome_core.yaml
+++ b/esphome/nspanel_esphome_core.yaml
@@ -31,34 +31,15 @@ external_components:
     components:
       - nspanel_ha_blueprint
     refresh: 30s
-  - source:
-      type: git
-      url: https://github.com/edwardtfn/esphome
-      ref: nextion-39  #nextion-v435
+  - source: github://pr#6330
     components:
-      - nextion  # Change this when that PR#6192 gets released (2024.5?)
-      - psram    # Change this when that PR#6526 gets released (2024.5?)
-    refresh: 30s  # To do: 300s
-  - source:
-      type: git
-      url: https://github.com/edwardtfn/esphome
-      ref: esp32ble-01
-    components:
-      - esp32_ble_tracker  # Change this when that PR#6585 gets released (2024.5?)
-    refresh: 300s
-  - source:
-      type: git
-      url: https://github.com/edwardtfn/esphome
-      ref: adc-sampling
-    components:
-      - adc  # Change this when PR#6330 is merged (2024.4?)
-    refresh: 300s
+      - adc  # Change this when PR#6330 is merged and released (2024.6)
 
 ##### ESPHOME CONFIGURATION #####
 esphome:
   name: ${name}
   friendly_name: ${friendly_name}
-  min_version: 2023.12.0
+  min_version: 2024.5.0
   platformio_options:
     build_flags:
       - -Wno-missing-field-initializers
@@ -1567,7 +1548,7 @@ sensor:
   - id: ntc_source
     platform: adc
     pin: 38
-    attenuation: 11db
+    attenuation: 12db
     samples: 4
     update_interval: 10s
     filters:
diff --git a/prebuilt/nspanel_esphome_prebuilt.yaml b/prebuilt/nspanel_esphome_prebuilt.yaml
index 23fbfea..4a4c76c 100644
--- a/prebuilt/nspanel_esphome_prebuilt.yaml
+++ b/prebuilt/nspanel_esphome_prebuilt.yaml
@@ -16,10 +16,9 @@ substitutions:
 
 ##### External components #####
 external_components:
-  - source: github://pr#5586  # Remove this and update min ver when that PR is released
+  - source: github://oarcher/esphome@ota_http_legacy  # Remove this and update min ver when PR#5586 is released
     components:
       - ota_http
-    refresh: 300s
 
 packages:
   core_package: !include ../esphome/nspanel_esphome_core.yaml