mirror of
https://github.com/Threnklyn/esphome-dev.git
synced 2026-06-05 20:38:27 +02:00
[sn74hc595] Enforce type field to distinguish gpio vs spi mode (#6609)
This commit is contained in:
@@ -4,14 +4,13 @@ from esphome import pins
|
||||
from esphome.components import spi
|
||||
from esphome.const import (
|
||||
CONF_ID,
|
||||
CONF_SPI_ID,
|
||||
CONF_NUMBER,
|
||||
CONF_INVERTED,
|
||||
CONF_DATA_PIN,
|
||||
CONF_CLOCK_PIN,
|
||||
CONF_OUTPUT,
|
||||
CONF_TYPE,
|
||||
)
|
||||
from esphome.core import EsphomeError
|
||||
|
||||
MULTI_CONF = True
|
||||
|
||||
@@ -34,53 +33,53 @@ CONF_LATCH_PIN = "latch_pin"
|
||||
CONF_OE_PIN = "oe_pin"
|
||||
CONF_SR_COUNT = "sr_count"
|
||||
|
||||
CONFIG_SCHEMA = cv.Any(
|
||||
cv.Schema(
|
||||
{
|
||||
cv.Required(CONF_ID): cv.declare_id(SN74HC595GPIOComponent),
|
||||
cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Required(CONF_LATCH_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Optional(CONF_OE_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Optional(CONF_SR_COUNT, default=1): cv.int_range(min=1, max=256),
|
||||
}
|
||||
).extend(cv.COMPONENT_SCHEMA),
|
||||
cv.Schema(
|
||||
{
|
||||
cv.Required(CONF_ID): cv.declare_id(SN74HC595SPIComponent),
|
||||
cv.Required(CONF_LATCH_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Optional(CONF_OE_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Optional(CONF_SR_COUNT, default=1): cv.int_range(min=1, max=256),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(spi.spi_device_schema(cs_pin_required=False))
|
||||
.extend(
|
||||
{
|
||||
cv.Required(CONF_SPI_ID): cv.use_id(spi.SPIComponent),
|
||||
}
|
||||
),
|
||||
msg='Either "data_pin" and "clock_pin" must be set or "spi_id" must be set.',
|
||||
TYPE_GPIO = "gpio"
|
||||
TYPE_SPI = "spi"
|
||||
|
||||
_COMMON_SCHEMA = cv.Schema(
|
||||
{
|
||||
cv.Required(CONF_LATCH_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Optional(CONF_OE_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Optional(CONF_SR_COUNT, default=1): cv.int_range(min=1, max=256),
|
||||
}
|
||||
)
|
||||
|
||||
CONFIG_SCHEMA = cv.typed_schema(
|
||||
{
|
||||
TYPE_GPIO: _COMMON_SCHEMA.extend(
|
||||
{
|
||||
cv.Required(CONF_ID): cv.declare_id(SN74HC595GPIOComponent),
|
||||
cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
|
||||
cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
|
||||
}
|
||||
).extend(cv.COMPONENT_SCHEMA),
|
||||
TYPE_SPI: _COMMON_SCHEMA.extend(
|
||||
{
|
||||
cv.Required(CONF_ID): cv.declare_id(SN74HC595SPIComponent),
|
||||
}
|
||||
)
|
||||
.extend(cv.COMPONENT_SCHEMA)
|
||||
.extend(spi.spi_device_schema(cs_pin_required=False)),
|
||||
},
|
||||
default_type=TYPE_GPIO,
|
||||
)
|
||||
|
||||
|
||||
async def to_code(config):
|
||||
var = cg.new_Pvariable(config[CONF_ID])
|
||||
await cg.register_component(var, config)
|
||||
if CONF_DATA_PIN in config:
|
||||
if config[CONF_TYPE] == TYPE_GPIO:
|
||||
data_pin = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
|
||||
cg.add(var.set_data_pin(data_pin))
|
||||
clock_pin = await cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
|
||||
cg.add(var.set_clock_pin(clock_pin))
|
||||
elif CONF_SPI_ID in config:
|
||||
await spi.register_spi_device(var, config)
|
||||
else:
|
||||
raise EsphomeError("Not supported")
|
||||
await spi.register_spi_device(var, config)
|
||||
|
||||
latch_pin = await cg.gpio_pin_expression(config[CONF_LATCH_PIN])
|
||||
cg.add(var.set_latch_pin(latch_pin))
|
||||
if CONF_OE_PIN in config:
|
||||
oe_pin = await cg.gpio_pin_expression(config[CONF_OE_PIN])
|
||||
if oe_pin := config.get(CONF_OE_PIN):
|
||||
oe_pin = await cg.gpio_pin_expression(oe_pin)
|
||||
cg.add(var.set_oe_pin(oe_pin))
|
||||
cg.add(var.set_sr_count(config[CONF_SR_COUNT]))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user