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

Fix triggers being interpreted as a sequence of automations (#199)

Browse Source
This commit is contained in:
Otto Winter
2018-10-20 13:15:09 +02:00
committed by GitHub
parent 92b6ed4180
commit 4aeb756388
11 changed files with 78 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
esphomeyaml/components/mqtt.py
View File

@@ -2,8 +2,8 @@ import re
import voluptuous as vol
from esphomeyaml.automation import ACTION_REGISTRY
from esphomeyaml import automation
from esphomeyaml.automation import ACTION_REGISTRY
from esphomeyaml.components import logger
import esphomeyaml.config_validation as cv
from esphomeyaml.const import CONF_BIRTH_MESSAGE, CONF_BROKER, CONF_CLIENT_ID, CONF_DISCOVERY, \
@@ -79,16 +79,16 @@ CONFIG_SCHEMA = vol.Schema({
cv.ensure_list, [validate_fingerprint]),
vol.Optional(CONF_KEEPALIVE): cv.positive_time_period_seconds,
vol.Optional(CONF_REBOOT_TIMEOUT): cv.positive_time_period_milliseconds,
vol.Optional(CONF_ON_MESSAGE): vol.All(cv.ensure_list, [automation.validate_automation({
vol.Optional(CONF_ON_MESSAGE): automation.validate_automation({
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(MQTTMessageTrigger),
vol.Required(CONF_TOPIC): cv.subscribe_topic,
vol.Optional(CONF_QOS, default=0): cv.mqtt_qos,
})]),
vol.Optional(CONF_ON_JSON_MESSAGE): vol.All(cv.ensure_list, [automation.validate_automation({
}),
vol.Optional(CONF_ON_JSON_MESSAGE): automation.validate_automation({
cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(MQTTJsonMessageTrigger),
vol.Required(CONF_TOPIC): cv.subscribe_topic,
vol.Optional(CONF_QOS, default=0): cv.mqtt_qos,
})]),
}),
})