From e9d9de448ef5e06eb66954018839a782ec709a83 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Wed, 31 Oct 2018 16:27:30 +0100 Subject: [PATCH] Fix output actions --- esphomeyaml/components/output/__init__.py | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/esphomeyaml/components/output/__init__.py b/esphomeyaml/components/output/__init__.py index 403d22c6b4..d4f6d27836 100644 --- a/esphomeyaml/components/output/__init__.py +++ b/esphomeyaml/components/output/__init__.py @@ -50,29 +50,13 @@ BUILD_FLAGS = '-DUSE_OUTPUT' CONF_OUTPUT_TURN_ON = 'output.turn_on' -OUTPUT_TURN_OFF_ACTION = maybe_simple_id({ +OUTPUT_TURN_ON_ACTION = maybe_simple_id({ vol.Required(CONF_ID): cv.use_variable_id(None), }) -@ACTION_REGISTRY.register(CONF_OUTPUT_TURN_ON, OUTPUT_TURN_OFF_ACTION) +@ACTION_REGISTRY.register(CONF_OUTPUT_TURN_ON, OUTPUT_TURN_ON_ACTION) def output_turn_on_to_code(config, action_id, arg_type): - template_arg = TemplateArguments(arg_type) - for var in get_variable(config[CONF_ID]): - yield None - rhs = var.make_turn_off_action(template_arg) - type = TurnOffAction.template(arg_type) - yield Pvariable(action_id, rhs, type=type) - - -CONF_OUTPUT_TURN_OFF = 'output.turn_off' -OUTPUT_TURN_ON_ACTION = maybe_simple_id({ - vol.Required(CONF_ID): cv.use_variable_id(None) -}) - - -@ACTION_REGISTRY.register(CONF_OUTPUT_TURN_OFF, OUTPUT_TURN_ON_ACTION) -def output_turn_off_to_code(config, action_id, arg_type): template_arg = TemplateArguments(arg_type) for var in get_variable(config[CONF_ID]): yield None @@ -81,6 +65,22 @@ def output_turn_off_to_code(config, action_id, arg_type): yield Pvariable(action_id, rhs, type=type) +CONF_OUTPUT_TURN_OFF = 'output.turn_off' +OUTPUT_TURN_OFF_ACTION = maybe_simple_id({ + vol.Required(CONF_ID): cv.use_variable_id(None) +}) + + +@ACTION_REGISTRY.register(CONF_OUTPUT_TURN_OFF, OUTPUT_TURN_OFF_ACTION) +def output_turn_off_to_code(config, action_id, arg_type): + template_arg = TemplateArguments(arg_type) + for var in get_variable(config[CONF_ID]): + yield None + rhs = var.make_turn_off_action(template_arg) + type = TurnOffAction.template(arg_type) + yield Pvariable(action_id, rhs, type=type) + + CONF_OUTPUT_SET_LEVEL = 'output.set_level' OUTPUT_SET_LEVEL_ACTION = vol.Schema({ vol.Required(CONF_ID): cv.use_variable_id(None),