Merge branch 'dev' into esp-idf_516

[psram] Add version check to fix 5.3.2 (#8588 )
Bump ruff from 0.11.5 to 0.11.6 (#8587 )
2025-07-29 14:46:40 +00:00 · 2025-04-17 21:06:51 -05:00 · 2025-04-17 21:06:41 -05:00 · 2025-04-17 20:24:31 +00:00
2 changed files with 8 additions and 6 deletions
--- a/esphome/components/psram/init.py
+++ b/esphome/components/psram/init.py
@ -16,6 +16,8 @@ from esphome.const import (
    CONF_ID,
    CONF_MODE,
    CONF_SPEED,
+    KEY_CORE,
+    KEY_FRAMEWORK_VERSION,
    PLATFORM_ESP32,
 )
 from esphome.core import CORE
@ -110,8 +112,8 @@ async def to_code(config):
        add_idf_sdkconfig_option(f"{SPIRAM_MODES[config[CONF_MODE]]}", True)
        add_idf_sdkconfig_option(f"{SPIRAM_SPEEDS[config[CONF_SPEED]]}", True)
        if config[CONF_MODE] == TYPE_OCTAL and config[CONF_SPEED] == 120e6:
-            add_idf_sdkconfig_option("CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240", True)
-            # This works only on IDF 5.4.x but does no harm on earlier versions
+            add_idf_sdkconfig_option("CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240", True)
+            if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(5, 4, 0):
                add_idf_sdkconfig_option(
                    "CONFIG_SPIRAM_TIMING_TUNING_POINT_VIA_TEMPERATURE_SENSOR", True
                )
--- a/requirements_test.txt
+++ b/requirements_test.txt
@ -1,6 +1,6 @@
 pylint==3.3.6
 flake8==7.2.0  # also change in .pre-commit-config.yaml when updating
-ruff==0.11.5 # also change in .pre-commit-config.yaml when updating
+ruff==0.11.6 # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.19.1  # also change in .pre-commit-config.yaml when updating
 pre-commit
Author	SHA1	Message	Date
Keith Burzinski	2155c657c9	Merge branch 'dev' into esp-idf_516	2025-04-17 21:06:51 -05:00
Jonathan Swoboda	e11883e431	[psram] Add version check to fix 5.3.2 (#8588 )	2025-04-17 21:06:41 -05:00
dependabot[bot]	ff5b9df607	Bump ruff from 0.11.5 to 0.11.6 (#8587 ) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-04-17 20:24:31 +00:00