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

Allow non-addressable lights in light partitions (#2256)

Browse Source
This commit is contained in:
Paul Monigatti
2021-09-22 13:59:21 +12:00
committed by GitHub
parent c8a8acd46e
commit c51352d04d
4 changed files with 104 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
esphome/components/partition/light.py
View File

@@ -2,9 +2,12 @@ import esphome.codegen as cg
import esphome.config_validation as cv
from esphome.components import light
from esphome.const import (
CONF_ADDRESSABLE_LIGHT_ID,
CONF_FROM,
CONF_ID,
CONF_LIGHT_ID,
CONF_SEGMENTS,
CONF_SINGLE_LIGHT_ID,
CONF_TO,
CONF_OUTPUT_ID,
CONF_REVERSED,
@@ -12,30 +15,47 @@ from esphome.const import (
partitions_ns = cg.esphome_ns.namespace("partition")
AddressableSegment = partitions_ns.class_("AddressableSegment")
AddressableLightWrapper = cg.esphome_ns.namespace("light").class_(
"AddressableLightWrapper"
)
PartitionLightOutput = partitions_ns.class_(
"PartitionLightOutput", light.AddressableLight
)
def validate_from_to(value):
if value[CONF_FROM] > value[CONF_TO]:
if CONF_ID in value and value[CONF_FROM] > value[CONF_TO]:
raise cv.Invalid(
f"From ({value[CONF_FROM]}) must not be larger than to ({value[CONF_TO]})"
)
return value
ADDRESSABLE_SEGMENT_SCHEMA = cv.Schema(
{
cv.Required(CONF_ID): cv.use_id(light.AddressableLightState),
cv.Required(CONF_FROM): cv.positive_int,
cv.Required(CONF_TO): cv.positive_int,
cv.Optional(CONF_REVERSED, default=False): cv.boolean,
}
)
NONADDRESSABLE_SEGMENT_SCHEMA = cv.COMPONENT_SCHEMA.extend(
{
cv.Required(CONF_SINGLE_LIGHT_ID): cv.use_id(light.LightState),
cv.GenerateID(CONF_ADDRESSABLE_LIGHT_ID): cv.declare_id(
AddressableLightWrapper
),
cv.GenerateID(CONF_LIGHT_ID): cv.declare_id(light.types.LightState),
}
)
CONFIG_SCHEMA = light.ADDRESSABLE_LIGHT_SCHEMA.extend(
{
cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(PartitionLightOutput),
cv.Required(CONF_SEGMENTS): cv.All(
cv.ensure_list(
{
cv.Required(CONF_ID): cv.use_id(light.AddressableLightState),
cv.Required(CONF_FROM): cv.positive_int,
cv.Required(CONF_TO): cv.positive_int,
cv.Optional(CONF_REVERSED, default=False): cv.boolean,
},
cv.Any(ADDRESSABLE_SEGMENT_SCHEMA, NONADDRESSABLE_SEGMENT_SCHEMA),
validate_from_to,
),
cv.Length(min=1),
@@ -47,15 +67,25 @@ CONFIG_SCHEMA = light.ADDRESSABLE_LIGHT_SCHEMA.extend(
async def to_code(config):
segments = []
for conf in config[CONF_SEGMENTS]:
var = await cg.get_variable(conf[CONF_ID])
segments.append(
AddressableSegment(
var,
conf[CONF_FROM],
conf[CONF_TO] - conf[CONF_FROM] + 1,
conf[CONF_REVERSED],
if CONF_SINGLE_LIGHT_ID in conf:
wrapper = cg.new_Pvariable(
conf[CONF_ADDRESSABLE_LIGHT_ID],
await cg.get_variable(conf[CONF_SINGLE_LIGHT_ID]),
)
light_state = cg.new_Pvariable(conf[CONF_LIGHT_ID], "", wrapper)
await cg.register_component(light_state, conf)
cg.add(cg.App.register_light(light_state))
segments.append(AddressableSegment(light_state, 0, 1, False))
else:
segments.append(
AddressableSegment(
await cg.get_variable(conf[CONF_ID]),
conf[CONF_FROM],
conf[CONF_TO] - conf[CONF_FROM] + 1,
conf[CONF_REVERSED],
)
)
)
var = cg.new_Pvariable(config[CONF_OUTPUT_ID], segments)
await cg.register_component(var, config)