mirror of
https://github.com/esphome/esphome.git
synced 2024-11-30 02:34:12 +01:00
c86675f644
* Fix custom output requiring type
Fixes #343
* Revert "Fix custom output requiring type"
This reverts commit 37f995d32a
.
* Fix
68 lines
2.4 KiB
Python
68 lines
2.4 KiB
Python
import voluptuous as vol
|
|
|
|
from esphomeyaml.components import output
|
|
import esphomeyaml.config_validation as cv
|
|
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_OUTPUTS, CONF_TYPE
|
|
from esphomeyaml.cpp_generator import process_lambda, variable
|
|
from esphomeyaml.cpp_types import std_vector
|
|
|
|
CustomBinaryOutputConstructor = output.output_ns.class_('CustomBinaryOutputConstructor')
|
|
CustomFloatOutputConstructor = output.output_ns.class_('CustomFloatOutputConstructor')
|
|
|
|
BINARY_SCHEMA = output.PLATFORM_SCHEMA.extend({
|
|
cv.GenerateID(): cv.declare_variable_id(CustomBinaryOutputConstructor),
|
|
vol.Required(CONF_LAMBDA): cv.lambda_,
|
|
vol.Required(CONF_TYPE): 'binary',
|
|
vol.Required(CONF_OUTPUTS):
|
|
cv.ensure_list(output.BINARY_OUTPUT_SCHEMA.extend({
|
|
cv.GenerateID(): cv.declare_variable_id(output.BinaryOutput),
|
|
})),
|
|
})
|
|
|
|
FLOAT_SCHEMA = output.PLATFORM_SCHEMA.extend({
|
|
cv.GenerateID(): cv.declare_variable_id(CustomFloatOutputConstructor),
|
|
vol.Required(CONF_LAMBDA): cv.lambda_,
|
|
vol.Required(CONF_TYPE): 'float',
|
|
vol.Required(CONF_OUTPUTS):
|
|
cv.ensure_list(output.FLOAT_OUTPUT_SCHEMA.extend({
|
|
cv.GenerateID(): cv.declare_variable_id(output.FloatOutput),
|
|
})),
|
|
})
|
|
|
|
|
|
def validate_custom_output(value):
|
|
if not isinstance(value, dict):
|
|
raise vol.Invalid("Value must be dict")
|
|
if CONF_TYPE not in value:
|
|
raise vol.Invalid("type not specified!")
|
|
type = cv.string_strict(value[CONF_TYPE]).lower()
|
|
value[CONF_TYPE] = type
|
|
if type == 'binary':
|
|
return BINARY_SCHEMA(value)
|
|
if type == 'float':
|
|
return FLOAT_SCHEMA(value)
|
|
raise vol.Invalid("type must either be binary or float, not {}!".format(type))
|
|
|
|
|
|
PLATFORM_SCHEMA = validate_custom_output
|
|
|
|
|
|
def to_code(config):
|
|
type = config[CONF_TYPE]
|
|
if type == 'binary':
|
|
ret_type = output.BinaryOutputPtr
|
|
klass = CustomBinaryOutputConstructor
|
|
else:
|
|
ret_type = output.FloatOutputPtr
|
|
klass = CustomFloatOutputConstructor
|
|
for template_ in process_lambda(config[CONF_LAMBDA], [],
|
|
return_type=std_vector.template(ret_type)):
|
|
yield
|
|
|
|
rhs = klass(template_)
|
|
custom = variable(config[CONF_ID], rhs)
|
|
for i, sens in enumerate(config[CONF_OUTPUTS]):
|
|
output.register_output(custom.get_output(i), sens)
|
|
|
|
|
|
BUILD_FLAGS = '-DUSE_CUSTOM_OUTPUT'
|