Updates for 1.13 (esphome#546)

* Update CI matcher

* Check Executable bit

* Quicklint

* Updates

* Allow pm1.0 and pm10.0 for PMS5003ST

Fixes esphome/feature-requests#225

* PowerSupplyRequester

* Lint

* Include debug data in generated main.cpp

* Updates

* Auto-select bit_depth

* Updates

.travis.yml

@@ -51,6 +51,6 @@ matrix:
         - clang-format-7 -version
         - clang-apply-replacements-7 -version
       script:
-        - script/clang-tidy.py --all-headers -j 2 --fix
-        - script/clang-format.py -i -j 2
+        - script/clang-tidy --all-headers -j 2 --fix
+        - script/clang-format -i -j 2
         - script/ci-suggest-changes

esphome/__main__.py

@@ -1,16 +1,18 @@
 from __future__ import print_function
 
 import argparse
+import functools
 import logging
 import os
 import sys
 from datetime import datetime
 
 from esphome import const, writer, yaml_util
+import esphome.codegen as cg
 from esphome.config import iter_components, read_config, strip_default_ids
 from esphome.const import CONF_BAUD_RATE, CONF_BROKER, CONF_LOGGER, CONF_OTA, \
     CONF_PASSWORD, CONF_PORT
-from esphome.core import CORE, EsphomeError
+from esphome.core import CORE, EsphomeError, coroutine, coroutine_with_priority
 from esphome.helpers import color, indent
 from esphome.py_compat import IS_PY2, safe_input
 from esphome.util import run_external_command, run_external_process, safe_print
@@ -117,12 +119,27 @@ def run_miniterm(config, port):
                 config, line, backtrace_state=backtrace_state)
 
 
+def wrap_to_code(name, comp):
+    coro = coroutine(comp.to_code)
+
+    @functools.wraps(comp.to_code)
+    @coroutine_with_priority(coro.priority)
+    def wrapped(conf):
+        cg.add(cg.LineComment(u"{}:".format(name)))
+        if comp.config_schema is not None:
+            cg.add(cg.LineComment(indent(yaml_util.dump(conf).decode('utf-8'))))
+        yield coro(conf)
+
+    return wrapped
+
+
 def write_cpp(config):
     _LOGGER.info("Generating C++ source...")
 
-    for _, component, conf in iter_components(CORE.config):
+    for name, component, conf in iter_components(CORE.config):
         if component.to_code is not None:
-            CORE.add_job(component.to_code, conf)
+            coro = wrap_to_code(name, component)
+            CORE.add_job(coro, conf)
 
     CORE.flush_tasks()
 

esphome/codegen.py

@@ -10,7 +10,7 @@
 # pylint: disable=unused-import
 from esphome.cpp_generator import (  # noqa
     Expression, RawExpression, RawStatement, TemplateArguments,
-    StructInitializer, ArrayInitializer, safe_exp, Statement,
+    StructInitializer, ArrayInitializer, safe_exp, Statement, LineComment,
     progmem_array, statement, variable, Pvariable, new_Pvariable,
     add, add_global, add_library, add_build_flag, add_define,
     get_variable, get_variable_with_full_id, process_lambda, is_template, templatable, MockObj,

esphome/components/binary_sensor/filter.cpp

@@ -5,7 +5,7 @@ namespace esphome {
 
 namespace binary_sensor {
 
-static const char *TAG = "something.Filter";
+static const char *TAG = "sensor.filter";
 
 void Filter::output(bool value, bool is_initial) {
   if (!this->dedup_.next(value))

esphome/components/ble_presence/ble_presence_device.cpp

@@ -6,7 +6,7 @@
 namespace esphome {
 namespace ble_presence {
 
-static const char *TAG = "something.something";
+static const char *TAG = "ble_presence";
 
 void BLEPresenceDevice::dump_config() { LOG_BINARY_SENSOR("", "BLE Presence", this); }
 

esphome/components/esp8266_pwm/esp8266_pwm.cpp

@@ -11,7 +11,7 @@
 namespace esphome {
 namespace esp8266_pwm {
 
-static const char *TAG = "something.something";
+static const char *TAG = "esp8266_pwm";
 
 void ESP8266PWM::setup() {
   ESP_LOGCONFIG(TAG, "Setting up ESP8266 PWM Output...");

esphome/components/fastled_base/__init__.py

@@ -1,8 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import light, power_supply
-from esphome.const import CONF_OUTPUT_ID, CONF_NUM_LEDS, CONF_RGB_ORDER, CONF_MAX_REFRESH_RATE, \
-    CONF_POWER_SUPPLY
+from esphome.components import light
+from esphome.const import CONF_OUTPUT_ID, CONF_NUM_LEDS, CONF_RGB_ORDER, CONF_MAX_REFRESH_RATE
 from esphome.core import coroutine
 
 fastled_base_ns = cg.esphome_ns.namespace('fastled_base')
@@ -24,8 +23,6 @@
     cv.Required(CONF_NUM_LEDS): cv.positive_not_null_int,
     cv.Optional(CONF_RGB_ORDER): cv.one_of(*RGB_ORDERS, upper=True),
     cv.Optional(CONF_MAX_REFRESH_RATE): cv.positive_time_period_microseconds,
-
-    cv.Optional(CONF_POWER_SUPPLY): cv.use_id(power_supply.PowerSupply),
 }).extend(cv.COMPONENT_SCHEMA)
 
 
@@ -37,10 +34,6 @@ def new_fastled_light(config):
     if CONF_MAX_REFRESH_RATE in config:
         cg.add(var.set_max_refresh_rate(config[CONF_MAX_REFRESH_RATE]))
 
-    if CONF_POWER_SUPPLY in config:
-        var_ = yield cg.get_variable(config[CONF_POWER_SUPPLY])
-        cg.add(var.set_power_supply(var_))
-
     yield light.register_light(var, config)
     cg.add_library('FastLED', '3.2.0')
     yield var

esphome/components/fastled_base/fastled_light.cpp

@@ -33,27 +33,6 @@ void FastLEDLightOutput::loop() {
   this->mark_shown_();
 
   ESP_LOGVV(TAG, "Writing RGB values to bus...");
-
-#ifdef USE_POWER_SUPPLY
-  if (this->power_supply_ != nullptr) {
-    bool is_on = false;
-    for (int i = 0; i < this->num_leds_; i++) {
-      if (bool(this->leds_[i])) {
-        is_on = true;
-        break;
-      }
-    }
-
-    if (is_on && !this->has_requested_high_power_) {
-      this->power_supply_->request_high_power();
-      this->has_requested_high_power_ = true;
-    }
-    if (!is_on && this->has_requested_high_power_) {
-      this->power_supply_->unrequest_high_power();
-      this->has_requested_high_power_ = false;
-    }
-  }
-#endif
   this->controller_->showLeds();
 }
 

esphome/components/fastled_base/fastled_light.h

@@ -4,10 +4,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/components/light/addressable_light.h"
 
-#ifdef USE_POWER_SUPPLY
-#include "esphome/components/power_supply/power_supply.h"
-#endif
-
 #define FASTLED_ESP8266_RAW_PIN_ORDER
 #define FASTLED_ESP32_RAW_PIN_ORDER
 #define FASTLED_RMT_BUILTIN_DRIVER true
@@ -30,10 +26,6 @@ class FastLEDLightOutput : public Component, public light::AddressableLight {
   /// Set a maximum refresh rate in µs as some lights do not like being updated too often.
   void set_max_refresh_rate(uint32_t interval_us) { this->max_refresh_rate_ = interval_us; }
 
-#ifdef USE_POWER_SUPPLY
-  void set_power_supply(power_supply::PowerSupply *power_supply) { this->power_supply_ = power_supply; }
-#endif
-
   /// Add some LEDS, can only be called once.
   CLEDController &add_leds(CLEDController *controller, int num_leds) {
     this->controller_ = controller;
@@ -242,10 +234,6 @@ class FastLEDLightOutput : public Component, public light::AddressableLight {
   int num_leds_{0};
   uint32_t last_refresh_{0};
   optional<uint32_t> max_refresh_rate_{};
-#ifdef USE_POWER_SUPPLY
-  power_supply::PowerSupply *power_supply_{nullptr};
-  bool has_requested_high_power_{false};
-#endif
 };
 
 }  // namespace fastled_base

esphome/components/integration/sensor.py

@@ -33,7 +33,7 @@
     cv.Required(CONF_TIME_UNIT): cv.enum(INTEGRATION_TIMES, lower=True),
     cv.Optional(CONF_INTEGRATION_METHOD, default='trapezoid'):
         cv.enum(INTEGRATION_METHODS, lower=True),
-    cv.Optional(CONF_RESTORE, default=True): cv.boolean,
+    cv.Optional(CONF_RESTORE, default=False): cv.boolean,
 }).extend(cv.COMPONENT_SCHEMA)
 
 

esphome/components/ledc/output.py

@@ -1,20 +1,54 @@
+import math
 
 from esphome import pins
 from esphome.components import output
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import APB_CLOCK_FREQ, CONF_BIT_DEPTH, CONF_CHANNEL, CONF_FREQUENCY, \
+from esphome.const import CONF_BIT_DEPTH, CONF_CHANNEL, CONF_FREQUENCY, \
     CONF_ID, CONF_PIN, ESP_PLATFORM_ESP32
 
 ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
 
 
+def calc_max_frequency(bit_depth):
+    return 80e6 / (2**bit_depth)
+
+
+def calc_min_frequency(bit_depth):
+    # LEDC_DIV_NUM_HSTIMER is 15-bit unsigned integer
+    # lower 8 bits represent fractional part
+    max_div_num = ((1 << 16) - 1) / 256.0
+    return 80e6 / (max_div_num * (2**bit_depth))
+
+
 def validate_frequency_bit_depth(obj):
     frequency = obj[CONF_FREQUENCY]
+    if CONF_BIT_DEPTH not in obj:
+        obj = obj.copy()
+        for bit_depth in range(15, 0, -1):
+            if calc_min_frequency(bit_depth) <= frequency <= calc_max_frequency(bit_depth):
+                obj[CONF_BIT_DEPTH] = bit_depth
+                break
+        else:
+            min_freq = min(calc_min_frequency(x) for x in range(1, 16))
+            max_freq = max(calc_max_frequency(x) for x in range(1, 16))
+            if frequency < min_freq:
+                raise cv.Invalid("This frequency setting is not possible, please choose a higher "
+                                 "frequency (at least {}Hz)".format(int(min_freq)))
+            if frequency > max_freq:
+                raise cv.Invalid("This frequency setting is not possible, please choose a lower "
+                                 "frequency (at most {}Hz)".format(int(max_freq)))
+            raise cv.Invalid("Invalid frequency!")
+
     bit_depth = obj[CONF_BIT_DEPTH]
-    max_freq = APB_CLOCK_FREQ / (2**bit_depth)
+    min_freq = calc_min_frequency(bit_depth)
+    max_freq = calc_max_frequency(bit_depth)
     if frequency > max_freq:
-        raise cv.Invalid('Maximum frequency for bit depth {} is {}Hz'.format(bit_depth, max_freq))
+        raise cv.Invalid('Maximum frequency for bit depth {} is {}Hz. Please decrease the '
+                         'bit_depth.'.format(bit_depth, int(math.floor(max_freq))))
+    if frequency < calc_min_frequency(bit_depth):
+        raise cv.Invalid('Minimum frequency for bit depth {} is {}Hz. Please increase the '
+                         'bit_depth.'.format(bit_depth, int(math.ceil(min_freq))))
     return obj
 
 
@@ -25,7 +59,7 @@ def validate_frequency_bit_depth(obj):
     cv.Required(CONF_ID): cv.declare_id(LEDCOutput),
     cv.Required(CONF_PIN): pins.internal_gpio_output_pin_schema,
     cv.Optional(CONF_FREQUENCY, default='1kHz'): cv.frequency,
-    cv.Optional(CONF_BIT_DEPTH, default=12): cv.int_range(min=1, max=15),
+    cv.Optional(CONF_BIT_DEPTH): cv.int_range(min=1, max=15),
     cv.Optional(CONF_CHANNEL): cv.int_range(min=0, max=15),
 }).extend(cv.COMPONENT_SCHEMA), validate_frequency_bit_depth)
 

esphome/components/light/__init__.py

@@ -1,9 +1,9 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import mqtt
+from esphome.components import mqtt, power_supply
 from esphome.const import CONF_COLOR_CORRECT, \
     CONF_DEFAULT_TRANSITION_LENGTH, CONF_EFFECTS, CONF_GAMMA_CORRECT, CONF_ID, \
-    CONF_INTERNAL, CONF_NAME, CONF_MQTT_ID
+    CONF_INTERNAL, CONF_NAME, CONF_MQTT_ID, CONF_POWER_SUPPLY
 from esphome.core import coroutine, coroutine_with_priority
 from .automation import light_control_to_code  # noqa
 from .effects import validate_effects, BINARY_EFFECTS, \
@@ -35,6 +35,7 @@
     cv.GenerateID(): cv.declare_id(AddressableLightState),
     cv.Optional(CONF_EFFECTS): validate_effects(ADDRESSABLE_EFFECTS),
     cv.Optional(CONF_COLOR_CORRECT): cv.All([cv.percentage], cv.Length(min=3, max=4)),
+    cv.Optional(CONF_POWER_SUPPLY): cv.use_id(power_supply.PowerSupply),
 })
 
 
@@ -52,6 +53,10 @@ def setup_light_core_(light_var, output_var, config):
     if CONF_COLOR_CORRECT in config:
         cg.add(output_var.set_correction(*config[CONF_COLOR_CORRECT]))
 
+    if CONF_POWER_SUPPLY in config:
+        var_ = yield cg.get_variable(config[CONF_POWER_SUPPLY])
+        cg.add(output_var.set_power_supply(var_))
+
     if CONF_MQTT_ID in config:
         mqtt_ = cg.new_Pvariable(config[CONF_MQTT_ID], light_var)
         yield mqtt.register_mqtt_component(mqtt_, config)

esphome/components/light/addressable_light.h

@@ -1,9 +1,14 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
 #include "light_output.h"
 #include "light_state.h"
 
+#ifdef USE_POWER_SUPPLY
+#include "esphome/components/power_supply/power_supply.h"
+#endif
+
 namespace esphome {
 namespace light {
 
@@ -30,6 +35,7 @@ struct ESPColor {
       };
     };
     uint8_t raw[4];
+    uint32_t raw_32;
   };
   inline ESPColor() ALWAYS_INLINE : r(0), g(0), b(0), w(0) {}  // NOLINT
   inline ESPColor(uint8_t red, uint8_t green, uint8_t blue, uint8_t white) ALWAYS_INLINE : r(red),
@@ -47,7 +53,7 @@ struct ESPColor {
     this->b = rhs.b;
     this->w = rhs.w;
   }
-  inline bool is_on() ALWAYS_INLINE { return this->r != 0 || this->g != 0 || this->b != 0 || this->w != 0; }
+  inline bool is_on() ALWAYS_INLINE { return this->raw_32 != 0; }
   inline ESPColor &operator=(const ESPColor &rhs) ALWAYS_INLINE {
     this->r = rhs.r;
     this->g = rhs.g;
@@ -527,14 +533,32 @@ class AddressableLight : public LightOutput {
   void setup_state(LightState *state) override { this->correction_.calculate_gamma_table(state->get_gamma_correct()); }
   void schedule_show() { this->next_show_ = true; }
 
+#ifdef USE_POWER_SUPPLY
+  void set_power_supply(power_supply::PowerSupply *power_supply) { this->power_.set_parent(power_supply); }
+#endif
+
  protected:
   bool should_show_() const { return this->effect_active_ || this->next_show_; }
-  void mark_shown_() { this->next_show_ = false; }
+  void mark_shown_() {
+    this->next_show_ = false;
+#ifdef USE_POWER_SUPPLY
+    for (auto c : *this) {
+      if (c.get().is_on()) {
+        this->power_.request();
+        return;
+      }
+    }
+    this->power_.unrequest();
+#endif
+  }
   virtual ESPColorView get_view_internal(int32_t index) const = 0;
 
   bool effect_active_{false};
   bool next_show_{true};
   ESPColorCorrection correction_{};
+#ifdef USE_POWER_SUPPLY
+  power_supply::PowerSupplyRequester power_;
+#endif
 };
 
 }  // namespace light

esphome/components/neopixelbus/light.py

@@ -1,9 +1,9 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
-from esphome.components import light, power_supply
+from esphome.components import light
 from esphome.const import CONF_CLOCK_PIN, CONF_DATA_PIN, CONF_METHOD, CONF_NUM_LEDS, CONF_PIN, \
-    CONF_POWER_SUPPLY, CONF_TYPE, CONF_VARIANT, CONF_OUTPUT_ID
+    CONF_TYPE, CONF_VARIANT, CONF_OUTPUT_ID
 from esphome.core import CORE
 
 neopixelbus_ns = cg.esphome_ns.namespace('neopixelbus')
@@ -138,8 +138,6 @@ def validate(config):
     cv.Optional(CONF_DATA_PIN): pins.output_pin,
 
     cv.Required(CONF_NUM_LEDS): cv.positive_not_null_int,
-
-    cv.Optional(CONF_POWER_SUPPLY): cv.use_id(power_supply.PowerSupply),
 }).extend(cv.COMPONENT_SCHEMA), validate, validate_method_pin)
 
 
@@ -162,8 +160,4 @@ def to_code(config):
 
     cg.add(var.set_pixel_order(getattr(ESPNeoPixelOrder, config[CONF_TYPE])))
 
-    if CONF_POWER_SUPPLY in config:
-        var_ = yield cg.get_variable(config[CONF_POWER_SUPPLY])
-        cg.add(var.set_power_supply(var_))
-
     cg.add_library('NeoPixelBus', '2.4.1')