Merge branch 'current' into ard-160

Author: clydebarrow

Makefile

@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2025.6.0
+ESPHOME_REF = 2025.6.2
 PAGEFIND_VERSION=1.1.1
 PAGEFIND=pagefind
 NET_PAGEFIND=../pagefindbin/pagefind

_static/version

@@ -1 +1 @@
-2025.6.0
+2025.6.2

changelog/2025.6.0.rst

@@ -166,6 +166,35 @@ This change makes the BME68x environmental sensors more versatile and easier to
 continuing ESPHome's move toward framework flexibility.
 
 
+Release 2025.6.1 - June 23
+--------------------------
+
+.. collapse:: Show
+    :open:
+
+    - Eliminate memory fragmentation with BLE event pool :esphomepr:`9101` by :ghuser:`bdraco`
+    - [nextion] Fix command spacing double timing and response blocking issues :esphomepr:`9134` by :ghuser:`edwardtfn`
+    - Fix missing BLE GAP events causing RSSI sensor and beacon failures :esphomepr:`9138` by :ghuser:`bdraco`
+    - [config validation] Add more ip address / network validators :esphomepr:`9181` by :ghuser:`jesserockz`
+    - Fixes for setup of OpenThread either using TLV or entering Credentials directly :esphomepr:`9157` by :ghuser:`rwrozelle`
+    - Restore access to BLEScanResult as get_scan_result :esphomepr:`9148` by :ghuser:`myhomeiot`
+
+
+Release 2025.6.2 - June 27
+--------------------------
+
+.. collapse:: Show
+    :open:
+
+    - [lvgl] Fix dangling pointer issue with qrcode :esphomepr:`9190` by :ghuser:`clydebarrow`
+    - [audio] Bugfix: improve timeout handling :esphomepr:`9221` by :ghuser:`kahrendt`
+    - [speaker] bugfix: continue to block tasks if stop flag is set :esphomepr:`9222` by :ghuser:`kahrendt`
+    - [voice_assistant] Support streaming TTS responses and fixes crash for long responses :esphomepr:`9224` by :ghuser:`kahrendt`
+    - [esp32] Change ``enable_lwip_mdns_queries`` default to ``True`` :esphomepr:`9188` by :ghuser:`scaiper`
+    - [i2c] Disable i2c scan on certain idf versions :esphomepr:`9237` by :ghuser:`swoboda1337`
+    - [mcp23xxx_base] fix pin interrupts :esphomepr:`9244` by :ghuser:`ssieb`
+
+
 Full list of changes
 --------------------
 

components/binary_sensor/esp32_touch.rst

@@ -240,8 +240,36 @@ reduce the ESP's overall performance.
 
 .. _esp32-note-about-variants:
 
-A Note About S2 and S3 Variants
--------------------------------
+S2 and S3 Variants
+------------------
+
+.. note::
+
+    **ESP32-S2 and ESP32-S3 Touch Configuration**
+
+    The default ``measurement_duration`` and ``sleep_duration`` values are optimized for the original ESP32 and
+    **may not work at all on S2/S3 variants**. The S2/S3 touch hardware requires different timing settings.
+
+    Key differences:
+
+    - **Touch values increase** when touched (opposite of ESP32 which decreases)
+    - **Higher raw values** are returned compared to original ESP32
+    - **Lower measurement duration required** - the default 8ms is often too high for S2/S3
+
+    **Example settings for S2/S3:**
+
+    .. code-block:: yaml
+
+        esp32_touch:
+          setup_mode: false
+          measurement_duration: 0.25ms  # Much lower than the 8ms default
+          sleep_duration: 0.5ms
+
+        binary_sensor:
+          - platform: esp32_touch
+            name: "Touch Sensor"
+            pin: GPIO1
+            threshold: 1000  # Adjust based on your hardware
 
 If you're familiar with the ESP32 hardware and pick up an S2 or S3 variant, you're likely to notice some behavioral
 differences between them. In particular:
@@ -255,6 +283,10 @@ These behavioral differences are due to changes in the hardware and software (ES
 expected -- if you are moving your configuration from an original ESP32 to an S2 or S3 variant, expect that you'll need
 to make some adjustments to your configuration to accommodate this behavior.
 
+Most importantly, the default ``measurement_duration`` of 8ms (optimized for original ESP32) is often too high for
+S2/S3 variants and can prevent touch detection from working entirely. Using a much lower value like 0.25ms has been
+found to work across many S2/S3 devices, though specific parameters may still need tuning per hardware implementation.
+
 See Also
 --------
 

components/esp32.rst

@@ -140,7 +140,7 @@ LWIP (Lightweight IP) features and save flash memory (approximately 4KB):
   as a DHCP server (necessary for WiFi AP mode). When the WiFi component is used, it automatically handles enabling/disabling
   the DHCP server based on whether AP mode is configured. When WiFi is not used, defaults to ``false``.
 - **enable_lwip_mdns_queries** (*Optional*, boolean): Enable mDNS query support in the DNS resolver. ESPHome uses its own
-  mDNS implementation, so this is rarely needed. Defaults to ``false``.
+  mDNS implementation, so this is rarely needed. Defaults to ``true``.
 - **enable_lwip_bridge_interface** (*Optional*, boolean): Enable bridge interface support for bridging multiple network
   interfaces. Defaults to ``false``.
 

components/esp32_camera.rst

@@ -502,6 +502,28 @@ Configuration examples
       name: My Camera
       # ...
 
+**Waveshare ESP32-S3 ETH + OV2640 camera**:
+
+.. code-block:: yaml
+
+    esp32_camera:
+      external_clock:
+        pin: GPIO3
+        frequency: 20MHz
+      i2c_pins:
+        sda: GPIO48
+        scl: GPIO47
+      data_pins: [GPIO41, GPIO45, GPIO46, GPIO42, GPIO40, GPIO38, GPIO15, GPIO18]
+      vsync_pin: GPIO1
+      href_pin: GPIO2
+      pixel_clock_pin: GPIO39
+      power_down_pin: GPIO8
+
+      # Image settings
+      name: My Camera
+      # ...
+
+
 See Also
 --------
 

components/ethernet.rst

@@ -315,6 +315,20 @@ Configuration examples
     ethernet:
       type: OPENETH
 
+**Waveshare ESP32-S3-ETH PoE**:
+
+.. code-block:: yaml
+
+    ethernet:
+      type: W5500
+      clk_pin: GPIO13
+      mosi_pin: GPIO11
+      miso_pin: GPIO12
+      cs_pin: GPIO14
+      interrupt_pin: GPIO10
+      reset_pin: GPIO9
+
+
 See Also
 --------