From d6db29605d363ab948635a170be5728e64799650 Mon Sep 17 00:00:00 2001
From: Brandon Harvey <bharvey88@users.noreply.github.com>
Date: Tue, 24 Feb 2026 18:43:47 -0600
Subject: [PATCH 1/3] [wifi-info] Add IP address text sensor

---
 Integrations/ESPHome/Core.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index 83294d1..8ea39d3 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -295,6 +295,12 @@ light:
           min_brightness: 50%
           max_brightness: 100%
 
+text_sensor:
+  - platform: wifi_info
+    ip_address:
+      name: "IP Address"
+      id: wifi_ip
+
 script:
   - id: pumpUntilFull
     then:

From d50e4b93618a5476fc5586dc459a8d1b11acb987 Mon Sep 17 00:00:00 2001
From: Brandon Harvey <bharvey88@users.noreply.github.com>
Date: Tue, 24 Feb 2026 18:44:11 -0600
Subject: [PATCH 2/3] [version] Add ESPHome and Apollo firmware version sensors

---
 Integrations/ESPHome/Core.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index 8ea39d3..49f5fd3 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -300,6 +300,16 @@ text_sensor:
     ip_address:
       name: "IP Address"
       id: wifi_ip
+  - platform: version
+    name: "ESPHome Version"
+    hide_timestamp: true
+    entity_category: "diagnostic"
+  - platform: template
+    name: "Apollo Firmware Version"
+    id: apollo_firmware_version
+    lambda: |-
+      return {"${version}"};
+    entity_category: "diagnostic"
 
 script:
   - id: pumpUntilFull

From d000ca325fe53cc6036b57f41b8d57eaa398c6db Mon Sep 17 00:00:00 2001
From: Brandon Harvey <bharvey88@users.noreply.github.com>
Date: Tue, 24 Feb 2026 18:44:53 -0600
Subject: [PATCH 3/3] [esphome] Modernise board spec, web server version,
 remove legacy options

- Remove redundant esp32 board string (variant + flash_size already present)
- Add web_server version: 3 to Core.yaml
- Remove platformio_options board_build.flash_mode from both device YAMLs
- Remove legacy BLE wifi on_connect/on_disconnect hooks from PUMP-1.yaml
---
 Integrations/ESPHome/Core.yaml           | 2 +-
 Integrations/ESPHome/PUMP-1.yaml         | 8 --------
 Integrations/ESPHome/PUMP-1_Minimal.yaml | 3 ---
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/Integrations/ESPHome/Core.yaml b/Integrations/ESPHome/Core.yaml
index 49f5fd3..3dea60d 100644
--- a/Integrations/ESPHome/Core.yaml
+++ b/Integrations/ESPHome/Core.yaml
@@ -4,7 +4,6 @@ substitutions:
   device_description: ${name} made by Apollo Automation - version ${version}.
 
 esp32:
-  board: esp32-c6-devkitm-1
   variant: esp32c6
   flash_size: 8MB
   framework:
@@ -69,6 +68,7 @@ captive_portal:
 
 web_server:
   port: 80
+  version: 3
 
 # Buzzer
 output:
diff --git a/Integrations/ESPHome/PUMP-1.yaml b/Integrations/ESPHome/PUMP-1.yaml
index 1c619eb..d0214b5 100644
--- a/Integrations/ESPHome/PUMP-1.yaml
+++ b/Integrations/ESPHome/PUMP-1.yaml
@@ -3,9 +3,6 @@ esphome:
   friendly_name: Apollo PUMP-1
   comment: Apollo PUMP-1
   name_add_mac_suffix: true
-  platformio_options:
-    board_build.flash_mode: dio
-
   on_boot:
   - priority: -10
     then:
@@ -48,11 +45,6 @@ update:
     source: https://apolloautomation.github.io/PUMP-1/firmware/manifest.json
 
 wifi:
-  on_connect:
-    - delay: 5s
-    - ble.disable:
-  on_disconnect:
-    - ble.enable:
   ap:
     ssid: "Apollo PUMP-1 Hotspot"
 
diff --git a/Integrations/ESPHome/PUMP-1_Minimal.yaml b/Integrations/ESPHome/PUMP-1_Minimal.yaml
index 5a5a83f..ff36804 100644
--- a/Integrations/ESPHome/PUMP-1_Minimal.yaml
+++ b/Integrations/ESPHome/PUMP-1_Minimal.yaml
@@ -3,9 +3,6 @@ esphome:
   friendly_name: Apollo PUMP-1
   comment: Apollo PUMP-1
   name_add_mac_suffix: true
-  platformio_options:
-    board_build.flash_mode: dio
-
   project:
     name: "ApolloAutomation.PUMP-1"
     version: "${version}"