Merge branch 'dev' into bump-1.17.0b1

2026-06-06 04:48:27 +02:00 · 2021-03-22 20:08:57 +13:00
parent 808ce6eecb fb6c5ebe9a
commit 4d340dc029
553 changed files with 27573 additions and 13992 deletions
@@ -2,37 +2,54 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.components import cover
-from esphome.const import CONF_ASSUMED_STATE, CONF_CLOSE_ACTION, CONF_CURRENT_OPERATION, CONF_ID, \
-    CONF_LAMBDA, CONF_OPEN_ACTION, CONF_OPTIMISTIC, CONF_POSITION, CONF_RESTORE_MODE, \
-    CONF_STATE, CONF_STOP_ACTION, CONF_TILT, CONF_TILT_ACTION, CONF_TILT_LAMBDA, \
-    CONF_POSITION_ACTION
+from esphome.const import (
+    CONF_ASSUMED_STATE,
+    CONF_CLOSE_ACTION,
+    CONF_CURRENT_OPERATION,
+    CONF_ID,
+    CONF_LAMBDA,
+    CONF_OPEN_ACTION,
+    CONF_OPTIMISTIC,
+    CONF_POSITION,
+    CONF_RESTORE_MODE,
+    CONF_STATE,
+    CONF_STOP_ACTION,
+    CONF_TILT,
+    CONF_TILT_ACTION,
+    CONF_TILT_LAMBDA,
+    CONF_POSITION_ACTION,
+)
 from .. import template_ns

-TemplateCover = template_ns.class_('TemplateCover', cover.Cover, cg.Component)
+TemplateCover = template_ns.class_("TemplateCover", cover.Cover, cg.Component)

-TemplateCoverRestoreMode = template_ns.enum('TemplateCoverRestoreMode')
+TemplateCoverRestoreMode = template_ns.enum("TemplateCoverRestoreMode")
 RESTORE_MODES = {
-    'NO_RESTORE': TemplateCoverRestoreMode.COVER_NO_RESTORE,
-    'RESTORE': TemplateCoverRestoreMode.COVER_RESTORE,
-    'RESTORE_AND_CALL': TemplateCoverRestoreMode.COVER_RESTORE_AND_CALL,
+    "NO_RESTORE": TemplateCoverRestoreMode.COVER_NO_RESTORE,
+    "RESTORE": TemplateCoverRestoreMode.COVER_RESTORE,
+    "RESTORE_AND_CALL": TemplateCoverRestoreMode.COVER_RESTORE_AND_CALL,
 }

-CONF_HAS_POSITION = 'has_position'
+CONF_HAS_POSITION = "has_position"

-CONFIG_SCHEMA = cover.COVER_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_id(TemplateCover),
-    cv.Optional(CONF_LAMBDA): cv.returning_lambda,
-    cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
-    cv.Optional(CONF_ASSUMED_STATE, default=False): cv.boolean,
-    cv.Optional(CONF_HAS_POSITION, default=False): cv.boolean,
-    cv.Optional(CONF_OPEN_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_CLOSE_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_STOP_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_TILT_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_TILT_LAMBDA): cv.returning_lambda,
-    cv.Optional(CONF_POSITION_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_RESTORE_MODE, default='RESTORE'): cv.enum(RESTORE_MODES, upper=True),
-}).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = cover.COVER_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(TemplateCover),
+        cv.Optional(CONF_LAMBDA): cv.returning_lambda,
+        cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
+        cv.Optional(CONF_ASSUMED_STATE, default=False): cv.boolean,
+        cv.Optional(CONF_HAS_POSITION, default=False): cv.boolean,
+        cv.Optional(CONF_OPEN_ACTION): automation.validate_automation(single=True),
+        cv.Optional(CONF_CLOSE_ACTION): automation.validate_automation(single=True),
+        cv.Optional(CONF_STOP_ACTION): automation.validate_automation(single=True),
+        cv.Optional(CONF_TILT_ACTION): automation.validate_automation(single=True),
+        cv.Optional(CONF_TILT_LAMBDA): cv.returning_lambda,
+        cv.Optional(CONF_POSITION_ACTION): automation.validate_automation(single=True),
+        cv.Optional(CONF_RESTORE_MODE, default="RESTORE"): cv.enum(
+            RESTORE_MODES, upper=True
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)


 def to_code(config):
@@ -40,26 +57,36 @@ def to_code(config):
    yield cg.register_component(var, config)
    yield cover.register_cover(var, config)
    if CONF_LAMBDA in config:
-        template_ = yield cg.process_lambda(config[CONF_LAMBDA], [],
-                                            return_type=cg.optional.template(float))
+        template_ = yield cg.process_lambda(
+            config[CONF_LAMBDA], [], return_type=cg.optional.template(float)
+        )
        cg.add(var.set_state_lambda(template_))
    if CONF_OPEN_ACTION in config:
-        yield automation.build_automation(var.get_open_trigger(), [], config[CONF_OPEN_ACTION])
+        yield automation.build_automation(
+            var.get_open_trigger(), [], config[CONF_OPEN_ACTION]
+        )
    if CONF_CLOSE_ACTION in config:
-        yield automation.build_automation(var.get_close_trigger(), [], config[CONF_CLOSE_ACTION])
+        yield automation.build_automation(
+            var.get_close_trigger(), [], config[CONF_CLOSE_ACTION]
+        )
    if CONF_STOP_ACTION in config:
-        yield automation.build_automation(var.get_stop_trigger(), [], config[CONF_STOP_ACTION])
+        yield automation.build_automation(
+            var.get_stop_trigger(), [], config[CONF_STOP_ACTION]
+        )
    if CONF_TILT_ACTION in config:
-        yield automation.build_automation(var.get_tilt_trigger(), [(float, 'tilt')],
-                                          config[CONF_TILT_ACTION])
+        yield automation.build_automation(
+            var.get_tilt_trigger(), [(float, "tilt")], config[CONF_TILT_ACTION]
+        )
        cg.add(var.set_has_tilt(True))
    if CONF_TILT_LAMBDA in config:
-        tilt_template_ = yield cg.process_lambda(config[CONF_TILT_LAMBDA], [],
-                                                 return_type=cg.optional.template(float))
+        tilt_template_ = yield cg.process_lambda(
+            config[CONF_TILT_LAMBDA], [], return_type=cg.optional.template(float)
+        )
        cg.add(var.set_tilt_lambda(tilt_template_))
    if CONF_POSITION_ACTION in config:
-        yield automation.build_automation(var.get_position_trigger(), [(float, 'pos')],
-                                          config[CONF_POSITION_ACTION])
+        yield automation.build_automation(
+            var.get_position_trigger(), [(float, "pos")], config[CONF_POSITION_ACTION]
+        )
        cg.add(var.set_has_position(True))
    else:
        cg.add(var.set_has_position(config[CONF_HAS_POSITION]))
@@ -69,13 +96,21 @@ def to_code(config):
    cg.add(var.set_has_position(config[CONF_HAS_POSITION]))


-@automation.register_action('cover.template.publish', cover.CoverPublishAction, cv.Schema({
-    cv.Required(CONF_ID): cv.use_id(cover.Cover),
-    cv.Exclusive(CONF_STATE, 'pos'): cv.templatable(cover.validate_cover_state),
-    cv.Exclusive(CONF_POSITION, 'pos'): cv.templatable(cv.zero_to_one_float),
-    cv.Optional(CONF_CURRENT_OPERATION): cv.templatable(cover.validate_cover_operation),
-    cv.Optional(CONF_TILT): cv.templatable(cv.zero_to_one_float),
-}))
+@automation.register_action(
+    "cover.template.publish",
+    cover.CoverPublishAction,
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.use_id(cover.Cover),
+            cv.Exclusive(CONF_STATE, "pos"): cv.templatable(cover.validate_cover_state),
+            cv.Exclusive(CONF_POSITION, "pos"): cv.templatable(cv.zero_to_one_float),
+            cv.Optional(CONF_CURRENT_OPERATION): cv.templatable(
+                cover.validate_cover_operation
+            ),
+            cv.Optional(CONF_TILT): cv.templatable(cv.zero_to_one_float),
+        }
+    ),
+)
 def cover_template_publish_to_code(config, action_id, template_arg, args):
    paren = yield cg.get_variable(config[CONF_ID])
    var = cg.new_Pvariable(action_id, template_arg, paren)
@@ -89,6 +124,8 @@ def cover_template_publish_to_code(config, action_id, template_arg, args):
        template_ = yield cg.templatable(config[CONF_TILT], args, float)
        cg.add(var.set_tilt(template_))
    if CONF_CURRENT_OPERATION in config:
-        template_ = yield cg.templatable(config[CONF_CURRENT_OPERATION], args, cover.CoverOperation)
+        template_ = yield cg.templatable(
+            config[CONF_CURRENT_OPERATION], args, cover.CoverOperation
+        )
        cg.add(var.set_current_operation(template_))
    yield var