sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-29 08:32:26 +01:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-27 00:04:03 -05:00
parent d4026f9333 b092c33e92
commit c526873d71
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/codeql.yml vendored
View File

@@ -58,7 +58,7 @@ jobs:
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4 uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }} build-mode: ${{ matrix.build-mode }}
@@ -86,6 +86,6 @@ jobs:
exit 1 exit 1
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.30.4 uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
with: with:
category: "/language:${{matrix.language}}" category: "/language:${{matrix.language}}"

13
esphome/components/ethernet/__init__.py
View File

@@ -145,13 +145,6 @@ def _validate(config):
use_address = CORE.name + config[CONF_DOMAIN] use_address = CORE.name + config[CONF_DOMAIN]
config[CONF_USE_ADDRESS] = use_address config[CONF_USE_ADDRESS] = use_address
# Validate LAN8670 is only used with ESP32 classic or ESP32-P4
if config[CONF_TYPE] == "LAN8670":
variant = get_esp32_variant()
if variant not in (VARIANT_ESP32, VARIANT_ESP32P4):
raise cv.Invalid(
f"LAN8670 PHY is only supported on ESP32 classic and ESP32-P4, not {variant}"
)
if config[CONF_TYPE] in SPI_ETHERNET_TYPES: if config[CONF_TYPE] in SPI_ETHERNET_TYPES:
if _is_framework_spi_polling_mode_supported(): if _is_framework_spi_polling_mode_supported():
if CONF_POLLING_INTERVAL in config and CONF_INTERRUPT_PIN in config: if CONF_POLLING_INTERVAL in config and CONF_INTERRUPT_PIN in config:
@@ -184,6 +177,12 @@ def _validate(config):
del config[CONF_CLK_MODE] del config[CONF_CLK_MODE]
elif CONF_CLK not in config: elif CONF_CLK not in config:
raise cv.Invalid("'clk' is a required option for [ethernet].") raise cv.Invalid("'clk' is a required option for [ethernet].")
variant = get_esp32_variant()
if variant not in (VARIANT_ESP32, VARIANT_ESP32P4):
raise cv.Invalid(
f"{config[CONF_TYPE]} PHY requires RMII interface and is only supported "
f"on ESP32 classic and ESP32-P4, not {variant}"
)
return config return config

2
requirements.txt
View File

@@ -1,6 +1,6 @@
cryptography==45.0.1 cryptography==45.0.1
voluptuous==0.15.2 voluptuous==0.15.2
PyYAML==6.0.2 PyYAML==6.0.3
paho-mqtt==1.6.1 paho-mqtt==1.6.1
colorama==0.4.6 colorama==0.4.6
icmplib==3.0.4 icmplib==3.0.4