Cleanup dashboard JS (#491)

* Cleanup dashboard JS * Add vscode * Save start_mark/end_mark * Updates * Updates * Remove need for cv.nameable It's a bit hacky but removes so much bloat from integrations * Add enum helper * Document APIs, and Improvements * Fixes * Fixes * Update PULL_REQUEST_TEMPLATE.md * Updates * Updates * Updates
2025-09-12 00:02:21 +01:00 · 2019-04-22 21:56:30 +02:00
parent 6682c43dfa
commit 8e75980ebd
359 changed files with 4395 additions and 4223 deletions
--- a/esphome/components/binary_sensor/init.py
+++ b/esphome/components/binary_sensor/init.py
@@ -1,16 +1,16 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation, core
-from esphome.automation import CONDITION_REGISTRY, Condition, maybe_simple_id
+from esphome.automation import Condition, maybe_simple_id
 from esphome.components import mqtt
 from esphome.const import CONF_DEVICE_CLASS, CONF_FILTERS, \
    CONF_ID, CONF_INTERNAL, CONF_INVALID_COOLDOWN, CONF_INVERTED, \
    CONF_MAX_LENGTH, CONF_MIN_LENGTH, CONF_ON_CLICK, \
    CONF_ON_DOUBLE_CLICK, CONF_ON_MULTI_CLICK, CONF_ON_PRESS, CONF_ON_RELEASE, CONF_ON_STATE, \
-    CONF_STATE, CONF_TIMING, CONF_TRIGGER_ID, CONF_FOR, CONF_VALUE, CONF_NAME, CONF_MQTT_ID
+    CONF_STATE, CONF_TIMING, CONF_TRIGGER_ID, CONF_FOR, CONF_NAME, CONF_MQTT_ID
 from esphome.core import CORE, coroutine
 from esphome.py_compat import string_types
-from esphome.util import ServiceRegistry
+from esphome.util import Registry

 DEVICE_CLASSES = [
    '', 'battery', 'cold', 'connectivity', 'door', 'garage_door', 'gas',
@@ -26,15 +26,15 @@ BinarySensor = binary_sensor_ns.class_('BinarySensor', cg.Nameable)
 BinarySensorPtr = BinarySensor.operator('ptr')

 # Triggers
-PressTrigger = binary_sensor_ns.class_('PressTrigger', cg.Trigger.template())
-ReleaseTrigger = binary_sensor_ns.class_('ReleaseTrigger', cg.Trigger.template())
-ClickTrigger = binary_sensor_ns.class_('ClickTrigger', cg.Trigger.template())
-DoubleClickTrigger = binary_sensor_ns.class_('DoubleClickTrigger', cg.Trigger.template())
-MultiClickTrigger = binary_sensor_ns.class_('MultiClickTrigger', cg.Trigger.template(),
+PressTrigger = binary_sensor_ns.class_('PressTrigger', automation.Trigger.template())
+ReleaseTrigger = binary_sensor_ns.class_('ReleaseTrigger', automation.Trigger.template())
+ClickTrigger = binary_sensor_ns.class_('ClickTrigger', automation.Trigger.template())
+DoubleClickTrigger = binary_sensor_ns.class_('DoubleClickTrigger', automation.Trigger.template())
+MultiClickTrigger = binary_sensor_ns.class_('MultiClickTrigger', automation.Trigger.template(),
                                            cg.Component)
 MultiClickTriggerEvent = binary_sensor_ns.struct('MultiClickTriggerEvent')
-StateTrigger = binary_sensor_ns.class_('StateTrigger', cg.Trigger.template(bool))
-BinarySensorPublishAction = binary_sensor_ns.class_('BinarySensorPublishAction', cg.Action)
+StateTrigger = binary_sensor_ns.class_('StateTrigger', automation.Trigger.template(bool))
+BinarySensorPublishAction = binary_sensor_ns.class_('BinarySensorPublishAction', automation.Action)

 # Condition
 BinarySensorCondition = binary_sensor_ns.class_('BinarySensorCondition', Condition)
@@ -46,55 +46,34 @@ DelayedOffFilter = binary_sensor_ns.class_('DelayedOffFilter', Filter, cg.Compon
 InvertFilter = binary_sensor_ns.class_('InvertFilter', Filter)
 LambdaFilter = binary_sensor_ns.class_('LambdaFilter', Filter)

-FILTER_REGISTRY = ServiceRegistry()
-validate_filters = cv.validate_registry('filter', FILTER_REGISTRY, [CONF_ID])
+FILTER_REGISTRY = Registry()
+validate_filters = cv.validate_registry('filter', FILTER_REGISTRY)


-@FILTER_REGISTRY.register('invert',
-                          cv.Schema({
-                              cv.GenerateID(): cv.declare_variable_id(InvertFilter)
-                          }))
-def invert_filter_to_code(config):
-    rhs = InvertFilter.new()
-    var = cg.Pvariable(config[CONF_ID], rhs)
+@FILTER_REGISTRY.register('invert', InvertFilter, {})
+def invert_filter_to_code(config, filter_id):
+    yield cg.new_Pvariable(filter_id)
+
+
+@FILTER_REGISTRY.register('delayed_on', DelayedOnFilter,
+                          cv.positive_time_period_milliseconds)
+def delayed_on_filter_to_code(config, filter_id):
+    var = cg.new_Pvariable(filter_id, config)
+    yield cg.register_component(var, {})
    yield var


-@FILTER_REGISTRY.register('delayed_on',
-                          cv.maybe_simple_value(cv.Schema({
-                              cv.GenerateID(): cv.declare_variable_id(DelayedOnFilter),
-                              cv.Required(CONF_VALUE): cv.positive_time_period_milliseconds,
-                          }).extend(cv.COMPONENT_SCHEMA)))
-def delayed_on_filter_to_code(config):
-    rhs = DelayedOnFilter.new(config[CONF_VALUE])
-    var = cg.Pvariable(config[CONF_ID], rhs)
-    yield cg.register_component(var, config)
+@FILTER_REGISTRY.register('delayed_off', DelayedOffFilter, cv.positive_time_period_milliseconds)
+def delayed_off_filter_to_code(config, filter_id):
+    var = cg.new_Pvariable(filter_id, config)
+    yield cg.register_component(var, {})
    yield var


-@FILTER_REGISTRY.register('delayed_off',
-                          cv.maybe_simple_value(cv.Schema({
-                              cv.GenerateID(): cv.declare_variable_id(DelayedOffFilter),
-                              cv.Required(CONF_VALUE): cv.positive_time_period_milliseconds,
-                          }).extend(cv.COMPONENT_SCHEMA)))
-def delayed_off_filter_to_code(config):
-    rhs = DelayedOffFilter.new(config[CONF_VALUE])
-    var = cg.Pvariable(config[CONF_ID], rhs)
-    yield cg.register_component(var, config)
-    yield var
-
-
-@FILTER_REGISTRY.register('lambda',
-                          cv.maybe_simple_value(cv.Schema({
-                              cv.GenerateID(): cv.declare_variable_id(LambdaFilter),
-                              cv.Required(CONF_VALUE): cv.lambda_,
-                          })))
-def lambda_filter_to_code(config):
-    lambda_ = yield cg.process_lambda(config[CONF_VALUE], [(bool, 'x')],
-                                      return_type=cg.optional.template(bool))
-    rhs = LambdaFilter.new(lambda_)
-    var = cg.Pvariable(config[CONF_ID], rhs)
-    yield var
+@FILTER_REGISTRY.register('lambda', LambdaFilter, cv.lambda_)
+def lambda_filter_to_code(config, filter_id):
+    lambda_ = yield cg.process_lambda(config, [(bool, 'x')], return_type=cg.optional.template(bool))
+    yield cg.new_Pvariable(filter_id, lambda_)


 MULTI_CLICK_TIMING_SCHEMA = cv.Schema({
@@ -193,35 +172,35 @@ def validate_multi_click_timing(value):
 device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space='_')

 BINARY_SENSOR_SCHEMA = cv.MQTT_COMPONENT_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_variable_id(BinarySensor),
-    cv.OnlyWith(CONF_MQTT_ID, 'mqtt'): cv.declare_variable_id(mqtt.MQTTBinarySensorComponent),
+    cv.GenerateID(): cv.declare_id(BinarySensor),
+    cv.OnlyWith(CONF_MQTT_ID, 'mqtt'): cv.declare_id(mqtt.MQTTBinarySensorComponent),

    cv.Optional(CONF_DEVICE_CLASS): device_class,
    cv.Optional(CONF_FILTERS): validate_filters,
    cv.Optional(CONF_ON_PRESS): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(PressTrigger),
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PressTrigger),
    }),
    cv.Optional(CONF_ON_RELEASE): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(ReleaseTrigger),
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ReleaseTrigger),
    }),
    cv.Optional(CONF_ON_CLICK): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(ClickTrigger),
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ClickTrigger),
        cv.Optional(CONF_MIN_LENGTH, default='50ms'): cv.positive_time_period_milliseconds,
        cv.Optional(CONF_MAX_LENGTH, default='350ms'): cv.positive_time_period_milliseconds,
    }),
    cv.Optional(CONF_ON_DOUBLE_CLICK): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(DoubleClickTrigger),
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DoubleClickTrigger),
        cv.Optional(CONF_MIN_LENGTH, default='50ms'): cv.positive_time_period_milliseconds,
        cv.Optional(CONF_MAX_LENGTH, default='350ms'): cv.positive_time_period_milliseconds,
    }),
    cv.Optional(CONF_ON_MULTI_CLICK): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(MultiClickTrigger),
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(MultiClickTrigger),
        cv.Required(CONF_TIMING): cv.All([parse_multi_click_timing_str],
                                         validate_multi_click_timing),
        cv.Optional(CONF_INVALID_COOLDOWN, default='1s'): cv.positive_time_period_milliseconds,
    }),
    cv.Optional(CONF_ON_STATE): automation.validate_automation({
-        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_variable_id(StateTrigger),
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(StateTrigger),
    }),

    cv.Optional(CONF_INVERTED): cv.invalid(
@@ -234,6 +213,7 @@ BINARY_SENSOR_SCHEMA = cv.MQTT_COMPONENT_SCHEMA.extend({

@coroutine
 def setup_binary_sensor_core_(var, config):
+    cg.add(var.set_name(config[CONF_NAME]))
    if CONF_INTERNAL in config:
        cg.add(var.set_internal(CONF_INTERNAL))
    if CONF_DEVICE_CLASS in config:
@@ -300,26 +280,24 @@ def new_binary_sensor(config):
    yield var


-BINARY_SENSOR_IS_ON_OFF_CONDITION_SCHEMA = maybe_simple_id({
-    cv.Required(CONF_ID): cv.use_variable_id(BinarySensor),
+BINARY_SENSOR_CONDITION_SCHEMA = maybe_simple_id({
+    cv.Required(CONF_ID): cv.use_id(BinarySensor),
    cv.Optional(CONF_FOR): cv.positive_time_period_milliseconds,
 })


-@CONDITION_REGISTRY.register('binary_sensor.is_on', BINARY_SENSOR_IS_ON_OFF_CONDITION_SCHEMA)
+@automation.register_condition('binary_sensor.is_on', BinarySensorCondition,
+                               BINARY_SENSOR_CONDITION_SCHEMA)
 def binary_sensor_is_on_to_code(config, condition_id, template_arg, args):
-    var = yield cg.get_variable(config[CONF_ID])
-    type = BinarySensorCondition.template(template_arg)
-    rhs = type.new(var, True, config.get(CONF_FOR))
-    yield cg.Pvariable(condition_id, rhs, type=type)
+    paren = yield cg.get_variable(config[CONF_ID])
+    yield cg.new_Pvariable(condition_id, template_arg, paren, True, config.get(CONF_FOR))


-@CONDITION_REGISTRY.register('binary_sensor.is_off', BINARY_SENSOR_IS_ON_OFF_CONDITION_SCHEMA)
+@automation.register_condition('binary_sensor.is_off', BinarySensorCondition,
+                               BINARY_SENSOR_CONDITION_SCHEMA)
 def binary_sensor_is_off_to_code(config, condition_id, template_arg, args):
-    var = yield cg.get_variable(config[CONF_ID])
-    type = BinarySensorCondition.template(template_arg)
-    rhs = type.new(var, False, config.get(CONF_FOR))
-    yield cg.Pvariable(condition_id, rhs, type=type)
+    paren = yield cg.get_variable(config[CONF_ID])
+    yield cg.new_Pvariable(condition_id, template_arg, paren, False, config.get(CONF_FOR))


 def to_code(config):
--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -150,7 +150,6 @@ template<typename... Ts> class BinarySensorPublishAction : public Action<Ts...>
  void play(Ts... x) override {
    auto val = this->state_.value(x...);
    this->sensor_->publish_state(val);
-    this->play_next(x...);
  }

 protected:
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -24,12 +24,12 @@ namespace binary_sensor {
 */
 class BinarySensor : public Nameable {
 public:
+  explicit BinarySensor();
  /** Construct a binary sensor with the specified name
   *
   * @param name Name of this binary sensor.
   */
  explicit BinarySensor(const std::string &name);
-  explicit BinarySensor();

  /** Add a callback to be notified of state changes.
   *