Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 21:44:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix Custom Components No Name (#395)

Browse source 
* Fix Custom Components No Name

Fixes https://github.com/esphome/ESPHome-Core/issues/445

* Fix
This commit is contained in:
Otto Winter 2019-01-29 16:39:29 +01:00 committed by GitHub
parent e3f7e0d14a
commit 92e909568c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
esphomeyaml/components/binary_sensor/custom.py
View file

@ -2,8 +2,8 @@ import voluptuous as vol
from esphomeyaml.components import binary_sensor from esphomeyaml.components import binary_sensor
import esphomeyaml.config_validation as cv import esphomeyaml.config_validation as cv
from esphomeyaml.const import CONF_BINARY_SENSORS, CONF_ID, CONF_LAMBDA from esphomeyaml.const import CONF_BINARY_SENSORS, CONF_ID, CONF_LAMBDA, CONF_NAME
from esphomeyaml.cpp_generator import process_lambda, variable from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable, add
from esphomeyaml.cpp_types import std_vector from esphomeyaml.cpp_types import std_vector
CustomBinarySensorConstructor = binary_sensor.binary_sensor_ns.class_( CustomBinarySensorConstructor = binary_sensor.binary_sensor_ns.class_(
@ -26,8 +26,10 @@ def to_code(config):
rhs = CustomBinarySensorConstructor(template_) rhs = CustomBinarySensorConstructor(template_)
custom = variable(config[CONF_ID], rhs) custom = variable(config[CONF_ID], rhs)
for i, sens in enumerate(config[CONF_BINARY_SENSORS]): for i, conf in enumerate(config[CONF_BINARY_SENSORS]):
binary_sensor.register_binary_sensor(custom.get_binary_sensor(i), sens) var = Pvariable(conf[CONF_ID], custom.get_binary_sensor(i))
add(var.set_name(conf[CONF_NAME]))
binary_sensor.register_binary_sensor(var, conf)
BUILD_FLAGS = '-DUSE_CUSTOM_BINARY_SENSOR' BUILD_FLAGS = '-DUSE_CUSTOM_BINARY_SENSOR'

7
esphomeyaml/components/output/custom.py
View file

@ -3,7 +3,7 @@ import voluptuous as vol
from esphomeyaml.components import output from esphomeyaml.components import output
import esphomeyaml.config_validation as cv import esphomeyaml.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_OUTPUTS, CONF_TYPE from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_OUTPUTS, CONF_TYPE
from esphomeyaml.cpp_generator import process_lambda, variable from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable
from esphomeyaml.cpp_types import std_vector from esphomeyaml.cpp_types import std_vector
CustomBinaryOutputConstructor = output.output_ns.class_('CustomBinaryOutputConstructor') CustomBinaryOutputConstructor = output.output_ns.class_('CustomBinaryOutputConstructor')
@ -61,8 +61,9 @@ def to_code(config):
rhs = klass(template_) rhs = klass(template_)
custom = variable(config[CONF_ID], rhs) custom = variable(config[CONF_ID], rhs)
for i, sens in enumerate(config[CONF_OUTPUTS]): for i, conf in enumerate(config[CONF_OUTPUTS]):
output.register_output(custom.get_output(i), sens) var = Pvariable(conf[CONF_ID], custom.get_output(i))
output.register_output(var, conf)
BUILD_FLAGS = '-DUSE_CUSTOM_OUTPUT' BUILD_FLAGS = '-DUSE_CUSTOM_OUTPUT'

10
esphomeyaml/components/sensor/custom.py
View file

@ -2,8 +2,8 @@ import voluptuous as vol
from esphomeyaml.components import sensor from esphomeyaml.components import sensor
import esphomeyaml.config_validation as cv import esphomeyaml.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_SENSORS from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_SENSORS, CONF_NAME
from esphomeyaml.cpp_generator import process_lambda, variable from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable, add
from esphomeyaml.cpp_types import std_vector from esphomeyaml.cpp_types import std_vector
CustomSensorConstructor = sensor.sensor_ns.class_('CustomSensorConstructor') CustomSensorConstructor = sensor.sensor_ns.class_('CustomSensorConstructor')
@ -24,8 +24,10 @@ def to_code(config):
rhs = CustomSensorConstructor(template_) rhs = CustomSensorConstructor(template_)
custom = variable(config[CONF_ID], rhs) custom = variable(config[CONF_ID], rhs)
for i, sens in enumerate(config[CONF_SENSORS]): for i, conf in enumerate(config[CONF_SENSORS]):
sensor.register_sensor(custom.get_sensor(i), sens) var = Pvariable(conf[CONF_ID], custom.get_sensor(i))
add(var.set_name(conf[CONF_NAME]))
sensor.register_sensor(var, conf)
BUILD_FLAGS = '-DUSE_CUSTOM_SENSOR' BUILD_FLAGS = '-DUSE_CUSTOM_SENSOR'

10
esphomeyaml/components/switch/custom.py
View file

@ -2,8 +2,8 @@ import voluptuous as vol
from esphomeyaml.components import switch from esphomeyaml.components import switch
import esphomeyaml.config_validation as cv import esphomeyaml.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_SWITCHES from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_SWITCHES, CONF_NAME
from esphomeyaml.cpp_generator import process_lambda, variable from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable, add
from esphomeyaml.cpp_types import std_vector from esphomeyaml.cpp_types import std_vector
CustomSwitchConstructor = switch.switch_ns.class_('CustomSwitchConstructor') CustomSwitchConstructor = switch.switch_ns.class_('CustomSwitchConstructor')
@ -25,8 +25,10 @@ def to_code(config):
rhs = CustomSwitchConstructor(template_) rhs = CustomSwitchConstructor(template_)
custom = variable(config[CONF_ID], rhs) custom = variable(config[CONF_ID], rhs)
for i, sens in enumerate(config[CONF_SWITCHES]): for i, conf in enumerate(config[CONF_SWITCHES]):
switch.register_switch(custom.get_switch(i), sens) var = Pvariable(conf[CONF_ID], custom.get_switch(i))
add(var.set_name(conf[CONF_NAME]))
switch.register_switch(var, conf)
BUILD_FLAGS = '-DUSE_CUSTOM_SWITCH' BUILD_FLAGS = '-DUSE_CUSTOM_SWITCH'

10
esphomeyaml/components/text_sensor/custom.py
View file

@ -2,8 +2,8 @@ import voluptuous as vol
from esphomeyaml.components import text_sensor from esphomeyaml.components import text_sensor
import esphomeyaml.config_validation as cv import esphomeyaml.config_validation as cv
from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_TEXT_SENSORS from esphomeyaml.const import CONF_ID, CONF_LAMBDA, CONF_TEXT_SENSORS, CONF_NAME
from esphomeyaml.cpp_generator import process_lambda, variable from esphomeyaml.cpp_generator import process_lambda, variable, Pvariable, add
from esphomeyaml.cpp_types import std_vector from esphomeyaml.cpp_types import std_vector
CustomTextSensorConstructor = text_sensor.text_sensor_ns.class_('CustomTextSensorConstructor') CustomTextSensorConstructor = text_sensor.text_sensor_ns.class_('CustomTextSensorConstructor')
@ -25,8 +25,10 @@ def to_code(config):
rhs = CustomTextSensorConstructor(template_) rhs = CustomTextSensorConstructor(template_)
custom = variable(config[CONF_ID], rhs) custom = variable(config[CONF_ID], rhs)
for i, sens in enumerate(config[CONF_TEXT_SENSORS]): for i, conf in enumerate(config[CONF_TEXT_SENSORS]):
text_sensor.register_text_sensor(custom.get_text_sensor(i), sens) var = Pvariable(conf[CONF_ID], custom.get_text_sensor(i))
add(var.set_name(conf[CONF_NAME]))
text_sensor.register_text_sensor(var, conf)
BUILD_FLAGS = '-DUSE_CUSTOM_TEXT_SENSOR' BUILD_FLAGS = '-DUSE_CUSTOM_TEXT_SENSOR'