1
0
mirror of https://github.com/esphome/esphome.git synced 2025-10-29 22:24:26 +00:00

Merge branch 'integration' into memory_api

This commit is contained in:
J. Nick Koston
2025-10-22 15:09:10 -10:00
10 changed files with 67 additions and 18 deletions

View File

@@ -32,6 +32,7 @@ from esphome.const import (
CONF_MISO_PIN,
CONF_MODE,
CONF_MOSI_PIN,
CONF_NUMBER,
CONF_PAGE_ID,
CONF_PIN,
CONF_POLLING_INTERVAL,
@@ -52,12 +53,24 @@ from esphome.core import (
coroutine_with_priority,
)
import esphome.final_validate as fv
from esphome.types import ConfigType
CONFLICTS_WITH = ["wifi"]
DEPENDENCIES = ["esp32"]
AUTO_LOAD = ["network"]
LOGGER = logging.getLogger(__name__)
# RMII pins that are hardcoded on ESP32 and cannot be changed
# These pins are used by the internal Ethernet MAC when using RMII PHYs
ESP32_RMII_FIXED_PINS = {
19: "EMAC_TXD0",
21: "EMAC_TX_EN",
22: "EMAC_TXD1",
25: "EMAC_RXD0",
26: "EMAC_RXD1",
27: "EMAC_RX_CRS_DV",
}
ethernet_ns = cg.esphome_ns.namespace("ethernet")
PHYRegister = ethernet_ns.struct("PHYRegister")
CONF_PHY_ADDR = "phy_addr"
@@ -383,3 +396,39 @@ async def to_code(config):
if CORE.using_arduino:
cg.add_library("WiFi", None)
def _final_validate_rmii_pins(config: ConfigType) -> None:
"""Validate that RMII pins are not used by other components."""
# Only validate for RMII-based PHYs on ESP32/ESP32P4
if config[CONF_TYPE] in SPI_ETHERNET_TYPES or config[CONF_TYPE] == "OPENETH":
return # SPI and OPENETH don't use RMII
variant = get_esp32_variant()
if variant not in (VARIANT_ESP32, VARIANT_ESP32P4):
return # Only ESP32 classic and P4 have RMII
# Check all used pins against RMII reserved pins
for pin_list in pins.PIN_SCHEMA_REGISTRY.pins_used.values():
for pin_path, _, pin_config in pin_list:
pin_num = pin_config.get(CONF_NUMBER)
if pin_num not in ESP32_RMII_FIXED_PINS:
continue
# Found a conflict - show helpful error message
pin_function = ESP32_RMII_FIXED_PINS[pin_num]
component_path = ".".join(str(p) for p in pin_path)
raise cv.Invalid(
f"GPIO{pin_num} is reserved for Ethernet RMII ({pin_function}) and cannot be used. "
f"This pin is hardcoded by ESP-IDF and cannot be changed when using RMII Ethernet PHYs. "
f"Please choose a different GPIO pin for '{component_path}'.",
path=pin_path,
)
def _final_validate(config: ConfigType) -> ConfigType:
"""Final validation for Ethernet component."""
_final_validate_rmii_pins(config)
return config
FINAL_VALIDATE_SCHEMA = _final_validate

View File

@@ -1,12 +1,12 @@
ethernet:
type: DP83848
mdc_pin: 23
mdio_pin: 25
mdio_pin: 32
clk:
pin: 0
mode: CLK_EXT_IN
phy_addr: 0
power_pin: 26
power_pin: 33
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1

View File

@@ -1,12 +1,12 @@
ethernet:
type: IP101
mdc_pin: 23
mdio_pin: 25
mdio_pin: 32
clk:
pin: 0
mode: CLK_EXT_IN
phy_addr: 0
power_pin: 26
power_pin: 33
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1

View File

@@ -1,12 +1,12 @@
ethernet:
type: JL1101
mdc_pin: 23
mdio_pin: 25
mdio_pin: 32
clk:
pin: 0
mode: CLK_EXT_IN
phy_addr: 0
power_pin: 26
power_pin: 33
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1

View File

@@ -1,12 +1,12 @@
ethernet:
type: KSZ8081
mdc_pin: 23
mdio_pin: 25
mdio_pin: 32
clk:
pin: 0
mode: CLK_EXT_IN
phy_addr: 0
power_pin: 26
power_pin: 33
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1

View File

@@ -1,12 +1,12 @@
ethernet:
type: KSZ8081RNA
mdc_pin: 23
mdio_pin: 25
mdio_pin: 32
clk:
pin: 0
mode: CLK_EXT_IN
phy_addr: 0
power_pin: 26
power_pin: 33
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1

View File

@@ -1,12 +1,12 @@
ethernet:
type: LAN8670
mdc_pin: 23
mdio_pin: 25
mdio_pin: 32
clk:
pin: 0
mode: CLK_EXT_IN
phy_addr: 0
power_pin: 26
power_pin: 33
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1

View File

@@ -1,12 +1,12 @@
ethernet:
type: LAN8720
mdc_pin: 23
mdio_pin: 25
mdio_pin: 32
clk:
pin: 0
mode: CLK_EXT_IN
phy_addr: 0
power_pin: 26
power_pin: 33
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1

View File

@@ -1,12 +1,12 @@
ethernet:
type: RTL8201
mdc_pin: 23
mdio_pin: 25
mdio_pin: 32
clk:
pin: 0
mode: CLK_EXT_IN
phy_addr: 0
power_pin: 26
power_pin: 33
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1

View File

@@ -1,12 +1,12 @@
ethernet:
type: LAN8720
mdc_pin: 23
mdio_pin: 25
mdio_pin: 32
clk:
pin: 0
mode: CLK_EXT_IN
phy_addr: 0
power_pin: 26
power_pin: 33
manual_ip:
static_ip: 192.168.178.56
gateway: 192.168.178.1