jeans/esphome
jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-07-25 12:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into esp-idf_516

Browse Source
This commit is contained in:
Keith Burzinski 2025-04-17 21:06:51 -05:00 committed by GitHub
commit 2155c657c9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
esphome/components/psram/__init__.py
View File

@ -16,6 +16,8 @@ from esphome.const import (
CONF_ID, CONF_ID,
CONF_MODE, CONF_MODE,
CONF_SPEED, CONF_SPEED,
KEY_CORE,
KEY_FRAMEWORK_VERSION,
PLATFORM_ESP32, PLATFORM_ESP32,
) )
from esphome.core import CORE from esphome.core import CORE
@ -110,11 +112,11 @@ async def to_code(config):
add_idf_sdkconfig_option(f"{SPIRAM_MODES[config[CONF_MODE]]}", True) add_idf_sdkconfig_option(f"{SPIRAM_MODES[config[CONF_MODE]]}", True)
add_idf_sdkconfig_option(f"{SPIRAM_SPEEDS[config[CONF_SPEED]]}", True) add_idf_sdkconfig_option(f"{SPIRAM_SPEEDS[config[CONF_SPEED]]}", True)
if config[CONF_MODE] == TYPE_OCTAL and config[CONF_SPEED] == 120e6: if config[CONF_MODE] == TYPE_OCTAL and config[CONF_SPEED] == 120e6:
add_idf_sdkconfig_option("CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240", True) add_idf_sdkconfig_option("CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240", True)
# This works only on IDF 5.4.x but does no harm on earlier versions if CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] >= cv.Version(5, 4, 0):
add_idf_sdkconfig_option( add_idf_sdkconfig_option(
"CONFIG_SPIRAM_TIMING_TUNING_POINT_VIA_TEMPERATURE_SENSOR", True "CONFIG_SPIRAM_TIMING_TUNING_POINT_VIA_TEMPERATURE_SENSOR", True
) )
if config[CONF_ENABLE_ECC]: if config[CONF_ENABLE_ECC]:
add_idf_sdkconfig_option("CONFIG_SPIRAM_ECC_ENABLE", True) add_idf_sdkconfig_option("CONFIG_SPIRAM_ECC_ENABLE", True)

2
requirements_test.txt
View File

@ -1,6 +1,6 @@
pylint==3.3.6 pylint==3.3.6
flake8==7.2.0 # also change in .pre-commit-config.yaml when updating 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 pyupgrade==3.19.1 # also change in .pre-commit-config.yaml when updating
pre-commit pre-commit