Merge upstream/dev into integration

Resolved conflicts in:
- esphome/components/fan/fan.cpp: Preserved pointer-based preset mode optimization
- esphome/components/fan/fan_traits.h: Kept cstring include for strcmp
- esphome/components/web_server_idf/web_server_idf.cpp: Kept float_buf_size constant

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
J. Nick Koston
2025-11-02 19:42:06 -06:00
co-authored by Claude
13 changed files with 68 additions and 18 deletions
+6 -1
View File
@@ -10,7 +10,11 @@ esphome:
on_shutdown:
logger.log: on_shutdown
on_loop:
logger.log: on_loop
if:
condition:
component.is_idle: binary_sensor_id
then:
logger.log: on_loop - sensor idle
compile_process_limit: 1
min_version: "2025.1"
name_add_mac_suffix: true
@@ -34,5 +38,6 @@ esphome:
binary_sensor:
- platform: template
id: binary_sensor_id
name: Other device sensor
device_id: other_device
+2 -2
View File
@@ -21,12 +21,12 @@ font:
id: roboto_greek
size: 20
glyphs: ["\u0300", "\u00C5", "\U000000C7"]
- file: "https://github.com/IdreesInc/Monocraft/releases/download/v3.0/Monocraft.ttf"
- file: "https://media.esphome.io/tests/fonts/Monocraft.ttf"
id: monocraft
size: 20
- file:
type: web
url: "https://github.com/IdreesInc/Monocraft/releases/download/v3.0/Monocraft.ttf"
url: "https://media.esphome.io/tests/fonts/Monocraft.ttf"
id: monocraft2
size: 24
- file: $component_dir/Monocraft.ttf
+2 -2
View File
@@ -21,12 +21,12 @@ font:
id: roboto_greek
size: 20
glyphs: ["\u0300", "\u00C5", "\U000000C7"]
- file: "https://github.com/IdreesInc/Monocraft/releases/download/v3.0/Monocraft.ttf"
- file: "https://media.esphome.io/tests/fonts/Monocraft.ttf"
id: monocraft
size: 20
- file:
type: web
url: "https://github.com/IdreesInc/Monocraft/releases/download/v3.0/Monocraft.ttf"
url: "https://media.esphome.io/tests/fonts/Monocraft.ttf"
id: monocraft2
size: 24
- file: $component_dir/Monocraft.ttf
+3 -3
View File
@@ -50,16 +50,16 @@ image:
transparency: opaque
- id: web_svg_image
file: https://raw.githubusercontent.com/esphome/esphome-docs/a62d7ab193c1a464ed791670170c7d518189109b/images/logo.svg
file: https://media.esphome.io/logo/logo.svg
resize: 256x48
type: BINARY
transparency: chroma_key
- id: web_tiff_image
file: https://upload.wikimedia.org/wikipedia/commons/b/b6/SIPI_Jelly_Beans_4.1.07.tiff
file: https://media.esphome.io/tests/images/SIPI_Jelly_Beans_4.1.07.tiff
type: RGB
resize: 48x48
- id: web_redirect_image
file: https://avatars.githubusercontent.com/u/3060199?s=48&v=4
file: https://media.esphome.io/logo/logo.png
type: RGB
resize: 48x48
- id: mdi_alert