From 16bc60644d6b5668b3fb4f4387e647dd2c9e2b79 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 19 Oct 2019 17:11:22 +0200
Subject: [PATCH 001/412] Bump version to v1.15.0-dev

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 523b9b019d..5d05c91373 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -2,7 +2,7 @@
 """Constants used by esphome."""
 
 MAJOR_VERSION = 1
-MINOR_VERSION = 14
+MINOR_VERSION = 15
 PATCH_VERSION = '0-dev'
 __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
 __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)

From 62d4b296626e7b8cc4c102c832d8ccc4ded35093 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 19 Oct 2019 17:38:48 +0200
Subject: [PATCH 002/412] Format

---
 esphome/components/scd30/scd30.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/esphome/components/scd30/scd30.cpp b/esphome/components/scd30/scd30.cpp
index 0b0e08387d..55ab07879e 100644
--- a/esphome/components/scd30/scd30.cpp
+++ b/esphome/components/scd30/scd30.cpp
@@ -113,8 +113,7 @@ void SCD30Component::update() {
     uint32_t temp_hum_u32 = (((uint32_t(raw_data[4])) << 16) | (uint32_t(raw_data[5])));
     uint32_float_t humidity{.uint32 = temp_hum_u32};
 
-    ESP_LOGD(TAG, "Got CO2=%.2fppm temperature=%.2f°C humidity=%.2f%%",
-             co2.value, temperature.value, humidity.value);
+    ESP_LOGD(TAG, "Got CO2=%.2fppm temperature=%.2f°C humidity=%.2f%%", co2.value, temperature.value, humidity.value);
     if (this->co2_sensor_ != nullptr)
       this->co2_sensor_->publish_state(co2.value);
     if (this->temperature_sensor_ != nullptr)

From e553c0768e0dc117ff5721a6c1ddb0269a2af791 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 19 Oct 2019 20:23:14 +0200
Subject: [PATCH 003/412] Link pip&python in lint Dockerfile

---
 docker/Dockerfile.lint | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 98c22d4c88..073ad90cb6 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -14,5 +14,7 @@ RUN \
 COPY requirements_test.txt /requirements_test.txt
 RUN pip3 install --no-cache-dir wheel && pip3 install --no-cache-dir -r /requirements_test.txt
 
+RUN ln -s /usr/bin/pip3 /usr/bin/pip && ln -f -s /usr/bin/python3 /usr/bin/python
+
 VOLUME ["/esphome"]
 WORKDIR /esphome

From 58b63118211cb2e9502d1949fde2ebbf8ee2a3dd Mon Sep 17 00:00:00 2001
From: Evan Coleman <e@edc.me>
Date: Sat, 19 Oct 2019 14:44:43 -0400
Subject: [PATCH 004/412] Add SSD1325 Display Component (#736)

* add ssd1325 component

* fix i2c

* remove ssd1325 i2c

* add test

* set max contrast

* No macros - see styleguide

* Remove invalid function

* Formatting


Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/ssd1325_base/__init__.py   |  42 +++++
 .../components/ssd1325_base/ssd1325_base.cpp  | 177 ++++++++++++++++++
 .../components/ssd1325_base/ssd1325_base.h    |  50 +++++
 esphome/components/ssd1325_spi/__init__.py    |   0
 esphome/components/ssd1325_spi/display.py     |  26 +++
 .../components/ssd1325_spi/ssd1325_spi.cpp    |  64 +++++++
 esphome/components/ssd1325_spi/ssd1325_spi.h  |  29 +++
 tests/test1.yaml                              |   7 +
 8 files changed, 395 insertions(+)
 create mode 100644 esphome/components/ssd1325_base/__init__.py
 create mode 100644 esphome/components/ssd1325_base/ssd1325_base.cpp
 create mode 100644 esphome/components/ssd1325_base/ssd1325_base.h
 create mode 100644 esphome/components/ssd1325_spi/__init__.py
 create mode 100644 esphome/components/ssd1325_spi/display.py
 create mode 100644 esphome/components/ssd1325_spi/ssd1325_spi.cpp
 create mode 100644 esphome/components/ssd1325_spi/ssd1325_spi.h

diff --git a/esphome/components/ssd1325_base/__init__.py b/esphome/components/ssd1325_base/__init__.py
new file mode 100644
index 0000000000..69e11ec0d1
--- /dev/null
+++ b/esphome/components/ssd1325_base/__init__.py
@@ -0,0 +1,42 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import display
+from esphome.const import CONF_EXTERNAL_VCC, CONF_LAMBDA, CONF_MODEL, CONF_RESET_PIN
+from esphome.core import coroutine
+
+ssd1325_base_ns = cg.esphome_ns.namespace('ssd1325_base')
+SSD1325 = ssd1325_base_ns.class_('SSD1325', cg.PollingComponent, display.DisplayBuffer)
+SSD1325Model = ssd1325_base_ns.enum('SSD1325Model')
+
+MODELS = {
+    'SSD1325_128X32': SSD1325Model.SSD1325_MODEL_128_32,
+    'SSD1325_128X64': SSD1325Model.SSD1325_MODEL_128_64,
+    'SSD1325_96X16': SSD1325Model.SSD1325_MODEL_96_16,
+    'SSD1325_64X48': SSD1325Model.SSD1325_MODEL_64_48,
+}
+
+SSD1325_MODEL = cv.enum(MODELS, upper=True, space="_")
+
+SSD1325_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend({
+    cv.Required(CONF_MODEL): SSD1325_MODEL,
+    cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+    cv.Optional(CONF_EXTERNAL_VCC): cv.boolean,
+}).extend(cv.polling_component_schema('1s'))
+
+
+@coroutine
+def setup_ssd1036(var, config):
+    yield cg.register_component(var, config)
+    yield display.register_display(var, config)
+
+    cg.add(var.set_model(config[CONF_MODEL]))
+    if CONF_RESET_PIN in config:
+        reset = yield cg.gpio_pin_expression(config[CONF_RESET_PIN])
+        cg.add(var.set_reset_pin(reset))
+    if CONF_EXTERNAL_VCC in config:
+        cg.add(var.set_external_vcc(config[CONF_EXTERNAL_VCC]))
+    if CONF_LAMBDA in config:
+        lambda_ = yield cg.process_lambda(
+            config[CONF_LAMBDA], [(display.DisplayBufferRef, 'it')], return_type=cg.void)
+        cg.add(var.set_writer(lambda_))
diff --git a/esphome/components/ssd1325_base/ssd1325_base.cpp b/esphome/components/ssd1325_base/ssd1325_base.cpp
new file mode 100644
index 0000000000..3079e19cc8
--- /dev/null
+++ b/esphome/components/ssd1325_base/ssd1325_base.cpp
@@ -0,0 +1,177 @@
+#include "ssd1325_base.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace ssd1325_base {
+
+static const char *TAG = "ssd1325";
+
+static const uint8_t BLACK = 0;
+static const uint8_t WHITE = 1;
+
+static const uint8_t SSD1325_SETCOLADDR = 0x15;
+static const uint8_t SSD1325_SETROWADDR = 0x75;
+static const uint8_t SSD1325_SETCONTRAST = 0x81;
+static const uint8_t SSD1325_SETCURRENT = 0x84;
+
+static const uint8_t SSD1325_SETREMAP = 0xA0;
+static const uint8_t SSD1325_SETSTARTLINE = 0xA1;
+static const uint8_t SSD1325_SETOFFSET = 0xA2;
+static const uint8_t SSD1325_NORMALDISPLAY = 0xA4;
+static const uint8_t SSD1325_DISPLAYALLON = 0xA5;
+static const uint8_t SSD1325_DISPLAYALLOFF = 0xA6;
+static const uint8_t SSD1325_INVERTDISPLAY = 0xA7;
+static const uint8_t SSD1325_SETMULTIPLEX = 0xA8;
+static const uint8_t SSD1325_MASTERCONFIG = 0xAD;
+static const uint8_t SSD1325_DISPLAYOFF = 0xAE;
+static const uint8_t SSD1325_DISPLAYON = 0xAF;
+
+static const uint8_t SSD1325_SETPRECHARGECOMPENABLE = 0xB0;
+static const uint8_t SSD1325_SETPHASELEN = 0xB1;
+static const uint8_t SSD1325_SETROWPERIOD = 0xB2;
+static const uint8_t SSD1325_SETCLOCK = 0xB3;
+static const uint8_t SSD1325_SETPRECHARGECOMP = 0xB4;
+static const uint8_t SSD1325_SETGRAYTABLE = 0xB8;
+static const uint8_t SSD1325_SETPRECHARGEVOLTAGE = 0xBC;
+static const uint8_t SSD1325_SETVCOMLEVEL = 0xBE;
+static const uint8_t SSD1325_SETVSL = 0xBF;
+
+static const uint8_t SSD1325_GFXACCEL = 0x23;
+static const uint8_t SSD1325_DRAWRECT = 0x24;
+static const uint8_t SSD1325_COPY = 0x25;
+
+void SSD1325::setup() {
+  this->init_internal_(this->get_buffer_length_());
+
+  this->command(SSD1325_DISPLAYOFF);   /* display off */
+  this->command(SSD1325_SETCLOCK);     /* set osc division */
+  this->command(0xF1);                 /* 145 */
+  this->command(SSD1325_SETMULTIPLEX); /* multiplex ratio */
+  this->command(0x3f);                 /* duty = 1/64 */
+  this->command(SSD1325_SETOFFSET);    /* set display offset --- */
+  this->command(0x4C);                 /* 76 */
+  this->command(SSD1325_SETSTARTLINE); /*set start line */
+  this->command(0x00);                 /* ------ */
+  this->command(SSD1325_MASTERCONFIG); /*Set Master Config DC/DC Converter*/
+  this->command(0x02);
+  this->command(SSD1325_SETREMAP); /* set segment remap------ */
+  this->command(0x56);
+  this->command(SSD1325_SETCURRENT + 0x2); /* Set Full Current Range */
+  this->command(SSD1325_SETGRAYTABLE);
+  this->command(0x01);
+  this->command(0x11);
+  this->command(0x22);
+  this->command(0x32);
+  this->command(0x43);
+  this->command(0x54);
+  this->command(0x65);
+  this->command(0x76);
+  this->command(SSD1325_SETCONTRAST); /* set contrast current */
+  this->command(0x7F);                // max!
+  this->command(SSD1325_SETROWPERIOD);
+  this->command(0x51);
+  this->command(SSD1325_SETPHASELEN);
+  this->command(0x55);
+  this->command(SSD1325_SETPRECHARGECOMP);
+  this->command(0x02);
+  this->command(SSD1325_SETPRECHARGECOMPENABLE);
+  this->command(0x28);
+  this->command(SSD1325_SETVCOMLEVEL);  // Set High Voltage Level of COM Pin
+  this->command(0x1C);                  //?
+  this->command(SSD1325_SETVSL);        // set Low Voltage Level of SEG Pin
+  this->command(0x0D | 0x02);
+  this->command(SSD1325_NORMALDISPLAY); /* set display mode */
+  this->command(SSD1325_DISPLAYON);     /* display ON */
+}
+void SSD1325::display() {
+  this->command(SSD1325_SETCOLADDR); /* set column address */
+  this->command(0x00);               /* set column start address */
+  this->command(0x3F);               /* set column end address */
+  this->command(SSD1325_SETROWADDR); /* set row address */
+  this->command(0x00);               /* set row start address */
+  this->command(0x3F);               /* set row end address */
+
+  this->write_display_data();
+}
+void SSD1325::update() {
+  this->do_update_();
+  this->display();
+}
+int SSD1325::get_height_internal() {
+  switch (this->model_) {
+    case SSD1325_MODEL_128_32:
+      return 32;
+    case SSD1325_MODEL_128_64:
+      return 64;
+    case SSD1325_MODEL_96_16:
+      return 16;
+    case SSD1325_MODEL_64_48:
+      return 48;
+    default:
+      return 0;
+  }
+}
+int SSD1325::get_width_internal() {
+  switch (this->model_) {
+    case SSD1325_MODEL_128_32:
+    case SSD1325_MODEL_128_64:
+      return 128;
+    case SSD1325_MODEL_96_16:
+      return 96;
+    case SSD1325_MODEL_64_48:
+      return 64;
+    default:
+      return 0;
+  }
+}
+size_t SSD1325::get_buffer_length_() {
+  return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) / 8u;
+}
+
+void HOT SSD1325::draw_absolute_pixel_internal(int x, int y, int color) {
+  if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
+    return;
+
+  uint16_t pos = x + (y / 8) * this->get_width_internal();
+  uint8_t subpos = y % 8;
+  if (color) {
+    this->buffer_[pos] |= (1 << subpos);
+  } else {
+    this->buffer_[pos] &= ~(1 << subpos);
+  }
+}
+void SSD1325::fill(int color) {
+  uint8_t fill = color ? 0xFF : 0x00;
+  for (uint32_t i = 0; i < this->get_buffer_length_(); i++)
+    this->buffer_[i] = fill;
+}
+void SSD1325::init_reset_() {
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(true);
+    delay(1);
+    // Trigger Reset
+    this->reset_pin_->digital_write(false);
+    delay(10);
+    // Wake up
+    this->reset_pin_->digital_write(true);
+  }
+}
+const char *SSD1325::model_str_() {
+  switch (this->model_) {
+    case SSD1325_MODEL_128_32:
+      return "SSD1325 128x32";
+    case SSD1325_MODEL_128_64:
+      return "SSD1325 128x64";
+    case SSD1325_MODEL_96_16:
+      return "SSD1325 96x16";
+    case SSD1325_MODEL_64_48:
+      return "SSD1325 64x48";
+    default:
+      return "Unknown";
+  }
+}
+
+}  // namespace ssd1325_base
+}  // namespace esphome
diff --git a/esphome/components/ssd1325_base/ssd1325_base.h b/esphome/components/ssd1325_base/ssd1325_base.h
new file mode 100644
index 0000000000..e227f68f86
--- /dev/null
+++ b/esphome/components/ssd1325_base/ssd1325_base.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
+#include "esphome/components/display/display_buffer.h"
+
+namespace esphome {
+namespace ssd1325_base {
+
+enum SSD1325Model {
+  SSD1325_MODEL_128_32 = 0,
+  SSD1325_MODEL_128_64,
+  SSD1325_MODEL_96_16,
+  SSD1325_MODEL_64_48,
+};
+
+class SSD1325 : public PollingComponent, public display::DisplayBuffer {
+ public:
+  void setup() override;
+
+  void display();
+
+  void update() override;
+
+  void set_model(SSD1325Model model) { this->model_ = model; }
+  void set_reset_pin(GPIOPin *reset_pin) { this->reset_pin_ = reset_pin; }
+  void set_external_vcc(bool external_vcc) { this->external_vcc_ = external_vcc; }
+
+  float get_setup_priority() const override { return setup_priority::PROCESSOR; }
+  void fill(int color) override;
+
+ protected:
+  virtual void command(uint8_t value) = 0;
+  virtual void write_display_data() = 0;
+  void init_reset_();
+
+  void draw_absolute_pixel_internal(int x, int y, int color) override;
+
+  int get_height_internal() override;
+  int get_width_internal() override;
+  size_t get_buffer_length_();
+  const char *model_str_();
+
+  SSD1325Model model_{SSD1325_MODEL_128_64};
+  GPIOPin *reset_pin_{nullptr};
+  bool external_vcc_{false};
+};
+
+}  // namespace ssd1325_base
+}  // namespace esphome
diff --git a/esphome/components/ssd1325_spi/__init__.py b/esphome/components/ssd1325_spi/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/ssd1325_spi/display.py b/esphome/components/ssd1325_spi/display.py
new file mode 100644
index 0000000000..4615d45393
--- /dev/null
+++ b/esphome/components/ssd1325_spi/display.py
@@ -0,0 +1,26 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import spi, ssd1325_base
+from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
+
+AUTO_LOAD = ['ssd1325_base']
+DEPENDENCIES = ['spi']
+
+ssd1325_spi = cg.esphome_ns.namespace('ssd1325_spi')
+SPISSD1325 = ssd1325_spi.class_('SPISSD1325', ssd1325_base.SSD1325, spi.SPIDevice)
+
+CONFIG_SCHEMA = cv.All(ssd1325_base.SSD1325_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(SPISSD1325),
+    cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
+}).extend(cv.COMPONENT_SCHEMA).extend(spi.SPI_DEVICE_SCHEMA),
+                       cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield ssd1325_base.setup_ssd1036(var, config)
+    yield spi.register_spi_device(var, config)
+
+    dc = yield cg.gpio_pin_expression(config[CONF_DC_PIN])
+    cg.add(var.set_dc_pin(dc))
diff --git a/esphome/components/ssd1325_spi/ssd1325_spi.cpp b/esphome/components/ssd1325_spi/ssd1325_spi.cpp
new file mode 100644
index 0000000000..1f547f8fd3
--- /dev/null
+++ b/esphome/components/ssd1325_spi/ssd1325_spi.cpp
@@ -0,0 +1,64 @@
+#include "ssd1325_spi.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+
+namespace esphome {
+namespace ssd1325_spi {
+
+static const char *TAG = "ssd1325_spi";
+
+void SPISSD1325::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up SPI SSD1325...");
+  this->spi_setup();
+  this->dc_pin_->setup();  // OUTPUT
+  this->cs_->setup();      // OUTPUT
+
+  this->init_reset_();
+  delay(500);
+  SSD1325::setup();
+}
+void SPISSD1325::dump_config() {
+  LOG_DISPLAY("", "SPI SSD1325", this);
+  ESP_LOGCONFIG(TAG, "  Model: %s", this->model_str_());
+  LOG_PIN("  CS Pin: ", this->cs_);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  ESP_LOGCONFIG(TAG, "  External VCC: %s", YESNO(this->external_vcc_));
+  LOG_UPDATE_INTERVAL(this);
+}
+void SPISSD1325::command(uint8_t value) {
+  this->cs_->digital_write(true);
+  this->dc_pin_->digital_write(false);
+  delay(1);
+  this->enable();
+  this->cs_->digital_write(false);
+  this->write_byte(value);
+  this->cs_->digital_write(true);
+  this->disable();
+}
+void HOT SPISSD1325::write_display_data() {
+  this->cs_->digital_write(true);
+  this->dc_pin_->digital_write(true);
+  this->cs_->digital_write(false);
+  delay(1);
+  this->enable();
+  for (uint16_t x = 0; x < this->get_width_internal(); x += 2) {
+    for (uint16_t y = 0; y < this->get_height_internal(); y += 8) {  // we write 8 pixels at once
+      uint8_t left8 = this->buffer_[y * 16 + x];
+      uint8_t right8 = this->buffer_[y * 16 + x + 1];
+      for (uint8_t p = 0; p < 8; p++) {
+        uint8_t d = 0;
+        if (left8 & (1 << p))
+          d |= 0xF0;
+        if (right8 & (1 << p))
+          d |= 0x0F;
+        this->write_byte(d);
+      }
+    }
+  }
+  this->cs_->digital_write(true);
+  this->disable();
+}
+
+}  // namespace ssd1325_spi
+}  // namespace esphome
diff --git a/esphome/components/ssd1325_spi/ssd1325_spi.h b/esphome/components/ssd1325_spi/ssd1325_spi.h
new file mode 100644
index 0000000000..e4e7d55769
--- /dev/null
+++ b/esphome/components/ssd1325_spi/ssd1325_spi.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/ssd1325_base/ssd1325_base.h"
+#include "esphome/components/spi/spi.h"
+
+namespace esphome {
+namespace ssd1325_spi {
+
+class SPISSD1325 : public ssd1325_base::SSD1325,
+                   public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH, spi::CLOCK_PHASE_TRAILING,
+                                         spi::DATA_RATE_8MHZ> {
+ public:
+  void set_dc_pin(GPIOPin *dc_pin) { dc_pin_ = dc_pin; }
+
+  void setup() override;
+
+  void dump_config() override;
+
+ protected:
+  void command(uint8_t value) override;
+
+  void write_display_data() override;
+
+  GPIOPin *dc_pin_;
+};
+
+}  // namespace ssd1325_spi
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index ac199a0a4a..686ff027e0 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1333,6 +1333,13 @@ display:
   reset_pin: GPIO23
   lambda: |-
     it.rectangle(0, 0, it.get_width(), it.get_height());
+- platform: ssd1325_spi
+  model: "SSD1325 128x64"
+  cs_pin: GPIO23
+  dc_pin: GPIO23
+  reset_pin: GPIO23
+  lambda: |-
+    it.rectangle(0, 0, it.get_width(), it.get_height());
 - platform: waveshare_epaper
   cs_pin: GPIO23
   dc_pin: GPIO23

From 286ca07cc8e5c4b0b89ebdc02309390428b7122b Mon Sep 17 00:00:00 2001
From: Nad <15346053+valordk@users.noreply.github.com>
Date: Sat, 19 Oct 2019 21:21:07 +0200
Subject: [PATCH 005/412] Add support for SGP30 eCO2 and TVOC sensors (#679)

* Add support for SGP30 eCO2 and TVOC sensors

* Added test for SGP30

* Lint issues fixed

* Lint fixes

* Fixed light lengths

* Cleanup

* Add support for Sensirion SCD30 CO2 sensors

* Fixed few lint issues

* Lint fixes

* Fixed line ending for lint

* Cleanup

* Refactored float conversion

* Refactor unnecessary return

* Refactoring and cleanup

* Updated uptime_sensor_ referencing and simplified checking on availability of copensation

* Temperature and Humidity source moved to a separate compensation block; Dependency for Uptime sensor removed.

* Both humidity_source and temperature_source are now mandatory if the compensation block is defined;

* Clean up

* Cleanup

* Cleanup in search of perfection

* Use correct comment style


Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/sgp30/__init__.py |   0
 esphome/components/sgp30/sensor.py   |  54 +++++
 esphome/components/sgp30/sgp30.cpp   | 295 +++++++++++++++++++++++++++
 esphome/components/sgp30/sgp30.h     |  54 +++++
 tests/test1.yaml                     |   9 +
 5 files changed, 412 insertions(+)
 create mode 100644 esphome/components/sgp30/__init__.py
 create mode 100644 esphome/components/sgp30/sensor.py
 create mode 100644 esphome/components/sgp30/sgp30.cpp
 create mode 100644 esphome/components/sgp30/sgp30.h

diff --git a/esphome/components/sgp30/__init__.py b/esphome/components/sgp30/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/sgp30/sensor.py b/esphome/components/sgp30/sensor.py
new file mode 100644
index 0000000000..0063c29bd3
--- /dev/null
+++ b/esphome/components/sgp30/sensor.py
@@ -0,0 +1,54 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import CONF_ID, ICON_RADIATOR, UNIT_PARTS_PER_MILLION, \
+    UNIT_PARTS_PER_BILLION, ICON_PERIODIC_TABLE_CO2
+
+DEPENDENCIES = ['i2c']
+
+sgp30_ns = cg.esphome_ns.namespace('sgp30')
+SGP30Component = sgp30_ns.class_('SGP30Component', cg.PollingComponent, i2c.I2CDevice)
+
+CONF_ECO2 = 'eco2'
+CONF_TVOC = 'tvoc'
+CONF_BASELINE = 'baseline'
+CONF_UPTIME = 'uptime'
+CONF_COMPENSATION = 'compensation'
+CONF_COMPENSATION_HUMIDITY = 'humidity_source'
+CONF_COMPENSATION_TEMPERATURE = 'temperature_source'
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(SGP30Component),
+    cv.Required(CONF_ECO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION,
+                                                 ICON_PERIODIC_TABLE_CO2, 0),
+    cv.Required(CONF_TVOC): sensor.sensor_schema(UNIT_PARTS_PER_BILLION, ICON_RADIATOR, 0),
+    cv.Optional(CONF_BASELINE): cv.hex_uint16_t,
+    cv.Optional(CONF_COMPENSATION): cv.Schema({
+        cv.Required(CONF_COMPENSATION_HUMIDITY): cv.use_id(sensor.Sensor),
+        cv.Required(CONF_COMPENSATION_TEMPERATURE): cv.use_id(sensor.Sensor)
+    }),
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x58))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield i2c.register_i2c_device(var, config)
+
+    if CONF_ECO2 in config:
+        sens = yield sensor.new_sensor(config[CONF_ECO2])
+        cg.add(var.set_eco2_sensor(sens))
+
+    if CONF_TVOC in config:
+        sens = yield sensor.new_sensor(config[CONF_TVOC])
+        cg.add(var.set_tvoc_sensor(sens))
+
+    if CONF_BASELINE in config:
+        cg.add(var.set_baseline(config[CONF_BASELINE]))
+
+    if CONF_COMPENSATION in config:
+        compensation_config = config[CONF_COMPENSATION]
+        sens = yield cg.get_variable(compensation_config[CONF_COMPENSATION_HUMIDITY])
+        cg.add(var.set_humidity_sensor(sens))
+        sens = yield cg.get_variable(compensation_config[CONF_COMPENSATION_TEMPERATURE])
+        cg.add(var.set_temperature_sensor(sens))
diff --git a/esphome/components/sgp30/sgp30.cpp b/esphome/components/sgp30/sgp30.cpp
new file mode 100644
index 0000000000..9a73295447
--- /dev/null
+++ b/esphome/components/sgp30/sgp30.cpp
@@ -0,0 +1,295 @@
+#include "sgp30.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sgp30 {
+
+static const char *TAG = "sgp30";
+
+static const uint16_t SGP30_CMD_GET_SERIAL_ID = 0x3682;
+static const uint16_t SGP30_CMD_GET_FEATURESET = 0x202f;
+static const uint16_t SGP30_CMD_IAQ_INIT = 0x2003;
+static const uint16_t SGP30_CMD_MEASURE_IAQ = 0x2008;
+static const uint16_t SGP30_CMD_SET_ABSOLUTE_HUMIDITY = 0x2061;
+static const uint16_t SGP30_CMD_GET_IAQ_BASELINE = 0x2015;
+static const uint16_t SGP30_CMD_SET_IAQ_BASELINE = 0x201E;
+
+// Sensor baseline should first be relied on after 1H of operation,
+// if the sensor starts with a baseline value provided
+const long IAQ_BASELINE_WARM_UP_SECONDS_WITH_BASELINE_PROVIDED = 3600;
+
+// Sensor baseline could first be relied on after 12H of operation,
+// if the sensor starts without any prior baseline value provided
+const long IAQ_BASELINE_WARM_UP_SECONDS_WITHOUT_BASELINE = 43200;
+
+void SGP30Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up SGP30...");
+
+  // Serial Number identification
+  if (!this->write_command_(SGP30_CMD_GET_SERIAL_ID)) {
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+  uint16_t raw_serial_number[3];
+
+  if (!this->read_data_(raw_serial_number, 3)) {
+    this->mark_failed();
+    return;
+  }
+  this->serial_number_ = (uint64_t(raw_serial_number[0]) << 24) | (uint64_t(raw_serial_number[1]) << 16) |
+                         (uint64_t(raw_serial_number[2]));
+  ESP_LOGD(TAG, "Serial Number: %llu", this->serial_number_);
+
+  // Featureset identification for future use
+  if (!this->write_command_(SGP30_CMD_GET_FEATURESET)) {
+    this->mark_failed();
+    return;
+  }
+  uint16_t raw_featureset[1];
+  if (!this->read_data_(raw_featureset, 1)) {
+    this->mark_failed();
+    return;
+  }
+  this->featureset_ = raw_featureset[0];
+  if (uint16_t(this->featureset_ >> 12) != 0x0) {
+    if (uint16_t(this->featureset_ >> 12) == 0x1) {
+      // ID matching a different sensor: SGPC3
+      this->error_code_ = UNSUPPORTED_ID;
+    } else {
+      // Unknown ID
+      this->error_code_ = INVALID_ID;
+    }
+    this->mark_failed();
+    return;
+  }
+  ESP_LOGD(TAG, "Product version: 0x%0X", uint16_t(this->featureset_ & 0x1FF));
+
+  // Sensor initialization
+  if (!this->write_command_(SGP30_CMD_IAQ_INIT)) {
+    ESP_LOGE(TAG, "Sensor sgp30_iaq_init failed.");
+    this->error_code_ = MEASUREMENT_INIT_FAILED;
+    this->mark_failed();
+    return;
+  }
+
+  // Sensor baseline reliability timer
+  if (this->baseline_ > 0) {
+    this->required_warm_up_time_ = IAQ_BASELINE_WARM_UP_SECONDS_WITH_BASELINE_PROVIDED;
+    this->write_iaq_baseline_(this->baseline_);
+  } else {
+    this->required_warm_up_time_ = IAQ_BASELINE_WARM_UP_SECONDS_WITHOUT_BASELINE;
+  }
+}
+
+bool SGP30Component::is_sensor_baseline_reliable_() {
+  if ((this->required_warm_up_time_ == 0) || (std::floor(millis() / 1000) >= this->required_warm_up_time_)) {
+    // requirement for warm up is removed once the millis uptime surpasses the required warm_up_time
+    // this avoids the repetitive warm up when the millis uptime is rolled over every ~40 days
+    this->required_warm_up_time_ = 0;
+    return true;
+  }
+  return false;
+}
+
+void SGP30Component::read_iaq_baseline_() {
+  if (this->is_sensor_baseline_reliable_()) {
+    if (!this->write_command_(SGP30_CMD_GET_IAQ_BASELINE)) {
+      ESP_LOGD(TAG, "Error getting baseline");
+      this->status_set_warning();
+      return;
+    }
+    this->set_timeout(50, [this]() {
+      uint16_t raw_data[2];
+      if (!this->read_data_(raw_data, 2)) {
+        this->status_set_warning();
+        return;
+      }
+
+      uint8_t eco2baseline = (raw_data[0]);
+      uint8_t tvocbaseline = (raw_data[1]);
+
+      ESP_LOGI(TAG, "Current eCO2 & TVOC baseline: 0x%04X", uint16_t((eco2baseline << 8) | (tvocbaseline & 0xFF)));
+      this->status_clear_warning();
+    });
+  } else {
+    ESP_LOGD(TAG, "Baseline reading not available for: %.0fs",
+             (this->required_warm_up_time_ - std::floor(millis() / 1000)));
+  }
+}
+
+void SGP30Component::send_env_data_() {
+  if (this->humidity_sensor_ == nullptr && this->temperature_sensor_ == nullptr)
+    return;
+  float humidity = NAN;
+  if (this->humidity_sensor_ != nullptr)
+    humidity = this->humidity_sensor_->state;
+  if (isnan(humidity) || humidity < 0.0f || humidity > 100.0f) {
+    ESP_LOGW(TAG, "Compensation not possible yet: bad humidity data.");
+    return;
+  } else {
+    ESP_LOGD(TAG, "External compensation data received: Humidity %0.2f%%", humidity);
+  }
+  float temperature = NAN;
+  if (this->temperature_sensor_ != nullptr) {
+    temperature = float(this->temperature_sensor_->state);
+  }
+  if (isnan(temperature) || temperature < -40.0f || temperature > 85.0f) {
+    ESP_LOGW(TAG, "Compensation not possible yet: bad temperature value data.");
+    return;
+  } else {
+    ESP_LOGD(TAG, "External compensation data received: Temperature %0.2f°C", temperature);
+  }
+
+  float absolute_humidity =
+      216.7f * (((humidity / 100) * 6.112f * std::exp((17.62f * temperature) / (243.12f + temperature))) /
+                (273.15f + temperature));
+  uint8_t humidity_full = uint8_t(std::floor(absolute_humidity));
+  uint8_t humidity_dec = uint8_t(std::floor((absolute_humidity - std::floor(absolute_humidity)) * 256));
+  ESP_LOGD(TAG, "Calculated Absolute humidity: %0.3f g/m³ (0x%04X)", absolute_humidity,
+           uint16_t(uint16_t(humidity_full) << 8 | uint16_t(humidity_dec)));
+  uint8_t crc = sht_crc_(humidity_full, humidity_dec);
+  uint8_t data[4];
+  data[0] = SGP30_CMD_SET_ABSOLUTE_HUMIDITY & 0xFF;
+  data[1] = humidity_full;
+  data[2] = humidity_dec;
+  data[3] = crc;
+  if (!this->write_bytes(SGP30_CMD_SET_ABSOLUTE_HUMIDITY >> 8, data, 4)) {
+    ESP_LOGE(TAG, "Error sending compensation data.");
+  }
+}
+
+void SGP30Component::write_iaq_baseline_(uint16_t baseline) {
+  uint8_t e_c_o2_baseline = baseline >> 8;
+  uint8_t tvoc_baseline = baseline & 0xFF;
+  uint8_t data[4];
+  data[0] = SGP30_CMD_SET_IAQ_BASELINE & 0xFF;
+  data[1] = e_c_o2_baseline;
+  data[2] = tvoc_baseline;
+  data[3] = sht_crc_(e_c_o2_baseline, tvoc_baseline);
+  if (!this->write_bytes(SGP30_CMD_SET_IAQ_BASELINE >> 8, data, 4)) {
+    ESP_LOGE(TAG, "Error applying baseline: 0x%04X", baseline);
+  } else
+    ESP_LOGI(TAG, "Initial baseline 0x%04X applied successfully!", baseline);
+}
+
+void SGP30Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "SGP30:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    switch (this->error_code_) {
+      case COMMUNICATION_FAILED:
+        ESP_LOGW(TAG, "Communication failed! Is the sensor connected?");
+        break;
+      case MEASUREMENT_INIT_FAILED:
+        ESP_LOGW(TAG, "Measurement Initialization failed!");
+        break;
+      case INVALID_ID:
+        ESP_LOGW(TAG, "Sensor reported an invalid ID. Is this an SGP30?");
+        break;
+      case UNSUPPORTED_ID:
+        ESP_LOGW(TAG, "Sensor reported an unsupported ID (SGPC3).");
+        break;
+      default:
+        ESP_LOGW(TAG, "Unknown setup error!");
+        break;
+    }
+  } else {
+    ESP_LOGCONFIG(TAG, "  Serial number: %llu", this->serial_number_);
+    ESP_LOGCONFIG(TAG, "  Baseline: 0x%04X%s", this->baseline_,
+                  ((this->baseline_ != 0x0000) ? " (enabled)" : " (disabled)"));
+    ESP_LOGCONFIG(TAG, "  Warm up time: %lds", this->required_warm_up_time_);
+  }
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "eCO2", this->eco2_sensor_);
+  LOG_SENSOR("  ", "TVOC", this->tvoc_sensor_);
+  if (this->humidity_sensor_ != nullptr && this->temperature_sensor_ != nullptr) {
+    ESP_LOGCONFIG(TAG, "  Compensation:");
+    LOG_SENSOR("    ", "Temperature Source:", this->temperature_sensor_);
+    LOG_SENSOR("    ", "Humidity Source:", this->humidity_sensor_);
+  } else {
+    ESP_LOGCONFIG(TAG, "  Compensation: No source configured");
+  }
+}
+
+void SGP30Component::update() {
+  if (!this->write_command_(SGP30_CMD_MEASURE_IAQ)) {
+    this->status_set_warning();
+    return;
+  }
+
+  this->set_timeout(50, [this]() {
+    uint16_t raw_data[2];
+    if (!this->read_data_(raw_data, 2)) {
+      this->status_set_warning();
+      return;
+    }
+
+    float eco2 = (raw_data[0]);
+    float tvoc = (raw_data[1]);
+
+    ESP_LOGD(TAG, "Got eCO2=%.1fppm TVOC=%.1fppb", eco2, tvoc);
+    if (this->eco2_sensor_ != nullptr)
+      this->eco2_sensor_->publish_state(eco2);
+    if (this->tvoc_sensor_ != nullptr)
+      this->tvoc_sensor_->publish_state(tvoc);
+    this->status_clear_warning();
+    this->send_env_data_();
+    this->read_iaq_baseline_();
+  });
+}
+
+bool SGP30Component::write_command_(uint16_t command) {
+  // Warning ugly, trick the I2Ccomponent base by setting register to the first 8 bit.
+  return this->write_byte(command >> 8, command & 0xFF);
+}
+
+uint8_t SGP30Component::sht_crc_(uint8_t data1, uint8_t data2) {
+  uint8_t bit;
+  uint8_t crc = 0xFF;
+
+  crc ^= data1;
+  for (bit = 8; bit > 0; --bit) {
+    if (crc & 0x80)
+      crc = (crc << 1) ^ 0x131;
+    else
+      crc = (crc << 1);
+  }
+
+  crc ^= data2;
+  for (bit = 8; bit > 0; --bit) {
+    if (crc & 0x80)
+      crc = (crc << 1) ^ 0x131;
+    else
+      crc = (crc << 1);
+  }
+
+  return crc;
+}
+
+bool SGP30Component::read_data_(uint16_t *data, uint8_t len) {
+  const uint8_t num_bytes = len * 3;
+  auto *buf = new uint8_t[num_bytes];
+
+  if (!this->parent_->raw_receive(this->address_, buf, num_bytes)) {
+    delete[](buf);
+    return false;
+  }
+
+  for (uint8_t i = 0; i < len; i++) {
+    const uint8_t j = 3 * i;
+    uint8_t crc = sht_crc_(buf[j], buf[j + 1]);
+    if (crc != buf[j + 2]) {
+      ESP_LOGE(TAG, "CRC8 Checksum invalid! 0x%02X != 0x%02X", buf[j + 2], crc);
+      delete[](buf);
+      return false;
+    }
+    data[i] = (buf[j] << 8) | buf[j + 1];
+  }
+
+  delete[](buf);
+  return true;
+}
+
+}  // namespace sgp30
+}  // namespace esphome
diff --git a/esphome/components/sgp30/sgp30.h b/esphome/components/sgp30/sgp30.h
new file mode 100644
index 0000000000..2362d1bca6
--- /dev/null
+++ b/esphome/components/sgp30/sgp30.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+#include <cmath>
+
+namespace esphome {
+namespace sgp30 {
+
+/// This class implements support for the Sensirion SGP30 i2c GAS (VOC and CO2eq) sensors.
+class SGP30Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void set_eco2_sensor(sensor::Sensor *eco2) { eco2_sensor_ = eco2; }
+  void set_tvoc_sensor(sensor::Sensor *tvoc) { tvoc_sensor_ = tvoc; }
+  void set_baseline(uint16_t baseline) { baseline_ = baseline; }
+  void set_humidity_sensor(sensor::Sensor *humidity) { humidity_sensor_ = humidity; }
+  void set_temperature_sensor(sensor::Sensor *temperature) { temperature_sensor_ = temperature; }
+
+  void setup() override;
+  void update() override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+ protected:
+  bool write_command_(uint16_t command);
+  bool read_data_(uint16_t *data, uint8_t len);
+  void send_env_data_();
+  void read_iaq_baseline_();
+  bool is_sensor_baseline_reliable_();
+  void write_iaq_baseline_(uint16_t baseline);
+  uint8_t sht_crc_(uint8_t data1, uint8_t data2);
+  uint64_t serial_number_;
+  uint16_t featureset_;
+  long required_warm_up_time_;
+
+  enum ErrorCode {
+    COMMUNICATION_FAILED,
+    MEASUREMENT_INIT_FAILED,
+    INVALID_ID,
+    UNSUPPORTED_ID,
+    UNKNOWN
+  } error_code_{UNKNOWN};
+
+  sensor::Sensor *eco2_sensor_{nullptr};
+  sensor::Sensor *tvoc_sensor_{nullptr};
+  uint16_t baseline_{0x0000};
+  /// Input sensor for humidity and temperature compensation.
+  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_{nullptr};
+};
+
+}  // namespace sgp30
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 686ff027e0..913fb6d549 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -531,6 +531,15 @@ sensor:
       name: "Living Room Humidity 9"
     address: 0x61
     update_interval: 15s
+  - platform: sgp30
+    eco2:
+      name: "Workshop eCO2"
+      accuracy_decimals: 1
+    tvoc:
+      name: "Workshop TVOC"
+      accuracy_decimals: 1
+    address: 0x58
+    update_interval: 5s
   - platform: template
     name: "Template Sensor"
     id: template_sensor

From 7063aa60093c68ae0f62a22e45dea9ee174cb44c Mon Sep 17 00:00:00 2001
From: Nad <15346053+valordk@users.noreply.github.com>
Date: Sat, 19 Oct 2019 21:31:27 +0200
Subject: [PATCH 006/412] Add support for SHTCx Temperature sensors (#676)

* Add support for Sensirion STS3x Temperature sensors

* Removed humidty reading from STS3x sensor

* Fixed line error and operand error

* Fixed syntax

* Add test snippet for STS3x sensor

* Clean up

* Add support for Sensirion SHTC1 and SHTC3 Temperature sensors

* Fixed the test

* Fix lint issues

* Update esphome/components/shtcx/shtcx.cpp

Good point.

Co-Authored-By: Otto Winter <otto@otto-winter.com>

* Refactored device type identification and logging

* Refactoring and cleanup

* Remove sts3x


Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/shtcx/__init__.py |   0
 esphome/components/shtcx/sensor.py   |  32 ++++++
 esphome/components/shtcx/shtcx.cpp   | 166 +++++++++++++++++++++++++++
 esphome/components/shtcx/shtcx.h     |  35 ++++++
 tests/test1.yaml                     |   7 ++
 5 files changed, 240 insertions(+)
 create mode 100644 esphome/components/shtcx/__init__.py
 create mode 100644 esphome/components/shtcx/sensor.py
 create mode 100644 esphome/components/shtcx/shtcx.cpp
 create mode 100644 esphome/components/shtcx/shtcx.h

diff --git a/esphome/components/shtcx/__init__.py b/esphome/components/shtcx/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/shtcx/sensor.py b/esphome/components/shtcx/sensor.py
new file mode 100644
index 0000000000..eb215078e7
--- /dev/null
+++ b/esphome/components/shtcx/sensor.py
@@ -0,0 +1,32 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_TEMPERATURE, ICON_WATER_PERCENT, \
+    ICON_THERMOMETER, UNIT_CELSIUS, UNIT_PERCENT
+
+DEPENDENCIES = ['i2c']
+
+shtcx_ns = cg.esphome_ns.namespace('shtcx')
+SHTCXComponent = shtcx_ns.class_('SHTCXComponent', cg.PollingComponent, i2c.I2CDevice)
+
+SHTCXType = shtcx_ns.enum('SHTCXType')
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(SHTCXComponent),
+    cv.Required(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
+    cv.Required(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 1),
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x70))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield i2c.register_i2c_device(var, config)
+
+    if CONF_TEMPERATURE in config:
+        sens = yield sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature_sensor(sens))
+
+    if CONF_HUMIDITY in config:
+        sens = yield sensor.new_sensor(config[CONF_HUMIDITY])
+        cg.add(var.set_humidity_sensor(sens))
diff --git a/esphome/components/shtcx/shtcx.cpp b/esphome/components/shtcx/shtcx.cpp
new file mode 100644
index 0000000000..d52bdb1257
--- /dev/null
+++ b/esphome/components/shtcx/shtcx.cpp
@@ -0,0 +1,166 @@
+#include "shtcx.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace shtcx {
+
+static const char *TAG = "shtcx";
+
+static const uint16_t SHTCX_COMMAND_SLEEP = 0xB098;
+static const uint16_t SHTCX_COMMAND_WAKEUP = 0x3517;
+static const uint16_t SHTCX_COMMAND_READ_ID_REGISTER = 0xEFC8;
+static const uint16_t SHTCX_COMMAND_SOFT_RESET = 0x805D;
+static const uint16_t SHTCX_COMMAND_POLLING_H = 0x7866;
+
+inline const char* to_string(SHTCXType type) {
+  switch (type) {
+    case SHTCX_TYPE_SHTC3:
+      return "SHTC3";
+    case SHTCX_TYPE_SHTC1:
+      return "SHTC1";
+    default:
+      return "[Unknown model]";
+  }
+}
+
+void SHTCXComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up SHTCx...");
+  this->soft_reset();
+
+  if (!this->write_command_(SHTCX_COMMAND_READ_ID_REGISTER)) {
+    ESP_LOGE(TAG, "Error requesting Device ID");
+    this->mark_failed();
+    return;
+  }
+
+  uint16_t device_id_register[1];
+  if (!this->read_data_(device_id_register, 1)) {
+    ESP_LOGE(TAG, "Error reading Device ID");
+    this->mark_failed();
+    return;
+  }
+
+  if (((device_id_register[0] << 2) & 0x1C) == 0x1C) {
+    if ((device_id_register[0] & 0x847) == 0x847) {
+      this->type_ = SHTCX_TYPE_SHTC3;
+    } else {
+      this->type_ = SHTCX_TYPE_SHTC1;
+    }
+  } else {
+    this->type_ = SHTCX_TYPE_UNKNOWN;
+  }
+  ESP_LOGCONFIG(TAG, "  Device identified: %s", to_string(this->type_));
+}
+void SHTCXComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "SHTCx:");
+  ESP_LOGCONFIG(TAG, "  Model: %s", to_string(this->type_));
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with SHTCx failed!");
+  }
+  LOG_UPDATE_INTERVAL(this);
+
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
+}
+float SHTCXComponent::get_setup_priority() const { return setup_priority::DATA; }
+void SHTCXComponent::update() {
+  if (this->status_has_warning()) {
+    ESP_LOGW(TAG, "Retrying to reconnect the sensor.");
+    this->soft_reset();
+  }
+  if (this->type_ != SHTCX_TYPE_SHTC1) {
+    this->wake_up();
+  }
+  if (!this->write_command_(SHTCX_COMMAND_POLLING_H)) {
+    this->status_set_warning();
+    return;
+  }
+
+  this->set_timeout(50, [this]() {
+    uint16_t raw_data[2];
+    if (!this->read_data_(raw_data, 2)) {
+      this->status_set_warning();
+      return;
+    }
+
+    float temperature = 175.0f * float(raw_data[0]) / 65536.0f - 45.0f;
+    float humidity = 100.0f * float(raw_data[1]) / 65536.0f;
+
+    ESP_LOGD(TAG, "Got temperature=%.2f°C humidity=%.2f%%", temperature, humidity);
+    if (this->temperature_sensor_ != nullptr)
+      this->temperature_sensor_->publish_state(temperature);
+    if (this->humidity_sensor_ != nullptr)
+      this->humidity_sensor_->publish_state(humidity);
+    this->status_clear_warning();
+    if (this->type_ != SHTCX_TYPE_SHTC1) {
+      this->sleep();
+    }
+  });
+}
+
+bool SHTCXComponent::write_command_(uint16_t command) {
+  // Warning ugly, trick the I2Ccomponent base by setting register to the first 8 bit.
+  return this->write_byte(command >> 8, command & 0xFF);
+}
+
+uint8_t sht_crc(uint8_t data1, uint8_t data2) {
+  uint8_t bit;
+  uint8_t crc = 0xFF;
+
+  crc ^= data1;
+  for (bit = 8; bit > 0; --bit) {
+    if (crc & 0x80)
+      crc = (crc << 1) ^ 0x131;
+    else
+      crc = (crc << 1);
+  }
+
+  crc ^= data2;
+  for (bit = 8; bit > 0; --bit) {
+    if (crc & 0x80)
+      crc = (crc << 1) ^ 0x131;
+    else
+      crc = (crc << 1);
+  }
+
+  return crc;
+}
+
+bool SHTCXComponent::read_data_(uint16_t *data, uint8_t len) {
+  const uint8_t num_bytes = len * 3;
+  auto *buf = new uint8_t[num_bytes];
+
+  if (!this->parent_->raw_receive(this->address_, buf, num_bytes)) {
+    delete[](buf);
+    return false;
+  }
+
+  for (uint8_t i = 0; i < len; i++) {
+    const uint8_t j = 3 * i;
+    uint8_t crc = sht_crc(buf[j], buf[j + 1]);
+    if (crc != buf[j + 2]) {
+      ESP_LOGE(TAG, "CRC8 Checksum invalid! 0x%02X != 0x%02X", buf[j + 2], crc);
+      delete[](buf);
+      return false;
+    }
+    data[i] = (buf[j] << 8) | buf[j + 1];
+  }
+
+  delete[](buf);
+  return true;
+}
+
+void SHTCXComponent::soft_reset() {
+  this->write_command_(SHTCX_COMMAND_SOFT_RESET);
+  delayMicroseconds(200);
+}
+void SHTCXComponent::sleep() { this->write_command_(SHTCX_COMMAND_SLEEP); }
+
+void SHTCXComponent::wake_up() {
+  this->write_command_(SHTCX_COMMAND_WAKEUP);
+  delayMicroseconds(200);
+}
+
+}  // namespace shtcx
+}  // namespace esphome
diff --git a/esphome/components/shtcx/shtcx.h b/esphome/components/shtcx/shtcx.h
new file mode 100644
index 0000000000..ccc6533bfa
--- /dev/null
+++ b/esphome/components/shtcx/shtcx.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace shtcx {
+
+enum SHTCXType { SHTCX_TYPE_SHTC3 = 0, SHTCX_TYPE_SHTC1, SHTCX_TYPE_UNKNOWN };
+
+/// This class implements support for the SHT3x-DIS family of temperature+humidity i2c sensors.
+class SHTCXComponent : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
+  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { humidity_sensor_ = humidity_sensor; }
+
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+  void soft_reset();
+  void sleep();
+  void wake_up();
+
+ protected:
+  bool write_command_(uint16_t command);
+  bool read_data_(uint16_t *data, uint8_t len);
+  SHTCXType type_;
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *humidity_sensor_;
+};
+
+}  // namespace shtcx
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 913fb6d549..19dc00aa88 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -540,6 +540,13 @@ sensor:
       accuracy_decimals: 1
     address: 0x58
     update_interval: 5s
+  - platform: shtcx
+      temperature:
+        name: "Living Room Temperature 10"
+      humidity:
+        name: "Living Room Humidity 10"
+      address: 0x70
+      update_interval: 15s
   - platform: template
     name: "Template Sensor"
     id: template_sensor

From 18426b71e46e6267046210a8e08ddc9c22d96c51 Mon Sep 17 00:00:00 2001
From: Nad <15346053+valordk@users.noreply.github.com>
Date: Sat, 19 Oct 2019 21:31:37 +0200
Subject: [PATCH 007/412] Add support for STS3x Temperature sensors (#669)

* Add support for Sensirion STS3x Temperature sensors

* Removed humidty reading from STS3x sensor

* Fixed line error and operand error

* Fixed syntax

* Add test snippet for STS3x sensor

* Clean up

* #550 Proactive fix for STS3x component reporting WARNING status and reinitialzing similar to SHT3xd

* Flattened config.

* Fixed missing temperature unit

* Code formatting

* Added marking for future commands

* Cleanup

* Removed whitespace

* Cleanup

* Cleanup
---
 esphome/components/sts3x/__init__.py |   0
 esphome/components/sts3x/sensor.py   |  22 +++++
 esphome/components/sts3x/sts3x.cpp   | 123 +++++++++++++++++++++++++++
 esphome/components/sts3x/sts3x.h     |  24 ++++++
 tests/test1.yaml                     |   3 +
 5 files changed, 172 insertions(+)
 create mode 100644 esphome/components/sts3x/__init__.py
 create mode 100644 esphome/components/sts3x/sensor.py
 create mode 100644 esphome/components/sts3x/sts3x.cpp
 create mode 100644 esphome/components/sts3x/sts3x.h

diff --git a/esphome/components/sts3x/__init__.py b/esphome/components/sts3x/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/sts3x/sensor.py b/esphome/components/sts3x/sensor.py
new file mode 100644
index 0000000000..f48deeeae5
--- /dev/null
+++ b/esphome/components/sts3x/sensor.py
@@ -0,0 +1,22 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import CONF_ID, ICON_THERMOMETER, UNIT_CELSIUS
+
+DEPENDENCIES = ['i2c']
+
+sts3x_ns = cg.esphome_ns.namespace('sts3x')
+
+STS3XComponent = sts3x_ns.class_('STS3XComponent', sensor.Sensor,
+                                 cg.PollingComponent, i2c.I2CDevice)
+
+CONFIG_SCHEMA = sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1).extend({
+    cv.GenerateID(): cv.declare_id(STS3XComponent),
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x4A))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield sensor.register_sensor(var, config)
+    yield i2c.register_i2c_device(var, config)
diff --git a/esphome/components/sts3x/sts3x.cpp b/esphome/components/sts3x/sts3x.cpp
new file mode 100644
index 0000000000..1a24a17caf
--- /dev/null
+++ b/esphome/components/sts3x/sts3x.cpp
@@ -0,0 +1,123 @@
+#include "sts3x.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sts3x {
+
+static const char *TAG = "sts3x";
+
+static const uint16_t STS3X_COMMAND_READ_SERIAL_NUMBER = 0x3780;
+static const uint16_t STS3X_COMMAND_READ_STATUS = 0xF32D;
+static const uint16_t STS3X_COMMAND_SOFT_RESET = 0x30A2;
+static const uint16_t STS3X_COMMAND_POLLING_H = 0x2400;
+
+/// Commands for future use
+static const uint16_t STS3X_COMMAND_CLEAR_STATUS = 0x3041;
+static const uint16_t STS3X_COMMAND_HEATER_ENABLE = 0x306D;
+static const uint16_t STS3X_COMMAND_HEATER_DISABLE = 0x3066;
+static const uint16_t STS3X_COMMAND_FETCH_DATA = 0xE000;
+
+void STS3XComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up STS3x...");
+  if (!this->write_command_(STS3X_COMMAND_READ_SERIAL_NUMBER)) {
+    this->mark_failed();
+    return;
+  }
+
+  uint16_t raw_serial_number[2];
+  if (!this->read_data_(raw_serial_number, 1)) {
+    this->mark_failed();
+    return;
+  }
+  uint32_t serial_number = (uint32_t(raw_serial_number[0]) << 16);
+  ESP_LOGV(TAG, "    Serial Number: 0x%08X", serial_number);
+}
+void STS3XComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "STS3x:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with ST3x failed!");
+  }
+  LOG_UPDATE_INTERVAL(this);
+
+  LOG_SENSOR("  ", "STS3x", this);
+}
+float STS3XComponent::get_setup_priority() const { return setup_priority::DATA; }
+void STS3XComponent::update() {
+  if (this->status_has_warning()) {
+    ESP_LOGD(TAG, "Retrying to reconnect the sensor.");
+    this->write_command_(STS3X_COMMAND_SOFT_RESET);
+  }
+  if (!this->write_command_(STS3X_COMMAND_POLLING_H)) {
+    this->status_set_warning();
+    return;
+  }
+
+  this->set_timeout(50, [this]() {
+    uint16_t raw_data[1];
+    if (!this->read_data_(raw_data, 1)) {
+      this->status_set_warning();
+      return;
+    }
+
+    float temperature = 175.0f * float(raw_data[0]) / 65535.0f - 45.0f;
+    ESP_LOGD(TAG, "Got temperature=%.2f°C", temperature);
+    this->publish_state(temperature);
+    this->status_clear_warning();
+  });
+}
+
+bool STS3XComponent::write_command_(uint16_t command) {
+  // Warning ugly, trick the I2Ccomponent base by setting register to the first 8 bit.
+  return this->write_byte(command >> 8, command & 0xFF);
+}
+
+uint8_t sts3x_crc(uint8_t data1, uint8_t data2) {
+  uint8_t bit;
+  uint8_t crc = 0xFF;
+
+  crc ^= data1;
+  for (bit = 8; bit > 0; --bit) {
+    if (crc & 0x80)
+      crc = (crc << 1) ^ 0x131;
+    else
+      crc = (crc << 1);
+  }
+
+  crc ^= data2;
+  for (bit = 8; bit > 0; --bit) {
+    if (crc & 0x80)
+      crc = (crc << 1) ^ 0x131;
+    else
+      crc = (crc << 1);
+  }
+
+  return crc;
+}
+
+bool STS3XComponent::read_data_(uint16_t *data, uint8_t len) {
+  const uint8_t num_bytes = len * 3;
+  auto *buf = new uint8_t[num_bytes];
+
+  if (!this->parent_->raw_receive(this->address_, buf, num_bytes)) {
+    delete[](buf);
+    return false;
+  }
+
+  for (uint8_t i = 0; i < len; i++) {
+    const uint8_t j = 3 * i;
+    uint8_t crc = sts3x_crc(buf[j], buf[j + 1]);
+    if (crc != buf[j + 2]) {
+      ESP_LOGE(TAG, "CRC8 Checksum invalid! 0x%02X != 0x%02X", buf[j + 2], crc);
+      delete[](buf);
+      return false;
+    }
+    data[i] = (buf[j] << 8) | buf[j + 1];
+  }
+
+  delete[](buf);
+  return true;
+}
+
+}  // namespace sts3x
+}  // namespace esphome
diff --git a/esphome/components/sts3x/sts3x.h b/esphome/components/sts3x/sts3x.h
new file mode 100644
index 0000000000..436cf938d8
--- /dev/null
+++ b/esphome/components/sts3x/sts3x.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace sts3x {
+
+/// This class implements support for the ST3x-DIS family of temperature i2c sensors.
+class STS3XComponent : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+
+ protected:
+  bool write_command_(uint16_t command);
+  bool read_data_(uint16_t *data, uint8_t len);
+};
+
+}  // namespace sts3x
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 19dc00aa88..2cdbbe8cff 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -522,6 +522,9 @@ sensor:
       name: "Living Room Humidity 8"
     address: 0x44
     update_interval: 15s
+  - platform: sts3x
+    name: "Living Room Temperature 9"
+    address: 0x4A
   - platform: scd30
     co2:
       name: "Living Room CO2 9"

From af15a4e71053f9bbe38a5686b632f5a8b1e964e6 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sat, 19 Oct 2019 16:37:05 -0300
Subject: [PATCH 008/412] Add dfplayer mini component (#655)

* Add dfplayer mini component

* receiving some data

* implemented many actions

* lint

* undo homeassistant_time.h

* Update esphome/components/dfplayer/__init__.py

Co-Authored-By: Otto Winter <otto@otto-winter.com>

* Update esphome/components/dfplayer/dfplayer.cpp

Co-Authored-By: Otto Winter <otto@otto-winter.com>

* add set device. fixes

* lint

* Fixes and sync with docs

* add test

* lint

* lint

* lint
---
 esphome/components/dfplayer/__init__.py  | 221 +++++++++++++++++++++++
 esphome/components/dfplayer/dfplayer.cpp | 120 ++++++++++++
 esphome/components/dfplayer/dfplayer.h   | 165 +++++++++++++++++
 tests/test3.yaml                         |  87 +++++++++
 4 files changed, 593 insertions(+)
 create mode 100644 esphome/components/dfplayer/__init__.py
 create mode 100644 esphome/components/dfplayer/dfplayer.cpp
 create mode 100644 esphome/components/dfplayer/dfplayer.h

diff --git a/esphome/components/dfplayer/__init__.py b/esphome/components/dfplayer/__init__.py
new file mode 100644
index 0000000000..78bcfa80f4
--- /dev/null
+++ b/esphome/components/dfplayer/__init__.py
@@ -0,0 +1,221 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.const import CONF_ID, CONF_TRIGGER_ID
+from esphome.components import uart
+
+DEPENDENCIES = ['uart']
+
+dfplayer_ns = cg.esphome_ns.namespace('dfplayer')
+DFPlayer = dfplayer_ns.class_('DFPlayer', cg.Component)
+DFPlayerFinishedPlaybackTrigger = dfplayer_ns.class_('DFPlayerFinishedPlaybackTrigger',
+                                                     automation.Trigger.template())
+DFPlayerIsPlayingCondition = dfplayer_ns.class_('DFPlayerIsPlayingCondition', automation.Condition)
+
+MULTI_CONF = True
+CONF_FOLDER = 'folder'
+CONF_FILE = 'file'
+CONF_LOOP = 'loop'
+CONF_VOLUME = 'volume'
+CONF_DEVICE = 'device'
+CONF_EQ_PRESET = 'eq_preset'
+CONF_ON_FINISHED_PLAYBACK = 'on_finished_playback'
+
+EqPreset = dfplayer_ns.enum("EqPreset")
+EQ_PRESET = {
+    'NORMAL': EqPreset.NORMAL,
+    'POP': EqPreset.POP,
+    'ROCK': EqPreset.ROCK,
+    'JAZZ': EqPreset.JAZZ,
+    'CLASSIC': EqPreset.CLASSIC,
+    'BASS': EqPreset.BASS,
+}
+Device = dfplayer_ns.enum("Device")
+DEVICE = {
+    'USB': Device.USB,
+    'TF_CARD': Device.TF_CARD,
+}
+
+NextAction = dfplayer_ns.class_('NextAction', automation.Action)
+PreviousAction = dfplayer_ns.class_('PreviousAction', automation.Action)
+PlayFileAction = dfplayer_ns.class_('PlayFileAction', automation.Action)
+PlayFolderAction = dfplayer_ns.class_('PlayFolderAction', automation.Action)
+SetVolumeAction = dfplayer_ns.class_('SetVolumeAction', automation.Action)
+SetEqAction = dfplayer_ns.class_('SetEqAction', automation.Action)
+SleepAction = dfplayer_ns.class_('SleepAction', automation.Action)
+ResetAction = dfplayer_ns.class_('ResetAction', automation.Action)
+StartAction = dfplayer_ns.class_('StartAction', automation.Action)
+PauseAction = dfplayer_ns.class_('PauseAction', automation.Action)
+StopAction = dfplayer_ns.class_('StopAction', automation.Action)
+RandomAction = dfplayer_ns.class_('RandomAction', automation.Action)
+SetDeviceAction = dfplayer_ns.class_('SetDeviceAction', automation.Action)
+
+CONFIG_SCHEMA = cv.All(cv.Schema({
+    cv.GenerateID(): cv.declare_id(DFPlayer),
+    cv.Optional(CONF_ON_FINISHED_PLAYBACK): automation.validate_automation({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DFPlayerFinishedPlaybackTrigger),
+    }),
+}).extend(uart.UART_DEVICE_SCHEMA))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield uart.register_uart_device(var, config)
+
+    for conf in config.get(CONF_ON_FINISHED_PLAYBACK, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        yield automation.build_automation(trigger, [], conf)
+
+
+@automation.register_action('dfplayer.play_next', NextAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+}))
+def dfplayer_next_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_action('dfplayer.play_previous', PreviousAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+}))
+def dfplayer_previous_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_action('dfplayer.play', PlayFileAction, cv.maybe_simple_value({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+    cv.Required(CONF_FILE): cv.templatable(cv.int_),
+    cv.Optional(CONF_LOOP): cv.templatable(cv.boolean),
+}, key=CONF_FILE))
+def dfplayer_play_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    template_ = yield cg.templatable(config[CONF_FILE], args, float)
+    cg.add(var.set_file(template_))
+    if CONF_LOOP in config:
+        template_ = yield cg.templatable(config[CONF_LOOP], args, float)
+        cg.add(var.set_loop(template_))
+    yield var
+
+
+@automation.register_action('dfplayer.play_folder', PlayFolderAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+    cv.Required(CONF_FOLDER): cv.templatable(cv.int_),
+    cv.Optional(CONF_FILE): cv.templatable(cv.int_),
+    cv.Optional(CONF_LOOP): cv.templatable(cv.boolean),
+}))
+def dfplayer_play_folder_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    template_ = yield cg.templatable(config[CONF_FOLDER], args, float)
+    cg.add(var.set_folder(template_))
+    if CONF_FILE in config:
+        template_ = yield cg.templatable(config[CONF_FILE], args, float)
+        cg.add(var.set_file(template_))
+    if CONF_LOOP in config:
+        template_ = yield cg.templatable(config[CONF_LOOP], args, float)
+        cg.add(var.set_loop(template_))
+    yield var
+
+
+@automation.register_action('dfplayer.set_device', SetDeviceAction, cv.maybe_simple_value({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+    cv.Required(CONF_DEVICE): cv.enum(DEVICE, upper=True),
+}, key=CONF_DEVICE))
+def dfplayer_set_device_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    template_ = yield cg.templatable(config[CONF_DEVICE], args, Device)
+    cg.add(var.set_device(template_))
+    yield var
+
+
+@automation.register_action('dfplayer.set_volume', SetVolumeAction, cv.maybe_simple_value({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+    cv.Required(CONF_VOLUME): cv.templatable(cv.int_),
+}, key=CONF_VOLUME))
+def dfplayer_set_volume_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    template_ = yield cg.templatable(config[CONF_VOLUME], args, float)
+    cg.add(var.set_volume(template_))
+    yield var
+
+
+@automation.register_action('dfplayer.set_eq', SetEqAction, cv.maybe_simple_value({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+    cv.Required(CONF_EQ_PRESET): cv.templatable(cv.enum(EQ_PRESET, upper=True)),
+}, key=CONF_EQ_PRESET))
+def dfplayer_set_eq_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    template_ = yield cg.templatable(config[CONF_EQ_PRESET], args, EqPreset)
+    cg.add(var.set_eq(template_))
+    yield var
+
+
+@automation.register_action('dfplayer.sleep', SleepAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+}))
+def dfplayer_sleep_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_action('dfplayer.reset', ResetAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+}))
+def dfplayer_reset_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_action('dfplayer.start', StartAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+}))
+def dfplayer_start_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_action('dfplayer.pause', PauseAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+}))
+def dfplayer_pause_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_action('dfplayer.stop', StopAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+}))
+def dfplayer_stop_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_action('dfplayer.random', RandomAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+}))
+def dfplayer_random_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_condition('dfplayer.is_playing', DFPlayerIsPlayingCondition, cv.Schema({
+    cv.GenerateID(): cv.use_id(DFPlayer),
+}))
+def dfplyaer_is_playing_to_code(config, condition_id, template_arg, args):
+    var = cg.new_Pvariable(condition_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
diff --git a/esphome/components/dfplayer/dfplayer.cpp b/esphome/components/dfplayer/dfplayer.cpp
new file mode 100644
index 0000000000..9589a907c4
--- /dev/null
+++ b/esphome/components/dfplayer/dfplayer.cpp
@@ -0,0 +1,120 @@
+#include "dfplayer.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace dfplayer {
+
+static const char* TAG = "dfplayer";
+
+void DFPlayer::play_folder(uint16_t folder, uint16_t file) {
+  if (folder < 100 && file < 256) {
+    this->send_cmd_(0x0F, (uint8_t) folder, (uint8_t) file);
+  } else if (folder <= 10 && file <= 1000) {
+    this->send_cmd_(0x14, (((uint16_t) folder) << 12) | file);
+  } else {
+    ESP_LOGE(TAG, "Cannot play folder %d file %d.", folder, file);
+  }
+}
+
+void DFPlayer::send_cmd_(uint8_t cmd, uint16_t argument) {
+  uint8_t buffer[10]{0x7e, 0xff, 0x06, cmd, 0x01, (uint8_t)(argument >> 8), (uint8_t) argument, 0x00, 0x00, 0xef};
+  uint16_t checksum = 0;
+  for (uint8_t i = 1; i < 7; i++)
+    checksum += buffer[i];
+  checksum = -checksum;
+  buffer[7] = checksum >> 8;
+  buffer[8] = (uint8_t) checksum;
+
+  this->sent_cmd_ = cmd;
+
+  ESP_LOGD(TAG, "Send Command %#02x arg %#04x", cmd, argument);
+  this->write_array(buffer, 10);
+}
+
+void DFPlayer::loop() {
+  // Read message
+  while (this->available()) {
+    uint8_t byte;
+    this->read_byte(&byte);
+
+    if (this->read_pos_ == DFPLAYER_READ_BUFFER_LENGTH)
+      this->read_pos_ = 0;
+
+    switch (this->read_pos_) {
+      case 0:  // Start mark
+        if (byte != 0x7E)
+          continue;
+        break;
+      case 1:  // Version
+        if (byte != 0xFF) {
+          ESP_LOGW(TAG, "Expected Version 0xFF, got %#02x", byte);
+          this->read_pos_ = 0;
+          continue;
+        }
+        break;
+      case 2:  // Buffer length
+        if (byte != 0x06) {
+          ESP_LOGW(TAG, "Expected Buffer length 0x06, got %#02x", byte);
+          this->read_pos_ = 0;
+          continue;
+        }
+        break;
+      case 9:  // End byte
+        if (byte != 0xEF) {
+          ESP_LOGW(TAG, "Expected end byte 0xEF, got %#02x", byte);
+          this->read_pos_ = 0;
+          continue;
+        }
+        // Parse valid received command
+        uint8_t cmd = this->read_buffer_[3];
+        uint16_t argument = (this->read_buffer_[5] << 8) | this->read_buffer_[6];
+
+        ESP_LOGV(TAG, "Received message cmd: %#02x arg %#04x", cmd, argument);
+
+        switch (cmd) {
+          case 0x3A:
+            if (argument == 1) {
+              ESP_LOGI(TAG, "USB loaded");
+            } else if (argument == 2)
+              ESP_LOGI(TAG, "TF Card loaded");
+            break;
+          case 0x3B:
+            if (argument == 1) {
+              ESP_LOGI(TAG, "USB unloaded");
+            } else if (argument == 2)
+              ESP_LOGI(TAG, "TF Card unloaded");
+            break;
+          case 0x3F:
+            if (argument == 1) {
+              ESP_LOGI(TAG, "USB available");
+            } else if (argument == 2) {
+              ESP_LOGI(TAG, "TF Card available");
+            } else if (argument == 3) {
+              ESP_LOGI(TAG, "USB, TF Card available");
+            }
+            break;
+          case 0x41:
+            ESP_LOGV(TAG, "Ack ok");
+            this->is_playing_ |= this->ack_set_is_playing_;
+            this->is_playing_ &= !this->ack_reset_is_playing_;
+            this->ack_set_is_playing_ = false;
+            this->ack_reset_is_playing_ = false;
+            break;
+          case 0x3D:  // Playback finished
+            this->is_playing_ = false;
+            this->on_finished_playback_callback_.call();
+            break;
+          default:
+            ESP_LOGD(TAG, "Command %#02x arg %#04x", cmd, argument);
+        }
+        this->sent_cmd_ = 0;
+        this->read_pos_ = 0;
+        continue;
+    }
+    this->read_buffer_[this->read_pos_] = byte;
+    this->read_pos_++;
+  }
+}
+
+}  // namespace dfplayer
+}  // namespace esphome
diff --git a/esphome/components/dfplayer/dfplayer.h b/esphome/components/dfplayer/dfplayer.h
new file mode 100644
index 0000000000..2cb9eea4eb
--- /dev/null
+++ b/esphome/components/dfplayer/dfplayer.h
@@ -0,0 +1,165 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+#include "esphome/core/automation.h"
+
+const size_t DFPLAYER_READ_BUFFER_LENGTH = 25;  // two messages + some extra
+
+namespace esphome {
+namespace dfplayer {
+
+enum EqPreset {
+  NORMAL = 0,
+  POP = 1,
+  ROCK = 2,
+  JAZZ = 3,
+  CLASSIC = 4,
+  BASS = 5,
+};
+
+enum Device {
+  USB = 1,
+  TF_CARD = 2,
+};
+
+class DFPlayer : public uart::UARTDevice, public Component {
+ public:
+  void loop() override;
+
+  void next() { this->send_cmd_(0x01); }
+  void previous() { this->send_cmd_(0x02); }
+  void play_file(uint16_t file) {
+    this->ack_set_is_playing_ = true;
+    this->send_cmd_(0x03, file);
+  }
+  void play_file_loop(uint16_t file) { this->send_cmd_(0x08, file); }
+  void play_folder(uint16_t folder, uint16_t file);
+  void play_folder_loop(uint16_t folder) { this->send_cmd_(0x17, folder); }
+  void volume_up() { this->send_cmd_(0x04); }
+  void volume_down() { this->send_cmd_(0x05); }
+  void set_device(Device device) { this->send_cmd_(0x09, device); }
+  void set_volume(uint8_t volume) { this->send_cmd_(0x06, volume); }
+  void set_eq(EqPreset preset) { this->send_cmd_(0x07, preset); }
+  void sleep() { this->send_cmd_(0x0A); }
+  void reset() { this->send_cmd_(0x0C); }
+  void start() { this->send_cmd_(0x0D); }
+  void pause() {
+    this->ack_reset_is_playing_ = true;
+    this->send_cmd_(0x0E);
+  }
+  void stop() { this->send_cmd_(0x16); }
+  void random() { this->send_cmd_(0x18); }
+
+  bool is_playing() { return is_playing_; }
+
+  void add_on_finished_playback_callback(std::function<void()> callback) {
+    this->on_finished_playback_callback_.add(std::move(callback));
+  }
+
+ protected:
+  void send_cmd_(uint8_t cmd, uint16_t argument = 0);
+  void send_cmd_(uint8_t cmd, uint16_t high, uint16_t low) {
+    this->send_cmd_(cmd, ((high & 0xFF) << 8) | (low & 0xFF));
+  }
+  uint8_t sent_cmd_{0};
+
+  char read_buffer_[DFPLAYER_READ_BUFFER_LENGTH];
+  size_t read_pos_{0};
+
+  bool is_playing_{false};
+  bool ack_set_is_playing_{false};
+  bool ack_reset_is_playing_{false};
+
+  CallbackManager<void()> on_finished_playback_callback_;
+};
+
+#define DFPLAYER_SIMPLE_ACTION(ACTION_CLASS, ACTION_METHOD) \
+  template<typename... Ts> class ACTION_CLASS : public Action<Ts...>, public Parented<DFPlayer> { \
+   public: \
+    void play(Ts... x) override { this->parent_->ACTION_METHOD(); } \
+  };
+
+DFPLAYER_SIMPLE_ACTION(NextAction, next)
+DFPLAYER_SIMPLE_ACTION(PreviousAction, previous)
+
+template<typename... Ts> class PlayFileAction : public Action<Ts...>, public Parented<DFPlayer> {
+ public:
+  TEMPLATABLE_VALUE(uint16_t, file)
+  TEMPLATABLE_VALUE(boolean, loop)
+  void play(Ts... x) override {
+    auto file = this->file_.value(x...);
+    auto loop = this->loop_.value(x...);
+    if (loop) {
+      this->parent_->play_file_loop(file);
+    } else {
+      this->parent_->play_file(file);
+    }
+  }
+};
+
+template<typename... Ts> class PlayFolderAction : public Action<Ts...>, public Parented<DFPlayer> {
+ public:
+  TEMPLATABLE_VALUE(uint16_t, folder)
+  TEMPLATABLE_VALUE(uint16_t, file)
+  TEMPLATABLE_VALUE(boolean, loop)
+  void play(Ts... x) override {
+    auto folder = this->folder_.value(x...);
+    auto file = this->file_.value(x...);
+    auto loop = this->loop_.value(x...);
+    if (loop) {
+      this->parent_->play_folder_loop(folder);
+    } else {
+      this->parent_->play_folder(folder, file);
+    }
+  }
+};
+
+template<typename... Ts> class SetDeviceAction : public Action<Ts...>, public Parented<DFPlayer> {
+ public:
+  TEMPLATABLE_VALUE(Device, device)
+  void play(Ts... x) override {
+    auto device = this->device_.value(x...);
+    this->parent_->set_device(device);
+  }
+};
+
+template<typename... Ts> class SetVolumeAction : public Action<Ts...>, public Parented<DFPlayer> {
+ public:
+  TEMPLATABLE_VALUE(uint8_t, volume)
+  void play(Ts... x) override {
+    auto volume = this->volume_.value(x...);
+    this->parent_->set_volume(volume);
+  }
+};
+
+template<typename... Ts> class SetEqAction : public Action<Ts...>, public Parented<DFPlayer> {
+ public:
+  TEMPLATABLE_VALUE(EqPreset, eq)
+  void play(Ts... x) override {
+    auto eq = this->eq_.value(x...);
+    this->parent_->set_eq(eq);
+  }
+};
+
+DFPLAYER_SIMPLE_ACTION(SleepAction, sleep)
+DFPLAYER_SIMPLE_ACTION(ResetAction, reset)
+DFPLAYER_SIMPLE_ACTION(StartAction, start)
+DFPLAYER_SIMPLE_ACTION(PauseAction, pause)
+DFPLAYER_SIMPLE_ACTION(StopAction, stop)
+DFPLAYER_SIMPLE_ACTION(RandomAction, random)
+
+template<typename... Ts> class DFPlayerIsPlayingCondition : public Condition<Ts...>, public Parented<DFPlayer> {
+ public:
+  bool check(Ts... x) override { return this->parent_->is_playing(); }
+};
+
+class DFPlayerFinishedPlaybackTrigger : public Trigger<> {
+ public:
+  explicit DFPlayerFinishedPlaybackTrigger(DFPlayer *parent) {
+    parent->add_on_finished_playback_callback([this]() { this->trigger(); });
+  }
+};
+
+}  // namespace dfplayer
+}  // namespace esphome
diff --git a/tests/test3.yaml b/tests/test3.yaml
index a7e8d26168..df4afe5ad9 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -60,6 +60,83 @@ api:
               - float_arr.size()
               - string_arr[0].c_str()
               - string_arr.size()
+    - service: dfplayer_next
+      then:
+        - dfplayer.play_next:
+    - service: dfplayer_previous
+      then:
+        - dfplayer.play_previous:
+    - service: dfplayer_play
+      variables:
+        file: int
+      then:
+        - dfplayer.play: !lambda 'return file;'
+    - service: dfplayer_play_loop
+      variables:
+        file: int
+        loop_: bool
+      then:
+        - dfplayer.play:
+            file: !lambda 'return file;'
+            loop: !lambda 'return loop_;'
+    - service: dfplayer_play_folder
+      variables:
+        folder: int
+        file: int
+      then:
+        - dfplayer.play_folder:
+            folder: !lambda 'return folder;'
+            file: !lambda 'return file;'
+
+    - service: dfplayer_play_loo_folder
+      variables:
+        folder: int
+      then:
+        - dfplayer.play_folder:
+            folder: !lambda 'return folder;'
+            loop: True
+
+    - service: dfplayer_set_device
+      variables:
+        device: int
+      then:
+        - dfplayer.set_device:
+            device: TF_CARD
+
+    - service: dfplayer_set_volume
+      variables:
+        volume: int
+      then:
+        - dfplayer.set_volume: !lambda 'return volume;'
+    - service: dfplayer_set_eq
+      variables:
+        preset: int
+      then:
+        - dfplayer.set_eq: !lambda 'return static_cast<dfplayer::EqPreset>(preset);'
+
+    - service: dfplayer_sleep
+      then:
+        - dfplayer.sleep
+
+    - service: dfplayer_reset
+      then:
+        - dfplayer.reset
+
+    - service: dfplayer_start
+      then:
+        - dfplayer.start
+
+    - service: dfplayer_pause
+      then:
+        - dfplayer.pause
+
+    - service: dfplayer_stop
+      then:
+        - dfplayer.stop
+
+    - service: dfplayer_random
+      then:
+        - dfplayer.random
 
 wifi:
   ssid: 'MySSID'
@@ -532,3 +609,13 @@ sim800l:
     - sim800l.send_sms:
         message: 'hello you'
         recipient: '+1234'
+
+dfplayer:
+  on_finished_playback:
+    then:
+      if:
+        condition:
+          not:
+            dfplayer.is_playing
+        then:
+          logger.log: 'Playback finished event'

From 96ff9a162c23f37a92a3fd60e17edfb3e49f293d Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Sat, 19 Oct 2019 12:47:24 -0700
Subject: [PATCH 009/412] Add new component for Tuya dimmers (#743)

* Add new component for Tuya dimmers

* Update code

* Class naming

* Log output

* Fixes

* Lint

* Format

* Fix test

* log setting datapoint values

* remove in_setup_ and fix datapoint handling


Co-authored-by: Samuel Sieb <samuel@sieb.net>
Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |  23 +-
 esphome/components/tuya/__init__.py           |  20 ++
 esphome/components/tuya/light/__init__.py     |  38 +++
 esphome/components/tuya/light/tuya_light.cpp  |  85 +++++
 esphome/components/tuya/light/tuya_light.h    |  36 +++
 esphome/components/tuya/tuya.cpp              | 294 ++++++++++++++++++
 esphome/components/tuya/tuya.h                |  73 +++++
 esphome/core/helpers.cpp                      |  16 +
 esphome/core/helpers.h                        |   3 +
 9 files changed, 571 insertions(+), 17 deletions(-)
 create mode 100644 esphome/components/tuya/__init__.py
 create mode 100644 esphome/components/tuya/light/__init__.py
 create mode 100644 esphome/components/tuya/light/tuya_light.cpp
 create mode 100644 esphome/components/tuya/light/tuya_light.h
 create mode 100644 esphome/components/tuya/tuya.cpp
 create mode 100644 esphome/components/tuya/tuya.h

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index ff1fe59668..c578acdaea 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -1,6 +1,7 @@
 #include "esp32_ble_tracker.h"
 #include "esphome/core/log.h"
 #include "esphome/core/application.h"
+#include "esphome/core/helpers.h"
 
 #ifdef ARDUINO_ARCH_ESP32
 
@@ -202,20 +203,8 @@ void ESP32BLETracker::gap_scan_result(const esp_ble_gap_cb_param_t::ble_scan_res
   }
 }
 
-std::string hexencode(const std::string &raw_data) {
-  char buf[20];
-  std::string res;
-  for (size_t i = 0; i < raw_data.size(); i++) {
-    if (i + 1 != raw_data.size()) {
-      sprintf(buf, "0x%02X.", static_cast<uint8_t>(raw_data[i]));
-    } else {
-      sprintf(buf, "0x%02X ", static_cast<uint8_t>(raw_data[i]));
-    }
-    res += buf;
-  }
-  sprintf(buf, "(%zu)", raw_data.size());
-  res += buf;
-  return res;
+std::string hexencode_string(const std::string &raw_data) {
+  return hexencode(reinterpret_cast<const uint8_t *>(raw_data.c_str()), raw_data.size());
 }
 
 ESPBTUUID::ESPBTUUID() : uuid_() {}
@@ -327,15 +316,15 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
   for (auto uuid : this->service_uuids_) {
     ESP_LOGVV(TAG, "  Service UUID: %s", uuid.to_string().c_str());
   }
-  ESP_LOGVV(TAG, "  Manufacturer data: %s", hexencode(this->manufacturer_data_).c_str());
-  ESP_LOGVV(TAG, "  Service data: %s", hexencode(this->service_data_).c_str());
+  ESP_LOGVV(TAG, "  Manufacturer data: %s", hexencode_string(this->manufacturer_data_).c_str());
+  ESP_LOGVV(TAG, "  Service data: %s", hexencode_string(this->service_data_).c_str());
 
   if (this->service_data_uuid_.has_value()) {
     ESP_LOGVV(TAG, "  Service Data UUID: %s", this->service_data_uuid_->to_string().c_str());
   }
 
   ESP_LOGVV(TAG, "Adv data: %s",
-            hexencode(std::string(reinterpret_cast<const char *>(param.ble_adv), param.adv_data_len)).c_str());
+            hexencode_string(std::string(reinterpret_cast<const char *>(param.ble_adv), param.adv_data_len)).c_str());
 #endif
 }
 void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
diff --git a/esphome/components/tuya/__init__.py b/esphome/components/tuya/__init__.py
new file mode 100644
index 0000000000..541f10f862
--- /dev/null
+++ b/esphome/components/tuya/__init__.py
@@ -0,0 +1,20 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.const import CONF_ID
+
+DEPENDENCIES = ['uart']
+
+tuya_ns = cg.esphome_ns.namespace('tuya')
+Tuya = tuya_ns.class_('Tuya', cg.Component, uart.UARTDevice)
+
+CONF_TUYA_ID = 'tuya_id'
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(Tuya),
+}).extend(cv.COMPONENT_SCHEMA).extend(uart.UART_DEVICE_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield uart.register_uart_device(var, config)
diff --git a/esphome/components/tuya/light/__init__.py b/esphome/components/tuya/light/__init__.py
new file mode 100644
index 0000000000..ec588d6cc9
--- /dev/null
+++ b/esphome/components/tuya/light/__init__.py
@@ -0,0 +1,38 @@
+from esphome.components import light
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_OUTPUT_ID, CONF_MIN_VALUE, CONF_MAX_VALUE
+from .. import tuya_ns, CONF_TUYA_ID, Tuya
+
+DEPENDENCIES = ['tuya']
+
+CONF_DIMMER_DATAPOINT = "dimmer_datapoint"
+CONF_SWITCH_DATAPOINT = "switch_datapoint"
+
+TuyaLight = tuya_ns.class_('TuyaLight', light.LightOutput, cg.Component)
+
+CONFIG_SCHEMA = light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend({
+    cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(TuyaLight),
+    cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
+    cv.Required(CONF_DIMMER_DATAPOINT): cv.uint8_t,
+    cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t,
+    cv.Optional(CONF_MIN_VALUE): cv.int_,
+    cv.Optional(CONF_MAX_VALUE): cv.int_,
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
+    yield cg.register_component(var, config)
+    yield light.register_light(var, config)
+
+    if CONF_DIMMER_DATAPOINT in config:
+        cg.add(var.set_dimmer_id(config[CONF_DIMMER_DATAPOINT]))
+    if CONF_SWITCH_DATAPOINT in config:
+        cg.add(var.set_switch_id(config[CONF_SWITCH_DATAPOINT]))
+    if CONF_MIN_VALUE in config:
+        cg.add(var.set_min_value(config[CONF_MIN_VALUE]))
+    if CONF_MAX_VALUE in config:
+        cg.add(var.set_max_value(config[CONF_MAX_VALUE]))
+    paren = yield cg.get_variable(config[CONF_TUYA_ID])
+    cg.add(var.set_tuya_parent(paren))
diff --git a/esphome/components/tuya/light/tuya_light.cpp b/esphome/components/tuya/light/tuya_light.cpp
new file mode 100644
index 0000000000..9696252049
--- /dev/null
+++ b/esphome/components/tuya/light/tuya_light.cpp
@@ -0,0 +1,85 @@
+#include "esphome/core/log.h"
+#include "tuya_light.h"
+
+namespace esphome {
+namespace tuya {
+
+static const char *TAG = "tuya.light";
+
+void TuyaLight::setup() {
+  if (this->dimmer_id_.has_value()) {
+    this->parent_->register_listener(*this->dimmer_id_, [this](TuyaDatapoint datapoint) {
+      auto call = this->state_->make_call();
+      call.set_brightness(float(datapoint.value_uint) / this->max_value_);
+      call.perform();
+    });
+  }
+  if (switch_id_.has_value()) {
+    this->parent_->register_listener(*this->switch_id_, [this](TuyaDatapoint datapoint) {
+      auto call = this->state_->make_call();
+      call.set_state(datapoint.value_bool);
+      call.perform();
+    });
+  }
+}
+
+void TuyaLight::dump_config() {
+  ESP_LOGCONFIG(TAG, "Tuya Dimmer:");
+  if (this->dimmer_id_.has_value())
+    ESP_LOGCONFIG(TAG, "   Dimmer has datapoint ID %u", *this->dimmer_id_);
+  if (this->switch_id_.has_value())
+    ESP_LOGCONFIG(TAG, "   Switch has datapoint ID %u", *this->switch_id_);
+}
+
+light::LightTraits TuyaLight::get_traits() {
+  auto traits = light::LightTraits();
+  traits.set_supports_brightness(this->dimmer_id_.has_value());
+  return traits;
+}
+
+void TuyaLight::setup_state(light::LightState *state) { state_ = state; }
+
+void TuyaLight::write_state(light::LightState *state) {
+  float brightness;
+  state->current_values_as_brightness(&brightness);
+
+  if (brightness == 0.0f) {
+    // turning off, first try via switch (if exists), then dimmer
+    if (switch_id_.has_value()) {
+      TuyaDatapoint datapoint{};
+      datapoint.id = *this->switch_id_;
+      datapoint.type = TuyaDatapointType::BOOLEAN;
+      datapoint.value_bool = false;
+
+      parent_->set_datapoint_value(datapoint);
+    } else if (dimmer_id_.has_value()) {
+      TuyaDatapoint datapoint{};
+      datapoint.id = *this->dimmer_id_;
+      datapoint.type = TuyaDatapointType::INTEGER;
+      datapoint.value_int = 0;
+      parent_->set_datapoint_value(datapoint);
+    }
+    return;
+  }
+
+  auto brightness_int = static_cast<uint32_t>(brightness * this->max_value_);
+  brightness_int = std::max(brightness_int, this->min_value_);
+
+  if (this->dimmer_id_.has_value()) {
+    TuyaDatapoint datapoint{};
+    datapoint.id = *this->dimmer_id_;
+    datapoint.type = TuyaDatapointType::INTEGER;
+    datapoint.value_int = brightness_int;
+    parent_->set_datapoint_value(datapoint);
+  }
+  if (this->switch_id_.has_value()) {
+    TuyaDatapoint datapoint{};
+    datapoint.id = *this->switch_id_;
+    datapoint.type = TuyaDatapointType::BOOLEAN;
+    datapoint.value_bool = true;
+    parent_->set_datapoint_value(datapoint);
+  }
+}
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/light/tuya_light.h b/esphome/components/tuya/light/tuya_light.h
new file mode 100644
index 0000000000..581512c29c
--- /dev/null
+++ b/esphome/components/tuya/light/tuya_light.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/tuya/tuya.h"
+#include "esphome/components/light/light_output.h"
+
+namespace esphome {
+namespace tuya {
+
+class TuyaLight : public Component, public light::LightOutput {
+ public:
+  void setup() override;
+  void dump_config() override;
+  void set_dimmer_id(uint8_t dimmer_id) { this->dimmer_id_ = dimmer_id; }
+  void set_switch_id(uint8_t switch_id) { this->switch_id_ = switch_id; }
+  void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
+  void set_min_value(uint32_t min_value) { min_value_ = min_value; }
+  void set_max_value(uint32_t max_value) { max_value_ = max_value; }
+  light::LightTraits get_traits() override;
+  void setup_state(light::LightState *state) override;
+  void write_state(light::LightState *state) override;
+
+ protected:
+  void update_dimmer_(uint32_t value);
+  void update_switch_(uint32_t value);
+
+  Tuya *parent_;
+  optional<uint8_t> dimmer_id_{};
+  optional<uint8_t> switch_id_{};
+  uint32_t min_value_ = 0;
+  uint32_t max_value_ = 255;
+  light::LightState *state_{nullptr};
+};
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
new file mode 100644
index 0000000000..ae3e7eed43
--- /dev/null
+++ b/esphome/components/tuya/tuya.cpp
@@ -0,0 +1,294 @@
+#include "tuya.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace tuya {
+
+static const char *TAG = "tuya";
+
+void Tuya::setup() {
+  this->send_empty_command_(TuyaCommandType::MCU_CONF);
+  this->set_interval("heartbeat", 1000, [this] { this->send_empty_command_(TuyaCommandType::HEARTBEAT); });
+}
+
+void Tuya::loop() {
+  while (this->available()) {
+    uint8_t c;
+    this->read_byte(&c);
+    this->handle_char_(c);
+  }
+}
+
+void Tuya::dump_config() {
+  ESP_LOGCONFIG(TAG, "Tuya:");
+  if ((gpio_status_ != -1) || (gpio_reset_ != -1))
+    ESP_LOGCONFIG(TAG, "  GPIO MCU configuration not supported!");
+  for (auto &info : this->datapoints_) {
+    if (info.type == TuyaDatapointType::BOOLEAN)
+      ESP_LOGCONFIG(TAG, "  Datapoint %d: switch (value: %s)", info.id, ONOFF(info.value_bool));
+    else if (info.type == TuyaDatapointType::INTEGER)
+      ESP_LOGCONFIG(TAG, "  Datapoint %d: int value (value: %d)", info.id, info.value_int);
+    else if (info.type == TuyaDatapointType::ENUM)
+      ESP_LOGCONFIG(TAG, "  Datapoint %d: enum (value: %d)", info.id, info.value_enum);
+    else if (info.type == TuyaDatapointType::BITMASK)
+      ESP_LOGCONFIG(TAG, "  Datapoint %d: bitmask (value: %x)", info.id, info.value_bitmask);
+    else
+      ESP_LOGCONFIG(TAG, "  Datapoint %d: unknown", info.id);
+  }
+}
+
+bool Tuya::validate_message_() {
+  uint32_t at = this->rx_message_.size() - 1;
+  auto *data = &this->rx_message_[0];
+  uint8_t new_byte = data[at];
+
+  // Byte 0: HEADER1 (always 0x55)
+  if (at == 0)
+    return new_byte == 0x55;
+  // Byte 1: HEADER2 (always 0xAA)
+  if (at == 1)
+    return new_byte == 0xAA;
+
+  // Byte 2: VERSION
+  // no validation for the following fields:
+  uint8_t version = data[2];
+  if (at == 2)
+    return true;
+  // Byte 3: COMMAND
+  uint8_t command = data[3];
+  if (at == 3)
+    return true;
+
+  // Byte 4: LENGTH1
+  // Byte 5: LENGTH2
+  if (at <= 5)
+    // no validation for these fields
+    return true;
+
+  uint16_t length = (uint16_t(data[4]) << 8) | (uint16_t(data[5]));
+
+  // wait until all data is read
+  if (at - 6 < length)
+    return true;
+
+  // Byte 6+LEN: CHECKSUM - sum of all bytes (including header) modulo 256
+  uint8_t rx_checksum = new_byte;
+  uint8_t calc_checksum = 0;
+  for (uint32_t i = 0; i < 6 + length; i++)
+    calc_checksum += data[i];
+
+  if (rx_checksum != calc_checksum) {
+    ESP_LOGW(TAG, "Tuya Received invalid message checksum %02X!=%02X", rx_checksum, calc_checksum);
+    return false;
+  }
+
+  // valid message
+  const uint8_t *message_data = data + 6;
+  ESP_LOGV(TAG, "Received Tuya: CMD=0x%02X VERSION=%u DATA=[%s]", command, version,
+           hexencode(message_data, length).c_str());
+  this->handle_command_(command, version, message_data, length);
+
+  // return false to reset rx buffer
+  return false;
+}
+
+void Tuya::handle_char_(uint8_t c) {
+  this->rx_message_.push_back(c);
+  if (!this->validate_message_()) {
+    this->rx_message_.clear();
+  }
+}
+
+void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buffer, size_t len) {
+  uint8_t c;
+  switch ((TuyaCommandType) command) {
+    case TuyaCommandType::HEARTBEAT:
+      ESP_LOGV(TAG, "MCU Heartbeat (0x%02X)", buffer[0]);
+      if (buffer[0] == 0) {
+        ESP_LOGI(TAG, "MCU restarted");
+        this->send_empty_command_(TuyaCommandType::QUERY_STATE);
+      }
+      break;
+    case TuyaCommandType::QUERY_PRODUCT: {
+      // check it is a valid string
+      bool valid = false;
+      for (int i = 0; i < len; i++) {
+        if (buffer[i] == 0x00) {
+          valid = true;
+          break;
+        }
+      }
+      if (valid) {
+        ESP_LOGD(TAG, "Tuya Product Code: %s", reinterpret_cast<const char *>(buffer));
+      }
+      break;
+    }
+    case TuyaCommandType::MCU_CONF:
+      if (len >= 2) {
+        gpio_status_ = buffer[0];
+        gpio_reset_ = buffer[1];
+      }
+      // set wifi state LED to off or on depending on the MCU firmware
+      // but it shouldn't be blinking
+      c = 0x3;
+      this->send_command_(TuyaCommandType::WIFI_STATE, &c, 1);
+      this->send_empty_command_(TuyaCommandType::QUERY_STATE);
+      break;
+    case TuyaCommandType::WIFI_STATE:
+      break;
+    case TuyaCommandType::WIFI_RESET:
+      ESP_LOGE(TAG, "TUYA_CMD_WIFI_RESET is not handled");
+      break;
+    case TuyaCommandType::WIFI_SELECT:
+      ESP_LOGE(TAG, "TUYA_CMD_WIFI_SELECT is not handled");
+      break;
+    case TuyaCommandType::SET_DATAPOINT:
+      break;
+    case TuyaCommandType::STATE: {
+      this->handle_datapoint_(buffer, len);
+      break;
+    }
+    case TuyaCommandType::QUERY_STATE:
+      break;
+    default:
+      ESP_LOGE(TAG, "invalid command (%02x) received", command);
+  }
+}
+
+void Tuya::handle_datapoint_(const uint8_t *buffer, size_t len) {
+  if (len < 2)
+    return;
+
+  TuyaDatapoint datapoint{};
+  datapoint.id = buffer[0];
+  datapoint.type = (TuyaDatapointType) buffer[1];
+  datapoint.value_uint = 0;
+
+  size_t data_size = (buffer[2] << 8) + buffer[3];
+  const uint8_t *data = buffer + 4;
+  size_t data_len = len - 4;
+  if (data_size != data_len) {
+    ESP_LOGW(TAG, "invalid datapoint update");
+    return;
+  }
+
+  switch (datapoint.type) {
+    case TuyaDatapointType::BOOLEAN:
+      if (data_len != 1)
+        return;
+      datapoint.value_bool = data[0];
+      break;
+    case TuyaDatapointType::INTEGER:
+      if (data_len != 4)
+        return;
+      datapoint.value_uint =
+          (uint32_t(data[0]) << 24) | (uint32_t(data[1]) << 16) | (uint32_t(data[2]) << 8) | (uint32_t(data[3]) << 0);
+      break;
+    case TuyaDatapointType::ENUM:
+      if (data_len != 1)
+        return;
+      datapoint.value_enum = data[0];
+      break;
+    case TuyaDatapointType::BITMASK:
+      if (data_len != 2)
+        return;
+      datapoint.value_bitmask = (uint16_t(data[0]) << 8) | (uint16_t(data[1]) << 0);
+      break;
+    default:
+      return;
+  }
+  ESP_LOGV(TAG, "Datapoint %u update to %u", datapoint.id, datapoint.value_uint);
+
+  // Update internal datapoints
+  bool found = false;
+  for (auto &other : this->datapoints_) {
+    if (other.id == datapoint.id) {
+      other = datapoint;
+      found = true;
+    }
+  }
+  if (!found) {
+    this->datapoints_.push_back(datapoint);
+    // New datapoint found, reprint dump_config after a delay.
+    this->set_timeout("datapoint_dump", 100, [this] { this->dump_config(); });
+  }
+
+  // Run through listeners
+  for (auto &listener : this->listeners_)
+    if (listener.datapoint_id == datapoint.id)
+      listener.on_datapoint(datapoint);
+}
+
+void Tuya::send_command_(TuyaCommandType command, const uint8_t *buffer, uint16_t len) {
+  uint8_t len_hi = len >> 8;
+  uint8_t len_lo = len >> 0;
+  this->write_array({0x55, 0xAA,
+                     0x00,  // version
+                     (uint8_t) command, len_hi, len_lo});
+  if (len != 0)
+    this->write_array(buffer, len);
+
+  uint8_t checksum = 0x55 + 0xAA + (uint8_t) command + len_hi + len_lo;
+  for (int i = 0; i < len; i++)
+    checksum += buffer[i];
+  this->write_byte(checksum);
+}
+
+void Tuya::set_datapoint_value(TuyaDatapoint datapoint) {
+  std::vector<uint8_t> buffer;
+  ESP_LOGV(TAG, "Datapoint %u set to %u", datapoint.id, datapoint.value_uint);
+  for (auto &other : this->datapoints_) {
+    if (other.id == datapoint.id) {
+      if (other.value_uint == datapoint.value_uint) {
+        ESP_LOGV(TAG, "Not sending unchanged value");
+        return;
+      }
+    }
+  }
+  buffer.push_back(datapoint.id);
+  buffer.push_back(static_cast<uint8_t>(datapoint.type));
+
+  std::vector<uint8_t> data;
+  switch (datapoint.type) {
+    case TuyaDatapointType::BOOLEAN:
+      data.push_back(datapoint.value_bool);
+      break;
+    case TuyaDatapointType::INTEGER:
+      data.push_back(datapoint.value_uint >> 24);
+      data.push_back(datapoint.value_uint >> 16);
+      data.push_back(datapoint.value_uint >> 8);
+      data.push_back(datapoint.value_uint >> 0);
+      break;
+    case TuyaDatapointType::ENUM:
+      data.push_back(datapoint.value_enum);
+      break;
+    case TuyaDatapointType::BITMASK:
+      data.push_back(datapoint.value_bitmask >> 8);
+      data.push_back(datapoint.value_bitmask >> 0);
+      break;
+    default:
+      return;
+  }
+
+  buffer.push_back(data.size() >> 8);
+  buffer.push_back(data.size() >> 0);
+  buffer.insert(buffer.end(), data.begin(), data.end());
+  this->send_command_(TuyaCommandType::SET_DATAPOINT, buffer.data(), buffer.size());
+}
+
+void Tuya::register_listener(uint8_t datapoint_id, const std::function<void(TuyaDatapoint)> &func) {
+  auto listener = TuyaDatapointListener{
+      .datapoint_id = datapoint_id,
+      .on_datapoint = func,
+  };
+  this->listeners_.push_back(listener);
+
+  // Run through existing datapoints
+  for (auto &datapoint : this->datapoints_)
+    if (datapoint.id == datapoint_id)
+      func(datapoint);
+}
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
new file mode 100644
index 0000000000..6bc6d92da0
--- /dev/null
+++ b/esphome/components/tuya/tuya.h
@@ -0,0 +1,73 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+
+namespace esphome {
+namespace tuya {
+
+enum class TuyaDatapointType : uint8_t {
+  RAW = 0x00,      // variable length
+  BOOLEAN = 0x01,  // 1 byte (0/1)
+  INTEGER = 0x02,  // 4 byte
+  STRING = 0x03,   // variable length
+  ENUM = 0x04,     // 1 byte
+  BITMASK = 0x05,  // 2 bytes
+};
+
+struct TuyaDatapoint {
+  uint8_t id;
+  TuyaDatapointType type;
+  union {
+    bool value_bool;
+    int value_int;
+    uint32_t value_uint;
+    uint8_t value_enum;
+    uint16_t value_bitmask;
+  };
+};
+
+struct TuyaDatapointListener {
+  uint8_t datapoint_id;
+  std::function<void(TuyaDatapoint)> on_datapoint;
+};
+
+enum class TuyaCommandType : uint8_t {
+  HEARTBEAT = 0x00,
+  QUERY_PRODUCT = 0x01,
+  MCU_CONF = 0x02,
+  WIFI_STATE = 0x03,
+  WIFI_RESET = 0x04,
+  WIFI_SELECT = 0x05,
+  SET_DATAPOINT = 0x06,
+  STATE = 0x07,
+  QUERY_STATE = 0x08,
+};
+
+class Tuya : public Component, public uart::UARTDevice {
+ public:
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+  void setup() override;
+  void loop() override;
+  void dump_config() override;
+  void register_listener(uint8_t datapoint_id, const std::function<void(TuyaDatapoint)> &func);
+  void set_datapoint_value(TuyaDatapoint datapoint);
+
+ protected:
+  void handle_char_(uint8_t c);
+  void handle_datapoint_(const uint8_t *buffer, size_t len);
+  bool validate_message_();
+
+  void handle_command_(uint8_t command, uint8_t version, const uint8_t *buffer, size_t len);
+  void send_command_(TuyaCommandType command, const uint8_t *buffer, uint16_t len);
+  void send_empty_command_(TuyaCommandType command) { this->send_command_(command, nullptr, 0); }
+
+  int gpio_status_ = -1;
+  int gpio_reset_ = -1;
+  std::vector<TuyaDatapointListener> listeners_;
+  std::vector<TuyaDatapoint> datapoints_;
+  std::vector<uint8_t> rx_message_;
+};
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index c65ca919ba..6d6aa80b66 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -314,4 +314,20 @@ std::array<uint8_t, 2> decode_uint16(uint16_t value) {
   return {msb, lsb};
 }
 
+std::string hexencode(const uint8_t *data, uint32_t len) {
+  char buf[20];
+  std::string res;
+  for (size_t i = 0; i < len; i++) {
+    if (i + 1 != len) {
+      sprintf(buf, "%02X.", data[i]);
+    } else {
+      sprintf(buf, "%02X ", data[i]);
+    }
+    res += buf;
+  }
+  sprintf(buf, "(%u)", len);
+  res += buf;
+  return res;
+}
+
 }  // namespace esphome
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 5670d136a3..88f0d587e5 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -156,6 +156,9 @@ enum ParseOnOffState {
 
 ParseOnOffState parse_on_off(const char *str, const char *on = nullptr, const char *off = nullptr);
 
+// Encode raw data to a human-readable string (for debugging)
+std::string hexencode(const uint8_t *data, uint32_t len);
+
 // https://stackoverflow.com/questions/7858817/unpacking-a-tuple-to-call-a-matching-function-pointer/7858971#7858971
 template<int...> struct seq {};                                       // NOLINT
 template<int N, int... S> struct gens : gens<N - 1, N - 1, S...> {};  // NOLINT

From 352bdd9fb5b2cb2489ce85728118a65b417c6dc8 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 19 Oct 2019 21:50:39 +0200
Subject: [PATCH 010/412] Tuya Set gamma correction and transition length
 defaults

See also https://github.com/esphome/esphome-docs/pull/353/files#r336751499
---
 esphome/components/tuya/light/__init__.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/esphome/components/tuya/light/__init__.py b/esphome/components/tuya/light/__init__.py
index ec588d6cc9..605bdae32e 100644
--- a/esphome/components/tuya/light/__init__.py
+++ b/esphome/components/tuya/light/__init__.py
@@ -1,7 +1,8 @@
 from esphome.components import light
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_OUTPUT_ID, CONF_MIN_VALUE, CONF_MAX_VALUE
+from esphome.const import CONF_OUTPUT_ID, CONF_MIN_VALUE, CONF_MAX_VALUE, CONF_GAMMA_CORRECT, \
+    CONF_DEFAULT_TRANSITION_LENGTH
 from .. import tuya_ns, CONF_TUYA_ID, Tuya
 
 DEPENDENCIES = ['tuya']
@@ -18,6 +19,11 @@ CONFIG_SCHEMA = light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend({
     cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t,
     cv.Optional(CONF_MIN_VALUE): cv.int_,
     cv.Optional(CONF_MAX_VALUE): cv.int_,
+
+    # Change the default gamma_correct and default transition length settings.
+    # The Tuya MCU handles transitions and gamma correction on its own.
+    cv.Optional(CONF_GAMMA_CORRECT, default=1.0): cv.positive_float,
+    cv.Optional(CONF_DEFAULT_TRANSITION_LENGTH, default='0s'): cv.positive_time_period_milliseconds,
 }).extend(cv.COMPONENT_SCHEMA)
 
 

From 4fa11dfa68018fa7f72db71475a012f858cad760 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 19 Oct 2019 21:59:55 +0200
Subject: [PATCH 011/412] Lint

---
 esphome/components/shtcx/shtcx.cpp |  2 +-
 tests/test1.yaml                   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/esphome/components/shtcx/shtcx.cpp b/esphome/components/shtcx/shtcx.cpp
index d52bdb1257..b8daceb1af 100644
--- a/esphome/components/shtcx/shtcx.cpp
+++ b/esphome/components/shtcx/shtcx.cpp
@@ -12,7 +12,7 @@ static const uint16_t SHTCX_COMMAND_READ_ID_REGISTER = 0xEFC8;
 static const uint16_t SHTCX_COMMAND_SOFT_RESET = 0x805D;
 static const uint16_t SHTCX_COMMAND_POLLING_H = 0x7866;
 
-inline const char* to_string(SHTCXType type) {
+inline const char *to_string(SHTCXType type) {
   switch (type) {
     case SHTCX_TYPE_SHTC3:
       return "SHTC3";
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 2cdbbe8cff..5caa03cf03 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -544,12 +544,12 @@ sensor:
     address: 0x58
     update_interval: 5s
   - platform: shtcx
-      temperature:
-        name: "Living Room Temperature 10"
-      humidity:
-        name: "Living Room Humidity 10"
-      address: 0x70
-      update_interval: 15s
+    temperature:
+      name: "Living Room Temperature 10"
+    humidity:
+      name: "Living Room Humidity 10"
+    address: 0x70
+    update_interval: 15s
   - platform: template
     name: "Template Sensor"
     id: template_sensor

From b59cf6572b915f4b8da6240ff8554e49a18b9972 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 19 Oct 2019 22:31:32 +0200
Subject: [PATCH 012/412] Add lint check for integer constants (#775)

---
 esphome/components/sim800l/sim800l.h |  4 ++--
 esphome/core/preferences.cpp         | 10 +++++-----
 script/ci-custom.py                  | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/esphome/components/sim800l/sim800l.h b/esphome/components/sim800l/sim800l.h
index 17cd0111fe..0a3f4b463b 100644
--- a/esphome/components/sim800l/sim800l.h
+++ b/esphome/components/sim800l/sim800l.h
@@ -4,11 +4,11 @@
 #include "esphome/components/uart/uart.h"
 #include "esphome/core/automation.h"
 
-#define SIM800L_READ_BUFFER_LENGTH 255
-
 namespace esphome {
 namespace sim800l {
 
+const uint8_t SIM800L_READ_BUFFER_LENGTH = 255;
+
 enum State {
   STATE_IDLE = 0,
   STATE_INIT,
diff --git a/esphome/core/preferences.cpp b/esphome/core/preferences.cpp
index f62a764b7e..2329ed34f5 100644
--- a/esphome/core/preferences.cpp
+++ b/esphome/core/preferences.cpp
@@ -54,15 +54,15 @@ bool ESPPreferenceObject::save_() {
 
 #ifdef ARDUINO_ARCH_ESP8266
 
-#define ESP_RTC_USER_MEM_START 0x60001200
+static const uint32_t ESP_RTC_USER_MEM_START = 0x60001200;
 #define ESP_RTC_USER_MEM ((uint32_t *) ESP_RTC_USER_MEM_START)
-#define ESP_RTC_USER_MEM_SIZE_WORDS 128
-#define ESP_RTC_USER_MEM_SIZE_BYTES ESP_RTC_USER_MEM_SIZE_WORDS * 4
+static const uint32_t ESP_RTC_USER_MEM_SIZE_WORDS = 128;
+static const uint32_t ESP_RTC_USER_MEM_SIZE_BYTES = ESP_RTC_USER_MEM_SIZE_WORDS * 4;
 
 #ifdef USE_ESP8266_PREFERENCES_FLASH
-#define ESP8266_FLASH_STORAGE_SIZE 128
+static const uint32_t ESP8266_FLASH_STORAGE_SIZE = 128;
 #else
-#define ESP8266_FLASH_STORAGE_SIZE 64
+static const uint32_t ESP8266_FLASH_STORAGE_SIZE = 64;
 #endif
 
 static inline bool esp_rtc_user_mem_read(uint32_t index, uint32_t *dest) {
diff --git a/script/ci-custom.py b/script/ci-custom.py
index fff24df0dc..07641a17e9 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -5,6 +5,7 @@ import codecs
 import collections
 import fnmatch
 import os.path
+import re
 import subprocess
 import sys
 
@@ -143,6 +144,19 @@ def lint_end_newline(fname, content):
     return None
 
 
+@lint_content_check(include=['*.cpp', '*.h', '*.tcc'],
+                    exclude=['esphome/core/log.h'])
+def lint_no_defines(fname, content):
+    errors = []
+    for match in re.finditer(r'#define\s+([a-zA-Z0-9_]+)\s+([0-9bx]+)', content, re.MULTILINE):
+        errors.append(
+            "#define macros for integer constants are not allowed, please use "
+            "`static const uint8_t {} = {};` style instead (replace uint8_t with the appropriate "
+            "datatype). See also Google styleguide.".format(match.group(1), match.group(2))
+        )
+    return errors
+
+
 def relative_cpp_search_text(fname, content):
     parts = fname.split('/')
     integration = parts[2]

From 6c8d0f18525d0f440134ac6a59367b3db7ed434c Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 20 Oct 2019 15:57:59 +0200
Subject: [PATCH 013/412] Change message

---
 esphome/core/application.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/esphome/core/application.cpp b/esphome/core/application.cpp
index a2f94235f5..fbd3c56e54 100644
--- a/esphome/core/application.cpp
+++ b/esphome/core/application.cpp
@@ -73,9 +73,8 @@ void Application::loop() {
 
   const uint32_t end = millis();
   if (end - start > 200) {
-    ESP_LOGV(TAG, "A component took a long time in a loop() cycle (%.1f s).", (end - start) / 1e3f);
+    ESP_LOGV(TAG, "A component took a long time in a loop() cycle (%.2f s).", (end - start) / 1e3f);
     ESP_LOGV(TAG, "Components should block for at most 20-30ms in loop().");
-    ESP_LOGV(TAG, "This will become a warning soon.");
   }
 
   const uint32_t now = millis();

From 16f42a3d03bfb14559f5cbd58611a7c70cc1b3db Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 20 Oct 2019 16:15:30 +0200
Subject: [PATCH 014/412] Add script.wait action (#778)

Fixes https://github.com/esphome/feature-requests/issues/416, fixes https://github.com/esphome/issues/issues/572
---
 esphome/components/script/__init__.py |  9 ++++++
 esphome/components/script/script.h    | 42 +++++++++++++++++++++++++++
 tests/test3.yaml                      |  2 ++
 3 files changed, 53 insertions(+)

diff --git a/esphome/components/script/__init__.py b/esphome/components/script/__init__.py
index e1983689a6..9590679f83 100644
--- a/esphome/components/script/__init__.py
+++ b/esphome/components/script/__init__.py
@@ -8,6 +8,7 @@ script_ns = cg.esphome_ns.namespace('script')
 Script = script_ns.class_('Script', automation.Trigger.template())
 ScriptExecuteAction = script_ns.class_('ScriptExecuteAction', automation.Action)
 ScriptStopAction = script_ns.class_('ScriptStopAction', automation.Action)
+ScriptWaitAction = script_ns.class_('ScriptWaitAction', automation.Action)
 IsRunningCondition = script_ns.class_('IsRunningCondition', automation.Condition)
 
 CONFIG_SCHEMA = automation.validate_automation({
@@ -42,6 +43,14 @@ def script_stop_action_to_code(config, action_id, template_arg, args):
     yield cg.new_Pvariable(action_id, template_arg, paren)
 
 
+@automation.register_action('script.wait', ScriptWaitAction, maybe_simple_id({
+    cv.Required(CONF_ID): cv.use_id(Script)
+}))
+def script_wait_action_to_code(config, action_id, template_arg, args):
+    paren = yield cg.get_variable(config[CONF_ID])
+    yield cg.new_Pvariable(action_id, template_arg, paren)
+
+
 @automation.register_condition('script.is_running', IsRunningCondition, automation.maybe_simple_id({
     cv.Required(CONF_ID): cv.use_id(Script)
 }))
diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index f937b9d637..3b97327da8 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -49,5 +49,47 @@ template<typename... Ts> class IsRunningCondition : public Condition<Ts...> {
   Script *parent_;
 };
 
+template<typename... Ts> class ScriptWaitAction : public Action<Ts...>, public Component {
+ public:
+  ScriptWaitAction(Script *script) : script_(script) {}
+
+  void play(Ts... x) { /* ignore - see play_complex */
+  }
+
+  void play_complex(Ts... x) override {
+    // Check if we can continue immediately.
+    if (!this->script_->is_running()) {
+      this->triggered_ = false;
+      this->play_next(x...);
+      return;
+    }
+    this->var_ = std::make_tuple(x...);
+    this->triggered_ = true;
+    this->loop();
+  }
+
+  void stop() override { this->triggered_ = false; }
+
+  void loop() override {
+    if (!this->triggered_)
+      return;
+
+    if (this->script_->is_running())
+      return;
+
+    this->triggered_ = false;
+    this->play_next_tuple(this->var_);
+  }
+
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+  bool is_running() override { return this->triggered_ || this->is_running_next(); }
+
+ protected:
+  Script *script_;
+  bool triggered_{false};
+  std::tuple<Ts...> var_{};
+};
+
 }  // namespace script
 }  // namespace esphome
diff --git a/tests/test3.yaml b/tests/test3.yaml
index df4afe5ad9..f3e530f07a 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -383,6 +383,8 @@ text_sensor:
       - lambda: !lambda |-
           ESP_LOGD("main", "The state is %s=%s", x.c_str(), id(version_sensor).state.c_str());
       - script.execute: my_script
+      - script.wait: my_script
+      - script.stop: my_script
       - homeassistant.service:
           service: notify.html5
           data:

From 9a152e588e3e9a57627bee0bdb687795c06bc6f2 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 20 Oct 2019 17:56:57 +0200
Subject: [PATCH 015/412] Vl53l0x (#644)

* VL530LX

* VL53L0X

* Updates

* License

* Lint
---
 MANIFEST.in                                   |   1 +
 esphome/components/i2c/i2c.cpp                |  25 ++
 esphome/components/i2c/i2c.h                  |  20 ++
 esphome/components/vl53l0x/LICENSE.txt        |  80 ++++++
 esphome/components/vl53l0x/__init__.py        |   0
 esphome/components/vl53l0x/sensor.py          |  24 ++
 esphome/components/vl53l0x/vl53l0x_sensor.cpp | 249 +++++++++++++++++
 esphome/components/vl53l0x/vl53l0x_sensor.h   | 257 ++++++++++++++++++
 8 files changed, 656 insertions(+)
 create mode 100644 esphome/components/vl53l0x/LICENSE.txt
 create mode 100644 esphome/components/vl53l0x/__init__.py
 create mode 100644 esphome/components/vl53l0x/sensor.py
 create mode 100644 esphome/components/vl53l0x/vl53l0x_sensor.cpp
 create mode 100644 esphome/components/vl53l0x/vl53l0x_sensor.h

diff --git a/MANIFEST.in b/MANIFEST.in
index e5c7b8f748..cdea2df2a6 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,3 +3,4 @@ include README.md
 include esphome/dashboard/templates/*.html
 recursive-include esphome/dashboard/static *.ico *.js *.css *.woff* LICENSE
 recursive-include esphome *.cpp *.h *.tcc
+recursive-include esphome LICENSE.txt
diff --git a/esphome/components/i2c/i2c.cpp b/esphome/components/i2c/i2c.cpp
index 840944748c..562bd26771 100644
--- a/esphome/components/i2c/i2c.cpp
+++ b/esphome/components/i2c/i2c.cpp
@@ -208,5 +208,30 @@ void I2CDevice::set_i2c_parent(I2CComponent *parent) { this->parent_ = parent; }
 uint8_t next_i2c_bus_num_ = 0;
 #endif
 
+I2CRegister &I2CRegister::operator=(uint8_t value) {
+  this->parent_->write_byte(this->register_, value);
+  return *this;
+}
+
+I2CRegister &I2CRegister::operator&=(uint8_t value) {
+  this->parent_->write_byte(this->register_, this->get() & value);
+  return *this;
+}
+
+I2CRegister &I2CRegister::operator|=(uint8_t value) {
+  this->parent_->write_byte(this->register_, this->get() | value);
+  return *this;
+}
+
+uint8_t I2CRegister::get() {
+  uint8_t value = 0x00;
+  this->parent_->read_byte(this->register_, &value);
+  return value;
+}
+I2CRegister &I2CRegister::operator=(const std::vector<uint8_t> &value) {
+  this->parent_->write_bytes(this->register_, value);
+  return *this;
+}
+
 }  // namespace i2c
 }  // namespace esphome
diff --git a/esphome/components/i2c/i2c.h b/esphome/components/i2c/i2c.h
index 67cd0373d3..c4ed40e268 100644
--- a/esphome/components/i2c/i2c.h
+++ b/esphome/components/i2c/i2c.h
@@ -134,6 +134,24 @@ class I2CComponent : public Component {
 extern uint8_t next_i2c_bus_num_;
 #endif
 
+class I2CDevice;
+
+class I2CRegister {
+ public:
+  I2CRegister(I2CDevice *parent, uint8_t a_register) : parent_(parent), register_(a_register) {}
+
+  I2CRegister &operator=(uint8_t value);
+  I2CRegister &operator=(const std::vector<uint8_t> &value);
+  I2CRegister &operator&=(uint8_t value);
+  I2CRegister &operator|=(uint8_t value);
+
+  uint8_t get();
+
+ protected:
+  I2CDevice *parent_;
+  uint8_t register_;
+};
+
 /** All components doing communication on the I2C bus should subclass I2CDevice.
  *
  * This class stores 1. the address of the i2c device and has a helper function to allow
@@ -153,6 +171,8 @@ class I2CDevice {
   /// Manually set the parent i2c bus for this device.
   void set_i2c_parent(I2CComponent *parent);
 
+  I2CRegister reg(uint8_t a_register) { return {this, a_register}; }
+
   /** Read len amount of bytes from a register into data. Optionally with a conversion time after
    * writing the register value to the bus.
    *
diff --git a/esphome/components/vl53l0x/LICENSE.txt b/esphome/components/vl53l0x/LICENSE.txt
new file mode 100644
index 0000000000..fe33583414
--- /dev/null
+++ b/esphome/components/vl53l0x/LICENSE.txt
@@ -0,0 +1,80 @@
+Most of the code in this integration is based on the VL53L0x library
+by Pololu (Pololu Corporation), which in turn is based on the VL53L0X
+API from ST. The code has been adapted to work with ESPHome's i2c APIs.
+Please see the top-level LICENSE.txt for information about ESPHome's license.
+The licenses for Pololu's and ST's software are included below.
+Orignally taken from https://github.com/pololu/vl53l0x-arduino (accessed 20th october 2019).
+
+=================================================================
+
+Copyright (c) 2017 Pololu Corporation.  For more information, see
+
+https://www.pololu.com/
+https://forum.pololu.com/
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+=================================================================
+
+Most of the functionality of this library is based on the VL53L0X
+API provided by ST (STSW-IMG005), and some of the explanatory
+comments are quoted or paraphrased from the API source code, API
+user manual (UM2039), and the VL53L0X datasheet.
+
+The following applies to source code reproduced or derived from
+the API:
+
+-----------------------------------------------------------------
+
+Copyright © 2016, STMicroelectronics International N.V.  All
+rights reserved.
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the following
+conditions are met:
+* Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following
+disclaimer in the documentation and/or other materials provided
+with the distribution.
+* Neither the name of STMicroelectronics nor the
+names of its contributors may be used to endorse or promote
+products derived from this software without specific prior
+written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
+NON-INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS ARE DISCLAIMED.
+IN NO EVENT SHALL STMICROELECTRONICS INTERNATIONAL N.V. BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+-----------------------------------------------------------------
diff --git a/esphome/components/vl53l0x/__init__.py b/esphome/components/vl53l0x/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/vl53l0x/sensor.py b/esphome/components/vl53l0x/sensor.py
new file mode 100644
index 0000000000..6740d53e13
--- /dev/null
+++ b/esphome/components/vl53l0x/sensor.py
@@ -0,0 +1,24 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import CONF_ID, UNIT_METER, ICON_ARROW_EXPAND_VERTICAL
+
+DEPENDENCIES = ['i2c']
+
+vl53l0x_ns = cg.esphome_ns.namespace('vl53l0x')
+VL53L0XSensor = vl53l0x_ns.class_('VL53L0XSensor', sensor.Sensor, cg.PollingComponent,
+                                  i2c.I2CDevice)
+
+CONF_SIGNAL_RATE_LIMIT = 'signal_rate_limit'
+CONFIG_SCHEMA = sensor.sensor_schema(UNIT_METER, ICON_ARROW_EXPAND_VERTICAL, 2).extend({
+    cv.GenerateID(): cv.declare_id(VL53L0XSensor),
+    cv.Optional(CONF_SIGNAL_RATE_LIMIT, default=0.25): cv.float_range(
+        min=0.0, max=512.0, min_included=False, max_included=False)
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x29))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield sensor.register_sensor(var, config)
+    yield i2c.register_i2c_device(var, config)
diff --git a/esphome/components/vl53l0x/vl53l0x_sensor.cpp b/esphome/components/vl53l0x/vl53l0x_sensor.cpp
new file mode 100644
index 0000000000..231bed99ac
--- /dev/null
+++ b/esphome/components/vl53l0x/vl53l0x_sensor.cpp
@@ -0,0 +1,249 @@
+#include "vl53l0x_sensor.h"
+#include "esphome/core/log.h"
+
+/*
+ * Most of the code in this integration is based on the VL53L0x library
+ * by Pololu (Pololu Corporation), which in turn is based on the VL53L0X
+ * API from ST.
+ *
+ * For more information about licensing, please view the included LICENSE.txt file
+ * in the vl53l0x integration directory.
+ */
+
+namespace esphome {
+namespace vl53l0x {
+
+static const char *TAG = "vl53l0x";
+
+void VL53L0XSensor::dump_config() {
+  LOG_SENSOR("", "VL53L0X", this);
+  LOG_UPDATE_INTERVAL(this);
+  LOG_I2C_DEVICE(this);
+}
+void VL53L0XSensor::setup() {
+  reg(0x89) |= 0x01;
+  reg(0x88) = 0x00;
+
+  reg(0x80) = 0x01;
+  reg(0xFF) = 0x01;
+  reg(0x00) = 0x00;
+  stop_variable_ = reg(0x91).get();
+
+  reg(0x00) = 0x01;
+  reg(0xFF) = 0x00;
+  reg(0x80) = 0x00;
+  reg(0x60) |= 0x12;
+
+  auto rate_value = static_cast<uint16_t>(signal_rate_limit_ * 128);
+  write_byte_16(0x44, rate_value);
+
+  reg(0x01) = 0xFF;
+
+  // getSpadInfo()
+  reg(0x80) = 0x01;
+  reg(0xFF) = 0x01;
+  reg(0x00) = 0x00;
+  reg(0xFF) = 0x06;
+  reg(0x83) |= 0x04;
+  reg(0xFF) = 0x07;
+  reg(0x81) = 0x01;
+  reg(0x80) = 0x01;
+  reg(0x94) = 0x6B;
+  reg(0x83) = 0x00;
+
+  while (reg(0x83).get() == 0x00)
+    yield();
+
+  reg(0x83) = 0x01;
+  uint8_t tmp = reg(0x92).get();
+  uint8_t spad_count = tmp & 0x7F;
+  bool spad_type_is_aperture = tmp & 0x80;
+
+  reg(0x81) = 0x00;
+  reg(0xFF) = 0x06;
+  reg(0x83) &= ~0x04;
+  reg(0xFF) = 0x01;
+  reg(0x00) = 0x01;
+  reg(0xFF) = 0x00;
+  reg(0x80) = 0x00;
+
+  uint8_t ref_spad_map[6];
+  this->read_bytes(0xB0, ref_spad_map, 6);
+
+  reg(0xFF) = 0x01;
+  reg(0x4F) = 0x00;
+  reg(0x4E) = 0x2C;
+  reg(0xFF) = 0x00;
+  reg(0xB6) = 0xB4;
+
+  uint8_t first_spad_to_enable = spad_type_is_aperture ? 12 : 0;
+  uint8_t spads_enabled = 0;
+  for (int i = 0; i < 48; i++) {
+    uint8_t &val = ref_spad_map[i / 8];
+    uint8_t mask = 1 << (i % 8);
+
+    if (i < first_spad_to_enable || spads_enabled == spad_count)
+      val &= ~mask;
+    else if (val & mask)
+      spads_enabled += 1;
+  }
+
+  this->write_bytes(0xB0, ref_spad_map, 6);
+
+  reg(0xFF) = 0x01;
+  reg(0x00) = 0x00;
+  reg(0xFF) = 0x00;
+  reg(0x09) = 0x00;
+  reg(0x10) = 0x00;
+  reg(0x11) = 0x00;
+  reg(0x24) = 0x01;
+  reg(0x25) = 0xFF;
+  reg(0x75) = 0x00;
+  reg(0xFF) = 0x01;
+  reg(0x4E) = 0x2C;
+  reg(0x48) = 0x00;
+  reg(0x30) = 0x20;
+  reg(0xFF) = 0x00;
+  reg(0x30) = 0x09;
+  reg(0x54) = 0x00;
+  reg(0x31) = 0x04;
+  reg(0x32) = 0x03;
+  reg(0x40) = 0x83;
+  reg(0x46) = 0x25;
+  reg(0x60) = 0x00;
+  reg(0x27) = 0x00;
+  reg(0x50) = 0x06;
+  reg(0x51) = 0x00;
+  reg(0x52) = 0x96;
+  reg(0x56) = 0x08;
+  reg(0x57) = 0x30;
+  reg(0x61) = 0x00;
+  reg(0x62) = 0x00;
+  reg(0x64) = 0x00;
+  reg(0x65) = 0x00;
+  reg(0x66) = 0xA0;
+  reg(0xFF) = 0x01;
+  reg(0x22) = 0x32;
+  reg(0x47) = 0x14;
+  reg(0x49) = 0xFF;
+  reg(0x4A) = 0x00;
+  reg(0xFF) = 0x00;
+  reg(0x7A) = 0x0A;
+  reg(0x7B) = 0x00;
+  reg(0x78) = 0x21;
+  reg(0xFF) = 0x01;
+  reg(0x23) = 0x34;
+  reg(0x42) = 0x00;
+  reg(0x44) = 0xFF;
+  reg(0x45) = 0x26;
+  reg(0x46) = 0x05;
+  reg(0x40) = 0x40;
+  reg(0x0E) = 0x06;
+  reg(0x20) = 0x1A;
+  reg(0x43) = 0x40;
+  reg(0xFF) = 0x00;
+  reg(0x34) = 0x03;
+  reg(0x35) = 0x44;
+  reg(0xFF) = 0x01;
+  reg(0x31) = 0x04;
+  reg(0x4B) = 0x09;
+  reg(0x4C) = 0x05;
+  reg(0x4D) = 0x04;
+  reg(0xFF) = 0x00;
+  reg(0x44) = 0x00;
+  reg(0x45) = 0x20;
+  reg(0x47) = 0x08;
+  reg(0x48) = 0x28;
+  reg(0x67) = 0x00;
+  reg(0x70) = 0x04;
+  reg(0x71) = 0x01;
+  reg(0x72) = 0xFE;
+  reg(0x76) = 0x00;
+  reg(0x77) = 0x00;
+  reg(0xFF) = 0x01;
+  reg(0x0D) = 0x01;
+  reg(0xFF) = 0x00;
+  reg(0x80) = 0x01;
+  reg(0x01) = 0xF8;
+  reg(0xFF) = 0x01;
+  reg(0x8E) = 0x01;
+  reg(0x00) = 0x01;
+  reg(0xFF) = 0x00;
+  reg(0x80) = 0x00;
+
+  reg(0x0A) = 0x04;
+  reg(0x84) &= ~0x10;
+  reg(0x0B) = 0x01;
+
+  measurement_timing_budget_us_ = get_measurement_timing_budget_();
+  reg(0x01) = 0xE8;
+  set_measurement_timing_budget_(measurement_timing_budget_us_);
+  reg(0x01) = 0x01;
+
+  if (!perform_single_ref_calibration_(0x40)) {
+    ESP_LOGW(TAG, "1st reference calibration failed!");
+    this->mark_failed();
+    return;
+  }
+  reg(0x01) = 0x02;
+  if (!perform_single_ref_calibration_(0x00)) {
+    ESP_LOGW(TAG, "2nd reference calibration failed!");
+    this->mark_failed();
+    return;
+  }
+  reg(0x01) = 0xE8;
+}
+void VL53L0XSensor::update() {
+  if (this->initiated_read_ || this->waiting_for_interrupt_) {
+    this->publish_state(NAN);
+    this->status_set_warning();
+  }
+
+  // initiate single shot measurement
+  reg(0x80) = 0x01;
+  reg(0xFF) = 0x01;
+
+  reg(0x00) = 0x00;
+  reg(0x91) = stop_variable_;
+  reg(0x00) = 0x01;
+  reg(0xFF) = 0x00;
+  reg(0x80) = 0x00;
+
+  reg(0x00) = 0x01;
+  this->waiting_for_interrupt_ = false;
+  this->initiated_read_ = true;
+  // wait for timeout
+}
+void VL53L0XSensor::loop() {
+  if (this->initiated_read_) {
+    if (reg(0x00).get() & 0x01) {
+      // waiting
+    } else {
+      // done
+      // wait until reg(0x13) & 0x07 is set
+      this->initiated_read_ = false;
+      this->waiting_for_interrupt_ = true;
+    }
+  }
+  if (this->waiting_for_interrupt_) {
+    if (reg(0x13).get() & 0x07) {
+      uint16_t range_mm;
+      this->read_byte_16(0x14 + 10, &range_mm);
+      reg(0x0B) = 0x01;
+      this->waiting_for_interrupt_ = false;
+
+      if (range_mm >= 8190) {
+        ESP_LOGW(TAG, "'%s' - Distance is out of range, please move the target closer", this->name_.c_str());
+        this->publish_state(NAN);
+        return;
+      }
+
+      float range_m = range_mm / 1e3f;
+      ESP_LOGD(TAG, "'%s' - Got distance %.3f m", this->name_.c_str(), range_m);
+      this->publish_state(range_m);
+    }
+  }
+}
+
+}  // namespace vl53l0x
+}  // namespace esphome
diff --git a/esphome/components/vl53l0x/vl53l0x_sensor.h b/esphome/components/vl53l0x/vl53l0x_sensor.h
new file mode 100644
index 0000000000..1825383cee
--- /dev/null
+++ b/esphome/components/vl53l0x/vl53l0x_sensor.h
@@ -0,0 +1,257 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace vl53l0x {
+
+struct SequenceStepEnables {
+  bool tcc, msrc, dss, pre_range, final_range;
+};
+
+struct SequenceStepTimeouts {
+  uint16_t pre_range_vcsel_period_pclks, final_range_vcsel_period_pclks;
+
+  uint16_t msrc_dss_tcc_mclks, pre_range_mclks, final_range_mclks;
+  uint32_t msrc_dss_tcc_us, pre_range_us, final_range_us;
+};
+
+class VL53L0XSensor : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void update() override;
+
+  void loop() override;
+
+  void set_signal_rate_limit(float signal_rate_limit) { signal_rate_limit_ = signal_rate_limit; }
+
+ protected:
+  uint32_t get_measurement_timing_budget_() {
+    SequenceStepEnables enables{};
+    SequenceStepTimeouts timeouts{};
+
+    uint16_t start_overhead = 1910;
+    uint16_t end_overhead = 960;
+    uint16_t msrc_overhead = 660;
+    uint16_t tcc_overhead = 590;
+    uint16_t dss_overhead = 690;
+    uint16_t pre_range_overhead = 660;
+    uint16_t final_range_overhead = 550;
+
+    // "Start and end overhead times always present"
+    uint32_t budget_us = start_overhead + end_overhead;
+
+    get_sequence_step_enables_(&enables);
+    get_sequence_step_timeouts_(&enables, &timeouts);
+
+    if (enables.tcc)
+      budget_us += (timeouts.msrc_dss_tcc_us + tcc_overhead);
+
+    if (enables.dss)
+      budget_us += 2 * (timeouts.msrc_dss_tcc_us + dss_overhead);
+    else if (enables.msrc)
+      budget_us += (timeouts.msrc_dss_tcc_us + msrc_overhead);
+
+    if (enables.pre_range)
+      budget_us += (timeouts.pre_range_us + pre_range_overhead);
+
+    if (enables.final_range)
+      budget_us += (timeouts.final_range_us + final_range_overhead);
+
+    measurement_timing_budget_us_ = budget_us;  // store for internal reuse
+    return budget_us;
+  }
+
+  bool set_measurement_timing_budget_(uint32_t budget_us) {
+    SequenceStepEnables enables{};
+    SequenceStepTimeouts timeouts{};
+
+    uint16_t start_overhead = 1320;  // note that this is different than the value in get_
+    uint16_t end_overhead = 960;
+    uint16_t msrc_overhead = 660;
+    uint16_t tcc_overhead = 590;
+    uint16_t dss_overhead = 690;
+    uint16_t pre_range_overhead = 660;
+    uint16_t final_range_overhead = 550;
+
+    uint32_t min_timing_budget = 20000;
+
+    if (budget_us < min_timing_budget) {
+      return false;
+    }
+
+    uint32_t used_budget_us = start_overhead + end_overhead;
+
+    get_sequence_step_enables_(&enables);
+    get_sequence_step_timeouts_(&enables, &timeouts);
+
+    if (enables.tcc) {
+      used_budget_us += (timeouts.msrc_dss_tcc_us + tcc_overhead);
+    }
+
+    if (enables.dss) {
+      used_budget_us += 2 * (timeouts.msrc_dss_tcc_us + dss_overhead);
+    } else if (enables.msrc) {
+      used_budget_us += (timeouts.msrc_dss_tcc_us + msrc_overhead);
+    }
+
+    if (enables.pre_range) {
+      used_budget_us += (timeouts.pre_range_us + pre_range_overhead);
+    }
+
+    if (enables.final_range) {
+      used_budget_us += final_range_overhead;
+
+      // "Note that the final range timeout is determined by the timing
+      // budget and the sum of all other timeouts within the sequence.
+      // If there is no room for the final range timeout, then an error
+      // will be set. Otherwise the remaining time will be applied to
+      // the final range."
+
+      if (used_budget_us > budget_us) {
+        // "Requested timeout too big."
+        return false;
+      }
+
+      uint32_t final_range_timeout_us = budget_us - used_budget_us;
+
+      // set_sequence_step_timeout() begin
+      // (SequenceStepId == VL53L0X_SEQUENCESTEP_FINAL_RANGE)
+
+      // "For the final range timeout, the pre-range timeout
+      //  must be added. To do this both final and pre-range
+      //  timeouts must be expressed in macro periods MClks
+      //  because they have different vcsel periods."
+
+      uint16_t final_range_timeout_mclks =
+          timeout_microseconds_to_mclks_(final_range_timeout_us, timeouts.final_range_vcsel_period_pclks);
+
+      if (enables.pre_range) {
+        final_range_timeout_mclks += timeouts.pre_range_mclks;
+      }
+
+      write_byte_16(0x71, encode_timeout_(final_range_timeout_mclks));
+
+      // set_sequence_step_timeout() end
+
+      measurement_timing_budget_us_ = budget_us;  // store for internal reuse
+    }
+    return true;
+  }
+
+  void get_sequence_step_enables_(SequenceStepEnables *enables) {
+    uint8_t sequence_config = reg(0x01).get();
+    enables->tcc = (sequence_config >> 4) & 0x1;
+    enables->dss = (sequence_config >> 3) & 0x1;
+    enables->msrc = (sequence_config >> 2) & 0x1;
+    enables->pre_range = (sequence_config >> 6) & 0x1;
+    enables->final_range = (sequence_config >> 7) & 0x1;
+  }
+
+  enum VcselPeriodType { VCSEL_PERIOD_PRE_RANGE, VCSEL_PERIOD_FINAL_RANGE };
+
+  void get_sequence_step_timeouts_(SequenceStepEnables const *enables, SequenceStepTimeouts *timeouts) {
+    timeouts->pre_range_vcsel_period_pclks = get_vcsel_pulse_period_(VCSEL_PERIOD_PRE_RANGE);
+
+    timeouts->msrc_dss_tcc_mclks = reg(0x46).get() + 1;
+    timeouts->msrc_dss_tcc_us =
+        timeout_mclks_to_microseconds_(timeouts->msrc_dss_tcc_mclks, timeouts->pre_range_vcsel_period_pclks);
+
+    uint16_t value;
+    read_byte_16(0x51, &value);
+    timeouts->pre_range_mclks = decode_timeout_(value);
+    timeouts->pre_range_us =
+        timeout_mclks_to_microseconds_(timeouts->pre_range_mclks, timeouts->pre_range_vcsel_period_pclks);
+
+    timeouts->final_range_vcsel_period_pclks = get_vcsel_pulse_period_(VCSEL_PERIOD_FINAL_RANGE);
+
+    read_byte_16(0x71, &value);
+    timeouts->final_range_mclks = decode_timeout_(value);
+
+    if (enables->pre_range) {
+      timeouts->final_range_mclks -= timeouts->pre_range_mclks;
+    }
+
+    timeouts->final_range_us =
+        timeout_mclks_to_microseconds_(timeouts->final_range_mclks, timeouts->final_range_vcsel_period_pclks);
+  }
+
+  uint8_t get_vcsel_pulse_period_(VcselPeriodType type) {
+    uint8_t vcsel;
+    if (type == VCSEL_PERIOD_PRE_RANGE)
+      vcsel = reg(0x50).get();
+    else if (type == VCSEL_PERIOD_FINAL_RANGE)
+      vcsel = reg(0x70).get();
+    else
+      return 255;
+
+    return (vcsel + 1) << 1;
+  }
+
+  uint32_t get_macro_period_(uint8_t vcsel_period_pclks) {
+    return ((2304UL * vcsel_period_pclks * 1655UL) + 500UL) / 1000UL;
+  }
+
+  uint32_t timeout_mclks_to_microseconds_(uint16_t timeout_period_mclks, uint8_t vcsel_period_pclks) {
+    uint32_t macro_period_ns = get_macro_period_(vcsel_period_pclks);
+    return ((timeout_period_mclks * macro_period_ns) + (macro_period_ns / 2)) / 1000;
+  }
+  uint32_t timeout_microseconds_to_mclks_(uint32_t timeout_period_us, uint8_t vcsel_period_pclks) {
+    uint32_t macro_period_ns = get_macro_period_(vcsel_period_pclks);
+    return (((timeout_period_us * 1000) + (macro_period_ns / 2)) / macro_period_ns);
+  }
+
+  uint16_t decode_timeout_(uint16_t reg_val) {
+    // format: "(LSByte * 2^MSByte) + 1"
+    uint8_t msb = (reg_val >> 8) & 0xFF;
+    uint8_t lsb = (reg_val >> 0) & 0xFF;
+    return (uint16_t(lsb) << msb) + 1;
+  }
+  uint16_t encode_timeout_(uint16_t timeout_mclks) {
+    // format: "(LSByte * 2^MSByte) + 1"
+    uint32_t ls_byte = 0;
+    uint16_t ms_byte = 0;
+
+    if (timeout_mclks <= 0)
+      return 0;
+
+    ls_byte = timeout_mclks - 1;
+
+    while ((ls_byte & 0xFFFFFF00) > 0) {
+      ls_byte >>= 1;
+      ms_byte++;
+    }
+
+    return (ms_byte << 8) | (ls_byte & 0xFF);
+  }
+
+  bool perform_single_ref_calibration_(uint8_t vhv_init_byte) {
+    reg(0x00) = 0x01 | vhv_init_byte;  // VL53L0X_REG_SYSRANGE_MODE_START_STOP
+
+    uint32_t start = millis();
+    while ((reg(0x13).get() & 0x07) == 0) {
+      if (millis() - start > 1000)
+        return false;
+      yield();
+    }
+
+    reg(0x0B) = 0x01;
+    reg(0x00) = 0x00;
+
+    return true;
+  }
+
+  float signal_rate_limit_;
+  uint32_t measurement_timing_budget_us_;
+  bool initiated_read_{false};
+  bool waiting_for_interrupt_{false};
+  uint8_t stop_variable_;
+};
+
+}  // namespace vl53l0x
+}  // namespace esphome

From f1e00f8c8e8ec86b99e82aa5d041d3753045f3ed Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 20 Oct 2019 18:10:14 +0200
Subject: [PATCH 016/412] Add GPIO Switch interlock wait time (#777)

* Add interlock wait time to gpio switch

Fixes https://github.com/esphome/issues/issues/753

* Format

* Fix
---
 esphome/components/gpio/switch/__init__.py     |  3 +++
 esphome/components/gpio/switch/gpio_switch.cpp | 18 +++++++++++++++++-
 esphome/components/gpio/switch/gpio_switch.h   |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/esphome/components/gpio/switch/__init__.py b/esphome/components/gpio/switch/__init__.py
index 7b383cb8a9..f75bc71009 100644
--- a/esphome/components/gpio/switch/__init__.py
+++ b/esphome/components/gpio/switch/__init__.py
@@ -15,12 +15,14 @@ RESTORE_MODES = {
     'ALWAYS_ON': GPIOSwitchRestoreMode.GPIO_SWITCH_ALWAYS_ON,
 }
 
+CONF_INTERLOCK_WAIT_TIME = 'interlock_wait_time'
 CONFIG_SCHEMA = switch.SWITCH_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(GPIOSwitch),
     cv.Required(CONF_PIN): pins.gpio_output_pin_schema,
     cv.Optional(CONF_RESTORE_MODE, default='RESTORE_DEFAULT_OFF'):
         cv.enum(RESTORE_MODES, upper=True, space='_'),
     cv.Optional(CONF_INTERLOCK): cv.ensure_list(cv.use_id(switch.Switch)),
+    cv.Optional(CONF_INTERLOCK_WAIT_TIME, default='0ms'): cv.positive_time_period_milliseconds,
 }).extend(cv.COMPONENT_SCHEMA)
 
 
@@ -40,3 +42,4 @@ def to_code(config):
             lock = yield cg.get_variable(it)
             interlock.append(lock)
         cg.add(var.set_interlock(interlock))
+        cg.add(var.set_interlock_wait_time(config[CONF_INTERLOCK_WAIT_TIME]))
diff --git a/esphome/components/gpio/switch/gpio_switch.cpp b/esphome/components/gpio/switch/gpio_switch.cpp
index d22a74847e..d87e5a61e6 100644
--- a/esphome/components/gpio/switch/gpio_switch.cpp
+++ b/esphome/components/gpio/switch/gpio_switch.cpp
@@ -69,13 +69,29 @@ void GPIOSwitch::dump_config() {
 void GPIOSwitch::write_state(bool state) {
   if (state != this->inverted_) {
     // Turning ON, check interlocking
+
+    bool found = false;
     for (auto *lock : this->interlock_) {
       if (lock == this)
         continue;
 
-      if (lock->state)
+      if (lock->state) {
         lock->turn_off();
+        found = true;
+      }
     }
+    if (found && this->interlock_wait_time_ != 0) {
+      this->set_timeout("interlock", this->interlock_wait_time_, [this, state] {
+        // Don't write directly, call the function again
+        // (some other switch may have changed state while we were waiting)
+        this->write_state(state);
+      });
+      return;
+    }
+  } else if (this->interlock_wait_time_ != 0) {
+    // If we are switched off during the interlock wait time, cancel any pending
+    // re-activations
+    this->cancel_timeout("interlock");
   }
 
   this->pin_->digital_write(state);
diff --git a/esphome/components/gpio/switch/gpio_switch.h b/esphome/components/gpio/switch/gpio_switch.h
index ceace477b2..dc0dd9bc95 100644
--- a/esphome/components/gpio/switch/gpio_switch.h
+++ b/esphome/components/gpio/switch/gpio_switch.h
@@ -26,6 +26,7 @@ class GPIOSwitch : public switch_::Switch, public Component {
   void setup() override;
   void dump_config() override;
   void set_interlock(const std::vector<Switch *> &interlock);
+  void set_interlock_wait_time(uint32_t interlock_wait_time) { interlock_wait_time_ = interlock_wait_time; }
 
  protected:
   void write_state(bool state) override;
@@ -33,6 +34,7 @@ class GPIOSwitch : public switch_::Switch, public Component {
   GPIOPin *pin_;
   GPIOSwitchRestoreMode restore_mode_{GPIO_SWITCH_RESTORE_DEFAULT_OFF};
   std::vector<Switch *> interlock_;
+  uint32_t interlock_wait_time_{0};
 };
 
 }  // namespace gpio

From e077ad56bd47b1b388f0d2fc5652a24a73e90510 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 20 Oct 2019 19:24:20 +0200
Subject: [PATCH 017/412] Add PZEM004T/PZEMAC/PZEMDC Support (#587)

* Add PZEM004T Support

* Don't flush as much

* Update pzem004t.cpp

* Add generalized modbus

* Add PZEMAC

* Add PZEMDC

* Fix file modes

* Lint

* Fix

* Fix

* Add check_uart_settings
---
 esphome/components/cse7766/cse7766.cpp   |   1 +
 esphome/components/mhz19/mhz19.cpp       |   1 +
 esphome/components/modbus/__init__.py    |  43 ++++++++
 esphome/components/modbus/modbus.cpp     | 119 +++++++++++++++++++++++
 esphome/components/modbus/modbus.h       |  51 ++++++++++
 esphome/components/pmsx003/pmsx003.cpp   |   1 +
 esphome/components/pzem004t/__init__.py  |   0
 esphome/components/pzem004t/pzem004t.cpp | 103 ++++++++++++++++++++
 esphome/components/pzem004t/pzem004t.h   |  39 ++++++++
 esphome/components/pzem004t/sensor.py    |  37 +++++++
 esphome/components/pzemac/__init__.py    |   0
 esphome/components/pzemac/pzemac.cpp     |  62 ++++++++++++
 esphome/components/pzemac/pzemac.h       |  31 ++++++
 esphome/components/pzemac/sensor.py      |  47 +++++++++
 esphome/components/pzemdc/__init__.py    |   0
 esphome/components/pzemdc/pzemdc.cpp     |  52 ++++++++++
 esphome/components/pzemdc/pzemdc.h       |  31 ++++++
 esphome/components/pzemdc/sensor.py      |  36 +++++++
 esphome/components/sds011/sds011.cpp     |   1 +
 esphome/components/senseair/senseair.cpp |   1 +
 esphome/components/tuya/tuya.cpp         |   1 +
 esphome/components/uart/__init__.py      |   3 +
 esphome/components/uart/uart.cpp         |  39 ++++++--
 esphome/components/uart/uart.h           |  19 +++-
 esphome/const.py                         |   2 +
 tests/test3.yaml                         |  25 +++++
 26 files changed, 738 insertions(+), 7 deletions(-)
 create mode 100644 esphome/components/modbus/__init__.py
 create mode 100644 esphome/components/modbus/modbus.cpp
 create mode 100644 esphome/components/modbus/modbus.h
 create mode 100644 esphome/components/pzem004t/__init__.py
 create mode 100644 esphome/components/pzem004t/pzem004t.cpp
 create mode 100644 esphome/components/pzem004t/pzem004t.h
 create mode 100644 esphome/components/pzem004t/sensor.py
 create mode 100644 esphome/components/pzemac/__init__.py
 create mode 100644 esphome/components/pzemac/pzemac.cpp
 create mode 100644 esphome/components/pzemac/pzemac.h
 create mode 100644 esphome/components/pzemac/sensor.py
 create mode 100644 esphome/components/pzemdc/__init__.py
 create mode 100644 esphome/components/pzemdc/pzemdc.cpp
 create mode 100644 esphome/components/pzemdc/pzemdc.h
 create mode 100644 esphome/components/pzemdc/sensor.py

diff --git a/esphome/components/cse7766/cse7766.cpp b/esphome/components/cse7766/cse7766.cpp
index 358453a63a..6c014138fd 100644
--- a/esphome/components/cse7766/cse7766.cpp
+++ b/esphome/components/cse7766/cse7766.cpp
@@ -172,6 +172,7 @@ void CSE7766Component::dump_config() {
   LOG_SENSOR("  ", "Voltage", this->voltage_sensor_);
   LOG_SENSOR("  ", "Current", this->current_sensor_);
   LOG_SENSOR("  ", "Power", this->power_sensor_);
+  this->check_uart_settings(4800);
 }
 
 }  // namespace cse7766
diff --git a/esphome/components/mhz19/mhz19.cpp b/esphome/components/mhz19/mhz19.cpp
index 36ccf70d84..8e28d04dea 100644
--- a/esphome/components/mhz19/mhz19.cpp
+++ b/esphome/components/mhz19/mhz19.cpp
@@ -94,6 +94,7 @@ void MHZ19Component::dump_config() {
   ESP_LOGCONFIG(TAG, "MH-Z19:");
   LOG_SENSOR("  ", "CO2", this->co2_sensor_);
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  this->check_uart_settings(9600);
 
   if (this->abc_boot_logic_ == MHZ19_ABC_ENABLED) {
     ESP_LOGCONFIG(TAG, "  Automatic baseline calibration enabled on boot");
diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py
new file mode 100644
index 0000000000..88105b7baf
--- /dev/null
+++ b/esphome/components/modbus/__init__.py
@@ -0,0 +1,43 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.const import CONF_ID, CONF_ADDRESS
+from esphome.core import coroutine
+
+DEPENDENCIES = ['uart']
+
+modbus_ns = cg.esphome_ns.namespace('modbus')
+Modbus = modbus_ns.class_('Modbus', cg.Component, uart.UARTDevice)
+ModbusDevice = modbus_ns.class_('ModbusDevice')
+MULTI_CONF = True
+
+CONF_MODBUS_ID = 'modbus_id'
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(Modbus),
+}).extend(cv.COMPONENT_SCHEMA).extend(uart.UART_DEVICE_SCHEMA)
+
+
+def to_code(config):
+    cg.add_global(modbus_ns.using)
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+
+    yield uart.register_uart_device(var, config)
+
+
+def modbus_device_schema(default_address):
+    schema = {
+        cv.GenerateID(CONF_MODBUS_ID): cv.use_id(Modbus),
+    }
+    if default_address is None:
+        schema[cv.Required(CONF_ADDRESS)] = cv.hex_uint8_t
+    else:
+        schema[cv.Optional(CONF_ADDRESS, default=default_address)] = cv.hex_uint8_t
+    return cv.Schema(schema)
+
+
+@coroutine
+def register_modbus_device(var, config):
+    parent = yield cg.get_variable(config[CONF_MODBUS_ID])
+    cg.add(var.set_parent(parent))
+    cg.add(var.set_address(config[CONF_ADDRESS]))
diff --git a/esphome/components/modbus/modbus.cpp b/esphome/components/modbus/modbus.cpp
new file mode 100644
index 0000000000..92505c6429
--- /dev/null
+++ b/esphome/components/modbus/modbus.cpp
@@ -0,0 +1,119 @@
+#include "modbus.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace modbus {
+
+static const char *TAG = "modbus";
+
+void Modbus::loop() {
+  const uint32_t now = millis();
+  if (now - this->last_modbus_byte_ > 50) {
+    this->rx_buffer_.clear();
+    this->last_modbus_byte_ = now;
+  }
+
+  while (this->available()) {
+    uint8_t byte;
+    this->read_byte(&byte);
+    if (this->parse_modbus_byte_(byte)) {
+      this->last_modbus_byte_ = now;
+    } else {
+      this->rx_buffer_.clear();
+    }
+  }
+}
+
+uint16_t crc16(uint8_t *data, uint8_t len) {
+  uint16_t crc = 0xFFFF;
+  while (len--) {
+    crc ^= *data++;
+    for (uint8_t i = 0; i < 8; i++) {
+      if ((crc & 0x01) != 0) {
+        crc >>= 1;
+        crc ^= 0xA001;
+      } else {
+        crc >>= 1;
+      }
+    }
+  }
+  return crc;
+}
+
+bool Modbus::parse_modbus_byte_(uint8_t byte) {
+  size_t at = this->rx_buffer_.size();
+  this->rx_buffer_.push_back(byte);
+  uint8_t *raw = &this->rx_buffer_[0];
+
+  // Byte 0: modbus address (match all)
+  if (at == 0)
+    return true;
+  uint8_t address = raw[0];
+
+  // Byte 1: Function (msb indicates error)
+  if (at == 1)
+    return (byte & 0x80) != 0x80;
+
+  // Byte 2: Size (with modbus rtu function code 4/3)
+  // See also https://en.wikipedia.org/wiki/Modbus
+  if (at == 2)
+    return true;
+
+  uint8_t data_len = raw[2];
+  // Byte 3..3+data_len-1: Data
+  if (at < 3 + data_len)
+    return true;
+
+  // Byte 3+data_len: CRC_LO (over all bytes)
+  if (at == 3 + data_len)
+    return true;
+  // Byte 3+len+1: CRC_HI (over all bytes)
+  uint16_t computed_crc = crc16(raw, 3 + data_len);
+  uint16_t remote_crc = uint16_t(raw[3 + data_len]) | (uint16_t(raw[3 + data_len]) << 8);
+  if (computed_crc != remote_crc) {
+    ESP_LOGW(TAG, "Modbus CRC Check failed! %02X!=%02X", computed_crc, remote_crc);
+    return false;
+  }
+
+  std::vector<uint8_t> data(this->rx_buffer_.begin() + 3, this->rx_buffer_.begin() + 3 + data_len);
+
+  bool found = false;
+  for (auto *device : this->devices_) {
+    if (device->address_ == address) {
+      device->on_modbus_data(data);
+      found = true;
+    }
+  }
+  if (!found) {
+    ESP_LOGW(TAG, "Got Modbus frame from unknown address 0x%02X!", address);
+  }
+
+  // return false to reset buffer
+  return false;
+}
+
+void Modbus::dump_config() {
+  ESP_LOGCONFIG(TAG, "Modbus:");
+  this->check_uart_settings(9600, 2);
+}
+float Modbus::get_setup_priority() const {
+  // After UART bus
+  return setup_priority::BUS - 1.0f;
+}
+void Modbus::send(uint8_t address, uint8_t function, uint16_t start_address, uint16_t register_count) {
+  uint8_t frame[8];
+  frame[0] = address;
+  frame[1] = function;
+  frame[2] = start_address >> 8;
+  frame[3] = start_address >> 0;
+  frame[4] = register_count >> 8;
+  frame[5] = register_count >> 0;
+  auto crc = crc16(frame, 6);
+  frame[6] = crc >> 0;
+  frame[7] = crc >> 8;
+
+  this->write_array(frame, 8);
+}
+
+}  // namespace modbus
+}  // namespace esphome
diff --git a/esphome/components/modbus/modbus.h b/esphome/components/modbus/modbus.h
new file mode 100644
index 0000000000..b75de147b1
--- /dev/null
+++ b/esphome/components/modbus/modbus.h
@@ -0,0 +1,51 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+
+namespace esphome {
+namespace modbus {
+
+class ModbusDevice;
+
+class Modbus : public uart::UARTDevice, public Component {
+ public:
+  Modbus() = default;
+
+  void loop() override;
+
+  void dump_config() override;
+
+  void register_device(ModbusDevice *device) { this->devices_.push_back(device); }
+
+  float get_setup_priority() const override;
+
+  void send(uint8_t address, uint8_t function, uint16_t start_address, uint16_t register_count);
+
+ protected:
+  bool parse_modbus_byte_(uint8_t byte);
+
+  std::vector<uint8_t> rx_buffer_;
+  uint32_t last_modbus_byte_{0};
+  std::vector<ModbusDevice *> devices_;
+};
+
+class ModbusDevice {
+ public:
+  void set_parent(Modbus *parent) { parent_ = parent; }
+  void set_address(uint8_t address) { address_ = address; }
+  virtual void on_modbus_data(const std::vector<uint8_t> &data) = 0;
+
+  void send(uint8_t function, uint16_t start_address, uint16_t register_count) {
+    this->parent_->send(this->address_, function, start_address, register_count);
+  }
+
+ protected:
+  friend Modbus;
+
+  Modbus *parent_;
+  uint8_t address_;
+};
+
+}  // namespace modbus
+}  // namespace esphome
diff --git a/esphome/components/pmsx003/pmsx003.cpp b/esphome/components/pmsx003/pmsx003.cpp
index 548099a495..489442c637 100644
--- a/esphome/components/pmsx003/pmsx003.cpp
+++ b/esphome/components/pmsx003/pmsx003.cpp
@@ -169,6 +169,7 @@ void PMSX003Component::dump_config() {
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
   LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
   LOG_SENSOR("  ", "Formaldehyde", this->formaldehyde_sensor_);
+  this->check_uart_settings(9600);
 }
 
 }  // namespace pmsx003
diff --git a/esphome/components/pzem004t/__init__.py b/esphome/components/pzem004t/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/pzem004t/pzem004t.cpp b/esphome/components/pzem004t/pzem004t.cpp
new file mode 100644
index 0000000000..3f07e74f9b
--- /dev/null
+++ b/esphome/components/pzem004t/pzem004t.cpp
@@ -0,0 +1,103 @@
+#include "pzem004t.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace pzem004t {
+
+static const char *TAG = "pzem004t";
+
+void PZEM004T::loop() {
+  const uint32_t now = millis();
+  if (now - this->last_read_ > 500 && this->available()) {
+    while (this->available())
+      this->read();
+    this->last_read_ = now;
+  }
+
+  // PZEM004T packet size is 7 byte
+  while (this->available() >= 7) {
+    auto resp = *this->read_array<7>();
+    // packet format:
+    // 0: packet type
+    // 1-5: data
+    // 6: checksum (sum of other bytes)
+    // see https://github.com/olehs/PZEM004T
+    uint8_t sum = 0;
+    for (int i = 0; i < 6; i++)
+      sum += resp[i];
+
+    if (sum != resp[6]) {
+      ESP_LOGV(TAG, "PZEM004T invalid checksum! 0x%02X != 0x%02X", sum, resp[6]);
+      continue;
+    }
+
+    switch (resp[0]) {
+      case 0xA4: {  // Set Module Address Response
+        this->write_state_(READ_VOLTAGE);
+        break;
+      }
+      case 0xA0: {  // Voltage Response
+        uint16_t int_voltage = (uint16_t(resp[1]) << 8) | (uint16_t(resp[2]) << 0);
+        float voltage = int_voltage + (resp[3] / 10.0f);
+        if (this->voltage_sensor_ != nullptr)
+          this->voltage_sensor_->publish_state(voltage);
+        ESP_LOGD(TAG, "Got Voltage %.1f V", voltage);
+        this->write_state_(READ_CURRENT);
+        break;
+      }
+      case 0xA1: {  // Current Response
+        uint16_t int_current = (uint16_t(resp[1]) << 8) | (uint16_t(resp[2]) << 0);
+        float current = int_current + (resp[3] / 100.0f);
+        if (this->current_sensor_ != nullptr)
+          this->current_sensor_->publish_state(current);
+        ESP_LOGD(TAG, "Got Current %.2f A", current);
+        this->write_state_(READ_POWER);
+        break;
+      }
+      case 0xA2: {  // Active Power Response
+        uint16_t power = (uint16_t(resp[1]) << 8) | (uint16_t(resp[2]) << 0);
+        if (this->power_sensor_ != nullptr)
+          this->power_sensor_->publish_state(power);
+        ESP_LOGD(TAG, "Got Power %u W", power);
+        this->write_state_(DONE);
+        break;
+      }
+
+      case 0xA3:  // Energy Response
+      case 0xA5:  // Set Power Alarm Response
+      case 0xB0:  // Voltage Request
+      case 0xB1:  // Current Request
+      case 0xB2:  // Active Power Response
+      case 0xB3:  // Energy Request
+      case 0xB4:  // Set Module Address Request
+      case 0xB5:  // Set Power Alarm Request
+      default:
+        break;
+    }
+
+    this->last_read_ = now;
+  }
+}
+void PZEM004T::update() { this->write_state_(SET_ADDRESS); }
+void PZEM004T::write_state_(PZEM004T::PZEM004TReadState state) {
+  if (state == DONE) {
+    this->read_state_ = state;
+    return;
+  }
+  std::array<uint8_t, 7> data{};
+  data[0] = state;
+  data[1] = 192;
+  data[2] = 168;
+  data[3] = 1;
+  data[4] = 1;
+  data[5] = 0;
+  data[6] = 0;
+  for (int i = 0; i < 6; i++)
+    data[6] += data[i];
+
+  this->write_array(data);
+  this->read_state_ = state;
+}
+
+}  // namespace pzem004t
+}  // namespace esphome
diff --git a/esphome/components/pzem004t/pzem004t.h b/esphome/components/pzem004t/pzem004t.h
new file mode 100644
index 0000000000..7969efd78c
--- /dev/null
+++ b/esphome/components/pzem004t/pzem004t.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+#include "esphome/components/sensor/sensor.h"
+
+namespace esphome {
+namespace pzem004t {
+
+class PZEM004T : public PollingComponent, public uart::UARTDevice {
+ public:
+  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
+  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
+  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
+
+  void loop() override;
+
+  void update() override;
+
+ protected:
+  sensor::Sensor *voltage_sensor_;
+  sensor::Sensor *current_sensor_;
+  sensor::Sensor *power_sensor_;
+
+  enum PZEM004TReadState {
+    SET_ADDRESS = 0xB4,
+    READ_VOLTAGE = 0xB0,
+    READ_CURRENT = 0xB1,
+    READ_POWER = 0xB2,
+    DONE = 0x00,
+  } read_state_{DONE};
+
+  void write_state_(PZEM004TReadState state);
+
+  uint32_t last_read_{0};
+};
+
+}  // namespace pzem004t
+}  // namespace esphome
diff --git a/esphome/components/pzem004t/sensor.py b/esphome/components/pzem004t/sensor.py
new file mode 100644
index 0000000000..6e3628c5ec
--- /dev/null
+++ b/esphome/components/pzem004t/sensor.py
@@ -0,0 +1,37 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, uart
+from esphome.const import CONF_CURRENT, CONF_ID, CONF_POWER, CONF_VOLTAGE, \
+    UNIT_VOLT, ICON_FLASH, UNIT_AMPERE, UNIT_WATT
+
+DEPENDENCIES = ['uart']
+
+pzem004t_ns = cg.esphome_ns.namespace('pzem004t')
+PZEM004T = pzem004t_ns.class_('PZEM004T', cg.PollingComponent, uart.UARTDevice)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(PZEM004T),
+
+    cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 1),
+    cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_FLASH, 2),
+    cv.Optional(CONF_POWER): sensor.sensor_schema(UNIT_WATT, ICON_FLASH, 0),
+}).extend(cv.polling_component_schema('60s')).extend(uart.UART_DEVICE_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield uart.register_uart_device(var, config)
+
+    if CONF_VOLTAGE in config:
+        conf = config[CONF_VOLTAGE]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_voltage_sensor(sens))
+    if CONF_CURRENT in config:
+        conf = config[CONF_CURRENT]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_current_sensor(sens))
+    if CONF_POWER in config:
+        conf = config[CONF_POWER]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_power_sensor(sens))
diff --git a/esphome/components/pzemac/__init__.py b/esphome/components/pzemac/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/pzemac/pzemac.cpp b/esphome/components/pzemac/pzemac.cpp
new file mode 100644
index 0000000000..1c3957dc09
--- /dev/null
+++ b/esphome/components/pzemac/pzemac.cpp
@@ -0,0 +1,62 @@
+#include "pzemac.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace pzemac {
+
+static const char *TAG = "pzemac";
+
+static const uint8_t PZEM_CMD_READ_IN_REGISTERS = 0x04;
+static const uint8_t PZEM_REGISTER_COUNT = 10;  // 10x 16-bit registers
+
+void PZEMAC::on_modbus_data(const std::vector<uint8_t> &data) {
+  if (data.size() < 20) {
+    ESP_LOGW(TAG, "Invalid size for PZEM AC!");
+    return;
+  }
+
+  // See https://github.com/esphome/feature-requests/issues/49#issuecomment-538636809
+  //  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
+  // 01 04 14 08 D1 00 6C 00 00 00 F4 00 00 00 26 00 00 01 F4 00 64 00 00 51 34
+  // Id Cc Sz Volt- Current---- Power------ Energy----- Frequ PFact Alarm Crc--
+
+  auto pzem_get_16bit = [&](size_t i) -> uint16_t {
+    return (uint16_t(data[i + 0]) << 8) | (uint16_t(data[i + 1]) << 0);
+  };
+  auto pzem_get_32bit = [&](size_t i) -> uint32_t {
+    return (uint32_t(pzem_get_16bit(i + 2)) << 16) | (uint32_t(pzem_get_16bit(i + 0)) << 0);
+  };
+
+  uint16_t raw_voltage = pzem_get_16bit(0);
+  float voltage = raw_voltage / 10.0f;  // max 6553.5 V
+
+  uint32_t raw_current = pzem_get_32bit(2);
+  float current = raw_current / 1000.0f;  // max 4294967.295 A
+
+  uint32_t raw_active_power = pzem_get_32bit(6);
+  float active_power = raw_active_power / 10.0f;  // max 429496729.5 W
+
+  uint16_t raw_frequency = pzem_get_16bit(14);
+  float frequency = raw_frequency / 10.0f;
+
+  uint16_t raw_power_factor = pzem_get_16bit(16);
+  float power_factor = raw_power_factor / 100.0f;
+
+  ESP_LOGD(TAG, "PZEM AC: V=%.1f V, I=%.3f A, P=%.1f W, F=%.1f Hz, PF=%.2f", voltage, current, active_power, frequency,
+           power_factor);
+  if (this->voltage_sensor_ != nullptr)
+    this->voltage_sensor_->publish_state(voltage);
+  if (this->current_sensor_ != nullptr)
+    this->current_sensor_->publish_state(current);
+  if (this->power_sensor_ != nullptr)
+    this->power_sensor_->publish_state(active_power);
+  if (this->frequency_sensor_ != nullptr)
+    this->frequency_sensor_->publish_state(frequency);
+  if (this->power_factor_sensor_ != nullptr)
+    this->power_factor_sensor_->publish_state(power_factor);
+}
+
+void PZEMAC::update() { this->send(PZEM_CMD_READ_IN_REGISTERS, 0, PZEM_REGISTER_COUNT); }
+
+}  // namespace pzemac
+}  // namespace esphome
diff --git a/esphome/components/pzemac/pzemac.h b/esphome/components/pzemac/pzemac.h
new file mode 100644
index 0000000000..0ba742fafe
--- /dev/null
+++ b/esphome/components/pzemac/pzemac.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/modbus/modbus.h"
+
+namespace esphome {
+namespace pzemac {
+
+class PZEMAC : public PollingComponent, public modbus::ModbusDevice {
+ public:
+  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
+  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
+  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
+  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
+  void set_power_factor_sensor(sensor::Sensor *power_factor_sensor) { power_factor_sensor_ = power_factor_sensor; }
+
+  void update() override;
+
+  void on_modbus_data(const std::vector<uint8_t> &data) override;
+
+ protected:
+  sensor::Sensor *voltage_sensor_;
+  sensor::Sensor *current_sensor_;
+  sensor::Sensor *power_sensor_;
+  sensor::Sensor *frequency_sensor_;
+  sensor::Sensor *power_factor_sensor_;
+};
+
+}  // namespace pzemac
+}  // namespace esphome
diff --git a/esphome/components/pzemac/sensor.py b/esphome/components/pzemac/sensor.py
new file mode 100644
index 0000000000..35d8069767
--- /dev/null
+++ b/esphome/components/pzemac/sensor.py
@@ -0,0 +1,47 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, modbus
+from esphome.const import CONF_CURRENT, CONF_ID, CONF_POWER, CONF_VOLTAGE, \
+    CONF_FREQUENCY, UNIT_VOLT, ICON_FLASH, UNIT_AMPERE, UNIT_WATT, UNIT_EMPTY, \
+    ICON_POWER, CONF_POWER_FACTOR, ICON_CURRENT_AC
+
+AUTO_LOAD = ['modbus']
+
+pzemac_ns = cg.esphome_ns.namespace('pzemac')
+PZEMAC = pzemac_ns.class_('PZEMAC', cg.PollingComponent, modbus.ModbusDevice)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(PZEMAC),
+    cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 1),
+    cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_CURRENT_AC, 3),
+    cv.Optional(CONF_POWER): sensor.sensor_schema(UNIT_WATT, ICON_POWER, 1),
+    cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(UNIT_EMPTY, ICON_CURRENT_AC, 1),
+    cv.Optional(CONF_POWER_FACTOR): sensor.sensor_schema(UNIT_EMPTY, ICON_FLASH, 2),
+}).extend(cv.polling_component_schema('60s')).extend(modbus.modbus_device_schema(0x01))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield modbus.register_modbus_device(var, config)
+
+    if CONF_VOLTAGE in config:
+        conf = config[CONF_VOLTAGE]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_voltage_sensor(sens))
+    if CONF_CURRENT in config:
+        conf = config[CONF_CURRENT]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_current_sensor(sens))
+    if CONF_POWER in config:
+        conf = config[CONF_POWER]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_power_sensor(sens))
+    if CONF_FREQUENCY in config:
+        conf = config[CONF_FREQUENCY]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_frequency_sensor(sens))
+    if CONF_POWER_FACTOR in config:
+        conf = config[CONF_POWER_FACTOR]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_power_factor_sensor(sens))
diff --git a/esphome/components/pzemdc/__init__.py b/esphome/components/pzemdc/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/pzemdc/pzemdc.cpp b/esphome/components/pzemdc/pzemdc.cpp
new file mode 100644
index 0000000000..c85d35106d
--- /dev/null
+++ b/esphome/components/pzemdc/pzemdc.cpp
@@ -0,0 +1,52 @@
+#include "pzemdc.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace pzemdc {
+
+static const char *TAG = "pzemdc";
+
+static const uint8_t PZEM_CMD_READ_IN_REGISTERS = 0x04;
+static const uint8_t PZEM_REGISTER_COUNT = 10;  // 10x 16-bit registers
+
+void PZEMDC::on_modbus_data(const std::vector<uint8_t> &data) {
+  if (data.size() < 16) {
+    ESP_LOGW(TAG, "Invalid size for PZEM DC!");
+    return;
+  }
+
+  // See https://github.com/esphome/feature-requests/issues/49#issuecomment-538636809
+  //           0     1     2     3     4     5     6     7           = ModBus register
+  //  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20  = Buffer index
+  // 01 04 10 05 40 00 0A 00 0D 00 00 00 02 00 00 00 00 00 00 D6 29
+  // Id Cc Sz Volt- Curre Power------ Energy----- HiAlm LoAlm Crc--
+
+  auto pzem_get_16bit = [&](size_t i) -> uint16_t {
+    return (uint16_t(data[i + 0]) << 8) | (uint16_t(data[i + 1]) << 0);
+  };
+  auto pzem_get_32bit = [&](size_t i) -> uint32_t {
+    return (uint32_t(pzem_get_16bit(i + 2)) << 16) | (uint32_t(pzem_get_16bit(i + 0)) << 0);
+  };
+
+  uint16_t raw_voltage = pzem_get_16bit(0);
+  float voltage = raw_voltage / 100.0f;  // max 655.35 V
+
+  uint16_t raw_current = pzem_get_16bit(2);
+  float current = raw_current / 100.0f;  // max 655.35 A
+
+  uint32_t raw_power = pzem_get_32bit(4);
+  float power = raw_power / 10.0f;  // max 429496729.5 W
+
+  ESP_LOGD(TAG, "PZEM DC: V=%.1f V, I=%.3f A, P=%.1f W", voltage, current, power);
+  if (this->voltage_sensor_ != nullptr)
+    this->voltage_sensor_->publish_state(voltage);
+  if (this->current_sensor_ != nullptr)
+    this->current_sensor_->publish_state(current);
+  if (this->power_sensor_ != nullptr)
+    this->power_sensor_->publish_state(power);
+}
+
+void PZEMDC::update() { this->send(PZEM_CMD_READ_IN_REGISTERS, 0, 8); }
+
+}  // namespace pzemdc
+}  // namespace esphome
diff --git a/esphome/components/pzemdc/pzemdc.h b/esphome/components/pzemdc/pzemdc.h
new file mode 100644
index 0000000000..e19203dc21
--- /dev/null
+++ b/esphome/components/pzemdc/pzemdc.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/modbus/modbus.h"
+
+namespace esphome {
+namespace pzemdc {
+
+class PZEMDC : public PollingComponent, public modbus::ModbusDevice {
+ public:
+  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
+  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
+  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
+  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
+  void set_powerfactor_sensor(sensor::Sensor *powerfactor_sensor) { power_factor_sensor_ = powerfactor_sensor; }
+
+  void update() override;
+
+  void on_modbus_data(const std::vector<uint8_t> &data) override;
+
+ protected:
+  sensor::Sensor *voltage_sensor_;
+  sensor::Sensor *current_sensor_;
+  sensor::Sensor *power_sensor_;
+  sensor::Sensor *frequency_sensor_;
+  sensor::Sensor *power_factor_sensor_;
+};
+
+}  // namespace pzemdc
+}  // namespace esphome
diff --git a/esphome/components/pzemdc/sensor.py b/esphome/components/pzemdc/sensor.py
new file mode 100644
index 0000000000..8c6fd08868
--- /dev/null
+++ b/esphome/components/pzemdc/sensor.py
@@ -0,0 +1,36 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, modbus
+from esphome.const import CONF_CURRENT, CONF_ID, CONF_POWER, CONF_VOLTAGE, \
+    UNIT_VOLT, ICON_FLASH, UNIT_AMPERE, UNIT_WATT, ICON_POWER, ICON_CURRENT_AC
+
+AUTO_LOAD = ['modbus']
+
+pzemdc_ns = cg.esphome_ns.namespace('pzemdc')
+PZEMDC = pzemdc_ns.class_('PZEMDC', cg.PollingComponent, modbus.ModbusDevice)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(PZEMDC),
+    cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 1),
+    cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_CURRENT_AC, 3),
+    cv.Optional(CONF_POWER): sensor.sensor_schema(UNIT_WATT, ICON_POWER, 1),
+}).extend(cv.polling_component_schema('60s')).extend(modbus.modbus_device_schema(0x01))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield modbus.register_modbus_device(var, config)
+
+    if CONF_VOLTAGE in config:
+        conf = config[CONF_VOLTAGE]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_voltage_sensor(sens))
+    if CONF_CURRENT in config:
+        conf = config[CONF_CURRENT]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_current_sensor(sens))
+    if CONF_POWER in config:
+        conf = config[CONF_POWER]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_power_sensor(sens))
diff --git a/esphome/components/sds011/sds011.cpp b/esphome/components/sds011/sds011.cpp
index 6ca414c55d..1a5be0adc3 100644
--- a/esphome/components/sds011/sds011.cpp
+++ b/esphome/components/sds011/sds011.cpp
@@ -56,6 +56,7 @@ void SDS011Component::dump_config() {
   ESP_LOGCONFIG(TAG, "  RX-only mode: %s", ONOFF(this->rx_mode_only_));
   LOG_SENSOR("  ", "PM2.5", this->pm_2_5_sensor_);
   LOG_SENSOR("  ", "PM10.0", this->pm_10_0_sensor_);
+  this->check_uart_settings(9600);
 }
 
 void SDS011Component::loop() {
diff --git a/esphome/components/senseair/senseair.cpp b/esphome/components/senseair/senseair.cpp
index 96f456282f..8b41a441ad 100644
--- a/esphome/components/senseair/senseair.cpp
+++ b/esphome/components/senseair/senseair.cpp
@@ -73,6 +73,7 @@ bool SenseAirComponent::senseair_write_command_(const uint8_t *command, uint8_t
 void SenseAirComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "SenseAir:");
   LOG_SENSOR("  ", "CO2", this->co2_sensor_);
+  this->check_uart_settings(9600);
 }
 
 }  // namespace senseair
diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index ae3e7eed43..4efcf08fe6 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -36,6 +36,7 @@ void Tuya::dump_config() {
     else
       ESP_LOGCONFIG(TAG, "  Datapoint %d: unknown", info.id);
   }
+  this->check_uart_settings(9600);
 }
 
 bool Tuya::validate_message_() {
diff --git a/esphome/components/uart/__init__.py b/esphome/components/uart/__init__.py
index 110bd64c81..2511cf28b1 100644
--- a/esphome/components/uart/__init__.py
+++ b/esphome/components/uart/__init__.py
@@ -29,11 +29,13 @@ def validate_rx_pin(value):
     return value
 
 
+CONF_STOP_BITS = 'stop_bits'
 CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.GenerateID(): cv.declare_id(UARTComponent),
     cv.Required(CONF_BAUD_RATE): cv.int_range(min=1),
     cv.Optional(CONF_TX_PIN): pins.output_pin,
     cv.Optional(CONF_RX_PIN): validate_rx_pin,
+    cv.Optional(CONF_STOP_BITS, default=1): cv.one_of(1, 2, int=True),
 }).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(CONF_TX_PIN, CONF_RX_PIN))
 
 
@@ -48,6 +50,7 @@ def to_code(config):
         cg.add(var.set_tx_pin(config[CONF_TX_PIN]))
     if CONF_RX_PIN in config:
         cg.add(var.set_rx_pin(config[CONF_RX_PIN]))
+    cg.add(var.set_stop_bits(config[CONF_STOP_BITS]))
 
 
 # A schema to use for all UART devices, all UART integrations must extend this!
diff --git a/esphome/components/uart/uart.cpp b/esphome/components/uart/uart.cpp
index 83ae81490e..fd27a8f897 100644
--- a/esphome/components/uart/uart.cpp
+++ b/esphome/components/uart/uart.cpp
@@ -25,7 +25,10 @@ void UARTComponent::setup() {
   }
   int8_t tx = this->tx_pin_.has_value() ? *this->tx_pin_ : -1;
   int8_t rx = this->rx_pin_.has_value() ? *this->rx_pin_ : -1;
-  this->hw_serial_->begin(this->baud_rate_, SERIAL_8N1, rx, tx);
+  uint32_t config = SERIAL_8N1;
+  if (this->stop_bits_ == 2)
+    config = SERIAL_8N2;
+  this->hw_serial_->begin(this->baud_rate_, config, rx, tx);
 }
 
 void UARTComponent::dump_config() {
@@ -37,6 +40,7 @@ void UARTComponent::dump_config() {
     ESP_LOGCONFIG(TAG, "  RX Pin: GPIO%d", *this->rx_pin_);
   }
   ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
+  ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
 }
 
 void UARTComponent::write_byte(uint8_t data) {
@@ -102,21 +106,27 @@ void UARTComponent::setup() {
   // Use Arduino HardwareSerial UARTs if all used pins match the ones
   // preconfigured by the platform. For example if RX disabled but TX pin
   // is 1 we still want to use Serial.
+  uint32_t mode = UART_NB_BIT_8 | UART_PARITY_NONE;
+  if (this->stop_bits_ == 1)
+    mode |= UART_NB_STOP_BIT_1;
+  else
+    mode |= UART_NB_STOP_BIT_2;
+  SerialConfig config = static_cast<SerialConfig>(mode);
   if (this->tx_pin_.value_or(1) == 1 && this->rx_pin_.value_or(3) == 3) {
     this->hw_serial_ = &Serial;
-    this->hw_serial_->begin(this->baud_rate_);
+    this->hw_serial_->begin(this->baud_rate_, config);
   } else if (this->tx_pin_.value_or(15) == 15 && this->rx_pin_.value_or(13) == 13) {
     this->hw_serial_ = &Serial;
-    this->hw_serial_->begin(this->baud_rate_);
+    this->hw_serial_->begin(this->baud_rate_, config);
     this->hw_serial_->swap();
   } else if (this->tx_pin_.value_or(2) == 2 && this->rx_pin_.value_or(8) == 8) {
     this->hw_serial_ = &Serial1;
-    this->hw_serial_->begin(this->baud_rate_);
+    this->hw_serial_->begin(this->baud_rate_, config);
   } else {
     this->sw_serial_ = new ESP8266SoftwareSerial();
     int8_t tx = this->tx_pin_.has_value() ? *this->tx_pin_ : -1;
     int8_t rx = this->rx_pin_.has_value() ? *this->rx_pin_ : -1;
-    this->sw_serial_->setup(tx, rx, this->baud_rate_);
+    this->sw_serial_->setup(tx, rx, this->baud_rate_, this->stop_bits_);
   }
 }
 
@@ -129,6 +139,7 @@ void UARTComponent::dump_config() {
     ESP_LOGCONFIG(TAG, "  RX Pin: GPIO%d", *this->rx_pin_);
   }
   ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
+  ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
   if (this->hw_serial_ != nullptr) {
     ESP_LOGCONFIG(TAG, "  Using hardware serial interface.");
   } else {
@@ -231,7 +242,7 @@ void UARTComponent::flush() {
   }
 }
 
-void ESP8266SoftwareSerial::setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate) {
+void ESP8266SoftwareSerial::setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits) {
   this->bit_time_ = F_CPU / baud_rate;
   if (tx_pin != -1) {
     auto pin = GPIOPin(tx_pin, OUTPUT);
@@ -246,6 +257,7 @@ void ESP8266SoftwareSerial::setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_ra
     this->rx_buffer_ = new uint8_t[this->rx_buffer_size_];
     pin.attach_interrupt(ESP8266SoftwareSerial::gpio_intr, this, FALLING);
   }
+  this->stop_bits_ = stop_bits;
 }
 void ICACHE_RAM_ATTR ESP8266SoftwareSerial::gpio_intr(ESP8266SoftwareSerial *arg) {
   uint32_t wait = arg->bit_time_ + arg->bit_time_ / 3 - 500;
@@ -262,6 +274,8 @@ void ICACHE_RAM_ATTR ESP8266SoftwareSerial::gpio_intr(ESP8266SoftwareSerial *arg
   rec |= arg->read_bit_(&wait, start) << 7;
   // Stop bit
   arg->wait_(&wait, start);
+  if (arg->stop_bits_ == 2)
+    arg->wait_(&wait, start);
 
   arg->rx_buffer_[arg->rx_in_pos_] = rec;
   arg->rx_in_pos_ = (arg->rx_in_pos_ + 1) % arg->rx_buffer_size_;
@@ -289,6 +303,8 @@ void ICACHE_RAM_ATTR HOT ESP8266SoftwareSerial::write_byte(uint8_t data) {
   this->write_bit_(data & (1 << 7), &wait, start);
   // Stop bit
   this->write_bit_(true, &wait, start);
+  if (this->stop_bits_ == 2)
+    this->wait_(&wait, start);
   enable_interrupts();
 }
 void ICACHE_RAM_ATTR ESP8266SoftwareSerial::wait_(uint32_t *wait, const uint32_t &start) {
@@ -344,5 +360,16 @@ int UARTComponent::peek() {
   return data;
 }
 
+void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits) {
+  if (this->parent_->baud_rate_ != baud_rate) {
+    ESP_LOGE(TAG, "  Invalid baud_rate: Integration requested baud_rate %u but you have %u!", baud_rate,
+             this->parent_->baud_rate_);
+  }
+  if (this->parent_->stop_bits_ != stop_bits) {
+    ESP_LOGE(TAG, "  Invalid stop bits: Integration requested stop_bits %u but you have %u!", stop_bits,
+             this->parent_->stop_bits_);
+  }
+}
+
 }  // namespace uart
 }  // namespace esphome
diff --git a/esphome/components/uart/uart.h b/esphome/components/uart/uart.h
index 3b347c1ff7..0e92fed0dc 100644
--- a/esphome/components/uart/uart.h
+++ b/esphome/components/uart/uart.h
@@ -10,7 +10,7 @@ namespace uart {
 #ifdef ARDUINO_ARCH_ESP8266
 class ESP8266SoftwareSerial {
  public:
-  void setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate);
+  void setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits);
 
   uint8_t read_byte();
   uint8_t peek_byte();
@@ -33,6 +33,7 @@ class ESP8266SoftwareSerial {
   size_t rx_buffer_size_{512};
   volatile size_t rx_in_pos_{0};
   size_t rx_out_pos_{0};
+  uint8_t stop_bits_;
   ISRInternalGPIOPin *tx_pin_{nullptr};
   ISRInternalGPIOPin *rx_pin_{nullptr};
 };
@@ -72,9 +73,11 @@ class UARTComponent : public Component, public Stream {
 
   void set_tx_pin(uint8_t tx_pin) { this->tx_pin_ = tx_pin; }
   void set_rx_pin(uint8_t rx_pin) { this->rx_pin_ = rx_pin; }
+  void set_stop_bits(uint8_t stop_bits) { this->stop_bits_ = stop_bits; }
 
  protected:
   bool check_read_timeout_(size_t len = 1);
+  friend class UARTDevice;
 
   HardwareSerial *hw_serial_{nullptr};
 #ifdef ARDUINO_ARCH_ESP8266
@@ -83,6 +86,7 @@ class UARTComponent : public Component, public Stream {
   optional<uint8_t> tx_pin_;
   optional<uint8_t> rx_pin_;
   uint32_t baud_rate_;
+  uint8_t stop_bits_;
 };
 
 #ifdef ARDUINO_ARCH_ESP32
@@ -100,6 +104,9 @@ class UARTDevice : public Stream {
 
   void write_array(const uint8_t *data, size_t len) { this->parent_->write_array(data, len); }
   void write_array(const std::vector<uint8_t> &data) { this->parent_->write_array(data); }
+  template<size_t N> void write_array(const std::array<uint8_t, N> &data) {
+    this->parent_->write_array(data.data(), data.size());
+  }
 
   void write_str(const char *str) { this->parent_->write_str(str); }
 
@@ -107,6 +114,13 @@ class UARTDevice : public Stream {
   bool peek_byte(uint8_t *data) { return this->parent_->peek_byte(data); }
 
   bool read_array(uint8_t *data, size_t len) { return this->parent_->read_array(data, len); }
+  template<size_t N> optional<std::array<uint8_t, N>> read_array() {  // NOLINT
+    std::array<uint8_t, N> res;
+    if (!this->read_array(res.data(), N)) {
+      return {};
+    }
+    return res;
+  }
 
   int available() override { return this->parent_->available(); }
 
@@ -116,6 +130,9 @@ class UARTDevice : public Stream {
   int read() override { return this->parent_->read(); }
   int peek() override { return this->parent_->peek(); }
 
+  /// Check that the configuration of the UART bus matches the provided values and otherwise print a warning
+  void check_uart_settings(uint32_t baud_rate, uint8_t stop_bits = 1);
+
  protected:
   UARTComponent *parent_{nullptr};
 };
diff --git a/esphome/const.py b/esphome/const.py
index 5d05c91373..524031da8c 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -323,6 +323,7 @@ CONF_PM_2_5 = 'pm_2_5'
 CONF_PORT = 'port'
 CONF_POSITION = 'position'
 CONF_POWER = 'power'
+CONF_POWER_FACTOR = 'power_factor'
 CONF_POWER_ON_VALUE = 'power_on_value'
 CONF_POWER_SAVE_MODE = 'power_save_mode'
 CONF_POWER_SUPPLY = 'power_supply'
@@ -479,6 +480,7 @@ ICON_BRIEFCASE_DOWNLOAD = 'mdi:briefcase-download'
 ICON_BRIGHTNESS_5 = 'mdi:brightness-5'
 ICON_CHEMICAL_WEAPON = 'mdi:chemical-weapon'
 ICON_CHECK_CIRCLE_OUTLINE = 'mdi:check-circle-outline'
+ICON_CURRENT_AC = 'mdi:current-ac'
 ICON_EMPTY = ''
 ICON_FLASH = 'mdi:flash'
 ICON_FLOWER = 'mdi:flower'
diff --git a/tests/test3.yaml b/tests/test3.yaml
index f3e530f07a..d1596c8f41 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -291,6 +291,31 @@ sensor:
       name: ADE7953 Active Power A
     active_power_b:
       name: ADE7953 Active Power B
+  - platform: pzem004t
+    voltage:
+      name: "PZEM00T Voltage"
+    current:
+      name: "PZEM004T Current"
+    power:
+      name: "PZEM004T Power"
+  - platform: pzemac
+    voltage:
+      name: "PZEMAC Voltage"
+    current:
+      name: "PZEMAC Current"
+    power:
+      name: "PZEMAC Power"
+    frequency:
+      name: "PZEMAC Frequency"
+    power_factor:
+      name: "PZEMAC Power Factor"
+  - platform: pzemdc
+    voltage:
+      name: "PZEMDC Voltage"
+    current:
+      name: "PZEMDC Current"
+    power:
+      name: "PZEMDC Power"
 
 time:
 - platform: homeassistant

From 1e22b1e95964e1992e0f19a2e25862dc8a154873 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 20 Oct 2019 19:24:34 +0200
Subject: [PATCH 018/412] Update AsyncMQTTClient/ESPAsyncWebServer (#779)

---
 esphome/components/mqtt/__init__.py            | 4 ++--
 esphome/components/web_server_base/__init__.py | 2 +-
 platformio.ini                                 | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 5a9bbee377..073bb3cede 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -154,8 +154,8 @@ def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     yield cg.register_component(var, config)
 
-    # https://github.com/marvinroger/async-mqtt-client/blob/master/library.json
-    cg.add_library('AsyncMqttClient-esphome', '0.8.2')
+    # https://github.com/OttoWinter/async-mqtt-client/blob/master/library.json
+    cg.add_library('AsyncMqttClient-esphome', '0.8.3')
     cg.add_define('USE_MQTT')
     cg.add_global(mqtt_ns.using)
 
diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index 53463a9927..54102b931f 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -22,4 +22,4 @@ def to_code(config):
     if CORE.is_esp32:
         cg.add_library('FS', None)
     # https://github.com/OttoWinter/ESPAsyncWebServer/blob/master/library.json
-    cg.add_library('ESPAsyncWebServer-esphome', '1.2.4')
+    cg.add_library('ESPAsyncWebServer-esphome', '1.2.5')
diff --git a/platformio.ini b/platformio.ini
index a3bb27a897..19b850c546 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,10 +10,10 @@ include_dir = include
 
 [common]
 lib_deps =
-    AsyncTCP@1.0.3
-    AsyncMqttClient-esphome@0.8.2
+    AsyncTCP@1.1.1
+    AsyncMqttClient-esphome@0.8.3
     ArduinoJson-esphomelib@5.13.3
-    ESPAsyncWebServer-esphome@1.2.3
+    ESPAsyncWebServer-esphome@1.2.5
     FastLED@3.2.9
     NeoPixelBus-esphome@2.5.2
     ESPAsyncTCP-esphome@1.2.2

From d64a4ef2b4b4df47889034003100c68313795c19 Mon Sep 17 00:00:00 2001
From: amishv <41266094+amishv@users.noreply.github.com>
Date: Mon, 21 Oct 2019 16:13:28 +0530
Subject: [PATCH 019/412] Implementation of LCD Clear (#781)

* Implementation of LCD Clear

* Implementation of LCD Clear

* Implementation of LCD Clear

* Implementation of LCD Clear
---
 esphome/components/lcd_base/lcd_display.cpp | 5 +++++
 esphome/components/lcd_base/lcd_display.h   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/esphome/components/lcd_base/lcd_display.cpp b/esphome/components/lcd_base/lcd_display.cpp
index 51541049b1..25ac143817 100644
--- a/esphome/components/lcd_base/lcd_display.cpp
+++ b/esphome/components/lcd_base/lcd_display.cpp
@@ -148,6 +148,11 @@ void LCDDisplay::printf(const char *format, ...) {
   if (ret > 0)
     this->print(0, 0, buffer);
 }
+void LCDDisplay::clear() {
+  // clear display, also sets DDRAM address to 0 (home)
+  this->command_(LCD_DISPLAY_COMMAND_CLEAR_DISPLAY);
+  delay(2);
+}
 #ifdef USE_TIME
 void LCDDisplay::strftime(uint8_t column, uint8_t row, const char *format, time::ESPTime time) {
   char buffer[64];
diff --git a/esphome/components/lcd_base/lcd_display.h b/esphome/components/lcd_base/lcd_display.h
index 791f31ace3..ee150059c6 100644
--- a/esphome/components/lcd_base/lcd_display.h
+++ b/esphome/components/lcd_base/lcd_display.h
@@ -23,6 +23,8 @@ class LCDDisplay : public PollingComponent {
   float get_setup_priority() const override;
   void update() override;
   void display();
+  //// Clear LCD display
+  void clear();
 
   /// Print the given text at the specified column and row.
   void print(uint8_t column, uint8_t row, const char *str);

From ae8700447ebd9d87b870af8de7cd2ebf2c475c93 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 21 Oct 2019 15:46:39 +0200
Subject: [PATCH 020/412] Add sensor force_update option (#783)

* Add sensor force_update option

* Add test
---
 esphome/components/api/api.proto        |  1 +
 esphome/components/api/api_pb2.cpp      |  9 +++++++++
 esphome/components/api/api_pb2.h        |  1 +
 esphome/components/mqtt/mqtt_sensor.cpp |  3 +++
 esphome/components/sensor/__init__.py   |  9 +++++----
 esphome/components/sensor/sensor.h      | 13 +++++++++++++
 esphome/const.py                        |  1 +
 tests/test1.yaml                        |  1 +
 8 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index e454bf1d31..175bd3858f 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -406,6 +406,7 @@ message ListEntitiesSensorResponse {
   string icon = 5;
   string unit_of_measurement = 6;
   int32 accuracy_decimals = 7;
+  bool force_update = 8;
 }
 message SensorStateResponse {
   option (id) = 25;
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index c4fa89ef97..3f635d1cdb 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -1359,6 +1359,10 @@ bool ListEntitiesSensorResponse::decode_varint(uint32_t field_id, ProtoVarInt va
       this->accuracy_decimals = value.as_int32();
       return true;
     }
+    case 8: {
+      this->force_update = value.as_bool();
+      return true;
+    }
     default:
       return false;
   }
@@ -1407,6 +1411,7 @@ void ListEntitiesSensorResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(5, this->icon);
   buffer.encode_string(6, this->unit_of_measurement);
   buffer.encode_int32(7, this->accuracy_decimals);
+  buffer.encode_bool(8, this->force_update);
 }
 void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -1440,6 +1445,10 @@ void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   sprintf(buffer, "%d", this->accuracy_decimals);
   out.append(buffer);
   out.append("\n");
+
+  out.append("  force_update: ");
+  out.append(YESNO(this->force_update));
+  out.append("\n");
   out.append("}");
 }
 bool SensorStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 9997a68477..2e685959bf 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -364,6 +364,7 @@ class ListEntitiesSensorResponse : public ProtoMessage {
   std::string icon{};                 // NOLINT
   std::string unit_of_measurement{};  // NOLINT
   int32_t accuracy_decimals{0};       // NOLINT
+  bool force_update{false};           // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
diff --git a/esphome/components/mqtt/mqtt_sensor.cpp b/esphome/components/mqtt/mqtt_sensor.cpp
index a241cf6ed6..f87e7651b9 100644
--- a/esphome/components/mqtt/mqtt_sensor.cpp
+++ b/esphome/components/mqtt/mqtt_sensor.cpp
@@ -55,6 +55,9 @@ void MQTTSensorComponent::send_discovery(JsonObject &root, mqtt::SendDiscoveryCo
   if (!this->sensor_->get_icon().empty())
     root["icon"] = this->sensor_->get_icon();
 
+  if (this->sensor_->get_force_update())
+    root["force_update"] = true;
+
   config.command_topic = false;
 }
 bool MQTTSensorComponent::send_initial_state() {
diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index a9b00b7c08..11a6e5e173 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -6,10 +6,9 @@ from esphome import automation
 from esphome.components import mqtt
 from esphome.const import CONF_ABOVE, CONF_ACCURACY_DECIMALS, CONF_ALPHA, CONF_BELOW, \
     CONF_EXPIRE_AFTER, CONF_FILTERS, CONF_FROM, CONF_ICON, CONF_ID, CONF_INTERNAL, \
-    CONF_ON_RAW_VALUE, CONF_ON_VALUE, CONF_ON_VALUE_RANGE, \
-    CONF_SEND_EVERY, CONF_SEND_FIRST_AT, CONF_TO, CONF_TRIGGER_ID, \
-    CONF_UNIT_OF_MEASUREMENT, \
-    CONF_WINDOW_SIZE, CONF_NAME, CONF_MQTT_ID
+    CONF_ON_RAW_VALUE, CONF_ON_VALUE, CONF_ON_VALUE_RANGE, CONF_SEND_EVERY, CONF_SEND_FIRST_AT, \
+    CONF_TO, CONF_TRIGGER_ID, CONF_UNIT_OF_MEASUREMENT, CONF_WINDOW_SIZE, CONF_NAME, CONF_MQTT_ID, \
+    CONF_FORCE_UPDATE
 from esphome.core import CORE, coroutine, coroutine_with_priority
 from esphome.util import Registry
 
@@ -87,6 +86,7 @@ SENSOR_SCHEMA = cv.MQTT_COMPONENT_SCHEMA.extend({
     cv.Optional(CONF_UNIT_OF_MEASUREMENT): unit_of_measurement,
     cv.Optional(CONF_ICON): icon,
     cv.Optional(CONF_ACCURACY_DECIMALS): accuracy_decimals,
+    cv.Optional(CONF_FORCE_UPDATE, default=False): cv.boolean,
     cv.Optional(CONF_EXPIRE_AFTER): cv.All(cv.requires_component('mqtt'),
                                            cv.Any(None, cv.positive_time_period_milliseconds)),
     cv.Optional(CONF_FILTERS): validate_filters,
@@ -258,6 +258,7 @@ def setup_sensor_core_(var, config):
         cg.add(var.set_icon(config[CONF_ICON]))
     if CONF_ACCURACY_DECIMALS in config:
         cg.add(var.set_accuracy_decimals(config[CONF_ACCURACY_DECIMALS]))
+    cg.add(var.set_force_update(config[CONF_FORCE_UPDATE]))
     if CONF_FILTERS in config:
         filters = yield build_filters(config[CONF_FILTERS])
         cg.add(var.set_filters(filters))
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index 1c7c854394..14ace91b35 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -18,6 +18,9 @@ namespace sensor {
     if (!obj->unique_id().empty()) { \
       ESP_LOGV(TAG, prefix "  Unique ID: '%s'", obj->unique_id().c_str()); \
     } \
+    if (obj->get_force_update()) { \
+      ESP_LOGV(TAG, prefix "  Force Update: YES"); \
+    } \
   }
 
 /** Base-class for all sensors.
@@ -142,6 +145,15 @@ class Sensor : public Nameable {
 
   void internal_send_state_to_frontend(float state);
 
+  bool get_force_update() const { return force_update_; }
+  /** Set this sensor's force_update mode.
+   *
+   * If the sensor is in force_update mode, the frontend is required to save all
+   * state changes to the database when they are published, even if the state is the
+   * same as before.
+   */
+  void set_force_update(bool force_update) { force_update_ = force_update; }
+
  protected:
   /** Override this to set the Home Assistant unit of measurement for this sensor.
    *
@@ -174,6 +186,7 @@ class Sensor : public Nameable {
   optional<int8_t> accuracy_decimals_;
   Filter *filter_list_{nullptr};  ///< Store all active filters.
   bool has_state_{false};
+  bool force_update_{false};
 };
 
 class PollingSensorComponent : public PollingComponent, public Sensor {
diff --git a/esphome/const.py b/esphome/const.py
index 524031da8c..ac020d00e6 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -156,6 +156,7 @@ CONF_FILTERS = 'filters'
 CONF_FILTER_OUT = 'filter_out'
 CONF_FLASH_LENGTH = 'flash_length'
 CONF_FOR = 'for'
+CONF_FORCE_UPDATE = 'force_update'
 CONF_FORMALDEHYDE = 'formaldehyde'
 CONF_FORMAT = 'format'
 CONF_FREQUENCY = 'frequency'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 5caa03cf03..2fbef9d4f7 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -185,6 +185,7 @@ sensor:
     accuracy_decimals: 5
     expire_after: 120s
     setup_priority: -100
+    force_update: true
     filters:
       - offset: 2.0
       - multiply: 1.2

From c0adaa8de848040d169d53b5e58a04e39c1ff026 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 21 Oct 2019 22:55:16 +0200
Subject: [PATCH 021/412] Update docker base image to 2.0.1 (#785)

---
 .gitlab-ci.yml         | 2 +-
 docker/Dockerfile      | 2 +-
 docker/Dockerfile.lint | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c3808b7381..3db0b982ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375/
-  BASE_VERSION: '2.0.0'
+  BASE_VERSION: '2.0.1'
   TZ: UTC
 
 stages:
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 66d88655f4..11bbeeda2b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.0.0
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.0.1
 FROM ${BUILD_FROM}
 
 COPY . .
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 073ad90cb6..5d8893bdbe 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.0.0
+FROM esphome/esphome-base-amd64:2.0.1
 
 RUN \
     apt-get update \

From 1177b856a0fba427002b25c63a934af65ce4a954 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 21 Oct 2019 22:55:27 +0200
Subject: [PATCH 022/412] Fix ledc can't find bit_depth (#786)

Fixes https://github.com/esphome/issues/issues/759
---
 esphome/components/ledc/ledc_output.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/ledc/ledc_output.cpp b/esphome/components/ledc/ledc_output.cpp
index b3652c84d6..2b1c181a62 100644
--- a/esphome/components/ledc/ledc_output.cpp
+++ b/esphome/components/ledc/ledc_output.cpp
@@ -42,8 +42,8 @@ float ledc_min_frequency_for_bit_depth(uint8_t bit_depth) {
 }
 optional<uint8_t> ledc_bit_depth_for_frequency(float frequency) {
   for (int i = 20; i >= 1; i--) {
-    const float min_frequency = ledc_min_frequency_for_bit_depth(frequency);
-    const float max_frequency = ledc_max_frequency_for_bit_depth(frequency);
+    const float min_frequency = ledc_min_frequency_for_bit_depth(i);
+    const float max_frequency = ledc_max_frequency_for_bit_depth(i);
     if (min_frequency <= frequency && frequency <= max_frequency)
       return i;
   }
@@ -56,7 +56,7 @@ void LEDCOutput::apply_frequency(float frequency) {
     ESP_LOGW(TAG, "Frequency %f can't be achieved with any bit depth", frequency);
     this->status_set_warning();
   }
-  this->bit_depth_ = *bit_depth_opt;
+  this->bit_depth_ = bit_depth_opt.value_or(8);
   this->frequency_ = frequency;
   ledcSetup(this->channel_, frequency, this->bit_depth_);
   // re-apply duty

From 9fb60b8015a92a8cef79d0150a5a25cc9ea2a459 Mon Sep 17 00:00:00 2001
From: Nils Schulte <47043622+Schnilz@users.noreply.github.com>
Date: Mon, 21 Oct 2019 23:05:50 +0200
Subject: [PATCH 023/412] web_server_base AUTO_LOAD includes ASYNC_TCP (#788)

* web_server_base AUTO_LOAD includes ASYNC_TCP

fix AUTO_LOAD of web_server_base to include ASYNC_TCP

* Remove from dependencies


Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/web_server_base/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index 54102b931f..923a594eb8 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -3,7 +3,8 @@ import esphome.codegen as cg
 from esphome.const import CONF_ID
 from esphome.core import coroutine_with_priority, CORE
 
-DEPENDENCIES = ['network', 'async_tcp']
+DEPENDENCIES = ['network']
+AUTO_LOAD = ['async_tcp']
 
 web_server_base_ns = cg.esphome_ns.namespace('web_server_base')
 WebServerBase = web_server_base_ns.class_('WebServerBase', cg.Component)

From 6542be5588025ce11154b1a3169b527bfc7a3f66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 22 Oct 2019 00:06:11 +0300
Subject: [PATCH 024/412] Wizard board name fixes (#787)

* Sort board names in wizard

* Fix board name in invalid board error message
---
 esphome/wizard.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/wizard.py b/esphome/wizard.py
index 34ff0ec6c7..f9dce7143a 100644
--- a/esphome/wizard.py
+++ b/esphome/wizard.py
@@ -220,7 +220,7 @@ def wizard(path):
     else:
         safe_print("For example \"{}\".".format(color("bold_white", 'nodemcuv2')))
         boards = list(ESP8266_BOARD_PINS.keys())
-    safe_print("Options: {}".format(', '.join(boards)))
+    safe_print("Options: {}".format(', '.join(sorted(boards))))
 
     while True:
         board = safe_input(color("bold_white", "(board): "))
@@ -228,7 +228,7 @@ def wizard(path):
             board = vol.All(vol.Lower, vol.Any(*boards))(board)
             break
         except vol.Invalid:
-            safe_print(color('red', "Sorry, I don't think the board \"{}\" exists."))
+            safe_print(color('red', "Sorry, I don't think the board \"{}\" exists.".format(board)))
             safe_print()
             sleep(0.25)
             safe_print()

From c18050bda08506b12399dd584140ad5940b7279c Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 21 Oct 2019 23:32:12 +0200
Subject: [PATCH 025/412] Add Python 2 deprecation notice (#784)

* Add Python 2 deprecation notice

* Update __main__.py
---
 esphome/__main__.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 403bf89401..bf2d68d834 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -509,6 +509,11 @@ def run_esphome(argv):
         _LOGGER.error("Missing configuration parameter, see esphome --help.")
         return 1
 
+    if IS_PY2:
+        _LOGGER.warning("You're using ESPHome with python 2. Support for python 2 is deprecated "
+                        "and will be removed in 1.15.0. Please reinstall ESPHome with python 3.6 "
+                        "or higher.")
+
     if args.command in PRE_CONFIG_ACTIONS:
         try:
             return PRE_CONFIG_ACTIONS[args.command](args)

From 3f0503c2962cfc6244744f6befdc2aee4462715d Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 22 Oct 2019 22:56:34 +0200
Subject: [PATCH 026/412] Fix modbus CRC calculation (#789)

* Fix modbus CRC calculation

Fixes https://github.com/esphome/feature-requests/issues/49#issuecomment-545045776

* Fix
---
 esphome/components/modbus/modbus.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/modbus/modbus.cpp b/esphome/components/modbus/modbus.cpp
index 92505c6429..74d0c40986 100644
--- a/esphome/components/modbus/modbus.cpp
+++ b/esphome/components/modbus/modbus.cpp
@@ -24,7 +24,7 @@ void Modbus::loop() {
   }
 }
 
-uint16_t crc16(uint8_t *data, uint8_t len) {
+uint16_t crc16(const uint8_t *data, uint8_t len) {
   uint16_t crc = 0xFFFF;
   while (len--) {
     crc ^= *data++;
@@ -43,7 +43,7 @@ uint16_t crc16(uint8_t *data, uint8_t len) {
 bool Modbus::parse_modbus_byte_(uint8_t byte) {
   size_t at = this->rx_buffer_.size();
   this->rx_buffer_.push_back(byte);
-  uint8_t *raw = &this->rx_buffer_[0];
+  const uint8_t *raw = &this->rx_buffer_[0];
 
   // Byte 0: modbus address (match all)
   if (at == 0)
@@ -69,7 +69,7 @@ bool Modbus::parse_modbus_byte_(uint8_t byte) {
     return true;
   // Byte 3+len+1: CRC_HI (over all bytes)
   uint16_t computed_crc = crc16(raw, 3 + data_len);
-  uint16_t remote_crc = uint16_t(raw[3 + data_len]) | (uint16_t(raw[3 + data_len]) << 8);
+  uint16_t remote_crc = uint16_t(raw[3 + data_len]) | (uint16_t(raw[3 + data_len + 1]) << 8);
   if (computed_crc != remote_crc) {
     ESP_LOGW(TAG, "Modbus CRC Check failed! %02X!=%02X", computed_crc, remote_crc);
     return false;

From d63cd8b4cd4d77f51dcdff3b8fdec62f00ad73f8 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 23 Oct 2019 14:43:27 +0200
Subject: [PATCH 027/412] Add additional custom lint checks (#790)

---
 .../components/binary_sensor_map/sensor.py    |   3 +-
 esphome/components/coolix/climate.py          |   8 +-
 esphome/components/custom/output/__init__.py  |   3 +-
 esphome/components/dfplayer/__init__.py       |   4 +-
 .../esp32_ble_beacon/esp32_ble_beacon.cpp     |   2 +-
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |   2 +-
 esphome/components/esp32_camera/__init__.py   |   6 +-
 .../components/esp32_touch/esp32_touch.cpp    |   8 +-
 esphome/components/esp32_touch/esp32_touch.h  |   1 +
 esphome/components/mpr121/mpr121.cpp          |   2 +-
 esphome/components/mqtt/mqtt_client.cpp       |   2 +-
 esphome/components/ms5611/ms5611.cpp          |   2 +-
 esphome/components/ota/ota_component.cpp      |   2 +-
 esphome/components/pmsx003/sensor.py          |  24 ++--
 esphome/components/restart/restart_switch.cpp |   4 +-
 esphome/components/rotary_encoder/sensor.py   |   4 +-
 esphome/components/scd30/sensor.py            |   4 +-
 esphome/components/sgp30/sensor.py            |  12 +-
 .../components/shutdown/shutdown_switch.cpp   |   2 +-
 .../components/ssd1325_spi/ssd1325_spi.cpp    |   2 +-
 .../sx1509/binary_sensor/__init__.py          |   6 +-
 esphome/components/tcl112/climate.py          |   8 +-
 .../components/template/output/__init__.py    |   3 +-
 .../waveshare_epaper/waveshare_epaper.h       |   8 +-
 esphome/components/wifi/wifi_component.cpp    |   2 +-
 esphome/components/yashima/climate.py         |   7 +-
 esphome/const.py                              |  66 ++++-----
 script/ci-custom.py                           | 130 ++++++++++++++++--
 28 files changed, 209 insertions(+), 118 deletions(-)

diff --git a/esphome/components/binary_sensor_map/sensor.py b/esphome/components/binary_sensor_map/sensor.py
index 8b8cd8fc4e..27f4654ded 100644
--- a/esphome/components/binary_sensor_map/sensor.py
+++ b/esphome/components/binary_sensor_map/sensor.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 
 from esphome.components import sensor, binary_sensor
 from esphome.const import CONF_ID, CONF_CHANNELS, CONF_VALUE, CONF_TYPE, UNIT_EMPTY, \
-    ICON_CHECK_CIRCLE_OUTLINE, CONF_BINARY_SENSOR
+    ICON_CHECK_CIRCLE_OUTLINE, CONF_BINARY_SENSOR, CONF_GROUP
 
 DEPENDENCIES = ['binary_sensor']
 
@@ -11,7 +11,6 @@ binary_sensor_map_ns = cg.esphome_ns.namespace('binary_sensor_map')
 BinarySensorMap = binary_sensor_map_ns.class_('BinarySensorMap', cg.Component, sensor.Sensor)
 SensorMapType = binary_sensor_map_ns.enum('SensorMapType')
 
-CONF_GROUP = 'group'
 SENSOR_MAP_TYPES = {
     CONF_GROUP: SensorMapType.BINARY_SENSOR_MAP_TYPE_GROUP,
 }
diff --git a/esphome/components/coolix/climate.py b/esphome/components/coolix/climate.py
index fe74798689..14868a7be0 100644
--- a/esphome/components/coolix/climate.py
+++ b/esphome/components/coolix/climate.py
@@ -1,18 +1,14 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import climate, remote_transmitter, remote_receiver, sensor
-from esphome.const import CONF_ID, CONF_SENSOR
+from esphome.components.remote_base import CONF_TRANSMITTER_ID, CONF_RECEIVER_ID
+from esphome.const import CONF_ID, CONF_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
 
 AUTO_LOAD = ['sensor', 'climate_ir']
 
 coolix_ns = cg.esphome_ns.namespace('coolix')
 CoolixClimate = coolix_ns.class_('CoolixClimate', climate.Climate, cg.Component)
 
-CONF_TRANSMITTER_ID = 'transmitter_id'
-CONF_RECEIVER_ID = 'receiver_id'
-CONF_SUPPORTS_HEAT = 'supports_heat'
-CONF_SUPPORTS_COOL = 'supports_cool'
-
 CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(CoolixClimate),
     cv.GenerateID(CONF_TRANSMITTER_ID): cv.use_id(remote_transmitter.RemoteTransmitterComponent),
diff --git a/esphome/components/custom/output/__init__.py b/esphome/components/custom/output/__init__.py
index 6042863872..efe6f19dab 100644
--- a/esphome/components/custom/output/__init__.py
+++ b/esphome/components/custom/output/__init__.py
@@ -1,13 +1,12 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import output
-from esphome.const import CONF_ID, CONF_LAMBDA, CONF_OUTPUTS, CONF_TYPE
+from esphome.const import CONF_ID, CONF_LAMBDA, CONF_OUTPUTS, CONF_TYPE, CONF_BINARY
 from .. import custom_ns
 
 CustomBinaryOutputConstructor = custom_ns.class_('CustomBinaryOutputConstructor')
 CustomFloatOutputConstructor = custom_ns.class_('CustomFloatOutputConstructor')
 
-CONF_BINARY = 'binary'
 CONF_FLOAT = 'float'
 
 CONFIG_SCHEMA = cv.typed_schema({
diff --git a/esphome/components/dfplayer/__init__.py b/esphome/components/dfplayer/__init__.py
index 78bcfa80f4..890c2bede4 100644
--- a/esphome/components/dfplayer/__init__.py
+++ b/esphome/components/dfplayer/__init__.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
-from esphome.const import CONF_ID, CONF_TRIGGER_ID
+from esphome.const import CONF_ID, CONF_TRIGGER_ID, CONF_FILE, CONF_DEVICE
 from esphome.components import uart
 
 DEPENDENCIES = ['uart']
@@ -14,10 +14,8 @@ DFPlayerIsPlayingCondition = dfplayer_ns.class_('DFPlayerIsPlayingCondition', au
 
 MULTI_CONF = True
 CONF_FOLDER = 'folder'
-CONF_FILE = 'file'
 CONF_LOOP = 'loop'
 CONF_VOLUME = 'volume'
-CONF_DEVICE = 'device'
 CONF_EQ_PRESET = 'eq_preset'
 CONF_ON_FINISHED_PLAYBACK = 'on_finished_playback'
 
diff --git a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
index 1f3bf01a86..a61975d02f 100644
--- a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
+++ b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
@@ -50,7 +50,7 @@ void ESP32BLEBeacon::ble_core_task(void *params) {
   ble_setup();
 
   while (true) {
-    delay(1000);
+    delay(1000);  // NOLINT
   }
 }
 void ESP32BLEBeacon::ble_setup() {
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index c578acdaea..7a5bd733a2 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -134,7 +134,7 @@ bool ESP32BLETracker::ble_setup() {
   }
 
   // BLE takes some time to be fully set up, 200ms should be more than enough
-  delay(200);
+  delay(200);  // NOLINT
 
   return true;
 }
diff --git a/esphome/components/esp32_camera/__init__.py b/esphome/components/esp32_camera/__init__.py
index c69e0a5710..81980d9d38 100644
--- a/esphome/components/esp32_camera/__init__.py
+++ b/esphome/components/esp32_camera/__init__.py
@@ -2,7 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
 from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_NAME, CONF_PIN, CONF_SCL, CONF_SDA, \
-    ESP_PLATFORM_ESP32
+    ESP_PLATFORM_ESP32, CONF_DATA_PINS, CONF_RESET_PIN, CONF_RESOLUTION, CONF_BRIGHTNESS
 
 ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
 DEPENDENCIES = ['api']
@@ -35,23 +35,19 @@ FRAME_SIZES = {
     'UXGA': ESP32CameraFrameSize.ESP32_CAMERA_SIZE_1600X1200,
 }
 
-CONF_DATA_PINS = 'data_pins'
 CONF_VSYNC_PIN = 'vsync_pin'
 CONF_HREF_PIN = 'href_pin'
 CONF_PIXEL_CLOCK_PIN = 'pixel_clock_pin'
 CONF_EXTERNAL_CLOCK = 'external_clock'
 CONF_I2C_PINS = 'i2c_pins'
-CONF_RESET_PIN = 'reset_pin'
 CONF_POWER_DOWN_PIN = 'power_down_pin'
 
 CONF_MAX_FRAMERATE = 'max_framerate'
 CONF_IDLE_FRAMERATE = 'idle_framerate'
-CONF_RESOLUTION = 'resolution'
 CONF_JPEG_QUALITY = 'jpeg_quality'
 CONF_VERTICAL_FLIP = 'vertical_flip'
 CONF_HORIZONTAL_MIRROR = 'horizontal_mirror'
 CONF_CONTRAST = 'contrast'
-CONF_BRIGHTNESS = 'brightness'
 CONF_SATURATION = 'saturation'
 CONF_TEST_PATTERN = 'test_pattern'
 
diff --git a/esphome/components/esp32_touch/esp32_touch.cpp b/esphome/components/esp32_touch/esp32_touch.cpp
index 56bc407e84..ce0028159e 100644
--- a/esphome/components/esp32_touch/esp32_touch.cpp
+++ b/esphome/components/esp32_touch/esp32_touch.cpp
@@ -108,6 +108,8 @@ void ESP32TouchComponent::dump_config() {
 }
 
 void ESP32TouchComponent::loop() {
+  const uint32_t now = millis();
+  bool should_print = this->setup_mode_ && now - this->setup_mode_last_log_print_ > 250;
   for (auto *child : this->children_) {
     uint16_t value;
     if (this->iir_filter_enabled_()) {
@@ -119,14 +121,14 @@ void ESP32TouchComponent::loop() {
     child->value_ = value;
     child->publish_state(value < child->get_threshold());
 
-    if (this->setup_mode_) {
+    if (should_print) {
       ESP_LOGD(TAG, "Touch Pad '%s' (T%u): %u", child->get_name().c_str(), child->get_touch_pad(), value);
     }
   }
 
-  if (this->setup_mode_) {
+  if (should_print) {
     // Avoid spamming logs
-    delay(250);
+    this->setup_mode_last_log_print_ = now;
   }
 }
 
diff --git a/esphome/components/esp32_touch/esp32_touch.h b/esphome/components/esp32_touch/esp32_touch.h
index 7adee23971..45d459a2ff 100644
--- a/esphome/components/esp32_touch/esp32_touch.h
+++ b/esphome/components/esp32_touch/esp32_touch.h
@@ -50,6 +50,7 @@ class ESP32TouchComponent : public Component {
   touch_volt_atten_t voltage_attenuation_{};
   std::vector<ESP32TouchBinarySensor *> children_;
   bool setup_mode_{false};
+  uint32_t setup_mode_last_log_print_{};
   uint32_t iir_filter_{0};
 };
 
diff --git a/esphome/components/mpr121/mpr121.cpp b/esphome/components/mpr121/mpr121.cpp
index a24a703306..2025bc5b3f 100644
--- a/esphome/components/mpr121/mpr121.cpp
+++ b/esphome/components/mpr121/mpr121.cpp
@@ -10,7 +10,7 @@ void MPR121Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up MPR121...");
   // soft reset device
   this->write_byte(MPR121_SOFTRESET, 0x63);
-  delay(100);
+  delay(100);  // NOLINT
   if (!this->write_byte(MPR121_ECR, 0x0)) {
     this->error_code_ = COMMUNICATION_FAILED;
     this->mark_failed();
diff --git a/esphome/components/mqtt/mqtt_client.cpp b/esphome/components/mqtt/mqtt_client.cpp
index e07204d559..2eb1c52153 100644
--- a/esphome/components/mqtt/mqtt_client.cpp
+++ b/esphome/components/mqtt/mqtt_client.cpp
@@ -201,7 +201,7 @@ void MQTTClientComponent::check_connected() {
   this->status_clear_warning();
   ESP_LOGI(TAG, "MQTT Connected!");
   // MQTT Client needs some time to be fully set up.
-  delay(100);
+  delay(100);  // NOLINT
 
   this->resubscribe_subscriptions_();
 
diff --git a/esphome/components/ms5611/ms5611.cpp b/esphome/components/ms5611/ms5611.cpp
index 33ed6b1899..39bce9f32c 100644
--- a/esphome/components/ms5611/ms5611.cpp
+++ b/esphome/components/ms5611/ms5611.cpp
@@ -19,7 +19,7 @@ void MS5611Component::setup() {
     this->mark_failed();
     return;
   }
-  delay(100);
+  delay(100);  // NOLINT
   for (uint8_t offset = 0; offset < 6; offset++) {
     if (!this->read_byte_16(MS5611_CMD_READ_PROM + (offset * 2), &this->prom_[offset])) {
       this->mark_failed();
diff --git a/esphome/components/ota/ota_component.cpp b/esphome/components/ota/ota_component.cpp
index 6d2a0dd7c3..2041c688eb 100644
--- a/esphome/components/ota/ota_component.cpp
+++ b/esphome/components/ota/ota_component.cpp
@@ -266,7 +266,7 @@ void OTAComponent::handle_() {
   delay(10);
   ESP_LOGI(TAG, "OTA update finished!");
   this->status_clear_warning();
-  delay(100);
+  delay(100);  // NOLINT
   App.safe_reboot();
 
 error:
diff --git a/esphome/components/pmsx003/sensor.py b/esphome/components/pmsx003/sensor.py
index fa9a92d430..0cbaf1bf29 100644
--- a/esphome/components/pmsx003/sensor.py
+++ b/esphome/components/pmsx003/sensor.py
@@ -12,24 +12,24 @@ pmsx003_ns = cg.esphome_ns.namespace('pmsx003')
 PMSX003Component = pmsx003_ns.class_('PMSX003Component', uart.UARTDevice, cg.Component)
 PMSX003Sensor = pmsx003_ns.class_('PMSX003Sensor', sensor.Sensor)
 
-CONF_PMSX003 = 'PMSX003'
-CONF_PMS5003T = 'PMS5003T'
-CONF_PMS5003ST = 'PMS5003ST'
+TYPE_PMSX003 = 'PMSX003'
+TYPE_PMS5003T = 'PMS5003T'
+TYPE_PMS5003ST = 'PMS5003ST'
 
 PMSX003Type = pmsx003_ns.enum('PMSX003Type')
 PMSX003_TYPES = {
-    CONF_PMSX003: PMSX003Type.PMSX003_TYPE_X003,
-    CONF_PMS5003T: PMSX003Type.PMSX003_TYPE_5003T,
-    CONF_PMS5003ST: PMSX003Type.PMSX003_TYPE_5003ST,
+    TYPE_PMSX003: PMSX003Type.PMSX003_TYPE_X003,
+    TYPE_PMS5003T: PMSX003Type.PMSX003_TYPE_5003T,
+    TYPE_PMS5003ST: PMSX003Type.PMSX003_TYPE_5003ST,
 }
 
 SENSORS_TO_TYPE = {
-    CONF_PM_1_0: [CONF_PMSX003, CONF_PMS5003ST],
-    CONF_PM_2_5: [CONF_PMSX003, CONF_PMS5003T, CONF_PMS5003ST],
-    CONF_PM_10_0: [CONF_PMSX003, CONF_PMS5003ST],
-    CONF_TEMPERATURE: [CONF_PMS5003T, CONF_PMS5003ST],
-    CONF_HUMIDITY: [CONF_PMS5003T, CONF_PMS5003ST],
-    CONF_FORMALDEHYDE: [CONF_PMS5003ST],
+    CONF_PM_1_0: [TYPE_PMSX003, TYPE_PMS5003ST],
+    CONF_PM_2_5: [TYPE_PMSX003, TYPE_PMS5003T, TYPE_PMS5003ST],
+    CONF_PM_10_0: [TYPE_PMSX003, TYPE_PMS5003ST],
+    CONF_TEMPERATURE: [TYPE_PMS5003T, TYPE_PMS5003ST],
+    CONF_HUMIDITY: [TYPE_PMS5003T, TYPE_PMS5003ST],
+    CONF_FORMALDEHYDE: [TYPE_PMS5003ST],
 }
 
 
diff --git a/esphome/components/restart/restart_switch.cpp b/esphome/components/restart/restart_switch.cpp
index cd0979b9d3..f66ebc616e 100644
--- a/esphome/components/restart/restart_switch.cpp
+++ b/esphome/components/restart/restart_switch.cpp
@@ -13,8 +13,8 @@ void RestartSwitch::write_state(bool state) {
 
   if (state) {
     ESP_LOGI(TAG, "Restarting device...");
-    // then execute
-    delay(100);  // Let MQTT settle a bit
+    // Let MQTT settle a bit
+    delay(100);  // NOLINT
     App.safe_reboot();
   }
 }
diff --git a/esphome/components/rotary_encoder/sensor.py b/esphome/components/rotary_encoder/sensor.py
index 742096cd5a..214ccbd056 100644
--- a/esphome/components/rotary_encoder/sensor.py
+++ b/esphome/components/rotary_encoder/sensor.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 from esphome import pins, automation
 from esphome.components import sensor
 from esphome.const import CONF_ID, CONF_RESOLUTION, CONF_MIN_VALUE, CONF_MAX_VALUE, UNIT_STEPS, \
-    ICON_ROTATE_RIGHT, CONF_VALUE
+    ICON_ROTATE_RIGHT, CONF_VALUE, CONF_PIN_A, CONF_PIN_B
 
 rotary_encoder_ns = cg.esphome_ns.namespace('rotary_encoder')
 RotaryEncoderResolution = rotary_encoder_ns.enum('RotaryEncoderResolution')
@@ -13,8 +13,6 @@ RESOLUTIONS = {
     4: RotaryEncoderResolution.ROTARY_ENCODER_4_PULSES_PER_CYCLE,
 }
 
-CONF_PIN_A = 'pin_a'
-CONF_PIN_B = 'pin_b'
 CONF_PIN_RESET = 'pin_reset'
 
 RotaryEncoderSensor = rotary_encoder_ns.class_('RotaryEncoderSensor', sensor.Sensor, cg.Component)
diff --git a/esphome/components/scd30/sensor.py b/esphome/components/scd30/sensor.py
index aa863b904a..7a60725276 100644
--- a/esphome/components/scd30/sensor.py
+++ b/esphome/components/scd30/sensor.py
@@ -3,15 +3,13 @@ import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import CONF_ID, UNIT_PARTS_PER_MILLION, \
     CONF_HUMIDITY, CONF_TEMPERATURE, ICON_PERIODIC_TABLE_CO2, \
-    UNIT_CELSIUS, ICON_THERMOMETER, ICON_WATER_PERCENT, UNIT_PERCENT
+    UNIT_CELSIUS, ICON_THERMOMETER, ICON_WATER_PERCENT, UNIT_PERCENT, CONF_CO2
 
 DEPENDENCIES = ['i2c']
 
 scd30_ns = cg.esphome_ns.namespace('scd30')
 SCD30Component = scd30_ns.class_('SCD30Component', cg.PollingComponent, i2c.I2CDevice)
 
-CONF_CO2 = 'co2'
-
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(SCD30Component),
     cv.Required(CONF_CO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION,
diff --git a/esphome/components/sgp30/sensor.py b/esphome/components/sgp30/sensor.py
index 0063c29bd3..6329b122fd 100644
--- a/esphome/components/sgp30/sensor.py
+++ b/esphome/components/sgp30/sensor.py
@@ -14,8 +14,8 @@ CONF_TVOC = 'tvoc'
 CONF_BASELINE = 'baseline'
 CONF_UPTIME = 'uptime'
 CONF_COMPENSATION = 'compensation'
-CONF_COMPENSATION_HUMIDITY = 'humidity_source'
-CONF_COMPENSATION_TEMPERATURE = 'temperature_source'
+CONF_HUMIDITY_SOURCE = 'humidity_source'
+CONF_TEMPERATURE_SOURCE = 'temperature_source'
 
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(SGP30Component),
@@ -24,8 +24,8 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Required(CONF_TVOC): sensor.sensor_schema(UNIT_PARTS_PER_BILLION, ICON_RADIATOR, 0),
     cv.Optional(CONF_BASELINE): cv.hex_uint16_t,
     cv.Optional(CONF_COMPENSATION): cv.Schema({
-        cv.Required(CONF_COMPENSATION_HUMIDITY): cv.use_id(sensor.Sensor),
-        cv.Required(CONF_COMPENSATION_TEMPERATURE): cv.use_id(sensor.Sensor)
+        cv.Required(CONF_HUMIDITY_SOURCE): cv.use_id(sensor.Sensor),
+        cv.Required(CONF_TEMPERATURE_SOURCE): cv.use_id(sensor.Sensor)
     }),
 }).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x58))
 
@@ -48,7 +48,7 @@ def to_code(config):
 
     if CONF_COMPENSATION in config:
         compensation_config = config[CONF_COMPENSATION]
-        sens = yield cg.get_variable(compensation_config[CONF_COMPENSATION_HUMIDITY])
+        sens = yield cg.get_variable(compensation_config[CONF_HUMIDITY_SOURCE])
         cg.add(var.set_humidity_sensor(sens))
-        sens = yield cg.get_variable(compensation_config[CONF_COMPENSATION_TEMPERATURE])
+        sens = yield cg.get_variable(compensation_config[CONF_TEMPERATURE_SOURCE])
         cg.add(var.set_temperature_sensor(sens))
diff --git a/esphome/components/shutdown/shutdown_switch.cpp b/esphome/components/shutdown/shutdown_switch.cpp
index d27bb8aadc..ce33cd187f 100644
--- a/esphome/components/shutdown/shutdown_switch.cpp
+++ b/esphome/components/shutdown/shutdown_switch.cpp
@@ -14,7 +14,7 @@ void ShutdownSwitch::write_state(bool state) {
 
   if (state) {
     ESP_LOGI(TAG, "Shutting down...");
-    delay(100);  // Let MQTT settle a bit
+    delay(100);  // NOLINT
 
     App.run_safe_shutdown_hooks();
 #ifdef ARDUINO_ARCH_ESP8266
diff --git a/esphome/components/ssd1325_spi/ssd1325_spi.cpp b/esphome/components/ssd1325_spi/ssd1325_spi.cpp
index 1f547f8fd3..399700f1dd 100644
--- a/esphome/components/ssd1325_spi/ssd1325_spi.cpp
+++ b/esphome/components/ssd1325_spi/ssd1325_spi.cpp
@@ -14,7 +14,7 @@ void SPISSD1325::setup() {
   this->cs_->setup();      // OUTPUT
 
   this->init_reset_();
-  delay(500);
+  delay(500);  // NOLINT
   SSD1325::setup();
 }
 void SPISSD1325::dump_config() {
diff --git a/esphome/components/sx1509/binary_sensor/__init__.py b/esphome/components/sx1509/binary_sensor/__init__.py
index e780505edb..9a65524383 100644
--- a/esphome/components/sx1509/binary_sensor/__init__.py
+++ b/esphome/components/sx1509/binary_sensor/__init__.py
@@ -5,7 +5,7 @@ from esphome.const import CONF_ID
 from .. import SX1509Component, sx1509_ns, CONF_SX1509_ID
 
 CONF_ROW = 'row'
-CONF_COLUMN = 'col'
+CONF_COL = 'col'
 
 DEPENDENCIES = ['sx1509']
 
@@ -15,7 +15,7 @@ CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(SX1509BinarySensor),
     cv.GenerateID(CONF_SX1509_ID): cv.use_id(SX1509Component),
     cv.Required(CONF_ROW): cv.int_range(min=0, max=4),
-    cv.Required(CONF_COLUMN): cv.int_range(min=0, max=4),
+    cv.Required(CONF_COL): cv.int_range(min=0, max=4),
 })
 
 
@@ -23,6 +23,6 @@ def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     yield binary_sensor.register_binary_sensor(var, config)
     hub = yield cg.get_variable(config[CONF_SX1509_ID])
-    cg.add(var.set_row_col(config[CONF_ROW], config[CONF_COLUMN]))
+    cg.add(var.set_row_col(config[CONF_ROW], config[CONF_COL]))
 
     cg.add(hub.register_keypad_binary_sensor(var))
diff --git a/esphome/components/tcl112/climate.py b/esphome/components/tcl112/climate.py
index d21300d946..66af291a17 100644
--- a/esphome/components/tcl112/climate.py
+++ b/esphome/components/tcl112/climate.py
@@ -1,18 +1,14 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import climate, remote_transmitter, remote_receiver, sensor
-from esphome.const import CONF_ID, CONF_SENSOR
+from esphome.components.remote_base import CONF_TRANSMITTER_ID, CONF_RECEIVER_ID
+from esphome.const import CONF_ID, CONF_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
 
 AUTO_LOAD = ['sensor', 'climate_ir']
 
 tcl112_ns = cg.esphome_ns.namespace('tcl112')
 Tcl112Climate = tcl112_ns.class_('Tcl112Climate', climate.Climate, cg.Component)
 
-CONF_TRANSMITTER_ID = 'transmitter_id'
-CONF_RECEIVER_ID = 'receiver_id'
-CONF_SUPPORTS_HEAT = 'supports_heat'
-CONF_SUPPORTS_COOL = 'supports_cool'
-
 CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(Tcl112Climate),
     cv.GenerateID(CONF_TRANSMITTER_ID): cv.use_id(remote_transmitter.RemoteTransmitterComponent),
diff --git a/esphome/components/template/output/__init__.py b/esphome/components/template/output/__init__.py
index 5cc9e089bd..cc85a9da68 100644
--- a/esphome/components/template/output/__init__.py
+++ b/esphome/components/template/output/__init__.py
@@ -2,13 +2,12 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.components import output
-from esphome.const import CONF_ID, CONF_TYPE
+from esphome.const import CONF_ID, CONF_TYPE, CONF_BINARY
 from .. import template_ns
 
 TemplateBinaryOutput = template_ns.class_('TemplateBinaryOutput', output.BinaryOutput)
 TemplateFloatOutput = template_ns.class_('TemplateFloatOutput', output.FloatOutput)
 
-CONF_BINARY = 'binary'
 CONF_FLOAT = 'float'
 CONF_WRITE_ACTION = 'write_action'
 
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index 13aebd4ec9..eff6b895a9 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -45,9 +45,9 @@ class WaveshareEPaper : public PollingComponent,
   void reset_() {
     if (this->reset_pin_ != nullptr) {
       this->reset_pin_->digital_write(false);
-      delay(200);
+      delay(200);  // NOLINT
       this->reset_pin_->digital_write(true);
-      delay(200);
+      delay(200);  // NOLINT
     }
   }
 
@@ -144,7 +144,7 @@ class WaveshareEPaper4P2In : public WaveshareEPaper {
     // COMMAND PANEL SETTING
     this->command(0x00);
 
-    delay(100);
+    delay(100);  // NOLINT
 
     // COMMAND POWER SETTING
     this->command(0x01);
@@ -153,7 +153,7 @@ class WaveshareEPaper4P2In : public WaveshareEPaper {
     this->data(0x00);
     this->data(0x00);
     this->data(0x00);
-    delay(100);
+    delay(100);  // NOLINT
 
     // COMMAND POWER OFF
     this->command(0x02);
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 0608f222f7..cb664d3cc3 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -481,7 +481,7 @@ void WiFiComponent::retry_connect() {
     // If retry failed for more than 5 times, let's restart STA
     ESP_LOGW(TAG, "Restarting WiFi adapter...");
     this->wifi_mode_(false, {});
-    delay(100);
+    delay(100);  // NOLINT
     this->num_retried_ = 0;
   } else {
     this->num_retried_++;
diff --git a/esphome/components/yashima/climate.py b/esphome/components/yashima/climate.py
index 5d33670fb5..4c4b98d9e7 100644
--- a/esphome/components/yashima/climate.py
+++ b/esphome/components/yashima/climate.py
@@ -1,17 +1,14 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import climate, remote_transmitter, sensor
-from esphome.const import CONF_ID, CONF_SENSOR
+from esphome.components.remote_base import CONF_TRANSMITTER_ID
+from esphome.const import CONF_ID, CONF_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
 
 AUTO_LOAD = ['sensor']
 
 yashima_ns = cg.esphome_ns.namespace('yashima')
 YashimaClimate = yashima_ns.class_('YashimaClimate', climate.Climate, cg.Component)
 
-CONF_TRANSMITTER_ID = 'transmitter_id'
-CONF_SUPPORTS_HEAT = 'supports_heat'
-CONF_SUPPORTS_COOL = 'supports_cool'
-
 CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(YashimaClimate),
     cv.GenerateID(CONF_TRANSMITTER_ID): cv.use_id(remote_transmitter.RemoteTransmitterComponent),
diff --git a/esphome/const.py b/esphome/const.py
index ac020d00e6..ffef106945 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -63,8 +63,8 @@ CONF_BROKER = 'broker'
 CONF_BSSID = 'bssid'
 CONF_BUFFER_SIZE = 'buffer_size'
 CONF_BUILD_PATH = 'build_path'
-CONF_BUSY_PIN = 'busy_pin'
 CONF_BUS_VOLTAGE = 'bus_voltage'
+CONF_BUSY_PIN = 'busy_pin'
 CONF_CALIBRATE_LINEAR = 'calibrate_linear'
 CONF_CALIBRATION = 'calibration'
 CONF_CAPACITANCE = 'capacitance'
@@ -84,23 +84,23 @@ CONF_CO2 = 'co2'
 CONF_CODE = 'code'
 CONF_COLD_WHITE = 'cold_white'
 CONF_COLD_WHITE_COLOR_TEMPERATURE = 'cold_white_color_temperature'
-CONF_COLORS = 'colors'
 CONF_COLOR_CORRECT = 'color_correct'
 CONF_COLOR_TEMPERATURE = 'color_temperature'
+CONF_COLORS = 'colors'
 CONF_COMMAND = 'command'
 CONF_COMMAND_TOPIC = 'command_topic'
 CONF_COMMENT = 'comment'
 CONF_COMMIT = 'commit'
-CONF_COMPONENTS = 'components'
 CONF_COMPONENT_ID = 'component_id'
+CONF_COMPONENTS = 'components'
 CONF_CONDITION = 'condition'
 CONF_CONDITION_ID = 'condition_id'
 CONF_CONDUCTIVITY = 'conductivity'
 CONF_COOL_ACTION = 'cool_action'
 CONF_COUNT_MODE = 'count_mode'
 CONF_CRON = 'cron'
-CONF_CSS_URL = 'css_url'
 CONF_CS_PIN = 'cs_pin'
+CONF_CSS_URL = 'css_url'
 CONF_CURRENT = 'current'
 CONF_CURRENT_OPERATION = 'current_operation'
 CONF_CURRENT_RESISTOR = 'current_resistor'
@@ -122,12 +122,12 @@ CONF_DELTA = 'delta'
 CONF_DEVICE = 'device'
 CONF_DEVICE_CLASS = 'device_class'
 CONF_DIMENSIONS = 'dimensions'
-CONF_DIRECTION = 'direction'
 CONF_DIR_PIN = 'dir_pin'
+CONF_DIRECTION = 'direction'
 CONF_DISCOVERY = 'discovery'
-CONF_DISTANCE = 'distance'
 CONF_DISCOVERY_PREFIX = 'discovery_prefix'
 CONF_DISCOVERY_RETAIN = 'discovery_retain'
+CONF_DISTANCE = 'distance'
 CONF_DIV_RATIO = 'div_ratio'
 CONF_DNS1 = 'dns1'
 CONF_DNS2 = 'dns2'
@@ -152,8 +152,8 @@ CONF_FAMILY = 'family'
 CONF_FAST_CONNECT = 'fast_connect'
 CONF_FILE = 'file'
 CONF_FILTER = 'filter'
-CONF_FILTERS = 'filters'
 CONF_FILTER_OUT = 'filter_out'
+CONF_FILTERS = 'filters'
 CONF_FLASH_LENGTH = 'flash_length'
 CONF_FOR = 'for'
 CONF_FORCE_UPDATE = 'force_update'
@@ -172,8 +172,8 @@ CONF_GREEN = 'green'
 CONF_GROUP = 'group'
 CONF_HARDWARE_UART = 'hardware_uart'
 CONF_HEARTBEAT = 'heartbeat'
-CONF_HEATER = 'heater'
 CONF_HEAT_ACTION = 'heat_action'
+CONF_HEATER = 'heater'
 CONF_HIDDEN = 'hidden'
 CONF_HIGH = 'high'
 CONF_HIGH_VOLTAGE_REFERENCE = 'high_voltage_reference'
@@ -207,8 +207,8 @@ CONF_INVERTED = 'inverted'
 CONF_IP_ADDRESS = 'ip_address'
 CONF_JS_URL = 'js_url'
 CONF_JVC = 'jvc'
-CONF_KEEPALIVE = 'keepalive'
 CONF_KEEP_ON_TIME = 'keep_on_time'
+CONF_KEEPALIVE = 'keepalive'
 CONF_LAMBDA = 'lambda'
 CONF_LEVEL = 'level'
 CONF_LG = 'lg'
@@ -218,9 +218,9 @@ CONF_LIGHTNING_ENERGY = 'lightning_energy'
 CONF_LIGHTNING_THRESHOLD = 'lightning_threshold'
 CONF_LOADED_INTEGRATIONS = 'loaded_integrations'
 CONF_LOCAL = 'local'
+CONF_LOG_TOPIC = 'log_topic'
 CONF_LOGGER = 'logger'
 CONF_LOGS = 'logs'
-CONF_LOG_TOPIC = 'log_topic'
 CONF_LOW = 'low'
 CONF_LOW_VOLTAGE_REFERENCE = 'low_voltage_reference'
 CONF_MAC_ADDRESS = 'mac_address'
@@ -240,13 +240,13 @@ CONF_MAX_VOLTAGE = 'max_voltage'
 CONF_MEASUREMENT_DURATION = 'measurement_duration'
 CONF_MEDIUM = 'medium'
 CONF_METHOD = 'method'
-CONF_MINUTE = 'minute'
-CONF_MINUTES = 'minutes'
 CONF_MIN_LENGTH = 'min_length'
 CONF_MIN_LEVEL = 'min_level'
 CONF_MIN_POWER = 'min_power'
 CONF_MIN_TEMPERATURE = 'min_temperature'
 CONF_MIN_VALUE = 'min_value'
+CONF_MINUTE = 'minute'
+CONF_MINUTES = 'minutes'
 CONF_MISO_PIN = 'miso_pin'
 CONF_MODE = 'mode'
 CONF_MODEL = 'model'
@@ -262,14 +262,13 @@ CONF_NBITS = 'nbits'
 CONF_NEC = 'nec'
 CONF_NETWORKS = 'networks'
 CONF_NOISE_LEVEL = 'noise_level'
-CONF_NUMBER = 'number'
 CONF_NUM_ATTEMPTS = 'num_attempts'
 CONF_NUM_CHANNELS = 'num_channels'
 CONF_NUM_CHIPS = 'num_chips'
 CONF_NUM_LEDS = 'num_leds'
+CONF_NUMBER = 'number'
 CONF_OFFSET = 'offset'
 CONF_ON = 'on'
-CONF_ONE = 'one'
 CONF_ON_BOOT = 'on_boot'
 CONF_ON_CLICK = 'on_click'
 CONF_ON_DOUBLE_CLICK = 'on_double_click'
@@ -288,6 +287,7 @@ CONF_ON_TURN_OFF = 'on_turn_off'
 CONF_ON_TURN_ON = 'on_turn_on'
 CONF_ON_VALUE = 'on_value'
 CONF_ON_VALUE_RANGE = 'on_value_range'
+CONF_ONE = 'one'
 CONF_OPEN_ACTION = 'open_action'
 CONF_OPEN_DURATION = 'open_duration'
 CONF_OPEN_ENDSTOP = 'open_endstop'
@@ -299,11 +299,11 @@ CONF_OSCILLATION_OUTPUT = 'oscillation_output'
 CONF_OSCILLATION_STATE_TOPIC = 'oscillation_state_topic'
 CONF_OTA = 'ota'
 CONF_OUTPUT = 'output'
-CONF_OUTPUTS = 'outputs'
 CONF_OUTPUT_ID = 'output_id'
+CONF_OUTPUTS = 'outputs'
 CONF_OVERSAMPLING = 'oversampling'
-CONF_PAGES = 'pages'
 CONF_PAGE_ID = 'page_id'
+CONF_PAGES = 'pages'
 CONF_PANASONIC = 'panasonic'
 CONF_PASSWORD = 'password'
 CONF_PAYLOAD = 'payload'
@@ -311,15 +311,15 @@ CONF_PAYLOAD_AVAILABLE = 'payload_available'
 CONF_PAYLOAD_NOT_AVAILABLE = 'payload_not_available'
 CONF_PHASE_BALANCER = 'phase_balancer'
 CONF_PIN = 'pin'
-CONF_PINS = 'pins'
 CONF_PIN_A = 'pin_a'
 CONF_PIN_B = 'pin_b'
 CONF_PIN_C = 'pin_c'
 CONF_PIN_D = 'pin_d'
+CONF_PINS = 'pins'
 CONF_PLATFORM = 'platform'
 CONF_PLATFORMIO_OPTIONS = 'platformio_options'
-CONF_PM_10_0 = 'pm_10_0'
 CONF_PM_1_0 = 'pm_1_0'
+CONF_PM_10_0 = 'pm_10_0'
 CONF_PM_2_5 = 'pm_2_5'
 CONF_PORT = 'port'
 CONF_POSITION = 'position'
@@ -353,8 +353,8 @@ CONF_RESTORE_MODE = 'restore_mode'
 CONF_RESTORE_STATE = 'restore_state'
 CONF_RESTORE_VALUE = 'restore_value'
 CONF_RETAIN = 'retain'
-CONF_RGBW = 'rgbw'
 CONF_RGB_ORDER = 'rgb_order'
+CONF_RGBW = 'rgbw'
 CONF_RISING_EDGE = 'rising_edge'
 CONF_ROTATION = 'rotation'
 CONF_RS_PIN = 'rs_pin'
@@ -377,14 +377,14 @@ CONF_SEL_PIN = 'sel_pin'
 CONF_SEND_EVERY = 'send_every'
 CONF_SEND_FIRST_AT = 'send_first_at'
 CONF_SENSOR = 'sensor'
-CONF_SENSORS = 'sensors'
 CONF_SENSOR_ID = 'sensor_id'
+CONF_SENSORS = 'sensors'
+CONF_SEQUENCE = 'sequence'
 CONF_SERVERS = 'servers'
 CONF_SERVICE = 'service'
 CONF_SERVICES = 'services'
 CONF_SETUP_MODE = 'setup_mode'
 CONF_SETUP_PRIORITY = 'setup_priority'
-CONF_SEQUENCE = 'sequence'
 CONF_SHUNT_RESISTANCE = 'shunt_resistance'
 CONF_SHUNT_VOLTAGE = 'shunt_voltage'
 CONF_SHUTDOWN_MESSAGE = 'shutdown_message'
@@ -408,6 +408,8 @@ CONF_STEP_PIN = 'step_pin'
 CONF_STOP = 'stop'
 CONF_STOP_ACTION = 'stop_action'
 CONF_SUBNET = 'subnet'
+CONF_SUPPORTS_COOL = 'supports_cool'
+CONF_SUPPORTS_HEAT = 'supports_heat'
 CONF_SWITCHES = 'switches'
 CONF_SYNC = 'sync'
 CONF_TAG = 'tag'
@@ -425,10 +427,10 @@ CONF_TILT = 'tilt'
 CONF_TILT_ACTION = 'tilt_action'
 CONF_TILT_LAMBDA = 'tilt_lambda'
 CONF_TIME = 'time'
+CONF_TIME_ID = 'time_id'
 CONF_TIMEOUT = 'timeout'
 CONF_TIMES = 'times'
 CONF_TIMEZONE = 'timezone'
-CONF_TIME_ID = 'time_id'
 CONF_TIMING = 'timing'
 CONF_TO = 'to'
 CONF_TOLERANCE = 'tolerance'
@@ -449,8 +451,8 @@ CONF_UNIQUE = 'unique'
 CONF_UNIT_OF_MEASUREMENT = 'unit_of_measurement'
 CONF_UPDATE_INTERVAL = 'update_interval'
 CONF_UPDATE_ON_BOOT = 'update_on_boot'
-CONF_USERNAME = 'username'
 CONF_USE_ADDRESS = 'use_address'
+CONF_USERNAME = 'username'
 CONF_UUID = 'uuid'
 CONF_VALUE = 'value'
 CONF_VARIABLES = 'variables'
@@ -470,8 +472,8 @@ CONF_WHITE = 'white'
 CONF_WIDTH = 'width'
 CONF_WIFI = 'wifi'
 CONF_WILL_MESSAGE = 'will_message'
-CONF_WIND_SPEED = 'wind_speed'
 CONF_WIND_DIRECTION_DEGREES = 'wind_direction_degrees'
+CONF_WIND_SPEED = 'wind_speed'
 CONF_WINDOW_SIZE = 'window_size'
 CONF_ZERO = 'zero'
 
@@ -479,8 +481,8 @@ ICON_ARROW_EXPAND_VERTICAL = 'mdi:arrow-expand-vertical'
 ICON_BATTERY = 'mdi:battery'
 ICON_BRIEFCASE_DOWNLOAD = 'mdi:briefcase-download'
 ICON_BRIGHTNESS_5 = 'mdi:brightness-5'
-ICON_CHEMICAL_WEAPON = 'mdi:chemical-weapon'
 ICON_CHECK_CIRCLE_OUTLINE = 'mdi:check-circle-outline'
+ICON_CHEMICAL_WEAPON = 'mdi:chemical-weapon'
 ICON_CURRENT_AC = 'mdi:current-ac'
 ICON_EMPTY = ''
 ICON_FLASH = 'mdi:flash'
@@ -499,26 +501,26 @@ ICON_RESTART = 'mdi:restart'
 ICON_ROTATE_RIGHT = 'mdi:rotate-right'
 ICON_SCALE = 'mdi:scale'
 ICON_SCREEN_ROTATION = 'mdi:screen-rotation'
+ICON_SIGN_DIRECTION = 'mdi:sign-direction'
 ICON_SIGNAL = 'mdi: signal-distance-variant'
 ICON_SIGNAL_DISTANCE_VARIANT = 'mdi:signal'
-ICON_SIGN_DIRECTION = 'mdi:sign-direction'
-ICON_WEATHER_SUNSET = 'mdi:weather-sunset'
-ICON_WEATHER_SUNSET_DOWN = 'mdi:weather-sunset-down'
-ICON_WEATHER_SUNSET_UP = 'mdi:weather-sunset-up'
 ICON_THERMOMETER = 'mdi:thermometer'
 ICON_TIMER = 'mdi:timer'
 ICON_WATER_PERCENT = 'mdi:water-percent'
+ICON_WEATHER_SUNSET = 'mdi:weather-sunset'
+ICON_WEATHER_SUNSET_DOWN = 'mdi:weather-sunset-down'
+ICON_WEATHER_SUNSET_UP = 'mdi:weather-sunset-up'
 ICON_WEATHER_WINDY = 'mdi:weather-windy'
 ICON_WIFI = 'mdi:wifi'
 
 UNIT_AMPERE = 'A'
 UNIT_CELSIUS = u'°C'
 UNIT_DECIBEL = 'dB'
-UNIT_DEGREES = u'°'
 UNIT_DEGREE_PER_SECOND = u'°/s'
+UNIT_DEGREES = u'°'
 UNIT_EMPTY = ''
-UNIT_HZ = 'hz'
 UNIT_HECTOPASCAL = 'hPa'
+UNIT_HZ = 'hz'
 UNIT_KELVIN = 'K'
 UNIT_KILOMETER = 'km'
 UNIT_KILOMETER_PER_HOUR = 'km/h'
@@ -529,8 +531,8 @@ UNIT_MICROGRAMS_PER_CUBIC_METER = u'µg/m³'
 UNIT_MICROSIEMENS_PER_CENTIMETER = u'µS/cm'
 UNIT_MICROTESLA = u'µT'
 UNIT_OHM = u'Ω'
-UNIT_PARTS_PER_MILLION = 'ppm'
 UNIT_PARTS_PER_BILLION = 'ppb'
+UNIT_PARTS_PER_MILLION = 'ppm'
 UNIT_PERCENT = '%'
 UNIT_PULSES_PER_MINUTE = 'pulses/min'
 UNIT_SECOND = 's'
diff --git a/script/ci-custom.py b/script/ci-custom.py
index 07641a17e9..3592faefab 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -40,6 +40,7 @@ ignore_types = ('.ico', '.woff', '.woff2', '')
 
 LINT_FILE_CHECKS = []
 LINT_CONTENT_CHECKS = []
+LINT_POST_CHECKS = []
 
 
 def run_check(lint_obj, fname, *args):
@@ -85,6 +86,31 @@ def lint_content_check(**kwargs):
     return decorator
 
 
+def lint_post_check(func):
+    _add_check(LINT_POST_CHECKS, func)
+    return func
+
+
+def lint_re_check(regex, **kwargs):
+    prog = re.compile(regex, re.MULTILINE)
+    decor = lint_content_check(**kwargs)
+
+    def decorator(func):
+        def new_func(fname, content):
+            errors = []
+            for match in prog.finditer(content):
+                if 'NOLINT' in match.group(0):
+                    continue
+                lineno = content.count("\n", 0, match.start()) + 1
+                err = func(fname, match)
+                if err is None:
+                    continue
+                errors.append("{} See line {}.".format(err, lineno))
+            return errors
+        return decor(new_func)
+    return decorator
+
+
 def lint_content_find_check(find, **kwargs):
     decor = lint_content_check(**kwargs)
 
@@ -93,9 +119,12 @@ def lint_content_find_check(find, **kwargs):
             find_ = find
             if callable(find):
                 find_ = find(fname, content)
+            errors = []
             for line, col in find_all(content, find_):
                 err = func(fname)
-                return "{err} See line {line}:{col}.".format(err=err, line=line+1, col=col+1)
+                errors.append("{err} See line {line}:{col}."
+                              "".format(err=err, line=line+1, col=col+1))
+            return errors
         return decor(new_func)
     return decorator
 
@@ -144,16 +173,95 @@ def lint_end_newline(fname, content):
     return None
 
 
-@lint_content_check(include=['*.cpp', '*.h', '*.tcc'],
-                    exclude=['esphome/core/log.h'])
-def lint_no_defines(fname, content):
+CPP_RE_EOL = r'\s*?(?://.*?)?$'
+
+
+def highlight(s):
+    return '\033[36m{}\033[0m'.format(s)
+
+
+@lint_re_check(r'^#define\s+([a-zA-Z0-9_]+)\s+([0-9bx]+)' + CPP_RE_EOL,
+               include=cpp_include, exclude=['esphome/core/log.h'])
+def lint_no_defines(fname, match):
+    s = highlight('static const uint8_t {} = {};'.format(match.group(1), match.group(2)))
+    return ("#define macros for integer constants are not allowed, please use "
+            "{} style instead (replace uint8_t with the appropriate "
+            "datatype). See also Google style guide.".format(s))
+
+
+@lint_re_check(r'^\s*delay\((\d+)\);' + CPP_RE_EOL, include=cpp_include)
+def lint_no_long_delays(fname, match):
+    duration_ms = int(match.group(1))
+    if duration_ms < 50:
+        return None
+    return (
+        "{} - long calls to delay() are not allowed in ESPHome because everything executes "
+        "in one thread. Calling delay() will block the main thread and slow down ESPHome.\n"
+        "If there's no way to work around the delay() and it doesn't execute often, please add "
+        "a '// NOLINT' comment to the line."
+        "".format(highlight(match.group(0).strip()))
+    )
+
+
+@lint_content_check(include=['esphome/const.py'])
+def lint_const_ordered(fname, content):
+    lines = content.splitlines()
     errors = []
-    for match in re.finditer(r'#define\s+([a-zA-Z0-9_]+)\s+([0-9bx]+)', content, re.MULTILINE):
-        errors.append(
-            "#define macros for integer constants are not allowed, please use "
-            "`static const uint8_t {} = {};` style instead (replace uint8_t with the appropriate "
-            "datatype). See also Google styleguide.".format(match.group(1), match.group(2))
-        )
+    for start in ['CONF_', 'ICON_', 'UNIT_']:
+        matching = [(i+1, line) for i, line in enumerate(lines) if line.startswith(start)]
+        ordered = list(sorted(matching, key=lambda x: x[1].replace('_', ' ')))
+        ordered = [(mi, ol) for (mi, _), (_, ol) in zip(matching, ordered)]
+        for (mi, ml), (oi, ol) in zip(matching, ordered):
+            if ml == ol:
+                continue
+            target = next(i for i, l in ordered if l == ml)
+            target_text = next(l for i, l in matching if target == i)
+            errors.append("Constant {} is not ordered, please make sure all constants are ordered. "
+                          "See line {} (should go to line {}, {})"
+                          "".format(highlight(ml), mi, target, target_text))
+    return errors
+
+
+@lint_re_check(r'^\s*CONF_([A-Z_0-9a-z]+)\s+=\s+[\'"](.*?)[\'"]\s*?$', include=['*.py'])
+def lint_conf_matches(fname, match):
+    const = match.group(1)
+    value = match.group(2)
+    const_norm = const.lower()
+    value_norm = value.replace('.', '_')
+    if const_norm == value_norm:
+        return None
+    return ("Constant {} does not match value {}! Please make sure the constant's name matches its "
+            "value!"
+            "".format(highlight('CONF_' + const), highlight(value)))
+
+
+CONF_RE = r'^(CONF_[a-zA-Z0-9_]+)\s*=\s*[\'"].*?[\'"]\s*?$'
+with codecs.open('esphome/const.py', 'r', encoding='utf-8') as f_handle:
+    constants_content = f_handle.read()
+CONSTANTS = [m.group(1) for m in re.finditer(CONF_RE, constants_content, re.MULTILINE)]
+
+CONSTANTS_USES = collections.defaultdict(list)
+
+
+@lint_re_check(CONF_RE, include=['*.py'], exclude=['esphome/const.py'])
+def lint_conf_from_const_py(fname, match):
+    name = match.group(1)
+    if name not in CONSTANTS:
+        CONSTANTS_USES[name].append(fname)
+        return None
+    return ("Constant {} has already been defined in const.py - please import the constant from "
+            "const.py directly.".format(highlight(name)))
+
+
+@lint_post_check
+def lint_constants_usage():
+    errors = []
+    for constant, uses in CONSTANTS_USES.items():
+        if len(uses) < 4:
+            continue
+        errors.append("Constant {} is defined in {} files. Please move all definitions of the "
+                      "constant to const.py (Uses: {})"
+                      "".format(highlight(constant), len(uses), ', '.join(uses)))
     return errors
 
 
@@ -255,6 +363,8 @@ for fname in files:
         continue
     run_checks(LINT_CONTENT_CHECKS, fname, fname, content)
 
+run_checks(LINT_POST_CHECKS, 'POST')
+
 for f, errs in sorted(errors.items()):
     print("\033[0;32m************* File \033[1;32m{}\033[0m".format(f))
     for err in errs:

From 8ff742d9ab61f2c6cb04df09bc0e792d0ba478a6 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 23 Oct 2019 14:43:41 +0200
Subject: [PATCH 028/412] Implement more dump_configs (#791)

---
 esphome/components/as3935_i2c/as3935_i2c.cpp         |  4 ++++
 esphome/components/as3935_i2c/as3935_i2c.h           |  3 +++
 esphome/components/bang_bang/bang_bang_climate.cpp   |  8 ++++++++
 esphome/components/bang_bang/bang_bang_climate.h     |  1 +
 esphome/components/binary_sensor/binary_sensor.h     |  4 ++--
 esphome/components/captive_portal/captive_portal.cpp |  1 +
 esphome/components/captive_portal/captive_portal.h   |  1 +
 esphome/components/climate/climate.h                 |  5 +++++
 esphome/components/climate_ir/climate_ir.cpp         | 10 ++++++++++
 esphome/components/climate_ir/climate_ir.h           |  1 +
 esphome/components/cover/cover.h                     |  6 +++---
 esphome/components/dfplayer/dfplayer.cpp             |  4 ++++
 esphome/components/dfplayer/dfplayer.h               |  1 +
 esphome/components/display/display_buffer.h          |  4 ++--
 .../components/esp32_ble_beacon/esp32_ble_beacon.cpp |  5 +++++
 .../components/esp32_ble_beacon/esp32_ble_beacon.h   |  1 +
 esphome/components/ntc/ntc.cpp                       |  6 +++---
 esphome/components/ntc/ntc.h                         | 12 ++++++------
 esphome/components/pzem004t/pzem004t.cpp             |  6 ++++++
 esphome/components/pzem004t/pzem004t.h               |  2 ++
 esphome/components/pzemac/pzemac.cpp                 |  9 +++++++++
 esphome/components/pzemac/pzemac.h                   |  2 ++
 esphome/components/pzemdc/pzemdc.cpp                 |  7 +++++++
 esphome/components/pzemdc/pzemdc.h                   |  2 ++
 esphome/components/sensor/sensor.h                   | 12 ++++++------
 esphome/components/sim800l/sim800l.cpp               |  4 ++++
 esphome/components/sim800l/sim800l.h                 |  1 +
 esphome/components/switch/switch.h                   |  8 ++++----
 esphome/components/text_sensor/text_sensor.h         |  6 +++---
 esphome/components/uptime/uptime_sensor.cpp          |  1 +
 esphome/components/uptime/uptime_sensor.h            |  1 +
 script/ci-custom.py                                  |  1 +
 32 files changed, 110 insertions(+), 29 deletions(-)

diff --git a/esphome/components/as3935_i2c/as3935_i2c.cpp b/esphome/components/as3935_i2c/as3935_i2c.cpp
index 7792bd3e29..a522116815 100644
--- a/esphome/components/as3935_i2c/as3935_i2c.cpp
+++ b/esphome/components/as3935_i2c/as3935_i2c.cpp
@@ -31,6 +31,10 @@ uint8_t I2CAS3935Component::read_register(uint8_t reg) {
   }
   return value;
 }
+void I2CAS3935Component::dump_config() {
+  AS3935Component::dump_config();
+  LOG_I2C_DEVICE(this);
+}
 
 }  // namespace as3935_i2c
 }  // namespace esphome
diff --git a/esphome/components/as3935_i2c/as3935_i2c.h b/esphome/components/as3935_i2c/as3935_i2c.h
index 0f4167fc64..1d16397bdf 100644
--- a/esphome/components/as3935_i2c/as3935_i2c.h
+++ b/esphome/components/as3935_i2c/as3935_i2c.h
@@ -10,6 +10,9 @@ namespace esphome {
 namespace as3935_i2c {
 
 class I2CAS3935Component : public as3935::AS3935Component, public i2c::I2CDevice {
+ public:
+  void dump_config() override;
+
  protected:
   void write_register(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position) override;
   uint8_t read_register(uint8_t reg) override;
diff --git a/esphome/components/bang_bang/bang_bang_climate.cpp b/esphome/components/bang_bang/bang_bang_climate.cpp
index 17c5c0bc48..978abae52a 100644
--- a/esphome/components/bang_bang/bang_bang_climate.cpp
+++ b/esphome/components/bang_bang/bang_bang_climate.cpp
@@ -145,6 +145,14 @@ Trigger<> *BangBangClimate::get_cool_trigger() const { return this->cool_trigger
 void BangBangClimate::set_supports_cool(bool supports_cool) { this->supports_cool_ = supports_cool; }
 Trigger<> *BangBangClimate::get_heat_trigger() const { return this->heat_trigger_; }
 void BangBangClimate::set_supports_heat(bool supports_heat) { this->supports_heat_ = supports_heat; }
+void BangBangClimate::dump_config() {
+  LOG_CLIMATE("", "Bang Bang Climate", this);
+  ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
+  ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
+  ESP_LOGCONFIG(TAG, "  Supports AWAY mode: %s", YESNO(this->supports_away_));
+  ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature_low);
+  ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature_high);
+}
 
 BangBangClimateTargetTempConfig::BangBangClimateTargetTempConfig() = default;
 BangBangClimateTargetTempConfig::BangBangClimateTargetTempConfig(float default_temperature_low,
diff --git a/esphome/components/bang_bang/bang_bang_climate.h b/esphome/components/bang_bang/bang_bang_climate.h
index 0a79c1d7af..84bcd51f34 100644
--- a/esphome/components/bang_bang/bang_bang_climate.h
+++ b/esphome/components/bang_bang/bang_bang_climate.h
@@ -21,6 +21,7 @@ class BangBangClimate : public climate::Climate, public Component {
  public:
   BangBangClimate();
   void setup() override;
+  void dump_config() override;
 
   void set_sensor(sensor::Sensor *sensor);
   Trigger<> *get_idle_trigger() const;
diff --git a/esphome/components/binary_sensor/binary_sensor.h b/esphome/components/binary_sensor/binary_sensor.h
index 51c7a57ff6..577e87258c 100644
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -10,9 +10,9 @@ namespace binary_sensor {
 
 #define LOG_BINARY_SENSOR(prefix, type, obj) \
   if (obj != nullptr) { \
-    ESP_LOGCONFIG(TAG, prefix type " '%s'", obj->get_name().c_str()); \
+    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, type, obj->get_name().c_str()); \
     if (!obj->get_device_class().empty()) { \
-      ESP_LOGCONFIG(TAG, prefix "  Device Class: '%s'", obj->get_device_class().c_str()); \
+      ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, obj->get_device_class().c_str()); \
     } \
   }
 
diff --git a/esphome/components/captive_portal/captive_portal.cpp b/esphome/components/captive_portal/captive_portal.cpp
index 1b533b570e..83f85d354c 100644
--- a/esphome/components/captive_portal/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -166,6 +166,7 @@ float CaptivePortal::get_setup_priority() const {
   // Before WiFi
   return setup_priority::WIFI + 1.0f;
 }
+void CaptivePortal::dump_config() { ESP_LOGCONFIG(TAG, "Captive Portal:"); }
 
 CaptivePortal *global_captive_portal = nullptr;
 
diff --git a/esphome/components/captive_portal/captive_portal.h b/esphome/components/captive_portal/captive_portal.h
index 4b1717d157..cbc3ba6ccc 100644
--- a/esphome/components/captive_portal/captive_portal.h
+++ b/esphome/components/captive_portal/captive_portal.h
@@ -18,6 +18,7 @@ class CaptivePortal : public AsyncWebHandler, public Component {
  public:
   CaptivePortal(web_server_base::WebServerBase *base);
   void setup() override;
+  void dump_config() override;
   void loop() override {
     if (this->dns_server_ != nullptr)
       this->dns_server_->processNextRequest();
diff --git a/esphome/components/climate/climate.h b/esphome/components/climate/climate.h
index 70c6bef13b..4dd872bbed 100644
--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -9,6 +9,11 @@
 namespace esphome {
 namespace climate {
 
+#define LOG_CLIMATE(prefix, type, obj) \
+  if (obj != nullptr) { \
+    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, type, obj->get_name().c_str()); \
+  }
+
 class Climate;
 
 /** This class is used to encode all control actions on a climate device.
diff --git a/esphome/components/climate_ir/climate_ir.cpp b/esphome/components/climate_ir/climate_ir.cpp
index 3d8b97e131..995e5a7ba5 100644
--- a/esphome/components/climate_ir/climate_ir.cpp
+++ b/esphome/components/climate_ir/climate_ir.cpp
@@ -1,8 +1,11 @@
 #include "climate_ir.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace climate {
 
+static const char *TAG = "climate_ir";
+
 climate::ClimateTraits ClimateIR::traits() {
   auto traits = climate::ClimateTraits();
   traits.set_supports_current_temperature(this->sensor_ != nullptr);
@@ -52,6 +55,13 @@ void ClimateIR::control(const climate::ClimateCall &call) {
   this->transmit_state();
   this->publish_state();
 }
+void ClimateIR::dump_config() {
+  LOG_CLIMATE("", "IR Climate", this);
+  ESP_LOGCONFIG(TAG, "  Min. Temperature: %.1f°C", this->minimum_temperature_);
+  ESP_LOGCONFIG(TAG, "  Max. Temperature: %.1f°C", this->maximum_temperature_);
+  ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
+  ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
+}
 
 }  // namespace climate
 }  // namespace esphome
diff --git a/esphome/components/climate_ir/climate_ir.h b/esphome/components/climate_ir/climate_ir.h
index 85f56c6b6b..51ced6b900 100644
--- a/esphome/components/climate_ir/climate_ir.h
+++ b/esphome/components/climate_ir/climate_ir.h
@@ -25,6 +25,7 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
   }
 
   void setup() override;
+  void dump_config() override;
   void set_transmitter(remote_transmitter::RemoteTransmitterComponent *transmitter) {
     this->transmitter_ = transmitter;
   }
diff --git a/esphome/components/cover/cover.h b/esphome/components/cover/cover.h
index 12011e1b4c..839cf9207e 100644
--- a/esphome/components/cover/cover.h
+++ b/esphome/components/cover/cover.h
@@ -13,13 +13,13 @@ const extern float COVER_CLOSED;
 
 #define LOG_COVER(prefix, type, obj) \
   if (obj != nullptr) { \
-    ESP_LOGCONFIG(TAG, prefix type " '%s'", obj->get_name().c_str()); \
+    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, type, obj->get_name().c_str()); \
     auto traits_ = obj->get_traits(); \
     if (traits_.get_is_assumed_state()) { \
-      ESP_LOGCONFIG(TAG, prefix "  Assumed State: YES"); \
+      ESP_LOGCONFIG(TAG, "%s  Assumed State: YES", prefix); \
     } \
     if (!obj->get_device_class().empty()) { \
-      ESP_LOGCONFIG(TAG, prefix "  Device Class: '%s'", obj->get_device_class().c_str()); \
+      ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, obj->get_device_class().c_str()); \
     } \
   }
 
diff --git a/esphome/components/dfplayer/dfplayer.cpp b/esphome/components/dfplayer/dfplayer.cpp
index 9589a907c4..5ce4998796 100644
--- a/esphome/components/dfplayer/dfplayer.cpp
+++ b/esphome/components/dfplayer/dfplayer.cpp
@@ -115,6 +115,10 @@ void DFPlayer::loop() {
     this->read_pos_++;
   }
 }
+void DFPlayer::dump_config() {
+  ESP_LOGCONFIG(TAG, "DFPlayer:");
+  this->check_uart_settings(9600);
+}
 
 }  // namespace dfplayer
 }  // namespace esphome
diff --git a/esphome/components/dfplayer/dfplayer.h b/esphome/components/dfplayer/dfplayer.h
index 2cb9eea4eb..86efd62138 100644
--- a/esphome/components/dfplayer/dfplayer.h
+++ b/esphome/components/dfplayer/dfplayer.h
@@ -52,6 +52,7 @@ class DFPlayer : public uart::UARTDevice, public Component {
   void random() { this->send_cmd_(0x18); }
 
   bool is_playing() { return is_playing_; }
+  void dump_config() override;
 
   void add_on_finished_playback_callback(std::function<void()> callback) {
     this->on_finished_playback_callback_.add(std::move(callback));
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 57b95eee29..b12fad8c8a 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -84,8 +84,8 @@ using display_writer_t = std::function<void(DisplayBuffer &)>;
 #define LOG_DISPLAY(prefix, type, obj) \
   if (obj != nullptr) { \
     ESP_LOGCONFIG(TAG, prefix type); \
-    ESP_LOGCONFIG(TAG, prefix "  Rotations: %d °", obj->rotation_); \
-    ESP_LOGCONFIG(TAG, prefix "  Dimensions: %dpx x %dpx", obj->get_width(), obj->get_height()); \
+    ESP_LOGCONFIG(TAG, "%s  Rotations: %d °", prefix, obj->rotation_); \
+    ESP_LOGCONFIG(TAG, "%s  Dimensions: %dpx x %dpx", prefix, obj->get_width(), obj->get_height()); \
   }
 
 class DisplayBuffer {
diff --git a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
index a61975d02f..b7810bd056 100644
--- a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
+++ b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
@@ -31,6 +31,11 @@ static esp_ble_adv_params_t ble_adv_params = {
 static esp_ble_ibeacon_head_t ibeacon_common_head = {
     .flags = {0x02, 0x01, 0x06}, .length = 0x1A, .type = 0xFF, .company_id = 0x004C, .beacon_type = 0x1502};
 
+void ESP32BLEBeacon::dump_config() {
+  ESP_LOGCONFIG(TAG, "ESP32 BLE Beacon:");
+  ESP_LOGCONFIG(TAG, "  Major: %u, Minor: %u", this->major_, this->minor_);
+}
+
 void ESP32BLEBeacon::setup() {
   ESP_LOGCONFIG(TAG, "Setting up ESP32 BLE beacon...");
   global_esp32_ble_beacon = this;
diff --git a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.h b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.h
index 1c52b41d73..aba02830b3 100644
--- a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.h
+++ b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.h
@@ -34,6 +34,7 @@ class ESP32BLEBeacon : public Component {
   explicit ESP32BLEBeacon(const std::array<uint8_t, 16> &uuid) : uuid_(uuid) {}
 
   void setup() override;
+  void dump_config() override;
   float get_setup_priority() const override;
 
   void set_major(uint16_t major) { this->major_ = major; }
diff --git a/esphome/components/ntc/ntc.cpp b/esphome/components/ntc/ntc.cpp
index 1b5c5182c7..9446508b0b 100644
--- a/esphome/components/ntc/ntc.cpp
+++ b/esphome/components/ntc/ntc.cpp
@@ -19,9 +19,9 @@ void NTC::process_(float value) {
     return;
   }
 
-  float lr = logf(value);
-  float v = this->a_ + this->b_ * lr + this->c_ * lr * lr * lr;
-  float temp = 1 / v - 273.15f;
+  double lr = log(double(value));
+  double v = this->a_ + this->b_ * lr + this->c_ * lr * lr * lr;
+  auto temp = float(1.0 / v - 273.15);
 
   ESP_LOGD(TAG, "'%s' - Temperature: %.1f°C", this->name_.c_str(), temp);
   this->publish_state(temp);
diff --git a/esphome/components/ntc/ntc.h b/esphome/components/ntc/ntc.h
index 9d6b37412d..c8592e0fe8 100644
--- a/esphome/components/ntc/ntc.h
+++ b/esphome/components/ntc/ntc.h
@@ -9,9 +9,9 @@ namespace ntc {
 class NTC : public Component, public sensor::Sensor {
  public:
   void set_sensor(Sensor *sensor) { sensor_ = sensor; }
-  void set_a(float a) { a_ = a; }
-  void set_b(float b) { b_ = b; }
-  void set_c(float c) { c_ = c; }
+  void set_a(double a) { a_ = a; }
+  void set_b(double b) { b_ = b; }
+  void set_c(double c) { c_ = c; }
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
@@ -20,9 +20,9 @@ class NTC : public Component, public sensor::Sensor {
   void process_(float value);
 
   sensor::Sensor *sensor_;
-  float a_;
-  float b_;
-  float c_;
+  double a_;
+  double b_;
+  double c_;
 };
 
 }  // namespace ntc
diff --git a/esphome/components/pzem004t/pzem004t.cpp b/esphome/components/pzem004t/pzem004t.cpp
index 3f07e74f9b..cbdc14f0d0 100644
--- a/esphome/components/pzem004t/pzem004t.cpp
+++ b/esphome/components/pzem004t/pzem004t.cpp
@@ -98,6 +98,12 @@ void PZEM004T::write_state_(PZEM004T::PZEM004TReadState state) {
   this->write_array(data);
   this->read_state_ = state;
 }
+void PZEM004T::dump_config() {
+  ESP_LOGCONFIG(TAG, "PZEM004T:");
+  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
+  LOG_SENSOR("", "Current", this->current_sensor_);
+  LOG_SENSOR("", "Power", this->power_sensor_);
+}
 
 }  // namespace pzem004t
 }  // namespace esphome
diff --git a/esphome/components/pzem004t/pzem004t.h b/esphome/components/pzem004t/pzem004t.h
index 7969efd78c..f0208d415a 100644
--- a/esphome/components/pzem004t/pzem004t.h
+++ b/esphome/components/pzem004t/pzem004t.h
@@ -17,6 +17,8 @@ class PZEM004T : public PollingComponent, public uart::UARTDevice {
 
   void update() override;
 
+  void dump_config() override;
+
  protected:
   sensor::Sensor *voltage_sensor_;
   sensor::Sensor *current_sensor_;
diff --git a/esphome/components/pzemac/pzemac.cpp b/esphome/components/pzemac/pzemac.cpp
index 1c3957dc09..f05ce15711 100644
--- a/esphome/components/pzemac/pzemac.cpp
+++ b/esphome/components/pzemac/pzemac.cpp
@@ -57,6 +57,15 @@ void PZEMAC::on_modbus_data(const std::vector<uint8_t> &data) {
 }
 
 void PZEMAC::update() { this->send(PZEM_CMD_READ_IN_REGISTERS, 0, PZEM_REGISTER_COUNT); }
+void PZEMAC::dump_config() {
+  ESP_LOGCONFIG(TAG, "PZEMAC:");
+  ESP_LOGCONFIG(TAG, "  Address: 0x%02X", this->address_);
+  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
+  LOG_SENSOR("", "Current", this->current_sensor_);
+  LOG_SENSOR("", "Power", this->power_sensor_);
+  LOG_SENSOR("", "Frequency", this->frequency_sensor_);
+  LOG_SENSOR("", "Power Factor", this->power_factor_sensor_);
+}
 
 }  // namespace pzemac
 }  // namespace esphome
diff --git a/esphome/components/pzemac/pzemac.h b/esphome/components/pzemac/pzemac.h
index 0ba742fafe..d396b7cddf 100644
--- a/esphome/components/pzemac/pzemac.h
+++ b/esphome/components/pzemac/pzemac.h
@@ -19,6 +19,8 @@ class PZEMAC : public PollingComponent, public modbus::ModbusDevice {
 
   void on_modbus_data(const std::vector<uint8_t> &data) override;
 
+  void dump_config() override;
+
  protected:
   sensor::Sensor *voltage_sensor_;
   sensor::Sensor *current_sensor_;
diff --git a/esphome/components/pzemdc/pzemdc.cpp b/esphome/components/pzemdc/pzemdc.cpp
index c85d35106d..9bd58410c0 100644
--- a/esphome/components/pzemdc/pzemdc.cpp
+++ b/esphome/components/pzemdc/pzemdc.cpp
@@ -47,6 +47,13 @@ void PZEMDC::on_modbus_data(const std::vector<uint8_t> &data) {
 }
 
 void PZEMDC::update() { this->send(PZEM_CMD_READ_IN_REGISTERS, 0, 8); }
+void PZEMDC::dump_config() {
+  ESP_LOGCONFIG(TAG, "PZEMDC:");
+  ESP_LOGCONFIG(TAG, "  Address: 0x%02X", this->address_);
+  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
+  LOG_SENSOR("", "Current", this->current_sensor_);
+  LOG_SENSOR("", "Power", this->power_sensor_);
+}
 
 }  // namespace pzemdc
 }  // namespace esphome
diff --git a/esphome/components/pzemdc/pzemdc.h b/esphome/components/pzemdc/pzemdc.h
index e19203dc21..d838eb4167 100644
--- a/esphome/components/pzemdc/pzemdc.h
+++ b/esphome/components/pzemdc/pzemdc.h
@@ -19,6 +19,8 @@ class PZEMDC : public PollingComponent, public modbus::ModbusDevice {
 
   void on_modbus_data(const std::vector<uint8_t> &data) override;
 
+  void dump_config() override;
+
  protected:
   sensor::Sensor *voltage_sensor_;
   sensor::Sensor *current_sensor_;
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index 14ace91b35..f23f022767 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -9,17 +9,17 @@ namespace sensor {
 
 #define LOG_SENSOR(prefix, type, obj) \
   if (obj != nullptr) { \
-    ESP_LOGCONFIG(TAG, prefix type " '%s'", obj->get_name().c_str()); \
-    ESP_LOGCONFIG(TAG, prefix "  Unit of Measurement: '%s'", obj->get_unit_of_measurement().c_str()); \
-    ESP_LOGCONFIG(TAG, prefix "  Accuracy Decimals: %d", obj->get_accuracy_decimals()); \
+    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, type, obj->get_name().c_str()); \
+    ESP_LOGCONFIG(TAG, "%s  Unit of Measurement: '%s'", prefix, obj->get_unit_of_measurement().c_str()); \
+    ESP_LOGCONFIG(TAG, "%s  Accuracy Decimals: %d", prefix, obj->get_accuracy_decimals()); \
     if (!obj->get_icon().empty()) { \
-      ESP_LOGCONFIG(TAG, prefix "  Icon: '%s'", obj->get_icon().c_str()); \
+      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, obj->get_icon().c_str()); \
     } \
     if (!obj->unique_id().empty()) { \
-      ESP_LOGV(TAG, prefix "  Unique ID: '%s'", obj->unique_id().c_str()); \
+      ESP_LOGV(TAG, "%s  Unique ID: '%s'", prefix, obj->unique_id().c_str()); \
     } \
     if (obj->get_force_update()) { \
-      ESP_LOGV(TAG, prefix "  Force Update: YES"); \
+      ESP_LOGV(TAG, "%s  Force Update: YES", prefix); \
     } \
   }
 
diff --git a/esphome/components/sim800l/sim800l.cpp b/esphome/components/sim800l/sim800l.cpp
index b2d58c5043..1390ef8b49 100644
--- a/esphome/components/sim800l/sim800l.cpp
+++ b/esphome/components/sim800l/sim800l.cpp
@@ -255,6 +255,10 @@ void Sim800LComponent::send_sms(std::string recipient, std::string message) {
   this->send_pending_ = true;
   this->update();
 }
+void Sim800LComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "SIM800L:");
+  ESP_LOGCONFIG(TAG, "  RSSI: %d dB", this->rssi_);
+}
 
 }  // namespace sim800l
 }  // namespace esphome
diff --git a/esphome/components/sim800l/sim800l.h b/esphome/components/sim800l/sim800l.h
index 0a3f4b463b..696eb8890f 100644
--- a/esphome/components/sim800l/sim800l.h
+++ b/esphome/components/sim800l/sim800l.h
@@ -37,6 +37,7 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
   /// Retrieve the latest sensor values. This operation takes approximately 16ms.
   void update() override;
   void loop() override;
+  void dump_config() override;
   void add_on_sms_received_callback(std::function<void(std::string, std::string)> callback) {
     this->callback_.add(std::move(callback));
   }
diff --git a/esphome/components/switch/switch.h b/esphome/components/switch/switch.h
index be4fc24c4a..cd6cec429f 100644
--- a/esphome/components/switch/switch.h
+++ b/esphome/components/switch/switch.h
@@ -9,15 +9,15 @@ namespace switch_ {
 
 #define LOG_SWITCH(prefix, type, obj) \
   if (obj != nullptr) { \
-    ESP_LOGCONFIG(TAG, prefix type " '%s'", obj->get_name().c_str()); \
+    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, type, obj->get_name().c_str()); \
     if (!obj->get_icon().empty()) { \
-      ESP_LOGCONFIG(TAG, prefix "  Icon: '%s'", obj->get_icon().c_str()); \
+      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, obj->get_icon().c_str()); \
     } \
     if (obj->assumed_state()) { \
-      ESP_LOGCONFIG(TAG, prefix "  Assumed State: YES"); \
+      ESP_LOGCONFIG(TAG, "%s  Assumed State: YES", prefix); \
     } \
     if (obj->is_inverted()) { \
-      ESP_LOGCONFIG(TAG, prefix "  Inverted: YES"); \
+      ESP_LOGCONFIG(TAG, "%s  Inverted: YES", prefix); \
     } \
   }
 
diff --git a/esphome/components/text_sensor/text_sensor.h b/esphome/components/text_sensor/text_sensor.h
index 719f0b0d62..85c2b644a0 100644
--- a/esphome/components/text_sensor/text_sensor.h
+++ b/esphome/components/text_sensor/text_sensor.h
@@ -8,12 +8,12 @@ namespace text_sensor {
 
 #define LOG_TEXT_SENSOR(prefix, type, obj) \
   if (obj != nullptr) { \
-    ESP_LOGCONFIG(TAG, prefix type " '%s'", obj->get_name().c_str()); \
+    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, type, obj->get_name().c_str()); \
     if (!obj->get_icon().empty()) { \
-      ESP_LOGCONFIG(TAG, prefix "  Icon: '%s'", obj->get_icon().c_str()); \
+      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, obj->get_icon().c_str()); \
     } \
     if (!obj->unique_id().empty()) { \
-      ESP_LOGV(TAG, prefix "  Unique ID: '%s'", obj->unique_id().c_str()); \
+      ESP_LOGV(TAG, "%s  Unique ID: '%s'", prefix, obj->unique_id().c_str()); \
     } \
   }
 
diff --git a/esphome/components/uptime/uptime_sensor.cpp b/esphome/components/uptime/uptime_sensor.cpp
index f047724768..5d117ab61d 100644
--- a/esphome/components/uptime/uptime_sensor.cpp
+++ b/esphome/components/uptime/uptime_sensor.cpp
@@ -27,6 +27,7 @@ void UptimeSensor::update() {
 }
 std::string UptimeSensor::unique_id() { return get_mac_address() + "-uptime"; }
 float UptimeSensor::get_setup_priority() const { return setup_priority::HARDWARE; }
+void UptimeSensor::dump_config() { LOG_SENSOR("", "Uptime Sensor", this); }
 
 }  // namespace uptime
 }  // namespace esphome
diff --git a/esphome/components/uptime/uptime_sensor.h b/esphome/components/uptime/uptime_sensor.h
index 184022503d..dab380d2d9 100644
--- a/esphome/components/uptime/uptime_sensor.h
+++ b/esphome/components/uptime/uptime_sensor.h
@@ -9,6 +9,7 @@ namespace uptime {
 class UptimeSensor : public sensor::Sensor, public PollingComponent {
  public:
   void update() override;
+  void dump_config() override;
 
   float get_setup_priority() const override;
 
diff --git a/script/ci-custom.py b/script/ci-custom.py
index 3592faefab..b43b15bcdd 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -325,6 +325,7 @@ def lint_pragma_once(fname, content):
     'esphome/components/stepper/stepper.h',
     'esphome/components/switch/switch.h',
     'esphome/components/text_sensor/text_sensor.h',
+    'esphome/components/climate/climate.h',
     'esphome/core/component.h',
     'esphome/core/esphal.h',
     'esphome/core/log.h',

From 4c49beb3c7691ee7167084e84ff4bc16938a0dbb Mon Sep 17 00:00:00 2001
From: Chris Debenham <chris@adebenham.com>
Date: Thu, 24 Oct 2019 23:13:50 +1100
Subject: [PATCH 029/412] Add missing include - fixes missing GPIOPin
 definition (#794)

---
 esphome/components/sm16716/sm16716.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/sm16716/sm16716.h b/esphome/components/sm16716/sm16716.h
index fe534d93fe..85f78c8cf5 100644
--- a/esphome/components/sm16716/sm16716.h
+++ b/esphome/components/sm16716/sm16716.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
 #include "esphome/components/output/float_output.h"
 
 namespace esphome {

From e4f055597cf4f9f9432e8495c6e4a26c581d5d26 Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Thu, 24 Oct 2019 15:19:33 +0300
Subject: [PATCH 030/412] Logger on_message trigger (#729)

* on_message

* Lint fix

* Lint fix (2)

* Lint fix (<3)

* Replace cg.int_ with int

* Revert

* Removed strdup


Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/codegen.py                    |  2 +-
 esphome/components/logger/__init__.py | 16 +++++++++++++++-
 esphome/components/logger/logger.h    | 16 ++++++++++++++++
 esphome/cpp_types.py                  |  1 +
 4 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/esphome/codegen.py b/esphome/codegen.py
index 46d652a3cd..c30b43f952 100644
--- a/esphome/codegen.py
+++ b/esphome/codegen.py
@@ -19,7 +19,7 @@ from esphome.cpp_helpers import (  # noqa
     gpio_pin_expression, register_component, build_registry_entry,
     build_registry_list, extract_registry_entry_config, register_parented)
 from esphome.cpp_types import (  # noqa
-    global_ns, void, nullptr, float_, double, bool_, std_ns, std_string,
+    global_ns, void, nullptr, float_, double, bool_, int_, std_ns, std_string,
     std_vector, uint8, uint16, uint32, int32, const_char_ptr, NAN,
     esphome_ns, App, Nameable, Component, ComponentPtr,
     PollingComponent, Application, optional, arduino_json_ns, JsonObject,
diff --git a/esphome/components/logger/__init__.py b/esphome/components/logger/__init__.py
index 3e07334313..850f955f65 100644
--- a/esphome/components/logger/__init__.py
+++ b/esphome/components/logger/__init__.py
@@ -5,7 +5,7 @@ import esphome.config_validation as cv
 from esphome import automation
 from esphome.automation import LambdaAction
 from esphome.const import CONF_ARGS, CONF_BAUD_RATE, CONF_FORMAT, CONF_HARDWARE_UART, CONF_ID, \
-    CONF_LEVEL, CONF_LOGS, CONF_TAG, CONF_TX_BUFFER_SIZE
+    CONF_LEVEL, CONF_LOGS, CONF_ON_MESSAGE, CONF_TAG, CONF_TRIGGER_ID, CONF_TX_BUFFER_SIZE
 from esphome.core import CORE, EsphomeError, Lambda, coroutine_with_priority
 from esphome.py_compat import text_type
 
@@ -70,6 +70,9 @@ def validate_local_no_higher_than_global(value):
 
 
 Logger = logger_ns.class_('Logger', cg.Component)
+LoggerMessageTrigger = logger_ns.class_('LoggerMessageTrigger',
+                                        automation.Trigger.template(cg.int_, cg.const_char_ptr,
+                                                                    cg.const_char_ptr))
 
 CONF_ESP8266_STORE_LOG_STRINGS_IN_FLASH = 'esp8266_store_log_strings_in_flash'
 CONFIG_SCHEMA = cv.All(cv.Schema({
@@ -81,6 +84,10 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.Optional(CONF_LOGS, default={}): cv.Schema({
         cv.string: is_log_level,
     }),
+    cv.Optional(CONF_ON_MESSAGE): automation.validate_automation({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(LoggerMessageTrigger),
+        cv.Optional(CONF_LEVEL, default='WARN'): is_log_level,
+    }),
 
     cv.SplitDefault(CONF_ESP8266_STORE_LOG_STRINGS_IN_FLASH, esp8266=True):
         cv.All(cv.only_on_esp8266, cv.boolean),
@@ -138,6 +145,13 @@ def to_code(config):
     # Register at end for safe mode
     yield cg.register_component(log, config)
 
+    for conf in config.get(CONF_ON_MESSAGE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], log,
+                                   LOG_LEVEL_SEVERITY.index(conf[CONF_LEVEL]))
+        yield automation.build_automation(trigger, [(cg.int_, 'level'),
+                                                    (cg.const_char_ptr, 'tag'),
+                                                    (cg.const_char_ptr, 'message')], conf)
+
 
 def maybe_simple_message(schema):
     def validator(value):
diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 18196b68d2..3d129e335b 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
@@ -114,6 +115,21 @@ class Logger : public Component {
 
 extern Logger *global_logger;
 
+class LoggerMessageTrigger : public Trigger<int, const char *, const char *> {
+ public:
+  explicit LoggerMessageTrigger(Logger *parent, int level) {
+    this->level_ = level;
+    parent->add_on_log_callback([this](int level, const char *tag, const char *message) {
+      if (level <= this->level_) {
+        this->trigger(level, tag, message);
+      }
+    });
+  }
+
+ protected:
+  int level_;
+};
+
 }  // namespace logger
 
 }  // namespace esphome
diff --git a/esphome/cpp_types.py b/esphome/cpp_types.py
index d3e5b2d561..4a9dce332b 100644
--- a/esphome/cpp_types.py
+++ b/esphome/cpp_types.py
@@ -6,6 +6,7 @@ nullptr = global_ns.namespace('nullptr')
 float_ = global_ns.namespace('float')
 double = global_ns.namespace('double')
 bool_ = global_ns.namespace('bool')
+int_ = global_ns.namespace('int')
 std_ns = global_ns.namespace('std')
 std_string = std_ns.class_('string')
 std_vector = std_ns.class_('vector')

From 59c5956f9330abbb8c578df6426e5037af15ef89 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 24 Oct 2019 20:11:17 +0200
Subject: [PATCH 031/412] Fix MQTT not showing logs with Python 3 (#797)

* Fix MQTT logging for Python 3

* Also fix captive portal PACKED
---
 esphome/components/captive_portal/captive_portal.h | 1 +
 esphome/mqtt.py                                    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/esphome/components/captive_portal/captive_portal.h b/esphome/components/captive_portal/captive_portal.h
index cbc3ba6ccc..3af47546cf 100644
--- a/esphome/components/captive_portal/captive_portal.h
+++ b/esphome/components/captive_portal/captive_portal.h
@@ -2,6 +2,7 @@
 
 #include <DNSServer.h>
 #include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/preferences.h"
 #include "esphome/components/web_server_base/web_server_base.h"
 
diff --git a/esphome/mqtt.py b/esphome/mqtt.py
index 0e00459944..e89a6d9578 100644
--- a/esphome/mqtt.py
+++ b/esphome/mqtt.py
@@ -15,6 +15,7 @@ from esphome.const import CONF_BROKER, CONF_DISCOVERY_PREFIX, CONF_ESPHOME, \
     CONF_TOPIC, CONF_TOPIC_PREFIX, CONF_USERNAME
 from esphome.core import CORE, EsphomeError
 from esphome.helpers import color
+from esphome.py_compat import decode_text
 from esphome.util import safe_print
 
 _LOGGER = logging.getLogger(__name__)
@@ -22,6 +23,7 @@ _LOGGER = logging.getLogger(__name__)
 
 def initialize(config, subscriptions, on_message, username, password, client_id):
     def on_connect(client, userdata, flags, return_code):
+        _LOGGER.info("Connected to MQTT broker!")
         for topic in subscriptions:
             client.subscribe(topic)
 
@@ -94,7 +96,8 @@ def show_logs(config, topic=None, username=None, password=None, client_id=None):
 
     def on_message(client, userdata, msg):
         time_ = datetime.now().time().strftime(u'[%H:%M:%S]')
-        message = time_ + msg.payload
+        payload = decode_text(msg.payload)
+        message = time_ + payload
         safe_print(message)
 
     return initialize(config, [topic], on_message, username, password, client_id)

From d62ef3586042c1a6da278f36fe40976630b8f0ec Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 24 Oct 2019 21:24:57 +0200
Subject: [PATCH 032/412] Fix scheduler first execution (#798)

* Fix scheduler first execution not immediately

* Also update sensor filters
---
 esphome/components/sensor/__init__.py | 2 +-
 esphome/core/scheduler.cpp            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 11a6e5e173..605f72a103 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -259,7 +259,7 @@ def setup_sensor_core_(var, config):
     if CONF_ACCURACY_DECIMALS in config:
         cg.add(var.set_accuracy_decimals(config[CONF_ACCURACY_DECIMALS]))
     cg.add(var.set_force_update(config[CONF_FORCE_UPDATE]))
-    if CONF_FILTERS in config:
+    if config.get(CONF_FILTERS):  # must exist and not be empty
         filters = yield build_filters(config[CONF_FILTERS])
         cg.add(var.set_filters(filters))
 
diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index 3df886cb5b..88054147f8 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -57,7 +57,7 @@ void HOT Scheduler::set_interval(Component *component, const std::string &name,
   item->name = name;
   item->type = SchedulerItem::INTERVAL;
   item->interval = interval;
-  item->last_execution = now - offset;
+  item->last_execution = now - offset - interval;
   item->last_execution_major = this->millis_major_;
   if (item->last_execution > now)
     item->last_execution_major--;
@@ -106,7 +106,7 @@ void ICACHE_RAM_ATTR HOT Scheduler::call() {
       // Not reached timeout yet, done for this call
       break;
     uint8_t major = item->last_execution_major;
-    if (item->last_execution + item->interval < item->last_execution)
+    if (item->last_execution > now)
       major++;
     if (major != this->millis_major_)
       break;

From bb2582717fa93e896ad3d84f941e488c0427df9d Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 24 Oct 2019 21:53:42 +0200
Subject: [PATCH 033/412] Make file generation saving atomic (#792)

* Make file generation saving atomic

* Lint

* Python 2 Compat

* Fix

* Handle file not found error
---
 esphome/config_helpers.py |  12 +---
 esphome/helpers.py        | 113 +++++++++++++++++++++++++++++---------
 esphome/py_compat.py      |  24 ++++----
 esphome/storage_json.py   |  15 ++---
 esphome/wizard.py         |   6 +-
 esphome/writer.py         |  30 +++++-----
 6 files changed, 123 insertions(+), 77 deletions(-)

diff --git a/esphome/config_helpers.py b/esphome/config_helpers.py
index ddad36f8a8..0c508d2202 100644
--- a/esphome/config_helpers.py
+++ b/esphome/config_helpers.py
@@ -1,10 +1,10 @@
 from __future__ import print_function
 
-import codecs
 import json
 import os
 
-from esphome.core import CORE, EsphomeError
+from esphome.core import CORE
+from esphome.helpers import read_file
 from esphome.py_compat import safe_input
 
 
@@ -20,10 +20,4 @@ def read_config_file(path):
         assert data['type'] == 'file_response'
         return data['content']
 
-    try:
-        with codecs.open(path, encoding='utf-8') as handle:
-            return handle.read()
-    except IOError as exc:
-        raise EsphomeError(u"Error accessing file {}: {}".format(path, exc))
-    except UnicodeDecodeError as exc:
-        raise EsphomeError(u"Unable to read file {}: {}".format(path, exc))
+    return read_file(path)
diff --git a/esphome/helpers.py b/esphome/helpers.py
index 30a06d842f..6fd1fa2ad7 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -1,10 +1,11 @@
 from __future__ import print_function
 
 import codecs
+
 import logging
 import os
 
-from esphome.py_compat import char_to_byte, text_type
+from esphome.py_compat import char_to_byte, text_type, IS_PY2, encode_text
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -79,15 +80,15 @@ def run_system_command(*args):
 
 
 def mkdir_p(path):
-    import errno
-
     try:
         os.makedirs(path)
-    except OSError as exc:
-        if exc.errno == errno.EEXIST and os.path.isdir(path):
+    except OSError as err:
+        import errno
+        if err.errno == errno.EEXIST and os.path.isdir(path):
             pass
         else:
-            raise
+            from esphome.core import EsphomeError
+            raise EsphomeError(u"Error creating directories {}: {}".format(path, err))
 
 
 def is_ip_address(host):
@@ -151,17 +152,6 @@ def is_hassio():
     return get_bool_env('ESPHOME_IS_HASSIO')
 
 
-def copy_file_if_changed(src, dst):
-    src_text = read_file(src)
-    if os.path.isfile(dst):
-        dst_text = read_file(dst)
-    else:
-        dst_text = None
-    if src_text == dst_text:
-        return
-    write_file(dst, src_text)
-
-
 def walk_files(path):
     for root, _, files in os.walk(path):
         for name in files:
@@ -172,28 +162,99 @@ def read_file(path):
     try:
         with codecs.open(path, 'r', encoding='utf-8') as f_handle:
             return f_handle.read()
-    except OSError:
+    except OSError as err:
         from esphome.core import EsphomeError
-        raise EsphomeError(u"Could not read file at {}".format(path))
+        raise EsphomeError(u"Error reading file {}: {}".format(path, err))
+    except UnicodeDecodeError as err:
+        from esphome.core import EsphomeError
+        raise EsphomeError(u"Error reading file {}: {}".format(path, err))
+
+
+def _write_file(path, text):
+    import tempfile
+    directory = os.path.dirname(path)
+    mkdir_p(directory)
+
+    tmp_path = None
+    data = encode_text(text)
+    try:
+        with tempfile.NamedTemporaryFile(mode="wb", dir=directory, delete=False) as f_handle:
+            tmp_path = f_handle.name
+            f_handle.write(data)
+        # Newer tempfile implementations create the file with mode 0o600
+        os.chmod(tmp_path, 0o644)
+        if IS_PY2:
+            if os.path.exists(path):
+                os.remove(path)
+            os.rename(tmp_path, path)
+        else:
+            # If destination exists, will be overwritten
+            os.replace(tmp_path, path)
+    finally:
+        if tmp_path is not None and os.path.exists(tmp_path):
+            try:
+                os.remove(tmp_path)
+            except OSError as err:
+                _LOGGER.error("Write file cleanup failed: %s", err)
 
 
 def write_file(path, text):
     try:
-        mkdir_p(os.path.dirname(path))
-        with codecs.open(path, 'w+', encoding='utf-8') as f_handle:
-            f_handle.write(text)
+        _write_file(path, text)
     except OSError:
         from esphome.core import EsphomeError
         raise EsphomeError(u"Could not write file at {}".format(path))
 
 
-def write_file_if_changed(text, dst):
+def write_file_if_changed(path, text):
     src_content = None
-    if os.path.isfile(dst):
-        src_content = read_file(dst)
+    if os.path.isfile(path):
+        src_content = read_file(path)
     if src_content != text:
-        write_file(dst, text)
+        write_file(path, text)
+
+
+def copy_file_if_changed(src, dst):
+    import shutil
+    if file_compare(src, dst):
+        return
+    mkdir_p(os.path.dirname(dst))
+    try:
+        shutil.copy(src, dst)
+    except OSError as err:
+        from esphome.core import EsphomeError
+        raise EsphomeError(u"Error copying file {} to {}: {}".format(src, dst, err))
 
 
 def list_starts_with(list_, sub):
     return len(sub) <= len(list_) and all(list_[i] == x for i, x in enumerate(sub))
+
+
+def file_compare(path1, path2):
+    """Return True if the files path1 and path2 have the same contents."""
+    import stat
+
+    try:
+        stat1, stat2 = os.stat(path1), os.stat(path2)
+    except OSError:
+        # File doesn't exist or another error -> not equal
+        return False
+
+    if stat.S_IFMT(stat1.st_mode) != stat.S_IFREG or stat.S_IFMT(stat2.st_mode) != stat.S_IFREG:
+        # At least one of them is not a regular file (or does not exist)
+        return False
+    if stat1.st_size != stat2.st_size:
+        # Different sizes
+        return False
+
+    bufsize = 8*1024
+    # Read files in blocks until a mismatch is found
+    with open(path1, 'rb') as fh1, open(path2, 'rb') as fh2:
+        while True:
+            blob1, blob2 = fh1.read(bufsize), fh2.read(bufsize)
+            if blob1 != blob2:
+                # Different content
+                return False
+            if not blob1:
+                # Reached end
+                return True
diff --git a/esphome/py_compat.py b/esphome/py_compat.py
index 6833a55801..6cdaa5b047 100644
--- a/esphome/py_compat.py
+++ b/esphome/py_compat.py
@@ -1,5 +1,6 @@
 import functools
 import sys
+import codecs
 
 PYTHON_MAJOR = sys.version_info[0]
 IS_PY2 = PYTHON_MAJOR == 2
@@ -75,15 +76,14 @@ def indexbytes(buf, i):
         return ord(buf[i])
 
 
-if IS_PY2:
-    def decode_text(data, encoding='utf-8', errors='strict'):
-        # type: (str, str, str) -> unicode
-        if isinstance(data, unicode):
-            return data
-        return unicode(data, encoding=encoding, errors=errors)
-else:
-    def decode_text(data, encoding='utf-8', errors='strict'):
-        # type: (bytes, str, str) -> str
-        if isinstance(data, str):
-            return data
-        return data.decode(encoding=encoding, errors=errors)
+def decode_text(data, encoding='utf-8', errors='strict'):
+    if isinstance(data, text_type):
+        return data
+    return codecs.decode(data, encoding, errors)
+
+
+def encode_text(data, encoding='utf-8', errors='strict'):
+    if isinstance(data, binary_type):
+        return data
+
+    return codecs.encode(data, encoding, errors)
diff --git a/esphome/storage_json.py b/esphome/storage_json.py
index cac7f9d2fa..0305b59ef5 100644
--- a/esphome/storage_json.py
+++ b/esphome/storage_json.py
@@ -7,7 +7,7 @@ import os
 
 from esphome import const
 from esphome.core import CORE
-from esphome.helpers import mkdir_p
+from esphome.helpers import mkdir_p, write_file_if_changed
 
 # pylint: disable=unused-import, wrong-import-order
 from esphome.core import CoreType  # noqa
@@ -89,8 +89,7 @@ class StorageJSON(object):
 
     def save(self, path):
         mkdir_p(os.path.dirname(path))
-        with codecs.open(path, 'w', encoding='utf-8') as f_handle:
-            f_handle.write(self.to_json())
+        write_file_if_changed(path, self.to_json())
 
     @staticmethod
     def from_esphome_core(esph, old):  # type: (CoreType, Optional[StorageJSON]) -> StorageJSON
@@ -130,8 +129,7 @@ class StorageJSON(object):
     @staticmethod
     def _load_impl(path):  # type: (str) -> Optional[StorageJSON]
         with codecs.open(path, 'r', encoding='utf-8') as f_handle:
-            text = f_handle.read()
-        storage = json.loads(text, encoding='utf-8')
+            storage = json.load(f_handle)
         storage_version = storage['storage_version']
         name = storage.get('name')
         comment = storage.get('comment')
@@ -195,15 +193,12 @@ class EsphomeStorageJSON(object):
         return json.dumps(self.as_dict(), indent=2) + u'\n'
 
     def save(self, path):  # type: (str) -> None
-        mkdir_p(os.path.dirname(path))
-        with codecs.open(path, 'w', encoding='utf-8') as f_handle:
-            f_handle.write(self.to_json())
+        write_file_if_changed(path, self.to_json())
 
     @staticmethod
     def _load_impl(path):  # type: (str) -> Optional[EsphomeStorageJSON]
         with codecs.open(path, 'r', encoding='utf-8') as f_handle:
-            text = f_handle.read()
-        storage = json.loads(text, encoding='utf-8')
+            storage = json.load(f_handle)
         storage_version = storage['storage_version']
         cookie_secret = storage.get('cookie_secret')
         last_update_check = storage.get('last_update_check')
diff --git a/esphome/wizard.py b/esphome/wizard.py
index f9dce7143a..8cc759f934 100644
--- a/esphome/wizard.py
+++ b/esphome/wizard.py
@@ -1,6 +1,5 @@
 from __future__ import print_function
 
-import codecs
 import os
 import random
 import string
@@ -9,7 +8,7 @@ import unicodedata
 import voluptuous as vol
 
 import esphome.config_validation as cv
-from esphome.helpers import color, get_bool_env
+from esphome.helpers import color, get_bool_env, write_file
 # pylint: disable=anomalous-backslash-in-string
 from esphome.pins import ESP32_BOARD_PINS, ESP8266_BOARD_PINS
 from esphome.py_compat import safe_input, text_type
@@ -104,8 +103,7 @@ def wizard_write(path, **kwargs):
         kwargs['platform'] = 'ESP8266' if board in ESP8266_BOARD_PINS else 'ESP32'
     platform = kwargs['platform']
 
-    with codecs.open(path, 'w', 'utf-8') as f_handle:
-        f_handle.write(wizard_file(**kwargs))
+    write_file(path, wizard_file(**kwargs))
     storage = StorageJSON.from_wizard(name, name + '.local', platform, board)
     storage_path = ext_storage_path(os.path.dirname(path), os.path.basename(path))
     storage.save(storage_path)
diff --git a/esphome/writer.py b/esphome/writer.py
index 8fa239d608..4c2e03569f 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -8,7 +8,8 @@ from esphome.config import iter_components
 from esphome.const import CONF_BOARD_FLASH_MODE, CONF_ESPHOME, CONF_PLATFORMIO_OPTIONS, \
     HEADER_FILE_EXTENSIONS, SOURCE_FILE_EXTENSIONS, __version__
 from esphome.core import CORE, EsphomeError
-from esphome.helpers import mkdir_p, read_file, write_file_if_changed, walk_files
+from esphome.helpers import mkdir_p, read_file, write_file_if_changed, walk_files, \
+    copy_file_if_changed
 from esphome.storage_json import StorageJSON, storage_path
 
 _LOGGER = logging.getLogger(__name__)
@@ -112,7 +113,7 @@ def migrate_src_version_0_to_1():
                           "auto-generated again.", main_cpp, main_cpp)
         _LOGGER.info("Migration: Added include section to %s", main_cpp)
 
-    write_file_if_changed(content, main_cpp)
+    write_file_if_changed(main_cpp, content)
 
 
 def migrate_src_version(old, new):
@@ -251,7 +252,7 @@ def write_platformio_ini(content):
         content_format = INI_BASE_FORMAT
     full_file = content_format[0] + INI_AUTO_GENERATE_BEGIN + '\n' + content
     full_file += INI_AUTO_GENERATE_END + content_format[1]
-    write_file_if_changed(full_file, path)
+    write_file_if_changed(path, full_file)
 
 
 def write_platformio_project():
@@ -285,7 +286,6 @@ or use the custom_components folder.
 
 
 def copy_src_tree():
-    import filecmp
     import shutil
 
     source_files = {}
@@ -321,9 +321,7 @@ def copy_src_tree():
             os.remove(path)
         else:
             src_path = source_files_copy.pop(target)
-            if not filecmp.cmp(path, src_path):
-                # Files are not same, copy
-                shutil.copy(src_path, path)
+            copy_file_if_changed(src_path, path)
 
     # Now copy new files
     for target, src_path in source_files_copy.items():
@@ -332,14 +330,14 @@ def copy_src_tree():
         shutil.copy(src_path, dst_path)
 
     # Finally copy defines
-    write_file_if_changed(generate_defines_h(),
-                          CORE.relative_src_path('esphome', 'core', 'defines.h'))
-    write_file_if_changed(ESPHOME_README_TXT,
-                          CORE.relative_src_path('esphome', 'README.txt'))
-    write_file_if_changed(ESPHOME_H_FORMAT.format(include_s),
-                          CORE.relative_src_path('esphome.h'))
-    write_file_if_changed(VERSION_H_FORMAT.format(__version__),
-                          CORE.relative_src_path('esphome', 'core', 'version.h'))
+    write_file_if_changed(CORE.relative_src_path('esphome', 'core', 'defines.h'),
+                          generate_defines_h())
+    write_file_if_changed(CORE.relative_src_path('esphome', 'README.txt'),
+                          ESPHOME_README_TXT)
+    write_file_if_changed(CORE.relative_src_path('esphome.h'),
+                          ESPHOME_H_FORMAT.format(include_s))
+    write_file_if_changed(CORE.relative_src_path('esphome', 'core', 'version.h'),
+                          VERSION_H_FORMAT.format(__version__))
 
 
 def generate_defines_h():
@@ -365,7 +363,7 @@ def write_cpp(code_s):
     full_file = code_format[0] + CPP_INCLUDE_BEGIN + u'\n' + global_s + CPP_INCLUDE_END
     full_file += code_format[1] + CPP_AUTO_GENERATE_BEGIN + u'\n' + code_s + CPP_AUTO_GENERATE_END
     full_file += code_format[2]
-    write_file_if_changed(full_file, path)
+    write_file_if_changed(path, full_file)
 
 
 def clean_build():

From 91c9b1164721ee28b0aafc84557df5ad4be88d5b Mon Sep 17 00:00:00 2001
From: Pavel Golovin <golovinps@yandex.ru>
Date: Fri, 25 Oct 2019 12:32:31 +0300
Subject: [PATCH 034/412] Fujitsu General climate new component (#677)

* new Fujitsu-General climate component

* Refactor out climate_ir

CC @glmnet

Refactored out climate_ir python files too.
Fixed invalid namespace name for climate_ir.

* Add namespace lint check

* Refactor Fujitsu Climate to climate_ir


Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/climate_ir/__init__.py     |  41 ++++
 esphome/components/climate_ir/climate_ir.cpp  |   4 +-
 esphome/components/climate_ir/climate_ir.h    |   7 +-
 esphome/components/coolix/climate.py          |  33 +--
 esphome/components/coolix/coolix.h            |   4 +-
 .../components/fujitsu_general/__init__.py    |   0
 esphome/components/fujitsu_general/climate.py |  18 ++
 .../fujitsu_general/fujitsu_general.cpp       | 212 ++++++++++++++++++
 .../fujitsu_general/fujitsu_general.h         |  24 ++
 esphome/components/tcl112/climate.py          |  33 +--
 esphome/components/tcl112/tcl112.h            |   4 +-
 script/ci-custom.py                           |  13 ++
 12 files changed, 332 insertions(+), 61 deletions(-)
 create mode 100644 esphome/components/fujitsu_general/__init__.py
 create mode 100644 esphome/components/fujitsu_general/climate.py
 create mode 100644 esphome/components/fujitsu_general/fujitsu_general.cpp
 create mode 100644 esphome/components/fujitsu_general/fujitsu_general.h

diff --git a/esphome/components/climate_ir/__init__.py b/esphome/components/climate_ir/__init__.py
index e69de29bb2..1163705faa 100644
--- a/esphome/components/climate_ir/__init__.py
+++ b/esphome/components/climate_ir/__init__.py
@@ -0,0 +1,41 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate, remote_transmitter, remote_receiver, sensor, remote_base
+from esphome.components.remote_base import CONF_RECEIVER_ID, CONF_TRANSMITTER_ID
+from esphome.const import CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT, CONF_SENSOR
+from esphome.core import coroutine
+
+AUTO_LOAD = ['sensor', 'remote_base']
+
+climate_ir_ns = cg.esphome_ns.namespace('climate_ir')
+ClimateIR = climate_ir_ns.class_('ClimateIR', climate.Climate, cg.Component,
+                                 remote_base.RemoteReceiverListener)
+
+CLIMATE_IR_SCHEMA = climate.CLIMATE_SCHEMA.extend({
+    cv.GenerateID(CONF_TRANSMITTER_ID): cv.use_id(remote_transmitter.RemoteTransmitterComponent),
+    cv.Optional(CONF_SUPPORTS_COOL, default=True): cv.boolean,
+    cv.Optional(CONF_SUPPORTS_HEAT, default=True): cv.boolean,
+    cv.Optional(CONF_SENSOR): cv.use_id(sensor.Sensor),
+}).extend(cv.COMPONENT_SCHEMA)
+
+CLIMATE_IR_WITH_RECEIVER_SCHEMA = CLIMATE_IR_SCHEMA.extend({
+    cv.Optional(CONF_RECEIVER_ID): cv.use_id(remote_receiver.RemoteReceiverComponent),
+})
+
+
+@coroutine
+def register_climate_ir(var, config):
+    yield cg.register_component(var, config)
+    yield climate.register_climate(var, config)
+
+    cg.add(var.set_supports_cool(config[CONF_SUPPORTS_COOL]))
+    cg.add(var.set_supports_heat(config[CONF_SUPPORTS_HEAT]))
+    if CONF_SENSOR in config:
+        sens = yield cg.get_variable(config[CONF_SENSOR])
+        cg.add(var.set_sensor(sens))
+    if CONF_RECEIVER_ID in config:
+        receiver = yield cg.get_variable(config[CONF_RECEIVER_ID])
+        cg.add(receiver.register_listener(var))
+
+    transmitter = yield cg.get_variable(config[CONF_TRANSMITTER_ID])
+    cg.add(var.set_transmitter(transmitter))
diff --git a/esphome/components/climate_ir/climate_ir.cpp b/esphome/components/climate_ir/climate_ir.cpp
index 995e5a7ba5..4b9a1c0baa 100644
--- a/esphome/components/climate_ir/climate_ir.cpp
+++ b/esphome/components/climate_ir/climate_ir.cpp
@@ -2,7 +2,7 @@
 #include "esphome/core/log.h"
 
 namespace esphome {
-namespace climate {
+namespace climate_ir {
 
 static const char *TAG = "climate_ir";
 
@@ -63,5 +63,5 @@ void ClimateIR::dump_config() {
   ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
 }
 
-}  // namespace climate
+}  // namespace climate_ir
 }  // namespace esphome
diff --git a/esphome/components/climate_ir/climate_ir.h b/esphome/components/climate_ir/climate_ir.h
index 51ced6b900..b4c036f3d6 100644
--- a/esphome/components/climate_ir/climate_ir.h
+++ b/esphome/components/climate_ir/climate_ir.h
@@ -6,7 +6,7 @@
 #include "esphome/components/sensor/sensor.h"
 
 namespace esphome {
-namespace climate {
+namespace climate_ir {
 
 /* A base for climate which works by sending (and receiving) IR codes
 
@@ -42,7 +42,7 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
   climate::ClimateTraits traits() override;
 
   /// Transmit via IR the state of this climate controller.
-  virtual void transmit_state() {}
+  virtual void transmit_state() = 0;
 
   bool supports_cool_{true};
   bool supports_heat_{true};
@@ -50,5 +50,6 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
   remote_transmitter::RemoteTransmitterComponent *transmitter_;
   sensor::Sensor *sensor_{nullptr};
 };
-}  // namespace climate
+
+}  // namespace climate_ir
 }  // namespace esphome
diff --git a/esphome/components/coolix/climate.py b/esphome/components/coolix/climate.py
index 14868a7be0..81412bb586 100644
--- a/esphome/components/coolix/climate.py
+++ b/esphome/components/coolix/climate.py
@@ -1,37 +1,18 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import climate, remote_transmitter, remote_receiver, sensor
-from esphome.components.remote_base import CONF_TRANSMITTER_ID, CONF_RECEIVER_ID
-from esphome.const import CONF_ID, CONF_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
 
-AUTO_LOAD = ['sensor', 'climate_ir']
+AUTO_LOAD = ['climate_ir']
 
 coolix_ns = cg.esphome_ns.namespace('coolix')
-CoolixClimate = coolix_ns.class_('CoolixClimate', climate.Climate, cg.Component)
+CoolixClimate = coolix_ns.class_('CoolixClimate', climate_ir.ClimateIR)
 
-CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(CoolixClimate),
-    cv.GenerateID(CONF_TRANSMITTER_ID): cv.use_id(remote_transmitter.RemoteTransmitterComponent),
-    cv.Optional(CONF_RECEIVER_ID): cv.use_id(remote_receiver.RemoteReceiverComponent),
-    cv.Optional(CONF_SUPPORTS_COOL, default=True): cv.boolean,
-    cv.Optional(CONF_SUPPORTS_HEAT, default=True): cv.boolean,
-    cv.Optional(CONF_SENSOR): cv.use_id(sensor.Sensor),
-}).extend(cv.COMPONENT_SCHEMA))
+})
 
 
 def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    yield cg.register_component(var, config)
-    yield climate.register_climate(var, config)
-
-    cg.add(var.set_supports_cool(config[CONF_SUPPORTS_COOL]))
-    cg.add(var.set_supports_heat(config[CONF_SUPPORTS_HEAT]))
-    if CONF_SENSOR in config:
-        sens = yield cg.get_variable(config[CONF_SENSOR])
-        cg.add(var.set_sensor(sens))
-    if CONF_RECEIVER_ID in config:
-        receiver = yield cg.get_variable(config[CONF_RECEIVER_ID])
-        cg.add(receiver.register_listener(var))
-
-    transmitter = yield cg.get_variable(config[CONF_TRANSMITTER_ID])
-    cg.add(var.set_transmitter(transmitter))
+    yield climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/coolix/coolix.h b/esphome/components/coolix/coolix.h
index 125d8ffd37..ed03a2fd1e 100644
--- a/esphome/components/coolix/coolix.h
+++ b/esphome/components/coolix/coolix.h
@@ -9,9 +9,9 @@ namespace coolix {
 const uint8_t COOLIX_TEMP_MIN = 17;  // Celsius
 const uint8_t COOLIX_TEMP_MAX = 30;  // Celsius
 
-class CoolixClimate : public climate::ClimateIR {
+class CoolixClimate : public climate_ir::ClimateIR {
  public:
-  CoolixClimate() : climate::ClimateIR(COOLIX_TEMP_MIN, COOLIX_TEMP_MAX) {}
+  CoolixClimate() : climate_ir::ClimateIR(COOLIX_TEMP_MIN, COOLIX_TEMP_MAX) {}
 
  protected:
   /// Transmit via IR the state of this climate controller.
diff --git a/esphome/components/fujitsu_general/__init__.py b/esphome/components/fujitsu_general/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/fujitsu_general/climate.py b/esphome/components/fujitsu_general/climate.py
new file mode 100644
index 0000000000..a6774c397a
--- /dev/null
+++ b/esphome/components/fujitsu_general/climate.py
@@ -0,0 +1,18 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
+
+AUTO_LOAD = ['climate_ir']
+
+fujitsu_general_ns = cg.esphome_ns.namespace('fujitsu_general')
+FujitsuGeneralClimate = fujitsu_general_ns.class_('FujitsuGeneralClimate', climate_ir.ClimateIR)
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(FujitsuGeneralClimate),
+})
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/fujitsu_general/fujitsu_general.cpp b/esphome/components/fujitsu_general/fujitsu_general.cpp
new file mode 100644
index 0000000000..261d8be258
--- /dev/null
+++ b/esphome/components/fujitsu_general/fujitsu_general.cpp
@@ -0,0 +1,212 @@
+#include "fujitsu_general.h"
+
+namespace esphome {
+namespace fujitsu_general {
+
+static const char *TAG = "fujitsu_general.climate";
+
+// Control packet
+const uint16_t FUJITSU_GENERAL_STATE_LENGTH = 16;
+
+const uint8_t FUJITSU_GENERAL_BASE_BYTE0 = 0x14;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE1 = 0x63;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE2 = 0x00;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE3 = 0x10;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE4 = 0x10;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE5 = 0xFE;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE6 = 0x09;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE7 = 0x30;
+
+// Temperature and POWER ON
+const uint8_t FUJITSU_GENERAL_POWER_ON_MASK_BYTE8 = 0b00000001;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE8 = 0x40;
+
+// Mode
+const uint8_t FUJITSU_GENERAL_MODE_AUTO_BYTE9 = 0x00;
+const uint8_t FUJITSU_GENERAL_MODE_HEAT_BYTE9 = 0x04;
+const uint8_t FUJITSU_GENERAL_MODE_COOL_BYTE9 = 0x01;
+const uint8_t FUJITSU_GENERAL_MODE_DRY_BYTE9 = 0x02;
+const uint8_t FUJITSU_GENERAL_MODE_FAN_BYTE9 = 0x03;
+const uint8_t FUJITSU_GENERAL_MODE_10C_BYTE9 = 0x0B;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE9 = 0x01;
+
+// Fan speed and swing
+const uint8_t FUJITSU_GENERAL_FAN_AUTO_BYTE10 = 0x00;
+const uint8_t FUJITSU_GENERAL_FAN_HIGH_BYTE10 = 0x01;
+const uint8_t FUJITSU_GENERAL_FAN_MEDIUM_BYTE10 = 0x02;
+const uint8_t FUJITSU_GENERAL_FAN_LOW_BYTE10 = 0x03;
+const uint8_t FUJITSU_GENERAL_FAN_SILENT_BYTE10 = 0x04;
+const uint8_t FUJITSU_GENERAL_SWING_MASK_BYTE10 = 0b00010000;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE10 = 0x00;
+
+const uint8_t FUJITSU_GENERAL_BASE_BYTE11 = 0x00;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE12 = 0x00;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE13 = 0x00;
+
+// Outdoor Unit Low Noise
+const uint8_t FUJITSU_GENERAL_OUTDOOR_UNIT_LOW_NOISE_BYTE14 = 0xA0;
+const uint8_t FUJITSU_GENERAL_BASE_BYTE14 = 0x20;
+
+// CRC
+const uint8_t FUJITSU_GENERAL_BASE_BYTE15 = 0x6F;
+
+// Power off packet is specific
+const uint16_t FUJITSU_GENERAL_OFF_LENGTH = 7;
+
+const uint8_t FUJITSU_GENERAL_OFF_BYTE0 = FUJITSU_GENERAL_BASE_BYTE0;
+const uint8_t FUJITSU_GENERAL_OFF_BYTE1 = FUJITSU_GENERAL_BASE_BYTE1;
+const uint8_t FUJITSU_GENERAL_OFF_BYTE2 = FUJITSU_GENERAL_BASE_BYTE2;
+const uint8_t FUJITSU_GENERAL_OFF_BYTE3 = FUJITSU_GENERAL_BASE_BYTE3;
+const uint8_t FUJITSU_GENERAL_OFF_BYTE4 = FUJITSU_GENERAL_BASE_BYTE4;
+const uint8_t FUJITSU_GENERAL_OFF_BYTE5 = 0x02;
+const uint8_t FUJITSU_GENERAL_OFF_BYTE6 = 0xFD;
+
+const uint8_t FUJITSU_GENERAL_TEMP_MAX = 30;  // Celsius
+const uint8_t FUJITSU_GENERAL_TEMP_MIN = 16;  // Celsius
+
+const uint16_t FUJITSU_GENERAL_HEADER_MARK = 3300;
+const uint16_t FUJITSU_GENERAL_HEADER_SPACE = 1600;
+const uint16_t FUJITSU_GENERAL_BIT_MARK = 420;
+const uint16_t FUJITSU_GENERAL_ONE_SPACE = 1200;
+const uint16_t FUJITSU_GENERAL_ZERO_SPACE = 420;
+const uint16_t FUJITSU_GENERAL_TRL_MARK = 420;
+const uint16_t FUJITSU_GENERAL_TRL_SPACE = 8000;
+
+const uint32_t FUJITSU_GENERAL_CARRIER_FREQUENCY = 38000;
+
+FujitsuGeneralClimate::FujitsuGeneralClimate() : ClimateIR(FUJITSU_GENERAL_TEMP_MIN, FUJITSU_GENERAL_TEMP_MAX, 1) {}
+
+void FujitsuGeneralClimate::transmit_state() {
+  if (this->mode == climate::CLIMATE_MODE_OFF) {
+    this->transmit_off_();
+    return;
+  }
+  uint8_t remote_state[FUJITSU_GENERAL_STATE_LENGTH] = {0};
+
+  remote_state[0] = FUJITSU_GENERAL_BASE_BYTE0;
+  remote_state[1] = FUJITSU_GENERAL_BASE_BYTE1;
+  remote_state[2] = FUJITSU_GENERAL_BASE_BYTE2;
+  remote_state[3] = FUJITSU_GENERAL_BASE_BYTE3;
+  remote_state[4] = FUJITSU_GENERAL_BASE_BYTE4;
+  remote_state[5] = FUJITSU_GENERAL_BASE_BYTE5;
+  remote_state[6] = FUJITSU_GENERAL_BASE_BYTE6;
+  remote_state[7] = FUJITSU_GENERAL_BASE_BYTE7;
+  remote_state[8] = FUJITSU_GENERAL_BASE_BYTE8;
+  remote_state[9] = FUJITSU_GENERAL_BASE_BYTE9;
+  remote_state[10] = FUJITSU_GENERAL_BASE_BYTE10;
+  remote_state[11] = FUJITSU_GENERAL_BASE_BYTE11;
+  remote_state[12] = FUJITSU_GENERAL_BASE_BYTE12;
+  remote_state[13] = FUJITSU_GENERAL_BASE_BYTE13;
+  remote_state[14] = FUJITSU_GENERAL_BASE_BYTE14;
+  remote_state[15] = FUJITSU_GENERAL_BASE_BYTE15;
+
+  // Set temperature
+  uint8_t safecelsius = std::max((uint8_t) this->target_temperature, FUJITSU_GENERAL_TEMP_MIN);
+  safecelsius = std::min(safecelsius, FUJITSU_GENERAL_TEMP_MAX);
+  remote_state[8] = (byte) safecelsius - 16;
+  remote_state[8] = remote_state[8] << 4;
+
+  // If not powered - set power on flag
+  if (!this->power_) {
+    remote_state[8] = (byte) remote_state[8] | FUJITSU_GENERAL_POWER_ON_MASK_BYTE8;
+  }
+
+  // Set mode
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_COOL:
+      remote_state[9] = FUJITSU_GENERAL_MODE_COOL_BYTE9;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      remote_state[9] = FUJITSU_GENERAL_MODE_HEAT_BYTE9;
+      break;
+    case climate::CLIMATE_MODE_AUTO:
+    default:
+      remote_state[9] = FUJITSU_GENERAL_MODE_AUTO_BYTE9;
+      break;
+      // TODO: CLIMATE_MODE_FAN_ONLY, CLIMATE_MODE_DRY, CLIMATE_MODE_10C are missing in esphome
+  }
+
+  // TODO: missing support for fan speed
+  remote_state[10] = FUJITSU_GENERAL_FAN_AUTO_BYTE10;
+
+  // TODO: missing support for swing
+  // remote_state[10] = (byte) remote_state[10] | FUJITSU_GENERAL_SWING_MASK_BYTE10;
+
+  // TODO: missing support for outdoor unit low noise
+  // remote_state[14] = (byte) remote_state[14] | FUJITSU_GENERAL_OUTDOOR_UNIT_LOW_NOISE_BYTE14;
+
+  // CRC
+  remote_state[15] = 0;
+  for (int i = 7; i < 15; i++) {
+    remote_state[15] += (byte) remote_state[i];  // Addiction
+  }
+  remote_state[15] = 0x100 - remote_state[15];  // mod 256
+
+  auto transmit = this->transmitter_->transmit();
+  auto data = transmit.get_data();
+
+  data->set_carrier_frequency(FUJITSU_GENERAL_CARRIER_FREQUENCY);
+
+  // Header
+  data->mark(FUJITSU_GENERAL_HEADER_MARK);
+  data->space(FUJITSU_GENERAL_HEADER_SPACE);
+  // Data
+  for (uint8_t i : remote_state) {
+    // Send all Bits from Byte Data in Reverse Order
+    for (uint8_t mask = 00000001; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(FUJITSU_GENERAL_BIT_MARK);
+      bool bit = i & mask;
+      data->space(bit ? FUJITSU_GENERAL_ONE_SPACE : FUJITSU_GENERAL_ZERO_SPACE);
+      // Next bits
+    }
+  }
+  // Footer
+  data->mark(FUJITSU_GENERAL_TRL_MARK);
+  data->space(FUJITSU_GENERAL_TRL_SPACE);
+
+  transmit.perform();
+
+  this->power_ = true;
+}
+
+void FujitsuGeneralClimate::transmit_off_() {
+  uint8_t remote_state[FUJITSU_GENERAL_OFF_LENGTH] = {0};
+
+  remote_state[0] = FUJITSU_GENERAL_OFF_BYTE0;
+  remote_state[1] = FUJITSU_GENERAL_OFF_BYTE1;
+  remote_state[2] = FUJITSU_GENERAL_OFF_BYTE2;
+  remote_state[3] = FUJITSU_GENERAL_OFF_BYTE3;
+  remote_state[4] = FUJITSU_GENERAL_OFF_BYTE4;
+  remote_state[5] = FUJITSU_GENERAL_OFF_BYTE5;
+  remote_state[6] = FUJITSU_GENERAL_OFF_BYTE6;
+
+  auto transmit = this->transmitter_->transmit();
+  auto data = transmit.get_data();
+
+  data->set_carrier_frequency(FUJITSU_GENERAL_CARRIER_FREQUENCY);
+
+  // Header
+  data->mark(FUJITSU_GENERAL_HEADER_MARK);
+  data->space(FUJITSU_GENERAL_HEADER_SPACE);
+
+  // Data
+  for (uint8_t i : remote_state) {
+    // Send all Bits from Byte Data in Reverse Order
+    for (uint8_t mask = 00000001; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(FUJITSU_GENERAL_BIT_MARK);
+      bool bit = i & mask;
+      data->space(bit ? FUJITSU_GENERAL_ONE_SPACE : FUJITSU_GENERAL_ZERO_SPACE);
+      // Next bits
+    }
+  }
+  // Footer
+  data->mark(FUJITSU_GENERAL_TRL_MARK);
+  data->space(FUJITSU_GENERAL_TRL_SPACE);
+
+  transmit.perform();
+
+  this->power_ = false;
+}
+
+}  // namespace fujitsu_general
+}  // namespace esphome
diff --git a/esphome/components/fujitsu_general/fujitsu_general.h b/esphome/components/fujitsu_general/fujitsu_general.h
new file mode 100644
index 0000000000..80db81a167
--- /dev/null
+++ b/esphome/components/fujitsu_general/fujitsu_general.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace fujitsu_general {
+
+class FujitsuGeneralClimate : public climate_ir::ClimateIR {
+ public:
+  FujitsuGeneralClimate();
+
+ protected:
+  /// Transmit via IR the state of this climate controller.
+  void transmit_state() override;
+  /// Transmit via IR power off command.
+  void transmit_off_();
+
+  bool power_{false};
+};
+
+}  // namespace fujitsu_general
+}  // namespace esphome
diff --git a/esphome/components/tcl112/climate.py b/esphome/components/tcl112/climate.py
index 66af291a17..3c94f4a243 100644
--- a/esphome/components/tcl112/climate.py
+++ b/esphome/components/tcl112/climate.py
@@ -1,37 +1,18 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import climate, remote_transmitter, remote_receiver, sensor
-from esphome.components.remote_base import CONF_TRANSMITTER_ID, CONF_RECEIVER_ID
-from esphome.const import CONF_ID, CONF_SENSOR, CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
 
-AUTO_LOAD = ['sensor', 'climate_ir']
+AUTO_LOAD = ['climate_ir']
 
 tcl112_ns = cg.esphome_ns.namespace('tcl112')
-Tcl112Climate = tcl112_ns.class_('Tcl112Climate', climate.Climate, cg.Component)
+Tcl112Climate = tcl112_ns.class_('Tcl112Climate', climate_ir.ClimateIR)
 
-CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(Tcl112Climate),
-    cv.GenerateID(CONF_TRANSMITTER_ID): cv.use_id(remote_transmitter.RemoteTransmitterComponent),
-    cv.Optional(CONF_RECEIVER_ID): cv.use_id(remote_receiver.RemoteReceiverComponent),
-    cv.Optional(CONF_SUPPORTS_COOL, default=True): cv.boolean,
-    cv.Optional(CONF_SUPPORTS_HEAT, default=True): cv.boolean,
-    cv.Optional(CONF_SENSOR): cv.use_id(sensor.Sensor),
-}).extend(cv.COMPONENT_SCHEMA))
+})
 
 
 def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    yield cg.register_component(var, config)
-    yield climate.register_climate(var, config)
-
-    cg.add(var.set_supports_cool(config[CONF_SUPPORTS_COOL]))
-    cg.add(var.set_supports_heat(config[CONF_SUPPORTS_HEAT]))
-    if CONF_SENSOR in config:
-        sens = yield cg.get_variable(config[CONF_SENSOR])
-        cg.add(var.set_sensor(sens))
-    if CONF_RECEIVER_ID in config:
-        receiver = yield cg.get_variable(config[CONF_RECEIVER_ID])
-        cg.add(receiver.register_listener(var))
-
-    transmitter = yield cg.get_variable(config[CONF_TRANSMITTER_ID])
-    cg.add(var.set_transmitter(transmitter))
+    yield climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/tcl112/tcl112.h b/esphome/components/tcl112/tcl112.h
index 7c5257a0f3..273162662d 100644
--- a/esphome/components/tcl112/tcl112.h
+++ b/esphome/components/tcl112/tcl112.h
@@ -9,9 +9,9 @@ namespace tcl112 {
 const float TCL112_TEMP_MAX = 31.0;
 const float TCL112_TEMP_MIN = 16.0;
 
-class Tcl112Climate : public climate::ClimateIR {
+class Tcl112Climate : public climate_ir::ClimateIR {
  public:
-  Tcl112Climate() : climate::ClimateIR(TCL112_TEMP_MIN, TCL112_TEMP_MAX, .5f) {}
+  Tcl112Climate() : climate_ir::ClimateIR(TCL112_TEMP_MIN, TCL112_TEMP_MAX, .5f) {}
 
  protected:
   /// Transmit via IR the state of this climate controller.
diff --git a/script/ci-custom.py b/script/ci-custom.py
index b43b15bcdd..51b7b9d9b5 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -298,6 +298,19 @@ def lint_relative_py_import(fname):
             '  from . import abc_ns\n\n')
 
 
+@lint_content_check(include=['esphome/components/*.h', 'esphome/components/*.cpp',
+                             'esphome/components/*.tcc'])
+def lint_namespace(fname, content):
+    expected_name = re.match(r'^esphome/components/([^/]+)/.*',
+                             fname.replace(os.path.sep, '/')).group(1)
+    search = 'namespace {}'.format(expected_name)
+    if search in content:
+        return None
+    return 'Invalid namespace found in C++ file. All integration C++ files should put all ' \
+           'functions in a separate namespace that matches the integration\'s name. ' \
+           'Please make sure the file contains {}'.format(highlight(search))
+
+
 @lint_content_find_check('"esphome.h"', include=cpp_include, exclude=['tests/custom.h'])
 def lint_esphome_h(fname):
     return ("File contains reference to 'esphome.h' - This file is "

From 5a67e723895297f78bae960cbfd38c787192a85e Mon Sep 17 00:00:00 2001
From: John <34163498+CircuitSetup@users.noreply.github.com>
Date: Sun, 27 Oct 2019 07:05:13 -0400
Subject: [PATCH 035/412] Added more power data to the atm90e32 component
 (#799)

* Added more data to atm90e32 component

* ignore

* correction

* Delete 6chan_energy_meter.yaml

* Update sensor.py

fixed indents

* Update atm90e32.h

* Update esphome/components/atm90e32/sensor.py

Co-Authored-By: Otto Winter <otto@otto-winter.com>

* PR request changes

* repository test branch

* Update setup.py

* Update const.py

* backslash

* comma!

* delete test yaml

* corrected chip temp

* change to signed int for get_pf_ functions

* Update atm90e32.h

formatting

* adjusted function & variable names

* Update atm90e32.h

formatting

* Update sensor.py

Import CONF_POWER_FACTOR from const.py

* travis formatting

* Update esphome/components/atm90e32/sensor.py

Co-Authored-By: Otto Winter <otto@otto-winter.com>

* Update esphome/components/atm90e32/atm90e32.h

Co-Authored-By: Otto Winter <otto@otto-winter.com>
---
 esphome/components/atm90e32/atm90e32.cpp | 58 +++++++++++++++++++++++-
 esphome/components/atm90e32/atm90e32.h   | 15 ++++++
 esphome/components/atm90e32/sensor.py    | 23 ++++++++--
 3 files changed, 91 insertions(+), 5 deletions(-)

diff --git a/esphome/components/atm90e32/atm90e32.cpp b/esphome/components/atm90e32/atm90e32.cpp
index 283319994e..bc1e326147 100644
--- a/esphome/components/atm90e32/atm90e32.cpp
+++ b/esphome/components/atm90e32/atm90e32.cpp
@@ -40,9 +40,30 @@ void ATM90E32Component::update() {
   if (this->phase_[2].power_sensor_ != nullptr) {
     this->phase_[2].power_sensor_->publish_state(this->get_active_power_c_());
   }
+  if (this->phase_[0].reactive_power_sensor_ != nullptr) {
+    this->phase_[0].reactive_power_sensor_->publish_state(this->get_reactive_power_a_());
+  }
+  if (this->phase_[1].reactive_power_sensor_ != nullptr) {
+    this->phase_[1].reactive_power_sensor_->publish_state(this->get_reactive_power_b_());
+  }
+  if (this->phase_[2].reactive_power_sensor_ != nullptr) {
+    this->phase_[2].reactive_power_sensor_->publish_state(this->get_reactive_power_c_());
+  }
+  if (this->phase_[0].power_factor_sensor_ != nullptr) {
+    this->phase_[0].power_factor_sensor_->publish_state(this->get_power_factor_a_());
+  }
+  if (this->phase_[1].power_factor_sensor_ != nullptr) {
+    this->phase_[1].power_factor_sensor_->publish_state(this->get_power_factor_b_());
+  }
+  if (this->phase_[2].power_factor_sensor_ != nullptr) {
+    this->phase_[2].power_factor_sensor_->publish_state(this->get_power_factor_c_());
+  }
   if (this->freq_sensor_ != nullptr) {
     this->freq_sensor_->publish_state(this->get_frequency_());
   }
+  if (this->chip_temperature_sensor_ != nullptr) {
+    this->chip_temperature_sensor_->publish_state(this->get_chip_temperature_());
+  }
   this->status_clear_warning();
 }
 
@@ -89,13 +110,20 @@ void ATM90E32Component::dump_config() {
   LOG_SENSOR("  ", "Voltage A", this->phase_[0].voltage_sensor_);
   LOG_SENSOR("  ", "Current A", this->phase_[0].current_sensor_);
   LOG_SENSOR("  ", "Power A", this->phase_[0].power_sensor_);
+  LOG_SENSOR("  ", "Reactive Power A", this->phase_[0].reactive_power_sensor_);
+  LOG_SENSOR("  ", "PF A", this->phase_[0].power_factor_sensor_);
   LOG_SENSOR("  ", "Voltage B", this->phase_[1].voltage_sensor_);
   LOG_SENSOR("  ", "Current B", this->phase_[1].current_sensor_);
   LOG_SENSOR("  ", "Power B", this->phase_[1].power_sensor_);
+  LOG_SENSOR("  ", "Reactive Power B", this->phase_[1].reactive_power_sensor_);
+  LOG_SENSOR("  ", "PF B", this->phase_[1].power_factor_sensor_);
   LOG_SENSOR("  ", "Voltage C", this->phase_[2].voltage_sensor_);
   LOG_SENSOR("  ", "Current C", this->phase_[2].current_sensor_);
   LOG_SENSOR("  ", "Power C", this->phase_[2].power_sensor_);
-  LOG_SENSOR("  ", "Frequency", this->freq_sensor_)
+  LOG_SENSOR("  ", "Reactive Power C", this->phase_[2].reactive_power_sensor_);
+  LOG_SENSOR("  ", "PF C", this->phase_[2].power_factor_sensor_);
+  LOG_SENSOR("  ", "Frequency", this->freq_sensor_);
+  LOG_SENSOR("  ", "Chip Temp", this->chip_temperature_sensor_);
 }
 float ATM90E32Component::get_setup_priority() const { return setup_priority::DATA; }
 
@@ -180,9 +208,37 @@ float ATM90E32Component::get_active_power_c_() {
   int val = this->read32_(ATM90E32_REGISTER_PMEANC, ATM90E32_REGISTER_PMEANCLSB);
   return val * 0.00032f;
 }
+float ATM90E32Component::get_reactive_power_a_() {
+  int val = this->read32_(ATM90E32_REGISTER_QMEANA, ATM90E32_REGISTER_QMEANALSB);
+  return val * 0.00032f;
+}
+float ATM90E32Component::get_reactive_power_b_() {
+  int val = this->read32_(ATM90E32_REGISTER_QMEANB, ATM90E32_REGISTER_QMEANBLSB);
+  return val * 0.00032f;
+}
+float ATM90E32Component::get_reactive_power_c_() {
+  int val = this->read32_(ATM90E32_REGISTER_QMEANC, ATM90E32_REGISTER_QMEANCLSB);
+  return val * 0.00032f;
+}
+float ATM90E32Component::get_power_factor_a_() {
+  int16_t pf = this->read16_(ATM90E32_REGISTER_PFMEANA);
+  return (float) pf / 1000;
+}
+float ATM90E32Component::get_power_factor_b_() {
+  int16_t pf = this->read16_(ATM90E32_REGISTER_PFMEANB);
+  return (float) pf / 1000;
+}
+float ATM90E32Component::get_power_factor_c_() {
+  int16_t pf = this->read16_(ATM90E32_REGISTER_PFMEANC);
+  return (float) pf / 1000;
+}
 float ATM90E32Component::get_frequency_() {
   uint16_t freq = this->read16_(ATM90E32_REGISTER_FREQ);
   return (float) freq / 100;
 }
+float ATM90E32Component::get_chip_temperature_() {
+  uint16_t ctemp = this->read16_(ATM90E32_REGISTER_TEMP);
+  return (float) ctemp;
+}
 }  // namespace atm90e32
 }  // namespace esphome
diff --git a/esphome/components/atm90e32/atm90e32.h b/esphome/components/atm90e32/atm90e32.h
index 4dd2bd5784..3daa31d15d 100644
--- a/esphome/components/atm90e32/atm90e32.h
+++ b/esphome/components/atm90e32/atm90e32.h
@@ -19,10 +19,15 @@ class ATM90E32Component : public PollingComponent,
   void set_voltage_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].voltage_sensor_ = obj; }
   void set_current_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].current_sensor_ = obj; }
   void set_power_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].power_sensor_ = obj; }
+  void set_reactive_power_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].reactive_power_sensor_ = obj; }
+  void set_power_factor_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].power_factor_sensor_ = obj; }
   void set_volt_gain(int phase, uint16_t gain) { this->phase_[phase].volt_gain_ = gain; }
   void set_ct_gain(int phase, uint16_t gain) { this->phase_[phase].ct_gain_ = gain; }
 
   void set_freq_sensor(sensor::Sensor *freq_sensor) { freq_sensor_ = freq_sensor; }
+  void set_chip_temperature_sensor(sensor::Sensor *chip_temperature_sensor) {
+    chip_temperature_sensor_ = chip_temperature_sensor;
+  }
   void set_line_freq(int freq) { line_freq_ = freq; }
   void set_pga_gain(uint16_t gain) { pga_gain_ = gain; }
 
@@ -40,7 +45,14 @@ class ATM90E32Component : public PollingComponent,
   float get_active_power_a_();
   float get_active_power_b_();
   float get_active_power_c_();
+  float get_reactive_power_a_();
+  float get_reactive_power_b_();
+  float get_reactive_power_c_();
+  float get_power_factor_a_();
+  float get_power_factor_b_();
+  float get_power_factor_c_();
   float get_frequency_();
+  float get_chip_temperature_();
 
   struct ATM90E32Phase {
     uint16_t volt_gain_{41820};
@@ -48,8 +60,11 @@ class ATM90E32Component : public PollingComponent,
     sensor::Sensor *voltage_sensor_{nullptr};
     sensor::Sensor *current_sensor_{nullptr};
     sensor::Sensor *power_sensor_{nullptr};
+    sensor::Sensor *reactive_power_sensor_{nullptr};
+    sensor::Sensor *power_factor_sensor_{nullptr};
   } phase_[3];
   sensor::Sensor *freq_sensor_{nullptr};
+  sensor::Sensor *chip_temperature_sensor_{nullptr};
   uint16_t pga_gain_{0x15};
   int line_freq_{60};
 };
diff --git a/esphome/components/atm90e32/sensor.py b/esphome/components/atm90e32/sensor.py
index 7b62740f8e..030ff90a77 100644
--- a/esphome/components/atm90e32/sensor.py
+++ b/esphome/components/atm90e32/sensor.py
@@ -2,14 +2,17 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, spi
 from esphome.const import \
-    CONF_ID, CONF_VOLTAGE, CONF_CURRENT, CONF_POWER, CONF_FREQUENCY, \
-    ICON_FLASH, UNIT_HZ, UNIT_VOLT, UNIT_AMPERE, UNIT_WATT
+    CONF_ID, CONF_VOLTAGE, CONF_CURRENT, CONF_POWER, CONF_POWER_FACTOR, CONF_FREQUENCY, \
+    ICON_FLASH, ICON_LIGHTBULB, ICON_CURRENT_AC, ICON_THERMOMETER, \
+    UNIT_HZ, UNIT_VOLT, UNIT_AMPERE, UNIT_WATT, UNIT_EMPTY, UNIT_CELSIUS
 
 CONF_PHASE_A = 'phase_a'
 CONF_PHASE_B = 'phase_b'
 CONF_PHASE_C = 'phase_c'
 
+CONF_REACTIVE_POWER = 'reactive_power'
 CONF_LINE_FREQUENCY = 'line_frequency'
+CONF_CHIP_TEMPERATURE = 'chip_temperature'
 CONF_GAIN_PGA = 'gain_pga'
 CONF_GAIN_VOLTAGE = 'gain_voltage'
 CONF_GAIN_CT = 'gain_ct'
@@ -28,8 +31,10 @@ ATM90E32Component = atm90e32_ns.class_('ATM90E32Component', cg.PollingComponent,
 
 ATM90E32_PHASE_SCHEMA = cv.Schema({
     cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 2),
-    cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_FLASH, 2),
+    cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_CURRENT_AC, 2),
     cv.Optional(CONF_POWER): sensor.sensor_schema(UNIT_WATT, ICON_FLASH, 2),
+    cv.Optional(CONF_REACTIVE_POWER): sensor.sensor_schema(UNIT_EMPTY, ICON_LIGHTBULB, 2),
+    cv.Optional(CONF_POWER_FACTOR): sensor.sensor_schema(UNIT_EMPTY, ICON_FLASH, 2),
     cv.Optional(CONF_GAIN_VOLTAGE, default=41820): cv.uint16_t,
     cv.Optional(CONF_GAIN_CT, default=25498): cv.uint16_t,
 })
@@ -39,7 +44,8 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_PHASE_A): ATM90E32_PHASE_SCHEMA,
     cv.Optional(CONF_PHASE_B): ATM90E32_PHASE_SCHEMA,
     cv.Optional(CONF_PHASE_C): ATM90E32_PHASE_SCHEMA,
-    cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(UNIT_HZ, ICON_FLASH, 1),
+    cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(UNIT_HZ, ICON_CURRENT_AC, 1),
+    cv.Optional(CONF_CHIP_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
     cv.Required(CONF_LINE_FREQUENCY): cv.enum(LINE_FREQS, upper=True),
     cv.Optional(CONF_GAIN_PGA, default='2X'): cv.enum(PGA_GAINS, upper=True),
 }).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
@@ -65,8 +71,17 @@ def to_code(config):
         if CONF_POWER in conf:
             sens = yield sensor.new_sensor(conf[CONF_POWER])
             cg.add(var.set_power_sensor(i, sens))
+        if CONF_REACTIVE_POWER in conf:
+            sens = yield sensor.new_sensor(conf[CONF_REACTIVE_POWER])
+            cg.add(var.set_react_pow_sensor(i, sens))
+        if CONF_POWER_FACTOR in conf:
+            sens = yield sensor.new_sensor(conf[CONF_POWER_FACTOR])
+            cg.add(var.set_pf_sensor(i, sens))
     if CONF_FREQUENCY in config:
         sens = yield sensor.new_sensor(config[CONF_FREQUENCY])
         cg.add(var.set_freq_sensor(sens))
+    if CONF_CHIP_TEMPERATURE in config:
+        sens = yield sensor.new_sensor(config[CONF_CHIP_TEMPERATURE])
+        cg.add(var.set_chip_temp_sensor(sens))
     cg.add(var.set_line_freq(config[CONF_LINE_FREQUENCY]))
     cg.add(var.set_pga_gain(config[CONF_GAIN_PGA]))

From c1f5e04d6cd2a051b6082c65a2d41b82e84a07c5 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 27 Oct 2019 12:27:46 +0100
Subject: [PATCH 036/412] Warn when UART and logger operating on same bus
 (#803)

---
 esphome/components/logger/logger.h |  1 +
 esphome/components/uart/uart.cpp   | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 3d129e335b..9d252af515 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -31,6 +31,7 @@ class Logger : public Component {
 
   /// Manually set the baud rate for serial, set to 0 to disable.
   void set_baud_rate(uint32_t baud_rate);
+  uint32_t get_baud_rate() const { return baud_rate_; }
 
   /// Get the UART used by the logger.
   UARTSelection get_uart() const;
diff --git a/esphome/components/uart/uart.cpp b/esphome/components/uart/uart.cpp
index fd27a8f897..3284d4cb67 100644
--- a/esphome/components/uart/uart.cpp
+++ b/esphome/components/uart/uart.cpp
@@ -2,6 +2,11 @@
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/application.h"
+#include "esphome/core/defines.h"
+
+#ifdef USE_LOGGER
+#include "esphome/components/logger/logger.h"
+#endif
 
 namespace esphome {
 namespace uart {
@@ -41,6 +46,12 @@ void UARTComponent::dump_config() {
   }
   ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
   ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
+#ifdef USE_LOGGER
+  if (this->hw_serial_ == &Serial && logger::global_logger->get_baud_rate() != 0) {
+    ESP_LOGW(TAG, "  You're using the same serial port for logging and the UART component. Please "
+                  "disable logging over the serial port by setting logger->baud_rate to 0.");
+  }
+#endif
 }
 
 void UARTComponent::write_byte(uint8_t data) {
@@ -145,6 +156,13 @@ void UARTComponent::dump_config() {
   } else {
     ESP_LOGCONFIG(TAG, "  Using software serial");
   }
+
+#ifdef USE_LOGGER
+  if (this->hw_serial_ == &Serial && logger::global_logger->get_baud_rate() != 0) {
+    ESP_LOGW(TAG, "  You're using the same serial port for logging and the UART component. Please "
+                  "disable logging over the serial port by setting logger->baud_rate to 0.");
+  }
+#endif
 }
 
 void UARTComponent::write_byte(uint8_t data) {

From 7bf6fd316fe155f9b44c199db50bd628e11934c1 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 27 Oct 2019 12:28:01 +0100
Subject: [PATCH 037/412] Add Tuya message for no datapoints (#804)

See also https://github.com/esphome/feature-requests/issues/352#issuecomment-546579206
---
 esphome/components/tuya/tuya.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index 4efcf08fe6..cb796644c8 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -36,6 +36,9 @@ void Tuya::dump_config() {
     else
       ESP_LOGCONFIG(TAG, "  Datapoint %d: unknown", info.id);
   }
+  if (this->datapoints_.empty()) {
+    ESP_LOGCONFIG(TAG, "  Received no datapoints! Please make sure this is a supported Tuya device.");
+  }
   this->check_uart_settings(9600);
 }
 

From b0bb692af448956d0179eb1341d12eb9f2f2f846 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 27 Oct 2019 12:30:19 +0100
Subject: [PATCH 038/412] AS3935 Use normal pin polling for IRQ (#805)

* AS3935 Use normal pin polling for IRQ

See also https://github.com/esphome/feature-requests/issues/452

* Fix tests
---
 esphome/components/as3935/__init__.py | 11 +++++------
 esphome/components/as3935/as3935.cpp  | 13 ++++---------
 esphome/components/as3935/as3935.h    | 13 ++-----------
 tests/test1.yaml                      |  2 +-
 tests/test2.yaml                      |  2 +-
 5 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/esphome/components/as3935/__init__.py b/esphome/components/as3935/__init__.py
index f8ac4eea01..de25060623 100644
--- a/esphome/components/as3935/__init__.py
+++ b/esphome/components/as3935/__init__.py
@@ -1,12 +1,11 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
-from esphome.const import CONF_PIN, CONF_INDOOR, CONF_WATCHDOG_THRESHOLD, \
+from esphome.const import CONF_INDOOR, CONF_WATCHDOG_THRESHOLD, \
     CONF_NOISE_LEVEL, CONF_SPIKE_REJECTION, CONF_LIGHTNING_THRESHOLD, \
     CONF_MASK_DISTURBER, CONF_DIV_RATIO, CONF_CAPACITANCE
 from esphome.core import coroutine
 
-
 AUTO_LOAD = ['sensor', 'binary_sensor']
 MULTI_CONF = True
 
@@ -15,10 +14,10 @@ CONF_AS3935_ID = 'as3935_id'
 as3935_ns = cg.esphome_ns.namespace('as3935')
 AS3935 = as3935_ns.class_('AS3935Component', cg.Component)
 
+CONF_IRQ_PIN = 'irq_pin'
 AS3935_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(AS3935),
-    cv.Required(CONF_PIN): cv.All(pins.internal_gpio_input_pin_schema,
-                                  pins.validate_has_interrupt),
+    cv.Required(CONF_IRQ_PIN): pins.gpio_input_pin_schema,
 
     cv.Optional(CONF_INDOOR, default=True): cv.boolean,
     cv.Optional(CONF_NOISE_LEVEL, default=2): cv.int_range(min=1, max=7),
@@ -35,8 +34,8 @@ AS3935_SCHEMA = cv.Schema({
 def setup_as3935(var, config):
     yield cg.register_component(var, config)
 
-    pin = yield cg.gpio_pin_expression(config[CONF_PIN])
-    cg.add(var.set_pin(pin))
+    irq_pin = yield cg.gpio_pin_expression(config[CONF_IRQ_PIN])
+    cg.add(var.set_irq_pin(irq_pin))
     cg.add(var.set_indoor(config[CONF_INDOOR]))
     cg.add(var.set_noise_level(config[CONF_NOISE_LEVEL]))
     cg.add(var.set_watchdog_threshold(config[CONF_WATCHDOG_THRESHOLD]))
diff --git a/esphome/components/as3935/as3935.cpp b/esphome/components/as3935/as3935.cpp
index 0fc8f086d2..f8272e6036 100644
--- a/esphome/components/as3935/as3935.cpp
+++ b/esphome/components/as3935/as3935.cpp
@@ -9,10 +9,8 @@ static const char *TAG = "as3935";
 void AS3935Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up AS3935...");
 
-  this->pin_->setup();
-  this->store_.pin = this->pin_->to_isr();
-  LOG_PIN("  Interrupt Pin: ", this->pin_);
-  this->pin_->attach_interrupt(AS3935ComponentStore::gpio_intr, &this->store_, RISING);
+  this->irq_pin_->setup();
+  LOG_PIN("  IRQ Pin: ", this->irq_pin_);
 
   // Write properties to sensor
   this->write_indoor(this->indoor_);
@@ -27,13 +25,13 @@ void AS3935Component::setup() {
 
 void AS3935Component::dump_config() {
   ESP_LOGCONFIG(TAG, "AS3935:");
-  LOG_PIN("  Interrupt Pin: ", this->pin_);
+  LOG_PIN("  Interrupt Pin: ", this->irq_pin_);
 }
 
 float AS3935Component::get_setup_priority() const { return setup_priority::DATA; }
 
 void AS3935Component::loop() {
-  if (!this->store_.interrupt)
+  if (!this->irq_pin_->digital_read())
     return;
 
   uint8_t int_value = this->read_interrupt_register_();
@@ -53,7 +51,6 @@ void AS3935Component::loop() {
       this->energy_sensor_->publish_state(energy);
   }
   this->thunder_alert_binary_sensor_->publish_state(false);
-  this->store_.interrupt = false;
 }
 
 void AS3935Component::write_indoor(bool indoor) {
@@ -222,7 +219,5 @@ uint8_t AS3935Component::read_register_(uint8_t reg, uint8_t mask) {
   return value;
 }
 
-void ICACHE_RAM_ATTR AS3935ComponentStore::gpio_intr(AS3935ComponentStore *arg) { arg->interrupt = true; }
-
 }  // namespace as3935
 }  // namespace esphome
diff --git a/esphome/components/as3935/as3935.h b/esphome/components/as3935/as3935.h
index ca7d409282..d0e53e7832 100644
--- a/esphome/components/as3935/as3935.h
+++ b/esphome/components/as3935/as3935.h
@@ -50,14 +50,6 @@ enum AS3935Values {
   NOISE_INT = 0x01
 };
 
-/// Store data in a class that doesn't use multiple-inheritance (vtables in flash)
-struct AS3935ComponentStore {
-  volatile bool interrupt;
-
-  ISRInternalGPIOPin *pin;
-  static void gpio_intr(AS3935ComponentStore *arg);
-};
-
 class AS3935Component : public Component {
  public:
   void setup() override;
@@ -65,7 +57,7 @@ class AS3935Component : public Component {
   float get_setup_priority() const override;
   void loop() override;
 
-  void set_pin(GPIOPin *pin) { pin_ = pin; }
+  void set_irq_pin(GPIOPin *irq_pin) { irq_pin_ = irq_pin; }
   void set_distance_sensor(sensor::Sensor *distance_sensor) { distance_sensor_ = distance_sensor; }
   void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
   void set_thunder_alert_binary_sensor(binary_sensor::BinarySensor *thunder_alert_binary_sensor) {
@@ -102,8 +94,7 @@ class AS3935Component : public Component {
   sensor::Sensor *distance_sensor_;
   sensor::Sensor *energy_sensor_;
   binary_sensor::BinarySensor *thunder_alert_binary_sensor_;
-  GPIOPin *pin_;
-  AS3935ComponentStore store_;
+  GPIOPin *irq_pin_;
 
   bool indoor_;
   uint8_t noise_level_;
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 2fbef9d4f7..66f0220836 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -172,7 +172,7 @@ dallas:
 
 as3935_spi:
   cs_pin: GPIO12
-  pin: GPIO13
+  irq_pin: GPIO13
 
 sensor:
   - platform: adc
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 1f4245d81d..097c29285a 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -54,7 +54,7 @@ deep_sleep:
   sleep_duration: 50s
 
 as3935_i2c:
-  pin: GPIO12
+  irq_pin: GPIO12
 
 
 sensor:

From 969bdb06ce105c60c655138ebf7715a92fe2d3e6 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 27 Oct 2019 12:30:36 +0100
Subject: [PATCH 039/412] Fix modbus register (#806)

Fixes https://github.com/esphome/feature-requests/issues/49#issuecomment-546555289

Co-Authored-By: tsunglung <tsunglung@users.noreply.github.com>
---
 esphome/components/modbus/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/modbus/__init__.py b/esphome/components/modbus/__init__.py
index 88105b7baf..cada835905 100644
--- a/esphome/components/modbus/__init__.py
+++ b/esphome/components/modbus/__init__.py
@@ -41,3 +41,4 @@ def register_modbus_device(var, config):
     parent = yield cg.get_variable(config[CONF_MODBUS_ID])
     cg.add(var.set_parent(parent))
     cg.add(var.set_address(config[CONF_ADDRESS]))
+    cg.add(parent.register_device(var))

From 08148c58306e62763c0ae8bd08beb0c421f3f440 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 27 Oct 2019 12:30:48 +0100
Subject: [PATCH 040/412] Fix web server transition length truncated (#807)

Fixes https://github.com/esphome/issues/issues/772
---
 esphome/components/web_server/web_server.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index b51ad2cf51..4fdbbbce7d 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -416,11 +416,15 @@ void WebServer::handle_light_request(AsyncWebServerRequest *request, UrlMatch ma
       if (request->hasParam("color_temp"))
         call.set_color_temperature(request->getParam("color_temp")->value().toFloat());
 
-      if (request->hasParam("flash"))
-        call.set_flash_length((uint32_t) request->getParam("flash")->value().toFloat() * 1000);
+      if (request->hasParam("flash")) {
+        float length_s = request->getParam("flash")->value().toFloat();
+        call.set_flash_length(static_cast<uint32_t>(length_s * 1000));
+      }
 
-      if (request->hasParam("transition"))
-        call.set_transition_length((uint32_t) request->getParam("transition")->value().toFloat() * 1000);
+      if (request->hasParam("transition")) {
+        float length_s = request->getParam("transition")->value().toFloat();
+        call.set_transition_length(static_cast<uint32_t>(length_s * 1000));
+      }
 
       if (request->hasParam("effect")) {
         const char *effect = request->getParam("effect")->value().c_str();

From 07286d1d76967a47ddeb4880877ea292f663be65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antoine=20GR=C3=89A?= <grea09@users.noreply.github.com>
Date: Wed, 30 Oct 2019 16:16:14 +0100
Subject: [PATCH 041/412] Add check if middle_text is too short (#811)

* Add check if middle_text is too short

* Use int division as suggested
---
 esphome/__main__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index bf2d68d834..a78413ff04 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -364,7 +364,7 @@ def command_update_all(args):
     def print_bar(middle_text):
         middle_text = " {} ".format(middle_text)
         width = len(click.unstyle(middle_text))
-        half_line = "=" * ((twidth - width) / 2)
+        half_line = "=" * ((twidth - width) // 2)
         click.echo("%s%s%s" % (half_line, middle_text, half_line))
 
     for f in files:

From 41233d7f25d2e88b6a4ca88409ee183214a3d1b7 Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Thu, 31 Oct 2019 17:10:52 +0300
Subject: [PATCH 042/412] [Hotfix] Dashboard authentication on Py3 (#812)

* Fix

* Review fix

* Reverted first fix
---
 esphome/dashboard/dashboard.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 0927fe2dfe..c934626da8 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -29,7 +29,7 @@ import tornado.websocket
 from esphome import const, util
 from esphome.__main__ import get_serial_ports
 from esphome.helpers import mkdir_p, get_bool_env, run_system_command
-from esphome.py_compat import IS_PY2, decode_text
+from esphome.py_compat import IS_PY2, decode_text, encode_text
 from esphome.storage_json import EsphomeStorageJSON, StorageJSON, \
     esphome_storage_path, ext_storage_path, trash_storage_path
 from esphome.util import shlex_quote
@@ -85,12 +85,11 @@ class DashboardSettings(object):
     def check_password(self, username, password):
         if not self.using_auth:
             return True
+        if username != self.username:
+            return False
 
-        if IS_PY2:
-            password = hmac.new(password).digest()
-        else:
-            password = hmac.new(password.encode()).digest()
-        return username == self.username and hmac.compare_digest(self.password_digest, password)
+        password_digest = hmac.new(encode_text(password)).digest()
+        return hmac.compare_digest(self.password_digest, password_digest)
 
     def rel_path(self, *args):
         return os.path.join(self.config_dir, *args)
@@ -610,8 +609,8 @@ class LoginHandler(BaseHandler):
             'X-HASSIO-KEY': os.getenv('HASSIO_TOKEN'),
         }
         data = {
-            'username': str(self.get_argument('username', '')),
-            'password': str(self.get_argument('password', ''))
+            'username': decode_text(self.get_argument('username', '')),
+            'password': decode_text(self.get_argument('password', ''))
         }
         try:
             req = requests.post('http://hassio/auth', headers=headers, data=data)
@@ -628,8 +627,8 @@ class LoginHandler(BaseHandler):
         self.render_login_page(error="Invalid username or password")
 
     def post_native_login(self):
-        username = str(self.get_argument("username", '').encode('utf-8'))
-        password = str(self.get_argument("password", '').encode('utf-8'))
+        username = decode_text(self.get_argument("username", ''))
+        password = decode_text(self.get_argument("password", ''))
         if settings.check_password(username, password):
             self.set_secure_cookie("authenticated", cookie_authenticated_yes)
             self.redirect("/")

From 69fd3e89378e777a26cb3b907020bf03dd0443bd Mon Sep 17 00:00:00 2001
From: Lumpusz <marton.keri@gmail.com>
Date: Thu, 31 Oct 2019 15:34:19 +0100
Subject: [PATCH 043/412] service uuid based ble tracking (#800)

* service uuid based ble tracking

* code review fixes

* fix import, format

* fix indentation

* reformat
---
 .../components/ble_presence/binary_sensor.py  | 22 +++++--
 .../ble_presence/ble_presence_device.h        | 62 +++++++++++++++++--
 esphome/components/ble_rssi/ble_rssi_sensor.h | 62 +++++++++++++++++--
 esphome/components/ble_rssi/sensor.py         | 22 +++++--
 .../components/esp32_ble_tracker/__init__.py  | 45 ++++++++++++++
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |  1 +
 .../esp32_ble_tracker/esp32_ble_tracker.h     |  2 +
 esphome/const.py                              |  1 +
 tests/test2.yaml                              | 18 ++++++
 9 files changed, 215 insertions(+), 20 deletions(-)

diff --git a/esphome/components/ble_presence/binary_sensor.py b/esphome/components/ble_presence/binary_sensor.py
index 43ec9455d4..1cf8009384 100644
--- a/esphome/components/ble_presence/binary_sensor.py
+++ b/esphome/components/ble_presence/binary_sensor.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor, esp32_ble_tracker
-from esphome.const import CONF_MAC_ADDRESS, CONF_ID
+from esphome.const import CONF_MAC_ADDRESS, CONF_SERVICE_UUID, CONF_ID
 
 DEPENDENCIES = ['esp32_ble_tracker']
 
@@ -9,10 +9,12 @@ ble_presence_ns = cg.esphome_ns.namespace('ble_presence')
 BLEPresenceDevice = ble_presence_ns.class_('BLEPresenceDevice', binary_sensor.BinarySensor,
                                            cg.Component, esp32_ble_tracker.ESPBTDeviceListener)
 
-CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend({
+CONFIG_SCHEMA = cv.All(binary_sensor.BINARY_SENSOR_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(BLEPresenceDevice),
-    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
-}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)
+    cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(
+    cv.COMPONENT_SCHEMA), cv.has_exactly_one_key(CONF_MAC_ADDRESS, CONF_SERVICE_UUID))
 
 
 def to_code(config):
@@ -21,4 +23,14 @@ def to_code(config):
     yield esp32_ble_tracker.register_ble_device(var, config)
     yield binary_sensor.register_binary_sensor(var, config)
 
-    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+    if CONF_MAC_ADDRESS in config:
+        cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+
+    if CONF_SERVICE_UUID in config:
+        if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
+            cg.add(var.set_service_uuid16(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID])))
+        elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid32_format):
+            cg.add(var.set_service_uuid32(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID])))
+        elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
+            uuid128 = esp32_ble_tracker.as_hex_array(config[CONF_SERVICE_UUID])
+            cg.add(var.set_service_uuid128(uuid128))
diff --git a/esphome/components/ble_presence/ble_presence_device.h b/esphome/components/ble_presence/ble_presence_device.h
index 262cc3eedf..9d7ec83bc7 100644
--- a/esphome/components/ble_presence/ble_presence_device.h
+++ b/esphome/components/ble_presence/ble_presence_device.h
@@ -13,17 +13,67 @@ class BLEPresenceDevice : public binary_sensor::BinarySensor,
                           public esp32_ble_tracker::ESPBTDeviceListener,
                           public Component {
  public:
-  void set_address(uint64_t address) { address_ = address; }
+  void set_address(uint64_t address) {
+    this->by_address_ = true;
+    this->address_ = address;
+  }
+  void set_service_uuid16(uint16_t uuid) {
+    this->by_address_ = false;
+    this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint16(uuid);
+  }
+  void set_service_uuid32(uint32_t uuid) {
+    this->by_address_ = false;
+    this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint32(uuid);
+  }
+  void set_service_uuid128(uint8_t *uuid) {
+    this->by_address_ = false;
+    this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(uuid);
+  }
   void on_scan_end() override {
     if (!this->found_)
       this->publish_state(false);
     this->found_ = false;
   }
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
-    if (device.address_uint64() == this->address_) {
-      this->publish_state(true);
-      this->found_ = true;
-      return true;
+    if (this->by_address_) {
+      if (device.address_uint64() == this->address_) {
+        this->publish_state(true);
+        this->found_ = true;
+        return true;
+      }
+    } else {
+      for (auto uuid : device.get_service_uuids()) {
+        switch (this->uuid_.get_uuid().len) {
+          case ESP_UUID_LEN_16:
+            if (uuid.get_uuid().len == ESP_UUID_LEN_16 &&
+                uuid.get_uuid().uuid.uuid16 == this->uuid_.get_uuid().uuid.uuid16) {
+              this->publish_state(true);
+              this->found_ = true;
+              return true;
+            }
+            break;
+          case ESP_UUID_LEN_32:
+            if (uuid.get_uuid().len == ESP_UUID_LEN_32 &&
+                uuid.get_uuid().uuid.uuid32 == this->uuid_.get_uuid().uuid.uuid32) {
+              this->publish_state(true);
+              this->found_ = true;
+              return true;
+            }
+            break;
+          case ESP_UUID_LEN_128:
+            if (uuid.get_uuid().len == ESP_UUID_LEN_128) {
+              for (int i = 0; i < ESP_UUID_LEN_128; i++) {
+                if (this->uuid_.get_uuid().uuid.uuid128[i] != uuid.get_uuid().uuid.uuid128[i]) {
+                  return false;
+                }
+              }
+              this->publish_state(true);
+              this->found_ = true;
+              return true;
+            }
+            break;
+        }
+      }
     }
     return false;
   }
@@ -32,7 +82,9 @@ class BLEPresenceDevice : public binary_sensor::BinarySensor,
 
  protected:
   bool found_{false};
+  bool by_address_{false};
   uint64_t address_;
+  esp32_ble_tracker::ESPBTUUID uuid_;
 };
 
 }  // namespace ble_presence
diff --git a/esphome/components/ble_rssi/ble_rssi_sensor.h b/esphome/components/ble_rssi/ble_rssi_sensor.h
index 2c296b3831..17dd0d4a7d 100644
--- a/esphome/components/ble_rssi/ble_rssi_sensor.h
+++ b/esphome/components/ble_rssi/ble_rssi_sensor.h
@@ -11,17 +11,67 @@ namespace ble_rssi {
 
 class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDeviceListener, public Component {
  public:
-  void set_address(uint64_t address) { address_ = address; }
+  void set_address(uint64_t address) {
+    this->by_address_ = true;
+    this->address_ = address;
+  }
+  void set_service_uuid16(uint16_t uuid) {
+    this->by_address_ = false;
+    this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint16(uuid);
+  }
+  void set_service_uuid32(uint32_t uuid) {
+    this->by_address_ = false;
+    this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_uint32(uuid);
+  }
+  void set_service_uuid128(uint8_t *uuid) {
+    this->by_address_ = false;
+    this->uuid_ = esp32_ble_tracker::ESPBTUUID::from_raw(uuid);
+  }
   void on_scan_end() override {
     if (!this->found_)
       this->publish_state(NAN);
     this->found_ = false;
   }
   bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
-    if (device.address_uint64() == this->address_) {
-      this->publish_state(device.get_rssi());
-      this->found_ = true;
-      return true;
+    if (this->by_address_) {
+      if (device.address_uint64() == this->address_) {
+        this->publish_state(device.get_rssi());
+        this->found_ = true;
+        return true;
+      }
+    } else {
+      for (auto uuid : device.get_service_uuids()) {
+        switch (this->uuid_.get_uuid().len) {
+          case ESP_UUID_LEN_16:
+            if (uuid.get_uuid().len == ESP_UUID_LEN_16 &&
+                uuid.get_uuid().uuid.uuid16 == this->uuid_.get_uuid().uuid.uuid16) {
+              this->publish_state(device.get_rssi());
+              this->found_ = true;
+              return true;
+            }
+            break;
+          case ESP_UUID_LEN_32:
+            if (uuid.get_uuid().len == ESP_UUID_LEN_32 &&
+                uuid.get_uuid().uuid.uuid32 == this->uuid_.get_uuid().uuid.uuid32) {
+              this->publish_state(device.get_rssi());
+              this->found_ = true;
+              return true;
+            }
+            break;
+          case ESP_UUID_LEN_128:
+            if (uuid.get_uuid().len == ESP_UUID_LEN_128) {
+              for (int i = 0; i < ESP_UUID_LEN_128; i++) {
+                if (uuid.get_uuid().uuid.uuid128[i] != this->uuid_.get_uuid().uuid.uuid128[i]) {
+                  return false;
+                }
+              }
+              this->publish_state(device.get_rssi());
+              this->found_ = true;
+              return true;
+            }
+            break;
+        }
+      }
     }
     return false;
   }
@@ -30,7 +80,9 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
 
  protected:
   bool found_{false};
+  bool by_address_{false};
   uint64_t address_;
+  esp32_ble_tracker::ESPBTUUID uuid_;
 };
 
 }  // namespace ble_rssi
diff --git a/esphome/components/ble_rssi/sensor.py b/esphome/components/ble_rssi/sensor.py
index ee8f71632f..76a27e6f2b 100644
--- a/esphome/components/ble_rssi/sensor.py
+++ b/esphome/components/ble_rssi/sensor.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, esp32_ble_tracker
-from esphome.const import CONF_MAC_ADDRESS, CONF_ID, UNIT_DECIBEL, ICON_SIGNAL
+from esphome.const import CONF_SERVICE_UUID, CONF_MAC_ADDRESS, CONF_ID, UNIT_DECIBEL, ICON_SIGNAL
 
 DEPENDENCIES = ['esp32_ble_tracker']
 
@@ -9,10 +9,12 @@ ble_rssi_ns = cg.esphome_ns.namespace('ble_rssi')
 BLERSSISensor = ble_rssi_ns.class_('BLERSSISensor', sensor.Sensor, cg.Component,
                                    esp32_ble_tracker.ESPBTDeviceListener)
 
-CONFIG_SCHEMA = sensor.sensor_schema(UNIT_DECIBEL, ICON_SIGNAL, 0).extend({
+CONFIG_SCHEMA = cv.All(sensor.sensor_schema(UNIT_DECIBEL, ICON_SIGNAL, 0).extend({
     cv.GenerateID(): cv.declare_id(BLERSSISensor),
-    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
-}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)
+    cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(
+    cv.COMPONENT_SCHEMA), cv.has_exactly_one_key(CONF_MAC_ADDRESS, CONF_SERVICE_UUID))
 
 
 def to_code(config):
@@ -21,4 +23,14 @@ def to_code(config):
     yield esp32_ble_tracker.register_ble_device(var, config)
     yield sensor.register_sensor(var, config)
 
-    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+    if CONF_MAC_ADDRESS in config:
+        cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+
+    if CONF_SERVICE_UUID in config:
+        if len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
+            cg.add(var.set_service_uuid16(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID])))
+        elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid32_format):
+            cg.add(var.set_service_uuid32(esp32_ble_tracker.as_hex(config[CONF_SERVICE_UUID])))
+        elif len(config[CONF_SERVICE_UUID]) == len(esp32_ble_tracker.bt_uuid128_format):
+            uuid128 = esp32_ble_tracker.as_hex_array(config[CONF_SERVICE_UUID])
+            cg.add(var.set_service_uuid128(uuid128))
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 7e998e77b1..4aa5b1610a 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -1,3 +1,4 @@
+import re
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ID, ESP_PLATFORM_ESP32, CONF_INTERVAL, \
@@ -32,6 +33,50 @@ def validate_scan_parameters(config):
     return config
 
 
+bt_uuid16_format = 'XXXX'
+bt_uuid32_format = 'XXXXXXXX'
+bt_uuid128_format = 'XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX'
+
+
+def bt_uuid(value):
+    in_value = cv.string_strict(value)
+    value = in_value.upper()
+
+    if len(value) == len(bt_uuid16_format):
+        pattern = re.compile("^[A-F|0-9]{4,}$")
+        if not pattern.match(value):
+            raise cv.Invalid(
+                u"Invalid hexadecimal value for 16 bit UUID format: '{}'".format(in_value))
+        return value
+    if len(value) == len(bt_uuid32_format):
+        pattern = re.compile("^[A-F|0-9]{8,}$")
+        if not pattern.match(value):
+            raise cv.Invalid(
+                u"Invalid hexadecimal value for 32 bit UUID format: '{}'".format(in_value))
+        return value
+    if len(value) == len(bt_uuid128_format):
+        pattern = re.compile(
+            "^[A-F|0-9]{8,}-[A-F|0-9]{4,}-[A-F|0-9]{4,}-[A-F|0-9]{4,}-[A-F|0-9]{12,}$")
+        if not pattern.match(value):
+            raise cv.Invalid(
+                u"Invalid hexadecimal value for 128 UUID format: '{}'".format(in_value))
+        return value
+    raise cv.Invalid(
+        u"Service UUID must be in 16 bit '{}', 32 bit '{}', or 128 bit '{}' format".format(
+            bt_uuid16_format, bt_uuid32_format, bt_uuid128_format))
+
+
+def as_hex(value):
+    return cg.RawExpression('0x{}ULL'.format(value))
+
+
+def as_hex_array(value):
+    value = value.replace("-", "")
+    cpp_array = ['0x{}'.format(part) for part in [value[i:i+2] for i in range(0, len(value), 2)]]
+    return cg.RawExpression(
+        '(uint8_t*)(const uint8_t[16]){{{}}}'.format(','.join(reversed(cpp_array))))
+
+
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(ESP32BLETracker),
     cv.Optional(CONF_SCAN_PARAMETERS, default={}): cv.All(cv.Schema({
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 7a5bd733a2..4b67277f16 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -245,6 +245,7 @@ bool ESPBTUUID::contains(uint8_t data1, uint8_t data2) const {
   }
   return false;
 }
+esp_bt_uuid_t ESPBTUUID::get_uuid() { return this->uuid_; }
 std::string ESPBTUUID::to_string() {
   char sbuf[64];
   switch (this->uuid_.len) {
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 82e8e553fc..280c3fc45f 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -25,6 +25,8 @@ class ESPBTUUID {
 
   bool contains(uint8_t data1, uint8_t data2) const;
 
+  esp_bt_uuid_t get_uuid();
+
   std::string to_string();
 
  protected:
diff --git a/esphome/const.py b/esphome/const.py
index ffef106945..dc607d62ff 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -382,6 +382,7 @@ CONF_SENSORS = 'sensors'
 CONF_SEQUENCE = 'sequence'
 CONF_SERVERS = 'servers'
 CONF_SERVICE = 'service'
+CONF_SERVICE_UUID = 'service_uuid'
 CONF_SERVICES = 'services'
 CONF_SETUP_MODE = 'setup_mode'
 CONF_SETUP_PRIORITY = 'setup_priority'
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 097c29285a..78e1ab149a 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -61,6 +61,15 @@ sensor:
   - platform: ble_rssi
     mac_address: AC:37:43:77:5F:4C
     name: "BLE Google Home Mini RSSI value"
+  - platform: ble_rssi
+    service_uuid: '11aa'
+    name: "BLE Test Service 16"
+  - platform: ble_rssi
+    service_uuid: '11223344'
+    name: "BLE Test Service 32"
+  - platform: ble_rssi
+    service_uuid: '11223344-5566-7788-99aa-bbccddeeff00'
+    name: "BLE Test Service 128"
   - platform: xiaomi_hhccjcy01
     mac_address: 94:2B:FF:5C:91:61
     temperature:
@@ -170,6 +179,15 @@ binary_sensor:
   - platform: ble_presence
     mac_address: AC:37:43:77:5F:4C
     name: "ESP32 BLE Tracker Google Home Mini"
+  - platform: ble_presence
+    service_uuid: '11aa'
+    name: "BLE Test Service 16 Presence"
+  - platform: ble_presence
+    service_uuid: '11223344'
+    name: "BLE Test Service 32 Presence"
+  - platform: ble_presence
+    service_uuid: '11223344-5566-7788-99aa-bbccddeeff00'
+    name: "BLE Test Service 128 Presence"
   - platform: esp32_touch
     name: "ESP32 Touch Pad GPIO27"
     pin: GPIO27

From a6faccb4d9fee7bdf92fb665247e6c73815c5f66 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 31 Oct 2019 20:09:07 +0100
Subject: [PATCH 044/412] Uppercase ESPHome (#814)

---
 esphome/core/application.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/core/application.cpp b/esphome/core/application.cpp
index fbd3c56e54..2600ace218 100644
--- a/esphome/core/application.cpp
+++ b/esphome/core/application.cpp
@@ -97,7 +97,7 @@ void Application::loop() {
 
   if (this->dump_config_at_ >= 0 && this->dump_config_at_ < this->components_.size()) {
     if (this->dump_config_at_ == 0) {
-      ESP_LOGI(TAG, "esphome version " ESPHOME_VERSION " compiled on %s", this->compilation_time_.c_str());
+      ESP_LOGI(TAG, "ESPHome version " ESPHOME_VERSION " compiled on %s", this->compilation_time_.c_str());
     }
 
     this->components_[this->dump_config_at_]->dump_config();

From 742c21506c8a11f5286ff060da5925215b55a048 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 31 Oct 2019 20:09:23 +0100
Subject: [PATCH 045/412] Print update interval for pulse counter (#816)

---
 esphome/components/pulse_counter/pulse_counter_sensor.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/pulse_counter/pulse_counter_sensor.cpp b/esphome/components/pulse_counter/pulse_counter_sensor.cpp
index 6503711e35..c71e51eb32 100644
--- a/esphome/components/pulse_counter/pulse_counter_sensor.cpp
+++ b/esphome/components/pulse_counter/pulse_counter_sensor.cpp
@@ -149,6 +149,7 @@ void PulseCounterSensor::dump_config() {
   ESP_LOGCONFIG(TAG, "  Rising Edge: %s", EDGE_MODE_TO_STRING[this->storage_.rising_edge_mode]);
   ESP_LOGCONFIG(TAG, "  Falling Edge: %s", EDGE_MODE_TO_STRING[this->storage_.falling_edge_mode]);
   ESP_LOGCONFIG(TAG, "  Filtering pulses shorter than %u µs", this->storage_.filter_us);
+  LOG_UPDATE_INTERVAL(this);
 }
 
 void PulseCounterSensor::update() {

From 864c5d89085876432ac8e466709a92c513a3a7c9 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 31 Oct 2019 20:09:57 +0100
Subject: [PATCH 046/412] Allow TimePeriod for time_period_str_unit (#815)

---
 esphome/config_validation.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 405d695b51..956779f655 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -461,6 +461,8 @@ def time_period_str_unit(value):
     if isinstance(value, int):
         raise Invalid("Don't know what '{0}' means as it has no time *unit*! Did you mean "
                       "'{0}s'?".format(value))
+    if isinstance(value, TimePeriod):
+        value = str(value)
     if not isinstance(value, string_types):
         raise Invalid("Expected string for time period with unit.")
 

From 560251ab2af52c2d52755d2c3effda2d1951636b Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 31 Oct 2019 20:25:16 +0100
Subject: [PATCH 047/412] Scheduler fixes (#813)

* Scheduler fixes

Fixes https://github.com/esphome/issues/issues/789, fixes https://github.com/esphome/issues/issues/788

Also changes to use unique_ptr - this should be much safer than the raw pointers form before (though the scoping rules might cause some issues, but looking closely I didn't find anything)

* Disable debugging

* Format
---
 esphome/core/scheduler.cpp | 179 ++++++++++++++++++++-----------------
 esphome/core/scheduler.h   |  18 +++-
 2 files changed, 112 insertions(+), 85 deletions(-)

diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index 88054147f8..cc4331b38e 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -9,6 +9,9 @@ static const char *TAG = "scheduler";
 
 static const uint32_t SCHEDULER_DONT_RUN = 4294967295UL;
 
+// Uncomment to debug scheduler
+// #define ESPHOME_DEBUG_SCHEDULER
+
 void HOT Scheduler::set_timeout(Component *component, const std::string &name, uint32_t timeout,
                                 std::function<void()> &&func) {
   const uint32_t now = this->millis_();
@@ -21,7 +24,7 @@ void HOT Scheduler::set_timeout(Component *component, const std::string &name, u
 
   ESP_LOGVV(TAG, "set_timeout(name='%s', timeout=%u)", name.c_str(), timeout);
 
-  auto *item = new SchedulerItem();
+  auto item = make_unique<SchedulerItem>();
   item->component = component;
   item->name = name;
   item->type = SchedulerItem::TIMEOUT;
@@ -30,7 +33,7 @@ void HOT Scheduler::set_timeout(Component *component, const std::string &name, u
   item->last_execution_major = this->millis_major_;
   item->f = std::move(func);
   item->remove = false;
-  this->push_(item);
+  this->push_(std::move(item));
 }
 bool HOT Scheduler::cancel_timeout(Component *component, const std::string &name) {
   return this->cancel_item_(component, name, SchedulerItem::TIMEOUT);
@@ -52,7 +55,7 @@ void HOT Scheduler::set_interval(Component *component, const std::string &name,
 
   ESP_LOGVV(TAG, "set_interval(name='%s', interval=%u, offset=%u)", name.c_str(), interval, offset);
 
-  auto *item = new SchedulerItem();
+  auto item = make_unique<SchedulerItem>();
   item->component = component;
   item->name = name;
   item->type = SchedulerItem::INTERVAL;
@@ -63,7 +66,7 @@ void HOT Scheduler::set_interval(Component *component, const std::string &name,
     item->last_execution_major--;
   item->f = std::move(func);
   item->remove = false;
-  this->push_(item);
+  this->push_(std::move(item));
 }
 bool HOT Scheduler::cancel_interval(Component *component, const std::string &name) {
   return this->cancel_item_(component, name, SchedulerItem::INTERVAL);
@@ -71,7 +74,7 @@ bool HOT Scheduler::cancel_interval(Component *component, const std::string &nam
 optional<uint32_t> HOT Scheduler::next_schedule_in() {
   if (this->empty_())
     return {};
-  auto *item = this->items_[0];
+  auto &item = this->items_[0];
   const uint32_t now = this->millis_();
   uint32_t next_time = item->last_execution + item->interval;
   if (next_time < now)
@@ -82,98 +85,103 @@ void ICACHE_RAM_ATTR HOT Scheduler::call() {
   const uint32_t now = this->millis_();
   this->process_to_add();
 
-  // Uncomment for debugging the scheduler:
+#ifdef ESPHOME_DEBUG_SCHEDULER
+  static uint32_t last_print = 0;
 
-  // if (random_uint32() % 400 == 0) {
-  //  std::vector<SchedulerItem *> old_items = this->items_;
-  //  ESP_LOGVV(TAG, "Items: count=%u, now=%u", this->items_.size(), now);
-  //  while (!this->empty_()) {
-  //    auto *item = this->items_[0];
-  //    const char *type = item->type == SchedulerItem::INTERVAL ? "interval" : "timeout";
-  //    ESP_LOGVV(TAG, "  %s '%s' interval=%u last_execution=%u (%u) next=%u",
-  //             type, item->name.c_str(), item->interval, item->last_execution, item->last_execution_major,
-  //             item->last_execution + item->interval);
-  //    this->pop_raw_();
-  //  }
-  //  ESP_LOGVV(TAG, "\n");
-  //  this->items_ = old_items;
-  //}
+  if (now - last_print > 2000) {
+    last_print = now;
+    std::vector<std::unique_ptr<SchedulerItem>> old_items;
+    ESP_LOGVV(TAG, "Items: count=%u, now=%u", this->items_.size(), now);
+    while (!this->empty_()) {
+      auto item = std::move(this->items_[0]);
+      const char *type = item->type == SchedulerItem::INTERVAL ? "interval" : "timeout";
+      ESP_LOGVV(TAG, "  %s '%s' interval=%u last_execution=%u (%u) next=%u (%u)", type, item->name.c_str(),
+                item->interval, item->last_execution, item->last_execution_major, item->next_execution(),
+                item->next_execution_major());
+
+      this->pop_raw_();
+      old_items.push_back(std::move(item));
+    }
+    ESP_LOGVV(TAG, "\n");
+    this->items_ = std::move(old_items);
+  }
+#endif  // ESPHOME_DEBUG_SCHEDULER
 
   while (!this->empty_()) {
-    // Don't copy-by value yet
-    auto *item = this->items_[0];
-    if ((now - item->last_execution) < item->interval)
-      // Not reached timeout yet, done for this call
-      break;
-    uint8_t major = item->last_execution_major;
-    if (item->last_execution > now)
-      major++;
-    if (major != this->millis_major_)
-      break;
+    // use scoping to indicate visibility of `item` variable
+    {
+      // Don't copy-by value yet
+      auto &item = this->items_[0];
+      if ((now - item->last_execution) < item->interval)
+        // Not reached timeout yet, done for this call
+        break;
+      uint8_t major = item->next_execution_major();
+      if (this->millis_major_ - major > 1)
+        break;
 
-    // Don't run on failed components
-    if (item->component != nullptr && item->component->is_failed()) {
-      this->pop_raw_();
-      delete item;
-      continue;
-    }
+      // Don't run on failed components
+      if (item->component != nullptr && item->component->is_failed()) {
+        this->pop_raw_();
+        continue;
+      }
 
 #ifdef ESPHOME_LOG_HAS_VERY_VERBOSE
-    const char *type = item->type == SchedulerItem::INTERVAL ? "interval" : "timeout";
-    ESP_LOGVV(TAG, "Running %s '%s' with interval=%u last_execution=%u (now=%u)", type, item->name.c_str(),
-              item->interval, item->last_execution, now);
+      const char *type = item->type == SchedulerItem::INTERVAL ? "interval" : "timeout";
+      ESP_LOGVV(TAG, "Running %s '%s' with interval=%u last_execution=%u (now=%u)", type, item->name.c_str(),
+                item->interval, item->last_execution, now);
 #endif
 
-    // Warning: During f(), a lot of stuff can happen, including:
-    //  - timeouts/intervals get added, potentially invalidating vector pointers
-    //  - timeouts/intervals get cancelled
-    item->f();
-
-    // Only pop after function call, this ensures we were reachable
-    // during the function call and know if we were cancelled.
-    this->pop_raw_();
-
-    if (item->remove) {
-      // We were removed/cancelled in the function call, stop
-      delete item;
-      continue;
+      // Warning: During f(), a lot of stuff can happen, including:
+      //  - timeouts/intervals get added, potentially invalidating vector pointers
+      //  - timeouts/intervals get cancelled
+      item->f();
     }
 
-    if (item->type == SchedulerItem::INTERVAL) {
-      if (item->interval != 0) {
-        const uint32_t before = item->last_execution;
-        const uint32_t amount = (now - item->last_execution) / item->interval;
-        item->last_execution += amount * item->interval;
-        if (item->last_execution < before)
-          item->last_execution_major++;
+    {
+      // new scope, item from before might have been moved in the vector
+      auto item = std::move(this->items_[0]);
+
+      // Only pop after function call, this ensures we were reachable
+      // during the function call and know if we were cancelled.
+      this->pop_raw_();
+
+      if (item->remove) {
+        // We were removed/cancelled in the function call, stop
+        continue;
+      }
+
+      if (item->type == SchedulerItem::INTERVAL) {
+        if (item->interval != 0) {
+          const uint32_t before = item->last_execution;
+          const uint32_t amount = (now - item->last_execution) / item->interval;
+          item->last_execution += amount * item->interval;
+          if (item->last_execution < before)
+            item->last_execution_major++;
+        }
+        this->push_(std::move(item));
       }
-      this->push_(item);
-    } else {
-      delete item;
     }
   }
 
   this->process_to_add();
 }
 void HOT Scheduler::process_to_add() {
-  for (auto *it : this->to_add_) {
+  for (auto &it : this->to_add_) {
     if (it->remove) {
-      delete it;
       continue;
     }
 
-    this->items_.push_back(it);
+    this->items_.push_back(std::move(it));
     std::push_heap(this->items_.begin(), this->items_.end(), SchedulerItem::cmp);
   }
   this->to_add_.clear();
 }
 void HOT Scheduler::cleanup_() {
   while (!this->items_.empty()) {
-    auto item = this->items_[0];
+    auto &item = this->items_[0];
     if (!item->remove)
       return;
 
-    delete item;
     this->pop_raw_();
   }
 }
@@ -181,15 +189,15 @@ void HOT Scheduler::pop_raw_() {
   std::pop_heap(this->items_.begin(), this->items_.end(), SchedulerItem::cmp);
   this->items_.pop_back();
 }
-void HOT Scheduler::push_(Scheduler::SchedulerItem *item) { this->to_add_.push_back(item); }
+void HOT Scheduler::push_(std::unique_ptr<Scheduler::SchedulerItem> item) { this->to_add_.push_back(std::move(item)); }
 bool HOT Scheduler::cancel_item_(Component *component, const std::string &name, Scheduler::SchedulerItem::Type type) {
   bool ret = false;
-  for (auto *it : this->items_)
+  for (auto &it : this->items_)
     if (it->component == component && it->name == name && it->type == type) {
       it->remove = true;
       ret = true;
     }
-  for (auto *it : this->to_add_)
+  for (auto &it : this->to_add_)
     if (it->component == component && it->name == name && it->type == type) {
       it->remove = true;
       ret = true;
@@ -206,21 +214,30 @@ uint32_t Scheduler::millis_() {
   return now;
 }
 
-bool HOT Scheduler::SchedulerItem::cmp(Scheduler::SchedulerItem *a, Scheduler::SchedulerItem *b) {
+bool HOT Scheduler::SchedulerItem::cmp(const std::unique_ptr<SchedulerItem> &a,
+                                       const std::unique_ptr<SchedulerItem> &b) {
   // min-heap
   // return true if *a* will happen after *b*
-  uint32_t a_next_exec = a->last_execution + a->timeout;
-  uint8_t a_next_exec_major = a->last_execution_major;
-  if (a_next_exec < a->last_execution)
-    a_next_exec_major++;
-
-  uint32_t b_next_exec = b->last_execution + b->timeout;
-  uint8_t b_next_exec_major = b->last_execution_major;
-  if (b_next_exec < b->last_execution)
-    b_next_exec_major++;
+  uint32_t a_next_exec = a->next_execution();
+  uint8_t a_next_exec_major = a->next_execution_major();
+  uint32_t b_next_exec = b->next_execution();
+  uint8_t b_next_exec_major = b->next_execution_major();
 
   if (a_next_exec_major != b_next_exec_major) {
-    return a_next_exec_major > b_next_exec_major;
+    // The "major" calculation is quite complicated.
+    // Basically, we need to check if the major value lies in the future or
+    //
+
+    // Here are some cases to think about:
+    // Format: a_major,b_major -> expected result (a-b, b-a)
+    // a=255,b=0 -> false (255, 1)
+    // a=0,b=1 -> false   (255, 1)
+    // a=1,b=0 -> true    (1, 255)
+    // a=0,b=255 -> true  (1, 255)
+
+    uint8_t diff1 = a_next_exec_major - b_next_exec_major;
+    uint8_t diff2 = b_next_exec_major - a_next_exec_major;
+    return diff1 < diff2;
   }
 
   return a_next_exec > b_next_exec;
diff --git a/esphome/core/scheduler.h b/esphome/core/scheduler.h
index 1faadfabd0..5688058a1e 100644
--- a/esphome/core/scheduler.h
+++ b/esphome/core/scheduler.h
@@ -2,6 +2,7 @@
 
 #include "esphome/core/component.h"
 #include <vector>
+#include <memory>
 
 namespace esphome {
 
@@ -34,21 +35,30 @@ class Scheduler {
     bool remove;
     uint8_t last_execution_major;
 
-    static bool cmp(SchedulerItem *a, SchedulerItem *b);
+    inline uint32_t next_execution() { return this->last_execution + this->timeout; }
+    inline uint8_t next_execution_major() {
+      uint32_t next_exec = this->next_execution();
+      uint8_t next_exec_major = this->last_execution_major;
+      if (next_exec < this->last_execution)
+        next_exec_major++;
+      return next_exec_major;
+    }
+
+    static bool cmp(const std::unique_ptr<SchedulerItem> &a, const std::unique_ptr<SchedulerItem> &b);
   };
 
   uint32_t millis_();
   void cleanup_();
   void pop_raw_();
-  void push_(SchedulerItem *item);
+  void push_(std::unique_ptr<SchedulerItem> item);
   bool cancel_item_(Component *component, const std::string &name, SchedulerItem::Type type);
   bool empty_() {
     this->cleanup_();
     return this->items_.empty();
   }
 
-  std::vector<SchedulerItem *> items_;
-  std::vector<SchedulerItem *> to_add_;
+  std::vector<std::unique_ptr<SchedulerItem>> items_;
+  std::vector<std::unique_ptr<SchedulerItem>> to_add_;
   uint32_t last_millis_{0};
   uint8_t millis_major_{0};
 };

From 80aaf669634223ace4c7163aed4d13328f2cef04 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 31 Oct 2019 20:31:58 +0100
Subject: [PATCH 048/412] Fix fan oscillating (#818)

Fixes https://github.com/esphome/issues/issues/783
---
 esphome/components/binary/fan/__init__.py | 2 +-
 esphome/components/speed/fan/__init__.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/binary/fan/__init__.py b/esphome/components/binary/fan/__init__.py
index 6ba04ce355..dbfe1a8286 100644
--- a/esphome/components/binary/fan/__init__.py
+++ b/esphome/components/binary/fan/__init__.py
@@ -24,4 +24,4 @@ def to_code(config):
 
     if CONF_OSCILLATION_OUTPUT in config:
         oscillation_output = yield cg.get_variable(config[CONF_OSCILLATION_OUTPUT])
-        cg.add(var.set_oscillation(oscillation_output))
+        cg.add(var.set_oscillating(oscillation_output))
diff --git a/esphome/components/speed/fan/__init__.py b/esphome/components/speed/fan/__init__.py
index ae6d09dfac..65ee5960f0 100644
--- a/esphome/components/speed/fan/__init__.py
+++ b/esphome/components/speed/fan/__init__.py
@@ -29,4 +29,4 @@ def to_code(config):
 
     if CONF_OSCILLATION_OUTPUT in config:
         oscillation_output = yield cg.get_variable(config[CONF_OSCILLATION_OUTPUT])
-        cg.add(var.set_oscillation(oscillation_output))
+        cg.add(var.set_oscillating(oscillation_output))

From adf2a463fd60c818aeeeee520f1cf7ac19095da8 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 31 Oct 2019 21:03:57 +0100
Subject: [PATCH 049/412] Fix some binary_sensor not having an initial state
 (#819)

Fixes https://github.com/home-assistant/home-assistant/issues/28384
---
 esphome/components/binary_sensor/__init__.py          | 1 +
 esphome/components/binary_sensor/binary_sensor.h      | 7 ++++++-
 esphome/components/ble_presence/ble_presence_device.h | 2 +-
 esphome/components/nextion/nextion.h                  | 2 +-
 esphome/components/rdm6300/rdm6300.h                  | 2 +-
 esphome/components/remote_base/remote_base.h          | 4 ++--
 esphome/components/status/status_binary_sensor.cpp    | 2 +-
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/esphome/components/binary_sensor/__init__.py b/esphome/components/binary_sensor/__init__.py
index c391e12895..c082e2e9af 100644
--- a/esphome/components/binary_sensor/__init__.py
+++ b/esphome/components/binary_sensor/__init__.py
@@ -23,6 +23,7 @@ IS_PLATFORM_COMPONENT = True
 
 binary_sensor_ns = cg.esphome_ns.namespace('binary_sensor')
 BinarySensor = binary_sensor_ns.class_('BinarySensor', cg.Nameable)
+BinarySensorInitiallyOff = binary_sensor_ns.class_('BinarySensorInitiallyOff', BinarySensor)
 BinarySensorPtr = BinarySensor.operator('ptr')
 
 # Triggers
diff --git a/esphome/components/binary_sensor/binary_sensor.h b/esphome/components/binary_sensor/binary_sensor.h
index 577e87258c..f91c93c424 100644
--- a/esphome/components/binary_sensor/binary_sensor.h
+++ b/esphome/components/binary_sensor/binary_sensor.h
@@ -67,7 +67,7 @@ class BinarySensor : public Nameable {
   void send_state_internal(bool state, bool is_initial);
 
   /// Return whether this binary sensor has outputted a state.
-  bool has_state() const;
+  virtual bool has_state() const;
 
   virtual bool is_status_binary_sensor() const;
 
@@ -86,5 +86,10 @@ class BinarySensor : public Nameable {
   Deduplicator<bool> publish_dedup_;
 };
 
+class BinarySensorInitiallyOff : public BinarySensor {
+ public:
+  bool has_state() const override { return true; }
+};
+
 }  // namespace binary_sensor
 }  // namespace esphome
diff --git a/esphome/components/ble_presence/ble_presence_device.h b/esphome/components/ble_presence/ble_presence_device.h
index 9d7ec83bc7..e721db7dcd 100644
--- a/esphome/components/ble_presence/ble_presence_device.h
+++ b/esphome/components/ble_presence/ble_presence_device.h
@@ -9,7 +9,7 @@
 namespace esphome {
 namespace ble_presence {
 
-class BLEPresenceDevice : public binary_sensor::BinarySensor,
+class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
                           public esp32_ble_tracker::ESPBTDeviceListener,
                           public Component {
  public:
diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index 92b41a88af..bd37e241e9 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -394,7 +394,7 @@ class Nextion : public PollingComponent, public uart::UARTDevice {
   bool wait_for_ack_{true};
 };
 
-class NextionTouchComponent : public binary_sensor::BinarySensor {
+class NextionTouchComponent : public binary_sensor::BinarySensorInitiallyOff {
  public:
   void set_page_id(uint8_t page_id) { page_id_ = page_id; }
   void set_component_id(uint8_t component_id) { component_id_ = component_id; }
diff --git a/esphome/components/rdm6300/rdm6300.h b/esphome/components/rdm6300/rdm6300.h
index a67b6e7ce8..13df400754 100644
--- a/esphome/components/rdm6300/rdm6300.h
+++ b/esphome/components/rdm6300/rdm6300.h
@@ -28,7 +28,7 @@ class RDM6300Component : public Component, public uart::UARTDevice {
   uint32_t last_id_{0};
 };
 
-class RDM6300BinarySensor : public binary_sensor::BinarySensor {
+class RDM6300BinarySensor : public binary_sensor::BinarySensorInitiallyOff {
  public:
   void set_id(uint32_t id) { id_ = id; }
 
diff --git a/esphome/components/remote_base/remote_base.h b/esphome/components/remote_base/remote_base.h
index 6035e2fd57..36be25add7 100644
--- a/esphome/components/remote_base/remote_base.h
+++ b/esphome/components/remote_base/remote_base.h
@@ -267,11 +267,11 @@ class RemoteReceiverBase : public RemoteComponentBase {
   uint8_t tolerance_{25};
 };
 
-class RemoteReceiverBinarySensorBase : public binary_sensor::BinarySensor,
+class RemoteReceiverBinarySensorBase : public binary_sensor::BinarySensorInitiallyOff,
                                        public Component,
                                        public RemoteReceiverListener {
  public:
-  explicit RemoteReceiverBinarySensorBase() : BinarySensor() {}
+  explicit RemoteReceiverBinarySensorBase() : BinarySensorInitiallyOff() {}
   void dump_config() override;
   virtual bool matches(RemoteReceiveData src) = 0;
   bool on_receive(RemoteReceiveData src) override {
diff --git a/esphome/components/status/status_binary_sensor.cpp b/esphome/components/status/status_binary_sensor.cpp
index 7fbeb8c171..90ac1faad7 100644
--- a/esphome/components/status/status_binary_sensor.cpp
+++ b/esphome/components/status/status_binary_sensor.cpp
@@ -30,7 +30,7 @@ void StatusBinarySensor::loop() {
 
   this->publish_state(status);
 }
-void StatusBinarySensor::setup() { this->publish_state(false); }
+void StatusBinarySensor::setup() { this->publish_initial_state(false); }
 void StatusBinarySensor::dump_config() { LOG_BINARY_SENSOR("", "Status Binary Sensor", this); }
 
 }  // namespace status

From 1df9ae53f8f6059e155cbbe9f3f0a2a8d24ab0b3 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 1 Nov 2019 11:50:02 +0100
Subject: [PATCH 050/412] Add ci-reporter bot

---
 .github/ci-reporter.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .github/ci-reporter.yml

diff --git a/.github/ci-reporter.yml b/.github/ci-reporter.yml
new file mode 100644
index 0000000000..243e671532
--- /dev/null
+++ b/.github/ci-reporter.yml
@@ -0,0 +1,8 @@
+# Set to false to create a new comment instead of updating the app's first one
+updateComment: true
+
+# Use a custom string, or set to false to disable
+before: "✨ Good work on this PR so far! ✨ Unfortunately, the [ build]() is failing as of . Here's the output:"
+
+# Use a custom string, or set to false to disable
+after: "Thanks for contributing to this project!"

From 442030b6ca9e54df2fc2d9759cff65ac0c4d39f9 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 1 Nov 2019 11:50:12 +0100
Subject: [PATCH 051/412] Add sentiment-bot

---
 .github/config.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 .github/config.yml

diff --git a/.github/config.yml b/.github/config.yml
new file mode 100644
index 0000000000..f2b357cc95
--- /dev/null
+++ b/.github/config.yml
@@ -0,0 +1,11 @@
+# Configuration for sentiment-bot - https://github.com/behaviorbot/sentiment-bot
+
+# *Required* toxicity threshold between 0 and .99 with the higher numbers being the most toxic
+# Anything higher than this threshold will be marked as toxic and commented on
+sentimentBotToxicityThreshold: .8
+
+# *Required* Comment to reply with
+sentimentBotReplyComment: >
+  Please be sure to review the code of conduct and be respectful of other users.
+
+# Note: the bot will only work if your repository has a Code of Conduct

From 042ccde44122b3501aea352d00a91a186322a5fa Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 1 Nov 2019 11:50:26 +0100
Subject: [PATCH 052/412] Add lock probot

---
 .github/lock.yml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .github/lock.yml

diff --git a/.github/lock.yml b/.github/lock.yml
new file mode 100644
index 0000000000..0680577b2e
--- /dev/null
+++ b/.github/lock.yml
@@ -0,0 +1,36 @@
+# Configuration for Lock Threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 7
+
+# Skip issues and pull requests created before a given timestamp. Timestamp must
+# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable
+skipCreatedBefore: false
+
+# Issues and pull requests with these labels will be ignored. Set to `[]` to disable
+exemptLabels:
+  - keep-open
+
+# Label to add before locking, such as `outdated`. Set to `false` to disable
+lockLabel: false
+
+# Comment to post before locking. Set to `false` to disable
+lockComment: false
+
+# Assign `resolved` as the reason for locking. Set to `false` to disable
+setLockReason: false
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings just for `issues` or `pulls`
+# issues:
+#   exemptLabels:
+#     - help-wanted
+#   lockLabel: outdated
+
+# pulls:
+#   daysUntilLock: 30
+
+# Repository to extend settings from
+# _extends: repo

From 09fd505f08599d97b1c5ad3760fd335108381fb2 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 1 Nov 2019 11:50:36 +0100
Subject: [PATCH 053/412] Add stale probot

---
 .github/stale.yml | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 .github/stale.yml

diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 0000000000..225c029bd9
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,59 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - not-stale
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 10
+
+# Limit to only `issues` or `pulls`
+only: pulls
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed

From 90f909d2ea1a01db1cd514adb2477c5215148272 Mon Sep 17 00:00:00 2001
From: Alexander Leisentritt <alexander@leisentritt.eu>
Date: Sat, 2 Nov 2019 18:55:10 +0100
Subject: [PATCH 054/412] refactored xiaomi ble data parsing (#823)

---
 esphome/components/xiaomi_ble/xiaomi_ble.cpp | 48 +++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/esphome/components/xiaomi_ble/xiaomi_ble.cpp b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
index 1172f6ee0a..e6884e5ea6 100644
--- a/esphome/components/xiaomi_ble/xiaomi_ble.cpp
+++ b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
@@ -91,17 +91,6 @@ optional<XiaomiParseResult> parse_xiaomi(const esp32_ble_tracker::ESPBTDevice &d
     return {};
   }
 
-  uint8_t raw_offset = is_lywsdcgq || is_cgg1 ? 11 : 12;
-
-  const uint8_t raw_type = raw[raw_offset];
-  const uint8_t data_length = raw[raw_offset + 2];
-  const uint8_t *data = &raw[raw_offset + 3];
-  const uint8_t expected_length = data_length + raw_offset + 3;
-  const uint8_t actual_length = device.get_service_data().size();
-  if (expected_length != actual_length) {
-    // ESP_LOGV(TAG, "Xiaomi %s data length mismatch (%u != %d)", type, expected_length, actual_length);
-    return {};
-  }
   XiaomiParseResult result;
   result.type = XiaomiParseResult::TYPE_HHCCJCY01;
   if (is_lywsdcgq) {
@@ -111,7 +100,42 @@ optional<XiaomiParseResult> parse_xiaomi(const esp32_ble_tracker::ESPBTDevice &d
   } else if (is_cgg1) {
     result.type = XiaomiParseResult::TYPE_CGG1;
   }
-  bool success = parse_xiaomi_data_byte(raw_type, data, data_length, result);
+
+  uint8_t raw_offset = is_lywsdcgq || is_cgg1 ? 11 : 12;
+
+  // Data point specs
+  // Byte 0: type
+  // Byte 1: fixed 0x10
+  // Byte 2: length
+  // Byte 3..3+len-1: data point value
+
+  const uint8_t *raw_data = &raw[raw_offset];
+  uint8_t data_offset = 0;
+  uint8_t data_length = device.get_service_data().size() - raw_offset;
+  bool success = false;
+
+  while (true) {
+    if (data_length < 4)
+      // at least 4 bytes required
+      // type, fixed 0x10, length, 1 byte value
+      break;
+
+    const uint8_t datapoint_type = raw_data[data_offset + 0];
+    const uint8_t datapoint_length = raw_data[data_offset + 2];
+
+    if (data_length < 3 + datapoint_length)
+      // 3 fixed bytes plus value length
+      break;
+
+    const uint8_t *datapoint_data = &raw_data[data_offset + 3];
+
+    if (parse_xiaomi_data_byte(datapoint_type, datapoint_data, datapoint_length, result))
+      success = true;
+
+    data_length -= data_offset + 3 + datapoint_length;
+    data_offset += 3 + datapoint_length;
+  }
+
   if (!success)
     return {};
   return result;

From be6b4ee47fd812fdbd137c4e32b0c780ae349f33 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 2 Nov 2019 19:35:37 +0100
Subject: [PATCH 055/412] Fix wizard mkdir (#824)

* Fix CLI wizard mkdir_p with empty path

Fixes https://github.com/esphome/issues/issues/796

* Cleanup

* Lint
---
 esphome/helpers.py      | 3 +++
 esphome/storage_json.py | 3 +--
 esphome/writer.py       | 5 +----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/esphome/helpers.py b/esphome/helpers.py
index 6fd1fa2ad7..48607dbff5 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -80,6 +80,9 @@ def run_system_command(*args):
 
 
 def mkdir_p(path):
+    if not path:
+        # Empty path - means create current dir
+        return
     try:
         os.makedirs(path)
     except OSError as err:
diff --git a/esphome/storage_json.py b/esphome/storage_json.py
index 0305b59ef5..e1b4070d3b 100644
--- a/esphome/storage_json.py
+++ b/esphome/storage_json.py
@@ -7,7 +7,7 @@ import os
 
 from esphome import const
 from esphome.core import CORE
-from esphome.helpers import mkdir_p, write_file_if_changed
+from esphome.helpers import write_file_if_changed
 
 # pylint: disable=unused-import, wrong-import-order
 from esphome.core import CoreType  # noqa
@@ -88,7 +88,6 @@ class StorageJSON(object):
         return json.dumps(self.as_dict(), indent=2) + u'\n'
 
     def save(self, path):
-        mkdir_p(os.path.dirname(path))
         write_file_if_changed(path, self.to_json())
 
     @staticmethod
diff --git a/esphome/writer.py b/esphome/writer.py
index 4c2e03569f..1961af5a15 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -286,8 +286,6 @@ or use the custom_components folder.
 
 
 def copy_src_tree():
-    import shutil
-
     source_files = {}
     for _, component, _ in iter_components(CORE.config):
         source_files.update(component.source_files)
@@ -326,8 +324,7 @@ def copy_src_tree():
     # Now copy new files
     for target, src_path in source_files_copy.items():
         dst_path = CORE.relative_src_path(*target.split('/'))
-        mkdir_p(os.path.dirname(dst_path))
-        shutil.copy(src_path, dst_path)
+        copy_file_if_changed(src_path, dst_path)
 
     # Finally copy defines
     write_file_if_changed(CORE.relative_src_path('esphome', 'core', 'defines.h'),

From 66aa02fc34b44df567198d2c89a4879b48003822 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 2 Nov 2019 19:35:45 +0100
Subject: [PATCH 056/412] Move native API enums to new namespace (#825)

Fixes https://github.com/esphome/issues/issues/801
---
 esphome/components/api/api_connection.cpp |  19 +--
 esphome/components/api/api_pb2.cpp        | 154 +++++++++++-----------
 esphome/components/api/api_pb2.h          |  67 +++++-----
 esphome/components/api/user_services.cpp  |  20 +--
 esphome/components/api/user_services.h    |   4 +-
 script/api_protobuf/api_protobuf.py       |  12 +-
 6 files changed, 145 insertions(+), 131 deletions(-)

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 4a595a3f99..e786fe61be 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -185,11 +185,12 @@ bool APIConnection::send_cover_state(cover::Cover *cover) {
   auto traits = cover->get_traits();
   CoverStateResponse resp{};
   resp.key = cover->get_object_id_hash();
-  resp.legacy_state = (cover->position == cover::COVER_OPEN) ? LEGACY_COVER_STATE_OPEN : LEGACY_COVER_STATE_CLOSED;
+  resp.legacy_state =
+      (cover->position == cover::COVER_OPEN) ? enums::LEGACY_COVER_STATE_OPEN : enums::LEGACY_COVER_STATE_CLOSED;
   resp.position = cover->position;
   if (traits.get_supports_tilt())
     resp.tilt = cover->tilt;
-  resp.current_operation = static_cast<EnumCoverOperation>(cover->current_operation);
+  resp.current_operation = static_cast<enums::CoverOperation>(cover->current_operation);
   return this->send_cover_state_response(resp);
 }
 bool APIConnection::send_cover_info(cover::Cover *cover) {
@@ -213,13 +214,13 @@ void APIConnection::cover_command(const CoverCommandRequest &msg) {
   auto call = cover->make_call();
   if (msg.has_legacy_command) {
     switch (msg.legacy_command) {
-      case LEGACY_COVER_COMMAND_OPEN:
+      case enums::LEGACY_COVER_COMMAND_OPEN:
         call.set_command_open();
         break;
-      case LEGACY_COVER_COMMAND_CLOSE:
+      case enums::LEGACY_COVER_COMMAND_CLOSE:
         call.set_command_close();
         break;
-      case LEGACY_COVER_COMMAND_STOP:
+      case enums::LEGACY_COVER_COMMAND_STOP:
         call.set_command_stop();
         break;
     }
@@ -246,7 +247,7 @@ bool APIConnection::send_fan_state(fan::FanState *fan) {
   if (traits.supports_oscillation())
     resp.oscillating = fan->oscillating;
   if (traits.supports_speed())
-    resp.speed = static_cast<EnumFanSpeed>(fan->speed);
+    resp.speed = static_cast<enums::FanSpeed>(fan->speed);
   return this->send_fan_state_response(resp);
 }
 bool APIConnection::send_fan_info(fan::FanState *fan) {
@@ -441,8 +442,8 @@ bool APIConnection::send_climate_state(climate::Climate *climate) {
   auto traits = climate->get_traits();
   ClimateStateResponse resp{};
   resp.key = climate->get_object_id_hash();
-  resp.mode = static_cast<EnumClimateMode>(climate->mode);
-  resp.action = static_cast<EnumClimateAction>(climate->action);
+  resp.mode = static_cast<enums::ClimateMode>(climate->mode);
+  resp.action = static_cast<enums::ClimateAction>(climate->action);
   if (traits.get_supports_current_temperature())
     resp.current_temperature = climate->current_temperature;
   if (traits.get_supports_two_point_target_temperature()) {
@@ -467,7 +468,7 @@ bool APIConnection::send_climate_info(climate::Climate *climate) {
   for (auto mode : {climate::CLIMATE_MODE_AUTO, climate::CLIMATE_MODE_OFF, climate::CLIMATE_MODE_COOL,
                     climate::CLIMATE_MODE_HEAT}) {
     if (traits.supports_mode(mode))
-      msg.supported_modes.push_back(static_cast<EnumClimateMode>(mode));
+      msg.supported_modes.push_back(static_cast<enums::ClimateMode>(mode));
   }
   msg.visual_min_temperature = traits.get_visual_min_temperature();
   msg.visual_max_temperature = traits.get_visual_max_temperature();
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 3f635d1cdb..7f45d38f1b 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -4,115 +4,115 @@
 namespace esphome {
 namespace api {
 
-template<> const char *proto_enum_to_string<EnumLegacyCoverState>(EnumLegacyCoverState value) {
+template<> const char *proto_enum_to_string<enums::LegacyCoverState>(enums::LegacyCoverState value) {
   switch (value) {
-    case LEGACY_COVER_STATE_OPEN:
+    case enums::LEGACY_COVER_STATE_OPEN:
       return "LEGACY_COVER_STATE_OPEN";
-    case LEGACY_COVER_STATE_CLOSED:
+    case enums::LEGACY_COVER_STATE_CLOSED:
       return "LEGACY_COVER_STATE_CLOSED";
     default:
       return "UNKNOWN";
   }
 }
-template<> const char *proto_enum_to_string<EnumCoverOperation>(EnumCoverOperation value) {
+template<> const char *proto_enum_to_string<enums::CoverOperation>(enums::CoverOperation value) {
   switch (value) {
-    case COVER_OPERATION_IDLE:
+    case enums::COVER_OPERATION_IDLE:
       return "COVER_OPERATION_IDLE";
-    case COVER_OPERATION_IS_OPENING:
+    case enums::COVER_OPERATION_IS_OPENING:
       return "COVER_OPERATION_IS_OPENING";
-    case COVER_OPERATION_IS_CLOSING:
+    case enums::COVER_OPERATION_IS_CLOSING:
       return "COVER_OPERATION_IS_CLOSING";
     default:
       return "UNKNOWN";
   }
 }
-template<> const char *proto_enum_to_string<EnumLegacyCoverCommand>(EnumLegacyCoverCommand value) {
+template<> const char *proto_enum_to_string<enums::LegacyCoverCommand>(enums::LegacyCoverCommand value) {
   switch (value) {
-    case LEGACY_COVER_COMMAND_OPEN:
+    case enums::LEGACY_COVER_COMMAND_OPEN:
       return "LEGACY_COVER_COMMAND_OPEN";
-    case LEGACY_COVER_COMMAND_CLOSE:
+    case enums::LEGACY_COVER_COMMAND_CLOSE:
       return "LEGACY_COVER_COMMAND_CLOSE";
-    case LEGACY_COVER_COMMAND_STOP:
+    case enums::LEGACY_COVER_COMMAND_STOP:
       return "LEGACY_COVER_COMMAND_STOP";
     default:
       return "UNKNOWN";
   }
 }
-template<> const char *proto_enum_to_string<EnumFanSpeed>(EnumFanSpeed value) {
+template<> const char *proto_enum_to_string<enums::FanSpeed>(enums::FanSpeed value) {
   switch (value) {
-    case FAN_SPEED_LOW:
+    case enums::FAN_SPEED_LOW:
       return "FAN_SPEED_LOW";
-    case FAN_SPEED_MEDIUM:
+    case enums::FAN_SPEED_MEDIUM:
       return "FAN_SPEED_MEDIUM";
-    case FAN_SPEED_HIGH:
+    case enums::FAN_SPEED_HIGH:
       return "FAN_SPEED_HIGH";
     default:
       return "UNKNOWN";
   }
 }
-template<> const char *proto_enum_to_string<EnumLogLevel>(EnumLogLevel value) {
+template<> const char *proto_enum_to_string<enums::LogLevel>(enums::LogLevel value) {
   switch (value) {
-    case LOG_LEVEL_NONE:
+    case enums::LOG_LEVEL_NONE:
       return "LOG_LEVEL_NONE";
-    case LOG_LEVEL_ERROR:
+    case enums::LOG_LEVEL_ERROR:
       return "LOG_LEVEL_ERROR";
-    case LOG_LEVEL_WARN:
+    case enums::LOG_LEVEL_WARN:
       return "LOG_LEVEL_WARN";
-    case LOG_LEVEL_INFO:
+    case enums::LOG_LEVEL_INFO:
       return "LOG_LEVEL_INFO";
-    case LOG_LEVEL_DEBUG:
+    case enums::LOG_LEVEL_DEBUG:
       return "LOG_LEVEL_DEBUG";
-    case LOG_LEVEL_VERBOSE:
+    case enums::LOG_LEVEL_VERBOSE:
       return "LOG_LEVEL_VERBOSE";
-    case LOG_LEVEL_VERY_VERBOSE:
+    case enums::LOG_LEVEL_VERY_VERBOSE:
       return "LOG_LEVEL_VERY_VERBOSE";
     default:
       return "UNKNOWN";
   }
 }
-template<> const char *proto_enum_to_string<EnumServiceArgType>(EnumServiceArgType value) {
+template<> const char *proto_enum_to_string<enums::ServiceArgType>(enums::ServiceArgType value) {
   switch (value) {
-    case SERVICE_ARG_TYPE_BOOL:
+    case enums::SERVICE_ARG_TYPE_BOOL:
       return "SERVICE_ARG_TYPE_BOOL";
-    case SERVICE_ARG_TYPE_INT:
+    case enums::SERVICE_ARG_TYPE_INT:
       return "SERVICE_ARG_TYPE_INT";
-    case SERVICE_ARG_TYPE_FLOAT:
+    case enums::SERVICE_ARG_TYPE_FLOAT:
       return "SERVICE_ARG_TYPE_FLOAT";
-    case SERVICE_ARG_TYPE_STRING:
+    case enums::SERVICE_ARG_TYPE_STRING:
       return "SERVICE_ARG_TYPE_STRING";
-    case SERVICE_ARG_TYPE_BOOL_ARRAY:
+    case enums::SERVICE_ARG_TYPE_BOOL_ARRAY:
       return "SERVICE_ARG_TYPE_BOOL_ARRAY";
-    case SERVICE_ARG_TYPE_INT_ARRAY:
+    case enums::SERVICE_ARG_TYPE_INT_ARRAY:
       return "SERVICE_ARG_TYPE_INT_ARRAY";
-    case SERVICE_ARG_TYPE_FLOAT_ARRAY:
+    case enums::SERVICE_ARG_TYPE_FLOAT_ARRAY:
       return "SERVICE_ARG_TYPE_FLOAT_ARRAY";
-    case SERVICE_ARG_TYPE_STRING_ARRAY:
+    case enums::SERVICE_ARG_TYPE_STRING_ARRAY:
       return "SERVICE_ARG_TYPE_STRING_ARRAY";
     default:
       return "UNKNOWN";
   }
 }
-template<> const char *proto_enum_to_string<EnumClimateMode>(EnumClimateMode value) {
+template<> const char *proto_enum_to_string<enums::ClimateMode>(enums::ClimateMode value) {
   switch (value) {
-    case CLIMATE_MODE_OFF:
+    case enums::CLIMATE_MODE_OFF:
       return "CLIMATE_MODE_OFF";
-    case CLIMATE_MODE_AUTO:
+    case enums::CLIMATE_MODE_AUTO:
       return "CLIMATE_MODE_AUTO";
-    case CLIMATE_MODE_COOL:
+    case enums::CLIMATE_MODE_COOL:
       return "CLIMATE_MODE_COOL";
-    case CLIMATE_MODE_HEAT:
+    case enums::CLIMATE_MODE_HEAT:
       return "CLIMATE_MODE_HEAT";
     default:
       return "UNKNOWN";
   }
 }
-template<> const char *proto_enum_to_string<EnumClimateAction>(EnumClimateAction value) {
+template<> const char *proto_enum_to_string<enums::ClimateAction>(enums::ClimateAction value) {
   switch (value) {
-    case CLIMATE_ACTION_OFF:
+    case enums::CLIMATE_ACTION_OFF:
       return "CLIMATE_ACTION_OFF";
-    case CLIMATE_ACTION_COOLING:
+    case enums::CLIMATE_ACTION_COOLING:
       return "CLIMATE_ACTION_COOLING";
-    case CLIMATE_ACTION_HEATING:
+    case enums::CLIMATE_ACTION_HEATING:
       return "CLIMATE_ACTION_HEATING";
     default:
       return "UNKNOWN";
@@ -535,11 +535,11 @@ void ListEntitiesCoverResponse::dump_to(std::string &out) const {
 bool CoverStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2: {
-      this->legacy_state = value.as_enum<EnumLegacyCoverState>();
+      this->legacy_state = value.as_enum<enums::LegacyCoverState>();
       return true;
     }
     case 5: {
-      this->current_operation = value.as_enum<EnumCoverOperation>();
+      this->current_operation = value.as_enum<enums::CoverOperation>();
       return true;
     }
     default:
@@ -566,10 +566,10 @@ bool CoverStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
 }
 void CoverStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
-  buffer.encode_enum<EnumLegacyCoverState>(2, this->legacy_state);
+  buffer.encode_enum<enums::LegacyCoverState>(2, this->legacy_state);
   buffer.encode_float(3, this->position);
   buffer.encode_float(4, this->tilt);
-  buffer.encode_enum<EnumCoverOperation>(5, this->current_operation);
+  buffer.encode_enum<enums::CoverOperation>(5, this->current_operation);
 }
 void CoverStateResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -580,7 +580,7 @@ void CoverStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  legacy_state: ");
-  out.append(proto_enum_to_string<EnumLegacyCoverState>(this->legacy_state));
+  out.append(proto_enum_to_string<enums::LegacyCoverState>(this->legacy_state));
   out.append("\n");
 
   out.append("  position: ");
@@ -594,7 +594,7 @@ void CoverStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  current_operation: ");
-  out.append(proto_enum_to_string<EnumCoverOperation>(this->current_operation));
+  out.append(proto_enum_to_string<enums::CoverOperation>(this->current_operation));
   out.append("\n");
   out.append("}");
 }
@@ -605,7 +605,7 @@ bool CoverCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
       return true;
     }
     case 3: {
-      this->legacy_command = value.as_enum<EnumLegacyCoverCommand>();
+      this->legacy_command = value.as_enum<enums::LegacyCoverCommand>();
       return true;
     }
     case 4: {
@@ -645,7 +645,7 @@ bool CoverCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
 void CoverCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_bool(2, this->has_legacy_command);
-  buffer.encode_enum<EnumLegacyCoverCommand>(3, this->legacy_command);
+  buffer.encode_enum<enums::LegacyCoverCommand>(3, this->legacy_command);
   buffer.encode_bool(4, this->has_position);
   buffer.encode_float(5, this->position);
   buffer.encode_bool(6, this->has_tilt);
@@ -665,7 +665,7 @@ void CoverCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  legacy_command: ");
-  out.append(proto_enum_to_string<EnumLegacyCoverCommand>(this->legacy_command));
+  out.append(proto_enum_to_string<enums::LegacyCoverCommand>(this->legacy_command));
   out.append("\n");
 
   out.append("  has_position: ");
@@ -781,7 +781,7 @@ bool FanStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       return true;
     }
     case 4: {
-      this->speed = value.as_enum<EnumFanSpeed>();
+      this->speed = value.as_enum<enums::FanSpeed>();
       return true;
     }
     default:
@@ -802,7 +802,7 @@ void FanStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_bool(2, this->state);
   buffer.encode_bool(3, this->oscillating);
-  buffer.encode_enum<EnumFanSpeed>(4, this->speed);
+  buffer.encode_enum<enums::FanSpeed>(4, this->speed);
 }
 void FanStateResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -821,7 +821,7 @@ void FanStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  speed: ");
-  out.append(proto_enum_to_string<EnumFanSpeed>(this->speed));
+  out.append(proto_enum_to_string<enums::FanSpeed>(this->speed));
   out.append("\n");
   out.append("}");
 }
@@ -840,7 +840,7 @@ bool FanCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
       return true;
     }
     case 5: {
-      this->speed = value.as_enum<EnumFanSpeed>();
+      this->speed = value.as_enum<enums::FanSpeed>();
       return true;
     }
     case 6: {
@@ -870,7 +870,7 @@ void FanCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(2, this->has_state);
   buffer.encode_bool(3, this->state);
   buffer.encode_bool(4, this->has_speed);
-  buffer.encode_enum<EnumFanSpeed>(5, this->speed);
+  buffer.encode_enum<enums::FanSpeed>(5, this->speed);
   buffer.encode_bool(6, this->has_oscillating);
   buffer.encode_bool(7, this->oscillating);
 }
@@ -895,7 +895,7 @@ void FanCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  speed: ");
-  out.append(proto_enum_to_string<EnumFanSpeed>(this->speed));
+  out.append(proto_enum_to_string<enums::FanSpeed>(this->speed));
   out.append("\n");
 
   out.append("  has_oscillating: ");
@@ -1740,7 +1740,7 @@ void TextSensorStateResponse::dump_to(std::string &out) const {
 bool SubscribeLogsRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 1: {
-      this->level = value.as_enum<EnumLogLevel>();
+      this->level = value.as_enum<enums::LogLevel>();
       return true;
     }
     case 2: {
@@ -1752,14 +1752,14 @@ bool SubscribeLogsRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   }
 }
 void SubscribeLogsRequest::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_enum<EnumLogLevel>(1, this->level);
+  buffer.encode_enum<enums::LogLevel>(1, this->level);
   buffer.encode_bool(2, this->dump_config);
 }
 void SubscribeLogsRequest::dump_to(std::string &out) const {
   char buffer[64];
   out.append("SubscribeLogsRequest {\n");
   out.append("  level: ");
-  out.append(proto_enum_to_string<EnumLogLevel>(this->level));
+  out.append(proto_enum_to_string<enums::LogLevel>(this->level));
   out.append("\n");
 
   out.append("  dump_config: ");
@@ -1770,7 +1770,7 @@ void SubscribeLogsRequest::dump_to(std::string &out) const {
 bool SubscribeLogsResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 1: {
-      this->level = value.as_enum<EnumLogLevel>();
+      this->level = value.as_enum<enums::LogLevel>();
       return true;
     }
     case 4: {
@@ -1796,7 +1796,7 @@ bool SubscribeLogsResponse::decode_length(uint32_t field_id, ProtoLengthDelimite
   }
 }
 void SubscribeLogsResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_enum<EnumLogLevel>(1, this->level);
+  buffer.encode_enum<enums::LogLevel>(1, this->level);
   buffer.encode_string(2, this->tag);
   buffer.encode_string(3, this->message);
   buffer.encode_bool(4, this->send_failed);
@@ -1805,7 +1805,7 @@ void SubscribeLogsResponse::dump_to(std::string &out) const {
   char buffer[64];
   out.append("SubscribeLogsResponse {\n");
   out.append("  level: ");
-  out.append(proto_enum_to_string<EnumLogLevel>(this->level));
+  out.append(proto_enum_to_string<enums::LogLevel>(this->level));
   out.append("\n");
 
   out.append("  tag: ");
@@ -2010,7 +2010,7 @@ void GetTimeResponse::dump_to(std::string &out) const {
 bool ListEntitiesServicesArgument::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2: {
-      this->type = value.as_enum<EnumServiceArgType>();
+      this->type = value.as_enum<enums::ServiceArgType>();
       return true;
     }
     default:
@@ -2029,7 +2029,7 @@ bool ListEntitiesServicesArgument::decode_length(uint32_t field_id, ProtoLengthD
 }
 void ListEntitiesServicesArgument::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->name);
-  buffer.encode_enum<EnumServiceArgType>(2, this->type);
+  buffer.encode_enum<enums::ServiceArgType>(2, this->type);
 }
 void ListEntitiesServicesArgument::dump_to(std::string &out) const {
   char buffer[64];
@@ -2039,7 +2039,7 @@ void ListEntitiesServicesArgument::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  type: ");
-  out.append(proto_enum_to_string<EnumServiceArgType>(this->type));
+  out.append(proto_enum_to_string<enums::ServiceArgType>(this->type));
   out.append("\n");
   out.append("}");
 }
@@ -2408,7 +2408,7 @@ bool ListEntitiesClimateResponse::decode_varint(uint32_t field_id, ProtoVarInt v
       return true;
     }
     case 7: {
-      this->supported_modes.push_back(value.as_enum<EnumClimateMode>());
+      this->supported_modes.push_back(value.as_enum<enums::ClimateMode>());
       return true;
     }
     case 11: {
@@ -2471,7 +2471,7 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(5, this->supports_current_temperature);
   buffer.encode_bool(6, this->supports_two_point_target_temperature);
   for (auto &it : this->supported_modes) {
-    buffer.encode_enum<EnumClimateMode>(7, it, true);
+    buffer.encode_enum<enums::ClimateMode>(7, it, true);
   }
   buffer.encode_float(8, this->visual_min_temperature);
   buffer.encode_float(9, this->visual_max_temperature);
@@ -2509,7 +2509,7 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
 
   for (const auto &it : this->supported_modes) {
     out.append("  supported_modes: ");
-    out.append(proto_enum_to_string<EnumClimateMode>(it));
+    out.append(proto_enum_to_string<enums::ClimateMode>(it));
     out.append("\n");
   }
 
@@ -2540,7 +2540,7 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
 bool ClimateStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2: {
-      this->mode = value.as_enum<EnumClimateMode>();
+      this->mode = value.as_enum<enums::ClimateMode>();
       return true;
     }
     case 7: {
@@ -2548,7 +2548,7 @@ bool ClimateStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       return true;
     }
     case 8: {
-      this->action = value.as_enum<EnumClimateAction>();
+      this->action = value.as_enum<enums::ClimateAction>();
       return true;
     }
     default:
@@ -2583,13 +2583,13 @@ bool ClimateStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
 }
 void ClimateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
-  buffer.encode_enum<EnumClimateMode>(2, this->mode);
+  buffer.encode_enum<enums::ClimateMode>(2, this->mode);
   buffer.encode_float(3, this->current_temperature);
   buffer.encode_float(4, this->target_temperature);
   buffer.encode_float(5, this->target_temperature_low);
   buffer.encode_float(6, this->target_temperature_high);
   buffer.encode_bool(7, this->away);
-  buffer.encode_enum<EnumClimateAction>(8, this->action);
+  buffer.encode_enum<enums::ClimateAction>(8, this->action);
 }
 void ClimateStateResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -2600,7 +2600,7 @@ void ClimateStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  mode: ");
-  out.append(proto_enum_to_string<EnumClimateMode>(this->mode));
+  out.append(proto_enum_to_string<enums::ClimateMode>(this->mode));
   out.append("\n");
 
   out.append("  current_temperature: ");
@@ -2628,7 +2628,7 @@ void ClimateStateResponse::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  action: ");
-  out.append(proto_enum_to_string<EnumClimateAction>(this->action));
+  out.append(proto_enum_to_string<enums::ClimateAction>(this->action));
   out.append("\n");
   out.append("}");
 }
@@ -2639,7 +2639,7 @@ bool ClimateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value)
       return true;
     }
     case 3: {
-      this->mode = value.as_enum<EnumClimateMode>();
+      this->mode = value.as_enum<enums::ClimateMode>();
       return true;
     }
     case 4: {
@@ -2691,7 +2691,7 @@ bool ClimateCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
 void ClimateCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_bool(2, this->has_mode);
-  buffer.encode_enum<EnumClimateMode>(3, this->mode);
+  buffer.encode_enum<enums::ClimateMode>(3, this->mode);
   buffer.encode_bool(4, this->has_target_temperature);
   buffer.encode_float(5, this->target_temperature);
   buffer.encode_bool(6, this->has_target_temperature_low);
@@ -2714,7 +2714,7 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   out.append("\n");
 
   out.append("  mode: ");
-  out.append(proto_enum_to_string<EnumClimateMode>(this->mode));
+  out.append(proto_enum_to_string<enums::ClimateMode>(this->mode));
   out.append("\n");
 
   out.append("  has_target_temperature: ");
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 2e685959bf..eb6a15afd4 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -5,26 +5,28 @@
 namespace esphome {
 namespace api {
 
-enum EnumLegacyCoverState : uint32_t {
+namespace enums {
+
+enum LegacyCoverState : uint32_t {
   LEGACY_COVER_STATE_OPEN = 0,
   LEGACY_COVER_STATE_CLOSED = 1,
 };
-enum EnumCoverOperation : uint32_t {
+enum CoverOperation : uint32_t {
   COVER_OPERATION_IDLE = 0,
   COVER_OPERATION_IS_OPENING = 1,
   COVER_OPERATION_IS_CLOSING = 2,
 };
-enum EnumLegacyCoverCommand : uint32_t {
+enum LegacyCoverCommand : uint32_t {
   LEGACY_COVER_COMMAND_OPEN = 0,
   LEGACY_COVER_COMMAND_CLOSE = 1,
   LEGACY_COVER_COMMAND_STOP = 2,
 };
-enum EnumFanSpeed : uint32_t {
+enum FanSpeed : uint32_t {
   FAN_SPEED_LOW = 0,
   FAN_SPEED_MEDIUM = 1,
   FAN_SPEED_HIGH = 2,
 };
-enum EnumLogLevel : uint32_t {
+enum LogLevel : uint32_t {
   LOG_LEVEL_NONE = 0,
   LOG_LEVEL_ERROR = 1,
   LOG_LEVEL_WARN = 2,
@@ -33,7 +35,7 @@ enum EnumLogLevel : uint32_t {
   LOG_LEVEL_VERBOSE = 5,
   LOG_LEVEL_VERY_VERBOSE = 6,
 };
-enum EnumServiceArgType : uint32_t {
+enum ServiceArgType : uint32_t {
   SERVICE_ARG_TYPE_BOOL = 0,
   SERVICE_ARG_TYPE_INT = 1,
   SERVICE_ARG_TYPE_FLOAT = 2,
@@ -43,17 +45,20 @@ enum EnumServiceArgType : uint32_t {
   SERVICE_ARG_TYPE_FLOAT_ARRAY = 6,
   SERVICE_ARG_TYPE_STRING_ARRAY = 7,
 };
-enum EnumClimateMode : uint32_t {
+enum ClimateMode : uint32_t {
   CLIMATE_MODE_OFF = 0,
   CLIMATE_MODE_AUTO = 1,
   CLIMATE_MODE_COOL = 2,
   CLIMATE_MODE_HEAT = 3,
 };
-enum EnumClimateAction : uint32_t {
+enum ClimateAction : uint32_t {
   CLIMATE_ACTION_OFF = 0,
   CLIMATE_ACTION_COOLING = 2,
   CLIMATE_ACTION_HEATING = 3,
 };
+
+}  // namespace enums
+
 class HelloRequest : public ProtoMessage {
  public:
   std::string client_info{};  // NOLINT
@@ -212,11 +217,11 @@ class ListEntitiesCoverResponse : public ProtoMessage {
 };
 class CoverStateResponse : public ProtoMessage {
  public:
-  uint32_t key{0};                         // NOLINT
-  EnumLegacyCoverState legacy_state{};     // NOLINT
-  float position{0.0f};                    // NOLINT
-  float tilt{0.0f};                        // NOLINT
-  EnumCoverOperation current_operation{};  // NOLINT
+  uint32_t key{0};                            // NOLINT
+  enums::LegacyCoverState legacy_state{};     // NOLINT
+  float position{0.0f};                       // NOLINT
+  float tilt{0.0f};                           // NOLINT
+  enums::CoverOperation current_operation{};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -226,14 +231,14 @@ class CoverStateResponse : public ProtoMessage {
 };
 class CoverCommandRequest : public ProtoMessage {
  public:
-  uint32_t key{0};                          // NOLINT
-  bool has_legacy_command{false};           // NOLINT
-  EnumLegacyCoverCommand legacy_command{};  // NOLINT
-  bool has_position{false};                 // NOLINT
-  float position{0.0f};                     // NOLINT
-  bool has_tilt{false};                     // NOLINT
-  float tilt{0.0f};                         // NOLINT
-  bool stop{false};                         // NOLINT
+  uint32_t key{0};                             // NOLINT
+  bool has_legacy_command{false};              // NOLINT
+  enums::LegacyCoverCommand legacy_command{};  // NOLINT
+  bool has_position{false};                    // NOLINT
+  float position{0.0f};                        // NOLINT
+  bool has_tilt{false};                        // NOLINT
+  float tilt{0.0f};                            // NOLINT
+  bool stop{false};                            // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -262,7 +267,7 @@ class FanStateResponse : public ProtoMessage {
   uint32_t key{0};          // NOLINT
   bool state{false};        // NOLINT
   bool oscillating{false};  // NOLINT
-  EnumFanSpeed speed{};     // NOLINT
+  enums::FanSpeed speed{};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -276,7 +281,7 @@ class FanCommandRequest : public ProtoMessage {
   bool has_state{false};        // NOLINT
   bool state{false};            // NOLINT
   bool has_speed{false};        // NOLINT
-  EnumFanSpeed speed{};         // NOLINT
+  enums::FanSpeed speed{};      // NOLINT
   bool has_oscillating{false};  // NOLINT
   bool oscillating{false};      // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
@@ -448,7 +453,7 @@ class TextSensorStateResponse : public ProtoMessage {
 };
 class SubscribeLogsRequest : public ProtoMessage {
  public:
-  EnumLogLevel level{};     // NOLINT
+  enums::LogLevel level{};  // NOLINT
   bool dump_config{false};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
@@ -458,7 +463,7 @@ class SubscribeLogsRequest : public ProtoMessage {
 };
 class SubscribeLogsResponse : public ProtoMessage {
  public:
-  EnumLogLevel level{};     // NOLINT
+  enums::LogLevel level{};  // NOLINT
   std::string tag{};        // NOLINT
   std::string message{};    // NOLINT
   bool send_failed{false};  // NOLINT
@@ -544,8 +549,8 @@ class GetTimeResponse : public ProtoMessage {
 };
 class ListEntitiesServicesArgument : public ProtoMessage {
  public:
-  std::string name{};         // NOLINT
-  EnumServiceArgType type{};  // NOLINT
+  std::string name{};            // NOLINT
+  enums::ServiceArgType type{};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -639,7 +644,7 @@ class ListEntitiesClimateResponse : public ProtoMessage {
   std::string unique_id{};                            // NOLINT
   bool supports_current_temperature{false};           // NOLINT
   bool supports_two_point_target_temperature{false};  // NOLINT
-  std::vector<EnumClimateMode> supported_modes{};     // NOLINT
+  std::vector<enums::ClimateMode> supported_modes{};  // NOLINT
   float visual_min_temperature{0.0f};                 // NOLINT
   float visual_max_temperature{0.0f};                 // NOLINT
   float visual_temperature_step{0.0f};                // NOLINT
@@ -656,13 +661,13 @@ class ListEntitiesClimateResponse : public ProtoMessage {
 class ClimateStateResponse : public ProtoMessage {
  public:
   uint32_t key{0};                      // NOLINT
-  EnumClimateMode mode{};               // NOLINT
+  enums::ClimateMode mode{};            // NOLINT
   float current_temperature{0.0f};      // NOLINT
   float target_temperature{0.0f};       // NOLINT
   float target_temperature_low{0.0f};   // NOLINT
   float target_temperature_high{0.0f};  // NOLINT
   bool away{false};                     // NOLINT
-  EnumClimateAction action{};           // NOLINT
+  enums::ClimateAction action{};        // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -674,7 +679,7 @@ class ClimateCommandRequest : public ProtoMessage {
  public:
   uint32_t key{0};                          // NOLINT
   bool has_mode{false};                     // NOLINT
-  EnumClimateMode mode{};                   // NOLINT
+  enums::ClimateMode mode{};                // NOLINT
   bool has_target_temperature{false};       // NOLINT
   float target_temperature{0.0f};           // NOLINT
   bool has_target_temperature_low{false};   // NOLINT
diff --git a/esphome/components/api/user_services.cpp b/esphome/components/api/user_services.cpp
index 0667d26ff6..39e42bcc02 100644
--- a/esphome/components/api/user_services.cpp
+++ b/esphome/components/api/user_services.cpp
@@ -25,14 +25,18 @@ template<> std::vector<std::string> get_execute_arg_value<std::vector<std::strin
   return arg.string_array;
 }
 
-template<> EnumServiceArgType to_service_arg_type<bool>() { return SERVICE_ARG_TYPE_BOOL; }
-template<> EnumServiceArgType to_service_arg_type<int>() { return SERVICE_ARG_TYPE_INT; }
-template<> EnumServiceArgType to_service_arg_type<float>() { return SERVICE_ARG_TYPE_FLOAT; }
-template<> EnumServiceArgType to_service_arg_type<std::string>() { return SERVICE_ARG_TYPE_STRING; }
-template<> EnumServiceArgType to_service_arg_type<std::vector<bool>>() { return SERVICE_ARG_TYPE_BOOL_ARRAY; }
-template<> EnumServiceArgType to_service_arg_type<std::vector<int>>() { return SERVICE_ARG_TYPE_INT_ARRAY; }
-template<> EnumServiceArgType to_service_arg_type<std::vector<float>>() { return SERVICE_ARG_TYPE_FLOAT_ARRAY; }
-template<> EnumServiceArgType to_service_arg_type<std::vector<std::string>>() { return SERVICE_ARG_TYPE_STRING_ARRAY; }
+template<> enums::ServiceArgType to_service_arg_type<bool>() { return enums::SERVICE_ARG_TYPE_BOOL; }
+template<> enums::ServiceArgType to_service_arg_type<int>() { return enums::SERVICE_ARG_TYPE_INT; }
+template<> enums::ServiceArgType to_service_arg_type<float>() { return enums::SERVICE_ARG_TYPE_FLOAT; }
+template<> enums::ServiceArgType to_service_arg_type<std::string>() { return enums::SERVICE_ARG_TYPE_STRING; }
+template<> enums::ServiceArgType to_service_arg_type<std::vector<bool>>() { return enums::SERVICE_ARG_TYPE_BOOL_ARRAY; }
+template<> enums::ServiceArgType to_service_arg_type<std::vector<int>>() { return enums::SERVICE_ARG_TYPE_INT_ARRAY; }
+template<> enums::ServiceArgType to_service_arg_type<std::vector<float>>() {
+  return enums::SERVICE_ARG_TYPE_FLOAT_ARRAY;
+}
+template<> enums::ServiceArgType to_service_arg_type<std::vector<std::string>>() {
+  return enums::SERVICE_ARG_TYPE_STRING_ARRAY;
+}
 
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/user_services.h b/esphome/components/api/user_services.h
index 3b99d426a9..3094ba397c 100644
--- a/esphome/components/api/user_services.h
+++ b/esphome/components/api/user_services.h
@@ -16,7 +16,7 @@ class UserServiceDescriptor {
 
 template<typename T> T get_execute_arg_value(const ExecuteServiceArgument &arg);
 
-template<typename T> EnumServiceArgType to_service_arg_type();
+template<typename T> enums::ServiceArgType to_service_arg_type();
 
 template<typename... Ts> class UserServiceBase : public UserServiceDescriptor {
  public:
@@ -29,7 +29,7 @@ template<typename... Ts> class UserServiceBase : public UserServiceDescriptor {
     ListEntitiesServicesResponse msg;
     msg.name = this->name_;
     msg.key = this->key_;
-    std::array<EnumServiceArgType, sizeof...(Ts)> arg_types = {to_service_arg_type<Ts>()...};
+    std::array<enums::ServiceArgType, sizeof...(Ts)> arg_types = {to_service_arg_type<Ts>()...};
     for (int i = 0; i < sizeof...(Ts); i++) {
       ListEntitiesServicesArgument arg;
       arg.type = arg_types[i];
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 6357ae38ed..a8f81c9daf 100644
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -344,7 +344,7 @@ class UInt32Type(TypeInfo):
 class EnumType(TypeInfo):
     @property
     def cpp_type(self):
-        return "Enum" + self._field.type_name[1:]
+        return f'enums::{self._field.type_name[1:]}'
 
     @property
     def decode_varint(self):
@@ -497,17 +497,17 @@ class RepeatedTypeInfo(TypeInfo):
 
 
 def build_enum_type(desc):
-    name = "Enum" + desc.name
+    name = desc.name
     out = f"enum {name} : uint32_t {{\n"
     for v in desc.value:
         out += f'  {v.name} = {v.number},\n'
     out += '};\n'
 
     cpp = f"template<>\n"
-    cpp += f"const char *proto_enum_to_string<{name}>({name} value) {{\n"
+    cpp += f"const char *proto_enum_to_string<enums::{name}>(enums::{name} value) {{\n"
     cpp += f"  switch (value) {{\n"
     for v in desc.value:
-        cpp += f'    case {v.name}: return "{v.name}";\n'
+        cpp += f'    case enums::{v.name}: return "{v.name}";\n'
     cpp += f'    default: return "UNKNOWN";\n'
     cpp += f'  }}\n'
     cpp += f'}}\n'
@@ -636,11 +636,15 @@ namespace api {
 
 '''
 
+content += 'namespace enums {\n\n'
+
 for enum in file.enum_type:
     s, c = build_enum_type(enum)
     content += s
     cpp += c
 
+content += '\n}  // namespace enums\n\n'
+
 mt = file.message_type
 
 for m in mt:

From 65d3dc9cb82c43cd5b1b7598ccfc00629de72321 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 2 Nov 2019 19:35:55 +0100
Subject: [PATCH 057/412] Fix update-all input in dashboard (#826)

Fixes https://github.com/esphome/issues/issues/798
---
 esphome/__main__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index a78413ff04..6d3705c87e 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -371,7 +371,8 @@ def command_update_all(args):
         print("Updating {}".format(color('cyan', f)))
         print('-' * twidth)
         print()
-        rc = run_external_process('esphome', '--dashboard', f, 'run', '--no-logs')
+        rc = run_external_process('esphome', '--dashboard', f, 'run', '--no-logs', '--upload-port',
+                                  'OTA')
         if rc == 0:
             print_bar("[{}] {}".format(color('bold_green', 'SUCCESS'), f))
             success[f] = True

From 75275c4e934746f33f81f6cc4aea251d04e88783 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 2 Nov 2019 20:31:39 +0100
Subject: [PATCH 058/412] Remove PCF8574 input_pullup mode and cleanup (#828)

Fixes https://github.com/esphome/issues/issues/755
Closes https://github.com/esphome/esphome/pull/822
Fixes https://github.com/esphome/issues/issues/667
Closes https://github.com/esphome/esphome/pull/808

Co-Authored-By: Amish Vishwakarma <amishv@users.noreply.github.com>
Co-Authored-By: S-Przybylski <s-przybylski@users.noreply.github.com>
---
 esphome/components/pcf8574/__init__.py | 13 ++++--
 esphome/components/pcf8574/pcf8574.cpp | 59 ++++++++++++--------------
 esphome/components/pcf8574/pcf8574.h   |  8 ++--
 3 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/esphome/components/pcf8574/__init__.py b/esphome/components/pcf8574/__init__.py
index ad74ac70a9..daf367c089 100644
--- a/esphome/components/pcf8574/__init__.py
+++ b/esphome/components/pcf8574/__init__.py
@@ -11,7 +11,6 @@ pcf8574_ns = cg.esphome_ns.namespace('pcf8574')
 PCF8574GPIOMode = pcf8574_ns.enum('PCF8574GPIOMode')
 PCF8674_GPIO_MODES = {
     'INPUT': PCF8574GPIOMode.PCF8574_INPUT,
-    'INPUT_PULLUP': PCF8574GPIOMode.PCF8574_INPUT_PULLUP,
     'OUTPUT': PCF8574GPIOMode.PCF8574_OUTPUT,
 }
 
@@ -33,16 +32,24 @@ def to_code(config):
     cg.add(var.set_pcf8575(config[CONF_PCF8575]))
 
 
+def validate_pcf8574_gpio_mode(value):
+    value = cv.string(value)
+    if value.upper() == 'INPUT_PULLUP':
+        raise cv.Invalid("INPUT_PULLUP mode has been removed in 1.14 and been combined into "
+                         "INPUT mode (they were the same thing). Please use INPUT instead.")
+    return cv.enum(PCF8674_GPIO_MODES, upper=True)(value)
+
+
 PCF8574_OUTPUT_PIN_SCHEMA = cv.Schema({
     cv.Required(CONF_PCF8574): cv.use_id(PCF8574Component),
     cv.Required(CONF_NUMBER): cv.int_,
-    cv.Optional(CONF_MODE, default="OUTPUT"): cv.enum(PCF8674_GPIO_MODES, upper=True),
+    cv.Optional(CONF_MODE, default="OUTPUT"): validate_pcf8574_gpio_mode,
     cv.Optional(CONF_INVERTED, default=False): cv.boolean,
 })
 PCF8574_INPUT_PIN_SCHEMA = cv.Schema({
     cv.Required(CONF_PCF8574): cv.use_id(PCF8574Component),
     cv.Required(CONF_NUMBER): cv.int_,
-    cv.Optional(CONF_MODE, default="INPUT"): cv.enum(PCF8674_GPIO_MODES, upper=True),
+    cv.Optional(CONF_MODE, default="INPUT"): validate_pcf8574_gpio_mode,
     cv.Optional(CONF_INVERTED, default=False): cv.boolean,
 })
 
diff --git a/esphome/components/pcf8574/pcf8574.cpp b/esphome/components/pcf8574/pcf8574.cpp
index 50922e2f48..6cadf565de 100644
--- a/esphome/components/pcf8574/pcf8574.cpp
+++ b/esphome/components/pcf8574/pcf8574.cpp
@@ -31,9 +31,9 @@ bool PCF8574Component::digital_read(uint8_t pin) {
 }
 void PCF8574Component::digital_write(uint8_t pin, bool value) {
   if (value) {
-    this->port_mask_ |= (1 << pin);
+    this->output_mask_ |= (1 << pin);
   } else {
-    this->port_mask_ &= ~(1 << pin);
+    this->output_mask_ &= ~(1 << pin);
   }
 
   this->write_gpio_();
@@ -41,16 +41,14 @@ void PCF8574Component::digital_write(uint8_t pin, bool value) {
 void PCF8574Component::pin_mode(uint8_t pin, uint8_t mode) {
   switch (mode) {
     case PCF8574_INPUT:
-      this->ddr_mask_ &= ~(1 << pin);
-      this->port_mask_ &= ~(1 << pin);
-      break;
-    case PCF8574_INPUT_PULLUP:
-      this->ddr_mask_ &= ~(1 << pin);
-      this->port_mask_ |= (1 << pin);
+      // Clear mode mask bit
+      this->mode_mask_ &= ~(1 << pin);
+      // Write GPIO to enable input mode
+      this->write_gpio_();
       break;
     case PCF8574_OUTPUT:
-      this->ddr_mask_ |= (1 << pin);
-      this->port_mask_ &= ~(1 << pin);
+      // Set mode mask bit
+      this->mode_mask_ |= 1 << pin;
       break;
     default:
       break;
@@ -59,21 +57,20 @@ void PCF8574Component::pin_mode(uint8_t pin, uint8_t mode) {
 bool PCF8574Component::read_gpio_() {
   if (this->is_failed())
     return false;
-
+  bool success;
+  uint8_t data[2];
   if (this->pcf8575_) {
-    if (!this->parent_->raw_receive_16(this->address_, &this->input_mask_, 1)) {
-      this->status_set_warning();
-      return false;
-    }
+    success = this->read_bytes_raw(data, 2);
+    this->input_mask_ = (uint16_t(data[1]) << 8) | (uint16_t(data[0]) << 0);
   } else {
-    uint8_t data;
-    if (!this->parent_->raw_receive(this->address_, &data, 1)) {
-      this->status_set_warning();
-      return false;
-    }
-    this->input_mask_ = data;
+    success = this->read_bytes_raw(data, 1);
+    this->input_mask_ = data[0];
   }
 
+  if (!success) {
+    this->status_set_warning();
+    return false;
+  }
   this->status_clear_warning();
   return true;
 }
@@ -81,20 +78,20 @@ bool PCF8574Component::write_gpio_() {
   if (this->is_failed())
     return false;
 
-  uint16_t value = (this->input_mask_ & ~this->ddr_mask_) | this->port_mask_;
+  uint16_t value = 0;
+  // Pins in OUTPUT mode and where pin is HIGH.
+  value |= this->mode_mask_ & this->output_mask_;
+  // Pins in INPUT mode must also be set here
+  value |= ~this->mode_mask_;
 
-  this->parent_->raw_begin_transmission(this->address_);
-  uint8_t data = value & 0xFF;
-  this->parent_->raw_write(this->address_, &data, 1);
-
-  if (this->pcf8575_) {
-    data = (value >> 8) & 0xFF;
-    this->parent_->raw_write(this->address_, &data, 1);
-  }
-  if (!this->parent_->raw_end_transmission(this->address_)) {
+  uint8_t data[2];
+  data[0] = value;
+  data[1] = value >> 8;
+  if (!this->write_bytes_raw(data, this->pcf8575_ ? 2 : 1)) {
     this->status_set_warning();
     return false;
   }
+
   this->status_clear_warning();
   return true;
 }
diff --git a/esphome/components/pcf8574/pcf8574.h b/esphome/components/pcf8574/pcf8574.h
index 390031c391..925fa30899 100644
--- a/esphome/components/pcf8574/pcf8574.h
+++ b/esphome/components/pcf8574/pcf8574.h
@@ -10,7 +10,6 @@ namespace pcf8574 {
 /// Modes for PCF8574 pins
 enum PCF8574GPIOMode : uint8_t {
   PCF8574_INPUT = INPUT,
-  PCF8574_INPUT_PULLUP = INPUT_PULLUP,
   PCF8574_OUTPUT = OUTPUT,
 };
 
@@ -38,9 +37,12 @@ class PCF8574Component : public Component, public i2c::I2CDevice {
 
   bool write_gpio_();
 
-  uint16_t ddr_mask_{0x00};
+  /// Mask for the pin mode - 1 means output, 0 means input
+  uint16_t mode_mask_{0x00};
+  /// The mask to write as output state - 1 means HIGH, 0 means LOW
+  uint16_t output_mask_{0x00};
+  /// The state read in read_gpio_ - 1 means HIGH, 0 means LOW
   uint16_t input_mask_{0x00};
-  uint16_t port_mask_{0x00};
   bool pcf8575_;  ///< TRUE->16-channel PCF8575, FALSE->8-channel PCF8574
 };
 

From dc2279b74fd385a4c07754271e33b0dddf196fe0 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 2 Nov 2019 20:56:42 +0100
Subject: [PATCH 059/412] Add servo missing restore option to codegen (#829)

See also https://github.com/esphome/issues/issues/609
---
 esphome/components/servo/__init__.py | 4 +++-
 esphome/components/servo/servo.h     | 1 +
 tests/test3.yaml                     | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/esphome/components/servo/__init__.py b/esphome/components/servo/__init__.py
index 92243ee18d..9b06159c13 100644
--- a/esphome/components/servo/__init__.py
+++ b/esphome/components/servo/__init__.py
@@ -4,7 +4,7 @@ from esphome import automation
 from esphome.automation import maybe_simple_id
 from esphome.components.output import FloatOutput
 from esphome.const import CONF_ID, CONF_IDLE_LEVEL, CONF_MAX_LEVEL, CONF_MIN_LEVEL, CONF_OUTPUT, \
-    CONF_LEVEL
+    CONF_LEVEL, CONF_RESTORE
 
 servo_ns = cg.esphome_ns.namespace('servo')
 Servo = servo_ns.class_('Servo', cg.Component)
@@ -18,6 +18,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_MIN_LEVEL, default='3%'): cv.percentage,
     cv.Optional(CONF_IDLE_LEVEL, default='7.5%'): cv.percentage,
     cv.Optional(CONF_MAX_LEVEL, default='12%'): cv.percentage,
+    cv.Optional(CONF_RESTORE, default=False): cv.boolean,
 }).extend(cv.COMPONENT_SCHEMA)
 
 
@@ -30,6 +31,7 @@ def to_code(config):
     cg.add(var.set_min_level(config[CONF_MIN_LEVEL]))
     cg.add(var.set_idle_level(config[CONF_IDLE_LEVEL]))
     cg.add(var.set_max_level(config[CONF_MAX_LEVEL]))
+    cg.add(var.set_restore(config[CONF_RESTORE]))
 
 
 @automation.register_action('servo.write', ServoWriteAction, cv.Schema({
diff --git a/esphome/components/servo/servo.h b/esphome/components/servo/servo.h
index 3a0993c0c4..19165be23d 100644
--- a/esphome/components/servo/servo.h
+++ b/esphome/components/servo/servo.h
@@ -47,6 +47,7 @@ class Servo : public Component {
   void set_min_level(float min_level) { min_level_ = min_level; }
   void set_idle_level(float idle_level) { idle_level_ = idle_level; }
   void set_max_level(float max_level) { max_level_ = max_level; }
+  void set_restore(bool restore) { restore_ = restore; }
 
  protected:
   void save_level_(float v) { this->rtc_.save(&v); }
diff --git a/tests/test3.yaml b/tests/test3.yaml
index d1596c8f41..6d70f60764 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -620,6 +620,7 @@ light:
 servo:
   id: my_servo
   output: out
+  restore: true
 
 ttp229_lsf:
 

From 16c2dc2aaf6ff0f5d95833353aafa869c3b120c1 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 2 Nov 2019 21:19:15 +0100
Subject: [PATCH 060/412] Fix stack trace decode for latest platformio (#830)

---
 esphome/platformio_api.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index 5cc4fad998..36e451c21d 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -101,12 +101,14 @@ def run_idedata(config):
     args = ['-t', 'idedata']
     stdout = run_platformio_cli_run(config, False, *args, capture_stdout=True)
     stdout = decode_text(stdout)
-    match = re.search(r'{.*}', stdout)
+    match = re.search(r'{\s*".*}', stdout)
     if match is None:
+        _LOGGER.debug("Could not match IDEData for %s", stdout)
         return IDEData(None)
     try:
         return IDEData(json.loads(match.group()))
     except ValueError:
+        _LOGGER.debug("Could not load IDEData for %s", stdout, exc_info=1)
         return IDEData(None)
 
 
@@ -165,11 +167,13 @@ ESP8266_EXCEPTION_CODES = {
 def _decode_pc(config, addr):
     idedata = get_idedata(config)
     if not idedata.addr2line_path or not idedata.firmware_elf_path:
+        _LOGGER.debug("decode_pc no addr2line")
         return
     command = [idedata.addr2line_path, '-pfiaC', '-e', idedata.firmware_elf_path, addr]
     try:
-        translation = subprocess.check_output(command).strip()
+        translation = decode_text(subprocess.check_output(command)).strip()
     except Exception:  # pylint: disable=broad-except
+        _LOGGER.debug("Caught exception for command %s", command, exc_info=1)
         return
 
     if "?? ??:0" in translation:

From 8027facb39841277bd44ddca5497e7c0ab6c0b45 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 3 Nov 2019 00:19:57 +0100
Subject: [PATCH 061/412] Fix weird ESP8266 wifi crashes (#831)

* Try fix ESP8266 weird crashes

* Only call disconnect if STA is active
---
 .../wifi/wifi_component_esp8266.cpp           | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index ed6e616b3d..3363b9e3a9 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -394,24 +394,6 @@ bool WiFiComponent::wifi_sta_pre_setup_() {
   if (!this->wifi_mode_(true, {}))
     return false;
 
-  // Clear saved STA config
-  station_config default_config{};
-  wifi_station_get_config_default(&default_config);
-  bool is_zero = default_config.ssid[0] == '\0' && default_config.password[0] == '\0' && default_config.bssid[0] == 0 &&
-                 default_config.bssid_set == 0;
-  if (!is_zero) {
-    ESP_LOGV(TAG, "Clearing default wifi STA config");
-
-    memset(&default_config, 0, sizeof(default_config));
-    ETS_UART_INTR_DISABLE();
-    bool ret = wifi_station_set_config(&default_config);
-    ETS_UART_INTR_ENABLE();
-
-    if (!ret) {
-      ESP_LOGW(TAG, "Clearing default wif STA config failed!");
-    }
-  }
-
   bool ret1, ret2;
   ETS_UART_INTR_DISABLE();
   ret1 = wifi_station_set_auto_connect(0);
@@ -496,11 +478,14 @@ bool WiFiComponent::wifi_scan_start_() {
   return ret;
 }
 bool WiFiComponent::wifi_disconnect_() {
+  bool ret = true;
+  // Only call disconnect if interface is up
+  if (wifi_get_opmode() & WIFI_STA)
+    ret = wifi_station_disconnect();
   station_config conf{};
   memset(&conf, 0, sizeof(conf));
   ETS_UART_INTR_DISABLE();
-  wifi_station_set_config(&conf);
-  bool ret = wifi_station_disconnect();
+  wifi_station_set_config_current(&conf);
   ETS_UART_INTR_ENABLE();
   return ret;
 }

From 0cbd3738171111c040b6b3d08a29cc21ee7cc8eb Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 5 Nov 2019 21:56:35 +0100
Subject: [PATCH 062/412] ESP8266 remove default opmode check (#835)

---
 esphome/components/wifi/wifi_component_esp8266.cpp | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index 3363b9e3a9..e218a12907 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -410,19 +410,6 @@ bool WiFiComponent::wifi_sta_pre_setup_() {
 
 void WiFiComponent::wifi_pre_setup_() {
   wifi_set_event_handler_cb(&WiFiComponent::wifi_event_callback);
-  // Make sure the default opmode is OFF
-  uint8_t default_opmode = wifi_get_opmode_default();
-  if (default_opmode != 0) {
-    ESP_LOGV(TAG, "Setting default WiFi Mode to 0 (was %u)", default_opmode);
-
-    ETS_UART_INTR_DISABLE();
-    bool ret = wifi_set_opmode(0);
-    ETS_UART_INTR_ENABLE();
-
-    if (!ret) {
-      ESP_LOGW(TAG, "Setting default WiFi mode failed!");
-    }
-  }
 
   // Make sure WiFi is in clean state before anything starts
   this->wifi_mode_(false, false);

From 85c46becdfe4b280f8895e896126b5cc4ae66fbc Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 5 Nov 2019 22:11:15 +0100
Subject: [PATCH 063/412] WiFi AP apply manual ip settings (#836)

---
 esphome/components/wifi/__init__.py                | 3 ++-
 esphome/components/wifi/wifi_component_esp8266.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index 93f2d59564..818d3c84e0 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -179,7 +179,8 @@ def to_code(config):
 
     if CONF_AP in config:
         conf = config[CONF_AP]
-        cg.add(var.set_ap(wifi_network(conf, config.get(CONF_MANUAL_IP))))
+        ip_config = conf.get(CONF_MANUAL_IP, config.get(CONF_MANUAL_IP))
+        cg.add(var.set_ap(wifi_network(conf, ip_config)))
         cg.add(var.set_ap_timeout(conf[CONF_AP_TIMEOUT]))
 
     cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index e218a12907..ff0dd57ed4 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -566,7 +566,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
   strcpy(reinterpret_cast<char *>(conf.ssid), ap.get_ssid().c_str());
   conf.ssid_len = static_cast<uint8>(ap.get_ssid().size());
   conf.channel = ap.get_channel().value_or(1);
-  conf.ssid_hidden = 0;
+  conf.ssid_hidden = ap.get_hidden();
   conf.max_connection = 5;
   conf.beacon_interval = 100;
 

From 3fdb68cba88f13f5b63ed0b0d630467bc6a1d6d6 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 5 Nov 2019 22:26:06 +0100
Subject: [PATCH 064/412] Fix ESP32 rotary encoder (#834)

* Fix ESP32 rotary encoder

Fixes https://github.com/esphome/issues/issues/672

* Update rotary_encoder.cpp

* Lint
---
 esphome/components/rotary_encoder/rotary_encoder.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/esphome/components/rotary_encoder/rotary_encoder.cpp b/esphome/components/rotary_encoder/rotary_encoder.cpp
index 949a301661..769d3e1103 100644
--- a/esphome/components/rotary_encoder/rotary_encoder.cpp
+++ b/esphome/components/rotary_encoder/rotary_encoder.cpp
@@ -32,7 +32,13 @@ static const uint16_t STATE_DECREMENT_COUNTER_1 = 0x1000;
 // Bit 2&3 (0x0C) encodes state S0-S3
 // Bit 4 (0x10) encodes clockwise/counter-clockwise rotation
 
-static const uint16_t STATE_LOOKUP_TABLE[32] = {
+// Only apply if DRAM_ATTR exists on this platform (exists on ESP32, not on ESP8266)
+#ifndef DRAM_ATTR
+#define DRAM_ATTR
+#endif
+// array needs to be placed in .dram1 for ESP32
+// otherwise it will automatically go into flash, and cause cache disabled issues
+static const uint16_t DRAM_ATTR STATE_LOOKUP_TABLE[32] = {
     // act state S0 in CCW direction
     STATE_CCW | STATE_S0,                              // 0x00: stay here
     STATE_CW | STATE_S1 | STATE_INCREMENT_COUNTER_1,   // 0x01: goto CW+S1 and increment counter (dir change)

From 5c56f15c6774910234dfb1b22493c26ae2d6c910 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 5 Nov 2019 22:27:35 +0100
Subject: [PATCH 065/412] Fix homeassistant.service schema lambda (#833)

* Fix homeassistant.service schema lambda

Fixes https://github.com/esphome/issues/issues/820

* Improve

* Fix
---
 esphome/components/api/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/api/__init__.py b/esphome/components/api/__init__.py
index 43c7d71e74..a0568863ad 100644
--- a/esphome/components/api/__init__.py
+++ b/esphome/components/api/__init__.py
@@ -70,14 +70,14 @@ def to_code(config):
     cg.add_global(api_ns.using)
 
 
-KEY_VALUE_SCHEMA = cv.Schema({cv.string: cv.templatable(cv.string)})
+KEY_VALUE_SCHEMA = cv.Schema({cv.string: cv.templatable(cv.string_strict)})
 
 HOMEASSISTANT_SERVICE_ACTION_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.use_id(APIServer),
     cv.Required(CONF_SERVICE): cv.templatable(cv.string),
     cv.Optional(CONF_DATA, default={}): KEY_VALUE_SCHEMA,
     cv.Optional(CONF_DATA_TEMPLATE, default={}): KEY_VALUE_SCHEMA,
-    cv.Optional(CONF_VARIABLES, default={}): KEY_VALUE_SCHEMA,
+    cv.Optional(CONF_VARIABLES, default={}): cv.Schema({cv.string: cv.returning_lambda}),
 })
 
 

From d97bc9579891d8e30a04eb24770fcfed45204167 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 5 Nov 2019 22:28:19 +0100
Subject: [PATCH 066/412] Update platformio libraries (#837)

* Update platformio libraries

* Lint
---
 esphome/components/async_tcp/__init__.py       | 14 ++------------
 esphome/components/mqtt/__init__.py            |  2 +-
 esphome/components/web_server_base/__init__.py |  2 +-
 platformio.ini                                 |  6 +++---
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py
index 4cbd5358ce..cf9d2f1585 100644
--- a/esphome/components/async_tcp/__init__.py
+++ b/esphome/components/async_tcp/__init__.py
@@ -1,23 +1,13 @@
 # Dummy integration to allow relying on AsyncTCP
 import esphome.codegen as cg
-from esphome.const import ARDUINO_VERSION_ESP32_1_0_0, ARDUINO_VERSION_ESP32_1_0_1, \
-    ARDUINO_VERSION_ESP32_1_0_2
 from esphome.core import CORE, coroutine_with_priority
 
 
 @coroutine_with_priority(200.0)
 def to_code(config):
     if CORE.is_esp32:
-        # https://github.com/me-no-dev/AsyncTCP/blob/master/library.json
-        versions_requiring_older_asynctcp = [
-            ARDUINO_VERSION_ESP32_1_0_0,
-            ARDUINO_VERSION_ESP32_1_0_1,
-            ARDUINO_VERSION_ESP32_1_0_2,
-        ]
-        if CORE.arduino_version in versions_requiring_older_asynctcp:
-            cg.add_library('AsyncTCP', '1.0.3')
-        else:
-            cg.add_library('AsyncTCP', '1.1.1')
+        # https://github.com/OttoWinter/AsyncTCP/blob/master/library.json
+        cg.add_library('AsyncTCP-esphome', '1.1.1')
     elif CORE.is_esp8266:
         # https://github.com/OttoWinter/ESPAsyncTCP
         cg.add_library('ESPAsyncTCP-esphome', '1.2.2')
diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 073bb3cede..20d7f5aafe 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -155,7 +155,7 @@ def to_code(config):
     yield cg.register_component(var, config)
 
     # https://github.com/OttoWinter/async-mqtt-client/blob/master/library.json
-    cg.add_library('AsyncMqttClient-esphome', '0.8.3')
+    cg.add_library('AsyncMqttClient-esphome', '0.8.4')
     cg.add_define('USE_MQTT')
     cg.add_global(mqtt_ns.using)
 
diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index 923a594eb8..d2faaf7162 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -23,4 +23,4 @@ def to_code(config):
     if CORE.is_esp32:
         cg.add_library('FS', None)
     # https://github.com/OttoWinter/ESPAsyncWebServer/blob/master/library.json
-    cg.add_library('ESPAsyncWebServer-esphome', '1.2.5')
+    cg.add_library('ESPAsyncWebServer-esphome', '1.2.6')
diff --git a/platformio.ini b/platformio.ini
index 19b850c546..4e1ef1d294 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,10 +10,10 @@ include_dir = include
 
 [common]
 lib_deps =
-    AsyncTCP@1.1.1
-    AsyncMqttClient-esphome@0.8.3
+    AsyncTCP-esphome@1.1.1
+    AsyncMqttClient-esphome@0.8.4
     ArduinoJson-esphomelib@5.13.3
-    ESPAsyncWebServer-esphome@1.2.5
+    ESPAsyncWebServer-esphome@1.2.6
     FastLED@3.2.9
     NeoPixelBus-esphome@2.5.2
     ESPAsyncTCP-esphome@1.2.2

From 1ed8e63d599408160446e307c4b4cded9a704c70 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 5 Nov 2019 22:45:31 +0100
Subject: [PATCH 067/412] Remove useless code

See also https://github.com/esphome/esphome/pull/801/files#r342813117
---
 esphome/components/ina219/ina219.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/esphome/components/ina219/ina219.cpp b/esphome/components/ina219/ina219.cpp
index 8dbf501e0e..1150f7c661 100644
--- a/esphome/components/ina219/ina219.cpp
+++ b/esphome/components/ina219/ina219.cpp
@@ -134,7 +134,6 @@ void INA219Component::dump_config() {
 
   if (this->is_failed()) {
     ESP_LOGE(TAG, "Communication with INA219 failed!");
-    this->mark_failed();
     return;
   }
   LOG_UPDATE_INTERVAL(this);

From f94e9b6b1eea43048fcbcdfc4a29211b03b007b2 Mon Sep 17 00:00:00 2001
From: DAVe3283 <DAVe3283+GitHub@gmail.com>
Date: Wed, 6 Nov 2019 05:56:43 -0700
Subject: [PATCH 068/412] Add MAX31865 sensor support, fix MAX31855 sensor
 (#832)

* Add MAX31865 sensor support, fix MAX31855 sensor.

# MAX31865

Added support for the MAX31865 RTD-to-Digital Converter to measure PT100 and
similar RTDs. Verified with an Adafruit unit (product ID: 3328) and a PT100
probe.

# MAX31855

This was setup for incorrect SPI clock polarity and phase, and would return bad
data due to a race condition measuring on the wrong edge (verified with Saleae
Logic scope). Selecting the correct configuration fixes that problem.

Re-wrote the decode off the datasheet to handle error states better (sends NaN
as an update on failure to read temperature, which shows the value as Unknown
in Home Assistant).

Added the *optional* ability to monitor the internal high-precision temperature
sensor, which can be nice in some applications.

* Tests for MAX31855/MAX38165.

* Update style to match project rules.

Also fix CONF_REFERENCE_RESISTANCE and CONF_REFERENCE_TEMPERATURE being defined
multiple places. Missed this when I added them to const.py.

* Update style to match project rules.

Pylint line limit 101/100 ("missed it by that much").
Also apparently I can't read and patched the wrong line in max31855.cpp.

* Minor string/style cleanup.

There was a copy-paste leftover in max31855.cpp and max31865/sensor.py had
unnecessary whitespace.

* Improve MAX31865 fault detection and logging.

Log levels are more in-line with the documented descriptions.

Fault detection code is improved. A transient fault between reads is still
reported, but now only faults *during* a read cause the sensor to fail and
return NAN ("unknown" in Home Assistant).

* Update style to match project rules.

I just now realized the .clang-format and pylintrc files are included. D'oh!

* MAX31855 & MAX31865 code style alignment.

@OttoWinter caught some style mismatches, updated to match project better.

* Fix a lost '\' in max31865/sensor.py.
---
 esphome/components/max31855/max31855.cpp | 110 +++++++-----
 esphome/components/max31855/max31855.h   |   7 +-
 esphome/components/max31855/sensor.py    |   7 +-
 esphome/components/max31865/__init__.py  |   0
 esphome/components/max31865/max31865.cpp | 214 +++++++++++++++++++++++
 esphome/components/max31865/max31865.h   |  56 ++++++
 esphome/components/max31865/sensor.py    |  34 ++++
 esphome/components/ntc/sensor.py         |   7 +-
 esphome/const.py                         |   5 +
 tests/test1.yaml                         |   8 +
 10 files changed, 397 insertions(+), 51 deletions(-)
 create mode 100644 esphome/components/max31865/__init__.py
 create mode 100644 esphome/components/max31865/max31865.cpp
 create mode 100644 esphome/components/max31865/max31865.h
 create mode 100644 esphome/components/max31865/sensor.py

diff --git a/esphome/components/max31855/max31855.cpp b/esphome/components/max31855/max31855.cpp
index 0462ed4342..88f9e836f9 100644
--- a/esphome/components/max31855/max31855.cpp
+++ b/esphome/components/max31855/max31855.cpp
@@ -1,10 +1,11 @@
 #include "max31855.h"
+
 #include "esphome/core/log.h"
 
 namespace esphome {
 namespace max31855 {
 
-static const char *TAG = "max31855";
+static const char* TAG = "max31855";
 
 void MAX31855Sensor::update() {
   this->enable();
@@ -22,9 +23,15 @@ void MAX31855Sensor::setup() {
   this->spi_setup();
 }
 void MAX31855Sensor::dump_config() {
-  LOG_SENSOR("", "MAX31855", this);
+  ESP_LOGCONFIG(TAG, "MAX31855:");
   LOG_PIN("  CS Pin: ", this->cs_);
   LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Thermocouple", this);
+  if (this->temperature_reference_) {
+    LOG_SENSOR("  ", "Reference", this->temperature_reference_);
+  } else {
+    ESP_LOGCONFIG(TAG, "  Reference temperature disabled.");
+  }
 }
 float MAX31855Sensor::get_setup_priority() const { return setup_priority::DATA; }
 void MAX31855Sensor::read_data_() {
@@ -32,53 +39,68 @@ void MAX31855Sensor::read_data_() {
   delay(1);
   uint8_t data[4];
   this->read_array(data, 4);
-
-  // val is 14 bits of signed temperature data followed by 2 bits of status flags
-  int16_t val = data[1] | data[0] << 8;
-
-  // test data from MAX31855 datasheet
-  // val = 0x6400 // 1600.00°C
-  // val = 0x3E80 // 1000.00°C
-  // val = 0x064C // 100.75°C
-  // val = 0x0190 // 25.00°C
-  // val = 0x0000 // 0.00°C
-  // val = 0xFFFC // -0.25°C
-  // val = 0xFFF0 // -1.00°C
-  // val = 0xF060 // -250.00°C
-
   this->disable();
-  if ((data[3] & 0x01) != 0) {
-    ESP_LOGW(TAG, "Got thermocouple not connected from MAX31855Sensor (0x%04X) (0x%04X)", val, data[3] | data[2] << 8);
-    this->status_set_warning();
-    return;
-  }
-  if ((data[3] & 0x02) != 0) {
-    ESP_LOGW(TAG, "Got short circuit to ground from MAX31855Sensor (0x%04X) (0x%04X)", val, data[3] | data[2] << 8);
-    this->status_set_warning();
-    return;
-  }
-  if ((data[3] & 0x04) != 0) {
-    ESP_LOGW(TAG, "Got short circuit to power from MAX31855Sensor (0x%04X) (0x%04X)", val, data[3] | data[2] << 8);
-    this->status_set_warning();
-    return;
-  }
-  if ((data[1] & 0x01) != 0) {
-    ESP_LOGW(TAG, "Got faulty reading from MAX31855Sensor (0x%04X) (0x%04X)", val, data[3] | data[2] << 8);
-    this->status_set_warning();
-    return;
-  }
 
-  if ((val & 0x8000) != 0) {
-    // Negative value, drop the lower 2 bits and explicitly extend sign bits.
-    val = 0xE000 | ((val >> 2) & 0x1FFF);
+  const uint32_t mem = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3] << 0;
+
+  // Verify we got data
+  if (mem != 0 && mem != 0xFFFFFFFF) {
+    this->status_clear_error();
   } else {
-    // Positive value, just drop the lower 2 bits.
-    val >>= 2;
+    ESP_LOGE(TAG, "No data received from MAX31855 (0x%08X). Check wiring!", mem);
+    this->publish_state(NAN);
+    if (this->temperature_reference_) {
+      this->temperature_reference_->publish_state(NAN);
+    }
+    this->status_set_error();
+    return;
   }
 
-  float temperature = float(val) / 4.0f;
-  ESP_LOGD(TAG, "'%s': Got temperature=%.1f°C", this->name_.c_str(), temperature);
-  this->publish_state(temperature);
+  // Internal reference temperature always works
+  if (this->temperature_reference_) {
+    int16_t val = (mem & 0x0000FFF0) >> 4;
+    if (val & 0x0800) {
+      val |= 0xF000;  // Pad out 2's complement
+    }
+    const float t_ref = float(val) * 0.0625f;
+    ESP_LOGD(TAG, "Got reference temperature: %.4f°C", t_ref);
+    this->temperature_reference_->publish_state(t_ref);
+  }
+
+  // Check thermocouple faults
+  if (mem & 0x00000001) {
+    ESP_LOGW(TAG, "Thermocouple open circuit (not connected) fault from MAX31855 (0x%08X)", mem);
+    this->publish_state(NAN);
+    this->status_set_warning();
+    return;
+  }
+  if (mem & 0x00000002) {
+    ESP_LOGW(TAG, "Thermocouple short circuit to ground fault from MAX31855 (0x%08X)", mem);
+    this->publish_state(NAN);
+    this->status_set_warning();
+    return;
+  }
+  if (mem & 0x00000004) {
+    ESP_LOGW(TAG, "Thermocouple short circuit to VCC fault from MAX31855 (0x%08X)", mem);
+    this->publish_state(NAN);
+    this->status_set_warning();
+    return;
+  }
+  if (mem & 0x00010000) {
+    ESP_LOGW(TAG, "Got faulty reading from MAX31855 (0x%08X)", mem);
+    this->publish_state(NAN);
+    this->status_set_warning();
+    return;
+  }
+
+  // Decode thermocouple temperature
+  int16_t val = (mem & 0xFFFC0000) >> 18;
+  if (val & 0x2000) {
+    val |= 0xC000;  // Pad out 2's complement
+  }
+  const float t_sense = float(val) * 0.25f;
+  ESP_LOGD(TAG, "Got thermocouple temperature: %.2f°C", t_sense);
+  this->publish_state(t_sense);
   this->status_clear_warning();
 }
 
diff --git a/esphome/components/max31855/max31855.h b/esphome/components/max31855/max31855.h
index 1d0fc79ac0..c0ed8a467d 100644
--- a/esphome/components/max31855/max31855.h
+++ b/esphome/components/max31855/max31855.h
@@ -9,9 +9,11 @@ namespace max31855 {
 
 class MAX31855Sensor : public sensor::Sensor,
                        public PollingComponent,
-                       public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
-                                             spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_4MHZ> {
+                       public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH,
+                                             spi::CLOCK_PHASE_TRAILING, spi::DATA_RATE_4MHZ> {
  public:
+  void set_reference_sensor(sensor::Sensor *temperature_sensor) { temperature_reference_ = temperature_sensor; }
+
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
@@ -20,6 +22,7 @@ class MAX31855Sensor : public sensor::Sensor,
 
  protected:
   void read_data_();
+  sensor::Sensor *temperature_reference_{nullptr};
 };
 
 }  // namespace max31855
diff --git a/esphome/components/max31855/sensor.py b/esphome/components/max31855/sensor.py
index b4d9f82b03..dce28bd542 100644
--- a/esphome/components/max31855/sensor.py
+++ b/esphome/components/max31855/sensor.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, spi
-from esphome.const import CONF_ID, ICON_THERMOMETER, UNIT_CELSIUS
+from esphome.const import CONF_ID, CONF_REFERENCE_TEMPERATURE, ICON_THERMOMETER, UNIT_CELSIUS
 
 max31855_ns = cg.esphome_ns.namespace('max31855')
 MAX31855Sensor = max31855_ns.class_('MAX31855Sensor', sensor.Sensor, cg.PollingComponent,
@@ -9,6 +9,8 @@ MAX31855Sensor = max31855_ns.class_('MAX31855Sensor', sensor.Sensor, cg.PollingC
 
 CONFIG_SCHEMA = sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1).extend({
     cv.GenerateID(): cv.declare_id(MAX31855Sensor),
+    cv.Optional(CONF_REFERENCE_TEMPERATURE):
+        sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 2),
 }).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
 
 
@@ -17,3 +19,6 @@ def to_code(config):
     yield cg.register_component(var, config)
     yield spi.register_spi_device(var, config)
     yield sensor.register_sensor(var, config)
+    if CONF_REFERENCE_TEMPERATURE in config:
+        tc_ref = yield sensor.new_sensor(config[CONF_REFERENCE_TEMPERATURE])
+        cg.add(var.set_reference_sensor(tc_ref))
diff --git a/esphome/components/max31865/__init__.py b/esphome/components/max31865/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/max31865/max31865.cpp b/esphome/components/max31865/max31865.cpp
new file mode 100644
index 0000000000..500b5b2883
--- /dev/null
+++ b/esphome/components/max31865/max31865.cpp
@@ -0,0 +1,214 @@
+#include "max31865.h"
+
+#include "esphome/core/log.h"
+#include <cmath>
+
+namespace esphome {
+namespace max31865 {
+
+static const char* TAG = "max31865";
+
+void MAX31865Sensor::update() {
+  // Check new faults since last measurement
+  if (!has_fault_) {
+    const uint8_t faults = this->read_register_(FAULT_STATUS_REG);
+    if (faults & 0b11111100) {
+      if (faults & (1 << 2)) {
+        ESP_LOGW(TAG, "Overvoltage/undervoltage fault between measurements");
+      }
+      if (faults & (1 << 3)) {
+        ESP_LOGW(TAG, "RTDIN- < 0.85 x V_BIAS (FORCE- open) between measurements");
+      }
+      if (faults & (1 << 4)) {
+        ESP_LOGW(TAG, "REFIN- < 0.85 x V_BIAS (FORCE- open) between measurements");
+      }
+      if (faults & (1 << 5)) {
+        ESP_LOGW(TAG, "REFIN- > 0.85 x V_BIAS between measurements");
+      }
+      if (!has_warn_) {
+        if (faults & (1 << 6)) {
+          ESP_LOGW(TAG, "RTD Low Threshold between measurements");
+        }
+        if (faults & (1 << 7)) {
+          ESP_LOGW(TAG, "RTD High Threshold between measurements");
+        }
+      }
+    }
+  }
+
+  // Run fault detection
+  write_register_(CONFIGURATION_REG, 0b11101110, 0b10000110);
+  const uint32_t start_time = micros();
+  uint8_t config;
+  uint32_t fault_detect_time;
+  do {
+    config = this->read_register_(CONFIGURATION_REG);
+    fault_detect_time = micros() - start_time;
+    if ((fault_detect_time >= 6000) && (config & 0b00001100)) {
+      ESP_LOGE(TAG, "Fault detection incomplete (0x%02X) after %uμs (datasheet spec is 600μs max)! Aborting read.",
+               config, fault_detect_time);
+      this->publish_state(NAN);
+      this->status_set_error();
+      return;
+    }
+  } while (config & 0b00001100);
+  ESP_LOGV(TAG, "Fault detection completed in %uμs.", fault_detect_time);
+
+  // Start 1-shot conversion
+  this->write_register_(CONFIGURATION_REG, 0b11100000, 0b10100000);
+
+  // Datasheet max conversion time is 55ms for 60Hz / 66ms for 50Hz
+  auto f = std::bind(&MAX31865Sensor::read_data_, this);
+  this->set_timeout("value", filter_ == FILTER_60HZ ? 55 : 66, f);
+}
+
+void MAX31865Sensor::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up MAX31865Sensor '%s'...", this->name_.c_str());
+  this->spi_setup();
+
+  // Build configuration
+  uint8_t config = 0b00000010;
+  config |= (filter_ & 1) << 0;
+  if (rtd_wires_ == 3) {
+    config |= 1 << 4;
+  }
+  this->write_register_(CONFIGURATION_REG, 0b11111111, config);
+}
+
+void MAX31865Sensor::dump_config() {
+  LOG_SENSOR("", "MAX31865", this);
+  LOG_PIN("  CS Pin: ", this->cs_);
+  LOG_UPDATE_INTERVAL(this);
+  ESP_LOGCONFIG(TAG, "  Reference Resistance: %.2fΩ", reference_resistance_);
+  ESP_LOGCONFIG(TAG, "  RTD: %u-wire %.2fΩ", rtd_wires_, rtd_nominal_resistance_);
+  ESP_LOGCONFIG(TAG, "  Filter: %s",
+                (filter_ == FILTER_60HZ ? "60 Hz" : (filter_ == FILTER_50HZ ? "50 Hz" : "Unknown!")));
+}
+
+float MAX31865Sensor::get_setup_priority() const { return setup_priority::DATA; }
+
+void MAX31865Sensor::read_data_() {
+  // Read temperature, disable V_BIAS (save power)
+  const uint16_t rtd_resistance_register = this->read_register_16_(RTD_RESISTANCE_MSB_REG);
+  this->write_register_(CONFIGURATION_REG, 0b11000000, 0b00000000);
+
+  // Check faults
+  const uint8_t faults = this->read_register_(FAULT_STATUS_REG);
+  if ((has_fault_ = faults & 0b00111100)) {
+    if (faults & (1 << 2)) {
+      ESP_LOGE(TAG, "Overvoltage/undervoltage fault");
+    }
+    if (faults & (1 << 3)) {
+      ESP_LOGE(TAG, "RTDIN- < 0.85 x V_BIAS (FORCE- open)");
+    }
+    if (faults & (1 << 4)) {
+      ESP_LOGE(TAG, "REFIN- < 0.85 x V_BIAS (FORCE- open)");
+    }
+    if (faults & (1 << 5)) {
+      ESP_LOGE(TAG, "REFIN- > 0.85 x V_BIAS");
+    }
+    this->publish_state(NAN);
+    this->status_set_error();
+    return;
+  } else {
+    this->status_clear_error();
+  }
+  if ((has_warn_ = faults & 0b11000000)) {
+    if (faults & (1 << 6)) {
+      ESP_LOGW(TAG, "RTD Low Threshold");
+    }
+    if (faults & (1 << 7)) {
+      ESP_LOGW(TAG, "RTD High Threshold");
+    }
+    this->status_set_warning();
+  } else {
+    this->status_clear_warning();
+  }
+
+  // Process temperature
+  if (rtd_resistance_register & 0x0001) {
+    ESP_LOGW(TAG, "RTD Resistance Registers fault bit set! (0x%04X)", rtd_resistance_register);
+    this->status_set_warning();
+  }
+  const float rtd_ratio = static_cast<float>(rtd_resistance_register >> 1) / static_cast<float>((1 << 15) - 1);
+  const float temperature = this->calc_temperature_(rtd_ratio);
+  ESP_LOGV(TAG, "RTD read complete. %.5f (ratio) * %.1fΩ (reference) = %.2fΩ --> %.2f°C", rtd_ratio,
+           reference_resistance_, reference_resistance_ * rtd_ratio, temperature);
+  this->publish_state(temperature);
+}
+
+void MAX31865Sensor::write_register_(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position) {
+  uint8_t value = this->read_register_(reg);
+
+  value &= (~mask);
+  value |= (bits << start_position);
+
+  this->enable();
+  this->write_byte(reg |= SPI_WRITE_M);
+  this->write_byte(value);
+  this->disable();
+  ESP_LOGVV(TAG, "write_register_ 0x%02X: 0x%02X", reg, value);
+}
+
+const uint8_t MAX31865Sensor::read_register_(uint8_t reg) {
+  this->enable();
+  this->write_byte(reg);
+  const uint8_t value(this->read_byte());
+  this->disable();
+  ESP_LOGVV(TAG, "read_register_ 0x%02X: 0x%02X", reg, value);
+  return value;
+}
+
+const uint16_t MAX31865Sensor::read_register_16_(uint8_t reg) {
+  this->enable();
+  this->write_byte(reg);
+  const uint8_t msb(this->read_byte());
+  const uint8_t lsb(this->read_byte());
+  this->disable();
+  const uint16_t value((msb << 8) | lsb);
+  ESP_LOGVV(TAG, "read_register_16_ 0x%02X: 0x%04X", reg, value);
+  return value;
+}
+
+float MAX31865Sensor::calc_temperature_(const float& rtd_ratio) {
+  // Based loosely on Adafruit's library: https://github.com/adafruit/Adafruit_MAX31865
+  // Mainly based on formulas provided by Analog:
+  // http://www.analog.com/media/en/technical-documentation/application-notes/AN709_0.pdf
+
+  const float a = 3.9083e-3;
+  const float b = -5.775e-7;
+  const float z1 = -a;
+  const float z2 = a * a - 4 * b;
+  const float z3 = 4 * b / rtd_nominal_resistance_;
+  const float z4 = 2 * b;
+
+  float rtd_resistance = rtd_ratio * reference_resistance_;
+
+  // ≥ 0°C Formula
+  const float pos_temp = (z1 + std::sqrt(z2 + (z3 * rtd_resistance))) / z4;
+  if (pos_temp >= 0) {
+    return pos_temp;
+  }
+
+  // < 0°C Formula
+  if (rtd_nominal_resistance_ != 100) {
+    // Normalize RTD to 100Ω
+    rtd_resistance /= rtd_nominal_resistance_;
+    rtd_resistance *= 100;
+  }
+  float rpoly = rtd_resistance;
+  float neg_temp = -242.02;
+  neg_temp += 2.2228 * rpoly;
+  rpoly *= rtd_resistance;  // square
+  neg_temp += 2.5859e-3 * rpoly;
+  rpoly *= rtd_resistance;  // ^3
+  neg_temp -= 4.8260e-6 * rpoly;
+  rpoly *= rtd_resistance;  // ^4
+  neg_temp -= 2.8183e-8 * rpoly;
+  rpoly *= rtd_resistance;  // ^5
+  neg_temp += 1.5243e-10 * rpoly;
+  return neg_temp;
+}
+
+}  // namespace max31865
+}  // namespace esphome
diff --git a/esphome/components/max31865/max31865.h b/esphome/components/max31865/max31865.h
new file mode 100644
index 0000000000..e63be8e6c5
--- /dev/null
+++ b/esphome/components/max31865/max31865.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/spi/spi.h"
+
+namespace esphome {
+namespace max31865 {
+
+enum MAX31865RegisterMasks { SPI_WRITE_M = 0x80 };
+enum MAX31865Registers {
+  CONFIGURATION_REG = 0x00,
+  RTD_RESISTANCE_MSB_REG = 0x01,
+  RTD_RESISTANCE_LSB_REG = 0x02,
+  FAULT_THRESHOLD_H_MSB_REG = 0x03,
+  FAULT_THRESHOLD_H_LSB_REG = 0x04,
+  FAULT_THRESHOLD_L_MSB_REG = 0x05,
+  FAULT_THRESHOLD_L_LSB_REG = 0x06,
+  FAULT_STATUS_REG = 0x07,
+};
+enum MAX31865ConfigFilter {
+  FILTER_60HZ = 0,
+  FILTER_50HZ = 1,
+};
+
+class MAX31865Sensor : public sensor::Sensor,
+                       public PollingComponent,
+                       public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                             spi::CLOCK_PHASE_TRAILING, spi::DATA_RATE_4MHZ> {
+ public:
+  void set_reference_resistance(float reference_resistance) { reference_resistance_ = reference_resistance; }
+  void set_nominal_resistance(float nominal_resistance) { rtd_nominal_resistance_ = nominal_resistance; }
+  void set_filter(MAX31865ConfigFilter filter) { filter_ = filter; }
+  void set_num_rtd_wires(uint8_t rtd_wires) { rtd_wires_ = rtd_wires; }
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+
+  void update() override;
+
+ protected:
+  float reference_resistance_;
+  float rtd_nominal_resistance_;
+  MAX31865ConfigFilter filter_;
+  uint8_t rtd_wires_;
+  bool has_fault_ = false;
+  bool has_warn_ = false;
+  void read_data_();
+  void write_register_(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position = 0);
+  const uint8_t read_register_(uint8_t reg);
+  const uint16_t read_register_16_(uint8_t reg);
+  float calc_temperature_(const float& rtd_ratio);
+};
+
+}  // namespace max31865
+}  // namespace esphome
diff --git a/esphome/components/max31865/sensor.py b/esphome/components/max31865/sensor.py
new file mode 100644
index 0000000000..ff1df9c5c8
--- /dev/null
+++ b/esphome/components/max31865/sensor.py
@@ -0,0 +1,34 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, spi
+from esphome.const import CONF_ID, CONF_MAINS_FILTER, CONF_REFERENCE_RESISTANCE, \
+    CONF_RTD_NOMINAL_RESISTANCE, CONF_RTD_WIRES, ICON_THERMOMETER, UNIT_CELSIUS
+
+max31865_ns = cg.esphome_ns.namespace('max31865')
+MAX31865Sensor = max31865_ns.class_('MAX31865Sensor', sensor.Sensor, cg.PollingComponent,
+                                    spi.SPIDevice)
+
+MAX31865ConfigFilter = max31865_ns.enum('MAX31865ConfigFilter')
+FILTER = {
+    '50HZ': MAX31865ConfigFilter.FILTER_50HZ,
+    '60HZ': MAX31865ConfigFilter.FILTER_60HZ,
+}
+
+CONFIG_SCHEMA = sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 2).extend({
+    cv.GenerateID(): cv.declare_id(MAX31865Sensor),
+    cv.Required(CONF_REFERENCE_RESISTANCE): cv.All(cv.resistance, cv.Range(min=100, max=10000)),
+    cv.Required(CONF_RTD_NOMINAL_RESISTANCE): cv.All(cv.resistance, cv.Range(min=100, max=1000)),
+    cv.Optional(CONF_MAINS_FILTER, default='60HZ'): cv.enum(FILTER, upper=True, space=''),
+    cv.Optional(CONF_RTD_WIRES, default=4): cv.int_range(min=2, max=4),
+}).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield spi.register_spi_device(var, config)
+    yield sensor.register_sensor(var, config)
+    cg.add(var.set_reference_resistance(config[CONF_REFERENCE_RESISTANCE]))
+    cg.add(var.set_nominal_resistance(config[CONF_RTD_NOMINAL_RESISTANCE]))
+    cg.add(var.set_filter(config[CONF_MAINS_FILTER]))
+    cg.add(var.set_num_rtd_wires(config[CONF_RTD_WIRES]))
diff --git a/esphome/components/ntc/sensor.py b/esphome/components/ntc/sensor.py
index a528183ac8..7ff4f4e137 100644
--- a/esphome/components/ntc/sensor.py
+++ b/esphome/components/ntc/sensor.py
@@ -4,15 +4,14 @@ from math import log
 import esphome.config_validation as cv
 import esphome.codegen as cg
 from esphome.components import sensor
-from esphome.const import UNIT_CELSIUS, ICON_THERMOMETER, CONF_SENSOR, CONF_TEMPERATURE, \
-    CONF_VALUE, CONF_CALIBRATION, CONF_ID
+from esphome.const import CONF_CALIBRATION, CONF_ID, CONF_REFERENCE_RESISTANCE, \
+    CONF_REFERENCE_TEMPERATURE, CONF_SENSOR, CONF_TEMPERATURE, CONF_VALUE, ICON_THERMOMETER, \
+    UNIT_CELSIUS
 
 ntc_ns = cg.esphome_ns.namespace('ntc')
 NTC = ntc_ns.class_('NTC', cg.Component, sensor.Sensor)
 
 CONF_B_CONSTANT = 'b_constant'
-CONF_REFERENCE_TEMPERATURE = 'reference_temperature'
-CONF_REFERENCE_RESISTANCE = 'reference_resistance'
 CONF_A = 'a'
 CONF_B = 'b'
 CONF_C = 'c'
diff --git a/esphome/const.py b/esphome/const.py
index dc607d62ff..cde9134eae 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -224,6 +224,7 @@ CONF_LOGS = 'logs'
 CONF_LOW = 'low'
 CONF_LOW_VOLTAGE_REFERENCE = 'low_voltage_reference'
 CONF_MAC_ADDRESS = 'mac_address'
+CONF_MAINS_FILTER = 'mains_filter'
 CONF_MAKE_ID = 'make_id'
 CONF_MANUAL_IP = 'manual_ip'
 CONF_MASK_DISTURBER = 'mask_disturber'
@@ -343,6 +344,8 @@ CONF_RAW = 'raw'
 CONF_REBOOT_TIMEOUT = 'reboot_timeout'
 CONF_RECEIVE_TIMEOUT = 'receive_timeout'
 CONF_RED = 'red'
+CONF_REFERENCE_RESISTANCE = 'reference_resistance'
+CONF_REFERENCE_TEMPERATURE = 'reference_temperature'
 CONF_REPEAT = 'repeat'
 CONF_REPOSITORY = 'repository'
 CONF_RESET_PIN = 'reset_pin'
@@ -358,6 +361,8 @@ CONF_RGBW = 'rgbw'
 CONF_RISING_EDGE = 'rising_edge'
 CONF_ROTATION = 'rotation'
 CONF_RS_PIN = 'rs_pin'
+CONF_RTD_NOMINAL_RESISTANCE = 'rtd_nominal_resistance'
+CONF_RTD_WIRES = 'rtd_wires'
 CONF_RUN_CYCLES = 'run_cycles'
 CONF_RUN_DURATION = 'run_duration'
 CONF_RW_PIN = 'rw_pin'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 66f0220836..60f3b7f418 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -451,6 +451,14 @@ sensor:
     name: "Den Temperature"
     cs_pin: GPIO23
     update_interval: 15s
+    reference_temperature:
+      name: "MAX31855 Internal Temperature"
+  - platform: max31865
+    name: "Water Tank Temperature"
+    cs_pin: GPIO23
+    update_interval: 15s
+    reference_resistance: "430 Ω"
+    rtd_nominal_resistance: "100 Ω"
   - platform: mhz19
     co2:
       name: "MH-Z19 CO2 Value"

From a919b015b40dbc10eef69ad0a17e00c68a1a0208 Mon Sep 17 00:00:00 2001
From: Sergio <sergio303@users.noreply.github.com>
Date: Wed, 6 Nov 2019 13:59:00 +0100
Subject: [PATCH 069/412] Add support for INA226 Current/Power Monitor (#801)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add support for INA226 Current/Power Monitor

* fix lint errors

* fix narrowing conversion

* Remove useless code


Co-authored-by: Sergio Muñoz <sergio@iMac-de-Sergio.local>
---
 esphome/components/ina226/__init__.py |   0
 esphome/components/ina226/ina226.cpp  | 140 ++++++++++++++++++++++++++
 esphome/components/ina226/ina226.h    |  35 +++++++
 esphome/components/ina226/sensor.py   |  48 +++++++++
 tests/test1.yaml                      |  13 +++
 5 files changed, 236 insertions(+)
 create mode 100644 esphome/components/ina226/__init__.py
 create mode 100644 esphome/components/ina226/ina226.cpp
 create mode 100644 esphome/components/ina226/ina226.h
 create mode 100644 esphome/components/ina226/sensor.py

diff --git a/esphome/components/ina226/__init__.py b/esphome/components/ina226/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/ina226/ina226.cpp b/esphome/components/ina226/ina226.cpp
new file mode 100644
index 0000000000..cbb06d73b6
--- /dev/null
+++ b/esphome/components/ina226/ina226.cpp
@@ -0,0 +1,140 @@
+#include "ina226.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace ina226 {
+
+static const char *TAG = "ina226";
+
+// | A0   | A1   | Address |
+// | GND  | GND  | 0x40    |
+// | GND  | V_S+ | 0x41    |
+// | GND  | SDA  | 0x42    |
+// | GND  | SCL  | 0x43    |
+// | V_S+ | GND  | 0x44    |
+// | V_S+ | V_S+ | 0x45    |
+// | V_S+ | SDA  | 0x46    |
+// | V_S+ | SCL  | 0x47    |
+// | SDA  | GND  | 0x48    |
+// | SDA  | V_S+ | 0x49    |
+// | SDA  | SDA  | 0x4A    |
+// | SDA  | SCL  | 0x4B    |
+// | SCL  | GND  | 0x4C    |
+// | SCL  | V_S+ | 0x4D    |
+// | SCL  | SDA  | 0x4E    |
+// | SCL  | SCL  | 0x4F    |
+
+static const uint8_t INA226_REGISTER_CONFIG = 0x00;
+static const uint8_t INA226_REGISTER_SHUNT_VOLTAGE = 0x01;
+static const uint8_t INA226_REGISTER_BUS_VOLTAGE = 0x02;
+static const uint8_t INA226_REGISTER_POWER = 0x03;
+static const uint8_t INA226_REGISTER_CURRENT = 0x04;
+static const uint8_t INA226_REGISTER_CALIBRATION = 0x05;
+
+void INA226Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up INA226...");
+  // Config Register
+  // 0bx000000000000000 << 15 RESET Bit (1 -> trigger reset)
+  if (!this->write_byte_16(INA226_REGISTER_CONFIG, 0x8000)) {
+    this->mark_failed();
+    return;
+  }
+  delay(1);
+
+  uint16_t config = 0x0000;
+
+  // Averaging Mode AVG Bit Settings[11:9] (000 -> 1 sample, 001 -> 4 sample, 111 -> 1024 samples)
+  config |= 0b0000001000000000;
+
+  // Bus Voltage Conversion Time VBUSCT Bit Settings [8:6] (100 -> 1.1ms, 111 -> 8.244 ms)
+  config |= 0b0000000100000000;
+
+  // Shunt Voltage Conversion Time VSHCT Bit Settings [5:3] (100 -> 1.1ms, 111 -> 8.244 ms)
+  config |= 0b0000000000100000;
+
+  // Mode Settings [2:0] Combinations (111 -> Shunt and Bus, Continuous)
+  config |= 0b0000000000000111;
+
+  if (!this->write_byte_16(INA226_REGISTER_CONFIG, config)) {
+    this->mark_failed();
+    return;
+  }
+
+  // lsb is multiplied by 1000000 to store it as an integer value
+  uint32_t lsb = static_cast<uint32_t>(ceilf(this->max_current_a_ * 1000000.0f / 32768));
+
+  this->calibration_lsb_ = lsb;
+
+  auto calibration = uint32_t(0.00512 / (lsb * this->shunt_resistance_ohm_ / 1000000.0f));
+
+  ESP_LOGV(TAG, "    Using LSB=%u calibration=%u", lsb, calibration);
+
+  if (!this->write_byte_16(INA226_REGISTER_CALIBRATION, calibration)) {
+    this->mark_failed();
+    return;
+  }
+}
+
+void INA226Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "INA226:");
+  LOG_I2C_DEVICE(this);
+
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with INA226 failed!");
+    return;
+  }
+  LOG_UPDATE_INTERVAL(this);
+
+  LOG_SENSOR("  ", "Bus Voltage", this->bus_voltage_sensor_);
+  LOG_SENSOR("  ", "Shunt Voltage", this->shunt_voltage_sensor_);
+  LOG_SENSOR("  ", "Current", this->current_sensor_);
+  LOG_SENSOR("  ", "Power", this->power_sensor_);
+}
+
+float INA226Component::get_setup_priority() const { return setup_priority::DATA; }
+
+void INA226Component::update() {
+  if (this->bus_voltage_sensor_ != nullptr) {
+    uint16_t raw_bus_voltage;
+    if (!this->read_byte_16(INA226_REGISTER_BUS_VOLTAGE, &raw_bus_voltage, 1)) {
+      this->status_set_warning();
+      return;
+    }
+    float bus_voltage_v = int16_t(raw_bus_voltage) * 0.00125f;
+    this->bus_voltage_sensor_->publish_state(bus_voltage_v);
+  }
+
+  if (this->shunt_voltage_sensor_ != nullptr) {
+    uint16_t raw_shunt_voltage;
+    if (!this->read_byte_16(INA226_REGISTER_SHUNT_VOLTAGE, &raw_shunt_voltage, 1)) {
+      this->status_set_warning();
+    }
+    float shunt_voltage_v = int16_t(raw_shunt_voltage) * 0.0000025f;
+    this->shunt_voltage_sensor_->publish_state(shunt_voltage_v);
+  }
+
+  if (this->current_sensor_ != nullptr) {
+    uint16_t raw_current;
+    if (!this->read_byte_16(INA226_REGISTER_CURRENT, &raw_current, 1)) {
+      this->status_set_warning();
+      return;
+    }
+    float current_ma = int16_t(raw_current) * (this->calibration_lsb_ / 1000.0f);
+    this->current_sensor_->publish_state(current_ma / 1000.0f);
+  }
+
+  if (this->power_sensor_ != nullptr) {
+    uint16_t raw_power;
+    if (!this->read_byte_16(INA226_REGISTER_POWER, &raw_power, 1)) {
+      this->status_set_warning();
+      return;
+    }
+    float power_mw = int16_t(raw_power) * (this->calibration_lsb_ * 25.0f / 1000.0f);
+    this->power_sensor_->publish_state(power_mw / 1000.0f);
+  }
+
+  this->status_clear_warning();
+}
+
+}  // namespace ina226
+}  // namespace esphome
diff --git a/esphome/components/ina226/ina226.h b/esphome/components/ina226/ina226.h
new file mode 100644
index 0000000000..a551cb3430
--- /dev/null
+++ b/esphome/components/ina226/ina226.h
@@ -0,0 +1,35 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace ina226 {
+
+class INA226Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+
+  void set_shunt_resistance_ohm(float shunt_resistance_ohm) { shunt_resistance_ohm_ = shunt_resistance_ohm; }
+  void set_max_current_a(float max_current_a) { max_current_a_ = max_current_a; }
+  void set_bus_voltage_sensor(sensor::Sensor *bus_voltage_sensor) { bus_voltage_sensor_ = bus_voltage_sensor; }
+  void set_shunt_voltage_sensor(sensor::Sensor *shunt_voltage_sensor) { shunt_voltage_sensor_ = shunt_voltage_sensor; }
+  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
+  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
+
+ protected:
+  float shunt_resistance_ohm_;
+  float max_current_a_;
+  uint32_t calibration_lsb_;
+  sensor::Sensor *bus_voltage_sensor_{nullptr};
+  sensor::Sensor *shunt_voltage_sensor_{nullptr};
+  sensor::Sensor *current_sensor_{nullptr};
+  sensor::Sensor *power_sensor_{nullptr};
+};
+
+}  // namespace ina226
+}  // namespace esphome
diff --git a/esphome/components/ina226/sensor.py b/esphome/components/ina226/sensor.py
new file mode 100644
index 0000000000..02a13f98c4
--- /dev/null
+++ b/esphome/components/ina226/sensor.py
@@ -0,0 +1,48 @@
+# coding=utf-8
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import CONF_BUS_VOLTAGE, CONF_CURRENT, CONF_ID, \
+    CONF_MAX_CURRENT, CONF_POWER, CONF_SHUNT_RESISTANCE, \
+    CONF_SHUNT_VOLTAGE, ICON_FLASH, UNIT_VOLT, UNIT_AMPERE, UNIT_WATT
+
+DEPENDENCIES = ['i2c']
+
+ina226_ns = cg.esphome_ns.namespace('ina226')
+INA226Component = ina226_ns.class_('INA226Component', cg.PollingComponent, i2c.I2CDevice)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(INA226Component),
+    cv.Optional(CONF_BUS_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 2),
+    cv.Optional(CONF_SHUNT_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 2),
+    cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_FLASH, 3),
+    cv.Optional(CONF_POWER): sensor.sensor_schema(UNIT_WATT, ICON_FLASH, 2),
+    cv.Optional(CONF_SHUNT_RESISTANCE, default=0.1): cv.All(cv.resistance, cv.Range(min=0.0)),
+    cv.Optional(CONF_MAX_CURRENT, default=3.2): cv.All(cv.current, cv.Range(min=0.0)),
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x40))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield i2c.register_i2c_device(var, config)
+
+    cg.add(var.set_shunt_resistance_ohm(config[CONF_SHUNT_RESISTANCE]))
+
+    cg.add(var.set_max_current_a(config[CONF_MAX_CURRENT]))
+
+    if CONF_BUS_VOLTAGE in config:
+        sens = yield sensor.new_sensor(config[CONF_BUS_VOLTAGE])
+        cg.add(var.set_bus_voltage_sensor(sens))
+
+    if CONF_SHUNT_VOLTAGE in config:
+        sens = yield sensor.new_sensor(config[CONF_SHUNT_VOLTAGE])
+        cg.add(var.set_shunt_voltage_sensor(sens))
+
+    if CONF_CURRENT in config:
+        sens = yield sensor.new_sensor(config[CONF_CURRENT])
+        cg.add(var.set_current_sensor(sens))
+
+    if CONF_POWER in config:
+        sens = yield sensor.new_sensor(config[CONF_POWER])
+        cg.add(var.set_power_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 60f3b7f418..0905c51efa 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -424,6 +424,19 @@ sensor:
     max_voltage: 32.0V
     max_current: 3.2A
     update_interval: 15s
+  - platform: ina226
+    address: 0x40
+    shunt_resistance: 0.1 ohm
+    current:
+      name: "INA226 Current"
+    power:
+      name: "INA226 Power"
+    bus_voltage:
+      name: "INA226 Bus Voltage"
+    shunt_voltage:
+      name: "INA226 Shunt Voltage"
+    max_current: 3.2A
+    update_interval: 15s
   - platform: ina3221
     address: 0x40
     channel_1:

From b5af3aa04880c33a7a572937052f8b3bb87b48f3 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 6 Nov 2019 22:35:22 +0100
Subject: [PATCH 070/412] Update variable in scheduler (#838)

Fixes https://github.com/esphome/issues/issues/826
---
 esphome/core/scheduler.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/core/scheduler.cpp b/esphome/core/scheduler.cpp
index cc4331b38e..e61b2b13c6 100644
--- a/esphome/core/scheduler.cpp
+++ b/esphome/core/scheduler.cpp
@@ -211,6 +211,7 @@ uint32_t Scheduler::millis_() {
     ESP_LOGD(TAG, "Incrementing scheduler major");
     this->millis_major_++;
   }
+  this->last_millis_ = now;
   return now;
 }
 

From 003326f2eb0f52e974325347bcc2e1d76d3c2283 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 6 Nov 2019 22:49:38 +0100
Subject: [PATCH 071/412] Fix calculations for negative sun declination (#839)

Fixes https://github.com/esphome/issues/issues/793

Also adds a clampd function that operates with doubles, not floats
---
 esphome/components/sun/sun.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/esphome/components/sun/sun.cpp b/esphome/components/sun/sun.cpp
index e0da63bb4b..6744a418c5 100644
--- a/esphome/components/sun/sun.cpp
+++ b/esphome/components/sun/sun.cpp
@@ -52,6 +52,14 @@ double Sun::azimuth() {
     return NAN;
   return this->azimuth_(time);
 }
+// like clamp, but with doubles
+double clampd(double val, double min, double max) {
+  if (val < min)
+    return min;
+  if (val > max)
+    return max;
+  return val;
+}
 double Sun::sun_declination_(double sun_time) {
   double n = sun_time - 1.0;
   // maximum declination
@@ -67,7 +75,7 @@ double Sun::sun_declination_(double sun_time) {
   const double c = TAU / 365.24;
   double v = cos(c * days_since_december_solstice + 2 * eccentricity * sin(c * days_since_perihelion));
   // Make sure value is in range (double error may lead to results slightly larger than 1)
-  double x = clamp(tot * v, 0, 1);
+  double x = clampd(tot * v, -1.0, 1.0);
   return asin(x);
 }
 double Sun::elevation_ratio_(double sun_time) {
@@ -75,7 +83,7 @@ double Sun::elevation_ratio_(double sun_time) {
   double hangle = this->hour_angle_(sun_time);
   double a = sin(this->latitude_rad_()) * sin(decl);
   double b = cos(this->latitude_rad_()) * cos(decl) * cos(hangle);
-  double val = clamp(a + b, -1.0, 1.0);
+  double val = clampd(a + b, -1.0, 1.0);
   return val;
 }
 double Sun::latitude_rad_() { return this->latitude_ * TO_RADIANS; }
@@ -92,7 +100,7 @@ double Sun::azimuth_rad_(double sun_time) {
   double zen = this->zenith_rad_(sun_time);
   double nom = cos(zen) * sin(this->latitude_rad_()) - sin(decl);
   double denom = sin(zen) * cos(this->latitude_rad_());
-  double v = clamp(nom / denom, -1.0, 1.0);
+  double v = clampd(nom / denom, -1.0, 1.0);
   double az = PI - acos(v);
   if (hangle > 0)
     az = -az;

From 3e8fd48dc0d6e90665c3c997ffc32a9a24f59215 Mon Sep 17 00:00:00 2001
From: Alexander Leisentritt <alexander@leisentritt.eu>
Date: Thu, 7 Nov 2019 22:10:09 +0100
Subject: [PATCH 072/412] implemented ruuvi_ble and ruuvitag with RAWv1 and
 RAWv2 protocol (#810)

* implemented ruuvi_ble and ruuvitag with RAWv1 protocol

fixes esphome/feature-requests#313

* lint

* updated data calculations

* cpp lint

* use string directly in message

Co-Authored-By: Otto Winter <otto@otto-winter.com>

* add RAWv2 protocol support

* fix ICON_SIGNAL

* typo

* calculation correction and cleaning

* c++ lint

* added acceleration and fixed typo

* removed remote_receiver to reduce firmware size

remote_receiver also in test1.yaml
---
 .../components/esp32_ble_tracker/__init__.py  |   2 +-
 esphome/components/ruuvi_ble/__init__.py      |  18 +++
 esphome/components/ruuvi_ble/ruuvi_ble.cpp    | 147 ++++++++++++++++++
 esphome/components/ruuvi_ble/ruuvi_ble.h      |  37 +++++
 esphome/components/ruuvitag/__init__.py       |   0
 esphome/components/ruuvitag/ruuvitag.cpp      |  29 ++++
 esphome/components/ruuvitag/ruuvitag.h        |  84 ++++++++++
 esphome/components/ruuvitag/sensor.py         |  76 +++++++++
 esphome/const.py                              |  15 +-
 tests/test2.yaml                              |  28 +++-
 10 files changed, 429 insertions(+), 7 deletions(-)
 create mode 100644 esphome/components/ruuvi_ble/__init__.py
 create mode 100644 esphome/components/ruuvi_ble/ruuvi_ble.cpp
 create mode 100644 esphome/components/ruuvi_ble/ruuvi_ble.h
 create mode 100644 esphome/components/ruuvitag/__init__.py
 create mode 100644 esphome/components/ruuvitag/ruuvitag.cpp
 create mode 100644 esphome/components/ruuvitag/ruuvitag.h
 create mode 100644 esphome/components/ruuvitag/sensor.py

diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 4aa5b1610a..3d48eafde4 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -6,7 +6,7 @@ from esphome.const import CONF_ID, ESP_PLATFORM_ESP32, CONF_INTERVAL, \
 from esphome.core import coroutine
 
 ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
-AUTO_LOAD = ['xiaomi_ble']
+AUTO_LOAD = ['xiaomi_ble', 'ruuvi_ble']
 
 CONF_ESP32_BLE_ID = 'esp32_ble_id'
 CONF_SCAN_PARAMETERS = 'scan_parameters'
diff --git a/esphome/components/ruuvi_ble/__init__.py b/esphome/components/ruuvi_ble/__init__.py
new file mode 100644
index 0000000000..05ba008dd0
--- /dev/null
+++ b/esphome/components/ruuvi_ble/__init__.py
@@ -0,0 +1,18 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import esp32_ble_tracker
+from esphome.const import CONF_ID
+
+DEPENDENCIES = ['esp32_ble_tracker']
+
+ruuvi_ble_ns = cg.esphome_ns.namespace('ruuvi_ble')
+RuuviListener = ruuvi_ble_ns.class_('RuuviListener', esp32_ble_tracker.ESPBTDeviceListener)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(RuuviListener),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield esp32_ble_tracker.register_ble_device(var, config)
diff --git a/esphome/components/ruuvi_ble/ruuvi_ble.cpp b/esphome/components/ruuvi_ble/ruuvi_ble.cpp
new file mode 100644
index 0000000000..28a689fee4
--- /dev/null
+++ b/esphome/components/ruuvi_ble/ruuvi_ble.cpp
@@ -0,0 +1,147 @@
+#include "ruuvi_ble.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace ruuvi_ble {
+
+static const char *TAG = "ruuvi_ble";
+
+bool parse_ruuvi_data_byte(uint8_t data_type, uint8_t data_length, const uint8_t *data, RuuviParseResult &result) {
+  switch (data_type) {
+    case 0x03: {  // RAWv1
+      if (data_length != 16)
+        return false;
+
+      const uint8_t temp_sign = (data[1] >> 7) & 1;
+      const float temp_val = (data[1] & 0x7F) + (data[2] / 100.0f);
+      const float temperature = temp_sign == 0 ? temp_val : -1 * temp_val;
+
+      const float humidity = data[0] * 0.5f;
+      const float pressure = (uint16_t(data[3] << 8) + uint16_t(data[4]) + 50000.0f) / 100.0f;
+      const float acceleration_x = (int16_t(data[5] << 8) + int16_t(data[6])) / 1000.0f;
+      const float acceleration_y = (int16_t(data[7] << 8) + int16_t(data[8])) / 1000.0f;
+      const float acceleration_z = (int16_t(data[9] << 8) + int16_t(data[10])) / 1000.0f;
+      const float battery_voltage = (uint16_t(data[11] << 8) + uint16_t(data[12])) / 1000.0f;
+
+      result.humidity = humidity;
+      result.temperature = temperature;
+      result.pressure = pressure;
+      result.acceleration_x = acceleration_x;
+      result.acceleration_y = acceleration_y;
+      result.acceleration_z = acceleration_z;
+      result.acceleration =
+          sqrt(acceleration_x * acceleration_x + acceleration_y * acceleration_y + acceleration_z * acceleration_z);
+      result.battery_voltage = battery_voltage;
+
+      return true;
+    }
+    case 0x05: {  // RAWv2
+      if (data_length != 26)
+        return false;
+
+      const float temperature = (int16_t(data[0] << 8) + int16_t(data[1])) * 0.005f;
+      const float humidity = (uint16_t(data[2] << 8) | uint16_t(data[3])) / 400.0f;
+      const float pressure = ((uint16_t(data[4] << 8) | uint16_t(data[5])) + 50000.0f) / 100.0f;
+      const float acceleration_x = (int16_t(data[6] << 8) + int16_t(data[7])) / 1000.0f;
+      const float acceleration_y = (int16_t(data[8] << 8) + int16_t(data[9])) / 1000.0f;
+      const float acceleration_z = (int16_t(data[10] << 8) + int16_t(data[11])) / 1000.0f;
+
+      const uint8_t power_info = (data[12] << 8) | data[13];
+      const float battery_voltage = ((power_info >> 5) + 1600.0f) / 1000.0f;
+      const float tx_power = ((power_info & 0x1F) * 2.0f) - 40.0f;
+
+      const float movement_counter = float(data[14]);
+      const float measurement_sequence_number = float(uint16_t(data[15] << 8) | uint16_t(data[16]));
+
+      result.temperature = data[0] == 0x7F && data[1] == 0xFF ? NAN : temperature;
+      result.humidity = data[2] == 0xFF && data[3] == 0xFF ? NAN : humidity;
+      result.pressure = data[4] == 0xFF && data[5] == 0xFF ? NAN : pressure;
+      result.acceleration_x = data[6] == 0xFF && data[7] == 0xFF ? NAN : acceleration_x;
+      result.acceleration_y = data[8] == 0xFF && data[9] == 0xFF ? NAN : acceleration_y;
+      result.acceleration_z = data[10] == 0xFF && data[11] == 0xFF ? NAN : acceleration_z;
+      result.acceleration = result.acceleration_x == NAN || result.acceleration_y == NAN || result.acceleration_z == NAN
+                                ? NAN
+                                : sqrt(acceleration_x * acceleration_x + acceleration_y * acceleration_y +
+                                       acceleration_z * acceleration_z);
+      result.battery_voltage = (power_info >> 5) == 0x7FF ? NAN : battery_voltage;
+      result.tx_power = (power_info & 0x1F) == 0x1F ? NAN : tx_power;
+      result.movement_counter = movement_counter;
+      result.measurement_sequence_number = measurement_sequence_number;
+
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+optional<RuuviParseResult> parse_ruuvi(const esp32_ble_tracker::ESPBTDevice &device) {
+  const auto *raw = reinterpret_cast<const uint8_t *>(device.get_manufacturer_data().data());
+
+  bool is_ruuvi = raw[0] == 0x99 && raw[1] == 0x04;
+
+  if (!is_ruuvi) {
+    return {};
+  }
+
+  const uint8_t data_length = device.get_manufacturer_data().size();
+  const uint8_t format = raw[2];
+  const uint8_t *data = &raw[3];
+
+  RuuviParseResult result;
+
+  bool success = parse_ruuvi_data_byte(format, data_length, data, result);
+  if (!success)
+    return {};
+  return result;
+}
+
+bool RuuviListener::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  auto res = parse_ruuvi(device);
+  if (!res.has_value())
+    return false;
+
+  ESP_LOGD(TAG, "Got RuuviTag (%s):", device.address_str().c_str());
+
+  if (res->humidity.has_value()) {
+    ESP_LOGD(TAG, "  Humidity: %.2f%%", *res->humidity);
+  }
+  if (res->temperature.has_value()) {
+    ESP_LOGD(TAG, "  Temperature: %.2f°C", *res->temperature);
+  }
+  if (res->pressure.has_value()) {
+    ESP_LOGD(TAG, "  Pressure: %.2fhPa", *res->pressure);
+  }
+  if (res->acceleration.has_value()) {
+    ESP_LOGD(TAG, "  Acceleration: %.3fG", *res->acceleration);
+  }
+  if (res->acceleration_x.has_value()) {
+    ESP_LOGD(TAG, "  Acceleration X: %.3fG", *res->acceleration_x);
+  }
+  if (res->acceleration_y.has_value()) {
+    ESP_LOGD(TAG, "  Acceleration Y: %.3fG", *res->acceleration_y);
+  }
+  if (res->acceleration_z.has_value()) {
+    ESP_LOGD(TAG, "  Acceleration Z: %.3fG", *res->acceleration_z);
+  }
+  if (res->battery_voltage.has_value()) {
+    ESP_LOGD(TAG, "  Battery Voltage: %.3fV", *res->battery_voltage);
+  }
+  if (res->tx_power.has_value()) {
+    ESP_LOGD(TAG, "  TX Power: %.0fdBm", *res->tx_power);
+  }
+  if (res->movement_counter.has_value()) {
+    ESP_LOGD(TAG, "  Movement Counter: %.0f", *res->movement_counter);
+  }
+  if (res->measurement_sequence_number.has_value()) {
+    ESP_LOGD(TAG, "  Measurement Sequence Number: %.0f", *res->measurement_sequence_number);
+  }
+
+  return true;
+}
+
+}  // namespace ruuvi_ble
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/ruuvi_ble/ruuvi_ble.h b/esphome/components/ruuvi_ble/ruuvi_ble.h
new file mode 100644
index 0000000000..848004f3d7
--- /dev/null
+++ b/esphome/components/ruuvi_ble/ruuvi_ble.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace ruuvi_ble {
+
+struct RuuviParseResult {
+  optional<float> humidity;
+  optional<float> temperature;
+  optional<float> pressure;
+  optional<float> acceleration;
+  optional<float> acceleration_x;
+  optional<float> acceleration_y;
+  optional<float> acceleration_z;
+  optional<float> battery_voltage;
+  optional<float> tx_power;
+  optional<float> movement_counter;
+  optional<float> measurement_sequence_number;
+};
+
+bool parse_ruuvi_data_byte(uint8_t data_type, const uint8_t *data, uint8_t data_length, RuuviParseResult &result);
+
+optional<RuuviParseResult> parse_ruuvi(const esp32_ble_tracker::ESPBTDevice &device);
+
+class RuuviListener : public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+};
+
+}  // namespace ruuvi_ble
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/ruuvitag/__init__.py b/esphome/components/ruuvitag/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/ruuvitag/ruuvitag.cpp b/esphome/components/ruuvitag/ruuvitag.cpp
new file mode 100644
index 0000000000..2963b777d1
--- /dev/null
+++ b/esphome/components/ruuvitag/ruuvitag.cpp
@@ -0,0 +1,29 @@
+#include "ruuvitag.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace ruuvitag {
+
+static const char *TAG = "ruuvitag";
+
+void RuuviTag::dump_config() {
+  ESP_LOGCONFIG(TAG, "RuuviTag");
+  LOG_SENSOR("  ", "Humidity", this->humidity_);
+  LOG_SENSOR("  ", "Temperature", this->temperature_);
+  LOG_SENSOR("  ", "Pressure", this->pressure_);
+  LOG_SENSOR("  ", "Acceleration", this->acceleration_);
+  LOG_SENSOR("  ", "Acceleration X", this->acceleration_x_);
+  LOG_SENSOR("  ", "Acceleration Y", this->acceleration_y_);
+  LOG_SENSOR("  ", "Acceleration Z", this->acceleration_z_);
+  LOG_SENSOR("  ", "Battery Voltage", this->battery_voltage_);
+  LOG_SENSOR("  ", "TX Power", this->tx_power_);
+  LOG_SENSOR("  ", "Movement Counter", this->movement_counter_);
+  LOG_SENSOR("  ", "Measurement Sequence Number", this->measurement_sequence_number_);
+}
+
+}  // namespace ruuvitag
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/ruuvitag/ruuvitag.h b/esphome/components/ruuvitag/ruuvitag.h
new file mode 100644
index 0000000000..863c5775c2
--- /dev/null
+++ b/esphome/components/ruuvitag/ruuvitag.h
@@ -0,0 +1,84 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/ruuvi_ble/ruuvi_ble.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace ruuvitag {
+
+class RuuviTag : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; }
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
+    if (device.address_uint64() != this->address_)
+      return false;
+
+    auto res = ruuvi_ble::parse_ruuvi(device);
+    if (!res.has_value())
+      return false;
+
+    if (res->humidity.has_value() && this->humidity_ != nullptr)
+      this->humidity_->publish_state(*res->humidity);
+    if (res->temperature.has_value() && this->temperature_ != nullptr)
+      this->temperature_->publish_state(*res->temperature);
+    if (res->pressure.has_value() && this->pressure_ != nullptr)
+      this->pressure_->publish_state(*res->pressure);
+    if (res->acceleration.has_value() && this->acceleration_ != nullptr)
+      this->acceleration_->publish_state(*res->acceleration);
+    if (res->acceleration_x.has_value() && this->acceleration_x_ != nullptr)
+      this->acceleration_x_->publish_state(*res->acceleration_x);
+    if (res->acceleration_y.has_value() && this->acceleration_y_ != nullptr)
+      this->acceleration_y_->publish_state(*res->acceleration_y);
+    if (res->acceleration_z.has_value() && this->acceleration_z_ != nullptr)
+      this->acceleration_z_->publish_state(*res->acceleration_z);
+    if (res->battery_voltage.has_value() && this->battery_voltage_ != nullptr)
+      this->battery_voltage_->publish_state(*res->battery_voltage);
+    if (res->tx_power.has_value() && this->tx_power_ != nullptr)
+      this->tx_power_->publish_state(*res->tx_power);
+    if (res->movement_counter.has_value() && this->movement_counter_ != nullptr)
+      this->movement_counter_->publish_state(*res->movement_counter);
+    if (res->measurement_sequence_number.has_value() && this->measurement_sequence_number_ != nullptr)
+      this->measurement_sequence_number_->publish_state(*res->measurement_sequence_number);
+    return true;
+  }
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; }
+  void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }
+  void set_pressure(sensor::Sensor *pressure) { pressure_ = pressure; }
+  void set_acceleration(sensor::Sensor *acceleration) { acceleration_ = acceleration; }
+  void set_acceleration_x(sensor::Sensor *acceleration_x) { acceleration_x_ = acceleration_x; }
+  void set_acceleration_y(sensor::Sensor *acceleration_y) { acceleration_y_ = acceleration_y; }
+  void set_acceleration_z(sensor::Sensor *acceleration_z) { acceleration_z_ = acceleration_z; }
+  void set_battery_voltage(sensor::Sensor *battery_voltage) { battery_voltage_ = battery_voltage; }
+  void set_tx_power(sensor::Sensor *tx_power) { tx_power_ = tx_power; }
+  void set_movement_counter(sensor::Sensor *movement_counter) { movement_counter_ = movement_counter; }
+  void set_measurement_sequence_number(sensor::Sensor *measurement_sequence_number) {
+    measurement_sequence_number_ = measurement_sequence_number;
+  }
+
+ protected:
+  uint64_t address_;
+  sensor::Sensor *temperature_{nullptr};
+  sensor::Sensor *humidity_{nullptr};
+  sensor::Sensor *pressure_{nullptr};
+  sensor::Sensor *acceleration_{nullptr};
+  sensor::Sensor *acceleration_x_{nullptr};
+  sensor::Sensor *acceleration_y_{nullptr};
+  sensor::Sensor *acceleration_z_{nullptr};
+  sensor::Sensor *battery_voltage_{nullptr};
+  sensor::Sensor *tx_power_{nullptr};
+  sensor::Sensor *movement_counter_{nullptr};
+  sensor::Sensor *measurement_sequence_number_{nullptr};
+};
+
+}  // namespace ruuvitag
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/ruuvitag/sensor.py b/esphome/components/ruuvitag/sensor.py
new file mode 100644
index 0000000000..3d9c724e7b
--- /dev/null
+++ b/esphome/components/ruuvitag/sensor.py
@@ -0,0 +1,76 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
+from esphome.const import CONF_HUMIDITY, CONF_MAC_ADDRESS, CONF_TEMPERATURE, \
+    CONF_PRESSURE, CONF_ACCELERATION, CONF_ACCELERATION_X, CONF_ACCELERATION_Y, \
+    CONF_ACCELERATION_Z, CONF_BATTERY_VOLTAGE, CONF_TX_POWER, \
+    CONF_MEASUREMENT_SEQUENCE_NUMBER, CONF_MOVEMENT_COUNTER, UNIT_CELSIUS, \
+    ICON_THERMOMETER, UNIT_PERCENT, UNIT_VOLT, UNIT_HECTOPASCAL, UNIT_G, \
+    UNIT_DECIBEL_MILLIWATT, UNIT_EMPTY, ICON_WATER_PERCENT, ICON_BATTERY, \
+    ICON_GAUGE, ICON_ACCELERATION, ICON_ACCELERATION_X, ICON_ACCELERATION_Y, \
+    ICON_ACCELERATION_Z, ICON_SIGNAL, CONF_ID
+
+DEPENDENCIES = ['esp32_ble_tracker']
+AUTO_LOAD = ['ruuvi_ble']
+
+ruuvitag_ns = cg.esphome_ns.namespace('ruuvitag')
+RuuviTag = ruuvitag_ns.class_(
+    'RuuviTag', esp32_ble_tracker.ESPBTDeviceListener, cg.Component)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(RuuviTag),
+    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 2),
+    cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 2),
+    cv.Optional(CONF_PRESSURE): sensor.sensor_schema(UNIT_HECTOPASCAL, ICON_GAUGE, 2),
+    cv.Optional(CONF_ACCELERATION): sensor.sensor_schema(UNIT_G, ICON_ACCELERATION, 3),
+    cv.Optional(CONF_ACCELERATION_X): sensor.sensor_schema(UNIT_G, ICON_ACCELERATION_X, 3),
+    cv.Optional(CONF_ACCELERATION_Y): sensor.sensor_schema(UNIT_G, ICON_ACCELERATION_Y, 3),
+    cv.Optional(CONF_ACCELERATION_Z): sensor.sensor_schema(UNIT_G, ICON_ACCELERATION_Z, 3),
+    cv.Optional(CONF_BATTERY_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_BATTERY, 3),
+    cv.Optional(CONF_TX_POWER): sensor.sensor_schema(UNIT_DECIBEL_MILLIWATT, ICON_SIGNAL, 0),
+    cv.Optional(CONF_MOVEMENT_COUNTER): sensor.sensor_schema(UNIT_EMPTY, ICON_GAUGE, 0),
+    cv.Optional(CONF_MEASUREMENT_SEQUENCE_NUMBER): sensor.sensor_schema(UNIT_EMPTY, ICON_GAUGE, 0),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+
+    if CONF_TEMPERATURE in config:
+        sens = yield sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature(sens))
+    if CONF_HUMIDITY in config:
+        sens = yield sensor.new_sensor(config[CONF_HUMIDITY])
+        cg.add(var.set_humidity(sens))
+    if CONF_PRESSURE in config:
+        sens = yield sensor.new_sensor(config[CONF_PRESSURE])
+        cg.add(var.set_pressure(sens))
+    if CONF_ACCELERATION in config:
+        sens = yield sensor.new_sensor(config[CONF_ACCELERATION])
+        cg.add(var.set_acceleration(sens))
+    if CONF_ACCELERATION_X in config:
+        sens = yield sensor.new_sensor(config[CONF_ACCELERATION_X])
+        cg.add(var.set_acceleration_x(sens))
+    if CONF_ACCELERATION_Y in config:
+        sens = yield sensor.new_sensor(config[CONF_ACCELERATION_Y])
+        cg.add(var.set_acceleration_y(sens))
+    if CONF_ACCELERATION_Z in config:
+        sens = yield sensor.new_sensor(config[CONF_ACCELERATION_Z])
+        cg.add(var.set_acceleration_z(sens))
+    if CONF_BATTERY_VOLTAGE in config:
+        sens = yield sensor.new_sensor(config[CONF_BATTERY_VOLTAGE])
+        cg.add(var.set_battery_voltage(sens))
+    if CONF_TX_POWER in config:
+        sens = yield sensor.new_sensor(config[CONF_TX_POWER])
+        cg.add(var.set_tx_power(sens))
+    if CONF_MOVEMENT_COUNTER in config:
+        sens = yield sensor.new_sensor(config[CONF_MOVEMENT_COUNTER])
+        cg.add(var.set_movement_counter(sens))
+    if CONF_MEASUREMENT_SEQUENCE_NUMBER in config:
+        sens = yield sensor.new_sensor(config[CONF_MEASUREMENT_SEQUENCE_NUMBER])
+        cg.add(var.set_measurement_sequence_number(sens))
diff --git a/esphome/const.py b/esphome/const.py
index cde9134eae..2af143984c 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -29,6 +29,9 @@ HEADER_FILE_EXTENSIONS = {'.h', '.hpp', '.tcc'}
 
 CONF_ABOVE = 'above'
 CONF_ACCELERATION = 'acceleration'
+CONF_ACCELERATION_X = 'acceleration_x'
+CONF_ACCELERATION_Y = 'acceleration_y'
+CONF_ACCELERATION_Z = 'acceleration_z'
 CONF_ACCURACY = 'accuracy'
 CONF_ACCURACY_DECIMALS = 'accuracy_decimals'
 CONF_ACTION_ID = 'action_id'
@@ -47,6 +50,7 @@ CONF_AVAILABILITY = 'availability'
 CONF_AWAY = 'away'
 CONF_AWAY_CONFIG = 'away_config'
 CONF_BATTERY_LEVEL = 'battery_level'
+CONF_BATTERY_VOLTAGE = 'battery_voltage'
 CONF_BAUD_RATE = 'baud_rate'
 CONF_BELOW = 'below'
 CONF_BINARY = 'binary'
@@ -239,6 +243,7 @@ CONF_MAX_TEMPERATURE = 'max_temperature'
 CONF_MAX_VALUE = 'max_value'
 CONF_MAX_VOLTAGE = 'max_voltage'
 CONF_MEASUREMENT_DURATION = 'measurement_duration'
+CONF_MEASUREMENT_SEQUENCE_NUMBER = 'measurement_sequence_number'
 CONF_MEDIUM = 'medium'
 CONF_METHOD = 'method'
 CONF_MIN_LENGTH = 'min_length'
@@ -254,6 +259,7 @@ CONF_MODEL = 'model'
 CONF_MOISTURE = 'moisture'
 CONF_MONTHS = 'months'
 CONF_MOSI_PIN = 'mosi_pin'
+CONF_MOVEMENT_COUNTER = 'movement_counter'
 CONF_MQTT = 'mqtt'
 CONF_MQTT_ID = 'mqtt_id'
 CONF_MULTIPLEXER = 'multiplexer'
@@ -449,6 +455,7 @@ CONF_TURN_OFF_ACTION = 'turn_off_action'
 CONF_TURN_ON_ACTION = 'turn_on_action'
 CONF_TX_BUFFER_SIZE = 'tx_buffer_size'
 CONF_TX_PIN = 'tx_pin'
+CONF_TX_POWER = 'tx_power'
 CONF_TYPE = 'type'
 CONF_TYPE_ID = 'type_id'
 CONF_UART_ID = 'uart_id'
@@ -483,6 +490,10 @@ CONF_WIND_SPEED = 'wind_speed'
 CONF_WINDOW_SIZE = 'window_size'
 CONF_ZERO = 'zero'
 
+ICON_ACCELERATION = 'mdi:axis-arrow'
+ICON_ACCELERATION_X = 'mdi:axis-x-arrow'
+ICON_ACCELERATION_Y = 'mdi:axis-y-arrow'
+ICON_ACCELERATION_Z = 'mdi:axis-z-arrow'
 ICON_ARROW_EXPAND_VERTICAL = 'mdi:arrow-expand-vertical'
 ICON_BATTERY = 'mdi:battery'
 ICON_BRIEFCASE_DOWNLOAD = 'mdi:briefcase-download'
@@ -508,7 +519,7 @@ ICON_ROTATE_RIGHT = 'mdi:rotate-right'
 ICON_SCALE = 'mdi:scale'
 ICON_SCREEN_ROTATION = 'mdi:screen-rotation'
 ICON_SIGN_DIRECTION = 'mdi:sign-direction'
-ICON_SIGNAL = 'mdi: signal-distance-variant'
+ICON_SIGNAL = 'mdi:signal-distance-variant'
 ICON_SIGNAL_DISTANCE_VARIANT = 'mdi:signal'
 ICON_THERMOMETER = 'mdi:thermometer'
 ICON_TIMER = 'mdi:timer'
@@ -522,9 +533,11 @@ ICON_WIFI = 'mdi:wifi'
 UNIT_AMPERE = 'A'
 UNIT_CELSIUS = u'°C'
 UNIT_DECIBEL = 'dB'
+UNIT_DECIBEL_MILLIWATT = 'dBm'
 UNIT_DEGREE_PER_SECOND = u'°/s'
 UNIT_DEGREES = u'°'
 UNIT_EMPTY = ''
+UNIT_G = 'G'
 UNIT_HECTOPASCAL = 'hPa'
 UNIT_HZ = 'hz'
 UNIT_KELVIN = 'K'
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 78e1ab149a..935f9edb84 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -95,7 +95,7 @@ sensor:
     temperature:
       name: "Xiaomi LYWSD02 Temperature"
     humidity:
-      name: "Xiaomi LYWSD02 Humidity"    
+      name: "Xiaomi LYWSD02 Humidity"
   - platform: xiaomi_cgg1
     mac_address: 7A:80:8E:19:36:BA
     temperature:
@@ -160,6 +160,28 @@ sensor:
       name: "Lightning Energy"
     distance:
       name: "Distance Storm"
+  - platform: ruuvitag
+    mac_address: FF:56:D3:2F:7D:E8
+    humidity:
+      name: "RuuviTag Humidity"
+    temperature:
+      name: "RuuviTag Temperature"
+    pressure:
+      name: "RuuviTag Pressure"
+    acceleration_x:
+      name: "RuuviTag Acceleration X"
+    acceleration_y:
+      name: "RuuviTag Acceleration Y"
+    acceleration_z:
+      name: "RuuviTag Acceleration Z"
+    battery_voltage:
+      name: "RuuviTag Battery Voltage"
+    tx_power:
+      name: "RuuviTag TX Power"
+    movement_counter:
+      name: "RuuviTag Movement Counter"
+    measurement_sequence_number:
+      name: "RuuviTag Measurement Sequence Number"
 
 time:
 - platform: homeassistant
@@ -210,10 +232,6 @@ binary_sensor:
   - platform: as3935
     name: "Storm Alert"
 
-remote_receiver:
-  pin: GPIO32
-  dump: []
-
 esp32_ble_tracker:
 
 #esp32_ble_beacon:

From f8d98ac4948b0b14702cd5a79fe2967dce452e6e Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Sat, 9 Nov 2019 20:37:52 +0300
Subject: [PATCH 073/412] http_request component (#719)

* It works

* Template doesn't work

* Template fix

* CA Certificate untested

* ESP32 done

* URL validation

* Lint fix

* Lint fix (2)

* Lint fix (<3)

* Support unsecure requests with framework >=2.5.0

* Removed fingerprint, payload renamed to body

* Removed add_extra

* Review

* Review

* New HTTP methods

* Check recommended version

* Removed dead code

* Small improvement

* Small improvement

* CONF_METHOD from const

* JSON support

* New JSON syntax

* Templatable headers

* verify_ssl param

* verify_ssl param (fix)

* Lint

* nolint

* JSON string_strict

* Two json syntax

* Lambda url fix validation

* CI fix

* CI fix
---
 esphome/automation.py                         |   8 +-
 esphome/components/http_request/__init__.py   | 148 ++++++++++++++++++
 .../components/http_request/http_request.cpp  |  63 ++++++++
 .../components/http_request/http_request.h    | 121 ++++++++++++++
 esphome/const.py                              |   2 +-
 esphome/core_config.py                        |   4 +-
 6 files changed, 341 insertions(+), 5 deletions(-)
 create mode 100644 esphome/components/http_request/__init__.py
 create mode 100644 esphome/components/http_request/http_request.cpp
 create mode 100644 esphome/components/http_request/http_request.h

diff --git a/esphome/automation.py b/esphome/automation.py
index 9f9ad35520..f758191268 100644
--- a/esphome/automation.py
+++ b/esphome/automation.py
@@ -7,13 +7,17 @@ from esphome.util import Registry
 
 
 def maybe_simple_id(*validators):
+    return maybe_conf(CONF_ID, *validators)
+
+
+def maybe_conf(conf, *validators):
     validator = cv.All(*validators)
 
     def validate(value):
         if isinstance(value, dict):
             return validator(value)
-        with cv.remove_prepend_path([CONF_ID]):
-            return validator({CONF_ID: value})
+        with cv.remove_prepend_path([conf]):
+            return validator({conf: value})
 
     return validate
 
diff --git a/esphome/components/http_request/__init__.py b/esphome/components/http_request/__init__.py
new file mode 100644
index 0000000000..23fc38ba40
--- /dev/null
+++ b/esphome/components/http_request/__init__.py
@@ -0,0 +1,148 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.const import CONF_ID, CONF_TIMEOUT, CONF_ESPHOME, CONF_METHOD, \
+    CONF_ARDUINO_VERSION, ARDUINO_VERSION_ESP8266_2_5_0
+from esphome.core import CORE, Lambda
+from esphome.core_config import PLATFORMIO_ESP8266_LUT
+from esphome.py_compat import IS_PY3
+
+if IS_PY3:
+    import urllib.parse as urlparse  # pylint: disable=no-name-in-module,import-error
+else:
+    import urlparse  # pylint: disable=import-error
+
+DEPENDENCIES = ['network']
+AUTO_LOAD = ['json']
+
+http_request_ns = cg.esphome_ns.namespace('http_request')
+HttpRequestComponent = http_request_ns.class_('HttpRequestComponent', cg.Component)
+HttpRequestSendAction = http_request_ns.class_('HttpRequestSendAction', automation.Action)
+
+CONF_URL = 'url'
+CONF_HEADERS = 'headers'
+CONF_USERAGENT = 'useragent'
+CONF_BODY = 'body'
+CONF_JSON = 'json'
+CONF_VERIFY_SSL = 'verify_ssl'
+
+
+def validate_framework(config):
+    if CORE.is_esp32:
+        return config
+
+    version = 'RECOMMENDED'
+    if CONF_ARDUINO_VERSION in CORE.raw_config[CONF_ESPHOME]:
+        version = CORE.raw_config[CONF_ESPHOME][CONF_ARDUINO_VERSION]
+
+    if version in ['LATEST', 'DEV']:
+        return config
+
+    framework = PLATFORMIO_ESP8266_LUT[version] if version in PLATFORMIO_ESP8266_LUT else version
+    if framework < ARDUINO_VERSION_ESP8266_2_5_0:
+        raise cv.Invalid('This component is not supported on arduino framework version below 2.5.0')
+    return config
+
+
+def validate_url(value):
+    value = cv.string(value)
+    try:
+        parsed = list(urlparse.urlparse(value))
+    except Exception:
+        raise cv.Invalid('Invalid URL')
+
+    if not parsed[0] or not parsed[1]:
+        raise cv.Invalid('URL must have a URL scheme and host')
+
+    if parsed[0] not in ['http', 'https']:
+        raise cv.Invalid('Scheme must be http or https')
+
+    if not parsed[2]:
+        parsed[2] = '/'
+
+    return urlparse.urlunparse(parsed)
+
+
+def validate_secure_url(config):
+    url_ = config[CONF_URL]
+    if config.get(CONF_VERIFY_SSL) and not isinstance(url_, Lambda) \
+            and url_.lower().startswith('https:'):
+        raise cv.Invalid('Currently ESPHome doesn\'t support SSL verification. '
+                         'Set \'verify_ssl: false\' to make insecure HTTPS requests.')
+    return config
+
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(HttpRequestComponent),
+    cv.Optional(CONF_USERAGENT, 'ESPHome'): cv.string,
+    cv.Optional(CONF_TIMEOUT, default='5s'): cv.positive_time_period_milliseconds,
+}).add_extra(validate_framework).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    cg.add(var.set_timeout(config[CONF_TIMEOUT]))
+    cg.add(var.set_useragent(config[CONF_USERAGENT]))
+    yield cg.register_component(var, config)
+
+
+HTTP_REQUEST_ACTION_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.use_id(HttpRequestComponent),
+    cv.Required(CONF_URL): cv.templatable(validate_url),
+    cv.Optional(CONF_HEADERS): cv.All(cv.Schema({cv.string: cv.templatable(cv.string)})),
+    cv.Optional(CONF_VERIFY_SSL, default=True): cv.boolean,
+}).add_extra(validate_secure_url)
+HTTP_REQUEST_GET_ACTION_SCHEMA = automation.maybe_conf(
+    CONF_URL, HTTP_REQUEST_ACTION_SCHEMA.extend({
+        cv.Optional(CONF_METHOD, default='GET'): cv.one_of('GET', upper=True),
+    })
+)
+HTTP_REQUEST_POST_ACTION_SCHEMA = automation.maybe_conf(
+    CONF_URL, HTTP_REQUEST_ACTION_SCHEMA.extend({
+        cv.Optional(CONF_METHOD, default='POST'): cv.one_of('POST', upper=True),
+        cv.Exclusive(CONF_BODY, 'body'): cv.templatable(cv.string),
+        cv.Exclusive(CONF_JSON, 'body'): cv.Any(
+            cv.lambda_, cv.All(cv.Schema({cv.string: cv.templatable(cv.string_strict)})),
+        ),
+    })
+)
+HTTP_REQUEST_SEND_ACTION_SCHEMA = HTTP_REQUEST_ACTION_SCHEMA.extend({
+    cv.Required(CONF_METHOD): cv.one_of('GET', 'POST', 'PUT', 'DELETE', 'PATCH', upper=True),
+    cv.Exclusive(CONF_BODY, 'body'): cv.templatable(cv.string),
+    cv.Exclusive(CONF_JSON, 'body'): cv.Any(
+        cv.lambda_, cv.All(cv.Schema({cv.string: cv.templatable(cv.string_strict)})),
+    ),
+})
+
+
+@automation.register_action('http_request.get', HttpRequestSendAction,
+                            HTTP_REQUEST_GET_ACTION_SCHEMA)
+@automation.register_action('http_request.post', HttpRequestSendAction,
+                            HTTP_REQUEST_POST_ACTION_SCHEMA)
+@automation.register_action('http_request.send', HttpRequestSendAction,
+                            HTTP_REQUEST_SEND_ACTION_SCHEMA)
+def http_request_action_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)
+
+    template_ = yield cg.templatable(config[CONF_URL], args, cg.const_char_ptr)
+    cg.add(var.set_url(template_))
+    cg.add(var.set_method(config[CONF_METHOD]))
+    if CONF_BODY in config:
+        template_ = yield cg.templatable(config[CONF_BODY], args, cg.std_string)
+        cg.add(var.set_body(template_))
+    if CONF_JSON in config:
+        json_ = config[CONF_JSON]
+        if isinstance(json_, Lambda):
+            args_ = args + [(cg.JsonObjectRef, 'root')]
+            lambda_ = yield cg.process_lambda(json_, args_, return_type=cg.void)
+            cg.add(var.set_json(lambda_))
+        else:
+            for key in json_:
+                template_ = yield cg.templatable(json_[key], args, cg.std_string)
+                cg.add(var.add_json(key, template_))
+    for key in config.get(CONF_HEADERS, []):
+        template_ = yield cg.templatable(config[CONF_HEADERS][key], args, cg.const_char_ptr)
+        cg.add(var.add_header(key, template_))
+
+    yield var
diff --git a/esphome/components/http_request/http_request.cpp b/esphome/components/http_request/http_request.cpp
new file mode 100644
index 0000000000..9df7cf7913
--- /dev/null
+++ b/esphome/components/http_request/http_request.cpp
@@ -0,0 +1,63 @@
+#include "http_request.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace http_request {
+
+static const char *TAG = "http_request";
+
+void HttpRequestComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "HTTP Request:");
+  ESP_LOGCONFIG(TAG, "  Timeout: %ums", this->timeout_);
+  ESP_LOGCONFIG(TAG, "  User-Agent: %s", this->useragent_);
+}
+
+void HttpRequestComponent::send() {
+  bool begin_status = false;
+#ifdef ARDUINO_ARCH_ESP32
+  begin_status = this->client_.begin(this->url_);
+#endif
+#ifdef ARDUINO_ARCH_ESP8266
+#ifndef CLANG_TIDY
+  begin_status = this->client_.begin(*this->wifi_client_, this->url_);
+  this->client_.setFollowRedirects(true);
+  this->client_.setRedirectLimit(3);
+#endif
+#endif
+
+  if (!begin_status) {
+    this->client_.end();
+    this->status_set_warning();
+    ESP_LOGW(TAG, "HTTP Request failed at the begin phase. Please check the configuration");
+    return;
+  }
+
+  this->client_.setTimeout(this->timeout_);
+  if (this->useragent_ != nullptr) {
+    this->client_.setUserAgent(this->useragent_);
+  }
+  for (const auto &header : this->headers_) {
+    this->client_.addHeader(header.name, header.value, false, true);
+  }
+
+  int http_code = this->client_.sendRequest(this->method_, this->body_.c_str());
+  this->client_.end();
+
+  if (http_code < 0) {
+    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s", this->url_, HTTPClient::errorToString(http_code).c_str());
+    this->status_set_warning();
+    return;
+  }
+
+  if (http_code < 200 || http_code >= 300) {
+    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Code: %d", this->url_, http_code);
+    this->status_set_warning();
+    return;
+  }
+
+  this->status_clear_warning();
+  ESP_LOGD(TAG, "HTTP Request completed; URL: %s; Code: %d", this->url_, http_code);
+}
+
+}  // namespace http_request
+}  // namespace esphome
diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
new file mode 100644
index 0000000000..4f772d6826
--- /dev/null
+++ b/esphome/components/http_request/http_request.h
@@ -0,0 +1,121 @@
+#pragma once
+
+#include <list>
+#include <map>
+#include "esphome/core/component.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/json/json_util.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+#include <HTTPClient.h>
+#endif
+#ifdef ARDUINO_ARCH_ESP8266
+#include <ESP8266HTTPClient.h>
+#include <WiFiClientSecure.h>
+#endif
+
+namespace esphome {
+namespace http_request {
+
+struct Header {
+  const char *name;
+  const char *value;
+};
+
+class HttpRequestComponent : public Component {
+ public:
+  void setup() override {
+#ifdef ARDUINO_ARCH_ESP8266
+    this->wifi_client_ = new BearSSL::WiFiClientSecure();
+    this->wifi_client_->setInsecure();
+#endif
+  }
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
+
+  void set_url(const char *url) { this->url_ = url; }
+  void set_method(const char *method) { this->method_ = method; }
+  void set_useragent(const char *useragent) { this->useragent_ = useragent; }
+  void set_timeout(uint16_t timeout) { this->timeout_ = timeout; }
+  void set_body(std::string body) { this->body_ = body; }
+  void set_headers(std::list<Header> headers) { this->headers_ = headers; }
+  void send();
+
+ protected:
+  HTTPClient client_{};
+  const char *url_;
+  const char *method_;
+  const char *useragent_{nullptr};
+  uint16_t timeout_{5000};
+  std::string body_;
+  std::list<Header> headers_;
+#ifdef ARDUINO_ARCH_ESP8266
+  BearSSL::WiFiClientSecure *wifi_client_;
+#endif
+};
+
+template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
+ public:
+  HttpRequestSendAction(HttpRequestComponent *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(const char *, url)
+  TEMPLATABLE_VALUE(const char *, method)
+  TEMPLATABLE_VALUE(std::string, body)
+  TEMPLATABLE_VALUE(const char *, useragent)
+  TEMPLATABLE_VALUE(uint16_t, timeout)
+
+  void add_header(const char *key, TemplatableValue<const char *, Ts...> value) { this->headers_.insert({key, value}); }
+
+  void add_json(const char *key, TemplatableValue<std::string, Ts...> value) { this->json_.insert({key, value}); }
+
+  void set_json(std::function<void(Ts..., JsonObject &)> json_func) { this->json_func_ = json_func; }
+
+  void play(Ts... x) override {
+    this->parent_->set_url(this->url_.value(x...));
+    this->parent_->set_method(this->method_.value(x...));
+    if (this->body_.has_value()) {
+      this->parent_->set_body(this->body_.value(x...));
+    }
+    if (!this->json_.empty()) {
+      auto f = std::bind(&HttpRequestSendAction<Ts...>::encode_json_, this, x..., std::placeholders::_1);
+      this->parent_->set_body(json::build_json(f));
+    }
+    if (this->json_func_ != nullptr) {
+      auto f = std::bind(&HttpRequestSendAction<Ts...>::encode_json_func_, this, x..., std::placeholders::_1);
+      this->parent_->set_body(json::build_json(f));
+    }
+    if (this->useragent_.has_value()) {
+      this->parent_->set_useragent(this->useragent_.value(x...));
+    }
+    if (this->timeout_.has_value()) {
+      this->parent_->set_timeout(this->timeout_.value(x...));
+    }
+    if (!this->headers_.empty()) {
+      std::list<Header> headers;
+      for (const auto &item : this->headers_) {
+        auto val = item.second;
+        Header header;
+        header.name = item.first;
+        header.value = val.value(x...);
+        headers.push_back(header);
+      }
+      this->parent_->set_headers(headers);
+    }
+    this->parent_->send();
+  }
+
+ protected:
+  void encode_json_(Ts... x, JsonObject &root) {
+    for (const auto &item : this->json_) {
+      auto val = item.second;
+      root[item.first] = val.value(x...);
+    }
+  }
+  void encode_json_func_(Ts... x, JsonObject &root) { this->json_func_(x..., root); }
+  HttpRequestComponent *parent_;
+  std::map<const char *, TemplatableValue<const char *, Ts...>> headers_{};
+  std::map<const char *, TemplatableValue<std::string, Ts...>> json_{};
+  std::function<void(Ts..., JsonObject &)> json_func_{nullptr};
+};
+
+}  // namespace http_request
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index 2af143984c..5867666576 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -20,7 +20,7 @@ ARDUINO_VERSION_ESP32_1_0_3 = 'espressif32@1.10.0'
 ARDUINO_VERSION_ESP32_1_0_4 = 'espressif32@1.11.0'
 ARDUINO_VERSION_ESP8266_DEV = 'https://github.com/platformio/platform-espressif8266.git#feature' \
                               '/stage'
-ARDUINO_VERSION_ESP8266_2_5_0 = 'espressif8266@2.0.0'
+ARDUINO_VERSION_ESP8266_2_5_0 = 'espressif8266@2.0.1'
 ARDUINO_VERSION_ESP8266_2_5_1 = 'espressif8266@2.1.0'
 ARDUINO_VERSION_ESP8266_2_5_2 = 'espressif8266@2.2.3'
 ARDUINO_VERSION_ESP8266_2_3_0 = 'espressif8266@1.5.0'
diff --git a/esphome/core_config.py b/esphome/core_config.py
index f63d2e17e3..f7149db797 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -76,7 +76,7 @@ def validate_arduino_version(value):
         if VERSION_REGEX.match(value) is not None and value_ not in PLATFORMIO_ESP8266_LUT:
             raise cv.Invalid("Unfortunately the arduino framework version '{}' is unsupported "
                              "at this time. You can override this by manually using "
-                             "espressif8266@<platformio version>")
+                             "espressif8266@<platformio version>".format(value))
         if value_ in PLATFORMIO_ESP8266_LUT:
             return PLATFORMIO_ESP8266_LUT[value_]
         return value
@@ -84,7 +84,7 @@ def validate_arduino_version(value):
         if VERSION_REGEX.match(value) is not None and value_ not in PLATFORMIO_ESP32_LUT:
             raise cv.Invalid("Unfortunately the arduino framework version '{}' is unsupported "
                              "at this time. You can override this by manually using "
-                             "espressif32@<platformio version>")
+                             "espressif32@<platformio version>".format(value))
         if value_ in PLATFORMIO_ESP32_LUT:
             return PLATFORMIO_ESP32_LUT[value_]
         return value

From 367ae906c3537065ca9aa5d5293e62a130db3f1f Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Mon, 11 Nov 2019 23:50:06 -0300
Subject: [PATCH 074/412] fix missing checks of is_playing condition (#844)

---
 esphome/components/dfplayer/dfplayer.cpp |  6 ++++
 esphome/components/dfplayer/dfplayer.h   | 45 +++++++++++++++++++-----
 2 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/esphome/components/dfplayer/dfplayer.cpp b/esphome/components/dfplayer/dfplayer.cpp
index 5ce4998796..6fed433dac 100644
--- a/esphome/components/dfplayer/dfplayer.cpp
+++ b/esphome/components/dfplayer/dfplayer.cpp
@@ -8,8 +8,10 @@ static const char* TAG = "dfplayer";
 
 void DFPlayer::play_folder(uint16_t folder, uint16_t file) {
   if (folder < 100 && file < 256) {
+    this->ack_set_is_playing_ = true;
     this->send_cmd_(0x0F, (uint8_t) folder, (uint8_t) file);
   } else if (folder <= 10 && file <= 1000) {
+    this->ack_set_is_playing_ = true;
     this->send_cmd_(0x14, (((uint16_t) folder) << 12) | file);
   } else {
     ESP_LOGE(TAG, "Cannot play folder %d file %d.", folder, file);
@@ -93,6 +95,10 @@ void DFPlayer::loop() {
               ESP_LOGI(TAG, "USB, TF Card available");
             }
             break;
+          case 0x40:
+            ESP_LOGV(TAG, "Nack");
+            this->ack_set_is_playing_ = false;
+            this->ack_reset_is_playing_ = false;
           case 0x41:
             ESP_LOGV(TAG, "Ack ok");
             this->is_playing_ |= this->ack_set_is_playing_;
diff --git a/esphome/components/dfplayer/dfplayer.h b/esphome/components/dfplayer/dfplayer.h
index 86efd62138..22ca11c3be 100644
--- a/esphome/components/dfplayer/dfplayer.h
+++ b/esphome/components/dfplayer/dfplayer.h
@@ -27,29 +27,56 @@ class DFPlayer : public uart::UARTDevice, public Component {
  public:
   void loop() override;
 
-  void next() { this->send_cmd_(0x01); }
-  void previous() { this->send_cmd_(0x02); }
+  void next() {
+    this->ack_set_is_playing_ = true;
+    this->send_cmd_(0x01);
+  }
+  void previous() {
+    this->ack_set_is_playing_ = true;
+    this->send_cmd_(0x02);
+  }
   void play_file(uint16_t file) {
     this->ack_set_is_playing_ = true;
     this->send_cmd_(0x03, file);
   }
-  void play_file_loop(uint16_t file) { this->send_cmd_(0x08, file); }
+  void play_file_loop(uint16_t file) {
+    this->ack_set_is_playing_ = true;
+    this->send_cmd_(0x08, file);
+  }
   void play_folder(uint16_t folder, uint16_t file);
-  void play_folder_loop(uint16_t folder) { this->send_cmd_(0x17, folder); }
+  void play_folder_loop(uint16_t folder) {
+    this->ack_set_is_playing_ = true;
+    this->send_cmd_(0x17, folder);
+  }
   void volume_up() { this->send_cmd_(0x04); }
   void volume_down() { this->send_cmd_(0x05); }
   void set_device(Device device) { this->send_cmd_(0x09, device); }
   void set_volume(uint8_t volume) { this->send_cmd_(0x06, volume); }
   void set_eq(EqPreset preset) { this->send_cmd_(0x07, preset); }
-  void sleep() { this->send_cmd_(0x0A); }
-  void reset() { this->send_cmd_(0x0C); }
-  void start() { this->send_cmd_(0x0D); }
+  void sleep() {
+    this->ack_reset_is_playing_ = true;
+    this->send_cmd_(0x0A);
+  }
+  void reset() {
+    this->ack_reset_is_playing_ = true;
+    this->send_cmd_(0x0C);
+  }
+  void start() {
+    this->ack_set_is_playing_ = true;
+    this->send_cmd_(0x0D);
+  }
   void pause() {
     this->ack_reset_is_playing_ = true;
     this->send_cmd_(0x0E);
   }
-  void stop() { this->send_cmd_(0x16); }
-  void random() { this->send_cmd_(0x18); }
+  void stop() {
+    this->ack_reset_is_playing_ = true;
+    this->send_cmd_(0x16);
+  }
+  void random() {
+    this->ack_set_is_playing_ = true;
+    this->send_cmd_(0x18);
+  }
 
   bool is_playing() { return is_playing_; }
   void dump_config() override;

From 9580b13b9f7f62b505b19e4b7856d723bbdf3ac9 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 12 Nov 2019 11:28:23 -0300
Subject: [PATCH 075/412] fix esphome better error out (#843)

* fix esphome better error out

* lint

* not in then
---
 esphome/__main__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 6d3705c87e..3ce116739b 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -188,6 +188,10 @@ def upload_program(config, args, host):
 
     from esphome import espota2
 
+    if CONF_OTA not in config:
+        raise EsphomeError("Cannot upload Over the Air as the config does not include the ota: "
+                           "component")
+
     ota_conf = config[CONF_OTA]
     remote_port = ota_conf[CONF_PORT]
     password = ota_conf[CONF_PASSWORD]

From fad05d5a2e681bd6c2c51da827b9496e45c948ee Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 17:39:27 +0100
Subject: [PATCH 076/412] Add wifi output_power setting (#853)

* Add wifi output_power setting

See also:
 - https://github.com/esphome/feature-requests/issues/471#issuecomment-552350467
 - https://github.com/esp8266/Arduino/issues/6366
 - https://github.com/esp8266/Arduino/issues/6471
 - https://github.com/xoseperez/espurna/blob/849f8cf920096fa4b804e70913dab0917ee18ad9/code/espurna/config/general.h#L593-L599
 - https://docs.espressif.com/projects/esp-idf/en/latest/api-reference/network/esp_wifi.html#_CPPv425esp_wifi_set_max_tx_power6int8_t

* Lint
---
 esphome/components/wifi/__init__.py                | 4 ++++
 esphome/components/wifi/wifi_component.cpp         | 6 ++++++
 esphome/components/wifi/wifi_component.h           | 3 +++
 esphome/components/wifi/wifi_component_esp32.cpp   | 4 ++++
 esphome/components/wifi/wifi_component_esp8266.cpp | 5 +++++
 esphome/config_validation.py                       | 1 +
 6 files changed, 23 insertions(+)

diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index 818d3c84e0..818fb70105 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -110,6 +110,7 @@ def validate(config):
     return config
 
 
+CONF_OUTPUT_POWER = 'output_power'
 CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.GenerateID(): cv.declare_id(WiFiComponent),
     cv.Optional(CONF_NETWORKS): cv.ensure_list(WIFI_NETWORK_STA),
@@ -125,6 +126,7 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
         cv.enum(WIFI_POWER_SAVE_MODES, upper=True),
     cv.Optional(CONF_FAST_CONNECT, default=False): cv.boolean,
     cv.Optional(CONF_USE_ADDRESS): cv.string_strict,
+    cv.Optional(CONF_OUTPUT_POWER): cv.All(cv.decibel, cv.float_range(min=10.0, max=20.5)),
 
     cv.Optional('hostname'): cv.invalid("The hostname option has been removed in 1.11.0"),
 }), validate)
@@ -186,6 +188,8 @@ def to_code(config):
     cg.add(var.set_reboot_timeout(config[CONF_REBOOT_TIMEOUT]))
     cg.add(var.set_power_save_mode(config[CONF_POWER_SAVE_MODE]))
     cg.add(var.set_fast_connect(config[CONF_FAST_CONNECT]))
+    if CONF_OUTPUT_POWER in config:
+        cg.add(var.set_output_power(config[CONF_OUTPUT_POWER]))
 
     if CORE.is_esp8266:
         cg.add_library('ESP8266WiFi', None)
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index cb664d3cc3..60b7fb8945 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -36,6 +36,9 @@ void WiFiComponent::setup() {
 
   if (this->has_sta()) {
     this->wifi_sta_pre_setup_();
+    if (this->output_power_.has_value() && !this->wifi_apply_output_power_(*this->output_power_)) {
+      ESP_LOGV(TAG, "Setting Power Save Option failed!");
+    }
 
     if (!this->wifi_apply_power_save_()) {
       ESP_LOGV(TAG, "Setting Power Save Option failed!");
@@ -49,6 +52,9 @@ void WiFiComponent::setup() {
     }
   } else if (this->has_ap()) {
     this->setup_ap_config_();
+    if (this->output_power_.has_value() && !this->wifi_apply_output_power_(*this->output_power_)) {
+      ESP_LOGV(TAG, "Setting Power Save Option failed!");
+    }
 #ifdef USE_CAPTIVE_PORTAL
     if (captive_portal::global_captive_portal != nullptr)
       captive_portal::global_captive_portal->start();
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index 04866ef8e2..d04e1c2ce0 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -162,6 +162,7 @@ class WiFiComponent : public Component {
   bool is_connected();
 
   void set_power_save_mode(WiFiPowerSaveMode power_save);
+  void set_output_power(float output_power) { output_power_ = output_power; }
 
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
@@ -217,6 +218,7 @@ class WiFiComponent : public Component {
 
   bool wifi_mode_(optional<bool> sta, optional<bool> ap);
   bool wifi_sta_pre_setup_();
+  bool wifi_apply_output_power_(float output_power);
   bool wifi_apply_power_save_();
   bool wifi_sta_ip_config_(optional<ManualIP> manual_ip);
   IPAddress wifi_sta_ip_();
@@ -260,6 +262,7 @@ class WiFiComponent : public Component {
   std::vector<WiFiScanResult> scan_result_;
   bool scan_done_{false};
   bool ap_setup_{false};
+  optional<float> output_power_;
 };
 
 extern WiFiComponent *global_wifi_component;
diff --git a/esphome/components/wifi/wifi_component_esp32.cpp b/esphome/components/wifi/wifi_component_esp32.cpp
index 353a51040a..7fc459d858 100644
--- a/esphome/components/wifi/wifi_component_esp32.cpp
+++ b/esphome/components/wifi/wifi_component_esp32.cpp
@@ -53,6 +53,10 @@ bool WiFiComponent::wifi_mode_(optional<bool> sta, optional<bool> ap) {
 
   return ret;
 }
+bool WiFiComponent::wifi_apply_output_power_(float output_power) {
+  int8_t val = static_cast<uint8_t>(output_power * 4);
+  return esp_wifi_set_max_tx_power(val) == ESP_OK;
+}
 bool WiFiComponent::wifi_sta_pre_setup_() {
   if (!this->wifi_mode_(true, {}))
     return false;
diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index ff0dd57ed4..ee67fd36df 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -390,6 +390,11 @@ void WiFiComponent::wifi_event_callback(System_Event_t *event) {
   WiFiMockClass::_event_callback(event);
 }
 
+bool WiFiComponent::wifi_apply_output_power_(float output_power) {
+  uint8_t val = static_cast<uint8_t>(output_power * 4);
+  system_phy_set_max_tpw(val);
+  return true;
+}
 bool WiFiComponent::wifi_sta_pre_setup_() {
   if (!this->wifi_mode_(true, {}))
     return false;
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 956779f655..5c7255a874 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -616,6 +616,7 @@ angle = float_with_unit("angle", u"(°|deg)", optional_unit=True)
 _temperature_c = float_with_unit("temperature", u"(°C|° C|°|C)?")
 _temperature_k = float_with_unit("temperature", u"(° K|° K|K)?")
 _temperature_f = float_with_unit("temperature", u"(°F|° F|F)?")
+decibel = float_with_unit("decibel", u"(dB|dBm|db|dbm)", optional_unit=True)
 
 if IS_PY2:
     # Override voluptuous invalid to unicode for py2

From fb055750df912a56e406cf151c4513195867f792 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 18:58:26 +0100
Subject: [PATCH 077/412] Add missing state attribute (#851)

* Add api missing_state attribute

Fixes https://github.com/esphome/issues/issues/828

Adds a new property for missing state, so that HA can now when a sensor does not have a state yet.

* Update api.proto
---
 esphome/components/api/api.proto           |  9 +++++
 esphome/components/api/api_connection.cpp  |  3 ++
 esphome/components/api/api_pb2.cpp         | 39 ++++++++++++++++++++++
 esphome/components/api/api_pb2.h           | 17 ++++++----
 esphome/components/api/subscribe_state.cpp |  9 -----
 5 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 175bd3858f..4e55744384 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -216,6 +216,9 @@ message BinarySensorStateResponse {
 
   fixed32 key = 1;
   bool state = 2;
+  // If the binary sensor does not have a valid state yet.
+  // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
+  bool missing_state = 3;
 }
 
 // ==================== COVER ====================
@@ -416,6 +419,9 @@ message SensorStateResponse {
 
   fixed32 key = 1;
   float state = 2;
+  // If the sensor does not have a valid state yet.
+  // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
+  bool missing_state = 3;
 }
 
 // ==================== SWITCH ====================
@@ -472,6 +478,9 @@ message TextSensorStateResponse {
 
   fixed32 key = 1;
   string state = 2;
+  // If the text sensor does not have a valid state yet.
+  // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
+  bool missing_state = 3;
 }
 
 // ==================== SUBSCRIBE LOGS ====================
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index e786fe61be..d4c4a52054 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -163,6 +163,7 @@ bool APIConnection::send_binary_sensor_state(binary_sensor::BinarySensor *binary
   BinarySensorStateResponse resp;
   resp.key = binary_sensor->get_object_id_hash();
   resp.state = state;
+  resp.missing_state = !binary_sensor->has_state();
   return this->send_binary_sensor_state_response(resp);
 }
 bool APIConnection::send_binary_sensor_info(binary_sensor::BinarySensor *binary_sensor) {
@@ -362,6 +363,7 @@ bool APIConnection::send_sensor_state(sensor::Sensor *sensor, float state) {
   SensorStateResponse resp{};
   resp.key = sensor->get_object_id_hash();
   resp.state = state;
+  resp.missing_state = !sensor->has_state();
   return this->send_sensor_state_response(resp);
 }
 bool APIConnection::send_sensor_info(sensor::Sensor *sensor) {
@@ -419,6 +421,7 @@ bool APIConnection::send_text_sensor_state(text_sensor::TextSensor *text_sensor,
   TextSensorStateResponse resp{};
   resp.key = text_sensor->get_object_id_hash();
   resp.state = std::move(state);
+  resp.missing_state = !text_sensor->has_state();
   return this->send_text_sensor_state_response(resp);
 }
 bool APIConnection::send_text_sensor_info(text_sensor::TextSensor *text_sensor) {
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 7f45d38f1b..0b6021c224 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -404,6 +404,10 @@ bool BinarySensorStateResponse::decode_varint(uint32_t field_id, ProtoVarInt val
       this->state = value.as_bool();
       return true;
     }
+    case 3: {
+      this->missing_state = value.as_bool();
+      return true;
+    }
     default:
       return false;
   }
@@ -421,6 +425,7 @@ bool BinarySensorStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value
 void BinarySensorStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_bool(2, this->state);
+  buffer.encode_bool(3, this->missing_state);
 }
 void BinarySensorStateResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -433,6 +438,10 @@ void BinarySensorStateResponse::dump_to(std::string &out) const {
   out.append("  state: ");
   out.append(YESNO(this->state));
   out.append("\n");
+
+  out.append("  missing_state: ");
+  out.append(YESNO(this->missing_state));
+  out.append("\n");
   out.append("}");
 }
 bool ListEntitiesCoverResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
@@ -1451,6 +1460,16 @@ void ListEntitiesSensorResponse::dump_to(std::string &out) const {
   out.append("\n");
   out.append("}");
 }
+bool SensorStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 3: {
+      this->missing_state = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
 bool SensorStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
   switch (field_id) {
     case 1: {
@@ -1468,6 +1487,7 @@ bool SensorStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
 void SensorStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_float(2, this->state);
+  buffer.encode_bool(3, this->missing_state);
 }
 void SensorStateResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -1481,6 +1501,10 @@ void SensorStateResponse::dump_to(std::string &out) const {
   sprintf(buffer, "%g", this->state);
   out.append(buffer);
   out.append("\n");
+
+  out.append("  missing_state: ");
+  out.append(YESNO(this->missing_state));
+  out.append("\n");
   out.append("}");
 }
 bool ListEntitiesSwitchResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
@@ -1700,6 +1724,16 @@ void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
   out.append("\n");
   out.append("}");
 }
+bool TextSensorStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 3: {
+      this->missing_state = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
 bool TextSensorStateResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
     case 2: {
@@ -1723,6 +1757,7 @@ bool TextSensorStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value)
 void TextSensorStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_fixed32(1, this->key);
   buffer.encode_string(2, this->state);
+  buffer.encode_bool(3, this->missing_state);
 }
 void TextSensorStateResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -1735,6 +1770,10 @@ void TextSensorStateResponse::dump_to(std::string &out) const {
   out.append("  state: ");
   out.append("'").append(this->state).append("'");
   out.append("\n");
+
+  out.append("  missing_state: ");
+  out.append(YESNO(this->missing_state));
+  out.append("\n");
   out.append("}");
 }
 bool SubscribeLogsRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index eb6a15afd4..3fe64fcb61 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -188,8 +188,9 @@ class ListEntitiesBinarySensorResponse : public ProtoMessage {
 };
 class BinarySensorStateResponse : public ProtoMessage {
  public:
-  uint32_t key{0};    // NOLINT
-  bool state{false};  // NOLINT
+  uint32_t key{0};            // NOLINT
+  bool state{false};          // NOLINT
+  bool missing_state{false};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -380,13 +381,15 @@ class ListEntitiesSensorResponse : public ProtoMessage {
 };
 class SensorStateResponse : public ProtoMessage {
  public:
-  uint32_t key{0};    // NOLINT
-  float state{0.0f};  // NOLINT
+  uint32_t key{0};            // NOLINT
+  float state{0.0f};          // NOLINT
+  bool missing_state{false};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
  protected:
   bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 class ListEntitiesSwitchResponse : public ProtoMessage {
  public:
@@ -442,14 +445,16 @@ class ListEntitiesTextSensorResponse : public ProtoMessage {
 };
 class TextSensorStateResponse : public ProtoMessage {
  public:
-  uint32_t key{0};      // NOLINT
-  std::string state{};  // NOLINT
+  uint32_t key{0};            // NOLINT
+  std::string state{};        // NOLINT
+  bool missing_state{false};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
  protected:
   bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 class SubscribeLogsRequest : public ProtoMessage {
  public:
diff --git a/esphome/components/api/subscribe_state.cpp b/esphome/components/api/subscribe_state.cpp
index 50d674bee2..2612a852d3 100644
--- a/esphome/components/api/subscribe_state.cpp
+++ b/esphome/components/api/subscribe_state.cpp
@@ -7,9 +7,6 @@ namespace api {
 
 #ifdef USE_BINARY_SENSOR
 bool InitialStateIterator::on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) {
-  if (!binary_sensor->has_state())
-    return true;
-
   return this->client_->send_binary_sensor_state(binary_sensor, binary_sensor->state);
 }
 #endif
@@ -24,9 +21,6 @@ bool InitialStateIterator::on_light(light::LightState *light) { return this->cli
 #endif
 #ifdef USE_SENSOR
 bool InitialStateIterator::on_sensor(sensor::Sensor *sensor) {
-  if (!sensor->has_state())
-    return true;
-
   return this->client_->send_sensor_state(sensor, sensor->state);
 }
 #endif
@@ -37,9 +31,6 @@ bool InitialStateIterator::on_switch(switch_::Switch *a_switch) {
 #endif
 #ifdef USE_TEXT_SENSOR
 bool InitialStateIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
-  if (!text_sensor->has_state())
-    return true;
-
   return this->client_->send_text_sensor_state(text_sensor, text_sensor->state);
 }
 #endif

From 907c14aa981cafd891a387982e921aa432f0b053 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 18:59:23 +0100
Subject: [PATCH 078/412] Fix neopixelbus missing method pins (#848)

Fixes https://github.com/esphome/issues/issues/839
---
 esphome/components/neopixelbus/light.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/esphome/components/neopixelbus/light.py b/esphome/components/neopixelbus/light.py
index e5106d4bd6..e405b3d7a8 100644
--- a/esphome/components/neopixelbus/light.py
+++ b/esphome/components/neopixelbus/light.py
@@ -74,7 +74,11 @@ def validate_method_pin(value):
         method_pins['BIT_BANG'] = list(range(0, 16))
     elif CORE.is_esp32:
         method_pins['BIT_BANG'] = list(range(0, 32))
-    pins_ = method_pins[method]
+    pins_ = method_pins.get(method)
+    if pins_ is None:
+        # all pins allowed for this method
+        return value
+
     for opt in (CONF_PIN, CONF_CLOCK_PIN, CONF_DATA_PIN):
         if opt in value and value[opt] not in pins_:
             raise cv.Invalid("Method {} only supports pin(s) {}".format(

From 51233e1931bc7f2a35e830ea2ce1c54332d5da1b Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 19:01:36 +0100
Subject: [PATCH 079/412] Fix sensor force_update native API (#847)

Fixes https://github.com/esphome/issues/issues/842
---
 esphome/components/api/api_connection.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index d4c4a52054..a329e81cee 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -377,6 +377,7 @@ bool APIConnection::send_sensor_info(sensor::Sensor *sensor) {
   msg.icon = sensor->get_icon();
   msg.unit_of_measurement = sensor->get_unit_of_measurement();
   msg.accuracy_decimals = sensor->get_accuracy_decimals();
+  msg.force_update = sensor->get_force_update();
   return this->send_list_entities_sensor_response(msg);
 }
 #endif

From 7d4f2792061938f54a0ebee5c434e46b9d5c2d25 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 19:03:59 +0100
Subject: [PATCH 080/412] Web server CORS headers (#840)

* Add CORS header to web server

* Refactor

* Cleanup

See also https://github.com/esphome/issues/issues/806
---
 esphome/components/web_server/web_server.cpp | 22 +++++++++-----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 4fdbbbce7d..c6204533d4 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -18,6 +18,8 @@ namespace web_server {
 static const char *TAG = "web_server";
 
 void write_row(AsyncResponseStream *stream, Nameable *obj, const std::string &klass, const std::string &action) {
+  if (obj->is_internal())
+    return;
   stream->print("<tr class=\"");
   stream->print(klass.c_str());
   stream->print("\" id=\"");
@@ -135,41 +137,37 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
   stream->print(F("\"></head><body><article class=\"markdown-body\"><h1>"));
   stream->print(title.c_str());
   stream->print(F("</h1><h2>States</h2><table id=\"states\"><thead><tr><th>Name<th>State<th>Actions<tbody>"));
+  // All content is controlled and created by user - so allowing all origins is fine here.
+  stream->addHeader("Access-Control-Allow-Origin", "*");
 
 #ifdef USE_SENSOR
   for (auto *obj : App.get_sensors())
-    if (!obj->is_internal())
-      write_row(stream, obj, "sensor", "");
+    write_row(stream, obj, "sensor", "");
 #endif
 
 #ifdef USE_SWITCH
   for (auto *obj : App.get_switches())
-    if (!obj->is_internal())
-      write_row(stream, obj, "switch", "<button>Toggle</button>");
+    write_row(stream, obj, "switch", "<button>Toggle</button>");
 #endif
 
 #ifdef USE_BINARY_SENSOR
   for (auto *obj : App.get_binary_sensors())
-    if (!obj->is_internal())
-      write_row(stream, obj, "binary_sensor", "");
+    write_row(stream, obj, "binary_sensor", "");
 #endif
 
 #ifdef USE_FAN
   for (auto *obj : App.get_fans())
-    if (!obj->is_internal())
-      write_row(stream, obj, "fan", "<button>Toggle</button>");
+    write_row(stream, obj, "fan", "<button>Toggle</button>");
 #endif
 
 #ifdef USE_LIGHT
   for (auto *obj : App.get_lights())
-    if (!obj->is_internal())
-      write_row(stream, obj, "light", "<button>Toggle</button>");
+    write_row(stream, obj, "light", "<button>Toggle</button>");
 #endif
 
 #ifdef USE_TEXT_SENSOR
   for (auto *obj : App.get_text_sensors())
-    if (!obj->is_internal())
-      write_row(stream, obj, "text_sensor", "");
+    write_row(stream, obj, "text_sensor", "");
 #endif
 
   stream->print(F("</tbody></table><p>See <a href=\"https://esphome.io/web-api/index.html\">ESPHome Web API</a> for "

From 7b142525b474c25a553ac0df907b395fd510454b Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 19:04:11 +0100
Subject: [PATCH 081/412] Check DHT sensor exists before publishing (#850)

Fixes https://github.com/esphome/issues/issues/841
---
 esphome/components/dht/dht.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/esphome/components/dht/dht.cpp b/esphome/components/dht/dht.cpp
index 1e28246bee..23d8c1d3e2 100644
--- a/esphome/components/dht/dht.cpp
+++ b/esphome/components/dht/dht.cpp
@@ -47,8 +47,10 @@ void DHT::update() {
   if (error) {
     ESP_LOGD(TAG, "Got Temperature=%.1f°C Humidity=%.1f%%", temperature, humidity);
 
-    this->temperature_sensor_->publish_state(temperature);
-    this->humidity_sensor_->publish_state(humidity);
+    if (this->temperature_sensor_ != nullptr)
+      this->temperature_sensor_->publish_state(temperature);
+    if (this->humidity_sensor_ != nullptr)
+      this->humidity_sensor_->publish_state(humidity);
     this->status_clear_warning();
   } else {
     const char *str = "";
@@ -56,8 +58,10 @@ void DHT::update() {
       str = " and consider manually specifying the DHT model using the model option";
     }
     ESP_LOGW(TAG, "Invalid readings! Please check your wiring (pull-up resistor, pin number)%s.", str);
-    this->temperature_sensor_->publish_state(NAN);
-    this->humidity_sensor_->publish_state(NAN);
+    if (this->temperature_sensor_ != nullptr)
+      this->temperature_sensor_->publish_state(NAN);
+    if (this->humidity_sensor_ != nullptr)
+      this->humidity_sensor_->publish_state(NAN);
     this->status_set_warning();
   }
 }

From 4f1a28d46013e3d504b1379275a3c6bd28e43bb1 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 19:04:39 +0100
Subject: [PATCH 082/412] Adjust some units (#852)

* Adjust some units

Fixes https://github.com/esphome/issues/issues/843

* Lint
---
 esphome/components/atm90e32/sensor.py | 7 ++++---
 esphome/components/pzemac/sensor.py   | 4 ++--
 esphome/components/tx20/sensor.py     | 4 ++--
 esphome/const.py                      | 4 +++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/esphome/components/atm90e32/sensor.py b/esphome/components/atm90e32/sensor.py
index 030ff90a77..a5d11bbb75 100644
--- a/esphome/components/atm90e32/sensor.py
+++ b/esphome/components/atm90e32/sensor.py
@@ -4,7 +4,7 @@ from esphome.components import sensor, spi
 from esphome.const import \
     CONF_ID, CONF_VOLTAGE, CONF_CURRENT, CONF_POWER, CONF_POWER_FACTOR, CONF_FREQUENCY, \
     ICON_FLASH, ICON_LIGHTBULB, ICON_CURRENT_AC, ICON_THERMOMETER, \
-    UNIT_HZ, UNIT_VOLT, UNIT_AMPERE, UNIT_WATT, UNIT_EMPTY, UNIT_CELSIUS
+    UNIT_HERTZ, UNIT_VOLT, UNIT_AMPERE, UNIT_WATT, UNIT_EMPTY, UNIT_CELSIUS, UNIT_VOLT_AMPS_REACTIVE
 
 CONF_PHASE_A = 'phase_a'
 CONF_PHASE_B = 'phase_b'
@@ -33,7 +33,8 @@ ATM90E32_PHASE_SCHEMA = cv.Schema({
     cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 2),
     cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_CURRENT_AC, 2),
     cv.Optional(CONF_POWER): sensor.sensor_schema(UNIT_WATT, ICON_FLASH, 2),
-    cv.Optional(CONF_REACTIVE_POWER): sensor.sensor_schema(UNIT_EMPTY, ICON_LIGHTBULB, 2),
+    cv.Optional(CONF_REACTIVE_POWER): sensor.sensor_schema(UNIT_VOLT_AMPS_REACTIVE,
+                                                           ICON_LIGHTBULB, 2),
     cv.Optional(CONF_POWER_FACTOR): sensor.sensor_schema(UNIT_EMPTY, ICON_FLASH, 2),
     cv.Optional(CONF_GAIN_VOLTAGE, default=41820): cv.uint16_t,
     cv.Optional(CONF_GAIN_CT, default=25498): cv.uint16_t,
@@ -44,7 +45,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_PHASE_A): ATM90E32_PHASE_SCHEMA,
     cv.Optional(CONF_PHASE_B): ATM90E32_PHASE_SCHEMA,
     cv.Optional(CONF_PHASE_C): ATM90E32_PHASE_SCHEMA,
-    cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(UNIT_HZ, ICON_CURRENT_AC, 1),
+    cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(UNIT_HERTZ, ICON_CURRENT_AC, 1),
     cv.Optional(CONF_CHIP_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
     cv.Required(CONF_LINE_FREQUENCY): cv.enum(LINE_FREQS, upper=True),
     cv.Optional(CONF_GAIN_PGA, default='2X'): cv.enum(PGA_GAINS, upper=True),
diff --git a/esphome/components/pzemac/sensor.py b/esphome/components/pzemac/sensor.py
index 35d8069767..54eb01e085 100644
--- a/esphome/components/pzemac/sensor.py
+++ b/esphome/components/pzemac/sensor.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 from esphome.components import sensor, modbus
 from esphome.const import CONF_CURRENT, CONF_ID, CONF_POWER, CONF_VOLTAGE, \
     CONF_FREQUENCY, UNIT_VOLT, ICON_FLASH, UNIT_AMPERE, UNIT_WATT, UNIT_EMPTY, \
-    ICON_POWER, CONF_POWER_FACTOR, ICON_CURRENT_AC
+    ICON_POWER, CONF_POWER_FACTOR, ICON_CURRENT_AC, UNIT_HERTZ
 
 AUTO_LOAD = ['modbus']
 
@@ -15,7 +15,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 1),
     cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_CURRENT_AC, 3),
     cv.Optional(CONF_POWER): sensor.sensor_schema(UNIT_WATT, ICON_POWER, 1),
-    cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(UNIT_EMPTY, ICON_CURRENT_AC, 1),
+    cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(UNIT_HERTZ, ICON_CURRENT_AC, 1),
     cv.Optional(CONF_POWER_FACTOR): sensor.sensor_schema(UNIT_EMPTY, ICON_FLASH, 2),
 }).extend(cv.polling_component_schema('60s')).extend(modbus.modbus_device_schema(0x01))
 
diff --git a/esphome/components/tx20/sensor.py b/esphome/components/tx20/sensor.py
index daa6677196..3547cdf50c 100644
--- a/esphome/components/tx20/sensor.py
+++ b/esphome/components/tx20/sensor.py
@@ -4,7 +4,7 @@ from esphome import pins
 from esphome.components import sensor
 from esphome.const import CONF_ID, CONF_WIND_SPEED, CONF_PIN, \
     CONF_WIND_DIRECTION_DEGREES, UNIT_KILOMETER_PER_HOUR, \
-    UNIT_EMPTY, ICON_WEATHER_WINDY, ICON_SIGN_DIRECTION
+    ICON_WEATHER_WINDY, ICON_SIGN_DIRECTION, UNIT_DEGREES
 
 tx20_ns = cg.esphome_ns.namespace('tx20')
 Tx20Component = tx20_ns.class_('Tx20Component', cg.Component)
@@ -14,7 +14,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_WIND_SPEED):
         sensor.sensor_schema(UNIT_KILOMETER_PER_HOUR, ICON_WEATHER_WINDY, 1),
     cv.Optional(CONF_WIND_DIRECTION_DEGREES):
-        sensor.sensor_schema(UNIT_EMPTY, ICON_SIGN_DIRECTION, 1),
+        sensor.sensor_schema(UNIT_DEGREES, ICON_SIGN_DIRECTION, 1),
     cv.Required(CONF_PIN): cv.All(pins.internal_gpio_input_pin_schema,
                                   pins.validate_has_interrupt),
 }).extend(cv.COMPONENT_SCHEMA)
diff --git a/esphome/const.py b/esphome/const.py
index 5867666576..829b4738ce 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -539,7 +539,7 @@ UNIT_DEGREES = u'°'
 UNIT_EMPTY = ''
 UNIT_G = 'G'
 UNIT_HECTOPASCAL = 'hPa'
-UNIT_HZ = 'hz'
+UNIT_HERTZ = 'hz'
 UNIT_KELVIN = 'K'
 UNIT_KILOMETER = 'km'
 UNIT_KILOMETER_PER_HOUR = 'km/h'
@@ -557,6 +557,8 @@ UNIT_PULSES_PER_MINUTE = 'pulses/min'
 UNIT_SECOND = 's'
 UNIT_STEPS = 'steps'
 UNIT_VOLT = 'V'
+UNIT_VOLT_AMPS = 'VA'
+UNIT_VOLT_AMPS_REACTIVE = 'VAR'
 UNIT_WATT = 'W'
 
 DEVICE_CLASS_CONNECTIVITY = 'connectivity'

From 8677d477773a428f6ae2e37a46132c30d4d9a361 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 21:44:20 +0100
Subject: [PATCH 083/412] Fix PZEM004T v2 (#846)

Fixes https://github.com/esphome/issues/issues/817
---
 esphome/components/pzem004t/pzem004t.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/pzem004t/pzem004t.cpp b/esphome/components/pzem004t/pzem004t.cpp
index cbdc14f0d0..e2d832b019 100644
--- a/esphome/components/pzem004t/pzem004t.cpp
+++ b/esphome/components/pzem004t/pzem004t.cpp
@@ -8,7 +8,7 @@ static const char *TAG = "pzem004t";
 
 void PZEM004T::loop() {
   const uint32_t now = millis();
-  if (now - this->last_read_ > 500 && this->available()) {
+  if (now - this->last_read_ > 500 && this->available() < 7) {
     while (this->available())
       this->read();
     this->last_read_ = now;
@@ -78,7 +78,7 @@ void PZEM004T::loop() {
     this->last_read_ = now;
   }
 }
-void PZEM004T::update() { this->write_state_(SET_ADDRESS); }
+void PZEM004T::update() { this->write_state_(READ_VOLTAGE); }
 void PZEM004T::write_state_(PZEM004T::PZEM004TReadState state) {
   if (state == DONE) {
     this->read_state_ = state;

From 663f84f8b465e033dff152954e60c039cd9a8337 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 21:44:28 +0100
Subject: [PATCH 084/412] Mark python 3.5 support deprecated (#849)

* Mark python 3.5 unsupported

Fixes https://github.com/esphome/issues/issues/831

* Update .travis.yml

* Update typing dep
---
 .travis.yml         | 6 +++---
 esphome/__main__.py | 6 +++++-
 setup.py            | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa848877c6..c7f75a2cb9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 sudo: false
 language: python
-python: '3.5'
+python: '3.6'
 install: script/setup
 cache:
   directories:
@@ -15,8 +15,8 @@ matrix:
         - script/ci-custom.py
         - flake8 esphome
         - pylint esphome
-    - python: "3.5"
-      env: TARGET=Test3.5
+    - python: "3.6"
+      env: TARGET=Test3.6
       script:
         - esphome tests/test1.yaml compile
         - esphome tests/test2.yaml compile
diff --git a/esphome/__main__.py b/esphome/__main__.py
index 3ce116739b..32be45f5d6 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -14,7 +14,7 @@ from esphome.const import CONF_BAUD_RATE, CONF_BROKER, CONF_LOGGER, CONF_OTA, \
     CONF_PASSWORD, CONF_PORT, CONF_ESPHOME, CONF_PLATFORMIO_OPTIONS
 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.py_compat import IS_PY2, safe_input, IS_PY3
 from esphome.util import run_external_command, run_external_process, safe_print, list_yaml_files
 
 _LOGGER = logging.getLogger(__name__)
@@ -518,6 +518,10 @@ def run_esphome(argv):
         _LOGGER.warning("You're using ESPHome with python 2. Support for python 2 is deprecated "
                         "and will be removed in 1.15.0. Please reinstall ESPHome with python 3.6 "
                         "or higher.")
+    elif IS_PY3 and sys.version_info < (3, 6, 0):
+        _LOGGER.warning("You're using ESPHome with python 3.5. Support for python 3.5 is "
+                        "deprecated and will be removed in 1.15.0. Please reinstall ESPHome with "
+                        "python 3.6 or higher.")
 
     if args.command in PRE_CONFIG_ACTIONS:
         try:
diff --git a/setup.py b/setup.py
index 53acef5a30..641bb3e431 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ REQUIRES = [
     'paho-mqtt==1.4.0',
     'colorlog==4.0.2',
     'tornado==5.1.1',
-    'typing>=3.6.6;python_version<"3.5"',
+    'typing>=3.6.6;python_version<"3.6"',
     'protobuf==3.10.0',
     'tzlocal==2.0.0',
     'pytz==2019.3',

From 39a520f552917582388d3a1766d514cc088355be Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Tue, 12 Nov 2019 13:24:13 -0800
Subject: [PATCH 085/412] add position reporting to the template cover (#821)

* add position reporting to the template cover

* remove duplicate import

* use config flag instead


Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/template/cover/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/template/cover/__init__.py b/esphome/components/template/cover/__init__.py
index 13370d749c..7a60096d85 100644
--- a/esphome/components/template/cover/__init__.py
+++ b/esphome/components/template/cover/__init__.py
@@ -16,11 +16,14 @@ RESTORE_MODES = {
     'RESTORE_AND_CALL': TemplateCoverRestoreMode.COVER_RESTORE_AND_CALL,
 }
 
+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),
@@ -56,6 +59,7 @@ def to_code(config):
     cg.add(var.set_optimistic(config[CONF_OPTIMISTIC]))
     cg.add(var.set_assumed_state(config[CONF_ASSUMED_STATE]))
     cg.add(var.set_restore_mode(config[CONF_RESTORE_MODE]))
+    cg.add(var.set_has_position(config[CONF_HAS_POSITION]))
 
 
 @automation.register_action('cover.template.publish', cover.CoverPublishAction, cv.Schema({

From a386bb476f56b8285a820be97bd5609aa2e36832 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 12 Nov 2019 22:26:35 +0100
Subject: [PATCH 086/412] Fix output_power log strings, lint

---
 esphome/components/wifi/wifi_component.cpp       | 4 ++--
 esphome/components/wifi/wifi_component_esp32.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 60b7fb8945..e68ab1765b 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -37,7 +37,7 @@ void WiFiComponent::setup() {
   if (this->has_sta()) {
     this->wifi_sta_pre_setup_();
     if (this->output_power_.has_value() && !this->wifi_apply_output_power_(*this->output_power_)) {
-      ESP_LOGV(TAG, "Setting Power Save Option failed!");
+      ESP_LOGV(TAG, "Setting Output Power Option failed!");
     }
 
     if (!this->wifi_apply_power_save_()) {
@@ -53,7 +53,7 @@ void WiFiComponent::setup() {
   } else if (this->has_ap()) {
     this->setup_ap_config_();
     if (this->output_power_.has_value() && !this->wifi_apply_output_power_(*this->output_power_)) {
-      ESP_LOGV(TAG, "Setting Power Save Option failed!");
+      ESP_LOGV(TAG, "Setting Output Power Option failed!");
     }
 #ifdef USE_CAPTIVE_PORTAL
     if (captive_portal::global_captive_portal != nullptr)
diff --git a/esphome/components/wifi/wifi_component_esp32.cpp b/esphome/components/wifi/wifi_component_esp32.cpp
index 7fc459d858..862db7a9de 100644
--- a/esphome/components/wifi/wifi_component_esp32.cpp
+++ b/esphome/components/wifi/wifi_component_esp32.cpp
@@ -54,7 +54,7 @@ bool WiFiComponent::wifi_mode_(optional<bool> sta, optional<bool> ap) {
   return ret;
 }
 bool WiFiComponent::wifi_apply_output_power_(float output_power) {
-  int8_t val = static_cast<uint8_t>(output_power * 4);
+  int8_t val = static_cast<int8_t>(output_power * 4);
   return esp_wifi_set_max_tx_power(val) == ESP_OK;
 }
 bool WiFiComponent::wifi_sta_pre_setup_() {

From 092bca0d6345555ecaf07e796ccef5537bd5d25a Mon Sep 17 00:00:00 2001
From: Mark <github@diramu.net>
Date: Wed, 13 Nov 2019 18:49:59 +1100
Subject: [PATCH 087/412] Atm90e32 pf fix (#841)

* correct set_pf_sensor to set_power_factor_senor

* remove junk files added in error

* correct sensors.yaml reference to set_reactive_power

* Fixes
---
 esphome/components/atm90e32/sensor.py | 4 ++--
 tests/test1.yaml                      | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/esphome/components/atm90e32/sensor.py b/esphome/components/atm90e32/sensor.py
index a5d11bbb75..520dfc82ef 100644
--- a/esphome/components/atm90e32/sensor.py
+++ b/esphome/components/atm90e32/sensor.py
@@ -74,10 +74,10 @@ def to_code(config):
             cg.add(var.set_power_sensor(i, sens))
         if CONF_REACTIVE_POWER in conf:
             sens = yield sensor.new_sensor(conf[CONF_REACTIVE_POWER])
-            cg.add(var.set_react_pow_sensor(i, sens))
+            cg.add(var.set_reactive_power_sensor(i, sens))
         if CONF_POWER_FACTOR in conf:
             sens = yield sensor.new_sensor(conf[CONF_POWER_FACTOR])
-            cg.add(var.set_pf_sensor(i, sens))
+            cg.add(var.set_power_factor_sensor(i, sens))
     if CONF_FREQUENCY in config:
         sens = yield sensor.new_sensor(config[CONF_FREQUENCY])
         cg.add(var.set_freq_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 0905c51efa..e9f8765167 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -261,6 +261,10 @@ sensor:
         name: "EMON CT1 Current"
       power:
         name: "EMON Active Power CT1"
+      reactive_power:
+        name: "EMON Reactive Power CT1"
+      power_factor:
+        name: "EMON Power Factor CT1"
       gain_voltage: 47660
       gain_ct: 12577
     phase_b:

From 694395ac91af447895f85000a4d8acddb2497b11 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 14 Nov 2019 12:42:50 +0100
Subject: [PATCH 088/412] Switch to 115200 baud upload if 460800 fails (#856)

* Switch to 115200 baud upload if 460800 fails

* Update __main__.py
---
 esphome/__main__.py | 27 +++++++++++++++++++--------
 esphome/util.py     |  2 ++
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 32be45f5d6..ae2db3e35c 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -165,16 +165,27 @@ def compile_program(args, config):
 
 def upload_using_esptool(config, port):
     path = CORE.firmware_bin
-    cmd = ['esptool.py', '--before', 'default_reset', '--after', 'hard_reset',
-           '--baud', str(config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get('upload_speed', 460800)),
-           '--chip', 'esp8266', '--port', port, 'write_flash', '0x0', path]
+    first_baudrate = config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get('upload_speed', 460800)
 
-    if os.environ.get('ESPHOME_USE_SUBPROCESS') is None:
-        import esptool
-        # pylint: disable=protected-access
-        return run_external_command(esptool._main, *cmd)
+    def run_esptool(baud_rate):
+        cmd = ['esptool.py', '--before', 'default_reset', '--after', 'hard_reset',
+               '--baud', str(baud_rate),
+               '--chip', 'esp8266', '--port', port, 'write_flash', '0x0', path]
 
-    return run_external_process(*cmd)
+        if os.environ.get('ESPHOME_USE_SUBPROCESS') is None:
+            import esptool
+            # pylint: disable=protected-access
+            return run_external_command(esptool._main, *cmd)
+
+        return run_external_process(*cmd)
+
+    rc = run_esptool(first_baudrate)
+    if rc == 0 or first_baudrate == 115200:
+        return rc
+    # Try with 115200 baud rate, with some serial chips the faster baud rates do not work well
+    _LOGGER.info("Upload with baud rate %s failed. Trying again with baud rate 115200.",
+                 first_baudrate)
+    return run_esptool(115200)
 
 
 def upload_program(config, args, host):
diff --git a/esphome/util.py b/esphome/util.py
index 098d5e52da..b8e65cd576 100644
--- a/esphome/util.py
+++ b/esphome/util.py
@@ -184,6 +184,7 @@ def run_external_command(func, *cmd, **kwargs):
     except Exception as err:  # pylint: disable=broad-except
         _LOGGER.error(u"Running command failed: %s", err)
         _LOGGER.error(u"Please try running %s locally.", full_cmd)
+        return 1
     finally:
         sys.argv = orig_argv
         sys.exit = orig_exit
@@ -216,6 +217,7 @@ def run_external_process(*cmd, **kwargs):
     except Exception as err:  # pylint: disable=broad-except
         _LOGGER.error(u"Running command failed: %s", err)
         _LOGGER.error(u"Please try running %s locally.", full_cmd)
+        return 1
     finally:
         if capture_stdout:
             # pylint: disable=lost-exception

From aca306d1202b2577f99fab9792296b07c9102b12 Mon Sep 17 00:00:00 2001
From: Brandon Davidson <brad@oatmail.org>
Date: Thu, 14 Nov 2019 04:36:55 -0800
Subject: [PATCH 089/412] Fix logger uart conflict check (#858)

* Fix logger uart conflict check

* Fix class for check func

* Fix syntax

Hope lint is OK with moving the end of the conditional outside the #IFDEF

* Move end of conditional inside ifdef and remove extra whitespace

* Simplify

clang-format did not like the ifdefs and was reformatting in a way that killed clang-tidy.

Simple solution is to use logger's hw_serial as source of truth

Also simplifies the code - uart doesn't need to know what the logger uart settings mean
---
 esphome/components/logger/logger.h |  1 +
 esphome/components/uart/uart.cpp   | 28 +++++++++++++++-------------
 esphome/components/uart/uart.h     |  1 +
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index 9d252af515..039ad78c63 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -32,6 +32,7 @@ class Logger : public Component {
   /// Manually set the baud rate for serial, set to 0 to disable.
   void set_baud_rate(uint32_t baud_rate);
   uint32_t get_baud_rate() const { return baud_rate_; }
+  HardwareSerial *get_hw_serial() const { return hw_serial_; }
 
   /// Get the UART used by the logger.
   UARTSelection get_uart() const;
diff --git a/esphome/components/uart/uart.cpp b/esphome/components/uart/uart.cpp
index 3284d4cb67..1f40498606 100644
--- a/esphome/components/uart/uart.cpp
+++ b/esphome/components/uart/uart.cpp
@@ -46,12 +46,7 @@ void UARTComponent::dump_config() {
   }
   ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
   ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
-#ifdef USE_LOGGER
-  if (this->hw_serial_ == &Serial && logger::global_logger->get_baud_rate() != 0) {
-    ESP_LOGW(TAG, "  You're using the same serial port for logging and the UART component. Please "
-                  "disable logging over the serial port by setting logger->baud_rate to 0.");
-  }
-#endif
+  this->check_logger_conflict_();
 }
 
 void UARTComponent::write_byte(uint8_t data) {
@@ -156,13 +151,7 @@ void UARTComponent::dump_config() {
   } else {
     ESP_LOGCONFIG(TAG, "  Using software serial");
   }
-
-#ifdef USE_LOGGER
-  if (this->hw_serial_ == &Serial && logger::global_logger->get_baud_rate() != 0) {
-    ESP_LOGW(TAG, "  You're using the same serial port for logging and the UART component. Please "
-                  "disable logging over the serial port by setting logger->baud_rate to 0.");
-  }
-#endif
+  this->check_logger_conflict_();
 }
 
 void UARTComponent::write_byte(uint8_t data) {
@@ -378,6 +367,19 @@ int UARTComponent::peek() {
   return data;
 }
 
+void UARTComponent::check_logger_conflict_() {
+#ifdef USE_LOGGER
+  if (this->hw_serial_ == nullptr || logger::global_logger->get_baud_rate() == 0) {
+    return;
+  }
+
+  if (this->hw_serial_ == logger::global_logger->get_hw_serial()) {
+    ESP_LOGW(TAG, "  You're using the same serial port for logging and the UART component. Please "
+                  "disable logging over the serial port by setting logger->baud_rate to 0.");
+  }
+#endif
+}
+
 void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits) {
   if (this->parent_->baud_rate_ != baud_rate) {
     ESP_LOGE(TAG, "  Invalid baud_rate: Integration requested baud_rate %u but you have %u!", baud_rate,
diff --git a/esphome/components/uart/uart.h b/esphome/components/uart/uart.h
index 0e92fed0dc..76e7496b80 100644
--- a/esphome/components/uart/uart.h
+++ b/esphome/components/uart/uart.h
@@ -76,6 +76,7 @@ class UARTComponent : public Component, public Stream {
   void set_stop_bits(uint8_t stop_bits) { this->stop_bits_ = stop_bits; }
 
  protected:
+  void check_logger_conflict_();
   bool check_read_timeout_(size_t len = 1);
   friend class UARTDevice;
 

From 4f8f59f705e2d5ed8cdc62629cac76f437257b79 Mon Sep 17 00:00:00 2001
From: Brandon Davidson <brad@oatmail.org>
Date: Thu, 14 Nov 2019 04:43:44 -0800
Subject: [PATCH 090/412] Tuya: Fix init sequence and handle wifi test command
 (#820)

* Handle WiFi test command

Also rename commands to match Tuya protocol docs

* Fix init sequence and product info check

* Fix clang-format suggestions

* Additional changes based on code review

* Fix temp command buffer scope

* Let the interval timer fire the first heatbeat

* Fix init steps; add logging

* Lint

* Remove setup_priority override

* Add delay to dump_config

* Refactor dump sequence

* Fix verbose logging

* Fix lints

* Don't bother suppressing duplicate config dumps

* nolint


Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/tuya/tuya.cpp | 93 +++++++++++++++++++++-----------
 esphome/components/tuya/tuya.h   | 24 ++++++---
 2 files changed, 80 insertions(+), 37 deletions(-)

diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index cb796644c8..b21df81d1e 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -8,7 +8,6 @@ namespace tuya {
 static const char *TAG = "tuya";
 
 void Tuya::setup() {
-  this->send_empty_command_(TuyaCommandType::MCU_CONF);
   this->set_interval("heartbeat", 1000, [this] { this->send_empty_command_(TuyaCommandType::HEARTBEAT); });
 }
 
@@ -22,8 +21,12 @@ void Tuya::loop() {
 
 void Tuya::dump_config() {
   ESP_LOGCONFIG(TAG, "Tuya:");
-  if ((gpio_status_ != -1) || (gpio_reset_ != -1))
-    ESP_LOGCONFIG(TAG, "  GPIO MCU configuration not supported!");
+  if (this->init_state_ != TuyaInitState::INIT_DONE) {
+    ESP_LOGCONFIG(TAG, "  Configuration will be reported when setup is complete. Current init_state: %u",  // NOLINT
+                  this->init_state_);
+    ESP_LOGCONFIG(TAG, "  If no further output is received, confirm that this is a supported Tuya device.");
+    return;
+  }
   for (auto &info : this->datapoints_) {
     if (info.type == TuyaDatapointType::BOOLEAN)
       ESP_LOGCONFIG(TAG, "  Datapoint %d: switch (value: %s)", info.id, ONOFF(info.value_bool));
@@ -36,9 +39,11 @@ void Tuya::dump_config() {
     else
       ESP_LOGCONFIG(TAG, "  Datapoint %d: unknown", info.id);
   }
-  if (this->datapoints_.empty()) {
-    ESP_LOGCONFIG(TAG, "  Received no datapoints! Please make sure this is a supported Tuya device.");
+  if ((this->gpio_status_ != -1) || (this->gpio_reset_ != -1)) {
+    ESP_LOGCONFIG(TAG, "  GPIO Configuration: status: pin %d, reset: pin %d (not supported)", this->gpio_status_,
+                  this->gpio_reset_);
   }
+  ESP_LOGCONFIG(TAG, "  Product: '%s'", this->product_.c_str());
   this->check_uart_settings(9600);
 }
 
@@ -89,8 +94,8 @@ bool Tuya::validate_message_() {
 
   // valid message
   const uint8_t *message_data = data + 6;
-  ESP_LOGV(TAG, "Received Tuya: CMD=0x%02X VERSION=%u DATA=[%s]", command, version,
-           hexencode(message_data, length).c_str());
+  ESP_LOGV(TAG, "Received Tuya: CMD=0x%02X VERSION=%u DATA=[%s] INIT_STATE=%u", command, version,  // NOLINT
+           hexencode(message_data, length).c_str(), this->init_state_);
   this->handle_command_(command, version, message_data, length);
 
   // return false to reset rx buffer
@@ -105,41 +110,58 @@ void Tuya::handle_char_(uint8_t c) {
 }
 
 void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buffer, size_t len) {
-  uint8_t c;
   switch ((TuyaCommandType) command) {
     case TuyaCommandType::HEARTBEAT:
       ESP_LOGV(TAG, "MCU Heartbeat (0x%02X)", buffer[0]);
       if (buffer[0] == 0) {
         ESP_LOGI(TAG, "MCU restarted");
-        this->send_empty_command_(TuyaCommandType::QUERY_STATE);
+        this->init_state_ = TuyaInitState::INIT_HEARTBEAT;
+      }
+      if (this->init_state_ == TuyaInitState::INIT_HEARTBEAT) {
+        this->init_state_ = TuyaInitState::INIT_PRODUCT;
+        this->send_empty_command_(TuyaCommandType::PRODUCT_QUERY);
       }
       break;
-    case TuyaCommandType::QUERY_PRODUCT: {
-      // check it is a valid string
-      bool valid = false;
+    case TuyaCommandType::PRODUCT_QUERY: {
+      // check it is a valid string made up of printable characters
+      bool valid = true;
       for (int i = 0; i < len; i++) {
-        if (buffer[i] == 0x00) {
-          valid = true;
+        if (!std::isprint(buffer[i])) {
+          valid = false;
           break;
         }
       }
       if (valid) {
-        ESP_LOGD(TAG, "Tuya Product Code: %s", reinterpret_cast<const char *>(buffer));
+        this->product_ = std::string(reinterpret_cast<const char *>(buffer), len);
+      } else {
+        this->product_ = R"({"p":"INVALID"})";
+      }
+      if (this->init_state_ == TuyaInitState::INIT_PRODUCT) {
+        this->init_state_ = TuyaInitState::INIT_CONF;
+        this->send_empty_command_(TuyaCommandType::CONF_QUERY);
       }
       break;
     }
-    case TuyaCommandType::MCU_CONF:
+    case TuyaCommandType::CONF_QUERY: {
       if (len >= 2) {
         gpio_status_ = buffer[0];
         gpio_reset_ = buffer[1];
       }
-      // set wifi state LED to off or on depending on the MCU firmware
-      // but it shouldn't be blinking
-      c = 0x3;
-      this->send_command_(TuyaCommandType::WIFI_STATE, &c, 1);
-      this->send_empty_command_(TuyaCommandType::QUERY_STATE);
+      if (this->init_state_ == TuyaInitState::INIT_CONF) {
+        // If we were following the spec to the letter we would send
+        // state updates until connected to both WiFi and API/MQTT.
+        // Instead we just claim to be connected immediately and move on.
+        uint8_t c[] = {0x04};
+        this->init_state_ = TuyaInitState::INIT_WIFI;
+        this->send_command_(TuyaCommandType::WIFI_STATE, c, 1);
+      }
       break;
+    }
     case TuyaCommandType::WIFI_STATE:
+      if (this->init_state_ == TuyaInitState::INIT_WIFI) {
+        this->init_state_ = TuyaInitState::INIT_DATAPOINT;
+        this->send_empty_command_(TuyaCommandType::DATAPOINT_QUERY);
+      }
       break;
     case TuyaCommandType::WIFI_RESET:
       ESP_LOGE(TAG, "TUYA_CMD_WIFI_RESET is not handled");
@@ -147,14 +169,22 @@ void Tuya::handle_command_(uint8_t command, uint8_t version, const uint8_t *buff
     case TuyaCommandType::WIFI_SELECT:
       ESP_LOGE(TAG, "TUYA_CMD_WIFI_SELECT is not handled");
       break;
-    case TuyaCommandType::SET_DATAPOINT:
+    case TuyaCommandType::DATAPOINT_DELIVER:
       break;
-    case TuyaCommandType::STATE: {
+    case TuyaCommandType::DATAPOINT_REPORT:
+      if (this->init_state_ == TuyaInitState::INIT_DATAPOINT) {
+        this->init_state_ = TuyaInitState::INIT_DONE;
+        this->set_timeout("datapoint_dump", 1000, [this] { this->dump_config(); });
+      }
       this->handle_datapoint_(buffer, len);
       break;
-    }
-    case TuyaCommandType::QUERY_STATE:
+    case TuyaCommandType::DATAPOINT_QUERY:
       break;
+    case TuyaCommandType::WIFI_TEST: {
+      uint8_t c[] = {0x00, 0x00};
+      this->send_command_(TuyaCommandType::WIFI_TEST, c, 2);
+      break;
+    }
     default:
       ESP_LOGE(TAG, "invalid command (%02x) received", command);
   }
@@ -214,8 +244,6 @@ void Tuya::handle_datapoint_(const uint8_t *buffer, size_t len) {
   }
   if (!found) {
     this->datapoints_.push_back(datapoint);
-    // New datapoint found, reprint dump_config after a delay.
-    this->set_timeout("datapoint_dump", 100, [this] { this->dump_config(); });
   }
 
   // Run through listeners
@@ -227,9 +255,12 @@ void Tuya::handle_datapoint_(const uint8_t *buffer, size_t len) {
 void Tuya::send_command_(TuyaCommandType command, const uint8_t *buffer, uint16_t len) {
   uint8_t len_hi = len >> 8;
   uint8_t len_lo = len >> 0;
-  this->write_array({0x55, 0xAA,
-                     0x00,  // version
-                     (uint8_t) command, len_hi, len_lo});
+  uint8_t version = 0;
+
+  ESP_LOGV(TAG, "Sending Tuya: CMD=0x%02X VERSION=%u DATA=[%s] INIT_STATE=%u", command, version,  // NOLINT
+           hexencode(buffer, len).c_str(), this->init_state_);
+
+  this->write_array({0x55, 0xAA, version, (uint8_t) command, len_hi, len_lo});
   if (len != 0)
     this->write_array(buffer, len);
 
@@ -278,7 +309,7 @@ void Tuya::set_datapoint_value(TuyaDatapoint datapoint) {
   buffer.push_back(data.size() >> 8);
   buffer.push_back(data.size() >> 0);
   buffer.insert(buffer.end(), data.begin(), data.end());
-  this->send_command_(TuyaCommandType::SET_DATAPOINT, buffer.data(), buffer.size());
+  this->send_command_(TuyaCommandType::DATAPOINT_DELIVER, buffer.data(), buffer.size());
 }
 
 void Tuya::register_listener(uint8_t datapoint_id, const std::function<void(TuyaDatapoint)> &func) {
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
index 6bc6d92da0..2fc9a16d44 100644
--- a/esphome/components/tuya/tuya.h
+++ b/esphome/components/tuya/tuya.h
@@ -34,19 +34,29 @@ struct TuyaDatapointListener {
 
 enum class TuyaCommandType : uint8_t {
   HEARTBEAT = 0x00,
-  QUERY_PRODUCT = 0x01,
-  MCU_CONF = 0x02,
+  PRODUCT_QUERY = 0x01,
+  CONF_QUERY = 0x02,
   WIFI_STATE = 0x03,
   WIFI_RESET = 0x04,
   WIFI_SELECT = 0x05,
-  SET_DATAPOINT = 0x06,
-  STATE = 0x07,
-  QUERY_STATE = 0x08,
+  DATAPOINT_DELIVER = 0x06,
+  DATAPOINT_REPORT = 0x07,
+  DATAPOINT_QUERY = 0x08,
+  WIFI_TEST = 0x0E,
+};
+
+enum class TuyaInitState : uint8_t {
+  INIT_HEARTBEAT = 0x00,
+  INIT_PRODUCT,
+  INIT_CONF,
+  INIT_WIFI,
+  INIT_DATAPOINT,
+  INIT_DONE,
 };
 
 class Tuya : public Component, public uart::UARTDevice {
  public:
-  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+  float get_setup_priority() const override { return setup_priority::LATE; }
   void setup() override;
   void loop() override;
   void dump_config() override;
@@ -62,8 +72,10 @@ class Tuya : public Component, public uart::UARTDevice {
   void send_command_(TuyaCommandType command, const uint8_t *buffer, uint16_t len);
   void send_empty_command_(TuyaCommandType command) { this->send_command_(command, nullptr, 0); }
 
+  TuyaInitState init_state_ = TuyaInitState::INIT_HEARTBEAT;
   int gpio_status_ = -1;
   int gpio_reset_ = -1;
+  std::string product_ = "";
   std::vector<TuyaDatapointListener> listeners_;
   std::vector<TuyaDatapoint> datapoints_;
   std::vector<uint8_t> rx_message_;

From 1814e4a46bf7ec7eb42294c44e8535b24ee06348 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sat, 16 Nov 2019 12:34:11 -0300
Subject: [PATCH 091/412] Add climate dry fan (#845)

* add climate dry fan

* clang-format

* updates, add swing mode, add back compat with old ha

* revert client-config add swing

* sort const.py

* fix missing retur
---
 esphome/components/api/api.proto              |  27 ++++
 esphome/components/api/api_connection.cpp     |  21 ++-
 esphome/components/api/api_pb2.cpp            | 124 ++++++++++++++++
 esphome/components/api/api_pb2.h              |  69 ++++++---
 esphome/components/api/api_pb2_service.cpp    |   2 +
 esphome/components/api/api_pb2_service.h      |   2 +
 esphome/components/climate/__init__.py        |  38 ++++-
 esphome/components/climate/automation.h       |   4 +
 esphome/components/climate/climate.cpp        | 108 ++++++++++++++
 esphome/components/climate/climate.h          |  24 ++++
 esphome/components/climate/climate_mode.cpp   |  44 ++++++
 esphome/components/climate/climate_mode.h     |  46 ++++++
 esphome/components/climate/climate_traits.cpp |  94 +++++++++++++
 esphome/components/climate/climate_traits.h   |  40 ++++++
 esphome/components/climate_ir/climate_ir.cpp  |  56 +++++++-
 esphome/components/climate_ir/climate_ir.h    |  13 +-
 esphome/components/coolix/coolix.cpp          | 133 +++++++++++-------
 esphome/components/coolix/coolix.h            |  17 ++-
 esphome/components/mqtt/mqtt_climate.cpp      |  10 ++
 esphome/const.py                              |   2 +
 script/api_protobuf/api_protobuf.py           |  35 ++++-
 21 files changed, 824 insertions(+), 85 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 4e55744384..2e01856a3b 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -653,6 +653,25 @@ enum ClimateMode {
   CLIMATE_MODE_AUTO = 1;
   CLIMATE_MODE_COOL = 2;
   CLIMATE_MODE_HEAT = 3;
+  CLIMATE_MODE_FAN_ONLY = 4;
+  CLIMATE_MODE_DRY = 5;
+}
+enum ClimateFanMode {
+  CLIMATE_FAN_ON = 0;
+  CLIMATE_FAN_OFF = 1;
+  CLIMATE_FAN_AUTO = 2;
+  CLIMATE_FAN_LOW = 3;
+  CLIMATE_FAN_MEDIUM = 4;
+  CLIMATE_FAN_HIGH = 5;
+  CLIMATE_FAN_MIDDLE = 6;
+  CLIMATE_FAN_FOCUS = 7;
+  CLIMATE_FAN_DIFFUSE = 8;
+}
+enum ClimateSwingMode {
+  CLIMATE_SWING_OFF = 0;
+  CLIMATE_SWING_BOTH = 1;
+  CLIMATE_SWING_VERTICAL = 2;
+  CLIMATE_SWINT_HORIZONTAL = 3;
 }
 enum ClimateAction {
   CLIMATE_ACTION_OFF = 0;
@@ -678,6 +697,8 @@ message ListEntitiesClimateResponse {
   float visual_temperature_step = 10;
   bool supports_away = 11;
   bool supports_action = 12;
+  repeated ClimateFanMode supported_fan_modes = 13;
+  repeated ClimateSwingMode supported_swing_modes = 14;
 }
 message ClimateStateResponse {
   option (id) = 47;
@@ -693,6 +714,8 @@ message ClimateStateResponse {
   float target_temperature_high = 6;
   bool away = 7;
   ClimateAction action = 8;
+  ClimateFanMode fan_mode = 9;
+  ClimateSwingMode swing_mode = 10;
 }
 message ClimateCommandRequest {
   option (id) = 48;
@@ -711,4 +734,8 @@ message ClimateCommandRequest {
   float target_temperature_high = 9;
   bool has_away = 10;
   bool away = 11;
+  bool has_fan_mode = 12;
+  ClimateFanMode fan_mode = 13;
+  bool has_swing_mode = 14;
+  ClimateSwingMode swing_mode = 15;
 }
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index a329e81cee..8844aa1e1a 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -458,6 +458,10 @@ bool APIConnection::send_climate_state(climate::Climate *climate) {
   }
   if (traits.get_supports_away())
     resp.away = climate->away;
+  if (traits.get_supports_fan_modes())
+    resp.fan_mode = static_cast<enums::ClimateFanMode>(climate->fan_mode);
+  if (traits.get_supports_swing_modes())
+    resp.swing_mode = static_cast<enums::ClimateSwingMode>(climate->swing_mode);
   return this->send_climate_state_response(resp);
 }
 bool APIConnection::send_climate_info(climate::Climate *climate) {
@@ -470,7 +474,7 @@ bool APIConnection::send_climate_info(climate::Climate *climate) {
   msg.supports_current_temperature = traits.get_supports_current_temperature();
   msg.supports_two_point_target_temperature = traits.get_supports_two_point_target_temperature();
   for (auto mode : {climate::CLIMATE_MODE_AUTO, climate::CLIMATE_MODE_OFF, climate::CLIMATE_MODE_COOL,
-                    climate::CLIMATE_MODE_HEAT}) {
+                    climate::CLIMATE_MODE_HEAT, climate::CLIMATE_MODE_DRY, climate::CLIMATE_MODE_FAN_ONLY}) {
     if (traits.supports_mode(mode))
       msg.supported_modes.push_back(static_cast<enums::ClimateMode>(mode));
   }
@@ -479,6 +483,17 @@ bool APIConnection::send_climate_info(climate::Climate *climate) {
   msg.visual_temperature_step = traits.get_visual_temperature_step();
   msg.supports_away = traits.get_supports_away();
   msg.supports_action = traits.get_supports_action();
+  for (auto fan_mode : {climate::CLIMATE_FAN_ON, climate::CLIMATE_FAN_OFF, climate::CLIMATE_FAN_AUTO,
+                        climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM, climate::CLIMATE_FAN_HIGH,
+                        climate::CLIMATE_FAN_MIDDLE, climate::CLIMATE_FAN_FOCUS, climate::CLIMATE_FAN_DIFFUSE}) {
+    if (traits.supports_fan_mode(fan_mode))
+      msg.supported_fan_modes.push_back(static_cast<enums::ClimateFanMode>(fan_mode));
+  }
+  for (auto swing_mode : {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_BOTH, climate::CLIMATE_SWING_VERTICAL,
+                          climate::CLIMATE_SWING_HORIZONTAL}) {
+    if (traits.supports_swing_mode(swing_mode))
+      msg.supported_swing_modes.push_back(static_cast<enums::ClimateSwingMode>(swing_mode));
+  }
   return this->send_list_entities_climate_response(msg);
 }
 void APIConnection::climate_command(const ClimateCommandRequest &msg) {
@@ -497,6 +512,10 @@ void APIConnection::climate_command(const ClimateCommandRequest &msg) {
     call.set_target_temperature_high(msg.target_temperature_high);
   if (msg.has_away)
     call.set_away(msg.away);
+  if (msg.has_fan_mode)
+    call.set_fan_mode(static_cast<climate::ClimateFanMode>(msg.fan_mode));
+  if (msg.has_swing_mode)
+    call.set_swing_mode(static_cast<climate::ClimateSwingMode>(msg.swing_mode));
   call.perform();
 }
 #endif
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 0b6021c224..cca488decf 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -1,3 +1,5 @@
+// This file was automatically generated with a tool.
+// See scripts/api_protobuf/api_protobuf.py
 #include "api_pb2.h"
 #include "esphome/core/log.h"
 
@@ -102,6 +104,48 @@ template<> const char *proto_enum_to_string<enums::ClimateMode>(enums::ClimateMo
       return "CLIMATE_MODE_COOL";
     case enums::CLIMATE_MODE_HEAT:
       return "CLIMATE_MODE_HEAT";
+    case enums::CLIMATE_MODE_FAN_ONLY:
+      return "CLIMATE_MODE_FAN_ONLY";
+    case enums::CLIMATE_MODE_DRY:
+      return "CLIMATE_MODE_DRY";
+    default:
+      return "UNKNOWN";
+  }
+}
+template<> const char *proto_enum_to_string<enums::ClimateFanMode>(enums::ClimateFanMode value) {
+  switch (value) {
+    case enums::CLIMATE_FAN_ON:
+      return "CLIMATE_FAN_ON";
+    case enums::CLIMATE_FAN_OFF:
+      return "CLIMATE_FAN_OFF";
+    case enums::CLIMATE_FAN_AUTO:
+      return "CLIMATE_FAN_AUTO";
+    case enums::CLIMATE_FAN_LOW:
+      return "CLIMATE_FAN_LOW";
+    case enums::CLIMATE_FAN_MEDIUM:
+      return "CLIMATE_FAN_MEDIUM";
+    case enums::CLIMATE_FAN_HIGH:
+      return "CLIMATE_FAN_HIGH";
+    case enums::CLIMATE_FAN_MIDDLE:
+      return "CLIMATE_FAN_MIDDLE";
+    case enums::CLIMATE_FAN_FOCUS:
+      return "CLIMATE_FAN_FOCUS";
+    case enums::CLIMATE_FAN_DIFFUSE:
+      return "CLIMATE_FAN_DIFFUSE";
+    default:
+      return "UNKNOWN";
+  }
+}
+template<> const char *proto_enum_to_string<enums::ClimateSwingMode>(enums::ClimateSwingMode value) {
+  switch (value) {
+    case enums::CLIMATE_SWING_OFF:
+      return "CLIMATE_SWING_OFF";
+    case enums::CLIMATE_SWING_BOTH:
+      return "CLIMATE_SWING_BOTH";
+    case enums::CLIMATE_SWING_VERTICAL:
+      return "CLIMATE_SWING_VERTICAL";
+    case enums::CLIMATE_SWINT_HORIZONTAL:
+      return "CLIMATE_SWINT_HORIZONTAL";
     default:
       return "UNKNOWN";
   }
@@ -2458,6 +2502,14 @@ bool ListEntitiesClimateResponse::decode_varint(uint32_t field_id, ProtoVarInt v
       this->supports_action = value.as_bool();
       return true;
     }
+    case 13: {
+      this->supported_fan_modes.push_back(value.as_enum<enums::ClimateFanMode>());
+      return true;
+    }
+    case 14: {
+      this->supported_swing_modes.push_back(value.as_enum<enums::ClimateSwingMode>());
+      return true;
+    }
     default:
       return false;
   }
@@ -2517,6 +2569,12 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(10, this->visual_temperature_step);
   buffer.encode_bool(11, this->supports_away);
   buffer.encode_bool(12, this->supports_action);
+  for (auto &it : this->supported_fan_modes) {
+    buffer.encode_enum<enums::ClimateFanMode>(13, it, true);
+  }
+  for (auto &it : this->supported_swing_modes) {
+    buffer.encode_enum<enums::ClimateSwingMode>(14, it, true);
+  }
 }
 void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -2574,6 +2632,18 @@ void ListEntitiesClimateResponse::dump_to(std::string &out) const {
   out.append("  supports_action: ");
   out.append(YESNO(this->supports_action));
   out.append("\n");
+
+  for (const auto &it : this->supported_fan_modes) {
+    out.append("  supported_fan_modes: ");
+    out.append(proto_enum_to_string<enums::ClimateFanMode>(it));
+    out.append("\n");
+  }
+
+  for (const auto &it : this->supported_swing_modes) {
+    out.append("  supported_swing_modes: ");
+    out.append(proto_enum_to_string<enums::ClimateSwingMode>(it));
+    out.append("\n");
+  }
   out.append("}");
 }
 bool ClimateStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
@@ -2590,6 +2660,14 @@ bool ClimateStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       this->action = value.as_enum<enums::ClimateAction>();
       return true;
     }
+    case 9: {
+      this->fan_mode = value.as_enum<enums::ClimateFanMode>();
+      return true;
+    }
+    case 10: {
+      this->swing_mode = value.as_enum<enums::ClimateSwingMode>();
+      return true;
+    }
     default:
       return false;
   }
@@ -2629,6 +2707,8 @@ void ClimateStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(6, this->target_temperature_high);
   buffer.encode_bool(7, this->away);
   buffer.encode_enum<enums::ClimateAction>(8, this->action);
+  buffer.encode_enum<enums::ClimateFanMode>(9, this->fan_mode);
+  buffer.encode_enum<enums::ClimateSwingMode>(10, this->swing_mode);
 }
 void ClimateStateResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -2669,6 +2749,14 @@ void ClimateStateResponse::dump_to(std::string &out) const {
   out.append("  action: ");
   out.append(proto_enum_to_string<enums::ClimateAction>(this->action));
   out.append("\n");
+
+  out.append("  fan_mode: ");
+  out.append(proto_enum_to_string<enums::ClimateFanMode>(this->fan_mode));
+  out.append("\n");
+
+  out.append("  swing_mode: ");
+  out.append(proto_enum_to_string<enums::ClimateSwingMode>(this->swing_mode));
+  out.append("\n");
   out.append("}");
 }
 bool ClimateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
@@ -2701,6 +2789,22 @@ bool ClimateCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value)
       this->away = value.as_bool();
       return true;
     }
+    case 12: {
+      this->has_fan_mode = value.as_bool();
+      return true;
+    }
+    case 13: {
+      this->fan_mode = value.as_enum<enums::ClimateFanMode>();
+      return true;
+    }
+    case 14: {
+      this->has_swing_mode = value.as_bool();
+      return true;
+    }
+    case 15: {
+      this->swing_mode = value.as_enum<enums::ClimateSwingMode>();
+      return true;
+    }
     default:
       return false;
   }
@@ -2739,6 +2843,10 @@ void ClimateCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(9, this->target_temperature_high);
   buffer.encode_bool(10, this->has_away);
   buffer.encode_bool(11, this->away);
+  buffer.encode_bool(12, this->has_fan_mode);
+  buffer.encode_enum<enums::ClimateFanMode>(13, this->fan_mode);
+  buffer.encode_bool(14, this->has_swing_mode);
+  buffer.encode_enum<enums::ClimateSwingMode>(15, this->swing_mode);
 }
 void ClimateCommandRequest::dump_to(std::string &out) const {
   char buffer[64];
@@ -2790,6 +2898,22 @@ void ClimateCommandRequest::dump_to(std::string &out) const {
   out.append("  away: ");
   out.append(YESNO(this->away));
   out.append("\n");
+
+  out.append("  has_fan_mode: ");
+  out.append(YESNO(this->has_fan_mode));
+  out.append("\n");
+
+  out.append("  fan_mode: ");
+  out.append(proto_enum_to_string<enums::ClimateFanMode>(this->fan_mode));
+  out.append("\n");
+
+  out.append("  has_swing_mode: ");
+  out.append(YESNO(this->has_swing_mode));
+  out.append("\n");
+
+  out.append("  swing_mode: ");
+  out.append(proto_enum_to_string<enums::ClimateSwingMode>(this->swing_mode));
+  out.append("\n");
   out.append("}");
 }
 
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 3fe64fcb61..fc855a889a 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -1,3 +1,5 @@
+// This file was automatically generated with a tool.
+// See scripts/api_protobuf/api_protobuf.py
 #pragma once
 
 #include "proto.h"
@@ -50,6 +52,25 @@ enum ClimateMode : uint32_t {
   CLIMATE_MODE_AUTO = 1,
   CLIMATE_MODE_COOL = 2,
   CLIMATE_MODE_HEAT = 3,
+  CLIMATE_MODE_FAN_ONLY = 4,
+  CLIMATE_MODE_DRY = 5,
+};
+enum ClimateFanMode : uint32_t {
+  CLIMATE_FAN_ON = 0,
+  CLIMATE_FAN_OFF = 1,
+  CLIMATE_FAN_AUTO = 2,
+  CLIMATE_FAN_LOW = 3,
+  CLIMATE_FAN_MEDIUM = 4,
+  CLIMATE_FAN_HIGH = 5,
+  CLIMATE_FAN_MIDDLE = 6,
+  CLIMATE_FAN_FOCUS = 7,
+  CLIMATE_FAN_DIFFUSE = 8,
+};
+enum ClimateSwingMode : uint32_t {
+  CLIMATE_SWING_OFF = 0,
+  CLIMATE_SWING_BOTH = 1,
+  CLIMATE_SWING_VERTICAL = 2,
+  CLIMATE_SWINT_HORIZONTAL = 3,
 };
 enum ClimateAction : uint32_t {
   CLIMATE_ACTION_OFF = 0,
@@ -643,18 +664,20 @@ class CameraImageRequest : public ProtoMessage {
 };
 class ListEntitiesClimateResponse : public ProtoMessage {
  public:
-  std::string object_id{};                            // NOLINT
-  uint32_t key{0};                                    // NOLINT
-  std::string name{};                                 // NOLINT
-  std::string unique_id{};                            // NOLINT
-  bool supports_current_temperature{false};           // NOLINT
-  bool supports_two_point_target_temperature{false};  // NOLINT
-  std::vector<enums::ClimateMode> supported_modes{};  // NOLINT
-  float visual_min_temperature{0.0f};                 // NOLINT
-  float visual_max_temperature{0.0f};                 // NOLINT
-  float visual_temperature_step{0.0f};                // NOLINT
-  bool supports_away{false};                          // NOLINT
-  bool supports_action{false};                        // NOLINT
+  std::string object_id{};                                       // NOLINT
+  uint32_t key{0};                                               // NOLINT
+  std::string name{};                                            // NOLINT
+  std::string unique_id{};                                       // NOLINT
+  bool supports_current_temperature{false};                      // NOLINT
+  bool supports_two_point_target_temperature{false};             // NOLINT
+  std::vector<enums::ClimateMode> supported_modes{};             // NOLINT
+  float visual_min_temperature{0.0f};                            // NOLINT
+  float visual_max_temperature{0.0f};                            // NOLINT
+  float visual_temperature_step{0.0f};                           // NOLINT
+  bool supports_away{false};                                     // NOLINT
+  bool supports_action{false};                                   // NOLINT
+  std::vector<enums::ClimateFanMode> supported_fan_modes{};      // NOLINT
+  std::vector<enums::ClimateSwingMode> supported_swing_modes{};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -665,14 +688,16 @@ class ListEntitiesClimateResponse : public ProtoMessage {
 };
 class ClimateStateResponse : public ProtoMessage {
  public:
-  uint32_t key{0};                      // NOLINT
-  enums::ClimateMode mode{};            // NOLINT
-  float current_temperature{0.0f};      // NOLINT
-  float target_temperature{0.0f};       // NOLINT
-  float target_temperature_low{0.0f};   // NOLINT
-  float target_temperature_high{0.0f};  // NOLINT
-  bool away{false};                     // NOLINT
-  enums::ClimateAction action{};        // NOLINT
+  uint32_t key{0};                       // NOLINT
+  enums::ClimateMode mode{};             // NOLINT
+  float current_temperature{0.0f};       // NOLINT
+  float target_temperature{0.0f};        // NOLINT
+  float target_temperature_low{0.0f};    // NOLINT
+  float target_temperature_high{0.0f};   // NOLINT
+  bool away{false};                      // NOLINT
+  enums::ClimateAction action{};         // NOLINT
+  enums::ClimateFanMode fan_mode{};      // NOLINT
+  enums::ClimateSwingMode swing_mode{};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -693,6 +718,10 @@ class ClimateCommandRequest : public ProtoMessage {
   float target_temperature_high{0.0f};      // NOLINT
   bool has_away{false};                     // NOLINT
   bool away{false};                         // NOLINT
+  bool has_fan_mode{false};                 // NOLINT
+  enums::ClimateFanMode fan_mode{};         // NOLINT
+  bool has_swing_mode{false};               // NOLINT
+  enums::ClimateSwingMode swing_mode{};     // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
diff --git a/esphome/components/api/api_pb2_service.cpp b/esphome/components/api/api_pb2_service.cpp
index 13e123c10f..ea6b647c72 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -1,3 +1,5 @@
+// This file was automatically generated with a tool.
+// See scripts/api_protobuf/api_protobuf.py
 #include "api_pb2_service.h"
 #include "esphome/core/log.h"
 
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index 16662811fe..afbe39e314 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -1,3 +1,5 @@
+// This file was automatically generated with a tool.
+// See scripts/api_protobuf/api_protobuf.py
 #pragma once
 
 #include "api_pb2.h"
diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index 8c9db58694..843b888218 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -5,7 +5,7 @@ from esphome.components import mqtt
 from esphome.const import CONF_AWAY, CONF_ID, CONF_INTERNAL, CONF_MAX_TEMPERATURE, \
     CONF_MIN_TEMPERATURE, CONF_MODE, CONF_TARGET_TEMPERATURE, \
     CONF_TARGET_TEMPERATURE_HIGH, CONF_TARGET_TEMPERATURE_LOW, CONF_TEMPERATURE_STEP, CONF_VISUAL, \
-    CONF_MQTT_ID, CONF_NAME
+    CONF_MQTT_ID, CONF_NAME, CONF_FAN_MODE, CONF_SWING_MODE
 from esphome.core import CORE, coroutine, coroutine_with_priority
 
 IS_PLATFORM_COMPONENT = True
@@ -22,9 +22,35 @@ CLIMATE_MODES = {
     'AUTO': ClimateMode.CLIMATE_MODE_AUTO,
     'COOL': ClimateMode.CLIMATE_MODE_COOL,
     'HEAT': ClimateMode.CLIMATE_MODE_HEAT,
+    'DRY': ClimateMode.CLIMATE_MODE_DRY,
+    'FAN_ONLY': ClimateMode.CLIMATE_MODE_FAN_ONLY,
+}
+validate_climate_mode = cv.enum(CLIMATE_MODES, upper=True)
+
+ClimateFanMode = climate_ns.enum('ClimateFanMode')
+CLIMATE_FAN_MODES = {
+    'ON': ClimateFanMode.CLIMATE_FAN_ON,
+    'OFF': ClimateFanMode.CLIMATE_FAN_OFF,
+    'AUTO': ClimateFanMode.CLIMATE_FAN_AUTO,
+    'LOW': ClimateFanMode.CLIMATE_FAN_LOW,
+    'MEDIUM': ClimateFanMode.CLIMATE_FAN_MEDIUM,
+    'HIGH': ClimateFanMode.CLIMATE_FAN_HIGH,
+    'MIDDLE': ClimateFanMode.CLIMATE_FAN_MIDDLE,
+    'FOCUS': ClimateFanMode.CLIMATE_FAN_FOCUS,
+    'DIFFUSE': ClimateFanMode.CLIMATE_FAN_DIFFUSE,
 }
 
-validate_climate_mode = cv.enum(CLIMATE_MODES, upper=True)
+validate_climate_fan_mode = cv.enum(CLIMATE_FAN_MODES, upper=True)
+
+ClimateSwingMode = climate_ns.enum('ClimateSwingMode')
+CLIMATE_SWING_MODES = {
+    'OFF': ClimateSwingMode.CLIMATE_SWING_OFF,
+    'BOTH': ClimateSwingMode.CLIMATE_SWING_BOTH,
+    'VERTICAL': ClimateSwingMode.CLIMATE_SWING_VERTICAL,
+    'HORIZONTAL': ClimateSwingMode.CLIMATE_SWING_HORIZONTAL,
+}
+
+validate_climate_swing_mode = cv.enum(CLIMATE_SWING_MODES, upper=True)
 
 # Actions
 ControlAction = climate_ns.class_('ControlAction', automation.Action)
@@ -74,6 +100,8 @@ CLIMATE_CONTROL_ACTION_SCHEMA = cv.Schema({
     cv.Optional(CONF_TARGET_TEMPERATURE_LOW): cv.templatable(cv.temperature),
     cv.Optional(CONF_TARGET_TEMPERATURE_HIGH): cv.templatable(cv.temperature),
     cv.Optional(CONF_AWAY): cv.templatable(cv.boolean),
+    cv.Optional(CONF_FAN_MODE): cv.templatable(validate_climate_fan_mode),
+    cv.Optional(CONF_SWING_MODE): cv.templatable(validate_climate_swing_mode),
 })
 
 
@@ -96,6 +124,12 @@ def climate_control_to_code(config, action_id, template_arg, args):
     if CONF_AWAY in config:
         template_ = yield cg.templatable(config[CONF_AWAY], args, bool)
         cg.add(var.set_away(template_))
+    if CONF_FAN_MODE in config:
+        template_ = yield cg.templatable(config[CONF_FAN_MODE], args, ClimateFanMode)
+        cg.add(var.set_fan_mode(template_))
+    if CONF_SWING_MODE in config:
+        template_ = yield cg.templatable(config[CONF_SWING_MODE], args, ClimateSwingMode)
+        cg.add(var.set_swing_mode(template_))
     yield var
 
 
diff --git a/esphome/components/climate/automation.h b/esphome/components/climate/automation.h
index 845773a0ab..0cd52b1036 100644
--- a/esphome/components/climate/automation.h
+++ b/esphome/components/climate/automation.h
@@ -15,6 +15,8 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(float, target_temperature_low)
   TEMPLATABLE_VALUE(float, target_temperature_high)
   TEMPLATABLE_VALUE(bool, away)
+  TEMPLATABLE_VALUE(ClimateFanMode, fan_mode)
+  TEMPLATABLE_VALUE(ClimateSwingMode, swing_mode)
 
   void play(Ts... x) override {
     auto call = this->climate_->make_call();
@@ -23,6 +25,8 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
     call.set_target_temperature_low(this->target_temperature_low_.optional_value(x...));
     call.set_target_temperature_high(this->target_temperature_high_.optional_value(x...));
     call.set_away(this->away_.optional_value(x...));
+    call.set_fan_mode(this->fan_mode_.optional_value(x...));
+    call.set_swing_mode(this->swing_mode_.optional_value(x...));
     call.perform();
   }
 
diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index 7c7da6bb0c..443290ed6d 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -13,6 +13,14 @@ void ClimateCall::perform() {
     const char *mode_s = climate_mode_to_string(*this->mode_);
     ESP_LOGD(TAG, "  Mode: %s", mode_s);
   }
+  if (this->fan_mode_.has_value()) {
+    const char *fan_mode_s = climate_fan_mode_to_string(*this->fan_mode_);
+    ESP_LOGD(TAG, "  Fan: %s", fan_mode_s);
+  }
+  if (this->swing_mode_.has_value()) {
+    const char *swing_mode_s = climate_swing_mode_to_string(*this->swing_mode_);
+    ESP_LOGD(TAG, "  Swing: %s", swing_mode_s);
+  }
   if (this->target_temperature_.has_value()) {
     ESP_LOGD(TAG, "  Target Temperature: %.2f", *this->target_temperature_);
   }
@@ -36,6 +44,20 @@ void ClimateCall::validate_() {
       this->mode_.reset();
     }
   }
+  if (this->fan_mode_.has_value()) {
+    auto fan_mode = *this->fan_mode_;
+    if (!traits.supports_fan_mode(fan_mode)) {
+      ESP_LOGW(TAG, "  Fan Mode %s is not supported by this device!", climate_fan_mode_to_string(fan_mode));
+      this->fan_mode_.reset();
+    }
+  }
+  if (this->swing_mode_.has_value()) {
+    auto swing_mode = *this->swing_mode_;
+    if (!traits.supports_swing_mode(swing_mode)) {
+      ESP_LOGW(TAG, "  Swing Mode %s is not supported by this device!", climate_swing_mode_to_string(swing_mode));
+      this->swing_mode_.reset();
+    }
+  }
   if (this->target_temperature_.has_value()) {
     auto target = *this->target_temperature_;
     if (traits.get_supports_two_point_target_temperature()) {
@@ -91,11 +113,63 @@ ClimateCall &ClimateCall::set_mode(const std::string &mode) {
     this->set_mode(CLIMATE_MODE_COOL);
   } else if (str_equals_case_insensitive(mode, "HEAT")) {
     this->set_mode(CLIMATE_MODE_HEAT);
+  } else if (str_equals_case_insensitive(mode, "FAN_ONLY")) {
+    this->set_mode(CLIMATE_MODE_FAN_ONLY);
+  } else if (str_equals_case_insensitive(mode, "DRY")) {
+    this->set_mode(CLIMATE_MODE_DRY);
   } else {
     ESP_LOGW(TAG, "'%s' - Unrecognized mode %s", this->parent_->get_name().c_str(), mode.c_str());
   }
   return *this;
 }
+ClimateCall &ClimateCall::set_fan_mode(ClimateFanMode fan_mode) {
+  this->fan_mode_ = fan_mode;
+  return *this;
+}
+ClimateCall &ClimateCall::set_fan_mode(const std::string &fan_mode) {
+  if (str_equals_case_insensitive(fan_mode, "ON")) {
+    this->set_fan_mode(CLIMATE_FAN_ON);
+  } else if (str_equals_case_insensitive(fan_mode, "OFF")) {
+    this->set_fan_mode(CLIMATE_FAN_OFF);
+  } else if (str_equals_case_insensitive(fan_mode, "AUTO")) {
+    this->set_fan_mode(CLIMATE_FAN_AUTO);
+  } else if (str_equals_case_insensitive(fan_mode, "LOW")) {
+    this->set_fan_mode(CLIMATE_FAN_LOW);
+  } else if (str_equals_case_insensitive(fan_mode, "MEDIUM")) {
+    this->set_fan_mode(CLIMATE_FAN_MEDIUM);
+  } else if (str_equals_case_insensitive(fan_mode, "HIGH")) {
+    this->set_fan_mode(CLIMATE_FAN_HIGH);
+  } else if (str_equals_case_insensitive(fan_mode, "MIDDLE")) {
+    this->set_fan_mode(CLIMATE_FAN_MIDDLE);
+  } else if (str_equals_case_insensitive(fan_mode, "FOCUS")) {
+    this->set_fan_mode(CLIMATE_FAN_FOCUS);
+  } else if (str_equals_case_insensitive(fan_mode, "DIFFUSE")) {
+    this->set_fan_mode(CLIMATE_FAN_DIFFUSE);
+  } else {
+    ESP_LOGW(TAG, "'%s' - Unrecognized fan mode %s", this->parent_->get_name().c_str(), fan_mode.c_str());
+  }
+  return *this;
+}
+
+ClimateCall &ClimateCall::set_swing_mode(ClimateSwingMode swing_mode) {
+  this->swing_mode_ = swing_mode;
+  return *this;
+}
+ClimateCall &ClimateCall::set_swing_mode(const std::string &swing_mode) {
+  if (str_equals_case_insensitive(swing_mode, "OFF")) {
+    this->set_swing_mode(CLIMATE_SWING_OFF);
+  } else if (str_equals_case_insensitive(swing_mode, "BOTH")) {
+    this->set_swing_mode(CLIMATE_SWING_BOTH);
+  } else if (str_equals_case_insensitive(swing_mode, "VERTICAL")) {
+    this->set_swing_mode(CLIMATE_SWING_VERTICAL);
+  } else if (str_equals_case_insensitive(swing_mode, "HORIZONTAL")) {
+    this->set_swing_mode(CLIMATE_SWING_HORIZONTAL);
+  } else {
+    ESP_LOGW(TAG, "'%s' - Unrecognized swing mode %s", this->parent_->get_name().c_str(), swing_mode.c_str());
+  }
+  return *this;
+}
+
 ClimateCall &ClimateCall::set_target_temperature(float target_temperature) {
   this->target_temperature_ = target_temperature;
   return *this;
@@ -113,6 +187,8 @@ const optional<float> &ClimateCall::get_target_temperature() const { return this
 const optional<float> &ClimateCall::get_target_temperature_low() const { return this->target_temperature_low_; }
 const optional<float> &ClimateCall::get_target_temperature_high() const { return this->target_temperature_high_; }
 const optional<bool> &ClimateCall::get_away() const { return this->away_; }
+const optional<ClimateFanMode> &ClimateCall::get_fan_mode() const { return this->fan_mode_; }
+const optional<ClimateSwingMode> &ClimateCall::get_swing_mode() const { return this->swing_mode_; }
 ClimateCall &ClimateCall::set_away(bool away) {
   this->away_ = away;
   return *this;
@@ -137,6 +213,14 @@ ClimateCall &ClimateCall::set_mode(optional<ClimateMode> mode) {
   this->mode_ = mode;
   return *this;
 }
+ClimateCall &ClimateCall::set_fan_mode(optional<ClimateFanMode> fan_mode) {
+  this->fan_mode_ = fan_mode;
+  return *this;
+}
+ClimateCall &ClimateCall::set_swing_mode(optional<ClimateSwingMode> swing_mode) {
+  this->swing_mode_ = swing_mode;
+  return *this;
+}
 
 void Climate::add_on_state_callback(std::function<void()> &&callback) {
   this->state_callback_.add(std::move(callback));
@@ -165,6 +249,12 @@ void Climate::save_state_() {
   if (traits.get_supports_away()) {
     state.away = this->away;
   }
+  if (traits.get_supports_fan_modes()) {
+    state.fan_mode = this->fan_mode;
+  }
+  if (traits.get_supports_swing_modes()) {
+    state.swing_mode = this->swing_mode;
+  }
 
   this->rtc_.save(&state);
 }
@@ -176,6 +266,12 @@ void Climate::publish_state() {
   if (traits.get_supports_action()) {
     ESP_LOGD(TAG, "  Action: %s", climate_action_to_string(this->action));
   }
+  if (traits.get_supports_fan_modes()) {
+    ESP_LOGD(TAG, "  Fan Mode: %s", climate_fan_mode_to_string(this->fan_mode));
+  }
+  if (traits.get_supports_swing_modes()) {
+    ESP_LOGD(TAG, "  Swing Mode: %s", climate_swing_mode_to_string(this->swing_mode));
+  }
   if (traits.get_supports_current_temperature()) {
     ESP_LOGD(TAG, "  Current Temperature: %.2f°C", this->current_temperature);
   }
@@ -236,6 +332,12 @@ ClimateCall ClimateDeviceRestoreState::to_call(Climate *climate) {
   if (traits.get_supports_away()) {
     call.set_away(this->away);
   }
+  if (traits.get_supports_fan_modes()) {
+    call.set_fan_mode(this->fan_mode);
+  }
+  if (traits.get_supports_swing_modes()) {
+    call.set_swing_mode(this->swing_mode);
+  }
   return call;
 }
 void ClimateDeviceRestoreState::apply(Climate *climate) {
@@ -250,6 +352,12 @@ void ClimateDeviceRestoreState::apply(Climate *climate) {
   if (traits.get_supports_away()) {
     climate->away = this->away;
   }
+  if (traits.get_supports_fan_modes()) {
+    climate->fan_mode = this->fan_mode;
+  }
+  if (traits.get_supports_swing_modes()) {
+    climate->swing_mode = this->swing_mode;
+  }
   climate->publish_state();
 }
 
diff --git a/esphome/components/climate/climate.h b/esphome/components/climate/climate.h
index 4dd872bbed..786afe097a 100644
--- a/esphome/components/climate/climate.h
+++ b/esphome/components/climate/climate.h
@@ -64,6 +64,18 @@ class ClimateCall {
   ClimateCall &set_target_temperature_high(optional<float> target_temperature_high);
   ClimateCall &set_away(bool away);
   ClimateCall &set_away(optional<bool> away);
+  /// Set the fan mode of the climate device.
+  ClimateCall &set_fan_mode(ClimateFanMode fan_mode);
+  /// Set the fan mode of the climate device.
+  ClimateCall &set_fan_mode(optional<ClimateFanMode> fan_mode);
+  /// Set the fan mode of the climate device based on a string.
+  ClimateCall &set_fan_mode(const std::string &fan_mode);
+  /// Set the swing mode of the climate device.
+  ClimateCall &set_swing_mode(ClimateSwingMode swing_mode);
+  /// Set the swing mode of the climate device.
+  ClimateCall &set_swing_mode(optional<ClimateSwingMode> swing_mode);
+  /// Set the swing mode of the climate device based on a string.
+  ClimateCall &set_swing_mode(const std::string &swing_mode);
 
   void perform();
 
@@ -72,6 +84,8 @@ class ClimateCall {
   const optional<float> &get_target_temperature_low() const;
   const optional<float> &get_target_temperature_high() const;
   const optional<bool> &get_away() const;
+  const optional<ClimateFanMode> &get_fan_mode() const;
+  const optional<ClimateSwingMode> &get_swing_mode() const;
 
  protected:
   void validate_();
@@ -82,12 +96,16 @@ class ClimateCall {
   optional<float> target_temperature_low_;
   optional<float> target_temperature_high_;
   optional<bool> away_;
+  optional<ClimateFanMode> fan_mode_;
+  optional<ClimateSwingMode> swing_mode_;
 };
 
 /// Struct used to save the state of the climate device in restore memory.
 struct ClimateDeviceRestoreState {
   ClimateMode mode;
   bool away;
+  ClimateFanMode fan_mode;
+  ClimateSwingMode swing_mode;
   union {
     float target_temperature;
     struct {
@@ -149,6 +167,12 @@ class Climate : public Nameable {
    */
   bool away{false};
 
+  /// The active fan mode of the climate device.
+  ClimateFanMode fan_mode;
+
+  /// The active swing mode of the climate device.
+  ClimateSwingMode swing_mode;
+
   /** Add a callback for the climate device state, each time the state of the climate device is updated
    * (using publish_state), this callback will be called.
    *
diff --git a/esphome/components/climate/climate_mode.cpp b/esphome/components/climate/climate_mode.cpp
index 34aa564fb0..aa06ce87f0 100644
--- a/esphome/components/climate/climate_mode.cpp
+++ b/esphome/components/climate/climate_mode.cpp
@@ -13,6 +13,10 @@ const char *climate_mode_to_string(ClimateMode mode) {
       return "COOL";
     case CLIMATE_MODE_HEAT:
       return "HEAT";
+    case CLIMATE_MODE_FAN_ONLY:
+      return "FAN_ONLY";
+    case CLIMATE_MODE_DRY:
+      return "DRY";
     default:
       return "UNKNOWN";
   }
@@ -30,5 +34,45 @@ const char *climate_action_to_string(ClimateAction action) {
   }
 }
 
+const char *climate_fan_mode_to_string(ClimateFanMode fan_mode) {
+  switch (fan_mode) {
+    case climate::CLIMATE_FAN_ON:
+      return "ON";
+    case climate::CLIMATE_FAN_OFF:
+      return "OFF";
+    case climate::CLIMATE_FAN_AUTO:
+      return "AUTO";
+    case climate::CLIMATE_FAN_LOW:
+      return "LOW";
+    case climate::CLIMATE_FAN_MEDIUM:
+      return "MEDIUM";
+    case climate::CLIMATE_FAN_HIGH:
+      return "HIGH";
+    case climate::CLIMATE_FAN_MIDDLE:
+      return "MIDDLE";
+    case climate::CLIMATE_FAN_FOCUS:
+      return "FOCUS";
+    case climate::CLIMATE_FAN_DIFFUSE:
+      return "DIFFUSE";
+    default:
+      return "UNKNOWN";
+  }
+}
+
+const char *climate_swing_mode_to_string(ClimateSwingMode swing_mode) {
+  switch (swing_mode) {
+    case climate::CLIMATE_SWING_OFF:
+      return "OFF";
+    case climate::CLIMATE_SWING_BOTH:
+      return "BOTH";
+    case climate::CLIMATE_SWING_VERTICAL:
+      return "VERTICAL";
+    case climate::CLIMATE_SWING_HORIZONTAL:
+      return "HORIZONTAL";
+    default:
+      return "UNKNOWN";
+  }
+}
+
 }  // namespace climate
 }  // namespace esphome
diff --git a/esphome/components/climate/climate_mode.h b/esphome/components/climate/climate_mode.h
index e5786286d8..83ef715402 100644
--- a/esphome/components/climate/climate_mode.h
+++ b/esphome/components/climate/climate_mode.h
@@ -15,6 +15,10 @@ enum ClimateMode : uint8_t {
   CLIMATE_MODE_COOL = 2,
   /// The climate device is manually set to heat mode (not in auto mode!)
   CLIMATE_MODE_HEAT = 3,
+  /// The climate device is manually set to fan only mode
+  CLIMATE_MODE_FAN_ONLY = 4,
+  /// The climate device is manually set to dry mode
+  CLIMATE_MODE_DRY = 5,
 };
 
 /// Enum for the current action of the climate device. Values match those of ClimateMode.
@@ -27,9 +31,51 @@ enum ClimateAction : uint8_t {
   CLIMATE_ACTION_HEATING = 3,
 };
 
+/// Enum for all modes a climate fan can be in
+enum ClimateFanMode : uint8_t {
+  /// The fan mode is set to On
+  CLIMATE_FAN_ON = 0,
+  /// The fan mode is set to Off
+  CLIMATE_FAN_OFF = 1,
+  /// The fan mode is set to Auto
+  CLIMATE_FAN_AUTO = 2,
+  /// The fan mode is set to Low
+  CLIMATE_FAN_LOW = 3,
+  /// The fan mode is set to Medium
+  CLIMATE_FAN_MEDIUM = 4,
+  /// The fan mode is set to High
+  CLIMATE_FAN_HIGH = 5,
+  /// The fan mode is set to Middle
+  CLIMATE_FAN_MIDDLE = 6,
+  /// The fan mode is set to Focus
+  CLIMATE_FAN_FOCUS = 7,
+  /// The fan mode is set to Diffuse
+  CLIMATE_FAN_DIFFUSE = 8,
+};
+
+/// Enum for all modes a climate swing can be in
+enum ClimateSwingMode : uint8_t {
+  /// The sing mode is set to Off
+  CLIMATE_SWING_OFF = 0,
+  /// The fan mode is set to Both
+  CLIMATE_SWING_BOTH = 1,
+  /// The fan mode is set to Vertical
+  CLIMATE_SWING_VERTICAL = 2,
+  /// The fan mode is set to Horizontal
+  CLIMATE_SWING_HORIZONTAL = 3,
+};
+
 /// Convert the given ClimateMode to a human-readable string.
 const char *climate_mode_to_string(ClimateMode mode);
+
+/// Convert the given ClimateAction to a human-readable string.
 const char *climate_action_to_string(ClimateAction action);
 
+/// Convert the given ClimateFanMode to a human-readable string.
+const char *climate_fan_mode_to_string(ClimateFanMode mode);
+
+/// Convert the given ClimateSwingMode to a human-readable string.
+const char *climate_swing_mode_to_string(ClimateSwingMode mode);
+
 }  // namespace climate
 }  // namespace esphome
diff --git a/esphome/components/climate/climate_traits.cpp b/esphome/components/climate/climate_traits.cpp
index a1db2bc696..6e941bddf0 100644
--- a/esphome/components/climate/climate_traits.cpp
+++ b/esphome/components/climate/climate_traits.cpp
@@ -14,6 +14,10 @@ bool ClimateTraits::supports_mode(ClimateMode mode) const {
       return this->supports_cool_mode_;
     case CLIMATE_MODE_HEAT:
       return this->supports_heat_mode_;
+    case CLIMATE_MODE_FAN_ONLY:
+      return this->supports_fan_only_mode_;
+    case CLIMATE_MODE_DRY:
+      return this->supports_dry_mode_;
     default:
       return false;
   }
@@ -29,6 +33,10 @@ void ClimateTraits::set_supports_two_point_target_temperature(bool supports_two_
 void ClimateTraits::set_supports_auto_mode(bool supports_auto_mode) { supports_auto_mode_ = supports_auto_mode; }
 void ClimateTraits::set_supports_cool_mode(bool supports_cool_mode) { supports_cool_mode_ = supports_cool_mode; }
 void ClimateTraits::set_supports_heat_mode(bool supports_heat_mode) { supports_heat_mode_ = supports_heat_mode; }
+void ClimateTraits::set_supports_fan_only_mode(bool supports_fan_only_mode) {
+  supports_fan_only_mode_ = supports_fan_only_mode;
+}
+void ClimateTraits::set_supports_dry_mode(bool supports_dry_mode) { supports_dry_mode_ = supports_dry_mode; }
 void ClimateTraits::set_supports_away(bool supports_away) { supports_away_ = supports_away; }
 void ClimateTraits::set_supports_action(bool supports_action) { supports_action_ = supports_action; }
 float ClimateTraits::get_visual_min_temperature() const { return visual_min_temperature_; }
@@ -55,5 +63,91 @@ void ClimateTraits::set_visual_temperature_step(float temperature_step) { visual
 bool ClimateTraits::get_supports_away() const { return supports_away_; }
 bool ClimateTraits::get_supports_action() const { return supports_action_; }
 
+void ClimateTraits::set_supports_fan_mode_on(bool supports_fan_mode_on) {
+  this->supports_fan_mode_on_ = supports_fan_mode_on;
+}
+void ClimateTraits::set_supports_fan_mode_off(bool supports_fan_mode_off) {
+  this->supports_fan_mode_off_ = supports_fan_mode_off;
+}
+void ClimateTraits::set_supports_fan_mode_auto(bool supports_fan_mode_auto) {
+  this->supports_fan_mode_auto_ = supports_fan_mode_auto;
+}
+void ClimateTraits::set_supports_fan_mode_low(bool supports_fan_mode_low) {
+  this->supports_fan_mode_low_ = supports_fan_mode_low;
+}
+void ClimateTraits::set_supports_fan_mode_medium(bool supports_fan_mode_medium) {
+  this->supports_fan_mode_medium_ = supports_fan_mode_medium;
+}
+void ClimateTraits::set_supports_fan_mode_high(bool supports_fan_mode_high) {
+  this->supports_fan_mode_high_ = supports_fan_mode_high;
+}
+void ClimateTraits::set_supports_fan_mode_middle(bool supports_fan_mode_middle) {
+  this->supports_fan_mode_middle_ = supports_fan_mode_middle;
+}
+void ClimateTraits::set_supports_fan_mode_focus(bool supports_fan_mode_focus) {
+  this->supports_fan_mode_focus_ = supports_fan_mode_focus;
+}
+void ClimateTraits::set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse) {
+  this->supports_fan_mode_diffuse_ = supports_fan_mode_diffuse;
+}
+bool ClimateTraits::supports_fan_mode(ClimateFanMode fan_mode) const {
+  switch (fan_mode) {
+    case climate::CLIMATE_FAN_ON:
+      return this->supports_fan_mode_on_;
+    case climate::CLIMATE_FAN_OFF:
+      return this->supports_fan_mode_off_;
+    case climate::CLIMATE_FAN_AUTO:
+      return this->supports_fan_mode_auto_;
+    case climate::CLIMATE_FAN_LOW:
+      return this->supports_fan_mode_low_;
+    case climate::CLIMATE_FAN_MEDIUM:
+      return this->supports_fan_mode_medium_;
+    case climate::CLIMATE_FAN_HIGH:
+      return this->supports_fan_mode_high_;
+    case climate::CLIMATE_FAN_MIDDLE:
+      return this->supports_fan_mode_middle_;
+    case climate::CLIMATE_FAN_FOCUS:
+      return this->supports_fan_mode_focus_;
+    case climate::CLIMATE_FAN_DIFFUSE:
+      return this->supports_fan_mode_diffuse_;
+    default:
+      return false;
+  }
+}
+bool ClimateTraits::get_supports_fan_modes() const {
+  return this->supports_fan_mode_on_ || this->supports_fan_mode_off_ || this->supports_fan_mode_auto_ ||
+         this->supports_fan_mode_low_ || this->supports_fan_mode_medium_ || this->supports_fan_mode_high_ ||
+         this->supports_fan_mode_middle_ || this->supports_fan_mode_focus_ || this->supports_fan_mode_diffuse_;
+}
+void ClimateTraits::set_supports_swing_mode_off(bool supports_swing_mode_off) {
+  this->supports_swing_mode_off_ = supports_swing_mode_off;
+}
+void ClimateTraits::set_supports_swing_mode_both(bool supports_swing_mode_both) {
+  this->supports_swing_mode_both_ = supports_swing_mode_both;
+}
+void ClimateTraits::set_supports_swing_mode_vertical(bool supports_swing_mode_vertical) {
+  this->supports_swing_mode_vertical_ = supports_swing_mode_vertical;
+}
+void ClimateTraits::set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal) {
+  this->supports_swing_mode_horizontal_ = supports_swing_mode_horizontal;
+}
+bool ClimateTraits::supports_swing_mode(ClimateSwingMode swing_mode) const {
+  switch (swing_mode) {
+    case climate::CLIMATE_SWING_OFF:
+      return this->supports_swing_mode_off_;
+    case climate::CLIMATE_SWING_BOTH:
+      return this->supports_swing_mode_both_;
+    case climate::CLIMATE_SWING_VERTICAL:
+      return this->supports_swing_mode_vertical_;
+    case climate::CLIMATE_SWING_HORIZONTAL:
+      return this->supports_swing_mode_horizontal_;
+    default:
+      return false;
+  }
+}
+bool ClimateTraits::get_supports_swing_modes() const {
+  return this->supports_swing_mode_off_ || this->supports_swing_mode_both_ || supports_swing_mode_vertical_ ||
+         supports_swing_mode_horizontal_;
+}
 }  // namespace climate
 }  // namespace esphome
diff --git a/esphome/components/climate/climate_traits.h b/esphome/components/climate/climate_traits.h
index 2d6f44eea6..347a7bc1f2 100644
--- a/esphome/components/climate/climate_traits.h
+++ b/esphome/components/climate/climate_traits.h
@@ -21,10 +21,16 @@ namespace climate {
  *    - auto mode (automatic control)
  *    - cool mode (lowers current temperature)
  *    - heat mode (increases current temperature)
+ *    - dry mode (removes humidity from air)
+ *    - fan mode (only turns on fan)
  *  - supports away - away mode means that the climate device supports two different
  *      target temperature settings: one target temp setting for "away" mode and one for non-away mode.
  *  - supports action - if the climate device supports reporting the active
  *    current action of the device with the action property.
+ *  - supports fan modes - optionally, if it has a fan which can be configured in different ways:
+ *    - on, off, auto, high, medium, low, middle, focus, diffuse
+ *  - supports swing modes - optionally, if it has a swing which can be configured in different ways:
+ *    - off, both, vertical, horizontal
  *
  * This class also contains static data for the climate device display:
  *  - visual min/max temperature - tells the frontend what range of temperatures the climate device
@@ -41,11 +47,30 @@ class ClimateTraits {
   void set_supports_auto_mode(bool supports_auto_mode);
   void set_supports_cool_mode(bool supports_cool_mode);
   void set_supports_heat_mode(bool supports_heat_mode);
+  void set_supports_fan_only_mode(bool supports_fan_only_mode);
+  void set_supports_dry_mode(bool supports_dry_mode);
   void set_supports_away(bool supports_away);
   bool get_supports_away() const;
   void set_supports_action(bool supports_action);
   bool get_supports_action() const;
   bool supports_mode(ClimateMode mode) const;
+  void set_supports_fan_mode_on(bool supports_fan_mode_on);
+  void set_supports_fan_mode_off(bool supports_fan_mode_off);
+  void set_supports_fan_mode_auto(bool supports_fan_mode_auto);
+  void set_supports_fan_mode_low(bool supports_fan_mode_low);
+  void set_supports_fan_mode_medium(bool supports_fan_mode_medium);
+  void set_supports_fan_mode_high(bool supports_fan_mode_high);
+  void set_supports_fan_mode_middle(bool supports_fan_mode_middle);
+  void set_supports_fan_mode_focus(bool supports_fan_mode_focus);
+  void set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse);
+  bool supports_fan_mode(ClimateFanMode fan_mode) const;
+  bool get_supports_fan_modes() const;
+  void set_supports_swing_mode_off(bool supports_swing_mode_off);
+  void set_supports_swing_mode_both(bool supports_swing_mode_both);
+  void set_supports_swing_mode_vertical(bool supports_swing_mode_vertical);
+  void set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal);
+  bool supports_swing_mode(ClimateSwingMode swing_mode) const;
+  bool get_supports_swing_modes() const;
 
   float get_visual_min_temperature() const;
   void set_visual_min_temperature(float visual_min_temperature);
@@ -61,8 +86,23 @@ class ClimateTraits {
   bool supports_auto_mode_{false};
   bool supports_cool_mode_{false};
   bool supports_heat_mode_{false};
+  bool supports_fan_only_mode_{false};
+  bool supports_dry_mode_{false};
   bool supports_away_{false};
   bool supports_action_{false};
+  bool supports_fan_mode_on_{false};
+  bool supports_fan_mode_off_{false};
+  bool supports_fan_mode_auto_{false};
+  bool supports_fan_mode_low_{false};
+  bool supports_fan_mode_medium_{false};
+  bool supports_fan_mode_high_{false};
+  bool supports_fan_mode_middle_{false};
+  bool supports_fan_mode_focus_{false};
+  bool supports_fan_mode_diffuse_{false};
+  bool supports_swing_mode_off_{false};
+  bool supports_swing_mode_both_{false};
+  bool supports_swing_mode_vertical_{false};
+  bool supports_swing_mode_horizontal_{false};
 
   float visual_min_temperature_{10};
   float visual_max_temperature_{30};
diff --git a/esphome/components/climate_ir/climate_ir.cpp b/esphome/components/climate_ir/climate_ir.cpp
index 4b9a1c0baa..8f06ff2214 100644
--- a/esphome/components/climate_ir/climate_ir.cpp
+++ b/esphome/components/climate_ir/climate_ir.cpp
@@ -12,11 +12,60 @@ climate::ClimateTraits ClimateIR::traits() {
   traits.set_supports_auto_mode(true);
   traits.set_supports_cool_mode(this->supports_cool_);
   traits.set_supports_heat_mode(this->supports_heat_);
+  traits.set_supports_dry_mode(this->supports_dry_);
+  traits.set_supports_fan_only_mode(this->supports_fan_only_);
   traits.set_supports_two_point_target_temperature(false);
   traits.set_supports_away(false);
   traits.set_visual_min_temperature(this->minimum_temperature_);
   traits.set_visual_max_temperature(this->maximum_temperature_);
   traits.set_visual_temperature_step(this->temperature_step_);
+  for (auto fan_mode : this->fan_modes_) {
+    switch (fan_mode) {
+      case climate::CLIMATE_FAN_AUTO:
+        traits.set_supports_fan_mode_auto(true);
+        break;
+      case climate::CLIMATE_FAN_DIFFUSE:
+        traits.set_supports_fan_mode_diffuse(true);
+        break;
+      case climate::CLIMATE_FAN_FOCUS:
+        traits.set_supports_fan_mode_focus(true);
+        break;
+      case climate::CLIMATE_FAN_HIGH:
+        traits.set_supports_fan_mode_high(true);
+        break;
+      case climate::CLIMATE_FAN_LOW:
+        traits.set_supports_fan_mode_low(true);
+        break;
+      case climate::CLIMATE_FAN_MEDIUM:
+        traits.set_supports_fan_mode_medium(true);
+        break;
+      case climate::CLIMATE_FAN_MIDDLE:
+        traits.set_supports_fan_mode_middle(true);
+        break;
+      case climate::CLIMATE_FAN_OFF:
+        traits.set_supports_fan_mode_off(true);
+        break;
+      case climate::CLIMATE_FAN_ON:
+        traits.set_supports_fan_mode_on(true);
+        break;
+    }
+  }
+  for (auto swing_mode : this->swing_modes_) {
+    switch (swing_mode) {
+      case climate::CLIMATE_SWING_OFF:
+        traits.set_supports_swing_mode_off(true);
+        break;
+      case climate::CLIMATE_SWING_BOTH:
+        traits.set_supports_swing_mode_both(true);
+        break;
+      case climate::CLIMATE_SWING_VERTICAL:
+        traits.set_supports_swing_mode_vertical(true);
+        break;
+      case climate::CLIMATE_SWING_HORIZONTAL:
+        traits.set_supports_swing_mode_horizontal(true);
+        break;
+    }
+  }
   return traits;
 }
 
@@ -40,6 +89,8 @@ void ClimateIR::setup() {
     // initialize target temperature to some value so that it's not NAN
     this->target_temperature =
         roundf(clamp(this->current_temperature, this->minimum_temperature_, this->maximum_temperature_));
+    this->fan_mode = climate::CLIMATE_FAN_AUTO;
+    this->swing_mode = climate::CLIMATE_SWING_OFF;
   }
   // Never send nan to HA
   if (isnan(this->target_temperature))
@@ -51,7 +102,10 @@ void ClimateIR::control(const climate::ClimateCall &call) {
     this->mode = *call.get_mode();
   if (call.get_target_temperature().has_value())
     this->target_temperature = *call.get_target_temperature();
-
+  if (call.get_fan_mode().has_value())
+    this->fan_mode = *call.get_fan_mode();
+  if (call.get_swing_mode().has_value())
+    this->swing_mode = *call.get_swing_mode();
   this->transmit_state();
   this->publish_state();
 }
diff --git a/esphome/components/climate_ir/climate_ir.h b/esphome/components/climate_ir/climate_ir.h
index b4c036f3d6..6dc5b43279 100644
--- a/esphome/components/climate_ir/climate_ir.h
+++ b/esphome/components/climate_ir/climate_ir.h
@@ -18,10 +18,17 @@ namespace climate_ir {
 */
 class ClimateIR : public climate::Climate, public Component, public remote_base::RemoteReceiverListener {
  public:
-  ClimateIR(float minimum_temperature, float maximum_temperature, float temperature_step = 1.0f) {
+  ClimateIR(float minimum_temperature, float maximum_temperature, float temperature_step = 1.0f,
+            bool supports_dry = false, bool supports_fan_only = false,
+            std::vector<climate::ClimateFanMode> fan_modes = {},
+            std::vector<climate::ClimateSwingMode> swing_modes = {}) {
     this->minimum_temperature_ = minimum_temperature;
     this->maximum_temperature_ = maximum_temperature;
     this->temperature_step_ = temperature_step;
+    this->supports_dry_ = supports_dry;
+    this->supports_fan_only_ = supports_fan_only;
+    this->fan_modes_ = fan_modes;
+    this->swing_modes_ = swing_modes;
   }
 
   void setup() override;
@@ -46,6 +53,10 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
 
   bool supports_cool_{true};
   bool supports_heat_{true};
+  bool supports_dry_{false};
+  bool supports_fan_only_{false};
+  std::vector<climate::ClimateFanMode> fan_modes_ = {};
+  std::vector<climate::ClimateSwingMode> swing_modes_ = {};
 
   remote_transmitter::RemoteTransmitterComponent *transmitter_;
   sensor::Sensor *sensor_{nullptr};
diff --git a/esphome/components/coolix/coolix.cpp b/esphome/components/coolix/coolix.cpp
index c08571c2e9..441f43b424 100644
--- a/esphome/components/coolix/coolix.cpp
+++ b/esphome/components/coolix/coolix.cpp
@@ -12,15 +12,13 @@ const uint32_t COOLIX_LED = 0xB5F5A5;
 const uint32_t COOLIX_SILENCE_FP = 0xB5F5B6;
 
 // On, 25C, Mode: Auto, Fan: Auto, Zone Follow: Off, Sensor Temp: Ignore.
-const uint32_t COOLIX_DEFAULT_STATE = 0xB2BFC8;
-const uint32_t COOLIX_DEFAULT_STATE_AUTO_24_FAN = 0xB21F48;
 const uint8_t COOLIX_COOL = 0b0000;
 const uint8_t COOLIX_DRY_FAN = 0b0100;
 const uint8_t COOLIX_AUTO = 0b1000;
 const uint8_t COOLIX_HEAT = 0b1100;
 const uint32_t COOLIX_MODE_MASK = 0b1100;
 const uint32_t COOLIX_FAN_MASK = 0xF000;
-const uint32_t COOLIX_FAN_DRY = 0x1000;
+const uint32_t COOLIX_FAN_MODE_AUTO_DRY = 0x1000;
 const uint32_t COOLIX_FAN_AUTO = 0xB000;
 const uint32_t COOLIX_FAN_MIN = 0x9000;
 const uint32_t COOLIX_FAN_MED = 0x5000;
@@ -28,23 +26,23 @@ const uint32_t COOLIX_FAN_MAX = 0x3000;
 
 // Temperature
 const uint8_t COOLIX_TEMP_RANGE = COOLIX_TEMP_MAX - COOLIX_TEMP_MIN + 1;
-const uint8_t COOLIX_FAN_TEMP_CODE = 0b1110;  // Part of Fan Mode.
+const uint8_t COOLIX_FAN_TEMP_CODE = 0b11100000;  // Part of Fan Mode.
 const uint32_t COOLIX_TEMP_MASK = 0b11110000;
 const uint8_t COOLIX_TEMP_MAP[COOLIX_TEMP_RANGE] = {
-    0b0000,  // 17C
-    0b0001,  // 18c
-    0b0011,  // 19C
-    0b0010,  // 20C
-    0b0110,  // 21C
-    0b0111,  // 22C
-    0b0101,  // 23C
-    0b0100,  // 24C
-    0b1100,  // 25C
-    0b1101,  // 26C
-    0b1001,  // 27C
-    0b1000,  // 28C
-    0b1010,  // 29C
-    0b1011   // 30C
+    0b00000000,  // 17C
+    0b00010000,  // 18c
+    0b00110000,  // 19C
+    0b00100000,  // 20C
+    0b01100000,  // 21C
+    0b01110000,  // 22C
+    0b01010000,  // 23C
+    0b01000000,  // 24C
+    0b11000000,  // 25C
+    0b11010000,  // 26C
+    0b10010000,  // 27C
+    0b10000000,  // 28C
+    0b10100000,  // 29C
+    0b10110000   // 30C
 };
 
 // Constants
@@ -59,29 +57,60 @@ static const uint32_t FOOTER_SPACE_US = HEADER_SPACE_US;
 const uint16_t COOLIX_BITS = 24;
 
 void CoolixClimate::transmit_state() {
-  uint32_t remote_state;
+  uint32_t remote_state = 0xB20F00;
 
-  switch (this->mode) {
-    case climate::CLIMATE_MODE_COOL:
-      remote_state = (COOLIX_DEFAULT_STATE & ~COOLIX_MODE_MASK) | COOLIX_COOL;
-      break;
-    case climate::CLIMATE_MODE_HEAT:
-      remote_state = (COOLIX_DEFAULT_STATE & ~COOLIX_MODE_MASK) | COOLIX_HEAT;
-      break;
-    case climate::CLIMATE_MODE_AUTO:
-      remote_state = COOLIX_DEFAULT_STATE_AUTO_24_FAN;
-      break;
-    case climate::CLIMATE_MODE_OFF:
-    default:
-      remote_state = COOLIX_OFF;
-      break;
+  if (send_swing_cmd_) {
+    send_swing_cmd_ = false;
+    remote_state = COOLIX_SWING;
+  } else {
+    switch (this->mode) {
+      case climate::CLIMATE_MODE_COOL:
+        remote_state |= COOLIX_COOL;
+        break;
+      case climate::CLIMATE_MODE_HEAT:
+        remote_state |= COOLIX_HEAT;
+        break;
+      case climate::CLIMATE_MODE_AUTO:
+        remote_state |= COOLIX_AUTO;
+        break;
+      case climate::CLIMATE_MODE_FAN_ONLY:
+      case climate::CLIMATE_MODE_DRY:
+        remote_state |= COOLIX_DRY_FAN;
+        break;
+      case climate::CLIMATE_MODE_OFF:
+      default:
+        remote_state = COOLIX_OFF;
+        break;
+    }
+    if (this->mode != climate::CLIMATE_MODE_OFF) {
+      if (this->mode != climate::CLIMATE_MODE_FAN_ONLY) {
+        auto temp = (uint8_t) roundf(clamp(this->target_temperature, COOLIX_TEMP_MIN, COOLIX_TEMP_MAX));
+        remote_state |= COOLIX_TEMP_MAP[temp - COOLIX_TEMP_MIN];
+      } else {
+        remote_state |= COOLIX_FAN_TEMP_CODE;
+      }
+      if (this->mode == climate::CLIMATE_MODE_AUTO || this->mode == climate::CLIMATE_MODE_DRY) {
+        this->fan_mode = climate::CLIMATE_FAN_AUTO;
+        remote_state |= COOLIX_FAN_MODE_AUTO_DRY;
+      } else {
+        switch (this->fan_mode) {
+          case climate::CLIMATE_FAN_HIGH:
+            remote_state |= COOLIX_FAN_MAX;
+            break;
+          case climate::CLIMATE_FAN_MEDIUM:
+            remote_state |= COOLIX_FAN_MED;
+            break;
+          case climate::CLIMATE_FAN_LOW:
+            remote_state |= COOLIX_FAN_MIN;
+            break;
+          case climate::CLIMATE_FAN_AUTO:
+          default:
+            remote_state |= COOLIX_FAN_AUTO;
+            break;
+        }
+      }
+    }
   }
-  if (this->mode != climate::CLIMATE_MODE_OFF) {
-    auto temp = (uint8_t) roundf(clamp(this->target_temperature, COOLIX_TEMP_MIN, COOLIX_TEMP_MAX));
-    remote_state &= ~COOLIX_TEMP_MASK;  // Clear the old temp.
-    remote_state |= COOLIX_TEMP_MAP[temp - COOLIX_TEMP_MIN] << 4;
-  }
-
   ESP_LOGV(TAG, "Sending coolix code: 0x%02X", remote_state);
 
   auto transmit = this->transmitter_->transmit();
@@ -161,35 +190,35 @@ bool CoolixClimate::on_receive(remote_base::RemoteReceiveData data) {
 
   if (remote_state == COOLIX_OFF) {
     this->mode = climate::CLIMATE_MODE_OFF;
+  } else if (remote_state == COOLIX_SWING) {
+    this->swing_mode =
+        this->swing_mode == climate::CLIMATE_SWING_OFF ? climate::CLIMATE_SWING_VERTICAL : climate::CLIMATE_SWING_OFF;
   } else {
     if ((remote_state & COOLIX_MODE_MASK) == COOLIX_HEAT)
       this->mode = climate::CLIMATE_MODE_HEAT;
     else if ((remote_state & COOLIX_MODE_MASK) == COOLIX_AUTO)
       this->mode = climate::CLIMATE_MODE_AUTO;
     else if ((remote_state & COOLIX_MODE_MASK) == COOLIX_DRY_FAN) {
-      // climate::CLIMATE_MODE_DRY;
-      if ((remote_state & COOLIX_FAN_MASK) == COOLIX_FAN_DRY)
-        ESP_LOGV(TAG, "Not supported DRY mode. Reporting AUTO");
+      if ((remote_state & COOLIX_FAN_MASK) == COOLIX_FAN_MODE_AUTO_DRY)
+        this->mode = climate::CLIMATE_MODE_DRY;
       else
-        ESP_LOGV(TAG, "Not supported FAN Auto mode. Reporting AUTO");
-      this->mode = climate::CLIMATE_MODE_AUTO;
+        this->mode = climate::CLIMATE_MODE_FAN_ONLY;
     } else
       this->mode = climate::CLIMATE_MODE_COOL;
 
     // Fan Speed
-    // When climate::CLIMATE_MODE_DRY is implemented replace following line with this:
-    //   if ((remote_state & COOLIX_FAN_AUTO) == COOLIX_FAN_AUTO || this->mode == climate::CLIMATE_MODE_DRY)
-    if ((remote_state & COOLIX_FAN_AUTO) == COOLIX_FAN_AUTO)
-      ESP_LOGV(TAG, "Not supported FAN speed AUTO");
+    if ((remote_state & COOLIX_FAN_AUTO) == COOLIX_FAN_AUTO || this->mode == climate::CLIMATE_MODE_AUTO ||
+        this->mode == climate::CLIMATE_MODE_DRY)
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
     else if ((remote_state & COOLIX_FAN_MIN) == COOLIX_FAN_MIN)
-      ESP_LOGV(TAG, "Not supported FAN speed MIN");
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
     else if ((remote_state & COOLIX_FAN_MED) == COOLIX_FAN_MED)
-      ESP_LOGV(TAG, "Not supported FAN speed MED");
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
     else if ((remote_state & COOLIX_FAN_MAX) == COOLIX_FAN_MAX)
-      ESP_LOGV(TAG, "Not supported FAN speed MAX");
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
 
     // Temperature
-    uint8_t temperature_code = (remote_state & COOLIX_TEMP_MASK) >> 4;
+    uint8_t temperature_code = remote_state & COOLIX_TEMP_MASK;
     for (uint8_t i = 0; i < COOLIX_TEMP_RANGE; i++)
       if (COOLIX_TEMP_MAP[i] == temperature_code)
         this->target_temperature = i + COOLIX_TEMP_MIN;
diff --git a/esphome/components/coolix/coolix.h b/esphome/components/coolix/coolix.h
index ed03a2fd1e..caf93f7621 100644
--- a/esphome/components/coolix/coolix.h
+++ b/esphome/components/coolix/coolix.h
@@ -11,13 +11,28 @@ const uint8_t COOLIX_TEMP_MAX = 30;  // Celsius
 
 class CoolixClimate : public climate_ir::ClimateIR {
  public:
-  CoolixClimate() : climate_ir::ClimateIR(COOLIX_TEMP_MIN, COOLIX_TEMP_MAX) {}
+  CoolixClimate()
+      : climate_ir::ClimateIR(COOLIX_TEMP_MIN, COOLIX_TEMP_MAX, 1.0f, true, true,
+                              {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
+                               climate::CLIMATE_FAN_HIGH},
+                              {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL}) {}
+
+  /// Override control to change settings of the climate device.
+  void control(const climate::ClimateCall &call) override {
+    send_swing_cmd_ = call.get_swing_mode().has_value();
+    // swing resets after unit powered off
+    if (call.get_mode().has_value() && *call.get_mode() == climate::CLIMATE_MODE_OFF)
+      this->swing_mode = climate::CLIMATE_SWING_OFF;
+    climate_ir::ClimateIR::control(call);
+  }
 
  protected:
   /// Transmit via IR the state of this climate controller.
   void transmit_state() override;
   /// Handle received IR Buffer
   bool on_receive(remote_base::RemoteReceiveData data) override;
+
+  bool send_swing_cmd_{false};
 };
 
 }  // namespace coolix
diff --git a/esphome/components/mqtt/mqtt_climate.cpp b/esphome/components/mqtt/mqtt_climate.cpp
index 48b470cfb2..3f097d9c07 100644
--- a/esphome/components/mqtt/mqtt_climate.cpp
+++ b/esphome/components/mqtt/mqtt_climate.cpp
@@ -30,6 +30,10 @@ void MQTTClimateComponent::send_discovery(JsonObject &root, mqtt::SendDiscoveryC
     modes.add("cool");
   if (traits.supports_mode(CLIMATE_MODE_HEAT))
     modes.add("heat");
+  if (traits.supports_mode(CLIMATE_MODE_FAN_ONLY))
+    modes.add("fan_only");
+  if (traits.supports_mode(CLIMATE_MODE_DRY))
+    modes.add("dry");
 
   if (traits.get_supports_two_point_target_temperature()) {
     // temperature_low_command_topic
@@ -155,6 +159,12 @@ bool MQTTClimateComponent::publish_state_() {
     case CLIMATE_MODE_HEAT:
       mode_s = "heat";
       break;
+    case CLIMATE_MODE_FAN_ONLY:
+      mode_s = "fan_only";
+      break;
+    case CLIMATE_MODE_DRY:
+      mode_s = "dry";
+      break;
   }
   bool success = true;
   if (!this->publish(this->get_mode_state_topic(), mode_s))
diff --git a/esphome/const.py b/esphome/const.py
index 829b4738ce..0655da8f5e 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -153,6 +153,7 @@ CONF_EXPIRE_AFTER = 'expire_after'
 CONF_EXTERNAL_VCC = 'external_vcc'
 CONF_FALLING_EDGE = 'falling_edge'
 CONF_FAMILY = 'family'
+CONF_FAN_MODE = 'fan_mode'
 CONF_FAST_CONNECT = 'fast_connect'
 CONF_FILE = 'file'
 CONF_FILTER = 'filter'
@@ -422,6 +423,7 @@ CONF_STOP_ACTION = 'stop_action'
 CONF_SUBNET = 'subnet'
 CONF_SUPPORTS_COOL = 'supports_cool'
 CONF_SUPPORTS_HEAT = 'supports_heat'
+CONF_SWING_MODE = 'swing_mode'
 CONF_SWITCHES = 'switches'
 CONF_SYNC = 'sync'
 CONF_TAG = 'tag'
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index a8f81c9daf..8373e0bd66 100644
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -1,6 +1,19 @@
 """Python 3 script to automatically generate C++ classes for ESPHome's native API.
 
 It's pretty crappy spaghetti code, but it works.
+
+you need to install protobuf-compiler:
+running protc --version should return
+libprotoc 3.6.1
+
+then run this script with python3 and the files
+
+    esphome/components/api/api_pb2_service.h
+    esphome/components/api/api_pb2_service.cpp
+    esphome/components/api/api_pb2.h
+    esphome/components/api/api_pb2.cpp
+
+will be generated, they still need to be formatted
 """
 
 import re
@@ -10,13 +23,17 @@ from subprocess import call
 
 # Generate with
 # protoc --python_out=script/api_protobuf -I esphome/components/api/ api_options.proto
+
 import api_options_pb2 as pb
 import google.protobuf.descriptor_pb2 as descriptor
 
-cwd = Path(__file__).parent
+file_header = '// This file was automatically generated with a tool.\n'
+file_header += '// See scripts/api_protobuf/api_protobuf.py\n'
+
+cwd = Path(__file__).resolve().parent
 root = cwd.parent.parent / 'esphome' / 'components' / 'api'
-prot = cwd / 'api.protoc'
-call(['protoc', '-o', prot, '-I', root, 'api.proto'])
+prot = root / 'api.protoc'
+call(['protoc', '-o', str(prot), '-I', str(root), 'api.proto'])
 content = prot.read_bytes()
 
 d = descriptor.FileDescriptorSet.FromString(content)
@@ -617,7 +634,8 @@ def build_message_type(desc):
 
 
 file = d.file[0]
-content = '''\
+content = file_header
+content += '''\
 #pragma once
 
 #include "proto.h"
@@ -627,7 +645,8 @@ namespace api {
 
 '''
 
-cpp = '''\
+cpp = file_header
+cpp += '''\
 #include "api_pb2.h"
 #include "esphome/core/log.h"
 
@@ -739,7 +758,8 @@ def build_service_message_type(mt):
     return hout, cout
 
 
-hpp = '''\
+hpp = file_header
+hpp += '''\
 #pragma once
 
 #include "api_pb2.h"
@@ -750,7 +770,8 @@ namespace api {
 
 '''
 
-cpp = '''\
+cpp = file_header
+cpp += '''\
 #include "api_pb2_service.h"
 #include "esphome/core/log.h"
 

From 5becaebdda0903558f0d3227c78c9bc7391e9d81 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 17 Nov 2019 23:25:04 +0100
Subject: [PATCH 092/412] Improve WiFi disconnect messages (#857)

* Improve WiFi disconnect messages

* Fix

* Update wifi_component_esp32.cpp
---
 esphome/components/wifi/wifi_component_esp32.cpp   | 8 ++++++--
 esphome/components/wifi/wifi_component_esp8266.cpp | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/esphome/components/wifi/wifi_component_esp32.cpp b/esphome/components/wifi/wifi_component_esp32.cpp
index 862db7a9de..e345ab1671 100644
--- a/esphome/components/wifi/wifi_component_esp32.cpp
+++ b/esphome/components/wifi/wifi_component_esp32.cpp
@@ -329,8 +329,12 @@ void WiFiComponent::wifi_event_callback_(system_event_id_t event, system_event_i
       char buf[33];
       memcpy(buf, it.ssid, it.ssid_len);
       buf[it.ssid_len] = '\0';
-      ESP_LOGW(TAG, "Event: Disconnected ssid='%s' bssid=" LOG_SECRET("%s") " reason=%s", buf,
-               format_mac_addr(it.bssid).c_str(), get_disconnect_reason_str(it.reason));
+      if (it.reason == WIFI_REASON_NO_AP_FOUND) {
+        ESP_LOGW(TAG, "Event: Disconnected ssid='%s' reason='Probe Request Unsuccessful'", buf);
+      } else {
+        ESP_LOGW(TAG, "Event: Disconnected ssid='%s' bssid=" LOG_SECRET("%s") " reason='%s'", buf,
+                 format_mac_addr(it.bssid).c_str(), get_disconnect_reason_str(it.reason));
+      }
       break;
     }
     case SYSTEM_EVENT_STA_AUTHMODE_CHANGE: {
diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index ee67fd36df..88bcb03450 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -330,8 +330,12 @@ void WiFiComponent::wifi_event_callback(System_Event_t *event) {
       char buf[33];
       memcpy(buf, it.ssid, it.ssid_len);
       buf[it.ssid_len] = '\0';
-      ESP_LOGW(TAG, "Event: Disconnected ssid='%s' bssid=%s reason='%s'", buf, format_mac_addr(it.bssid).c_str(),
-               get_disconnect_reason_str(it.reason));
+      if (it.reason == REASON_NO_AP_FOUND) {
+        ESP_LOGW(TAG, "Event: Disconnected ssid='%s' reason='Probe Request Unsuccessful'", buf);
+      } else {
+        ESP_LOGW(TAG, "Event: Disconnected ssid='%s' bssid=" LOG_SECRET("%s") " reason='%s'", buf,
+                 format_mac_addr(it.bssid).c_str(), get_disconnect_reason_str(it.reason));
+      }
       break;
     }
     case EVENT_STAMODE_AUTHMODE_CHANGE: {

From b55544b860c6b2bf9fc66b74d119d6c4a216b1eb Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 17 Nov 2019 23:25:20 +0100
Subject: [PATCH 093/412] Fix MQTT python 3 stringify IPAddress Type (#864)

Fixes https://github.com/esphome/issues/issues/850
---
 esphome/mqtt.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/mqtt.py b/esphome/mqtt.py
index e89a6d9578..541f1983f7 100644
--- a/esphome/mqtt.py
+++ b/esphome/mqtt.py
@@ -67,7 +67,7 @@ def initialize(config, subscriptions, on_message, username, password, client_id)
                        tls_version=tls_version, ciphers=None)
 
     try:
-        client.connect(config[CONF_MQTT][CONF_BROKER], config[CONF_MQTT][CONF_PORT])
+        client.connect(str(config[CONF_MQTT][CONF_BROKER]), config[CONF_MQTT][CONF_PORT])
     except socket.error as err:
         raise EsphomeError("Cannot connect to MQTT broker: {}".format(err))
 
@@ -127,7 +127,7 @@ def clear_topic(config, topic, username=None, password=None, client_id=None):
 
 # From marvinroger/async-mqtt-client -> scripts/get-fingerprint/get-fingerprint.py
 def get_fingerprint(config):
-    addr = config[CONF_MQTT][CONF_BROKER], config[CONF_MQTT][CONF_PORT]
+    addr = str(config[CONF_MQTT][CONF_BROKER]), config[CONF_MQTT][CONF_PORT]
     _LOGGER.info("Getting fingerprint from %s:%s", addr[0], addr[1])
     try:
         cert_pem = ssl.get_server_certificate(addr)

From cfd42ea16298f234ae68f082d8b8025d5bcdc633 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 17 Nov 2019 23:28:30 +0100
Subject: [PATCH 094/412] Revert ESP32 BLE Tracker defaults (#863)

Fixes https://github.com/esphome/issues/issues/824
Fixes https://github.com/esphome/issues/issues/851
---
 esphome/components/esp32_ble_tracker/__init__.py           | 2 +-
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 3d48eafde4..ccc15eb451 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -82,7 +82,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_SCAN_PARAMETERS, default={}): cv.All(cv.Schema({
         cv.Optional(CONF_DURATION, default='5min'): cv.positive_time_period_seconds,
         cv.Optional(CONF_INTERVAL, default='320ms'): cv.positive_time_period_milliseconds,
-        cv.Optional(CONF_WINDOW, default='200ms'): cv.positive_time_period_milliseconds,
+        cv.Optional(CONF_WINDOW, default='30ms'): cv.positive_time_period_milliseconds,
         cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
     }), validate_scan_parameters),
 
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 4b67277f16..a53d61f878 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -442,8 +442,8 @@ const optional<ESPBTUUID> &ESPBTDevice::get_service_data_uuid() const { return t
 void ESP32BLETracker::dump_config() {
   ESP_LOGCONFIG(TAG, "BLE Tracker:");
   ESP_LOGCONFIG(TAG, "  Scan Duration: %u s", this->scan_duration_);
-  ESP_LOGCONFIG(TAG, "  Scan Interval: %u ms", this->scan_interval_);
-  ESP_LOGCONFIG(TAG, "  Scan Window: %u ms", this->scan_window_);
+  ESP_LOGCONFIG(TAG, "  Scan Interval: %.1f ms", this->scan_interval_ * 0.625f);
+  ESP_LOGCONFIG(TAG, "  Scan Window: %.1f ms", this->scan_window_ * 0.625f);
   ESP_LOGCONFIG(TAG, "  Scan Type: %s", this->scan_active_ ? "ACTIVE" : "PASSIVE");
 }
 void ESP32BLETracker::print_bt_device_info(const ESPBTDevice &device) {

From 072cd5b83ec51f81a68fc6f7969b9e48524caa8b Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 17 Nov 2019 23:28:43 +0100
Subject: [PATCH 095/412] Change ESP8266 default wifi output power (#862)

See also https://github.com/esphome/issues/issues/455
---
 esphome/components/wifi/__init__.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index 818fb70105..37ea20c6e4 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -126,7 +126,8 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
         cv.enum(WIFI_POWER_SAVE_MODES, upper=True),
     cv.Optional(CONF_FAST_CONNECT, default=False): cv.boolean,
     cv.Optional(CONF_USE_ADDRESS): cv.string_strict,
-    cv.Optional(CONF_OUTPUT_POWER): cv.All(cv.decibel, cv.float_range(min=10.0, max=20.5)),
+    cv.SplitDefault(CONF_OUTPUT_POWER, esp8266=20.0): cv.All(
+        cv.decibel, cv.float_range(min=10.0, max=20.5)),
 
     cv.Optional('hostname'): cv.invalid("The hostname option has been removed in 1.11.0"),
 }), validate)

From ad76709d00e757907e3241f43e1cf9626de8032b Mon Sep 17 00:00:00 2001
From: warpzone <11829895+warpzone@users.noreply.github.com>
Date: Thu, 21 Nov 2019 00:54:25 +0900
Subject: [PATCH 096/412] =?UTF-8?q?fix=20the=20problem=20of=20missing=20pa?=
 =?UTF-8?q?rt=20of=20advertising=20packet=20when=20activ=E2=80=A6=20(#868)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix the problem of missing part of advertising packet when active scan is enabled.

* fix for ci-suggest-changes
---
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index a53d61f878..53c6de62cc 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -325,13 +325,15 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
   }
 
   ESP_LOGVV(TAG, "Adv data: %s",
-            hexencode_string(std::string(reinterpret_cast<const char *>(param.ble_adv), param.adv_data_len)).c_str());
+            hexencode_string(
+                std::string(reinterpret_cast<const char *>(param.ble_adv), param.adv_data_len + param.scan_rsp_len))
+                .c_str());
 #endif
 }
 void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
   size_t offset = 0;
   const uint8_t *payload = param.ble_adv;
-  uint8_t len = param.adv_data_len;
+  uint8_t len = param.adv_data_len + param.scan_rsp_len;
 
   while (offset + 2 < len) {
     const uint8_t field_length = payload[offset++];  // First byte is length of adv record

From b7b23ffdb2c6e45a2c8b426f9fb7ceed6e537fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Airy=20Andr=C3=A9?= <airy.andre@free.fr>
Date: Wed, 20 Nov 2019 17:00:32 +0100
Subject: [PATCH 097/412] Decode DHT11 decimal part (#861)

* Decode DHT11 decimal part

* Fix comment

* Fix comment

* Handle negative temp for some DHT11  - code from the DHT12 component

* Don't use the fractional part if the checksum is the 2 bytes one
---
 esphome/components/dht/dht.cpp | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/esphome/components/dht/dht.cpp b/esphome/components/dht/dht.cpp
index 23d8c1d3e2..28a365c49f 100644
--- a/esphome/components/dht/dht.cpp
+++ b/esphome/components/dht/dht.cpp
@@ -165,10 +165,24 @@ bool HOT DHT::read_sensor_(float *temperature, float *humidity, bool report_erro
   }
 
   if (this->model_ == DHT_MODEL_DHT11) {
-    *humidity = data[0];
-    if (*humidity > 100)
-      *humidity = NAN;
-    *temperature = data[2];
+    if (checksum_a == data[4]) {
+      // Data format: 8bit integral RH data + 8bit decimal RH data + 8bit integral T data + 8bit decimal T data + 8bit
+      // check sum - some models always have 0 in the decimal part
+      const uint16_t raw_temperature = uint16_t(data[2]) * 10 + (data[3] & 0x7F);
+      *temperature = raw_temperature / 10.0f;
+      if ((data[3] & 0x80) != 0) {
+        // negative
+        *temperature *= -1;
+      }
+
+      const uint16_t raw_humidity = uint16_t(data[0]) * 10 + data[1];
+      *humidity = raw_humidity / 10.0f;
+    } else {
+      // For compatibily with DHT11 models which might only use 2 bytes checksums, only use the data from these two
+      // bytes
+      *temperature = data[2];
+      *humidity = data[0];
+    }
   } else {
     uint16_t raw_humidity = (uint16_t(data[0] & 0xFF) << 8) | (data[1] & 0xFF);
     uint16_t raw_temperature = (uint16_t(data[2] & 0xFF) << 8) | (data[3] & 0xFF);

From 6a0268b8523ffcfe53833062e8508175ea4a1ad2 Mon Sep 17 00:00:00 2001
From: John <34163498+CircuitSetup@users.noreply.github.com>
Date: Wed, 20 Nov 2019 11:47:34 -0500
Subject: [PATCH 098/412] fix chip_temperature for atm90e32 component (#865)

* Added more data to atm90e32 component

* ignore

* correction

* Delete 6chan_energy_meter.yaml

* PR request changes

* repository test branch

* Update setup.py

* Update const.py

* delete test yaml

* fix chip_temperature_sensor

This was throwing an error if chip_temperature was used. It needed to be changed from temp to temperature.

* default

* Update test1.yaml
---
 esphome/components/atm90e32/sensor.py |  2 +-
 tests/test1.yaml                      | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/esphome/components/atm90e32/sensor.py b/esphome/components/atm90e32/sensor.py
index 520dfc82ef..490fdb4719 100644
--- a/esphome/components/atm90e32/sensor.py
+++ b/esphome/components/atm90e32/sensor.py
@@ -83,6 +83,6 @@ def to_code(config):
         cg.add(var.set_freq_sensor(sens))
     if CONF_CHIP_TEMPERATURE in config:
         sens = yield sensor.new_sensor(config[CONF_CHIP_TEMPERATURE])
-        cg.add(var.set_chip_temp_sensor(sens))
+        cg.add(var.set_chip_temperature_sensor(sens))
     cg.add(var.set_line_freq(config[CONF_LINE_FREQUENCY]))
     cg.add(var.set_pga_gain(config[CONF_GAIN_PGA]))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index e9f8765167..103a450379 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -272,6 +272,10 @@ sensor:
         name: "EMON CT2 Current"
       power:
         name: "EMON Active Power CT2"
+      reactive_power:
+        name: "EMON Reactive Power CT2"
+      power_factor:
+        name: "EMON Power Factor CT2"
       gain_voltage: 47660
       gain_ct: 12577
     phase_c:
@@ -279,10 +283,16 @@ sensor:
         name: "EMON CT3 Current"
       power:
         name: "EMON Active Power CT3"
+      reactive_power:
+        name: "EMON Reactive Power CT3"
+      power_factor:
+        name: "EMON Power Factor CT3"
       gain_voltage: 47660
       gain_ct: 12577
     frequency:
       name: "EMON Line Frequency"
+    chip_temperature:
+      name: "EMON Chip Temp A"
     line_frequency: 50Hz
     gain_pga: 2X
   - platform: bh1750

From be36eef939554478d5a48556827a5eed810de98d Mon Sep 17 00:00:00 2001
From: KristopherMackowiak
 <33198635+KristopherMackowiak@users.noreply.github.com>
Date: Thu, 21 Nov 2019 21:57:27 +0100
Subject: [PATCH 099/412] fix: template cover add position action  (#877)

* Update const.py

* Update __init__.py

* Update template_cover.cpp

* Update __init__.py

* Update test3.yaml

* formatting code

* formatting code 2

* removed position lambda

* Update test3.yaml

* Update __init__.py
---
 esphome/components/template/cover/__init__.py        | 12 +++++++++---
 esphome/components/template/cover/template_cover.cpp |  4 ++--
 esphome/const.py                                     |  1 +
 tests/test3.yaml                                     |  4 ++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/esphome/components/template/cover/__init__.py b/esphome/components/template/cover/__init__.py
index 7a60096d85..607d9d0064 100644
--- a/esphome/components/template/cover/__init__.py
+++ b/esphome/components/template/cover/__init__.py
@@ -4,7 +4,8 @@ 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_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)
@@ -29,6 +30,7 @@ CONFIG_SCHEMA = cover.COVER_SCHEMA.extend({
     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)
 
@@ -55,11 +57,15 @@ def to_code(config):
         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])
+        cg.add(var.set_has_position(True))
+    else:
+        cg.add(var.set_has_position(config[CONF_HAS_POSITION]))
     cg.add(var.set_optimistic(config[CONF_OPTIMISTIC]))
     cg.add(var.set_assumed_state(config[CONF_ASSUMED_STATE]))
     cg.add(var.set_restore_mode(config[CONF_RESTORE_MODE]))
-    cg.add(var.set_has_position(config[CONF_HAS_POSITION]))
 
 
 @automation.register_action('cover.template.publish', cover.CoverPublishAction, cv.Schema({
diff --git a/esphome/components/template/cover/template_cover.cpp b/esphome/components/template/cover/template_cover.cpp
index 381e6dd6cd..887f282007 100644
--- a/esphome/components/template/cover/template_cover.cpp
+++ b/esphome/components/template/cover/template_cover.cpp
@@ -86,10 +86,10 @@ void TemplateCover::control(const CoverCall &call) {
     } else if (pos == COVER_CLOSED) {
       this->close_trigger_->trigger();
       this->prev_command_trigger_ = this->close_trigger_;
+    } else {
+      this->position_trigger_->trigger(pos);
     }
 
-    this->position_trigger_->trigger(pos);
-
     if (this->optimistic_) {
       this->position = pos;
     }
diff --git a/esphome/const.py b/esphome/const.py
index 0655da8f5e..b604120318 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -331,6 +331,7 @@ CONF_PM_10_0 = 'pm_10_0'
 CONF_PM_2_5 = 'pm_2_5'
 CONF_PORT = 'port'
 CONF_POSITION = 'position'
+CONF_POSITION_ACTION = 'position_action'
 CONF_POWER = 'power'
 CONF_POWER_FACTOR = 'power_factor'
 CONF_POWER_ON_VALUE = 'power_on_value'
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 6d70f60764..bbfcc72880 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -578,6 +578,10 @@ cover:
       - output.set_level:
           id: out
           level: !lambda "return tilt;"
+    position_action:
+      - output.set_level:
+          id: out
+          level: !lambda "return pos;"
 
 
 output:

From fe89dcdc0892248f2353481e6e44a8cc346e91fe Mon Sep 17 00:00:00 2001
From: Daniel Kucera <daniel.kucera@gmail.com>
Date: Tue, 26 Nov 2019 16:56:04 +0000
Subject: [PATCH 100/412] added idle action for climate (#859)

* added idle

* more clear state description

* Also add drying/fan

Putting it in this PR because it will be put in the same aioesphomeapi release anyway.

* Update bang_bang for idle action


Co-authored-by: root <root@mail.danman.eu>
Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/api/api.proto              |  3 ++
 esphome/components/api/api_pb2.cpp            |  6 +++
 esphome/components/api/api_pb2.h              |  3 ++
 .../bang_bang/bang_bang_climate.cpp           | 38 ++++++++++++-------
 esphome/components/climate/climate_mode.cpp   |  6 +++
 esphome/components/climate/climate_mode.h     |  6 +++
 6 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 2e01856a3b..4bb7d1b555 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -678,6 +678,9 @@ enum ClimateAction {
   // values same as mode for readability
   CLIMATE_ACTION_COOLING = 2;
   CLIMATE_ACTION_HEATING = 3;
+  CLIMATE_ACTION_IDLE = 4;
+  CLIMATE_ACTION_DRYING = 5;
+  CLIMATE_ACTION_FAN = 6;
 }
 message ListEntitiesClimateResponse {
   option (id) = 46;
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index cca488decf..6b98f95f53 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -158,6 +158,12 @@ template<> const char *proto_enum_to_string<enums::ClimateAction>(enums::Climate
       return "CLIMATE_ACTION_COOLING";
     case enums::CLIMATE_ACTION_HEATING:
       return "CLIMATE_ACTION_HEATING";
+    case enums::CLIMATE_ACTION_IDLE:
+      return "CLIMATE_ACTION_IDLE";
+    case enums::CLIMATE_ACTION_DRYING:
+      return "CLIMATE_ACTION_DRYING";
+    case enums::CLIMATE_ACTION_FAN:
+      return "CLIMATE_ACTION_FAN";
     default:
       return "UNKNOWN";
   }
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index fc855a889a..8be89f0365 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -76,6 +76,9 @@ enum ClimateAction : uint32_t {
   CLIMATE_ACTION_OFF = 0,
   CLIMATE_ACTION_COOLING = 2,
   CLIMATE_ACTION_HEATING = 3,
+  CLIMATE_ACTION_IDLE = 4,
+  CLIMATE_ACTION_DRYING = 5,
+  CLIMATE_ACTION_FAN = 6,
 };
 
 }  // namespace enums
diff --git a/esphome/components/bang_bang/bang_bang_climate.cpp b/esphome/components/bang_bang/bang_bang_climate.cpp
index 978abae52a..cf527988fe 100644
--- a/esphome/components/bang_bang/bang_bang_climate.cpp
+++ b/esphome/components/bang_bang/bang_bang_climate.cpp
@@ -51,12 +51,15 @@ climate::ClimateTraits BangBangClimate::traits() {
 }
 void BangBangClimate::compute_state_() {
   if (this->mode != climate::CLIMATE_MODE_AUTO) {
-    // in non-auto mode
+    // in non-auto mode, switch directly to appropriate action
+    //  - HEAT mode -> HEATING action
+    //  - COOL mode -> COOLING action
+    //  - OFF mode -> OFF action (not IDLE!)
     this->switch_to_action_(static_cast<climate::ClimateAction>(this->mode));
     return;
   }
   if (isnan(this->current_temperature) || isnan(this->target_temperature_low) || isnan(this->target_temperature_high)) {
-    // if any control values are nan, go to OFF (idle) mode
+    // if any control parameters are nan, go to OFF action (not IDLE!)
     this->switch_to_action_(climate::CLIMATE_ACTION_OFF);
     return;
   }
@@ -69,18 +72,18 @@ void BangBangClimate::compute_state_() {
     if (this->supports_heat_)
       target_action = climate::CLIMATE_ACTION_HEATING;
     else
-      target_action = climate::CLIMATE_ACTION_OFF;
+      target_action = climate::CLIMATE_ACTION_IDLE;
   } else if (too_hot) {
     // too hot -> enable cooling if possible, else idle
     if (this->supports_cool_)
       target_action = climate::CLIMATE_ACTION_COOLING;
     else
-      target_action = climate::CLIMATE_ACTION_OFF;
+      target_action = climate::CLIMATE_ACTION_IDLE;
   } else {
     // neither too hot nor too cold -> in range
     if (this->supports_cool_ && this->supports_heat_) {
-      // if supports both ends, go to idle mode
-      target_action = climate::CLIMATE_ACTION_OFF;
+      // if supports both ends, go to idle action
+      target_action = climate::CLIMATE_ACTION_IDLE;
     } else {
       // else use current mode and don't change (hysteresis)
       target_action = this->action;
@@ -94,6 +97,16 @@ void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
     // already in target mode
     return;
 
+  if ((action == climate::CLIMATE_ACTION_OFF && this->action == climate::CLIMATE_ACTION_IDLE) ||
+      (action == climate::CLIMATE_ACTION_IDLE && this->action == climate::CLIMATE_ACTION_OFF)) {
+    // switching from OFF to IDLE or vice-versa
+    // these only have visual difference. OFF means user manually disabled,
+    // IDLE means it's in auto mode but value is in target range.
+    this->action = action;
+    this->publish_state();
+    return;
+  }
+
   if (this->prev_trigger_ != nullptr) {
     this->prev_trigger_->stop();
     this->prev_trigger_ = nullptr;
@@ -101,6 +114,7 @@ void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
   Trigger<> *trig;
   switch (action) {
     case climate::CLIMATE_ACTION_OFF:
+    case climate::CLIMATE_ACTION_IDLE:
       trig = this->idle_trigger_;
       break;
     case climate::CLIMATE_ACTION_COOLING:
@@ -112,13 +126,11 @@ void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
     default:
       trig = nullptr;
   }
-  if (trig != nullptr) {
-    // trig should never be null, but still check so that we don't crash
-    trig->trigger();
-    this->action = action;
-    this->prev_trigger_ = trig;
-    this->publish_state();
-  }
+  assert(trig != nullptr);
+  trig->trigger();
+  this->action = action;
+  this->prev_trigger_ = trig;
+  this->publish_state();
 }
 void BangBangClimate::change_away_(bool away) {
   if (!away) {
diff --git a/esphome/components/climate/climate_mode.cpp b/esphome/components/climate/climate_mode.cpp
index aa06ce87f0..ddcc4af4d9 100644
--- a/esphome/components/climate/climate_mode.cpp
+++ b/esphome/components/climate/climate_mode.cpp
@@ -29,6 +29,12 @@ const char *climate_action_to_string(ClimateAction action) {
       return "COOLING";
     case CLIMATE_ACTION_HEATING:
       return "HEATING";
+    case CLIMATE_ACTION_IDLE:
+      return "IDLE";
+    case CLIMATE_ACTION_DRYING:
+      return "DRYING";
+    case CLIMATE_ACTION_FAN:
+      return "FAN";
     default:
       return "UNKNOWN";
   }
diff --git a/esphome/components/climate/climate_mode.h b/esphome/components/climate/climate_mode.h
index 83ef715402..8037ea2196 100644
--- a/esphome/components/climate/climate_mode.h
+++ b/esphome/components/climate/climate_mode.h
@@ -29,6 +29,12 @@ enum ClimateAction : uint8_t {
   CLIMATE_ACTION_COOLING = 2,
   /// The climate device is actively heating (usually in heat or auto mode)
   CLIMATE_ACTION_HEATING = 3,
+  /// The climate device is idle (monitoring climate but no action needed)
+  CLIMATE_ACTION_IDLE = 4,
+  /// The climate device is drying (either mode DRY or AUTO)
+  CLIMATE_ACTION_DRYING = 5,
+  /// The climate device is in fan only mode (either mode FAN_ONLY or AUTO)
+  CLIMATE_ACTION_FAN = 6,
 };
 
 /// Enum for all modes a climate fan can be in

From 36ffef083bf3db2d0bfe76f304d88397956c003a Mon Sep 17 00:00:00 2001
From: DAVe3283 <DAVe3283@gmail.com>
Date: Tue, 26 Nov 2019 10:31:33 -0700
Subject: [PATCH 101/412] Fix MAX31865 edge case. (#882)

In a heavy EMI environment, reading the current config from the MAX31865 can
fail, such as switching from a 4-wire sensor to a 3-wire sensor. This causes
the temperature value to be off wildly, but still technically valid, so it
doesn't get reported as a sensor failure.

Since we know what configuration we want, rather than send it to the MAX31865
on setup and ask for it over and over (propagating any error as we write it
back), instead store the base configuration and work from that to change modes.
This not only avoids propagating any error, it also saves a lot of unnecessary
reads from the MAX31865.
---
 esphome/components/max31865/max31865.cpp | 26 +++++++++++++++---------
 esphome/components/max31865/max31865.h   |  4 +++-
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/esphome/components/max31865/max31865.cpp b/esphome/components/max31865/max31865.cpp
index 500b5b2883..a3c537a2c2 100644
--- a/esphome/components/max31865/max31865.cpp
+++ b/esphome/components/max31865/max31865.cpp
@@ -37,7 +37,7 @@ void MAX31865Sensor::update() {
   }
 
   // Run fault detection
-  write_register_(CONFIGURATION_REG, 0b11101110, 0b10000110);
+  this->write_config_(0b11101110, 0b10000110);
   const uint32_t start_time = micros();
   uint8_t config;
   uint32_t fault_detect_time;
@@ -55,7 +55,7 @@ void MAX31865Sensor::update() {
   ESP_LOGV(TAG, "Fault detection completed in %uμs.", fault_detect_time);
 
   // Start 1-shot conversion
-  this->write_register_(CONFIGURATION_REG, 0b11100000, 0b10100000);
+  this->write_config_(0b11100000, 0b10100000);
 
   // Datasheet max conversion time is 55ms for 60Hz / 66ms for 50Hz
   auto f = std::bind(&MAX31865Sensor::read_data_, this);
@@ -66,13 +66,15 @@ void MAX31865Sensor::setup() {
   ESP_LOGCONFIG(TAG, "Setting up MAX31865Sensor '%s'...", this->name_.c_str());
   this->spi_setup();
 
-  // Build configuration
-  uint8_t config = 0b00000010;
-  config |= (filter_ & 1) << 0;
+  // Build base configuration
+  base_config_ = 0b00000000;
+  base_config_ |= (filter_ & 1) << 0;
   if (rtd_wires_ == 3) {
-    config |= 1 << 4;
+    base_config_ |= 1 << 4;
   }
-  this->write_register_(CONFIGURATION_REG, 0b11111111, config);
+
+  // Clear any existing faults & set base config
+  this->write_config_(0b00000010, 0b00000010);
 }
 
 void MAX31865Sensor::dump_config() {
@@ -90,7 +92,7 @@ float MAX31865Sensor::get_setup_priority() const { return setup_priority::DATA;
 void MAX31865Sensor::read_data_() {
   // Read temperature, disable V_BIAS (save power)
   const uint16_t rtd_resistance_register = this->read_register_16_(RTD_RESISTANCE_MSB_REG);
-  this->write_register_(CONFIGURATION_REG, 0b11000000, 0b00000000);
+  this->write_config_(0b11000000, 0b00000000);
 
   // Check faults
   const uint8_t faults = this->read_register_(FAULT_STATUS_REG);
@@ -137,12 +139,16 @@ void MAX31865Sensor::read_data_() {
   this->publish_state(temperature);
 }
 
-void MAX31865Sensor::write_register_(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position) {
-  uint8_t value = this->read_register_(reg);
+void MAX31865Sensor::write_config_(uint8_t mask, uint8_t bits, uint8_t start_position) {
+  uint8_t value = base_config_;
 
   value &= (~mask);
   value |= (bits << start_position);
 
+  this->write_register_(CONFIGURATION_REG, value);
+}
+
+void MAX31865Sensor::write_register_(uint8_t reg, uint8_t value) {
   this->enable();
   this->write_byte(reg |= SPI_WRITE_M);
   this->write_byte(value);
diff --git a/esphome/components/max31865/max31865.h b/esphome/components/max31865/max31865.h
index e63be8e6c5..ee2f155f74 100644
--- a/esphome/components/max31865/max31865.h
+++ b/esphome/components/max31865/max31865.h
@@ -43,10 +43,12 @@ class MAX31865Sensor : public sensor::Sensor,
   float rtd_nominal_resistance_;
   MAX31865ConfigFilter filter_;
   uint8_t rtd_wires_;
+  uint8_t base_config_;
   bool has_fault_ = false;
   bool has_warn_ = false;
   void read_data_();
-  void write_register_(uint8_t reg, uint8_t mask, uint8_t bits, uint8_t start_position = 0);
+  void write_config_(uint8_t mask, uint8_t bits, uint8_t start_position = 0);
+  void write_register_(uint8_t reg, uint8_t value);
   const uint8_t read_register_(uint8_t reg);
   const uint16_t read_register_16_(uint8_t reg);
   float calc_temperature_(const float& rtd_ratio);

From fa1adfd93467c4fbec5018f2d8d3030e94d5e6bf Mon Sep 17 00:00:00 2001
From: Tim P <timothy@purchas.com>
Date: Wed, 27 Nov 2019 04:43:11 +1100
Subject: [PATCH 102/412] Add QMC5883L Sensor + Improvements to HMC5883L (#671)

* Add QMC5883L and Updated HMC5883L

* add tests

* changed to oversampling

* fix pylint

* fix private method

* typo fix

* fix protected method

* Clean up code and PR recomendations

* fix tests

* remote file

* fix qmc oversampling unit

* Remove hmc5883l config logging

Either the units are converted to the user values like 1x, 8x oversampling or not printed at all. Printing the machine-value of these is only confusing users.

* Changes for validate_enum

Move stuff that can be done beforehand out of the bound function, use text_type for py2/3 compatability.

* Remove unused constant

* Remove duplicate tests

* Repeat remove config print

* remove changes to test2 since bin is to large

* Add comment to HMC5583L


Co-authored-by: Timothy Purchas <timothy@TPF.local>
Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/hmc5883l/hmc5883l.cpp |  10 +-
 esphome/components/hmc5883l/hmc5883l.h   |  21 ++++
 esphome/components/hmc5883l/sensor.py    |  59 +++++++++--
 esphome/components/qmc5883l/__init__.py  |   0
 esphome/components/qmc5883l/qmc5883l.cpp | 124 +++++++++++++++++++++++
 esphome/components/qmc5883l/qmc5883l.h   |  60 +++++++++++
 esphome/components/qmc5883l/sensor.py    | 105 +++++++++++++++++++
 tests/test1.yaml                         |  14 +++
 8 files changed, 378 insertions(+), 15 deletions(-)
 create mode 100644 esphome/components/qmc5883l/__init__.py
 create mode 100644 esphome/components/qmc5883l/qmc5883l.cpp
 create mode 100644 esphome/components/qmc5883l/qmc5883l.h
 create mode 100644 esphome/components/qmc5883l/sensor.py

diff --git a/esphome/components/hmc5883l/hmc5883l.cpp b/esphome/components/hmc5883l/hmc5883l.cpp
index f68b65e654..9094548bb3 100644
--- a/esphome/components/hmc5883l/hmc5883l.cpp
+++ b/esphome/components/hmc5883l/hmc5883l.cpp
@@ -38,12 +38,9 @@ void HMC5883LComponent::setup() {
   }
 
   uint8_t config_a = 0;
-  // 0b0xx00000 << 5 Sample Averaging - 0b00=1 sample, 0b11=8 samples
-  config_a |= 0b01100000;
-  // 0b000xxx00 << 2 Data Output Rate - 0b100=15Hz
-  config_a |= 0b00010000;
-  // 0b000000xx << 0 Measurement Mode - 0b00=high impedance on load
-  config_a |= 0b00000000;
+  config_a |= this->oversampling_ << 5;
+  config_a |= this->datarate_ << 2;
+  config_a |= 0b0 << 0;  // Measurement Mode: Normal(high impedance on load)
   if (!this->write_byte(HMC5883L_REGISTER_CONFIG_A, config_a)) {
     this->error_code_ = COMMUNICATION_FAILED;
     this->mark_failed();
@@ -61,7 +58,6 @@ void HMC5883LComponent::setup() {
   uint8_t mode = 0;
   // Continuous Measurement Mode
   mode |= 0b00;
-
   if (!this->write_byte(HMC5883L_REGISTER_MODE, mode)) {
     this->error_code_ = COMMUNICATION_FAILED;
     this->mark_failed();
diff --git a/esphome/components/hmc5883l/hmc5883l.h b/esphome/components/hmc5883l/hmc5883l.h
index 3946f1fb10..41d41baa22 100644
--- a/esphome/components/hmc5883l/hmc5883l.h
+++ b/esphome/components/hmc5883l/hmc5883l.h
@@ -7,6 +7,23 @@
 namespace esphome {
 namespace hmc5883l {
 
+enum HMC5883LOversampling {
+  HMC5883L_OVERSAMPLING_1 = 0b000,
+  HMC5883L_OVERSAMPLING_2 = 0b001,
+  HMC5883L_OVERSAMPLING_4 = 0b010,
+  HMC5883L_OVERSAMPLING_8 = 0b011,
+};
+
+enum HMC5883LDatarate {
+  HMC5883L_DATARATE_0_75_HZ = 0b000,
+  HMC5883L_DATARATE_1_5_HZ = 0b001,
+  HMC5883L_DATARATE_3_0_HZ = 0b010,
+  HMC5883L_DATARATE_7_5_HZ = 0b011,
+  HMC5883L_DATARATE_15_0_HZ = 0b100,
+  HMC5883L_DATARATE_30_0_HZ = 0b101,
+  HMC5883L_DATARATE_75_0_HZ = 0b110,
+};
+
 enum HMC5883LRange {
   HMC5883L_RANGE_88_UT = 0b000,
   HMC5883L_RANGE_130_UT = 0b001,
@@ -25,6 +42,8 @@ class HMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
   float get_setup_priority() const override;
   void update() override;
 
+  void set_oversampling(HMC5883LOversampling oversampling) { oversampling_ = oversampling; }
+  void set_datarate(HMC5883LDatarate datarate) { datarate_ = datarate; }
   void set_range(HMC5883LRange range) { range_ = range; }
   void set_x_sensor(sensor::Sensor *x_sensor) { x_sensor_ = x_sensor; }
   void set_y_sensor(sensor::Sensor *y_sensor) { y_sensor_ = y_sensor; }
@@ -32,6 +51,8 @@ class HMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
   void set_heading_sensor(sensor::Sensor *heading_sensor) { heading_sensor_ = heading_sensor; }
 
  protected:
+  HMC5883LOversampling oversampling_{HMC5883L_OVERSAMPLING_1};
+  HMC5883LDatarate datarate_{HMC5883L_DATARATE_15_0_HZ};
   HMC5883LRange range_{HMC5883L_RANGE_130_UT};
   sensor::Sensor *x_sensor_;
   sensor::Sensor *y_sensor_;
diff --git a/esphome/components/hmc5883l/sensor.py b/esphome/components/hmc5883l/sensor.py
index afb8ffac7d..6e2366cadc 100644
--- a/esphome/components/hmc5883l/sensor.py
+++ b/esphome/components/hmc5883l/sensor.py
@@ -2,8 +2,10 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
-from esphome.const import CONF_ADDRESS, CONF_ID, CONF_RANGE, ICON_MAGNET, UNIT_MICROTESLA, \
-    UNIT_DEGREES, ICON_SCREEN_ROTATION
+from esphome.const import (CONF_ADDRESS, CONF_ID, CONF_OVERSAMPLING, CONF_RANGE, ICON_MAGNET,
+                           UNIT_MICROTESLA, UNIT_DEGREES, ICON_SCREEN_ROTATION,
+                           CONF_UPDATE_INTERVAL)
+from esphome.py_compat import text_type
 
 DEPENDENCIES = ['i2c']
 
@@ -16,6 +18,25 @@ CONF_HEADING = 'heading'
 
 HMC5883LComponent = hmc5883l_ns.class_('HMC5883LComponent', cg.PollingComponent, i2c.I2CDevice)
 
+HMC5883LOversampling = hmc5883l_ns.enum('HMC5883LOversampling')
+HMC5883LOversamplings = {
+    1: HMC5883LOversampling.HMC5883L_OVERSAMPLING_1,
+    2: HMC5883LOversampling.HMC5883L_OVERSAMPLING_2,
+    4: HMC5883LOversampling.HMC5883L_OVERSAMPLING_4,
+    8: HMC5883LOversampling.HMC5883L_OVERSAMPLING_8,
+}
+
+HMC5883LDatarate = hmc5883l_ns.enum('HMC5883LDatarate')
+HMC5883LDatarates = {
+    0.75: HMC5883LDatarate.HMC5883L_DATARATE_0_75_HZ,
+    1.5: HMC5883LDatarate.HMC5883L_DATARATE_1_5_HZ,
+    3.0: HMC5883LDatarate.HMC5883L_DATARATE_3_0_HZ,
+    7.5: HMC5883LDatarate.HMC5883L_DATARATE_7_5_HZ,
+    15: HMC5883LDatarate.HMC5883L_DATARATE_15_0_HZ,
+    30: HMC5883LDatarate.HMC5883L_DATARATE_30_0_HZ,
+    75: HMC5883LDatarate.HMC5883L_DATARATE_75_0_HZ,
+}
+
 HMC5883LRange = hmc5883l_ns.enum('HMC5883LRange')
 HMC5883L_RANGES = {
     88: HMC5883LRange.HMC5883L_RANGE_88_UT,
@@ -29,11 +50,21 @@ HMC5883L_RANGES = {
 }
 
 
-def validate_range(value):
-    value = cv.string(value)
-    if value.endswith(u'µT') or value.endswith('uT'):
-        value = value[:-2]
-    return cv.enum(HMC5883L_RANGES, int=True)(value)
+def validate_enum(enum_values, units=None, int=True):
+    _units = []
+    if units is not None:
+        _units = units if isinstance(units, list) else [units]
+        _units = [text_type(x) for x in _units]
+    enum_bound = cv.enum(enum_values, int=int)
+
+    def validate_enum_bound(value):
+        value = cv.string(value)
+        for unit in _units:
+            if value.endswith(unit):
+                value = value[:-len(unit)]
+                break
+        return enum_bound(value)
+    return validate_enum_bound
 
 
 field_strength_schema = sensor.sensor_schema(UNIT_MICROTESLA, ICON_MAGNET, 1)
@@ -42,19 +73,31 @@ heading_schema = sensor.sensor_schema(UNIT_DEGREES, ICON_SCREEN_ROTATION, 1)
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(HMC5883LComponent),
     cv.Optional(CONF_ADDRESS): cv.i2c_address,
+    cv.Optional(CONF_OVERSAMPLING, default='1x'): validate_enum(HMC5883LOversamplings, units="x"),
+    cv.Optional(CONF_RANGE, default=u'130µT'): validate_enum(HMC5883L_RANGES, units=["uT", u"µT"]),
     cv.Optional(CONF_FIELD_STRENGTH_X): field_strength_schema,
     cv.Optional(CONF_FIELD_STRENGTH_Y): field_strength_schema,
     cv.Optional(CONF_FIELD_STRENGTH_Z): field_strength_schema,
     cv.Optional(CONF_HEADING): heading_schema,
-    cv.Optional(CONF_RANGE, default='130uT'): validate_range,
 }).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x1E))
 
 
+def auto_data_rate(config):
+    interval_sec = config[CONF_UPDATE_INTERVAL].seconds
+    interval_hz = 1.0/interval_sec
+    for datarate in sorted(HMC5883LDatarates.keys()):
+        if float(datarate) >= interval_hz:
+            return HMC5883LDatarates[datarate]
+    return HMC5883LDatarates[75]
+
+
 def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     yield cg.register_component(var, config)
     yield i2c.register_i2c_device(var, config)
 
+    cg.add(var.set_oversampling(config[CONF_OVERSAMPLING]))
+    cg.add(var.set_datarate(auto_data_rate(config)))
     cg.add(var.set_range(config[CONF_RANGE]))
     if CONF_FIELD_STRENGTH_X in config:
         sens = yield sensor.new_sensor(config[CONF_FIELD_STRENGTH_X])
diff --git a/esphome/components/qmc5883l/__init__.py b/esphome/components/qmc5883l/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/qmc5883l/qmc5883l.cpp b/esphome/components/qmc5883l/qmc5883l.cpp
new file mode 100644
index 0000000000..f809f9dfb3
--- /dev/null
+++ b/esphome/components/qmc5883l/qmc5883l.cpp
@@ -0,0 +1,124 @@
+#include "qmc5883l.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace qmc5883l {
+
+static const char *TAG = "qmc5883l";
+static const uint8_t QMC5883L_ADDRESS = 0x0D;
+
+static const uint8_t QMC5883L_REGISTER_DATA_X_LSB = 0x00;
+static const uint8_t QMC5883L_REGISTER_DATA_X_MSB = 0x01;
+static const uint8_t QMC5883L_REGISTER_DATA_Y_LSB = 0x02;
+static const uint8_t QMC5883L_REGISTER_DATA_Y_MSB = 0x03;
+static const uint8_t QMC5883L_REGISTER_DATA_Z_LSB = 0x04;
+static const uint8_t QMC5883L_REGISTER_DATA_Z_MSB = 0x05;
+static const uint8_t QMC5883L_REGISTER_STATUS = 0x06;
+static const uint8_t QMC5883L_REGISTER_TEMPERATURE_LSB = 0x07;
+static const uint8_t QMC5883L_REGISTER_TEMPERATURE_MSB = 0x08;
+static const uint8_t QMC5883L_REGISTER_CONTROL_1 = 0x09;
+static const uint8_t QMC5883L_REGISTER_CONTROL_2 = 0x0A;
+static const uint8_t QMC5883L_REGISTER_PERIOD = 0x0B;
+
+void QMC5883LComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up QMC5883L...");
+  // Soft Reset
+  if (!this->write_byte(QMC5883L_REGISTER_CONTROL_2, 1 << 7)) {
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+  delay(10);
+
+  uint8_t control_1 = 0;
+  control_1 |= 0b01 << 0;  // MODE (Mode) -> 0b00=standby, 0b01=continuous
+  control_1 |= this->datarate_ << 2;
+  control_1 |= this->range_ << 4;
+  control_1 |= this->oversampling_ << 6;
+  if (!this->write_byte(QMC5883L_REGISTER_CONTROL_1, control_1)) {
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+
+  uint8_t control_2 = 0;
+  control_2 |= 0b0 << 7;  // SOFT_RST (Soft Reset) -> 0b00=disabled, 0b01=enabled
+  control_2 |= 0b0 << 6;  // ROL_PNT (Pointer Roll Over) -> 0b00=disabled, 0b01=enabled
+  control_2 |= 0b0 << 0;  // INT_ENB (Interrupt) -> 0b00=disabled, 0b01=enabled
+  if (!this->write_byte(QMC5883L_REGISTER_CONTROL_2, control_2)) {
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+
+  uint8_t period = 0x01;  // recommended value
+  if (!this->write_byte(QMC5883L_REGISTER_PERIOD, period)) {
+    this->error_code_ = COMMUNICATION_FAILED;
+    this->mark_failed();
+    return;
+  }
+}
+void QMC5883LComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "QMC5883L:");
+  LOG_I2C_DEVICE(this);
+  if (this->error_code_ == COMMUNICATION_FAILED) {
+    ESP_LOGE(TAG, "Communication with QMC5883L failed!");
+  }
+  LOG_UPDATE_INTERVAL(this);
+
+  LOG_SENSOR("  ", "X Axis", this->x_sensor_);
+  LOG_SENSOR("  ", "Y Axis", this->y_sensor_);
+  LOG_SENSOR("  ", "Z Axis", this->z_sensor_);
+  LOG_SENSOR("  ", "Heading", this->heading_sensor_);
+}
+float QMC5883LComponent::get_setup_priority() const { return setup_priority::DATA; }
+void QMC5883LComponent::update() {
+  uint8_t status = false;
+  this->read_byte(QMC5883L_REGISTER_STATUS, &status);
+
+  uint16_t raw_x, raw_y, raw_z;
+  if (!this->read_byte_16_(QMC5883L_REGISTER_DATA_X_LSB, &raw_x) ||
+      !this->read_byte_16_(QMC5883L_REGISTER_DATA_Y_LSB, &raw_y) ||
+      !this->read_byte_16_(QMC5883L_REGISTER_DATA_Z_LSB, &raw_z)) {
+    this->status_set_warning();
+    return;
+  }
+
+  float mg_per_bit;
+  switch (this->range_) {
+    case QMC5883L_RANGE_200_UT:
+      mg_per_bit = 0.0833f;
+      break;
+    case QMC5883L_RANGE_800_UT:
+      mg_per_bit = 0.333f;
+      break;
+    default:
+      mg_per_bit = NAN;
+  }
+
+  // in µT
+  const float x = int16_t(raw_x) * mg_per_bit * 0.1f;
+  const float y = int16_t(raw_y) * mg_per_bit * 0.1f;
+  const float z = int16_t(raw_z) * mg_per_bit * 0.1f;
+
+  float heading = atan2f(0.0f - x, y) * 180.0f / M_PI;
+  ESP_LOGD(TAG, "Got x=%0.02fµT y=%0.02fµT z=%0.02fµT heading=%0.01f° status=%u", x, y, z, heading, status);
+
+  if (this->x_sensor_ != nullptr)
+    this->x_sensor_->publish_state(x);
+  if (this->y_sensor_ != nullptr)
+    this->y_sensor_->publish_state(y);
+  if (this->z_sensor_ != nullptr)
+    this->z_sensor_->publish_state(z);
+  if (this->heading_sensor_ != nullptr)
+    this->heading_sensor_->publish_state(heading);
+}
+
+bool QMC5883LComponent::read_byte_16_(uint8_t a_register, uint16_t *data) {
+  bool success = this->read_byte_16(a_register, data);
+  *data = (*data & 0x00FF) << 8 | (*data & 0xFF00) >> 8;  // Flip Byte oder, LSB first;
+  return success;
+}
+
+}  // namespace qmc5883l
+}  // namespace esphome
diff --git a/esphome/components/qmc5883l/qmc5883l.h b/esphome/components/qmc5883l/qmc5883l.h
new file mode 100644
index 0000000000..01697ecbd0
--- /dev/null
+++ b/esphome/components/qmc5883l/qmc5883l.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace qmc5883l {
+
+enum QMC5883LDatarate {
+  QMC5883L_DATARATE_10_HZ = 0b00,
+  QMC5883L_DATARATE_50_HZ = 0b01,
+  QMC5883L_DATARATE_100_HZ = 0b10,
+  QMC5883L_DATARATE_200_HZ = 0b11,
+};
+
+enum QMC5883LRange {
+  QMC5883L_RANGE_200_UT = 0b00,
+  QMC5883L_RANGE_800_UT = 0b01,
+};
+
+enum QMC5883LOversampling {
+  QMC5883L_SAMPLING_512 = 0b00,
+  QMC5883L_SAMPLING_256 = 0b01,
+  QMC5883L_SAMPLING_128 = 0b10,
+  QMC5883L_SAMPLING_64 = 0b11,
+};
+
+class QMC5883LComponent : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+
+  void set_datarate(QMC5883LDatarate datarate) { datarate_ = datarate; }
+  void set_range(QMC5883LRange range) { range_ = range; }
+  void set_oversampling(QMC5883LOversampling oversampling) { oversampling_ = oversampling; }
+  void set_x_sensor(sensor::Sensor *x_sensor) { x_sensor_ = x_sensor; }
+  void set_y_sensor(sensor::Sensor *y_sensor) { y_sensor_ = y_sensor; }
+  void set_z_sensor(sensor::Sensor *z_sensor) { z_sensor_ = z_sensor; }
+  void set_heading_sensor(sensor::Sensor *heading_sensor) { heading_sensor_ = heading_sensor; }
+
+ protected:
+  QMC5883LDatarate datarate_{QMC5883L_DATARATE_10_HZ};
+  QMC5883LRange range_{QMC5883L_RANGE_200_UT};
+  QMC5883LOversampling oversampling_{QMC5883L_SAMPLING_512};
+  sensor::Sensor *x_sensor_;
+  sensor::Sensor *y_sensor_;
+  sensor::Sensor *z_sensor_;
+  sensor::Sensor *heading_sensor_;
+  enum ErrorCode {
+    NONE = 0,
+    COMMUNICATION_FAILED,
+  } error_code_;
+  bool read_byte_16_(uint8_t a_register, uint16_t *data);
+};
+
+}  // namespace qmc5883l
+}  // namespace esphome
diff --git a/esphome/components/qmc5883l/sensor.py b/esphome/components/qmc5883l/sensor.py
new file mode 100644
index 0000000000..8ccd542753
--- /dev/null
+++ b/esphome/components/qmc5883l/sensor.py
@@ -0,0 +1,105 @@
+# coding=utf-8
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (CONF_ADDRESS, CONF_ID, CONF_OVERSAMPLING, CONF_RANGE, ICON_MAGNET,
+                           UNIT_MICROTESLA, UNIT_DEGREES, ICON_SCREEN_ROTATION,
+                           CONF_UPDATE_INTERVAL)
+from esphome.py_compat import text_type
+
+DEPENDENCIES = ['i2c']
+
+qmc5883l_ns = cg.esphome_ns.namespace('qmc5883l')
+
+CONF_FIELD_STRENGTH_X = 'field_strength_x'
+CONF_FIELD_STRENGTH_Y = 'field_strength_y'
+CONF_FIELD_STRENGTH_Z = 'field_strength_z'
+CONF_HEADING = 'heading'
+
+QMC5883LComponent = qmc5883l_ns.class_(
+    'QMC5883LComponent', cg.PollingComponent, i2c.I2CDevice)
+
+QMC5883LDatarate = qmc5883l_ns.enum('QMC5883LDatarate')
+QMC5883LDatarates = {
+    10: QMC5883LDatarate.QMC5883L_DATARATE_10_HZ,
+    50: QMC5883LDatarate.QMC5883L_DATARATE_50_HZ,
+    100: QMC5883LDatarate.QMC5883L_DATARATE_100_HZ,
+    200: QMC5883LDatarate.QMC5883L_DATARATE_200_HZ,
+}
+
+QMC5883LRange = qmc5883l_ns.enum('QMC5883LRange')
+QMC5883L_RANGES = {
+    200: QMC5883LRange.QMC5883L_RANGE_200_UT,
+    800: QMC5883LRange.QMC5883L_RANGE_800_UT,
+}
+
+QMC5883LOversampling = qmc5883l_ns.enum('QMC5883LOversampling')
+QMC5883LOversamplings = {
+    512: QMC5883LOversampling.QMC5883L_SAMPLING_512,
+    256: QMC5883LOversampling.QMC5883L_SAMPLING_256,
+    128: QMC5883LOversampling.QMC5883L_SAMPLING_128,
+    64: QMC5883LOversampling.QMC5883L_SAMPLING_64,
+}
+
+
+def validate_enum(enum_values, units=None, int=True):
+    _units = []
+    if units is not None:
+        _units = units if isinstance(units, list) else [units]
+        _units = [text_type(x) for x in _units]
+    enum_bound = cv.enum(enum_values, int=int)
+
+    def validate_enum_bound(value):
+        value = cv.string(value)
+        for unit in _units:
+            if value.endswith(unit):
+                value = value[:-len(unit)]
+                break
+        return enum_bound(value)
+    return validate_enum_bound
+
+
+field_strength_schema = sensor.sensor_schema(UNIT_MICROTESLA, ICON_MAGNET, 1)
+heading_schema = sensor.sensor_schema(UNIT_DEGREES, ICON_SCREEN_ROTATION, 1)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(QMC5883LComponent),
+    cv.Optional(CONF_ADDRESS): cv.i2c_address,
+    cv.Optional(CONF_RANGE, default=u'200µT'): validate_enum(QMC5883L_RANGES, units=["uT", u"µT"]),
+    cv.Optional(CONF_OVERSAMPLING, default="512x"): validate_enum(QMC5883LOversamplings, units="x"),
+    cv.Optional(CONF_FIELD_STRENGTH_X): field_strength_schema,
+    cv.Optional(CONF_FIELD_STRENGTH_Y): field_strength_schema,
+    cv.Optional(CONF_FIELD_STRENGTH_Z): field_strength_schema,
+    cv.Optional(CONF_HEADING): heading_schema,
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x0D))
+
+
+def auto_data_rate(config):
+    interval_sec = config[CONF_UPDATE_INTERVAL].seconds
+    interval_hz = 1.0/interval_sec
+    for datarate in sorted(QMC5883LDatarates.keys()):
+        if float(datarate) >= interval_hz:
+            return QMC5883LDatarates[datarate]
+    return QMC5883LDatarates[200]
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield i2c.register_i2c_device(var, config)
+
+    cg.add(var.set_oversampling(config[CONF_OVERSAMPLING]))
+    cg.add(var.set_datarate(auto_data_rate(config)))
+    cg.add(var.set_range(config[CONF_RANGE]))
+    if CONF_FIELD_STRENGTH_X in config:
+        sens = yield sensor.new_sensor(config[CONF_FIELD_STRENGTH_X])
+        cg.add(var.set_x_sensor(sens))
+    if CONF_FIELD_STRENGTH_Y in config:
+        sens = yield sensor.new_sensor(config[CONF_FIELD_STRENGTH_Y])
+        cg.add(var.set_y_sensor(sens))
+    if CONF_FIELD_STRENGTH_Z in config:
+        sens = yield sensor.new_sensor(config[CONF_FIELD_STRENGTH_Z])
+        cg.add(var.set_z_sensor(sens))
+    if CONF_HEADING in config:
+        sens = yield sensor.new_sensor(config[CONF_HEADING])
+        cg.add(var.set_heading_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 103a450379..3bde797b4a 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -417,6 +417,20 @@ sensor:
     heading:
       name: "HMC5883L Heading"
     range: 130uT
+    oversampling: 8x
+    update_interval: 15s
+  - platform: qmc5883l
+    address: 0x0D
+    field_strength_x:
+      name: "QMC5883L Field Strength X"
+    field_strength_y:
+      name: "QMC5883L Field Strength Y"
+    field_strength_z:
+      name: "QMC5883L Field Strength Z"
+    heading:
+      name: "QMC5883L Heading"
+    range: 800uT
+    oversampling: 256x
     update_interval: 15s
   - platform: hx711
     name: "HX711 Value"

From 6433da13a33f5427142b1e2a512301db94626e36 Mon Sep 17 00:00:00 2001
From: Andrej Komelj <akomelj@gmail.com>
Date: Tue, 3 Dec 2019 14:18:05 +0100
Subject: [PATCH 103/412] Add B/W support for Waveshare 2.90in (B) screen
 (#889)

* Add B/W support for Waveshare 2.90in (B) screen

* Fix for() loop source code formatting
---
 .../components/waveshare_epaper/display.py    |  2 +
 .../waveshare_epaper/waveshare_epaper.cpp     | 79 +++++++++++++++++++
 .../waveshare_epaper/waveshare_epaper.h       | 20 +++++
 3 files changed, 101 insertions(+)

diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index a8ffbcc538..343059d0c1 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -12,6 +12,7 @@ WaveshareEPaper = waveshare_epaper_ns.class_('WaveshareEPaper', cg.PollingCompon
                                              display.DisplayBuffer)
 WaveshareEPaperTypeA = waveshare_epaper_ns.class_('WaveshareEPaperTypeA', WaveshareEPaper)
 WaveshareEPaper2P7In = waveshare_epaper_ns.class_('WaveshareEPaper2P7In', WaveshareEPaper)
+WaveshareEPaper2P9InB = waveshare_epaper_ns.class_('WaveshareEPaper2P9InB', WaveshareEPaper)
 WaveshareEPaper4P2In = waveshare_epaper_ns.class_('WaveshareEPaper4P2In', WaveshareEPaper)
 WaveshareEPaper7P5In = waveshare_epaper_ns.class_('WaveshareEPaper7P5In', WaveshareEPaper)
 
@@ -24,6 +25,7 @@ MODELS = {
     '2.13in-ttgo': ('a', WaveshareEPaperTypeAModel.TTGO_EPAPER_2_13_IN),
     '2.90in': ('a', WaveshareEPaperTypeAModel.WAVESHARE_EPAPER_2_9_IN),
     '2.70in': ('b', WaveshareEPaper2P7In),
+    '2.90in-b': ('b', WaveshareEPaper2P9InB),
     '4.20in': ('b', WaveshareEPaper4P2In),
     '7.50in': ('b', WaveshareEPaper7P5In),
 }
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index c2f7acde40..ff29df4444 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -423,6 +423,85 @@ void WaveshareEPaper2P7In::dump_config() {
   LOG_UPDATE_INTERVAL(this);
 }
 
+// ========================================================
+//               2.90in Type B (LUT from OTP)
+// Datasheet:
+//  - https://www.waveshare.com/w/upload/b/bb/2.9inch-e-paper-b-specification.pdf
+//  - https://github.com/soonuse/epd-library-arduino/blob/master/2.9inch_e-paper_b/epd2in9b/epd2in9b.cpp
+// ========================================================
+
+void WaveshareEPaper2P9InB::initialize() {
+  // from https://www.waveshare.com/w/upload/b/bb/2.9inch-e-paper-b-specification.pdf, page 37
+  // EPD hardware init start
+  this->reset_();
+
+  // COMMAND BOOSTER SOFT START
+  this->command(0x06);
+  this->data(0x17);
+  this->data(0x17);
+  this->data(0x17);
+
+  // COMMAND POWER ON
+  this->command(0x04);
+  this->wait_until_idle_();
+
+  // COMMAND PANEL SETTING
+  this->command(0x00);
+  // 128x296 resolution:        10
+  // LUT from OTP:              0
+  // B/W mode (doesn't work):   1
+  // scan-up:                   1
+  // shift-right:               1
+  // booster ON:                1
+  // no soft reset:             1
+  this->data(0x9F);
+
+  // COMMAND RESOLUTION SETTING
+  // set to 128x296 by COMMAND PANNEL SETTING
+
+  // COMMAND VCOM AND DATA INTERVAL SETTING
+  // use defaults for white border and ESPHome image polarity
+
+  // EPD hardware init end
+}
+void HOT WaveshareEPaper2P9InB::display() {
+  // COMMAND DATA START TRANSMISSION 1 (B/W data)
+  this->command(0x10);
+  delay(2);
+  this->start_data_();
+  this->write_array(this->buffer_, this->get_buffer_length_());
+  this->end_data_();
+  delay(2);
+
+  // COMMAND DATA START TRANSMISSION 2 (RED data)
+  this->command(0x13);
+  delay(2);
+  this->start_data_();
+  for (int i = 0; i < this->get_buffer_length_(); i++)
+    this->write_byte(0x00);
+  this->end_data_();
+  delay(2);
+
+  // COMMAND DISPLAY REFRESH
+  this->command(0x12);
+  delay(2);
+  this->wait_until_idle_();
+
+  // COMMAND POWER OFF
+  // NOTE: power off < deep sleep
+  this->command(0x02);
+}
+int WaveshareEPaper2P9InB::get_width_internal() { return 128; }
+int WaveshareEPaper2P9InB::get_height_internal() { return 296; }
+void WaveshareEPaper2P9InB::dump_config() {
+  LOG_DISPLAY("", "Waveshare E-Paper", this);
+  ESP_LOGCONFIG(TAG, "  Model: 2.9in (B)");
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Busy Pin: ", this->busy_pin_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
 static const uint8_t LUT_VCOM_DC_4_2[] = {
     0x00, 0x17, 0x00, 0x00, 0x00, 0x02, 0x00, 0x17, 0x17, 0x00, 0x00, 0x02, 0x00, 0x0A, 0x01,
     0x00, 0x00, 0x01, 0x00, 0x0E, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index eff6b895a9..46fe465c5b 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -126,6 +126,26 @@ class WaveshareEPaper2P7In : public WaveshareEPaper {
   int get_height_internal() override;
 };
 
+class WaveshareEPaper2P9InB : public WaveshareEPaper {
+ public:
+  void initialize() override;
+
+  void display() override;
+
+  void dump_config() override;
+
+  void deep_sleep() override {
+    // COMMAND DEEP SLEEP
+    this->command(0x07);
+    this->data(0xA5);  // check byte
+  }
+
+ protected:
+  int get_width_internal() override;
+
+  int get_height_internal() override;
+};
+
 class WaveshareEPaper4P2In : public WaveshareEPaper {
  public:
   void initialize() override;

From 0f406c38ebe0c5c2e00bba412082c8a589101265 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 3 Dec 2019 11:50:06 -0300
Subject: [PATCH 104/412] fix climate_ir on receive optional (#897)

* fix climate on receive optional

* add climate tests
---
 esphome/components/climate_ir/climate_ir.h |  3 +++
 tests/test1.yaml                           | 11 ++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/esphome/components/climate_ir/climate_ir.h b/esphome/components/climate_ir/climate_ir.h
index 6dc5b43279..7a69b19786 100644
--- a/esphome/components/climate_ir/climate_ir.h
+++ b/esphome/components/climate_ir/climate_ir.h
@@ -51,6 +51,9 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
   /// Transmit via IR the state of this climate controller.
   virtual void transmit_state() = 0;
 
+  // Dummy implement on_receive so implementation is optional for inheritors
+  bool on_receive(remote_base::RemoteReceiveData data) override { return false; };
+
   bool supports_cool_{true};
   bool supports_heat_{true};
   bool supports_dry_{false};
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 3bde797b4a..601789a829 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -667,7 +667,7 @@ sensor:
       name: "Windspeed"
     wind_direction_degrees:
       name: "Winddirection Degrees"
-    pin: 
+    pin:
       number: GPIO04
       mode: INPUT
   - platform: zyaura
@@ -1082,7 +1082,7 @@ light:
           name: "Test For Custom Lambda Effect"
           lambda: |-
             it[0] = current_color;
-                
+
     - automation:
         name: Custom Effect
         sequence:
@@ -1154,6 +1154,11 @@ climate:
     sensor: my_sensor
   - platform: coolix
     name: Coolix Climate
+  - platform: fujitsu_general
+    name: Fujitsu General Climate
+  - platform: yashima
+    name: Yashima Climate
+
 
 switch:
   - platform: gpio
@@ -1351,7 +1356,7 @@ interval:
             static uint16_t btn_left_state = id(btn_left)->get_value();
 
             ESP_LOGD("adaptive touch", "___  Touch Pad '%s' (T%u): val: %u state: %u tres:%u", id(btn_left)->get_name().c_str(), id(btn_left)->get_touch_pad(), id(btn_left)->get_value(), btn_left_state, id(btn_left)->get_threshold());
-            
+
             btn_left_state = ((uint32_t) id(btn_left)->get_value()  +  63 * (uint32_t)btn_left_state) >> 6;
 
             id(btn_left)->set_threshold(btn_left_state * 0.9);

From 7f895abc24547aefe8f8b979fd57650bebc15fd0 Mon Sep 17 00:00:00 2001
From: Nad <15346053+valordk@users.noreply.github.com>
Date: Wed, 4 Dec 2019 12:34:10 +0100
Subject: [PATCH 105/412] Add support for Sensirion SPS30 Particulate Matter
 sensors (#891)

* Add support for Sensirion SPS30 Particulate Matter sensors

* Remove blocking of the main thread on initialization;
Improve wording on the debug messages;
Add robustness in re-initialization of reconnected or replaced sensors;

* Fix code formatting;


Co-authored-by: Nad <valordk@github>
---
 esphome/components/sps30/__init__.py |   0
 esphome/components/sps30/sensor.py   |  82 ++++++++
 esphome/components/sps30/sps30.cpp   | 268 +++++++++++++++++++++++++++
 esphome/components/sps30/sps30.h     |  62 +++++++
 esphome/const.py                     |  11 ++
 tests/test1.yaml                     |  30 +++
 6 files changed, 453 insertions(+)
 create mode 100644 esphome/components/sps30/__init__.py
 create mode 100644 esphome/components/sps30/sensor.py
 create mode 100644 esphome/components/sps30/sps30.cpp
 create mode 100644 esphome/components/sps30/sps30.h

diff --git a/esphome/components/sps30/__init__.py b/esphome/components/sps30/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/sps30/sensor.py b/esphome/components/sps30/sensor.py
new file mode 100644
index 0000000000..c45758be4e
--- /dev/null
+++ b/esphome/components/sps30/sensor.py
@@ -0,0 +1,82 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import CONF_ID, CONF_PM_1_0, CONF_PM_2_5, CONF_PM_4_0, CONF_PM_10_0, \
+    CONF_PMC_0_5, CONF_PMC_1_0, CONF_PMC_2_5, CONF_PMC_4_0, CONF_PMC_10_0, CONF_PM_SIZE, \
+    UNIT_MICROGRAMS_PER_CUBIC_METER, UNIT_COUNTS_PER_CUBIC_METER, UNIT_MICROMETER, \
+    ICON_CHEMICAL_WEAPON, ICON_COUNTER, ICON_RULER
+
+DEPENDENCIES = ['i2c']
+
+sps30_ns = cg.esphome_ns.namespace('sps30')
+SPS30Component = sps30_ns.class_('SPS30Component', cg.PollingComponent, i2c.I2CDevice)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(SPS30Component),
+    cv.Optional(CONF_PM_1_0): sensor.sensor_schema(UNIT_MICROGRAMS_PER_CUBIC_METER,
+                                                   ICON_CHEMICAL_WEAPON, 2),
+    cv.Optional(CONF_PM_2_5): sensor.sensor_schema(UNIT_MICROGRAMS_PER_CUBIC_METER,
+                                                   ICON_CHEMICAL_WEAPON, 2),
+    cv.Optional(CONF_PM_4_0): sensor.sensor_schema(UNIT_MICROGRAMS_PER_CUBIC_METER,
+                                                   ICON_CHEMICAL_WEAPON, 2),
+    cv.Optional(CONF_PM_10_0): sensor.sensor_schema(UNIT_MICROGRAMS_PER_CUBIC_METER,
+                                                    ICON_CHEMICAL_WEAPON, 2),
+    cv.Optional(CONF_PMC_0_5): sensor.sensor_schema(UNIT_COUNTS_PER_CUBIC_METER,
+                                                    ICON_COUNTER, 2),
+    cv.Optional(CONF_PMC_1_0): sensor.sensor_schema(UNIT_COUNTS_PER_CUBIC_METER,
+                                                    ICON_COUNTER, 2),
+    cv.Optional(CONF_PMC_2_5): sensor.sensor_schema(UNIT_COUNTS_PER_CUBIC_METER,
+                                                    ICON_COUNTER, 2),
+    cv.Optional(CONF_PMC_4_0): sensor.sensor_schema(UNIT_COUNTS_PER_CUBIC_METER,
+                                                    ICON_COUNTER, 2),
+    cv.Optional(CONF_PMC_10_0): sensor.sensor_schema(UNIT_COUNTS_PER_CUBIC_METER,
+                                                     ICON_COUNTER, 2),
+    cv.Optional(CONF_PM_SIZE): sensor.sensor_schema(UNIT_MICROMETER,
+                                                    ICON_RULER, 0),
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x69))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield i2c.register_i2c_device(var, config)
+
+    if CONF_PM_1_0 in config:
+        sens = yield sensor.new_sensor(config[CONF_PM_1_0])
+        cg.add(var.set_pm_1_0_sensor(sens))
+
+    if CONF_PM_2_5 in config:
+        sens = yield sensor.new_sensor(config[CONF_PM_2_5])
+        cg.add(var.set_pm_2_5_sensor(sens))
+
+    if CONF_PM_4_0 in config:
+        sens = yield sensor.new_sensor(config[CONF_PM_4_0])
+        cg.add(var.set_pm_4_0_sensor(sens))
+
+    if CONF_PM_10_0 in config:
+        sens = yield sensor.new_sensor(config[CONF_PM_10_0])
+        cg.add(var.set_pm_10_0_sensor(sens))
+
+    if CONF_PMC_0_5 in config:
+        sens = yield sensor.new_sensor(config[CONF_PMC_0_5])
+        cg.add(var.set_pmc_0_5_sensor(sens))
+
+    if CONF_PMC_1_0 in config:
+        sens = yield sensor.new_sensor(config[CONF_PMC_1_0])
+        cg.add(var.set_pmc_1_0_sensor(sens))
+
+    if CONF_PMC_2_5 in config:
+        sens = yield sensor.new_sensor(config[CONF_PMC_2_5])
+        cg.add(var.set_pmc_2_5_sensor(sens))
+
+    if CONF_PMC_4_0 in config:
+        sens = yield sensor.new_sensor(config[CONF_PMC_4_0])
+        cg.add(var.set_pmc_4_0_sensor(sens))
+
+    if CONF_PMC_10_0 in config:
+        sens = yield sensor.new_sensor(config[CONF_PMC_10_0])
+        cg.add(var.set_pmc_10_0_sensor(sens))
+
+    if CONF_PM_SIZE in config:
+        sens = yield sensor.new_sensor(config[CONF_PM_SIZE])
+        cg.add(var.set_pm_size_sensor(sens))
diff --git a/esphome/components/sps30/sps30.cpp b/esphome/components/sps30/sps30.cpp
new file mode 100644
index 0000000000..181bf44189
--- /dev/null
+++ b/esphome/components/sps30/sps30.cpp
@@ -0,0 +1,268 @@
+#include "sps30.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sps30 {
+
+static const char *TAG = "sps30";
+
+static const uint16_t SPS30_CMD_GET_ARTICLE_CODE = 0xD025;
+static const uint16_t SPS30_CMD_GET_SERIAL_NUMBER = 0xD033;
+static const uint16_t SPS30_CMD_GET_FIRMWARE_VERSION = 0xD100;
+static const uint16_t SPS30_CMD_START_CONTINUOUS_MEASUREMENTS = 0x0010;
+static const uint16_t SPS30_CMD_START_CONTINUOUS_MEASUREMENTS_ARG = 0x0300;
+static const uint16_t SPS30_CMD_GET_DATA_READY_STATUS = 0x0202;
+static const uint16_t SPS30_CMD_READ_MEASUREMENT = 0x0300;
+static const uint16_t SPS30_CMD_STOP_MEASUREMENTS = 0x0104;
+static const uint16_t SPS30_CMD_SET_AUTOMATIC_CLEANING_INTERVAL_SECONDS = 0x8004;
+static const uint16_t SPS30_CMD_START_FAN_CLEANING = 0x5607;
+static const uint16_t SPS30_CMD_SOFT_RESET = 0xD304;
+static const size_t SERIAL_NUMBER_LENGTH = 8;
+static const uint8_t MAX_SKIPPED_DATA_CYCLES_BEFORE_ERROR = 5;
+
+void SPS30Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up sps30...");
+  this->write_command_(SPS30_CMD_SOFT_RESET);
+  /// Deferred Sensor initialization
+  this->set_timeout(500, [this]() {
+    /// Firmware version identification
+    if (!this->write_command_(SPS30_CMD_GET_FIRMWARE_VERSION)) {
+      this->error_code_ = FIRMWARE_VERSION_REQUEST_FAILED;
+      this->mark_failed();
+      return;
+    }
+
+    uint16_t raw_firmware_version[4];
+    if (!this->read_data_(raw_firmware_version, 4)) {
+      this->error_code_ = FIRMWARE_VERSION_READ_FAILED;
+      this->mark_failed();
+      return;
+    }
+    ESP_LOGD(TAG, "  Firmware version v%0d.%02d", (raw_firmware_version[0] >> 8),
+             uint16_t(raw_firmware_version[0] & 0xFF));
+    /// Serial number identification
+    if (!this->write_command_(SPS30_CMD_GET_SERIAL_NUMBER)) {
+      this->error_code_ = SERIAL_NUMBER_REQUEST_FAILED;
+      this->mark_failed();
+      return;
+    }
+
+    uint16_t raw_serial_number[8];
+    if (!this->read_data_(raw_serial_number, 8)) {
+      this->error_code_ = SERIAL_NUMBER_READ_FAILED;
+      this->mark_failed();
+      return;
+    }
+
+    for (size_t i = 0; i < 8; ++i) {
+      this->serial_number_[i * 2] = static_cast<char>(raw_serial_number[i] >> 8);
+      this->serial_number_[i * 2 + 1] = uint16_t(uint16_t(raw_serial_number[i] & 0xFF));
+    }
+    ESP_LOGD(TAG, "  Serial Number: '%s'", this->serial_number_);
+    this->start_continuous_measurement_();
+  });
+}
+
+void SPS30Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "sps30:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    switch (this->error_code_) {
+      case COMMUNICATION_FAILED:
+        ESP_LOGW(TAG, "Communication failed! Is the sensor connected?");
+        break;
+      case MEASUREMENT_INIT_FAILED:
+        ESP_LOGW(TAG, "Measurement Initialization failed!");
+        break;
+      case SERIAL_NUMBER_REQUEST_FAILED:
+        ESP_LOGW(TAG, "Unable to request sensor serial number");
+        break;
+      case SERIAL_NUMBER_READ_FAILED:
+        ESP_LOGW(TAG, "Unable to read sensor serial number");
+        break;
+      case FIRMWARE_VERSION_REQUEST_FAILED:
+        ESP_LOGW(TAG, "Unable to request sensor firmware version");
+        break;
+      case FIRMWARE_VERSION_READ_FAILED:
+        ESP_LOGW(TAG, "Unable to read sensor firmware version");
+        break;
+      default:
+        ESP_LOGW(TAG, "Unknown setup error!");
+        break;
+    }
+  }
+  LOG_UPDATE_INTERVAL(this);
+  ESP_LOGCONFIG(TAG, "  Serial Number: '%s'", this->serial_number_);
+  LOG_SENSOR("  ", "PM1.0", this->pm_1_0_sensor_);
+  LOG_SENSOR("  ", "PM2.5", this->pm_2_5_sensor_);
+  LOG_SENSOR("  ", "PM4", this->pm_4_0_sensor_);
+  LOG_SENSOR("  ", "PM10", this->pm_10_0_sensor_);
+}
+
+void SPS30Component::update() {
+  /// Check if warning flag active (sensor reconnected?)
+  if (this->status_has_warning()) {
+    ESP_LOGD(TAG, "Trying to reconnect the sensor...");
+    if (this->write_command_(SPS30_CMD_SOFT_RESET)) {
+      ESP_LOGD(TAG, "Sensor has soft-reset successfully. Waiting for reconnection in 500ms...");
+      this->set_timeout(500, [this]() {
+        this->start_continuous_measurement_();
+        /// Sensor restarted and reading attempt made next cycle
+        this->status_clear_warning();
+        this->skipped_data_read_cycles_ = 0;
+        ESP_LOGD(TAG, "Sensor reconnected successfully. Resuming continuous measurement!");
+      });
+    } else {
+      ESP_LOGD(TAG, "Sensor soft-reset failed. Is the sensor offline?");
+    }
+    return;
+  }
+  /// Check if measurement is ready before reading the value
+  if (!this->write_command_(SPS30_CMD_GET_DATA_READY_STATUS)) {
+    this->status_set_warning();
+    return;
+  }
+
+  uint16_t raw_read_status[1];
+  if (!this->read_data_(raw_read_status, 1) || raw_read_status[0] == 0x00) {
+    ESP_LOGD(TAG, "Sensor measurement not ready yet.");
+    this->skipped_data_read_cycles_++;
+    /// The following logic is required to address the cases when a sensor is quickly replaced before it's marked
+    /// as failed so that new sensor is eventually forced to be reinitialized for continuous measurement.
+    if (this->skipped_data_read_cycles_ > MAX_SKIPPED_DATA_CYCLES_BEFORE_ERROR) {
+      ESP_LOGD(TAG, "Sensor exceeded max allowed attempts. Sensor communication will be reinitialized.");
+      this->status_set_warning();
+    }
+    return;
+  }
+
+  if (!this->write_command_(SPS30_CMD_READ_MEASUREMENT)) {
+    ESP_LOGW(TAG, "Error reading measurement status!");
+    this->status_set_warning();
+    return;
+  }
+
+  this->set_timeout(50, [this]() {
+    uint16_t raw_data[20];
+    if (!this->read_data_(raw_data, 20)) {
+      ESP_LOGW(TAG, "Error reading measurement data!");
+      this->status_set_warning();
+      return;
+    }
+
+    union uint32_float_t {
+      uint32_t uint32;
+      float value;
+    };
+
+    /// Reading and converting Mass concentration
+    uint32_float_t pm_1_0{.uint32 = (((uint32_t(raw_data[0])) << 16) | (uint32_t(raw_data[1])))};
+    uint32_float_t pm_2_5{.uint32 = (((uint32_t(raw_data[2])) << 16) | (uint32_t(raw_data[3])))};
+    uint32_float_t pm_4_0{.uint32 = (((uint32_t(raw_data[4])) << 16) | (uint32_t(raw_data[5])))};
+    uint32_float_t pm_10_0{.uint32 = (((uint32_t(raw_data[6])) << 16) | (uint32_t(raw_data[7])))};
+
+    /// Reading and converting Number concentration
+    uint32_float_t pmc_0_5{.uint32 = (((uint32_t(raw_data[8])) << 16) | (uint32_t(raw_data[9])))};
+    uint32_float_t pmc_1_0{.uint32 = (((uint32_t(raw_data[10])) << 16) | (uint32_t(raw_data[11])))};
+    uint32_float_t pmc_2_5{.uint32 = (((uint32_t(raw_data[12])) << 16) | (uint32_t(raw_data[13])))};
+    uint32_float_t pmc_4_0{.uint32 = (((uint32_t(raw_data[14])) << 16) | (uint32_t(raw_data[15])))};
+    uint32_float_t pmc_10_0{.uint32 = (((uint32_t(raw_data[16])) << 16) | (uint32_t(raw_data[17])))};
+
+    /// Reading and converting Typical size
+    uint32_float_t pm_size{.uint32 = (((uint32_t(raw_data[18])) << 16) | (uint32_t(raw_data[19])))};
+
+    if (this->pm_1_0_sensor_ != nullptr)
+      this->pm_1_0_sensor_->publish_state(pm_1_0.value);
+    if (this->pm_2_5_sensor_ != nullptr)
+      this->pm_2_5_sensor_->publish_state(pm_2_5.value);
+    if (this->pm_4_0_sensor_ != nullptr)
+      this->pm_4_0_sensor_->publish_state(pm_4_0.value);
+    if (this->pm_10_0_sensor_ != nullptr)
+      this->pm_10_0_sensor_->publish_state(pm_10_0.value);
+
+    if (this->pmc_0_5_sensor_ != nullptr)
+      this->pmc_0_5_sensor_->publish_state(pmc_0_5.value);
+    if (this->pmc_1_0_sensor_ != nullptr)
+      this->pmc_1_0_sensor_->publish_state(pmc_1_0.value);
+    if (this->pmc_2_5_sensor_ != nullptr)
+      this->pmc_2_5_sensor_->publish_state(pmc_2_5.value);
+    if (this->pmc_4_0_sensor_ != nullptr)
+      this->pmc_4_0_sensor_->publish_state(pmc_4_0.value);
+    if (this->pmc_10_0_sensor_ != nullptr)
+      this->pmc_10_0_sensor_->publish_state(pmc_10_0.value);
+
+    if (this->pm_size_sensor_ != nullptr)
+      this->pm_size_sensor_->publish_state(pm_size.value);
+
+    this->status_clear_warning();
+    this->skipped_data_read_cycles_ = 0;
+  });
+}
+
+bool SPS30Component::write_command_(uint16_t command) {
+  // Warning ugly, trick the I2Ccomponent base by setting register to the first 8 bit.
+  return this->write_byte(command >> 8, command & 0xFF);
+}
+
+uint8_t SPS30Component::sht_crc_(uint8_t data1, uint8_t data2) {
+  uint8_t bit;
+  uint8_t crc = 0xFF;
+
+  crc ^= data1;
+  for (bit = 8; bit > 0; --bit) {
+    if (crc & 0x80)
+      crc = (crc << 1) ^ 0x131;
+    else
+      crc = (crc << 1);
+  }
+
+  crc ^= data2;
+  for (bit = 8; bit > 0; --bit) {
+    if (crc & 0x80)
+      crc = (crc << 1) ^ 0x131;
+    else
+      crc = (crc << 1);
+  }
+
+  return crc;
+}
+
+bool SPS30Component::start_continuous_measurement_() {
+  uint8_t data[4];
+  data[0] = SPS30_CMD_START_CONTINUOUS_MEASUREMENTS & 0xFF;
+  data[1] = 0x03;
+  data[2] = 0x00;
+  data[3] = sht_crc_(0x03, 0x00);
+  if (!this->write_bytes(SPS30_CMD_START_CONTINUOUS_MEASUREMENTS >> 8, data, 4)) {
+    ESP_LOGE(TAG, "Error initiating measurements");
+    return false;
+  }
+  return true;
+}
+
+bool SPS30Component::read_data_(uint16_t *data, uint8_t len) {
+  const uint8_t num_bytes = len * 3;
+  auto *buf = new uint8_t[num_bytes];
+
+  if (!this->parent_->raw_receive(this->address_, buf, num_bytes)) {
+    delete[](buf);
+    return false;
+  }
+
+  for (uint8_t i = 0; i < len; i++) {
+    const uint8_t j = 3 * i;
+    uint8_t crc = sht_crc_(buf[j], buf[j + 1]);
+    if (crc != buf[j + 2]) {
+      ESP_LOGE(TAG, "CRC8 Checksum invalid! 0x%02X != 0x%02X", buf[j + 2], crc);
+      delete[](buf);
+      return false;
+    }
+    data[i] = (buf[j] << 8) | buf[j + 1];
+  }
+
+  delete[](buf);
+  return true;
+}
+
+}  // namespace sps30
+}  // namespace esphome
diff --git a/esphome/components/sps30/sps30.h b/esphome/components/sps30/sps30.h
new file mode 100644
index 0000000000..2f977252a5
--- /dev/null
+++ b/esphome/components/sps30/sps30.h
@@ -0,0 +1,62 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace sps30 {
+
+/// This class implements support for the Sensirion SPS30 i2c/UART Particulate Matter
+/// PM1.0, PM2.5, PM4, PM10 Air Quality sensors.
+class SPS30Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void set_pm_1_0_sensor(sensor::Sensor *pm_1_0) { pm_1_0_sensor_ = pm_1_0; }
+  void set_pm_2_5_sensor(sensor::Sensor *pm_2_5) { pm_2_5_sensor_ = pm_2_5; }
+  void set_pm_4_0_sensor(sensor::Sensor *pm_4_0) { pm_4_0_sensor_ = pm_4_0; }
+  void set_pm_10_0_sensor(sensor::Sensor *pm_10_0) { pm_10_0_sensor_ = pm_10_0; }
+  void set_pmc_0_5_sensor(sensor::Sensor *pmc_0_5) { pmc_0_5_sensor_ = pmc_0_5; }
+  void set_pmc_1_0_sensor(sensor::Sensor *pmc_1_0) { pmc_1_0_sensor_ = pmc_1_0; }
+  void set_pmc_2_5_sensor(sensor::Sensor *pmc_2_5) { pmc_2_5_sensor_ = pmc_2_5; }
+  void set_pmc_4_0_sensor(sensor::Sensor *pmc_4_0) { pmc_4_0_sensor_ = pmc_4_0; }
+  void set_pmc_10_0_sensor(sensor::Sensor *pmc_10_0) { pmc_10_0_sensor_ = pmc_10_0; }
+
+  void set_pm_size_sensor(sensor::Sensor *pm_size) { pm_size_sensor_ = pm_size; }
+
+  void setup() override;
+  void update() override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+ protected:
+  bool write_command_(uint16_t command);
+  bool read_data_(uint16_t *data, uint8_t len);
+  uint8_t sht_crc_(uint8_t data1, uint8_t data2);
+  char serial_number_[17] = {0};  /// Terminating NULL character
+  bool start_continuous_measurement_();
+  uint8_t skipped_data_read_cycles_ = 0;
+
+  enum ErrorCode {
+    COMMUNICATION_FAILED,
+    FIRMWARE_VERSION_REQUEST_FAILED,
+    FIRMWARE_VERSION_READ_FAILED,
+    SERIAL_NUMBER_REQUEST_FAILED,
+    SERIAL_NUMBER_READ_FAILED,
+    MEASUREMENT_INIT_FAILED,
+    UNKNOWN
+  } error_code_{UNKNOWN};
+
+  sensor::Sensor *pm_1_0_sensor_{nullptr};
+  sensor::Sensor *pm_2_5_sensor_{nullptr};
+  sensor::Sensor *pm_4_0_sensor_{nullptr};
+  sensor::Sensor *pm_10_0_sensor_{nullptr};
+  sensor::Sensor *pmc_0_5_sensor_{nullptr};
+  sensor::Sensor *pmc_1_0_sensor_{nullptr};
+  sensor::Sensor *pmc_2_5_sensor_{nullptr};
+  sensor::Sensor *pmc_4_0_sensor_{nullptr};
+  sensor::Sensor *pmc_10_0_sensor_{nullptr};
+  sensor::Sensor *pm_size_sensor_{nullptr};
+};
+
+}  // namespace sps30
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index b604120318..e225862e70 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -329,6 +329,13 @@ CONF_PLATFORMIO_OPTIONS = 'platformio_options'
 CONF_PM_1_0 = 'pm_1_0'
 CONF_PM_10_0 = 'pm_10_0'
 CONF_PM_2_5 = 'pm_2_5'
+CONF_PM_4_0 = 'pm_4_0'
+CONF_PM_SIZE = 'pm_size'
+CONF_PMC_0_5 = 'pmc_0_5'
+CONF_PMC_1_0 = 'pmc_1_0'
+CONF_PMC_10_0 = 'pmc_10_0'
+CONF_PMC_2_5 = 'pmc_2_5'
+CONF_PMC_4_0 = 'pmc_4_0'
 CONF_PORT = 'port'
 CONF_POSITION = 'position'
 CONF_POSITION_ACTION = 'position_action'
@@ -503,6 +510,7 @@ ICON_BRIEFCASE_DOWNLOAD = 'mdi:briefcase-download'
 ICON_BRIGHTNESS_5 = 'mdi:brightness-5'
 ICON_CHECK_CIRCLE_OUTLINE = 'mdi:check-circle-outline'
 ICON_CHEMICAL_WEAPON = 'mdi:chemical-weapon'
+ICON_COUNTER = 'mdi:counter'
 ICON_CURRENT_AC = 'mdi:current-ac'
 ICON_EMPTY = ''
 ICON_FLASH = 'mdi:flash'
@@ -519,6 +527,7 @@ ICON_PULSE = 'mdi:pulse'
 ICON_RADIATOR = 'mdi:radiator'
 ICON_RESTART = 'mdi:restart'
 ICON_ROTATE_RIGHT = 'mdi:rotate-right'
+ICON_RULER = 'mdi:ruler'
 ICON_SCALE = 'mdi:scale'
 ICON_SCREEN_ROTATION = 'mdi:screen-rotation'
 ICON_SIGN_DIRECTION = 'mdi:sign-direction'
@@ -535,6 +544,7 @@ ICON_WIFI = 'mdi:wifi'
 
 UNIT_AMPERE = 'A'
 UNIT_CELSIUS = u'°C'
+UNIT_COUNTS_PER_CUBIC_METER = u'#/m³'
 UNIT_DECIBEL = 'dB'
 UNIT_DECIBEL_MILLIWATT = 'dBm'
 UNIT_DEGREE_PER_SECOND = u'°/s'
@@ -550,6 +560,7 @@ UNIT_LUX = 'lx'
 UNIT_METER = 'm'
 UNIT_METER_PER_SECOND_SQUARED = u'm/s²'
 UNIT_MICROGRAMS_PER_CUBIC_METER = u'µg/m³'
+UNIT_MICROMETER = 'µm'
 UNIT_MICROSIEMENS_PER_CENTIMETER = u'µS/cm'
 UNIT_MICROTESLA = u'µT'
 UNIT_OHM = u'Ω'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 601789a829..f4d6e5dcfe 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -593,6 +593,36 @@ sensor:
       accuracy_decimals: 1
     address: 0x58
     update_interval: 5s
+  - platform: sps30
+    pm_1_0:
+      name: "Workshop PM <1µm Weight concentration"
+      id: "workshop_PM_1_0"
+    pm_2_5:
+      name: "Workshop PM <2.5µm Weight concentration"
+      id: "workshop_PM_2_5"
+    pm_4_0:
+      name: "Workshop PM <4µm Weight concentration"
+      id: "workshop_PM_4_0"
+    pm_10_0:
+      name: "Workshop PM <10µm Weight concentration"
+      id: "workshop_PM_10_0"
+    pmc_0_5:
+      name: "Workshop PM <0.5µm Number concentration"
+      id: "workshop_PMC_0_5"
+    pmc_1_0:
+      name: "Workshop PM <1µm Number concentration"
+      id: "workshop_PMC_1_0"
+    pmc_2_5:
+      name: "Workshop PM <2.5µm Number concentration"
+      id: "workshop_PMC_2_5"
+    pmc_4_0:
+      name: "Workshop PM <4µm Number concentration"
+      id: "workshop_PMC_4_0"
+    pmc_10_0:
+      name: "Workshop PM <10µm Number concentration"
+      id: "workshop_PMC_10_0"
+    address: 0x69
+    update_interval: 10s
   - platform: shtcx
     temperature:
       name: "Living Room Temperature 10"

From 31d964c16ae61fd5716794b8682262627acb79d0 Mon Sep 17 00:00:00 2001
From: Evgeny <freekode@users.noreply.github.com>
Date: Wed, 4 Dec 2019 13:11:53 +0100
Subject: [PATCH 106/412] Add TM1561 support (#893)

* Add TM1561 support

* Fixed after clang-tidy

* Fixed after clang-tidy

* Fixed after clang-tidy, updated lib_deps

* Fixed after clang-tidy, updated formatting

* Added actions, removed from display domain

* Protected methods naming

* float casting

* float casting
---
 .gitignore                            |  3 ++
 esphome/components/tm1651/__init__.py | 61 +++++++++++++++++++++++
 esphome/components/tm1651/tm1651.cpp  | 69 +++++++++++++++++++++++++++
 esphome/components/tm1651/tm1651.h    | 56 ++++++++++++++++++++++
 platformio.ini                        |  1 +
 tests/test1.yaml                      |  5 ++
 tests/test3.yaml                      | 20 ++++++++
 7 files changed, 215 insertions(+)
 create mode 100644 esphome/components/tm1651/__init__.py
 create mode 100644 esphome/components/tm1651/tm1651.cpp
 create mode 100644 esphome/components/tm1651/tm1651.h

diff --git a/.gitignore b/.gitignore
index b004947390..fa4670769b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@ __pycache__/
 *.sublime-project
 *.sublime-workspace
 
+# Intellij Idea
+.idea
+
 # Hide some OS X stuff
 .DS_Store
 .AppleDouble
diff --git a/esphome/components/tm1651/__init__.py b/esphome/components/tm1651/__init__.py
new file mode 100644
index 0000000000..1c49287878
--- /dev/null
+++ b/esphome/components/tm1651/__init__.py
@@ -0,0 +1,61 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins, automation
+from esphome.const import CONF_ID, CONF_CLK_PIN, CONF_LEVEL, CONF_BRIGHTNESS
+
+tm1651_ns = cg.esphome_ns.namespace('tm1651')
+TM1651Display = tm1651_ns.class_('TM1651Display', cg.Component)
+SetLevelAction = tm1651_ns.class_('SetLevelAction', automation.Action)
+SetBrightnessAction = tm1651_ns.class_('SetBrightnessAction', automation.Action)
+validate_level = cv.All(cv.int_range(min=0, max=100))
+
+TM1651_BRIGHTNESS_OPTIONS = {
+    1: TM1651Display.TM1651_BRIGHTNESS_LOW,
+    2: TM1651Display.TM1651_BRIGHTNESS_MEDIUM,
+    3: TM1651Display.TM1651_BRIGHTNESS_HIGH
+}
+
+CONF_DIO_PIN = 'dio_pin'
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(TM1651Display),
+    cv.Required(CONF_CLK_PIN): pins.internal_gpio_output_pin_schema,
+    cv.Required(CONF_DIO_PIN): pins.internal_gpio_output_pin_schema,
+})
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+
+    clk_pin = yield cg.gpio_pin_expression(config[CONF_CLK_PIN])
+    cg.add(var.set_clk_pin(clk_pin))
+    dio_pin = yield cg.gpio_pin_expression(config[CONF_DIO_PIN])
+    cg.add(var.set_dio_pin(dio_pin))
+
+    # https://platformio.org/lib/show/6865/TM1651
+    cg.add_library('6865', '1.0.0')
+
+
+@automation.register_action('tm1651.set_level', SetLevelAction, cv.maybe_simple_value({
+    cv.GenerateID(): cv.use_id(TM1651Display),
+    cv.Required(CONF_LEVEL): cv.templatable(validate_level),
+}, key=CONF_LEVEL))
+def tm1651_set_level_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    template_ = yield cg.templatable(config[CONF_LEVEL], args, cg.uint8)
+    cg.add(var.set_level(template_))
+    yield var
+
+
+@automation.register_action('tm1651.set_brightness', SetBrightnessAction, cv.maybe_simple_value({
+    cv.GenerateID(): cv.use_id(TM1651Display),
+    cv.Required(CONF_BRIGHTNESS): cv.templatable(validate_level),
+}, key=CONF_BRIGHTNESS))
+def tm1651_set_brightness_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    template_ = yield cg.templatable(config[CONF_BRIGHTNESS], args, cg.uint8)
+    cg.add(var.set_brightness(template_))
+    yield var
diff --git a/esphome/components/tm1651/tm1651.cpp b/esphome/components/tm1651/tm1651.cpp
new file mode 100644
index 0000000000..594ebe9db9
--- /dev/null
+++ b/esphome/components/tm1651/tm1651.cpp
@@ -0,0 +1,69 @@
+#include "tm1651.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace tm1651 {
+
+static const char *TAG = "tm1651.display";
+static const uint8_t TM1651_MAX_LEVEL = 7;
+static const uint8_t MAX_INPUT_LEVEL = 100;
+
+static const uint8_t TM1651_BRIGHTNESS_LOW = 0;
+static const uint8_t TM1651_BRIGHTNESS_MEDIUM = 2;
+static const uint8_t TM1651_BRIGHTNESS_HIGH = 7;
+
+void TM1651Display::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up TM1651...");
+
+  uint8_t clk = clk_pin_->get_pin();
+  uint8_t dio = dio_pin_->get_pin();
+
+  battery_display_ = new TM1651(clk, dio);
+  battery_display_->init();
+  battery_display_->clearDisplay();
+}
+
+void TM1651Display::dump_config() {
+  ESP_LOGCONFIG(TAG, "TM1651 Battery Display");
+  LOG_PIN("  CLK: ", clk_pin_);
+  LOG_PIN("  DIO: ", dio_pin_);
+}
+
+void TM1651Display::set_level(uint8_t new_level) {
+  this->level_ = calculate_level_(new_level);
+  this->repaint_();
+}
+
+void TM1651Display::set_brightness(uint8_t new_brightness) {
+  this->brightness_ = calculate_brightness_(new_brightness);
+  this->repaint_();
+}
+
+void TM1651Display::repaint_() {
+  battery_display_->set(this->brightness_);
+  battery_display_->displayLevel(this->level_);
+}
+
+uint8_t TM1651Display::calculate_level_(uint8_t new_level) {
+  if (new_level == 0) {
+    return 0;
+  }
+
+  float calculated_level = TM1651_MAX_LEVEL / (float) (MAX_INPUT_LEVEL / (float) new_level);
+  return (uint8_t) roundf(calculated_level);
+}
+
+uint8_t TM1651Display::calculate_brightness_(uint8_t new_brightness) {
+  if (new_brightness <= 1) {
+    return TM1651_BRIGHTNESS_LOW;
+  } else if (new_brightness == 2) {
+    return TM1651_BRIGHTNESS_MEDIUM;
+  } else if (new_brightness >= 3) {
+    return TM1651_BRIGHTNESS_HIGH;
+  }
+
+  return TM1651_BRIGHTNESS_LOW;
+}
+
+}  // namespace tm1651
+}  // namespace esphome
diff --git a/esphome/components/tm1651/tm1651.h b/esphome/components/tm1651/tm1651.h
new file mode 100644
index 0000000000..d75c2adb62
--- /dev/null
+++ b/esphome/components/tm1651/tm1651.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
+#include "esphome/core/automation.h"
+
+#include <TM1651.h>
+
+namespace esphome {
+namespace tm1651 {
+
+class TM1651Display : public Component {
+ public:
+  void set_clk_pin(GPIOPin *pin) { clk_pin_ = pin; }
+  void set_dio_pin(GPIOPin *pin) { dio_pin_ = pin; }
+
+  void setup() override;
+  void dump_config() override;
+
+  void set_level(uint8_t);
+  void set_brightness(uint8_t);
+
+ protected:
+  TM1651 *battery_display_;
+  GPIOPin *clk_pin_;
+  GPIOPin *dio_pin_;
+
+  uint8_t brightness_;
+  uint8_t level_;
+
+  void repaint_();
+
+  uint8_t calculate_level_(uint8_t);
+  uint8_t calculate_brightness_(uint8_t);
+};
+
+template<typename... Ts> class SetLevelAction : public Action<Ts...>, public Parented<TM1651Display> {
+ public:
+  TEMPLATABLE_VALUE(uint8_t, level)
+  void play(Ts... x) override {
+    auto level = this->level_.value(x...);
+    this->parent_->set_level(level);
+  }
+};
+
+template<typename... Ts> class SetBrightnessAction : public Action<Ts...>, public Parented<TM1651Display> {
+ public:
+  TEMPLATABLE_VALUE(uint8_t, brightness)
+  void play(Ts... x) override {
+    auto brightness = this->brightness_.value(x...);
+    this->parent_->set_brightness(brightness);
+  }
+};
+
+}  // namespace tm1651
+}  // namespace esphome
diff --git a/platformio.ini b/platformio.ini
index 4e1ef1d294..408e5af1ce 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -18,6 +18,7 @@ lib_deps =
     NeoPixelBus-esphome@2.5.2
     ESPAsyncTCP-esphome@1.2.2
     1655@1.0.2  ; TinyGPSPlus (has name conflict)
+    6865@1.0.0  ; TM1651 Battery Display
 build_flags =
     -Wno-reorder
     -DUSE_WEB_SERVER
diff --git a/tests/test1.yaml b/tests/test1.yaml
index f4d6e5dcfe..192d7a2fc9 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1454,6 +1454,11 @@ display:
   lambda: |-
     it.rectangle(0, 0, it.get_width(), it.get_height());
 
+tm1651:
+  id: tm1651_battery
+  clk_pin: GPIO23
+  dio_pin: GPIO23
+
 remote_receiver:
   pin: GPIO32
   dump: all
diff --git a/tests/test3.yaml b/tests/test3.yaml
index bbfcc72880..2703621752 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -138,6 +138,21 @@ api:
       then:
         - dfplayer.random
 
+    - service: battery_level
+      variables:
+        level: int
+      then:
+        - tm1651.set_level:
+            id: tm1651_battery
+            level: !lambda 'return level;'
+    - service: battery_brightness
+      variables:
+        brightness: int
+      then:
+        - tm1651.set_brightness:
+            id: tm1651_battery
+            brightness: !lambda 'return brightness;'
+
 wifi:
   ssid: 'MySSID'
   password: 'password1'
@@ -651,3 +666,8 @@ dfplayer:
             dfplayer.is_playing
         then:
           logger.log: 'Playback finished event'
+
+tm1651:
+  id: tm1651_battery
+  clk_pin: D6
+  dio_pin: D5

From b7dff4bbab367e44279671fd04d72e140d9817d4 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 15:58:40 +0100
Subject: [PATCH 107/412] Add magic value REPLACEME (#881)

* Add magic value REPLACEME

* Lint
---
 esphome/config.py            | 30 +++++++++++++++--
 esphome/config_validation.py |  9 ++---
 esphome/helpers.py           | 48 ++++++++++++++++++++++++++
 esphome/yaml_util.py         | 65 ++++++++++--------------------------
 4 files changed, 95 insertions(+), 57 deletions(-)

diff --git a/esphome/config.py b/esphome/config.py
index 5906e2fc95..53449c3e85 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -18,12 +18,12 @@ from esphome.components.substitutions import CONF_SUBSTITUTIONS
 from esphome.const import CONF_ESPHOME, CONF_PLATFORM, ESP_PLATFORMS
 from esphome.core import CORE, EsphomeError  # noqa
 from esphome.helpers import color, indent
-from esphome.py_compat import text_type, IS_PY2, decode_text
+from esphome.py_compat import text_type, IS_PY2, decode_text, string_types
 from esphome.util import safe_print, OrderedDict
 
 from typing import List, Optional, Tuple, Union  # noqa
 from esphome.core import ConfigType  # noqa
-from esphome.yaml_util import is_secret, ESPHomeDataBase
+from esphome.yaml_util import is_secret, ESPHomeDataBase, ESPForceValue
 from esphome.voluptuous_schema import ExtraKeysInvalid
 
 _LOGGER = logging.getLogger(__name__)
@@ -380,6 +380,24 @@ def do_id_pass(result):  # type: (Config) -> None
                 result.add_str_error("Couldn't resolve ID for type '{}'".format(id.type), path)
 
 
+def recursive_check_replaceme(value):
+    import esphome.config_validation as cv
+
+    if isinstance(value, list):
+        return cv.Schema([recursive_check_replaceme])(value)
+    if isinstance(value, dict):
+        return cv.Schema({cv.valid: recursive_check_replaceme})(value)
+    if isinstance(value, ESPForceValue):
+        pass
+    if isinstance(value, string_types) and value == 'REPLACEME':
+        raise cv.Invalid("Found 'REPLACEME' in configuration, this is most likely an error. "
+                         "Please make sure you have replaced all fields from the sample "
+                         "configuration.\n"
+                         "If you want to use the literal REPLACEME string, "
+                         "please use \"!force REPLACEME\"")
+    return value
+
+
 def validate_config(config):
     result = Config()
 
@@ -393,6 +411,12 @@ def validate_config(config):
             result.add_error(err)
             return result
 
+    # 1.1. Check for REPLACEME special value
+    try:
+        recursive_check_replaceme(config)
+    except vol.Invalid as err:
+        result.add_error(err)
+
     if 'esphomeyaml' in config:
         _LOGGER.warning("The esphomeyaml section has been renamed to esphome in 1.11.0. "
                         "Please replace 'esphomeyaml:' in your configuration with 'esphome:'.")
@@ -588,7 +612,7 @@ def _nested_getitem(data, path):
 
 def humanize_error(config, validation_error):
     validation_error = text_type(validation_error)
-    m = re.match(r'^(.*?)\s*(?:for dictionary value )?@ data\[.*$', validation_error)
+    m = re.match(r'^(.*?)\s*(?:for dictionary value )?@ data\[.*$', validation_error, re.DOTALL)
     if m is not None:
         validation_error = m.group(1)
     validation_error = validation_error.strip()
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 5c7255a874..88fb55e841 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -19,7 +19,7 @@ from esphome.const import CONF_AVAILABILITY, CONF_COMMAND_TOPIC, CONF_DISCOVERY,
     CONF_HOUR, CONF_MINUTE, CONF_SECOND, CONF_VALUE, CONF_UPDATE_INTERVAL, CONF_TYPE_ID, CONF_TYPE
 from esphome.core import CORE, HexInt, IPAddress, Lambda, TimePeriod, TimePeriodMicroseconds, \
     TimePeriodMilliseconds, TimePeriodSeconds, TimePeriodMinutes
-from esphome.helpers import list_starts_with
+from esphome.helpers import list_starts_with, add_class_to_obj
 from esphome.py_compat import integer_types, string_types, text_type, IS_PY2, decode_text
 from esphome.voluptuous_schema import _Schema
 
@@ -964,11 +964,8 @@ def enum(mapping, **kwargs):
     one_of_validator = one_of(*mapping, **kwargs)
 
     def validator(value):
-        from esphome.yaml_util import make_data_base
-
-        value = make_data_base(one_of_validator(value))
-        cls = value.__class__
-        value.__class__ = cls.__class__(cls.__name__ + "Enum", (cls, core.EnumValue), {})
+        value = one_of_validator(value)
+        value = add_class_to_obj(value, core.EnumValue)
         value.enum_value = mapping[value]
         return value
 
diff --git a/esphome/helpers.py b/esphome/helpers.py
index 48607dbff5..e91b13a735 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -261,3 +261,51 @@ def file_compare(path1, path2):
             if not blob1:
                 # Reached end
                 return True
+
+
+# A dict of types that need to be converted to heaptypes before a class can be added
+# to the object
+_TYPE_OVERLOADS = {
+    int: type('int', (int,), dict()),
+    float: type('float', (float,), dict()),
+    str: type('str', (str,), dict()),
+    dict: type('dict', (str,), dict()),
+    list: type('list', (list,), dict()),
+}
+
+if IS_PY2:
+    _TYPE_OVERLOADS[long] = type('long', (long,), dict())
+    _TYPE_OVERLOADS[unicode] = type('unicode', (unicode,), dict())
+
+# cache created classes here
+_CLASS_LOOKUP = {}
+
+
+def add_class_to_obj(value, cls):
+    """Add a class to a python type.
+
+    This function modifies value so that it has cls as a basetype.
+    The value itself may be modified by this action! You must use the return
+    value of this function however, since some types need to be copied first (heaptypes).
+    """
+    if isinstance(value, cls):
+        # If already is instance, do not add
+        return value
+
+    try:
+        orig_cls = value.__class__
+        key = (orig_cls, cls)
+        new_cls = _CLASS_LOOKUP.get(key)
+        if new_cls is None:
+            new_cls = orig_cls.__class__(orig_cls.__name__, (orig_cls, cls), {})
+            _CLASS_LOOKUP[key] = new_cls
+        value.__class__ = new_cls
+        return value
+    except TypeError:
+        # Non heap type, look in overloads dict
+        for type_, func in _TYPE_OVERLOADS.items():
+            # Use type() here, we only need to trigger if it's the exact type,
+            # as otherwise we don't need to overload the class
+            if type(value) is type_:  # pylint: disable=unidiomatic-typecheck
+                return add_class_to_obj(func(value), cls)
+        raise
diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index fb04d7d5b0..d80334cedf 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -2,6 +2,7 @@ from __future__ import print_function
 
 import fnmatch
 import functools
+import inspect
 import logging
 import math
 import os
@@ -13,6 +14,7 @@ import yaml.constructor
 from esphome import core
 from esphome.config_helpers import read_config_file
 from esphome.core import EsphomeError, IPAddress, Lambda, MACAddress, TimePeriod, DocumentRange
+from esphome.helpers import add_class_to_obj
 from esphome.py_compat import text_type, IS_PY2
 from esphome.util import OrderedDict, filter_yaml_files
 
@@ -26,14 +28,6 @@ _SECRET_CACHE = {}
 _SECRET_VALUES = {}
 
 
-class NodeListClass(list):
-    pass
-
-
-class NodeStrClass(text_type):
-    pass
-
-
 class ESPHomeDataBase(object):
     @property
     def esp_range(self):
@@ -44,56 +38,25 @@ class ESPHomeDataBase(object):
         self._esp_range = DocumentRange.from_marks(node.start_mark, node.end_mark)
 
 
-class ESPInt(int, ESPHomeDataBase):
+class ESPForceValue(object):
     pass
 
 
-class ESPFloat(float, ESPHomeDataBase):
-    pass
-
-
-class ESPStr(str, ESPHomeDataBase):
-    pass
-
-
-class ESPDict(OrderedDict, ESPHomeDataBase):
-    pass
-
-
-class ESPList(list, ESPHomeDataBase):
-    pass
-
-
-class ESPLambda(Lambda, ESPHomeDataBase):
-    pass
-
-
-ESP_TYPES = {
-    int: ESPInt,
-    float: ESPFloat,
-    str: ESPStr,
-    dict: ESPDict,
-    list: ESPList,
-    Lambda: ESPLambda,
-}
-if IS_PY2:
-    class ESPUnicode(unicode, ESPHomeDataBase):
-        pass
-
-    ESP_TYPES[unicode] = ESPUnicode
-
-
 def make_data_base(value):
-    for typ, cons in ESP_TYPES.items():
-        if isinstance(value, typ):
-            return cons(value)
-    return value
+    return add_class_to_obj(value, ESPHomeDataBase)
 
 
 def _add_data_ref(fn):
     @functools.wraps(fn)
     def wrapped(loader, node):
         res = fn(loader, node)
+        # newer PyYAML versions use generators, resolve them
+        if inspect.isgenerator(res):
+            generator = res
+            res = next(generator)
+            # Let generator finish
+            for _ in generator:
+                pass
         res = make_data_base(res)
         if isinstance(res, ESPHomeDataBase):
             res.from_node(node)
@@ -296,6 +259,11 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
     def construct_lambda(self, node):
         return Lambda(text_type(node.value))
 
+    @_add_data_ref
+    def construct_force(self, node):
+        obj = self.construct_scalar(node)
+        return add_class_to_obj(obj, ESPForceValue)
+
 
 ESPHomeLoader.add_constructor(u'tag:yaml.org,2002:int', ESPHomeLoader.construct_yaml_int)
 ESPHomeLoader.add_constructor(u'tag:yaml.org,2002:float', ESPHomeLoader.construct_yaml_float)
@@ -314,6 +282,7 @@ ESPHomeLoader.add_constructor('!include_dir_named', ESPHomeLoader.construct_incl
 ESPHomeLoader.add_constructor('!include_dir_merge_named',
                               ESPHomeLoader.construct_include_dir_merge_named)
 ESPHomeLoader.add_constructor('!lambda', ESPHomeLoader.construct_lambda)
+ESPHomeLoader.add_constructor('!force', ESPHomeLoader.construct_force)
 
 
 def load_yaml(fname):

From 73f80a8ea1a18b8d2fad0116d0fd5379d746ac06 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 15:58:58 +0100
Subject: [PATCH 108/412] Fix MQTT logs Int or String expected Python 3 (#898)

Fixes https://github.com/esphome/issues/issues/850
---
 esphome/mqtt.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/esphome/mqtt.py b/esphome/mqtt.py
index 541f1983f7..77eb941363 100644
--- a/esphome/mqtt.py
+++ b/esphome/mqtt.py
@@ -67,7 +67,9 @@ def initialize(config, subscriptions, on_message, username, password, client_id)
                        tls_version=tls_version, ciphers=None)
 
     try:
-        client.connect(str(config[CONF_MQTT][CONF_BROKER]), config[CONF_MQTT][CONF_PORT])
+        host = str(config[CONF_MQTT][CONF_BROKER])
+        port = int(config[CONF_MQTT][CONF_PORT])
+        client.connect(host, port)
     except socket.error as err:
         raise EsphomeError("Cannot connect to MQTT broker: {}".format(err))
 
@@ -127,7 +129,7 @@ def clear_topic(config, topic, username=None, password=None, client_id=None):
 
 # From marvinroger/async-mqtt-client -> scripts/get-fingerprint/get-fingerprint.py
 def get_fingerprint(config):
-    addr = str(config[CONF_MQTT][CONF_BROKER]), config[CONF_MQTT][CONF_PORT]
+    addr = str(config[CONF_MQTT][CONF_BROKER]), int(config[CONF_MQTT][CONF_PORT])
     _LOGGER.info("Getting fingerprint from %s:%s", addr[0], addr[1])
     try:
         cert_pem = ssl.get_server_certificate(addr)

From d26cd85306ee925b5ae1021247633d2d075939a7 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 15:59:08 +0100
Subject: [PATCH 109/412] web_server call setup_controller (#899)

---
 esphome/components/web_server/web_server.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index c6204533d4..fcd83297e2 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -64,6 +64,7 @@ void WebServer::set_js_url(const char *js_url) { this->js_url_ = js_url; }
 
 void WebServer::setup() {
   ESP_LOGCONFIG(TAG, "Setting up web server...");
+  this->setup_controller();
   this->base_->init();
 
   this->events_.onConnect([this](AsyncEventSourceClient *client) {

From e86f2e993f94954a6c96d55cb09a0004a46f32d0 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 15:59:27 +0100
Subject: [PATCH 110/412] Pulse counter validate not both disabled (#902)

---
 esphome/components/pulse_counter/sensor.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/esphome/components/pulse_counter/sensor.py b/esphome/components/pulse_counter/sensor.py
index e73bc36036..61d3f3d5b5 100644
--- a/esphome/components/pulse_counter/sensor.py
+++ b/esphome/components/pulse_counter/sensor.py
@@ -38,16 +38,25 @@ def validate_pulse_counter_pin(value):
     return value
 
 
+def validate_count_mode(value):
+    rising_edge = value[CONF_RISING_EDGE]
+    falling_edge = value[CONF_FALLING_EDGE]
+    if rising_edge == 'DISABLE' and falling_edge == 'DISABLE':
+        raise cv.Invalid("Can't set both count modes to DISABLE! This means no counting occurs at "
+                         "all!")
+    return value
+
+
 CONFIG_SCHEMA = sensor.sensor_schema(UNIT_PULSES_PER_MINUTE, ICON_PULSE, 2).extend({
     cv.GenerateID(): cv.declare_id(PulseCounterSensor),
     cv.Required(CONF_PIN): validate_pulse_counter_pin,
     cv.Optional(CONF_COUNT_MODE, default={
         CONF_RISING_EDGE: 'INCREMENT',
         CONF_FALLING_EDGE: 'DISABLE',
-    }): cv.Schema({
+    }): cv.All(cv.Schema({
         cv.Required(CONF_RISING_EDGE): COUNT_MODE_SCHEMA,
         cv.Required(CONF_FALLING_EDGE): COUNT_MODE_SCHEMA,
-    }),
+    }), validate_count_mode),
     cv.Optional(CONF_INTERNAL_FILTER, default='13us'): validate_internal_filter,
 }).extend(cv.polling_component_schema('60s'))
 

From e9e92afc9e6857af24bd55dbce0de452c76aca07 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 16:03:37 +0100
Subject: [PATCH 111/412] Optimize application loop speed (#860)

* Optimize application loop speed

* Also check call_loop

* Remove duplicate code

* Fixes
---
 esphome/components/light/light_state.cpp |  2 --
 esphome/core/application.cpp             | 10 +++++++++-
 esphome/core/application.h               |  3 +++
 esphome/core/component.cpp               | 10 ++++++++++
 esphome/core/component.h                 |  2 ++
 5 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index e96d64ad1f..0ffb603818 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -416,8 +416,6 @@ LightColorValues LightCall::validate_() {
   if (this->brightness_.has_value())
     v.set_brightness(*this->brightness_);
 
-  if (this->brightness_.has_value())
-    v.set_brightness(*this->brightness_);
   if (this->red_.has_value())
     v.set_red(*this->red_);
   if (this->green_.has_value())
diff --git a/esphome/core/application.cpp b/esphome/core/application.cpp
index 2600ace218..4ecb247ec3 100644
--- a/esphome/core/application.cpp
+++ b/esphome/core/application.cpp
@@ -57,13 +57,14 @@ void Application::setup() {
 
   ESP_LOGI(TAG, "setup() finished successfully!");
   this->schedule_dump_config();
+  this->calculate_looping_components_();
 }
 void Application::loop() {
   uint32_t new_app_state = 0;
   const uint32_t start = millis();
 
   this->scheduler.call();
-  for (Component *component : this->components_) {
+  for (Component *component : this->looping_components_) {
     component->call();
     new_app_state |= component->get_component_state();
     this->app_state_ |= new_app_state;
@@ -146,6 +147,13 @@ void Application::safe_reboot() {
   }
 }
 
+void Application::calculate_looping_components_() {
+  for (auto *obj : this->components_) {
+    if (obj->has_overridden_loop())
+      this->looping_components_.push_back(obj);
+  }
+}
+
 Application App;
 
 }  // namespace esphome
diff --git a/esphome/core/application.h b/esphome/core/application.h
index 2014b082e9..3c293e6c8f 100644
--- a/esphome/core/application.h
+++ b/esphome/core/application.h
@@ -209,7 +209,10 @@ class Application {
 
   void register_component_(Component *comp);
 
+  void calculate_looping_components_();
+
   std::vector<Component *> components_{};
+  std::vector<Component *> looping_components_{};
 
 #ifdef USE_BINARY_SENSOR
   std::vector<binary_sensor::BinarySensor *> binary_sensors_{};
diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index 0547fcbdd5..26662b0061 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -138,6 +138,16 @@ float Component::get_actual_setup_priority() const {
   return this->setup_priority_override_;
 }
 void Component::set_setup_priority(float priority) { this->setup_priority_override_ = priority; }
+bool Component::has_overridden_loop() const {
+#ifdef CLANG_TIDY
+  bool loop_overridden = true;
+  bool call_loop_overridden = true;
+#else
+  bool loop_overridden = (void *) (this->*(&Component::loop)) != (void *) (&Component::loop);
+  bool call_loop_overridden = (void *) (this->*(&Component::call_loop)) != (void *) (&Component::call_loop);
+#endif
+  return loop_overridden || call_loop_overridden;
+}
 
 PollingComponent::PollingComponent(uint32_t update_interval) : Component(), update_interval_(update_interval) {}
 
diff --git a/esphome/core/component.h b/esphome/core/component.h
index c8e05cc252..e3f9a51f25 100644
--- a/esphome/core/component.h
+++ b/esphome/core/component.h
@@ -126,6 +126,8 @@ class Component {
 
   void status_momentary_error(const std::string &name, uint32_t length = 5000);
 
+  bool has_overridden_loop() const;
+
  protected:
   virtual void call_loop();
   virtual void call_setup();

From 064589934cd3df5d582563f6120f4fc9b8b9c717 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 16:04:46 +0100
Subject: [PATCH 112/412] Ignore ESP32 Camera unknown framesizes (#901)

Fixes https://github.com/esphome/issues/issues/866
---
 esphome/components/esp32_camera/esp32_camera.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/esp32_camera/esp32_camera.cpp b/esphome/components/esp32_camera/esp32_camera.cpp
index 2b153f5667..1d9faf7ea2 100644
--- a/esphome/components/esp32_camera/esp32_camera.cpp
+++ b/esphome/components/esp32_camera/esp32_camera.cpp
@@ -85,6 +85,8 @@ void ESP32Camera::dump_config() {
     case FRAMESIZE_UXGA:
       ESP_LOGCONFIG(TAG, "  Resolution: 1600x1200 (UXGA)");
       break;
+    default:
+      break;
   }
 
   if (this->is_failed()) {

From 0698be39956f55f02c83bd7b606f0e9f6a0b0a05 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 16:47:34 +0100
Subject: [PATCH 113/412] Better/stricter pin validation (#903)

* Better/stricter pin validation

* Update tests
---
 esphome/pins.py  | 40 ++++++++++++++++++++++++++++++----------
 tests/test1.yaml | 12 ++++++------
 tests/test2.yaml |  4 ++--
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/esphome/pins.py b/esphome/pins.py
index 42c8548da4..9a2cf90984 100644
--- a/esphome/pins.py
+++ b/esphome/pins.py
@@ -289,30 +289,48 @@ def _translate_pin(value):
     return _lookup_pin(value)
 
 
+_ESP_SDIO_PINS = {
+    6: 'Flash Clock',
+    7: 'Flash Data 0',
+    8: 'Flash Data 1',
+    11: 'Flash Command',
+}
+
+
 def validate_gpio_pin(value):
     value = _translate_pin(value)
     if CORE.is_esp32:
         if value < 0 or value > 39:
             raise cv.Invalid(u"ESP32: Invalid pin number: {}".format(value))
-        if 6 <= value <= 11:
-            _LOGGER.warning(u"ESP32: Pin %s (6-11) might already be used by the "
-                            u"flash interface. Be warned.", value)
+        if value in _ESP_SDIO_PINS:
+            raise cv.Invalid("This pin cannot be used on ESP32s and is already used by "
+                             "the flash interface (function: {})".format(_ESP_SDIO_PINS[value]))
+        if 9 <= value <= 10:
+            _LOGGER.warning(u"ESP32: Pin %s (9-10) might already be used by the "
+                            u"flash interface in QUAD IO flash mode.", value)
         if value in (20, 24, 28, 29, 30, 31):
-            _LOGGER.warning(u"ESP32: Pin %s (20, 24, 28-31) can usually not be used. "
-                            u"Be warned.", value)
+            # These pins are not exposed in GPIO mux (reason unknown)
+            # but they're missing from IO_MUX list in datasheet
+            raise cv.Invalid("The pin GPIO{} is not usable on ESP32s.".format(value))
         return value
     if CORE.is_esp8266:
-        if 6 <= value <= 11:
-            _LOGGER.warning(u"ESP8266: Pin %s (6-11) might already be used by the "
-                            u"flash interface. Be warned.", value)
         if value < 0 or value > 17:
             raise cv.Invalid(u"ESP8266: Invalid pin number: {}".format(value))
+        if value in _ESP_SDIO_PINS:
+            raise cv.Invalid("This pin cannot be used on ESP8266s and is already used by "
+                             "the flash interface (function: {})".format(_ESP_SDIO_PINS[value]))
+        if 9 <= value <= 10:
+            _LOGGER.warning(u"ESP8266: Pin %s (9-10) might already be used by the "
+                            u"flash interface in QUAD IO flash mode.", value)
         return value
     raise NotImplementedError
 
 
 def input_pin(value):
-    return validate_gpio_pin(value)
+    value = validate_gpio_pin(value)
+    if CORE.is_esp8266 and value == 17:
+        raise cv.Invalid("GPIO17 (TOUT) is an analog-only pin on the ESP8266.")
+    return value
 
 
 def input_pullup_pin(value):
@@ -335,6 +353,8 @@ def output_pin(value):
                              u"input pin.".format(value))
         return value
     if CORE.is_esp8266:
+        if value == 17:
+            raise cv.Invalid("GPIO17 (TOUT) is an analog-only pin on the ESP8266.")
         return value
     raise NotImplementedError
 
@@ -348,7 +368,7 @@ def analog_pin(value):
     if CORE.is_esp8266:
         if value == 17:  # A0
             return value
-        raise cv.Invalid(u"ESP8266: Only pin A0 (17) supports ADC.")
+        raise cv.Invalid(u"ESP8266: Only pin A0 (GPIO17) supports ADC.")
     raise NotImplementedError
 
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 192d7a2fc9..b7f3d04b40 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -435,7 +435,7 @@ sensor:
   - platform: hx711
     name: "HX711 Value"
     dout_pin: GPIO23
-    clk_pin: GPIO24
+    clk_pin: GPIO25
     gain: 128
     update_interval: 15s
   - platform: ina219
@@ -542,7 +542,7 @@ sensor:
     name: "Rotary Encoder"
     id: rotary_encoder1
     pin_a: GPIO23
-    pin_b: GPIO24
+    pin_b: GPIO25
     pin_reset: GPIO25
     filters:
       - or:
@@ -655,7 +655,7 @@ sensor:
     integration_time: 402ms
     gain: 16x
   - platform: ultrasonic
-    trigger_pin: GPIO24
+    trigger_pin: GPIO25
     echo_pin:
       number: GPIO23
       inverted: true
@@ -1396,11 +1396,11 @@ display:
   dimensions: 18x4
   data_pins:
   - GPIO19
-  - GPIO20
   - GPIO21
   - GPIO22
+  - GPIO23
   enable_pin: GPIO23
-  rs_pin: GPIO24
+  rs_pin: GPIO25
   lambda: |-
     it.print("Hello World!");
 - platform: lcd_pcf8574
@@ -1528,7 +1528,7 @@ stepper:
 - platform: a4988
   id: my_stepper
   step_pin: GPIO23
-  dir_pin: GPIO24
+  dir_pin: GPIO25
   sleep_pin: GPIO25
   max_speed: 250 steps/s
   acceleration: 100 steps/s^2
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 935f9edb84..bcc777b83b 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -10,7 +10,7 @@ substitutions:
 ethernet:
   type: LAN8720
   mdc_pin: GPIO23
-  mdio_pin: GPIO24
+  mdio_pin: GPIO25
   clk_mode: GPIO0_IN
   phy_addr: 0
   power_pin: GPIO25
@@ -286,7 +286,7 @@ stepper:
   - platform: uln2003
     id: my_stepper
     pin_a: GPIO23
-    pin_b: GPIO24
+    pin_b: GPIO27
     pin_c: GPIO25
     pin_d: GPIO26
     sleep_when_done: no

From f68a3a9334da5288b39035542b95e0c194198a7e Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 16:48:08 +0100
Subject: [PATCH 114/412] Disable default wait_time for rc_switch (#900)

See also https://github.com/esphome/esphome/commit/82625a30808f4c914bb9e6a2b3e7ef229a451c99#commitcomment-36092052
---
 esphome/components/remote_base/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index a62304c87d..023f0f253e 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -505,7 +505,7 @@ RC_SWITCH_TYPE_D_SCHEMA = cv.Schema({
 RC_SWITCH_TRANSMITTER = cv.Schema({
     cv.Optional(CONF_REPEAT, default={CONF_TIMES: 5}): cv.Schema({
         cv.Required(CONF_TIMES): cv.templatable(cv.positive_int),
-        cv.Optional(CONF_WAIT_TIME, default='10ms'):
+        cv.Optional(CONF_WAIT_TIME, default='0us'):
             cv.templatable(cv.positive_time_period_microseconds),
     }),
 })

From 33c08812ccc34515f5fb163bbd937ecdce772971 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 17:12:26 +0100
Subject: [PATCH 115/412] Update ESP32 BLE ADV parse to match BLE spec (#904)

* Update ESP32 BLE ADV parse to match BLE spec

* Update xiaomi

* Update ruuvi

* Format

* Update esp32_ble_tracker.cpp

* Fix log

* Format

* Update xiaomi_ble.cpp
---
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 130 ++++++++++++------
 .../esp32_ble_tracker/esp32_ble_tracker.h     |  56 +++++---
 esphome/components/ruuvi_ble/ruuvi_ble.cpp    |  35 +++--
 esphome/components/xiaomi_ble/xiaomi_ble.cpp  |  31 +++--
 esphome/core/helpers.h                        |   1 +
 5 files changed, 158 insertions(+), 95 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 53c6de62cc..ab6bfa681c 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -203,10 +203,6 @@ void ESP32BLETracker::gap_scan_result(const esp_ble_gap_cb_param_t::ble_scan_res
   }
 }
 
-std::string hexencode_string(const std::string &raw_data) {
-  return hexencode(reinterpret_cast<const uint8_t *>(raw_data.c_str()), raw_data.size());
-}
-
 ESPBTUUID::ESPBTUUID() : uuid_() {}
 ESPBTUUID ESPBTUUID::from_uint16(uint16_t uuid) {
   ESPBTUUID ret;
@@ -267,13 +263,13 @@ std::string ESPBTUUID::to_string() {
 }
 
 ESPBLEiBeacon::ESPBLEiBeacon(const uint8_t *data) { memcpy(&this->beacon_data_, data, sizeof(beacon_data_)); }
-optional<ESPBLEiBeacon> ESPBLEiBeacon::from_manufacturer_data(const std::string &data) {
-  if (data.size() != 25)
-    return {};
-  if (data[0] != 0x4C || data[1] != 0x00)
+optional<ESPBLEiBeacon> ESPBLEiBeacon::from_manufacturer_data(const ServiceData &data) {
+  if (!data.uuid.contains(0x4C, 0x00))
     return {};
 
-  return ESPBLEiBeacon(reinterpret_cast<const uint8_t *>(data.data()));
+  if (data.data.size() != 23)
+    return {};
+  return ESPBLEiBeacon(data.data.data());
 }
 
 void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
@@ -305,8 +301,8 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
 
   ESP_LOGVV(TAG, "  RSSI: %d", this->rssi_);
   ESP_LOGVV(TAG, "  Name: '%s'", this->name_.c_str());
-  if (this->tx_power_.has_value()) {
-    ESP_LOGVV(TAG, "  TX Power: %d", *this->tx_power_);
+  for (auto &it : this->tx_powers_) {
+    ESP_LOGVV(TAG, "  TX Power: %d", it);
   }
   if (this->appearance_.has_value()) {
     ESP_LOGVV(TAG, "  Appearance: %u", *this->appearance_);
@@ -314,20 +310,19 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
   if (this->ad_flag_.has_value()) {
     ESP_LOGVV(TAG, "  Ad Flag: %u", *this->ad_flag_);
   }
-  for (auto uuid : this->service_uuids_) {
+  for (auto &uuid : this->service_uuids_) {
     ESP_LOGVV(TAG, "  Service UUID: %s", uuid.to_string().c_str());
   }
-  ESP_LOGVV(TAG, "  Manufacturer data: %s", hexencode_string(this->manufacturer_data_).c_str());
-  ESP_LOGVV(TAG, "  Service data: %s", hexencode_string(this->service_data_).c_str());
-
-  if (this->service_data_uuid_.has_value()) {
-    ESP_LOGVV(TAG, "  Service Data UUID: %s", this->service_data_uuid_->to_string().c_str());
+  for (auto &data : this->manufacturer_datas_) {
+    ESP_LOGVV(TAG, "  Manufacturer data: %s", hexencode(data.data).c_str());
+  }
+  for (auto &data : this->service_datas_) {
+    ESP_LOGVV(TAG, "  Service data:");
+    ESP_LOGVV(TAG, "    UUID: %s", data.uuid.to_string().c_str());
+    ESP_LOGVV(TAG, "    Data: %s", hexencode(data.data).c_str());
   }
 
-  ESP_LOGVV(TAG, "Adv data: %s",
-            hexencode_string(
-                std::string(reinterpret_cast<const char *>(param.ble_adv), param.adv_data_len + param.scan_rsp_len))
-                .c_str());
+  ESP_LOGVV(TAG, "Adv data: %s", hexencode(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
 #endif
 }
 void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
@@ -346,25 +341,52 @@ void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_p
     const uint8_t record_length = field_length - 1;
     offset += record_length;
 
+    // See also Generic Access Profile Assigned Numbers:
+    // https://www.bluetooth.com/specifications/assigned-numbers/generic-access-profile/ See also ADVERTISING AND SCAN
+    // RESPONSE DATA FORMAT: https://www.bluetooth.com/specifications/bluetooth-core-specification/ (vol 3, part C, 11)
+    // See also Core Specification Supplement: https://www.bluetooth.com/specifications/bluetooth-core-specification/
+    // (called CSS here)
+
     switch (record_type) {
       case ESP_BLE_AD_TYPE_NAME_CMPL: {
+        // CSS 1.2 LOCAL NAME
+        // "The Local Name data type shall be the same as, or a shortened version of, the local name assigned to the
+        // device." CSS 1: Optional in this context; shall not appear more than once in a block.
         this->name_ = std::string(reinterpret_cast<const char *>(record), record_length);
         break;
       }
       case ESP_BLE_AD_TYPE_TX_PWR: {
-        this->tx_power_ = *payload;
+        // CSS 1.5 TX POWER LEVEL
+        // "The TX Power Level data type indicates the transmitted power level of the packet containing the data type."
+        // CSS 1: Optional in this context (may appear more than once in a block).
+        this->tx_powers_.push_back(*payload);
         break;
       }
       case ESP_BLE_AD_TYPE_APPEARANCE: {
+        // CSS 1.12 APPEARANCE
+        // "The Appearance data type defines the external appearance of the device."
+        // See also https://www.bluetooth.com/specifications/gatt/characteristics/
+        // CSS 1: Optional in this context; shall not appear more than once in a block and shall not appear in both
+        // the AD and SRD of the same extended advertising interval.
         this->appearance_ = *reinterpret_cast<const uint16_t *>(record);
         break;
       }
       case ESP_BLE_AD_TYPE_FLAG: {
+        // CSS 1.3 FLAGS
+        // "The Flags data type contains one bit Boolean flags. The Flags data type shall be included when any of the
+        // Flag bits are non-zero and the advertising packet is connectable, otherwise the Flags data type may be
+        // omitted."
+        // CSS 1: Optional in this context; shall not appear more than once in a block.
         this->ad_flag_ = *record;
         break;
       }
+      // CSS 1.1 SERVICE UUID
+      // The Service UUID data type is used to include a list of Service or Service Class UUIDs.
+      // There are six data types defined for the three sizes of Service UUIDs that may be returned:
+      // CSS 1: Optional in this context (may appear more than once in a block).
       case ESP_BLE_AD_TYPE_16SRV_CMPL:
       case ESP_BLE_AD_TYPE_16SRV_PART: {
+        // • 16-bit Bluetooth Service UUIDs
         for (uint8_t i = 0; i < record_length / 2; i++) {
           this->service_uuids_.push_back(ESPBTUUID::from_uint16(*reinterpret_cast<const uint16_t *>(record + 2 * i)));
         }
@@ -372,6 +394,7 @@ void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_p
       }
       case ESP_BLE_AD_TYPE_32SRV_CMPL:
       case ESP_BLE_AD_TYPE_32SRV_PART: {
+        // • 32-bit Bluetooth Service UUIDs
         for (uint8_t i = 0; i < record_length / 4; i++) {
           this->service_uuids_.push_back(ESPBTUUID::from_uint32(*reinterpret_cast<const uint32_t *>(record + 4 * i)));
         }
@@ -379,41 +402,70 @@ void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_p
       }
       case ESP_BLE_AD_TYPE_128SRV_CMPL:
       case ESP_BLE_AD_TYPE_128SRV_PART: {
+        // • Global 128-bit Service UUIDs
         this->service_uuids_.push_back(ESPBTUUID::from_raw(record));
         break;
       }
       case ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE: {
-        this->manufacturer_data_ = std::string(reinterpret_cast<const char *>(record), record_length);
+        // CSS 1.4 MANUFACTURER SPECIFIC DATA
+        // "The Manufacturer Specific data type is used for manufacturer specific data. The first two data octets shall
+        // contain a company identifier from Assigned Numbers. The interpretation of any other octets within the data
+        // shall be defined by the manufacturer specified by the company identifier."
+        // CSS 1: Optional in this context (may appear more than once in a block).
+        if (record_length < 2) {
+          ESP_LOGV(TAG, "Record length too small for ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE");
+          break;
+        }
+        ServiceData data{};
+        data.uuid = ESPBTUUID::from_uint16(*reinterpret_cast<const uint16_t *>(record));
+        data.data.assign(record + 2UL, record + record_length);
+        this->manufacturer_datas_.push_back(data);
         break;
       }
+
+      // CSS 1.11 SERVICE DATA
+      // "The Service Data data type consists of a service UUID with the data associated with that service."
+      // CSS 1: Optional in this context (may appear more than once in a block).
       case ESP_BLE_AD_TYPE_SERVICE_DATA: {
+        // «Service Data - 16 bit UUID»
+        // Size: 2 or more octets
+        // The first 2 octets contain the 16 bit Service UUID fol- lowed by additional service data
         if (record_length < 2) {
           ESP_LOGV(TAG, "Record length too small for ESP_BLE_AD_TYPE_SERVICE_DATA");
           break;
         }
-        this->service_data_uuid_ = ESPBTUUID::from_uint16(*reinterpret_cast<const uint16_t *>(record));
-        if (record_length > 2)
-          this->service_data_ = std::string(reinterpret_cast<const char *>(record + 2), record_length - 2UL);
+        ServiceData data{};
+        data.uuid = ESPBTUUID::from_uint16(*reinterpret_cast<const uint16_t *>(record));
+        data.data.assign(record + 2UL, record + record_length);
+        this->service_datas_.push_back(data);
         break;
       }
       case ESP_BLE_AD_TYPE_32SERVICE_DATA: {
+        // «Service Data - 32 bit UUID»
+        // Size: 4 or more octets
+        // The first 4 octets contain the 32 bit Service UUID fol- lowed by additional service data
         if (record_length < 4) {
           ESP_LOGV(TAG, "Record length too small for ESP_BLE_AD_TYPE_32SERVICE_DATA");
           break;
         }
-        this->service_data_uuid_ = ESPBTUUID::from_uint32(*reinterpret_cast<const uint32_t *>(record));
-        if (record_length > 4)
-          this->service_data_ = std::string(reinterpret_cast<const char *>(record + 4), record_length - 4UL);
+        ServiceData data{};
+        data.uuid = ESPBTUUID::from_uint32(*reinterpret_cast<const uint32_t *>(record));
+        data.data.assign(record + 4UL, record + record_length);
+        this->service_datas_.push_back(data);
         break;
       }
       case ESP_BLE_AD_TYPE_128SERVICE_DATA: {
+        // «Service Data - 128 bit UUID»
+        // Size: 16 or more octets
+        // The first 16 octets contain the 128 bit Service UUID followed by additional service data
         if (record_length < 16) {
           ESP_LOGV(TAG, "Record length too small for ESP_BLE_AD_TYPE_128SERVICE_DATA");
           break;
         }
-        this->service_data_uuid_ = ESPBTUUID::from_raw(record);
-        if (record_length > 16)
-          this->service_data_ = std::string(reinterpret_cast<const char *>(record + 16), record_length - 16UL);
+        ServiceData data{};
+        data.uuid = ESPBTUUID::from_raw(record);
+        data.data.assign(record + 16UL, record + record_length);
+        this->service_datas_.push_back(data);
         break;
       }
       default: {
@@ -430,16 +482,6 @@ std::string ESPBTDevice::address_str() const {
   return mac;
 }
 uint64_t ESPBTDevice::address_uint64() const { return ble_addr_to_uint64(this->address_); }
-esp_ble_addr_type_t ESPBTDevice::get_address_type() const { return this->address_type_; }
-int ESPBTDevice::get_rssi() const { return this->rssi_; }
-const std::string &ESPBTDevice::get_name() const { return this->name_; }
-const optional<int8_t> &ESPBTDevice::get_tx_power() const { return this->tx_power_; }
-const optional<uint16_t> &ESPBTDevice::get_appearance() const { return this->appearance_; }
-const optional<uint8_t> &ESPBTDevice::get_ad_flag() const { return this->ad_flag_; }
-const std::vector<ESPBTUUID> &ESPBTDevice::get_service_uuids() const { return this->service_uuids_; }
-const std::string &ESPBTDevice::get_manufacturer_data() const { return this->manufacturer_data_; }
-const std::string &ESPBTDevice::get_service_data() const { return this->service_data_; }
-const optional<ESPBTUUID> &ESPBTDevice::get_service_data_uuid() const { return this->service_data_uuid_; }
 
 void ESP32BLETracker::dump_config() {
   ESP_LOGCONFIG(TAG, "BLE Tracker:");
@@ -480,8 +522,8 @@ void ESP32BLETracker::print_bt_device_info(const ESPBTDevice &device) {
   ESP_LOGD(TAG, "  Address Type: %s", address_type_s);
   if (!device.get_name().empty())
     ESP_LOGD(TAG, "  Name: '%s'", device.get_name().c_str());
-  if (device.get_tx_power().has_value()) {
-    ESP_LOGD(TAG, "  TX Power: %d", *device.get_tx_power());
+  for (auto &tx_power : device.get_tx_powers()) {
+    ESP_LOGD(TAG, "  TX Power: %d", tx_power);
   }
 }
 
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 280c3fc45f..74bb7e5d10 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -33,11 +33,18 @@ class ESPBTUUID {
   esp_bt_uuid_t uuid_;
 };
 
+using adv_data_t = std::vector<uint8_t>;
+
+struct ServiceData {
+  ESPBTUUID uuid;
+  adv_data_t data;
+};
+
 class ESPBLEiBeacon {
  public:
   ESPBLEiBeacon() { memset(&this->beacon_data_, 0, sizeof(this->beacon_data_)); }
   ESPBLEiBeacon(const uint8_t *data);
-  static optional<ESPBLEiBeacon> from_manufacturer_data(const std::string &data);
+  static optional<ESPBLEiBeacon> from_manufacturer_data(const ServiceData &data);
 
   uint16_t get_major() { return reverse_bits_16(this->beacon_data_.major); }
   uint16_t get_minor() { return reverse_bits_16(this->beacon_data_.minor); }
@@ -46,7 +53,6 @@ class ESPBLEiBeacon {
 
  protected:
   struct {
-    uint16_t manufacturer_id;
     uint8_t sub_type;
     uint8_t proximity_uuid[16];
     uint16_t major;
@@ -63,18 +69,33 @@ class ESPBTDevice {
 
   uint64_t address_uint64() const;
 
-  esp_ble_addr_type_t get_address_type() const;
-  int get_rssi() const;
-  const std::string &get_name() const;
-  const optional<int8_t> &get_tx_power() const;
-  const optional<uint16_t> &get_appearance() const;
-  const optional<uint8_t> &get_ad_flag() const;
-  const std::vector<ESPBTUUID> &get_service_uuids() const;
-  const std::string &get_manufacturer_data() const;
-  const std::string &get_service_data() const;
-  const optional<ESPBTUUID> &get_service_data_uuid() const;
-  const optional<ESPBLEiBeacon> get_ibeacon() const {
-    return ESPBLEiBeacon::from_manufacturer_data(this->manufacturer_data_);
+  esp_ble_addr_type_t get_address_type() const { return this->address_type_; }
+  int get_rssi() const { return rssi_; }
+  const std::string &get_name() const { return this->name_; }
+
+  ESPDEPRECATED("Use get_tx_powers() instead")
+  optional<int8_t> get_tx_power() const {
+    if (this->tx_powers_.empty())
+      return {};
+    return this->tx_powers_[0];
+  }
+  const std::vector<int8_t> &get_tx_powers() const { return tx_powers_; }
+
+  const optional<uint16_t> &get_appearance() const { return appearance_; }
+  const optional<uint8_t> &get_ad_flag() const { return ad_flag_; }
+  const std::vector<ESPBTUUID> &get_service_uuids() const { return service_uuids_; }
+
+  const std::vector<ServiceData> &get_manufacturer_datas() const { return manufacturer_datas_; }
+
+  const std::vector<ServiceData> &get_service_datas() const { return service_datas_; }
+
+  optional<ESPBLEiBeacon> get_ibeacon() const {
+    for (auto &it : this->manufacturer_datas_) {
+      auto res = ESPBLEiBeacon::from_manufacturer_data(it);
+      if (res.has_value())
+        return *res;
+    }
+    return {};
   }
 
  protected:
@@ -86,13 +107,12 @@ class ESPBTDevice {
   esp_ble_addr_type_t address_type_{BLE_ADDR_TYPE_PUBLIC};
   int rssi_{0};
   std::string name_{};
-  optional<int8_t> tx_power_{};
+  std::vector<int8_t> tx_powers_{};
   optional<uint16_t> appearance_{};
   optional<uint8_t> ad_flag_{};
   std::vector<ESPBTUUID> service_uuids_;
-  std::string manufacturer_data_{};
-  std::string service_data_{};
-  optional<ESPBTUUID> service_data_uuid_{};
+  std::vector<ServiceData> manufacturer_datas_{};
+  std::vector<ServiceData> service_datas_{};
 };
 
 class ESP32BLETracker;
diff --git a/esphome/components/ruuvi_ble/ruuvi_ble.cpp b/esphome/components/ruuvi_ble/ruuvi_ble.cpp
index 28a689fee4..7e13140e55 100644
--- a/esphome/components/ruuvi_ble/ruuvi_ble.cpp
+++ b/esphome/components/ruuvi_ble/ruuvi_ble.cpp
@@ -8,10 +8,12 @@ namespace ruuvi_ble {
 
 static const char *TAG = "ruuvi_ble";
 
-bool parse_ruuvi_data_byte(uint8_t data_type, uint8_t data_length, const uint8_t *data, RuuviParseResult &result) {
+bool parse_ruuvi_data_byte(const esp32_ble_tracker::adv_data_t &adv_data, RuuviParseResult &result) {
+  const uint8_t data_type = adv_data[0];
+  const auto *data = &adv_data[1];
   switch (data_type) {
     case 0x03: {  // RAWv1
-      if (data_length != 16)
+      if (adv_data.size() != 14)
         return false;
 
       const uint8_t temp_sign = (data[1] >> 7) & 1;
@@ -32,13 +34,13 @@ bool parse_ruuvi_data_byte(uint8_t data_type, uint8_t data_length, const uint8_t
       result.acceleration_y = acceleration_y;
       result.acceleration_z = acceleration_z;
       result.acceleration =
-          sqrt(acceleration_x * acceleration_x + acceleration_y * acceleration_y + acceleration_z * acceleration_z);
+          sqrtf(acceleration_x * acceleration_x + acceleration_y * acceleration_y + acceleration_z * acceleration_z);
       result.battery_voltage = battery_voltage;
 
       return true;
     }
     case 0x05: {  // RAWv2
-      if (data_length != 26)
+      if (adv_data.size() != 24)
         return false;
 
       const float temperature = (int16_t(data[0] << 8) + int16_t(data[1])) * 0.005f;
@@ -63,8 +65,8 @@ bool parse_ruuvi_data_byte(uint8_t data_type, uint8_t data_length, const uint8_t
       result.acceleration_z = data[10] == 0xFF && data[11] == 0xFF ? NAN : acceleration_z;
       result.acceleration = result.acceleration_x == NAN || result.acceleration_y == NAN || result.acceleration_z == NAN
                                 ? NAN
-                                : sqrt(acceleration_x * acceleration_x + acceleration_y * acceleration_y +
-                                       acceleration_z * acceleration_z);
+                                : sqrtf(acceleration_x * acceleration_x + acceleration_y * acceleration_y +
+                                        acceleration_z * acceleration_z);
       result.battery_voltage = (power_info >> 5) == 0x7FF ? NAN : battery_voltage;
       result.tx_power = (power_info & 0x1F) == 0x1F ? NAN : tx_power;
       result.movement_counter = movement_counter;
@@ -77,21 +79,16 @@ bool parse_ruuvi_data_byte(uint8_t data_type, uint8_t data_length, const uint8_t
   }
 }
 optional<RuuviParseResult> parse_ruuvi(const esp32_ble_tracker::ESPBTDevice &device) {
-  const auto *raw = reinterpret_cast<const uint8_t *>(device.get_manufacturer_data().data());
+  bool success = false;
+  RuuviParseResult result{};
+  for (auto &it : device.get_manufacturer_datas()) {
+    bool is_ruuvi = it.uuid.contains(0x99, 0x04);
+    if (!is_ruuvi)
+      continue;
 
-  bool is_ruuvi = raw[0] == 0x99 && raw[1] == 0x04;
-
-  if (!is_ruuvi) {
-    return {};
+    if (parse_ruuvi_data_byte(it.data, result))
+      success = true;
   }
-
-  const uint8_t data_length = device.get_manufacturer_data().size();
-  const uint8_t format = raw[2];
-  const uint8_t *data = &raw[3];
-
-  RuuviParseResult result;
-
-  bool success = parse_ruuvi_data_byte(format, data_length, data, result);
   if (!success)
     return {};
   return result;
diff --git a/esphome/components/xiaomi_ble/xiaomi_ble.cpp b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
index e6884e5ea6..18eaffed06 100644
--- a/esphome/components/xiaomi_ble/xiaomi_ble.cpp
+++ b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
@@ -63,22 +63,17 @@ bool parse_xiaomi_data_byte(uint8_t data_type, const uint8_t *data, uint8_t data
       return false;
   }
 }
-optional<XiaomiParseResult> parse_xiaomi(const esp32_ble_tracker::ESPBTDevice &device) {
-  if (!device.get_service_data_uuid().has_value()) {
-    // ESP_LOGVV(TAG, "Xiaomi no service data");
-    return {};
-  }
-
-  if (!device.get_service_data_uuid()->contains(0x95, 0xFE)) {
+bool parse_xiaomi_service_data(XiaomiParseResult &result, const esp32_ble_tracker::ServiceData &service_data) {
+  if (!service_data.uuid.contains(0x95, 0xFE)) {
     // ESP_LOGVV(TAG, "Xiaomi no service data UUID magic bytes");
-    return {};
+    return false;
   }
 
-  const auto *raw = reinterpret_cast<const uint8_t *>(device.get_service_data().data());
+  const auto raw = service_data.data;
 
-  if (device.get_service_data().size() < 14) {
+  if (raw.size() < 14) {
     // ESP_LOGVV(TAG, "Xiaomi service data too short!");
-    return {};
+    return false;
   }
 
   bool is_lywsdcgq = (raw[1] & 0x20) == 0x20 && raw[2] == 0xAA && raw[3] == 0x01;
@@ -88,10 +83,9 @@ optional<XiaomiParseResult> parse_xiaomi(const esp32_ble_tracker::ESPBTDevice &d
 
   if (!is_lywsdcgq && !is_hhccjcy01 && !is_lywsd02 && !is_cgg1) {
     // ESP_LOGVV(TAG, "Xiaomi no magic bytes");
-    return {};
+    return false;
   }
 
-  XiaomiParseResult result;
   result.type = XiaomiParseResult::TYPE_HHCCJCY01;
   if (is_lywsdcgq) {
     result.type = XiaomiParseResult::TYPE_LYWSDCGQ;
@@ -111,7 +105,7 @@ optional<XiaomiParseResult> parse_xiaomi(const esp32_ble_tracker::ESPBTDevice &d
 
   const uint8_t *raw_data = &raw[raw_offset];
   uint8_t data_offset = 0;
-  uint8_t data_length = device.get_service_data().size() - raw_offset;
+  uint8_t data_length = raw.size() - raw_offset;
   bool success = false;
 
   while (true) {
@@ -136,6 +130,15 @@ optional<XiaomiParseResult> parse_xiaomi(const esp32_ble_tracker::ESPBTDevice &d
     data_offset += 3 + datapoint_length;
   }
 
+  return success;
+}
+optional<XiaomiParseResult> parse_xiaomi(const esp32_ble_tracker::ESPBTDevice &device) {
+  XiaomiParseResult result;
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    if (parse_xiaomi_service_data(result, service_data))
+      success = true;
+  }
   if (!success)
     return {};
   return result;
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 88f0d587e5..91b78b73a0 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -158,6 +158,7 @@ ParseOnOffState parse_on_off(const char *str, const char *on = nullptr, const ch
 
 // Encode raw data to a human-readable string (for debugging)
 std::string hexencode(const uint8_t *data, uint32_t len);
+template<typename T> std::string hexencode(const T &data) { return hexencode(data.data(), data.size()); }
 
 // https://stackoverflow.com/questions/7858817/unpacking-a-tuple-to-call-a-matching-function-pointer/7858971#7858971
 template<int...> struct seq {};                                       // NOLINT

From bba6d6897d140b45fc7eafff26d0330c1df7af79 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 17:13:34 +0100
Subject: [PATCH 116/412] Update dependencies (#906)

PyYAML 5.1.2 -> 5.2 https://github.com/yaml/pyyaml/blob/master/CHANGES
flake8 3.6.0 -> 3.7.9 https://github.com/PyCQA/flake8/tree/master/docs/source/release-notes
paho-mqtt 1.4.0 -> 1.5.0 https://github.com/eclipse/paho.mqtt.python/blob/master/ChangeLog.txt
platformio 4.0.3 -> 4.1.0 https://github.com/platformio/platformio-core/releases
protobuf 3.10.0 -> 3.11.1 https://github.com/protocolbuffers/protobuf/releases
pylint 2.3.0 -> 2.4.4 http://pylint.pycqa.org/en/latest/whatsnew/changelog.html#what-s-new-in-pylint-2-4-4
---
 esphome/components/time/__init__.py | 12 ++++++------
 esphome/core.py                     | 10 +++++-----
 esphome/cpp_helpers.py              |  2 +-
 esphome/storage_json.py             |  4 ++--
 esphome/vscode.py                   |  8 ++++++--
 esphome/writer.py                   |  2 +-
 pylintrc                            |  1 +
 requirements.txt                    |  8 ++++----
 requirements_test.txt               | 12 ++++++------
 setup.cfg                           |  2 +-
 setup.py                            |  8 ++++----
 11 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/esphome/components/time/__init__.py b/esphome/components/time/__init__.py
index ca1ac375ba..58739772b0 100644
--- a/esphome/components/time/__init__.py
+++ b/esphome/components/time/__init__.py
@@ -301,17 +301,17 @@ def setup_time_core_(time_var, config):
     for conf in config.get(CONF_ON_TIME, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], time_var)
 
-        seconds = conf.get(CONF_SECONDS, [x for x in range(0, 61)])
+        seconds = conf.get(CONF_SECONDS, list(range(0, 61)))
         cg.add(trigger.add_seconds(seconds))
-        minutes = conf.get(CONF_MINUTES, [x for x in range(0, 60)])
+        minutes = conf.get(CONF_MINUTES, list(range(0, 60)))
         cg.add(trigger.add_minutes(minutes))
-        hours = conf.get(CONF_HOURS, [x for x in range(0, 24)])
+        hours = conf.get(CONF_HOURS, list(range(0, 24)))
         cg.add(trigger.add_hours(hours))
-        days_of_month = conf.get(CONF_DAYS_OF_MONTH, [x for x in range(1, 32)])
+        days_of_month = conf.get(CONF_DAYS_OF_MONTH, list(range(1, 32)))
         cg.add(trigger.add_days_of_month(days_of_month))
-        months = conf.get(CONF_MONTHS, [x for x in range(1, 13)])
+        months = conf.get(CONF_MONTHS, list(range(1, 13)))
         cg.add(trigger.add_months(months))
-        days_of_week = conf.get(CONF_DAYS_OF_WEEK, [x for x in range(1, 8)])
+        days_of_week = conf.get(CONF_DAYS_OF_WEEK, list(range(1, 8)))
         cg.add(trigger.add_days_of_week(days_of_week))
 
         yield cg.register_component(trigger, conf)
diff --git a/esphome/core.py b/esphome/core.py
index 82ce196cab..9df30384bc 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -8,7 +8,7 @@ import os
 import re
 
 # pylint: disable=unused-import, wrong-import-order
-from typing import Any, Dict, List  # noqa
+from typing import Any, Dict, List, Optional, Set  # noqa
 
 from esphome.const import CONF_ARDUINO_VERSION, SOURCE_FILE_EXTENSIONS, \
     CONF_COMMENT, CONF_ESPHOME, CONF_USE_ADDRESS, CONF_WIFI
@@ -271,7 +271,7 @@ class ID(object):
         else:
             self.is_manual = is_manual
         self.is_declaration = is_declaration
-        self.type = type  # type: Optional[MockObjClass]
+        self.type = type  # type: Optional['MockObjClass']
 
     def resolve(self, registered_ids):
         from esphome.config_validation import RESERVED_IDS
@@ -489,11 +489,11 @@ class EsphomeCore(object):
         # Task counter for pending tasks
         self.task_counter = 0
         # The variable cache, for each ID this holds a MockObj of the variable obj
-        self.variables = {}  # type: Dict[str, MockObj]
+        self.variables = {}  # type: Dict[str, 'MockObj']
         # A list of statements that go in the main setup() block
-        self.main_statements = []  # type: List[Statement]
+        self.main_statements = []  # type: List['Statement']
         # A list of statements to insert in the global block (includes and global variables)
-        self.global_statements = []  # type: List[Statement]
+        self.global_statements = []  # type: List['Statement']
         # A set of platformio libraries to add to the project
         self.libraries = []  # type: List[Library]
         # A set of build flags to set in the platformio project
diff --git a/esphome/cpp_helpers.py b/esphome/cpp_helpers.py
index fd79feec1c..39ac8e7118 100644
--- a/esphome/cpp_helpers.py
+++ b/esphome/cpp_helpers.py
@@ -59,7 +59,7 @@ def register_parented(var, value):
 
 
 def extract_registry_entry_config(registry, full_config):
-    # type: (Registry, ConfigType) -> RegistryEntry
+    # type: ('Registry', 'ConfigType') -> 'RegistryEntry'
     key, config = next((k, v) for k, v in full_config.items() if k in registry)
     return registry[key], config
 
diff --git a/esphome/storage_json.py b/esphome/storage_json.py
index e1b4070d3b..f3e53ce168 100644
--- a/esphome/storage_json.py
+++ b/esphome/storage_json.py
@@ -10,8 +10,8 @@ from esphome.core import CORE
 from esphome.helpers import write_file_if_changed
 
 # pylint: disable=unused-import, wrong-import-order
-from esphome.core import CoreType  # noqa
-from typing import Any, Dict, Optional  # noqa
+from esphome.core import CoreType
+from typing import Any, Optional, List
 
 from esphome.py_compat import text_type
 
diff --git a/esphome/vscode.py b/esphome/vscode.py
index 151bfb5281..6b35d4bd7a 100644
--- a/esphome/vscode.py
+++ b/esphome/vscode.py
@@ -3,10 +3,14 @@ from __future__ import print_function
 import json
 import os
 
-from esphome.config import load_config, _format_vol_invalid
-from esphome.core import CORE
+from esphome.config import load_config, _format_vol_invalid, Config
+from esphome.core import CORE, DocumentRange
 from esphome.py_compat import text_type, safe_input
 
+# pylint: disable=unused-import, wrong-import-order
+import voluptuous as vol
+from typing import Optional
+
 
 def _get_invalid_range(res, invalid):
     # type: (Config, vol.Invalid) -> Optional[DocumentRange]
diff --git a/esphome/writer.py b/esphome/writer.py
index 1961af5a15..b036413a66 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -291,7 +291,7 @@ def copy_src_tree():
         source_files.update(component.source_files)
 
     # Convert to list and sort
-    source_files_l = [it for it in source_files.items()]
+    source_files_l = list(source_files.items())
     source_files_l.sort()
 
     # Build #include list for esphome.h
diff --git a/pylintrc b/pylintrc
index b011e2750c..89cc73656f 100644
--- a/pylintrc
+++ b/pylintrc
@@ -24,6 +24,7 @@ disable=
   useless-object-inheritance,
   stop-iteration-return,
   no-self-use,
+  import-outside-toplevel,
 
 
 additional-builtins=
diff --git a/requirements.txt b/requirements.txt
index 14ce062000..b8af2a605b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
 voluptuous==0.11.7
-PyYAML==5.1.2
-paho-mqtt==1.4.0
+PyYAML==5.2
+paho-mqtt==1.5.0
 colorlog==4.0.2
 tornado==5.1.1
 typing>=3.6.6;python_version<"3.5"
-protobuf==3.10.0
+protobuf==3.11.1
 tzlocal==2.0.0
 pytz==2019.3
 pyserial==3.4
 ifaddr==0.1.6
-platformio==4.0.3
+platformio==4.1.0
 esptool==2.7
diff --git a/requirements_test.txt b/requirements_test.txt
index 26f14434d8..ff02badf80 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,19 +1,19 @@
 voluptuous==0.11.7
-PyYAML==5.1.2
-paho-mqtt==1.4.0
+PyYAML==5.2
+paho-mqtt==1.5.0
 colorlog==4.0.2
 tornado==5.1.1
 typing>=3.6.6;python_version<"3.5"
-protobuf==3.10.0
+protobuf==3.11.1
 tzlocal==2.0.0
 pytz==2019.3
 pyserial==3.4
 ifaddr==0.1.6
-platformio==4.0.3
+platformio==4.1.0
 esptool==2.7
 
 pylint==1.9.4 ; python_version<"3"
-pylint==2.3.0 ; python_version>"3"
-flake8==3.6.0
+pylint==2.4.4 ; python_version>"3"
+flake8==3.7.9
 pillow
 pexpect
diff --git a/setup.cfg b/setup.cfg
index e3521f48b7..bef998fb37 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,7 +18,7 @@ Topic :: Home Automation
 
 [flake8]
 max-line-length = 120
-builtins = unicode, long, raw_input
+builtins = unicode, long, raw_input, basestring
 exclude = api_pb2.py
 
 [bdist_wheel]
diff --git a/setup.py b/setup.py
index 641bb3e431..1d4fb3a4d0 100755
--- a/setup.py
+++ b/setup.py
@@ -24,12 +24,12 @@ DOWNLOAD_URL = '{}/archive/v{}.zip'.format(GITHUB_URL, const.__version__)
 
 REQUIRES = [
     'voluptuous==0.11.7',
-    'PyYAML==5.1.2',
-    'paho-mqtt==1.4.0',
+    'PyYAML==5.2',
+    'paho-mqtt==1.5.0',
     'colorlog==4.0.2',
     'tornado==5.1.1',
     'typing>=3.6.6;python_version<"3.6"',
-    'protobuf==3.10.0',
+    'protobuf==3.11.1',
     'tzlocal==2.0.0',
     'pytz==2019.3',
     'pyserial==3.4',
@@ -41,7 +41,7 @@ REQUIRES = [
 # This means they have to be in your $PATH.
 if os.environ.get('ESPHOME_USE_SUBPROCESS') is None:
     REQUIRES.extend([
-        'platformio==4.0.3',
+        'platformio==4.1.0',
         'esptool==2.7',
     ])
 

From 7a6df38515fb4bdd48db1b25c8004d1d5d755872 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 19:30:10 +0100
Subject: [PATCH 117/412] Add ESP8266 core v2.6.2 (#905)

* Add ESP8266 core v2.6.2

* Upstream ESP8266 Wifi fixes

* Replace disable_interrupt with InterruptLock C++ class

* Update code to use InterruptLock

* Lint

* Update dht.cpp

* Improve InterruptLock docs, mark as ICACHE_RAM_ATTR

* Fixes
---
 .../components/dallas/dallas_component.cpp    |  68 +++++----
 esphome/components/dallas/esp_one_wire.cpp    |  26 ++--
 esphome/components/dht/dht.cpp                | 137 ++++++++++--------
 esphome/components/hx711/hx711.cpp            |  31 ++--
 .../remote_transmitter_esp8266.cpp            |  24 +--
 esphome/components/uart/uart.cpp              |  39 ++---
 .../wifi/wifi_component_esp8266.cpp           |  59 +++++++-
 esphome/core/helpers.cpp                      |  28 ++--
 esphome/core/helpers.h                        |  34 ++++-
 esphome/core/preferences.cpp                  |  22 +--
 esphome/core_config.py                        |   2 +
 esphome/platformio_api.py                     |   1 +
 12 files changed, 291 insertions(+), 180 deletions(-)

diff --git a/esphome/components/dallas/dallas_component.cpp b/esphome/components/dallas/dallas_component.cpp
index 6eeddb1b56..aa839e7331 100644
--- a/esphome/components/dallas/dallas_component.cpp
+++ b/esphome/components/dallas/dallas_component.cpp
@@ -32,9 +32,11 @@ void DallasComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up DallasComponent...");
 
   yield();
-  disable_interrupts();
-  std::vector<uint64_t> raw_sensors = this->one_wire_->search_vec();
-  enable_interrupts();
+  std::vector<uint64_t> raw_sensors;
+  {
+    InterruptLock lock;
+    raw_sensors = this->one_wire_->search_vec();
+  }
 
   for (auto &address : raw_sensors) {
     std::string s = uint64_to_string(address);
@@ -108,16 +110,17 @@ DallasTemperatureSensor *DallasComponent::get_sensor_by_index(uint8_t index, uin
 void DallasComponent::update() {
   this->status_clear_warning();
 
-  disable_interrupts();
   bool result;
-  if (!this->one_wire_->reset()) {
-    result = false;
-  } else {
-    result = true;
-    this->one_wire_->skip();
-    this->one_wire_->write8(DALLAS_COMMAND_START_CONVERSION);
+  {
+    InterruptLock lock;
+    if (!this->one_wire_->reset()) {
+      result = false;
+    } else {
+      result = true;
+      this->one_wire_->skip();
+      this->one_wire_->write8(DALLAS_COMMAND_START_CONVERSION);
+    }
   }
-  enable_interrupts();
 
   if (!result) {
     ESP_LOGE(TAG, "Requesting conversion failed");
@@ -127,9 +130,11 @@ void DallasComponent::update() {
 
   for (auto *sensor : this->sensors_) {
     this->set_timeout(sensor->get_address_name(), sensor->millis_to_wait_for_conversion(), [this, sensor] {
-      disable_interrupts();
-      bool res = sensor->read_scratch_pad();
-      enable_interrupts();
+      bool res;
+      {
+        InterruptLock lock;
+        res = sensor->read_scratch_pad();
+      }
 
       if (!res) {
         ESP_LOGW(TAG, "'%s' - Reseting bus for read failed!", sensor->get_name().c_str());
@@ -170,7 +175,7 @@ const std::string &DallasTemperatureSensor::get_address_name() {
 
   return this->address_name_;
 }
-bool DallasTemperatureSensor::read_scratch_pad() {
+bool ICACHE_RAM_ATTR DallasTemperatureSensor::read_scratch_pad() {
   ESPOneWire *wire = this->parent_->one_wire_;
   if (!wire->reset()) {
     return false;
@@ -185,9 +190,11 @@ bool DallasTemperatureSensor::read_scratch_pad() {
   return true;
 }
 bool DallasTemperatureSensor::setup_sensor() {
-  disable_interrupts();
-  bool r = this->read_scratch_pad();
-  enable_interrupts();
+  bool r;
+  {
+    InterruptLock lock;
+    r = this->read_scratch_pad();
+  }
 
   if (!r) {
     ESP_LOGE(TAG, "Reading scratchpad failed: reset");
@@ -222,20 +229,21 @@ bool DallasTemperatureSensor::setup_sensor() {
   }
 
   ESPOneWire *wire = this->parent_->one_wire_;
-  disable_interrupts();
-  if (wire->reset()) {
-    wire->select(this->address_);
-    wire->write8(DALLAS_COMMAND_WRITE_SCRATCH_PAD);
-    wire->write8(this->scratch_pad_[2]);  // high alarm temp
-    wire->write8(this->scratch_pad_[3]);  // low alarm temp
-    wire->write8(this->scratch_pad_[4]);  // resolution
-    wire->reset();
+  {
+    InterruptLock lock;
+    if (wire->reset()) {
+      wire->select(this->address_);
+      wire->write8(DALLAS_COMMAND_WRITE_SCRATCH_PAD);
+      wire->write8(this->scratch_pad_[2]);  // high alarm temp
+      wire->write8(this->scratch_pad_[3]);  // low alarm temp
+      wire->write8(this->scratch_pad_[4]);  // resolution
+      wire->reset();
 
-    // write value to EEPROM
-    wire->select(this->address_);
-    wire->write8(0x48);
+      // write value to EEPROM
+      wire->select(this->address_);
+      wire->write8(0x48);
+    }
   }
-  enable_interrupts();
 
   delay(20);  // allow it to finish operation
   wire->reset();
diff --git a/esphome/components/dallas/esp_one_wire.cpp b/esphome/components/dallas/esp_one_wire.cpp
index e0db3118b9..d90b10894d 100644
--- a/esphome/components/dallas/esp_one_wire.cpp
+++ b/esphome/components/dallas/esp_one_wire.cpp
@@ -12,7 +12,7 @@ const int ONE_WIRE_ROM_SEARCH = 0xF0;
 
 ESPOneWire::ESPOneWire(GPIOPin *pin) : pin_(pin) {}
 
-bool HOT ESPOneWire::reset() {
+bool HOT ICACHE_RAM_ATTR ESPOneWire::reset() {
   uint8_t retries = 125;
 
   // Wait for communication to clear
@@ -39,7 +39,7 @@ bool HOT ESPOneWire::reset() {
   return r;
 }
 
-void HOT ESPOneWire::write_bit(bool bit) {
+void HOT ICACHE_RAM_ATTR ESPOneWire::write_bit(bool bit) {
   // Initiate write/read by pulling low.
   this->pin_->pin_mode(OUTPUT);
   this->pin_->digital_write(false);
@@ -60,7 +60,7 @@ void HOT ESPOneWire::write_bit(bool bit) {
   }
 }
 
-bool HOT ESPOneWire::read_bit() {
+bool HOT ICACHE_RAM_ATTR ESPOneWire::read_bit() {
   // Initiate read slot by pulling LOW for at least 1µs
   this->pin_->pin_mode(OUTPUT);
   this->pin_->digital_write(false);
@@ -76,43 +76,43 @@ bool HOT ESPOneWire::read_bit() {
   return r;
 }
 
-void ESPOneWire::write8(uint8_t val) {
+void ICACHE_RAM_ATTR ESPOneWire::write8(uint8_t val) {
   for (uint8_t i = 0; i < 8; i++) {
     this->write_bit(bool((1u << i) & val));
   }
 }
 
-void ESPOneWire::write64(uint64_t val) {
+void ICACHE_RAM_ATTR ESPOneWire::write64(uint64_t val) {
   for (uint8_t i = 0; i < 64; i++) {
     this->write_bit(bool((1ULL << i) & val));
   }
 }
 
-uint8_t ESPOneWire::read8() {
+uint8_t ICACHE_RAM_ATTR ESPOneWire::read8() {
   uint8_t ret = 0;
   for (uint8_t i = 0; i < 8; i++) {
     ret |= (uint8_t(this->read_bit()) << i);
   }
   return ret;
 }
-uint64_t ESPOneWire::read64() {
+uint64_t ICACHE_RAM_ATTR ESPOneWire::read64() {
   uint64_t ret = 0;
   for (uint8_t i = 0; i < 8; i++) {
     ret |= (uint64_t(this->read_bit()) << i);
   }
   return ret;
 }
-void ESPOneWire::select(uint64_t address) {
+void ICACHE_RAM_ATTR ESPOneWire::select(uint64_t address) {
   this->write8(ONE_WIRE_ROM_SELECT);
   this->write64(address);
 }
-void ESPOneWire::reset_search() {
+void ICACHE_RAM_ATTR ESPOneWire::reset_search() {
   this->last_discrepancy_ = 0;
   this->last_device_flag_ = false;
   this->last_family_discrepancy_ = 0;
   this->rom_number_ = 0;
 }
-uint64_t HOT ESPOneWire::search() {
+uint64_t HOT ICACHE_RAM_ATTR ESPOneWire::search() {
   if (this->last_device_flag_) {
     return 0u;
   }
@@ -196,7 +196,7 @@ uint64_t HOT ESPOneWire::search() {
 
   return this->rom_number_;
 }
-std::vector<uint64_t> ESPOneWire::search_vec() {
+std::vector<uint64_t> ICACHE_RAM_ATTR ESPOneWire::search_vec() {
   std::vector<uint64_t> res;
 
   this->reset_search();
@@ -206,12 +206,12 @@ std::vector<uint64_t> ESPOneWire::search_vec() {
 
   return res;
 }
-void ESPOneWire::skip() {
+void ICACHE_RAM_ATTR ESPOneWire::skip() {
   this->write8(0xCC);  // skip ROM
 }
 GPIOPin *ESPOneWire::get_pin() { return this->pin_; }
 
-uint8_t *ESPOneWire::rom_number8_() { return reinterpret_cast<uint8_t *>(&this->rom_number_); }
+uint8_t ICACHE_RAM_ATTR *ESPOneWire::rom_number8_() { return reinterpret_cast<uint8_t *>(&this->rom_number_); }
 
 }  // namespace dallas
 }  // namespace esphome
diff --git a/esphome/components/dht/dht.cpp b/esphome/components/dht/dht.cpp
index 28a365c49f..c311aa43ec 100644
--- a/esphome/components/dht/dht.cpp
+++ b/esphome/components/dht/dht.cpp
@@ -71,80 +71,101 @@ void DHT::set_dht_model(DHTModel model) {
   this->model_ = model;
   this->is_auto_detect_ = model == DHT_MODEL_AUTO_DETECT;
 }
-bool HOT DHT::read_sensor_(float *temperature, float *humidity, bool report_errors) {
+bool HOT ICACHE_RAM_ATTR DHT::read_sensor_(float *temperature, float *humidity, bool report_errors) {
   *humidity = NAN;
   *temperature = NAN;
 
-  disable_interrupts();
-  this->pin_->digital_write(false);
-  this->pin_->pin_mode(OUTPUT);
-  this->pin_->digital_write(false);
-
-  if (this->model_ == DHT_MODEL_DHT11) {
-    delayMicroseconds(18000);
-  } else if (this->model_ == DHT_MODEL_SI7021) {
-    delayMicroseconds(500);
-    this->pin_->digital_write(true);
-    delayMicroseconds(40);
-  } else {
-    delayMicroseconds(800);
-  }
-  this->pin_->pin_mode(INPUT_PULLUP);
-  delayMicroseconds(40);
-
+  int error_code = 0;
+  int8_t i = 0;
   uint8_t data[5] = {0, 0, 0, 0, 0};
-  uint8_t bit = 7;
-  uint8_t byte = 0;
 
-  for (int8_t i = -1; i < 40; i++) {
-    uint32_t start_time = micros();
+  {
+    InterruptLock lock;
 
-    // Wait for rising edge
-    while (!this->pin_->digital_read()) {
-      if (micros() - start_time > 90) {
-        enable_interrupts();
-        if (report_errors) {
-          if (i < 0) {
-            ESP_LOGW(TAG, "Waiting for DHT communication to clear failed!");
-          } else {
-            ESP_LOGW(TAG, "Rising edge for bit %d failed!", i);
-          }
+    this->pin_->digital_write(false);
+    this->pin_->pin_mode(OUTPUT);
+    this->pin_->digital_write(false);
+
+    if (this->model_ == DHT_MODEL_DHT11) {
+      delayMicroseconds(18000);
+    } else if (this->model_ == DHT_MODEL_SI7021) {
+      delayMicroseconds(500);
+      this->pin_->digital_write(true);
+      delayMicroseconds(40);
+    } else {
+      delayMicroseconds(800);
+    }
+    this->pin_->pin_mode(INPUT_PULLUP);
+    delayMicroseconds(40);
+
+    uint8_t bit = 7;
+    uint8_t byte = 0;
+
+    for (i = -1; i < 40; i++) {
+      uint32_t start_time = micros();
+
+      // Wait for rising edge
+      while (!this->pin_->digital_read()) {
+        if (micros() - start_time > 90) {
+          if (i < 0)
+            error_code = 1;
+          else
+            error_code = 2;
+          break;
         }
-        return false;
       }
-    }
+      if (error_code != 0)
+        break;
 
-    start_time = micros();
-    uint32_t end_time = start_time;
+      start_time = micros();
+      uint32_t end_time = start_time;
 
-    // Wait for falling edge
-    while (this->pin_->digital_read()) {
-      if ((end_time = micros()) - start_time > 90) {
-        enable_interrupts();
-        if (report_errors) {
-          if (i < 0) {
-            ESP_LOGW(TAG, "Requesting data from DHT failed!");
-          } else {
-            ESP_LOGW(TAG, "Falling edge for bit %d failed!", i);
-          }
+      // Wait for falling edge
+      while (this->pin_->digital_read()) {
+        if ((end_time = micros()) - start_time > 90) {
+          if (i < 0)
+            error_code = 3;
+          else
+            error_code = 4;
+          break;
         }
-        return false;
       }
-    }
+      if (error_code != 0)
+        break;
 
-    if (i < 0)
-      continue;
+      if (i < 0)
+        continue;
 
-    if (end_time - start_time >= 40) {
-      data[byte] |= 1 << bit;
+      if (end_time - start_time >= 40) {
+        data[byte] |= 1 << bit;
+      }
+      if (bit == 0) {
+        bit = 7;
+        byte++;
+      } else
+        bit--;
     }
-    if (bit == 0) {
-      bit = 7;
-      byte++;
-    } else
-      bit--;
   }
-  enable_interrupts();
+  if (!report_errors && error_code != 0)
+    return false;
+
+  switch (error_code) {
+    case 1:
+      ESP_LOGW(TAG, "Waiting for DHT communication to clear failed!");
+      return false;
+    case 2:
+      ESP_LOGW(TAG, "Rising edge for bit %d failed!", i);
+      return false;
+    case 3:
+      ESP_LOGW(TAG, "Requesting data from DHT failed!");
+      return false;
+    case 4:
+      ESP_LOGW(TAG, "Falling edge for bit %d failed!", i);
+      return false;
+    case 0:
+    default:
+      break;
+  }
 
   ESP_LOGVV(TAG,
             "Data: Hum=0b" BYTE_TO_BINARY_PATTERN BYTE_TO_BINARY_PATTERN
diff --git a/esphome/components/hx711/hx711.cpp b/esphome/components/hx711/hx711.cpp
index 1c808a2501..605f534f91 100644
--- a/esphome/components/hx711/hx711.cpp
+++ b/esphome/components/hx711/hx711.cpp
@@ -42,23 +42,24 @@ bool HX711Sensor::read_sensor_(uint32_t *result) {
   this->status_clear_warning();
   uint32_t data = 0;
 
-  disable_interrupts();
-  for (uint8_t i = 0; i < 24; i++) {
-    this->sck_pin_->digital_write(true);
-    delayMicroseconds(1);
-    data |= uint32_t(this->dout_pin_->digital_read()) << (23 - i);
-    this->sck_pin_->digital_write(false);
-    delayMicroseconds(1);
-  }
+  {
+    InterruptLock lock;
+    for (uint8_t i = 0; i < 24; i++) {
+      this->sck_pin_->digital_write(true);
+      delayMicroseconds(1);
+      data |= uint32_t(this->dout_pin_->digital_read()) << (23 - i);
+      this->sck_pin_->digital_write(false);
+      delayMicroseconds(1);
+    }
 
-  // Cycle clock pin for gain setting
-  for (uint8_t i = 0; i < this->gain_; i++) {
-    this->sck_pin_->digital_write(true);
-    delayMicroseconds(1);
-    this->sck_pin_->digital_write(false);
-    delayMicroseconds(1);
+    // Cycle clock pin for gain setting
+    for (uint8_t i = 0; i < this->gain_; i++) {
+      this->sck_pin_->digital_write(true);
+      delayMicroseconds(1);
+      this->sck_pin_->digital_write(false);
+      delayMicroseconds(1);
+    }
   }
-  enable_interrupts();
 
   if (data & 0x800000ULL) {
     data |= 0xFF000000ULL;
diff --git a/esphome/components/remote_transmitter/remote_transmitter_esp8266.cpp b/esphome/components/remote_transmitter/remote_transmitter_esp8266.cpp
index 7704f1d9ab..e8906e87aa 100644
--- a/esphome/components/remote_transmitter/remote_transmitter_esp8266.cpp
+++ b/esphome/components/remote_transmitter/remote_transmitter_esp8266.cpp
@@ -67,22 +67,22 @@ void RemoteTransmitterComponent::send_internal(uint32_t send_times, uint32_t sen
   uint32_t on_time, off_time;
   this->calculate_on_off_time_(this->temp_.get_carrier_frequency(), &on_time, &off_time);
   for (uint32_t i = 0; i < send_times; i++) {
-    disable_interrupts();
-    for (int32_t item : this->temp_.get_data()) {
-      if (item > 0) {
-        const auto length = uint32_t(item);
-        this->mark_(on_time, off_time, length);
-      } else {
-        const auto length = uint32_t(-item);
-        this->space_(length);
+    {
+      InterruptLock lock;
+      for (int32_t item : this->temp_.get_data()) {
+        if (item > 0) {
+          const auto length = uint32_t(item);
+          this->mark_(on_time, off_time, length);
+        } else {
+          const auto length = uint32_t(-item);
+          this->space_(length);
+        }
+        App.feed_wdt();
       }
-      App.feed_wdt();
     }
-    enable_interrupts();
 
     if (i + 1 < send_times) {
-      delay(send_wait / 1000UL);
-      delayMicroseconds(send_wait % 1000UL);
+      delay_microseconds_accurate(send_wait);
     }
   }
 }
diff --git a/esphome/components/uart/uart.cpp b/esphome/components/uart/uart.cpp
index 1f40498606..205e9e2300 100644
--- a/esphome/components/uart/uart.cpp
+++ b/esphome/components/uart/uart.cpp
@@ -295,24 +295,25 @@ void ICACHE_RAM_ATTR HOT ESP8266SoftwareSerial::write_byte(uint8_t data) {
     return;
   }
 
-  disable_interrupts();
-  uint32_t wait = this->bit_time_;
-  const uint32_t start = ESP.getCycleCount();
-  // Start bit
-  this->write_bit_(false, &wait, start);
-  this->write_bit_(data & (1 << 0), &wait, start);
-  this->write_bit_(data & (1 << 1), &wait, start);
-  this->write_bit_(data & (1 << 2), &wait, start);
-  this->write_bit_(data & (1 << 3), &wait, start);
-  this->write_bit_(data & (1 << 4), &wait, start);
-  this->write_bit_(data & (1 << 5), &wait, start);
-  this->write_bit_(data & (1 << 6), &wait, start);
-  this->write_bit_(data & (1 << 7), &wait, start);
-  // Stop bit
-  this->write_bit_(true, &wait, start);
-  if (this->stop_bits_ == 2)
-    this->wait_(&wait, start);
-  enable_interrupts();
+  {
+    InterruptLock lock;
+    uint32_t wait = this->bit_time_;
+    const uint32_t start = ESP.getCycleCount();
+    // Start bit
+    this->write_bit_(false, &wait, start);
+    this->write_bit_(data & (1 << 0), &wait, start);
+    this->write_bit_(data & (1 << 1), &wait, start);
+    this->write_bit_(data & (1 << 2), &wait, start);
+    this->write_bit_(data & (1 << 3), &wait, start);
+    this->write_bit_(data & (1 << 4), &wait, start);
+    this->write_bit_(data & (1 << 5), &wait, start);
+    this->write_bit_(data & (1 << 6), &wait, start);
+    this->write_bit_(data & (1 << 7), &wait, start);
+    // Stop bit
+    this->write_bit_(true, &wait, start);
+    if (this->stop_bits_ == 2)
+      this->wait_(&wait, start);
+  }
 }
 void ICACHE_RAM_ATTR ESP8266SoftwareSerial::wait_(uint32_t *wait, const uint32_t &start) {
   while (ESP.getCycleCount() - start < *wait)
@@ -323,7 +324,7 @@ bool ICACHE_RAM_ATTR ESP8266SoftwareSerial::read_bit_(uint32_t *wait, const uint
   this->wait_(wait, start);
   return this->rx_pin_->digital_read();
 }
-void ESP8266SoftwareSerial::write_bit_(bool bit, uint32_t *wait, const uint32_t &start) {
+void ICACHE_RAM_ATTR ESP8266SoftwareSerial::write_bit_(bool bit, uint32_t *wait, const uint32_t &start) {
   this->tx_pin_->digital_write(bit);
   this->wait_(wait, start);
 }
diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index 88bcb03450..deee578b4c 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -6,8 +6,16 @@
 
 #include <utility>
 #include <algorithm>
+
+extern "C" {
 #include "lwip/err.h"
 #include "lwip/dns.h"
+#include "lwip/dhcp.h"
+#include "lwip/init.h"  // LWIP_VERSION_
+#if LWIP_IPV6
+#include "lwip/netif.h"  // struct netif
+#endif
+}
 
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
@@ -74,6 +82,19 @@ bool WiFiComponent::wifi_apply_power_save_() {
   }
   return wifi_set_sleep_type(power_save);
 }
+
+#if LWIP_VERSION_MAJOR != 1
+/*
+  lwip v2 needs to be notified of IP changes, see also
+  https://github.com/d-a-v/Arduino/blob/0e7d21e17144cfc5f53c016191daca8723e89ee8/libraries/ESP8266WiFi/src/ESP8266WiFiSTA.cpp#L251
+ */
+#undef netif_set_addr  // need to call lwIP-v1.4 netif_set_addr()
+extern "C" {
+struct netif *eagle_lwip_getif(int netif_index);
+void netif_set_addr(struct netif *netif, const ip4_addr_t *ip, const ip4_addr_t *netmask, const ip4_addr_t *gw);
+};
+#endif
+
 bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
   // enable STA
   if (!this->wifi_mode_(true, {}))
@@ -94,6 +115,13 @@ bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
 
   bool ret = true;
 
+#if LWIP_VERSION_MAJOR != 1
+  // get current->previous IP address
+  // (check below)
+  ip_info previp{};
+  wifi_get_ip_info(STATION_IF, &previp);
+#endif
+
   struct ip_info info {};
   info.ip.addr = static_cast<uint32_t>(manual_ip->static_ip);
   info.gw.addr = static_cast<uint32_t>(manual_ip->gateway);
@@ -122,6 +150,14 @@ bool WiFiComponent::wifi_sta_ip_config_(optional<ManualIP> manual_ip) {
     dns_setserver(1, &dns);
   }
 
+#if LWIP_VERSION_MAJOR != 1
+  // trigger address change by calling lwIP-v1.4 api
+  // only when ip is already set by other mean (generally dhcp)
+  if (previp.ip.addr != 0 && previp.ip.addr != info.ip.addr) {
+    netif_set_addr(eagle_lwip_getif(STATION_IF), reinterpret_cast<const ip4_addr_t *>(&info.ip),
+                   reinterpret_cast<const ip4_addr_t *>(&info.netmask), reinterpret_cast<const ip4_addr_t *>(&info.gw));
+  }
+#endif
   return ret;
 }
 
@@ -133,10 +169,31 @@ IPAddress WiFiComponent::wifi_sta_ip_() {
   return {ip.ip.addr};
 }
 bool WiFiComponent::wifi_apply_hostname_() {
-  bool ret = wifi_station_set_hostname(const_cast<char *>(App.get_name().c_str()));
+  const std::string &hostname = App.get_name();
+  bool ret = wifi_station_set_hostname(const_cast<char *>(hostname.c_str()));
   if (!ret) {
     ESP_LOGV(TAG, "Setting WiFi Hostname failed!");
   }
+
+  // inform dhcp server of hostname change using dhcp_renew()
+  for (netif *intf = netif_list; intf; intf = intf->next) {
+    // unconditionally update all known interfaces
+#if LWIP_VERSION_MAJOR == 1
+    intf->hostname = (char *) wifi_station_get_hostname();
+#else
+    intf->hostname = wifi_station_get_hostname();
+#endif
+    if (netif_dhcp_data(intf) != nullptr) {
+      // renew already started DHCP leases
+      err_t lwipret = dhcp_renew(intf);
+      if (lwipret != ERR_OK) {
+        ESP_LOGW(TAG, "wifi_apply_hostname_(%s): lwIP error %d on interface %c%c (index %d)", intf->hostname,
+                 (int) lwipret, intf->name[0], intf->name[1], intf->num);
+        ret = false;
+      }
+    }
+  }
+
   return ret;
 }
 
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 6d6aa80b66..3ff87678e8 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -156,21 +156,6 @@ ParseOnOffState parse_on_off(const char *str, const char *on, const char *off) {
 
 const char *HOSTNAME_CHARACTER_WHITELIST = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
 
-void disable_interrupts() {
-#ifdef ARDUINO_ARCH_ESP32
-  portDISABLE_INTERRUPTS();
-#else
-  noInterrupts();
-#endif
-}
-void enable_interrupts() {
-#ifdef ARDUINO_ARCH_ESP32
-  portENABLE_INTERRUPTS();
-#else
-  interrupts();
-#endif
-}
-
 uint8_t crc8(uint8_t *data, uint8_t len) {
   uint8_t crc = 0;
 
@@ -193,8 +178,8 @@ void delay_microseconds_accurate(uint32_t usec) {
   if (usec <= 16383UL) {
     delayMicroseconds(usec);
   } else {
-    delay(usec / 1000UL);
-    delayMicroseconds(usec % 1000UL);
+    delay(usec / 16383UL);
+    delayMicroseconds(usec % 16383UL);
   }
 }
 
@@ -330,4 +315,13 @@ std::string hexencode(const uint8_t *data, uint32_t len) {
   return res;
 }
 
+#ifdef ARDUINO_ARCH_ESP8266
+ICACHE_RAM_ATTR InterruptLock::InterruptLock() { xt_state_ = xt_rsil(15); }
+ICACHE_RAM_ATTR InterruptLock::~InterruptLock() { xt_wsr_ps(xt_state_); }
+#endif
+#ifdef ARDUINO_ARCH_ESP32
+ICACHE_RAM_ATTR InterruptLock::InterruptLock() { portENABLE_INTERRUPTS(); }
+ICACHE_RAM_ATTR InterruptLock::~InterruptLock() { portDISABLE_INTERRUPTS(); }
+#endif
+
 }  // namespace esphome
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index 91b78b73a0..ab3d883e05 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -133,16 +133,38 @@ uint16_t encode_uint16(uint8_t msb, uint8_t lsb);
 /// Decode a 16-bit unsigned integer into an array of two values: most significant byte, least significant byte.
 std::array<uint8_t, 2> decode_uint16(uint16_t value);
 
-/** Cross-platform method to disable interrupts.
+/***
+ * An interrupt helper class.
  *
- * Useful when you need to do some timing-dependent communication.
+ * This behaves like std::lock_guard. As long as the value is visible in the current stack, all interrupts
+ * (including flash reads) will be disabled.
  *
- * @see Do not forget to call `enable_interrupts()` again or otherwise things will go very wrong.
+ * Please note all functions called when the interrupt lock must be marked ICACHE_RAM_ATTR (loading code into
+ * instruction cache is done via interrupts; disabling interrupts prevents data not already in cache from being
+ * pulled from flash).
+ *
+ * Example:
+ *
+ * ```cpp
+ * // interrupts are enabled
+ * {
+ *   InterruptLock lock;
+ *   // do something
+ *   // interrupts are disabled
+ * }
+ * // interrupts are enabled
+ * ```
  */
-void disable_interrupts();
+class InterruptLock {
+ public:
+  InterruptLock();
+  ~InterruptLock();
 
-/// Cross-platform method to enable interrupts after they have been disabled.
-void enable_interrupts();
+ protected:
+#ifdef ARDUINO_ARCH_ESP8266
+  uint32_t xt_state_;
+#endif
+};
 
 /// Calculate a crc8 of data with the provided data length.
 uint8_t crc8(uint8_t *data, uint8_t len);
diff --git a/esphome/core/preferences.cpp b/esphome/core/preferences.cpp
index 2329ed34f5..8b41cbc7b5 100644
--- a/esphome/core/preferences.cpp
+++ b/esphome/core/preferences.cpp
@@ -105,16 +105,18 @@ void ESPPreferences::save_esp8266_flash_() {
     return;
 
   ESP_LOGVV(TAG, "Saving preferences to flash...");
-  disable_interrupts();
-  auto erase_res = spi_flash_erase_sector(get_esp8266_flash_sector());
+  SpiFlashOpResult erase_res, write_res = SPI_FLASH_RESULT_OK;
+  {
+    InterruptLock lock;
+    erase_res = spi_flash_erase_sector(get_esp8266_flash_sector());
+    if (erase_res == SPI_FLASH_RESULT_OK) {
+      write_res = spi_flash_write(get_esp8266_flash_address(), this->flash_storage_, ESP8266_FLASH_STORAGE_SIZE * 4);
+    }
+  }
   if (erase_res != SPI_FLASH_RESULT_OK) {
-    enable_interrupts();
     ESP_LOGV(TAG, "Erase ESP8266 flash failed!");
     return;
   }
-
-  auto write_res = spi_flash_write(get_esp8266_flash_address(), this->flash_storage_, ESP8266_FLASH_STORAGE_SIZE * 4);
-  enable_interrupts();
   if (write_res != SPI_FLASH_RESULT_OK) {
     ESP_LOGV(TAG, "Write ESP8266 flash failed!");
     return;
@@ -173,9 +175,11 @@ ESPPreferences::ESPPreferences()
 void ESPPreferences::begin() {
   this->flash_storage_ = new uint32_t[ESP8266_FLASH_STORAGE_SIZE];
   ESP_LOGVV(TAG, "Loading preferences from flash...");
-  disable_interrupts();
-  spi_flash_read(get_esp8266_flash_address(), this->flash_storage_, ESP8266_FLASH_STORAGE_SIZE * 4);
-  enable_interrupts();
+
+  {
+    InterruptLock lock;
+    spi_flash_read(get_esp8266_flash_address(), this->flash_storage_, ESP8266_FLASH_STORAGE_SIZE * 4);
+  }
 }
 
 ESPPreferenceObject ESPPreferences::make_preference(size_t length, uint32_t type, bool in_flash) {
diff --git a/esphome/core_config.py b/esphome/core_config.py
index f7149db797..63092891d3 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -45,6 +45,8 @@ def validate_board(value):
 validate_platform = cv.one_of('ESP32', 'ESP8266', upper=True)
 
 PLATFORMIO_ESP8266_LUT = {
+    '2.6.2': 'espressif8266@2.3.1',
+    '2.6.1': 'espressif8266@2.3.0',
     '2.5.2': 'espressif8266@2.2.3',
     '2.5.1': 'espressif8266@2.1.0',
     '2.5.0': 'espressif8266@2.0.1',
diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index 36e451c21d..317670710b 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -60,6 +60,7 @@ FILTER_PLATFORMIO_LINES = [
     r"Using cache: .*",
     r'Installing dependencies',
     r'.* @ .* is already installed',
+    r'Building in .* mode',
 ]
 
 

From ea652e35879e554a478422eb0832d737ca6cc26c Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 4 Dec 2019 23:51:27 +0100
Subject: [PATCH 118/412] Fix ESP32 interrupt enable/disable switched

Needs to be manually cherry-picked
---
 esphome/core/helpers.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 3ff87678e8..2222a1a664 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -320,8 +320,8 @@ ICACHE_RAM_ATTR InterruptLock::InterruptLock() { xt_state_ = xt_rsil(15); }
 ICACHE_RAM_ATTR InterruptLock::~InterruptLock() { xt_wsr_ps(xt_state_); }
 #endif
 #ifdef ARDUINO_ARCH_ESP32
-ICACHE_RAM_ATTR InterruptLock::InterruptLock() { portENABLE_INTERRUPTS(); }
-ICACHE_RAM_ATTR InterruptLock::~InterruptLock() { portDISABLE_INTERRUPTS(); }
+ICACHE_RAM_ATTR InterruptLock::InterruptLock() { portDISABLE_INTERRUPTS(); }
+ICACHE_RAM_ATTR InterruptLock::~InterruptLock() { portENABLE_INTERRUPTS(); }
 #endif
 
 }  // namespace esphome

From 8a08d1fb5d5914a5e5fbc860b74b6efdc5952806 Mon Sep 17 00:00:00 2001
From: Niclas Larsson <niclas@edgesystems.se>
Date: Thu, 5 Dec 2019 00:27:49 +0100
Subject: [PATCH 119/412] Handle yaml merge keys correcly. (#888)

* Handle yaml merge keys correcly.

* Removed old debug bool.

* Deleted after request from @OttoWinder.

* Small refactoring.

Removed unused variable `value`
Small refactoring to make the code clearer.
Added comments.

* Fix merge sequence edge case
---
 esphome/yaml_util.py | 58 ++++++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index d80334cedf..69f3c70ede 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -93,50 +93,66 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
         return super(ESPHomeLoader, self).construct_yaml_seq(node)
 
     def custom_flatten_mapping(self, node):
-        pre_merge = []
-        post_merge = []
+        merge = []
         index = 0
         while index < len(node.value):
-            if isinstance(node.value[index], yaml.ScalarNode):
-                index += 1
-                continue
-
             key_node, value_node = node.value[index]
-            if key_node.tag == u'tag:yaml.org,2002:merge':
+            if key_node.tag == 'tag:yaml.org,2002:merge':
                 del node.value[index]
-
                 if isinstance(value_node, yaml.MappingNode):
                     self.custom_flatten_mapping(value_node)
-                    node.value = node.value[:index] + value_node.value + node.value[index:]
+                    merge.extend(value_node.value)
                 elif isinstance(value_node, yaml.SequenceNode):
                     submerge = []
                     for subnode in value_node.value:
                         if not isinstance(subnode, yaml.MappingNode):
                             raise yaml.constructor.ConstructorError(
                                 "while constructing a mapping", node.start_mark,
-                                "expected a mapping for merging, but found %{}".format(subnode.id),
+                                "expected a mapping for merging, but found {}".format(subnode.id),
                                 subnode.start_mark)
                         self.custom_flatten_mapping(subnode)
                         submerge.append(subnode.value)
-                    # submerge.reverse()
-                    node.value = node.value[:index] + submerge + node.value[index:]
-                elif isinstance(value_node, yaml.ScalarNode):
-                    node.value = node.value[:index] + [value_node] + node.value[index:]
-                    # post_merge.append(value_node)
+                    submerge.reverse()
+                    for value in submerge:
+                        merge.extend(value)
                 else:
                     raise yaml.constructor.ConstructorError(
                         "while constructing a mapping", node.start_mark,
                         "expected a mapping or list of mappings for merging, "
                         "but found {}".format(value_node.id), value_node.start_mark)
-            elif key_node.tag == u'tag:yaml.org,2002:value':
-                key_node.tag = u'tag:yaml.org,2002:str'
+            elif key_node.tag == 'tag:yaml.org,2002:value':
+                key_node.tag = 'tag:yaml.org,2002:str'
                 index += 1
             else:
                 index += 1
-        if pre_merge:
-            node.value = pre_merge + node.value
-        if post_merge:
-            node.value = node.value + post_merge
+        if merge:
+            # https://yaml.org/type/merge.html
+            # Generate a set of keys that should override values in `merge`.
+            haystack = {key.value for (key, _) in node.value}
+
+            # Construct a new merge set with values overridden by current mapping or earlier
+            # sequence entries removed
+            new_merge = []
+
+            for key, value in merge:
+                if key.value in haystack:
+                    # key already in the current map or from an earlier merge sequence entry,
+                    # do not override
+                    #
+                    # "... each of its key/value pairs is inserted into the current mapping,
+                    # unless the key already exists in it."
+                    #
+                    # "If the value associated with the merge key is a sequence, then this sequence
+                    #  is expected to contain mapping nodes and each of these nodes is merged in
+                    #  turn according to its order in the sequence. Keys in mapping nodes earlier
+                    #  in the sequence override keys specified in later mapping nodes."
+                    continue
+                new_merge.append((key, value))
+                # Add key node to haystack, for sequence merge values.
+                haystack.add(key.value)
+
+            # Merge
+            node.value = new_merge + node.value
 
     def custom_construct_pairs(self, node):
         pairs = []

From d280380c8d3abce04e7066733b1425c890a033ed Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 6 Dec 2019 00:01:12 +1300
Subject: [PATCH 120/412] Allow loading esphome version from a fork (#907)

---
 docker/rootfs/etc/cont-init.d/30-esphome.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker/rootfs/etc/cont-init.d/30-esphome.sh b/docker/rootfs/etc/cont-init.d/30-esphome.sh
index 086c5af19f..d9a80cde2e 100644
--- a/docker/rootfs/etc/cont-init.d/30-esphome.sh
+++ b/docker/rootfs/etc/cont-init.d/30-esphome.sh
@@ -8,7 +8,15 @@ declare esphome_version
 
 if bashio::config.has_value 'esphome_version'; then
     esphome_version=$(bashio::config 'esphome_version')
-    full_url="https://github.com/esphome/esphome/archive/${esphome_version}.zip"
+    if [[ $esphome_version == *":"* ]]; then
+      IFS=':' read -r -a array <<< "$esphome_version"
+      username=${array[0]}
+      ref=${array[1]}
+    else
+      username="esphome"
+      ref=$esphome_version
+    fi
+    full_url="https://github.com/${username}/esphome/archive/${ref}.zip"
     bashio::log.info "Installing esphome version '${esphome_version}' (${full_url})..."
     pip3 install -U --no-cache-dir "${full_url}" \
       || bashio::exit.nok "Failed installing esphome pinned version."

From d09dff3ae31285e7afff255e679b0cf637dda5d6 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 7 Dec 2019 13:43:51 +0100
Subject: [PATCH 121/412] Clean up YAML Mapping construction (#910)

* Clean up YAML Mapping construction

Fixes https://github.com/esphome/issues/issues/902

* Clean up DataBase

* Update error messages
---
 esphome/config.py    |   3 +-
 esphome/helpers.py   |  10 +--
 esphome/yaml_util.py | 180 ++++++++++++++++++++-----------------------
 3 files changed, 89 insertions(+), 104 deletions(-)

diff --git a/esphome/config.py b/esphome/config.py
index 53449c3e85..027c28bc5d 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -663,8 +663,7 @@ class InvalidYAMLError(EsphomeError):
         except UnicodeDecodeError:
             base = repr(base_exc)
         base = decode_text(base)
-        message = u"Invalid YAML syntax. Please see YAML syntax reference or use an " \
-                  u"online YAML syntax validator:\n\n{}".format(base)
+        message = u"Invalid YAML syntax:\n\n{}".format(base)
         super(InvalidYAMLError, self).__init__(message)
         self.base_exc = base_exc
 
diff --git a/esphome/helpers.py b/esphome/helpers.py
index e91b13a735..179452c353 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -266,11 +266,11 @@ def file_compare(path1, path2):
 # A dict of types that need to be converted to heaptypes before a class can be added
 # to the object
 _TYPE_OVERLOADS = {
-    int: type('int', (int,), dict()),
-    float: type('float', (float,), dict()),
-    str: type('str', (str,), dict()),
-    dict: type('dict', (str,), dict()),
-    list: type('list', (list,), dict()),
+    int: type('EInt', (int,), dict()),
+    float: type('EFloat', (float,), dict()),
+    str: type('EStr', (str,), dict()),
+    dict: type('EDict', (str,), dict()),
+    list: type('EList', (list,), dict()),
 }
 
 if IS_PY2:
diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index 69f3c70ede..0e5b4593e9 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -43,7 +43,11 @@ class ESPForceValue(object):
 
 
 def make_data_base(value):
-    return add_class_to_obj(value, ESPHomeDataBase)
+    try:
+        return add_class_to_obj(value, ESPHomeDataBase)
+    except TypeError:
+        # Adding class failed, ignore error
+        return value
 
 
 def _add_data_ref(fn):
@@ -92,50 +96,82 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
     def construct_yaml_seq(self, node):
         return super(ESPHomeLoader, self).construct_yaml_seq(node)
 
-    def custom_flatten_mapping(self, node):
-        merge = []
-        index = 0
-        while index < len(node.value):
-            key_node, value_node = node.value[index]
-            if key_node.tag == 'tag:yaml.org,2002:merge':
-                del node.value[index]
-                if isinstance(value_node, yaml.MappingNode):
-                    self.custom_flatten_mapping(value_node)
-                    merge.extend(value_node.value)
-                elif isinstance(value_node, yaml.SequenceNode):
-                    submerge = []
-                    for subnode in value_node.value:
-                        if not isinstance(subnode, yaml.MappingNode):
-                            raise yaml.constructor.ConstructorError(
-                                "while constructing a mapping", node.start_mark,
-                                "expected a mapping for merging, but found {}".format(subnode.id),
-                                subnode.start_mark)
-                        self.custom_flatten_mapping(subnode)
-                        submerge.append(subnode.value)
-                    submerge.reverse()
-                    for value in submerge:
-                        merge.extend(value)
-                else:
-                    raise yaml.constructor.ConstructorError(
-                        "while constructing a mapping", node.start_mark,
-                        "expected a mapping or list of mappings for merging, "
-                        "but found {}".format(value_node.id), value_node.start_mark)
-            elif key_node.tag == 'tag:yaml.org,2002:value':
-                key_node.tag = 'tag:yaml.org,2002:str'
-                index += 1
-            else:
-                index += 1
-        if merge:
-            # https://yaml.org/type/merge.html
-            # Generate a set of keys that should override values in `merge`.
-            haystack = {key.value for (key, _) in node.value}
+    @_add_data_ref
+    def construct_yaml_map(self, node):
+        """Traverses the given mapping node and returns a list of constructed key-value pairs."""
+        assert isinstance(node, yaml.MappingNode)
+        # A list of key-value pairs we find in the current mapping
+        pairs = []
+        # A list of key-value pairs we find while resolving merges ('<<' key), will be
+        # added to pairs in a second pass
+        merge_pairs = []
+        # A dict of seen keys so far, used to alert the user of duplicate keys and checking
+        # which keys to merge.
+        # Value of dict items is the start mark of the previous declaration.
+        seen_keys = {}
 
+        for key_node, value_node in node.value:
+            # merge key is '<<'
+            is_merge_key = key_node.tag == 'tag:yaml.org,2002:merge'
+            # key has no explicit tag set
+            is_default_tag = key_node.tag == 'tag:yaml.org,2002:value'
+
+            if is_default_tag:
+                # Default tag for mapping keys is string
+                key_node.tag = 'tag:yaml.org,2002:str'
+
+            if not is_merge_key:
+                # base case, this is a simple key-value pair
+                key = self.construct_object(key_node)
+                value = self.construct_object(value_node)
+
+                # Check if key is hashable
+                try:
+                    hash(key)
+                except TypeError:
+                    raise yaml.constructor.ConstructorError(
+                        'Invalid key "{}" (not hashable)'.format(key), key_node.start_mark)
+
+                # Check if it is a duplicate key
+                if key in seen_keys:
+                    raise yaml.constructor.ConstructorError(
+                        'Duplicate key "{}"'.format(key), key_node.start_mark,
+                        'NOTE: Previous declaration here:', seen_keys[key],
+                    )
+                seen_keys[key] = key_node.start_mark
+
+                # Add to pairs
+                pairs.append((key, value))
+                continue
+
+            # This is a merge key, resolve value and add to merge_pairs
+            value = self.construct_object(value_node)
+            if isinstance(value, dict):
+                # base case, copy directly to merge_pairs
+                # direct merge, like "<<: {some_key: some_value}"
+                merge_pairs.extend(value.items())
+            elif isinstance(value, list):
+                # sequence merge, like "<<: [{some_key: some_value}, {other_key: some_value}]"
+                for item in value:
+                    if not isinstance(item, dict):
+                        raise yaml.constructor.ConstructorError(
+                            "While constructing a mapping", node.start_mark,
+                            "Expected a mapping for merging, but found {}".format(type(item)),
+                            value_node.start_mark)
+                    merge_pairs.extend(item.items())
+            else:
+                raise yaml.constructor.ConstructorError(
+                    "While constructing a mapping", node.start_mark,
+                    "Expected a mapping or list of mappings for merging, "
+                    "but found {}".format(type(value)), value_node.start_mark)
+
+        if merge_pairs:
+            # We found some merge keys along the way, merge them into base pairs
+            # https://yaml.org/type/merge.html
             # Construct a new merge set with values overridden by current mapping or earlier
             # sequence entries removed
-            new_merge = []
-
-            for key, value in merge:
-                if key.value in haystack:
+            for key, value in merge_pairs:
+                if key in seen_keys:
                     # key already in the current map or from an earlier merge sequence entry,
                     # do not override
                     #
@@ -147,59 +183,11 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
                     #  turn according to its order in the sequence. Keys in mapping nodes earlier
                     #  in the sequence override keys specified in later mapping nodes."
                     continue
-                new_merge.append((key, value))
-                # Add key node to haystack, for sequence merge values.
-                haystack.add(key.value)
-
-            # Merge
-            node.value = new_merge + node.value
-
-    def custom_construct_pairs(self, node):
-        pairs = []
-        for kv in node.value:
-            if isinstance(kv, yaml.ScalarNode):
-                obj = self.construct_object(kv)
-                if not isinstance(obj, dict):
-                    raise EsphomeError(
-                        "Expected mapping for anchored include tag, got {}".format(type(obj)))
-                for key, value in obj.items():
-                    pairs.append((key, value))
-            else:
-                key_node, value_node = kv
-                key = self.construct_object(key_node)
-                value = self.construct_object(value_node)
                 pairs.append((key, value))
+                # Add key node to seen keys, for sequence merge values.
+                seen_keys[key] = None
 
-        return pairs
-
-    @_add_data_ref
-    def construct_yaml_map(self, node):
-        self.custom_flatten_mapping(node)
-        nodes = self.custom_construct_pairs(node)
-
-        seen = {}
-        for (key, _), nv in zip(nodes, node.value):
-            if isinstance(nv, yaml.ScalarNode):
-                line = nv.start_mark.line
-            else:
-                line = nv[0].start_mark.line
-
-            try:
-                hash(key)
-            except TypeError:
-                raise yaml.MarkedYAMLError(
-                    context="invalid key: \"{}\"".format(key),
-                    context_mark=yaml.Mark(self.name, 0, line, -1, None, None)
-                )
-
-            if key in seen:
-                raise yaml.MarkedYAMLError(
-                    context="duplicate key: \"{}\"".format(key),
-                    context_mark=yaml.Mark(self.name, 0, line, -1, None, None)
-                )
-            seen[key] = line
-
-        return OrderedDict(nodes)
+        return OrderedDict(pairs)
 
     @_add_data_ref
     def construct_env_var(self, node):
@@ -210,8 +198,7 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
         if args[0] in os.environ:
             return os.environ[args[0]]
         raise yaml.MarkedYAMLError(
-            context=u"Environment variable '{}' not defined".format(node.value),
-            context_mark=node.start_mark
+            u"Environment variable '{}' not defined".format(node.value), node.start_mark
         )
 
     @property
@@ -226,8 +213,7 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
         secrets = _load_yaml_internal(self._rel_path(SECRET_YAML))
         if node.value not in secrets:
             raise yaml.MarkedYAMLError(
-                context=u"Secret '{}' not defined".format(node.value),
-                context_mark=node.start_mark
+                u"Secret '{}' not defined".format(node.value), node.start_mark
             )
         val = secrets[node.value]
         _SECRET_VALUES[text_type(val)] = node.value

From 74aca2137b22b3c9f650cf7e9595cada06c2f611 Mon Sep 17 00:00:00 2001
From: Nick Whyte <nick@canva.com>
Date: Sun, 8 Dec 2019 03:15:04 +1100
Subject: [PATCH 122/412] Add duty cycle output component (#894)

* Add duty cycle output component

* cleanup + tests

* format

* duty_cycle -> slow_pwm

* .

* clang-format

* ESP_LOGD -> ESPLOGVV

Co-Authored-By: Otto Winter <otto@otto-winter.com>
---
 esphome/components/slow_pwm/__init__.py       |  0
 esphome/components/slow_pwm/output.py         | 29 ++++++++++++++
 .../components/slow_pwm/slow_pwm_output.cpp   | 40 +++++++++++++++++++
 esphome/components/slow_pwm/slow_pwm_output.h | 32 +++++++++++++++
 esphome/const.py                              |  1 +
 tests/test1.yaml                              |  4 ++
 6 files changed, 106 insertions(+)
 create mode 100644 esphome/components/slow_pwm/__init__.py
 create mode 100644 esphome/components/slow_pwm/output.py
 create mode 100644 esphome/components/slow_pwm/slow_pwm_output.cpp
 create mode 100644 esphome/components/slow_pwm/slow_pwm_output.h

diff --git a/esphome/components/slow_pwm/__init__.py b/esphome/components/slow_pwm/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/slow_pwm/output.py b/esphome/components/slow_pwm/output.py
new file mode 100644
index 0000000000..f7b26a953a
--- /dev/null
+++ b/esphome/components/slow_pwm/output.py
@@ -0,0 +1,29 @@
+from esphome import pins, core
+from esphome.components import output
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_ID, CONF_PIN, CONF_PERIOD
+
+slow_pwm_ns = cg.esphome_ns.namespace("slow_pwm")
+SlowPWMOutput = slow_pwm_ns.class_("SlowPWMOutput", output.FloatOutput, cg.Component)
+
+CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
+    {
+        cv.Required(CONF_ID): cv.declare_id(SlowPWMOutput),
+        cv.Required(CONF_PIN): pins.gpio_output_pin_schema,
+        cv.Required(CONF_PERIOD): cv.All(
+            cv.positive_time_period_milliseconds,
+            cv.Range(min=core.TimePeriod(milliseconds=100)),
+        ),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield output.register_output(var, config)
+
+    pin = yield cg.gpio_pin_expression(config[CONF_PIN])
+    cg.add(var.set_pin(pin))
+    cg.add(var.set_period(config[CONF_PERIOD]))
diff --git a/esphome/components/slow_pwm/slow_pwm_output.cpp b/esphome/components/slow_pwm/slow_pwm_output.cpp
new file mode 100644
index 0000000000..04a0d86bf7
--- /dev/null
+++ b/esphome/components/slow_pwm/slow_pwm_output.cpp
@@ -0,0 +1,40 @@
+#include "slow_pwm_output.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace slow_pwm {
+
+static const char *TAG = "output.slow_pwm";
+
+void SlowPWMOutput::setup() {
+  this->pin_->setup();
+  this->turn_off();
+}
+
+void SlowPWMOutput::loop() {
+  unsigned long now = millis();
+  float scaled_state = this->state_ * this->period_;
+
+  if (now - this->period_start_time_ > this->period_) {
+    ESP_LOGVV(TAG, "End of period. State: %f, Scaled state: %f", this->state_, scaled_state);
+    this->period_start_time_ += this->period_;
+  }
+
+  if (scaled_state > now - this->period_start_time_) {
+    this->pin_->digital_write(true);
+  } else {
+    this->pin_->digital_write(false);
+  }
+}
+
+void SlowPWMOutput::dump_config() {
+  ESP_LOGCONFIG(TAG, "Slow PWM Output:");
+  LOG_PIN("  Pin: ", this->pin_);
+  ESP_LOGCONFIG(TAG, "  Period: %d ms", this->period_);
+  LOG_FLOAT_OUTPUT(this);
+}
+
+void SlowPWMOutput::write_state(float state) { this->state_ = state; }
+
+}  // namespace slow_pwm
+}  // namespace esphome
diff --git a/esphome/components/slow_pwm/slow_pwm_output.h b/esphome/components/slow_pwm/slow_pwm_output.h
new file mode 100644
index 0000000000..4a2c1d0a14
--- /dev/null
+++ b/esphome/components/slow_pwm/slow_pwm_output.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
+#include "esphome/components/output/float_output.h"
+
+namespace esphome {
+namespace slow_pwm {
+
+class SlowPWMOutput : public output::FloatOutput, public Component {
+ public:
+  void set_pin(GPIOPin *pin) { pin_ = pin; };
+  void set_period(unsigned int period) { period_ = period; };
+
+  /// Initialize pin
+  void setup() override;
+  void dump_config() override;
+  /// HARDWARE setup_priority
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+
+ protected:
+  void write_state(float state) override;
+  void loop() override;
+
+  GPIOPin *pin_;
+  float state_{0};
+  unsigned int period_start_time_{0};
+  unsigned int period_{5000};
+};
+
+}  // namespace slow_pwm
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index e225862e70..0790a49552 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -317,6 +317,7 @@ CONF_PASSWORD = 'password'
 CONF_PAYLOAD = 'payload'
 CONF_PAYLOAD_AVAILABLE = 'payload_available'
 CONF_PAYLOAD_NOT_AVAILABLE = 'payload_not_available'
+CONF_PERIOD = 'period'
 CONF_PHASE_BALANCER = 'phase_balancer'
 CONF_PIN = 'pin'
 CONF_PIN_A = 'pin_a'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b7f3d04b40..1080339b67 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -995,6 +995,10 @@ output:
   - platform: my9231
     id: my_5
     channel: 5
+  - platform: slow_pwm
+    id: id24
+    pin: GPIO26
+    period: 15s
 
 light:
   - platform: binary

From b5714cd70fdf716f313bd2b578fa2ddeff9fc937 Mon Sep 17 00:00:00 2001
From: adamgreg <agregdev@gmail.com>
Date: Sat, 7 Dec 2019 16:19:27 +0000
Subject: [PATCH 123/412] ESP32 GPIOs 33 to 38 can be used for deep sleep
 wakeup (#911)

---
 esphome/components/deep_sleep/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/deep_sleep/__init__.py b/esphome/components/deep_sleep/__init__.py
index 5babf422bd..07c1d117b6 100644
--- a/esphome/components/deep_sleep/__init__.py
+++ b/esphome/components/deep_sleep/__init__.py
@@ -6,7 +6,7 @@ from esphome.const import CONF_ID, CONF_MODE, CONF_NUMBER, CONF_PINS, CONF_RUN_C
 
 
 def validate_pin_number(value):
-    valid_pins = [0, 2, 4, 12, 13, 14, 15, 25, 26, 27, 32, 39]
+    valid_pins = [0, 2, 4, 12, 13, 14, 15, 25, 26, 27, 32, 33, 34, 35, 36, 37, 38, 39]
     if value[CONF_NUMBER] not in valid_pins:
         raise cv.Invalid(u"Only pins {} support wakeup"
                          u"".format(', '.join(str(x) for x in valid_pins)))

From 056c72d50d6274a528f736345691e9c51de67b63 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 7 Dec 2019 18:28:55 +0100
Subject: [PATCH 124/412] Drop Python 2 Support (#793)

* Remove Python 2 support

* Remove u-strings

* Remove docker symlinks

* Remove from travis

* Update requirements

* Upgrade flake8/pylint

* Fixes

* Manual

* Run pyupgrade

* Lint

* Remove base_int

* Fix

* Update platformio_api.py

* Update component.cpp
---
 .travis.yml                                   |   6 -
 docker/Dockerfile.lint                        |   2 -
 esphome/__main__.py                           |  61 +++---
 esphome/api/client.py                         |  45 ++--
 esphome/automation.py                         |   4 +-
 esphome/components/ade7953/sensor.py          |   2 +-
 esphome/components/ads1115/sensor.py          |   7 +-
 esphome/components/api/__init__.py            |   2 +-
 esphome/components/binary_sensor/__init__.py  |  17 +-
 esphome/components/deep_sleep/__init__.py     |   4 +-
 esphome/components/display/__init__.py        |   3 +-
 .../components/esp32_ble_tracker/__init__.py  |  12 +-
 .../components/esp32_touch/binary_sensor.py   |   2 +-
 esphome/components/font/__init__.py           |  20 +-
 esphome/components/globals/__init__.py        |   3 +-
 esphome/components/hmc5883l/sensor.py         |   6 +-
 esphome/components/http_request/__init__.py   |   8 +-
 esphome/components/image/__init__.py          |   3 +-
 esphome/components/ina219/sensor.py           |   1 -
 esphome/components/ina226/sensor.py           |   1 -
 esphome/components/ina3221/sensor.py          |   1 -
 esphome/components/light/effects.py           |   4 +-
 esphome/components/logger/__init__.py         |  19 +-
 esphome/components/mpu6050/sensor.py          |   8 +-
 esphome/components/mqtt/__init__.py           |  10 +-
 esphome/components/neopixelbus/light.py       |   2 +-
 esphome/components/ntc/sensor.py              |   3 +-
 esphome/components/partition/light.py         |   4 +-
 esphome/components/pmsx003/sensor.py          |   2 +-
 esphome/components/qmc5883l/sensor.py         |   6 +-
 esphome/components/remote_base/__init__.py    |  25 ++-
 .../components/remote_transmitter/switch.py   |   6 +-
 esphome/components/stepper/__init__.py        |   4 +-
 esphome/components/substitutions/__init__.py  |  19 +-
 esphome/components/sun/__init__.py            |   3 +-
 esphome/components/tcs34725/sensor.py         |   1 -
 esphome/components/time/__init__.py           |  42 ++--
 esphome/components/uart/__init__.py           |   7 +-
 esphome/components/uart/switch/__init__.py    |   5 +-
 esphome/components/wifi/__init__.py           |   4 +-
 esphome/config.py                             | 172 +++++++--------
 esphome/config_helpers.py                     |   7 +-
 esphome/config_validation.py                  | 202 ++++++++---------
 esphome/const.py                              |  25 ++-
 esphome/core.py                               | 129 ++++++-----
 esphome/core/component.cpp                    |   4 +
 esphome/core_config.py                        |  12 +-
 esphome/cpp_generator.py                      | 203 +++++++++---------
 esphome/cpp_helpers.py                        |  15 +-
 esphome/dashboard/dashboard.py                |  49 ++---
 esphome/espota2.py                            |  51 ++---
 esphome/helpers.py                            |  54 ++---
 esphome/legacy.py                             |   1 -
 esphome/mqtt.py                               |  46 ++--
 esphome/pins.py                               |  30 ++-
 esphome/platformio_api.py                     |  11 +-
 esphome/py_compat.py                          |  89 --------
 esphome/storage_json.py                       |  16 +-
 esphome/util.py                               |  59 ++---
 esphome/voluptuous_schema.py                  |  18 +-
 esphome/vscode.py                             |  14 +-
 esphome/wizard.py                             |  73 +++----
 esphome/writer.py                             |  76 ++++---
 esphome/yaml_util.py                          |  76 +++----
 esphome/zeroconf.py                           |  32 ++-
 pylintrc                                      |   6 -
 requirements.txt                              |   1 -
 requirements_test.txt                         |   1 -
 script/api_protobuf/api_options_pb2.py        |   1 -
 script/api_protobuf/api_protobuf.py           |   8 +-
 script/build_compile_commands.py              |   2 +-
 script/ci-custom.py                           |  17 +-
 script/clang-format                           |   2 +-
 script/clang-tidy                             |   2 +-
 script/helpers.py                             |  12 +-
 script/lint-python                            |   6 +-
 setup.cfg                                     |   1 -
 setup.py                                      |   5 +-
 78 files changed, 815 insertions(+), 1097 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7f75a2cb9..ca0a3082db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,12 +21,6 @@ matrix:
         - esphome tests/test1.yaml compile
         - esphome tests/test2.yaml compile
         - esphome tests/test3.yaml compile
-    - python: "2.7"
-      env: TARGET=Test2.7
-      script:
-        - esphome tests/test1.yaml compile
-        - esphome tests/test2.yaml compile
-        - esphome tests/test3.yaml compile
     - env: TARGET=Cpp-Lint
       dist: trusty
       sudo: required
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 5d8893bdbe..2d77502dc2 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -14,7 +14,5 @@ RUN \
 COPY requirements_test.txt /requirements_test.txt
 RUN pip3 install --no-cache-dir wheel && pip3 install --no-cache-dir -r /requirements_test.txt
 
-RUN ln -s /usr/bin/pip3 /usr/bin/pip && ln -f -s /usr/bin/python3 /usr/bin/python
-
 VOLUME ["/esphome"]
 WORKDIR /esphome
diff --git a/esphome/__main__.py b/esphome/__main__.py
index ae2db3e35c..73723dfa00 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import argparse
 import functools
 import logging
@@ -14,7 +12,6 @@ from esphome.const import CONF_BAUD_RATE, CONF_BROKER, CONF_LOGGER, CONF_OTA, \
     CONF_PASSWORD, CONF_PORT, CONF_ESPHOME, CONF_PLATFORMIO_OPTIONS
 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, IS_PY3
 from esphome.util import run_external_command, run_external_process, safe_print, list_yaml_files
 
 _LOGGER = logging.getLogger(__name__)
@@ -42,12 +39,12 @@ def choose_prompt(options):
     if len(options) == 1:
         return options[0][1]
 
-    safe_print(u"Found multiple options, please choose one:")
+    safe_print("Found multiple options, please choose one:")
     for i, (desc, _) in enumerate(options):
-        safe_print(u"  [{}] {}".format(i + 1, desc))
+        safe_print(f"  [{i+1}] {desc}")
 
     while True:
-        opt = safe_input('(number): ')
+        opt = input('(number): ')
         if opt in options:
             opt = options.index(opt)
             break
@@ -57,20 +54,20 @@ def choose_prompt(options):
                 raise ValueError
             break
         except ValueError:
-            safe_print(color('red', u"Invalid option: '{}'".format(opt)))
+            safe_print(color('red', f"Invalid option: '{opt}'"))
     return options[opt - 1][1]
 
 
 def choose_upload_log_host(default, check_default, show_ota, show_mqtt, show_api):
     options = []
     for res, desc in get_serial_ports():
-        options.append((u"{} ({})".format(res, desc), res))
+        options.append((f"{res} ({desc})", res))
     if (show_ota and 'ota' in CORE.config) or (show_api and 'api' in CORE.config):
-        options.append((u"Over The Air ({})".format(CORE.address), CORE.address))
+        options.append((f"Over The Air ({CORE.address})", CORE.address))
         if default == 'OTA':
             return CORE.address
     if show_mqtt and 'mqtt' in CORE.config:
-        options.append((u"MQTT ({})".format(CORE.config['mqtt'][CONF_BROKER]), 'MQTT'))
+        options.append(("MQTT ({})".format(CORE.config['mqtt'][CONF_BROKER]), 'MQTT'))
         if default == 'OTA':
             return 'MQTT'
     if default is not None:
@@ -108,11 +105,7 @@ def run_miniterm(config, port):
             except serial.SerialException:
                 _LOGGER.error("Serial port closed!")
                 return
-            if IS_PY2:
-                line = raw.replace('\r', '').replace('\n', '')
-            else:
-                line = raw.replace(b'\r', b'').replace(b'\n', b'').decode('utf8',
-                                                                          'backslashreplace')
+            line = raw.replace(b'\r', b'').replace(b'\n', b'').decode('utf8', 'backslashreplace')
             time = datetime.now().time().strftime('[%H:%M:%S]')
             message = time + line
             safe_print(message)
@@ -127,11 +120,9 @@ def wrap_to_code(name, comp):
     @functools.wraps(comp.to_code)
     @coroutine_with_priority(coro.priority)
     def wrapped(conf):
-        cg.add(cg.LineComment(u"{}:".format(name)))
+        cg.add(cg.LineComment(f"{name}:"))
         if comp.config_schema is not None:
             conf_str = yaml_util.dump(conf)
-            if IS_PY2:
-                conf_str = conf_str.decode('utf-8')
             conf_str = conf_str.replace('//', '')
             cg.add(cg.LineComment(indent(conf_str)))
         yield coro(conf)
@@ -243,7 +234,7 @@ def setup_log(debug=False, quiet=False):
         log_level = logging.INFO
     logging.basicConfig(level=log_level)
     fmt = "%(levelname)s %(message)s"
-    colorfmt = "%(log_color)s{}%(reset)s".format(fmt)
+    colorfmt = f"%(log_color)s{fmt}%(reset)s"
     datefmt = '%H:%M:%S'
 
     logging.getLogger('urllib3').setLevel(logging.WARNING)
@@ -292,12 +283,12 @@ def command_compile(args, config):
     if exit_code != 0:
         return exit_code
     if args.only_generate:
-        _LOGGER.info(u"Successfully generated source code.")
+        _LOGGER.info("Successfully generated source code.")
         return 0
     exit_code = compile_program(args, config)
     if exit_code != 0:
         return exit_code
-    _LOGGER.info(u"Successfully compiled program.")
+    _LOGGER.info("Successfully compiled program.")
     return 0
 
 
@@ -307,7 +298,7 @@ def command_upload(args, config):
     exit_code = upload_program(config, args, port)
     if exit_code != 0:
         return exit_code
-    _LOGGER.info(u"Successfully uploaded program.")
+    _LOGGER.info("Successfully uploaded program.")
     return 0
 
 
@@ -324,13 +315,13 @@ def command_run(args, config):
     exit_code = compile_program(args, config)
     if exit_code != 0:
         return exit_code
-    _LOGGER.info(u"Successfully compiled program.")
+    _LOGGER.info("Successfully compiled program.")
     port = choose_upload_log_host(default=args.upload_port, check_default=None,
                                   show_ota=True, show_mqtt=False, show_api=True)
     exit_code = upload_program(config, args, port)
     if exit_code != 0:
         return exit_code
-    _LOGGER.info(u"Successfully uploaded program.")
+    _LOGGER.info("Successfully uploaded program.")
     if args.no_logs:
         return 0
     port = choose_upload_log_host(default=args.upload_port, check_default=port,
@@ -349,7 +340,7 @@ def command_mqtt_fingerprint(args, config):
 
 
 def command_version(args):
-    safe_print(u"Version: {}".format(const.__version__))
+    safe_print(f"Version: {const.__version__}")
     return 0
 
 
@@ -377,10 +368,10 @@ def command_update_all(args):
     twidth = 60
 
     def print_bar(middle_text):
-        middle_text = " {} ".format(middle_text)
+        middle_text = f" {middle_text} "
         width = len(click.unstyle(middle_text))
         half_line = "=" * ((twidth - width) // 2)
-        click.echo("%s%s%s" % (half_line, middle_text, half_line))
+        click.echo(f"{half_line}{middle_text}{half_line}")
 
     for f in files:
         print("Updating {}".format(color('cyan', f)))
@@ -431,7 +422,7 @@ POST_CONFIG_ACTIONS = {
 
 
 def parse_args(argv):
-    parser = argparse.ArgumentParser(description='ESPHome v{}'.format(const.__version__))
+    parser = argparse.ArgumentParser(description=f'ESPHome v{const.__version__}')
     parser.add_argument('-v', '--verbose', help="Enable verbose esphome logs.",
                         action='store_true')
     parser.add_argument('-q', '--quiet', help="Disable all esphome logs.",
@@ -525,14 +516,10 @@ def run_esphome(argv):
         _LOGGER.error("Missing configuration parameter, see esphome --help.")
         return 1
 
-    if IS_PY2:
-        _LOGGER.warning("You're using ESPHome with python 2. Support for python 2 is deprecated "
-                        "and will be removed in 1.15.0. Please reinstall ESPHome with python 3.6 "
-                        "or higher.")
-    elif IS_PY3 and sys.version_info < (3, 6, 0):
-        _LOGGER.warning("You're using ESPHome with python 3.5. Support for python 3.5 is "
-                        "deprecated and will be removed in 1.15.0. Please reinstall ESPHome with "
-                        "python 3.6 or higher.")
+    if sys.version_info < (3, 6, 0):
+        _LOGGER.error("You're running ESPHome with Python <3.6. ESPHome is no longer compatible "
+                      "with this Python version. Please reinstall ESPHome with Python 3.6+")
+        return 1
 
     if args.command in PRE_CONFIG_ACTIONS:
         try:
@@ -551,7 +538,7 @@ def run_esphome(argv):
         CORE.config = config
 
         if args.command not in POST_CONFIG_ACTIONS:
-            safe_print(u"Unknown command {}".format(args.command))
+            safe_print(f"Unknown command {args.command}")
 
         try:
             rc = POST_CONFIG_ACTIONS[args.command](args, config)
diff --git a/esphome/api/client.py b/esphome/api/client.py
index 0c52674287..fcea90e3b4 100644
--- a/esphome/api/client.py
+++ b/esphome/api/client.py
@@ -14,7 +14,6 @@ import esphome.api.api_pb2 as pb
 from esphome.const import CONF_PASSWORD, CONF_PORT
 from esphome.core import EsphomeError
 from esphome.helpers import resolve_ip_address, indent, color
-from esphome.py_compat import text_type, IS_PY2, byte_to_bytes, char_to_byte
 from esphome.util import safe_print
 
 _LOGGER = logging.getLogger(__name__)
@@ -67,16 +66,16 @@ MESSAGE_TYPE_TO_PROTO = {
 
 def _varuint_to_bytes(value):
     if value <= 0x7F:
-        return byte_to_bytes(value)
+        return bytes([value])
 
     ret = bytes()
     while value:
         temp = value & 0x7F
         value >>= 7
         if value:
-            ret += byte_to_bytes(temp | 0x80)
+            ret += bytes([temp | 0x80])
         else:
-            ret += byte_to_bytes(temp)
+            ret += bytes([temp])
 
     return ret
 
@@ -84,8 +83,7 @@ def _varuint_to_bytes(value):
 def _bytes_to_varuint(value):
     result = 0
     bitpos = 0
-    for c in value:
-        val = char_to_byte(c)
+    for val in value:
         result |= (val & 0x7F) << bitpos
         bitpos += 7
         if (val & 0x80) == 0:
@@ -191,8 +189,8 @@ class APIClient(threading.Thread):
         self._socket.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
         try:
             self._socket.connect((ip, self._port))
-        except socket.error as err:
-            err = APIConnectionError("Error connecting to {}: {}".format(ip, err))
+        except OSError as err:
+            err = APIConnectionError(f"Error connecting to {ip}: {err}")
             self._fatal_error(err)
             raise err
         self._socket.settimeout(0.1)
@@ -200,7 +198,7 @@ class APIClient(threading.Thread):
         self._socket_open_event.set()
 
         hello = pb.HelloRequest()
-        hello.client_info = 'ESPHome v{}'.format(const.__version__)
+        hello.client_info = f'ESPHome v{const.__version__}'
         try:
             resp = self._send_message_await_response(hello, pb.HelloResponse)
         except APIConnectionError as err:
@@ -251,8 +249,8 @@ class APIClient(threading.Thread):
         with self._socket_write_lock:
             try:
                 self._socket.sendall(data)
-            except socket.error as err:
-                err = APIConnectionError("Error while writing data: {}".format(err))
+            except OSError as err:
+                err = APIConnectionError(f"Error while writing data: {err}")
                 self._fatal_error(err)
                 raise err
 
@@ -265,11 +263,8 @@ class APIClient(threading.Thread):
             raise ValueError
 
         encoded = msg.SerializeToString()
-        _LOGGER.debug("Sending %s:\n%s", type(msg), indent(text_type(msg)))
-        if IS_PY2:
-            req = chr(0x00)
-        else:
-            req = bytes([0])
+        _LOGGER.debug("Sending %s:\n%s", type(msg), indent(str(msg)))
+        req = bytes([0])
         req += _varuint_to_bytes(len(encoded))
         req += _varuint_to_bytes(message_type)
         req += encoded
@@ -355,14 +350,14 @@ class APIClient(threading.Thread):
                 raise APIConnectionError("Socket was closed")
             except socket.timeout:
                 continue
-            except socket.error as err:
-                raise APIConnectionError("Error while receiving data: {}".format(err))
+            except OSError as err:
+                raise APIConnectionError(f"Error while receiving data: {err}")
             ret += val
         return ret
 
     def _recv_varint(self):
         raw = bytes()
-        while not raw or char_to_byte(raw[-1]) & 0x80:
+        while not raw or raw[-1] & 0x80:
             raw += self._recv(1)
         return _bytes_to_varuint(raw)
 
@@ -371,7 +366,7 @@ class APIClient(threading.Thread):
             return
 
         # Preamble
-        if char_to_byte(self._recv(1)[0]) != 0x00:
+        if self._recv(1)[0] != 0x00:
             raise APIConnectionError("Invalid preamble")
 
         length = self._recv_varint()
@@ -436,7 +431,7 @@ def run_logs(config, address):
             return
 
         if err:
-            _LOGGER.warning(u"Disconnected from API: %s", err)
+            _LOGGER.warning("Disconnected from API: %s", err)
 
         while retry_timer:
             retry_timer.pop(0).cancel()
@@ -454,18 +449,18 @@ def run_logs(config, address):
 
         wait_time = int(min(1.5**min(tries, 100), 30))
         if not has_connects:
-            _LOGGER.warning(u"Initial connection failed. The ESP might not be connected "
-                            u"to WiFi yet (%s). Re-Trying in %s seconds",
+            _LOGGER.warning("Initial connection failed. The ESP might not be connected "
+                            "to WiFi yet (%s). Re-Trying in %s seconds",
                             error, wait_time)
         else:
-            _LOGGER.warning(u"Couldn't connect to API (%s). Trying to reconnect in %s seconds",
+            _LOGGER.warning("Couldn't connect to API (%s). Trying to reconnect in %s seconds",
                             error, wait_time)
         timer = threading.Timer(wait_time, functools.partial(try_connect, None, tries + 1))
         timer.start()
         retry_timer.append(timer)
 
     def on_log(msg):
-        time_ = datetime.now().time().strftime(u'[%H:%M:%S]')
+        time_ = datetime.now().time().strftime('[%H:%M:%S]')
         text = msg.message
         if msg.send_failed:
             text = color('white', '(Message skipped because it was too big to fit in '
diff --git a/esphome/automation.py b/esphome/automation.py
index f758191268..5df884e7c2 100644
--- a/esphome/automation.py
+++ b/esphome/automation.py
@@ -83,9 +83,9 @@ def validate_automation(extra_schema=None, extra_validators=None, single=False):
                 try:
                     return cv.Schema([schema])(value)
                 except cv.Invalid as err2:
-                    if u'extra keys not allowed' in str(err2) and len(err2.path) == 2:
+                    if 'extra keys not allowed' in str(err2) and len(err2.path) == 2:
                         raise err
-                    if u'Unable to find action' in str(err):
+                    if 'Unable to find action' in str(err):
                         raise err2
                     raise cv.MultipleInvalid([err, err2])
         elif isinstance(value, dict):
diff --git a/esphome/components/ade7953/sensor.py b/esphome/components/ade7953/sensor.py
index 4fcd307332..b048b1ed71 100644
--- a/esphome/components/ade7953/sensor.py
+++ b/esphome/components/ade7953/sensor.py
@@ -36,4 +36,4 @@ def to_code(config):
             continue
         conf = config[key]
         sens = yield sensor.new_sensor(conf)
-        cg.add(getattr(var, 'set_{}_sensor'.format(key))(sens))
+        cg.add(getattr(var, f'set_{key}_sensor')(sens))
diff --git a/esphome/components/ads1115/sensor.py b/esphome/components/ads1115/sensor.py
index 204ccb99d7..55619b22e9 100644
--- a/esphome/components/ads1115/sensor.py
+++ b/esphome/components/ads1115/sensor.py
@@ -2,7 +2,6 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, voltage_sampler
 from esphome.const import CONF_GAIN, CONF_MULTIPLEXER, ICON_FLASH, UNIT_VOLT, CONF_ID
-from esphome.py_compat import string_types
 from . import ads1115_ns, ADS1115Component
 
 DEPENDENCIES = ['ads1115']
@@ -32,9 +31,9 @@ GAIN = {
 
 def validate_gain(value):
     if isinstance(value, float):
-        value = u'{:0.03f}'.format(value)
-    elif not isinstance(value, string_types):
-        raise cv.Invalid('invalid gain "{}"'.format(value))
+        value = f'{value:0.03f}'
+    elif not isinstance(value, str):
+        raise cv.Invalid(f'invalid gain "{value}"')
 
     return cv.enum(GAIN)(value)
 
diff --git a/esphome/components/api/__init__.py b/esphome/components/api/__init__.py
index a0568863ad..eef60602ba 100644
--- a/esphome/components/api/__init__.py
+++ b/esphome/components/api/__init__.py
@@ -102,7 +102,7 @@ def homeassistant_service_to_code(config, action_id, template_arg, args):
 
 def validate_homeassistant_event(value):
     value = cv.string(value)
-    if not value.startswith(u'esphome.'):
+    if not value.startswith('esphome.'):
         raise cv.Invalid("ESPHome can only generate Home Assistant events that begin with "
                          "esphome. For example 'esphome.xyz'")
     return value
diff --git a/esphome/components/binary_sensor/__init__.py b/esphome/components/binary_sensor/__init__.py
index c082e2e9af..7c78c3a369 100644
--- a/esphome/components/binary_sensor/__init__.py
+++ b/esphome/components/binary_sensor/__init__.py
@@ -9,7 +9,6 @@ from esphome.const import CONF_DEVICE_CLASS, CONF_FILTERS, \
     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_NAME, CONF_MQTT_ID
 from esphome.core import CORE, coroutine, coroutine_with_priority
-from esphome.py_compat import string_types
 from esphome.util import Registry
 
 DEVICE_CLASSES = [
@@ -94,7 +93,7 @@ MULTI_CLICK_TIMING_SCHEMA = cv.Schema({
 
 
 def parse_multi_click_timing_str(value):
-    if not isinstance(value, string_types):
+    if not isinstance(value, str):
         return value
 
     parts = value.lower().split(' ')
@@ -104,10 +103,10 @@ def parse_multi_click_timing_str(value):
     try:
         state = cv.boolean(parts[0])
     except cv.Invalid:
-        raise cv.Invalid(u"First word must either be ON or OFF, not {}".format(parts[0]))
+        raise cv.Invalid("First word must either be ON or OFF, not {}".format(parts[0]))
 
     if parts[1] != 'for':
-        raise cv.Invalid(u"Second word must be 'for', got {}".format(parts[1]))
+        raise cv.Invalid("Second word must be 'for', got {}".format(parts[1]))
 
     if parts[2] == 'at':
         if parts[3] == 'least':
@@ -115,12 +114,12 @@ def parse_multi_click_timing_str(value):
         elif parts[3] == 'most':
             key = CONF_MAX_LENGTH
         else:
-            raise cv.Invalid(u"Third word after at must either be 'least' or 'most', got {}"
-                             u"".format(parts[3]))
+            raise cv.Invalid("Third word after at must either be 'least' or 'most', got {}"
+                             "".format(parts[3]))
         try:
             length = cv.positive_time_period_milliseconds(parts[4])
         except cv.Invalid as err:
-            raise cv.Invalid(u"Multi Click Grammar Parsing length failed: {}".format(err))
+            raise cv.Invalid(f"Multi Click Grammar Parsing length failed: {err}")
         return {
             CONF_STATE: state,
             key: str(length)
@@ -132,12 +131,12 @@ def parse_multi_click_timing_str(value):
     try:
         min_length = cv.positive_time_period_milliseconds(parts[2])
     except cv.Invalid as err:
-        raise cv.Invalid(u"Multi Click Grammar Parsing minimum length failed: {}".format(err))
+        raise cv.Invalid(f"Multi Click Grammar Parsing minimum length failed: {err}")
 
     try:
         max_length = cv.positive_time_period_milliseconds(parts[4])
     except cv.Invalid as err:
-        raise cv.Invalid(u"Multi Click Grammar Parsing minimum length failed: {}".format(err))
+        raise cv.Invalid(f"Multi Click Grammar Parsing minimum length failed: {err}")
 
     return {
         CONF_STATE: state,
diff --git a/esphome/components/deep_sleep/__init__.py b/esphome/components/deep_sleep/__init__.py
index 07c1d117b6..1b766c9928 100644
--- a/esphome/components/deep_sleep/__init__.py
+++ b/esphome/components/deep_sleep/__init__.py
@@ -8,8 +8,8 @@ from esphome.const import CONF_ID, CONF_MODE, CONF_NUMBER, CONF_PINS, CONF_RUN_C
 def validate_pin_number(value):
     valid_pins = [0, 2, 4, 12, 13, 14, 15, 25, 26, 27, 32, 33, 34, 35, 36, 37, 38, 39]
     if value[CONF_NUMBER] not in valid_pins:
-        raise cv.Invalid(u"Only pins {} support wakeup"
-                         u"".format(', '.join(str(x) for x in valid_pins)))
+        raise cv.Invalid("Only pins {} support wakeup"
+                         "".format(', '.join(str(x) for x in valid_pins)))
     return value
 
 
diff --git a/esphome/components/display/__init__.py b/esphome/components/display/__init__.py
index 38d19d832e..951d561caa 100644
--- a/esphome/components/display/__init__.py
+++ b/esphome/components/display/__init__.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import core, automation
@@ -27,7 +26,7 @@ DISPLAY_ROTATIONS = {
 
 def validate_rotation(value):
     value = cv.string(value)
-    if value.endswith(u"°"):
+    if value.endswith("°"):
         value = value[:-1]
     return cv.enum(DISPLAY_ROTATIONS, int=True)(value)
 
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index ccc15eb451..3311801b6c 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -46,33 +46,33 @@ def bt_uuid(value):
         pattern = re.compile("^[A-F|0-9]{4,}$")
         if not pattern.match(value):
             raise cv.Invalid(
-                u"Invalid hexadecimal value for 16 bit UUID format: '{}'".format(in_value))
+                f"Invalid hexadecimal value for 16 bit UUID format: '{in_value}'")
         return value
     if len(value) == len(bt_uuid32_format):
         pattern = re.compile("^[A-F|0-9]{8,}$")
         if not pattern.match(value):
             raise cv.Invalid(
-                u"Invalid hexadecimal value for 32 bit UUID format: '{}'".format(in_value))
+                f"Invalid hexadecimal value for 32 bit UUID format: '{in_value}'")
         return value
     if len(value) == len(bt_uuid128_format):
         pattern = re.compile(
             "^[A-F|0-9]{8,}-[A-F|0-9]{4,}-[A-F|0-9]{4,}-[A-F|0-9]{4,}-[A-F|0-9]{12,}$")
         if not pattern.match(value):
             raise cv.Invalid(
-                u"Invalid hexadecimal value for 128 UUID format: '{}'".format(in_value))
+                f"Invalid hexadecimal value for 128 UUID format: '{in_value}'")
         return value
     raise cv.Invalid(
-        u"Service UUID must be in 16 bit '{}', 32 bit '{}', or 128 bit '{}' format".format(
+        "Service UUID must be in 16 bit '{}', 32 bit '{}', or 128 bit '{}' format".format(
             bt_uuid16_format, bt_uuid32_format, bt_uuid128_format))
 
 
 def as_hex(value):
-    return cg.RawExpression('0x{}ULL'.format(value))
+    return cg.RawExpression(f'0x{value}ULL')
 
 
 def as_hex_array(value):
     value = value.replace("-", "")
-    cpp_array = ['0x{}'.format(part) for part in [value[i:i+2] for i in range(0, len(value), 2)]]
+    cpp_array = [f'0x{part}' for part in [value[i:i+2] for i in range(0, len(value), 2)]]
     return cg.RawExpression(
         '(uint8_t*)(const uint8_t[16]){{{}}}'.format(','.join(reversed(cpp_array))))
 
diff --git a/esphome/components/esp32_touch/binary_sensor.py b/esphome/components/esp32_touch/binary_sensor.py
index a72ca5796f..5142879a04 100644
--- a/esphome/components/esp32_touch/binary_sensor.py
+++ b/esphome/components/esp32_touch/binary_sensor.py
@@ -27,7 +27,7 @@ TOUCH_PADS = {
 def validate_touch_pad(value):
     value = validate_gpio_pin(value)
     if value not in TOUCH_PADS:
-        raise cv.Invalid("Pin {} does not support touch pads.".format(value))
+        raise cv.Invalid(f"Pin {value} does not support touch pads.")
     return value
 
 
diff --git a/esphome/components/font/__init__.py b/esphome/components/font/__init__.py
index e77bd5da8e..5b19dc74e0 100644
--- a/esphome/components/font/__init__.py
+++ b/esphome/components/font/__init__.py
@@ -1,11 +1,11 @@
-# coding=utf-8
+import functools
+
 from esphome import core
 from esphome.components import display
 import esphome.config_validation as cv
 import esphome.codegen as cg
 from esphome.const import CONF_FILE, CONF_GLYPHS, CONF_ID, CONF_SIZE
 from esphome.core import CORE, HexInt
-from esphome.py_compat import sort_by_cmp
 
 DEPENDENCIES = ['display']
 MULTI_CONF = True
@@ -33,9 +33,9 @@ def validate_glyphs(value):
             return -1
         if len(x_) > len(y_):
             return 1
-        raise cv.Invalid(u"Found duplicate glyph {}".format(x))
+        raise cv.Invalid(f"Found duplicate glyph {x}")
 
-    sort_by_cmp(value, comparator)
+    value.sort(key=functools.cmp_to_key(comparator))
     return value
 
 
@@ -55,15 +55,15 @@ def validate_pillow_installed(value):
 
 def validate_truetype_file(value):
     if value.endswith('.zip'):  # for Google Fonts downloads
-        raise cv.Invalid(u"Please unzip the font archive '{}' first and then use the .ttf files "
-                         u"inside.".format(value))
+        raise cv.Invalid("Please unzip the font archive '{}' first and then use the .ttf files "
+                         "inside.".format(value))
     if not value.endswith('.ttf'):
-        raise cv.Invalid(u"Only truetype (.ttf) files are supported. Please make sure you're "
-                         u"using the correct format or rename the extension to .ttf")
+        raise cv.Invalid("Only truetype (.ttf) files are supported. Please make sure you're "
+                         "using the correct format or rename the extension to .ttf")
     return cv.file_(value)
 
 
-DEFAULT_GLYPHS = u' !"%()+,-.:0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz°'
+DEFAULT_GLYPHS = ' !"%()+,-.:0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz°'
 CONF_RAW_DATA_ID = 'raw_data_id'
 
 FONT_SCHEMA = cv.Schema({
@@ -84,7 +84,7 @@ def to_code(config):
     try:
         font = ImageFont.truetype(path, config[CONF_SIZE])
     except Exception as e:
-        raise core.EsphomeError(u"Could not load truetype file {}: {}".format(path, e))
+        raise core.EsphomeError(f"Could not load truetype file {path}: {e}")
 
     ascent, descent = font.getmetrics()
 
diff --git a/esphome/components/globals/__init__.py b/esphome/components/globals/__init__.py
index e7030978ed..d285f1e97f 100644
--- a/esphome/components/globals/__init__.py
+++ b/esphome/components/globals/__init__.py
@@ -4,7 +4,6 @@ from esphome import config_validation as cv, automation
 from esphome import codegen as cg
 from esphome.const import CONF_ID, CONF_INITIAL_VALUE, CONF_RESTORE_VALUE, CONF_TYPE, CONF_VALUE
 from esphome.core import coroutine_with_priority
-from esphome.py_compat import IS_PY3
 
 globals_ns = cg.esphome_ns.namespace('globals')
 GlobalsComponent = globals_ns.class_('GlobalsComponent', cg.Component)
@@ -36,7 +35,7 @@ def to_code(config):
 
     if config[CONF_RESTORE_VALUE]:
         value = config[CONF_ID].id
-        if IS_PY3 and isinstance(value, str):
+        if isinstance(value, str):
             value = value.encode()
         hash_ = int(hashlib.md5(value).hexdigest()[:8], 16)
         cg.add(glob.set_restore_value(hash_))
diff --git a/esphome/components/hmc5883l/sensor.py b/esphome/components/hmc5883l/sensor.py
index 6e2366cadc..b063284698 100644
--- a/esphome/components/hmc5883l/sensor.py
+++ b/esphome/components/hmc5883l/sensor.py
@@ -1,11 +1,9 @@
-# coding=utf-8
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import (CONF_ADDRESS, CONF_ID, CONF_OVERSAMPLING, CONF_RANGE, ICON_MAGNET,
                            UNIT_MICROTESLA, UNIT_DEGREES, ICON_SCREEN_ROTATION,
                            CONF_UPDATE_INTERVAL)
-from esphome.py_compat import text_type
 
 DEPENDENCIES = ['i2c']
 
@@ -54,7 +52,7 @@ def validate_enum(enum_values, units=None, int=True):
     _units = []
     if units is not None:
         _units = units if isinstance(units, list) else [units]
-        _units = [text_type(x) for x in _units]
+        _units = [str(x) for x in _units]
     enum_bound = cv.enum(enum_values, int=int)
 
     def validate_enum_bound(value):
@@ -74,7 +72,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(HMC5883LComponent),
     cv.Optional(CONF_ADDRESS): cv.i2c_address,
     cv.Optional(CONF_OVERSAMPLING, default='1x'): validate_enum(HMC5883LOversamplings, units="x"),
-    cv.Optional(CONF_RANGE, default=u'130µT'): validate_enum(HMC5883L_RANGES, units=["uT", u"µT"]),
+    cv.Optional(CONF_RANGE, default='130µT'): validate_enum(HMC5883L_RANGES, units=["uT", "µT"]),
     cv.Optional(CONF_FIELD_STRENGTH_X): field_strength_schema,
     cv.Optional(CONF_FIELD_STRENGTH_Y): field_strength_schema,
     cv.Optional(CONF_FIELD_STRENGTH_Z): field_strength_schema,
diff --git a/esphome/components/http_request/__init__.py b/esphome/components/http_request/__init__.py
index 23fc38ba40..897440a454 100644
--- a/esphome/components/http_request/__init__.py
+++ b/esphome/components/http_request/__init__.py
@@ -1,3 +1,5 @@
+import urllib.parse as urlparse
+
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
@@ -5,12 +7,6 @@ from esphome.const import CONF_ID, CONF_TIMEOUT, CONF_ESPHOME, CONF_METHOD, \
     CONF_ARDUINO_VERSION, ARDUINO_VERSION_ESP8266_2_5_0
 from esphome.core import CORE, Lambda
 from esphome.core_config import PLATFORMIO_ESP8266_LUT
-from esphome.py_compat import IS_PY3
-
-if IS_PY3:
-    import urllib.parse as urlparse  # pylint: disable=no-name-in-module,import-error
-else:
-    import urlparse  # pylint: disable=import-error
 
 DEPENDENCIES = ['network']
 AUTO_LOAD = ['json']
diff --git a/esphome/components/image/__init__.py b/esphome/components/image/__init__.py
index d933af1a93..d0a41a7379 100644
--- a/esphome/components/image/__init__.py
+++ b/esphome/components/image/__init__.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import logging
 
 from esphome import core
@@ -33,7 +32,7 @@ def to_code(config):
     try:
         image = Image.open(path)
     except Exception as e:
-        raise core.EsphomeError(u"Could not load image file {}: {}".format(path, e))
+        raise core.EsphomeError(f"Could not load image file {path}: {e}")
 
     if CONF_RESIZE in config:
         image.thumbnail(config[CONF_RESIZE])
diff --git a/esphome/components/ina219/sensor.py b/esphome/components/ina219/sensor.py
index a6f415edb0..6a61e16226 100644
--- a/esphome/components/ina219/sensor.py
+++ b/esphome/components/ina219/sensor.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
diff --git a/esphome/components/ina226/sensor.py b/esphome/components/ina226/sensor.py
index 02a13f98c4..066363b3d4 100644
--- a/esphome/components/ina226/sensor.py
+++ b/esphome/components/ina226/sensor.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
diff --git a/esphome/components/ina3221/sensor.py b/esphome/components/ina3221/sensor.py
index 199f7be624..1c26533cc4 100644
--- a/esphome/components/ina3221/sensor.py
+++ b/esphome/components/ina3221/sensor.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
diff --git a/esphome/components/light/effects.py b/esphome/components/light/effects.py
index c2250e7e0c..005a66a5ad 100644
--- a/esphome/components/light/effects.py
+++ b/esphome/components/light/effects.py
@@ -253,8 +253,8 @@ def validate_effects(allowed_effects):
             name = x[key][CONF_NAME]
             if name in names:
                 errors.append(
-                    cv.Invalid(u"Found the effect name '{}' twice. All effects must have "
-                               u"unique names".format(name), [i])
+                    cv.Invalid("Found the effect name '{}' twice. All effects must have "
+                               "unique names".format(name), [i])
                 )
                 continue
             names.add(name)
diff --git a/esphome/components/logger/__init__.py b/esphome/components/logger/__init__.py
index 850f955f65..329c515aee 100644
--- a/esphome/components/logger/__init__.py
+++ b/esphome/components/logger/__init__.py
@@ -7,7 +7,6 @@ from esphome.automation import LambdaAction
 from esphome.const import CONF_ARGS, CONF_BAUD_RATE, CONF_FORMAT, CONF_HARDWARE_UART, CONF_ID, \
     CONF_LEVEL, CONF_LOGS, CONF_ON_MESSAGE, CONF_TAG, CONF_TRIGGER_ID, CONF_TX_BUFFER_SIZE
 from esphome.core import CORE, EsphomeError, Lambda, coroutine_with_priority
-from esphome.py_compat import text_type
 
 logger_ns = cg.esphome_ns.namespace('logger')
 LOG_LEVELS = {
@@ -64,8 +63,8 @@ def validate_local_no_higher_than_global(value):
     global_level = value.get(CONF_LEVEL, 'DEBUG')
     for tag, level in value.get(CONF_LOGS, {}).items():
         if LOG_LEVEL_SEVERITY.index(level) > LOG_LEVEL_SEVERITY.index(global_level):
-            raise EsphomeError(u"The local log level {} for {} must be less severe than the "
-                               u"global log level {}.".format(level, tag, global_level))
+            raise EsphomeError("The local log level {} for {} must be less severe than the "
+                               "global log level {}.".format(level, tag, global_level))
     return value
 
 
@@ -119,7 +118,7 @@ def to_code(config):
 
     if CORE.is_esp8266 and has_serial_logging and is_at_least_verbose:
         debug_serial_port = HARDWARE_UART_TO_SERIAL[config.get(CONF_HARDWARE_UART)]
-        cg.add_build_flag("-DDEBUG_ESP_PORT={}".format(debug_serial_port))
+        cg.add_build_flag(f"-DDEBUG_ESP_PORT={debug_serial_port}")
         cg.add_build_flag("-DLWIP_DEBUG")
         DEBUG_COMPONENTS = {
             'HTTP_CLIENT',
@@ -134,7 +133,7 @@ def to_code(config):
             # 'MDNS_RESPONDER',
         }
         for comp in DEBUG_COMPONENTS:
-            cg.add_build_flag("-DDEBUG_ESP_{}".format(comp))
+            cg.add_build_flag(f"-DDEBUG_ESP_{comp}")
     if CORE.is_esp32 and is_at_least_verbose:
         cg.add_build_flag('-DCORE_DEBUG_LEVEL=5')
     if CORE.is_esp32 and is_at_least_very_verbose:
@@ -165,7 +164,7 @@ def maybe_simple_message(schema):
 def validate_printf(value):
     # https://stackoverflow.com/questions/30011379/how-can-i-parse-a-c-format-string-in-python
     # pylint: disable=anomalous-backslash-in-string
-    cfmt = u"""\
+    cfmt = """\
     (                                  # start of capture group 1
     %                                  # literal "%"
     (?:                                # first option
@@ -179,8 +178,8 @@ def validate_printf(value):
     """  # noqa
     matches = re.findall(cfmt, value[CONF_FORMAT], flags=re.X)
     if len(matches) != len(value[CONF_ARGS]):
-        raise cv.Invalid(u"Found {} printf-patterns ({}), but {} args were given!"
-                         u"".format(len(matches), u', '.join(matches), len(value[CONF_ARGS])))
+        raise cv.Invalid("Found {} printf-patterns ({}), but {} args were given!"
+                         "".format(len(matches), ', '.join(matches), len(value[CONF_ARGS])))
     return value
 
 
@@ -196,9 +195,9 @@ LOGGER_LOG_ACTION_SCHEMA = cv.All(maybe_simple_message({
 @automation.register_action(CONF_LOGGER_LOG, LambdaAction, LOGGER_LOG_ACTION_SCHEMA)
 def logger_log_action_to_code(config, action_id, template_arg, args):
     esp_log = LOG_LEVEL_TO_ESP_LOG[config[CONF_LEVEL]]
-    args_ = [cg.RawExpression(text_type(x)) for x in config[CONF_ARGS]]
+    args_ = [cg.RawExpression(str(x)) for x in config[CONF_ARGS]]
 
-    text = text_type(cg.statement(esp_log(config[CONF_TAG], config[CONF_FORMAT], *args_)))
+    text = str(cg.statement(esp_log(config[CONF_TAG], config[CONF_FORMAT], *args_)))
 
     lambda_ = yield cg.process_lambda(Lambda(text), args, return_type=cg.void)
     yield cg.new_Pvariable(action_id, template_arg, lambda_)
diff --git a/esphome/components/mpu6050/sensor.py b/esphome/components/mpu6050/sensor.py
index bf44c67848..73c78e7f16 100644
--- a/esphome/components/mpu6050/sensor.py
+++ b/esphome/components/mpu6050/sensor.py
@@ -39,14 +39,14 @@ def to_code(config):
     yield i2c.register_i2c_device(var, config)
 
     for d in ['x', 'y', 'z']:
-        accel_key = 'accel_{}'.format(d)
+        accel_key = f'accel_{d}'
         if accel_key in config:
             sens = yield sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, 'set_accel_{}_sensor'.format(d))(sens))
-        accel_key = 'gyro_{}'.format(d)
+            cg.add(getattr(var, f'set_accel_{d}_sensor')(sens))
+        accel_key = f'gyro_{d}'
         if accel_key in config:
             sens = yield sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, 'set_gyro_{}_sensor'.format(d))(sens))
+            cg.add(getattr(var, f'set_gyro_{d}_sensor')(sens))
 
     if CONF_TEMPERATURE in config:
         sens = yield sensor.new_sensor(config[CONF_TEMPERATURE])
diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 20d7f5aafe..2f0ed0f8e2 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -64,28 +64,28 @@ def validate_config(value):
     topic_prefix = value[CONF_TOPIC_PREFIX]
     if CONF_BIRTH_MESSAGE not in value:
         out[CONF_BIRTH_MESSAGE] = {
-            CONF_TOPIC: '{}/status'.format(topic_prefix),
+            CONF_TOPIC: f'{topic_prefix}/status',
             CONF_PAYLOAD: 'online',
             CONF_QOS: 0,
             CONF_RETAIN: True,
         }
     if CONF_WILL_MESSAGE not in value:
         out[CONF_WILL_MESSAGE] = {
-            CONF_TOPIC: '{}/status'.format(topic_prefix),
+            CONF_TOPIC: f'{topic_prefix}/status',
             CONF_PAYLOAD: 'offline',
             CONF_QOS: 0,
             CONF_RETAIN: True,
         }
     if CONF_SHUTDOWN_MESSAGE not in value:
         out[CONF_SHUTDOWN_MESSAGE] = {
-            CONF_TOPIC: '{}/status'.format(topic_prefix),
+            CONF_TOPIC: f'{topic_prefix}/status',
             CONF_PAYLOAD: 'offline',
             CONF_QOS: 0,
             CONF_RETAIN: True,
         }
     if CONF_LOG_TOPIC not in value:
         out[CONF_LOG_TOPIC] = {
-            CONF_TOPIC: '{}/debug'.format(topic_prefix),
+            CONF_TOPIC: f'{topic_prefix}/debug',
             CONF_QOS: 0,
             CONF_RETAIN: True,
         }
@@ -95,7 +95,7 @@ def validate_config(value):
 def validate_fingerprint(value):
     value = cv.string(value)
     if re.match(r'^[0-9a-f]{40}$', value) is None:
-        raise cv.Invalid(u"fingerprint must be valid SHA1 hash")
+        raise cv.Invalid("fingerprint must be valid SHA1 hash")
     return value
 
 
diff --git a/esphome/components/neopixelbus/light.py b/esphome/components/neopixelbus/light.py
index e405b3d7a8..ea1b67f8ce 100644
--- a/esphome/components/neopixelbus/light.py
+++ b/esphome/components/neopixelbus/light.py
@@ -82,7 +82,7 @@ def validate_method_pin(value):
     for opt in (CONF_PIN, CONF_CLOCK_PIN, CONF_DATA_PIN):
         if opt in value and value[opt] not in pins_:
             raise cv.Invalid("Method {} only supports pin(s) {}".format(
-                method, ', '.join('GPIO{}'.format(x) for x in pins_)
+                method, ', '.join(f'GPIO{x}' for x in pins_)
             ), path=[CONF_METHOD])
     return value
 
diff --git a/esphome/components/ntc/sensor.py b/esphome/components/ntc/sensor.py
index 7ff4f4e137..f2eb601ed2 100644
--- a/esphome/components/ntc/sensor.py
+++ b/esphome/components/ntc/sensor.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from math import log
 
 import esphome.config_validation as cv
@@ -28,7 +27,7 @@ def validate_calibration_parameter(value):
     value = cv.string(value)
     parts = value.split('->')
     if len(parts) != 2:
-        raise cv.Invalid(u"Calibration parameter must be of form 3000 -> 23°C")
+        raise cv.Invalid("Calibration parameter must be of form 3000 -> 23°C")
     voltage = cv.resistance(parts[0].strip())
     temperature = cv.temperature(parts[1].strip())
     return validate_calibration_parameter({
diff --git a/esphome/components/partition/light.py b/esphome/components/partition/light.py
index 62434e7a19..ba1059e36b 100644
--- a/esphome/components/partition/light.py
+++ b/esphome/components/partition/light.py
@@ -10,8 +10,8 @@ PartitionLightOutput = partitions_ns.class_('PartitionLightOutput', light.Addres
 
 def validate_from_to(value):
     if value[CONF_FROM] > value[CONF_TO]:
-        raise cv.Invalid(u"From ({}) must not be larger than to ({})"
-                         u"".format(value[CONF_FROM], value[CONF_TO]))
+        raise cv.Invalid("From ({}) must not be larger than to ({})"
+                         "".format(value[CONF_FROM], value[CONF_TO]))
     return value
 
 
diff --git a/esphome/components/pmsx003/sensor.py b/esphome/components/pmsx003/sensor.py
index 0cbaf1bf29..4dbe500d3d 100644
--- a/esphome/components/pmsx003/sensor.py
+++ b/esphome/components/pmsx003/sensor.py
@@ -36,7 +36,7 @@ SENSORS_TO_TYPE = {
 def validate_pmsx003_sensors(value):
     for key, types in SENSORS_TO_TYPE.items():
         if key in value and value[CONF_TYPE] not in types:
-            raise cv.Invalid(u"{} does not have {} sensor!".format(value[CONF_TYPE], key))
+            raise cv.Invalid("{} does not have {} sensor!".format(value[CONF_TYPE], key))
     return value
 
 
diff --git a/esphome/components/qmc5883l/sensor.py b/esphome/components/qmc5883l/sensor.py
index 8ccd542753..8a2952f54f 100644
--- a/esphome/components/qmc5883l/sensor.py
+++ b/esphome/components/qmc5883l/sensor.py
@@ -1,11 +1,9 @@
-# coding=utf-8
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import (CONF_ADDRESS, CONF_ID, CONF_OVERSAMPLING, CONF_RANGE, ICON_MAGNET,
                            UNIT_MICROTESLA, UNIT_DEGREES, ICON_SCREEN_ROTATION,
                            CONF_UPDATE_INTERVAL)
-from esphome.py_compat import text_type
 
 DEPENDENCIES = ['i2c']
 
@@ -46,7 +44,7 @@ def validate_enum(enum_values, units=None, int=True):
     _units = []
     if units is not None:
         _units = units if isinstance(units, list) else [units]
-        _units = [text_type(x) for x in _units]
+        _units = [str(x) for x in _units]
     enum_bound = cv.enum(enum_values, int=int)
 
     def validate_enum_bound(value):
@@ -65,7 +63,7 @@ heading_schema = sensor.sensor_schema(UNIT_DEGREES, ICON_SCREEN_ROTATION, 1)
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(QMC5883LComponent),
     cv.Optional(CONF_ADDRESS): cv.i2c_address,
-    cv.Optional(CONF_RANGE, default=u'200µT'): validate_enum(QMC5883L_RANGES, units=["uT", u"µT"]),
+    cv.Optional(CONF_RANGE, default='200µT'): validate_enum(QMC5883L_RANGES, units=["uT", "µT"]),
     cv.Optional(CONF_OVERSAMPLING, default="512x"): validate_enum(QMC5883LOversamplings, units="x"),
     cv.Optional(CONF_FIELD_STRENGTH_X): field_strength_schema,
     cv.Optional(CONF_FIELD_STRENGTH_Y): field_strength_schema,
diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index 023f0f253e..3d57041e56 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -7,7 +7,6 @@ from esphome.const import CONF_DATA, CONF_TRIGGER_ID, CONF_NBITS, CONF_ADDRESS,
     CONF_PROTOCOL, CONF_GROUP, CONF_DEVICE, CONF_STATE, CONF_CHANNEL, CONF_FAMILY, CONF_REPEAT, \
     CONF_WAIT_TIME, CONF_TIMES, CONF_TYPE_ID, CONF_CARRIER_FREQUENCY
 from esphome.core import coroutine
-from esphome.py_compat import string_types, text_type
 from esphome.util import Registry, SimpleRegistry
 
 AUTO_LOAD = ['binary_sensor']
@@ -52,7 +51,7 @@ def register_trigger(name, type, data_type):
         cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(type),
         cv.GenerateID(CONF_RECEIVER_ID): cv.use_id(RemoteReceiverBase),
     })
-    registerer = TRIGGER_REGISTRY.register('on_{}'.format(name), validator)
+    registerer = TRIGGER_REGISTRY.register(f'on_{name}', validator)
 
     def decorator(func):
         @coroutine
@@ -98,7 +97,7 @@ def register_action(name, type_, schema):
         cv.GenerateID(CONF_TRANSMITTER_ID): cv.use_id(RemoteTransmitterBase),
         cv.Optional(CONF_REPEAT): validate_repeat,
     })
-    registerer = automation.register_action('remote_transmitter.transmit_{}'.format(name),
+    registerer = automation.register_action(f'remote_transmitter.transmit_{name}',
                                             type_, validator)
 
     def decorator(func):
@@ -122,11 +121,11 @@ def register_action(name, type_, schema):
 
 
 def declare_protocol(name):
-    data = ns.struct('{}Data'.format(name))
-    binary_sensor_ = ns.class_('{}BinarySensor'.format(name), RemoteReceiverBinarySensorBase)
-    trigger = ns.class_('{}Trigger'.format(name), RemoteReceiverTrigger)
-    action = ns.class_('{}Action'.format(name), RemoteTransmitterActionBase)
-    dumper = ns.class_('{}Dumper'.format(name), RemoteTransmitterDumper)
+    data = ns.struct(f'{name}Data')
+    binary_sensor_ = ns.class_(f'{name}BinarySensor', RemoteReceiverBinarySensorBase)
+    trigger = ns.class_(f'{name}Trigger', RemoteReceiverTrigger)
+    action = ns.class_(f'{name}Action', RemoteTransmitterActionBase)
+    dumper = ns.class_(f'{name}Dumper', RemoteTransmitterDumper)
     return data, binary_sensor_, trigger, action, dumper
 
 
@@ -141,7 +140,7 @@ DUMPER_REGISTRY = Registry({
 
 
 def validate_dumpers(value):
-    if isinstance(value, string_types) and value.lower() == 'all':
+    if isinstance(value, str) and value.lower() == 'all':
         return validate_dumpers(list(DUMPER_REGISTRY.keys()))
     return cv.validate_registry('dumper', DUMPER_REGISTRY)(value)
 
@@ -432,12 +431,12 @@ RC_SWITCH_PROTOCOL_SCHEMA = cv.Any(
 
 
 def validate_rc_switch_code(value):
-    if not isinstance(value, (str, text_type)):
+    if not isinstance(value, (str, str)):
         raise cv.Invalid("All RCSwitch codes must be in quotes ('')")
     for c in value:
         if c not in ('0', '1'):
-            raise cv.Invalid(u"Invalid RCSwitch code character '{}'. Only '0' and '1' are allowed"
-                             u"".format(c))
+            raise cv.Invalid("Invalid RCSwitch code character '{}'. Only '0' and '1' are allowed"
+                             "".format(c))
     if len(value) > 64:
         raise cv.Invalid("Maximum length for RCSwitch codes is 64, code '{}' has length {}"
                          "".format(value, len(value)))
@@ -447,7 +446,7 @@ def validate_rc_switch_code(value):
 
 
 def validate_rc_switch_raw_code(value):
-    if not isinstance(value, (str, text_type)):
+    if not isinstance(value, (str, str)):
         raise cv.Invalid("All RCSwitch raw codes must be in quotes ('')")
     for c in value:
         if c not in ('0', '1', 'x'):
diff --git a/esphome/components/remote_transmitter/switch.py b/esphome/components/remote_transmitter/switch.py
index 5802ece807..5e0be04d7a 100644
--- a/esphome/components/remote_transmitter/switch.py
+++ b/esphome/components/remote_transmitter/switch.py
@@ -19,12 +19,12 @@ def show_new(value):
     if 'name' in value:
         args.append(('name', value['name']))
     args.append(('turn_on_action', {
-        'remote_transmitter.transmit_{}'.format(key): val
+        f'remote_transmitter.transmit_{key}': val
     }))
 
     text = yaml_util.dump([OrderedDict(args)])
-    raise cv.Invalid(u"This platform has been removed in 1.13, please change to:\n\n{}\n\n."
-                     u"".format(text))
+    raise cv.Invalid("This platform has been removed in 1.13, please change to:\n\n{}\n\n."
+                     "".format(text))
 
 
 CONFIG_SCHEMA = show_new
diff --git a/esphome/components/stepper/__init__.py b/esphome/components/stepper/__init__.py
index 087fb18137..e8d6acbd1c 100644
--- a/esphome/components/stepper/__init__.py
+++ b/esphome/components/stepper/__init__.py
@@ -28,7 +28,7 @@ def validate_acceleration(value):
     try:
         value = float(value)
     except ValueError:
-        raise cv.Invalid("Expected acceleration as floating point number, got {}".format(value))
+        raise cv.Invalid(f"Expected acceleration as floating point number, got {value}")
 
     if value <= 0:
         raise cv.Invalid("Acceleration must be larger than 0 steps/s^2!")
@@ -48,7 +48,7 @@ def validate_speed(value):
     try:
         value = float(value)
     except ValueError:
-        raise cv.Invalid("Expected speed as floating point number, got {}".format(value))
+        raise cv.Invalid(f"Expected speed as floating point number, got {value}")
 
     if value <= 0:
         raise cv.Invalid("Speed must be larger than 0 steps/s!")
diff --git a/esphome/components/substitutions/__init__.py b/esphome/components/substitutions/__init__.py
index 433a3066ee..292a7bf299 100644
--- a/esphome/components/substitutions/__init__.py
+++ b/esphome/components/substitutions/__init__.py
@@ -3,7 +3,6 @@ import re
 
 import esphome.config_validation as cv
 from esphome import core
-from esphome.py_compat import string_types
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -24,8 +23,8 @@ def validate_substitution_key(value):
     for char in value:
         if char not in VALID_SUBSTITUTIONS_CHARACTERS:
             raise cv.Invalid(
-                u"Substitution must only consist of upper/lowercase characters, the underscore "
-                u"and numbers. The character '{}' cannot be used".format(char))
+                "Substitution must only consist of upper/lowercase characters, the underscore "
+                "and numbers. The character '{}' cannot be used".format(char))
     return value
 
 
@@ -42,7 +41,7 @@ VARIABLE_PROG = re.compile('\\$([{0}]+|\\{{[{0}]*\\}})'.format(VALID_SUBSTITUTIO
 
 
 def _expand_substitutions(substitutions, value, path):
-    if u'$' not in value:
+    if '$' not in value:
         return value
 
     orig_value = value
@@ -56,11 +55,11 @@ def _expand_substitutions(substitutions, value, path):
 
         i, j = m.span(0)
         name = m.group(1)
-        if name.startswith(u'{') and name.endswith(u'}'):
+        if name.startswith('{') and name.endswith('}'):
             name = name[1:-1]
         if name not in substitutions:
-            _LOGGER.warning(u"Found '%s' (see %s) which looks like a substitution, but '%s' was "
-                            u"not declared", orig_value, u'->'.join(str(x) for x in path), name)
+            _LOGGER.warning("Found '%s' (see %s) which looks like a substitution, but '%s' was "
+                            "not declared", orig_value, '->'.join(str(x) for x in path), name)
             i = j
             continue
 
@@ -91,7 +90,7 @@ def _substitute_item(substitutions, item, path):
         for old, new in replace_keys:
             item[new] = item[old]
             del item[old]
-    elif isinstance(item, string_types):
+    elif isinstance(item, str):
         sub = _expand_substitutions(substitutions, item, path)
         if sub != item:
             return sub
@@ -109,8 +108,8 @@ def do_substitution_pass(config):
     substitutions = config[CONF_SUBSTITUTIONS]
     with cv.prepend_path('substitutions'):
         if not isinstance(substitutions, dict):
-            raise cv.Invalid(u"Substitutions must be a key to value mapping, got {}"
-                             u"".format(type(substitutions)))
+            raise cv.Invalid("Substitutions must be a key to value mapping, got {}"
+                             "".format(type(substitutions)))
 
         replace_keys = []
         for key, value in substitutions.items():
diff --git a/esphome/components/sun/__init__.py b/esphome/components/sun/__init__.py
index fef0902181..e4d2023a8e 100644
--- a/esphome/components/sun/__init__.py
+++ b/esphome/components/sun/__init__.py
@@ -3,7 +3,6 @@ import esphome.config_validation as cv
 from esphome import automation
 from esphome.components import time
 from esphome.const import CONF_TIME_ID, CONF_ID, CONF_TRIGGER_ID
-from esphome.py_compat import string_types
 
 sun_ns = cg.esphome_ns.namespace('sun')
 
@@ -32,7 +31,7 @@ ELEVATION_MAP = {
 
 
 def elevation(value):
-    if isinstance(value, string_types):
+    if isinstance(value, str):
         try:
             value = ELEVATION_MAP[cv.one_of(*ELEVATION_MAP, lower=True, space='_')(value)]
         except cv.Invalid:
diff --git a/esphome/components/tcs34725/sensor.py b/esphome/components/tcs34725/sensor.py
index 478fe4aba6..287b2e441c 100644
--- a/esphome/components/tcs34725/sensor.py
+++ b/esphome/components/tcs34725/sensor.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
diff --git a/esphome/components/time/__init__.py b/esphome/components/time/__init__.py
index 58739772b0..6283392103 100644
--- a/esphome/components/time/__init__.py
+++ b/esphome/components/time/__init__.py
@@ -14,7 +14,6 @@ from esphome.const import CONF_CRON, CONF_DAYS_OF_MONTH, CONF_DAYS_OF_WEEK, CONF
     CONF_MINUTES, CONF_MONTHS, CONF_ON_TIME, CONF_SECONDS, CONF_TIMEZONE, CONF_TRIGGER_ID, \
     CONF_AT, CONF_SECOND, CONF_HOUR, CONF_MINUTE
 from esphome.core import coroutine, coroutine_with_priority
-from esphome.py_compat import string_types
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,10 +32,10 @@ def _tz_timedelta(td):
     if offset_hour == 0 and offset_minute == 0 and offset_second == 0:
         return '0'
     if offset_minute == 0 and offset_second == 0:
-        return '{}'.format(offset_hour)
+        return f'{offset_hour}'
     if offset_second == 0:
-        return '{}:{}'.format(offset_hour, offset_minute)
-    return '{}:{}:{}'.format(offset_hour, offset_minute, offset_second)
+        return f'{offset_hour}:{offset_minute}'
+    return f'{offset_hour}:{offset_minute}:{offset_second}'
 
 
 # https://stackoverflow.com/a/16804556/8924614
@@ -133,7 +132,7 @@ def detect_tz():
 
 def _parse_cron_int(value, special_mapping, message):
     special_mapping = special_mapping or {}
-    if isinstance(value, string_types) and value in special_mapping:
+    if isinstance(value, str) and value in special_mapping:
         return special_mapping[value]
     try:
         return int(value)
@@ -143,41 +142,40 @@ def _parse_cron_int(value, special_mapping, message):
 
 def _parse_cron_part(part, min_value, max_value, special_mapping):
     if part in ('*', '?'):
-        return set(x for x in range(min_value, max_value + 1))
+        return set(range(min_value, max_value + 1))
     if '/' in part:
         data = part.split('/')
         if len(data) > 2:
-            raise cv.Invalid(u"Can't have more than two '/' in one time expression, got {}"
+            raise cv.Invalid("Can't have more than two '/' in one time expression, got {}"
                              .format(part))
         offset, repeat = data
         offset_n = 0
         if offset:
             offset_n = _parse_cron_int(offset, special_mapping,
-                                       u"Offset for '/' time expression must be an integer, got {}")
+                                       "Offset for '/' time expression must be an integer, got {}")
 
         try:
             repeat_n = int(repeat)
         except ValueError:
-            raise cv.Invalid(u"Repeat for '/' time expression must be an integer, got {}"
+            raise cv.Invalid("Repeat for '/' time expression must be an integer, got {}"
                              .format(repeat))
-        return set(x for x in range(offset_n, max_value + 1, repeat_n))
+        return set(range(offset_n, max_value + 1, repeat_n))
     if '-' in part:
         data = part.split('-')
         if len(data) > 2:
-            raise cv.Invalid(u"Can't have more than two '-' in range time expression '{}'"
+            raise cv.Invalid("Can't have more than two '-' in range time expression '{}'"
                              .format(part))
         begin, end = data
-        begin_n = _parse_cron_int(begin, special_mapping, u"Number for time range must be integer, "
-                                                          u"got {}")
-        end_n = _parse_cron_int(end, special_mapping, u"Number for time range must be integer, "
-                                                      u"got {}")
+        begin_n = _parse_cron_int(begin, special_mapping, "Number for time range must be integer, "
+                                                          "got {}")
+        end_n = _parse_cron_int(end, special_mapping, "Number for time range must be integer, "
+                                                      "got {}")
         if end_n < begin_n:
-            return set(x for x in range(end_n, max_value + 1)) | \
-                   set(x for x in range(min_value, begin_n + 1))
-        return set(x for x in range(begin_n, end_n + 1))
+            return set(range(end_n, max_value + 1)) | set(range(min_value, begin_n + 1))
+        return set(range(begin_n, end_n + 1))
 
-    return {_parse_cron_int(part, special_mapping, u"Number for time expression must be an "
-                                                   u"integer, got {}")}
+    return {_parse_cron_int(part, special_mapping, "Number for time expression must be an "
+                                                   "integer, got {}")}
 
 
 def cron_expression_validator(name, min_value, max_value, special_mapping=None):
@@ -249,7 +247,7 @@ def validate_cron_keys(value):
     if CONF_CRON in value:
         for key in value.keys():
             if key in CRON_KEYS:
-                raise cv.Invalid("Cannot use option {} when cron: is specified.".format(key))
+                raise cv.Invalid(f"Cannot use option {key} when cron: is specified.")
         if CONF_AT in value:
             raise cv.Invalid("Cannot use option at with cron!")
         cron_ = value[CONF_CRON]
@@ -259,7 +257,7 @@ def validate_cron_keys(value):
     if CONF_AT in value:
         for key in value.keys():
             if key in CRON_KEYS:
-                raise cv.Invalid("Cannot use option {} when at: is specified.".format(key))
+                raise cv.Invalid(f"Cannot use option {key} when at: is specified.")
         at_ = value[CONF_AT]
         value = {x: value[x] for x in value if x != CONF_AT}
         value.update(at_)
diff --git a/esphome/components/uart/__init__.py b/esphome/components/uart/__init__.py
index 2511cf28b1..4312bd5d10 100644
--- a/esphome/components/uart/__init__.py
+++ b/esphome/components/uart/__init__.py
@@ -3,7 +3,6 @@ import esphome.config_validation as cv
 from esphome import pins, automation
 from esphome.const import CONF_BAUD_RATE, CONF_ID, CONF_RX_PIN, CONF_TX_PIN, CONF_UART_ID, CONF_DATA
 from esphome.core import CORE, coroutine
-from esphome.py_compat import text_type, binary_type, char_to_byte
 
 uart_ns = cg.esphome_ns.namespace('uart')
 UARTComponent = uart_ns.class_('UARTComponent', cg.Component)
@@ -13,7 +12,7 @@ MULTI_CONF = True
 
 
 def validate_raw_data(value):
-    if isinstance(value, text_type):
+    if isinstance(value, str):
         return value.encode('utf-8')
     if isinstance(value, str):
         return value
@@ -77,8 +76,8 @@ def uart_write_to_code(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     yield cg.register_parented(var, config[CONF_ID])
     data = config[CONF_DATA]
-    if isinstance(data, binary_type):
-        data = [char_to_byte(x) for x in data]
+    if isinstance(data, bytes):
+        data = list(data)
 
     if cg.is_template(data):
         templ = yield cg.templatable(data, args, cg.std_vector.template(cg.uint8))
diff --git a/esphome/components/uart/switch/__init__.py b/esphome/components/uart/switch/__init__.py
index b6f622604f..6cc11d8bbe 100644
--- a/esphome/components/uart/switch/__init__.py
+++ b/esphome/components/uart/switch/__init__.py
@@ -3,7 +3,6 @@ import esphome.config_validation as cv
 from esphome.components import switch, uart
 from esphome.const import CONF_DATA, CONF_ID, CONF_INVERTED
 from esphome.core import HexInt
-from esphome.py_compat import binary_type, char_to_byte
 from .. import uart_ns, validate_raw_data
 
 DEPENDENCIES = ['uart']
@@ -25,6 +24,6 @@ def to_code(config):
     yield uart.register_uart_device(var, config)
 
     data = config[CONF_DATA]
-    if isinstance(data, binary_type):
-        data = [HexInt(char_to_byte(x)) for x in data]
+    if isinstance(data, bytes):
+        data = [HexInt(x) for x in data]
     cg.add(var.set_data(data))
diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index 37ea20c6e4..d3c7e51603 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -30,9 +30,9 @@ def validate_password(value):
     if not value:
         return value
     if len(value) < 8:
-        raise cv.Invalid(u"WPA password must be at least 8 characters long")
+        raise cv.Invalid("WPA password must be at least 8 characters long")
     if len(value) > 64:
-        raise cv.Invalid(u"WPA password must be at most 64 characters long")
+        raise cv.Invalid("WPA password must be at most 64 characters long")
     return value
 
 
diff --git a/esphome/config.py b/esphome/config.py
index 027c28bc5d..8d7c622a27 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import collections
 import importlib
 import logging
@@ -18,7 +16,6 @@ from esphome.components.substitutions import CONF_SUBSTITUTIONS
 from esphome.const import CONF_ESPHOME, CONF_PLATFORM, ESP_PLATFORMS
 from esphome.core import CORE, EsphomeError  # noqa
 from esphome.helpers import color, indent
-from esphome.py_compat import text_type, IS_PY2, decode_text, string_types
 from esphome.util import safe_print, OrderedDict
 
 from typing import List, Optional, Tuple, Union  # noqa
@@ -31,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
 _COMPONENT_CACHE = {}
 
 
-class ComponentManifest(object):
+class ComponentManifest:
     def __init__(self, module, base_components_path, is_core=False, is_platform=False):
         self.module = module
         self._is_core = is_core
@@ -89,7 +86,7 @@ class ComponentManifest(object):
             source_files = core.find_source_files(os.path.join(core_p, 'dummy'))
             ret = {}
             for f in source_files:
-                ret['esphome/core/{}'.format(f)] = os.path.join(core_p, f)
+                ret[f'esphome/core/{f}'] = os.path.join(core_p, f)
             return ret
 
         source_files = core.find_source_files(self.module.__file__)
@@ -101,7 +98,7 @@ class ComponentManifest(object):
             rel = os.path.relpath(full_file, self.base_components_path)
             # Always use / for C++ include names
             rel = rel.replace(os.sep, '/')
-            target_file = 'esphome/components/{}'.format(rel)
+            target_file = f'esphome/components/{rel}'
             ret[target_file] = full_file
         return ret
 
@@ -119,12 +116,6 @@ def _mount_config_dir():
     if not os.path.isdir(custom_path):
         CUSTOM_COMPONENTS_PATH = None
         return
-    init_path = os.path.join(custom_path, '__init__.py')
-    if IS_PY2 and not os.path.isfile(init_path):
-        _LOGGER.warning("Found 'custom_components' folder, but file __init__.py was not found. "
-                        "ESPHome will automatically create it now....")
-        with open(init_path, 'w') as f:
-            f.write('\n')
     if CORE.config_dir not in sys.path:
         sys.path.insert(0, CORE.config_dir)
     CUSTOM_COMPONENTS_PATH = custom_path
@@ -137,7 +128,7 @@ def _lookup_module(domain, is_platform):
     _mount_config_dir()
     # First look for custom_components
     try:
-        module = importlib.import_module('custom_components.{}'.format(domain))
+        module = importlib.import_module(f'custom_components.{domain}')
     except ImportError as e:
         # ImportError when no such module
         if 'No module named' not in str(e):
@@ -153,7 +144,7 @@ def _lookup_module(domain, is_platform):
         return manif
 
     try:
-        module = importlib.import_module('esphome.components.{}'.format(domain))
+        module = importlib.import_module(f'esphome.components.{domain}')
     except ImportError as e:
         if 'No module named' not in str(e):
             _LOGGER.error("Unable to import component %s:", domain, exc_info=True)
@@ -173,7 +164,7 @@ def get_component(domain):
 
 
 def get_platform(domain, platform):
-    full = '{}.{}'.format(platform, domain)
+    full = f'{platform}.{domain}'
     return _lookup_module(full, True)
 
 
@@ -192,7 +183,7 @@ def iter_components(config):
             yield domain, component, conf
         if component.is_platform_component:
             for p_config in conf:
-                p_name = u"{}.{}".format(domain, p_config[CONF_PLATFORM])
+                p_name = "{}.{}".format(domain, p_config[CONF_PLATFORM])
                 platform = get_platform(domain, p_config[CONF_PLATFORM])
                 yield p_name, platform, p_config
 
@@ -208,13 +199,13 @@ def _path_begins_with(path, other):  # type: (ConfigPath, ConfigPath) -> bool
 
 class Config(OrderedDict):
     def __init__(self):
-        super(Config, self).__init__()
+        super().__init__()
         # A list of voluptuous errors
         self.errors = []  # type: List[vol.Invalid]
         # A list of paths that should be fully outputted
         # The values will be the paths to all "domain", for example (['logger'], 'logger')
         # or (['sensor', 'ultrasonic'], 'sensor.ultrasonic')
-        self.output_paths = []  # type: List[Tuple[ConfigPath, unicode]]
+        self.output_paths = []  # type: List[Tuple[ConfigPath, str]]
 
     def add_error(self, error):
         # type: (vol.Invalid) -> None
@@ -234,15 +225,15 @@ class Config(OrderedDict):
             self.add_error(e)
 
     def add_str_error(self, message, path):
-        # type: (basestring, ConfigPath) -> None
+        # type: (str, ConfigPath) -> None
         self.add_error(vol.Invalid(message, path))
 
     def add_output_path(self, path, domain):
-        # type: (ConfigPath, unicode) -> None
+        # type: (ConfigPath, str) -> None
         self.output_paths.append((path, domain))
 
     def remove_output_path(self, path, domain):
-        # type: (ConfigPath, unicode) -> None
+        # type: (ConfigPath, str) -> None
         self.output_paths.remove((path, domain))
 
     def is_in_error_path(self, path):
@@ -312,12 +303,10 @@ def iter_ids(config, path=None):
             yield id, path
     elif isinstance(config, list):
         for i, item in enumerate(config):
-            for result in iter_ids(item, path + [i]):
-                yield result
+            yield from iter_ids(item, path + [i])
     elif isinstance(config, dict):
         for key, value in config.items():
-            for result in iter_ids(value, path + [key]):
-                yield result
+            yield from iter_ids(value, path + [key])
 
 
 def do_id_pass(result):  # type: (Config) -> None
@@ -332,8 +321,8 @@ def do_id_pass(result):  # type: (Config) -> None
                 # Look for duplicate definitions
                 match = next((v for v in declare_ids if v[0].id == id.id), None)
                 if match is not None:
-                    opath = u'->'.join(text_type(v) for v in match[1])
-                    result.add_str_error(u"ID {} redefined! Check {}".format(id.id, opath), path)
+                    opath = '->'.join(str(v) for v in match[1])
+                    result.add_str_error(f"ID {id.id} redefined! Check {opath}", path)
                     continue
             declare_ids.append((id, path))
         else:
@@ -357,8 +346,8 @@ def do_id_pass(result):  # type: (Config) -> None
                 # Find candidates
                 matches = difflib.get_close_matches(id.id, [v[0].id for v in declare_ids])
                 if matches:
-                    matches_s = ', '.join('"{}"'.format(x) for x in matches)
-                    error += " These IDs look similar: {}.".format(matches_s)
+                    matches_s = ', '.join(f'"{x}"' for x in matches)
+                    error += f" These IDs look similar: {matches_s}."
                 result.add_str_error(error, path)
                 continue
             if not isinstance(match.type, MockObjClass) or not isinstance(id.type, MockObjClass):
@@ -377,7 +366,7 @@ def do_id_pass(result):  # type: (Config) -> None
                     id.id = v[0].id
                     break
             else:
-                result.add_str_error("Couldn't resolve ID for type '{}'".format(id.type), path)
+                result.add_str_error(f"Couldn't resolve ID for type '{id.type}'", path)
 
 
 def recursive_check_replaceme(value):
@@ -389,7 +378,7 @@ def recursive_check_replaceme(value):
         return cv.Schema({cv.valid: recursive_check_replaceme})(value)
     if isinstance(value, ESPForceValue):
         pass
-    if isinstance(value, string_types) and value == 'REPLACEME':
+    if isinstance(value, str) and value == 'REPLACEME':
         raise cv.Invalid("Found 'REPLACEME' in configuration, this is most likely an error. "
                          "Please make sure you have replaced all fields from the sample "
                          "configuration.\n"
@@ -455,8 +444,8 @@ def validate_config(config):
 
     while load_queue:
         domain, conf = load_queue.popleft()
-        domain = text_type(domain)
-        if domain.startswith(u'.'):
+        domain = str(domain)
+        if domain.startswith('.'):
             # Ignore top-level keys starting with a dot
             continue
         result.add_output_path([domain], domain)
@@ -464,7 +453,7 @@ def validate_config(config):
         component = get_component(domain)
         path = [domain]
         if component is None:
-            result.add_str_error(u"Component not found: {}".format(domain), path)
+            result.add_str_error(f"Component not found: {domain}", path)
             continue
         CORE.loaded_integrations.add(domain)
 
@@ -492,24 +481,24 @@ def validate_config(config):
         for i, p_config in enumerate(conf):
             path = [domain, i]
             # Construct temporary unknown output path
-            p_domain = u'{}.unknown'.format(domain)
+            p_domain = f'{domain}.unknown'
             result.add_output_path(path, p_domain)
             result[domain][i] = p_config
             if not isinstance(p_config, dict):
-                result.add_str_error(u"Platform schemas must be key-value pairs.", path)
+                result.add_str_error("Platform schemas must be key-value pairs.", path)
                 continue
             p_name = p_config.get('platform')
             if p_name is None:
-                result.add_str_error(u"No platform specified! See 'platform' key.", path)
+                result.add_str_error("No platform specified! See 'platform' key.", path)
                 continue
             # Remove temp output path and construct new one
             result.remove_output_path(path, p_domain)
-            p_domain = u'{}.{}'.format(domain, p_name)
+            p_domain = f'{domain}.{p_name}'
             result.add_output_path(path, p_domain)
             # Try Load platform
             platform = get_platform(domain, p_name)
             if platform is None:
-                result.add_str_error(u"Platform not found: '{}'".format(p_domain), path)
+                result.add_str_error(f"Platform not found: '{p_domain}'", path)
                 continue
             CORE.loaded_integrations.add(p_name)
 
@@ -537,8 +526,8 @@ def validate_config(config):
         success = True
         for dependency in comp.dependencies:
             if dependency not in config:
-                result.add_str_error(u"Component {} requires component {}"
-                                     u"".format(domain, dependency), path)
+                result.add_str_error("Component {} requires component {}"
+                                     "".format(domain, dependency), path)
                 success = False
         if not success:
             continue
@@ -546,22 +535,22 @@ def validate_config(config):
         success = True
         for conflict in comp.conflicts_with:
             if conflict in config:
-                result.add_str_error(u"Component {} cannot be used together with component {}"
-                                     u"".format(domain, conflict), path)
+                result.add_str_error("Component {} cannot be used together with component {}"
+                                     "".format(domain, conflict), path)
                 success = False
         if not success:
             continue
 
         if CORE.esp_platform not in comp.esp_platforms:
-            result.add_str_error(u"Component {} doesn't support {}.".format(domain,
-                                                                            CORE.esp_platform),
+            result.add_str_error("Component {} doesn't support {}.".format(domain,
+                                                                           CORE.esp_platform),
                                  path)
             continue
 
         if not comp.is_platform_component and comp.config_schema is None and \
                 not isinstance(conf, core.AutoLoad):
-            result.add_str_error(u"Component {} cannot be loaded via YAML "
-                                 u"(no CONFIG_SCHEMA).".format(domain), path)
+            result.add_str_error("Component {} cannot be loaded via YAML "
+                                 "(no CONFIG_SCHEMA).".format(domain), path)
             continue
 
         if comp.is_multi_conf:
@@ -611,13 +600,13 @@ def _nested_getitem(data, path):
 
 
 def humanize_error(config, validation_error):
-    validation_error = text_type(validation_error)
+    validation_error = str(validation_error)
     m = re.match(r'^(.*?)\s*(?:for dictionary value )?@ data\[.*$', validation_error, re.DOTALL)
     if m is not None:
         validation_error = m.group(1)
     validation_error = validation_error.strip()
-    if not validation_error.endswith(u'.'):
-        validation_error += u'.'
+    if not validation_error.endswith('.'):
+        validation_error += '.'
     return validation_error
 
 
@@ -634,22 +623,22 @@ def _get_parent_name(path, config):
 
 
 def _format_vol_invalid(ex, config):
-    # type: (vol.Invalid, Config) -> unicode
-    message = u''
+    # type: (vol.Invalid, Config) -> str
+    message = ''
 
     paren = _get_parent_name(ex.path[:-1], config)
 
     if isinstance(ex, ExtraKeysInvalid):
         if ex.candidates:
-            message += u'[{}] is an invalid option for [{}]. Did you mean {}?'.format(
-                ex.path[-1], paren, u', '.join(u'[{}]'.format(x) for x in ex.candidates))
+            message += '[{}] is an invalid option for [{}]. Did you mean {}?'.format(
+                ex.path[-1], paren, ', '.join(f'[{x}]' for x in ex.candidates))
         else:
-            message += u'[{}] is an invalid option for [{}]. Please check the indentation.'.format(
+            message += '[{}] is an invalid option for [{}]. Please check the indentation.'.format(
                 ex.path[-1], paren)
-    elif u'extra keys not allowed' in text_type(ex):
-        message += u'[{}] is an invalid option for [{}].'.format(ex.path[-1], paren)
-    elif u'required key not provided' in text_type(ex):
-        message += u"'{}' is a required option for [{}].".format(ex.path[-1], paren)
+    elif 'extra keys not allowed' in str(ex):
+        message += '[{}] is an invalid option for [{}].'.format(ex.path[-1], paren)
+    elif 'required key not provided' in str(ex):
+        message += "'{}' is a required option for [{}].".format(ex.path[-1], paren)
     else:
         message += humanize_error(config, ex)
 
@@ -662,9 +651,8 @@ class InvalidYAMLError(EsphomeError):
             base = str(base_exc)
         except UnicodeDecodeError:
             base = repr(base_exc)
-        base = decode_text(base)
-        message = u"Invalid YAML syntax:\n\n{}".format(base)
-        super(InvalidYAMLError, self).__init__(message)
+        message = f"Invalid YAML syntax:\n\n{base}"
+        super().__init__(message)
         self.base_exc = base_exc
 
 
@@ -680,7 +668,7 @@ def _load_config():
     except EsphomeError:
         raise
     except Exception:
-        _LOGGER.error(u"Unexpected exception while reading configuration:")
+        _LOGGER.error("Unexpected exception while reading configuration:")
         raise
 
     return result
@@ -690,7 +678,7 @@ def load_config():
     try:
         return _load_config()
     except vol.Invalid as err:
-        raise EsphomeError("Error while parsing config: {}".format(err))
+        raise EsphomeError(f"Error while parsing config: {err}")
 
 
 def line_info(obj, highlight=True):
@@ -699,7 +687,7 @@ def line_info(obj, highlight=True):
         return None
     if isinstance(obj, ESPHomeDataBase) and obj.esp_range is not None:
         mark = obj.esp_range.start_mark
-        source = u"[source {}:{}]".format(mark.document, mark.line + 1)
+        source = "[source {}:{}]".format(mark.document, mark.line + 1)
         return color('cyan', source)
     return None
 
@@ -715,82 +703,82 @@ def _print_on_next_line(obj):
 
 
 def dump_dict(config, path, at_root=True):
-    # type: (Config, ConfigPath, bool) -> Tuple[unicode, bool]
+    # type: (Config, ConfigPath, bool) -> Tuple[str, bool]
     conf = config.get_nested_item(path)
-    ret = u''
+    ret = ''
     multiline = False
 
     if at_root:
         error = config.get_error_for_path(path)
         if error is not None:
-            ret += u'\n' + color('bold_red', _format_vol_invalid(error, config)) + u'\n'
+            ret += '\n' + color('bold_red', _format_vol_invalid(error, config)) + '\n'
 
     if isinstance(conf, (list, tuple)):
         multiline = True
         if not conf:
-            ret += u'[]'
+            ret += '[]'
             multiline = False
 
         for i in range(len(conf)):
             path_ = path + [i]
             error = config.get_error_for_path(path_)
             if error is not None:
-                ret += u'\n' + color('bold_red', _format_vol_invalid(error, config)) + u'\n'
+                ret += '\n' + color('bold_red', _format_vol_invalid(error, config)) + '\n'
 
-            sep = u'- '
+            sep = '- '
             if config.is_in_error_path(path_):
                 sep = color('red', sep)
             msg, _ = dump_dict(config, path_, at_root=False)
             msg = indent(msg)
             inf = line_info(config.get_nested_item(path_), highlight=config.is_in_error_path(path_))
             if inf is not None:
-                msg = inf + u'\n' + msg
+                msg = inf + '\n' + msg
             elif msg:
                 msg = msg[2:]
-            ret += sep + msg + u'\n'
+            ret += sep + msg + '\n'
     elif isinstance(conf, dict):
         multiline = True
         if not conf:
-            ret += u'{}'
+            ret += '{}'
             multiline = False
 
         for k in conf.keys():
             path_ = path + [k]
             error = config.get_error_for_path(path_)
             if error is not None:
-                ret += u'\n' + color('bold_red', _format_vol_invalid(error, config)) + u'\n'
+                ret += '\n' + color('bold_red', _format_vol_invalid(error, config)) + '\n'
 
-            st = u'{}: '.format(k)
+            st = f'{k}: '
             if config.is_in_error_path(path_):
                 st = color('red', st)
             msg, m = dump_dict(config, path_, at_root=False)
 
             inf = line_info(config.get_nested_item(path_), highlight=config.is_in_error_path(path_))
             if m:
-                msg = u'\n' + indent(msg)
+                msg = '\n' + indent(msg)
 
             if inf is not None:
                 if m:
-                    msg = u' ' + inf + msg
+                    msg = ' ' + inf + msg
                 else:
-                    msg = msg + u' ' + inf
-            ret += st + msg + u'\n'
+                    msg = msg + ' ' + inf
+            ret += st + msg + '\n'
     elif isinstance(conf, str):
         if is_secret(conf):
-            conf = u'!secret {}'.format(is_secret(conf))
+            conf = '!secret {}'.format(is_secret(conf))
         if not conf:
-            conf += u"''"
+            conf += "''"
 
         if len(conf) > 80:
-            conf = u'|-\n' + indent(conf)
+            conf = '|-\n' + indent(conf)
         error = config.get_error_for_path(path)
         col = 'bold_red' if error else 'white'
-        ret += color(col, text_type(conf))
+        ret += color(col, str(conf))
     elif isinstance(conf, core.Lambda):
         if is_secret(conf):
-            conf = u'!secret {}'.format(is_secret(conf))
+            conf = '!secret {}'.format(is_secret(conf))
 
-        conf = u'!lambda |-\n' + indent(text_type(conf.value))
+        conf = '!lambda |-\n' + indent(str(conf.value))
         error = config.get_error_for_path(path)
         col = 'bold_red' if error else 'white'
         ret += color(col, conf)
@@ -799,8 +787,8 @@ def dump_dict(config, path, at_root=True):
     else:
         error = config.get_error_for_path(path)
         col = 'bold_red' if error else 'white'
-        ret += color(col, text_type(conf))
-        multiline = u'\n' in ret
+        ret += color(col, str(conf))
+        multiline = '\n' in ret
 
     return ret, multiline
 
@@ -830,20 +818,20 @@ def read_config():
     try:
         res = load_config()
     except EsphomeError as err:
-        _LOGGER.error(u"Error while reading config: %s", err)
+        _LOGGER.error("Error while reading config: %s", err)
         return None
     if res.errors:
         if not CORE.verbose:
             res = strip_default_ids(res)
 
-        safe_print(color('bold_red', u"Failed config"))
+        safe_print(color('bold_red', "Failed config"))
         safe_print('')
         for path, domain in res.output_paths:
             if not res.is_in_error_path(path):
                 continue
 
-            safe_print(color('bold_red', u'{}:'.format(domain)) + u' ' +
-                       (line_info(res.get_nested_item(path)) or u''))
+            safe_print(color('bold_red', f'{domain}:') + ' ' +
+                       (line_info(res.get_nested_item(path)) or ''))
             safe_print(indent(dump_dict(res, path)[0]))
         return None
     return OrderedDict(res)
diff --git a/esphome/config_helpers.py b/esphome/config_helpers.py
index 0c508d2202..dcbcb70efe 100644
--- a/esphome/config_helpers.py
+++ b/esphome/config_helpers.py
@@ -1,22 +1,19 @@
-from __future__ import print_function
-
 import json
 import os
 
 from esphome.core import CORE
 from esphome.helpers import read_file
-from esphome.py_compat import safe_input
 
 
 def read_config_file(path):
-    # type: (basestring) -> unicode
+    # type: (str) -> str
     if CORE.vscode and (not CORE.ace or
                         os.path.abspath(path) == os.path.abspath(CORE.config_path)):
         print(json.dumps({
             'type': 'read_file',
             'path': path,
         }))
-        data = json.loads(safe_input())
+        data = json.loads(input())
         assert data['type'] == 'file_response'
         return data['content']
 
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 88fb55e841..55199e6647 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1,6 +1,4 @@
-# coding=utf-8
 """Helpers for config validation using voluptuous."""
-from __future__ import print_function
 
 import logging
 import os
@@ -20,7 +18,6 @@ from esphome.const import CONF_AVAILABILITY, CONF_COMMAND_TOPIC, CONF_DISCOVERY,
 from esphome.core import CORE, HexInt, IPAddress, Lambda, TimePeriod, TimePeriodMicroseconds, \
     TimePeriodMilliseconds, TimePeriodSeconds, TimePeriodMinutes
 from esphome.helpers import list_starts_with, add_class_to_obj
-from esphome.py_compat import integer_types, string_types, text_type, IS_PY2, decode_text
 from esphome.voluptuous_schema import _Schema
 
 _LOGGER = logging.getLogger(__name__)
@@ -43,7 +40,7 @@ ALLOW_EXTRA = vol.ALLOW_EXTRA
 UNDEFINED = vol.UNDEFINED
 RequiredFieldInvalid = vol.RequiredFieldInvalid
 
-ALLOWED_NAME_CHARS = u'abcdefghijklmnopqrstuvwxyz0123456789_'
+ALLOWED_NAME_CHARS = 'abcdefghijklmnopqrstuvwxyz0123456789_'
 
 RESERVED_IDS = [
     # C++ keywords http://en.cppreference.com/w/cpp/keyword
@@ -82,7 +79,7 @@ class Optional(vol.Optional):
     """
 
     def __init__(self, key, default=UNDEFINED):
-        super(Optional, self).__init__(key, default=default)
+        super().__init__(key, default=default)
 
 
 class Required(vol.Required):
@@ -94,7 +91,7 @@ class Required(vol.Required):
     """
 
     def __init__(self, key):
-        super(Required, self).__init__(key)
+        super().__init__(key)
 
 
 def check_not_templatable(value):
@@ -105,7 +102,7 @@ def check_not_templatable(value):
 def alphanumeric(value):
     if value is None:
         raise Invalid("string value is None")
-    value = text_type(value)
+    value = str(value)
     if not value.isalnum():
         raise Invalid("string value is not alphanumeric")
     return value
@@ -115,8 +112,8 @@ def valid_name(value):
     value = string_strict(value)
     for c in value:
         if c not in ALLOWED_NAME_CHARS:
-            raise Invalid(u"'{}' is an invalid character for names. Valid characters are: {}"
-                          u" (lowercase, no spaces)".format(c, ALLOWED_NAME_CHARS))
+            raise Invalid(f"'{c}' is an invalid character for names. Valid characters are: "
+                          f"{ALLOWED_NAME_CHARS} (lowercase, no spaces)")
     return value
 
 
@@ -131,10 +128,10 @@ def string(value):
         raise Invalid("string value cannot be dictionary or list.")
     if isinstance(value, bool):
         raise Invalid("Auto-converted this value to boolean, please wrap the value in quotes.")
-    if isinstance(value, text_type):
+    if isinstance(value, str):
         return value
     if value is not None:
-        return text_type(value)
+        return str(value)
     raise Invalid("string value is None")
 
 
@@ -142,10 +139,8 @@ def string_strict(value):
     """Like string, but only allows strings, and does not automatically convert other types to
     strings."""
     check_not_templatable(value)
-    if isinstance(value, text_type):
+    if isinstance(value, str):
         return value
-    if isinstance(value, string_types):
-        return text_type(value)
     raise Invalid("Must be string, got {}. did you forget putting quotes "
                   "around the value?".format(type(value)))
 
@@ -172,14 +167,14 @@ def boolean(value):
     check_not_templatable(value)
     if isinstance(value, bool):
         return value
-    if isinstance(value, string_types):
+    if isinstance(value, str):
         value = value.lower()
         if value in ('true', 'yes', 'on', 'enable'):
             return True
         if value in ('false', 'no', 'off', 'disable'):
             return False
-    raise Invalid(u"Expected boolean value, but cannot convert {} to a boolean. "
-                  u"Please use 'true' or 'false'".format(value))
+    raise Invalid("Expected boolean value, but cannot convert {} to a boolean. "
+                  "Please use 'true' or 'false'".format(value))
 
 
 def ensure_list(*validators):
@@ -228,7 +223,7 @@ def int_(value):
     Automatically also converts strings to ints.
     """
     check_not_templatable(value)
-    if isinstance(value, integer_types):
+    if isinstance(value, int):
         return value
     if isinstance(value, float):
         if int(value) == value:
@@ -242,15 +237,15 @@ def int_(value):
     try:
         return int(value, base)
     except ValueError:
-        raise Invalid(u"Expected integer, but cannot parse {} as an integer".format(value))
+        raise Invalid(f"Expected integer, but cannot parse {value} as an integer")
 
 
 def int_range(min=None, max=None, min_included=True, max_included=True):
     """Validate that the config option is an integer in the given range."""
     if min is not None:
-        assert isinstance(min, integer_types)
+        assert isinstance(min, int)
     if max is not None:
-        assert isinstance(max, integer_types)
+        assert isinstance(max, int)
     return All(int_, Range(min=min, max=max, min_included=min_included, max_included=max_included))
 
 
@@ -291,14 +286,14 @@ def validate_id_name(value):
     valid_chars = ascii_letters + digits + '_'
     for char in value:
         if char not in valid_chars:
-            raise Invalid(u"IDs must only consist of upper/lowercase characters, the underscore"
-                          u"character and numbers. The character '{}' cannot be used"
-                          u"".format(char))
+            raise Invalid("IDs must only consist of upper/lowercase characters, the underscore"
+                          "character and numbers. The character '{}' cannot be used"
+                          "".format(char))
     if value in RESERVED_IDS:
-        raise Invalid(u"ID '{}' is reserved internally and cannot be used".format(value))
+        raise Invalid(f"ID '{value}' is reserved internally and cannot be used")
     if value in CORE.loaded_integrations:
-        raise Invalid(u"ID '{}' conflicts with the name of an esphome integration, please use "
-                      u"another ID name.".format(value))
+        raise Invalid("ID '{}' conflicts with the name of an esphome integration, please use "
+                      "another ID name.".format(value))
     return value
 
 
@@ -358,7 +353,7 @@ def only_on(platforms):
 
     def validator_(obj):
         if CORE.esp_platform not in platforms:
-            raise Invalid(u"This feature is only available on {}".format(platforms))
+            raise Invalid(f"This feature is only available on {platforms}")
         return obj
 
     return validator_
@@ -463,7 +458,7 @@ def time_period_str_unit(value):
                       "'{0}s'?".format(value))
     if isinstance(value, TimePeriod):
         value = str(value)
-    if not isinstance(value, string_types):
+    if not isinstance(value, str):
         raise Invalid("Expected string for time period with unit.")
 
     unit_to_kwarg = {
@@ -485,8 +480,8 @@ def time_period_str_unit(value):
     match = re.match(r"^([-+]?[0-9]*\.?[0-9]*)\s*(\w*)$", value)
 
     if match is None:
-        raise Invalid(u"Expected time period with unit, "
-                      u"got {}".format(value))
+        raise Invalid("Expected time period with unit, "
+                      "got {}".format(value))
     kwarg = unit_to_kwarg[one_of(*unit_to_kwarg)(match.group(2))]
 
     return TimePeriod(**{kwarg: float(match.group(1))})
@@ -545,7 +540,7 @@ def time_of_day(value):
         try:
             date = datetime.strptime(value, '%H:%M:%S %p')
         except ValueError:
-            raise Invalid("Invalid time of day: {}".format(err))
+            raise Invalid(f"Invalid time of day: {err}")
 
     return {
         CONF_HOUR: date.hour,
@@ -577,7 +572,7 @@ def uuid(value):
 
 METRIC_SUFFIXES = {
     'E': 1e18, 'P': 1e15, 'T': 1e12, 'G': 1e9, 'M': 1e6, 'k': 1e3, 'da': 10, 'd': 1e-1,
-    'c': 1e-2, 'm': 0.001, u'µ': 1e-6, 'u': 1e-6, 'n': 1e-9, 'p': 1e-12, 'f': 1e-15, 'a': 1e-18,
+    'c': 1e-2, 'm': 0.001, 'µ': 1e-6, 'u': 1e-6, 'n': 1e-9, 'p': 1e-12, 'f': 1e-15, 'a': 1e-18,
     '': 1
 }
 
@@ -594,11 +589,11 @@ def float_with_unit(quantity, regex_suffix, optional_unit=False):
         match = pattern.match(string(value))
 
         if match is None:
-            raise Invalid(u"Expected {} with unit, got {}".format(quantity, value))
+            raise Invalid(f"Expected {quantity} with unit, got {value}")
 
         mantissa = float(match.group(1))
         if match.group(2) not in METRIC_SUFFIXES:
-            raise Invalid(u"Invalid {} suffix {}".format(quantity, match.group(2)))
+            raise Invalid("Invalid {} suffix {}".format(quantity, match.group(2)))
 
         multiplier = METRIC_SUFFIXES[match.group(2)]
         return mantissa * multiplier
@@ -606,30 +601,17 @@ def float_with_unit(quantity, regex_suffix, optional_unit=False):
     return validator
 
 
-frequency = float_with_unit("frequency", u"(Hz|HZ|hz)?")
-resistance = float_with_unit("resistance", u"(Ω|Ω|ohm|Ohm|OHM)?")
-current = float_with_unit("current", u"(a|A|amp|Amp|amps|Amps|ampere|Ampere)?")
-voltage = float_with_unit("voltage", u"(v|V|volt|Volts)?")
-distance = float_with_unit("distance", u"(m)")
-framerate = float_with_unit("framerate", u"(FPS|fps|Fps|FpS|Hz)")
-angle = float_with_unit("angle", u"(°|deg)", optional_unit=True)
-_temperature_c = float_with_unit("temperature", u"(°C|° C|°|C)?")
-_temperature_k = float_with_unit("temperature", u"(° K|° K|K)?")
-_temperature_f = float_with_unit("temperature", u"(°F|° F|F)?")
-decibel = float_with_unit("decibel", u"(dB|dBm|db|dbm)", optional_unit=True)
-
-if IS_PY2:
-    # Override voluptuous invalid to unicode for py2
-    def _vol_invalid_unicode(self):
-        path = u' @ data[%s]' % u']['.join(map(repr, self.path)) \
-            if self.path else u''
-        # pylint: disable=no-member
-        output = decode_text(self.message)
-        if self.error_type:
-            output += u' for ' + self.error_type
-        return output + path
-
-    Invalid.__unicode__ = _vol_invalid_unicode
+frequency = float_with_unit("frequency", "(Hz|HZ|hz)?")
+resistance = float_with_unit("resistance", "(Ω|Ω|ohm|Ohm|OHM)?")
+current = float_with_unit("current", "(a|A|amp|Amp|amps|Amps|ampere|Ampere)?")
+voltage = float_with_unit("voltage", "(v|V|volt|Volts)?")
+distance = float_with_unit("distance", "(m)")
+framerate = float_with_unit("framerate", "(FPS|fps|Fps|FpS|Hz)")
+angle = float_with_unit("angle", "(°|deg)", optional_unit=True)
+_temperature_c = float_with_unit("temperature", "(°C|° C|°|C)?")
+_temperature_k = float_with_unit("temperature", "(° K|° K|K)?")
+_temperature_f = float_with_unit("temperature", "(°F|° F|F)?")
+decibel = float_with_unit("decibel", "(dB|dBm|db|dbm)", optional_unit=True)
 
 
 def temperature(value):
@@ -672,15 +654,15 @@ def validate_bytes(value):
     match = re.match(r"^([0-9]+)\s*(\w*?)(?:byte|B|b)?s?$", value)
 
     if match is None:
-        raise Invalid(u"Expected number of bytes with unit, got {}".format(value))
+        raise Invalid(f"Expected number of bytes with unit, got {value}")
 
     mantissa = int(match.group(1))
     if match.group(2) not in METRIC_SUFFIXES:
-        raise Invalid(u"Invalid metric suffix {}".format(match.group(2)))
+        raise Invalid("Invalid metric suffix {}".format(match.group(2)))
     multiplier = METRIC_SUFFIXES[match.group(2)]
     if multiplier < 1:
-        raise Invalid(u"Only suffixes with positive exponents are supported. "
-                      u"Got {}".format(match.group(2)))
+        raise Invalid("Only suffixes with positive exponents are supported. "
+                      "Got {}".format(match.group(2)))
     return int(mantissa * multiplier)
 
 
@@ -701,7 +683,7 @@ def domain(value):
     try:
         return str(ipv4(value))
     except Invalid:
-        raise Invalid("Invalid domain: {}".format(value))
+        raise Invalid(f"Invalid domain: {value}")
 
 
 def domain_name(value):
@@ -730,7 +712,7 @@ def ssid(value):
 def ipv4(value):
     if isinstance(value, list):
         parts = value
-    elif isinstance(value, string_types):
+    elif isinstance(value, str):
         parts = value.split('.')
     elif isinstance(value, IPAddress):
         return value
@@ -806,7 +788,7 @@ def mqtt_qos(value):
     try:
         value = int(value)
     except (TypeError, ValueError):
-        raise Invalid(u"MQTT Quality of Service must be integer, got {}".format(value))
+        raise Invalid(f"MQTT Quality of Service must be integer, got {value}")
     return one_of(0, 1, 2)(value)
 
 
@@ -814,7 +796,7 @@ def requires_component(comp):
     """Validate that this option can only be specified when the component `comp` is loaded."""
     def validator(value):
         if comp not in CORE.raw_config:
-            raise Invalid("This option requires component {}".format(comp))
+            raise Invalid(f"This option requires component {comp}")
         return value
 
     return validator
@@ -839,7 +821,7 @@ def percentage(value):
 
 
 def possibly_negative_percentage(value):
-    has_percent_sign = isinstance(value, string_types) and value.endswith('%')
+    has_percent_sign = isinstance(value, str) and value.endswith('%')
     if has_percent_sign:
         value = float(value[:-1].rstrip()) / 100.0
     if value > 1:
@@ -856,7 +838,7 @@ def possibly_negative_percentage(value):
 
 
 def percentage_int(value):
-    if isinstance(value, string_types) and value.endswith('%'):
+    if isinstance(value, str) and value.endswith('%'):
         value = int(value[:-1].rstrip())
     return value
 
@@ -916,7 +898,7 @@ def one_of(*values, **kwargs):
       - *float* (``bool``, default=False): Whether to convert the incoming values to floats.
       - *space* (``str``, default=' '): What to convert spaces in the input string to.
     """
-    options = u', '.join(u"'{}'".format(x) for x in values)
+    options = ', '.join(f"'{x}'" for x in values)
     lower = kwargs.pop('lower', False)
     upper = kwargs.pop('upper', False)
     string_ = kwargs.pop('string', False) or lower or upper
@@ -940,13 +922,13 @@ def one_of(*values, **kwargs):
             value = Upper(value)
         if value not in values:
             import difflib
-            options_ = [text_type(x) for x in values]
-            option = text_type(value)
+            options_ = [str(x) for x in values]
+            option = str(value)
             matches = difflib.get_close_matches(option, options_)
             if matches:
-                raise Invalid(u"Unknown value '{}', did you mean {}?"
-                              u"".format(value, u", ".join(u"'{}'".format(x) for x in matches)))
-            raise Invalid(u"Unknown value '{}', valid options are {}.".format(value, options))
+                raise Invalid("Unknown value '{}', did you mean {}?"
+                              "".format(value, ", ".join(f"'{x}'" for x in matches)))
+            raise Invalid(f"Unknown value '{value}', valid options are {options}.")
         return value
 
     return validator
@@ -996,7 +978,7 @@ def returning_lambda(value):
     Additionally, make sure the lambda returns something.
     """
     value = lambda_(value)
-    if u'return' not in value.value:
+    if 'return' not in value.value:
         raise Invalid("Lambda doesn't contain a 'return' statement, but the lambda "
                       "is expected to return a value. \n"
                       "Please make sure the lambda contains at least one "
@@ -1007,24 +989,23 @@ def returning_lambda(value):
 def dimensions(value):
     if isinstance(value, list):
         if len(value) != 2:
-            raise Invalid(u"Dimensions must have a length of two, not {}".format(len(value)))
+            raise Invalid("Dimensions must have a length of two, not {}".format(len(value)))
         try:
             width, height = int(value[0]), int(value[1])
         except ValueError:
-            raise Invalid(u"Width and height dimensions must be integers")
+            raise Invalid("Width and height dimensions must be integers")
         if width <= 0 or height <= 0:
-            raise Invalid(u"Width and height must at least be 1")
+            raise Invalid("Width and height must at least be 1")
         return [width, height]
     value = string(value)
     match = re.match(r"\s*([0-9]+)\s*[xX]\s*([0-9]+)\s*", value)
     if not match:
-        raise Invalid(u"Invalid value '{}' for dimensions. Only WIDTHxHEIGHT is allowed.")
+        raise Invalid("Invalid value '{}' for dimensions. Only WIDTHxHEIGHT is allowed.")
     return dimensions([match.group(1), match.group(2)])
 
 
 def directory(value):
     import json
-    from esphome.py_compat import safe_input
     value = string(value)
     path = CORE.relative_config_path(value)
 
@@ -1034,25 +1015,24 @@ def directory(value):
             'type': 'check_directory_exists',
             'path': path,
         }))
-        data = json.loads(safe_input())
+        data = json.loads(input())
         assert data['type'] == 'directory_exists_response'
         if data['content']:
             return value
-        raise Invalid(u"Could not find directory '{}'. Please make sure it exists (full path: {})."
-                      u"".format(path, os.path.abspath(path)))
+        raise Invalid("Could not find directory '{}'. Please make sure it exists (full path: {})."
+                      "".format(path, os.path.abspath(path)))
 
     if not os.path.exists(path):
-        raise Invalid(u"Could not find directory '{}'. Please make sure it exists (full path: {})."
-                      u"".format(path, os.path.abspath(path)))
+        raise Invalid("Could not find directory '{}'. Please make sure it exists (full path: {})."
+                      "".format(path, os.path.abspath(path)))
     if not os.path.isdir(path):
-        raise Invalid(u"Path '{}' is not a directory (full path: {})."
-                      u"".format(path, os.path.abspath(path)))
+        raise Invalid("Path '{}' is not a directory (full path: {})."
+                      "".format(path, os.path.abspath(path)))
     return value
 
 
 def file_(value):
     import json
-    from esphome.py_compat import safe_input
     value = string(value)
     path = CORE.relative_config_path(value)
 
@@ -1062,19 +1042,19 @@ def file_(value):
             'type': 'check_file_exists',
             'path': path,
         }))
-        data = json.loads(safe_input())
+        data = json.loads(input())
         assert data['type'] == 'file_exists_response'
         if data['content']:
             return value
-        raise Invalid(u"Could not find file '{}'. Please make sure it exists (full path: {})."
-                      u"".format(path, os.path.abspath(path)))
+        raise Invalid("Could not find file '{}'. Please make sure it exists (full path: {})."
+                      "".format(path, os.path.abspath(path)))
 
     if not os.path.exists(path):
-        raise Invalid(u"Could not find file '{}'. Please make sure it exists (full path: {})."
-                      u"".format(path, os.path.abspath(path)))
+        raise Invalid("Could not find file '{}'. Please make sure it exists (full path: {})."
+                      "".format(path, os.path.abspath(path)))
     if not os.path.isfile(path):
-        raise Invalid(u"Path '{}' is not a file (full path: {})."
-                      u"".format(path, os.path.abspath(path)))
+        raise Invalid("Path '{}' is not a file (full path: {})."
+                      "".format(path, os.path.abspath(path)))
     return value
 
 
@@ -1092,7 +1072,7 @@ def entity_id(value):
     for x in value.split('.'):
         for c in x:
             if c not in ENTITY_ID_CHARACTERS:
-                raise Invalid("Invalid character for entity ID: {}".format(c))
+                raise Invalid(f"Invalid character for entity ID: {c}")
     return value
 
 
@@ -1103,9 +1083,9 @@ def extract_keys(schema):
     assert isinstance(schema, dict)
     keys = []
     for skey in list(schema.keys()):
-        if isinstance(skey, string_types):
+        if isinstance(skey, str):
             keys.append(skey)
-        elif isinstance(skey, vol.Marker) and isinstance(skey.schema, string_types):
+        elif isinstance(skey, vol.Marker) and isinstance(skey.schema, str):
             keys.append(skey.schema)
         else:
             raise ValueError()
@@ -1136,14 +1116,14 @@ class GenerateID(Optional):
     """Mark this key as being an auto-generated ID key."""
 
     def __init__(self, key=CONF_ID):
-        super(GenerateID, self).__init__(key, default=lambda: None)
+        super().__init__(key, default=lambda: None)
 
 
 class SplitDefault(Optional):
     """Mark this key to have a split default for ESP8266/ESP32."""
 
     def __init__(self, key, esp8266=vol.UNDEFINED, esp32=vol.UNDEFINED):
-        super(SplitDefault, self).__init__(key)
+        super().__init__(key)
         self._esp8266_default = vol.default_factory(esp8266)
         self._esp32_default = vol.default_factory(esp32)
 
@@ -1165,7 +1145,7 @@ class OnlyWith(Optional):
     """Set the default value only if the given component is loaded."""
 
     def __init__(self, key, component, default=None):
-        super(OnlyWith, self).__init__(key)
+        super().__init__(key)
         self._component = component
         self._default = vol.default_factory(default)
 
@@ -1207,21 +1187,21 @@ def validate_registry_entry(name, registry):
     ignore_keys = extract_keys(base_schema)
 
     def validator(value):
-        if isinstance(value, string_types):
+        if isinstance(value, str):
             value = {value: {}}
         if not isinstance(value, dict):
-            raise Invalid(u"{} must consist of key-value mapping! Got {}"
-                          u"".format(name.title(), value))
+            raise Invalid("{} must consist of key-value mapping! Got {}"
+                          "".format(name.title(), value))
         key = next((x for x in value if x not in ignore_keys), None)
         if key is None:
-            raise Invalid(u"Key missing from {}! Got {}".format(name, value))
+            raise Invalid(f"Key missing from {name}! Got {value}")
         if key not in registry:
-            raise Invalid(u"Unable to find {} with the name '{}'".format(name, key), [key])
+            raise Invalid(f"Unable to find {name} with the name '{key}'", [key])
         key2 = next((x for x in value if x != key and x not in ignore_keys), None)
         if key2 is not None:
-            raise Invalid(u"Cannot have two {0}s in one item. Key '{1}' overrides '{2}'! "
-                          u"Did you forget to indent the block inside the {0}?"
-                          u"".format(name, key, key2))
+            raise Invalid("Cannot have two {0}s in one item. Key '{1}' overrides '{2}'! "
+                          "Did you forget to indent the block inside the {0}?"
+                          "".format(name, key, key2))
 
         if value[key] is None:
             value[key] = {}
@@ -1296,7 +1276,7 @@ def polling_component_schema(default_update_interval):
         return COMPONENT_SCHEMA.extend({
             Required(CONF_UPDATE_INTERVAL): default_update_interval,
         })
-    assert isinstance(default_update_interval, string_types)
+    assert isinstance(default_update_interval, str)
     return COMPONENT_SCHEMA.extend({
         Optional(CONF_UPDATE_INTERVAL, default=default_update_interval): update_interval,
     })
diff --git a/esphome/const.py b/esphome/const.py
index 0790a49552..8a45f27880 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,17 +1,16 @@
-# coding=utf-8
 """Constants used by esphome."""
 
 MAJOR_VERSION = 1
 MINOR_VERSION = 15
 PATCH_VERSION = '0-dev'
-__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
-__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
+__short_version__ = f'{MAJOR_VERSION}.{MINOR_VERSION}'
+__version__ = f'{__short_version__}.{PATCH_VERSION}'
 
 ESP_PLATFORM_ESP32 = 'ESP32'
 ESP_PLATFORM_ESP8266 = 'ESP8266'
 ESP_PLATFORMS = [ESP_PLATFORM_ESP32, ESP_PLATFORM_ESP8266]
 
-ALLOWED_NAME_CHARS = u'abcdefghijklmnopqrstuvwxyz0123456789_'
+ALLOWED_NAME_CHARS = 'abcdefghijklmnopqrstuvwxyz0123456789_'
 ARDUINO_VERSION_ESP32_DEV = 'https://github.com/platformio/platform-espressif32.git#feature/stage'
 ARDUINO_VERSION_ESP32_1_0_0 = 'espressif32@1.5.0'
 ARDUINO_VERSION_ESP32_1_0_1 = 'espressif32@1.6.0'
@@ -544,12 +543,12 @@ ICON_WEATHER_WINDY = 'mdi:weather-windy'
 ICON_WIFI = 'mdi:wifi'
 
 UNIT_AMPERE = 'A'
-UNIT_CELSIUS = u'°C'
-UNIT_COUNTS_PER_CUBIC_METER = u'#/m³'
+UNIT_CELSIUS = '°C'
+UNIT_COUNTS_PER_CUBIC_METER = '#/m³'
 UNIT_DECIBEL = 'dB'
 UNIT_DECIBEL_MILLIWATT = 'dBm'
-UNIT_DEGREE_PER_SECOND = u'°/s'
-UNIT_DEGREES = u'°'
+UNIT_DEGREE_PER_SECOND = '°/s'
+UNIT_DEGREES = '°'
 UNIT_EMPTY = ''
 UNIT_G = 'G'
 UNIT_HECTOPASCAL = 'hPa'
@@ -559,12 +558,12 @@ UNIT_KILOMETER = 'km'
 UNIT_KILOMETER_PER_HOUR = 'km/h'
 UNIT_LUX = 'lx'
 UNIT_METER = 'm'
-UNIT_METER_PER_SECOND_SQUARED = u'm/s²'
-UNIT_MICROGRAMS_PER_CUBIC_METER = u'µg/m³'
+UNIT_METER_PER_SECOND_SQUARED = 'm/s²'
+UNIT_MICROGRAMS_PER_CUBIC_METER = 'µg/m³'
 UNIT_MICROMETER = 'µm'
-UNIT_MICROSIEMENS_PER_CENTIMETER = u'µS/cm'
-UNIT_MICROTESLA = u'µT'
-UNIT_OHM = u'Ω'
+UNIT_MICROSIEMENS_PER_CENTIMETER = 'µS/cm'
+UNIT_MICROTESLA = 'µT'
+UNIT_OHM = 'Ω'
 UNIT_PARTS_PER_BILLION = 'ppb'
 UNIT_PARTS_PER_MILLION = 'ppm'
 UNIT_PERCENT = '%'
diff --git a/esphome/core.py b/esphome/core.py
index 9df30384bc..96447e560d 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -13,7 +13,6 @@ from typing import Any, Dict, List, Optional, Set  # noqa
 from esphome.const import CONF_ARDUINO_VERSION, SOURCE_FILE_EXTENSIONS, \
     CONF_COMMENT, CONF_ESPHOME, CONF_USE_ADDRESS, CONF_WIFI
 from esphome.helpers import ensure_unique_string, is_hassio
-from esphome.py_compat import IS_PY2, integer_types, text_type, string_types
 from esphome.util import OrderedDict
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,53 +22,47 @@ class EsphomeError(Exception):
     """General ESPHome exception occurred."""
 
 
-if IS_PY2:
-    base_int = long
-else:
-    base_int = int
-
-
-class HexInt(base_int):
+class HexInt(int):
     def __str__(self):
         if 0 <= self <= 255:
-            return "0x{:02X}".format(self)
-        return "0x{:X}".format(self)
+            return f"0x{self:02X}"
+        return f"0x{self:X}"
 
 
-class IPAddress(object):
+class IPAddress:
     def __init__(self, *args):
         if len(args) != 4:
-            raise ValueError(u"IPAddress must consist up 4 items")
+            raise ValueError("IPAddress must consist up 4 items")
         self.args = args
 
     def __str__(self):
         return '.'.join(str(x) for x in self.args)
 
 
-class MACAddress(object):
+class MACAddress:
     def __init__(self, *parts):
         if len(parts) != 6:
-            raise ValueError(u"MAC Address must consist of 6 items")
+            raise ValueError("MAC Address must consist of 6 items")
         self.parts = parts
 
     def __str__(self):
-        return ':'.join('{:02X}'.format(part) for part in self.parts)
+        return ':'.join(f'{part:02X}' for part in self.parts)
 
     @property
     def as_hex(self):
         from esphome.cpp_generator import RawExpression
 
-        num = ''.join('{:02X}'.format(part) for part in self.parts)
-        return RawExpression('0x{}ULL'.format(num))
+        num = ''.join(f'{part:02X}' for part in self.parts)
+        return RawExpression(f'0x{num}ULL')
 
 
 def is_approximately_integer(value):
-    if isinstance(value, integer_types):
+    if isinstance(value, int):
         return True
     return abs(value - round(value)) < 0.001
 
 
-class TimePeriod(object):
+class TimePeriod:
     def __init__(self, microseconds=None, milliseconds=None, seconds=None,
                  minutes=None, hours=None, days=None):
         if days is not None:
@@ -137,17 +130,17 @@ class TimePeriod(object):
 
     def __str__(self):
         if self.microseconds is not None:
-            return '{}us'.format(self.total_microseconds)
+            return f'{self.total_microseconds}us'
         if self.milliseconds is not None:
-            return '{}ms'.format(self.total_milliseconds)
+            return f'{self.total_milliseconds}ms'
         if self.seconds is not None:
-            return '{}s'.format(self.total_seconds)
+            return f'{self.total_seconds}s'
         if self.minutes is not None:
-            return '{}min'.format(self.total_minutes)
+            return f'{self.total_minutes}min'
         if self.hours is not None:
-            return '{}h'.format(self.total_hours)
+            return f'{self.total_hours}h'
         if self.days is not None:
-            return '{}d'.format(self.total_days)
+            return f'{self.total_days}d'
         return '0s'
 
     @property
@@ -224,7 +217,7 @@ class TimePeriodMinutes(TimePeriod):
 LAMBDA_PROG = re.compile(r'id\(\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*\)(\.?)')
 
 
-class Lambda(object):
+class Lambda:
     def __init__(self, value):
         # pylint: disable=protected-access
         if isinstance(value, Lambda):
@@ -260,10 +253,10 @@ class Lambda(object):
         return self.value
 
     def __repr__(self):
-        return u'Lambda<{}>'.format(self.value)
+        return f'Lambda<{self.value}>'
 
 
-class ID(object):
+class ID:
     def __init__(self, id, is_declaration=False, type=None, is_manual=None):
         self.id = id
         if is_manual is None:
@@ -289,7 +282,7 @@ class ID(object):
         return self.id
 
     def __repr__(self):
-        return u'ID<{} declaration={}, type={}, manual={}>'.format(
+        return 'ID<{} declaration={}, type={}, manual={}>'.format(
             self.id, self.is_declaration, self.type, self.is_manual)
 
     def __eq__(self, other):
@@ -305,10 +298,10 @@ class ID(object):
                   is_manual=self.is_manual)
 
 
-class DocumentLocation(object):
+class DocumentLocation:
     def __init__(self, document, line, column):
-        # type: (basestring, int, int) -> None
-        self.document = document  # type: basestring
+        # type: (str, int, int) -> None
+        self.document = document  # type: str
         self.line = line  # type: int
         self.column = column  # type: int
 
@@ -321,10 +314,10 @@ class DocumentLocation(object):
         )
 
     def __str__(self):
-        return u'{} {}:{}'.format(self.document, self.line, self.column)
+        return f'{self.document} {self.line}:{self.column}'
 
 
-class DocumentRange(object):
+class DocumentRange:
     def __init__(self, start_mark, end_mark):
         # type: (DocumentLocation, DocumentLocation) -> None
         self.start_mark = start_mark  # type: DocumentLocation
@@ -338,10 +331,10 @@ class DocumentRange(object):
         )
 
     def __str__(self):
-        return u'[{} - {}]'.format(self.start_mark, self.end_mark)
+        return f'[{self.start_mark} - {self.end_mark}]'
 
 
-class Define(object):
+class Define:
     def __init__(self, name, value=None):
         self.name = name
         self.value = value
@@ -349,14 +342,14 @@ class Define(object):
     @property
     def as_build_flag(self):
         if self.value is None:
-            return u'-D{}'.format(self.name)
-        return u'-D{}={}'.format(self.name, self.value)
+            return f'-D{self.name}'
+        return f'-D{self.name}={self.value}'
 
     @property
     def as_macro(self):
         if self.value is None:
-            return u'#define {}'.format(self.name)
-        return u'#define {} {}'.format(self.name, self.value)
+            return f'#define {self.name}'
+        return f'#define {self.name} {self.value}'
 
     @property
     def as_tuple(self):
@@ -369,7 +362,7 @@ class Define(object):
         return isinstance(self, type(other)) and self.as_tuple == other.as_tuple
 
 
-class Library(object):
+class Library:
     def __init__(self, name, version):
         self.name = name
         self.version = version
@@ -378,7 +371,7 @@ class Library(object):
     def as_lib_dep(self):
         if self.version is None:
             return self.name
-        return u'{}@{}'.format(self.name, self.version)
+        return f'{self.name}@{self.version}'
 
     @property
     def as_tuple(self):
@@ -461,7 +454,7 @@ def find_source_files(file):
 
 
 # pylint: disable=too-many-instance-attributes,too-many-public-methods
-class EsphomeCore(object):
+class EsphomeCore:
     def __init__(self):
         # True if command is run from dashboard
         self.dashboard = False
@@ -499,7 +492,7 @@ class EsphomeCore(object):
         # A set of build flags to set in the platformio project
         self.build_flags = set()  # type: Set[str]
         # A set of defines to set for the compile process in esphome/core/defines.h
-        self.defines = set()  # type: Set[Define]
+        self.defines = set()  # type: Set['Define']
         # A dictionary of started coroutines, used to warn when a coroutine was not
         # awaited.
         self.active_coroutines = {}  # type: Dict[int, Any]
@@ -634,15 +627,15 @@ class EsphomeCore(object):
 
         # Print not-awaited coroutines
         for obj in self.active_coroutines.values():
-            _LOGGER.warning(u"Coroutine '%s' %s was never awaited with 'yield'.", obj.__name__, obj)
-            _LOGGER.warning(u"Please file a bug report with your configuration.")
+            _LOGGER.warning("Coroutine '%s' %s was never awaited with 'yield'.", obj.__name__, obj)
+            _LOGGER.warning("Please file a bug report with your configuration.")
         if self.active_coroutines:
             raise EsphomeError()
         if self.component_ids:
-            comps = u', '.join(u"'{}'".format(x) for x in self.component_ids)
-            _LOGGER.warning(u"Components %s were never registered. Please create a bug report",
+            comps = ', '.join(f"'{x}'" for x in self.component_ids)
+            _LOGGER.warning("Components %s were never registered. Please create a bug report",
                             comps)
-            _LOGGER.warning(u"with your configuration.")
+            _LOGGER.warning("with your configuration.")
             raise EsphomeError()
         self.active_coroutines.clear()
 
@@ -652,8 +645,8 @@ class EsphomeCore(object):
         if isinstance(expression, Expression):
             expression = statement(expression)
         if not isinstance(expression, Statement):
-            raise ValueError(u"Add '{}' must be expression or statement, not {}"
-                             u"".format(expression, type(expression)))
+            raise ValueError("Add '{}' must be expression or statement, not {}"
+                             "".format(expression, type(expression)))
 
         self.main_statements.append(expression)
         _LOGGER.debug("Adding: %s", expression)
@@ -665,16 +658,16 @@ class EsphomeCore(object):
         if isinstance(expression, Expression):
             expression = statement(expression)
         if not isinstance(expression, Statement):
-            raise ValueError(u"Add '{}' must be expression or statement, not {}"
-                             u"".format(expression, type(expression)))
+            raise ValueError("Add '{}' must be expression or statement, not {}"
+                             "".format(expression, type(expression)))
         self.global_statements.append(expression)
         _LOGGER.debug("Adding global: %s", expression)
         return expression
 
     def add_library(self, library):
         if not isinstance(library, Library):
-            raise ValueError(u"Library {} must be instance of Library, not {}"
-                             u"".format(library, type(library)))
+            raise ValueError("Library {} must be instance of Library, not {}"
+                             "".format(library, type(library)))
         _LOGGER.debug("Adding library: %s", library)
         for other in self.libraries[:]:
             if other.name != library.name:
@@ -689,9 +682,9 @@ class EsphomeCore(object):
             if other.version == library.version:
                 break
 
-            raise ValueError(u"Version pinning failed! Libraries {} and {} "
-                             u"requested with conflicting versions!"
-                             u"".format(library, other))
+            raise ValueError("Version pinning failed! Libraries {} and {} "
+                             "requested with conflicting versions!"
+                             "".format(library, other))
         else:
             self.libraries.append(library)
         return library
@@ -702,20 +695,20 @@ class EsphomeCore(object):
         return build_flag
 
     def add_define(self, define):
-        if isinstance(define, string_types):
+        if isinstance(define, str):
             define = Define(define)
         elif isinstance(define, Define):
             pass
         else:
-            raise ValueError(u"Define {} must be string or Define, not {}"
-                             u"".format(define, type(define)))
+            raise ValueError("Define {} must be string or Define, not {}"
+                             "".format(define, type(define)))
         self.defines.add(define)
         _LOGGER.debug("Adding define: %s", define)
         return define
 
     def get_variable(self, id):
         if not isinstance(id, ID):
-            raise ValueError("ID {!r} must be of type ID!".format(id))
+            raise ValueError(f"ID {id!r} must be of type ID!")
         while True:
             if id in self.variables:
                 yield self.variables[id]
@@ -735,7 +728,7 @@ class EsphomeCore(object):
 
     def register_variable(self, id, obj):
         if id in self.variables:
-            raise EsphomeError("ID {} is already registered".format(id))
+            raise EsphomeError(f"ID {id} is already registered")
         _LOGGER.debug("Registered variable %s of type %s", id.id, id.type)
         self.variables[id] = obj
 
@@ -748,10 +741,10 @@ class EsphomeCore(object):
 
         main_code = []
         for exp in self.main_statements:
-            text = text_type(statement(exp))
+            text = str(statement(exp))
             text = text.rstrip()
             main_code.append(text)
-        return u'\n'.join(main_code) + u'\n\n'
+        return '\n'.join(main_code) + '\n\n'
 
     @property
     def cpp_global_section(self):
@@ -759,17 +752,17 @@ class EsphomeCore(object):
 
         global_code = []
         for exp in self.global_statements:
-            text = text_type(statement(exp))
+            text = str(statement(exp))
             text = text.rstrip()
             global_code.append(text)
-        return u'\n'.join(global_code) + u'\n'
+        return '\n'.join(global_code) + '\n'
 
 
 class AutoLoad(OrderedDict):
     pass
 
 
-class EnumValue(object):
+class EnumValue:
     """Special type used by ESPHome to mark enum values for cv.enum."""
     @property
     def enum_value(self):
diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index 26662b0061..6297013247 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -138,6 +138,9 @@ float Component::get_actual_setup_priority() const {
   return this->setup_priority_override_;
 }
 void Component::set_setup_priority(float priority) { this->setup_priority_override_ = priority; }
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpmf-conversions"
 bool Component::has_overridden_loop() const {
 #ifdef CLANG_TIDY
   bool loop_overridden = true;
@@ -148,6 +151,7 @@ bool Component::has_overridden_loop() const {
 #endif
   return loop_overridden || call_loop_overridden;
 }
+#pragma GCC diagnostic pop
 
 PollingComponent::PollingComponent(uint32_t update_interval) : Component(), update_interval_(update_interval) {}
 
diff --git a/esphome/core_config.py b/esphome/core_config.py
index 63092891d3..5cfff6c4d9 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -37,8 +37,8 @@ def validate_board(value):
         raise NotImplementedError
 
     if value not in board_pins:
-        raise cv.Invalid(u"Could not find board '{}'. Valid boards are {}".format(
-            value, u', '.join(sorted(board_pins.keys()))))
+        raise cv.Invalid("Could not find board '{}'. Valid boards are {}".format(
+            value, ', '.join(sorted(board_pins.keys()))))
     return value
 
 
@@ -108,8 +108,8 @@ def valid_include(value):
     value = cv.file_(value)
     _, ext = os.path.splitext(value)
     if ext not in VALID_INCLUDE_EXTS:
-        raise cv.Invalid(u"Include has invalid file extension {} - valid extensions are {}"
-                         u"".format(ext, ', '.join(VALID_INCLUDE_EXTS)))
+        raise cv.Invalid("Include has invalid file extension {} - valid extensions are {}"
+                         "".format(ext, ', '.join(VALID_INCLUDE_EXTS)))
     return value
 
 
@@ -184,7 +184,7 @@ def include_file(path, basename):
     _, ext = os.path.splitext(path)
     if ext in ['.h', '.hpp', '.tcc']:
         # Header, add include statement
-        cg.add_global(cg.RawStatement(u'#include "{}"'.format(basename)))
+        cg.add_global(cg.RawStatement(f'#include "{basename}"'))
 
 
 @coroutine_with_priority(-1000.0)
@@ -238,7 +238,7 @@ def to_code(config):
             ld_script = ld_scripts[1]
 
         if ld_script is not None:
-            cg.add_build_flag('-Wl,-T{}'.format(ld_script))
+            cg.add_build_flag(f'-Wl,-T{ld_script}')
 
     cg.add_build_flag('-fno-exceptions')
 
diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index 09b542b3cc..b5239e9413 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -10,22 +10,21 @@ from esphome.core import (  # noqa
     TimePeriodMilliseconds, TimePeriodMinutes, TimePeriodSeconds, coroutine, Library, Define,
     EnumValue)
 from esphome.helpers import cpp_string_escape, indent_all_but_first_and_last
-from esphome.py_compat import integer_types, string_types, text_type
 from esphome.util import OrderedDict
 
 
-class Expression(object):
+class Expression:
     def __str__(self):
         raise NotImplementedError
 
 
-SafeExpType = Union[Expression, bool, str, text_type, int, float, TimePeriod,
+SafeExpType = Union[Expression, bool, str, str, int, float, TimePeriod,
                     Type[bool], Type[int], Type[float], List[Any]]
 
 
 class RawExpression(Expression):
-    def __init__(self, text):  # type: (Union[str, unicode]) -> None
-        super(RawExpression, self).__init__()
+    def __init__(self, text):  # type: (Union[str, str]) -> None
+        super().__init__()
         self.text = text
 
     def __str__(self):
@@ -35,7 +34,7 @@ class RawExpression(Expression):
 # pylint: disable=redefined-builtin
 class AssignmentExpression(Expression):
     def __init__(self, type, modifier, name, rhs, obj):
-        super(AssignmentExpression, self).__init__()
+        super().__init__()
         self.type = type
         self.modifier = modifier
         self.name = name
@@ -44,24 +43,24 @@ class AssignmentExpression(Expression):
 
     def __str__(self):
         if self.type is None:
-            return u"{} = {}".format(self.name, self.rhs)
-        return u"{} {}{} = {}".format(self.type, self.modifier, self.name, self.rhs)
+            return f"{self.name} = {self.rhs}"
+        return f"{self.type} {self.modifier}{self.name} = {self.rhs}"
 
 
 class VariableDeclarationExpression(Expression):
     def __init__(self, type, modifier, name):
-        super(VariableDeclarationExpression, self).__init__()
+        super().__init__()
         self.type = type
         self.modifier = modifier
         self.name = name
 
     def __str__(self):
-        return u"{} {}{}".format(self.type, self.modifier, self.name)
+        return f"{self.type} {self.modifier}{self.name}"
 
 
 class ExpressionList(Expression):
     def __init__(self, *args):
-        super(ExpressionList, self).__init__()
+        super().__init__()
         # Remove every None on end
         args = list(args)
         while args and args[-1] is None:
@@ -69,7 +68,7 @@ class ExpressionList(Expression):
         self.args = [safe_exp(arg) for arg in args]
 
     def __str__(self):
-        text = u", ".join(text_type(x) for x in self.args)
+        text = ", ".join(str(x) for x in self.args)
         return indent_all_but_first_and_last(text)
 
     def __iter__(self):
@@ -78,11 +77,11 @@ class ExpressionList(Expression):
 
 class TemplateArguments(Expression):
     def __init__(self, *args):  # type: (*SafeExpType) -> None
-        super(TemplateArguments, self).__init__()
+        super().__init__()
         self.args = ExpressionList(*args)
 
     def __str__(self):
-        return u'<{}>'.format(self.args)
+        return f'<{self.args}>'
 
     def __iter__(self):
         return iter(self.args)
@@ -90,7 +89,7 @@ class TemplateArguments(Expression):
 
 class CallExpression(Expression):
     def __init__(self, base, *args):  # type: (Expression, *SafeExpType) -> None
-        super(CallExpression, self).__init__()
+        super().__init__()
         self.base = base
         if args and isinstance(args[0], TemplateArguments):
             self.template_args = args[0]
@@ -101,13 +100,13 @@ class CallExpression(Expression):
 
     def __str__(self):
         if self.template_args is not None:
-            return u'{}{}({})'.format(self.base, self.template_args, self.args)
-        return u'{}({})'.format(self.base, self.args)
+            return f'{self.base}{self.template_args}({self.args})'
+        return f'{self.base}({self.args})'
 
 
 class StructInitializer(Expression):
     def __init__(self, base, *args):  # type: (Expression, *Tuple[str, SafeExpType]) -> None
-        super(StructInitializer, self).__init__()
+        super().__init__()
         self.base = base
         if not isinstance(args, OrderedDict):
             args = OrderedDict(args)
@@ -119,16 +118,16 @@ class StructInitializer(Expression):
             self.args[key] = exp
 
     def __str__(self):
-        cpp = u'{}{{\n'.format(self.base)
+        cpp = f'{self.base}{{\n'
         for key, value in self.args.items():
-            cpp += u'  .{} = {},\n'.format(key, value)
-        cpp += u'}'
+            cpp += f'  .{key} = {value},\n'
+        cpp += '}'
         return cpp
 
 
 class ArrayInitializer(Expression):
     def __init__(self, *args, **kwargs):  # type: (*Any, **Any) -> None
-        super(ArrayInitializer, self).__init__()
+        super().__init__()
         self.multiline = kwargs.get('multiline', False)
         self.args = []
         for arg in args:
@@ -139,30 +138,30 @@ class ArrayInitializer(Expression):
 
     def __str__(self):
         if not self.args:
-            return u'{}'
+            return '{}'
         if self.multiline:
-            cpp = u'{\n'
+            cpp = '{\n'
             for arg in self.args:
-                cpp += u'  {},\n'.format(arg)
-            cpp += u'}'
+                cpp += f'  {arg},\n'
+            cpp += '}'
         else:
-            cpp = u'{' + u', '.join(str(arg) for arg in self.args) + u'}'
+            cpp = '{' + ', '.join(str(arg) for arg in self.args) + '}'
         return cpp
 
 
 class ParameterExpression(Expression):
     def __init__(self, type, id):
-        super(ParameterExpression, self).__init__()
+        super().__init__()
         self.type = safe_exp(type)
         self.id = id
 
     def __str__(self):
-        return u"{} {}".format(self.type, self.id)
+        return f"{self.type} {self.id}"
 
 
 class ParameterListExpression(Expression):
     def __init__(self, *parameters):
-        super(ParameterListExpression, self).__init__()
+        super().__init__()
         self.parameters = []
         for parameter in parameters:
             if not isinstance(parameter, ParameterExpression):
@@ -170,12 +169,12 @@ class ParameterListExpression(Expression):
             self.parameters.append(parameter)
 
     def __str__(self):
-        return u", ".join(text_type(x) for x in self.parameters)
+        return ", ".join(str(x) for x in self.parameters)
 
 
 class LambdaExpression(Expression):
     def __init__(self, parts, parameters, capture='=', return_type=None):
-        super(LambdaExpression, self).__init__()
+        super().__init__()
         self.parts = parts
         if not isinstance(parameters, ParameterListExpression):
             parameters = ParameterListExpression(*parameters)
@@ -184,15 +183,15 @@ class LambdaExpression(Expression):
         self.return_type = safe_exp(return_type) if return_type is not None else None
 
     def __str__(self):
-        cpp = u'[{}]({})'.format(self.capture, self.parameters)
+        cpp = f'[{self.capture}]({self.parameters})'
         if self.return_type is not None:
-            cpp += u' -> {}'.format(self.return_type)
-        cpp += u' {{\n{}\n}}'.format(self.content)
+            cpp += f' -> {self.return_type}'
+        cpp += f' {{\n{self.content}\n}}'
         return indent_all_but_first_and_last(cpp)
 
     @property
     def content(self):
-        return u''.join(text_type(part) for part in self.parts)
+        return ''.join(str(part) for part in self.parts)
 
 
 class Literal(Expression):
@@ -201,41 +200,41 @@ class Literal(Expression):
 
 
 class StringLiteral(Literal):
-    def __init__(self, string):  # type: (Union[str, unicode]) -> None
-        super(StringLiteral, self).__init__()
+    def __init__(self, string):  # type: (Union[str, str]) -> None
+        super().__init__()
         self.string = string
 
     def __str__(self):
-        return u'{}'.format(cpp_string_escape(self.string))
+        return '{}'.format(cpp_string_escape(self.string))
 
 
 class IntLiteral(Literal):
-    def __init__(self, i):  # type: (Union[int, long]) -> None
-        super(IntLiteral, self).__init__()
+    def __init__(self, i):  # type: (Union[int]) -> None
+        super().__init__()
         self.i = i
 
     def __str__(self):
         if self.i > 4294967295:
-            return u'{}ULL'.format(self.i)
+            return f'{self.i}ULL'
         if self.i > 2147483647:
-            return u'{}UL'.format(self.i)
+            return f'{self.i}UL'
         if self.i < -2147483648:
-            return u'{}LL'.format(self.i)
-        return text_type(self.i)
+            return f'{self.i}LL'
+        return str(self.i)
 
 
 class BoolLiteral(Literal):
     def __init__(self, binary):  # type: (bool) -> None
-        super(BoolLiteral, self).__init__()
+        super().__init__()
         self.binary = binary
 
     def __str__(self):
-        return u"true" if self.binary else u"false"
+        return "true" if self.binary else "false"
 
 
 class HexIntLiteral(Literal):
     def __init__(self, i):  # type: (int) -> None
-        super(HexIntLiteral, self).__init__()
+        super().__init__()
         self.i = HexInt(i)
 
     def __str__(self):
@@ -244,18 +243,18 @@ class HexIntLiteral(Literal):
 
 class FloatLiteral(Literal):
     def __init__(self, value):  # type: (float) -> None
-        super(FloatLiteral, self).__init__()
+        super().__init__()
         self.float_ = value
 
     def __str__(self):
         if math.isnan(self.float_):
-            return u"NAN"
-        return u"{}f".format(self.float_)
+            return "NAN"
+        return f"{self.float_}f"
 
 
 # pylint: disable=bad-continuation
 def safe_exp(
-        obj  # type: Union[Expression, bool, str, unicode, int, long, float, TimePeriod, list]
+        obj  # type: Union[Expression, bool, str, int, float, TimePeriod, list]
              ):
     # type: (...) -> Expression
     """Try to convert obj to an expression by automatically converting native python types to
@@ -269,11 +268,11 @@ def safe_exp(
         return safe_exp(obj.enum_value)
     if isinstance(obj, bool):
         return BoolLiteral(obj)
-    if isinstance(obj, string_types):
+    if isinstance(obj, str):
         return StringLiteral(obj)
     if isinstance(obj, HexInt):
         return HexIntLiteral(obj)
-    if isinstance(obj, integer_types):
+    if isinstance(obj, int):
         return IntLiteral(obj)
     if isinstance(obj, float):
         return FloatLiteral(obj)
@@ -294,15 +293,15 @@ def safe_exp(
     if obj is float:
         return float_
     if isinstance(obj, ID):
-        raise ValueError(u"Object {} is an ID. Did you forget to register the variable?"
-                         u"".format(obj))
+        raise ValueError("Object {} is an ID. Did you forget to register the variable?"
+                         "".format(obj))
     if inspect.isgenerator(obj):
-        raise ValueError(u"Object {} is a coroutine. Did you forget to await the expression with "
-                         u"'yield'?".format(obj))
-    raise ValueError(u"Object is not an expression", obj)
+        raise ValueError("Object {} is a coroutine. Did you forget to await the expression with "
+                         "'yield'?".format(obj))
+    raise ValueError("Object is not an expression", obj)
 
 
-class Statement(object):
+class Statement:
     def __init__(self):
         pass
 
@@ -312,7 +311,7 @@ class Statement(object):
 
 class RawStatement(Statement):
     def __init__(self, text):
-        super(RawStatement, self).__init__()
+        super().__init__()
         self.text = text
 
     def __str__(self):
@@ -321,38 +320,38 @@ class RawStatement(Statement):
 
 class ExpressionStatement(Statement):
     def __init__(self, expression):
-        super(ExpressionStatement, self).__init__()
+        super().__init__()
         self.expression = safe_exp(expression)
 
     def __str__(self):
-        return u"{};".format(self.expression)
+        return f"{self.expression};"
 
 
 class LineComment(Statement):
-    def __init__(self, value):  # type: (unicode) -> None
-        super(LineComment, self).__init__()
+    def __init__(self, value):  # type: (str) -> None
+        super().__init__()
         self._value = value
 
     def __str__(self):
-        parts = self._value.split(u'\n')
-        parts = [u'// {}'.format(x) for x in parts]
-        return u'\n'.join(parts)
+        parts = self._value.split('\n')
+        parts = [f'// {x}' for x in parts]
+        return '\n'.join(parts)
 
 
 class ProgmemAssignmentExpression(AssignmentExpression):
     def __init__(self, type, name, rhs, obj):
-        super(ProgmemAssignmentExpression, self).__init__(
+        super().__init__(
             type, '', name, rhs, obj
         )
 
     def __str__(self):
         type_ = self.type
-        return u"static const {} {}[] PROGMEM = {}".format(type_, self.name, self.rhs)
+        return f"static const {type_} {self.name}[] PROGMEM = {self.rhs}"
 
 
 def progmem_array(id, rhs):
     rhs = safe_exp(rhs)
-    obj = MockObj(id, u'.')
+    obj = MockObj(id, '.')
     assignment = ProgmemAssignmentExpression(id.type, id, rhs, obj)
     CORE.add(assignment)
     CORE.register_variable(id, obj)
@@ -381,7 +380,7 @@ def variable(id,  # type: ID
     """
     assert isinstance(id, ID)
     rhs = safe_exp(rhs)
-    obj = MockObj(id, u'.')
+    obj = MockObj(id, '.')
     if type is not None:
         id.type = type
     assignment = AssignmentExpression(id.type, '', id, rhs, obj)
@@ -405,7 +404,7 @@ def Pvariable(id,  # type: ID
     :returns The new variable as a MockObj.
     """
     rhs = safe_exp(rhs)
-    obj = MockObj(id, u'->')
+    obj = MockObj(id, '->')
     if type is not None:
         id.type = type
     decl = VariableDeclarationExpression(id.type, '*', id)
@@ -594,51 +593,51 @@ class MockObj(Expression):
 
     Mostly consists of magic methods that allow ESPHome's codegen syntax.
     """
-    def __init__(self, base, op=u'.'):
+    def __init__(self, base, op='.'):
         self.base = base
         self.op = op
-        super(MockObj, self).__init__()
+        super().__init__()
 
     def __getattr__(self, attr):  # type: (str) -> MockObj
-        next_op = u'.'
-        if attr.startswith(u'P') and self.op not in ['::', '']:
+        next_op = '.'
+        if attr.startswith('P') and self.op not in ['::', '']:
             attr = attr[1:]
-            next_op = u'->'
-        if attr.startswith(u'_'):
+            next_op = '->'
+        if attr.startswith('_'):
             attr = attr[1:]
-        return MockObj(u'{}{}{}'.format(self.base, self.op, attr), next_op)
+        return MockObj(f'{self.base}{self.op}{attr}', next_op)
 
     def __call__(self, *args):  # type: (SafeExpType) -> MockObj
         call = CallExpression(self.base, *args)
         return MockObj(call, self.op)
 
-    def __str__(self):  # type: () -> unicode
-        return text_type(self.base)
+    def __str__(self):  # type: () -> str
+        return str(self.base)
 
     def __repr__(self):
-        return u'MockObj<{}>'.format(text_type(self.base))
+        return 'MockObj<{}>'.format(str(self.base))
 
     @property
     def _(self):  # type: () -> MockObj
-        return MockObj(u'{}{}'.format(self.base, self.op))
+        return MockObj(f'{self.base}{self.op}')
 
     @property
     def new(self):  # type: () -> MockObj
-        return MockObj(u'new {}'.format(self.base), u'->')
+        return MockObj(f'new {self.base}', '->')
 
     def template(self, *args):  # type: (*SafeExpType) -> MockObj
         if len(args) != 1 or not isinstance(args[0], TemplateArguments):
             args = TemplateArguments(*args)
         else:
             args = args[0]
-        return MockObj(u'{}{}'.format(self.base, args))
+        return MockObj(f'{self.base}{args}')
 
     def namespace(self, name):  # type: (str) -> MockObj
-        return MockObj(u'{}{}'.format(self._, name), u'::')
+        return MockObj(f'{self._}{name}', '::')
 
     def class_(self, name, *parents):  # type: (str, *MockObjClass) -> MockObjClass
         op = '' if self.op == '' else '::'
-        return MockObjClass(u'{}{}{}'.format(self.base, op, name), u'.', parents=parents)
+        return MockObjClass(f'{self.base}{op}{name}', '.', parents=parents)
 
     def struct(self, name):  # type: (str) -> MockObjClass
         return self.class_(name)
@@ -648,24 +647,24 @@ class MockObj(Expression):
 
     def operator(self, name):  # type: (str) -> MockObj
         if name == 'ref':
-            return MockObj(u'{} &'.format(self.base), u'')
+            return MockObj(f'{self.base} &', '')
         if name == 'ptr':
-            return MockObj(u'{} *'.format(self.base), u'')
+            return MockObj(f'{self.base} *', '')
         if name == "const":
-            return MockObj(u'const {}'.format(self.base), u'')
+            return MockObj(f'const {self.base}', '')
         raise NotImplementedError
 
     @property
     def using(self):  # type: () -> MockObj
         assert self.op == '::'
-        return MockObj(u'using namespace {}'.format(self.base))
+        return MockObj(f'using namespace {self.base}')
 
     def __getitem__(self, item):  # type: (Union[str, Expression]) -> MockObj
-        next_op = u'.'
-        if isinstance(item, str) and item.startswith(u'P'):
+        next_op = '.'
+        if isinstance(item, str) and item.startswith('P'):
             item = item[1:]
-            next_op = u'->'
-        return MockObj(u'{}[{}]'.format(self.base, item), next_op)
+            next_op = '->'
+        return MockObj(f'{self.base}[{item}]', next_op)
 
 
 class MockObjEnum(MockObj):
@@ -679,13 +678,13 @@ class MockObjEnum(MockObj):
         kwargs['base'] = base
         MockObj.__init__(self, *args, **kwargs)
 
-    def __str__(self):  # type: () -> unicode
+    def __str__(self):  # type: () -> str
         if self._is_class:
-            return super(MockObjEnum, self).__str__()
-        return u'{}{}{}'.format(self.base, self.op, self._enum)
+            return super().__str__()
+        return f'{self.base}{self.op}{self._enum}'
 
     def __repr__(self):
-        return u'MockObj<{}>'.format(text_type(self.base))
+        return 'MockObj<{}>'.format(str(self.base))
 
 
 class MockObjClass(MockObj):
@@ -716,7 +715,7 @@ class MockObjClass(MockObj):
             args = args[0]
         new_parents = self._parents[:]
         new_parents.append(self)
-        return MockObjClass(u'{}{}'.format(self.base, args), parents=new_parents)
+        return MockObjClass(f'{self.base}{args}', parents=new_parents)
 
     def __repr__(self):
-        return u'MockObjClass<{}, parents={}>'.format(text_type(self.base), self._parents)
+        return 'MockObjClass<{}, parents={}>'.format(str(self.base), self._parents)
diff --git a/esphome/cpp_helpers.py b/esphome/cpp_helpers.py
index 39ac8e7118..f01981acc8 100644
--- a/esphome/cpp_helpers.py
+++ b/esphome/cpp_helpers.py
@@ -1,9 +1,10 @@
 from esphome.const import CONF_INVERTED, CONF_MODE, CONF_NUMBER, CONF_SETUP_PRIORITY, \
     CONF_UPDATE_INTERVAL, CONF_TYPE_ID
-from esphome.core import coroutine, ID, CORE
+# pylint: disable=unused-import
+from esphome.core import coroutine, ID, CORE, ConfigType
 from esphome.cpp_generator import RawExpression, add, get_variable
 from esphome.cpp_types import App, GPIOPin
-from esphome.py_compat import text_type
+from esphome.util import Registry, RegistryEntry
 
 
 @coroutine
@@ -35,11 +36,11 @@ def register_component(var, config):
     :param var: The variable representing the component.
     :param config: The configuration for the component.
     """
-    id_ = text_type(var.base)
+    id_ = str(var.base)
     if id_ not in CORE.component_ids:
-        raise ValueError(u"Component ID {} was not declared to inherit from Component, "
-                         u"or was registered twice. Please create a bug report with your "
-                         u"configuration.".format(id_))
+        raise ValueError("Component ID {} was not declared to inherit from Component, "
+                         "or was registered twice. Please create a bug report with your "
+                         "configuration.".format(id_))
     CORE.component_ids.remove(id_)
     if CONF_SETUP_PRIORITY in config:
         add(var.set_setup_priority(config[CONF_SETUP_PRIORITY]))
@@ -59,7 +60,7 @@ def register_parented(var, value):
 
 
 def extract_registry_entry_config(registry, full_config):
-    # type: ('Registry', 'ConfigType') -> 'RegistryEntry'
+    # type: (Registry, ConfigType) -> RegistryEntry
     key, config = next((k, v) for k, v in full_config.items() if k in registry)
     return registry[key], config
 
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index c934626da8..8aea841247 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -1,5 +1,4 @@
 # pylint: disable=wrong-import-position
-from __future__ import print_function
 
 import codecs
 import collections
@@ -29,7 +28,6 @@ import tornado.websocket
 from esphome import const, util
 from esphome.__main__ import get_serial_ports
 from esphome.helpers import mkdir_p, get_bool_env, run_system_command
-from esphome.py_compat import IS_PY2, decode_text, encode_text
 from esphome.storage_json import EsphomeStorageJSON, StorageJSON, \
     esphome_storage_path, ext_storage_path, trash_storage_path
 from esphome.util import shlex_quote
@@ -42,7 +40,7 @@ from esphome.zeroconf import DashboardStatus, Zeroconf
 _LOGGER = logging.getLogger(__name__)
 
 
-class DashboardSettings(object):
+class DashboardSettings:
     def __init__(self):
         self.config_dir = ''
         self.password_digest = ''
@@ -58,10 +56,7 @@ class DashboardSettings(object):
             self.username = args.username or os.getenv('USERNAME', '')
             self.using_password = bool(password)
         if self.using_password:
-            if IS_PY2:
-                self.password_digest = hmac.new(password).digest()
-            else:
-                self.password_digest = hmac.new(password.encode()).digest()
+            self.password_digest = hmac.new(password.encode()).digest()
         self.config_dir = args.configuration[0]
 
     @property
@@ -88,8 +83,8 @@ class DashboardSettings(object):
         if username != self.username:
             return False
 
-        password_digest = hmac.new(encode_text(password)).digest()
-        return hmac.compare_digest(self.password_digest, password_digest)
+        password = hmac.new(password.encode()).digest()
+        return username == self.username and hmac.compare_digest(self.password_digest, password)
 
     def rel_path(self, *args):
         return os.path.join(self.config_dir, *args)
@@ -100,10 +95,7 @@ class DashboardSettings(object):
 
 settings = DashboardSettings()
 
-if IS_PY2:
-    cookie_authenticated_yes = 'yes'
-else:
-    cookie_authenticated_yes = b'yes'
+cookie_authenticated_yes = b'yes'
 
 
 def template_args():
@@ -181,7 +173,7 @@ def websocket_method(name):
 @websocket_class
 class EsphomeCommandWebSocket(tornado.websocket.WebSocketHandler):
     def __init__(self, application, request, **kwargs):
-        super(EsphomeCommandWebSocket, self).__init__(application, request, **kwargs)
+        super().__init__(application, request, **kwargs)
         self._proc = None
         self._is_closed = False
 
@@ -204,7 +196,7 @@ class EsphomeCommandWebSocket(tornado.websocket.WebSocketHandler):
             # spawn can only be called once
             return
         command = self.build_command(json_message)
-        _LOGGER.info(u"Running command '%s'", ' '.join(shlex_quote(x) for x in command))
+        _LOGGER.info("Running command '%s'", ' '.join(shlex_quote(x) for x in command))
         self._proc = tornado.process.Subprocess(command,
                                                 stdout=tornado.process.Subprocess.STREAM,
                                                 stderr=subprocess.STDOUT,
@@ -227,10 +219,7 @@ class EsphomeCommandWebSocket(tornado.websocket.WebSocketHandler):
 
     @tornado.gen.coroutine
     def _redirect_stdout(self):
-        if IS_PY2:
-            reg = '[\n\r]'
-        else:
-            reg = b'[\n\r]'
+        reg = b'[\n\r]'
 
         while True:
             try:
@@ -336,8 +325,8 @@ class WizardRequestHandler(BaseHandler):
     def post(self):
         from esphome import wizard
 
-        kwargs = {k: u''.join(decode_text(x) for x in v) for k, v in self.request.arguments.items()}
-        destination = settings.rel_path(kwargs['name'] + u'.yaml')
+        kwargs = {k: ''.join(str(x) for x in v) for k, v in self.request.arguments.items()}
+        destination = settings.rel_path(kwargs['name'] + '.yaml')
         wizard.wizard_write(path=destination, **kwargs)
         self.redirect('./?begin=True')
 
@@ -355,8 +344,8 @@ class DownloadBinaryRequestHandler(BaseHandler):
 
         path = storage_json.firmware_bin_path
         self.set_header('Content-Type', 'application/octet-stream')
-        filename = '{}.bin'.format(storage_json.name)
-        self.set_header("Content-Disposition", 'attachment; filename="{}"'.format(filename))
+        filename = f'{storage_json.name}.bin'
+        self.set_header("Content-Disposition", f'attachment; filename="{filename}"')
         with open(path, 'rb') as f:
             while True:
                 data = f.read(16384)
@@ -371,7 +360,7 @@ def _list_dashboard_entries():
     return [DashboardEntry(file) for file in files]
 
 
-class DashboardEntry(object):
+class DashboardEntry:
     def __init__(self, path):
         self.path = path
         self._storage = None
@@ -609,8 +598,8 @@ class LoginHandler(BaseHandler):
             'X-HASSIO-KEY': os.getenv('HASSIO_TOKEN'),
         }
         data = {
-            'username': decode_text(self.get_argument('username', '')),
-            'password': decode_text(self.get_argument('password', ''))
+            'username': self.get_argument('username', ''),
+            'password': self.get_argument('password', '')
         }
         try:
             req = requests.post('http://hassio/auth', headers=headers, data=data)
@@ -627,8 +616,8 @@ class LoginHandler(BaseHandler):
         self.render_login_page(error="Invalid username or password")
 
     def post_native_login(self):
-        username = decode_text(self.get_argument("username", ''))
-        password = decode_text(self.get_argument("password", ''))
+        username = self.get_argument("username", '')
+        password = self.get_argument("password", '')
         if settings.check_password(username, password):
             self.set_secure_cookie("authenticated", cookie_authenticated_yes)
             self.redirect("/")
@@ -663,7 +652,7 @@ def get_static_file_url(name):
         with open(path, 'rb') as f_handle:
             hash_ = hashlib.md5(f_handle.read()).hexdigest()[:8]
         _STATIC_FILE_HASHES[name] = hash_
-    return u'./static/{}?hash={}'.format(name, hash_)
+    return f'./static/{name}?hash={hash_}'
 
 
 def make_app(debug=False):
@@ -754,7 +743,7 @@ def start_web_server(args):
         if args.open_ui:
             import webbrowser
 
-            webbrowser.open('localhost:{}'.format(args.port))
+            webbrowser.open(f'localhost:{args.port}')
 
     if settings.status_use_ping:
         status_thread = PingStatusThread()
diff --git a/esphome/espota2.py b/esphome/espota2.py
index 40417b9ab2..edfa4e63e6 100644
--- a/esphome/espota2.py
+++ b/esphome/espota2.py
@@ -7,7 +7,6 @@ import time
 
 from esphome.core import EsphomeError
 from esphome.helpers import is_ip_address, resolve_ip_address
-from esphome.py_compat import IS_PY2, char_to_byte
 
 RESPONSE_OK = 0
 RESPONSE_REQUEST_AUTH = 1
@@ -38,7 +37,7 @@ MAGIC_BYTES = [0x6C, 0x26, 0xF7, 0x5C, 0x45]
 _LOGGER = logging.getLogger(__name__)
 
 
-class ProgressBar(object):
+class ProgressBar:
     def __init__(self):
         self.last_progress = None
 
@@ -72,33 +71,31 @@ def recv_decode(sock, amount, decode=True):
     data = sock.recv(amount)
     if not decode:
         return data
-    return [char_to_byte(x) for x in data]
+    return list(data)
 
 
 def receive_exactly(sock, amount, msg, expect, decode=True):
     if decode:
         data = []
-    elif IS_PY2:
-        data = ''
     else:
         data = b''
 
     try:
         data += recv_decode(sock, 1, decode=decode)
-    except socket.error as err:
-        raise OTAError("Error receiving acknowledge {}: {}".format(msg, err))
+    except OSError as err:
+        raise OTAError(f"Error receiving acknowledge {msg}: {err}")
 
     try:
         check_error(data, expect)
     except OTAError as err:
         sock.close()
-        raise OTAError("Error {}: {}".format(msg, err))
+        raise OTAError(f"Error {msg}: {err}")
 
     while len(data) < amount:
         try:
             data += recv_decode(sock, amount - len(data), decode=decode)
-        except socket.error as err:
-            raise OTAError("Error receiving {}: {}".format(msg, err))
+        except OSError as err:
+            raise OTAError(f"Error receiving {msg}: {err}")
     return data
 
 
@@ -145,22 +142,16 @@ def check_error(data, expect):
 
 def send_check(sock, data, msg):
     try:
-        if IS_PY2:
-            if isinstance(data, (list, tuple)):
-                data = ''.join([chr(x) for x in data])
-            elif isinstance(data, int):
-                data = chr(data)
-        else:
-            if isinstance(data, (list, tuple)):
-                data = bytes(data)
-            elif isinstance(data, int):
-                data = bytes([data])
-            elif isinstance(data, str):
-                data = data.encode('utf8')
+        if isinstance(data, (list, tuple)):
+            data = bytes(data)
+        elif isinstance(data, int):
+            data = bytes([data])
+        elif isinstance(data, str):
+            data = data.encode('utf8')
 
         sock.sendall(data)
-    except socket.error as err:
-        raise OTAError("Error sending {}: {}".format(msg, err))
+    except OSError as err:
+        raise OTAError(f"Error sending {msg}: {err}")
 
 
 def perform_ota(sock, password, file_handle, filename):
@@ -176,7 +167,7 @@ def perform_ota(sock, password, file_handle, filename):
 
     _, version = receive_exactly(sock, 2, 'version', RESPONSE_OK)
     if version != OTA_VERSION_1_0:
-        raise OTAError("Unsupported OTA version {}".format(version))
+        raise OTAError(f"Unsupported OTA version {version}")
 
     # Features
     send_check(sock, 0x00, 'features')
@@ -186,9 +177,7 @@ def perform_ota(sock, password, file_handle, filename):
     if auth == RESPONSE_REQUEST_AUTH:
         if not password:
             raise OTAError("ESP requests password, but no password given!")
-        nonce = receive_exactly(sock, 32, 'authentication nonce', [], decode=False)
-        if not IS_PY2:
-            nonce = nonce.decode()
+        nonce = receive_exactly(sock, 32, 'authentication nonce', [], decode=False).decode()
         _LOGGER.debug("Auth: Nonce is %s", nonce)
         cnonce = hashlib.md5(str(random.random()).encode()).hexdigest()
         _LOGGER.debug("Auth: CNonce is %s", cnonce)
@@ -235,9 +224,9 @@ def perform_ota(sock, password, file_handle, filename):
 
         try:
             sock.sendall(chunk)
-        except socket.error as err:
+        except OSError as err:
             sys.stderr.write('\n')
-            raise OTAError("Error sending data: {}".format(err))
+            raise OTAError(f"Error sending data: {err}")
 
         progress.update(offset / float(file_size))
     progress.done()
@@ -277,7 +266,7 @@ def run_ota_impl_(remote_host, remote_port, password, filename):
     sock.settimeout(10.0)
     try:
         sock.connect((ip, remote_port))
-    except socket.error as err:
+    except OSError as err:
         sock.close()
         _LOGGER.error("Connecting to %s:%s failed: %s", remote_host, remote_port, err)
         return 1
diff --git a/esphome/helpers.py b/esphome/helpers.py
index 179452c353..6413a25e01 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -1,12 +1,8 @@
-from __future__ import print_function
-
 import codecs
 
 import logging
 import os
 
-from esphome.py_compat import char_to_byte, text_type, IS_PY2, encode_text
-
 _LOGGER = logging.getLogger(__name__)
 
 
@@ -18,24 +14,24 @@ def ensure_unique_string(preferred_string, current_strings):
 
     while test_string in current_strings_set:
         tries += 1
-        test_string = u"{}_{}".format(preferred_string, tries)
+        test_string = f"{preferred_string}_{tries}"
 
     return test_string
 
 
-def indent_all_but_first_and_last(text, padding=u'  '):
+def indent_all_but_first_and_last(text, padding='  '):
     lines = text.splitlines(True)
     if len(lines) <= 2:
         return text
-    return lines[0] + u''.join(padding + line for line in lines[1:-1]) + lines[-1]
+    return lines[0] + ''.join(padding + line for line in lines[1:-1]) + lines[-1]
 
 
-def indent_list(text, padding=u'  '):
+def indent_list(text, padding='  '):
     return [padding + line for line in text.splitlines()]
 
 
-def indent(text, padding=u'  '):
-    return u'\n'.join(indent_list(text, padding))
+def indent(text, padding='  '):
+    return '\n'.join(indent_list(text, padding))
 
 
 # From https://stackoverflow.com/a/14945195/8924614
@@ -43,17 +39,16 @@ def cpp_string_escape(string, encoding='utf-8'):
     def _should_escape(byte):  # type: (int) -> bool
         if not 32 <= byte < 127:
             return True
-        if byte in (char_to_byte('\\'), char_to_byte('"')):
+        if byte in (ord('\\'), ord('"')):
             return True
         return False
 
-    if isinstance(string, text_type):
+    if isinstance(string, str):
         string = string.encode(encoding)
     result = ''
     for character in string:
-        character = char_to_byte(character)
         if _should_escape(character):
-            result += '\\%03o' % character
+            result += f'\\{character:03o}'
         else:
             result += chr(character)
     return '"' + result + '"'
@@ -91,7 +86,7 @@ def mkdir_p(path):
             pass
         else:
             from esphome.core import EsphomeError
-            raise EsphomeError(u"Error creating directories {}: {}".format(path, err))
+            raise EsphomeError(f"Error creating directories {path}: {err}")
 
 
 def is_ip_address(host):
@@ -118,7 +113,7 @@ def _resolve_with_zeroconf(host):
     try:
         info = zc.resolve_host(host + '.')
     except Exception as err:
-        raise EsphomeError("Error resolving mDNS hostname: {}".format(err))
+        raise EsphomeError(f"Error resolving mDNS hostname: {err}")
     finally:
         zc.close()
     if info is None:
@@ -141,7 +136,7 @@ def resolve_ip_address(host):
 
     try:
         return socket.gethostbyname(host)
-    except socket.error as err:
+    except OSError as err:
         errs.append(str(err))
         raise EsphomeError("Error resolving IP address: {}"
                            "".format(', '.join(errs)))
@@ -167,10 +162,10 @@ def read_file(path):
             return f_handle.read()
     except OSError as err:
         from esphome.core import EsphomeError
-        raise EsphomeError(u"Error reading file {}: {}".format(path, err))
+        raise EsphomeError(f"Error reading file {path}: {err}")
     except UnicodeDecodeError as err:
         from esphome.core import EsphomeError
-        raise EsphomeError(u"Error reading file {}: {}".format(path, err))
+        raise EsphomeError(f"Error reading file {path}: {err}")
 
 
 def _write_file(path, text):
@@ -179,20 +174,17 @@ def _write_file(path, text):
     mkdir_p(directory)
 
     tmp_path = None
-    data = encode_text(text)
+    data = text
+    if isinstance(text, str):
+        data = text.encode()
     try:
         with tempfile.NamedTemporaryFile(mode="wb", dir=directory, delete=False) as f_handle:
             tmp_path = f_handle.name
             f_handle.write(data)
         # Newer tempfile implementations create the file with mode 0o600
         os.chmod(tmp_path, 0o644)
-        if IS_PY2:
-            if os.path.exists(path):
-                os.remove(path)
-            os.rename(tmp_path, path)
-        else:
-            # If destination exists, will be overwritten
-            os.replace(tmp_path, path)
+        # If destination exists, will be overwritten
+        os.replace(tmp_path, path)
     finally:
         if tmp_path is not None and os.path.exists(tmp_path):
             try:
@@ -206,7 +198,7 @@ def write_file(path, text):
         _write_file(path, text)
     except OSError:
         from esphome.core import EsphomeError
-        raise EsphomeError(u"Could not write file at {}".format(path))
+        raise EsphomeError(f"Could not write file at {path}")
 
 
 def write_file_if_changed(path, text):
@@ -226,7 +218,7 @@ def copy_file_if_changed(src, dst):
         shutil.copy(src, dst)
     except OSError as err:
         from esphome.core import EsphomeError
-        raise EsphomeError(u"Error copying file {} to {}: {}".format(src, dst, err))
+        raise EsphomeError(f"Error copying file {src} to {dst}: {err}")
 
 
 def list_starts_with(list_, sub):
@@ -273,10 +265,6 @@ _TYPE_OVERLOADS = {
     list: type('EList', (list,), dict()),
 }
 
-if IS_PY2:
-    _TYPE_OVERLOADS[long] = type('long', (long,), dict())
-    _TYPE_OVERLOADS[unicode] = type('unicode', (unicode,), dict())
-
 # cache created classes here
 _CLASS_LOOKUP = {}
 
diff --git a/esphome/legacy.py b/esphome/legacy.py
index 0e19545d68..27373ee1a3 100644
--- a/esphome/legacy.py
+++ b/esphome/legacy.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 
 
diff --git a/esphome/mqtt.py b/esphome/mqtt.py
index 77eb941363..cbcf067c44 100644
--- a/esphome/mqtt.py
+++ b/esphome/mqtt.py
@@ -1,9 +1,6 @@
-from __future__ import print_function
-
 from datetime import datetime
 import hashlib
 import logging
-import socket
 import ssl
 import sys
 import time
@@ -15,7 +12,6 @@ from esphome.const import CONF_BROKER, CONF_DISCOVERY_PREFIX, CONF_ESPHOME, \
     CONF_TOPIC, CONF_TOPIC_PREFIX, CONF_USERNAME
 from esphome.core import CORE, EsphomeError
 from esphome.helpers import color
-from esphome.py_compat import decode_text
 from esphome.util import safe_print
 
 _LOGGER = logging.getLogger(__name__)
@@ -37,7 +33,7 @@ def initialize(config, subscriptions, on_message, username, password, client_id)
                 if client.reconnect() == 0:
                     _LOGGER.info("Successfully reconnected to the MQTT server")
                     break
-            except socket.error:
+            except OSError:
                 pass
 
             wait_time = min(2**tries, 300)
@@ -47,7 +43,7 @@ def initialize(config, subscriptions, on_message, username, password, client_id)
             time.sleep(wait_time)
             tries += 1
 
-    client = mqtt.Client(client_id or u'')
+    client = mqtt.Client(client_id or '')
     client.on_connect = on_connect
     client.on_message = on_message
     client.on_disconnect = on_disconnect
@@ -70,8 +66,8 @@ def initialize(config, subscriptions, on_message, username, password, client_id)
         host = str(config[CONF_MQTT][CONF_BROKER])
         port = int(config[CONF_MQTT][CONF_PORT])
         client.connect(host, port)
-    except socket.error as err:
-        raise EsphomeError("Cannot connect to MQTT broker: {}".format(err))
+    except OSError as err:
+        raise EsphomeError(f"Cannot connect to MQTT broker: {err}")
 
     try:
         client.loop_forever()
@@ -88,17 +84,17 @@ def show_logs(config, topic=None, username=None, password=None, client_id=None):
         if CONF_LOG_TOPIC in conf:
             topic = config[CONF_MQTT][CONF_LOG_TOPIC][CONF_TOPIC]
         elif CONF_TOPIC_PREFIX in config[CONF_MQTT]:
-            topic = config[CONF_MQTT][CONF_TOPIC_PREFIX] + u'/debug'
+            topic = config[CONF_MQTT][CONF_TOPIC_PREFIX] + '/debug'
         else:
-            topic = config[CONF_ESPHOME][CONF_NAME] + u'/debug'
+            topic = config[CONF_ESPHOME][CONF_NAME] + '/debug'
     else:
-        _LOGGER.error(u"MQTT isn't setup, can't start MQTT logs")
+        _LOGGER.error("MQTT isn't setup, can't start MQTT logs")
         return 1
-    _LOGGER.info(u"Starting log output from %s", topic)
+    _LOGGER.info("Starting log output from %s", topic)
 
     def on_message(client, userdata, msg):
-        time_ = datetime.now().time().strftime(u'[%H:%M:%S]')
-        payload = decode_text(msg.payload)
+        time_ = datetime.now().time().strftime('[%H:%M:%S]')
+        payload = msg.payload.decode(errors='backslashreplace')
         message = time_ + payload
         safe_print(message)
 
@@ -107,20 +103,20 @@ def show_logs(config, topic=None, username=None, password=None, client_id=None):
 
 def clear_topic(config, topic, username=None, password=None, client_id=None):
     if topic is None:
-        discovery_prefix = config[CONF_MQTT].get(CONF_DISCOVERY_PREFIX, u'homeassistant')
+        discovery_prefix = config[CONF_MQTT].get(CONF_DISCOVERY_PREFIX, 'homeassistant')
         name = config[CONF_ESPHOME][CONF_NAME]
-        topic = u'{}/+/{}/#'.format(discovery_prefix, name)
-    _LOGGER.info(u"Clearing messages from '%s'", topic)
-    _LOGGER.info(u"Please close this window when no more messages appear and the "
-                 u"MQTT topic has been cleared of retained messages.")
+        topic = f'{discovery_prefix}/+/{name}/#'
+    _LOGGER.info("Clearing messages from '%s'", topic)
+    _LOGGER.info("Please close this window when no more messages appear and the "
+                 "MQTT topic has been cleared of retained messages.")
 
     def on_message(client, userdata, msg):
         if not msg.payload or not msg.retain:
             return
         try:
-            print(u"Clearing topic {}".format(msg.topic))
+            print(f"Clearing topic {msg.topic}")
         except UnicodeDecodeError:
-            print(u"Skipping non-UTF-8 topic (prohibited by MQTT standard)")
+            print("Skipping non-UTF-8 topic (prohibited by MQTT standard)")
             return
         client.publish(msg.topic, None, retain=True)
 
@@ -133,14 +129,14 @@ def get_fingerprint(config):
     _LOGGER.info("Getting fingerprint from %s:%s", addr[0], addr[1])
     try:
         cert_pem = ssl.get_server_certificate(addr)
-    except IOError as err:
+    except OSError as err:
         _LOGGER.error("Unable to connect to server: %s", err)
         return 1
     cert_der = ssl.PEM_cert_to_DER_cert(cert_pem)
 
     sha1 = hashlib.sha1(cert_der).hexdigest()
 
-    safe_print(u"SHA1 Fingerprint: " + color('cyan', sha1))
-    safe_print(u"Copy the string above into mqtt.ssl_fingerprints section of {}"
-               u"".format(CORE.config_path))
+    safe_print("SHA1 Fingerprint: " + color('cyan', sha1))
+    safe_print("Copy the string above into mqtt.ssl_fingerprints section of {}"
+               "".format(CORE.config_path))
     return 0
diff --git a/esphome/pins.py b/esphome/pins.py
index 9a2cf90984..22192b599e 100644
--- a/esphome/pins.py
+++ b/esphome/pins.py
@@ -1,5 +1,3 @@
-from __future__ import division
-
 import logging
 
 import esphome.config_validation as cv
@@ -271,13 +269,13 @@ def _lookup_pin(value):
         return board_pins[value]
     if value in base_pins:
         return base_pins[value]
-    raise cv.Invalid(u"Cannot resolve pin name '{}' for board {}.".format(value, CORE.board))
+    raise cv.Invalid(f"Cannot resolve pin name '{value}' for board {CORE.board}.")
 
 
 def _translate_pin(value):
     if isinstance(value, dict) or value is None:
-        raise cv.Invalid(u"This variable only supports pin numbers, not full pin schemas "
-                         u"(with inverted and mode).")
+        raise cv.Invalid("This variable only supports pin numbers, not full pin schemas "
+                         "(with inverted and mode).")
     if isinstance(value, int):
         return value
     try:
@@ -301,27 +299,27 @@ def validate_gpio_pin(value):
     value = _translate_pin(value)
     if CORE.is_esp32:
         if value < 0 or value > 39:
-            raise cv.Invalid(u"ESP32: Invalid pin number: {}".format(value))
+            raise cv.Invalid(f"ESP32: Invalid pin number: {value}")
         if value in _ESP_SDIO_PINS:
             raise cv.Invalid("This pin cannot be used on ESP32s and is already used by "
                              "the flash interface (function: {})".format(_ESP_SDIO_PINS[value]))
         if 9 <= value <= 10:
-            _LOGGER.warning(u"ESP32: Pin %s (9-10) might already be used by the "
-                            u"flash interface in QUAD IO flash mode.", value)
+            _LOGGER.warning("ESP32: Pin %s (9-10) might already be used by the "
+                            "flash interface in QUAD IO flash mode.", value)
         if value in (20, 24, 28, 29, 30, 31):
             # These pins are not exposed in GPIO mux (reason unknown)
             # but they're missing from IO_MUX list in datasheet
-            raise cv.Invalid("The pin GPIO{} is not usable on ESP32s.".format(value))
+            raise cv.Invalid(f"The pin GPIO{value} is not usable on ESP32s.")
         return value
     if CORE.is_esp8266:
         if value < 0 or value > 17:
-            raise cv.Invalid(u"ESP8266: Invalid pin number: {}".format(value))
+            raise cv.Invalid(f"ESP8266: Invalid pin number: {value}")
         if value in _ESP_SDIO_PINS:
             raise cv.Invalid("This pin cannot be used on ESP8266s and is already used by "
                              "the flash interface (function: {})".format(_ESP_SDIO_PINS[value]))
         if 9 <= value <= 10:
-            _LOGGER.warning(u"ESP8266: Pin %s (9-10) might already be used by the "
-                            u"flash interface in QUAD IO flash mode.", value)
+            _LOGGER.warning("ESP8266: Pin %s (9-10) might already be used by the "
+                            "flash interface in QUAD IO flash mode.", value)
         return value
     raise NotImplementedError
 
@@ -349,8 +347,8 @@ def output_pin(value):
     value = validate_gpio_pin(value)
     if CORE.is_esp32:
         if 34 <= value <= 39:
-            raise cv.Invalid(u"ESP32: GPIO{} (34-39) can only be used as an "
-                             u"input pin.".format(value))
+            raise cv.Invalid("ESP32: GPIO{} (34-39) can only be used as an "
+                             "input pin.".format(value))
         return value
     if CORE.is_esp8266:
         if value == 17:
@@ -364,11 +362,11 @@ def analog_pin(value):
     if CORE.is_esp32:
         if 32 <= value <= 39:  # ADC1
             return value
-        raise cv.Invalid(u"ESP32: Only pins 32 though 39 support ADC.")
+        raise cv.Invalid("ESP32: Only pins 32 though 39 support ADC.")
     if CORE.is_esp8266:
         if value == 17:  # A0
             return value
-        raise cv.Invalid(u"ESP8266: Only pin A0 (GPIO17) supports ADC.")
+        raise cv.Invalid("ESP8266: Only pin A0 (GPIO17) supports ADC.")
     raise NotImplementedError
 
 
diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index 317670710b..59f5bf20ae 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import json
 import logging
 import os
@@ -7,7 +5,6 @@ import re
 import subprocess
 
 from esphome.core import CORE
-from esphome.py_compat import decode_text
 from esphome.util import run_external_command, run_external_process
 
 _LOGGER = logging.getLogger(__name__)
@@ -61,6 +58,7 @@ FILTER_PLATFORMIO_LINES = [
     r'Installing dependencies',
     r'.* @ .* is already installed',
     r'Building in .* mode',
+    r'Advanced Memory Usage is available via .*',
 ]
 
 
@@ -100,8 +98,7 @@ def run_upload(config, verbose, port):
 
 def run_idedata(config):
     args = ['-t', 'idedata']
-    stdout = run_platformio_cli_run(config, False, *args, capture_stdout=True)
-    stdout = decode_text(stdout)
+    stdout = run_platformio_cli_run(config, False, *args, capture_stdout=True).decode()
     match = re.search(r'{\s*".*}', stdout)
     if match is None:
         _LOGGER.debug("Could not match IDEData for %s", stdout)
@@ -172,7 +169,7 @@ def _decode_pc(config, addr):
         return
     command = [idedata.addr2line_path, '-pfiaC', '-e', idedata.firmware_elf_path, addr]
     try:
-        translation = decode_text(subprocess.check_output(command)).strip()
+        translation = subprocess.check_output(command).decode().strip()
     except Exception:  # pylint: disable=broad-except
         _LOGGER.debug("Caught exception for command %s", command, exc_info=1)
         return
@@ -246,7 +243,7 @@ def process_stacktrace(config, line, backtrace_state):
     return backtrace_state
 
 
-class IDEData(object):
+class IDEData:
     def __init__(self, raw):
         if not isinstance(raw, dict):
             self.raw = {}
diff --git a/esphome/py_compat.py b/esphome/py_compat.py
index 6cdaa5b047..e69de29bb2 100644
--- a/esphome/py_compat.py
+++ b/esphome/py_compat.py
@@ -1,89 +0,0 @@
-import functools
-import sys
-import codecs
-
-PYTHON_MAJOR = sys.version_info[0]
-IS_PY2 = PYTHON_MAJOR == 2
-IS_PY3 = PYTHON_MAJOR == 3
-
-
-# pylint: disable=no-else-return
-def safe_input(prompt=None):
-    if IS_PY2:
-        if prompt is None:
-            return raw_input()
-        return raw_input(prompt)
-    else:
-        if prompt is None:
-            return input()
-        return input(prompt)
-
-
-if IS_PY2:
-    text_type = unicode
-    string_types = (str, unicode)
-    integer_types = (int, long)
-    binary_type = str
-else:
-    text_type = str
-    string_types = (str,)
-    integer_types = (int,)
-    binary_type = bytes
-
-
-def byte_to_bytes(val):  # type: (int) -> bytes
-    if IS_PY2:
-        return chr(val)
-    else:
-        return bytes([val])
-
-
-def char_to_byte(val):  # type: (str) -> int
-    if IS_PY2:
-        if isinstance(val, string_types):
-            return ord(val)
-        elif isinstance(val, int):
-            return val
-        else:
-            raise ValueError
-    else:
-        if isinstance(val, str):
-            return ord(val)
-        elif isinstance(val, int):
-            return val
-        else:
-            raise ValueError
-
-
-def format_bytes(val):
-    if IS_PY2:
-        return ' '.join('{:02X}'.format(ord(x)) for x in val)
-    else:
-        return ' '.join('{:02X}'.format(x) for x in val)
-
-
-def sort_by_cmp(list_, cmp):
-    if IS_PY2:
-        list_.sort(cmp=cmp)
-    else:
-        list_.sort(key=functools.cmp_to_key(cmp))
-
-
-def indexbytes(buf, i):
-    if IS_PY3:
-        return buf[i]
-    else:
-        return ord(buf[i])
-
-
-def decode_text(data, encoding='utf-8', errors='strict'):
-    if isinstance(data, text_type):
-        return data
-    return codecs.decode(data, encoding, errors)
-
-
-def encode_text(data, encoding='utf-8', errors='strict'):
-    if isinstance(data, binary_type):
-        return data
-
-    return codecs.encode(data, encoding, errors)
diff --git a/esphome/storage_json.py b/esphome/storage_json.py
index f3e53ce168..b4dc29c9cd 100644
--- a/esphome/storage_json.py
+++ b/esphome/storage_json.py
@@ -13,17 +13,15 @@ from esphome.helpers import write_file_if_changed
 from esphome.core import CoreType
 from typing import Any, Optional, List
 
-from esphome.py_compat import text_type
-
 _LOGGER = logging.getLogger(__name__)
 
 
 def storage_path():  # type: () -> str
-    return CORE.relative_config_path('.esphome', '{}.json'.format(CORE.config_filename))
+    return CORE.relative_config_path('.esphome', f'{CORE.config_filename}.json')
 
 
 def ext_storage_path(base_path, config_filename):  # type: (str, str) -> str
-    return os.path.join(base_path, '.esphome', '{}.json'.format(config_filename))
+    return os.path.join(base_path, '.esphome', f'{config_filename}.json')
 
 
 def esphome_storage_path(base_path):  # type: (str) -> str
@@ -35,7 +33,7 @@ def trash_storage_path(base_path):  # type: (str) -> str
 
 
 # pylint: disable=too-many-instance-attributes
-class StorageJSON(object):
+class StorageJSON:
     def __init__(self, storage_version, name, comment, esphome_version,
                  src_version, arduino_version, address, esp_platform, board, build_path,
                  firmware_bin_path, loaded_integrations):
@@ -85,7 +83,7 @@ class StorageJSON(object):
         }
 
     def to_json(self):
-        return json.dumps(self.as_dict(), indent=2) + u'\n'
+        return json.dumps(self.as_dict(), indent=2) + '\n'
 
     def save(self, path):
         write_file_if_changed(path, self.to_json())
@@ -156,7 +154,7 @@ class StorageJSON(object):
         return isinstance(o, StorageJSON) and self.as_dict() == o.as_dict()
 
 
-class EsphomeStorageJSON(object):
+class EsphomeStorageJSON:
     def __init__(self, storage_version, cookie_secret, last_update_check,
                  remote_version):
         # Version of the storage JSON schema
@@ -189,7 +187,7 @@ class EsphomeStorageJSON(object):
         self.last_update_check_str = new.strftime("%Y-%m-%dT%H:%M:%S")
 
     def to_json(self):  # type: () -> dict
-        return json.dumps(self.as_dict(), indent=2) + u'\n'
+        return json.dumps(self.as_dict(), indent=2) + '\n'
 
     def save(self, path):  # type: (str) -> None
         write_file_if_changed(path, self.to_json())
@@ -216,7 +214,7 @@ class EsphomeStorageJSON(object):
     def get_default():  # type: () -> EsphomeStorageJSON
         return EsphomeStorageJSON(
             storage_version=1,
-            cookie_secret=text_type(binascii.hexlify(os.urandom(64))),
+            cookie_secret=binascii.hexlify(os.urandom(64)).decode(),
             last_update_check=None,
             remote_version=None,
         )
diff --git a/esphome/util.py b/esphome/util.py
index b8e65cd576..6677946b01 100644
--- a/esphome/util.py
+++ b/esphome/util.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import collections
 import io
 import logging
@@ -9,12 +7,11 @@ import subprocess
 import sys
 
 from esphome import const
-from esphome.py_compat import IS_PY2, decode_text, text_type
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class RegistryEntry(object):
+class RegistryEntry:
     def __init__(self, name, fun, type_id, schema):
         self.name = name
         self.fun = fun
@@ -34,7 +31,7 @@ class RegistryEntry(object):
 
 class Registry(dict):
     def __init__(self, base_schema=None, type_id_key=None):
-        super(Registry, self).__init__()
+        super().__init__()
         self.base_schema = base_schema or {}
         self.type_id_key = type_id_key
 
@@ -81,17 +78,17 @@ def safe_print(message=""):
 
 def shlex_quote(s):
     if not s:
-        return u"''"
+        return "''"
     if re.search(r'[^\w@%+=:,./-]', s) is None:
         return s
 
-    return u"'" + s.replace(u"'", u"'\"'\"'") + u"'"
+    return "'" + s.replace("'", "'\"'\"'") + "'"
 
 
 ANSI_ESCAPE = re.compile(r'\033[@-_][0-?]*[ -/]*[@-~]')
 
 
-class RedirectText(object):
+class RedirectText:
     def __init__(self, out, filter_lines=None):
         self._out = out
         if filter_lines is None:
@@ -116,13 +113,12 @@ class RedirectText(object):
         self._out.write(s)
 
     def write(self, s):
-        # s is usually a text_type already (self._out is of type TextIOWrapper)
+        # s is usually a str already (self._out is of type TextIOWrapper)
         # However, s is sometimes also a bytes object in python3. Let's make sure it's a
-        # text_type
+        # str
         # If the conversion fails, we will create an exception, which is okay because we won't
         # be able to print it anyway.
-        text = decode_text(s)
-        assert isinstance(text, text_type)
+        text = s.decode()
 
         if self._filter_pattern is not None:
             self._line_buffer += text
@@ -160,8 +156,8 @@ def run_external_command(func, *cmd, **kwargs):
 
     orig_argv = sys.argv
     orig_exit = sys.exit  # mock sys.exit
-    full_cmd = u' '.join(shlex_quote(x) for x in cmd)
-    _LOGGER.info(u"Running:  %s", full_cmd)
+    full_cmd = ' '.join(shlex_quote(x) for x in cmd)
+    _LOGGER.info("Running:  %s", full_cmd)
 
     filter_lines = kwargs.get('filter_lines')
     orig_stdout = sys.stdout
@@ -182,8 +178,8 @@ def run_external_command(func, *cmd, **kwargs):
     except SystemExit as err:
         return err.args[0]
     except Exception as err:  # pylint: disable=broad-except
-        _LOGGER.error(u"Running command failed: %s", err)
-        _LOGGER.error(u"Please try running %s locally.", full_cmd)
+        _LOGGER.error("Running command failed: %s", err)
+        _LOGGER.error("Please try running %s locally.", full_cmd)
         return 1
     finally:
         sys.argv = orig_argv
@@ -198,8 +194,8 @@ def run_external_command(func, *cmd, **kwargs):
 
 
 def run_external_process(*cmd, **kwargs):
-    full_cmd = u' '.join(shlex_quote(x) for x in cmd)
-    _LOGGER.info(u"Running:  %s", full_cmd)
+    full_cmd = ' '.join(shlex_quote(x) for x in cmd)
+    _LOGGER.info("Running:  %s", full_cmd)
     filter_lines = kwargs.get('filter_lines')
 
     capture_stdout = kwargs.get('capture_stdout', False)
@@ -215,8 +211,8 @@ def run_external_process(*cmd, **kwargs):
                                stdout=sub_stdout,
                                stderr=sub_stderr)
     except Exception as err:  # pylint: disable=broad-except
-        _LOGGER.error(u"Running command failed: %s", err)
-        _LOGGER.error(u"Please try running %s locally.", full_cmd)
+        _LOGGER.error("Running command failed: %s", err)
+        _LOGGER.error("Please try running %s locally.", full_cmd)
         return 1
     finally:
         if capture_stdout:
@@ -233,29 +229,6 @@ class OrderedDict(collections.OrderedDict):
     def __repr__(self):
         return dict(self).__repr__()
 
-    def move_to_end(self, key, last=True):
-        if IS_PY2:
-            if len(self) == 1:
-                return
-            if last:
-                # When moving to end, just pop and re-add
-                val = self.pop(key)
-                self[key] = val
-            else:
-                # When moving to front, use internals here
-                # https://stackoverflow.com/a/16664932
-                root = self._OrderedDict__root  # pylint: disable=no-member
-                first = root[1]
-                link = self._OrderedDict__map[key]  # pylint: disable=no-member
-                link_prev, link_next, _ = link
-                link_prev[1] = link_next
-                link_next[0] = link_prev
-                link[0] = root
-                link[1] = first
-                root[1] = first[0] = link
-        else:
-            super(OrderedDict, self).move_to_end(key, last=last)  # pylint: disable=no-member
-
 
 def list_yaml_files(folder):
     files = filter_yaml_files([os.path.join(folder, p) for p in os.listdir(folder)])
diff --git a/esphome/voluptuous_schema.py b/esphome/voluptuous_schema.py
index 09fa1a6756..8193c1317c 100644
--- a/esphome/voluptuous_schema.py
+++ b/esphome/voluptuous_schema.py
@@ -3,8 +3,6 @@ import itertools
 
 import voluptuous as vol
 
-from esphome.py_compat import string_types
-
 
 class ExtraKeysInvalid(vol.Invalid):
     def __init__(self, *arg, **kwargs):
@@ -22,14 +20,14 @@ def ensure_multiple_invalid(err):
 class _Schema(vol.Schema):
     """Custom cv.Schema that prints similar keys on error."""
     def __init__(self, schema, required=False, extra=vol.PREVENT_EXTRA, extra_schemas=None):
-        super(_Schema, self).__init__(schema, required=required, extra=extra)
+        super().__init__(schema, required=required, extra=extra)
         # List of extra schemas to apply after validation
         # Should be used sparingly, as it's not a very voluptuous-way/clean way of
         # doing things.
         self._extra_schemas = extra_schemas or []
 
     def __call__(self, data):
-        res = super(_Schema, self).__call__(data)
+        res = super().__call__(data)
         for extra in self._extra_schemas:
             try:
                 res = extra(res)
@@ -51,10 +49,10 @@ class _Schema(vol.Schema):
                 raise ValueError("All schema keys must be wrapped in cv.Required or cv.Optional")
 
         # Keys that may be required
-        all_required_keys = set(key for key in schema if isinstance(key, vol.Required))
+        all_required_keys = {key for key in schema if isinstance(key, vol.Required)}
 
         # Keys that may have defaults
-        all_default_keys = set(key for key in schema if isinstance(key, vol.Optional))
+        all_default_keys = {key for key in schema if isinstance(key, vol.Optional)}
 
         # Recursively compile schema
         _compiled_schema = {}
@@ -84,9 +82,9 @@ class _Schema(vol.Schema):
 
         key_names = []
         for skey in schema:
-            if isinstance(skey, string_types):
+            if isinstance(skey, str):
                 key_names.append(skey)
-            elif isinstance(skey, vol.Marker) and isinstance(skey.schema, string_types):
+            elif isinstance(skey, vol.Marker) and isinstance(skey.schema, str):
                 key_names.append(skey.schema)
 
         def validate_mapping(path, iterable, out):
@@ -156,7 +154,7 @@ class _Schema(vol.Schema):
                     if self.extra == vol.ALLOW_EXTRA:
                         out[key] = value
                     elif self.extra != vol.REMOVE_EXTRA:
-                        if isinstance(key, string_types) and key_names:
+                        if isinstance(key, str) and key_names:
                             matches = difflib.get_close_matches(key, key_names)
                             errors.append(ExtraKeysInvalid('extra keys not allowed', key_path,
                                                            candidates=matches))
@@ -195,5 +193,5 @@ class _Schema(vol.Schema):
         schema = schemas[0]
         if isinstance(schema, vol.Schema):
             schema = schema.schema
-        ret = super(_Schema, self).extend(schema, extra=extra)
+        ret = super().extend(schema, extra=extra)
         return _Schema(ret.schema, extra=ret.extra, extra_schemas=self._extra_schemas)
diff --git a/esphome/vscode.py b/esphome/vscode.py
index 6b35d4bd7a..e8c0b106f7 100644
--- a/esphome/vscode.py
+++ b/esphome/vscode.py
@@ -1,19 +1,17 @@
-from __future__ import print_function
-
 import json
 import os
 
+# pylint: disable=unused-import
 from esphome.config import load_config, _format_vol_invalid, Config
 from esphome.core import CORE, DocumentRange
-from esphome.py_compat import text_type, safe_input
+import esphome.config_validation as cv
 
 # pylint: disable=unused-import, wrong-import-order
-import voluptuous as vol
 from typing import Optional
 
 
 def _get_invalid_range(res, invalid):
-    # type: (Config, vol.Invalid) -> Optional[DocumentRange]
+    # type: (Config, cv.Invalid) -> Optional[DocumentRange]
     return res.get_deepest_document_range_for_path(invalid.path)
 
 
@@ -30,7 +28,7 @@ def _dump_range(range):
     }
 
 
-class VSCodeResult(object):
+class VSCodeResult:
     def __init__(self):
         self.yaml_errors = []
         self.validation_errors = []
@@ -57,7 +55,7 @@ class VSCodeResult(object):
 def read_config(args):
     while True:
         CORE.reset()
-        data = json.loads(safe_input())
+        data = json.loads(input())
         assert data['type'] == 'validate'
         CORE.vscode = True
         CORE.ace = args.ace
@@ -70,7 +68,7 @@ def read_config(args):
         try:
             res = load_config()
         except Exception as err:  # pylint: disable=broad-except
-            vs.add_yaml_error(text_type(err))
+            vs.add_yaml_error(str(err))
         else:
             for err in res.errors:
                 try:
diff --git a/esphome/wizard.py b/esphome/wizard.py
index 8cc759f934..b00f6d2b01 100644
--- a/esphome/wizard.py
+++ b/esphome/wizard.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import os
 import random
 import string
@@ -11,7 +9,6 @@ import esphome.config_validation as cv
 from esphome.helpers import color, get_bool_env, write_file
 # pylint: disable=anomalous-backslash-in-string
 from esphome.pins import ESP32_BOARD_PINS, ESP8266_BOARD_PINS
-from esphome.py_compat import safe_input, text_type
 from esphome.storage_json import StorageJSON, ext_storage_path
 from esphome.util import safe_print
 
@@ -44,7 +41,7 @@ OTA_BIG = r"""       ____ _______
       \____/  |_/_/    \_\\
 """
 
-BASE_CONFIG = u"""esphome:
+BASE_CONFIG = """esphome:
   name: {name}
   platform: {platform}
   board: {board}
@@ -75,7 +72,7 @@ def sanitize_double_quotes(value):
 def wizard_file(**kwargs):
     letters = string.ascii_letters + string.digits
     ap_name_base = kwargs['name'].replace('_', ' ').title()
-    ap_name = "{} Fallback Hotspot".format(ap_name_base)
+    ap_name = f"{ap_name_base} Fallback Hotspot"
     if len(ap_name) > 32:
         ap_name = ap_name_base
     kwargs['fallback_name'] = ap_name
@@ -84,9 +81,9 @@ def wizard_file(**kwargs):
     config = BASE_CONFIG.format(**kwargs)
 
     if kwargs['password']:
-        config += u'  password: "{0}"\n\nota:\n  password: "{0}"\n'.format(kwargs['password'])
+        config += '  password: "{0}"\n\nota:\n  password: "{0}"\n'.format(kwargs['password'])
     else:
-        config += u"\nota:\n"
+        config += "\nota:\n"
 
     return config
 
@@ -119,7 +116,7 @@ else:
 def safe_print_step(step, big):
     safe_print()
     safe_print()
-    safe_print("============= STEP {} =============".format(step))
+    safe_print(f"============= STEP {step} =============")
     safe_print(big)
     safe_print("===================================")
     sleep(0.25)
@@ -127,24 +124,24 @@ def safe_print_step(step, big):
 
 def default_input(text, default):
     safe_print()
-    safe_print(u"Press ENTER for default ({})".format(default))
-    return safe_input(text.format(default)) or default
+    safe_print(f"Press ENTER for default ({default})")
+    return input(text.format(default)) or default
 
 
 # From https://stackoverflow.com/a/518232/8924614
 def strip_accents(value):
-    return u''.join(c for c in unicodedata.normalize('NFD', text_type(value))
-                    if unicodedata.category(c) != 'Mn')
+    return ''.join(c for c in unicodedata.normalize('NFD', str(value))
+                   if unicodedata.category(c) != 'Mn')
 
 
 def wizard(path):
     if not path.endswith('.yaml') and not path.endswith('.yml'):
-        safe_print(u"Please make your configuration file {} have the extension .yaml or .yml"
-                   u"".format(color('cyan', path)))
+        safe_print("Please make your configuration file {} have the extension .yaml or .yml"
+                   "".format(color('cyan', path)))
         return 1
     if os.path.exists(path):
-        safe_print(u"Uh oh, it seems like {} already exists, please delete that file first "
-                   u"or chose another configuration file.".format(color('cyan', path)))
+        safe_print("Uh oh, it seems like {} already exists, please delete that file first "
+                   "or chose another configuration file.".format(color('cyan', path)))
         return 1
     safe_print("Hi there!")
     sleep(1.5)
@@ -164,21 +161,21 @@ def wizard(path):
         color('bold_white', "livingroom")))
     safe_print()
     sleep(1)
-    name = safe_input(color("bold_white", "(name): "))
+    name = input(color("bold_white", "(name): "))
     while True:
         try:
             name = cv.valid_name(name)
             break
         except vol.Invalid:
-            safe_print(color("red", u"Oh noes, \"{}\" isn't a valid name. Names can only include "
-                                    u"numbers, letters and underscores.".format(name)))
+            safe_print(color("red", "Oh noes, \"{}\" isn't a valid name. Names can only include "
+                                    "numbers, letters and underscores.".format(name)))
             name = strip_accents(name).replace(' ', '_')
-            name = u''.join(c for c in name if c in cv.ALLOWED_NAME_CHARS)
-            safe_print(u"Shall I use \"{}\" as the name instead?".format(color('cyan', name)))
+            name = ''.join(c for c in name if c in cv.ALLOWED_NAME_CHARS)
+            safe_print("Shall I use \"{}\" as the name instead?".format(color('cyan', name)))
             sleep(0.5)
-            name = default_input(u"(name [{}]): ", name)
+            name = default_input("(name [{}]): ", name)
 
-    safe_print(u"Great! Your node is now called \"{}\".".format(color('cyan', name)))
+    safe_print("Great! Your node is now called \"{}\".".format(color('cyan', name)))
     sleep(1)
     safe_print_step(2, ESP_BIG)
     safe_print("Now I'd like to know what microcontroller you're using so that I can compile "
@@ -189,14 +186,14 @@ def wizard(path):
         sleep(0.5)
         safe_print()
         safe_print("Please enter either ESP32 or ESP8266.")
-        platform = safe_input(color("bold_white", "(ESP32/ESP8266): "))
+        platform = input(color("bold_white", "(ESP32/ESP8266): "))
         try:
             platform = vol.All(vol.Upper, vol.Any('ESP32', 'ESP8266'))(platform)
             break
         except vol.Invalid:
-            safe_print(u"Unfortunately, I can't find an espressif microcontroller called "
-                       u"\"{}\". Please try again.".format(platform))
-    safe_print(u"Thanks! You've chosen {} as your platform.".format(color('cyan', platform)))
+            safe_print("Unfortunately, I can't find an espressif microcontroller called "
+                       "\"{}\". Please try again.".format(platform))
+    safe_print("Thanks! You've chosen {} as your platform.".format(color('cyan', platform)))
     safe_print()
     sleep(1)
 
@@ -221,17 +218,17 @@ def wizard(path):
     safe_print("Options: {}".format(', '.join(sorted(boards))))
 
     while True:
-        board = safe_input(color("bold_white", "(board): "))
+        board = input(color("bold_white", "(board): "))
         try:
             board = vol.All(vol.Lower, vol.Any(*boards))(board)
             break
         except vol.Invalid:
-            safe_print(color('red', "Sorry, I don't think the board \"{}\" exists.".format(board)))
+            safe_print(color('red', f"Sorry, I don't think the board \"{board}\" exists."))
             safe_print()
             sleep(0.25)
             safe_print()
 
-    safe_print(u"Way to go! You've chosen {} as your board.".format(color('cyan', board)))
+    safe_print("Way to go! You've chosen {} as your board.".format(color('cyan', board)))
     safe_print()
     sleep(1)
 
@@ -241,22 +238,22 @@ def wizard(path):
     safe_print()
     sleep(1)
     safe_print("First, what's the " + color('green', 'SSID') +
-               u" (the name) of the WiFi network {} I should connect to?".format(name))
+               f" (the name) of the WiFi network {name} I should connect to?")
     sleep(1.5)
     safe_print("For example \"{}\".".format(color('bold_white', "Abraham Linksys")))
     while True:
-        ssid = safe_input(color('bold_white', "(ssid): "))
+        ssid = input(color('bold_white', "(ssid): "))
         try:
             ssid = cv.ssid(ssid)
             break
         except vol.Invalid:
-            safe_print(color('red', u"Unfortunately, \"{}\" doesn't seem to be a valid SSID. "
-                                    u"Please try again.".format(ssid)))
+            safe_print(color('red', "Unfortunately, \"{}\" doesn't seem to be a valid SSID. "
+                                    "Please try again.".format(ssid)))
             safe_print()
             sleep(1)
 
-    safe_print(u"Thank you very much! You've just chosen \"{}\" as your SSID."
-               u"".format(color('cyan', ssid)))
+    safe_print("Thank you very much! You've just chosen \"{}\" as your SSID."
+               "".format(color('cyan', ssid)))
     safe_print()
     sleep(0.75)
 
@@ -265,7 +262,7 @@ def wizard(path):
     safe_print()
     safe_print("For example \"{}\"".format(color('bold_white', 'PASSWORD42')))
     sleep(0.5)
-    psk = safe_input(color('bold_white', '(PSK): '))
+    psk = input(color('bold_white', '(PSK): '))
     safe_print("Perfect! WiFi is now set up (you can create static IPs and so on later).")
     sleep(1.5)
 
@@ -277,7 +274,7 @@ def wizard(path):
     safe_print()
     sleep(0.25)
     safe_print("Press ENTER for no password")
-    password = safe_input(color('bold_white', '(password): '))
+    password = input(color('bold_white', '(password): '))
 
     wizard_write(path=path, name=name, platform=platform, board=board,
                  ssid=ssid, psk=psk, password=password)
diff --git a/esphome/writer.py b/esphome/writer.py
index b036413a66..b3a60c5de9 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import logging
 import os
 import re
@@ -14,19 +12,19 @@ from esphome.storage_json import StorageJSON, storage_path
 
 _LOGGER = logging.getLogger(__name__)
 
-CPP_AUTO_GENERATE_BEGIN = u'// ========== AUTO GENERATED CODE BEGIN ==========='
-CPP_AUTO_GENERATE_END = u'// =========== AUTO GENERATED CODE END ============'
-CPP_INCLUDE_BEGIN = u'// ========== AUTO GENERATED INCLUDE BLOCK BEGIN ==========='
-CPP_INCLUDE_END = u'// ========== AUTO GENERATED INCLUDE BLOCK END ==========='
-INI_AUTO_GENERATE_BEGIN = u'; ========== AUTO GENERATED CODE BEGIN ==========='
-INI_AUTO_GENERATE_END = u'; =========== AUTO GENERATED CODE END ============'
+CPP_AUTO_GENERATE_BEGIN = '// ========== AUTO GENERATED CODE BEGIN ==========='
+CPP_AUTO_GENERATE_END = '// =========== AUTO GENERATED CODE END ============'
+CPP_INCLUDE_BEGIN = '// ========== AUTO GENERATED INCLUDE BLOCK BEGIN ==========='
+CPP_INCLUDE_END = '// ========== AUTO GENERATED INCLUDE BLOCK END ==========='
+INI_AUTO_GENERATE_BEGIN = '; ========== AUTO GENERATED CODE BEGIN ==========='
+INI_AUTO_GENERATE_END = '; =========== AUTO GENERATED CODE END ============'
 
-CPP_BASE_FORMAT = (u"""// Auto generated code by esphome
-""", u""""
+CPP_BASE_FORMAT = ("""// Auto generated code by esphome
+""", """"
 
 void setup() {
   // ===== DO NOT EDIT ANYTHING BELOW THIS LINE =====
-  """, u"""
+  """, """
   // ========= YOU CAN EDIT AFTER THIS LINE =========
   App.setup();
 }
@@ -36,7 +34,7 @@ void loop() {
 }
 """)
 
-INI_BASE_FORMAT = (u"""; Auto generated code by esphome
+INI_BASE_FORMAT = ("""; Auto generated code by esphome
 
 [common]
 lib_deps =
@@ -44,7 +42,7 @@ build_flags =
 upload_flags =
 
 ; ===== DO NOT EDIT ANYTHING BELOW THIS LINE =====
-""", u"""
+""", """
 ; ========= YOU CAN EDIT AFTER THIS LINE =========
 
 """)
@@ -62,8 +60,8 @@ def get_flags(key):
 
 
 def get_include_text():
-    include_text = u'#include "esphome.h"\n' \
-                   u'using namespace esphome;\n'
+    include_text = '#include "esphome.h"\n' \
+                   'using namespace esphome;\n'
     for _, component, conf in iter_components(CORE.config):
         if not hasattr(component, 'includes'):
             continue
@@ -106,7 +104,7 @@ def migrate_src_version_0_to_1():
 
     if CPP_INCLUDE_BEGIN not in content:
         content, count = replace_file_content(content, r'#include "esphomelib/application.h"',
-                                              CPP_INCLUDE_BEGIN + u'\n' + CPP_INCLUDE_END)
+                                              CPP_INCLUDE_BEGIN + '\n' + CPP_INCLUDE_END)
         if count == 0:
             _LOGGER.error("Migration failed. ESPHome 1.10.0 needs to have a new auto-generated "
                           "include section in the %s file. Please remove %s and let it be "
@@ -160,14 +158,14 @@ def update_storage_json():
 
 
 def format_ini(data):
-    content = u''
+    content = ''
     for key, value in sorted(data.items()):
         if isinstance(value, (list, set, tuple)):
-            content += u'{} =\n'.format(key)
+            content += f'{key} =\n'
             for x in value:
-                content += u'    {}\n'.format(x)
+                content += f'    {x}\n'
         else:
-            content += u'{} = {}\n'.format(key, value)
+            content += f'{key} = {value}\n'
     return content
 
 
@@ -216,7 +214,7 @@ def get_ini_content():
     # data['lib_ldf_mode'] = 'chain'
     data.update(CORE.config[CONF_ESPHOME].get(CONF_PLATFORMIO_OPTIONS, {}))
 
-    content = u'[env:{}]\n'.format(CORE.name)
+    content = f'[env:{CORE.name}]\n'
     content += format_ini(data)
 
     return content
@@ -225,18 +223,18 @@ def get_ini_content():
 def find_begin_end(text, begin_s, end_s):
     begin_index = text.find(begin_s)
     if begin_index == -1:
-        raise EsphomeError(u"Could not find auto generated code begin in file, either "
-                           u"delete the main sketch file or insert the comment again.")
+        raise EsphomeError("Could not find auto generated code begin in file, either "
+                           "delete the main sketch file or insert the comment again.")
     if text.find(begin_s, begin_index + 1) != -1:
-        raise EsphomeError(u"Found multiple auto generate code begins, don't know "
-                           u"which to chose, please remove one of them.")
+        raise EsphomeError("Found multiple auto generate code begins, don't know "
+                           "which to chose, please remove one of them.")
     end_index = text.find(end_s)
     if end_index == -1:
-        raise EsphomeError(u"Could not find auto generated code end in file, either "
-                           u"delete the main sketch file or insert the comment again.")
+        raise EsphomeError("Could not find auto generated code end in file, either "
+                           "delete the main sketch file or insert the comment again.")
     if text.find(end_s, end_index + 1) != -1:
-        raise EsphomeError(u"Found multiple auto generate code endings, don't know "
-                           u"which to chose, please remove one of them.")
+        raise EsphomeError("Found multiple auto generate code endings, don't know "
+                           "which to chose, please remove one of them.")
 
     return text[:begin_index], text[(end_index + len(end_s)):]
 
@@ -263,17 +261,17 @@ def write_platformio_project():
     write_platformio_ini(content)
 
 
-DEFINES_H_FORMAT = ESPHOME_H_FORMAT = u"""\
+DEFINES_H_FORMAT = ESPHOME_H_FORMAT = """\
 #pragma once
 {}
 """
-VERSION_H_FORMAT = u"""\
+VERSION_H_FORMAT = """\
 #pragma once
 #define ESPHOME_VERSION "{}"
 """
 DEFINES_H_TARGET = 'esphome/core/defines.h'
 VERSION_H_TARGET = 'esphome/core/version.h'
-ESPHOME_README_TXT = u"""
+ESPHOME_README_TXT = """
 THIS DIRECTORY IS AUTO-GENERATED, DO NOT MODIFY
 
 ESPHome automatically populates the esphome/ directory, and any
@@ -298,9 +296,9 @@ def copy_src_tree():
     include_l = []
     for target, path in source_files_l:
         if os.path.splitext(path)[1] in HEADER_FILE_EXTENSIONS:
-            include_l.append(u'#include "{}"'.format(target))
-    include_l.append(u'')
-    include_s = u'\n'.join(include_l)
+            include_l.append(f'#include "{target}"')
+    include_l.append('')
+    include_s = '\n'.join(include_l)
 
     source_files_copy = source_files.copy()
     source_files_copy.pop(DEFINES_H_TARGET)
@@ -340,7 +338,7 @@ def copy_src_tree():
 def generate_defines_h():
     define_content_l = [x.as_macro for x in CORE.defines]
     define_content_l.sort()
-    return DEFINES_H_FORMAT.format(u'\n'.join(define_content_l))
+    return DEFINES_H_FORMAT.format('\n'.join(define_content_l))
 
 
 def write_cpp(code_s):
@@ -354,11 +352,11 @@ def write_cpp(code_s):
         code_format = CPP_BASE_FORMAT
 
     copy_src_tree()
-    global_s = u'#include "esphome.h"\n'
+    global_s = '#include "esphome.h"\n'
     global_s += CORE.cpp_global_section
 
-    full_file = code_format[0] + CPP_INCLUDE_BEGIN + u'\n' + global_s + CPP_INCLUDE_END
-    full_file += code_format[1] + CPP_AUTO_GENERATE_BEGIN + u'\n' + code_s + CPP_AUTO_GENERATE_END
+    full_file = code_format[0] + CPP_INCLUDE_BEGIN + '\n' + global_s + CPP_INCLUDE_END
+    full_file += code_format[1] + CPP_AUTO_GENERATE_BEGIN + '\n' + code_s + CPP_AUTO_GENERATE_END
     full_file += code_format[2]
     write_file_if_changed(path, full_file)
 
diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index 0e5b4593e9..053fba6274 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import fnmatch
 import functools
 import inspect
@@ -15,7 +13,6 @@ from esphome import core
 from esphome.config_helpers import read_config_file
 from esphome.core import EsphomeError, IPAddress, Lambda, MACAddress, TimePeriod, DocumentRange
 from esphome.helpers import add_class_to_obj
-from esphome.py_compat import text_type, IS_PY2
 from esphome.util import OrderedDict, filter_yaml_files
 
 _LOGGER = logging.getLogger(__name__)
@@ -23,12 +20,12 @@ _LOGGER = logging.getLogger(__name__)
 # Mostly copied from Home Assistant because that code works fine and
 # let's not reinvent the wheel here
 
-SECRET_YAML = u'secrets.yaml'
+SECRET_YAML = 'secrets.yaml'
 _SECRET_CACHE = {}
 _SECRET_VALUES = {}
 
 
-class ESPHomeDataBase(object):
+class ESPHomeDataBase:
     @property
     def esp_range(self):
         return getattr(self, '_esp_range', None)
@@ -38,7 +35,7 @@ class ESPHomeDataBase(object):
         self._esp_range = DocumentRange.from_marks(node.start_mark, node.end_mark)
 
 
-class ESPForceValue(object):
+class ESPForceValue:
     pass
 
 
@@ -74,27 +71,27 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
 
     @_add_data_ref
     def construct_yaml_int(self, node):
-        return super(ESPHomeLoader, self).construct_yaml_int(node)
+        return super().construct_yaml_int(node)
 
     @_add_data_ref
     def construct_yaml_float(self, node):
-        return super(ESPHomeLoader, self).construct_yaml_float(node)
+        return super().construct_yaml_float(node)
 
     @_add_data_ref
     def construct_yaml_binary(self, node):
-        return super(ESPHomeLoader, self).construct_yaml_binary(node)
+        return super().construct_yaml_binary(node)
 
     @_add_data_ref
     def construct_yaml_omap(self, node):
-        return super(ESPHomeLoader, self).construct_yaml_omap(node)
+        return super().construct_yaml_omap(node)
 
     @_add_data_ref
     def construct_yaml_str(self, node):
-        return super(ESPHomeLoader, self).construct_yaml_str(node)
+        return super().construct_yaml_str(node)
 
     @_add_data_ref
     def construct_yaml_seq(self, node):
-        return super(ESPHomeLoader, self).construct_yaml_seq(node)
+        return super().construct_yaml_seq(node)
 
     @_add_data_ref
     def construct_yaml_map(self, node):
@@ -130,12 +127,12 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
                     hash(key)
                 except TypeError:
                     raise yaml.constructor.ConstructorError(
-                        'Invalid key "{}" (not hashable)'.format(key), key_node.start_mark)
+                        f'Invalid key "{key}" (not hashable)', key_node.start_mark)
 
                 # Check if it is a duplicate key
                 if key in seen_keys:
                     raise yaml.constructor.ConstructorError(
-                        'Duplicate key "{}"'.format(key), key_node.start_mark,
+                        f'Duplicate key "{key}"', key_node.start_mark,
                         'NOTE: Previous declaration here:', seen_keys[key],
                     )
                 seen_keys[key] = key_node.start_mark
@@ -194,11 +191,11 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
         args = node.value.split()
         # Check for a default value
         if len(args) > 1:
-            return os.getenv(args[0], u' '.join(args[1:]))
+            return os.getenv(args[0], ' '.join(args[1:]))
         if args[0] in os.environ:
             return os.environ[args[0]]
         raise yaml.MarkedYAMLError(
-            u"Environment variable '{}' not defined".format(node.value), node.start_mark
+            f"Environment variable '{node.value}' not defined", node.start_mark
         )
 
     @property
@@ -213,10 +210,10 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
         secrets = _load_yaml_internal(self._rel_path(SECRET_YAML))
         if node.value not in secrets:
             raise yaml.MarkedYAMLError(
-                u"Secret '{}' not defined".format(node.value), node.start_mark
+                f"Secret '{node.value}' not defined", node.start_mark
             )
         val = secrets[node.value]
-        _SECRET_VALUES[text_type(val)] = node.value
+        _SECRET_VALUES[str(val)] = node.value
         return val
 
     @_add_data_ref
@@ -259,7 +256,7 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
 
     @_add_data_ref
     def construct_lambda(self, node):
-        return Lambda(text_type(node.value))
+        return Lambda(str(node.value))
 
     @_add_data_ref
     def construct_force(self, node):
@@ -267,13 +264,13 @@ class ESPHomeLoader(yaml.SafeLoader):  # pylint: disable=too-many-ancestors
         return add_class_to_obj(obj, ESPForceValue)
 
 
-ESPHomeLoader.add_constructor(u'tag:yaml.org,2002:int', ESPHomeLoader.construct_yaml_int)
-ESPHomeLoader.add_constructor(u'tag:yaml.org,2002:float', ESPHomeLoader.construct_yaml_float)
-ESPHomeLoader.add_constructor(u'tag:yaml.org,2002:binary', ESPHomeLoader.construct_yaml_binary)
-ESPHomeLoader.add_constructor(u'tag:yaml.org,2002:omap', ESPHomeLoader.construct_yaml_omap)
-ESPHomeLoader.add_constructor(u'tag:yaml.org,2002:str', ESPHomeLoader.construct_yaml_str)
-ESPHomeLoader.add_constructor(u'tag:yaml.org,2002:seq', ESPHomeLoader.construct_yaml_seq)
-ESPHomeLoader.add_constructor(u'tag:yaml.org,2002:map', ESPHomeLoader.construct_yaml_map)
+ESPHomeLoader.add_constructor('tag:yaml.org,2002:int', ESPHomeLoader.construct_yaml_int)
+ESPHomeLoader.add_constructor('tag:yaml.org,2002:float', ESPHomeLoader.construct_yaml_float)
+ESPHomeLoader.add_constructor('tag:yaml.org,2002:binary', ESPHomeLoader.construct_yaml_binary)
+ESPHomeLoader.add_constructor('tag:yaml.org,2002:omap', ESPHomeLoader.construct_yaml_omap)
+ESPHomeLoader.add_constructor('tag:yaml.org,2002:str', ESPHomeLoader.construct_yaml_str)
+ESPHomeLoader.add_constructor('tag:yaml.org,2002:seq', ESPHomeLoader.construct_yaml_seq)
+ESPHomeLoader.add_constructor('tag:yaml.org,2002:map', ESPHomeLoader.construct_yaml_map)
 ESPHomeLoader.add_constructor('!env_var', ESPHomeLoader.construct_env_var)
 ESPHomeLoader.add_constructor('!secret', ESPHomeLoader.construct_secret)
 ESPHomeLoader.add_constructor('!include', ESPHomeLoader.construct_include)
@@ -313,7 +310,7 @@ def dump(dict_):
 
 def _is_file_valid(name):
     """Decide if a file is valid."""
-    return not name.startswith(u'.')
+    return not name.startswith('.')
 
 
 def _find_files(directory, pattern):
@@ -328,7 +325,7 @@ def _find_files(directory, pattern):
 
 def is_secret(value):
     try:
-        return _SECRET_VALUES[text_type(value)]
+        return _SECRET_VALUES[str(value)]
     except (KeyError, ValueError):
         return None
 
@@ -358,31 +355,31 @@ class ESPHomeDumper(yaml.SafeDumper):  # pylint: disable=too-many-ancestors
         return node
 
     def represent_secret(self, value):
-        return self.represent_scalar(tag=u'!secret', value=_SECRET_VALUES[text_type(value)])
+        return self.represent_scalar(tag='!secret', value=_SECRET_VALUES[str(value)])
 
     def represent_stringify(self, value):
         if is_secret(value):
             return self.represent_secret(value)
-        return self.represent_scalar(tag=u'tag:yaml.org,2002:str', value=text_type(value))
+        return self.represent_scalar(tag='tag:yaml.org,2002:str', value=str(value))
 
     # pylint: disable=arguments-differ
     def represent_bool(self, value):
-        return self.represent_scalar(u'tag:yaml.org,2002:bool', u'true' if value else u'false')
+        return self.represent_scalar('tag:yaml.org,2002:bool', 'true' if value else 'false')
 
     def represent_int(self, value):
         if is_secret(value):
             return self.represent_secret(value)
-        return self.represent_scalar(tag=u'tag:yaml.org,2002:int', value=text_type(value))
+        return self.represent_scalar(tag='tag:yaml.org,2002:int', value=str(value))
 
     def represent_float(self, value):
         if is_secret(value):
             return self.represent_secret(value)
         if math.isnan(value):
-            value = u'.nan'
+            value = '.nan'
         elif math.isinf(value):
-            value = u'.inf' if value > 0 else u'-.inf'
+            value = '.inf' if value > 0 else '-.inf'
         else:
-            value = text_type(repr(value)).lower()
+            value = str(repr(value)).lower()
             # Note that in some cases `repr(data)` represents a float number
             # without the decimal parts.  For instance:
             #   >>> repr(1e17)
@@ -390,9 +387,9 @@ class ESPHomeDumper(yaml.SafeDumper):  # pylint: disable=too-many-ancestors
             # Unfortunately, this is not a valid float representation according
             # to the definition of the `!!float` tag.  We fix this by adding
             # '.0' before the 'e' symbol.
-            if u'.' not in value and u'e' in value:
-                value = value.replace(u'e', u'.0e', 1)
-        return self.represent_scalar(tag=u'tag:yaml.org,2002:float', value=value)
+            if '.' not in value and 'e' in value:
+                value = value.replace('e', '.0e', 1)
+        return self.represent_scalar(tag='tag:yaml.org,2002:float', value=value)
 
     def represent_lambda(self, value):
         if is_secret(value.value):
@@ -417,9 +414,6 @@ ESPHomeDumper.add_multi_representer(bool, ESPHomeDumper.represent_bool)
 ESPHomeDumper.add_multi_representer(str, ESPHomeDumper.represent_stringify)
 ESPHomeDumper.add_multi_representer(int, ESPHomeDumper.represent_int)
 ESPHomeDumper.add_multi_representer(float, ESPHomeDumper.represent_float)
-if IS_PY2:
-    ESPHomeDumper.add_multi_representer(unicode, ESPHomeDumper.represent_stringify)
-    ESPHomeDumper.add_multi_representer(long, ESPHomeDumper.represent_int)
 ESPHomeDumper.add_multi_representer(IPAddress, ESPHomeDumper.represent_stringify)
 ESPHomeDumper.add_multi_representer(MACAddress, ESPHomeDumper.represent_stringify)
 ESPHomeDumper.add_multi_representer(TimePeriod, ESPHomeDumper.represent_stringify)
diff --git a/esphome/zeroconf.py b/esphome/zeroconf.py
index 9c8f8eab77..a8ca5b3c53 100644
--- a/esphome/zeroconf.py
+++ b/esphome/zeroconf.py
@@ -12,8 +12,6 @@ import time
 
 import ifaddr
 
-from esphome.py_compat import indexbytes, text_type
-
 log = logging.getLogger(__name__)
 
 # Some timing constants
@@ -83,7 +81,7 @@ class IncomingDecodeError(Error):
 
 
 # pylint: disable=no-init
-class QuietLogger(object):
+class QuietLogger:
     _seen_logs = {}
 
     @classmethod
@@ -112,7 +110,7 @@ class QuietLogger(object):
         logger(*args)
 
 
-class DNSEntry(object):
+class DNSEntry:
     """A DNS entry"""
 
     def __init__(self, name, type_, class_):
@@ -281,7 +279,7 @@ class DNSIncoming(QuietLogger):
 
     def read_utf(self, offset, length):
         """Reads a UTF-8 string of a given length from the packet"""
-        return text_type(self.data[offset:offset + length], 'utf-8', 'replace')
+        return str(self.data[offset:offset + length], 'utf-8', 'replace')
 
     def read_name(self):
         """Reads a domain name from the packet"""
@@ -291,7 +289,7 @@ class DNSIncoming(QuietLogger):
         first = off
 
         while True:
-            length = indexbytes(self.data, off)
+            length = self.data[off]
             off += 1
             if length == 0:
                 break
@@ -302,13 +300,13 @@ class DNSIncoming(QuietLogger):
             elif t == 0xC0:
                 if next_ < 0:
                     next_ = off + 1
-                off = ((length & 0x3F) << 8) | indexbytes(self.data, off)
+                off = ((length & 0x3F) << 8) | self.data[off]
                 if off >= first:
                     raise IncomingDecodeError(
-                        "Bad domain name (circular) at %s" % (off,))
+                        f"Bad domain name (circular) at {off}")
                 first = off
             else:
-                raise IncomingDecodeError("Bad domain name at %s" % (off,))
+                raise IncomingDecodeError(f"Bad domain name at {off}")
 
         if next_ >= 0:
             self.offset = next_
@@ -318,7 +316,7 @@ class DNSIncoming(QuietLogger):
         return result
 
 
-class DNSOutgoing(object):
+class DNSOutgoing:
     """Object representation of an outgoing packet"""
 
     def __init__(self, flags):
@@ -461,7 +459,7 @@ class Engine(threading.Thread):
                             if reader:
                                 reader.handle_read(socket_)
 
-                except (select.error, socket.error) as e:
+                except OSError as e:
                     # If the socket was closed by another thread, during
                     # shutdown, ignore it and exit
                     if e.args[0] != socket.EBADF or not self.zc.done:
@@ -500,7 +498,7 @@ class Listener(QuietLogger):
             self.zc.handle_response(msg)
 
 
-class RecordUpdateListener(object):
+class RecordUpdateListener:
     def update_record(self, zc, now, record):
         raise NotImplementedError()
 
@@ -578,7 +576,7 @@ class DashboardStatus(RecordUpdateListener, threading.Thread):
         self.on_update({key: self.host_status(key) for key in self.key_to_host})
 
     def request_query(self, hosts):
-        self.query_hosts = set(host for host in hosts.values())
+        self.query_hosts = set(hosts.values())
         self.key_to_host = hosts
         self.query_event.set()
 
@@ -605,12 +603,12 @@ class DashboardStatus(RecordUpdateListener, threading.Thread):
 
 
 def get_all_addresses():
-    return list(set(
+    return list({
         addr.ip
         for iface in ifaddr.get_adapters()
         for addr in iface.ips
         if addr.is_IPv4 and addr.network_prefix != 32  # Host only netmask 255.255.255.255
-    ))
+    })
 
 
 def new_socket():
@@ -631,7 +629,7 @@ def new_socket():
     else:
         try:
             s.setsockopt(socket.SOL_SOCKET, reuseport, 1)
-        except (OSError, socket.error) as err:
+        except OSError as err:
             # OSError on python 3, socket.error on python 2
             if err.errno != errno.ENOPROTOOPT:
                 raise
@@ -662,7 +660,7 @@ class Zeroconf(QuietLogger):
                 _value = socket.inet_aton(_MDNS_ADDR) + socket.inet_aton(i)
                 self._listen_socket.setsockopt(
                     socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, _value)
-            except socket.error as e:
+            except OSError as e:
                 _errno = e.args[0]
                 if _errno == errno.EADDRINUSE:
                     log.info(
diff --git a/pylintrc b/pylintrc
index 89cc73656f..c65a9a7cd9 100644
--- a/pylintrc
+++ b/pylintrc
@@ -25,9 +25,3 @@ disable=
   stop-iteration-return,
   no-self-use,
   import-outside-toplevel,
-
-
-additional-builtins=
-  unicode,
-  long,
-  raw_input
diff --git a/requirements.txt b/requirements.txt
index b8af2a605b..8c763ef9a6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,6 @@ PyYAML==5.2
 paho-mqtt==1.5.0
 colorlog==4.0.2
 tornado==5.1.1
-typing>=3.6.6;python_version<"3.5"
 protobuf==3.11.1
 tzlocal==2.0.0
 pytz==2019.3
diff --git a/requirements_test.txt b/requirements_test.txt
index ff02badf80..7711b3867a 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -3,7 +3,6 @@ PyYAML==5.2
 paho-mqtt==1.5.0
 colorlog==4.0.2
 tornado==5.1.1
-typing>=3.6.6;python_version<"3.5"
 protobuf==3.11.1
 tzlocal==2.0.0
 pytz==2019.3
diff --git a/script/api_protobuf/api_options_pb2.py b/script/api_protobuf/api_options_pb2.py
index 52cbbde678..e690a2c5d7 100644
--- a/script/api_protobuf/api_options_pb2.py
+++ b/script/api_protobuf/api_options_pb2.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: api_options.proto
 
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 8373e0bd66..2ecaec10bd 100644
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -39,12 +39,12 @@ content = prot.read_bytes()
 d = descriptor.FileDescriptorSet.FromString(content)
 
 
-def indent_list(text, padding=u'  '):
+def indent_list(text, padding='  '):
     return [padding + line for line in text.splitlines()]
 
 
-def indent(text, padding=u'  '):
-    return u'\n'.join(indent_list(text, padding))
+def indent(text, padding='  '):
+    return '\n'.join(indent_list(text, padding))
 
 
 def camel_to_snake(name):
@@ -432,7 +432,7 @@ class SInt64Type(TypeInfo):
 
 class RepeatedTypeInfo(TypeInfo):
     def __init__(self, field):
-        super(RepeatedTypeInfo, self).__init__(field)
+        super().__init__(field)
         self._ti = TYPE_INFO[field.type](field)
 
     @property
diff --git a/script/build_compile_commands.py b/script/build_compile_commands.py
index 31e4c2fa56..f0fc48ad98 100755
--- a/script/build_compile_commands.py
+++ b/script/build_compile_commands.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 import sys
 import os.path
 
diff --git a/script/ci-custom.py b/script/ci-custom.py
index 51b7b9d9b5..b2b838cb5b 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python
-from __future__ import print_function
+#!/usr/bin/env python3
 
 import codecs
 import collections
@@ -105,7 +104,7 @@ def lint_re_check(regex, **kwargs):
                 err = func(fname, match)
                 if err is None:
                     continue
-                errors.append("{} See line {}.".format(err, lineno))
+                errors.append(f"{err} See line {lineno}.")
             return errors
         return decor(new_func)
     return decorator
@@ -134,7 +133,7 @@ def lint_ino(fname):
     return "This file extension (.ino) is not allowed. Please use either .cpp or .h"
 
 
-@lint_file_check(exclude=['*{}'.format(f) for f in file_types] + [
+@lint_file_check(exclude=[f'*{f}' for f in file_types] + [
     '.clang-*', '.dockerignore', '.editorconfig', '*.gitignore', 'LICENSE', 'pylintrc',
     'MANIFEST.in', 'docker/Dockerfile*', 'docker/rootfs/*', 'script/*',
 ])
@@ -177,7 +176,7 @@ CPP_RE_EOL = r'\s*?(?://.*?)?$'
 
 
 def highlight(s):
-    return '\033[36m{}\033[0m'.format(s)
+    return f'\033[36m{s}\033[0m'
 
 
 @lint_re_check(r'^#define\s+([a-zA-Z0-9_]+)\s+([0-9bx]+)' + CPP_RE_EOL,
@@ -268,7 +267,7 @@ def lint_constants_usage():
 def relative_cpp_search_text(fname, content):
     parts = fname.split('/')
     integration = parts[2]
-    return '#include "esphome/components/{}'.format(integration)
+    return f'#include "esphome/components/{integration}'
 
 
 @lint_content_find_check(relative_cpp_search_text, include=['esphome/components/*.cpp'])
@@ -284,7 +283,7 @@ def lint_relative_cpp_import(fname):
 def relative_py_search_text(fname, content):
     parts = fname.split('/')
     integration = parts[2]
-    return 'esphome.components.{}'.format(integration)
+    return f'esphome.components.{integration}'
 
 
 @lint_content_find_check(relative_py_search_text, include=['esphome/components/*.py'],
@@ -303,7 +302,7 @@ def lint_relative_py_import(fname):
 def lint_namespace(fname, content):
     expected_name = re.match(r'^esphome/components/([^/]+)/.*',
                              fname.replace(os.path.sep, '/')).group(1)
-    search = 'namespace {}'.format(expected_name)
+    search = f'namespace {expected_name}'
     if search in content:
         return None
     return 'Invalid namespace found in C++ file. All integration C++ files should put all ' \
@@ -380,7 +379,7 @@ for fname in files:
 run_checks(LINT_POST_CHECKS, 'POST')
 
 for f, errs in sorted(errors.items()):
-    print("\033[0;32m************* File \033[1;32m{}\033[0m".format(f))
+    print(f"\033[0;32m************* File \033[1;32m{f}\033[0m")
     for err in errs:
         print(err)
     print()
diff --git a/script/clang-format b/script/clang-format
index 89a5acd746..e9c3692bb8 100755
--- a/script/clang-format
+++ b/script/clang-format
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 
diff --git a/script/clang-tidy b/script/clang-tidy
index f178e036b1..1005d15580 100755
--- a/script/clang-tidy
+++ b/script/clang-tidy
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 
diff --git a/script/helpers.py b/script/helpers.py
index 243dfde49e..c9bf5224b1 100644
--- a/script/helpers.py
+++ b/script/helpers.py
@@ -12,11 +12,11 @@ temp_header_file = os.path.join(root_path, '.temp-clang-tidy.cpp')
 
 def shlex_quote(s):
     if not s:
-        return u"''"
+        return "''"
     if re.search(r'[^\w@%+=:,./-]', s) is None:
         return s
 
-    return u"'" + s.replace(u"'", u"'\"'\"'") + u"'"
+    return "'" + s.replace("'", "'\"'\"'") + "'"
 
 
 def build_all_include():
@@ -29,7 +29,7 @@ def build_all_include():
         if ext in filetypes:
             path = os.path.relpath(path, root_path)
             include_p = path.replace(os.path.sep, '/')
-            headers.append('#include "{}"'.format(include_p))
+            headers.append(f'#include "{include_p}"')
     headers.sort()
     headers.append('')
     content = '\n'.join(headers)
@@ -47,7 +47,7 @@ def build_compile_commands():
         gcc_flags = json.load(f)
     exec_path = gcc_flags['execPath']
     include_paths = gcc_flags['gccIncludePaths'].split(',')
-    includes = ['-I{}'.format(p) for p in include_paths]
+    includes = [f'-I{p}' for p in include_paths]
     cpp_flags = gcc_flags['gccDefaultCppFlags'].split(' ')
     defines = [flag for flag in cpp_flags if flag.startswith('-D')]
     command = [exec_path]
@@ -102,7 +102,7 @@ def splitlines_no_ends(string):
 
 def changed_files():
     for remote in ('upstream', 'origin'):
-        command = ['git', 'merge-base', '{}/dev'.format(remote), 'HEAD']
+        command = ['git', 'merge-base', f'{remote}/dev', 'HEAD']
         try:
             merge_base = splitlines_no_ends(get_output(*command))[0]
             break
@@ -124,7 +124,7 @@ def filter_changed(files):
     if not files:
         print("    No changed files!")
     for c in files:
-        print("    {}".format(c))
+        print(f"    {c}")
     return files
 
 
diff --git a/script/lint-python b/script/lint-python
index 3fbc329ab0..4915115262 100755
--- a/script/lint-python
+++ b/script/lint-python
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 
@@ -61,7 +61,7 @@ def main():
             continue
         file_ = line[0]
         linno = line[1]
-        msg = (u':'.join(line[3:])).strip()
+        msg = (':'.join(line[3:])).strip()
         print_error(file_, linno, msg)
         errors += 1
 
@@ -74,7 +74,7 @@ def main():
             continue
         file_ = line[0]
         linno = line[1]
-        msg = (u':'.join(line[2:])).strip()
+        msg = (':'.join(line[2:])).strip()
         print_error(file_, linno, msg)
         errors += 1
 
diff --git a/setup.cfg b/setup.cfg
index bef998fb37..ab43acfbc5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,7 +18,6 @@ Topic :: Home Automation
 
 [flake8]
 max-line-length = 120
-builtins = unicode, long, raw_input, basestring
 exclude = api_pb2.py
 
 [bdist_wheel]
diff --git a/setup.py b/setup.py
index 1d4fb3a4d0..c520b949fc 100755
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """esphome setup script."""
 from setuptools import setup, find_packages
 import os
@@ -28,7 +28,6 @@ REQUIRES = [
     'paho-mqtt==1.5.0',
     'colorlog==4.0.2',
     'tornado==5.1.1',
-    'typing>=3.6.6;python_version<"3.6"',
     'protobuf==3.11.1',
     'tzlocal==2.0.0',
     'pytz==2019.3',
@@ -69,7 +68,7 @@ setup(
     zip_safe=False,
     platforms='any',
     test_suite='tests',
-    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,<4.0',
+    python_requires='>=3.6,<4.0',
     install_requires=REQUIRES,
     keywords=['home', 'automation'],
     entry_points={

From ae784dc74c4c51516f3851615888b4a09c472af7 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 7 Dec 2019 18:53:20 +0100
Subject: [PATCH 125/412] Fix CI

---
 esphome/core/component.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index 6297013247..f4151a14fc 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -139,19 +139,19 @@ float Component::get_actual_setup_priority() const {
 }
 void Component::set_setup_priority(float priority) { this->setup_priority_override_ = priority; }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpmf-conversions"
 bool Component::has_overridden_loop() const {
 #ifdef CLANG_TIDY
   bool loop_overridden = true;
   bool call_loop_overridden = true;
 #else
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wpmf-conversions"
   bool loop_overridden = (void *) (this->*(&Component::loop)) != (void *) (&Component::loop);
   bool call_loop_overridden = (void *) (this->*(&Component::call_loop)) != (void *) (&Component::call_loop);
+#pragma GCC diagnostic pop
 #endif
   return loop_overridden || call_loop_overridden;
 }
-#pragma GCC diagnostic pop
 
 PollingComponent::PollingComponent(uint32_t update_interval) : Component(), update_interval_(update_interval) {}
 

From f5b7cc81d8c75fdb6ec045eeca38f619849d280b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 10 Dec 2019 23:09:35 +1300
Subject: [PATCH 126/412] Add RFBridge component (#896)

* Add RFBridge component

* Fix format issues

* Rename methods

* More formatting

* Fix line length

* Apply suggestions from code review

Co-Authored-By: Otto Winter <otto@otto-winter.com>

* Check uart settings on dump

* Make receiving local to the loop

* FIx code order and schema

* Add rf_bridge to test file

* Apply suggestions from code review

Co-Authored-By: Otto Winter <otto@otto-winter.com>
---
 esphome/components/rf_bridge/__init__.py   |  75 ++++++++++++++++
 esphome/components/rf_bridge/rf_bridge.cpp | 100 +++++++++++++++++++++
 esphome/components/rf_bridge/rf_bridge.h   |  95 ++++++++++++++++++++
 tests/test3.yaml                           |  17 +++-
 4 files changed, 285 insertions(+), 2 deletions(-)
 create mode 100644 esphome/components/rf_bridge/__init__.py
 create mode 100644 esphome/components/rf_bridge/rf_bridge.cpp
 create mode 100644 esphome/components/rf_bridge/rf_bridge.h

diff --git a/esphome/components/rf_bridge/__init__.py b/esphome/components/rf_bridge/__init__.py
new file mode 100644
index 0000000000..1fd4fbc7bd
--- /dev/null
+++ b/esphome/components/rf_bridge/__init__.py
@@ -0,0 +1,75 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.const import CONF_ID, CONF_TRIGGER_ID, CONF_CODE, CONF_LOW, CONF_SYNC, CONF_HIGH
+from esphome.components import uart
+
+DEPENDENCIES = ['uart']
+
+rf_bridge_ns = cg.esphome_ns.namespace('rf_bridge')
+RFBridgeComponent = rf_bridge_ns.class_('RFBridgeComponent', cg.Component, uart.UARTDevice)
+
+RFBridgeData = rf_bridge_ns.struct('RFBridgeData')
+
+RFBridgeReceivedCodeTrigger = rf_bridge_ns.class_('RFBridgeReceivedCodeTrigger',
+                                                  automation.Trigger.template(RFBridgeData))
+
+RFBridgeSendCodeAction = rf_bridge_ns.class_('RFBridgeSendCodeAction', automation.Action)
+RFBridgeLearnAction = rf_bridge_ns.class_('RFBridgeLearnAction', automation.Action)
+
+
+CONF_ON_CODE_RECEIVED = 'on_code_received'
+
+CONFIG_SCHEMA = cv.All(cv.Schema({
+    cv.GenerateID(): cv.declare_id(RFBridgeComponent),
+    cv.Optional(CONF_ON_CODE_RECEIVED): automation.validate_automation({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(RFBridgeReceivedCodeTrigger),
+    }),
+}).extend(uart.UART_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield uart.register_uart_device(var, config)
+
+    for conf in config.get(CONF_ON_CODE_RECEIVED, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        yield automation.build_automation(trigger, [(RFBridgeData, 'data')], conf)
+
+
+RFBRIDGE_SEND_CODE_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.use_id(RFBridgeComponent),
+    cv.Required(CONF_SYNC): cv.templatable(cv.hex_uint16_t),
+    cv.Required(CONF_LOW): cv.templatable(cv.hex_uint16_t),
+    cv.Required(CONF_HIGH): cv.templatable(cv.hex_uint16_t),
+    cv.Required(CONF_CODE): cv.templatable(cv.hex_uint32_t)
+})
+
+
+@automation.register_action('rf_bridge.send_code', RFBridgeSendCodeAction,
+                            RFBRIDGE_SEND_CODE_SCHEMA)
+def rf_bridge_send_code_to_code(config, action_id, template_args, args):
+    paren = yield cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_args, paren)
+    template_ = yield cg.templatable(config[CONF_SYNC], args, cg.uint16)
+    cg.add(var.set_sync(template_))
+    template_ = yield cg.templatable(config[CONF_LOW], args, cg.uint16)
+    cg.add(var.set_low(template_))
+    template_ = yield cg.templatable(config[CONF_HIGH], args, cg.uint16)
+    cg.add(var.set_high(template_))
+    template_ = yield cg.templatable(config[CONF_CODE], args, cg.uint32)
+    cg.add(var.set_code(template_))
+    yield var
+
+
+RFBRIDGE_LEARN_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.use_id(RFBridgeComponent)
+})
+
+
+@automation.register_action('rf_bridge.learn', RFBridgeLearnAction, RFBRIDGE_LEARN_SCHEMA)
+def rf_bridge_learnx_to_code(config, action_id, template_args, args):
+    paren = yield cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_args, paren)
+    yield var
diff --git a/esphome/components/rf_bridge/rf_bridge.cpp b/esphome/components/rf_bridge/rf_bridge.cpp
new file mode 100644
index 0000000000..f1537cdc87
--- /dev/null
+++ b/esphome/components/rf_bridge/rf_bridge.cpp
@@ -0,0 +1,100 @@
+#include "rf_bridge.h"
+#include "esphome/core/log.h"
+#include <cstring>
+
+namespace esphome {
+namespace rf_bridge {
+
+static const char *TAG = "rf_bridge";
+
+void RFBridgeComponent::ack_() {
+  ESP_LOGV(TAG, "Sending ACK");
+  this->write(RF_CODE_START);
+  this->write(RF_CODE_ACK);
+  this->write(RF_CODE_STOP);
+  this->flush();
+}
+
+void RFBridgeComponent::decode_() {
+  uint8_t action = uartbuf_[0];
+  RFBridgeData data{};
+
+  switch (action) {
+    case RF_CODE_ACK:
+      ESP_LOGD(TAG, "Action OK");
+      break;
+    case RF_CODE_LEARN_KO:
+      this->ack_();
+      ESP_LOGD(TAG, "Learn timeout");
+      break;
+    case RF_CODE_LEARN_OK:
+      ESP_LOGD(TAG, "Learn started");
+    case RF_CODE_RFIN:
+      this->ack_();
+
+      data.sync = (uartbuf_[1] << 8) | uartbuf_[2];
+      data.low = (uartbuf_[3] << 8) | uartbuf_[4];
+      data.high = (uartbuf_[5] << 8) | uartbuf_[6];
+      data.code = (uartbuf_[7] << 16) | (uartbuf_[8] << 8) | uartbuf_[9];
+
+      ESP_LOGD(TAG, "Received RFBridge Code: sync=0x%04X low=0x%04X high=0x%04X code=0x%06X", data.sync, data.low,
+               data.high, data.code);
+      this->callback_.call(data);
+      break;
+    default:
+      ESP_LOGD(TAG, "Unknown action: 0x%02X", action);
+      break;
+  }
+  this->last_ = millis();
+}
+
+void RFBridgeComponent::loop() {
+  bool receiving = false;
+  if (this->last_ != 0 && millis() - this->last_ > RF_DEBOUNCE) {
+    this->last_ = 0;
+  }
+
+  while (this->available()) {
+    uint8_t c = this->read();
+    if (receiving) {
+      if (c == RF_CODE_STOP && (this->uartpos_ == 1 || this->uartpos_ == RF_MESSAGE_SIZE + 1)) {
+        this->decode_();
+        receiving = false;
+      } else if (this->uartpos_ <= RF_MESSAGE_SIZE) {
+        this->uartbuf_[uartpos_++] = c;
+      } else {
+        receiving = false;
+      }
+    } else if (c == RF_CODE_START) {
+      this->uartpos_ = 0;
+      receiving = true;
+    }
+  }
+}
+
+void RFBridgeComponent::send_code(RFBridgeData data) {
+  ESP_LOGD(TAG, "Sending code: sync=0x%04X low=0x%04X high=0x%04X code=0x%06X", data.sync, data.low, data.high,
+           data.code);
+  this->write(RF_CODE_START);
+  this->write(RF_CODE_RFOUT);
+  this->write(data.sync);
+  this->write(data.low);
+  this->write(data.high);
+  this->write(data.code);
+  this->write(RF_CODE_STOP);
+}
+
+void RFBridgeComponent::learn() {
+  ESP_LOGD(TAG, "Learning mode");
+  this->write(RF_CODE_START);
+  this->write(RF_CODE_LEARN);
+  this->write(RF_CODE_STOP);
+}
+
+void RFBridgeComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "RF_Bridge:");
+  this->check_uart_settings(19200);
+}
+
+}  // namespace rf_bridge
+}  // namespace esphome
diff --git a/esphome/components/rf_bridge/rf_bridge.h b/esphome/components/rf_bridge/rf_bridge.h
new file mode 100644
index 0000000000..86713b8a5c
--- /dev/null
+++ b/esphome/components/rf_bridge/rf_bridge.h
@@ -0,0 +1,95 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+#include "esphome/core/automation.h"
+
+namespace esphome {
+namespace rf_bridge {
+
+static const uint8_t RF_MESSAGE_SIZE = 9;
+static const uint8_t RF_CODE_START = 0xAA;
+static const uint8_t RF_CODE_ACK = 0xA0;
+static const uint8_t RF_CODE_LEARN = 0xA1;
+static const uint8_t RF_CODE_LEARN_KO = 0xA2;
+static const uint8_t RF_CODE_LEARN_OK = 0xA3;
+static const uint8_t RF_CODE_RFIN = 0xA4;
+static const uint8_t RF_CODE_RFOUT = 0xA5;
+static const uint8_t RF_CODE_SNIFFING_ON = 0xA6;
+static const uint8_t RF_CODE_SNIFFING_OFF = 0xA7;
+static const uint8_t RF_CODE_RFOUT_NEW = 0xA8;
+static const uint8_t RF_CODE_LEARN_NEW = 0xA9;
+static const uint8_t RF_CODE_LEARN_KO_NEW = 0xAA;
+static const uint8_t RF_CODE_LEARN_OK_NEW = 0xAB;
+static const uint8_t RF_CODE_RFOUT_BUCKET = 0xB0;
+static const uint8_t RF_CODE_STOP = 0x55;
+static const uint8_t RF_DEBOUNCE = 200;
+
+struct RFBridgeData {
+  uint16_t sync;
+  uint16_t low;
+  uint16_t high;
+  uint32_t code;
+};
+
+class RFBridgeComponent : public uart::UARTDevice, public Component {
+ public:
+  void loop() override;
+  void dump_config() override;
+  void add_on_code_received_callback(std::function<void(RFBridgeData)> callback) {
+    this->callback_.add(std::move(callback));
+  }
+  void send_code(RFBridgeData data);
+  void learn();
+
+ protected:
+  void ack_();
+  void decode_();
+
+  unsigned long last_ = 0;
+  unsigned char uartbuf_[RF_MESSAGE_SIZE + 3] = {0};
+  unsigned char uartpos_ = 0;
+
+  CallbackManager<void(RFBridgeData)> callback_;
+};
+
+class RFBridgeReceivedCodeTrigger : public Trigger<RFBridgeData> {
+ public:
+  explicit RFBridgeReceivedCodeTrigger(RFBridgeComponent *parent) {
+    parent->add_on_code_received_callback([this](RFBridgeData data) { this->trigger(data); });
+  }
+};
+
+template<typename... Ts> class RFBridgeSendCodeAction : public Action<Ts...> {
+ public:
+  RFBridgeSendCodeAction(RFBridgeComponent *parent) : parent_(parent) {}
+  TEMPLATABLE_VALUE(uint16_t, sync)
+  TEMPLATABLE_VALUE(uint16_t, low)
+  TEMPLATABLE_VALUE(uint16_t, high)
+  TEMPLATABLE_VALUE(uint32_t, code)
+
+  void play(Ts... x) {
+    RFBridgeData data{};
+    data.sync = this->sync_.value(x...);
+    data.low = this->low_.value(x...);
+    data.high = this->high_.value(x...);
+    data.code = this->code_.value(x...);
+    this->parent_->send_code(data);
+  }
+
+ protected:
+  RFBridgeComponent *parent_;
+};
+
+template<typename... Ts> class RFBridgeLearnAction : public Action<Ts...> {
+ public:
+  RFBridgeLearnAction(RFBridgeComponent *parent) : parent_(parent) {}
+
+  void play(Ts... x) { this->parent_->learn(); }
+
+ protected:
+  RFBridgeComponent *parent_;
+};
+
+}  // namespace rf_bridge
+}  // namespace esphome
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 2703621752..77a0fa631c 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -623,7 +623,7 @@ output:
 
 mcp23017:
   id: mcp23017_hub
-  
+
 mcp23008:
   id: mcp23008_hub
 
@@ -666,8 +666,21 @@ dfplayer:
             dfplayer.is_playing
         then:
           logger.log: 'Playback finished event'
-
 tm1651:
   id: tm1651_battery
   clk_pin: D6
   dio_pin: D5
+rf_bridge:
+  on_code_received:
+    - lambda: |-
+        uint32_t test;
+        test = data.sync;
+        test = data.low;
+        test = data.high;
+        test = data.code;
+    - rf_bridge.send_code:
+        sync: 0x1234
+        low: 0x1234
+        high: 0x1234
+        code: 0x123456
+    - rf_bridge.learn

From c8ccb06f11e28c035f2d340444cfb3b3e49110ff Mon Sep 17 00:00:00 2001
From: Andrew Zaborowski <balrogg@gmail.com>
Date: Tue, 17 Dec 2019 12:08:37 +0100
Subject: [PATCH 127/412] ct_clamp: Check sample() return value is not NaN
 (#921)

Don't try to update CT clamp's state with NaN values returned from the
underlaying sensor.  A single IO error in the sensor code will cause a
NaN to be returned and if we use that in CTClampSensor's floating point
maths both sample_sum_ and offset_ will become NaN and from there every
future calculation will use the NaN offset_ and return NaN too.
---
 esphome/components/ct_clamp/ct_clamp_sensor.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/ct_clamp/ct_clamp_sensor.cpp b/esphome/components/ct_clamp/ct_clamp_sensor.cpp
index 674cc0ae98..c1e3bec486 100644
--- a/esphome/components/ct_clamp/ct_clamp_sensor.cpp
+++ b/esphome/components/ct_clamp/ct_clamp_sensor.cpp
@@ -64,6 +64,8 @@ void CTClampSensor::loop() {
 
   // Perform a single sample
   float value = this->source_->sample();
+  if (isnan(value))
+    return;
 
   if (this->is_calibrating_offset_) {
     this->sample_sum_ += value;

From eea78531a10109cba691d8f3c08478d3ec9220ff Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Mon, 30 Dec 2019 22:02:55 -0300
Subject: [PATCH 128/412] Climate Mitsubishi (#725)

* add climate

* Mitsubishi updates

* refactor mitsubishi to use climate_ir

* lint
---
 esphome/components/climate_ir/climate_ir.cpp |  1 +
 esphome/components/climate_ir/climate_ir.h   |  3 +
 esphome/components/mitsubishi/__init__.py    |  0
 esphome/components/mitsubishi/climate.py     | 18 +++++
 esphome/components/mitsubishi/mitsubishi.cpp | 84 ++++++++++++++++++++
 esphome/components/mitsubishi/mitsubishi.h   | 22 +++++
 6 files changed, 128 insertions(+)
 create mode 100644 esphome/components/mitsubishi/__init__.py
 create mode 100644 esphome/components/mitsubishi/climate.py
 create mode 100644 esphome/components/mitsubishi/mitsubishi.cpp
 create mode 100644 esphome/components/mitsubishi/mitsubishi.h

diff --git a/esphome/components/climate_ir/climate_ir.cpp b/esphome/components/climate_ir/climate_ir.cpp
index 8f06ff2214..92a5b2423a 100644
--- a/esphome/components/climate_ir/climate_ir.cpp
+++ b/esphome/components/climate_ir/climate_ir.cpp
@@ -116,6 +116,7 @@ void ClimateIR::dump_config() {
   ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
   ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
 }
+bool ClimateIR::on_receive(remote_base::RemoteReceiveData data) { return false; }
 
 }  // namespace climate_ir
 }  // namespace esphome
diff --git a/esphome/components/climate_ir/climate_ir.h b/esphome/components/climate_ir/climate_ir.h
index 7a69b19786..82bf4247b0 100644
--- a/esphome/components/climate_ir/climate_ir.h
+++ b/esphome/components/climate_ir/climate_ir.h
@@ -63,6 +63,9 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
 
   remote_transmitter::RemoteTransmitterComponent *transmitter_;
   sensor::Sensor *sensor_{nullptr};
+
+  /// Handle received IR Buffer, so it is optional to implement
+  bool on_receive(remote_base::RemoteReceiveData data) override;
 };
 
 }  // namespace climate_ir
diff --git a/esphome/components/mitsubishi/__init__.py b/esphome/components/mitsubishi/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/mitsubishi/climate.py b/esphome/components/mitsubishi/climate.py
new file mode 100644
index 0000000000..933e53baf0
--- /dev/null
+++ b/esphome/components/mitsubishi/climate.py
@@ -0,0 +1,18 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
+
+AUTO_LOAD = ['climate_ir']
+
+mitsubishi_ns = cg.esphome_ns.namespace('mitsubishi')
+MitsubishiClimate = mitsubishi_ns.class_('MitsubishiClimate', climate_ir.ClimateIR)
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(MitsubishiClimate),
+})
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/mitsubishi/mitsubishi.cpp b/esphome/components/mitsubishi/mitsubishi.cpp
new file mode 100644
index 0000000000..b70aa6d394
--- /dev/null
+++ b/esphome/components/mitsubishi/mitsubishi.cpp
@@ -0,0 +1,84 @@
+#include "mitsubishi.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace mitsubishi {
+
+static const char *TAG = "mitsubishi.climate";
+
+const uint32_t MITSUBISHI_OFF = 0x00;
+
+const uint8_t MITSUBISHI_COOL = 0x18;
+const uint8_t MITSUBISHI_DRY = 0x10;
+const uint8_t MITSUBISHI_AUTO = 0x20;
+const uint8_t MITSUBISHI_HEAT = 0x08;
+const uint8_t MITSUBISHI_FAN_AUTO = 0x00;
+
+// Pulse parameters in usec
+const uint16_t MITSUBISHI_BIT_MARK = 430;
+const uint16_t MITSUBISHI_ONE_SPACE = 1250;
+const uint16_t MITSUBISHI_ZERO_SPACE = 390;
+const uint16_t MITSUBISHI_HEADER_MARK = 3500;
+const uint16_t MITSUBISHI_HEADER_SPACE = 1700;
+const uint16_t MITSUBISHI_MIN_GAP = 17500;
+
+void MitsubishiClimate::transmit_state() {
+  uint32_t remote_state[18] = {0x23, 0xCB, 0x26, 0x01, 0x00, 0x20, 0x48, 0x00, 0x30,
+                               0x58, 0x61, 0x00, 0x00, 0x00, 0x10, 0x40, 0x00, 0x00};
+
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_COOL:
+      remote_state[6] = MITSUBISHI_COOL;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      remote_state[6] = MITSUBISHI_HEAT;
+      break;
+    case climate::CLIMATE_MODE_AUTO:
+      remote_state[6] = MITSUBISHI_AUTO;
+      break;
+    case climate::CLIMATE_MODE_OFF:
+    default:
+      remote_state[5] = MITSUBISHI_OFF;
+      break;
+  }
+
+  remote_state[7] =
+      (uint8_t) roundf(clamp(this->target_temperature, MITSUBISHI_TEMP_MIN, MITSUBISHI_TEMP_MAX) - MITSUBISHI_TEMP_MIN);
+
+  ESP_LOGV(TAG, "Sending Mitsubishi target temp: %.1f state: %02X mode: %02X temp: %02X", this->target_temperature,
+           remote_state[5], remote_state[6], remote_state[7]);
+
+  // Checksum
+  for (int i = 0; i < 17; i++) {
+    remote_state[17] += remote_state[i];
+  }
+
+  auto transmit = this->transmitter_->transmit();
+  auto data = transmit.get_data();
+
+  data->set_carrier_frequency(38000);
+  // repeat twice
+  for (uint16_t r = 0; r < 2; r++) {
+    // Header
+    data->mark(MITSUBISHI_HEADER_MARK);
+    data->space(MITSUBISHI_HEADER_SPACE);
+    // Data
+    for (uint8_t i : remote_state)
+      for (uint8_t j = 0; j < 8; j++) {
+        data->mark(MITSUBISHI_BIT_MARK);
+        bool bit = i & (1 << j);
+        data->space(bit ? MITSUBISHI_ONE_SPACE : MITSUBISHI_ZERO_SPACE);
+      }
+    // Footer
+    if (r == 0) {
+      data->mark(MITSUBISHI_BIT_MARK);
+      data->space(MITSUBISHI_MIN_GAP);  // Pause before repeating
+    }
+  }
+  data->mark(MITSUBISHI_BIT_MARK);
+
+  transmit.perform();
+}
+
+}  // namespace mitsubishi
+}  // namespace esphome
diff --git a/esphome/components/mitsubishi/mitsubishi.h b/esphome/components/mitsubishi/mitsubishi.h
new file mode 100644
index 0000000000..e6bd7b8ebe
--- /dev/null
+++ b/esphome/components/mitsubishi/mitsubishi.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace mitsubishi {
+
+// Temperature
+const uint8_t MITSUBISHI_TEMP_MIN = 16;  // Celsius
+const uint8_t MITSUBISHI_TEMP_MAX = 31;  // Celsius
+
+class MitsubishiClimate : public climate_ir::ClimateIR {
+ public:
+  MitsubishiClimate() : climate_ir::ClimateIR(MITSUBISHI_TEMP_MIN, MITSUBISHI_TEMP_MAX) {}
+
+ protected:
+  /// Transmit via IR the state of this climate controller.
+  void transmit_state() override;
+};
+
+}  // namespace mitsubishi
+}  // namespace esphome

From 828e2915384e8e0b861bbe814d20104568f9e24d Mon Sep 17 00:00:00 2001
From: Wilmar den Ouden <wilmardo@users.noreply.github.com>
Date: Tue, 31 Dec 2019 03:23:03 +0100
Subject: [PATCH 129/412] fix: only decode when not str already (#923)

Signed-off-by: wilmardo <info@wilmardenouden.nl>
---
 esphome/util.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/esphome/util.py b/esphome/util.py
index 6677946b01..10c8d4e581 100644
--- a/esphome/util.py
+++ b/esphome/util.py
@@ -118,10 +118,11 @@ class RedirectText:
         # str
         # If the conversion fails, we will create an exception, which is okay because we won't
         # be able to print it anyway.
-        text = s.decode()
+        if not isinstance(s, str):
+            s = s.decode()
 
         if self._filter_pattern is not None:
-            self._line_buffer += text
+            self._line_buffer += s
             lines = self._line_buffer.splitlines(True)
             for line in lines:
                 if '\n' not in line and '\r' not in line:
@@ -138,7 +139,7 @@ class RedirectText:
 
                 self._write_color_replace(line)
         else:
-            self._write_color_replace(text)
+            self._write_color_replace(s)
 
         # write() returns the number of characters written
         # Let's print the number of characters of the original string in order to not confuse

From 420c86042443daff4a075b8fedde80c65f37cc03 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 31 Dec 2019 00:20:11 -0300
Subject: [PATCH 130/412] fix climate-ir bad merge (#935)

* fix climate-ir bad merge

* add mitshubishi test
---
 esphome/components/climate_ir/climate_ir.cpp | 1 -
 esphome/components/climate_ir/climate_ir.h   | 3 ---
 tests/test1.yaml                             | 3 ++-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/esphome/components/climate_ir/climate_ir.cpp b/esphome/components/climate_ir/climate_ir.cpp
index 92a5b2423a..8f06ff2214 100644
--- a/esphome/components/climate_ir/climate_ir.cpp
+++ b/esphome/components/climate_ir/climate_ir.cpp
@@ -116,7 +116,6 @@ void ClimateIR::dump_config() {
   ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
   ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
 }
-bool ClimateIR::on_receive(remote_base::RemoteReceiveData data) { return false; }
 
 }  // namespace climate_ir
 }  // namespace esphome
diff --git a/esphome/components/climate_ir/climate_ir.h b/esphome/components/climate_ir/climate_ir.h
index 82bf4247b0..7a69b19786 100644
--- a/esphome/components/climate_ir/climate_ir.h
+++ b/esphome/components/climate_ir/climate_ir.h
@@ -63,9 +63,6 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
 
   remote_transmitter::RemoteTransmitterComponent *transmitter_;
   sensor::Sensor *sensor_{nullptr};
-
-  /// Handle received IR Buffer, so it is optional to implement
-  bool on_receive(remote_base::RemoteReceiveData data) override;
 };
 
 }  // namespace climate_ir
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 1080339b67..043fafc9c3 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1192,7 +1192,8 @@ climate:
     name: Fujitsu General Climate
   - platform: yashima
     name: Yashima Climate
-
+  - platform: mitsubishi
+    name: Mitsubishi
 
 switch:
   - platform: gpio

From 7c870556c6204f5acfa52486727e5a708fd61631 Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Tue, 31 Dec 2019 14:40:13 +0300
Subject: [PATCH 131/412] http_request: fix memory allocation (#916)

---
 esphome/components/http_request/http_request.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index 4f772d6826..d26899c0db 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -28,6 +28,7 @@ class HttpRequestComponent : public Component {
 #ifdef ARDUINO_ARCH_ESP8266
     this->wifi_client_ = new BearSSL::WiFiClientSecure();
     this->wifi_client_->setInsecure();
+    this->wifi_client_->setBufferSizes(512, 512);
 #endif
   }
   void dump_config() override;

From 05f9dede702f959892493bed9d8ae75797710587 Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Tue, 31 Dec 2019 14:40:20 +0300
Subject: [PATCH 132/412] http_request version fix (#917)

---
 esphome/components/http_request/__init__.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/http_request/__init__.py b/esphome/components/http_request/__init__.py
index 897440a454..ea12b0657d 100644
--- a/esphome/components/http_request/__init__.py
+++ b/esphome/components/http_request/__init__.py
@@ -4,7 +4,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.const import CONF_ID, CONF_TIMEOUT, CONF_ESPHOME, CONF_METHOD, \
-    CONF_ARDUINO_VERSION, ARDUINO_VERSION_ESP8266_2_5_0
+    CONF_ARDUINO_VERSION, ARDUINO_VERSION_ESP8266_2_5_1
 from esphome.core import CORE, Lambda
 from esphome.core_config import PLATFORMIO_ESP8266_LUT
 
@@ -35,8 +35,8 @@ def validate_framework(config):
         return config
 
     framework = PLATFORMIO_ESP8266_LUT[version] if version in PLATFORMIO_ESP8266_LUT else version
-    if framework < ARDUINO_VERSION_ESP8266_2_5_0:
-        raise cv.Invalid('This component is not supported on arduino framework version below 2.5.0')
+    if framework < ARDUINO_VERSION_ESP8266_2_5_1:
+        raise cv.Invalid('This component is not supported on arduino framework version below 2.5.1')
     return config
 
 

From a6d31f05ee900eeddddd82be940af43c40e33268 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 4 Jan 2020 12:43:11 +0100
Subject: [PATCH 133/412] PID Climate (#885)

* PID Climate

* Add sensor for debugging PID output value

* Add dump_config, use percent

* Add more observable values

* Update

* Set target temperature

* Add autotuner

* Add algorithm explanation

* Add autotuner action, update controller

* Add simulator

* Format

* Change defaults

* Updates
---
 esphome/components/pid/__init__.py            |   0
 esphome/components/pid/climate.py             |  79 ++++
 esphome/components/pid/pid_autotuner.cpp      | 358 ++++++++++++++++++
 esphome/components/pid/pid_autotuner.h        | 110 ++++++
 esphome/components/pid/pid_climate.cpp        | 152 ++++++++
 esphome/components/pid/pid_climate.h          |  94 +++++
 esphome/components/pid/pid_controller.h       |  79 ++++
 esphome/components/pid/pid_simulator.h        |  75 ++++
 esphome/components/pid/sensor/__init__.py     |  36 ++
 .../pid/sensor/pid_climate_sensor.cpp         |  47 +++
 .../pid/sensor/pid_climate_sensor.h           |  34 ++
 11 files changed, 1064 insertions(+)
 create mode 100644 esphome/components/pid/__init__.py
 create mode 100644 esphome/components/pid/climate.py
 create mode 100644 esphome/components/pid/pid_autotuner.cpp
 create mode 100644 esphome/components/pid/pid_autotuner.h
 create mode 100644 esphome/components/pid/pid_climate.cpp
 create mode 100644 esphome/components/pid/pid_climate.h
 create mode 100644 esphome/components/pid/pid_controller.h
 create mode 100644 esphome/components/pid/pid_simulator.h
 create mode 100644 esphome/components/pid/sensor/__init__.py
 create mode 100644 esphome/components/pid/sensor/pid_climate_sensor.cpp
 create mode 100644 esphome/components/pid/sensor/pid_climate_sensor.h

diff --git a/esphome/components/pid/__init__.py b/esphome/components/pid/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/pid/climate.py b/esphome/components/pid/climate.py
new file mode 100644
index 0000000000..a3e2299296
--- /dev/null
+++ b/esphome/components/pid/climate.py
@@ -0,0 +1,79 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.components import climate, sensor, output
+from esphome.const import CONF_ID, CONF_SENSOR
+
+pid_ns = cg.esphome_ns.namespace('pid')
+PIDClimate = pid_ns.class_('PIDClimate', climate.Climate, cg.Component)
+PIDAutotuneAction = pid_ns.class_('PIDAutotuneAction', automation.Action)
+
+CONF_DEFAULT_TARGET_TEMPERATURE = 'default_target_temperature'
+
+CONF_KP = 'kp'
+CONF_KI = 'ki'
+CONF_KD = 'kd'
+CONF_CONTROL_PARAMETERS = 'control_parameters'
+CONF_COOL_OUTPUT = 'cool_output'
+CONF_HEAT_OUTPUT = 'heat_output'
+CONF_NOISEBAND = 'noiseband'
+CONF_POSITIVE_OUTPUT = 'positive_output'
+CONF_NEGATIVE_OUTPUT = 'negative_output'
+CONF_MIN_INTEGRAL = 'min_integral'
+CONF_MAX_INTEGRAL = 'max_integral'
+
+CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(PIDClimate),
+    cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
+    cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE): cv.temperature,
+    cv.Optional(CONF_COOL_OUTPUT): cv.use_id(output.FloatOutput),
+    cv.Optional(CONF_HEAT_OUTPUT): cv.use_id(output.FloatOutput),
+    cv.Required(CONF_CONTROL_PARAMETERS): cv.Schema({
+        cv.Required(CONF_KP): cv.float_,
+        cv.Optional(CONF_KI, default=0.0): cv.float_,
+        cv.Optional(CONF_KD, default=0.0): cv.float_,
+        cv.Optional(CONF_MIN_INTEGRAL, default=-1): cv.float_,
+        cv.Optional(CONF_MAX_INTEGRAL, default=1): cv.float_,
+    }),
+}), cv.has_at_least_one_key(CONF_COOL_OUTPUT, CONF_HEAT_OUTPUT))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield climate.register_climate(var, config)
+
+    sens = yield cg.get_variable(config[CONF_SENSOR])
+    cg.add(var.set_sensor(sens))
+
+    if CONF_COOL_OUTPUT in config:
+        out = yield cg.get_variable(config[CONF_COOL_OUTPUT])
+        cg.add(var.set_cool_output(out))
+    if CONF_HEAT_OUTPUT in config:
+        out = yield cg.get_variable(config[CONF_HEAT_OUTPUT])
+        cg.add(var.set_heat_output(out))
+    params = config[CONF_CONTROL_PARAMETERS]
+    cg.add(var.set_kp(params[CONF_KP]))
+    cg.add(var.set_ki(params[CONF_KI]))
+    cg.add(var.set_kd(params[CONF_KD]))
+    if CONF_MIN_INTEGRAL in params:
+        cg.add(var.set_min_integral(params[CONF_MIN_INTEGRAL]))
+    if CONF_MAX_INTEGRAL in params:
+        cg.add(var.set_max_integral(params[CONF_MAX_INTEGRAL]))
+
+    cg.add(var.set_default_target_temperature(config[CONF_DEFAULT_TARGET_TEMPERATURE]))
+
+
+@automation.register_action('climate.pid.autotune', PIDAutotuneAction, automation.maybe_simple_id({
+    cv.Required(CONF_ID): cv.use_id(PIDClimate),
+    cv.Optional(CONF_NOISEBAND, default=0.25): cv.float_,
+    cv.Optional(CONF_POSITIVE_OUTPUT, default=1.0): cv.possibly_negative_percentage,
+    cv.Optional(CONF_NEGATIVE_OUTPUT, default=-1.0): cv.possibly_negative_percentage,
+}))
+def esp8266_set_frequency_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)
+    cg.add(var.set_noiseband(config[CONF_NOISEBAND]))
+    cg.add(var.set_positive_output(config[CONF_POSITIVE_OUTPUT]))
+    cg.add(var.set_negative_output(config[CONF_NEGATIVE_OUTPUT]))
+    yield var
diff --git a/esphome/components/pid/pid_autotuner.cpp b/esphome/components/pid/pid_autotuner.cpp
new file mode 100644
index 0000000000..e8b006b8d7
--- /dev/null
+++ b/esphome/components/pid/pid_autotuner.cpp
@@ -0,0 +1,358 @@
+#include "pid_autotuner.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace pid {
+
+static const char *TAG = "pid.autotune";
+
+/*
+ * # PID Autotuner
+ *
+ * Autotuning of PID parameters is a very interesting topic. There has been
+ * a lot of research over the years to create algorithms that can efficiently determine
+ * suitable starting PID parameters.
+ *
+ * The most basic approach is the Ziegler-Nichols method, which can determine good PID parameters
+ * in a manual process:
+ *  - Set ki, kd to zero.
+ *  - Increase kp until the output oscillates *around* the setpoint. This value kp is called the
+ *    "ultimate gain" K_u.
+ *  - Additionally, record the period of the observed oscillation as P_u (also called T_u).
+ *  - suitable PID parameters are then: kp=0.6*K_u, ki=1.2*K_u/P_u, kd=0.075*K_u*P_u (additional variants of
+ *    these "magic" factors exist as well [2]).
+ *
+ * Now we'd like to automate that process to get K_u and P_u without the user. So we'd like to somehow
+ * make the observed variable oscillate. One observation is that in many applications of PID controllers
+ * the observed variable has some amount of "delay" to the output value (think heating an object, it will
+ * take a few seconds before the sensor can sense the change of temperature) [3].
+ *
+ * It turns out one way to induce such an oscillation is by using a really dumb heating controller:
+ * When the observed value is below the setpoint, heat at 100%. If it's below, cool at 100% (or disable heating).
+ * We call this the "RelayFunction" - the class is responsible for making the observed value oscillate around the
+ * setpoint. We actually use a hysteresis filter (like the bang bang controller) to make the process immune to
+ * noise in the input data, but the math is the same [1].
+ *
+ * Next, now that we have induced an oscillation, we want to measure the frequency (or period) of oscillation.
+ * This is what "OscillationFrequencyDetector" is for: it records zerocrossing events (when the observed value
+ * crosses the setpoint). From that data, we can determine the average oscillating period. This is the P_u of the
+ * ZN-method.
+ *
+ * Finally, we need to determine K_u, the ultimate gain. It turns out we can calculate this based on the amplitude of
+ * oscillation ("induced amplitude `a`) as described in [1]:
+ *   K_u = (4d) / (πa)
+ * where d is the magnitude of the relay function (in range -d to +d).
+ * To measure `a`, we look at the current phase the relay function is in - if it's in the "heating" phase, then we
+ * expect the lowest temperature (=highest error) to be found in the phase because the peak will always happen slightly
+ * after the relay function has changed state (assuming a delay-dominated process).
+ *
+ * Finally, we use some heuristics to determine if the data we've received so far is good:
+ *  - First, of course we must have enough data to calculate the values.
+ *  - The ZC events need to happen at a relatively periodic rate. If the heating/cooling speeds are very different,
+ *    I've observed the ZN parameters are not very useful.
+ *  - The induced amplitude should not deviate too much. If the amplitudes deviate too much this means there has
+ *    been some outside influence (or noise) on the system, and the measured amplitude values are not reliable.
+ *
+ * There are many ways this method can be improved, but on my simulation data the current method already produces very
+ * good results. Some ideas for future improvements:
+ *  - Relay Function improvements:
+ *    - Integrator, Preload, Saturation Relay ([1])
+ *  - Use phase of measured signal relative to relay function.
+ *  - Apply PID parameters from ZN, but continuously tweak them in a second step.
+ *
+ * [1]: https://warwick.ac.uk/fac/cross_fac/iatl/reinvention/archive/volume5issue2/hornsey/
+ * [2]: http://www.mstarlabs.com/control/znrule.html
+ * [3]: https://www.academia.edu/38620114/SEBORG_3rd_Edition_Process_Dynamics_and_Control
+ */
+
+PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float process_variable) {
+  PIDAutotuner::PIDAutotuneResult res;
+  if (this->state_ == AUTOTUNE_SUCCEEDED) {
+    res.result_params = this->get_ziegler_nichols_pid_();
+    return res;
+  }
+
+  if (!isnan(this->setpoint_) && this->setpoint_ != setpoint) {
+    ESP_LOGW(TAG, "Setpoint changed during autotune! The result will not be accurate!");
+  }
+  this->setpoint_ = setpoint;
+
+  float error = setpoint - process_variable;
+  const uint32_t now = millis();
+
+  float output = this->relay_function_.update(error);
+  this->frequency_detector_.update(now, error);
+  this->amplitude_detector_.update(error, this->relay_function_.state);
+  res.output = output;
+
+  if (!this->frequency_detector_.has_enough_data() || !this->amplitude_detector_.has_enough_data()) {
+    // not enough data for calculation yet
+    ESP_LOGV(TAG, "  Not enough data yet for aututuner");
+    return res;
+  }
+
+  bool zc_symmetrical = this->frequency_detector_.is_increase_decrease_symmetrical();
+  bool amplitude_convergent = this->frequency_detector_.is_increase_decrease_symmetrical();
+  if (!zc_symmetrical || !amplitude_convergent) {
+    // The frequency/amplitude is not fully accurate yet, try to wait
+    // until the fault clears, or terminate after a while anyway
+    if (zc_symmetrical) {
+      ESP_LOGVV(TAG, "  ZC is not symmetrical");
+    }
+    if (amplitude_convergent) {
+      ESP_LOGVV(TAG, "  Amplitude is not convergent");
+    }
+    uint32_t phase = this->relay_function_.phase_count;
+    ESP_LOGVV(TAG, "  Phase %u, enough=%u", phase, enough_data_phase_);
+
+    if (this->enough_data_phase_ == 0) {
+      this->enough_data_phase_ = phase;
+    } else if (phase - this->enough_data_phase_ <= 6) {
+      // keep trying for at least 6 more phases
+      return res;
+    } else {
+      // proceed to calculating PID parameters
+      // warning will be shown in "Checks" section
+    }
+  }
+
+  ESP_LOGI(TAG, "PID Autotune finished!");
+
+  float osc_ampl = this->amplitude_detector_.get_mean_oscillation_amplitude();
+  float d = (this->relay_function_.output_positive - this->relay_function_.output_negative) / 2.0f;
+  ESP_LOGVV(TAG, "  Relay magnitude: %f", d);
+  this->ku_ = 4.0f * d / float(M_PI * osc_ampl);
+  this->pu_ = this->frequency_detector_.get_mean_oscillation_period();
+
+  this->state_ = AUTOTUNE_SUCCEEDED;
+  res.result_params = this->get_ziegler_nichols_pid_();
+  this->dump_config();
+
+  return res;
+}
+void PIDAutotuner::dump_config() {
+  ESP_LOGI(TAG, "PID Autotune:");
+  if (this->state_ == AUTOTUNE_SUCCEEDED) {
+    ESP_LOGI(TAG, "  State: Succeeded!");
+    bool has_issue = false;
+    if (!this->amplitude_detector_.is_amplitude_convergent()) {
+      ESP_LOGW(TAG, "  Could not reliable determine oscillation amplitude, PID parameters may be inaccurate!");
+      ESP_LOGW(TAG, "    Please make sure you eliminate all outside influences on the measured temperature.");
+      has_issue = true;
+    }
+    if (!this->frequency_detector_.is_increase_decrease_symmetrical()) {
+      ESP_LOGW(TAG, "  Oscillation Frequency is not symmetrical. PID parameters may be inaccurate!");
+      ESP_LOGW(
+          TAG,
+          "    This is usually because the heat and cool processes do not change the temperature at the same rate.");
+      ESP_LOGW(TAG,
+               "    Please try reducing the positive_output value (or increase negative_output in case of a cooler)");
+      has_issue = true;
+    }
+    if (!has_issue) {
+      ESP_LOGI(TAG, "  All checks passed!");
+    }
+
+    auto fac = get_ziegler_nichols_pid_();
+    ESP_LOGI(TAG, "  Calculated PID parameters (\"Ziegler-Nichols PID\" rule):");
+    ESP_LOGI(TAG, " ");
+    ESP_LOGI(TAG, "  control_parameters:");
+    ESP_LOGI(TAG, "    kp: %.5f", fac.kp);
+    ESP_LOGI(TAG, "    ki: %.5f", fac.ki);
+    ESP_LOGI(TAG, "    kd: %.5f", fac.kd);
+    ESP_LOGI(TAG, " ");
+    ESP_LOGI(TAG, "  Please copy these values into your YAML configuration! They will reset on the next reboot.");
+
+    ESP_LOGV(TAG, "  Oscillation Period: %f", this->frequency_detector_.get_mean_oscillation_period());
+    ESP_LOGV(TAG, "  Oscillation Amplitude: %f", this->amplitude_detector_.get_mean_oscillation_amplitude());
+    ESP_LOGV(TAG, "  Ku: %f, Pu: %f", this->ku_, this->pu_);
+
+    ESP_LOGD(TAG, "  Alternative Rules:");
+    // http://www.mstarlabs.com/control/znrule.html
+    print_rule_("Ziegler-Nichols PI", 0.45f, 0.54f, 0.0f);
+    print_rule_("Pessen Integral PID", 0.7f, 1.75f, 0.105f);
+    print_rule_("Some Overshoot PID", 0.333f, 0.667f, 0.111f);
+    print_rule_("No Overshoot PID", 0.2f, 0.4f, 0.0625f);
+  }
+
+  if (this->state_ == AUTOTUNE_RUNNING) {
+    ESP_LOGI(TAG, "  Autotune is still running!");
+    ESP_LOGD(TAG, "  Status: Trying to reach %.2f °C", setpoint_ - relay_function_.current_target_error());
+    ESP_LOGD(TAG, "  Stats so far:");
+    ESP_LOGD(TAG, "    Phases: %u", relay_function_.phase_count);
+    ESP_LOGD(TAG, "    Detected %u zero-crossings", frequency_detector_.zerocrossing_intervals.size());  // NOLINT
+    ESP_LOGD(TAG, "    Current Phase Min: %.2f, Max: %.2f", amplitude_detector_.phase_min,
+             amplitude_detector_.phase_max);
+  }
+}
+PIDAutotuner::PIDResult PIDAutotuner::calculate_pid_(float kp_factor, float ki_factor, float kd_factor) {
+  float kp = kp_factor * ku_;
+  float ki = ki_factor * ku_ / pu_;
+  float kd = kd_factor * ku_ * pu_;
+  return {
+      .kp = kp,
+      .ki = ki,
+      .kd = kd,
+  };
+}
+void PIDAutotuner::print_rule_(const char *name, float kp_factor, float ki_factor, float kd_factor) {
+  auto fac = calculate_pid_(kp_factor, ki_factor, kd_factor);
+  ESP_LOGD(TAG, "    Rule '%s':", name);
+  ESP_LOGD(TAG, "      kp: %.5f, ki: %.5f, kd: %.5f", fac.kp, fac.ki, fac.kd);
+}
+
+// ================== RelayFunction ==================
+float PIDAutotuner::RelayFunction::update(float error) {
+  if (this->state == RELAY_FUNCTION_INIT) {
+    bool pos = error > this->noiseband;
+    state = pos ? RELAY_FUNCTION_POSITIVE : RELAY_FUNCTION_NEGATIVE;
+  }
+  bool change = false;
+  if (this->state == RELAY_FUNCTION_POSITIVE && error < -this->noiseband) {
+    // Positive hysteresis reached, change direction
+    this->state = RELAY_FUNCTION_NEGATIVE;
+    change = true;
+  } else if (this->state == RELAY_FUNCTION_NEGATIVE && error > this->noiseband) {
+    // Negative hysteresis reached, change direction
+    this->state = RELAY_FUNCTION_POSITIVE;
+    change = true;
+  }
+
+  float output = state == RELAY_FUNCTION_POSITIVE ? output_positive : output_negative;
+  if (change) {
+    this->phase_count++;
+    ESP_LOGV(TAG, "Autotune: Turning output to %.1f%%", output * 100);
+  }
+
+  return output;
+}
+
+// ================== OscillationFrequencyDetector ==================
+void PIDAutotuner::OscillationFrequencyDetector::update(uint32_t now, float error) {
+  if (this->state == FREQUENCY_DETECTOR_INIT) {
+    bool pos = error > this->noiseband;
+    state = pos ? FREQUENCY_DETECTOR_POSITIVE : FREQUENCY_DETECTOR_NEGATIVE;
+  }
+
+  bool had_crossing = false;
+  if (this->state == FREQUENCY_DETECTOR_POSITIVE && error < -this->noiseband) {
+    this->state = FREQUENCY_DETECTOR_NEGATIVE;
+    had_crossing = true;
+  } else if (this->state == FREQUENCY_DETECTOR_NEGATIVE && error > this->noiseband) {
+    this->state = FREQUENCY_DETECTOR_POSITIVE;
+    had_crossing = true;
+  }
+
+  if (had_crossing) {
+    // Had crossing above hysteresis threshold, record
+    ESP_LOGV(TAG, "Autotune: Detected Zero-Cross at %u", now);
+    if (this->last_zerocross != 0) {
+      uint32_t dt = now - this->last_zerocross;
+      ESP_LOGV(TAG, "  dt: %u", dt);
+      this->zerocrossing_intervals.push_back(dt);
+    }
+    this->last_zerocross = now;
+  }
+}
+bool PIDAutotuner::OscillationFrequencyDetector::has_enough_data() const {
+  // Do we have enough data in this detector to generate PID values?
+  return this->zerocrossing_intervals.size() >= 2;
+}
+float PIDAutotuner::OscillationFrequencyDetector::get_mean_oscillation_period() const {
+  // Get the mean oscillation period in seconds
+  // Only call if has_enough_data() has returned true.
+  float sum = 0.0f;
+  for (uint32_t v : this->zerocrossing_intervals)
+    sum += v;
+  // zerocrossings are each half-period, multiply by 2
+  float mean_value = sum / this->zerocrossing_intervals.size();
+  // divide by 1000 to get seconds, multiply by two because zc happens two times per period
+  float mean_period = mean_value / 1000 * 2;
+  return mean_period;
+}
+bool PIDAutotuner::OscillationFrequencyDetector::is_increase_decrease_symmetrical() const {
+  // Check if increase/decrease of process value was symmetrical
+  // If the process value increases much faster than it decreases, the generated PID values will
+  // not be very good and the function output values need to be adjusted
+  // Happens for example with a well-insulated heating element.
+  // We calculate this based on the zerocrossing interval.
+  if (zerocrossing_intervals.empty())
+    return false;
+  uint32_t max_interval = zerocrossing_intervals[0];
+  uint32_t min_interval = zerocrossing_intervals[0];
+  for (uint32_t interval : zerocrossing_intervals) {
+    max_interval = std::max(max_interval, interval);
+    min_interval = std::min(min_interval, interval);
+  }
+  float ratio = min_interval / float(max_interval);
+  return ratio >= 0.66;
+}
+
+// ================== OscillationAmplitudeDetector ==================
+void PIDAutotuner::OscillationAmplitudeDetector::update(float error,
+                                                        PIDAutotuner::RelayFunction::RelayFunctionState relay_state) {
+  if (relay_state != last_relay_state) {
+    if (last_relay_state == RelayFunction::RELAY_FUNCTION_POSITIVE) {
+      // Transitioned from positive error to negative error.
+      // The positive error peak must have been in previous segment (180° shifted)
+      // record phase_max
+      this->phase_maxs.push_back(phase_max);
+      ESP_LOGV(TAG, "Autotune: Phase Max: %f", phase_max);
+    } else if (last_relay_state == RelayFunction::RELAY_FUNCTION_NEGATIVE) {
+      // Transitioned from negative error to positive error.
+      // The negative error peak must have been in previous segment (180° shifted)
+      // record phase_min
+      this->phase_mins.push_back(phase_min);
+      ESP_LOGV(TAG, "Autotune: Phase Min: %f", phase_min);
+    }
+    // reset phase values for next phase
+    this->phase_min = error;
+    this->phase_max = error;
+  }
+  this->last_relay_state = relay_state;
+
+  this->phase_min = std::min(this->phase_min, error);
+  this->phase_max = std::max(this->phase_max, error);
+
+  // Check arrays sizes, we keep at most 7 items (6 datapoints is enough, and data at beginning might not
+  // have been stabilized)
+  if (this->phase_maxs.size() > 7)
+    this->phase_maxs.erase(this->phase_maxs.begin());
+  if (this->phase_mins.size() > 7)
+    this->phase_mins.erase(this->phase_mins.begin());
+}
+bool PIDAutotuner::OscillationAmplitudeDetector::has_enough_data() const {
+  // Return if we have enough data to generate PID parameters
+  // The first phase is not very useful if the setpoint is not set to the starting process value
+  // So discard first phase. Otherwise we need at least two phases.
+  return std::min(phase_mins.size(), phase_maxs.size()) >= 3;
+}
+float PIDAutotuner::OscillationAmplitudeDetector::get_mean_oscillation_amplitude() const {
+  float total_amplitudes = 0;
+  size_t total_amplitudes_n = 0;
+  for (int i = 1; i < std::min(phase_mins.size(), phase_maxs.size()) - 1; i++) {
+    total_amplitudes += std::abs(phase_maxs[i] - phase_mins[i + 1]);
+    total_amplitudes_n++;
+  }
+  float mean_amplitude = total_amplitudes / total_amplitudes_n;
+  // Amplitude is measured from center, divide by 2
+  return mean_amplitude / 2.0f;
+}
+bool PIDAutotuner::OscillationAmplitudeDetector::is_amplitude_convergent() const {
+  // Check if oscillation amplitude is convergent
+  // We implement this by checking global extrema against average amplitude
+  if (this->phase_mins.empty() || this->phase_maxs.empty())
+    return false;
+
+  float global_max = phase_maxs[0], global_min = phase_mins[0];
+  for (auto v : this->phase_mins)
+    global_min = std::min(global_min, v);
+  for (auto v : this->phase_maxs)
+    global_max = std::min(global_max, v);
+  float global_amplitude = (global_max - global_min) / 2.0f;
+  float mean_amplitude = this->get_mean_oscillation_amplitude();
+  return (mean_amplitude - global_amplitude) / (global_amplitude) < 0.05f;
+}
+
+}  // namespace pid
+}  // namespace esphome
diff --git a/esphome/components/pid/pid_autotuner.h b/esphome/components/pid/pid_autotuner.h
new file mode 100644
index 0000000000..7dfe0c056d
--- /dev/null
+++ b/esphome/components/pid/pid_autotuner.h
@@ -0,0 +1,110 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/optional.h"
+#include "pid_controller.h"
+#include "pid_simulator.h"
+
+namespace esphome {
+namespace pid {
+
+class PIDAutotuner {
+ public:
+  struct PIDResult {
+    float kp;
+    float ki;
+    float kd;
+  };
+  struct PIDAutotuneResult {
+    float output;
+    optional<PIDResult> result_params;
+  };
+
+  void config(float output_min, float output_max) {
+    relay_function_.output_negative = std::max(relay_function_.output_negative, output_min);
+    relay_function_.output_positive = std::min(relay_function_.output_positive, output_max);
+  }
+  PIDAutotuneResult update(float setpoint, float process_variable);
+  bool is_finished() const { return state_ != AUTOTUNE_RUNNING; }
+
+  void dump_config();
+
+  void set_noiseband(float noiseband) {
+    relay_function_.noiseband = noiseband;
+    // ZC detector uses 1/4 the noiseband of relay function (noise suppression)
+    frequency_detector_.noiseband = noiseband / 4;
+  }
+  void set_output_positive(float output_positive) { relay_function_.output_positive = output_positive; }
+  void set_output_negative(float output_negative) { relay_function_.output_negative = output_negative; }
+
+ protected:
+  struct RelayFunction {
+    float update(float error);
+
+    float current_target_error() const {
+      if (state == RELAY_FUNCTION_INIT)
+        return 0;
+      if (state == RELAY_FUNCTION_POSITIVE)
+        return -noiseband;
+      return noiseband;
+    }
+
+    enum RelayFunctionState {
+      RELAY_FUNCTION_INIT,
+      RELAY_FUNCTION_POSITIVE,
+      RELAY_FUNCTION_NEGATIVE,
+    } state = RELAY_FUNCTION_INIT;
+    float noiseband = 0.5;
+    float output_positive = 1;
+    float output_negative = -1;
+    uint32_t phase_count = 0;
+  } relay_function_;
+  struct OscillationFrequencyDetector {
+    void update(uint32_t now, float error);
+
+    bool has_enough_data() const;
+
+    float get_mean_oscillation_period() const;
+
+    bool is_increase_decrease_symmetrical() const;
+
+    enum FrequencyDetectorState {
+      FREQUENCY_DETECTOR_INIT,
+      FREQUENCY_DETECTOR_POSITIVE,
+      FREQUENCY_DETECTOR_NEGATIVE,
+    } state;
+    float noiseband = 0.05;
+    uint32_t last_zerocross{0};
+    std::vector<uint32_t> zerocrossing_intervals;
+  } frequency_detector_;
+  struct OscillationAmplitudeDetector {
+    void update(float error, RelayFunction::RelayFunctionState relay_state);
+
+    bool has_enough_data() const;
+
+    float get_mean_oscillation_amplitude() const;
+
+    bool is_amplitude_convergent() const;
+
+    float phase_min = NAN;
+    float phase_max = NAN;
+    std::vector<float> phase_mins;
+    std::vector<float> phase_maxs;
+    RelayFunction::RelayFunctionState last_relay_state = RelayFunction::RELAY_FUNCTION_INIT;
+  } amplitude_detector_;
+  PIDResult calculate_pid_(float kp_factor, float ki_factor, float kd_factor);
+  void print_rule_(const char *name, float kp_factor, float ki_factor, float kd_factor);
+  PIDResult get_ziegler_nichols_pid_() { return calculate_pid_(0.6f, 1.2f, 0.075f); }
+
+  uint32_t enough_data_phase_ = 0;
+  float setpoint_ = NAN;
+  enum State {
+    AUTOTUNE_RUNNING,
+    AUTOTUNE_SUCCEEDED,
+  } state_ = AUTOTUNE_RUNNING;
+  float ku_;
+  float pu_;
+};
+
+}  // namespace pid
+}  // namespace esphome
diff --git a/esphome/components/pid/pid_climate.cpp b/esphome/components/pid/pid_climate.cpp
new file mode 100644
index 0000000000..0c777ffd8b
--- /dev/null
+++ b/esphome/components/pid/pid_climate.cpp
@@ -0,0 +1,152 @@
+#include "pid_climate.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace pid {
+
+static const char *TAG = "pid.climate";
+
+void PIDClimate::setup() {
+  this->sensor_->add_on_state_callback([this](float state) {
+    // only publish if state/current temperature has changed in two digits of precision
+    this->do_publish_ = roundf(state * 100) != roundf(this->current_temperature * 100);
+    this->current_temperature = state;
+    this->update_pid_();
+  });
+  this->current_temperature = this->sensor_->state;
+  // restore set points
+  auto restore = this->restore_state_();
+  if (restore.has_value()) {
+    restore->to_call(this).perform();
+  } else {
+    // restore from defaults, change_away handles those for us
+    this->mode = climate::CLIMATE_MODE_AUTO;
+    this->target_temperature = this->default_target_temperature_;
+  }
+}
+void PIDClimate::control(const climate::ClimateCall &call) {
+  if (call.get_mode().has_value())
+    this->mode = *call.get_mode();
+  if (call.get_target_temperature().has_value())
+    this->target_temperature = *call.get_target_temperature();
+
+  // If switching to non-auto mode, set output immediately
+  if (this->mode != climate::CLIMATE_MODE_AUTO)
+    this->handle_non_auto_mode_();
+
+  this->publish_state();
+}
+climate::ClimateTraits PIDClimate::traits() {
+  auto traits = climate::ClimateTraits();
+  traits.set_supports_current_temperature(true);
+  traits.set_supports_auto_mode(true);
+  traits.set_supports_two_point_target_temperature(false);
+  traits.set_supports_cool_mode(this->supports_cool_());
+  traits.set_supports_heat_mode(this->supports_heat_());
+  traits.set_supports_action(true);
+  return traits;
+}
+void PIDClimate::dump_config() {
+  LOG_CLIMATE("", "PID Climate", this);
+  ESP_LOGCONFIG(TAG, "  Control Parameters:");
+  ESP_LOGCONFIG(TAG, "    kp: %.5f, ki: %.5f, kd: %.5f", controller_.kp, controller_.ki, controller_.kd);
+
+  if (this->autotuner_ != nullptr) {
+    this->autotuner_->dump_config();
+  }
+}
+void PIDClimate::write_output_(float value) {
+  this->output_value_ = value;
+
+  // first ensure outputs are off (both outputs not active at the same time)
+  if (this->supports_cool_() && value >= 0)
+    this->cool_output_->set_level(0.0f);
+  if (this->supports_heat_() && value <= 0)
+    this->heat_output_->set_level(0.0f);
+
+  // value < 0 means cool, > 0 means heat
+  if (this->supports_cool_() && value < 0)
+    this->cool_output_->set_level(std::min(1.0f, -value));
+  if (this->supports_heat_() && value > 0)
+    this->heat_output_->set_level(std::min(1.0f, value));
+
+  // Update action variable for user feedback what's happening
+  climate::ClimateAction new_action;
+  if (this->supports_cool_() && value < 0)
+    new_action = climate::CLIMATE_ACTION_COOLING;
+  else if (this->supports_heat_() && value > 0)
+    new_action = climate::CLIMATE_ACTION_HEATING;
+  else if (this->mode == climate::CLIMATE_MODE_OFF)
+    new_action = climate::CLIMATE_ACTION_OFF;
+  else
+    new_action = climate::CLIMATE_ACTION_IDLE;
+
+  if (new_action != this->action) {
+    this->action = new_action;
+    this->do_publish_ = true;
+  }
+  this->pid_computed_callback_.call();
+}
+void PIDClimate::handle_non_auto_mode_() {
+  // in non-auto mode, switch directly to appropriate action
+  //  - HEAT mode / COOL mode -> Output at ±100%
+  //  - OFF mode -> Output at 0%
+  if (this->mode == climate::CLIMATE_MODE_HEAT) {
+    this->write_output_(1.0);
+  } else if (this->mode == climate::CLIMATE_MODE_COOL) {
+    this->write_output_(-1.0);
+  } else if (this->mode == climate::CLIMATE_MODE_OFF) {
+    this->write_output_(0.0);
+  } else {
+    assert(false);
+  }
+}
+void PIDClimate::update_pid_() {
+  float value;
+  if (isnan(this->current_temperature) || isnan(this->target_temperature)) {
+    // if any control parameters are nan, turn off all outputs
+    value = 0.0;
+  } else {
+    // Update PID controller irrespective of current mode, to not mess up D/I terms
+    // In non-auto mode, we just discard the output value
+    value = this->controller_.update(this->target_temperature, this->current_temperature);
+
+    // Check autotuner
+    if (this->autotuner_ != nullptr && !this->autotuner_->is_finished()) {
+      auto res = this->autotuner_->update(this->target_temperature, this->current_temperature);
+      if (res.result_params.has_value()) {
+        this->controller_.kp = res.result_params->kp;
+        this->controller_.ki = res.result_params->ki;
+        this->controller_.kd = res.result_params->kd;
+        // keep autotuner instance so that subsequent dump_configs will print the long result message.
+      } else {
+        value = res.output;
+        if (mode != climate::CLIMATE_MODE_AUTO) {
+          ESP_LOGW(TAG, "For PID autotuner you need to set AUTO (also called heat/cool) mode!");
+        }
+      }
+    }
+  }
+
+  if (this->mode != climate::CLIMATE_MODE_AUTO) {
+    this->handle_non_auto_mode_();
+  } else {
+    this->write_output_(value);
+  }
+
+  if (this->do_publish_)
+    this->publish_state();
+}
+void PIDClimate::start_autotune(std::unique_ptr<PIDAutotuner> &&autotune) {
+  this->autotuner_ = std::move(autotune);
+  float min_value = this->supports_cool_() ? -1.0f : 0.0f;
+  float max_value = this->supports_heat_() ? 1.0f : 0.0f;
+  this->autotuner_->config(min_value, max_value);
+  this->set_interval("autotune-progress", 10000, [this]() {
+    if (this->autotuner_ != nullptr && !this->autotuner_->is_finished())
+      this->autotuner_->dump_config();
+  });
+}
+
+}  // namespace pid
+}  // namespace esphome
diff --git a/esphome/components/pid/pid_climate.h b/esphome/components/pid/pid_climate.h
new file mode 100644
index 0000000000..8f379c47b4
--- /dev/null
+++ b/esphome/components/pid/pid_climate.h
@@ -0,0 +1,94 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/climate/climate.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/output/float_output.h"
+#include "pid_controller.h"
+#include "pid_autotuner.h"
+
+namespace esphome {
+namespace pid {
+
+class PIDClimate : public climate::Climate, public Component {
+ public:
+  PIDClimate() = default;
+  void setup() override;
+  void dump_config() override;
+
+  void set_sensor(sensor::Sensor *sensor) { sensor_ = sensor; }
+  void set_cool_output(output::FloatOutput *cool_output) { cool_output_ = cool_output; }
+  void set_heat_output(output::FloatOutput *heat_output) { heat_output_ = heat_output; }
+  void set_kp(float kp) { controller_.kp = kp; }
+  void set_ki(float ki) { controller_.ki = ki; }
+  void set_kd(float kd) { controller_.kd = kd; }
+  void set_min_integral(float min_integral) { controller_.min_integral = min_integral; }
+  void set_max_integral(float max_integral) { controller_.max_integral = max_integral; }
+
+  float get_output_value() const { return output_value_; }
+  float get_error_value() const { return controller_.error; }
+  float get_proportional_term() const { return controller_.proportional_term; }
+  float get_integral_term() const { return controller_.integral_term; }
+  float get_derivative_term() const { return controller_.derivative_term; }
+  void add_on_pid_computed_callback(std::function<void()> &&callback) {
+    pid_computed_callback_.add(std::move(callback));
+  }
+  void set_default_target_temperature(float default_target_temperature) {
+    default_target_temperature_ = default_target_temperature;
+  }
+  void start_autotune(std::unique_ptr<PIDAutotuner> &&autotune);
+
+ protected:
+  /// Override control to change settings of the climate device.
+  void control(const climate::ClimateCall &call) override;
+  /// Return the traits of this controller.
+  climate::ClimateTraits traits() override;
+
+  void update_pid_();
+
+  bool supports_cool_() const { return this->cool_output_ != nullptr; }
+  bool supports_heat_() const { return this->heat_output_ != nullptr; }
+
+  void write_output_(float value);
+  void handle_non_auto_mode_();
+
+  /// The sensor used for getting the current temperature
+  sensor::Sensor *sensor_;
+  output::FloatOutput *cool_output_ = nullptr;
+  output::FloatOutput *heat_output_ = nullptr;
+  PIDController controller_;
+  /// Output value as reported by the PID controller, for PIDClimateSensor
+  float output_value_;
+  CallbackManager<void()> pid_computed_callback_;
+  float default_target_temperature_;
+  std::unique_ptr<PIDAutotuner> autotuner_;
+  bool do_publish_ = false;
+};
+
+template<typename... Ts> class PIDAutotuneAction : public Action<Ts...> {
+ public:
+  PIDAutotuneAction(PIDClimate *parent) : parent_(parent) {}
+
+  void play(Ts... x) {
+    auto tuner = make_unique<PIDAutotuner>();
+    tuner->set_noiseband(this->noiseband_);
+    tuner->set_output_negative(this->negative_output_);
+    tuner->set_output_positive(this->positive_output_);
+    this->parent_->start_autotune(std::move(tuner));
+  }
+
+  void set_noiseband(float noiseband) { noiseband_ = noiseband; }
+  void set_positive_output(float positive_output) { positive_output_ = positive_output; }
+  void set_negative_output(float negative_output) { negative_output_ = negative_output; }
+
+ protected:
+  float noiseband_;
+  float positive_output_;
+  float negative_output_;
+  PIDClimate *parent_;
+};
+
+}  // namespace pid
+}  // namespace esphome
diff --git a/esphome/components/pid/pid_controller.h b/esphome/components/pid/pid_controller.h
new file mode 100644
index 0000000000..7ec7724e15
--- /dev/null
+++ b/esphome/components/pid/pid_controller.h
@@ -0,0 +1,79 @@
+#pragma once
+
+#include "esphome/core/esphal.h"
+
+namespace esphome {
+namespace pid {
+
+struct PIDController {
+  float update(float setpoint, float process_value) {
+    // e(t) ... error at timestamp t
+    // r(t) ... setpoint
+    // y(t) ... process value (sensor reading)
+    // u(t) ... output value
+
+    float dt = calculate_relative_time_();
+
+    // e(t) := r(t) - y(t)
+    error = setpoint - process_value;
+
+    // p(t) := K_p * e(t)
+    proportional_term = kp * error;
+
+    // i(t) := K_i * \int_{0}^{t} e(t) dt
+    accumulated_integral_ += error * dt * ki;
+    // constrain accumulated integral value
+    if (!isnan(min_integral) && accumulated_integral_ < min_integral)
+      accumulated_integral_ = min_integral;
+    if (!isnan(max_integral) && accumulated_integral_ > max_integral)
+      accumulated_integral_ = max_integral;
+    integral_term = accumulated_integral_;
+
+    // d(t) := K_d * de(t)/dt
+    float derivative = 0.0f;
+    if (dt != 0.0f)
+      derivative = (error - previous_error_) / dt;
+    previous_error_ = error;
+    derivative_term = kd * derivative;
+
+    // u(t) := p(t) + i(t) + d(t)
+    return proportional_term + integral_term + derivative_term;
+  }
+
+  /// Proportional gain K_p.
+  float kp = 0;
+  /// Integral gain K_i.
+  float ki = 0;
+  /// Differential gain K_d.
+  float kd = 0;
+
+  float min_integral = NAN;
+  float max_integral = NAN;
+
+  // Store computed values in struct so that values can be monitored through sensors
+  float error;
+  float proportional_term;
+  float integral_term;
+  float derivative_term;
+
+ protected:
+  float calculate_relative_time_() {
+    uint32_t now = millis();
+    uint32_t dt = now - this->last_time_;
+    if (last_time_ == 0) {
+      last_time_ = now;
+      return 0.0f;
+    }
+    last_time_ = now;
+    return dt / 1000.0f;
+  }
+
+  /// Error from previous update used for derivative term
+  float previous_error_ = 0;
+  /// Accumulated integral value
+  float accumulated_integral_ = 0;
+  uint32_t last_time_ = 0;
+};
+
+}  // namespace pid
+}  // namespace esphome
diff --git a/esphome/components/pid/pid_simulator.h b/esphome/components/pid/pid_simulator.h
new file mode 100644
index 0000000000..fe145b7330
--- /dev/null
+++ b/esphome/components/pid/pid_simulator.h
@@ -0,0 +1,75 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/output/float_output.h"
+
+namespace esphome {
+namespace pid {
+
+class PIDSimulator : public PollingComponent, public output::FloatOutput {
+ public:
+  PIDSimulator() : PollingComponent(1000) {}
+
+  float surface = 1;                     /// surface area in m²
+  float mass = 3;                        /// mass of simulated object in kg
+  float temperature = 21;                /// current temperature of object in °C
+  float efficiency = 0.98;               /// heating efficiency, 1 is 100% efficient
+  float thermal_conductivity = 15;       /// thermal conductivity of surface are in W/(m*K), here: steel
+  float specific_heat_capacity = 4.182;  /// specific heat capacity of mass in kJ/(kg*K), here: water
+  float heat_power = 500;                /// Heating power in W
+  float ambient_temperature = 20;        /// Ambient temperature in °C
+  float update_interval = 1;             /// The simulated updated interval in seconds
+  std::vector<float> delayed_temps;      /// storage of past temperatures for delaying temperature reading
+  size_t delay_cycles = 15;              /// how many update cycles to delay the output
+  float output_value = 0.0;              /// Current output value of heating element
+  sensor::Sensor *sensor = new sensor::Sensor();
+
+  float delta_t(float power) {
+    // P = Q / t
+    // Q = c * m * 𝚫t
+    // 𝚫t = (P*t) / (c*m)
+    float c = this->specific_heat_capacity;
+    float t = this->update_interval;
+    float p = power / 1000;  //  in kW
+    float m = this->mass;
+    return (p * t) / (c * m);
+  }
+
+  float update_temp() {
+    float value = clamp(output_value, 0.0f, 1.0f);
+
+    // Heat
+    float power = value * heat_power * efficiency;
+    temperature += this->delta_t(power);
+
+    // Cool
+    // Q = k_w * A * (T_mass - T_ambient)
+    // P = Q / t
+    float dt = temperature - ambient_temperature;
+    float cool_power = (thermal_conductivity * surface * dt) / update_interval;
+    temperature -= this->delta_t(cool_power);
+
+    // Delay temperature readings
+    delayed_temps.push_back(temperature);
+    if (delayed_temps.size() > delay_cycles)
+      delayed_temps.erase(delayed_temps.begin());
+    float prev_temp = this->delayed_temps[0];
+    float alpha = 0.1f;
+    float ret = (1 - alpha) * prev_temp + alpha * prev_temp;
+    return ret;
+  }
+
+  void setup() override { sensor->publish_state(this->temperature); }
+  void update() override {
+    float new_temp = this->update_temp();
+    sensor->publish_state(new_temp);
+  }
+
+ protected:
+  void write_state(float state) override { this->output_value = state; }
+};
+
+}  // namespace pid
+}  // namespace esphome
diff --git a/esphome/components/pid/sensor/__init__.py b/esphome/components/pid/sensor/__init__.py
new file mode 100644
index 0000000000..cfab23d204
--- /dev/null
+++ b/esphome/components/pid/sensor/__init__.py
@@ -0,0 +1,36 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import CONF_ID, UNIT_PERCENT, ICON_GAUGE, CONF_TYPE
+from ..climate import pid_ns, PIDClimate
+
+PIDClimateSensor = pid_ns.class_('PIDClimateSensor', sensor.Sensor, cg.Component)
+PIDClimateSensorType = pid_ns.enum('PIDClimateSensorType')
+
+PID_CLIMATE_SENSOR_TYPES = {
+    'RESULT': PIDClimateSensorType.PID_SENSOR_TYPE_RESULT,
+    'ERROR': PIDClimateSensorType.PID_SENSOR_TYPE_ERROR,
+    'PROPORTIONAL': PIDClimateSensorType.PID_SENSOR_TYPE_PROPORTIONAL,
+    'INTEGRAL': PIDClimateSensorType.PID_SENSOR_TYPE_INTEGRAL,
+    'DERIVATIVE': PIDClimateSensorType.PID_SENSOR_TYPE_DERIVATIVE,
+    'HEAT': PIDClimateSensorType.PID_SENSOR_TYPE_HEAT,
+    'COOL': PIDClimateSensorType.PID_SENSOR_TYPE_COOL,
+}
+
+CONF_CLIMATE_ID = 'climate_id'
+CONFIG_SCHEMA = sensor.sensor_schema(UNIT_PERCENT, ICON_GAUGE, 1).extend({
+    cv.GenerateID(): cv.declare_id(PIDClimateSensor),
+    cv.GenerateID(CONF_CLIMATE_ID): cv.use_id(PIDClimate),
+
+    cv.Required(CONF_TYPE): cv.enum(PID_CLIMATE_SENSOR_TYPES, upper=True),
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    parent = yield cg.get_variable(config[CONF_CLIMATE_ID])
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield sensor.register_sensor(var, config)
+    yield cg.register_component(var, config)
+
+    cg.add(var.set_parent(parent))
+    cg.add(var.set_type(config[CONF_TYPE]))
diff --git a/esphome/components/pid/sensor/pid_climate_sensor.cpp b/esphome/components/pid/sensor/pid_climate_sensor.cpp
new file mode 100644
index 0000000000..6241a139f6
--- /dev/null
+++ b/esphome/components/pid/sensor/pid_climate_sensor.cpp
@@ -0,0 +1,47 @@
+#include "pid_climate_sensor.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace pid {
+
+static const char *TAG = "pid.sensor";
+
+void PIDClimateSensor::setup() {
+  this->parent_->add_on_pid_computed_callback([this]() { this->update_from_parent_(); });
+  this->update_from_parent_();
+}
+void PIDClimateSensor::update_from_parent_() {
+  float value;
+  switch (this->type_) {
+    case PID_SENSOR_TYPE_RESULT:
+      value = this->parent_->get_output_value();
+      break;
+    case PID_SENSOR_TYPE_ERROR:
+      value = this->parent_->get_error_value();
+      break;
+    case PID_SENSOR_TYPE_PROPORTIONAL:
+      value = this->parent_->get_proportional_term();
+      break;
+    case PID_SENSOR_TYPE_INTEGRAL:
+      value = this->parent_->get_integral_term();
+      break;
+    case PID_SENSOR_TYPE_DERIVATIVE:
+      value = this->parent_->get_derivative_term();
+      break;
+    case PID_SENSOR_TYPE_HEAT:
+      value = clamp(this->parent_->get_output_value(), 0.0f, 1.0f);
+      break;
+    case PID_SENSOR_TYPE_COOL:
+      value = clamp(-this->parent_->get_output_value(), 0.0f, 1.0f);
+      break;
+    default:
+      value = NAN;
+      break;
+  }
+  this->publish_state(value * 100.0f);
+}
+void PIDClimateSensor::dump_config() { LOG_SENSOR("", "PID Climate Sensor", this); }
+
+}  // namespace pid
+}  // namespace esphome
diff --git a/esphome/components/pid/sensor/pid_climate_sensor.h b/esphome/components/pid/sensor/pid_climate_sensor.h
new file mode 100644
index 0000000000..85759f1eaf
--- /dev/null
+++ b/esphome/components/pid/sensor/pid_climate_sensor.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/pid/pid_climate.h"
+
+namespace esphome {
+namespace pid {
+
+enum PIDClimateSensorType {
+  PID_SENSOR_TYPE_RESULT,
+  PID_SENSOR_TYPE_ERROR,
+  PID_SENSOR_TYPE_PROPORTIONAL,
+  PID_SENSOR_TYPE_INTEGRAL,
+  PID_SENSOR_TYPE_DERIVATIVE,
+  PID_SENSOR_TYPE_HEAT,
+  PID_SENSOR_TYPE_COOL,
+};
+
+class PIDClimateSensor : public sensor::Sensor, public Component {
+ public:
+  void setup() override;
+  void set_parent(PIDClimate *parent) { parent_ = parent; }
+  void set_type(PIDClimateSensorType type) { type_ = type; }
+
+  void dump_config() override;
+
+ protected:
+  void update_from_parent_();
+  PIDClimate *parent_;
+  PIDClimateSensorType type_;
+};
+
+}  // namespace pid
+}  // namespace esphome

From 45630d74f33b8106496989562a9222de09164695 Mon Sep 17 00:00:00 2001
From: Tim Savage <tim@savage.company>
Date: Fri, 10 Jan 2020 08:23:25 +1100
Subject: [PATCH 134/412] Use b''.decode() instead of str(b'') (#941)

Handling of request arguments in WizardRequestHandler is not decoding
bytes and rather just doing a str conversion resulting in a value of
"b''" being supplied to the wizard code.
---
 esphome/dashboard/dashboard.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 8aea841247..4f2d63d545 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -325,7 +325,10 @@ class WizardRequestHandler(BaseHandler):
     def post(self):
         from esphome import wizard
 
-        kwargs = {k: ''.join(str(x) for x in v) for k, v in self.request.arguments.items()}
+        kwargs = {
+            k: ''.join(x.decode() for x in v)
+            for k, v in self.request.arguments.items()
+        }
         destination = settings.rel_path(kwargs['name'] + '.yaml')
         wizard.wizard_write(path=destination, **kwargs)
         self.redirect('./?begin=True')

From a73fd55fc2e3ec20c7a80bb13cd73324b8636167 Mon Sep 17 00:00:00 2001
From: Vc <37367415+Valcob@users.noreply.github.com>
Date: Thu, 9 Jan 2020 23:25:35 +0200
Subject: [PATCH 135/412] Adding the espressif 2.6.3 (#944)

---
 esphome/core_config.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/core_config.py b/esphome/core_config.py
index 5cfff6c4d9..35f2fa1f80 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -45,6 +45,7 @@ def validate_board(value):
 validate_platform = cv.one_of('ESP32', 'ESP8266', upper=True)
 
 PLATFORMIO_ESP8266_LUT = {
+    '2.6.3': 'espressif8266@2.3.2',
     '2.6.2': 'espressif8266@2.3.1',
     '2.6.1': 'espressif8266@2.3.0',
     '2.5.2': 'espressif8266@2.2.3',

From 8a754421fe18c0c0de9d8389d9aa48c7998acd5e Mon Sep 17 00:00:00 2001
From: gitolicious <mrjchn@gmail.com>
Date: Thu, 9 Jan 2020 22:27:39 +0100
Subject: [PATCH 136/412] extract and use current version of python 3 (#938)

---
 .gitpod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 1859ef44e4..2ff20a0366 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -2,5 +2,5 @@ ports:
 - port: 6052
   onOpen: open-preview
 tasks:
-- before: script/setup
+- before: pyenv local $(pyenv version | grep '^3\.' | cut -d ' ' -f 1) && script/setup
   command: python -m esphome config dashboard

From e21dbc4b60a37237995757a434f5cc314b6d9147 Mon Sep 17 00:00:00 2001
From: voibit <krestean@gmail.com>
Date: Sun, 12 Jan 2020 15:16:25 +0100
Subject: [PATCH 137/412] Inverted output in neopixelbus (#895)

* Added inverted output

* Added support for inverted output in neopixelbus

* Update esphome/components/neopixelbus/light.py

Co-Authored-By: Otto Winter <otto@otto-winter.com>

* Update light.py

* corrected lint errors

Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/neopixelbus/light.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/esphome/components/neopixelbus/light.py b/esphome/components/neopixelbus/light.py
index ea1b67f8ce..fb83e4740d 100644
--- a/esphome/components/neopixelbus/light.py
+++ b/esphome/components/neopixelbus/light.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 from esphome import pins
 from esphome.components import light
 from esphome.const import CONF_CLOCK_PIN, CONF_DATA_PIN, CONF_METHOD, CONF_NUM_LEDS, CONF_PIN, \
-    CONF_TYPE, CONF_VARIANT, CONF_OUTPUT_ID
+    CONF_TYPE, CONF_VARIANT, CONF_OUTPUT_ID, CONF_INVERT
 from esphome.core import CORE
 
 neopixelbus_ns = cg.esphome_ns.namespace('neopixelbus')
@@ -120,6 +120,13 @@ ESP32_METHODS = {
 def format_method(config):
     variant = VARIANTS[config[CONF_VARIANT]]
     method = config[CONF_METHOD]
+
+    if config[CONF_INVERT]:
+        if method == 'ESP8266_DMA':
+            variant = 'Inverted' + variant
+        else:
+            variant += 'Inverted'
+
     if CORE.is_esp8266:
         return ESP8266_METHODS[method].format(variant)
     if CORE.is_esp32:
@@ -145,6 +152,7 @@ CONFIG_SCHEMA = cv.All(light.ADDRESSABLE_LIGHT_SCHEMA.extend({
     cv.Optional(CONF_TYPE, default='GRB'): validate_type,
     cv.Optional(CONF_VARIANT, default='800KBPS'): validate_variant,
     cv.Optional(CONF_METHOD, default=None): validate_method,
+    cv.Optional(CONF_INVERT, default='no'): cv.boolean,
     cv.Optional(CONF_PIN): pins.output_pin,
     cv.Optional(CONF_CLOCK_PIN): pins.output_pin,
     cv.Optional(CONF_DATA_PIN): pins.output_pin,

From d33a1585851724777957a8a983260f38cd8e9181 Mon Sep 17 00:00:00 2001
From: Luar Roji <cyberplant@users.noreply.github.com>
Date: Sun, 12 Jan 2020 11:18:30 -0300
Subject: [PATCH 138/412] Added degree symbol for MAX7219 7-segment display.
 (#764)

The ascii char to use it is "~" (0x7E).

Disclaimer: I didn't test this yet.
---
 esphome/components/max7219/max7219.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/esphome/components/max7219/max7219.cpp b/esphome/components/max7219/max7219.cpp
index db43ff19f6..6af8982c33 100644
--- a/esphome/components/max7219/max7219.cpp
+++ b/esphome/components/max7219/max7219.cpp
@@ -14,7 +14,7 @@ static const uint8_t MAX7219_REGISTER_SCAN_LIMIT = 0x0B;
 static const uint8_t MAX7219_REGISTER_SHUTDOWN = 0x0C;
 static const uint8_t MAX7219_UNKNOWN_CHAR = 0b11111111;
 
-const uint8_t MAX7219_ASCII_TO_RAW[94] PROGMEM = {
+const uint8_t MAX7219_ASCII_TO_RAW[95] PROGMEM = {
     0b00000000,            // ' ', ord 0x20
     0b10110000,            // '!', ord 0x21
     0b00100010,            // '"', ord 0x22
@@ -109,6 +109,7 @@ const uint8_t MAX7219_ASCII_TO_RAW[94] PROGMEM = {
     0b00110001,            // '{', ord 0x7B
     0b00000110,            // '|', ord 0x7C
     0b00000111,            // '}', ord 0x7D
+    0b01100011,            // '~', ord 0x7E (degree symbol)
 };
 
 float MAX7219Component::get_setup_priority() const { return setup_priority::PROCESSOR; }
@@ -166,7 +167,7 @@ uint8_t MAX7219Component::print(uint8_t start_pos, const char *str) {
   uint8_t pos = start_pos;
   for (; *str != '\0'; str++) {
     uint8_t data = MAX7219_UNKNOWN_CHAR;
-    if (*str >= ' ' && *str <= '}')
+    if (*str >= ' ' && *str <= '~')
       data = pgm_read_byte(&MAX7219_ASCII_TO_RAW[*str - ' ']);
 
     if (data == MAX7219_UNKNOWN_CHAR) {

From a30d2f291c47c79159c4a1eef8445ca50bcfc5e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A1s=20B=C3=ADr=C3=B3?=
 <1202136+andrasbiro@users.noreply.github.com>
Date: Sun, 12 Jan 2020 16:25:32 +0100
Subject: [PATCH 139/412] Fix dump/tx of 64 bit codes (#940)

* Fix dump/tx of 64 bit codes

* fixed source format
---
 esphome/components/remote_base/rc_switch_protocol.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/remote_base/rc_switch_protocol.cpp b/esphome/components/remote_base/rc_switch_protocol.cpp
index 754b2fae49..b2ff22eb2a 100644
--- a/esphome/components/remote_base/rc_switch_protocol.cpp
+++ b/esphome/components/remote_base/rc_switch_protocol.cpp
@@ -56,7 +56,7 @@ void RCSwitchBase::sync(RemoteTransmitData *dst) const {
 void RCSwitchBase::transmit(RemoteTransmitData *dst, uint64_t code, uint8_t len) const {
   dst->set_carrier_frequency(0);
   for (int16_t i = len - 1; i >= 0; i--) {
-    if (code & (1 << i))
+    if (code & ((uint64_t) 1 << i))
       this->one(dst);
     else
       this->zero(dst);
@@ -237,7 +237,7 @@ bool RCSwitchDumper::dump(RemoteReceiveData src) {
     if (protocol->decode(src, &out_data, &out_nbits) && out_nbits >= 3) {
       char buffer[65];
       for (uint8_t j = 0; j < out_nbits; j++)
-        buffer[j] = (out_data & (1 << (out_nbits - j - 1))) ? '1' : '0';
+        buffer[j] = (out_data & ((uint64_t) 1 << (out_nbits - j - 1))) ? '1' : '0';
 
       buffer[out_nbits] = '\0';
       ESP_LOGD(TAG, "Received RCSwitch Raw: protocol=%u data='%s'", i, buffer);

From d7a2816c58f46dd7b40cd18c535e6c0c5fd9d92c Mon Sep 17 00:00:00 2001
From: dmkif <dmkif@users.noreply.github.com>
Date: Sun, 12 Jan 2020 16:38:40 +0100
Subject: [PATCH 140/412] Update hdc1080.cpp (#887)

* Update hdc1080.cpp

increase waittime, to fix reading errors

* Fix: Update HDC1080.cpp

i fixed the my change on write_bytes
---
 esphome/components/hdc1080/hdc1080.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/hdc1080/hdc1080.cpp b/esphome/components/hdc1080/hdc1080.cpp
index 4041c0c464..915c44b155 100644
--- a/esphome/components/hdc1080/hdc1080.cpp
+++ b/esphome/components/hdc1080/hdc1080.cpp
@@ -36,7 +36,7 @@ void HDC1080Component::dump_config() {
 }
 void HDC1080Component::update() {
   uint16_t raw_temp;
-  if (!this->read_byte_16(HDC1080_CMD_TEMPERATURE, &raw_temp, 9)) {
+  if (!this->read_byte_16(HDC1080_CMD_TEMPERATURE, &raw_temp, 20)) {
     this->status_set_warning();
     return;
   }
@@ -44,7 +44,7 @@ void HDC1080Component::update() {
   this->temperature_->publish_state(temp);
 
   uint16_t raw_humidity;
-  if (!this->read_byte_16(HDC1080_CMD_HUMIDITY, &raw_humidity, 9)) {
+  if (!this->read_byte_16(HDC1080_CMD_HUMIDITY, &raw_humidity, 20)) {
     this->status_set_warning();
     return;
   }

From 92d93d658c85afea6845bc4fb5eaa008cb7e8117 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 12 Jan 2020 12:39:23 -0300
Subject: [PATCH 141/412] add tcl112 support for dry, fan and swing (#939)

---
 esphome/components/tcl112/tcl112.cpp | 71 ++++++++++++++++++++++++++--
 esphome/components/tcl112/tcl112.h   |  6 ++-
 2 files changed, 72 insertions(+), 5 deletions(-)

diff --git a/esphome/components/tcl112/tcl112.cpp b/esphome/components/tcl112/tcl112.cpp
index 2907ae1743..3e7eb7ec9a 100644
--- a/esphome/components/tcl112/tcl112.cpp
+++ b/esphome/components/tcl112/tcl112.cpp
@@ -15,6 +15,12 @@ const uint8_t TCL112_COOL = 3;
 const uint8_t TCL112_FAN = 7;
 const uint8_t TCL112_AUTO = 8;
 
+const uint8_t TCL112_FAN_AUTO = 0;
+const uint8_t TCL112_FAN_LOW = 2;
+const uint8_t TCL112_FAN_MED = 3;
+const uint8_t TCL112_FAN_HIGH = 5;
+
+const uint8_t TCL112_VSWING_MASK = 0x38;
 const uint8_t TCL112_POWER_MASK = 0x04;
 
 const uint8_t TCL112_HALF_DEGREE = 0b00100000;
@@ -53,6 +59,14 @@ void Tcl112Climate::transmit_state() {
       remote_state[6] &= 0xF0;
       remote_state[6] |= TCL112_HEAT;
       break;
+    case climate::CLIMATE_MODE_DRY:
+      remote_state[6] &= 0xF0;
+      remote_state[6] |= TCL112_DRY;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      remote_state[6] &= 0xF0;
+      remote_state[6] |= TCL112_FAN;
+      break;
     case climate::CLIMATE_MODE_OFF:
     default:
       remote_state[5] &= ~TCL112_POWER_MASK;
@@ -72,6 +86,29 @@ void Tcl112Climate::transmit_state() {
   remote_state[7] &= 0xF0;                    // Clear temp bits.
   remote_state[7] |= ((uint8_t) TCL112_TEMP_MAX - half_degrees / 2);
 
+  // Set fan
+  uint8_t selected_fan;
+  switch (this->fan_mode) {
+    case climate::CLIMATE_FAN_HIGH:
+      selected_fan = TCL112_FAN_HIGH;
+      break;
+    case climate::CLIMATE_FAN_MEDIUM:
+      selected_fan = TCL112_FAN_MED;
+      break;
+    case climate::CLIMATE_FAN_LOW:
+      selected_fan = TCL112_FAN_LOW;
+      break;
+    case climate::CLIMATE_FAN_AUTO:
+    default:
+      selected_fan = TCL112_FAN_AUTO;
+  }
+  remote_state[8] |= selected_fan;
+
+  // Set swing
+  if (this->swing_mode == climate::CLIMATE_SWING_VERTICAL) {
+    remote_state[8] |= TCL112_VSWING_MASK;
+  }
+
   // Calculate & set the checksum for the current internal state of the remote.
   // Stored the checksum value in the last byte.
   for (uint8_t checksum_byte = 0; checksum_byte < TCL112_STATE_LENGTH - 1; checksum_byte++)
@@ -107,7 +144,7 @@ void Tcl112Climate::transmit_state() {
 bool Tcl112Climate::on_receive(remote_base::RemoteReceiveData data) {
   // Validate header
   if (!data.expect_item(TCL112_HEADER_MARK, TCL112_HEADER_SPACE)) {
-    ESP_LOGV(TAG, "Header fail");
+    ESP_LOGVV(TAG, "Header fail");
     return false;
   }
 
@@ -119,14 +156,14 @@ bool Tcl112Climate::on_receive(remote_base::RemoteReceiveData data) {
       if (data.expect_item(TCL112_BIT_MARK, TCL112_ONE_SPACE))
         remote_state[i] |= 1 << j;
       else if (!data.expect_item(TCL112_BIT_MARK, TCL112_ZERO_SPACE)) {
-        ESP_LOGV(TAG, "Byte %d bit %d fail", i, j);
+        ESP_LOGVV(TAG, "Byte %d bit %d fail", i, j);
         return false;
       }
     }
   }
   // Validate footer
   if (!data.expect_mark(TCL112_BIT_MARK)) {
-    ESP_LOGV(TAG, "Footer fail");
+    ESP_LOGVV(TAG, "Footer fail");
     return false;
   }
 
@@ -136,7 +173,7 @@ bool Tcl112Climate::on_receive(remote_base::RemoteReceiveData data) {
   for (uint8_t checksum_byte = 0; checksum_byte < TCL112_STATE_LENGTH - 1; checksum_byte++)
     checksum += remote_state[checksum_byte];
   if (checksum != remote_state[TCL112_STATE_LENGTH - 1]) {
-    ESP_LOGV(TAG, "Checksum fail");
+    ESP_LOGVV(TAG, "Checksum fail");
     return false;
   }
 
@@ -161,7 +198,11 @@ bool Tcl112Climate::on_receive(remote_base::RemoteReceiveData data) {
         this->mode = climate::CLIMATE_MODE_COOL;
         break;
       case TCL112_DRY:
+        this->mode = climate::CLIMATE_MODE_DRY;
+        break;
       case TCL112_FAN:
+        this->mode = climate::CLIMATE_MODE_FAN_ONLY;
+        break;
       case TCL112_AUTO:
         this->mode = climate::CLIMATE_MODE_AUTO;
         break;
@@ -171,6 +212,28 @@ bool Tcl112Climate::on_receive(remote_base::RemoteReceiveData data) {
   if (remote_state[12] & TCL112_HALF_DEGREE)
     temp += .5f;
   this->target_temperature = temp;
+  auto fan = remote_state[8] & 0x7;
+  switch (fan) {
+    case TCL112_FAN_HIGH:
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+      break;
+    case TCL112_FAN_MED:
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+      break;
+    case TCL112_FAN_LOW:
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+      break;
+    case TCL112_FAN_AUTO:
+    default:
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+      break;
+  }
+  if ((remote_state[8] & TCL112_VSWING_MASK) == TCL112_VSWING_MASK) {
+    this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
+  } else {
+    this->swing_mode = climate::CLIMATE_SWING_OFF;
+  }
+
   this->publish_state();
   return true;
 }
diff --git a/esphome/components/tcl112/tcl112.h b/esphome/components/tcl112/tcl112.h
index 273162662d..e982755d40 100644
--- a/esphome/components/tcl112/tcl112.h
+++ b/esphome/components/tcl112/tcl112.h
@@ -11,7 +11,11 @@ const float TCL112_TEMP_MIN = 16.0;
 
 class Tcl112Climate : public climate_ir::ClimateIR {
  public:
-  Tcl112Climate() : climate_ir::ClimateIR(TCL112_TEMP_MIN, TCL112_TEMP_MAX, .5f) {}
+  Tcl112Climate()
+      : climate_ir::ClimateIR(TCL112_TEMP_MIN, TCL112_TEMP_MAX, .5f, true, true,
+                              {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
+                               climate::CLIMATE_FAN_HIGH},
+                              {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL}) {}
 
  protected:
   /// Transmit via IR the state of this climate controller.

From 170d52e0db8ef1a83859b8bfbfd18715140f00b7 Mon Sep 17 00:00:00 2001
From: "Panuruj Khambanonda (PK)" <pk@panurujk.com>
Date: Sun, 12 Jan 2020 07:42:18 -0800
Subject: [PATCH 142/412] Fix SGP30 incorrect baseline reading/writing (#936)

* Split the SGP30 baseline into 2 values

- According to the SGP30 datasheet, each eCO2 and TVOC baseline is a 2-byte value (MSB first)
- The current implementation ignores the MSB of each of the value
- Update the schema to allow 2 different baseline values (optional, but both need to be specified for the baseline to apply)

* Make both eCO2 and TVOC required if the optional baseline is defined

* Make dump_config() looks better
---
 esphome/components/sgp30/sensor.py | 11 ++++++--
 esphome/components/sgp30/sgp30.cpp | 40 +++++++++++++++++-------------
 esphome/components/sgp30/sgp30.h   |  8 +++---
 3 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/esphome/components/sgp30/sensor.py b/esphome/components/sgp30/sensor.py
index 6329b122fd..a52811eb34 100644
--- a/esphome/components/sgp30/sensor.py
+++ b/esphome/components/sgp30/sensor.py
@@ -12,6 +12,8 @@ SGP30Component = sgp30_ns.class_('SGP30Component', cg.PollingComponent, i2c.I2CD
 CONF_ECO2 = 'eco2'
 CONF_TVOC = 'tvoc'
 CONF_BASELINE = 'baseline'
+CONF_ECO2_BASELINE = 'eco2_baseline'
+CONF_TVOC_BASELINE = 'tvoc_baseline'
 CONF_UPTIME = 'uptime'
 CONF_COMPENSATION = 'compensation'
 CONF_HUMIDITY_SOURCE = 'humidity_source'
@@ -22,7 +24,10 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Required(CONF_ECO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION,
                                                  ICON_PERIODIC_TABLE_CO2, 0),
     cv.Required(CONF_TVOC): sensor.sensor_schema(UNIT_PARTS_PER_BILLION, ICON_RADIATOR, 0),
-    cv.Optional(CONF_BASELINE): cv.hex_uint16_t,
+    cv.Optional(CONF_BASELINE): cv.Schema({
+        cv.Required(CONF_ECO2_BASELINE): cv.hex_uint16_t,
+        cv.Required(CONF_TVOC_BASELINE): cv.hex_uint16_t,
+    }),
     cv.Optional(CONF_COMPENSATION): cv.Schema({
         cv.Required(CONF_HUMIDITY_SOURCE): cv.use_id(sensor.Sensor),
         cv.Required(CONF_TEMPERATURE_SOURCE): cv.use_id(sensor.Sensor)
@@ -44,7 +49,9 @@ def to_code(config):
         cg.add(var.set_tvoc_sensor(sens))
 
     if CONF_BASELINE in config:
-        cg.add(var.set_baseline(config[CONF_BASELINE]))
+        baseline_config = config[CONF_BASELINE]
+        cg.add(var.set_eco2_baseline(baseline_config[CONF_ECO2_BASELINE]))
+        cg.add(var.set_tvoc_baseline(baseline_config[CONF_TVOC_BASELINE]))
 
     if CONF_COMPENSATION in config:
         compensation_config = config[CONF_COMPENSATION]
diff --git a/esphome/components/sgp30/sgp30.cpp b/esphome/components/sgp30/sgp30.cpp
index 9a73295447..8c148b8e83 100644
--- a/esphome/components/sgp30/sgp30.cpp
+++ b/esphome/components/sgp30/sgp30.cpp
@@ -74,9 +74,9 @@ void SGP30Component::setup() {
   }
 
   // Sensor baseline reliability timer
-  if (this->baseline_ > 0) {
+  if (this->eco2_baseline_ > 0 && this->tvoc_baseline_ > 0) {
     this->required_warm_up_time_ = IAQ_BASELINE_WARM_UP_SECONDS_WITH_BASELINE_PROVIDED;
-    this->write_iaq_baseline_(this->baseline_);
+    this->write_iaq_baseline_(this->eco2_baseline_, this->tvoc_baseline_);
   } else {
     this->required_warm_up_time_ = IAQ_BASELINE_WARM_UP_SECONDS_WITHOUT_BASELINE;
   }
@@ -106,10 +106,10 @@ void SGP30Component::read_iaq_baseline_() {
         return;
       }
 
-      uint8_t eco2baseline = (raw_data[0]);
-      uint8_t tvocbaseline = (raw_data[1]);
+      uint16_t eco2baseline = (raw_data[0]);
+      uint16_t tvocbaseline = (raw_data[1]);
 
-      ESP_LOGI(TAG, "Current eCO2 & TVOC baseline: 0x%04X", uint16_t((eco2baseline << 8) | (tvocbaseline & 0xFF)));
+      ESP_LOGI(TAG, "Current eCO2 baseline: 0x%04X, TVOC baseline: 0x%04X", eco2baseline, tvocbaseline);
       this->status_clear_warning();
     });
   } else {
@@ -159,18 +159,19 @@ void SGP30Component::send_env_data_() {
   }
 }
 
-void SGP30Component::write_iaq_baseline_(uint16_t baseline) {
-  uint8_t e_c_o2_baseline = baseline >> 8;
-  uint8_t tvoc_baseline = baseline & 0xFF;
-  uint8_t data[4];
+void SGP30Component::write_iaq_baseline_(uint16_t eco2_baseline, uint16_t tvoc_baseline) {
+  uint8_t data[7];
   data[0] = SGP30_CMD_SET_IAQ_BASELINE & 0xFF;
-  data[1] = e_c_o2_baseline;
-  data[2] = tvoc_baseline;
-  data[3] = sht_crc_(e_c_o2_baseline, tvoc_baseline);
-  if (!this->write_bytes(SGP30_CMD_SET_IAQ_BASELINE >> 8, data, 4)) {
-    ESP_LOGE(TAG, "Error applying baseline: 0x%04X", baseline);
+  data[1] = eco2_baseline >> 8;
+  data[2] = eco2_baseline & 0xFF;
+  data[3] = sht_crc_(data[1], data[2]);
+  data[4] = tvoc_baseline >> 8;
+  data[5] = tvoc_baseline & 0xFF;
+  data[6] = sht_crc_(data[4], data[5]);
+  if (!this->write_bytes(SGP30_CMD_SET_IAQ_BASELINE >> 8, data, 7)) {
+    ESP_LOGE(TAG, "Error applying eCO2 baseline: 0x%04X, TVOC baseline: 0x%04X", eco2_baseline, tvoc_baseline);
   } else
-    ESP_LOGI(TAG, "Initial baseline 0x%04X applied successfully!", baseline);
+    ESP_LOGI(TAG, "Initial eCO2 and TVOC baselines applied successfully!");
 }
 
 void SGP30Component::dump_config() {
@@ -196,8 +197,13 @@ void SGP30Component::dump_config() {
     }
   } else {
     ESP_LOGCONFIG(TAG, "  Serial number: %llu", this->serial_number_);
-    ESP_LOGCONFIG(TAG, "  Baseline: 0x%04X%s", this->baseline_,
-                  ((this->baseline_ != 0x0000) ? " (enabled)" : " (disabled)"));
+    if (this->eco2_baseline_ != 0x0000 && this->tvoc_baseline_ != 0x0000) {
+      ESP_LOGCONFIG(TAG, "  Baseline:");
+      ESP_LOGCONFIG(TAG, "    eCO2 Baseline: 0x%04X", this->eco2_baseline_);
+      ESP_LOGCONFIG(TAG, "    TVOC Baseline: 0x%04X", this->tvoc_baseline_);
+    } else {
+      ESP_LOGCONFIG(TAG, "  Baseline: No baseline configured");
+    }
     ESP_LOGCONFIG(TAG, "  Warm up time: %lds", this->required_warm_up_time_);
   }
   LOG_UPDATE_INTERVAL(this);
diff --git a/esphome/components/sgp30/sgp30.h b/esphome/components/sgp30/sgp30.h
index 2362d1bca6..27572e9c46 100644
--- a/esphome/components/sgp30/sgp30.h
+++ b/esphome/components/sgp30/sgp30.h
@@ -13,7 +13,8 @@ class SGP30Component : public PollingComponent, public i2c::I2CDevice {
  public:
   void set_eco2_sensor(sensor::Sensor *eco2) { eco2_sensor_ = eco2; }
   void set_tvoc_sensor(sensor::Sensor *tvoc) { tvoc_sensor_ = tvoc; }
-  void set_baseline(uint16_t baseline) { baseline_ = baseline; }
+  void set_eco2_baseline(uint16_t eco2_baseline) { eco2_baseline_ = eco2_baseline; }
+  void set_tvoc_baseline(uint16_t tvoc_baseline) { tvoc_baseline_ = tvoc_baseline; }
   void set_humidity_sensor(sensor::Sensor *humidity) { humidity_sensor_ = humidity; }
   void set_temperature_sensor(sensor::Sensor *temperature) { temperature_sensor_ = temperature; }
 
@@ -28,7 +29,7 @@ class SGP30Component : public PollingComponent, public i2c::I2CDevice {
   void send_env_data_();
   void read_iaq_baseline_();
   bool is_sensor_baseline_reliable_();
-  void write_iaq_baseline_(uint16_t baseline);
+  void write_iaq_baseline_(uint16_t eco2_baseline, uint16_t tvoc_baseline);
   uint8_t sht_crc_(uint8_t data1, uint8_t data2);
   uint64_t serial_number_;
   uint16_t featureset_;
@@ -44,7 +45,8 @@ class SGP30Component : public PollingComponent, public i2c::I2CDevice {
 
   sensor::Sensor *eco2_sensor_{nullptr};
   sensor::Sensor *tvoc_sensor_{nullptr};
-  uint16_t baseline_{0x0000};
+  uint16_t eco2_baseline_{0x0000};
+  uint16_t tvoc_baseline_{0x0000};
   /// Input sensor for humidity and temperature compensation.
   sensor::Sensor *humidity_sensor_{nullptr};
   sensor::Sensor *temperature_sensor_{nullptr};

From 3b689ef39cb44f92deedf61de21ddc35c9e9819f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Sun, 12 Jan 2020 17:08:48 +0100
Subject: [PATCH 143/412] Add register_*_effect to allow registering custom
 effects (#947)

This allows to register custom effect from user components,
allowing for bigger composability of source.
---
 esphome/components/light/effects.py | 95 ++++++++++++++++++++---------
 1 file changed, 66 insertions(+), 29 deletions(-)

diff --git a/esphome/components/light/effects.py b/esphome/components/light/effects.py
index 005a66a5ad..d08e7f08f5 100644
--- a/esphome/components/light/effects.py
+++ b/esphome/components/light/effects.py
@@ -34,13 +34,10 @@ CONF_ADDRESSABLE_FIREWORKS = 'addressable_fireworks'
 CONF_ADDRESSABLE_FLICKER = 'addressable_flicker'
 CONF_AUTOMATION = 'automation'
 
-BINARY_EFFECTS = ['lambda', 'automation', 'strobe']
-MONOCHROMATIC_EFFECTS = BINARY_EFFECTS + ['flicker']
-RGB_EFFECTS = MONOCHROMATIC_EFFECTS + ['random']
-ADDRESSABLE_EFFECTS = RGB_EFFECTS + [CONF_ADDRESSABLE_LAMBDA, CONF_ADDRESSABLE_RAINBOW,
-                                     CONF_ADDRESSABLE_COLOR_WIPE, CONF_ADDRESSABLE_SCAN,
-                                     CONF_ADDRESSABLE_TWINKLE, CONF_ADDRESSABLE_RANDOM_TWINKLE,
-                                     CONF_ADDRESSABLE_FIREWORKS, CONF_ADDRESSABLE_FLICKER]
+BINARY_EFFECTS = []
+MONOCHROMATIC_EFFECTS = []
+RGB_EFFECTS = []
+ADDRESSABLE_EFFECTS = []
 
 EFFECTS_REGISTRY = Registry()
 
@@ -53,7 +50,41 @@ def register_effect(name, effect_type, default_name, schema, *extra_validators):
     return EFFECTS_REGISTRY.register(name, effect_type, validator)
 
 
-@register_effect('lambda', LambdaLightEffect, "Lambda", {
+def register_binary_effect(name, effect_type, default_name, schema, *extra_validators):
+    # binary effect can be used for all lights
+    BINARY_EFFECTS.append(name)
+    MONOCHROMATIC_EFFECTS.append(name)
+    RGB_EFFECTS.append(name)
+    ADDRESSABLE_EFFECTS.append(name)
+
+    return register_effect(name, effect_type, default_name, schema, *extra_validators)
+
+
+def register_monochromatic_effect(name, effect_type, default_name, schema, *extra_validators):
+    # monochromatic effect can be used for all lights expect binary
+    MONOCHROMATIC_EFFECTS.append(name)
+    RGB_EFFECTS.append(name)
+    ADDRESSABLE_EFFECTS.append(name)
+
+    return register_effect(name, effect_type, default_name, schema, *extra_validators)
+
+
+def register_rgb_effect(name, effect_type, default_name, schema, *extra_validators):
+    # RGB effect can be used for RGB and addressable lights
+    RGB_EFFECTS.append(name)
+    ADDRESSABLE_EFFECTS.append(name)
+
+    return register_effect(name, effect_type, default_name, schema, *extra_validators)
+
+
+def register_addressable_effect(name, effect_type, default_name, schema, *extra_validators):
+    # addressable effect can be used only in addressable
+    ADDRESSABLE_EFFECTS.append(name)
+
+    return register_effect(name, effect_type, default_name, schema, *extra_validators)
+
+
+@register_binary_effect('lambda', LambdaLightEffect, "Lambda", {
     cv.Required(CONF_LAMBDA): cv.lambda_,
     cv.Optional(CONF_UPDATE_INTERVAL, default='0ms'): cv.update_interval,
 })
@@ -63,7 +94,7 @@ def lambda_effect_to_code(config, effect_id):
                            config[CONF_UPDATE_INTERVAL])
 
 
-@register_effect('automation', AutomationLightEffect, "Automation", {
+@register_binary_effect('automation', AutomationLightEffect, "Automation", {
     cv.Required(CONF_SEQUENCE): automation.validate_automation(single=True),
 })
 def automation_effect_to_code(config, effect_id):
@@ -72,7 +103,7 @@ def automation_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('random', RandomLightEffect, "Random", {
+@register_rgb_effect('random', RandomLightEffect, "Random", {
     cv.Optional(CONF_TRANSITION_LENGTH, default='7.5s'): cv.positive_time_period_milliseconds,
     cv.Optional(CONF_UPDATE_INTERVAL, default='10s'): cv.positive_time_period_milliseconds,
 })
@@ -83,7 +114,7 @@ def random_effect_to_code(config, effect_id):
     yield effect
 
 
-@register_effect('strobe', StrobeLightEffect, "Strobe", {
+@register_binary_effect('strobe', StrobeLightEffect, "Strobe", {
     cv.Optional(CONF_COLORS, default=[
         {CONF_STATE: True, CONF_DURATION: '0.5s'},
         {CONF_STATE: False, CONF_DURATION: '0.5s'},
@@ -113,7 +144,7 @@ def strobe_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('flicker', FlickerLightEffect, "Flicker", {
+@register_monochromatic_effect('flicker', FlickerLightEffect, "Flicker", {
     cv.Optional(CONF_ALPHA, default=0.95): cv.percentage,
     cv.Optional(CONF_INTENSITY, default=0.015): cv.percentage,
 })
@@ -124,10 +155,12 @@ def flicker_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('addressable_lambda', AddressableLambdaLightEffect, "Addressable Lambda", {
-    cv.Required(CONF_LAMBDA): cv.lambda_,
-    cv.Optional(CONF_UPDATE_INTERVAL, default='0ms'): cv.positive_time_period_milliseconds,
-})
+@register_addressable_effect(
+    'addressable_lambda', AddressableLambdaLightEffect, "Addressable Lambda", {
+        cv.Required(CONF_LAMBDA): cv.lambda_,
+        cv.Optional(CONF_UPDATE_INTERVAL, default='0ms'): cv.positive_time_period_milliseconds,
+    }
+)
 def addressable_lambda_effect_to_code(config, effect_id):
     args = [(AddressableLightRef, 'it'), (ESPColor, 'current_color')]
     lambda_ = yield cg.process_lambda(config[CONF_LAMBDA], args, return_type=cg.void)
@@ -136,7 +169,7 @@ def addressable_lambda_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('addressable_rainbow', AddressableRainbowLightEffect, "Rainbow", {
+@register_addressable_effect('addressable_rainbow', AddressableRainbowLightEffect, "Rainbow", {
     cv.Optional(CONF_SPEED, default=10): cv.uint32_t,
     cv.Optional(CONF_WIDTH, default=50): cv.uint32_t,
 })
@@ -147,7 +180,7 @@ def addressable_rainbow_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('addressable_color_wipe', AddressableColorWipeEffect, "Color Wipe", {
+@register_addressable_effect('addressable_color_wipe', AddressableColorWipeEffect, "Color Wipe", {
     cv.Optional(CONF_COLORS, default=[{CONF_NUM_LEDS: 1, CONF_RANDOM: True}]): cv.ensure_list({
         cv.Optional(CONF_RED, default=1.0): cv.percentage,
         cv.Optional(CONF_GREEN, default=1.0): cv.percentage,
@@ -178,7 +211,7 @@ def addressable_color_wipe_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('addressable_scan', AddressableScanEffect, "Scan", {
+@register_addressable_effect('addressable_scan', AddressableScanEffect, "Scan", {
     cv.Optional(CONF_MOVE_INTERVAL, default='0.1s'): cv.positive_time_period_milliseconds,
     cv.Optional(CONF_SCAN_WIDTH, default=1): cv.int_range(min=1),
 })
@@ -189,7 +222,7 @@ def addressable_scan_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('addressable_twinkle', AddressableTwinkleEffect, "Twinkle", {
+@register_addressable_effect('addressable_twinkle', AddressableTwinkleEffect, "Twinkle", {
     cv.Optional(CONF_TWINKLE_PROBABILITY, default='5%'): cv.percentage,
     cv.Optional(CONF_PROGRESS_INTERVAL, default='4ms'): cv.positive_time_period_milliseconds,
 })
@@ -200,10 +233,12 @@ def addressable_twinkle_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('addressable_random_twinkle', AddressableRandomTwinkleEffect, "Random Twinkle", {
-    cv.Optional(CONF_TWINKLE_PROBABILITY, default='5%'): cv.percentage,
-    cv.Optional(CONF_PROGRESS_INTERVAL, default='32ms'): cv.positive_time_period_milliseconds,
-})
+@register_addressable_effect(
+    'addressable_random_twinkle', AddressableRandomTwinkleEffect, "Random Twinkle", {
+        cv.Optional(CONF_TWINKLE_PROBABILITY, default='5%'): cv.percentage,
+        cv.Optional(CONF_PROGRESS_INTERVAL, default='32ms'): cv.positive_time_period_milliseconds,
+    }
+)
 def addressable_random_twinkle_effect_to_code(config, effect_id):
     var = cg.new_Pvariable(effect_id, config[CONF_NAME])
     cg.add(var.set_twinkle_probability(config[CONF_TWINKLE_PROBABILITY]))
@@ -211,7 +246,7 @@ def addressable_random_twinkle_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('addressable_fireworks', AddressableFireworksEffect, "Fireworks", {
+@register_addressable_effect('addressable_fireworks', AddressableFireworksEffect, "Fireworks", {
     cv.Optional(CONF_UPDATE_INTERVAL, default='32ms'): cv.positive_time_period_milliseconds,
     cv.Optional(CONF_SPARK_PROBABILITY, default='10%'): cv.percentage,
     cv.Optional(CONF_USE_RANDOM_COLOR, default=False): cv.boolean,
@@ -226,10 +261,12 @@ def addressable_fireworks_effect_to_code(config, effect_id):
     yield var
 
 
-@register_effect('addressable_flicker', AddressableFlickerEffect, "Addressable Flicker", {
-    cv.Optional(CONF_UPDATE_INTERVAL, default='16ms'): cv.positive_time_period_milliseconds,
-    cv.Optional(CONF_INTENSITY, default='5%'): cv.percentage,
-})
+@register_addressable_effect(
+    'addressable_flicker', AddressableFlickerEffect, "Addressable Flicker", {
+        cv.Optional(CONF_UPDATE_INTERVAL, default='16ms'): cv.positive_time_period_milliseconds,
+        cv.Optional(CONF_INTENSITY, default='5%'): cv.percentage,
+    }
+)
 def addressable_flicker_effect_to_code(config, effect_id):
     var = cg.new_Pvariable(effect_id, config[CONF_NAME])
     cg.add(var.set_update_interval(config[CONF_UPDATE_INTERVAL]))

From 30ecb58e061a71b445ca01b356f4a59eb926dc56 Mon Sep 17 00:00:00 2001
From: Tim Savage <tim@savage.company>
Date: Tue, 14 Jan 2020 09:35:55 +1100
Subject: [PATCH 144/412] Bugfix/normalize core comparisons (and Python 3
 update fixes) (#952)

* Correct implementation of comparisons to be Pythonic

If a comparison cannot be made return NotImplemented, this allows the
Python interpreter to try other comparisons (eg __ieq__) and either
return False (in the case of __eq__) or raise a TypeError
exception (eg in the case of __lt__).

* Python 3 updates

* Add a more helpful message in exception if platform is not defined

* Added a basic pre-commit check
---
 .pre-commit-config.yaml |  11 ++++
 esphome/core.py         | 110 ++++++++++++++++++++--------------------
 setup.cfg               |   1 -
 setup.py                |   1 -
 4 files changed, 67 insertions(+), 56 deletions(-)
 create mode 100644 .pre-commit-config.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000..d57da791fd
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,11 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.4.0
+    hooks:
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+    -   id: flake8
diff --git a/esphome/core.py b/esphome/core.py
index 96447e560d..b4bea49dbd 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -168,34 +168,34 @@ class TimePeriod:
         return self.days or 0
 
     def __eq__(self, other):
-        if not isinstance(other, TimePeriod):
-            raise ValueError("other must be TimePeriod")
-        return self.total_microseconds == other.total_microseconds
+        if isinstance(other, TimePeriod):
+            return self.total_microseconds == other.total_microseconds
+        return NotImplemented
 
     def __ne__(self, other):
-        if not isinstance(other, TimePeriod):
-            raise ValueError("other must be TimePeriod")
-        return self.total_microseconds != other.total_microseconds
+        if isinstance(other, TimePeriod):
+            return self.total_microseconds != other.total_microseconds
+        return NotImplemented
 
     def __lt__(self, other):
-        if not isinstance(other, TimePeriod):
-            raise ValueError("other must be TimePeriod")
-        return self.total_microseconds < other.total_microseconds
+        if isinstance(other, TimePeriod):
+            return self.total_microseconds < other.total_microseconds
+        return NotImplemented
 
     def __gt__(self, other):
-        if not isinstance(other, TimePeriod):
-            raise ValueError("other must be TimePeriod")
-        return self.total_microseconds > other.total_microseconds
+        if isinstance(other, TimePeriod):
+            return self.total_microseconds > other.total_microseconds
+        return NotImplemented
 
     def __le__(self, other):
-        if not isinstance(other, TimePeriod):
-            raise ValueError("other must be TimePeriod")
-        return self.total_microseconds <= other.total_microseconds
+        if isinstance(other, TimePeriod):
+            return self.total_microseconds <= other.total_microseconds
+        return NotImplemented
 
     def __ge__(self, other):
-        if not isinstance(other, TimePeriod):
-            raise ValueError("other must be TimePeriod")
-        return self.total_microseconds >= other.total_microseconds
+        if isinstance(other, TimePeriod):
+            return self.total_microseconds >= other.total_microseconds
+        return NotImplemented
 
 
 class TimePeriodMicroseconds(TimePeriod):
@@ -264,7 +264,7 @@ class ID:
         else:
             self.is_manual = is_manual
         self.is_declaration = is_declaration
-        self.type = type  # type: Optional['MockObjClass']
+        self.type: Optional['MockObjClass'] = type
 
     def resolve(self, registered_ids):
         from esphome.config_validation import RESERVED_IDS
@@ -282,13 +282,13 @@ class ID:
         return self.id
 
     def __repr__(self):
-        return 'ID<{} declaration={}, type={}, manual={}>'.format(
-            self.id, self.is_declaration, self.type, self.is_manual)
+        return (f'ID<{self.id} declaration={self.is_declaration}, '
+                f'type={self.type}, manual={self.is_manual}>')
 
     def __eq__(self, other):
-        if not isinstance(other, ID):
-            raise ValueError("other must be ID {} {}".format(type(other), other))
-        return self.id == other.id
+        if isinstance(other, ID):
+            return self.id == other.id
+        return NotImplemented
 
     def __hash__(self):
         return hash(self.id)
@@ -299,11 +299,10 @@ class ID:
 
 
 class DocumentLocation:
-    def __init__(self, document, line, column):
-        # type: (str, int, int) -> None
-        self.document = document  # type: str
-        self.line = line  # type: int
-        self.column = column  # type: int
+    def __init__(self, document: str, line: int, column: int):
+        self.document: str = document
+        self.line: int = line
+        self.column: int = column
 
     @classmethod
     def from_mark(cls, mark):
@@ -318,10 +317,9 @@ class DocumentLocation:
 
 
 class DocumentRange:
-    def __init__(self, start_mark, end_mark):
-        # type: (DocumentLocation, DocumentLocation) -> None
-        self.start_mark = start_mark  # type: DocumentLocation
-        self.end_mark = end_mark  # type: DocumentLocation
+    def __init__(self, start_mark: DocumentLocation, end_mark: DocumentLocation):
+        self.start_mark: DocumentLocation = start_mark
+        self.end_mark: DocumentLocation = end_mark
 
     @classmethod
     def from_marks(cls, start_mark, end_mark):
@@ -359,7 +357,9 @@ class Define:
         return hash(self.as_tuple)
 
     def __eq__(self, other):
-        return isinstance(self, type(other)) and self.as_tuple == other.as_tuple
+        if isinstance(other, Define):
+            return self.as_tuple == other.as_tuple
+        return NotImplemented
 
 
 class Library:
@@ -381,7 +381,9 @@ class Library:
         return hash(self.as_tuple)
 
     def __eq__(self, other):
-        return isinstance(self, type(other)) and self.as_tuple == other.as_tuple
+        if isinstance(other, Library):
+            return self.as_tuple == other.as_tuple
+        return NotImplemented
 
 
 def coroutine(func):
@@ -462,19 +464,19 @@ class EsphomeCore:
         self.vscode = False
         self.ace = False
         # The name of the node
-        self.name = None  # type: str
+        self.name: Optional[str] = None
         # The relative path to the configuration YAML
-        self.config_path = None  # type: str
+        self.config_path: Optional[str] = None
         # The relative path to where all build files are stored
-        self.build_path = None  # type: str
+        self.build_path: Optional[str] = None
         # The platform (ESP8266, ESP32) of this device
-        self.esp_platform = None  # type: str
+        self.esp_platform: Optional[str] = None
         # The board that's used (for example nodemcuv2)
-        self.board = None  # type: str
+        self.board: Optional[str] = None
         # The full raw configuration
-        self.raw_config = {}  # type: ConfigType
+        self.raw_config: ConfigType = {}
         # The validated configuration, this is None until the config has been validated
-        self.config = {}  # type: ConfigType
+        self.config: ConfigType = {}
         # The pending tasks in the task queue (mostly for C++ generation)
         # This is a priority queue (with heapq)
         # Each item is a tuple of form: (-priority, unique number, task)
@@ -482,20 +484,20 @@ class EsphomeCore:
         # Task counter for pending tasks
         self.task_counter = 0
         # The variable cache, for each ID this holds a MockObj of the variable obj
-        self.variables = {}  # type: Dict[str, 'MockObj']
+        self.variables: Dict[str, 'MockObj'] = {}
         # A list of statements that go in the main setup() block
-        self.main_statements = []  # type: List['Statement']
+        self.main_statements: List['Statement'] = []
         # A list of statements to insert in the global block (includes and global variables)
-        self.global_statements = []  # type: List['Statement']
+        self.global_statements: List['Statement'] = []
         # A set of platformio libraries to add to the project
-        self.libraries = []  # type: List[Library]
+        self.libraries: List[Library] = []
         # A set of build flags to set in the platformio project
-        self.build_flags = set()  # type: Set[str]
+        self.build_flags: Set[str] = set()
         # A set of defines to set for the compile process in esphome/core/defines.h
-        self.defines = set()  # type: Set['Define']
+        self.defines: Set['Define'] = set()
         # A dictionary of started coroutines, used to warn when a coroutine was not
         # awaited.
-        self.active_coroutines = {}  # type: Dict[int, Any]
+        self.active_coroutines: Dict[int, Any] = {}
         # A set of strings of names of loaded integrations, used to find namespace ID conflicts
         self.loaded_integrations = set()
         # A set of component IDs to track what Component subclasses are declared
@@ -525,7 +527,7 @@ class EsphomeCore:
         self.component_ids = set()
 
     @property
-    def address(self):  # type: () -> str
+    def address(self) -> Optional[str]:
         if 'wifi' in self.config:
             return self.config[CONF_WIFI][CONF_USE_ADDRESS]
 
@@ -535,7 +537,7 @@ class EsphomeCore:
         return None
 
     @property
-    def comment(self):  # type: () -> str
+    def comment(self) -> Optional[str]:
         if CONF_COMMENT in self.config[CONF_ESPHOME]:
             return self.config[CONF_ESPHOME][CONF_COMMENT]
 
@@ -548,7 +550,7 @@ class EsphomeCore:
         self.active_coroutines.pop(instance_id)
 
     @property
-    def arduino_version(self):  # type: () -> str
+    def arduino_version(self) -> str:
         return self.config[CONF_ESPHOME][CONF_ARDUINO_VERSION]
 
     @property
@@ -587,13 +589,13 @@ class EsphomeCore:
     @property
     def is_esp8266(self):
         if self.esp_platform is None:
-            raise ValueError
+            raise ValueError("No platform specified")
         return self.esp_platform == 'ESP8266'
 
     @property
     def is_esp32(self):
         if self.esp_platform is None:
-            raise ValueError
+            raise ValueError("No platform specified")
         return self.esp_platform == 'ESP32'
 
     def add_job(self, func, *args, **kwargs):
diff --git a/setup.cfg b/setup.cfg
index ab43acfbc5..32a60839a5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,7 +11,6 @@ classifier =
     Intended Audience :: End Users/Desktop
     License :: OSI Approved :: MIT License
     Programming Language :: C++
-    Programming Language :: Python :: 2
     Programming Language :: Python :: 3
     Topic :: Home Automation
 Topic :: Home Automation
diff --git a/setup.py b/setup.py
index c520b949fc..f78ec49f28 100755
--- a/setup.py
+++ b/setup.py
@@ -50,7 +50,6 @@ CLASSIFIERS = [
     'Intended Audience :: End Users/Desktop',
     'License :: OSI Approved :: MIT License',
     'Programming Language :: C++',
-    'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 3',
     'Topic :: Home Automation',
 ]

From 6a60f01753fabb3bdcf1aa504b151f15de912916 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Mon, 13 Jan 2020 16:39:17 -0600
Subject: [PATCH 145/412] Add transmit pioneer (#922)

* Added pioneer_protocol to support transmit_pioneer
---
 esphome/components/remote_base/__init__.py    |  40 ++++-
 .../remote_base/pioneer_protocol.cpp          | 150 ++++++++++++++++++
 .../components/remote_base/pioneer_protocol.h |  37 +++++
 esphome/const.py                              |   2 +
 tests/test1.yaml                              |   8 +
 5 files changed, 235 insertions(+), 2 deletions(-)
 create mode 100644 esphome/components/remote_base/pioneer_protocol.cpp
 create mode 100644 esphome/components/remote_base/pioneer_protocol.h

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index 3d57041e56..2c8b6be51c 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -5,7 +5,7 @@ from esphome.components import binary_sensor
 from esphome.const import CONF_DATA, CONF_TRIGGER_ID, CONF_NBITS, CONF_ADDRESS, \
     CONF_COMMAND, CONF_CODE, CONF_PULSE_LENGTH, CONF_SYNC, CONF_ZERO, CONF_ONE, CONF_INVERTED, \
     CONF_PROTOCOL, CONF_GROUP, CONF_DEVICE, CONF_STATE, CONF_CHANNEL, CONF_FAMILY, CONF_REPEAT, \
-    CONF_WAIT_TIME, CONF_TIMES, CONF_TYPE_ID, CONF_CARRIER_FREQUENCY
+    CONF_WAIT_TIME, CONF_TIMES, CONF_TYPE_ID, CONF_CARRIER_FREQUENCY, CONF_RC_CODE_1, CONF_RC_CODE_2
 from esphome.core import coroutine
 from esphome.util import Registry, SimpleRegistry
 
@@ -86,7 +86,7 @@ def validate_repeat(value):
     if isinstance(value, dict):
         return cv.Schema({
             cv.Required(CONF_TIMES): cv.templatable(cv.positive_int),
-            cv.Optional(CONF_WAIT_TIME, default='10ms'):
+            cv.Optional(CONF_WAIT_TIME, default='25ms'):
                 cv.templatable(cv.positive_time_period_microseconds),
         })(value)
     return validate_repeat({CONF_TIMES: value})
@@ -288,6 +288,42 @@ def nec_action(var, config, args):
     cg.add(var.set_command(template_))
 
 
+# Pioneer
+(PioneerData, PioneerBinarySensor, PioneerTrigger, PioneerAction,
+ PioneerDumper) = declare_protocol('Pioneer')
+PIONEER_SCHEMA = cv.Schema({
+    cv.Required(CONF_RC_CODE_1): cv.hex_uint16_t,
+    cv.Optional(CONF_RC_CODE_2, default=0): cv.hex_uint16_t,
+})
+
+
+@register_binary_sensor('pioneer', PioneerBinarySensor, PIONEER_SCHEMA)
+def pioneer_binary_sensor(var, config):
+    cg.add(var.set_data(cg.StructInitializer(
+        PioneerData,
+        ('rc_code_1', config[CONF_RC_CODE_1]),
+        ('rc_code_2', config[CONF_RC_CODE_2]),
+    )))
+
+
+@register_trigger('pioneer', PioneerTrigger, PioneerData)
+def pioneer_trigger(var, config):
+    pass
+
+
+@register_dumper('pioneer', PioneerDumper)
+def pioneer_dumper(var, config):
+    pass
+
+
+@register_action('pioneer', PioneerAction, PIONEER_SCHEMA)
+def pioneer_action(var, config, args):
+    template_ = yield cg.templatable(config[CONF_RC_CODE_1], args, cg.uint16)
+    cg.add(var.set_rc_code_1(template_))
+    template_ = yield cg.templatable(config[CONF_RC_CODE_2], args, cg.uint16)
+    cg.add(var.set_rc_code_2(template_))
+
+
 # Sony
 SonyData, SonyBinarySensor, SonyTrigger, SonyAction, SonyDumper = declare_protocol('Sony')
 SONY_SCHEMA = cv.Schema({
diff --git a/esphome/components/remote_base/pioneer_protocol.cpp b/esphome/components/remote_base/pioneer_protocol.cpp
new file mode 100644
index 0000000000..49a27e08e7
--- /dev/null
+++ b/esphome/components/remote_base/pioneer_protocol.cpp
@@ -0,0 +1,150 @@
+#include "pioneer_protocol.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace remote_base {
+
+static const char *TAG = "remote.pioneer";
+
+static const uint32_t HEADER_HIGH_US = 9000;
+static const uint32_t HEADER_LOW_US = 4500;
+static const uint32_t BIT_HIGH_US = 560;
+static const uint32_t BIT_ONE_LOW_US = 1690;
+static const uint32_t BIT_ZERO_LOW_US = 560;
+static const uint32_t TRAILER_SPACE_US = 25500;
+
+void PioneerProtocol::encode(RemoteTransmitData *dst, const PioneerData &data) {
+  uint32_t address1 = ((data.rc_code_1 & 0xff00) | (~(data.rc_code_1 >> 8) & 0xff));
+  uint32_t address2 = ((data.rc_code_2 & 0xff00) | (~(data.rc_code_2 >> 8) & 0xff));
+  uint32_t command1 = 0;
+  uint32_t command2 = 0;
+
+  for (uint32_t bit = 0; bit < 4; bit++) {
+    if ((data.rc_code_1 >> bit) & 1)
+      command1 |= (1UL << (7 - bit));
+  }
+
+  for (uint32_t bit = 0; bit < 4; bit++) {
+    if ((data.rc_code_1 >> (bit + 4)) & 1)
+      command1 |= (1UL << (3 - bit));
+  }
+
+  for (uint32_t bit = 0; bit < 4; bit++) {
+    if ((data.rc_code_2 >> bit) & 1)
+      command2 |= (1UL << (7 - bit));
+  }
+
+  for (uint32_t bit = 0; bit < 4; bit++) {
+    if ((data.rc_code_2 >> (bit + 4)) & 1)
+      command2 |= (1UL << (3 - bit));
+  }
+
+  command1 = (command1 << 8) | ((~command1) & 0xff);
+  command2 = (command2 << 8) | ((~command2) & 0xff);
+
+  if (data.rc_code_2 == 0)
+    dst->reserve(68);
+  else
+    dst->reserve((68 * 2) + 1);
+
+  dst->set_carrier_frequency(40000);
+
+  dst->item(HEADER_HIGH_US, HEADER_LOW_US);
+  for (uint32_t mask = 1UL << 15; mask; mask >>= 1) {
+    if (address1 & mask)
+      dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
+    else
+      dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
+  }
+
+  for (uint32_t mask = 1UL << 15; mask; mask >>= 1) {
+    if (command1 & mask)
+      dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
+    else
+      dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
+  }
+
+  dst->mark(BIT_HIGH_US);
+
+  if (data.rc_code_2 != 0) {
+    dst->space(TRAILER_SPACE_US);
+    dst->item(HEADER_HIGH_US, HEADER_LOW_US);
+    for (uint32_t mask = 1UL << 15; mask; mask >>= 1) {
+      if (address2 & mask)
+        dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
+      else
+        dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
+    }
+
+    for (uint32_t mask = 1UL << 15; mask; mask >>= 1) {
+      if (command2 & mask)
+        dst->item(BIT_HIGH_US, BIT_ONE_LOW_US);
+      else
+        dst->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
+    }
+
+    dst->mark(BIT_HIGH_US);
+  }
+}
+optional<PioneerData> PioneerProtocol::decode(RemoteReceiveData src) {
+  uint16_t address1 = 0;
+  uint16_t command1 = 0;
+
+  PioneerData data{
+      .rc_code_1 = 0,
+      .rc_code_2 = 0,
+  };
+  if (!src.expect_item(HEADER_HIGH_US, HEADER_LOW_US))
+    return {};
+
+  for (uint32_t mask = 1UL << 15; mask != 0; mask >>= 1) {
+    if (src.expect_item(BIT_HIGH_US, BIT_ONE_LOW_US)) {
+      address1 |= mask;
+    } else if (src.expect_item(BIT_HIGH_US, BIT_ZERO_LOW_US)) {
+      address1 &= ~mask;
+    } else {
+      return {};
+    }
+  }
+
+  for (uint32_t mask = 1UL << 15; mask != 0; mask >>= 1) {
+    if (src.expect_item(BIT_HIGH_US, BIT_ONE_LOW_US)) {
+      command1 |= mask;
+    } else if (src.expect_item(BIT_HIGH_US, BIT_ZERO_LOW_US)) {
+      command1 &= ~mask;
+    } else {
+      return {};
+    }
+  }
+
+  if (!src.expect_mark(BIT_HIGH_US))
+    return {};
+
+  if ((address1 >> 8) != ((~address1) & 0xff))
+    return {};
+
+  if ((command1 >> 8) != ((~command1) & 0xff))
+    return {};
+
+  for (uint32_t bit = 0; bit < 4; bit++) {
+    if ((~command1 >> bit) & 1)
+      data.rc_code_1 |= (1UL << (7 - bit));
+  }
+
+  for (uint32_t bit = 0; bit < 4; bit++) {
+    if ((~command1 >> (bit + 4)) & 1)
+      data.rc_code_1 |= (1UL << (3 - bit));
+  }
+  data.rc_code_1 |= address1 & 0xff00;
+
+  return data;
+}
+void PioneerProtocol::dump(const PioneerData &data) {
+  if (data.rc_code_2 == 0)
+    ESP_LOGD(TAG, "Received Pioneer: rc_code_X=0x%04X", data.rc_code_1);
+  else
+    ESP_LOGD(TAG, "Received Pioneer: rc_code_1=0x%04X, rc_code_2=0x%04X", data.rc_code_1, data.rc_code_2);
+}
+
+}  // namespace remote_base
+}  // namespace esphome
diff --git a/esphome/components/remote_base/pioneer_protocol.h b/esphome/components/remote_base/pioneer_protocol.h
new file mode 100644
index 0000000000..f93e51a033
--- /dev/null
+++ b/esphome/components/remote_base/pioneer_protocol.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "remote_base.h"
+
+namespace esphome {
+namespace remote_base {
+
+struct PioneerData {
+  uint16_t rc_code_1;
+  uint16_t rc_code_2;
+
+  bool operator==(const PioneerData &rhs) const { return rc_code_1 == rhs.rc_code_1 && rc_code_2 == rhs.rc_code_2; }
+};
+
+class PioneerProtocol : public RemoteProtocol<PioneerData> {
+ public:
+  void encode(RemoteTransmitData *dst, const PioneerData &data) override;
+  optional<PioneerData> decode(RemoteReceiveData src) override;
+  void dump(const PioneerData &data) override;
+};
+
+DECLARE_REMOTE_PROTOCOL(Pioneer)
+
+template<typename... Ts> class PioneerAction : public RemoteTransmitterActionBase<Ts...> {
+ public:
+  TEMPLATABLE_VALUE(uint16_t, rc_code_1)
+  TEMPLATABLE_VALUE(uint16_t, rc_code_2)
+  void encode(RemoteTransmitData *dst, Ts... x) override {
+    PioneerData data{};
+    data.rc_code_1 = this->rc_code_1_.value(x...);
+    data.rc_code_2 = this->rc_code_2_.value(x...);
+    PioneerProtocol().encode(dst, data);
+  }
+};
+
+}  // namespace remote_base
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index 8a45f27880..f287a15734 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -356,6 +356,8 @@ CONF_RANGE_FROM = 'range_from'
 CONF_RANGE_TO = 'range_to'
 CONF_RATE = 'rate'
 CONF_RAW = 'raw'
+CONF_RC_CODE_1 = 'rc_code_1'
+CONF_RC_CODE_2 = 'rc_code_2'
 CONF_REBOOT_TIMEOUT = 'reboot_timeout'
 CONF_RECEIVE_TIMEOUT = 'receive_timeout'
 CONF_RED = 'red'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 043fafc9c3..f0de50d9b6 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1239,6 +1239,14 @@ switch:
       remote_transmitter.transmit_panasonic:
         address: 0x4004
         command: 0x1000BCD
+  - platform: template
+    name: Pioneer
+    turn_on_action:
+      - remote_transmitter.transmit_pioneer:
+          rc_code_1: 0xA556
+          rc_code_2: 0xA506
+          repeat:
+            times: 2
   - platform: template
     name: RC Switch Raw
     turn_on_action:

From 990a4d47746056786700655a253c93d1774f7634 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Mon, 13 Jan 2020 19:44:55 -0300
Subject: [PATCH 146/412] Display tm1637 (#946)

* add TM1637 support
---
 esphome/components/tm1637/display.py  |  35 +++
 esphome/components/tm1637/tm1637.cpp  | 299 ++++++++++++++++++++++++++
 esphome/components/tm1637/tm1637.h    |  70 ++++++
 esphome/components/tm1651/__init__.py |   4 +-
 esphome/const.py                      |   1 +
 tests/test1.yaml                      |   6 +
 6 files changed, 412 insertions(+), 3 deletions(-)
 create mode 100644 esphome/components/tm1637/display.py
 create mode 100644 esphome/components/tm1637/tm1637.cpp
 create mode 100644 esphome/components/tm1637/tm1637.h

diff --git a/esphome/components/tm1637/display.py b/esphome/components/tm1637/display.py
new file mode 100644
index 0000000000..211d78a9d9
--- /dev/null
+++ b/esphome/components/tm1637/display.py
@@ -0,0 +1,35 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import display
+from esphome.const import CONF_CLK_PIN, CONF_DIO_PIN, CONF_ID, CONF_LAMBDA, CONF_INTENSITY
+
+tm1637_ns = cg.esphome_ns.namespace('tm1637')
+TM1637Display = tm1637_ns.class_('TM1637Display', cg.PollingComponent)
+TM1637DisplayRef = TM1637Display.operator('ref')
+
+CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(TM1637Display),
+
+    cv.Optional(CONF_INTENSITY, default=7): cv.All(cv.uint8_t, cv.Range(min=0, max=7)),
+    cv.Required(CONF_CLK_PIN): pins.internal_gpio_output_pin_schema,
+    cv.Required(CONF_DIO_PIN): pins.internal_gpio_output_pin_schema,
+}).extend(cv.polling_component_schema('1s'))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield display.register_display(var, config)
+
+    clk = yield cg.gpio_pin_expression(config[CONF_CLK_PIN])
+    cg.add(var.set_clk_pin(clk))
+    dio = yield cg.gpio_pin_expression(config[CONF_DIO_PIN])
+    cg.add(var.set_dio_pin(dio))
+
+    cg.add(var.set_intensity(config[CONF_INTENSITY]))
+
+    if CONF_LAMBDA in config:
+        lambda_ = yield cg.process_lambda(config[CONF_LAMBDA], [(TM1637DisplayRef, 'it')],
+                                          return_type=cg.void)
+        cg.add(var.set_writer(lambda_))
diff --git a/esphome/components/tm1637/tm1637.cpp b/esphome/components/tm1637/tm1637.cpp
new file mode 100644
index 0000000000..ebf2fff9d6
--- /dev/null
+++ b/esphome/components/tm1637/tm1637.cpp
@@ -0,0 +1,299 @@
+#include "tm1637.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace tm1637 {
+
+const char* TAG = "display.tm1637";
+const uint8_t TM1637_I2C_COMM1 = 0x40;
+const uint8_t TM1637_I2C_COMM2 = 0xC0;
+const uint8_t TM1637_I2C_COMM3 = 0x80;
+const uint8_t TM1637_UNKNOWN_CHAR = 0b11111111;
+
+//
+//      A
+//     ---
+//  F |   | B
+//     -G-
+//  E |   | C
+//     ---
+//      D   X
+// XABCDEFG
+const uint8_t TM1637_ASCII_TO_RAW[94] PROGMEM = {
+    0b00000000,           // ' ', ord 0x20
+    0b10110000,           // '!', ord 0x21
+    0b00100010,           // '"', ord 0x22
+    TM1637_UNKNOWN_CHAR,  // '#', ord 0x23
+    TM1637_UNKNOWN_CHAR,  // '$', ord 0x24
+    0b01001001,           // '%', ord 0x25
+    TM1637_UNKNOWN_CHAR,  // '&', ord 0x26
+    0b00000010,           // ''', ord 0x27
+    0b01001110,           // '(', ord 0x28
+    0b01111000,           // ')', ord 0x29
+    0b01000000,           // '*', ord 0x2A
+    TM1637_UNKNOWN_CHAR,  // '+', ord 0x2B
+    0b00010000,           // ',', ord 0x2C
+    0b00000001,           // '-', ord 0x2D
+    0b10000000,           // '.', ord 0x2E
+    TM1637_UNKNOWN_CHAR,  // '/', ord 0x2F
+    0b01111110,           // '0', ord 0x30
+    0b00110000,           // '1', ord 0x31
+    0b01101101,           // '2', ord 0x32
+    0b01111001,           // '3', ord 0x33
+    0b00110011,           // '4', ord 0x34
+    0b01011011,           // '5', ord 0x35
+    0b01011111,           // '6', ord 0x36
+    0b01110000,           // '7', ord 0x37
+    0b01111111,           // '8', ord 0x38
+    0b01110011,           // '9', ord 0x39
+    0b01001000,           // ':', ord 0x3A
+    0b01011000,           // ';', ord 0x3B
+    TM1637_UNKNOWN_CHAR,  // '<', ord 0x3C
+    TM1637_UNKNOWN_CHAR,  // '=', ord 0x3D
+    TM1637_UNKNOWN_CHAR,  // '>', ord 0x3E
+    0b01100101,           // '?', ord 0x3F
+    0b01101111,           // '@', ord 0x40
+    0b01110111,           // 'A', ord 0x41
+    0b00011111,           // 'B', ord 0x42
+    0b01001110,           // 'C', ord 0x43
+    0b00111101,           // 'D', ord 0x44
+    0b01001111,           // 'E', ord 0x45
+    0b01000111,           // 'F', ord 0x46
+    0b01011110,           // 'G', ord 0x47
+    0b00110111,           // 'H', ord 0x48
+    0b00110000,           // 'I', ord 0x49
+    0b00111100,           // 'J', ord 0x4A
+    TM1637_UNKNOWN_CHAR,  // 'K', ord 0x4B
+    0b00001110,           // 'L', ord 0x4C
+    TM1637_UNKNOWN_CHAR,  // 'M', ord 0x4D
+    0b00010101,           // 'N', ord 0x4E
+    0b01111110,           // 'O', ord 0x4F
+    0b01100111,           // 'P', ord 0x50
+    0b11111110,           // 'Q', ord 0x51
+    0b00000101,           // 'R', ord 0x52
+    0b01011011,           // 'S', ord 0x53
+    0b00000111,           // 'T', ord 0x54
+    0b00111110,           // 'U', ord 0x55
+    0b00111110,           // 'V', ord 0x56
+    0b00111111,           // 'W', ord 0x57
+    TM1637_UNKNOWN_CHAR,  // 'X', ord 0x58
+    0b00100111,           // 'Y', ord 0x59
+    0b01101101,           // 'Z', ord 0x5A
+    0b01001110,           // '[', ord 0x5B
+    TM1637_UNKNOWN_CHAR,  // '\', ord 0x5C
+    0b01111000,           // ']', ord 0x5D
+    TM1637_UNKNOWN_CHAR,  // '^', ord 0x5E
+    0b00001000,           // '_', ord 0x5F
+    0b00100000,           // '`', ord 0x60
+    0b01110111,           // 'a', ord 0x61
+    0b00011111,           // 'b', ord 0x62
+    0b00001101,           // 'c', ord 0x63
+    0b00111101,           // 'd', ord 0x64
+    0b01001111,           // 'e', ord 0x65
+    0b01000111,           // 'f', ord 0x66
+    0b01011110,           // 'g', ord 0x67
+    0b00010111,           // 'h', ord 0x68
+    0b00010000,           // 'i', ord 0x69
+    0b00111100,           // 'j', ord 0x6A
+    TM1637_UNKNOWN_CHAR,  // 'k', ord 0x6B
+    0b00001110,           // 'l', ord 0x6C
+    TM1637_UNKNOWN_CHAR,  // 'm', ord 0x6D
+    0b00010101,           // 'n', ord 0x6E
+    0b00011101,           // 'o', ord 0x6F
+    0b01100111,           // 'p', ord 0x70
+    TM1637_UNKNOWN_CHAR,  // 'q', ord 0x71
+    0b00000101,           // 'r', ord 0x72
+    0b01011011,           // 's', ord 0x73
+    0b00000111,           // 't', ord 0x74
+    0b00011100,           // 'u', ord 0x75
+    0b00011100,           // 'v', ord 0x76
+    TM1637_UNKNOWN_CHAR,  // 'w', ord 0x77
+    TM1637_UNKNOWN_CHAR,  // 'x', ord 0x78
+    0b00100111,           // 'y', ord 0x79
+    TM1637_UNKNOWN_CHAR,  // 'z', ord 0x7A
+    0b00110001,           // '{', ord 0x7B
+    0b00000110,           // '|', ord 0x7C
+    0b00000111,           // '}', ord 0x7D
+};
+void TM1637Display::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up TM1637...");
+
+  this->clk_pin_->setup();               // OUTPUT
+  this->clk_pin_->digital_write(false);  // LOW
+  this->dio_pin_->setup();               // OUTPUT
+  this->dio_pin_->digital_write(false);  // LOW
+
+  this->display();
+}
+void TM1637Display::dump_config() {
+  ESP_LOGCONFIG(TAG, "TM1637:");
+  ESP_LOGCONFIG(TAG, "  INTENSITY: %d", this->intensity_);
+  LOG_PIN("  CLK Pin: ", this->clk_pin_);
+  LOG_PIN("  DIO Pin: ", this->dio_pin_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void TM1637Display::update() {
+  for (uint8_t& i : this->buffer_)
+    i = 0;
+  if (this->writer_.has_value())
+    (*this->writer_)(*this);
+  this->display();
+}
+
+float TM1637Display::get_setup_priority() const { return setup_priority::PROCESSOR; }
+void TM1637Display::bit_delay_() { delayMicroseconds(100); }
+void TM1637Display::start_() {
+  this->dio_pin_->pin_mode(OUTPUT);
+  this->bit_delay_();
+}
+
+void TM1637Display::stop_() {
+  this->dio_pin_->pin_mode(OUTPUT);
+  bit_delay_();
+  this->clk_pin_->pin_mode(INPUT);
+  bit_delay_();
+  this->dio_pin_->pin_mode(INPUT);
+  bit_delay_();
+}
+
+void TM1637Display::display() {
+  ESP_LOGVV(TAG, "Display %02X%02X%02X%02X", buffer_[0], buffer_[1], buffer_[2], buffer_[3]);
+
+  // Write COMM1
+  this->start_();
+  this->send_byte_(TM1637_I2C_COMM1);
+  this->stop_();
+
+  // Write COMM2 + first digit address
+  this->start_();
+  this->send_byte_(TM1637_I2C_COMM2);
+
+  // Write the data bytes
+  for (auto b : this->buffer_) {
+    this->send_byte_(b);
+  }
+
+  this->stop_();
+
+  // Write COMM3 + brightness
+  this->start_();
+  this->send_byte_(TM1637_I2C_COMM3 + ((this->intensity_ & 0x7) | 0x08));
+  this->stop_();
+}
+bool TM1637Display::send_byte_(uint8_t b) {
+  uint8_t data = b;
+
+  // 8 Data Bits
+  for (uint8_t i = 0; i < 8; i++) {
+    // CLK low
+    this->clk_pin_->pin_mode(OUTPUT);
+    this->bit_delay_();
+
+    // Set data bit
+    if (data & 0x01)
+      this->dio_pin_->pin_mode(INPUT);
+    else
+      this->dio_pin_->pin_mode(OUTPUT);
+
+    this->bit_delay_();
+
+    // CLK high
+    this->clk_pin_->pin_mode(INPUT);
+    this->bit_delay_();
+    data = data >> 1;
+  }
+
+  // Wait for acknowledge
+  // CLK to zero
+  this->clk_pin_->pin_mode(OUTPUT);
+  this->dio_pin_->pin_mode(INPUT);
+  this->bit_delay_();
+
+  // CLK to high
+  this->clk_pin_->pin_mode(INPUT);
+  this->bit_delay_();
+  uint8_t ack = this->dio_pin_->digital_read();
+  if (ack == 0) {
+    this->dio_pin_->pin_mode(OUTPUT);
+  }
+
+  this->bit_delay_();
+  this->clk_pin_->pin_mode(OUTPUT);
+  this->bit_delay_();
+
+  return ack;
+}
+
+uint8_t TM1637Display::print(uint8_t start_pos, const char* str) {
+  ESP_LOGV(TAG, "Print at %d: %s", start_pos, str);
+  uint8_t pos = start_pos;
+  for (; *str != '\0'; str++) {
+    uint8_t data = TM1637_UNKNOWN_CHAR;
+    if (*str >= ' ' && *str <= '}')
+      data = pgm_read_byte(&TM1637_ASCII_TO_RAW[*str - ' ']);
+
+    if (data == TM1637_UNKNOWN_CHAR) {
+      ESP_LOGW(TAG, "Encountered character '%c' with no TM1637 representation while translating string!", *str);
+    }
+    // Remap segments, for compatibility with MAX7219 segment definition which is
+    // XABCDEFG, but TM1637 is // XGFEDCBA
+    data = ((data & 0x80) ? 0x80 : 0) |  // no move X
+           ((data & 0x40) ? 0x1 : 0) |   // A
+           ((data & 0x20) ? 0x2 : 0) |   // B
+           ((data & 0x10) ? 0x4 : 0) |   // C
+           ((data & 0x8) ? 0x8 : 0) |    // D
+           ((data & 0x4) ? 0x10 : 0) |   // E
+           ((data & 0x2) ? 0x20 : 0) |   // F
+           ((data & 0x1) ? 0x40 : 0);    // G
+    if (*str == '.') {
+      if (pos != start_pos)
+        pos--;
+      this->buffer_[pos] |= 0b10000000;
+    } else {
+      if (pos >= 4) {
+        ESP_LOGE(TAG, "String is too long for the display!");
+        break;
+      }
+      this->buffer_[pos] = data;
+    }
+    pos++;
+  }
+  return pos - start_pos;
+}
+uint8_t TM1637Display::print(const char* str) { return this->print(0, str); }
+uint8_t TM1637Display::printf(uint8_t pos, const char* format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char buffer[64];
+  int ret = vsnprintf(buffer, sizeof(buffer), format, arg);
+  va_end(arg);
+  if (ret > 0)
+    return this->print(pos, buffer);
+  return 0;
+}
+uint8_t TM1637Display::printf(const char* format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char buffer[64];
+  int ret = vsnprintf(buffer, sizeof(buffer), format, arg);
+  va_end(arg);
+  if (ret > 0)
+    return this->print(buffer);
+  return 0;
+}
+
+#ifdef USE_TIME
+uint8_t TM1637Display::strftime(uint8_t pos, const char* format, time::ESPTime time) {
+  char buffer[64];
+  size_t ret = time.strftime(buffer, sizeof(buffer), format);
+  if (ret > 0)
+    return this->print(pos, buffer);
+  return 0;
+}
+uint8_t TM1637Display::strftime(const char* format, time::ESPTime time) { return this->strftime(0, format, time); }
+#endif
+
+}  // namespace tm1637
+}  // namespace esphome
diff --git a/esphome/components/tm1637/tm1637.h b/esphome/components/tm1637/tm1637.h
new file mode 100644
index 0000000000..91e8ba66c0
--- /dev/null
+++ b/esphome/components/tm1637/tm1637.h
@@ -0,0 +1,70 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/esphal.h"
+
+#ifdef USE_TIME
+#include "esphome/components/time/real_time_clock.h"
+#endif
+
+namespace esphome {
+namespace tm1637 {
+
+class TM1637Display;
+
+using tm1637_writer_t = std::function<void(TM1637Display &)>;
+
+class TM1637Display : public PollingComponent {
+ public:
+  void set_writer(tm1637_writer_t &&writer) { this->writer_ = writer; }
+
+  void setup() override;
+
+  void dump_config() override;
+
+  void set_clk_pin(GPIOPin *pin) { clk_pin_ = pin; }
+  void set_dio_pin(GPIOPin *pin) { dio_pin_ = pin; }
+
+  float get_setup_priority() const override;
+
+  void update() override;
+
+  /// Evaluate the printf-format and print the result at the given position.
+  uint8_t printf(uint8_t pos, const char *format, ...) __attribute__((format(printf, 3, 4)));
+  /// Evaluate the printf-format and print the result at position 0.
+  uint8_t printf(const char *format, ...) __attribute__((format(printf, 2, 3)));
+
+  /// Print `str` at the given position.
+  uint8_t print(uint8_t pos, const char *str);
+  /// Print `str` at position 0.
+  uint8_t print(const char *str);
+
+  void set_intensity(uint8_t intensity) { this->intensity_ = intensity; }
+
+  void display();
+
+#ifdef USE_TIME
+  /// Evaluate the strftime-format and print the result at the given position.
+  uint8_t strftime(uint8_t pos, const char *format, time::ESPTime time) __attribute__((format(strftime, 3, 0)));
+
+  /// Evaluate the strftime-format and print the result at position 0.
+  uint8_t strftime(const char *format, time::ESPTime time) __attribute__((format(strftime, 2, 0)));
+#endif
+
+ protected:
+  void bit_delay_();
+  void setup_pins_();
+  bool send_byte_(uint8_t b);
+  void start_();
+  void stop_();
+
+  GPIOPin *dio_pin_;
+  GPIOPin *clk_pin_;
+  uint8_t intensity_;
+  optional<tm1637_writer_t> writer_{};
+  uint8_t buffer_[4] = {0};
+};
+
+}  // namespace tm1637
+}  // namespace esphome
diff --git a/esphome/components/tm1651/__init__.py b/esphome/components/tm1651/__init__.py
index 1c49287878..d83ef4b3b7 100644
--- a/esphome/components/tm1651/__init__.py
+++ b/esphome/components/tm1651/__init__.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins, automation
-from esphome.const import CONF_ID, CONF_CLK_PIN, CONF_LEVEL, CONF_BRIGHTNESS
+from esphome.const import CONF_ID, CONF_CLK_PIN, CONF_DIO_PIN, CONF_LEVEL, CONF_BRIGHTNESS
 
 tm1651_ns = cg.esphome_ns.namespace('tm1651')
 TM1651Display = tm1651_ns.class_('TM1651Display', cg.Component)
@@ -15,8 +15,6 @@ TM1651_BRIGHTNESS_OPTIONS = {
     3: TM1651Display.TM1651_BRIGHTNESS_HIGH
 }
 
-CONF_DIO_PIN = 'dio_pin'
-
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(TM1651Display),
     cv.Required(CONF_CLK_PIN): pins.internal_gpio_output_pin_schema,
diff --git a/esphome/const.py b/esphome/const.py
index f287a15734..0c5f286f30 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -125,6 +125,7 @@ CONF_DELTA = 'delta'
 CONF_DEVICE = 'device'
 CONF_DEVICE_CLASS = 'device_class'
 CONF_DIMENSIONS = 'dimensions'
+CONF_DIO_PIN = 'dio_pin'
 CONF_DIR_PIN = 'dir_pin'
 CONF_DIRECTION = 'direction'
 CONF_DISCOVERY = 'discovery'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index f0de50d9b6..fb15bc0a6b 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1426,6 +1426,12 @@ display:
   num_chips: 1
   lambda: |-
     it.print("01234567");
+- platform: tm1637
+  clk_pin: GPIO23
+  dio_pin: GPIO25
+  intensity: 3
+  lambda: |-
+      it.print("1234");
 - platform: nextion
   lambda: |-
     it.set_component_value("gauge", 50);

From a55787f40caf11e8c7ed83aff76dd1205c5a50f6 Mon Sep 17 00:00:00 2001
From: Mario <4376789+mario-tux@users.noreply.github.com>
Date: Tue, 14 Jan 2020 10:34:49 +0100
Subject: [PATCH 147/412] Support a further variant of Xiaomi CGG1 (#930)

---
 esphome/components/xiaomi_ble/xiaomi_ble.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/xiaomi_ble/xiaomi_ble.cpp b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
index 18eaffed06..030ee73d4b 100644
--- a/esphome/components/xiaomi_ble/xiaomi_ble.cpp
+++ b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
@@ -79,7 +79,7 @@ bool parse_xiaomi_service_data(XiaomiParseResult &result, const esp32_ble_tracke
   bool is_lywsdcgq = (raw[1] & 0x20) == 0x20 && raw[2] == 0xAA && raw[3] == 0x01;
   bool is_hhccjcy01 = (raw[1] & 0x20) == 0x20 && raw[2] == 0x98 && raw[3] == 0x00;
   bool is_lywsd02 = (raw[1] & 0x20) == 0x20 && raw[2] == 0x5b && raw[3] == 0x04;
-  bool is_cgg1 = (raw[1] & 0x30) == 0x30 && raw[2] == 0x47 && raw[3] == 0x03;
+  bool is_cgg1 = ((raw[1] & 0x30) == 0x30 || (raw[1] & 0x20) == 0x20) && raw[2] == 0x47 && raw[3] == 0x03;
 
   if (!is_lywsdcgq && !is_hhccjcy01 && !is_lywsd02 && !is_cgg1) {
     // ESP_LOGVV(TAG, "Xiaomi no magic bytes");

From 2d0d794a9dab9f538d65744fddbe6ecbee6c50e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Gim=C3=A9nez?= <hector.fwbz@gmail.com>
Date: Wed, 22 Jan 2020 23:38:04 +0100
Subject: [PATCH 148/412] Daikin climate ir component (#964)

* Daikin ARC43XXX IR remote controller support

* Format and lint fixes

* Check temperature values against allowed min/max
---
 esphome/components/daikin/__init__.py |   0
 esphome/components/daikin/climate.py  |  18 ++++
 esphome/components/daikin/daikin.cpp  | 128 ++++++++++++++++++++++++++
 esphome/components/daikin/daikin.h    |  57 ++++++++++++
 tests/test1.yaml                      |   2 +
 5 files changed, 205 insertions(+)
 create mode 100644 esphome/components/daikin/__init__.py
 create mode 100644 esphome/components/daikin/climate.py
 create mode 100644 esphome/components/daikin/daikin.cpp
 create mode 100644 esphome/components/daikin/daikin.h

diff --git a/esphome/components/daikin/__init__.py b/esphome/components/daikin/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/daikin/climate.py b/esphome/components/daikin/climate.py
new file mode 100644
index 0000000000..f1d5c7ed4a
--- /dev/null
+++ b/esphome/components/daikin/climate.py
@@ -0,0 +1,18 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
+
+AUTO_LOAD = ['climate_ir']
+
+daikin_ns = cg.esphome_ns.namespace('daikin')
+DaikinClimate = daikin_ns.class_('DaikinClimate', climate_ir.ClimateIR)
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(DaikinClimate),
+})
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/daikin/daikin.cpp b/esphome/components/daikin/daikin.cpp
new file mode 100644
index 0000000000..eabbb96014
--- /dev/null
+++ b/esphome/components/daikin/daikin.cpp
@@ -0,0 +1,128 @@
+#include "daikin.h"
+#include "esphome/components/remote_base/remote_base.h"
+
+namespace esphome {
+namespace daikin {
+
+static const char *TAG = "daikin.climate";
+
+void DaikinClimate::transmit_state() {
+  uint8_t remote_state[35] = {0x11, 0xDA, 0x27, 0x00, 0xC5, 0x00, 0x00, 0xD7, 0x11, 0xDA, 0x27, 0x00,
+                              0x42, 0x49, 0x05, 0xA2, 0x11, 0xDA, 0x27, 0x00, 0x00, 0x00, 0x00, 0x00,
+                              0x00, 0x00, 0x00, 0x06, 0x60, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00};
+
+  remote_state[21] = this->operation_mode_();
+  remote_state[24] = this->fan_speed_();
+  remote_state[22] = this->temperature_();
+
+  // Calculate checksum
+  for (int i = 16; i < 34; i++) {
+    remote_state[34] += remote_state[i];
+  }
+
+  auto transmit = this->transmitter_->transmit();
+  auto data = transmit.get_data();
+  data->set_carrier_frequency(DAIKIN_IR_FREQUENCY);
+
+  data->mark(DAIKIN_HEADER_MARK);
+  data->space(DAIKIN_HEADER_SPACE);
+  for (int i = 0; i < 8; i++) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(DAIKIN_BIT_MARK);
+      bool bit = remote_state[i] & mask;
+      data->space(bit ? DAIKIN_ONE_SPACE : DAIKIN_ZERO_SPACE);
+    }
+  }
+  data->mark(DAIKIN_BIT_MARK);
+  data->space(DAIKIN_MESSAGE_SPACE);
+  data->mark(DAIKIN_HEADER_MARK);
+  data->space(DAIKIN_HEADER_SPACE);
+
+  for (int i = 8; i < 16; i++) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(DAIKIN_BIT_MARK);
+      bool bit = remote_state[i] & mask;
+      data->space(bit ? DAIKIN_ONE_SPACE : DAIKIN_ZERO_SPACE);
+    }
+  }
+  data->mark(DAIKIN_BIT_MARK);
+  data->space(DAIKIN_MESSAGE_SPACE);
+  data->mark(DAIKIN_HEADER_MARK);
+  data->space(DAIKIN_HEADER_SPACE);
+
+  for (int i = 16; i < 35; i++) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(DAIKIN_BIT_MARK);
+      bool bit = remote_state[i] & mask;
+      data->space(bit ? DAIKIN_ONE_SPACE : DAIKIN_ZERO_SPACE);
+    }
+  }
+  data->mark(DAIKIN_BIT_MARK);
+  data->space(0);
+
+  transmit.perform();
+}
+
+uint8_t DaikinClimate::operation_mode_() {
+  uint8_t operating_mode = DAIKIN_MODE_ON;
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_COOL:
+      operating_mode |= DAIKIN_MODE_COOL;
+      break;
+    case climate::CLIMATE_MODE_DRY:
+      operating_mode |= DAIKIN_MODE_DRY;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      operating_mode |= DAIKIN_MODE_HEAT;
+      break;
+    case climate::CLIMATE_MODE_AUTO:
+      operating_mode |= DAIKIN_MODE_AUTO;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      operating_mode |= DAIKIN_MODE_FAN;
+      break;
+    case climate::CLIMATE_MODE_OFF:
+    default:
+      operating_mode = DAIKIN_MODE_OFF;
+      break;
+  }
+
+  return operating_mode;
+}
+
+uint8_t DaikinClimate::fan_speed_() {
+  uint8_t fan_speed;
+  switch (this->fan_mode) {
+    case climate::CLIMATE_FAN_LOW:
+      fan_speed = DAIKIN_FAN_1;
+      break;
+    case climate::CLIMATE_FAN_MEDIUM:
+      fan_speed = DAIKIN_FAN_3;
+      break;
+    case climate::CLIMATE_FAN_HIGH:
+      fan_speed = DAIKIN_FAN_5;
+      break;
+    case climate::CLIMATE_FAN_AUTO:
+    default:
+      fan_speed = DAIKIN_FAN_AUTO;
+  }
+
+  // If swing is enabled switch first 4 bits to 1111
+  return this->swing_mode == climate::CLIMATE_SWING_VERTICAL ? fan_speed | 0xF : fan_speed;
+}
+
+uint8_t DaikinClimate::temperature_() {
+  // Force special temperatures depending on the mode
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      return 25;
+    case climate::CLIMATE_MODE_DRY:
+      return 0xc0;
+    default:
+      uint8_t temperature = (uint8_t) roundf(clamp(this->target_temperature, DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX));
+      return temperature << 1;
+  }
+}
+
+}  // namespace daikin
+}  // namespace esphome
diff --git a/esphome/components/daikin/daikin.h b/esphome/components/daikin/daikin.h
new file mode 100644
index 0000000000..ea69256701
--- /dev/null
+++ b/esphome/components/daikin/daikin.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace daikin {
+
+// Values for Daikin ARC43XXX IR Controllers
+// Temperature
+const uint8_t DAIKIN_TEMP_MIN = 10;  // Celsius
+const uint8_t DAIKIN_TEMP_MAX = 30;  // Celsius
+
+// Modes
+const uint8_t DAIKIN_MODE_AUTO = 0x00;
+const uint8_t DAIKIN_MODE_COOL = 0x30;
+const uint8_t DAIKIN_MODE_HEAT = 0x40;
+const uint8_t DAIKIN_MODE_DRY = 0x20;
+const uint8_t DAIKIN_MODE_FAN = 0x60;
+const uint8_t DAIKIN_MODE_OFF = 0x00;
+const uint8_t DAIKIN_MODE_ON = 0x01;
+
+// Fan Speed
+const uint8_t DAIKIN_FAN_AUTO = 0xA0;
+const uint8_t DAIKIN_FAN_1 = 0x30;
+const uint8_t DAIKIN_FAN_2 = 0x40;
+const uint8_t DAIKIN_FAN_3 = 0x50;
+const uint8_t DAIKIN_FAN_4 = 0x60;
+const uint8_t DAIKIN_FAN_5 = 0x70;
+
+// IR Transmission
+const uint32_t DAIKIN_IR_FREQUENCY = 38000;
+const uint32_t DAIKIN_HEADER_MARK = 3360;
+const uint32_t DAIKIN_HEADER_SPACE = 1760;
+const uint32_t DAIKIN_BIT_MARK = 360;
+const uint32_t DAIKIN_ONE_SPACE = 1370;
+const uint32_t DAIKIN_ZERO_SPACE = 520;
+const uint32_t DAIKIN_MESSAGE_SPACE = 32300;
+
+class DaikinClimate : public climate_ir::ClimateIR {
+ public:
+  DaikinClimate()
+      : climate_ir::ClimateIR(
+            DAIKIN_TEMP_MIN, DAIKIN_TEMP_MAX, 1.0f, true, true,
+            std::vector<climate::ClimateFanMode>{climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW,
+                                                 climate::CLIMATE_FAN_MEDIUM, climate::CLIMATE_FAN_HIGH},
+            std::vector<climate::ClimateSwingMode>{climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL}) {}
+
+ protected:
+  // Transmit via IR the state of this climate controller.
+  void transmit_state() override;
+  uint8_t operation_mode_();
+  uint8_t fan_speed_();
+  uint8_t temperature_();
+};
+
+}  // namespace daikin
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index fb15bc0a6b..0533063fb8 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1190,6 +1190,8 @@ climate:
     name: Coolix Climate
   - platform: fujitsu_general
     name: Fujitsu General Climate
+  - platform: daikin
+    name: Daikin Climate
   - platform: yashima
     name: Yashima Climate
   - platform: mitsubishi

From 499903bd3dd24915774942e70ae25aa4bf2c6283 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 4 Feb 2020 22:35:41 -0300
Subject: [PATCH 149/412] fix tm1637 missing __init__.py (#975)

---
 esphome/components/tm1637/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 esphome/components/tm1637/__init__.py

diff --git a/esphome/components/tm1637/__init__.py b/esphome/components/tm1637/__init__.py
new file mode 100644
index 0000000000..e69de29bb2

From e6f21873c33703c8f82eddec080241c607c3f3c5 Mon Sep 17 00:00:00 2001
From: Andrzej <andriej@users.noreply.github.com>
Date: Sat, 8 Feb 2020 18:03:24 +0100
Subject: [PATCH 150/412] sim800l: Add support of roaming-registered SIM cards
 (#977)

* Add support of roaming-registered cards

* Change or to ||
---
 esphome/components/sim800l/sim800l.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/sim800l/sim800l.cpp b/esphome/components/sim800l/sim800l.cpp
index 1390ef8b49..9f8c733fa9 100644
--- a/esphome/components/sim800l/sim800l.cpp
+++ b/esphome/components/sim800l/sim800l.cpp
@@ -97,7 +97,7 @@ void Sim800LComponent::parse_cmd_(std::string message) {
     case STATE_CREGWAIT: {
       // Response: "+CREG: 0,1" -- the one there means registered ok
       //           "+CREG: -,-" means not registered ok
-      bool registered = message.compare(0, 6, "+CREG:") == 0 && message[9] == '1';
+      bool registered = message.compare(0, 6, "+CREG:") == 0 && (message[9] == '1' || message[9] == '5');
       if (registered) {
         if (!this->registered_)
           ESP_LOGD(TAG, "Registered OK");

From 7721049ed787958437818da2690169a85b926d0d Mon Sep 17 00:00:00 2001
From: Jelle Raaijmakers <jelle@gmta.nl>
Date: Sat, 8 Feb 2020 18:10:07 +0100
Subject: [PATCH 151/412] BME280: fix typos, use forced mode constant (#974)

* Fix typo in BME280 chip ID error message

* Use BME280 forced mode constant instead of literal
---
 esphome/components/bme280/bme280.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/bme280/bme280.cpp b/esphome/components/bme280/bme280.cpp
index b7c7f12f6f..6bb5ac9800 100644
--- a/esphome/components/bme280/bme280.cpp
+++ b/esphome/components/bme280/bme280.cpp
@@ -146,7 +146,7 @@ void BME280Component::dump_config() {
       ESP_LOGE(TAG, "Communication with BME280 failed!");
       break;
     case WRONG_CHIP_ID:
-      ESP_LOGE(TAG, "BMP280 has wrong chip ID! Is it a BMP280?");
+      ESP_LOGE(TAG, "BME280 has wrong chip ID! Is it a BME280?");
       break;
     case NONE:
     default:
@@ -172,7 +172,7 @@ void BME280Component::update() {
   uint8_t meas_register = 0;
   meas_register |= (this->temperature_oversampling_ & 0b111) << 5;
   meas_register |= (this->pressure_oversampling_ & 0b111) << 2;
-  meas_register |= 0b01;  // Forced mode
+  meas_register |= BME280_MODE_FORCED;
   if (!this->write_byte(BME280_REGISTER_CONTROL, meas_register)) {
     this->status_set_warning();
     return;

From 1d136ab0df69ab08da266671f472a518fd7caae0 Mon Sep 17 00:00:00 2001
From: puuu <puuu@users.noreply.github.com>
Date: Sun, 9 Feb 2020 21:20:56 +0900
Subject: [PATCH 152/412] MQTT climate features (#913)

* mqtt_climate: add action support

* mqtt_climate: add fan and swing mode support

* mqtt_climate: reduce length of discovery payload by using abbreviations

https://github.com/home-assistant/home-assistant/blob/dev/homeassistant/components/mqtt/abbreviations.py
---
 esphome/components/mqtt/mqtt_climate.cpp | 168 +++++++++++++++++++++--
 esphome/components/mqtt/mqtt_climate.h   |   5 +
 2 files changed, 162 insertions(+), 11 deletions(-)

diff --git a/esphome/components/mqtt/mqtt_climate.cpp b/esphome/components/mqtt/mqtt_climate.cpp
index 3f097d9c07..2a95ed2f64 100644
--- a/esphome/components/mqtt/mqtt_climate.cpp
+++ b/esphome/components/mqtt/mqtt_climate.cpp
@@ -14,12 +14,13 @@ void MQTTClimateComponent::send_discovery(JsonObject &root, mqtt::SendDiscoveryC
   auto traits = this->device_->get_traits();
   // current_temperature_topic
   if (traits.get_supports_current_temperature()) {
-    root["current_temperature_topic"] = this->get_current_temperature_state_topic();
+    // current_temperature_topic
+    root["curr_temp_t"] = this->get_current_temperature_state_topic();
   }
   // mode_command_topic
-  root["mode_command_topic"] = this->get_mode_command_topic();
+  root["mode_cmd_t"] = this->get_mode_command_topic();
   // mode_state_topic
-  root["mode_state_topic"] = this->get_mode_state_topic();
+  root["mode_stat_t"] = this->get_mode_state_topic();
   // modes
   JsonArray &modes = root.createNestedArray("modes");
   // sort array for nice UI in HA
@@ -37,18 +38,18 @@ void MQTTClimateComponent::send_discovery(JsonObject &root, mqtt::SendDiscoveryC
 
   if (traits.get_supports_two_point_target_temperature()) {
     // temperature_low_command_topic
-    root["temperature_low_command_topic"] = this->get_target_temperature_low_command_topic();
+    root["temp_lo_cmd_t"] = this->get_target_temperature_low_command_topic();
     // temperature_low_state_topic
-    root["temperature_low_state_topic"] = this->get_target_temperature_low_state_topic();
+    root["temp_lo_stat_t"] = this->get_target_temperature_low_state_topic();
     // temperature_high_command_topic
-    root["temperature_high_command_topic"] = this->get_target_temperature_high_command_topic();
+    root["temp_hi_cmd_t"] = this->get_target_temperature_high_command_topic();
     // temperature_high_state_topic
-    root["temperature_high_state_topic"] = this->get_target_temperature_high_state_topic();
+    root["temp_hi_stat_t"] = this->get_target_temperature_high_state_topic();
   } else {
     // temperature_command_topic
-    root["temperature_command_topic"] = this->get_target_temperature_command_topic();
+    root["temp_cmd_t"] = this->get_target_temperature_command_topic();
     // temperature_state_topic
-    root["temperature_state_topic"] = this->get_target_temperature_state_topic();
+    root["temp_stat_t"] = this->get_target_temperature_state_topic();
   }
 
   // min_temp
@@ -60,10 +61,59 @@ void MQTTClimateComponent::send_discovery(JsonObject &root, mqtt::SendDiscoveryC
 
   if (traits.get_supports_away()) {
     // away_mode_command_topic
-    root["away_mode_command_topic"] = this->get_away_command_topic();
+    root["away_mode_cmd_t"] = this->get_away_command_topic();
     // away_mode_state_topic
-    root["away_mode_state_topic"] = this->get_away_state_topic();
+    root["away_mode_stat_t"] = this->get_away_state_topic();
   }
+  if (traits.get_supports_action()) {
+    // action_topic
+    root["act_t"] = this->get_action_state_topic();
+  }
+
+  if (traits.get_supports_fan_modes()) {
+    // fan_mode_command_topic
+    root["fan_mode_cmd_t"] = this->get_fan_mode_command_topic();
+    // fan_mode_state_topic
+    root["fan_mode_stat_t"] = this->get_fan_mode_state_topic();
+    // fan_modes
+    JsonArray &fan_modes = root.createNestedArray("fan_modes");
+    if (traits.supports_fan_mode(CLIMATE_FAN_ON))
+      fan_modes.add("on");
+    if (traits.supports_fan_mode(CLIMATE_FAN_OFF))
+      fan_modes.add("off");
+    if (traits.supports_fan_mode(CLIMATE_FAN_AUTO))
+      fan_modes.add("auto");
+    if (traits.supports_fan_mode(CLIMATE_FAN_LOW))
+      fan_modes.add("low");
+    if (traits.supports_fan_mode(CLIMATE_FAN_MEDIUM))
+      fan_modes.add("medium");
+    if (traits.supports_fan_mode(CLIMATE_FAN_HIGH))
+      fan_modes.add("high");
+    if (traits.supports_fan_mode(CLIMATE_FAN_MIDDLE))
+      fan_modes.add("middle");
+    if (traits.supports_fan_mode(CLIMATE_FAN_FOCUS))
+      fan_modes.add("focus");
+    if (traits.supports_fan_mode(CLIMATE_FAN_DIFFUSE))
+      fan_modes.add("diffuse");
+  }
+
+  if (traits.get_supports_swing_modes()) {
+    // swing_mode_command_topic
+    root["swing_mode_cmd_t"] = this->get_swing_mode_command_topic();
+    // swing_mode_state_topic
+    root["swing_mode_stat_t"] = this->get_swing_mode_state_topic();
+    // swing_modes
+    JsonArray &swing_modes = root.createNestedArray("swing_modes");
+    if (traits.supports_swing_mode(CLIMATE_SWING_OFF))
+      swing_modes.add("off");
+    if (traits.supports_swing_mode(CLIMATE_SWING_BOTH))
+      swing_modes.add("both");
+    if (traits.supports_swing_mode(CLIMATE_SWING_VERTICAL))
+      swing_modes.add("vertical");
+    if (traits.supports_swing_mode(CLIMATE_SWING_HORIZONTAL))
+      swing_modes.add("horizontal");
+  }
+
   config.state_topic = false;
   config.command_topic = false;
 }
@@ -135,6 +185,22 @@ void MQTTClimateComponent::setup() {
     });
   }
 
+  if (traits.get_supports_fan_modes()) {
+    this->subscribe(this->get_fan_mode_command_topic(), [this](const std::string &topic, const std::string &payload) {
+      auto call = this->device_->make_call();
+      call.set_fan_mode(payload);
+      call.perform();
+    });
+  }
+
+  if (traits.get_supports_swing_modes()) {
+    this->subscribe(this->get_swing_mode_command_topic(), [this](const std::string &topic, const std::string &payload) {
+      auto call = this->device_->make_call();
+      call.set_swing_mode(payload);
+      call.perform();
+    });
+  }
+
   this->device_->add_on_state_callback([this]() { this->publish_state_(); });
 }
 MQTTClimateComponent::MQTTClimateComponent(Climate *device) : device_(device) {}
@@ -193,6 +259,86 @@ bool MQTTClimateComponent::publish_state_() {
     if (!this->publish(this->get_away_state_topic(), payload))
       success = false;
   }
+  if (traits.get_supports_action()) {
+    const char *payload = "unknown";
+    switch (this->device_->action) {
+      case CLIMATE_ACTION_OFF:
+        payload = "off";
+        break;
+      case CLIMATE_ACTION_COOLING:
+        payload = "cooling";
+        break;
+      case CLIMATE_ACTION_HEATING:
+        payload = "heating";
+        break;
+      case CLIMATE_ACTION_IDLE:
+        payload = "idle";
+        break;
+      case CLIMATE_ACTION_DRYING:
+        payload = "drying";
+        break;
+      case CLIMATE_ACTION_FAN:
+        payload = "fan";
+        break;
+    }
+    if (!this->publish(this->get_action_state_topic(), payload))
+      success = false;
+  }
+
+  if (traits.get_supports_fan_modes()) {
+    const char *payload = "";
+    switch (this->device_->fan_mode) {
+      case CLIMATE_FAN_ON:
+        payload = "on";
+        break;
+      case CLIMATE_FAN_OFF:
+        payload = "off";
+        break;
+      case CLIMATE_FAN_AUTO:
+        payload = "auto";
+        break;
+      case CLIMATE_FAN_LOW:
+        payload = "low";
+        break;
+      case CLIMATE_FAN_MEDIUM:
+        payload = "medium";
+        break;
+      case CLIMATE_FAN_HIGH:
+        payload = "high";
+        break;
+      case CLIMATE_FAN_MIDDLE:
+        payload = "middle";
+        break;
+      case CLIMATE_FAN_FOCUS:
+        payload = "focus";
+        break;
+      case CLIMATE_FAN_DIFFUSE:
+        payload = "diffuse";
+        break;
+    }
+    if (!this->publish(this->get_fan_mode_state_topic(), payload))
+      success = false;
+  }
+
+  if (traits.get_supports_swing_modes()) {
+    const char *payload = "";
+    switch (this->device_->swing_mode) {
+      case CLIMATE_SWING_OFF:
+        payload = "off";
+        break;
+      case CLIMATE_SWING_BOTH:
+        payload = "both";
+        break;
+      case CLIMATE_SWING_VERTICAL:
+        payload = "vertical";
+        break;
+      case CLIMATE_SWING_HORIZONTAL:
+        payload = "horizontal";
+        break;
+    }
+    if (!this->publish(this->get_swing_mode_state_topic(), payload))
+      success = false;
+  }
 
   return success;
 }
diff --git a/esphome/components/mqtt/mqtt_climate.h b/esphome/components/mqtt/mqtt_climate.h
index 2d6fe3cc5e..8aea4feb26 100644
--- a/esphome/components/mqtt/mqtt_climate.h
+++ b/esphome/components/mqtt/mqtt_climate.h
@@ -30,6 +30,11 @@ class MQTTClimateComponent : public mqtt::MQTTComponent {
   MQTT_COMPONENT_CUSTOM_TOPIC(target_temperature_high, command)
   MQTT_COMPONENT_CUSTOM_TOPIC(away, state)
   MQTT_COMPONENT_CUSTOM_TOPIC(away, command)
+  MQTT_COMPONENT_CUSTOM_TOPIC(action, state)
+  MQTT_COMPONENT_CUSTOM_TOPIC(fan_mode, state)
+  MQTT_COMPONENT_CUSTOM_TOPIC(fan_mode, command)
+  MQTT_COMPONENT_CUSTOM_TOPIC(swing_mode, state)
+  MQTT_COMPONENT_CUSTOM_TOPIC(swing_mode, command)
 
  protected:
   std::string friendly_name() const override;

From 6ae1efcf9fc00cb61eff0d9c28413d0f91525b88 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 16 Feb 2020 00:48:08 +0100
Subject: [PATCH 153/412] Revert ESP32 default upload speed to 115200 (#978)

---
 esphome/writer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/writer.py b/esphome/writer.py
index b3a60c5de9..67b1332e8f 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -190,7 +190,7 @@ def get_ini_content():
         'framework': 'arduino',
         'lib_deps': lib_deps + ['${common.lib_deps}'],
         'build_flags': build_flags + ['${common.build_flags}'],
-        'upload_speed': UPLOAD_SPEED_OVERRIDE.get(CORE.board, 460800),
+        'upload_speed': UPLOAD_SPEED_OVERRIDE.get(CORE.board, 115200),
     }
 
     if CORE.is_esp32:

From 4402a6eb4cc6db389b7bf9dffe86eb2a26a3804f Mon Sep 17 00:00:00 2001
From: Evgeny <freekode@users.noreply.github.com>
Date: Sun, 16 Feb 2020 00:52:20 +0100
Subject: [PATCH 154/412] Add TM1651 simple level, turn on, turn off actions
 (#920)

* Add TM1651 simple level action

* fixed brightness validation

* Updated lib, fixed import

* Added turn_on, turn_off actions

* Fixed after lint
---
 esphome/components/tm1651/__init__.py | 70 +++++++++++++++++++++++----
 esphome/components/tm1651/tm1651.cpp  | 26 ++++++++--
 esphome/components/tm1651/tm1651.h    | 27 +++++++++++
 tests/test3.yaml                      | 15 ++++++
 4 files changed, 125 insertions(+), 13 deletions(-)

diff --git a/esphome/components/tm1651/__init__.py b/esphome/components/tm1651/__init__.py
index d83ef4b3b7..aa972552f4 100644
--- a/esphome/components/tm1651/__init__.py
+++ b/esphome/components/tm1651/__init__.py
@@ -1,13 +1,19 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins, automation
+from esphome.automation import maybe_simple_id
 from esphome.const import CONF_ID, CONF_CLK_PIN, CONF_DIO_PIN, CONF_LEVEL, CONF_BRIGHTNESS
 
 tm1651_ns = cg.esphome_ns.namespace('tm1651')
 TM1651Display = tm1651_ns.class_('TM1651Display', cg.Component)
+
+SetLevelPercentAction = tm1651_ns.class_('SetLevelPercentAction', automation.Action)
 SetLevelAction = tm1651_ns.class_('SetLevelAction', automation.Action)
 SetBrightnessAction = tm1651_ns.class_('SetBrightnessAction', automation.Action)
-validate_level = cv.All(cv.int_range(min=0, max=100))
+TurnOnAction = tm1651_ns.class_('SetLevelPercentAction', automation.Action)
+TurnOffAction = tm1651_ns.class_('SetLevelPercentAction', automation.Action)
+
+CONF_LEVEL_PERCENT = 'level_percent'
 
 TM1651_BRIGHTNESS_OPTIONS = {
     1: TM1651Display.TM1651_BRIGHTNESS_LOW,
@@ -21,6 +27,10 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Required(CONF_DIO_PIN): pins.internal_gpio_output_pin_schema,
 })
 
+validate_level_percent = cv.All(cv.int_range(min=0, max=100))
+validate_level = cv.All(cv.int_range(min=0, max=7))
+validate_brightness = cv.enum(TM1651_BRIGHTNESS_OPTIONS, int=True)
+
 
 def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
@@ -32,13 +42,50 @@ def to_code(config):
     cg.add(var.set_dio_pin(dio_pin))
 
     # https://platformio.org/lib/show/6865/TM1651
-    cg.add_library('6865', '1.0.0')
+    cg.add_library('6865', '1.0.1')
 
 
-@automation.register_action('tm1651.set_level', SetLevelAction, cv.maybe_simple_value({
-    cv.GenerateID(): cv.use_id(TM1651Display),
-    cv.Required(CONF_LEVEL): cv.templatable(validate_level),
-}, key=CONF_LEVEL))
+BINARY_OUTPUT_ACTION_SCHEMA = maybe_simple_id({
+    cv.Required(CONF_ID): cv.use_id(TM1651Display),
+})
+
+
+@automation.register_action('tm1651.turn_on', TurnOnAction, BINARY_OUTPUT_ACTION_SCHEMA)
+def output_turn_on_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_action('tm1651.turn_off', TurnOffAction, BINARY_OUTPUT_ACTION_SCHEMA)
+def output_turn_off_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_action(
+    'tm1651.set_level_percent',
+    SetLevelPercentAction,
+    cv.maybe_simple_value({
+        cv.GenerateID(): cv.use_id(TM1651Display),
+        cv.Required(CONF_LEVEL_PERCENT): cv.templatable(validate_level_percent),
+    }, key=CONF_LEVEL_PERCENT))
+def tm1651_set_level_percent_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    template_ = yield cg.templatable(config[CONF_LEVEL_PERCENT], args, cg.uint8)
+    cg.add(var.set_level_percent(template_))
+    yield var
+
+
+@automation.register_action(
+    'tm1651.set_level',
+    SetLevelAction,
+    cv.maybe_simple_value({
+        cv.GenerateID(): cv.use_id(TM1651Display),
+        cv.Required(CONF_LEVEL): cv.templatable(validate_level),
+    }, key=CONF_LEVEL))
 def tm1651_set_level_to_code(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     yield cg.register_parented(var, config[CONF_ID])
@@ -47,10 +94,13 @@ def tm1651_set_level_to_code(config, action_id, template_arg, args):
     yield var
 
 
-@automation.register_action('tm1651.set_brightness', SetBrightnessAction, cv.maybe_simple_value({
-    cv.GenerateID(): cv.use_id(TM1651Display),
-    cv.Required(CONF_BRIGHTNESS): cv.templatable(validate_level),
-}, key=CONF_BRIGHTNESS))
+@automation.register_action(
+    'tm1651.set_brightness',
+    SetBrightnessAction,
+    cv.maybe_simple_value({
+        cv.GenerateID(): cv.use_id(TM1651Display),
+        cv.Required(CONF_BRIGHTNESS): cv.templatable(validate_brightness),
+    }, key=CONF_BRIGHTNESS))
 def tm1651_set_brightness_to_code(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     yield cg.register_parented(var, config[CONF_ID])
diff --git a/esphome/components/tm1651/tm1651.cpp b/esphome/components/tm1651/tm1651.cpp
index 594ebe9db9..0417706327 100644
--- a/esphome/components/tm1651/tm1651.cpp
+++ b/esphome/components/tm1651/tm1651.cpp
@@ -5,8 +5,9 @@ namespace esphome {
 namespace tm1651 {
 
 static const char *TAG = "tm1651.display";
+
+static const uint8_t MAX_INPUT_LEVEL_PERCENT = 100;
 static const uint8_t TM1651_MAX_LEVEL = 7;
-static const uint8_t MAX_INPUT_LEVEL = 100;
 
 static const uint8_t TM1651_BRIGHTNESS_LOW = 0;
 static const uint8_t TM1651_BRIGHTNESS_MEDIUM = 2;
@@ -29,17 +30,36 @@ void TM1651Display::dump_config() {
   LOG_PIN("  DIO: ", dio_pin_);
 }
 
-void TM1651Display::set_level(uint8_t new_level) {
+void TM1651Display::set_level_percent(uint8_t new_level) {
   this->level_ = calculate_level_(new_level);
   this->repaint_();
 }
 
+void TM1651Display::set_level(uint8_t new_level) {
+  this->level_ = new_level;
+  this->repaint_();
+}
+
 void TM1651Display::set_brightness(uint8_t new_brightness) {
   this->brightness_ = calculate_brightness_(new_brightness);
   this->repaint_();
 }
 
+void TM1651Display::turn_on() {
+  this->is_on_ = true;
+  this->repaint_();
+}
+
+void TM1651Display::turn_off() {
+  this->is_on_ = false;
+  battery_display_->displayLevel(0);
+}
+
 void TM1651Display::repaint_() {
+  if (!this->is_on_) {
+    return;
+  }
+
   battery_display_->set(this->brightness_);
   battery_display_->displayLevel(this->level_);
 }
@@ -49,7 +69,7 @@ uint8_t TM1651Display::calculate_level_(uint8_t new_level) {
     return 0;
   }
 
-  float calculated_level = TM1651_MAX_LEVEL / (float) (MAX_INPUT_LEVEL / (float) new_level);
+  float calculated_level = TM1651_MAX_LEVEL / (float) (MAX_INPUT_LEVEL_PERCENT / (float) new_level);
   return (uint8_t) roundf(calculated_level);
 }
 
diff --git a/esphome/components/tm1651/tm1651.h b/esphome/components/tm1651/tm1651.h
index d75c2adb62..6eab24687c 100644
--- a/esphome/components/tm1651/tm1651.h
+++ b/esphome/components/tm1651/tm1651.h
@@ -17,13 +17,18 @@ class TM1651Display : public Component {
   void setup() override;
   void dump_config() override;
 
+  void set_level_percent(uint8_t);
   void set_level(uint8_t);
   void set_brightness(uint8_t);
 
+  void turn_on();
+  void turn_off();
+
  protected:
   TM1651 *battery_display_;
   GPIOPin *clk_pin_;
   GPIOPin *dio_pin_;
+  bool is_on_ = true;
 
   uint8_t brightness_;
   uint8_t level_;
@@ -34,9 +39,20 @@ class TM1651Display : public Component {
   uint8_t calculate_brightness_(uint8_t);
 };
 
+template<typename... Ts> class SetLevelPercentAction : public Action<Ts...>, public Parented<TM1651Display> {
+ public:
+  TEMPLATABLE_VALUE(uint8_t, level_percent)
+
+  void play(Ts... x) override {
+    auto level_percent = this->level_percent_.value(x...);
+    this->parent_->set_level_percent(level_percent);
+  }
+};
+
 template<typename... Ts> class SetLevelAction : public Action<Ts...>, public Parented<TM1651Display> {
  public:
   TEMPLATABLE_VALUE(uint8_t, level)
+
   void play(Ts... x) override {
     auto level = this->level_.value(x...);
     this->parent_->set_level(level);
@@ -46,11 +62,22 @@ template<typename... Ts> class SetLevelAction : public Action<Ts...>, public Par
 template<typename... Ts> class SetBrightnessAction : public Action<Ts...>, public Parented<TM1651Display> {
  public:
   TEMPLATABLE_VALUE(uint8_t, brightness)
+
   void play(Ts... x) override {
     auto brightness = this->brightness_.value(x...);
     this->parent_->set_brightness(brightness);
   }
 };
 
+template<typename... Ts> class TurnOnAction : public Action<Ts...>, public Parented<TM1651Display> {
+ public:
+  void play(Ts... x) override { this->parent_->turn_on(); }
+};
+
+template<typename... Ts> class TurnOffAction : public Action<Ts...>, public Parented<TM1651Display> {
+ public:
+  void play(Ts... x) override { this->parent_->turn_off(); }
+};
+
 }  // namespace tm1651
 }  // namespace esphome
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 77a0fa631c..9c66242b4e 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -138,6 +138,13 @@ api:
       then:
         - dfplayer.random
 
+    - service: battery_level_percent
+      variables:
+        level_percent: int
+      then:
+        - tm1651.set_level_percent:
+            id: tm1651_battery
+            level_percent: !lambda 'return level_percent;'
     - service: battery_level
       variables:
         level: int
@@ -152,6 +159,14 @@ api:
         - tm1651.set_brightness:
             id: tm1651_battery
             brightness: !lambda 'return brightness;'
+    - service: battery_turn_on
+      then:
+        - tm1651.turn_on:
+            id: tm1651_battery
+    - service: battery_turn_on
+      then:
+        - tm1651.turn_off:
+            id: tm1651_battery
 
 wifi:
   ssid: 'MySSID'

From 67cbaabd99ef05b3b9f9510220766bdc3aa6625e Mon Sep 17 00:00:00 2001
From: Elkropac <Elkropac@users.noreply.github.com>
Date: Thu, 20 Feb 2020 13:05:10 +0100
Subject: [PATCH 155/412] Webserver - include css, js in index (#932)

* add new config options

* init variables in code

* load css and js in python

* update print inside webserver

* fix indentation

* fix indentation

* indentation fix

* fix condition in init

* use cv.file_ instead of cv.string

* do not import EsphomeError

* support embedding js and css at the same time as defined in url

* handle css as separate page

* handle js as separate page

* fix copy and paste error
---
 esphome/components/web_server/__init__.py    | 12 ++-
 esphome/components/web_server/web_server.cpp | 77 ++++++++++++++++++--
 esphome/components/web_server/web_server.h   | 24 ++++++
 esphome/const.py                             |  2 +
 4 files changed, 107 insertions(+), 8 deletions(-)

diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py
index 04f3cc5c04..2f0d179eba 100644
--- a/esphome/components/web_server/__init__.py
+++ b/esphome/components/web_server/__init__.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 from esphome.components import web_server_base
 from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
 from esphome.const import (
-    CONF_CSS_URL, CONF_ID, CONF_JS_URL, CONF_PORT,
+    CONF_CSS_INCLUDE, CONF_CSS_URL, CONF_ID, CONF_JS_INCLUDE, CONF_JS_URL, CONF_PORT,
     CONF_AUTH, CONF_USERNAME, CONF_PASSWORD)
 from esphome.core import coroutine_with_priority
 
@@ -16,7 +16,9 @@ CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(WebServer),
     cv.Optional(CONF_PORT, default=80): cv.port,
     cv.Optional(CONF_CSS_URL, default="https://esphome.io/_static/webserver-v1.min.css"): cv.string,
+    cv.Optional(CONF_CSS_INCLUDE): cv.file_,
     cv.Optional(CONF_JS_URL, default="https://esphome.io/_static/webserver-v1.min.js"): cv.string,
+    cv.Optional(CONF_JS_INCLUDE): cv.file_,
     cv.Optional(CONF_AUTH): cv.Schema({
         cv.Required(CONF_USERNAME): cv.string_strict,
         cv.Required(CONF_PASSWORD): cv.string_strict,
@@ -39,3 +41,11 @@ def to_code(config):
     if CONF_AUTH in config:
         cg.add(var.set_username(config[CONF_AUTH][CONF_USERNAME]))
         cg.add(var.set_password(config[CONF_AUTH][CONF_PASSWORD]))
+    if CONF_CSS_INCLUDE in config:
+        cg.add_define('WEBSERVER_CSS_INCLUDE')
+        with open(config[CONF_CSS_INCLUDE], "r") as myfile:
+            cg.add(var.set_css_include(myfile.read()))
+    if CONF_JS_INCLUDE in config:
+        cg.add_define('WEBSERVER_JS_INCLUDE')
+        with open(config[CONF_JS_INCLUDE], "r") as myfile:
+            cg.add(var.set_js_include(myfile.read()))
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index fcd83297e2..c0708b763f 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -60,7 +60,9 @@ UrlMatch match_url(const std::string &url, bool only_domain = false) {
 }
 
 void WebServer::set_css_url(const char *css_url) { this->css_url_ = css_url; }
+void WebServer::set_css_include(const char *css_include) { this->css_include_ = css_include; }
 void WebServer::set_js_url(const char *js_url) { this->js_url_ = js_url; }
+void WebServer::set_js_include(const char *js_include) { this->js_include_ = js_include; }
 
 void WebServer::setup() {
   ESP_LOGCONFIG(TAG, "Setting up web server...");
@@ -133,9 +135,16 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
   std::string title = App.get_name() + " Web Server";
   stream->print(F("<!DOCTYPE html><html><head><meta charset=UTF-8><title>"));
   stream->print(title.c_str());
-  stream->print(F("</title><link rel=\"stylesheet\" href=\""));
-  stream->print(this->css_url_);
-  stream->print(F("\"></head><body><article class=\"markdown-body\"><h1>"));
+  stream->print(F("</title>"));
+#ifdef WEBSERVER_CSS_INCLUDE
+  stream->print(F("<link rel=\"stylesheet\" href=\"/0.css\">"));
+#endif
+  if (strlen(this->css_url_) > 0) {
+    stream->print(F("<link rel=\"stylesheet\" href=\""));
+    stream->print(this->css_url_);
+    stream->print(F("\">"));
+  }
+  stream->print(F("</head><body><article class=\"markdown-body\"><h1>"));
   stream->print(title.c_str());
   stream->print(F("</h1><h2>States</h2><table id=\"states\"><thead><tr><th>Name<th>State<th>Actions<tbody>"));
   // All content is controlled and created by user - so allowing all origins is fine here.
@@ -175,14 +184,44 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
                   "REST API documentation.</p>"
                   "<h2>OTA Update</h2><form method=\"POST\" action=\"/update\" enctype=\"multipart/form-data\"><input "
                   "type=\"file\" name=\"update\"><input type=\"submit\" value=\"Update\"></form>"
-                  "<h2>Debug Log</h2><pre id=\"log\"></pre>"
-                  "<script src=\""));
-  stream->print(this->js_url_);
-  stream->print(F("\"></script></article></body></html>"));
+                  "<h2>Debug Log</h2><pre id=\"log\"></pre>"));
+#ifdef WEBSERVER_JS_INCLUDE
+  if (this->js_include_ != nullptr) {
+    stream->print(F("<script src=\"/0.js\"></script>"));
+  }
+#endif
+  if (strlen(this->js_url_) > 0) {
+    stream->print(F("<script src=\""));
+    stream->print(this->js_url_);
+    stream->print(F("\"></script>"));
+  }
+  stream->print(F("</article></body></html>"));
 
   request->send(stream);
 }
 
+#ifdef WEBSERVER_CSS_INCLUDE
+void WebServer::handle_css_request(AsyncWebServerRequest *request) {
+  AsyncResponseStream *stream = request->beginResponseStream("text/css");
+  if (this->css_include_ != nullptr) {
+    stream->print(this->css_include_);
+  }
+
+  request->send(stream);
+}
+#endif
+
+#ifdef WEBSERVER_JS_INCLUDE
+void WebServer::handle_js_request(AsyncWebServerRequest *request) {
+  AsyncResponseStream *stream = request->beginResponseStream("text/javascript");
+  if (this->js_include_ != nullptr) {
+    stream->print(this->js_include_);
+  }
+
+  request->send(stream);
+}
+#endif
+
 #ifdef USE_SENSOR
 void WebServer::on_sensor_update(sensor::Sensor *obj, float state) {
   this->events_.send(this->sensor_json(obj, state).c_str(), "state");
@@ -460,6 +499,16 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) {
   if (request->url() == "/")
     return true;
 
+#ifdef WEBSERVER_CSS_INCLUDE
+  if (request->url() == "/0.css")
+    return true;
+#endif
+
+#ifdef WEBSERVER_JS_INCLUDE
+  if (request->url() == "/0.js")
+    return true;
+#endif
+
   UrlMatch match = match_url(request->url().c_str(), true);
   if (!match.valid)
     return false;
@@ -505,6 +554,20 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
     return;
   }
 
+#ifdef WEBSERVER_CSS_INCLUDE
+  if (request->url() == "/0.css") {
+    this->handle_css_request(request);
+    return;
+  }
+#endif
+
+#ifdef WEBSERVER_JS_INCLUDE
+  if (request->url() == "/0.js") {
+    this->handle_js_request(request);
+    return;
+  }
+#endif
+
   UrlMatch match = match_url(request->url().c_str());
 #ifdef USE_SENSOR
   if (match.domain == "sensor") {
diff --git a/esphome/components/web_server/web_server.h b/esphome/components/web_server/web_server.h
index 4dca8200cc..def1cac0ea 100644
--- a/esphome/components/web_server/web_server.h
+++ b/esphome/components/web_server/web_server.h
@@ -41,6 +41,12 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
    */
   void set_css_url(const char *css_url);
 
+  /** Set local path to the script that's embedded in the index page. Defaults to
+   *
+   * @param css_include Local path to web server script.
+   */
+  void set_css_include(const char *css_include);
+
   /** Set the URL to the script that's embedded in the index page. Defaults to
    * https://esphome.io/_static/webserver-v1.min.js
    *
@@ -48,6 +54,12 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
    */
   void set_js_url(const char *js_url);
 
+  /** Set local path to the script that's embedded in the index page. Defaults to
+   *
+   * @param js_include Local path to web server script.
+   */
+  void set_js_include(const char *js_include);
+
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
   /// Setup the internal web server and register handlers.
@@ -61,6 +73,16 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
   /// Handle an index request under '/'.
   void handle_index_request(AsyncWebServerRequest *request);
 
+#ifdef WEBSERVER_CSS_INCLUDE
+  /// Handle included css request under '/0.css'.
+  void handle_css_request(AsyncWebServerRequest *request);
+#endif
+
+#ifdef WEBSERVER_JS_INCLUDE
+  /// Handle included js request under '/0.js'.
+  void handle_js_request(AsyncWebServerRequest *request);
+#endif
+
   bool using_auth() { return username_ != nullptr && password_ != nullptr; }
 
 #ifdef USE_SENSOR
@@ -135,7 +157,9 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
   const char *username_{nullptr};
   const char *password_{nullptr};
   const char *css_url_{nullptr};
+  const char *css_include_{nullptr};
   const char *js_url_{nullptr};
+  const char *js_include_{nullptr};
 };
 
 }  // namespace web_server
diff --git a/esphome/const.py b/esphome/const.py
index 0c5f286f30..308dd2683f 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -103,6 +103,7 @@ CONF_COOL_ACTION = 'cool_action'
 CONF_COUNT_MODE = 'count_mode'
 CONF_CRON = 'cron'
 CONF_CS_PIN = 'cs_pin'
+CONF_CSS_INCLUDE = 'css_include'
 CONF_CSS_URL = 'css_url'
 CONF_CURRENT = 'current'
 CONF_CURRENT_OPERATION = 'current_operation'
@@ -210,6 +211,7 @@ CONF_INVALID_COOLDOWN = 'invalid_cooldown'
 CONF_INVERT = 'invert'
 CONF_INVERTED = 'inverted'
 CONF_IP_ADDRESS = 'ip_address'
+CONF_JS_INCLUDE = 'js_include'
 CONF_JS_URL = 'js_url'
 CONF_JVC = 'jvc'
 CONF_KEEP_ON_TIME = 'keep_on_time'

From eb895d2095861a4d51f1a5fcd582a97389c27b4f Mon Sep 17 00:00:00 2001
From: Erwin Kooi <github@ewak.net>
Date: Mon, 2 Mar 2020 23:56:25 +0100
Subject: [PATCH 156/412]  	Added equal symbol for MAX7219 7-segment
 display (#986)

---
 esphome/components/max7219/max7219.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/max7219/max7219.cpp b/esphome/components/max7219/max7219.cpp
index 6af8982c33..6616da1a58 100644
--- a/esphome/components/max7219/max7219.cpp
+++ b/esphome/components/max7219/max7219.cpp
@@ -44,7 +44,7 @@ const uint8_t MAX7219_ASCII_TO_RAW[95] PROGMEM = {
     0b01001000,            // ':', ord 0x3A
     0b01011000,            // ';', ord 0x3B
     MAX7219_UNKNOWN_CHAR,  // '<', ord 0x3C
-    MAX7219_UNKNOWN_CHAR,  // '=', ord 0x3D
+    0b00001001,            // '=', ord 0x3D
     MAX7219_UNKNOWN_CHAR,  // '>', ord 0x3E
     0b01100101,            // '?', ord 0x3F
     0b01101111,            // '@', ord 0x40

From a4ab52918b60410039b57751070c2788725ab6b8 Mon Sep 17 00:00:00 2001
From: Brandon Davidson <brad@oatmail.org>
Date: Wed, 11 Mar 2020 17:16:05 -0700
Subject: [PATCH 157/412] Output from platformio click command does not need to
 be decoded (#953)

---
 esphome/platformio_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index 59f5bf20ae..29bfe7d2e6 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -98,7 +98,7 @@ def run_upload(config, verbose, port):
 
 def run_idedata(config):
     args = ['-t', 'idedata']
-    stdout = run_platformio_cli_run(config, False, *args, capture_stdout=True).decode()
+    stdout = run_platformio_cli_run(config, False, *args, capture_stdout=True)
     match = re.search(r'{\s*".*}', stdout)
     if match is None:
         _LOGGER.debug("Could not match IDEData for %s", stdout)

From 854d735ab3b72032d5163ad20ed5d763deff0dc2 Mon Sep 17 00:00:00 2001
From: Brandon Davidson <brad@oatmail.org>
Date: Wed, 11 Mar 2020 17:16:33 -0700
Subject: [PATCH 158/412] Allow custom lights to be addressable (#954)

---
 esphome/components/custom/light/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/custom/light/__init__.py b/esphome/components/custom/light/__init__.py
index 24b284941e..61dd74e661 100644
--- a/esphome/components/custom/light/__init__.py
+++ b/esphome/components/custom/light/__init__.py
@@ -10,7 +10,7 @@ CONF_LIGHTS = 'lights'
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(CustomLightOutputConstructor),
     cv.Required(CONF_LAMBDA): cv.returning_lambda,
-    cv.Required(CONF_LIGHTS): cv.ensure_list(light.RGB_LIGHT_SCHEMA),
+    cv.Required(CONF_LIGHTS): cv.ensure_list(light.ADDRESSABLE_LIGHT_SCHEMA),
 })
 
 

From 11069085e3819dac3adb62f3f41df8004e27c10d Mon Sep 17 00:00:00 2001
From: Paul Nicholls <paul.n@next.gen.nz>
Date: Thu, 12 Mar 2020 13:17:29 +1300
Subject: [PATCH 159/412] Fix esphome/issues#947 - RGBW(W) white brightness
 (#925)

---
 esphome/components/light/light_color_values.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/light/light_color_values.h b/esphome/components/light/light_color_values.h
index cda86d3f1c..9ac8be1dd0 100644
--- a/esphome/components/light/light_color_values.h
+++ b/esphome/components/light/light_color_values.h
@@ -185,7 +185,7 @@ class LightColorValues {
   /// Convert these light color values to an RGBW representation and write them to red, green, blue, white.
   void as_rgbw(float *red, float *green, float *blue, float *white) const {
     this->as_rgb(red, green, blue);
-    *white = this->state_ * this->white_;
+    *white = this->state_ * this->brightness_ * this->white_;
   }
 
   /// Convert these light color values to an RGBWW representation with the given parameters.
@@ -196,8 +196,8 @@ class LightColorValues {
     const float ww_fraction = (color_temp - color_temperature_cw) / (color_temperature_ww - color_temperature_cw);
     const float cw_fraction = 1.0f - ww_fraction;
     const float max_cw_ww = std::max(ww_fraction, cw_fraction);
-    *cold_white = this->state_ * this->white_ * (cw_fraction / max_cw_ww);
-    *warm_white = this->state_ * this->white_ * (ww_fraction / max_cw_ww);
+    *cold_white = this->state_ * this->brightness_ * this->white_ * (cw_fraction / max_cw_ww);
+    *warm_white = this->state_ * this->brightness_ * this->white_ * (ww_fraction / max_cw_ww);
   }
 
   /// Convert these light color values to an CWWW representation with the given parameters.

From 7f2a6e74038beaf729c7acfc8f7a0aba9651d810 Mon Sep 17 00:00:00 2001
From: Thomas Klingbeil <mail@thomas-klingbeil.de>
Date: Thu, 12 Mar 2020 01:19:01 +0100
Subject: [PATCH 160/412] Add support for TTGO epaper boards with B73 revision
 (#928)

* Add support for TTGO epaper boards with B73 revision
---
 .../components/waveshare_epaper/display.py    |  1 +
 .../waveshare_epaper/waveshare_epaper.cpp     | 31 +++++++++++++++++++
 .../waveshare_epaper/waveshare_epaper.h       |  1 +
 3 files changed, 33 insertions(+)

diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index 343059d0c1..77322cbb70 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -23,6 +23,7 @@ MODELS = {
     '1.54in': ('a', WaveshareEPaperTypeAModel.WAVESHARE_EPAPER_1_54_IN),
     '2.13in': ('a', WaveshareEPaperTypeAModel.WAVESHARE_EPAPER_2_13_IN),
     '2.13in-ttgo': ('a', WaveshareEPaperTypeAModel.TTGO_EPAPER_2_13_IN),
+    '2.13in-ttgo-b73': ('a', WaveshareEPaperTypeAModel.TTGO_EPAPER_2_13_IN_B73),
     '2.90in': ('a', WaveshareEPaperTypeAModel.WAVESHARE_EPAPER_2_9_IN),
     '2.70in': ('b', WaveshareEPaper2P7In),
     '2.90in-b': ('b', WaveshareEPaper2P9InB),
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index ff29df4444..fd869b46ec 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -18,6 +18,8 @@ static const uint8_t PARTIAL_UPDATE_LUT[LUT_SIZE_WAVESHARE] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0x14, 0x44, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 static const uint8_t LUT_SIZE_TTGO = 70;
+static const uint8_t LUT_SIZE_TTGO_B73 = 100;
+
 static const uint8_t FULL_UPDATE_LUT_TTGO[LUT_SIZE_TTGO] = {
     0x80, 0x60, 0x40, 0x00, 0x00, 0x00, 0x00,  // LUT0: BB:     VS 0 ~7
     0x10, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00,  // LUT1: BW:     VS 0 ~7
@@ -33,6 +35,26 @@ static const uint8_t FULL_UPDATE_LUT_TTGO[LUT_SIZE_TTGO] = {
     0x00, 0x00, 0x00, 0x00, 0x00,              // TP6 A~D RP6
 };
 
+static const uint8_t FULL_UPDATE_LUT_TTGO_B73[LUT_SIZE_TTGO_B73] = {
+    0xA0, 0x90, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x90, 0xA0, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xA0, 0x90, 0x50, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x50, 0x90, 0xA0, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+    0x0F, 0x0F, 0x00, 0x00, 0x00, 0x0F, 0x0F, 0x00, 0x00, 0x03, 0x0F, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const uint8_t PARTIAL_UPDATE_LUT_TTGO_B73[LUT_SIZE_TTGO_B73] = {
+    0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+
+    0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
 static const uint8_t PARTIAL_UPDATE_LUT_TTGO[LUT_SIZE_TTGO] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // LUT0: BB:     VS 0 ~7
     0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  // LUT1: BW:     VS 0 ~7
@@ -169,6 +191,9 @@ void WaveshareEPaperTypeA::dump_config() {
     case TTGO_EPAPER_2_13_IN:
       ESP_LOGCONFIG(TAG, "  Model: 2.13in (TTGO)");
       break;
+    case TTGO_EPAPER_2_13_IN_B73:
+      ESP_LOGCONFIG(TAG, "  Model: 2.13in (TTGO B73)");
+      break;
     case WAVESHARE_EPAPER_2_9_IN:
       ESP_LOGCONFIG(TAG, "  Model: 2.9in");
       break;
@@ -191,6 +216,8 @@ void HOT WaveshareEPaperTypeA::display() {
     if (full_update != prev_full_update) {
       if (this->model_ == TTGO_EPAPER_2_13_IN) {
         this->write_lut_(full_update ? FULL_UPDATE_LUT_TTGO : PARTIAL_UPDATE_LUT_TTGO, LUT_SIZE_TTGO);
+      } else if (this->model_ == TTGO_EPAPER_2_13_IN_B73) {
+        this->write_lut_(full_update ? FULL_UPDATE_LUT_TTGO_B73 : PARTIAL_UPDATE_LUT_TTGO_B73, LUT_SIZE_TTGO_B73);
       } else {
         this->write_lut_(full_update ? FULL_UPDATE_LUT : PARTIAL_UPDATE_LUT, LUT_SIZE_WAVESHARE);
       }
@@ -247,6 +274,8 @@ int WaveshareEPaperTypeA::get_width_internal() {
       return 128;
     case TTGO_EPAPER_2_13_IN:
       return 128;
+    case TTGO_EPAPER_2_13_IN_B73:
+      return 128;
     case WAVESHARE_EPAPER_2_9_IN:
       return 128;
   }
@@ -260,6 +289,8 @@ int WaveshareEPaperTypeA::get_height_internal() {
       return 250;
     case TTGO_EPAPER_2_13_IN:
       return 250;
+    case TTGO_EPAPER_2_13_IN_B73:
+      return 250;
     case WAVESHARE_EPAPER_2_9_IN:
       return 296;
   }
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index 46fe465c5b..c21cabcaf4 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -68,6 +68,7 @@ enum WaveshareEPaperTypeAModel {
   WAVESHARE_EPAPER_2_13_IN,
   WAVESHARE_EPAPER_2_9_IN,
   TTGO_EPAPER_2_13_IN,
+  TTGO_EPAPER_2_13_IN_B73,
 };
 
 class WaveshareEPaperTypeA : public WaveshareEPaper {

From 3c68348868e8eafc0858df26cf2dd1a3dec89377 Mon Sep 17 00:00:00 2001
From: Niklas Wagner <Skaro@Skaronator.com>
Date: Thu, 12 Mar 2020 01:20:27 +0100
Subject: [PATCH 161/412] Fix OTA updates getting killed by task_wdt (#959)

---
 esphome/components/ota/ota_component.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/ota/ota_component.cpp b/esphome/components/ota/ota_component.cpp
index 2041c688eb..b614139e07 100644
--- a/esphome/components/ota/ota_component.cpp
+++ b/esphome/components/ota/ota_component.cpp
@@ -241,6 +241,8 @@ void OTAComponent::handle_() {
       last_progress = now;
       float percentage = (total * 100.0f) / ota_size;
       ESP_LOGD(TAG, "OTA in progress: %0.1f%%", percentage);
+      // slow down OTA update to avoid getting killed by task watchdog (task_wdt)
+      delay(10);
     }
   }
 

From aff4f1e9e2d613436af73a29299256a207655216 Mon Sep 17 00:00:00 2001
From: Tim Savage <tim@savage.company>
Date: Thu, 12 Mar 2020 11:22:45 +1100
Subject: [PATCH 162/412] Bugfix/1077 decode called on str fetching platformio
 stacktrace (#991)

* Remove decode from str result, add type annotations
---
 esphome/platformio_api.py |  6 ++++--
 esphome/util.py           | 20 +++++++++++++++++---
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/esphome/platformio_api.py b/esphome/platformio_api.py
index 29bfe7d2e6..4866119902 100644
--- a/esphome/platformio_api.py
+++ b/esphome/platformio_api.py
@@ -1,4 +1,6 @@
 import json
+from typing import Union
+
 import logging
 import os
 import re
@@ -62,7 +64,7 @@ FILTER_PLATFORMIO_LINES = [
 ]
 
 
-def run_platformio_cli(*args, **kwargs):
+def run_platformio_cli(*args, **kwargs) -> Union[str, int]:
     os.environ["PLATFORMIO_FORCE_COLOR"] = "true"
     os.environ["PLATFORMIO_BUILD_DIR"] = os.path.abspath(CORE.relative_pioenvs_path())
     os.environ["PLATFORMIO_LIBDEPS_DIR"] = os.path.abspath(CORE.relative_piolibdeps_path())
@@ -80,7 +82,7 @@ def run_platformio_cli(*args, **kwargs):
                                 *cmd, **kwargs)
 
 
-def run_platformio_cli_run(config, verbose, *args, **kwargs):
+def run_platformio_cli_run(config, verbose, *args, **kwargs) -> Union[str, int]:
     command = ['run', '-d', CORE.build_path]
     if verbose:
         command += ['-v']
diff --git a/esphome/util.py b/esphome/util.py
index 10c8d4e581..de6736096c 100644
--- a/esphome/util.py
+++ b/esphome/util.py
@@ -1,3 +1,5 @@
+from typing import Union
+
 import collections
 import io
 import logging
@@ -151,7 +153,21 @@ class RedirectText:
         return True
 
 
-def run_external_command(func, *cmd, **kwargs):
+def run_external_command(func, *cmd,
+                         capture_stdout: bool = False,
+                         filter_lines: str = None) -> Union[int, str]:
+    """
+    Run a function from an external package that acts like a main method.
+
+    Temporarily replaces stdin/stderr/stdout, sys.argv and sys.exit handler during the run.
+
+    :param func: Function to execute
+    :param cmd: Command to run as (eg first element of sys.argv)
+    :param capture_stdout: Capture text from stdout and return that.
+    :param filter_lines: Regular expression used to filter captured output.
+    :return: str if `capture_stdout` is set else int exit code.
+
+    """
     def mock_exit(return_code):
         raise SystemExit(return_code)
 
@@ -160,13 +176,11 @@ def run_external_command(func, *cmd, **kwargs):
     full_cmd = ' '.join(shlex_quote(x) for x in cmd)
     _LOGGER.info("Running:  %s", full_cmd)
 
-    filter_lines = kwargs.get('filter_lines')
     orig_stdout = sys.stdout
     sys.stdout = RedirectText(sys.stdout, filter_lines=filter_lines)
     orig_stderr = sys.stderr
     sys.stderr = RedirectText(sys.stderr, filter_lines=filter_lines)
 
-    capture_stdout = kwargs.get('capture_stdout', False)
     if capture_stdout:
         cap_stdout = sys.stdout = io.StringIO()
 

From 66083c5e973d15262fb9921bc84681ac524d342c Mon Sep 17 00:00:00 2001
From: buxtronix <bbuxton@gmail.com>
Date: Thu, 12 Mar 2020 11:24:05 +1100
Subject: [PATCH 163/412] Add support for Tuya ceiling fan controllers (#989)

* Add support for Tuya ceiling fan controllers
---
 esphome/components/tuya/fan/__init__.py   | 39 ++++++++++
 esphome/components/tuya/fan/tuya_fan.cpp  | 90 +++++++++++++++++++++++
 esphome/components/tuya/fan/tuya_fan.h    | 34 +++++++++
 esphome/components/tuya/light/__init__.py |  7 +-
 4 files changed, 167 insertions(+), 3 deletions(-)
 create mode 100644 esphome/components/tuya/fan/__init__.py
 create mode 100644 esphome/components/tuya/fan/tuya_fan.cpp
 create mode 100644 esphome/components/tuya/fan/tuya_fan.h

diff --git a/esphome/components/tuya/fan/__init__.py b/esphome/components/tuya/fan/__init__.py
new file mode 100644
index 0000000000..8b4a0fa25f
--- /dev/null
+++ b/esphome/components/tuya/fan/__init__.py
@@ -0,0 +1,39 @@
+from esphome.components import fan
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_OUTPUT_ID
+from .. import tuya_ns, CONF_TUYA_ID, Tuya
+
+DEPENDENCIES = ['tuya']
+
+CONF_SPEED_DATAPOINT = "speed_datapoint"
+CONF_SWITCH_DATAPOINT = "switch_datapoint"
+CONF_OSCILLATION_DATAPOINT = "oscillation_datapoint"
+
+TuyaFan = tuya_ns.class_('TuyaFan', cg.Component)
+
+CONFIG_SCHEMA = cv.All(fan.FAN_SCHEMA.extend({
+    cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(TuyaFan),
+    cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
+    cv.Optional(CONF_OSCILLATION_DATAPOINT): cv.uint8_t,
+    cv.Optional(CONF_SPEED_DATAPOINT): cv.uint8_t,
+    cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t,
+}).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(
+    CONF_SPEED_DATAPOINT, CONF_SWITCH_DATAPOINT))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
+    yield cg.register_component(var, config)
+
+    paren = yield cg.get_variable(config[CONF_TUYA_ID])
+    fan_ = yield fan.create_fan_state(config)
+    cg.add(var.set_tuya_parent(paren))
+    cg.add(var.set_fan(fan_))
+
+    if CONF_SPEED_DATAPOINT in config:
+        cg.add(var.set_speed_id(config[CONF_SPEED_DATAPOINT]))
+    if CONF_SWITCH_DATAPOINT in config:
+        cg.add(var.set_switch_id(config[CONF_SWITCH_DATAPOINT]))
+    if CONF_OSCILLATION_DATAPOINT in config:
+        cg.add(var.set_oscillation_id(config[CONF_OSCILLATION_DATAPOINT]))
diff --git a/esphome/components/tuya/fan/tuya_fan.cpp b/esphome/components/tuya/fan/tuya_fan.cpp
new file mode 100644
index 0000000000..b9fe2c0829
--- /dev/null
+++ b/esphome/components/tuya/fan/tuya_fan.cpp
@@ -0,0 +1,90 @@
+#include "esphome/core/log.h"
+#include "tuya_fan.h"
+
+namespace esphome {
+namespace tuya {
+
+static const char *TAG = "tuya.fan";
+
+void TuyaFan::setup() {
+  auto traits = fan::FanTraits(this->oscillation_id_.has_value(), this->speed_id_.has_value());
+  this->fan_->set_traits(traits);
+
+  if (this->speed_id_.has_value()) {
+    this->parent_->register_listener(*this->speed_id_, [this](TuyaDatapoint datapoint) {
+      auto call = this->fan_->make_call();
+      if (datapoint.value_enum == 0x0)
+        call.set_speed(fan::FAN_SPEED_LOW);
+      else if (datapoint.value_enum == 0x1)
+        call.set_speed(fan::FAN_SPEED_MEDIUM);
+      else if (datapoint.value_enum == 0x2)
+        call.set_speed(fan::FAN_SPEED_HIGH);
+      else
+        ESP_LOGCONFIG(TAG, "Speed has invalid value %d", datapoint.value_enum);
+      ESP_LOGD(TAG, "MCU reported speed of: %d", datapoint.value_enum);
+      call.perform();
+    });
+  }
+  if (this->switch_id_.has_value()) {
+    this->parent_->register_listener(*this->switch_id_, [this](TuyaDatapoint datapoint) {
+      auto call = this->fan_->make_call();
+      call.set_state(datapoint.value_bool);
+      call.perform();
+      ESP_LOGD(TAG, "MCU reported switch is: %s", ONOFF(datapoint.value_bool));
+    });
+  }
+  if (this->oscillation_id_.has_value()) {
+    this->parent_->register_listener(*this->oscillation_id_, [this](TuyaDatapoint datapoint) {
+      auto call = this->fan_->make_call();
+      call.set_oscillating(datapoint.value_bool);
+      call.perform();
+      ESP_LOGD(TAG, "MCU reported oscillation is: %s", ONOFF(datapoint.value_bool));
+    });
+  }
+  this->fan_->add_on_state_callback([this]() { this->write_state(); });
+}
+
+void TuyaFan::dump_config() {
+  ESP_LOGCONFIG(TAG, "Tuya Fan:");
+  if (this->speed_id_.has_value())
+    ESP_LOGCONFIG(TAG, "  Speed has datapoint ID %u", *this->speed_id_);
+  if (this->switch_id_.has_value())
+    ESP_LOGCONFIG(TAG, "  Switch has datapoint ID %u", *this->switch_id_);
+  if (this->oscillation_id_.has_value())
+    ESP_LOGCONFIG(TAG, "  Oscillation has datapoint ID %u", *this->oscillation_id_);
+}
+
+void TuyaFan::write_state() {
+  if (this->switch_id_.has_value()) {
+    TuyaDatapoint datapoint{};
+    datapoint.id = *this->switch_id_;
+    datapoint.type = TuyaDatapointType::BOOLEAN;
+    datapoint.value_bool = this->fan_->state;
+    this->parent_->set_datapoint_value(datapoint);
+    ESP_LOGD(TAG, "Setting switch: %s", ONOFF(this->fan_->state));
+  }
+  if (this->oscillation_id_.has_value()) {
+    TuyaDatapoint datapoint{};
+    datapoint.id = *this->oscillation_id_;
+    datapoint.type = TuyaDatapointType::BOOLEAN;
+    datapoint.value_bool = this->fan_->oscillating;
+    this->parent_->set_datapoint_value(datapoint);
+    ESP_LOGD(TAG, "Setting oscillating: %s", ONOFF(this->fan_->oscillating));
+  }
+  if (this->speed_id_.has_value()) {
+    TuyaDatapoint datapoint{};
+    datapoint.id = *this->speed_id_;
+    datapoint.type = TuyaDatapointType::ENUM;
+    if (this->fan_->speed == fan::FAN_SPEED_LOW)
+      datapoint.value_enum = 0;
+    if (this->fan_->speed == fan::FAN_SPEED_MEDIUM)
+      datapoint.value_enum = 1;
+    if (this->fan_->speed == fan::FAN_SPEED_HIGH)
+      datapoint.value_enum = 2;
+    ESP_LOGD(TAG, "Setting speed: %d", datapoint.value_enum);
+    this->parent_->set_datapoint_value(datapoint);
+  }
+}
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/fan/tuya_fan.h b/esphome/components/tuya/fan/tuya_fan.h
new file mode 100644
index 0000000000..d31d490e1a
--- /dev/null
+++ b/esphome/components/tuya/fan/tuya_fan.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/tuya/tuya.h"
+#include "esphome/components/fan/fan_state.h"
+
+namespace esphome {
+namespace tuya {
+
+class TuyaFan : public Component {
+ public:
+  void setup() override;
+  void dump_config() override;
+  void set_speed_id(uint8_t speed_id) { this->speed_id_ = speed_id; }
+  void set_switch_id(uint8_t switch_id) { this->switch_id_ = switch_id; }
+  void set_oscillation_id(uint8_t oscillation_id) { this->oscillation_id_ = oscillation_id; }
+  void set_fan(fan::FanState *fan) { this->fan_ = fan; }
+  void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
+  void write_state();
+
+ protected:
+  void update_speed_(uint32_t value);
+  void update_switch_(uint32_t value);
+  void update_oscillation_(uint32_t value);
+
+  Tuya *parent_;
+  optional<uint8_t> speed_id_{};
+  optional<uint8_t> switch_id_{};
+  optional<uint8_t> oscillation_id_{};
+  fan::FanState *fan_;
+};
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/light/__init__.py b/esphome/components/tuya/light/__init__.py
index 605bdae32e..adaeb52531 100644
--- a/esphome/components/tuya/light/__init__.py
+++ b/esphome/components/tuya/light/__init__.py
@@ -12,10 +12,10 @@ CONF_SWITCH_DATAPOINT = "switch_datapoint"
 
 TuyaLight = tuya_ns.class_('TuyaLight', light.LightOutput, cg.Component)
 
-CONFIG_SCHEMA = light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend({
+CONFIG_SCHEMA = cv.All(light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend({
     cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(TuyaLight),
     cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
-    cv.Required(CONF_DIMMER_DATAPOINT): cv.uint8_t,
+    cv.Optional(CONF_DIMMER_DATAPOINT): cv.uint8_t,
     cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t,
     cv.Optional(CONF_MIN_VALUE): cv.int_,
     cv.Optional(CONF_MAX_VALUE): cv.int_,
@@ -24,7 +24,8 @@ CONFIG_SCHEMA = light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend({
     # The Tuya MCU handles transitions and gamma correction on its own.
     cv.Optional(CONF_GAMMA_CORRECT, default=1.0): cv.positive_float,
     cv.Optional(CONF_DEFAULT_TRANSITION_LENGTH, default='0s'): cv.positive_time_period_milliseconds,
-}).extend(cv.COMPONENT_SCHEMA)
+}).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(CONF_DIMMER_DATAPOINT,
+                                                        CONF_SWITCH_DATAPOINT))
 
 
 def to_code(config):

From 426e6a1b46a1e3a8cc1859cc7fb878c97077ee3b Mon Sep 17 00:00:00 2001
From: sekkr1 <dekel@reches.xyz>
Date: Thu, 12 Mar 2020 02:25:54 +0200
Subject: [PATCH 164/412] Fixed iBeacon struct and major and minor parsing
 (#987)

Co-authored-by: sekkr1 <dekel.reches@pm.me>
---
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 74bb7e5d10..5456adbfe5 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -46,14 +46,15 @@ class ESPBLEiBeacon {
   ESPBLEiBeacon(const uint8_t *data);
   static optional<ESPBLEiBeacon> from_manufacturer_data(const ServiceData &data);
 
-  uint16_t get_major() { return reverse_bits_16(this->beacon_data_.major); }
-  uint16_t get_minor() { return reverse_bits_16(this->beacon_data_.minor); }
+  uint16_t get_major() { return ((this->beacon_data_.major & 0xFF) << 8) | (this->beacon_data_.major >> 8); }
+  uint16_t get_minor() { return ((this->beacon_data_.minor & 0xFF) << 8) | (this->beacon_data_.minor >> 8); }
   int8_t get_signal_power() { return this->beacon_data_.signal_power; }
   ESPBTUUID get_uuid() { return ESPBTUUID::from_raw(this->beacon_data_.proximity_uuid); }
 
  protected:
   struct {
     uint8_t sub_type;
+    uint8_t length;
     uint8_t proximity_uuid[16];
     uint16_t major;
     uint16_t minor;

From e0b4226930e30fbed70930a6ec25a23693970b05 Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Thu, 12 Mar 2020 03:27:05 +0300
Subject: [PATCH 165/412] http_request http fix (#980)

Co-authored-by: Nikolay Vasilchuk <nikolay.vasilchuk@corp.mail.ru>
---
 esphome/components/http_request/__init__.py   |  5 ++--
 .../components/http_request/http_request.cpp  | 27 ++++++++++++++++---
 .../components/http_request/http_request.h    | 22 ++++++++-------
 esphome/const.py                              |  1 +
 4 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/esphome/components/http_request/__init__.py b/esphome/components/http_request/__init__.py
index ea12b0657d..e79df12a6c 100644
--- a/esphome/components/http_request/__init__.py
+++ b/esphome/components/http_request/__init__.py
@@ -4,7 +4,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.const import CONF_ID, CONF_TIMEOUT, CONF_ESPHOME, CONF_METHOD, \
-    CONF_ARDUINO_VERSION, ARDUINO_VERSION_ESP8266_2_5_1
+    CONF_ARDUINO_VERSION, ARDUINO_VERSION_ESP8266_2_5_1, CONF_URL
 from esphome.core import CORE, Lambda
 from esphome.core_config import PLATFORMIO_ESP8266_LUT
 
@@ -15,7 +15,6 @@ http_request_ns = cg.esphome_ns.namespace('http_request')
 HttpRequestComponent = http_request_ns.class_('HttpRequestComponent', cg.Component)
 HttpRequestSendAction = http_request_ns.class_('HttpRequestSendAction', automation.Action)
 
-CONF_URL = 'url'
 CONF_HEADERS = 'headers'
 CONF_USERAGENT = 'useragent'
 CONF_BODY = 'body'
@@ -121,7 +120,7 @@ def http_request_action_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)
 
-    template_ = yield cg.templatable(config[CONF_URL], args, cg.const_char_ptr)
+    template_ = yield cg.templatable(config[CONF_URL], args, cg.std_string)
     cg.add(var.set_url(template_))
     cg.add(var.set_method(config[CONF_METHOD]))
     if CONF_BODY in config:
diff --git a/esphome/components/http_request/http_request.cpp b/esphome/components/http_request/http_request.cpp
index 9df7cf7913..f2fe0cff54 100644
--- a/esphome/components/http_request/http_request.cpp
+++ b/esphome/components/http_request/http_request.cpp
@@ -14,14 +14,15 @@ void HttpRequestComponent::dump_config() {
 
 void HttpRequestComponent::send() {
   bool begin_status = false;
+  this->client_.setReuse(true);
 #ifdef ARDUINO_ARCH_ESP32
   begin_status = this->client_.begin(this->url_);
 #endif
 #ifdef ARDUINO_ARCH_ESP8266
 #ifndef CLANG_TIDY
-  begin_status = this->client_.begin(*this->wifi_client_, this->url_);
   this->client_.setFollowRedirects(true);
   this->client_.setRedirectLimit(3);
+  begin_status = this->client_.begin(*this->get_wifi_client_(), this->url_);
 #endif
 #endif
 
@@ -41,8 +42,6 @@ void HttpRequestComponent::send() {
   }
 
   int http_code = this->client_.sendRequest(this->method_, this->body_.c_str());
-  this->client_.end();
-
   if (http_code < 0) {
     ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s", this->url_, HTTPClient::errorToString(http_code).c_str());
     this->status_set_warning();
@@ -59,5 +58,27 @@ void HttpRequestComponent::send() {
   ESP_LOGD(TAG, "HTTP Request completed; URL: %s; Code: %d", this->url_, http_code);
 }
 
+#ifdef ARDUINO_ARCH_ESP8266
+WiFiClient *HttpRequestComponent::get_wifi_client_() {
+  if (this->secure_) {
+    if (this->wifi_client_secure_ == nullptr) {
+      this->wifi_client_secure_ = new BearSSL::WiFiClientSecure();
+      this->wifi_client_secure_->setInsecure();
+      this->wifi_client_secure_->setBufferSizes(512, 512);
+    }
+    return this->wifi_client_secure_;
+  }
+
+  if (this->wifi_client_ == nullptr) {
+    this->wifi_client_ = new WiFiClient();
+  }
+  return this->wifi_client_;
+}
+#endif
+
+void HttpRequestComponent::close() { this->client_.end(); }
+
+const char *HttpRequestComponent::get_string() { return this->client_.getString().c_str(); }
+
 }  // namespace http_request
 }  // namespace esphome
diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index d26899c0db..0c849f2ab0 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -24,41 +24,42 @@ struct Header {
 
 class HttpRequestComponent : public Component {
  public:
-  void setup() override {
-#ifdef ARDUINO_ARCH_ESP8266
-    this->wifi_client_ = new BearSSL::WiFiClientSecure();
-    this->wifi_client_->setInsecure();
-    this->wifi_client_->setBufferSizes(512, 512);
-#endif
-  }
   void dump_config() override;
   float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
 
-  void set_url(const char *url) { this->url_ = url; }
+  void set_url(std::string url) {
+    this->url_ = url.c_str();
+    this->secure_ = url.compare(0, 6, "https:") == 0;
+  }
   void set_method(const char *method) { this->method_ = method; }
   void set_useragent(const char *useragent) { this->useragent_ = useragent; }
   void set_timeout(uint16_t timeout) { this->timeout_ = timeout; }
   void set_body(std::string body) { this->body_ = body; }
   void set_headers(std::list<Header> headers) { this->headers_ = headers; }
   void send();
+  void close();
+  const char *get_string();
 
  protected:
   HTTPClient client_{};
   const char *url_;
   const char *method_;
   const char *useragent_{nullptr};
+  bool secure_;
   uint16_t timeout_{5000};
   std::string body_;
   std::list<Header> headers_;
 #ifdef ARDUINO_ARCH_ESP8266
-  BearSSL::WiFiClientSecure *wifi_client_;
+  WiFiClient *wifi_client_{nullptr};
+  BearSSL::WiFiClientSecure *wifi_client_secure_{nullptr};
+  WiFiClient *get_wifi_client_();
 #endif
 };
 
 template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
  public:
   HttpRequestSendAction(HttpRequestComponent *parent) : parent_(parent) {}
-  TEMPLATABLE_VALUE(const char *, url)
+  TEMPLATABLE_VALUE(std::string, url)
   TEMPLATABLE_VALUE(const char *, method)
   TEMPLATABLE_VALUE(std::string, body)
   TEMPLATABLE_VALUE(const char *, useragent)
@@ -102,6 +103,7 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
       this->parent_->set_headers(headers);
     }
     this->parent_->send();
+    this->parent_->close();
   }
 
  protected:
diff --git a/esphome/const.py b/esphome/const.py
index 308dd2683f..e747371710 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -479,6 +479,7 @@ CONF_UNIQUE = 'unique'
 CONF_UNIT_OF_MEASUREMENT = 'unit_of_measurement'
 CONF_UPDATE_INTERVAL = 'update_interval'
 CONF_UPDATE_ON_BOOT = 'update_on_boot'
+CONF_URL = 'url'
 CONF_USE_ADDRESS = 'use_address'
 CONF_USERNAME = 'username'
 CONF_UUID = 'uuid'

From 177617e6e34a54c095bbb15f7b62c33839869f19 Mon Sep 17 00:00:00 2001
From: Quinn Hosler <quinnhosler@users.noreply.github.com>
Date: Wed, 11 Mar 2020 20:33:20 -0400
Subject: [PATCH 166/412] Rgbww color fix (#967)

* RGBWW color vs white and brightness adjustments
---
 esphome/components/light/light_state.cpp | 30 ++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index 0ffb603818..5e9166795e 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -393,6 +393,36 @@ LightColorValues LightCall::validate_() {
     this->color_temperature_.reset();
   }
 
+  // sets RGB to 100% if only White specified
+  if (this->white_.has_value()) {
+    if (!this->red_.has_value() && !this->green_.has_value() && !this->blue_.has_value()) {
+      this->red_ = optional<float>(1.0f);
+      this->green_ = optional<float>(1.0f);
+      this->blue_ = optional<float>(1.0f);
+    }
+  }
+  // White to 0% if (exclusively) setting any RGB value
+  else if (this->red_.has_value() || this->green_.has_value() || this->blue_.has_value()) {
+    if (!this->white_.has_value()) {
+      this->white_ = optional<float>(0.0f);
+    }
+  }
+  // if changing Kelvin alone, change to white light
+  else if (this->color_temperature_.has_value()) {
+    if (!this->red_.has_value() && !this->green_.has_value() && !this->blue_.has_value()) {
+      this->red_ = optional<float>(1.0f);
+      this->green_ = optional<float>(1.0f);
+      this->blue_ = optional<float>(1.0f);
+    }
+    // if setting Kelvin from color (i.e. switching to white light), set White to 100%
+    auto cv = this->parent_->remote_values;
+    bool was_color = cv.get_red() != 1.0f || cv.get_blue() != 1.0f || cv.get_green() != 1.0f;
+    bool now_white = *this->red_ == 1.0f && *this->blue_ == 1.0f && *this->green_ == 1.0f;
+    if (!this->white_.has_value() && was_color && now_white) {
+      this->white_ = optional<float>(1.0f);
+    }
+  }
+
 #define VALIDATE_RANGE_(name_, upper_name) \
   if (name_##_.has_value()) { \
     auto val = *name_##_; \

From fcb2cc2471fc589d881154ce3147ae9662bb44b3 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 11 Mar 2020 21:35:01 -0300
Subject: [PATCH 167/412] add time cover assumed_state option (#979)

---
 esphome/components/time_based/cover.py             | 4 +++-
 esphome/components/time_based/time_based_cover.cpp | 2 +-
 esphome/components/time_based/time_based_cover.h   | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/esphome/components/time_based/cover.py b/esphome/components/time_based/cover.py
index 6a7c9b6835..dcb8d9505b 100644
--- a/esphome/components/time_based/cover.py
+++ b/esphome/components/time_based/cover.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 from esphome import automation
 from esphome.components import cover
 from esphome.const import CONF_CLOSE_ACTION, CONF_CLOSE_DURATION, CONF_ID, CONF_OPEN_ACTION, \
-    CONF_OPEN_DURATION, CONF_STOP_ACTION
+    CONF_OPEN_DURATION, CONF_STOP_ACTION, CONF_ASSUMED_STATE
 
 time_based_ns = cg.esphome_ns.namespace('time_based')
 TimeBasedCover = time_based_ns.class_('TimeBasedCover', cover.Cover, cg.Component)
@@ -21,6 +21,7 @@ CONFIG_SCHEMA = cover.COVER_SCHEMA.extend({
     cv.Required(CONF_CLOSE_DURATION): cv.positive_time_period_milliseconds,
 
     cv.Optional(CONF_HAS_BUILT_IN_ENDSTOP, default=False): cv.boolean,
+    cv.Optional(CONF_ASSUMED_STATE, default=True): cv.boolean,
 }).extend(cv.COMPONENT_SCHEMA)
 
 
@@ -38,3 +39,4 @@ def to_code(config):
     yield automation.build_automation(var.get_close_trigger(), [], config[CONF_CLOSE_ACTION])
 
     cg.add(var.set_has_built_in_endstop(config[CONF_HAS_BUILT_IN_ENDSTOP]))
+    cg.add(var.set_assumed_state(config[CONF_ASSUMED_STATE]))
diff --git a/esphome/components/time_based/time_based_cover.cpp b/esphome/components/time_based/time_based_cover.cpp
index bdb4e5379c..6d1de144f5 100644
--- a/esphome/components/time_based/time_based_cover.cpp
+++ b/esphome/components/time_based/time_based_cover.cpp
@@ -51,7 +51,7 @@ float TimeBasedCover::get_setup_priority() const { return setup_priority::DATA;
 CoverTraits TimeBasedCover::get_traits() {
   auto traits = CoverTraits();
   traits.set_supports_position(true);
-  traits.set_is_assumed_state(true);
+  traits.set_is_assumed_state(this->assumed_state_);
   return traits;
 }
 void TimeBasedCover::control(const CoverCall &call) {
diff --git a/esphome/components/time_based/time_based_cover.h b/esphome/components/time_based/time_based_cover.h
index be3a55c546..6c48c26ed1 100644
--- a/esphome/components/time_based/time_based_cover.h
+++ b/esphome/components/time_based/time_based_cover.h
@@ -21,6 +21,7 @@ class TimeBasedCover : public cover::Cover, public Component {
   void set_close_duration(uint32_t close_duration) { this->close_duration_ = close_duration; }
   cover::CoverTraits get_traits() override;
   void set_has_built_in_endstop(bool value) { this->has_built_in_endstop_ = value; }
+  void set_assumed_state(bool value) { this->assumed_state_ = value; }
 
  protected:
   void control(const cover::CoverCall &call) override;
@@ -43,6 +44,7 @@ class TimeBasedCover : public cover::Cover, public Component {
   uint32_t last_publish_time_{0};
   float target_position_{0};
   bool has_built_in_endstop_{false};
+  bool assumed_state_{false};
 };
 
 }  // namespace time_based

From a1dfd355f703cf59764ea2e340710e6accc91a2d Mon Sep 17 00:00:00 2001
From: escoand <escoand@users.noreply.github.com>
Date: Thu, 12 Mar 2020 01:36:34 +0100
Subject: [PATCH 168/412] add on_rc_switch trigger (#983)

---
 esphome/components/remote_base/__init__.py          |  7 +++++++
 .../components/remote_base/rc_switch_protocol.cpp   | 13 +++++++++++++
 esphome/components/remote_base/rc_switch_protocol.h | 11 +++++++++++
 3 files changed, 31 insertions(+)

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index 2c8b6be51c..05a3e7e1aa 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -546,7 +546,9 @@ RC_SWITCH_TRANSMITTER = cv.Schema({
 })
 
 rc_switch_protocols = ns.rc_switch_protocols
+RCSwitchData = ns.struct('RCSwitchData')
 RCSwitchBase = ns.class_('RCSwitchBase')
+RCSwitchTrigger = ns.class_('RCSwitchTrigger', RemoteReceiverTrigger)
 RCSwitchDumper = ns.class_('RCSwitchDumper', RemoteTransmitterDumper)
 RCSwitchRawAction = ns.class_('RCSwitchRawAction', RemoteTransmitterActionBase)
 RCSwitchTypeAAction = ns.class_('RCSwitchTypeAAction', RemoteTransmitterActionBase)
@@ -642,6 +644,11 @@ def rc_switch_type_d_action(var, config, args):
     cg.add(var.set_state((yield cg.templatable(config[CONF_STATE], args, bool))))
 
 
+@register_trigger('rc_switch', RCSwitchTrigger, RCSwitchData)
+def rc_switch_trigger(var, config):
+    pass
+
+
 @register_dumper('rc_switch', RCSwitchDumper)
 def rc_switch_dumper(var, config):
     pass
diff --git a/esphome/components/remote_base/rc_switch_protocol.cpp b/esphome/components/remote_base/rc_switch_protocol.cpp
index b2ff22eb2a..91b22500e6 100644
--- a/esphome/components/remote_base/rc_switch_protocol.cpp
+++ b/esphome/components/remote_base/rc_switch_protocol.cpp
@@ -127,6 +127,19 @@ bool RCSwitchBase::decode(RemoteReceiveData &src, uint64_t *out_data, uint8_t *o
   }
   return true;
 }
+optional<RCSwitchData> RCSwitchBase::decode(RemoteReceiveData &src) const {
+  RCSwitchData out;
+  uint8_t out_nbits;
+  for (uint8_t i = 1; i <= 8; i++) {
+    src.reset();
+    RCSwitchBase *protocol = &rc_switch_protocols[i];
+    if (protocol->decode(src, &out.code, &out_nbits) && out_nbits >= 3) {
+      out.protocol = i;
+      return out;
+    }
+  }
+  return {};
+}
 
 void RCSwitchBase::simple_code_to_tristate(uint16_t code, uint8_t nbits, uint64_t *out_code) {
   *out_code = 0;
diff --git a/esphome/components/remote_base/rc_switch_protocol.h b/esphome/components/remote_base/rc_switch_protocol.h
index 0983da27ea..8362899cec 100644
--- a/esphome/components/remote_base/rc_switch_protocol.h
+++ b/esphome/components/remote_base/rc_switch_protocol.h
@@ -6,6 +6,13 @@
 namespace esphome {
 namespace remote_base {
 
+struct RCSwitchData {
+  uint64_t code;
+  uint8_t protocol;
+
+  bool operator==(const RCSwitchData &rhs) const { return code == rhs.code && protocol == rhs.protocol; }
+};
+
 class RCSwitchBase {
  public:
   RCSwitchBase() = default;
@@ -28,6 +35,8 @@ class RCSwitchBase {
 
   bool decode(RemoteReceiveData &src, uint64_t *out_data, uint8_t *out_nbits) const;
 
+  optional<RCSwitchData> decode(RemoteReceiveData &src) const;
+
   static void simple_code_to_tristate(uint16_t code, uint8_t nbits, uint64_t *out_code);
 
   static void type_a_code(uint8_t switch_group, uint8_t switch_device, bool state, uint64_t *out_code,
@@ -204,5 +213,7 @@ class RCSwitchDumper : public RemoteReceiverDumperBase {
   bool dump(RemoteReceiveData src) override;
 };
 
+using RCSwitchTrigger = RemoteReceiverTrigger<RCSwitchBase, RCSwitchData>;
+
 }  // namespace remote_base
 }  // namespace esphome

From 11b727fdf7c8409c199d28816c6aff3cfb3ddbf8 Mon Sep 17 00:00:00 2001
From: Derek Hageman <hageman@inthat.cloud>
Date: Wed, 11 Mar 2020 18:39:40 -0600
Subject: [PATCH 169/412] SCD30 fixes and improvements (#962)

* SCD30 improvements
---
 esphome/components/scd30/scd30.cpp | 43 +++++++++++++++++++++++++++---
 esphome/components/scd30/scd30.h   |  5 ++++
 esphome/components/scd30/sensor.py | 17 ++++++++++++
 tests/test1.yaml                   |  2 ++
 4 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/esphome/components/scd30/scd30.cpp b/esphome/components/scd30/scd30.cpp
index 55ab07879e..195dfef5f6 100644
--- a/esphome/components/scd30/scd30.cpp
+++ b/esphome/components/scd30/scd30.cpp
@@ -8,21 +8,25 @@ static const char *TAG = "scd30";
 
 static const uint16_t SCD30_CMD_GET_FIRMWARE_VERSION = 0xd100;
 static const uint16_t SCD30_CMD_START_CONTINUOUS_MEASUREMENTS = 0x0010;
+static const uint16_t SCD30_CMD_ALTITUDE_COMPENSATION = 0x5102;
+static const uint16_t SCD30_CMD_AUTOMATIC_SELF_CALIBRATION = 0x5306;
 static const uint16_t SCD30_CMD_GET_DATA_READY_STATUS = 0x0202;
 static const uint16_t SCD30_CMD_READ_MEASUREMENT = 0x0300;
 
 /// Commands for future use
 static const uint16_t SCD30_CMD_STOP_MEASUREMENTS = 0x0104;
 static const uint16_t SCD30_CMD_MEASUREMENT_INTERVAL = 0x4600;
-static const uint16_t SCD30_CMD_AUTOMATIC_SELF_CALIBRATION = 0x5306;
 static const uint16_t SCD30_CMD_FORCED_CALIBRATION = 0x5204;
 static const uint16_t SCD30_CMD_TEMPERATURE_OFFSET = 0x5403;
-static const uint16_t SCD30_CMD_ALTITUDE_COMPENSATION = 0x5102;
 static const uint16_t SCD30_CMD_SOFT_RESET = 0xD304;
 
 void SCD30Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up scd30...");
 
+#ifdef ARDUINO_ARCH_ESP8266
+  Wire.setClockStretchLimit(150000);
+#endif
+
   /// Firmware version identification
   if (!this->write_command_(SCD30_CMD_GET_FIRMWARE_VERSION)) {
     this->error_code_ = COMMUNICATION_FAILED;
@@ -40,12 +44,29 @@ void SCD30Component::setup() {
            uint16_t(raw_firmware_version[0] & 0xFF));
 
   /// Sensor initialization
-  if (!this->write_command_(SCD30_CMD_START_CONTINUOUS_MEASUREMENTS)) {
+  if (!this->write_command_(SCD30_CMD_START_CONTINUOUS_MEASUREMENTS, 0)) {
     ESP_LOGE(TAG, "Sensor SCD30 error starting continuous measurements.");
     this->error_code_ = MEASUREMENT_INIT_FAILED;
     this->mark_failed();
     return;
   }
+
+  // The start measurement command disables the altitude compensation, if any, so we only set it if it's turned on
+  if (this->altitude_compensation_ != 0xFFFF) {
+    if (!this->write_command_(SCD30_CMD_ALTITUDE_COMPENSATION, altitude_compensation_)) {
+      ESP_LOGE(TAG, "Sensor SCD30 error starting continuous measurements.");
+      this->error_code_ = MEASUREMENT_INIT_FAILED;
+      this->mark_failed();
+      return;
+    }
+  }
+
+  if (!this->write_command_(SCD30_CMD_AUTOMATIC_SELF_CALIBRATION, enable_asc_ ? 1 : 0)) {
+    ESP_LOGE(TAG, "Sensor SCD30 error setting automatic self calibration.");
+    this->error_code_ = MEASUREMENT_INIT_FAILED;
+    this->mark_failed();
+    return;
+  }
 }
 
 void SCD30Component::dump_config() {
@@ -67,6 +88,12 @@ void SCD30Component::dump_config() {
         break;
     }
   }
+  if (this->altitude_compensation_ == 0xFFFF) {
+    ESP_LOGCONFIG(TAG, "  Altitude compensation: OFF");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Altitude compensation: %dm", this->altitude_compensation_);
+  }
+  ESP_LOGCONFIG(TAG, "  Automatic self calibration: %s", ONOFF(this->enable_asc_));
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "CO2", this->co2_sensor_);
   LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
@@ -130,6 +157,16 @@ bool SCD30Component::write_command_(uint16_t command) {
   return this->write_byte(command >> 8, command & 0xFF);
 }
 
+bool SCD30Component::write_command_(uint16_t command, uint16_t data) {
+  uint8_t raw[5];
+  raw[0] = command >> 8;
+  raw[1] = command & 0xFF;
+  raw[2] = data >> 8;
+  raw[3] = data & 0xFF;
+  raw[4] = sht_crc_(raw[2], raw[3]);
+  return this->write_bytes_raw(raw, 5);
+}
+
 uint8_t SCD30Component::sht_crc_(uint8_t data1, uint8_t data2) {
   uint8_t bit;
   uint8_t crc = 0xFF;
diff --git a/esphome/components/scd30/scd30.h b/esphome/components/scd30/scd30.h
index 999e66414d..2c4ee51f8a 100644
--- a/esphome/components/scd30/scd30.h
+++ b/esphome/components/scd30/scd30.h
@@ -13,6 +13,8 @@ class SCD30Component : public PollingComponent, public i2c::I2CDevice {
   void set_co2_sensor(sensor::Sensor *co2) { co2_sensor_ = co2; }
   void set_humidity_sensor(sensor::Sensor *humidity) { humidity_sensor_ = humidity; }
   void set_temperature_sensor(sensor::Sensor *temperature) { temperature_sensor_ = temperature; }
+  void set_automatic_self_calibration(bool asc) { enable_asc_ = asc; }
+  void set_altitude_compensation(uint16_t altitude) { altitude_compensation_ = altitude; }
 
   void setup() override;
   void update() override;
@@ -21,6 +23,7 @@ class SCD30Component : public PollingComponent, public i2c::I2CDevice {
 
  protected:
   bool write_command_(uint16_t command);
+  bool write_command_(uint16_t command, uint16_t data);
   bool read_data_(uint16_t *data, uint8_t len);
   uint8_t sht_crc_(uint8_t data1, uint8_t data2);
 
@@ -30,6 +33,8 @@ class SCD30Component : public PollingComponent, public i2c::I2CDevice {
     MEASUREMENT_INIT_FAILED,
     UNKNOWN
   } error_code_{UNKNOWN};
+  bool enable_asc_{true};
+  uint16_t altitude_compensation_{0xFFFF};
 
   sensor::Sensor *co2_sensor_{nullptr};
   sensor::Sensor *humidity_sensor_{nullptr};
diff --git a/esphome/components/scd30/sensor.py b/esphome/components/scd30/sensor.py
index 7a60725276..b3de1b214a 100644
--- a/esphome/components/scd30/sensor.py
+++ b/esphome/components/scd30/sensor.py
@@ -1,3 +1,4 @@
+import re
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
@@ -10,12 +11,24 @@ DEPENDENCIES = ['i2c']
 scd30_ns = cg.esphome_ns.namespace('scd30')
 SCD30Component = scd30_ns.class_('SCD30Component', cg.PollingComponent, i2c.I2CDevice)
 
+CONF_AUTOMATIC_SELF_CALIBRATION = 'automatic_self_calibration'
+CONF_ALTITUDE_COMPENSATION = 'altitude_compensation'
+
+
+def remove_altitude_suffix(value):
+    return re.sub(r"\s*(?:m(?:\s+a\.s\.l)?)|(?:MAM?SL)$", '', value)
+
+
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(SCD30Component),
     cv.Required(CONF_CO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION,
                                                 ICON_PERIODIC_TABLE_CO2, 0),
     cv.Required(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
     cv.Required(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 1),
+    cv.Optional(CONF_AUTOMATIC_SELF_CALIBRATION, default=True): cv.boolean,
+    cv.Optional(CONF_ALTITUDE_COMPENSATION): cv.All(remove_altitude_suffix,
+                                                    cv.int_range(min=0, max=0xFFFF,
+                                                                 max_included=False)),
 }).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x61))
 
 
@@ -24,6 +37,10 @@ def to_code(config):
     yield cg.register_component(var, config)
     yield i2c.register_i2c_device(var, config)
 
+    cg.add(var.set_automatic_self_calibration(config[CONF_AUTOMATIC_SELF_CALIBRATION]))
+    if CONF_ALTITUDE_COMPENSATION in config:
+        cg.add(var.set_altitude_compensation(config[CONF_ALTITUDE_COMPENSATION]))
+
     if CONF_CO2 in config:
         sens = yield sensor.new_sensor(config[CONF_CO2])
         cg.add(var.set_co2_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 0533063fb8..93e6638330 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -584,6 +584,8 @@ sensor:
       name: "Living Room Humidity 9"
     address: 0x61
     update_interval: 15s
+    automatic_self_calibration: true
+    altitude_compensation: 10m
   - platform: sgp30
     eco2:
       name: "Workshop eCO2"

From c60989a7be75989e55af166d8496cb5ff27b4080 Mon Sep 17 00:00:00 2001
From: Pavel <205196+yekm@users.noreply.github.com>
Date: Thu, 12 Mar 2020 23:37:57 +0300
Subject: [PATCH 170/412] pzemac total energy support (#933)

* add energy support in pzemac sensor

Co-authored-by: Sergio Mayoral Martinez <sergiomayoralmartinez@gmail.com>
Co-authored-by: t151602 <sergio.mayoralmartinez@telefonica.com>
Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/pzemac/pzemac.cpp | 10 ++++++++--
 esphome/components/pzemac/pzemac.h   |  2 ++
 esphome/components/pzemac/sensor.py  |  8 +++++++-
 esphome/const.py                     |  2 ++
 tests/test3.yaml                     |  2 ++
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/esphome/components/pzemac/pzemac.cpp b/esphome/components/pzemac/pzemac.cpp
index f05ce15711..c79508d22f 100644
--- a/esphome/components/pzemac/pzemac.cpp
+++ b/esphome/components/pzemac/pzemac.cpp
@@ -19,6 +19,7 @@ void PZEMAC::on_modbus_data(const std::vector<uint8_t> &data) {
   //  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
   // 01 04 14 08 D1 00 6C 00 00 00 F4 00 00 00 26 00 00 01 F4 00 64 00 00 51 34
   // Id Cc Sz Volt- Current---- Power------ Energy----- Frequ PFact Alarm Crc--
+  //           0     2           6          10          14    16
 
   auto pzem_get_16bit = [&](size_t i) -> uint16_t {
     return (uint16_t(data[i + 0]) << 8) | (uint16_t(data[i + 1]) << 0);
@@ -36,20 +37,24 @@ void PZEMAC::on_modbus_data(const std::vector<uint8_t> &data) {
   uint32_t raw_active_power = pzem_get_32bit(6);
   float active_power = raw_active_power / 10.0f;  // max 429496729.5 W
 
+  float active_energy = static_cast<float>(pzem_get_32bit(10));
+
   uint16_t raw_frequency = pzem_get_16bit(14);
   float frequency = raw_frequency / 10.0f;
 
   uint16_t raw_power_factor = pzem_get_16bit(16);
   float power_factor = raw_power_factor / 100.0f;
 
-  ESP_LOGD(TAG, "PZEM AC: V=%.1f V, I=%.3f A, P=%.1f W, F=%.1f Hz, PF=%.2f", voltage, current, active_power, frequency,
-           power_factor);
+  ESP_LOGD(TAG, "PZEM AC: V=%.1f V, I=%.3f A, P=%.1f W, E=%.1f Wh, F=%.1f Hz, PF=%.2f", voltage, current, active_power,
+           active_energy, frequency, power_factor);
   if (this->voltage_sensor_ != nullptr)
     this->voltage_sensor_->publish_state(voltage);
   if (this->current_sensor_ != nullptr)
     this->current_sensor_->publish_state(current);
   if (this->power_sensor_ != nullptr)
     this->power_sensor_->publish_state(active_power);
+  if (this->energy_sensor_ != nullptr)
+    this->energy_sensor_->publish_state(active_energy);
   if (this->frequency_sensor_ != nullptr)
     this->frequency_sensor_->publish_state(frequency);
   if (this->power_factor_sensor_ != nullptr)
@@ -63,6 +68,7 @@ void PZEMAC::dump_config() {
   LOG_SENSOR("", "Voltage", this->voltage_sensor_);
   LOG_SENSOR("", "Current", this->current_sensor_);
   LOG_SENSOR("", "Power", this->power_sensor_);
+  LOG_SENSOR("", "Energy", this->energy_sensor_);
   LOG_SENSOR("", "Frequency", this->frequency_sensor_);
   LOG_SENSOR("", "Power Factor", this->power_factor_sensor_);
 }
diff --git a/esphome/components/pzemac/pzemac.h b/esphome/components/pzemac/pzemac.h
index d396b7cddf..07f661535f 100644
--- a/esphome/components/pzemac/pzemac.h
+++ b/esphome/components/pzemac/pzemac.h
@@ -12,6 +12,7 @@ class PZEMAC : public PollingComponent, public modbus::ModbusDevice {
   void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
   void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
   void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
+  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
   void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
   void set_power_factor_sensor(sensor::Sensor *power_factor_sensor) { power_factor_sensor_ = power_factor_sensor; }
 
@@ -25,6 +26,7 @@ class PZEMAC : public PollingComponent, public modbus::ModbusDevice {
   sensor::Sensor *voltage_sensor_;
   sensor::Sensor *current_sensor_;
   sensor::Sensor *power_sensor_;
+  sensor::Sensor *energy_sensor_;
   sensor::Sensor *frequency_sensor_;
   sensor::Sensor *power_factor_sensor_;
 };
diff --git a/esphome/components/pzemac/sensor.py b/esphome/components/pzemac/sensor.py
index 54eb01e085..e3d2b90742 100644
--- a/esphome/components/pzemac/sensor.py
+++ b/esphome/components/pzemac/sensor.py
@@ -3,7 +3,8 @@ import esphome.config_validation as cv
 from esphome.components import sensor, modbus
 from esphome.const import CONF_CURRENT, CONF_ID, CONF_POWER, CONF_VOLTAGE, \
     CONF_FREQUENCY, UNIT_VOLT, ICON_FLASH, UNIT_AMPERE, UNIT_WATT, UNIT_EMPTY, \
-    ICON_POWER, CONF_POWER_FACTOR, ICON_CURRENT_AC, UNIT_HERTZ
+    ICON_POWER, CONF_POWER_FACTOR, ICON_CURRENT_AC, UNIT_HERTZ, \
+    CONF_ENERGY, UNIT_WATT_HOURS, ICON_COUNTER
 
 AUTO_LOAD = ['modbus']
 
@@ -15,6 +16,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 1),
     cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_CURRENT_AC, 3),
     cv.Optional(CONF_POWER): sensor.sensor_schema(UNIT_WATT, ICON_POWER, 1),
+    cv.Optional(CONF_ENERGY): sensor.sensor_schema(UNIT_WATT_HOURS, ICON_COUNTER, 0),
     cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(UNIT_HERTZ, ICON_CURRENT_AC, 1),
     cv.Optional(CONF_POWER_FACTOR): sensor.sensor_schema(UNIT_EMPTY, ICON_FLASH, 2),
 }).extend(cv.polling_component_schema('60s')).extend(modbus.modbus_device_schema(0x01))
@@ -37,6 +39,10 @@ def to_code(config):
         conf = config[CONF_POWER]
         sens = yield sensor.new_sensor(conf)
         cg.add(var.set_power_sensor(sens))
+    if CONF_ENERGY in config:
+        conf = config[CONF_ENERGY]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_energy_sensor(sens))
     if CONF_FREQUENCY in config:
         conf = config[CONF_FREQUENCY]
         sens = yield sensor.new_sensor(conf)
diff --git a/esphome/const.py b/esphome/const.py
index e747371710..36ffbed254 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -145,6 +145,7 @@ CONF_EFFECTS = 'effects'
 CONF_ELSE = 'else'
 CONF_ENABLE_PIN = 'enable_pin'
 CONF_ENABLE_TIME = 'enable_time'
+CONF_ENERGY = 'energy'
 CONF_ENTITY_ID = 'entity_id'
 CONF_ESP8266_RESTORE_FROM_FLASH = 'esp8266_restore_from_flash'
 CONF_ESPHOME = 'esphome'
@@ -580,6 +581,7 @@ UNIT_VOLT = 'V'
 UNIT_VOLT_AMPS = 'VA'
 UNIT_VOLT_AMPS_REACTIVE = 'VAR'
 UNIT_WATT = 'W'
+UNIT_WATT_HOURS = 'Wh'
 
 DEVICE_CLASS_CONNECTIVITY = 'connectivity'
 DEVICE_CLASS_MOVING = 'moving'
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 9c66242b4e..2e1dd3f078 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -335,6 +335,8 @@ sensor:
       name: "PZEMAC Current"
     power:
       name: "PZEMAC Power"
+    energy:
+      name: "PZEMAC Energy"
     frequency:
       name: "PZEMAC Frequency"
     power_factor:

From 714d28a61a2b9d4cec82f1f2091c59b70b1e7c60 Mon Sep 17 00:00:00 2001
From: Nicholas Peters <npnickster@gmail.com>
Date: Thu, 12 Mar 2020 17:25:00 -0400
Subject: [PATCH 171/412] Add TMP117 component (#992)

* Create TMP117 sensor component
---
 esphome/components/tmp117/__init__.py |  0
 esphome/components/tmp117/sensor.py   | 67 +++++++++++++++++++++++
 esphome/components/tmp117/tmp117.cpp  | 76 +++++++++++++++++++++++++++
 esphome/components/tmp117/tmp117.h    | 27 ++++++++++
 tests/test1.yaml                      |  3 ++
 5 files changed, 173 insertions(+)
 create mode 100644 esphome/components/tmp117/__init__.py
 create mode 100644 esphome/components/tmp117/sensor.py
 create mode 100644 esphome/components/tmp117/tmp117.cpp
 create mode 100644 esphome/components/tmp117/tmp117.h

diff --git a/esphome/components/tmp117/__init__.py b/esphome/components/tmp117/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/tmp117/sensor.py b/esphome/components/tmp117/sensor.py
new file mode 100644
index 0000000000..ddca3eeb64
--- /dev/null
+++ b/esphome/components/tmp117/sensor.py
@@ -0,0 +1,67 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import CONF_ID, CONF_UPDATE_INTERVAL, \
+    UNIT_CELSIUS, ICON_THERMOMETER
+
+DEPENDENCIES = ['i2c']
+
+tmp117_ns = cg.esphome_ns.namespace('tmp117')
+TMP117Component = tmp117_ns.class_('TMP117Component',
+                                   cg.PollingComponent, i2c.I2CDevice, sensor.Sensor)
+
+CONFIG_SCHEMA = cv.All(sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1).extend({
+    cv.GenerateID(): cv.declare_id(TMP117Component),
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x48)))
+
+
+def determine_config_register(polling_period):
+    if polling_period >= 16.0:
+        # 64 averaged conversions, max conversion time
+        # 0000 00 111 11 00000
+        # 0000 0011 1110 0000
+        return 0x03E0
+    if polling_period >= 8.0:
+        # 64 averaged conversions, high conversion time
+        # 0000 00 110 11 00000
+        # 0000 0011 0110 0000
+        return 0x0360
+    if polling_period >= 4.0:
+        # 64 averaged conversions, mid conversion time
+        # 0000 00 101 11 00000
+        # 0000 0010 1110 0000
+        return 0x02E0
+    if polling_period >= 1.0:
+        # 64 averaged conversions, min conversion time
+        # 0000 00 000 11 00000
+        # 0000 0000 0110 0000
+        return 0x0060
+    if polling_period >= 0.5:
+        # 32 averaged conversions, min conversion time
+        # 0000 00 000 10 00000
+        # 0000 0000 0100 0000
+        return 0x0040
+    if polling_period >= 0.25:
+        # 8 averaged conversions, mid conversion time
+        # 0000 00 010 01 00000
+        # 0000 0001 0010 0000
+        return 0x0120
+    if polling_period >= 0.125:
+        # 8 averaged conversions, min conversion time
+        # 0000 00 000 01 00000
+        # 0000 0000 0010 0000
+        return 0x0020
+    # 1 averaged conversions, min conversion time
+    # 0000 00 000 00 00000
+    # 0000 0000 0000 0000
+    return 0x0000
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield i2c.register_i2c_device(var, config)
+    yield sensor.register_sensor(var, config)
+
+    update_period = config[CONF_UPDATE_INTERVAL].total_seconds
+    cg.add(var.set_config(determine_config_register(update_period)))
diff --git a/esphome/components/tmp117/tmp117.cpp b/esphome/components/tmp117/tmp117.cpp
new file mode 100644
index 0000000000..9040d9bfed
--- /dev/null
+++ b/esphome/components/tmp117/tmp117.cpp
@@ -0,0 +1,76 @@
+// Implementation based on:
+//  - DHT 12 Component
+
+#include "tmp117.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace tmp117 {
+
+static const char *TAG = "tmp117";
+
+void TMP117Component::update() {
+  int16_t data;
+  if (!this->read_data_(&data)) {
+    this->status_set_warning();
+    return;
+  }
+  if ((uint16_t) data != 0x8000) {
+    float temperature = data * 0.0078125f;
+
+    ESP_LOGD(TAG, "Got temperature=%.2f°C", temperature);
+    this->publish_state(temperature);
+    this->status_clear_warning();
+  } else {
+    ESP_LOGD(TAG, "TMP117 not ready");
+  }
+}
+void TMP117Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up TMP117...");
+
+  if (!this->write_config_(this->config_)) {
+    this->mark_failed();
+    return;
+  }
+
+  int16_t data;
+  if (!this->read_data_(&data)) {
+    this->mark_failed();
+    return;
+  }
+}
+void TMP117Component::dump_config() {
+  ESP_LOGD(TAG, "TMP117:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with TMP117 failed!");
+  }
+  LOG_SENSOR("  ", "Temperature", this);
+}
+float TMP117Component::get_setup_priority() const { return setup_priority::DATA; }
+bool TMP117Component::read_data_(int16_t *data) {
+  if (!this->read_byte_16(0, (uint16_t *) data)) {
+    ESP_LOGW(TAG, "Updating TMP117 failed!");
+    return false;
+  }
+  return true;
+}
+
+bool TMP117Component::read_config_(uint16_t *config) {
+  if (!this->read_byte_16(1, (uint16_t *) config)) {
+    ESP_LOGW(TAG, "Reading TMP117 config failed!");
+    return false;
+  }
+  return true;
+}
+
+bool TMP117Component::write_config_(uint16_t config) {
+  if (!this->write_byte_16(1, config)) {
+    ESP_LOGE(TAG, "Writing TMP117 config failed!");
+    return false;
+  }
+  return true;
+}
+
+}  // namespace tmp117
+}  // namespace esphome
diff --git a/esphome/components/tmp117/tmp117.h b/esphome/components/tmp117/tmp117.h
new file mode 100644
index 0000000000..162dbb64db
--- /dev/null
+++ b/esphome/components/tmp117/tmp117.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace tmp117 {
+
+class TMP117Component : public PollingComponent, public i2c::I2CDevice, public sensor::Sensor {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+  void set_config(uint16_t config) { config_ = config; };
+
+ protected:
+  bool read_data_(int16_t *data);
+  bool read_config_(uint16_t *config);
+  bool write_config_(uint16_t config);
+
+  uint16_t config_;
+};
+
+}  // namespace tmp117
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 93e6638330..b3b397ddb1 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -716,6 +716,9 @@ sensor:
       name: "Lightning Energy"
     distance:
       name: "Distance Storm"
+  - platform: tmp117
+    name: "TMP117 Temperature"
+    update_interval: 5s
 
 esp32_touch:
   setup_mode: False

From c632b0e1d40d50927d521cfd253bff017792541b Mon Sep 17 00:00:00 2001
From: Tim Savage <tim@savage.company>
Date: Fri, 13 Mar 2020 08:27:22 +1100
Subject: [PATCH 172/412] Unittests for esphome python code (#931)

---
 .coveragerc                                   |   2 +
 esphome/core.py                               |   3 +
 pytest.ini                                    |   4 +
 requirements_test.txt                         |   6 +
 script/fulltest                               |   1 +
 script/unit_test                              |   9 +
 tests/unit_tests/conftest.py                  |  30 ++
 tests/unit_tests/fixtures/helpers/file-a.txt  |   1 +
 .../unit_tests/fixtures/helpers/file-b_1.txt  |   1 +
 .../unit_tests/fixtures/helpers/file-b_2.txt  |   1 +
 tests/unit_tests/fixtures/helpers/file-c.txt  |   1 +
 tests/unit_tests/strategies.py                |  15 +
 tests/unit_tests/test_config_validation.py    | 113 ++++
 tests/unit_tests/test_core.py                 | 491 ++++++++++++++++++
 tests/unit_tests/test_helpers.py              | 208 ++++++++
 tests/unit_tests/test_pins.py                 | 326 ++++++++++++
 16 files changed, 1212 insertions(+)
 create mode 100644 .coveragerc
 create mode 100644 pytest.ini
 create mode 100755 script/unit_test
 create mode 100644 tests/unit_tests/conftest.py
 create mode 100644 tests/unit_tests/fixtures/helpers/file-a.txt
 create mode 100644 tests/unit_tests/fixtures/helpers/file-b_1.txt
 create mode 100644 tests/unit_tests/fixtures/helpers/file-b_2.txt
 create mode 100644 tests/unit_tests/fixtures/helpers/file-c.txt
 create mode 100644 tests/unit_tests/strategies.py
 create mode 100644 tests/unit_tests/test_config_validation.py
 create mode 100644 tests/unit_tests/test_core.py
 create mode 100644 tests/unit_tests/test_helpers.py
 create mode 100644 tests/unit_tests/test_pins.py

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 0000000000..723242b288
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+omit = esphome/components/*
diff --git a/esphome/core.py b/esphome/core.py
index b4bea49dbd..7734636a76 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -143,6 +143,9 @@ class TimePeriod:
             return f'{self.total_days}d'
         return '0s'
 
+    def __repr__(self):
+        return f"TimePeriod<{self.total_microseconds}>"
+
     @property
     def total_microseconds(self):
         return self.total_milliseconds * 1000 + (self.microseconds or 0)
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000000..a91a2ea200
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,4 @@
+[pytest]
+addopts =
+    --cov=esphome
+    --cov-branch
diff --git a/requirements_test.txt b/requirements_test.txt
index 7711b3867a..85f7d511a8 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -16,3 +16,9 @@ pylint==2.4.4 ; python_version>"3"
 flake8==3.7.9
 pillow
 pexpect
+
+# Unit tests
+pytest==5.3.2
+pytest-cov==2.8.1
+pytest-mock==1.13.0
+hypothesis==4.57.0
diff --git a/script/fulltest b/script/fulltest
index 0fa88516c2..795482281a 100755
--- a/script/fulltest
+++ b/script/fulltest
@@ -9,4 +9,5 @@ set -x
 script/ci-custom.py
 script/lint-python
 script/lint-cpp
+script/unit_test
 script/test
diff --git a/script/unit_test b/script/unit_test
new file mode 100755
index 0000000000..1e5c288632
--- /dev/null
+++ b/script/unit_test
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "$0")/.."
+
+set -x
+
+pytest tests/unit_tests
diff --git a/tests/unit_tests/conftest.py b/tests/unit_tests/conftest.py
new file mode 100644
index 0000000000..adef39a0b3
--- /dev/null
+++ b/tests/unit_tests/conftest.py
@@ -0,0 +1,30 @@
+"""
+ESPHome Unittests
+~~~~~~~~~~~~~~~~~
+
+Configuration file for unit tests.
+
+If adding unit tests ensure that they are fast. Slower integration tests should
+not be part of a unit test suite.
+
+"""
+import sys
+import pytest
+
+from pathlib import Path
+
+
+here = Path(__file__).parent
+
+# Configure location of package root
+package_root = here.parent.parent
+sys.path.insert(0, package_root.as_posix())
+
+
+@pytest.fixture
+def fixture_path() -> Path:
+    """
+    Location of all fixture files.
+    """
+    return here / "fixtures"
+
diff --git a/tests/unit_tests/fixtures/helpers/file-a.txt b/tests/unit_tests/fixtures/helpers/file-a.txt
new file mode 100644
index 0000000000..a9d1060fb6
--- /dev/null
+++ b/tests/unit_tests/fixtures/helpers/file-a.txt
@@ -0,0 +1 @@
+A files are unique.
diff --git a/tests/unit_tests/fixtures/helpers/file-b_1.txt b/tests/unit_tests/fixtures/helpers/file-b_1.txt
new file mode 100644
index 0000000000..907b98d934
--- /dev/null
+++ b/tests/unit_tests/fixtures/helpers/file-b_1.txt
@@ -0,0 +1 @@
+All b files match.
diff --git a/tests/unit_tests/fixtures/helpers/file-b_2.txt b/tests/unit_tests/fixtures/helpers/file-b_2.txt
new file mode 100644
index 0000000000..907b98d934
--- /dev/null
+++ b/tests/unit_tests/fixtures/helpers/file-b_2.txt
@@ -0,0 +1 @@
+All b files match.
diff --git a/tests/unit_tests/fixtures/helpers/file-c.txt b/tests/unit_tests/fixtures/helpers/file-c.txt
new file mode 100644
index 0000000000..558763720e
--- /dev/null
+++ b/tests/unit_tests/fixtures/helpers/file-c.txt
@@ -0,0 +1 @@
+C files are unique.
diff --git a/tests/unit_tests/strategies.py b/tests/unit_tests/strategies.py
new file mode 100644
index 0000000000..f4763f047f
--- /dev/null
+++ b/tests/unit_tests/strategies.py
@@ -0,0 +1,15 @@
+from typing import Text
+
+import hypothesis.strategies._internal.core as st
+from hypothesis.strategies._internal.strategies import SearchStrategy
+
+
+@st.defines_strategy_with_reusable_values
+def mac_addr_strings():
+    # type: () -> SearchStrategy[Text]
+    """A strategy for MAC address strings.
+
+    This consists of six strings representing integers [0..255],
+    without zero-padding, joined by dots.
+    """
+    return st.builds("{:02X}:{:02X}:{:02X}:{:02X}:{:02X}:{:02X}".format, *(6 * [st.integers(0, 255)]))
diff --git a/tests/unit_tests/test_config_validation.py b/tests/unit_tests/test_config_validation.py
new file mode 100644
index 0000000000..a19330062e
--- /dev/null
+++ b/tests/unit_tests/test_config_validation.py
@@ -0,0 +1,113 @@
+import pytest
+import string
+
+from hypothesis import given, example
+from hypothesis.strategies import one_of, text, integers, booleans, builds
+
+from esphome import config_validation
+from esphome.config_validation import Invalid
+from esphome.core import Lambda, HexInt
+
+
+def test_check_not_tamplatable__invalid():
+    with pytest.raises(Invalid, match="This option is not templatable!"):
+        config_validation.check_not_templatable(Lambda(""))
+
+
+@given(one_of(
+    booleans(),
+    integers(),
+    text(alphabet=string.ascii_letters + string.digits)),
+)
+def test_alphanumeric__valid(value):
+    actual = config_validation.alphanumeric(value)
+
+    assert actual == str(value)
+
+
+@given(value=text(alphabet=string.ascii_lowercase + string.digits + "_"))
+def test_valid_name__valid(value):
+    actual = config_validation.valid_name(value)
+
+    assert actual == value
+
+
+@pytest.mark.parametrize("value", (
+    "foo bar", "FooBar", "foo::bar"
+))
+def test_valid_name__invalid(value):
+    with pytest.raises(Invalid):
+        config_validation.valid_name(value)
+
+
+@given(one_of(integers(), text()))
+def test_string__valid(value):
+    actual = config_validation.string(value)
+
+    assert actual == str(value)
+
+
+@pytest.mark.parametrize("value", (
+    {}, [], True, False, None
+))
+def test_string__invalid(value):
+    with pytest.raises(Invalid):
+        config_validation.string(value)
+
+
+@given(text())
+def test_strict_string__valid(value):
+    actual = config_validation.string_strict(value)
+
+    assert actual == value
+
+
+@pytest.mark.parametrize("value", (None, 123))
+def test_string_string__invalid(value):
+    with pytest.raises(Invalid, match="Must be string, got"):
+        config_validation.string_strict(value)
+
+
+@given(builds(lambda v: "mdi:" + v, text()))
+@example("")
+def test_icon__valid(value):
+    actual = config_validation.icon(value)
+
+    assert actual == value
+
+
+def test_icon__invalid():
+    with pytest.raises(Invalid, match="Icons should start with prefix"):
+        config_validation.icon("foo")
+
+
+@pytest.mark.parametrize("value", (
+    "True", "YES", "on", "enAblE", True
+))
+def test_boolean__valid_true(value):
+    assert config_validation.boolean(value) is True
+
+
+@pytest.mark.parametrize("value", (
+    "False", "NO", "off", "disAblE", False
+))
+def test_boolean__valid_false(value):
+    assert config_validation.boolean(value) is False
+
+
+@pytest.mark.parametrize("value", (
+    None, 1, 0, "foo"
+))
+def test_boolean__invalid(value):
+    with pytest.raises(Invalid, match="Expected boolean value"):
+        config_validation.boolean(value)
+
+
+# TODO: ensure_list
+@given(integers())
+def hex_int__valid(value):
+    actual = config_validation.hex_int(value)
+
+    assert isinstance(actual, HexInt)
+    assert actual == value
+    
diff --git a/tests/unit_tests/test_core.py b/tests/unit_tests/test_core.py
new file mode 100644
index 0000000000..c02aed6447
--- /dev/null
+++ b/tests/unit_tests/test_core.py
@@ -0,0 +1,491 @@
+import pytest
+
+from hypothesis import given
+from hypothesis.provisional import ip4_addr_strings
+from strategies import mac_addr_strings
+
+from esphome import core, const
+
+
+class TestHexInt:
+    @pytest.mark.parametrize("value, expected", (
+            (1, "0x01"),
+            (255, "0xFF"),
+            (128, "0x80"),
+            (256, "0x100"),
+            (-1, "-0x01"),  # TODO: this currently fails
+    ))
+    def test_str(self, value, expected):
+        target = core.HexInt(value)
+
+        actual = str(target)
+
+        assert actual == expected
+
+
+class TestIPAddress:
+    @given(value=ip4_addr_strings())
+    def test_init__valid(self, value):
+        core.IPAddress(*value.split("."))
+
+    @pytest.mark.parametrize("value", ("127.0.0", "localhost", ""))
+    def test_init__invalid(self, value):
+        with pytest.raises(ValueError, match="IPAddress must consist of 4 items"):
+            core.IPAddress(*value.split("."))
+
+    @given(value=ip4_addr_strings())
+    def test_str(self, value):
+        target = core.IPAddress(*value.split("."))
+
+        actual = str(target)
+
+        assert actual == value
+
+
+class TestMACAddress:
+    @given(value=mac_addr_strings())
+    def test_init__valid(self, value):
+        core.MACAddress(*value.split(":"))
+
+    @pytest.mark.parametrize("value", ("1:2:3:4:5", "localhost", ""))
+    def test_init__invalid(self, value):
+        with pytest.raises(ValueError, match="MAC Address must consist of 6 items"):
+            core.MACAddress(*value.split(":"))
+
+    @given(value=mac_addr_strings())
+    def test_str(self, value):
+        target = core.MACAddress(*(int(v, 16) for v in value.split(":")))
+
+        actual = str(target)
+
+        assert actual == value
+
+    def test_as_hex(self):
+        target = core.MACAddress(0xDE, 0xAD, 0xBE, 0xEF, 0x00, 0xFF)
+
+        actual = target.as_hex
+
+        assert actual.text == "0xDEADBEEF00FFULL"
+
+
+@pytest.mark.parametrize("value", (
+    1, 2, -1, 0, 1.0, -1.0, 42.0009, -42.0009
+))
+def test_is_approximately_integer__in_range(value):
+    actual = core.is_approximately_integer(value)
+
+    assert actual is True
+
+
+@pytest.mark.parametrize("value", (
+    42.01, -42.01, 1.5
+))
+def test_is_approximately_integer__not_in_range(value):
+    actual = core.is_approximately_integer(value)
+
+    assert actual is False
+
+
+class TestTimePeriod:
+    @pytest.mark.parametrize("kwargs, expected", (
+            ({}, {}),
+            ({"microseconds": 1}, {"microseconds": 1}),
+            ({"microseconds": 1.0001}, {"microseconds": 1}),
+            ({"milliseconds": 2}, {"milliseconds": 2}),
+            ({"milliseconds": 2.0001}, {"milliseconds": 2}),
+            ({"milliseconds": 2.01}, {"milliseconds": 2, "microseconds": 10}),
+            ({"seconds": 3}, {"seconds": 3}),
+            ({"seconds": 3.0001}, {"seconds": 3}),
+            ({"seconds": 3.01}, {"seconds": 3, "milliseconds": 10}),
+            ({"minutes": 4}, {"minutes": 4}),
+            ({"minutes": 4.0001}, {"minutes": 4}),
+            ({"minutes": 4.1}, {"minutes": 4, "seconds": 6}),
+            ({"hours": 5}, {"hours": 5}),
+            ({"hours": 5.0001}, {"hours": 5}),
+            ({"hours": 5.1}, {"hours": 5, "minutes": 6}),
+            ({"days": 6}, {"days": 6}),
+            ({"days": 6.0001}, {"days": 6}),
+            ({"days": 6.1}, {"days": 6, "hours": 2, "minutes": 24}),
+    ))
+    def test_init(self, kwargs, expected):
+        target = core.TimePeriod(**kwargs)
+
+        actual = target.as_dict()
+
+        assert actual == expected
+
+    def test_init__microseconds_with_fraction(self):
+        with pytest.raises(ValueError, match="Maximum precision is microseconds"):
+            core.TimePeriod(microseconds=1.1)
+
+    @pytest.mark.parametrize("kwargs, expected", (
+            ({}, "0s"),
+            ({"microseconds": 1}, "1us"),
+            ({"microseconds": 1.0001}, "1us"),
+            ({"milliseconds": 2}, "2ms"),
+            ({"milliseconds": 2.0001}, "2ms"),
+            ({"milliseconds": 2.01}, "2010us"),
+            ({"seconds": 3}, "3s"),
+            ({"seconds": 3.0001}, "3s"),
+            ({"seconds": 3.01}, "3010ms"),
+            ({"minutes": 4}, "4min"),
+            ({"minutes": 4.0001}, "4min"),
+            ({"minutes": 4.1}, "246s"),
+            ({"hours": 5}, "5h"),
+            ({"hours": 5.0001}, "5h"),
+            ({"hours": 5.1}, "306min"),
+            ({"days": 6}, "6d"),
+            ({"days": 6.0001}, "6d"),
+            ({"days": 6.1}, "8784min"),
+    ))
+    def test_str(self, kwargs, expected):
+        target = core.TimePeriod(**kwargs)
+
+        actual = str(target)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("comparison, other, expected", (
+            ("__eq__", core.TimePeriod(microseconds=900), False),
+            ("__eq__", core.TimePeriod(milliseconds=1), True),
+            ("__eq__", core.TimePeriod(microseconds=1100), False),
+            ("__eq__", 1000, NotImplemented),
+            ("__eq__", "1000", NotImplemented),
+            ("__eq__", True, NotImplemented),
+            ("__eq__", object(), NotImplemented),
+            ("__eq__", None, NotImplemented),
+
+            ("__ne__", core.TimePeriod(microseconds=900), True),
+            ("__ne__", core.TimePeriod(milliseconds=1), False),
+            ("__ne__", core.TimePeriod(microseconds=1100), True),
+            ("__ne__", 1000, NotImplemented),
+            ("__ne__", "1000", NotImplemented),
+            ("__ne__", True, NotImplemented),
+            ("__ne__", object(), NotImplemented),
+            ("__ne__", None, NotImplemented),
+
+            ("__lt__", core.TimePeriod(microseconds=900), False),
+            ("__lt__", core.TimePeriod(milliseconds=1), False),
+            ("__lt__", core.TimePeriod(microseconds=1100), True),
+            ("__lt__", 1000, NotImplemented),
+            ("__lt__", "1000", NotImplemented),
+            ("__lt__", True, NotImplemented),
+            ("__lt__", object(), NotImplemented),
+            ("__lt__", None, NotImplemented),
+
+            ("__gt__", core.TimePeriod(microseconds=900), True),
+            ("__gt__", core.TimePeriod(milliseconds=1), False),
+            ("__gt__", core.TimePeriod(microseconds=1100), False),
+            ("__gt__", 1000, NotImplemented),
+            ("__gt__", "1000", NotImplemented),
+            ("__gt__", True, NotImplemented),
+            ("__gt__", object(), NotImplemented),
+            ("__gt__", None, NotImplemented),
+
+            ("__le__", core.TimePeriod(microseconds=900), False),
+            ("__le__", core.TimePeriod(milliseconds=1), True),
+            ("__le__", core.TimePeriod(microseconds=1100), True),
+            ("__le__", 1000, NotImplemented),
+            ("__le__", "1000", NotImplemented),
+            ("__le__", True, NotImplemented),
+            ("__le__", object(), NotImplemented),
+            ("__le__", None, NotImplemented),
+
+            ("__ge__", core.TimePeriod(microseconds=900), True),
+            ("__ge__", core.TimePeriod(milliseconds=1), True),
+            ("__ge__", core.TimePeriod(microseconds=1100), False),
+            ("__ge__", 1000, NotImplemented),
+            ("__ge__", "1000", NotImplemented),
+            ("__ge__", True, NotImplemented),
+            ("__ge__", object(), NotImplemented),
+            ("__ge__", None, NotImplemented),
+    ))
+    def test_comparison(self, comparison, other, expected):
+        target = core.TimePeriod(microseconds=1000)
+
+        actual = getattr(target, comparison)(other)
+
+        assert actual == expected
+
+
+SAMPLE_LAMBDA = """
+it.strftime(64, 0, id(my_font), TextAlign::TOP_CENTER, "%H:%M:%S", id(esptime).now());
+it.printf(64, 16, id(my_font2), TextAlign::TOP_CENTER, "%.1f°C (%.1f%%)", id( office_tmp ).state, id(office_hmd).state);
+"""
+
+
+class TestLambda:
+    def test_init__copy_initializer(self):
+        value = core.Lambda("foo")
+        target = core.Lambda(value)
+
+        assert str(target) is value.value
+
+    def test_parts(self):
+        target = core.Lambda(SAMPLE_LAMBDA.strip())
+
+        # Check cache
+        assert target._parts is None
+        actual = target.parts
+        assert target._parts is actual
+        assert target.parts is actual
+
+        assert actual == [
+            "it.strftime(64, 0, ",
+            "my_font",
+            "",
+            ", TextAlign::TOP_CENTER, \"%H:%M:%S\", ",
+            "esptime",
+            ".",
+            "now());\nit.printf(64, 16, ",
+            "my_font2",
+            "",
+            ", TextAlign::TOP_CENTER, \"%.1f°C (%.1f%%)\", ",
+            "office_tmp",
+            ".",
+            "state, ",
+            "office_hmd",
+            ".",
+            "state);"
+        ]
+
+    def test_requires_ids(self):
+        target = core.Lambda(SAMPLE_LAMBDA.strip())
+
+        # Check cache
+        assert target._requires_ids is None
+        actual = target.requires_ids
+        assert target._requires_ids is actual
+        assert target.requires_ids is actual
+
+        assert actual == [
+            core.ID("my_font"),
+            core.ID("esptime"),
+            core.ID("my_font2"),
+            core.ID("office_tmp"),
+            core.ID("office_hmd"),
+        ]
+
+    def test_value_setter(self):
+        target = core.Lambda("")
+
+        # Populate cache
+        _ = target.parts
+        _ = target.requires_ids
+
+        target.value = SAMPLE_LAMBDA
+
+        # Check cache has been cleared
+        assert target._parts is None
+        assert target._requires_ids is None
+
+        assert target.value == SAMPLE_LAMBDA
+
+    def test_repr(self):
+        target = core.Lambda("id(var).value == 1")
+
+        assert repr(target) == "Lambda<id(var).value == 1>"
+
+
+class TestID:
+    @pytest.fixture
+    def target(self):
+        return core.ID(None, is_declaration=True, type="binary_sensor::Example")
+
+    @pytest.mark.parametrize("id, is_manual, expected", (
+            ("foo", None, True),
+            (None, None, False),
+            ("foo", True, True),
+            ("foo", False, False),
+            (None, True, True),
+    ))
+    def test_init__resolve_is_manual(self, id, is_manual, expected):
+        target = core.ID(id, is_manual=is_manual)
+
+        assert target.is_manual == expected
+
+    @pytest.mark.parametrize("registered_ids, expected", (
+            ([], "binary_sensor_example"),
+            (["binary_sensor_example"], "binary_sensor_example_2"),
+            (["foo"], "binary_sensor_example"),
+            (["binary_sensor_example", "foo", "binary_sensor_example_2"], "binary_sensor_example_3"),
+    ))
+    def test_resolve(self, target, registered_ids, expected):
+        actual = target.resolve(registered_ids)
+
+        assert actual == expected
+        assert str(target) == expected
+
+    def test_copy(self, target):
+        target.resolve([])
+
+        actual = target.copy()
+
+        assert actual is not target
+        assert all(getattr(actual, n) == getattr(target, n)
+                   for n in ("id", "is_declaration", "type", "is_manual"))
+
+    @pytest.mark.parametrize("comparison, other, expected", (
+            ("__eq__", core.ID(id="foo"), True),
+            ("__eq__", core.ID(id="bar"), False),
+            ("__eq__", 1000, NotImplemented),
+            ("__eq__", "1000", NotImplemented),
+            ("__eq__", True, NotImplemented),
+            ("__eq__", object(), NotImplemented),
+            ("__eq__", None, NotImplemented),
+    ))
+    def test_comparison(self, comparison, other, expected):
+        target = core.ID(id="foo")
+
+        actual = getattr(target, comparison)(other)
+
+        assert actual == expected
+
+
+class TestDocumentLocation:
+    @pytest.fixture
+    def target(self):
+        return core.DocumentLocation(
+            document="foo.txt",
+            line=10,
+            column=20,
+        )
+
+    def test_str(self, target):
+        actual = str(target)
+
+        assert actual == "foo.txt 10:20"
+
+
+class TestDocumentRange:
+    @pytest.fixture
+    def target(self):
+        return core.DocumentRange(
+            core.DocumentLocation(
+                document="foo.txt",
+                line=10,
+                column=20,
+            ),
+            core.DocumentLocation(
+                document="foo.txt",
+                line=15,
+                column=12,
+            ),
+        )
+
+    def test_str(self, target):
+        actual = str(target)
+
+        assert actual == "[foo.txt 10:20 - foo.txt 15:12]"
+
+
+class TestDefine:
+    @pytest.mark.parametrize("name, value, prop, expected", (
+            ("ANSWER", None, "as_build_flag", "-DANSWER"),
+            ("ANSWER", None, "as_macro", "#define ANSWER"),
+            ("ANSWER", None, "as_tuple", ("ANSWER", None)),
+            ("ANSWER", 42, "as_build_flag", "-DANSWER=42"),
+            ("ANSWER", 42, "as_macro", "#define ANSWER 42"),
+            ("ANSWER", 42, "as_tuple", ("ANSWER", 42)),
+    ))
+    def test_properties(self, name, value, prop, expected):
+        target = core.Define(name, value)
+
+        actual = getattr(target, prop)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("comparison, other, expected", (
+            ("__eq__", core.Define(name="FOO", value=42), True),
+            ("__eq__", core.Define(name="FOO", value=13), False),
+            ("__eq__", core.Define(name="FOO"), False),
+            ("__eq__", core.Define(name="BAR", value=42), False),
+            ("__eq__", core.Define(name="BAR"), False),
+            ("__eq__", 1000, NotImplemented),
+            ("__eq__", "1000", NotImplemented),
+            ("__eq__", True, NotImplemented),
+            ("__eq__", object(), NotImplemented),
+            ("__eq__", None, NotImplemented),
+    ))
+    def test_comparison(self, comparison, other, expected):
+        target = core.Define(name="FOO", value=42)
+
+        actual = getattr(target, comparison)(other)
+
+        assert actual == expected
+
+
+class TestLibrary:
+    @pytest.mark.parametrize("name, value, prop, expected", (
+            ("mylib", None, "as_lib_dep", "mylib"),
+            ("mylib", None, "as_tuple", ("mylib", None)),
+            ("mylib", "1.2.3", "as_lib_dep", "mylib@1.2.3"),
+            ("mylib", "1.2.3", "as_tuple", ("mylib", "1.2.3")),
+    ))
+    def test_properties(self, name, value, prop, expected):
+        target = core.Library(name, value)
+
+        actual = getattr(target, prop)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("comparison, other, expected", (
+            ("__eq__", core.Library(name="libfoo", version="1.2.3"), True),
+            ("__eq__", core.Library(name="libfoo", version="1.2.4"), False),
+            ("__eq__", core.Library(name="libbar", version="1.2.3"), False),
+            ("__eq__", 1000, NotImplemented),
+            ("__eq__", "1000", NotImplemented),
+            ("__eq__", True, NotImplemented),
+            ("__eq__", object(), NotImplemented),
+            ("__eq__", None, NotImplemented),
+    ))
+    def test_comparison(self, comparison, other, expected):
+        target = core.Library(name="libfoo", version="1.2.3")
+
+        actual = getattr(target, comparison)(other)
+
+        assert actual == expected
+
+
+class TestEsphomeCore:
+    @pytest.fixture
+    def target(self, fixture_path):
+        target = core.EsphomeCore()
+        target.build_path = "foo/build"
+        target.config_path = "foo/config"
+        return target
+
+    def test_reset(self, target):
+        """Call reset on target and compare to new instance"""
+        other = core.EsphomeCore()
+
+        target.reset()
+
+        # TODO: raw_config and config differ, should they?
+        assert target.__dict__ == other.__dict__
+
+    def test_address__none(self, target):
+        assert target.address is None
+
+    def test_address__wifi(self, target):
+        target.config[const.CONF_WIFI] = {const.CONF_USE_ADDRESS: "1.2.3.4"}
+        target.config["ethernet"] = {const.CONF_USE_ADDRESS: "4.3.2.1"}
+
+        assert target.address == "1.2.3.4"
+
+    def test_address__ethernet(self, target):
+        target.config["ethernet"] = {const.CONF_USE_ADDRESS: "4.3.2.1"}
+
+        assert target.address == "4.3.2.1"
+
+    def test_is_esp32(self, target):
+        target.esp_platform = "ESP32"
+
+        assert target.is_esp32 is True
+        assert target.is_esp8266 is False
+
+    def test_is_esp8266(self, target):
+        target.esp_platform = "ESP8266"
+
+        assert target.is_esp32 is False
+        assert target.is_esp8266 is True
diff --git a/tests/unit_tests/test_helpers.py b/tests/unit_tests/test_helpers.py
new file mode 100644
index 0000000000..e48286ae51
--- /dev/null
+++ b/tests/unit_tests/test_helpers.py
@@ -0,0 +1,208 @@
+import pytest
+
+from hypothesis import given
+from hypothesis.provisional import ip4_addr_strings
+
+from esphome import helpers
+
+
+@pytest.mark.parametrize("preferred_string, current_strings, expected", (
+        ("foo", [], "foo"),
+        # TODO: Should this actually start at 1?
+        ("foo", ["foo"], "foo_2"),
+        ("foo", ("foo",), "foo_2"),
+        ("foo", ("foo", "foo_2"), "foo_3"),
+        ("foo", ("foo", "foo_2", "foo_2"), "foo_3"),
+))
+def test_ensure_unique_string(preferred_string, current_strings, expected):
+    actual = helpers.ensure_unique_string(preferred_string, current_strings)
+
+    assert actual == expected
+
+
+@pytest.mark.parametrize("text, expected", (
+        ("foo", "foo"),
+        ("foo\nbar", "foo\nbar"),
+        ("foo\nbar\neek", "foo\n  bar\neek"),
+))
+def test_indent_all_but_first_and_last(text, expected):
+    actual = helpers.indent_all_but_first_and_last(text)
+
+    assert actual == expected
+
+
+@pytest.mark.parametrize("text, expected", (
+        ("foo", ["  foo"]),
+        ("foo\nbar", ["  foo", "  bar"]),
+        ("foo\nbar\neek", ["  foo", "  bar", "  eek"]),
+))
+def test_indent_list(text, expected):
+    actual = helpers.indent_list(text)
+
+    assert actual == expected
+
+
+@pytest.mark.parametrize("text, expected", (
+        ("foo", "  foo"),
+        ("foo\nbar", "  foo\n  bar"),
+        ("foo\nbar\neek", "  foo\n  bar\n  eek"),
+))
+def test_indent(text, expected):
+    actual = helpers.indent(text)
+
+    assert actual == expected
+
+
+@pytest.mark.parametrize("string, expected", (
+        ("foo", '"foo"'),
+        ("foo\nbar", '"foo\\012bar"'),
+        ("foo\\bar", '"foo\\134bar"'),
+        ('foo "bar"', '"foo \\042bar\\042"'),
+        ('foo 🐍', '"foo \\360\\237\\220\\215"'),
+))
+def test_cpp_string_escape(string, expected):
+    actual = helpers.cpp_string_escape(string)
+
+    assert actual == expected
+
+
+@pytest.mark.parametrize("host", (
+    "127.0.0", "localhost", "127.0.0.b",
+))
+def test_is_ip_address__invalid(host):
+    actual = helpers.is_ip_address(host)
+
+    assert actual is False
+
+
+@given(value=ip4_addr_strings())
+def test_is_ip_address__valid(value):
+    actual = helpers.is_ip_address(value)
+
+    assert actual is True
+
+
+@pytest.mark.parametrize("var, value, default, expected", (
+        ("FOO", None, False, False),
+        ("FOO", None, True, True),
+        ("FOO", "", False, False),
+        ("FOO", "Yes", False, True),
+        ("FOO", "123", False, True),
+))
+def test_get_bool_env(monkeypatch, var, value, default, expected):
+    if value is None:
+        monkeypatch.delenv(var, raising=False)
+    else:
+        monkeypatch.setenv(var, value)
+
+    actual = helpers.get_bool_env(var, default)
+
+    assert actual == expected
+
+
+@pytest.mark.parametrize("value, expected", (
+        (None, False),
+        ("Yes", True)
+))
+def test_is_hassio(monkeypatch, value, expected):
+    if value is None:
+        monkeypatch.delenv("ESPHOME_IS_HASSIO", raising=False)
+    else:
+        monkeypatch.setenv("ESPHOME_IS_HASSIO", value)
+
+    actual = helpers.is_hassio()
+
+    assert actual == expected
+
+
+def test_walk_files(fixture_path):
+    path = fixture_path / "helpers"
+
+    actual = list(helpers.walk_files(path))
+
+    # Ensure paths start with the root
+    assert all(p.startswith(path.as_posix()) for p in actual)
+
+
+class Test_write_file_if_changed:
+    def test_src_and_dst_match(self, tmp_path):
+        text = "A files are unique.\n"
+        initial = text
+        dst = tmp_path / "file-a.txt"
+        dst.write_text(initial)
+
+        helpers.write_file_if_changed(dst, text)
+
+        assert dst.read_text() == text
+
+    def test_src_and_dst_do_not_match(self, tmp_path):
+        text = "A files are unique.\n"
+        initial = "B files are unique.\n"
+        dst = tmp_path / "file-a.txt"
+        dst.write_text(initial)
+
+        helpers.write_file_if_changed(dst, text)
+
+        assert dst.read_text() == text
+
+    def test_dst_does_not_exist(self, tmp_path):
+        text = "A files are unique.\n"
+        dst = tmp_path / "file-a.txt"
+
+        helpers.write_file_if_changed(dst, text)
+
+        assert dst.read_text() == text
+
+
+class Test_copy_file_if_changed:
+    def test_src_and_dst_match(self, tmp_path, fixture_path):
+        src = fixture_path / "helpers" / "file-a.txt"
+        initial = fixture_path / "helpers" / "file-a.txt"
+        dst = tmp_path / "file-a.txt"
+
+        dst.write_text(initial.read_text())
+
+        helpers.copy_file_if_changed(src, dst)
+
+    def test_src_and_dst_do_not_match(self, tmp_path, fixture_path):
+        src = fixture_path / "helpers" / "file-a.txt"
+        initial = fixture_path / "helpers" / "file-c.txt"
+        dst = tmp_path / "file-a.txt"
+
+        dst.write_text(initial.read_text())
+
+        helpers.copy_file_if_changed(src, dst)
+
+        assert src.read_text() == dst.read_text()
+
+    def test_dst_does_not_exist(self, tmp_path, fixture_path):
+        src = fixture_path / "helpers" / "file-a.txt"
+        dst = tmp_path / "file-a.txt"
+
+        helpers.copy_file_if_changed(src, dst)
+
+        assert dst.exists()
+        assert src.read_text() == dst.read_text()
+
+
+@pytest.mark.parametrize("file1, file2, expected", (
+        # Same file
+        ("file-a.txt", "file-a.txt", True),
+        # Different files, different size
+        ("file-a.txt", "file-b_1.txt", False),
+        # Different files, same size
+        ("file-a.txt", "file-c.txt", False),
+        # Same files
+        ("file-b_1.txt", "file-b_2.txt", True),
+        # Not a file
+        ("file-a.txt", "", False),
+        # File doesn't exist
+        ("file-a.txt", "file-d.txt", False),
+))
+def test_file_compare(fixture_path, file1, file2, expected):
+    path1 = fixture_path / "helpers" / file1
+    path2 = fixture_path / "helpers" / file2
+
+    actual = helpers.file_compare(path1, path2)
+
+    assert actual == expected
diff --git a/tests/unit_tests/test_pins.py b/tests/unit_tests/test_pins.py
new file mode 100644
index 0000000000..606c20eea2
--- /dev/null
+++ b/tests/unit_tests/test_pins.py
@@ -0,0 +1,326 @@
+"""
+Please Note:
+
+These tests cover the process of identifying information about pins, they do not
+check if the definition of MCUs and pins is correct.
+
+"""
+import logging
+
+import pytest
+
+from esphome.config_validation import Invalid
+from esphome.core import EsphomeCore
+from esphome import pins
+
+
+MOCK_ESP8266_BOARD_ID = "_mock_esp8266"
+MOCK_ESP8266_PINS = {'X0': 16, 'X1': 5, 'X2': 4, 'LED': 2}
+MOCK_ESP8266_BOARD_ALIAS_ID = "_mock_esp8266_alias"
+MOCK_ESP8266_FLASH_SIZE = pins.FLASH_SIZE_2_MB
+
+MOCK_ESP32_BOARD_ID = "_mock_esp32"
+MOCK_ESP32_PINS = {'Y0': 12, 'Y1': 8, 'Y2': 3, 'LED': 9, "A0": 8}
+MOCK_ESP32_BOARD_ALIAS_ID = "_mock_esp32_alias"
+
+UNKNOWN_PLATFORM = "STM32"
+
+
+@pytest.fixture
+def mock_mcu(monkeypatch):
+    """
+    Add a mock MCU into the lists as a stable fixture
+    """
+    pins.ESP8266_BOARD_PINS[MOCK_ESP8266_BOARD_ID] = MOCK_ESP8266_PINS
+    pins.ESP8266_FLASH_SIZES[MOCK_ESP8266_BOARD_ID] = MOCK_ESP8266_FLASH_SIZE
+    pins.ESP8266_BOARD_PINS[MOCK_ESP8266_BOARD_ALIAS_ID] = MOCK_ESP8266_BOARD_ID
+    pins.ESP8266_FLASH_SIZES[MOCK_ESP8266_BOARD_ALIAS_ID] = MOCK_ESP8266_FLASH_SIZE
+    pins.ESP32_BOARD_PINS[MOCK_ESP32_BOARD_ID] = MOCK_ESP32_PINS
+    pins.ESP32_BOARD_PINS[MOCK_ESP32_BOARD_ALIAS_ID] = MOCK_ESP32_BOARD_ID
+    yield
+    del pins.ESP8266_BOARD_PINS[MOCK_ESP8266_BOARD_ID]
+    del pins.ESP8266_FLASH_SIZES[MOCK_ESP8266_BOARD_ID]
+    del pins.ESP8266_BOARD_PINS[MOCK_ESP8266_BOARD_ALIAS_ID]
+    del pins.ESP8266_FLASH_SIZES[MOCK_ESP8266_BOARD_ALIAS_ID]
+    del pins.ESP32_BOARD_PINS[MOCK_ESP32_BOARD_ID]
+    del pins.ESP32_BOARD_PINS[MOCK_ESP32_BOARD_ALIAS_ID]
+
+
+@pytest.fixture
+def core(monkeypatch, mock_mcu):
+    core = EsphomeCore()
+    monkeypatch.setattr(pins, "CORE", core)
+    return core
+
+
+@pytest.fixture
+def core_esp8266(core):
+    core.esp_platform = "ESP8266"
+    core.board = MOCK_ESP8266_BOARD_ID
+    return core
+
+
+@pytest.fixture
+def core_esp32(core):
+    core.esp_platform = "ESP32"
+    core.board = MOCK_ESP32_BOARD_ID
+    return core
+
+
+class Test_lookup_pin:
+    @pytest.mark.parametrize("value, expected", (
+            ("X1", 5),
+            ("MOSI", 13),
+    ))
+    def test_valid_esp8266_pin(self, core_esp8266, value, expected):
+        actual = pins._lookup_pin(value)
+
+        assert actual == expected
+
+    def test_valid_esp8266_pin_alias(self, core_esp8266):
+        core_esp8266.board = MOCK_ESP8266_BOARD_ALIAS_ID
+
+        actual = pins._lookup_pin("X2")
+
+        assert actual == 4
+
+    @pytest.mark.parametrize("value, expected", (
+            ("Y1", 8),
+            ("A0", 8),
+            ("MOSI", 23),
+    ))
+    def test_valid_esp32_pin(self, core_esp32, value, expected):
+        actual = pins._lookup_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.xfail(reason="This may be expected")
+    def test_valid_32_pin_alias(self, core_esp32):
+        core_esp32.board = MOCK_ESP32_BOARD_ALIAS_ID
+
+        actual = pins._lookup_pin("Y2")
+
+        assert actual == 3
+
+    def test_invalid_pin(self, core_esp8266):
+        with pytest.raises(Invalid, match="Cannot resolve pin name 'X42' for board _mock_esp8266."):
+            pins._lookup_pin("X42")
+
+    def test_unsupported_platform(self, core):
+        core.esp_platform = UNKNOWN_PLATFORM
+
+        with pytest.raises(NotImplementedError):
+            pins._lookup_pin("TX")
+
+
+class Test_translate_pin:
+    @pytest.mark.parametrize("value, expected", (
+            (2, 2),
+            ("3", 3),
+            ("GPIO4", 4),
+            ("TX", 1),
+            ("Y0", 12),
+    ))
+    def test_valid_values(self, core_esp32, value, expected):
+        actual = pins._translate_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("value", ({}, None))
+    def test_invalid_values(self, core_esp32, value):
+        with pytest.raises(Invalid, match="This variable only supports"):
+            pins._translate_pin(value)
+
+
+class Test_validate_gpio_pin:
+    def test_esp32_valid(self, core_esp32):
+        actual = pins.validate_gpio_pin("GPIO22")
+
+        assert actual == 22
+
+    @pytest.mark.parametrize("value, match", (
+            (-1, "ESP32: Invalid pin number: -1"),
+            (40, "ESP32: Invalid pin number: 40"),
+            (6, "This pin cannot be used on ESP32s and"),
+            (7, "This pin cannot be used on ESP32s and"),
+            (8, "This pin cannot be used on ESP32s and"),
+            (11, "This pin cannot be used on ESP32s and"),
+            (20, "The pin GPIO20 is not usable on ESP32s"),
+            (24, "The pin GPIO24 is not usable on ESP32s"),
+            (28, "The pin GPIO28 is not usable on ESP32s"),
+            (29, "The pin GPIO29 is not usable on ESP32s"),
+            (30, "The pin GPIO30 is not usable on ESP32s"),
+            (31, "The pin GPIO31 is not usable on ESP32s"),
+    ))
+    def test_esp32_invalid_pin(self, core_esp32, value, match):
+        with pytest.raises(Invalid, match=match):
+            pins.validate_gpio_pin(value)
+
+    @pytest.mark.parametrize("value", (9, 10))
+    def test_esp32_warning(self, core_esp32, caplog, value):
+        caplog.at_level(logging.WARNING)
+        pins.validate_gpio_pin(value)
+
+        assert len(caplog.messages) == 1
+        assert caplog.messages[0].endswith("flash interface in QUAD IO flash mode.")
+
+    def test_esp8266_valid(self, core_esp8266):
+        actual = pins.validate_gpio_pin("GPIO12")
+
+        assert actual == 12
+
+    @pytest.mark.parametrize("value, match", (
+            (-1, "ESP8266: Invalid pin number: -1"),
+            (18, "ESP8266: Invalid pin number: 18"),
+            (6, "This pin cannot be used on ESP8266s and"),
+            (7, "This pin cannot be used on ESP8266s and"),
+            (8, "This pin cannot be used on ESP8266s and"),
+            (11, "This pin cannot be used on ESP8266s and"),
+    ))
+    def test_esp8266_invalid_pin(self, core_esp8266, value, match):
+        with pytest.raises(Invalid, match=match):
+            pins.validate_gpio_pin(value)
+
+    @pytest.mark.parametrize("value", (9, 10))
+    def test_esp8266_warning(self, core_esp8266, caplog, value):
+        caplog.at_level(logging.WARNING)
+        pins.validate_gpio_pin(value)
+
+        assert len(caplog.messages) == 1
+        assert caplog.messages[0].endswith("flash interface in QUAD IO flash mode.")
+
+    def test_unknown_device(self, core):
+        core.esp_platform = UNKNOWN_PLATFORM
+
+        with pytest.raises(NotImplementedError):
+            pins.validate_gpio_pin("0")
+
+
+class Test_input_pin:
+    @pytest.mark.parametrize("value, expected", (
+            ("X0", 16),
+    ))
+    def test_valid_esp8266_values(self, core_esp8266, value, expected):
+        actual = pins.input_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("value, expected", (
+            ("Y0", 12),
+            (17, 17),
+    ))
+    def test_valid_esp32_values(self, core_esp32, value, expected):
+        actual = pins.input_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("value", (17,))
+    def test_invalid_esp8266_values(self, core_esp8266, value):
+        with pytest.raises(Invalid):
+            pins.input_pin(value)
+
+    def test_unknown_platform(self, core):
+        core.esp_platform = UNKNOWN_PLATFORM
+
+        with pytest.raises(NotImplementedError):
+            pins.input_pin(2)
+
+
+class Test_input_pullup_pin:
+    @pytest.mark.parametrize("value, expected", (
+            ("X0", 16),
+    ))
+    def test_valid_esp8266_values(self, core_esp8266, value, expected):
+        actual = pins.input_pullup_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("value, expected", (
+            ("Y0", 12),
+            (17, 17),
+    ))
+    def test_valid_esp32_values(self, core_esp32, value, expected):
+        actual = pins.input_pullup_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("value", (0,))
+    def test_invalid_esp8266_values(self, core_esp8266, value):
+        with pytest.raises(Invalid):
+            pins.input_pullup_pin(value)
+
+    def test_unknown_platform(self, core):
+        core.esp_platform = UNKNOWN_PLATFORM
+
+        with pytest.raises(NotImplementedError):
+            pins.input_pullup_pin(2)
+
+
+class Test_output_pin:
+    @pytest.mark.parametrize("value, expected", (
+            ("X0", 16),
+    ))
+    def test_valid_esp8266_values(self, core_esp8266, value, expected):
+        actual = pins.output_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("value, expected", (
+            ("Y0", 12),
+            (17, 17),
+    ))
+    def test_valid_esp32_values(self, core_esp32, value, expected):
+        actual = pins.output_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("value", (17,))
+    def test_invalid_esp8266_values(self, core_esp8266, value):
+        with pytest.raises(Invalid):
+            pins.output_pin(value)
+
+    @pytest.mark.parametrize("value", range(34, 40))
+    def test_invalid_esp32_values(self, core_esp32, value):
+        with pytest.raises(Invalid):
+            pins.output_pin(value)
+
+    def test_unknown_platform(self, core):
+        core.esp_platform = UNKNOWN_PLATFORM
+
+        with pytest.raises(NotImplementedError):
+            pins.output_pin(2)
+
+
+class Test_analog_pin:
+    @pytest.mark.parametrize("value, expected", (
+            (17, 17),
+    ))
+    def test_valid_esp8266_values(self, core_esp8266, value, expected):
+        actual = pins.analog_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("value, expected", (
+            (32, 32),
+            (39, 39),
+    ))
+    def test_valid_esp32_values(self, core_esp32, value, expected):
+        actual = pins.analog_pin(value)
+
+        assert actual == expected
+
+    @pytest.mark.parametrize("value", ("X0",))
+    def test_invalid_esp8266_values(self, core_esp8266, value):
+        with pytest.raises(Invalid):
+            pins.analog_pin(value)
+
+    @pytest.mark.parametrize("value", ("Y0",))
+    def test_invalid_esp32_values(self, core_esp32, value):
+        with pytest.raises(Invalid):
+            pins.analog_pin(value)
+
+    def test_unknown_platform(self, core):
+        core.esp_platform = UNKNOWN_PLATFORM
+
+        with pytest.raises(NotImplementedError):
+            pins.analog_pin(2)

From 4cb30a22ac804124e2198784e34bd6c575ed5d96 Mon Sep 17 00:00:00 2001
From: John <34163498+CircuitSetup@users.noreply.github.com>
Date: Fri, 13 Mar 2020 13:27:19 -0400
Subject: [PATCH 173/412] Corrections to default register values of ATM90E32
 component (#982)

* Corrections to default register values of ATM90E32 component
---
 esphome/components/atm90e32/atm90e32.cpp   | 27 ++++++++++++++--------
 esphome/components/atm90e32/atm90e32.h     |  6 +++--
 esphome/components/atm90e32/atm90e32_reg.h | 12 +++++-----
 esphome/components/atm90e32/sensor.py      | 11 +++++++--
 tests/test1.yaml                           | 15 ++++++------
 5 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/esphome/components/atm90e32/atm90e32.cpp b/esphome/components/atm90e32/atm90e32.cpp
index bc1e326147..85e38fce3e 100644
--- a/esphome/components/atm90e32/atm90e32.cpp
+++ b/esphome/components/atm90e32/atm90e32.cpp
@@ -68,12 +68,17 @@ void ATM90E32Component::update() {
 }
 
 void ATM90E32Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up ATM90E32Component...");
+  ESP_LOGCONFIG(TAG, "Setting up ATM90E32 Component...");
   this->spi_setup();
 
-  uint16_t mmode0 = 0x185;
+  uint16_t mmode0 = 0x87;  // 3P4W 50Hz
   if (line_freq_ == 60) {
-    mmode0 |= 1 << 12;
+    mmode0 |= 1 << 12;  // sets 12th bit to 1, 60Hz
+  }
+
+  if (current_phases_ == 2) {
+    mmode0 |= 1 << 8;  // sets 8th bit to 1, 3P3W
+    mmode0 |= 0 << 1;  // sets 1st bit to 0, phase b is not counted into the all-phase sum energy/power (P/Q/S)
   }
 
   this->write16_(ATM90E32_REGISTER_SOFTRESET, 0x789A);    // Perform soft reset
@@ -84,13 +89,15 @@ void ATM90E32Component::setup() {
     this->mark_failed();
     return;
   }
-
-  this->write16_(ATM90E32_REGISTER_ZXCONFIG, 0x0A55);                    // ZX2, ZX1, ZX0 pin config
-  this->write16_(ATM90E32_REGISTER_MMODE0, mmode0);                      // Mode Config (frequency set in main program)
-  this->write16_(ATM90E32_REGISTER_MMODE1, pga_gain_);                   // PGA Gain Configuration for Current Channels
-  this->write16_(ATM90E32_REGISTER_PSTARTTH, 0x0AFC);                    // Active Startup Power Threshold = 50%
-  this->write16_(ATM90E32_REGISTER_QSTARTTH, 0x0AEC);                    // Reactive Startup Power Threshold = 50%
-  this->write16_(ATM90E32_REGISTER_PPHASETH, 0x00BC);                    // Active Phase Threshold = 10%
+  this->write16_(ATM90E32_REGISTER_PLCONSTH, 0x0861);   // PL Constant MSB (default) = 140625000
+  this->write16_(ATM90E32_REGISTER_PLCONSTL, 0xC468);   // PL Constant LSB (default)
+  this->write16_(ATM90E32_REGISTER_ZXCONFIG, 0xD654);   // ZX2, ZX1, ZX0 pin config
+  this->write16_(ATM90E32_REGISTER_MMODE0, mmode0);     // Mode Config (frequency set in main program)
+  this->write16_(ATM90E32_REGISTER_MMODE1, pga_gain_);  // PGA Gain Configuration for Current Channels
+  this->write16_(ATM90E32_REGISTER_PSTARTTH, 0x1D4C);   // All Active Startup Power Threshold - 0.02A/0.00032 = 7500
+  this->write16_(ATM90E32_REGISTER_QSTARTTH, 0x1D4C);   // All Reactive Startup Power Threshold - 50%
+  this->write16_(ATM90E32_REGISTER_PPHASETH, 0x02EE);   // Each Phase Active Phase Threshold - 0.002A/0.00032 = 750
+  this->write16_(ATM90E32_REGISTER_QPHASETH, 0x02EE);   // Each phase Reactive Phase Threshold - 10%
   this->write16_(ATM90E32_REGISTER_UGAINA, this->phase_[0].volt_gain_);  // A Voltage rms gain
   this->write16_(ATM90E32_REGISTER_IGAINA, this->phase_[0].ct_gain_);    // A line current gain
   this->write16_(ATM90E32_REGISTER_UGAINB, this->phase_[1].volt_gain_);  // B Voltage rms gain
diff --git a/esphome/components/atm90e32/atm90e32.h b/esphome/components/atm90e32/atm90e32.h
index 3daa31d15d..eb5de3878c 100644
--- a/esphome/components/atm90e32/atm90e32.h
+++ b/esphome/components/atm90e32/atm90e32.h
@@ -29,6 +29,7 @@ class ATM90E32Component : public PollingComponent,
     chip_temperature_sensor_ = chip_temperature_sensor;
   }
   void set_line_freq(int freq) { line_freq_ = freq; }
+  void set_current_phases(int phases) { current_phases_ = phases; }
   void set_pga_gain(uint16_t gain) { pga_gain_ = gain; }
 
  protected:
@@ -55,8 +56,8 @@ class ATM90E32Component : public PollingComponent,
   float get_chip_temperature_();
 
   struct ATM90E32Phase {
-    uint16_t volt_gain_{41820};
-    uint16_t ct_gain_{25498};
+    uint16_t volt_gain_{7305};
+    uint16_t ct_gain_{27961};
     sensor::Sensor *voltage_sensor_{nullptr};
     sensor::Sensor *current_sensor_{nullptr};
     sensor::Sensor *power_sensor_{nullptr};
@@ -67,6 +68,7 @@ class ATM90E32Component : public PollingComponent,
   sensor::Sensor *chip_temperature_sensor_{nullptr};
   uint16_t pga_gain_{0x15};
   int line_freq_{60};
+  int current_phases_{3};
 };
 
 }  // namespace atm90e32
diff --git a/esphome/components/atm90e32/atm90e32_reg.h b/esphome/components/atm90e32/atm90e32_reg.h
index ca3715a2a8..dc2048fbc2 100644
--- a/esphome/components/atm90e32/atm90e32_reg.h
+++ b/esphome/components/atm90e32/atm90e32_reg.h
@@ -234,12 +234,12 @@ static const uint16_t ATM90E32_REGISTER_IRMSBLSB = 0xEE;    // Lower Word (B RMS
 static const uint16_t ATM90E32_REGISTER_IRMSCLSB = 0xEF;    // Lower Word (C RMS Current)
 
 /* THD, FREQUENCY, ANGLE & TEMPTEMP REGISTERS*/
-static const uint16_t ATM90E32_REGISTER_THDNUA = 0xF1;   // A Voltage THD+N
-static const uint16_t ATM90E32_REGISTER_THDNUB = 0xF2;   // B Voltage THD+N
-static const uint16_t ATM90E32_REGISTER_THDNUC = 0xF3;   // C Voltage THD+N
-static const uint16_t ATM90E32_REGISTER_THDNIA = 0xF5;   // A Current THD+N
-static const uint16_t ATM90E32_REGISTER_THDNIB = 0xF6;   // B Current THD+N
-static const uint16_t ATM90E32_REGISTER_THDNIC = 0xF7;   // C Current THD+N
+static const uint16_t ATM90E32_REGISTER_UPEAKA = 0xF1;   // A Voltage Peak
+static const uint16_t ATM90E32_REGISTER_UPEAKB = 0xF2;   // B Voltage Peak
+static const uint16_t ATM90E32_REGISTER_UPEAKC = 0xF3;   // C Voltage Peak
+static const uint16_t ATM90E32_REGISTER_IPEAKA = 0xF5;   // A Current Peak
+static const uint16_t ATM90E32_REGISTER_IPEAKB = 0xF6;   // B Current Peak
+static const uint16_t ATM90E32_REGISTER_IPEAKC = 0xF7;   // C Current Peak
 static const uint16_t ATM90E32_REGISTER_FREQ = 0xF8;     // Frequency
 static const uint16_t ATM90E32_REGISTER_PANGLEA = 0xF9;  // A Mean Phase Angle
 static const uint16_t ATM90E32_REGISTER_PANGLEB = 0xFA;  // B Mean Phase Angle
diff --git a/esphome/components/atm90e32/sensor.py b/esphome/components/atm90e32/sensor.py
index 490fdb4719..fc526dfbc0 100644
--- a/esphome/components/atm90e32/sensor.py
+++ b/esphome/components/atm90e32/sensor.py
@@ -14,12 +14,17 @@ CONF_REACTIVE_POWER = 'reactive_power'
 CONF_LINE_FREQUENCY = 'line_frequency'
 CONF_CHIP_TEMPERATURE = 'chip_temperature'
 CONF_GAIN_PGA = 'gain_pga'
+CONF_CURRENT_PHASES = 'current_phases'
 CONF_GAIN_VOLTAGE = 'gain_voltage'
 CONF_GAIN_CT = 'gain_ct'
 LINE_FREQS = {
     '50HZ': 50,
     '60HZ': 60,
 }
+CURRENT_PHASES = {
+    '2': 2,
+    '3': 3,
+}
 PGA_GAINS = {
     '1X': 0x0,
     '2X': 0x15,
@@ -36,8 +41,8 @@ ATM90E32_PHASE_SCHEMA = cv.Schema({
     cv.Optional(CONF_REACTIVE_POWER): sensor.sensor_schema(UNIT_VOLT_AMPS_REACTIVE,
                                                            ICON_LIGHTBULB, 2),
     cv.Optional(CONF_POWER_FACTOR): sensor.sensor_schema(UNIT_EMPTY, ICON_FLASH, 2),
-    cv.Optional(CONF_GAIN_VOLTAGE, default=41820): cv.uint16_t,
-    cv.Optional(CONF_GAIN_CT, default=25498): cv.uint16_t,
+    cv.Optional(CONF_GAIN_VOLTAGE, default=7305): cv.uint16_t,
+    cv.Optional(CONF_GAIN_CT, default=27961): cv.uint16_t,
 })
 
 CONFIG_SCHEMA = cv.Schema({
@@ -48,6 +53,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(UNIT_HERTZ, ICON_CURRENT_AC, 1),
     cv.Optional(CONF_CHIP_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
     cv.Required(CONF_LINE_FREQUENCY): cv.enum(LINE_FREQS, upper=True),
+    cv.Optional(CONF_CURRENT_PHASES, default='3'): cv.enum(CURRENT_PHASES, upper=True),
     cv.Optional(CONF_GAIN_PGA, default='2X'): cv.enum(PGA_GAINS, upper=True),
 }).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
 
@@ -85,4 +91,5 @@ def to_code(config):
         sens = yield sensor.new_sensor(config[CONF_CHIP_TEMPERATURE])
         cg.add(var.set_chip_temperature_sensor(sens))
     cg.add(var.set_line_freq(config[CONF_LINE_FREQUENCY]))
+    cg.add(var.set_current_phases(config[CONF_CURRENT_PHASES]))
     cg.add(var.set_pga_gain(config[CONF_GAIN_PGA]))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b3b397ddb1..9102873fb6 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -265,8 +265,8 @@ sensor:
         name: "EMON Reactive Power CT1"
       power_factor:
         name: "EMON Power Factor CT1"
-      gain_voltage: 47660
-      gain_ct: 12577
+      gain_voltage: 7305
+      gain_ct: 27961
     phase_b:
       current:
         name: "EMON CT2 Current"
@@ -276,8 +276,8 @@ sensor:
         name: "EMON Reactive Power CT2"
       power_factor:
         name: "EMON Power Factor CT2"
-      gain_voltage: 47660
-      gain_ct: 12577
+      gain_voltage: 7305
+      gain_ct: 27961
     phase_c:
       current:
         name: "EMON CT3 Current"
@@ -287,13 +287,14 @@ sensor:
         name: "EMON Reactive Power CT3"
       power_factor:
         name: "EMON Power Factor CT3"
-      gain_voltage: 47660
-      gain_ct: 12577
+      gain_voltage: 7305
+      gain_ct: 27961
     frequency:
       name: "EMON Line Frequency"
     chip_temperature:
       name: "EMON Chip Temp A"
-    line_frequency: 50Hz
+    line_frequency: 60Hz
+    current_phases: 3
     gain_pga: 2X
   - platform: bh1750
     name: "Living Room Brightness 3"

From 4ec636c08feb2e4d7aecf37e33580f2371df3903 Mon Sep 17 00:00:00 2001
From: Germain Masse <gmasse@users.noreply.github.com>
Date: Sat, 21 Mar 2020 19:31:07 +0100
Subject: [PATCH 174/412] Add AHT10 sensor (#949)

---
 esphome/components/aht10/__init__.py |   0
 esphome/components/aht10/aht10.cpp   | 127 +++++++++++++++++++++++++++
 esphome/components/aht10/aht10.h     |  26 ++++++
 esphome/components/aht10/sensor.py   |  30 +++++++
 tests/test3.yaml                     |   5 ++
 5 files changed, 188 insertions(+)
 create mode 100644 esphome/components/aht10/__init__.py
 create mode 100644 esphome/components/aht10/aht10.cpp
 create mode 100644 esphome/components/aht10/aht10.h
 create mode 100644 esphome/components/aht10/sensor.py

diff --git a/esphome/components/aht10/__init__.py b/esphome/components/aht10/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/aht10/aht10.cpp b/esphome/components/aht10/aht10.cpp
new file mode 100644
index 0000000000..6951254e0d
--- /dev/null
+++ b/esphome/components/aht10/aht10.cpp
@@ -0,0 +1,127 @@
+// Implementation based on:
+//  - AHT10: https://github.com/Thinary/AHT10
+//  - Official Datasheet (cn):
+//  http://www.aosong.com/userfiles/files/media/aht10%E8%A7%84%E6%A0%BC%E4%B9%A6v1_1%EF%BC%8820191015%EF%BC%89.pdf
+//  - Unofficial Translated Datasheet (en):
+//  https://wiki.liutyi.info/download/attachments/30507639/Aosong_AHT10_en_draft_0c.pdf
+//
+// When configured for humidity, the log 'Components should block for at most 20-30ms in loop().' will be generated in
+// verbose mode. This is due to technical specs of the sensor and can not be avoided.
+//
+// According to the datasheet, the component is supposed to respond in more than 75ms. In fact, it can answer almost
+// immediately for temperature. But for humidity, it takes >90ms to get a valid data. From experience, we have best
+// results making successive requests; the current implementation make 3 attemps with a delay of 30ms each time.
+
+#include "aht10.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace aht10 {
+
+static const char *TAG = "aht10";
+static const uint8_t AHT10_CALIBRATE_CMD[] = {0xE1};
+static const uint8_t AHT10_MEASURE_CMD[] = {0xAC, 0x33, 0x00};
+static const uint8_t AHT10_DEFAULT_DELAY = 5;    // ms, for calibration and temperature measurement
+static const uint8_t AHT10_HUMIDITY_DELAY = 30;  // ms
+static const uint8_t AHT10_ATTEMPS = 3;          // safety margin, normally 3 attemps are enough: 3*30=90ms
+
+void AHT10Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up AHT10...");
+
+  if (!this->write_bytes(0, AHT10_CALIBRATE_CMD, sizeof(AHT10_CALIBRATE_CMD))) {
+    ESP_LOGE(TAG, "Communication with AHT10 failed!");
+    this->mark_failed();
+    return;
+  }
+  uint8_t data;
+  if (!this->read_byte(0, &data, AHT10_DEFAULT_DELAY)) {
+    ESP_LOGD(TAG, "Communication with AHT10 failed!");
+    this->mark_failed();
+    return;
+  }
+  if ((data & 0x68) != 0x08) {  // Bit[6:5] = 0b00, NORMAL mode and Bit[3] = 0b1, CALIBRATED
+    ESP_LOGE(TAG, "AHT10 calibration failed!");
+    this->mark_failed();
+    return;
+  }
+
+  ESP_LOGV(TAG, "AHT10 calibrated");
+}
+
+void AHT10Component::update() {
+  if (!this->write_bytes(0, AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD))) {
+    ESP_LOGE(TAG, "Communication with AHT10 failed!");
+    this->status_set_warning();
+    return;
+  }
+  uint8_t data[6];
+  uint8_t delay = AHT10_DEFAULT_DELAY;
+  if (this->humidity_sensor_ != nullptr)
+    delay = AHT10_HUMIDITY_DELAY;
+  for (int i = 0; i < AHT10_ATTEMPS; ++i) {
+    ESP_LOGVV(TAG, "Attemps %u at %6ld", i, millis());
+    if (!this->read_bytes(0, data, 6, delay)) {
+      ESP_LOGD(TAG, "Communication with AHT10 failed, waiting...");
+    } else if ((data[0] & 0x80) == 0x80) {  // Bit[7] = 0b1, device is busy
+      ESP_LOGD(TAG, "AHT10 is busy, waiting...");
+    } else if (data[1] == 0x0 && data[2] == 0x0 && (data[3] >> 4) == 0x0) {
+      // Unrealistic humidity (0x0)
+      if (this->humidity_sensor_ == nullptr) {
+        ESP_LOGVV(TAG, "ATH10 Unrealistic humidity (0x0), but humidity is not required");
+        break;
+      } else {
+        ESP_LOGD(TAG, "ATH10 Unrealistic humidity (0x0), retrying...");
+        if (!this->write_bytes(0, AHT10_MEASURE_CMD, sizeof(AHT10_MEASURE_CMD))) {
+          ESP_LOGE(TAG, "Communication with AHT10 failed!");
+          this->status_set_warning();
+          return;
+        }
+      }
+    } else {
+      // data is valid, we can break the loop
+      ESP_LOGVV(TAG, "Answer at %6ld", millis());
+      break;
+    }
+  }
+  if ((data[0] & 0x80) == 0x80) {
+    ESP_LOGE(TAG, "Measurements reading timed-out!");
+    this->status_set_warning();
+    return;
+  }
+
+  uint32_t raw_temperature = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
+  uint32_t raw_humidity = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
+
+  float temperature = ((200.0 * (float) raw_temperature) / 1048576.0) - 50.0;
+  float humidity;
+  if (raw_humidity == 0) {  // unrealistic value
+    humidity = NAN;
+  } else {
+    humidity = (float) raw_humidity * 100.0 / 1048576.0;
+  }
+
+  if (this->temperature_sensor_ != nullptr) {
+    this->temperature_sensor_->publish_state(temperature);
+  }
+  if (this->humidity_sensor_ != nullptr) {
+    if (isnan(humidity))
+      ESP_LOGW(TAG, "Invalid humidity! Sensor reported 0%% Hum");
+    this->humidity_sensor_->publish_state(humidity);
+  }
+  this->status_clear_warning();
+}
+
+float AHT10Component::get_setup_priority() const { return setup_priority::DATA; }
+
+void AHT10Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "AHT10:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with AHT10 failed!");
+  }
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
+}
+
+}  // namespace aht10
+}  // namespace esphome
diff --git a/esphome/components/aht10/aht10.h b/esphome/components/aht10/aht10.h
new file mode 100644
index 0000000000..bfb6b07a7a
--- /dev/null
+++ b/esphome/components/aht10/aht10.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace aht10 {
+
+class AHT10Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void setup() override;
+  void update() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
+  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { humidity_sensor_ = humidity_sensor; }
+
+ protected:
+  sensor::Sensor *temperature_sensor_;
+  sensor::Sensor *humidity_sensor_;
+};
+
+}  // namespace aht10
+}  // namespace esphome
diff --git a/esphome/components/aht10/sensor.py b/esphome/components/aht10/sensor.py
new file mode 100644
index 0000000000..71b0adce79
--- /dev/null
+++ b/esphome/components/aht10/sensor.py
@@ -0,0 +1,30 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import CONF_HUMIDITY, CONF_ID, CONF_TEMPERATURE, \
+    UNIT_CELSIUS, ICON_THERMOMETER, ICON_WATER_PERCENT, UNIT_PERCENT
+
+DEPENDENCIES = ['i2c']
+
+aht10_ns = cg.esphome_ns.namespace('aht10')
+AHT10Component = aht10_ns.class_('AHT10Component', cg.PollingComponent, i2c.I2CDevice)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(AHT10Component),
+    cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 2),
+    cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 2),
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x38))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield i2c.register_i2c_device(var, config)
+
+    if CONF_TEMPERATURE in config:
+        sens = yield sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature_sensor(sens))
+
+    if CONF_HUMIDITY in config:
+        sens = yield sensor.new_sensor(config[CONF_HUMIDITY])
+        cg.add(var.set_humidity_sensor(sens))
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 2e1dd3f078..9407cab687 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -221,6 +221,11 @@ sensor:
   - platform: homeassistant
     entity_id: sensor.hello_world
     id: ha_hello_world
+  - platform: aht10  
+    temperature:
+      name: "Temperature"
+    humidity:
+      name: "Humidity"
   - platform: am2320
     temperature:
       name: "Temperature"

From 25cdbacecc01a52eee82b34bcb68f8450ada33a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ab=C3=ADlio=20Costa?= <abmantis@users.noreply.github.com>
Date: Mon, 30 Mar 2020 18:32:48 +0100
Subject: [PATCH 175/412] wifi: retry connection if the connection is not valid
 (#994)

---
 esphome/components/wifi/wifi_component.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index e68ab1765b..40f12a8adc 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -420,6 +420,12 @@ void WiFiComponent::check_connecting_finished() {
   wl_status_t status = this->wifi_sta_status_();
 
   if (status == WL_CONNECTED) {
+    if (WiFi.SSID().equals("")) {
+      ESP_LOGW(TAG, "Incomplete connection.");
+      this->retry_connect();
+      return;
+    }
+
     ESP_LOGI(TAG, "WiFi Connected!");
     this->print_connect_params_();
 

From 4620ad612432a45d01a1cee7dffb249a3ef3f32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Biernacki?=
 <pax0r@users.noreply.github.com>
Date: Sat, 4 Apr 2020 23:23:23 +0200
Subject: [PATCH 176/412] Support for pcd8544 (nokia 5110 and 3310) screen
 (#973)

* First version of working compontent for pc8544 screen

* Fixed lint errors

* Fixed lint errors #2
---
 esphome/components/pcd8544/__init__.py  |   0
 esphome/components/pcd8544/display.py   |  39 ++++++++
 esphome/components/pcd8544/pcd_8544.cpp | 127 ++++++++++++++++++++++++
 esphome/components/pcd8544/pcd_8544.h   |  75 ++++++++++++++
 tests/test1.yaml                        |   6 ++
 5 files changed, 247 insertions(+)
 create mode 100644 esphome/components/pcd8544/__init__.py
 create mode 100644 esphome/components/pcd8544/display.py
 create mode 100644 esphome/components/pcd8544/pcd_8544.cpp
 create mode 100644 esphome/components/pcd8544/pcd_8544.h

diff --git a/esphome/components/pcd8544/__init__.py b/esphome/components/pcd8544/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/pcd8544/display.py b/esphome/components/pcd8544/display.py
new file mode 100644
index 0000000000..e47937e46a
--- /dev/null
+++ b/esphome/components/pcd8544/display.py
@@ -0,0 +1,39 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import display, spi
+from esphome.const import (
+    CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES, CONF_RESET_PIN, CONF_CS_PIN,
+)
+
+DEPENDENCIES = ['spi']
+
+pcd8544_ns = cg.esphome_ns.namespace('pcd8544')
+PCD8544 = pcd8544_ns.class_('PCD8544', cg.PollingComponent, display.DisplayBuffer, spi.SPIDevice)
+
+
+CONFIG_SCHEMA = cv.All(display.FULL_DISPLAY_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(PCD8544),
+    cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
+    cv.Required(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+    cv.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,  # CE
+}).extend(cv.polling_component_schema('1s')).extend(spi.SPI_DEVICE_SCHEMA),
+                       cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+
+    yield cg.register_component(var, config)
+    yield display.register_display(var, config)
+    yield spi.register_spi_device(var, config)
+
+    dc = yield cg.gpio_pin_expression(config[CONF_DC_PIN])
+    cg.add(var.set_dc_pin(dc))
+    reset = yield cg.gpio_pin_expression(config[CONF_RESET_PIN])
+    cg.add(var.set_reset_pin(reset))
+
+    if CONF_LAMBDA in config:
+        lambda_ = yield cg.process_lambda(config[CONF_LAMBDA], [(display.DisplayBufferRef, 'it')],
+                                          return_type=cg.void)
+        cg.add(var.set_writer(lambda_))
diff --git a/esphome/components/pcd8544/pcd_8544.cpp b/esphome/components/pcd8544/pcd_8544.cpp
new file mode 100644
index 0000000000..ed9d1bbd43
--- /dev/null
+++ b/esphome/components/pcd8544/pcd_8544.cpp
@@ -0,0 +1,127 @@
+#include "pcd_8544.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace pcd8544 {
+
+static const char *TAG = "pcd_8544";
+
+void PCD8544::setup_pins_() {
+  this->spi_setup();
+  this->init_reset_();
+  this->dc_pin_->setup();
+}
+
+void PCD8544::init_reset_() {
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(true);
+    delay(1);
+    // Trigger Reset
+    this->reset_pin_->digital_write(false);
+    delay(10);
+    // Wake up
+    this->reset_pin_->digital_write(true);
+  }
+}
+
+void PCD8544::initialize() {
+  this->init_internal_(this->get_buffer_length_());
+
+  this->command(this->PCD8544_FUNCTIONSET | this->PCD8544_EXTENDEDINSTRUCTION);
+  // LCD bias select (4 is optimal?)
+  this->command(this->PCD8544_SETBIAS | 0x04);
+
+  // contrast
+  // TODO: in future version we may add a user a control over contrast
+  this->command(this->PCD8544_SETVOP | 0x7f);  // Experimentally determined
+
+  // normal mode
+  this->command(this->PCD8544_FUNCTIONSET);
+
+  // Set display to Normal
+  this->command(this->PCD8544_DISPLAYCONTROL | this->PCD8544_DISPLAYNORMAL);
+}
+
+void PCD8544::start_command_() {
+  this->dc_pin_->digital_write(false);
+  this->enable();
+}
+void PCD8544::end_command_() { this->disable(); }
+void PCD8544::start_data_() {
+  this->dc_pin_->digital_write(true);
+  this->enable();
+}
+void PCD8544::end_data_() { this->disable(); }
+
+int PCD8544::get_width_internal() { return 84; }
+int PCD8544::get_height_internal() { return 48; }
+
+size_t PCD8544::get_buffer_length_() {
+  return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) / 8u;
+}
+
+void HOT PCD8544::display() {
+  uint8_t col, maxcol, p;
+
+  for (p = 0; p < 6; p++) {
+    this->command(this->PCD8544_SETYADDR | p);
+
+    // start at the beginning of the row
+    col = 0;
+    maxcol = this->get_width_internal() - 1;
+
+    this->command(this->PCD8544_SETXADDR | col);
+
+    this->start_data_();
+    for (; col <= maxcol; col++) {
+      this->write_byte(this->buffer_[(this->get_width_internal() * p) + col]);
+    }
+    this->end_data_();
+  }
+
+  this->command(this->PCD8544_SETYADDR);
+}
+
+void HOT PCD8544::draw_absolute_pixel_internal(int x, int y, int color) {
+  if (x >= this->get_width_internal() || y >= this->get_height_internal() || x < 0 || y < 0) {
+    return;
+  }
+
+  uint16_t pos = x + (y / 8) * this->get_width_internal();
+  uint8_t subpos = y % 8;
+  if (color) {
+    this->buffer_[pos] |= (1 << subpos);
+  } else {
+    this->buffer_[pos] &= ~(1 << subpos);
+  }
+}
+
+void PCD8544::dump_config() {
+  LOG_DISPLAY("", "PCD8544", this);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void PCD8544::command(uint8_t value) {
+  this->start_command_();
+  this->write_byte(value);
+  this->end_command_();
+}
+
+void PCD8544::update() {
+  this->do_update_();
+  this->display();
+}
+
+void PCD8544::fill(int color) {
+  uint8_t fill = color ? 0xFF : 0x00;
+  for (uint32_t i = 0; i < this->get_buffer_length_(); i++)
+    this->buffer_[i] = fill;
+}
+
+}  // namespace pcd8544
+}  // namespace esphome
diff --git a/esphome/components/pcd8544/pcd_8544.h b/esphome/components/pcd8544/pcd_8544.h
new file mode 100644
index 0000000000..a1c247bf7b
--- /dev/null
+++ b/esphome/components/pcd8544/pcd_8544.h
@@ -0,0 +1,75 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/spi/spi.h"
+#include "esphome/components/display/display_buffer.h"
+
+namespace esphome {
+namespace pcd8544 {
+
+class PCD8544 : public PollingComponent,
+                public display::DisplayBuffer,
+                public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH, spi::CLOCK_PHASE_TRAILING,
+                                      spi::DATA_RATE_8MHZ> {
+ public:
+  const uint8_t PCD8544_POWERDOWN = 0x04;
+  const uint8_t PCD8544_ENTRYMODE = 0x02;
+  const uint8_t PCD8544_EXTENDEDINSTRUCTION = 0x01;
+
+  const uint8_t PCD8544_DISPLAYBLANK = 0x0;
+  const uint8_t PCD8544_DISPLAYNORMAL = 0x4;
+  const uint8_t PCD8544_DISPLAYALLON = 0x1;
+  const uint8_t PCD8544_DISPLAYINVERTED = 0x5;
+
+  const uint8_t PCD8544_FUNCTIONSET = 0x20;
+  const uint8_t PCD8544_DISPLAYCONTROL = 0x08;
+  const uint8_t PCD8544_SETYADDR = 0x40;
+  const uint8_t PCD8544_SETXADDR = 0x80;
+
+  const uint8_t PCD8544_SETTEMP = 0x04;
+  const uint8_t PCD8544_SETBIAS = 0x10;
+  const uint8_t PCD8544_SETVOP = 0x80;
+
+  void set_dc_pin(GPIOPin *dc_pin) { this->dc_pin_ = dc_pin; }
+  void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; }
+  float get_setup_priority() const override { return setup_priority::PROCESSOR; }
+
+  void command(uint8_t value);
+  void data(uint8_t value);
+
+  void initialize();
+  void dump_config() override;
+  void HOT display();
+
+  void update() override;
+
+  void fill(int color) override;
+
+  void setup() override {
+    this->setup_pins_();
+    this->initialize();
+  }
+
+ protected:
+  void draw_absolute_pixel_internal(int x, int y, int color) override;
+
+  void setup_pins_();
+
+  void init_reset_();
+
+  size_t get_buffer_length_();
+
+  void start_command_();
+  void end_command_();
+  void start_data_();
+  void end_data_();
+
+  int get_width_internal() override;
+  int get_height_internal() override;
+
+  GPIOPin *reset_pin_;
+  GPIOPin *dc_pin_;
+};
+
+}  // namespace pcd8544
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 9102873fb6..1fc6b650c4 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1444,6 +1444,12 @@ display:
   lambda: |-
     it.set_component_value("gauge", 50);
     it.set_component_text("textview", "Hello World!");
+- platform: pcd8544
+  cs_pin: GPIO23
+  dc_pin: GPIO23
+  reset_pin: GPIO23
+  lambda: |-
+    it.rectangle(0, 0, it.get_width(), it.get_height());
 - platform: ssd1306_i2c
   model: "SSD1306_128X64"
   reset_pin: GPIO23

From 79248e8b7477aa577ee64df2fe3878e9efaa582f Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 5 Apr 2020 13:42:43 -0300
Subject: [PATCH 177/412] fix servo bug restoring state and starting servo
 detached (#1008)

---
 esphome/components/servo/servo.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/servo/servo.h b/esphome/components/servo/servo.h
index 19165be23d..a37188740c 100644
--- a/esphome/components/servo/servo.h
+++ b/esphome/components/servo/servo.h
@@ -36,11 +36,11 @@ class Servo : public Component {
       this->rtc_ = global_preferences.make_preference<float>(global_servo_id);
       global_servo_id++;
       if (this->rtc_.load(&v)) {
-        this->write(v);
+        this->output_->set_level(v);
         return;
       }
     }
-    this->write(0.0f);
+    this->detach();
   }
   void dump_config() override;
   float get_setup_priority() const override { return setup_priority::DATA; }

From 3b7a47fb907ed1e2bf91ab304c97279752c81fde Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Sun, 5 Apr 2020 21:50:52 +0300
Subject: [PATCH 178/412] VSCode devcontainer support (#914)

* Devcontainer

* Removed header from json
---
 .devcontainer/devcontainer.json | 31 +++++++++++++++++++++++++++++++
 docker/Dockerfile.dev           | 13 +++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 .devcontainer/devcontainer.json
 create mode 100644 docker/Dockerfile.dev

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..5ce1768f5f
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,31 @@
+{
+  "name": "ESPHome Dev",
+  "context": "..",
+  "dockerFile": "../docker/Dockerfile.dev",
+  "postCreateCommand": "mkdir -p config && pip3 install -e .",
+  "runArgs": ["--privileged", "-e", "ESPHOME_DASHBOARD_USE_PING=1"],
+  "appPort": 6052,
+  "extensions": [
+    "ms-python.python",
+    "visualstudioexptteam.vscodeintellicode",
+    "redhat.vscode-yaml"
+  ],
+  "settings": {
+    "python.pythonPath": "/usr/local/bin/python",
+    "python.linting.pylintEnabled": true,
+    "python.linting.enabled": true,
+    "python.formatting.provider": "black",
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "files.trimTrailingWhitespace": true,
+    "terminal.integrated.shell.linux": "/bin/bash",
+    "yaml.customTags": [
+      "!secret scalar",
+      "!include_dir_named scalar",
+      "!include_dir_list scalar",
+      "!include_dir_merge_list scalar",
+      "!include_dir_merge_named scalar"
+    ]
+  }
+}
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
new file mode 100644
index 0000000000..a3871e2513
--- /dev/null
+++ b/docker/Dockerfile.dev
@@ -0,0 +1,13 @@
+FROM esphome/esphome-base-amd64:2.0.1
+
+COPY . .
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        python3-wheel \
+        net-tools \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /workspaces
+ENV SHELL /bin/bash

From 43cf3063e0c2a6af80bb23288870b71ff978c2dc Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 5 Apr 2020 22:14:49 -0300
Subject: [PATCH 179/412] removes comments from lambda (#998)

* removes comments from lambda

* include comments in lambda test

* pylint no else return
---
 esphome/core.py               |  15 +-
 tests/unit_tests/test_core.py | 272 +++++++++++++++++-----------------
 2 files changed, 152 insertions(+), 135 deletions(-)

diff --git a/esphome/core.py b/esphome/core.py
index 7734636a76..4b1d3b2115 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -230,10 +230,23 @@ class Lambda:
         self._parts = None
         self._requires_ids = None
 
+    # https://stackoverflow.com/a/241506/229052
+    def comment_remover(self, text):
+        def replacer(match):
+            s = match.group(0)
+            if s.startswith('/'):
+                return " "  # note: a space and not an empty string
+            return s
+        pattern = re.compile(
+            r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"',
+            re.DOTALL | re.MULTILINE
+        )
+        return re.sub(pattern, replacer, text)
+
     @property
     def parts(self):
         if self._parts is None:
-            self._parts = re.split(LAMBDA_PROG, self._value)
+            self._parts = re.split(LAMBDA_PROG, self.comment_remover(self._value))
         return self._parts
 
     @property
diff --git a/tests/unit_tests/test_core.py b/tests/unit_tests/test_core.py
index c02aed6447..14f6990bd9 100644
--- a/tests/unit_tests/test_core.py
+++ b/tests/unit_tests/test_core.py
@@ -9,11 +9,11 @@ from esphome import core, const
 
 class TestHexInt:
     @pytest.mark.parametrize("value, expected", (
-            (1, "0x01"),
-            (255, "0xFF"),
-            (128, "0x80"),
-            (256, "0x100"),
-            (-1, "-0x01"),  # TODO: this currently fails
+        (1, "0x01"),
+        (255, "0xFF"),
+        (128, "0x80"),
+        (256, "0x100"),
+        (-1, "-0x01"),  # TODO: this currently fails
     ))
     def test_str(self, value, expected):
         target = core.HexInt(value)
@@ -88,24 +88,24 @@ def test_is_approximately_integer__not_in_range(value):
 
 class TestTimePeriod:
     @pytest.mark.parametrize("kwargs, expected", (
-            ({}, {}),
-            ({"microseconds": 1}, {"microseconds": 1}),
-            ({"microseconds": 1.0001}, {"microseconds": 1}),
-            ({"milliseconds": 2}, {"milliseconds": 2}),
-            ({"milliseconds": 2.0001}, {"milliseconds": 2}),
-            ({"milliseconds": 2.01}, {"milliseconds": 2, "microseconds": 10}),
-            ({"seconds": 3}, {"seconds": 3}),
-            ({"seconds": 3.0001}, {"seconds": 3}),
-            ({"seconds": 3.01}, {"seconds": 3, "milliseconds": 10}),
-            ({"minutes": 4}, {"minutes": 4}),
-            ({"minutes": 4.0001}, {"minutes": 4}),
-            ({"minutes": 4.1}, {"minutes": 4, "seconds": 6}),
-            ({"hours": 5}, {"hours": 5}),
-            ({"hours": 5.0001}, {"hours": 5}),
-            ({"hours": 5.1}, {"hours": 5, "minutes": 6}),
-            ({"days": 6}, {"days": 6}),
-            ({"days": 6.0001}, {"days": 6}),
-            ({"days": 6.1}, {"days": 6, "hours": 2, "minutes": 24}),
+        ({}, {}),
+        ({"microseconds": 1}, {"microseconds": 1}),
+        ({"microseconds": 1.0001}, {"microseconds": 1}),
+        ({"milliseconds": 2}, {"milliseconds": 2}),
+        ({"milliseconds": 2.0001}, {"milliseconds": 2}),
+        ({"milliseconds": 2.01}, {"milliseconds": 2, "microseconds": 10}),
+        ({"seconds": 3}, {"seconds": 3}),
+        ({"seconds": 3.0001}, {"seconds": 3}),
+        ({"seconds": 3.01}, {"seconds": 3, "milliseconds": 10}),
+        ({"minutes": 4}, {"minutes": 4}),
+        ({"minutes": 4.0001}, {"minutes": 4}),
+        ({"minutes": 4.1}, {"minutes": 4, "seconds": 6}),
+        ({"hours": 5}, {"hours": 5}),
+        ({"hours": 5.0001}, {"hours": 5}),
+        ({"hours": 5.1}, {"hours": 5, "minutes": 6}),
+        ({"days": 6}, {"days": 6}),
+        ({"days": 6.0001}, {"days": 6}),
+        ({"days": 6.1}, {"days": 6, "hours": 2, "minutes": 24}),
     ))
     def test_init(self, kwargs, expected):
         target = core.TimePeriod(**kwargs)
@@ -119,24 +119,24 @@ class TestTimePeriod:
             core.TimePeriod(microseconds=1.1)
 
     @pytest.mark.parametrize("kwargs, expected", (
-            ({}, "0s"),
-            ({"microseconds": 1}, "1us"),
-            ({"microseconds": 1.0001}, "1us"),
-            ({"milliseconds": 2}, "2ms"),
-            ({"milliseconds": 2.0001}, "2ms"),
-            ({"milliseconds": 2.01}, "2010us"),
-            ({"seconds": 3}, "3s"),
-            ({"seconds": 3.0001}, "3s"),
-            ({"seconds": 3.01}, "3010ms"),
-            ({"minutes": 4}, "4min"),
-            ({"minutes": 4.0001}, "4min"),
-            ({"minutes": 4.1}, "246s"),
-            ({"hours": 5}, "5h"),
-            ({"hours": 5.0001}, "5h"),
-            ({"hours": 5.1}, "306min"),
-            ({"days": 6}, "6d"),
-            ({"days": 6.0001}, "6d"),
-            ({"days": 6.1}, "8784min"),
+        ({}, "0s"),
+        ({"microseconds": 1}, "1us"),
+        ({"microseconds": 1.0001}, "1us"),
+        ({"milliseconds": 2}, "2ms"),
+        ({"milliseconds": 2.0001}, "2ms"),
+        ({"milliseconds": 2.01}, "2010us"),
+        ({"seconds": 3}, "3s"),
+        ({"seconds": 3.0001}, "3s"),
+        ({"seconds": 3.01}, "3010ms"),
+        ({"minutes": 4}, "4min"),
+        ({"minutes": 4.0001}, "4min"),
+        ({"minutes": 4.1}, "246s"),
+        ({"hours": 5}, "5h"),
+        ({"hours": 5.0001}, "5h"),
+        ({"hours": 5.1}, "306min"),
+        ({"days": 6}, "6d"),
+        ({"days": 6.0001}, "6d"),
+        ({"days": 6.1}, "8784min"),
     ))
     def test_str(self, kwargs, expected):
         target = core.TimePeriod(**kwargs)
@@ -146,59 +146,59 @@ class TestTimePeriod:
         assert actual == expected
 
     @pytest.mark.parametrize("comparison, other, expected", (
-            ("__eq__", core.TimePeriod(microseconds=900), False),
-            ("__eq__", core.TimePeriod(milliseconds=1), True),
-            ("__eq__", core.TimePeriod(microseconds=1100), False),
-            ("__eq__", 1000, NotImplemented),
-            ("__eq__", "1000", NotImplemented),
-            ("__eq__", True, NotImplemented),
-            ("__eq__", object(), NotImplemented),
-            ("__eq__", None, NotImplemented),
+        ("__eq__", core.TimePeriod(microseconds=900), False),
+        ("__eq__", core.TimePeriod(milliseconds=1), True),
+        ("__eq__", core.TimePeriod(microseconds=1100), False),
+        ("__eq__", 1000, NotImplemented),
+        ("__eq__", "1000", NotImplemented),
+        ("__eq__", True, NotImplemented),
+        ("__eq__", object(), NotImplemented),
+        ("__eq__", None, NotImplemented),
 
-            ("__ne__", core.TimePeriod(microseconds=900), True),
-            ("__ne__", core.TimePeriod(milliseconds=1), False),
-            ("__ne__", core.TimePeriod(microseconds=1100), True),
-            ("__ne__", 1000, NotImplemented),
-            ("__ne__", "1000", NotImplemented),
-            ("__ne__", True, NotImplemented),
-            ("__ne__", object(), NotImplemented),
-            ("__ne__", None, NotImplemented),
+        ("__ne__", core.TimePeriod(microseconds=900), True),
+        ("__ne__", core.TimePeriod(milliseconds=1), False),
+        ("__ne__", core.TimePeriod(microseconds=1100), True),
+        ("__ne__", 1000, NotImplemented),
+        ("__ne__", "1000", NotImplemented),
+        ("__ne__", True, NotImplemented),
+        ("__ne__", object(), NotImplemented),
+        ("__ne__", None, NotImplemented),
 
-            ("__lt__", core.TimePeriod(microseconds=900), False),
-            ("__lt__", core.TimePeriod(milliseconds=1), False),
-            ("__lt__", core.TimePeriod(microseconds=1100), True),
-            ("__lt__", 1000, NotImplemented),
-            ("__lt__", "1000", NotImplemented),
-            ("__lt__", True, NotImplemented),
-            ("__lt__", object(), NotImplemented),
-            ("__lt__", None, NotImplemented),
+        ("__lt__", core.TimePeriod(microseconds=900), False),
+        ("__lt__", core.TimePeriod(milliseconds=1), False),
+        ("__lt__", core.TimePeriod(microseconds=1100), True),
+        ("__lt__", 1000, NotImplemented),
+        ("__lt__", "1000", NotImplemented),
+        ("__lt__", True, NotImplemented),
+        ("__lt__", object(), NotImplemented),
+        ("__lt__", None, NotImplemented),
 
-            ("__gt__", core.TimePeriod(microseconds=900), True),
-            ("__gt__", core.TimePeriod(milliseconds=1), False),
-            ("__gt__", core.TimePeriod(microseconds=1100), False),
-            ("__gt__", 1000, NotImplemented),
-            ("__gt__", "1000", NotImplemented),
-            ("__gt__", True, NotImplemented),
-            ("__gt__", object(), NotImplemented),
-            ("__gt__", None, NotImplemented),
+        ("__gt__", core.TimePeriod(microseconds=900), True),
+        ("__gt__", core.TimePeriod(milliseconds=1), False),
+        ("__gt__", core.TimePeriod(microseconds=1100), False),
+        ("__gt__", 1000, NotImplemented),
+        ("__gt__", "1000", NotImplemented),
+        ("__gt__", True, NotImplemented),
+        ("__gt__", object(), NotImplemented),
+        ("__gt__", None, NotImplemented),
 
-            ("__le__", core.TimePeriod(microseconds=900), False),
-            ("__le__", core.TimePeriod(milliseconds=1), True),
-            ("__le__", core.TimePeriod(microseconds=1100), True),
-            ("__le__", 1000, NotImplemented),
-            ("__le__", "1000", NotImplemented),
-            ("__le__", True, NotImplemented),
-            ("__le__", object(), NotImplemented),
-            ("__le__", None, NotImplemented),
+        ("__le__", core.TimePeriod(microseconds=900), False),
+        ("__le__", core.TimePeriod(milliseconds=1), True),
+        ("__le__", core.TimePeriod(microseconds=1100), True),
+        ("__le__", 1000, NotImplemented),
+        ("__le__", "1000", NotImplemented),
+        ("__le__", True, NotImplemented),
+        ("__le__", object(), NotImplemented),
+        ("__le__", None, NotImplemented),
 
-            ("__ge__", core.TimePeriod(microseconds=900), True),
-            ("__ge__", core.TimePeriod(milliseconds=1), True),
-            ("__ge__", core.TimePeriod(microseconds=1100), False),
-            ("__ge__", 1000, NotImplemented),
-            ("__ge__", "1000", NotImplemented),
-            ("__ge__", True, NotImplemented),
-            ("__ge__", object(), NotImplemented),
-            ("__ge__", None, NotImplemented),
+        ("__ge__", core.TimePeriod(microseconds=900), True),
+        ("__ge__", core.TimePeriod(milliseconds=1), True),
+        ("__ge__", core.TimePeriod(microseconds=1100), False),
+        ("__ge__", 1000, NotImplemented),
+        ("__ge__", "1000", NotImplemented),
+        ("__ge__", True, NotImplemented),
+        ("__ge__", object(), NotImplemented),
+        ("__ge__", None, NotImplemented),
     ))
     def test_comparison(self, comparison, other, expected):
         target = core.TimePeriod(microseconds=1000)
@@ -211,6 +211,10 @@ class TestTimePeriod:
 SAMPLE_LAMBDA = """
 it.strftime(64, 0, id(my_font), TextAlign::TOP_CENTER, "%H:%M:%S", id(esptime).now());
 it.printf(64, 16, id(my_font2), TextAlign::TOP_CENTER, "%.1f°C (%.1f%%)", id( office_tmp ).state, id(office_hmd).state);
+//id(my_commented_id)
+int x = 4;/* id(my_commented_id2)
+id(my_commented_id3)
+*/
 """
 
 
@@ -246,7 +250,7 @@ class TestLambda:
             "state, ",
             "office_hmd",
             ".",
-            "state);"
+            "state);\n \nint x = 4; "
         ]
 
     def test_requires_ids(self):
@@ -293,11 +297,11 @@ class TestID:
         return core.ID(None, is_declaration=True, type="binary_sensor::Example")
 
     @pytest.mark.parametrize("id, is_manual, expected", (
-            ("foo", None, True),
-            (None, None, False),
-            ("foo", True, True),
-            ("foo", False, False),
-            (None, True, True),
+        ("foo", None, True),
+        (None, None, False),
+        ("foo", True, True),
+        ("foo", False, False),
+        (None, True, True),
     ))
     def test_init__resolve_is_manual(self, id, is_manual, expected):
         target = core.ID(id, is_manual=is_manual)
@@ -305,10 +309,10 @@ class TestID:
         assert target.is_manual == expected
 
     @pytest.mark.parametrize("registered_ids, expected", (
-            ([], "binary_sensor_example"),
-            (["binary_sensor_example"], "binary_sensor_example_2"),
-            (["foo"], "binary_sensor_example"),
-            (["binary_sensor_example", "foo", "binary_sensor_example_2"], "binary_sensor_example_3"),
+        ([], "binary_sensor_example"),
+        (["binary_sensor_example"], "binary_sensor_example_2"),
+        (["foo"], "binary_sensor_example"),
+        (["binary_sensor_example", "foo", "binary_sensor_example_2"], "binary_sensor_example_3"),
     ))
     def test_resolve(self, target, registered_ids, expected):
         actual = target.resolve(registered_ids)
@@ -326,13 +330,13 @@ class TestID:
                    for n in ("id", "is_declaration", "type", "is_manual"))
 
     @pytest.mark.parametrize("comparison, other, expected", (
-            ("__eq__", core.ID(id="foo"), True),
-            ("__eq__", core.ID(id="bar"), False),
-            ("__eq__", 1000, NotImplemented),
-            ("__eq__", "1000", NotImplemented),
-            ("__eq__", True, NotImplemented),
-            ("__eq__", object(), NotImplemented),
-            ("__eq__", None, NotImplemented),
+        ("__eq__", core.ID(id="foo"), True),
+        ("__eq__", core.ID(id="bar"), False),
+        ("__eq__", 1000, NotImplemented),
+        ("__eq__", "1000", NotImplemented),
+        ("__eq__", True, NotImplemented),
+        ("__eq__", object(), NotImplemented),
+        ("__eq__", None, NotImplemented),
     ))
     def test_comparison(self, comparison, other, expected):
         target = core.ID(id="foo")
@@ -381,12 +385,12 @@ class TestDocumentRange:
 
 class TestDefine:
     @pytest.mark.parametrize("name, value, prop, expected", (
-            ("ANSWER", None, "as_build_flag", "-DANSWER"),
-            ("ANSWER", None, "as_macro", "#define ANSWER"),
-            ("ANSWER", None, "as_tuple", ("ANSWER", None)),
-            ("ANSWER", 42, "as_build_flag", "-DANSWER=42"),
-            ("ANSWER", 42, "as_macro", "#define ANSWER 42"),
-            ("ANSWER", 42, "as_tuple", ("ANSWER", 42)),
+        ("ANSWER", None, "as_build_flag", "-DANSWER"),
+        ("ANSWER", None, "as_macro", "#define ANSWER"),
+        ("ANSWER", None, "as_tuple", ("ANSWER", None)),
+        ("ANSWER", 42, "as_build_flag", "-DANSWER=42"),
+        ("ANSWER", 42, "as_macro", "#define ANSWER 42"),
+        ("ANSWER", 42, "as_tuple", ("ANSWER", 42)),
     ))
     def test_properties(self, name, value, prop, expected):
         target = core.Define(name, value)
@@ -396,16 +400,16 @@ class TestDefine:
         assert actual == expected
 
     @pytest.mark.parametrize("comparison, other, expected", (
-            ("__eq__", core.Define(name="FOO", value=42), True),
-            ("__eq__", core.Define(name="FOO", value=13), False),
-            ("__eq__", core.Define(name="FOO"), False),
-            ("__eq__", core.Define(name="BAR", value=42), False),
-            ("__eq__", core.Define(name="BAR"), False),
-            ("__eq__", 1000, NotImplemented),
-            ("__eq__", "1000", NotImplemented),
-            ("__eq__", True, NotImplemented),
-            ("__eq__", object(), NotImplemented),
-            ("__eq__", None, NotImplemented),
+        ("__eq__", core.Define(name="FOO", value=42), True),
+        ("__eq__", core.Define(name="FOO", value=13), False),
+        ("__eq__", core.Define(name="FOO"), False),
+        ("__eq__", core.Define(name="BAR", value=42), False),
+        ("__eq__", core.Define(name="BAR"), False),
+        ("__eq__", 1000, NotImplemented),
+        ("__eq__", "1000", NotImplemented),
+        ("__eq__", True, NotImplemented),
+        ("__eq__", object(), NotImplemented),
+        ("__eq__", None, NotImplemented),
     ))
     def test_comparison(self, comparison, other, expected):
         target = core.Define(name="FOO", value=42)
@@ -417,10 +421,10 @@ class TestDefine:
 
 class TestLibrary:
     @pytest.mark.parametrize("name, value, prop, expected", (
-            ("mylib", None, "as_lib_dep", "mylib"),
-            ("mylib", None, "as_tuple", ("mylib", None)),
-            ("mylib", "1.2.3", "as_lib_dep", "mylib@1.2.3"),
-            ("mylib", "1.2.3", "as_tuple", ("mylib", "1.2.3")),
+        ("mylib", None, "as_lib_dep", "mylib"),
+        ("mylib", None, "as_tuple", ("mylib", None)),
+        ("mylib", "1.2.3", "as_lib_dep", "mylib@1.2.3"),
+        ("mylib", "1.2.3", "as_tuple", ("mylib", "1.2.3")),
     ))
     def test_properties(self, name, value, prop, expected):
         target = core.Library(name, value)
@@ -430,14 +434,14 @@ class TestLibrary:
         assert actual == expected
 
     @pytest.mark.parametrize("comparison, other, expected", (
-            ("__eq__", core.Library(name="libfoo", version="1.2.3"), True),
-            ("__eq__", core.Library(name="libfoo", version="1.2.4"), False),
-            ("__eq__", core.Library(name="libbar", version="1.2.3"), False),
-            ("__eq__", 1000, NotImplemented),
-            ("__eq__", "1000", NotImplemented),
-            ("__eq__", True, NotImplemented),
-            ("__eq__", object(), NotImplemented),
-            ("__eq__", None, NotImplemented),
+        ("__eq__", core.Library(name="libfoo", version="1.2.3"), True),
+        ("__eq__", core.Library(name="libfoo", version="1.2.4"), False),
+        ("__eq__", core.Library(name="libbar", version="1.2.3"), False),
+        ("__eq__", 1000, NotImplemented),
+        ("__eq__", "1000", NotImplemented),
+        ("__eq__", True, NotImplemented),
+        ("__eq__", object(), NotImplemented),
+        ("__eq__", None, NotImplemented),
     ))
     def test_comparison(self, comparison, other, expected):
         target = core.Library(name="libfoo", version="1.2.3")

From dea6675c218fe4b3c6435cadb33d7da74dc18b0f Mon Sep 17 00:00:00 2001
From: Evgeny <freekode@users.noreply.github.com>
Date: Mon, 6 Apr 2020 19:11:41 +0200
Subject: [PATCH 180/412] Add HM3301 laser dust detection sensor (#963)

* Add HM3301 laser dust detection sensor

* Fixed after lint

* Fixed after lint

* added status clear warning
---
 esphome/components/hm3301/__init__.py |  0
 esphome/components/hm3301/hm3301.cpp  | 82 +++++++++++++++++++++++++++
 esphome/components/hm3301/hm3301.h    | 42 ++++++++++++++
 esphome/components/hm3301/sensor.py   | 43 ++++++++++++++
 platformio.ini                        |  1 +
 tests/test1.yaml                      |  7 +++
 tests/test3.yaml                      |  7 +++
 7 files changed, 182 insertions(+)
 create mode 100644 esphome/components/hm3301/__init__.py
 create mode 100644 esphome/components/hm3301/hm3301.cpp
 create mode 100644 esphome/components/hm3301/hm3301.h
 create mode 100644 esphome/components/hm3301/sensor.py

diff --git a/esphome/components/hm3301/__init__.py b/esphome/components/hm3301/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/hm3301/hm3301.cpp b/esphome/components/hm3301/hm3301.cpp
new file mode 100644
index 0000000000..6456ee354a
--- /dev/null
+++ b/esphome/components/hm3301/hm3301.cpp
@@ -0,0 +1,82 @@
+#include "hm3301.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace hm3301 {
+
+static const char *TAG = "hm3301.sensor";
+
+static const uint8_t PM_1_0_VALUE_INDEX = 5;
+static const uint8_t PM_2_5_VALUE_INDEX = 6;
+static const uint8_t PM_10_0_VALUE_INDEX = 7;
+
+void HM3301Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up HM3301...");
+  hm3301_ = new HM330X();
+  error_code_ = hm3301_->init();
+  if (error_code_ != NO_ERROR) {
+    this->mark_failed();
+    return;
+  }
+}
+
+void HM3301Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "HM3301:");
+  LOG_I2C_DEVICE(this);
+  if (error_code_ == ERROR_COMM) {
+    ESP_LOGE(TAG, "Communication with HM3301 failed!");
+  }
+
+  LOG_SENSOR("  ", "PM1.0", this->pm_1_0_sensor_);
+  LOG_SENSOR("  ", "PM2.5", this->pm_2_5_sensor_);
+  LOG_SENSOR("  ", "PM10.0", this->pm_10_0_sensor_);
+}
+
+float HM3301Component::get_setup_priority() const { return setup_priority::DATA; }
+
+void HM3301Component::update() {
+  if (!this->read_sensor_value_(data_buffer_)) {
+    ESP_LOGW(TAG, "Read result failed");
+    this->status_set_warning();
+    return;
+  }
+
+  if (!this->validate_checksum_(data_buffer_)) {
+    ESP_LOGW(TAG, "Checksum validation failed");
+    this->status_set_warning();
+    return;
+  }
+
+  if (this->pm_1_0_sensor_ != nullptr) {
+    uint16_t value = get_sensor_value_(data_buffer_, PM_1_0_VALUE_INDEX);
+    this->pm_1_0_sensor_->publish_state(value);
+  }
+  if (this->pm_2_5_sensor_ != nullptr) {
+    uint16_t value = get_sensor_value_(data_buffer_, PM_2_5_VALUE_INDEX);
+    this->pm_2_5_sensor_->publish_state(value);
+  }
+  if (this->pm_10_0_sensor_ != nullptr) {
+    uint16_t value = get_sensor_value_(data_buffer_, PM_10_0_VALUE_INDEX);
+    this->pm_10_0_sensor_->publish_state(value);
+  }
+
+  this->status_clear_warning();
+}
+
+bool HM3301Component::read_sensor_value_(uint8_t *data) { return !hm3301_->read_sensor_value(data, 29); }
+
+bool HM3301Component::validate_checksum_(const uint8_t *data) {
+  uint8_t sum = 0;
+  for (int i = 0; i < 28; i++) {
+    sum += data[i];
+  }
+
+  return sum == data[28];
+}
+
+uint16_t HM3301Component::get_sensor_value_(const uint8_t *data, uint8_t i) {
+  return (uint16_t) data[i * 2] << 8 | data[i * 2 + 1];
+}
+
+}  // namespace hm3301
+}  // namespace esphome
diff --git a/esphome/components/hm3301/hm3301.h b/esphome/components/hm3301/hm3301.h
new file mode 100644
index 0000000000..0fbb32612e
--- /dev/null
+++ b/esphome/components/hm3301/hm3301.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+#include <Seeed_HM330X.h>
+
+namespace esphome {
+namespace hm3301 {
+
+class HM3301Component : public PollingComponent, public i2c::I2CDevice {
+ public:
+  HM3301Component() = default;
+
+  void set_pm_1_0_sensor(sensor::Sensor *pm_1_0_sensor) { pm_1_0_sensor_ = pm_1_0_sensor; }
+  void set_pm_2_5_sensor(sensor::Sensor *pm_2_5_sensor) { pm_2_5_sensor_ = pm_2_5_sensor; }
+  void set_pm_10_0_sensor(sensor::Sensor *pm_10_0_sensor) { pm_10_0_sensor_ = pm_10_0_sensor; }
+
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+
+ protected:
+  HM330X *hm3301_;
+
+  HM330XErrorCode error_code_{NO_ERROR};
+
+  uint8_t data_buffer_[30];
+
+  sensor::Sensor *pm_1_0_sensor_{nullptr};
+  sensor::Sensor *pm_2_5_sensor_{nullptr};
+  sensor::Sensor *pm_10_0_sensor_{nullptr};
+
+  bool read_sensor_value_(uint8_t *);
+  bool validate_checksum_(const uint8_t *);
+  uint16_t get_sensor_value_(const uint8_t *, uint8_t);
+};
+
+}  // namespace hm3301
+}  // namespace esphome
diff --git a/esphome/components/hm3301/sensor.py b/esphome/components/hm3301/sensor.py
new file mode 100644
index 0000000000..718d0a20bb
--- /dev/null
+++ b/esphome/components/hm3301/sensor.py
@@ -0,0 +1,43 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import CONF_ID, CONF_PM_2_5, CONF_PM_10_0, CONF_PM_1_0, \
+    UNIT_MICROGRAMS_PER_CUBIC_METER, ICON_CHEMICAL_WEAPON
+
+DEPENDENCIES = ['i2c']
+
+hm3301_ns = cg.esphome_ns.namespace('hm3301')
+HM3301Component = hm3301_ns.class_('HM3301Component', cg.PollingComponent, i2c.I2CDevice)
+
+CONFIG_SCHEMA = cv.All(cv.Schema({
+    cv.GenerateID(): cv.declare_id(HM3301Component),
+
+    cv.Optional(CONF_PM_1_0):
+        sensor.sensor_schema(UNIT_MICROGRAMS_PER_CUBIC_METER, ICON_CHEMICAL_WEAPON, 0),
+    cv.Optional(CONF_PM_2_5):
+        sensor.sensor_schema(UNIT_MICROGRAMS_PER_CUBIC_METER, ICON_CHEMICAL_WEAPON, 0),
+    cv.Optional(CONF_PM_10_0):
+        sensor.sensor_schema(UNIT_MICROGRAMS_PER_CUBIC_METER, ICON_CHEMICAL_WEAPON, 0),
+
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x40)))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield i2c.register_i2c_device(var, config)
+
+    if CONF_PM_1_0 in config:
+        sens = yield sensor.new_sensor(config[CONF_PM_1_0])
+        cg.add(var.set_pm_1_0_sensor(sens))
+
+    if CONF_PM_2_5 in config:
+        sens = yield sensor.new_sensor(config[CONF_PM_2_5])
+        cg.add(var.set_pm_2_5_sensor(sens))
+
+    if CONF_PM_10_0 in config:
+        sens = yield sensor.new_sensor(config[CONF_PM_10_0])
+        cg.add(var.set_pm_10_0_sensor(sens))
+
+    # https://platformio.org/lib/show/6306/Grove%20-%20Laser%20PM2.5%20Sensor%20HM3301
+    cg.add_library('6306', '1.0.3')
diff --git a/platformio.ini b/platformio.ini
index 408e5af1ce..a6e9926de6 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,6 +19,7 @@ lib_deps =
     ESPAsyncTCP-esphome@1.2.2
     1655@1.0.2  ; TinyGPSPlus (has name conflict)
     6865@1.0.0  ; TM1651 Battery Display
+    6306@1.0.3  ; HM3301
 build_flags =
     -Wno-reorder
     -DUSE_WEB_SERVER
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 1fc6b650c4..f87d77c9c2 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -720,6 +720,13 @@ sensor:
   - platform: tmp117
     name: "TMP117 Temperature"
     update_interval: 5s
+  - platform: hm3301
+    pm_1_0:
+      name: "PM1.0"
+    pm_2_5:
+      name: "PM2.5"
+    pm_10_0:
+      name: "PM10.0"
 
 esp32_touch:
   setup_mode: False
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 9407cab687..e7c3da18de 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -353,6 +353,13 @@ sensor:
       name: "PZEMDC Current"
     power:
       name: "PZEMDC Power"
+  - platform: hm3301
+    pm_1_0:
+      name: "PM1.0"
+    pm_2_5:
+      name: "PM2.5"
+    pm_10_0:
+      name: "PM10.0"
 
 time:
 - platform: homeassistant

From 8613c02d5c3e40938e39def1671fb37c69c9db11 Mon Sep 17 00:00:00 2001
From: kroimon <github@kroimon.de>
Date: Wed, 8 Apr 2020 14:31:23 +0200
Subject: [PATCH 181/412] Add constant_brightness property to CWWW/RGBWW lights
 (#1007)

Fixes https://github.com/esphome/feature-requests/issues/460

Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/cwww/cwww_light_output.h   |  4 ++-
 esphome/components/cwww/light.py              |  4 +++
 esphome/components/light/light_color_values.h | 25 +++++++++++++------
 esphome/components/light/light_state.cpp      | 10 +++++---
 esphome/components/light/light_state.h        |  5 ++--
 esphome/components/rgbww/light.py             |  4 +++
 esphome/components/rgbww/rgbww_light_output.h |  4 ++-
 tests/test1.yaml                              |  1 +
 8 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/esphome/components/cwww/cwww_light_output.h b/esphome/components/cwww/cwww_light_output.h
index 8192039511..3351a98d24 100644
--- a/esphome/components/cwww/cwww_light_output.h
+++ b/esphome/components/cwww/cwww_light_output.h
@@ -13,6 +13,7 @@ class CWWWLightOutput : public light::LightOutput {
   void set_warm_white(output::FloatOutput *warm_white) { warm_white_ = warm_white; }
   void set_cold_white_temperature(float cold_white_temperature) { cold_white_temperature_ = cold_white_temperature; }
   void set_warm_white_temperature(float warm_white_temperature) { warm_white_temperature_ = warm_white_temperature; }
+  void set_constant_brightness(bool constant_brightness) { constant_brightness_ = constant_brightness; }
   light::LightTraits get_traits() override {
     auto traits = light::LightTraits();
     traits.set_supports_brightness(true);
@@ -25,7 +26,7 @@ class CWWWLightOutput : public light::LightOutput {
   }
   void write_state(light::LightState *state) override {
     float cwhite, wwhite;
-    state->current_values_as_cwww(&cwhite, &wwhite);
+    state->current_values_as_cwww(&cwhite, &wwhite, this->constant_brightness_);
     this->cold_white_->set_level(cwhite);
     this->warm_white_->set_level(wwhite);
   }
@@ -35,6 +36,7 @@ class CWWWLightOutput : public light::LightOutput {
   output::FloatOutput *warm_white_;
   float cold_white_temperature_;
   float warm_white_temperature_;
+  bool constant_brightness_;
 };
 
 }  // namespace cwww
diff --git a/esphome/components/cwww/light.py b/esphome/components/cwww/light.py
index f86f1eace0..5cc4262105 100644
--- a/esphome/components/cwww/light.py
+++ b/esphome/components/cwww/light.py
@@ -7,12 +7,15 @@ from esphome.const import CONF_OUTPUT_ID, CONF_COLD_WHITE, CONF_WARM_WHITE, \
 cwww_ns = cg.esphome_ns.namespace('cwww')
 CWWWLightOutput = cwww_ns.class_('CWWWLightOutput', light.LightOutput)
 
+CONF_CONSTANT_BRIGHTNESS = 'constant_brightness'
+
 CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend({
     cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(CWWWLightOutput),
     cv.Required(CONF_COLD_WHITE): cv.use_id(output.FloatOutput),
     cv.Required(CONF_WARM_WHITE): cv.use_id(output.FloatOutput),
     cv.Required(CONF_COLD_WHITE_COLOR_TEMPERATURE): cv.color_temperature,
     cv.Required(CONF_WARM_WHITE_COLOR_TEMPERATURE): cv.color_temperature,
+    cv.Optional(CONF_CONSTANT_BRIGHTNESS, default=False): cv.boolean,
 })
 
 
@@ -26,3 +29,4 @@ def to_code(config):
     wwhite = yield cg.get_variable(config[CONF_WARM_WHITE])
     cg.add(var.set_warm_white(wwhite))
     cg.add(var.set_warm_white_temperature(config[CONF_WARM_WHITE_COLOR_TEMPERATURE]))
+    cg.add(var.set_constant_brightness(config[CONF_CONSTANT_BRIGHTNESS]))
diff --git a/esphome/components/light/light_color_values.h b/esphome/components/light/light_color_values.h
index 9ac8be1dd0..39a93cbbcd 100644
--- a/esphome/components/light/light_color_values.h
+++ b/esphome/components/light/light_color_values.h
@@ -190,24 +190,33 @@ class LightColorValues {
 
   /// Convert these light color values to an RGBWW representation with the given parameters.
   void as_rgbww(float color_temperature_cw, float color_temperature_ww, float *red, float *green, float *blue,
-                float *cold_white, float *warm_white) const {
+                float *cold_white, float *warm_white, bool constant_brightness = false) const {
     this->as_rgb(red, green, blue);
     const float color_temp = clamp(this->color_temperature_, color_temperature_cw, color_temperature_ww);
     const float ww_fraction = (color_temp - color_temperature_cw) / (color_temperature_ww - color_temperature_cw);
     const float cw_fraction = 1.0f - ww_fraction;
-    const float max_cw_ww = std::max(ww_fraction, cw_fraction);
-    *cold_white = this->state_ * this->brightness_ * this->white_ * (cw_fraction / max_cw_ww);
-    *warm_white = this->state_ * this->brightness_ * this->white_ * (ww_fraction / max_cw_ww);
+    *cold_white = this->state_ * this->brightness_ * this->white_ * cw_fraction;
+    *warm_white = this->state_ * this->brightness_ * this->white_ * ww_fraction;
+    if (!constant_brightness) {
+      const float max_cw_ww = std::max(ww_fraction, cw_fraction);
+      *cold_white /= max_cw_ww;
+      *warm_white /= max_cw_ww;
+    }
   }
 
   /// Convert these light color values to an CWWW representation with the given parameters.
-  void as_cwww(float color_temperature_cw, float color_temperature_ww, float *cold_white, float *warm_white) const {
+  void as_cwww(float color_temperature_cw, float color_temperature_ww, float *cold_white, float *warm_white,
+               bool constant_brightness = false) const {
     const float color_temp = clamp(this->color_temperature_, color_temperature_cw, color_temperature_ww);
     const float ww_fraction = (color_temp - color_temperature_cw) / (color_temperature_ww - color_temperature_cw);
     const float cw_fraction = 1.0f - ww_fraction;
-    const float max_cw_ww = std::max(ww_fraction, cw_fraction);
-    *cold_white = this->state_ * this->brightness_ * (cw_fraction / max_cw_ww);
-    *warm_white = this->state_ * this->brightness_ * (ww_fraction / max_cw_ww);
+    *cold_white = this->state_ * this->brightness_ * cw_fraction;
+    *warm_white = this->state_ * this->brightness_ * ww_fraction;
+    if (!constant_brightness) {
+      const float max_cw_ww = std::max(ww_fraction, cw_fraction);
+      *cold_white /= max_cw_ww;
+      *warm_white /= max_cw_ww;
+    }
   }
 
   /// Compare this LightColorValues to rhs, return true if and only if all attributes match.
diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index 5e9166795e..c6e7df0811 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -718,19 +718,21 @@ void LightState::current_values_as_rgbw(float *red, float *green, float *blue, f
   *blue = gamma_correct(*blue, this->gamma_correct_);
   *white = gamma_correct(*white, this->gamma_correct_);
 }
-void LightState::current_values_as_rgbww(float *red, float *green, float *blue, float *cold_white, float *warm_white) {
+void LightState::current_values_as_rgbww(float *red, float *green, float *blue, float *cold_white, float *warm_white,
+                                         bool constant_brightness) {
   auto traits = this->get_traits();
   this->current_values.as_rgbww(traits.get_min_mireds(), traits.get_max_mireds(), red, green, blue, cold_white,
-                                warm_white);
+                                warm_white, constant_brightness);
   *red = gamma_correct(*red, this->gamma_correct_);
   *green = gamma_correct(*green, this->gamma_correct_);
   *blue = gamma_correct(*blue, this->gamma_correct_);
   *cold_white = gamma_correct(*cold_white, this->gamma_correct_);
   *warm_white = gamma_correct(*warm_white, this->gamma_correct_);
 }
-void LightState::current_values_as_cwww(float *cold_white, float *warm_white) {
+void LightState::current_values_as_cwww(float *cold_white, float *warm_white, bool constant_brightness) {
   auto traits = this->get_traits();
-  this->current_values.as_cwww(traits.get_min_mireds(), traits.get_max_mireds(), cold_white, warm_white);
+  this->current_values.as_cwww(traits.get_min_mireds(), traits.get_max_mireds(), cold_white, warm_white,
+                               constant_brightness);
   *cold_white = gamma_correct(*cold_white, this->gamma_correct_);
   *warm_white = gamma_correct(*warm_white, this->gamma_correct_);
 }
diff --git a/esphome/components/light/light_state.h b/esphome/components/light/light_state.h
index 07a0e3147b..f399cc2be4 100644
--- a/esphome/components/light/light_state.h
+++ b/esphome/components/light/light_state.h
@@ -270,9 +270,10 @@ class LightState : public Nameable, public Component {
 
   void current_values_as_rgbw(float *red, float *green, float *blue, float *white);
 
-  void current_values_as_rgbww(float *red, float *green, float *blue, float *cold_white, float *warm_white);
+  void current_values_as_rgbww(float *red, float *green, float *blue, float *cold_white, float *warm_white,
+                               bool constant_brightness = false);
 
-  void current_values_as_cwww(float *cold_white, float *warm_white);
+  void current_values_as_cwww(float *cold_white, float *warm_white, bool constant_brightness = false);
 
  protected:
   friend LightOutput;
diff --git a/esphome/components/rgbww/light.py b/esphome/components/rgbww/light.py
index c804eed942..78f4bee630 100644
--- a/esphome/components/rgbww/light.py
+++ b/esphome/components/rgbww/light.py
@@ -8,6 +8,8 @@ from esphome.const import CONF_BLUE, CONF_GREEN, CONF_RED, CONF_OUTPUT_ID, CONF_
 rgbww_ns = cg.esphome_ns.namespace('rgbww')
 RGBWWLightOutput = rgbww_ns.class_('RGBWWLightOutput', light.LightOutput)
 
+CONF_CONSTANT_BRIGHTNESS = 'constant_brightness'
+
 CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend({
     cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(RGBWWLightOutput),
     cv.Required(CONF_RED): cv.use_id(output.FloatOutput),
@@ -17,6 +19,7 @@ CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend({
     cv.Required(CONF_WARM_WHITE): cv.use_id(output.FloatOutput),
     cv.Required(CONF_COLD_WHITE_COLOR_TEMPERATURE): cv.color_temperature,
     cv.Required(CONF_WARM_WHITE_COLOR_TEMPERATURE): cv.color_temperature,
+    cv.Optional(CONF_CONSTANT_BRIGHTNESS, default=False): cv.boolean,
 })
 
 
@@ -38,3 +41,4 @@ def to_code(config):
     wwhite = yield cg.get_variable(config[CONF_WARM_WHITE])
     cg.add(var.set_warm_white(wwhite))
     cg.add(var.set_warm_white_temperature(config[CONF_WARM_WHITE_COLOR_TEMPERATURE]))
+    cg.add(var.set_constant_brightness(config[CONF_CONSTANT_BRIGHTNESS]))
diff --git a/esphome/components/rgbww/rgbww_light_output.h b/esphome/components/rgbww/rgbww_light_output.h
index ef9e99a3eb..a975331a37 100644
--- a/esphome/components/rgbww/rgbww_light_output.h
+++ b/esphome/components/rgbww/rgbww_light_output.h
@@ -16,6 +16,7 @@ class RGBWWLightOutput : public light::LightOutput {
   void set_warm_white(output::FloatOutput *warm_white) { warm_white_ = warm_white; }
   void set_cold_white_temperature(float cold_white_temperature) { cold_white_temperature_ = cold_white_temperature; }
   void set_warm_white_temperature(float warm_white_temperature) { warm_white_temperature_ = warm_white_temperature; }
+  void set_constant_brightness(bool constant_brightness) { constant_brightness_ = constant_brightness; }
   light::LightTraits get_traits() override {
     auto traits = light::LightTraits();
     traits.set_supports_brightness(true);
@@ -28,7 +29,7 @@ class RGBWWLightOutput : public light::LightOutput {
   }
   void write_state(light::LightState *state) override {
     float red, green, blue, cwhite, wwhite;
-    state->current_values_as_rgbww(&red, &green, &blue, &cwhite, &wwhite);
+    state->current_values_as_rgbww(&red, &green, &blue, &cwhite, &wwhite, this->constant_brightness_);
     this->red_->set_level(red);
     this->green_->set_level(green);
     this->blue_->set_level(blue);
@@ -44,6 +45,7 @@ class RGBWWLightOutput : public light::LightOutput {
   output::FloatOutput *warm_white_;
   float cold_white_temperature_;
   float warm_white_temperature_;
+  bool constant_brightness_;
 };
 
 }  // namespace rgbww
diff --git a/tests/test1.yaml b/tests/test1.yaml
index f87d77c9c2..8483281b59 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1074,6 +1074,7 @@ light:
     warm_white: pca_6
     cold_white_color_temperature: 153 mireds
     warm_white_color_temperature: 500 mireds
+    constant_brightness: true
   - platform: fastled_clockless
     id: addr1
     chipset: WS2811

From 17fd9d5107d8ddbf51abcf8288c3088126cd9cdd Mon Sep 17 00:00:00 2001
From: Andrew Zaborowski <balrogg@gmail.com>
Date: Thu, 9 Apr 2020 16:12:42 +0200
Subject: [PATCH 182/412] web_server: Add cover calls to REST API (#999)

Add the GET and POST handler for cover components.  Also add covers to
the index page although the Open/Close buttons that are shown for covers
will need a few lines added to webserver-v1.js, without them they don't
do anything.
---
 esphome/components/web_server/web_server.cpp | 85 ++++++++++++++++++++
 esphome/components/web_server/web_server.h   | 10 +++
 2 files changed, 95 insertions(+)

diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index c0708b763f..1f6cd10666 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -108,6 +108,12 @@ void WebServer::setup() {
       if (!obj->is_internal())
         client->send(this->text_sensor_json(obj, obj->state).c_str(), "state");
 #endif
+
+#ifdef USE_COVER
+    for (auto *obj : App.get_covers())
+      if (!obj->is_internal())
+        client->send(this->cover_json(obj).c_str(), "state");
+#endif
   });
 
 #ifdef USE_LOGGER
@@ -180,6 +186,11 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
     write_row(stream, obj, "text_sensor", "");
 #endif
 
+#ifdef USE_COVER
+  for (auto *obj : App.get_covers())
+    write_row(stream, obj, "cover", "<button>Open</button><button>Close</button>");
+#endif
+
   stream->print(F("</tbody></table><p>See <a href=\"https://esphome.io/web-api/index.html\">ESPHome Web API</a> for "
                   "REST API documentation.</p>"
                   "<h2>OTA Update</h2><form method=\"POST\" action=\"/update\" enctype=\"multipart/form-data\"><input "
@@ -495,6 +506,68 @@ std::string WebServer::light_json(light::LightState *obj) {
 }
 #endif
 
+#ifdef USE_COVER
+void WebServer::on_cover_update(cover::Cover *obj) {
+  if (obj->is_internal())
+    return;
+  this->events_.send(this->cover_json(obj).c_str(), "state");
+}
+void WebServer::handle_cover_request(AsyncWebServerRequest *request, UrlMatch match) {
+  for (cover::Cover *obj : App.get_covers()) {
+    if (obj->is_internal())
+      continue;
+    if (obj->get_object_id() != match.id)
+      continue;
+
+    if (request->method() == HTTP_GET) {
+      std::string data = this->cover_json(obj);
+      request->send(200, "text/json", data.c_str());
+      continue;
+    }
+
+    auto call = obj->make_call();
+    if (match.method == "open") {
+      call.set_command_open();
+    } else if (match.method == "close") {
+      call.set_command_close();
+    } else if (match.method == "stop") {
+      call.set_command_stop();
+    } else if (match.method != "set") {
+      request->send(404);
+      return;
+    }
+
+    auto traits = obj->get_traits();
+    if ((request->hasParam("position") && !traits.get_supports_position()) ||
+        (request->hasParam("tilt") && !traits.get_supports_tilt())) {
+      request->send(409);
+      return;
+    }
+
+    if (request->hasParam("position"))
+      call.set_position(request->getParam("position")->value().toFloat());
+    if (request->hasParam("tilt"))
+      call.set_tilt(request->getParam("tilt")->value().toFloat());
+
+    this->defer([call]() mutable { call.perform(); });
+    request->send(200);
+    return;
+  }
+  request->send(404);
+}
+std::string WebServer::cover_json(cover::Cover *obj) {
+  return json::build_json([obj](JsonObject &root) {
+    root["id"] = "cover-" + obj->get_object_id();
+    root["state"] = obj->is_fully_closed() ? "CLOSED" : "OPEN";
+    root["value"] = obj->position;
+    root["current_operation"] = cover::cover_operation_to_str(obj->current_operation);
+
+    if (obj->get_traits().get_supports_tilt())
+      root["tilt"] = obj->tilt;
+  });
+}
+#endif
+
 bool WebServer::canHandle(AsyncWebServerRequest *request) {
   if (request->url() == "/")
     return true;
@@ -542,6 +615,11 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) {
     return true;
 #endif
 
+#ifdef USE_COVER
+  if ((request->method() == HTTP_POST || request->method() == HTTP_GET) && match.domain == "cover")
+    return true;
+#endif
+
   return false;
 }
 void WebServer::handleRequest(AsyncWebServerRequest *request) {
@@ -610,6 +688,13 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
     return;
   }
 #endif
+
+#ifdef USE_COVER
+  if (match.domain == "cover") {
+    this->handle_cover_request(request, match);
+    return;
+  }
+#endif
 }
 
 bool WebServer::isRequestHandlerTrivial() { return false; }
diff --git a/esphome/components/web_server/web_server.h b/esphome/components/web_server/web_server.h
index def1cac0ea..b3bf2ef7f7 100644
--- a/esphome/components/web_server/web_server.h
+++ b/esphome/components/web_server/web_server.h
@@ -144,6 +144,16 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
   std::string text_sensor_json(text_sensor::TextSensor *obj, const std::string &value);
 #endif
 
+#ifdef USE_COVER
+  void on_cover_update(cover::Cover *obj) override;
+
+  /// Handle a cover request under '/cover/<id>/<open/close/stop/set>'.
+  void handle_cover_request(AsyncWebServerRequest *request, UrlMatch match);
+
+  /// Dump the cover state as a JSON string.
+  std::string cover_json(cover::Cover *obj);
+#endif
+
   /// Override the web handler's canHandle method.
   bool canHandle(AsyncWebServerRequest *request) override;
   /// Override the web handler's handleRequest method.

From 835079ad43593258cd38988209f303ccb4efac7c Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 10 Apr 2020 05:07:18 +0200
Subject: [PATCH 183/412] Add AC Dimmer support (#880)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add AC Dimmer support

Fixes https://github.com/esphome/feature-requests/issues/278

* fixes

basically missed the output pin setup and in the switching was switching true true true :P

* Format

* Enable ESP32

* Also setup ZC pin

* Support multiple dimmers sharing ZC pin

* Fix ESP32

* Lint

* off gate on zc detect

* tests pins validation

* Climate Mitsubishi (#725)

* add climate

* Mitsubishi updates

* refactor mitsubishi to use climate_ir

* lint

* fix: only decode when not str already (#923)

Signed-off-by: wilmardo <info@wilmardenouden.nl>

* fix climate-ir bad merge (#935)

* fix climate-ir bad merge

* add mitshubishi test

* http_request: fix memory allocation (#916)

* http_request version fix (#917)

* PID Climate (#885)

* PID Climate

* Add sensor for debugging PID output value

* Add dump_config, use percent

* Add more observable values

* Update

* Set target temperature

* Add autotuner

* Add algorithm explanation

* Add autotuner action, update controller

* Add simulator

* Format

* Change defaults

* Updates

* Use b''.decode() instead of str(b'') (#941)

Handling of request arguments in WizardRequestHandler is not decoding
bytes and rather just doing a str conversion resulting in a value of
"b''" being supplied to the wizard code.

* Adding the espressif 2.6.3 (#944)

* extract and use current version of python 3 (#938)

* Inverted output in neopixelbus (#895)

* Added inverted output

* Added support for inverted output in neopixelbus

* Update esphome/components/neopixelbus/light.py

Co-Authored-By: Otto Winter <otto@otto-winter.com>

* Update light.py

* corrected lint errors

Co-authored-by: Otto Winter <otto@otto-winter.com>

* Added degree symbol for MAX7219 7-segment display. (#764)

The ascii char to use it is "~" (0x7E).

Disclaimer: I didn't test this yet.

* Fix dump/tx of 64 bit codes (#940)

* Fix dump/tx of 64 bit codes

* fixed source format

* Update hdc1080.cpp (#887)

* Update hdc1080.cpp

increase waittime, to fix reading errors

* Fix: Update HDC1080.cpp

i fixed the my change on write_bytes

* add tcl112 support for dry, fan and swing (#939)

* Fix SGP30 incorrect baseline reading/writing (#936)

* Split the SGP30 baseline into 2 values

- According to the SGP30 datasheet, each eCO2 and TVOC baseline is a 2-byte value (MSB first)
- The current implementation ignores the MSB of each of the value
- Update the schema to allow 2 different baseline values (optional, but both need to be specified for the baseline to apply)

* Make both eCO2 and TVOC required if the optional baseline is defined

* Make dump_config() looks better

* Add register_*_effect to allow registering custom effects (#947)

This allows to register custom effect from user components,
allowing for bigger composability of source.

* Bugfix/normalize core comparisons (and Python 3 update fixes) (#952)

* Correct implementation of comparisons to be Pythonic

If a comparison cannot be made return NotImplemented, this allows the
Python interpreter to try other comparisons (eg __ieq__) and either
return False (in the case of __eq__) or raise a TypeError
exception (eg in the case of __lt__).

* Python 3 updates

* Add a more helpful message in exception if platform is not defined

* Added a basic pre-commit check

* Add transmit pioneer (#922)

* Added pioneer_protocol to support transmit_pioneer

* Display tm1637 (#946)

* add TM1637 support

* Support a further variant of Xiaomi CGG1 (#930)

* Daikin climate ir component (#964)

* Daikin ARC43XXX IR remote controller support

* Format and lint fixes

* Check temperature values against allowed min/max

* fix tm1637 missing __init__.py (#975)

* Add AC Dimmer support

Fixes https://github.com/esphome/feature-requests/issues/278

* fixes

basically missed the output pin setup and in the switching was switching true true true :P

* Format

* Enable ESP32

* Also setup ZC pin

* Support multiple dimmers sharing ZC pin

* Fix ESP32

* Lint

* off gate on zc detect

* tests pins validation

* fix esp8266 many dimmers, changed timing

* Increased value resolution, added min power

* use min_power from base class

* fix min_power. add init with half cycle

* added method for trailing pulse, trailing and leading

* fix method name. try filter invalid falling pulse

* renamed to ac_dimmer

* fix ESP32 not configuring zero cross twice

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
Co-authored-by: Wilmar den Ouden <wilmardo@users.noreply.github.com>
Co-authored-by: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Co-authored-by: Tim Savage <tim@savage.company>
Co-authored-by: Vc <37367415+Valcob@users.noreply.github.com>
Co-authored-by: gitolicious <mrjchn@gmail.com>
Co-authored-by: voibit <krestean@gmail.com>
Co-authored-by: Luar Roji <cyberplant@users.noreply.github.com>
Co-authored-by: András Bíró <1202136+andrasbiro@users.noreply.github.com>
Co-authored-by: dmkif <dmkif@users.noreply.github.com>
Co-authored-by: Panuruj Khambanonda (PK) <pk@panurujk.com>
Co-authored-by: Kamil Trzciński <ayufan@ayufan.eu>
Co-authored-by: Keith Burzinski <kbx81x@gmail.com>
Co-authored-by: Mario <4376789+mario-tux@users.noreply.github.com>
Co-authored-by: Héctor Giménez <hector.fwbz@gmail.com>
---
 esphome/components/ac_dimmer/__init__.py   |   0
 esphome/components/ac_dimmer/ac_dimmer.cpp | 217 +++++++++++++++++++++
 esphome/components/ac_dimmer/ac_dimmer.h   |  66 +++++++
 esphome/components/ac_dimmer/output.py     |  43 ++++
 tests/test1.yaml                           |   4 +
 tests/test3.yaml                           |   4 +
 6 files changed, 334 insertions(+)
 create mode 100644 esphome/components/ac_dimmer/__init__.py
 create mode 100644 esphome/components/ac_dimmer/ac_dimmer.cpp
 create mode 100644 esphome/components/ac_dimmer/ac_dimmer.h
 create mode 100644 esphome/components/ac_dimmer/output.py

diff --git a/esphome/components/ac_dimmer/__init__.py b/esphome/components/ac_dimmer/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/ac_dimmer/ac_dimmer.cpp b/esphome/components/ac_dimmer/ac_dimmer.cpp
new file mode 100644
index 0000000000..a60cc9e29a
--- /dev/null
+++ b/esphome/components/ac_dimmer/ac_dimmer.cpp
@@ -0,0 +1,217 @@
+#include "ac_dimmer.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP8266
+#include <core_esp8266_waveform.h>
+#endif
+
+namespace esphome {
+namespace ac_dimmer {
+
+static const char *TAG = "ac_dimmer";
+
+// Global array to store dimmer objects
+static AcDimmerDataStore *all_dimmers[32];
+
+/// Time in microseconds the gate should be held high
+/// 10µs should be long enough for most triacs
+/// For reference: BT136 datasheet says 2µs nominal (page 7)
+static uint32_t GATE_ENABLE_TIME = 10;
+
+/// Function called from timer interrupt
+/// Input is current time in microseconds (micros())
+/// Returns when next "event" is expected in µs, or 0 if no such event known.
+uint32_t ICACHE_RAM_ATTR HOT AcDimmerDataStore::timer_intr(uint32_t now) {
+  // If no ZC signal received yet.
+  if (this->crossed_zero_at == 0)
+    return 0;
+
+  uint32_t time_since_zc = now - this->crossed_zero_at;
+  if (this->value == 65535 || this->value == 0) {
+    return 0;
+  }
+
+  if (this->enable_time_us != 0 && time_since_zc >= this->enable_time_us) {
+    this->enable_time_us = 0;
+    this->gate_pin->digital_write(true);
+    // Prevent too short pulses
+    this->disable_time_us = max(this->disable_time_us, time_since_zc + GATE_ENABLE_TIME);
+  }
+  if (this->disable_time_us != 0 && time_since_zc >= this->disable_time_us) {
+    this->disable_time_us = 0;
+    this->gate_pin->digital_write(false);
+  }
+
+  if (time_since_zc < this->enable_time_us)
+    // Next event is enable, return time until that event
+    return this->enable_time_us - time_since_zc;
+  else if (time_since_zc < disable_time_us) {
+    // Next event is disable, return time until that event
+    return this->disable_time_us - time_since_zc;
+  }
+
+  if (time_since_zc >= this->cycle_time_us) {
+    // Already past last cycle time, schedule next call shortly
+    return 100;
+  }
+
+  return this->cycle_time_us - time_since_zc;
+}
+
+/// Run timer interrupt code and return in how many µs the next event is expected
+uint32_t ICACHE_RAM_ATTR HOT timer_interrupt() {
+  // run at least with 1kHz
+  uint32_t min_dt_us = 1000;
+  uint32_t now = micros();
+  for (auto *dimmer : all_dimmers) {
+    if (dimmer == nullptr)
+      // no more dimmers
+      break;
+    uint32_t res = dimmer->timer_intr(now);
+    if (res != 0 && res < min_dt_us)
+      min_dt_us = res;
+  }
+  // return time until next timer1 interrupt in µs
+  return min_dt_us;
+}
+
+/// GPIO interrupt routine, called when ZC pin triggers
+void ICACHE_RAM_ATTR HOT AcDimmerDataStore::gpio_intr() {
+  uint32_t prev_crossed = this->crossed_zero_at;
+
+  // 50Hz mains frequency should give a half cycle of 10ms a 60Hz will give 8.33ms
+  // in any case the cycle last at least 5ms
+  this->crossed_zero_at = micros();
+  uint32_t cycle_time = this->crossed_zero_at - prev_crossed;
+  if (cycle_time > 5000) {
+    this->cycle_time_us = cycle_time;
+  } else {
+    // Otherwise this is noise and this is 2nd (or 3rd...) fall in the same pulse
+    // Consider this is the right fall edge and accumulate the cycle time instead
+    this->cycle_time_us += cycle_time;
+  }
+
+  if (this->value == 65535) {
+    // fully on, enable output immediately
+    this->gate_pin->digital_write(true);
+  } else if (this->init_cycle) {
+    // send a full cycle
+    this->init_cycle = false;
+    this->enable_time_us = 0;
+    this->disable_time_us = cycle_time_us;
+  } else if (this->value == 0) {
+    // fully off, disable output immediately
+    this->gate_pin->digital_write(false);
+  } else {
+    if (this->method == DIM_METHOD_TRAILING) {
+      this->enable_time_us = 1;  // cannot be 0
+      this->disable_time_us = max((uint32_t) 10, this->value * this->cycle_time_us / 65535);
+    } else {
+      // calculate time until enable in µs: (1.0-value)*cycle_time, but with integer arithmetic
+      // also take into account min_power
+      auto min_us = this->cycle_time_us * this->min_power / 1000;
+      this->enable_time_us = max((uint32_t) 1, ((65535 - this->value) * (this->cycle_time_us - min_us)) / 65535);
+      if (this->method == DIM_METHOD_LEADING_PULSE) {
+        // Minimum pulse time should be enough for the triac to trigger when it is close to the ZC zone
+        // this is for brightness near 99%
+        this->disable_time_us = max(this->enable_time_us + GATE_ENABLE_TIME, (uint32_t) cycle_time_us / 10);
+      } else {
+        this->gate_pin->digital_write(false);
+        this->disable_time_us = this->cycle_time_us;
+      }
+    }
+  }
+}
+
+void ICACHE_RAM_ATTR HOT AcDimmerDataStore::s_gpio_intr(AcDimmerDataStore *store) {
+  // Attaching pin interrupts on the same pin will override the previous interupt
+  // However, the user expects that multiple dimmers sharing the same ZC pin will work.
+  // We solve this in a bit of a hacky way: On each pin interrupt, we check all dimmers
+  // if any of them are using the same ZC pin, and also trigger the interrupt for *them*.
+  for (auto *dimmer : all_dimmers) {
+    if (dimmer == nullptr)
+      break;
+    if (dimmer->zero_cross_pin_number == store->zero_cross_pin_number) {
+      dimmer->gpio_intr();
+    }
+  }
+}
+
+#ifdef ARDUINO_ARCH_ESP32
+// ESP32 implementation, uses basically the same code but needs to wrap
+// timer_interrupt() function to auto-reschedule
+static hw_timer_t *dimmer_timer = nullptr;
+void ICACHE_RAM_ATTR HOT AcDimmerDataStore::s_timer_intr() { timer_interrupt(); }
+#endif
+
+void AcDimmer::setup() {
+  // extend all_dimmers array with our dimmer
+
+  // Need to be sure the zero cross pin is setup only once, ESP8266 fails and ESP32 seems to fail silently
+  auto setup_zero_cross_pin = true;
+
+  for (auto &all_dimmer : all_dimmers) {
+    if (all_dimmer == nullptr) {
+      all_dimmer = &this->store_;
+      break;
+    }
+    if (all_dimmer->zero_cross_pin_number == this->zero_cross_pin_->get_pin()) {
+      setup_zero_cross_pin = false;
+    }
+  }
+
+  this->gate_pin_->setup();
+  this->store_.gate_pin = this->gate_pin_->to_isr();
+  this->store_.zero_cross_pin_number = this->zero_cross_pin_->get_pin();
+  this->store_.min_power = static_cast<uint16_t>(this->min_power_ * 1000);
+  this->min_power_ = 0;
+  this->store_.method = this->method_;
+
+  if (setup_zero_cross_pin) {
+    this->zero_cross_pin_->setup();
+    this->store_.zero_cross_pin = this->zero_cross_pin_->to_isr();
+    this->zero_cross_pin_->attach_interrupt(&AcDimmerDataStore::s_gpio_intr, &this->store_, FALLING);
+  }
+
+#ifdef ARDUINO_ARCH_ESP8266
+  // Uses ESP8266 waveform (soft PWM) class
+  // PWM and AcDimmer can even run at the same time this way
+  setTimer1Callback(&timer_interrupt);
+#endif
+#ifdef ARDUINO_ARCH_ESP32
+  // 80 Divider -> 1 count=1µs
+  dimmer_timer = timerBegin(0, 80, true);
+  timerAttachInterrupt(dimmer_timer, &AcDimmerDataStore::s_timer_intr, true);
+  // For ESP32, we can't use dynamic interval calculation because the timerX functions
+  // are not callable from ISR (placed in flash storage).
+  // Here we just use an interrupt firing every 50 µs.
+  timerAlarmWrite(dimmer_timer, 50, true);
+  timerAlarmEnable(dimmer_timer);
+#endif
+}
+void AcDimmer::write_state(float state) {
+  auto new_value = static_cast<uint16_t>(roundf(state * 65535));
+  if (new_value != 0 && this->store_.value == 0)
+    this->store_.init_cycle = this->init_with_half_cycle_;
+  this->store_.value = new_value;
+}
+void AcDimmer::dump_config() {
+  ESP_LOGCONFIG(TAG, "AcDimmer:");
+  LOG_PIN("  Output Pin: ", this->gate_pin_);
+  LOG_PIN("  Zero-Cross Pin: ", this->zero_cross_pin_);
+  ESP_LOGCONFIG(TAG, "   Min Power: %.1f%%", this->store_.min_power / 10.0f);
+  ESP_LOGCONFIG(TAG, "   Init with half cycle: %s", YESNO(this->init_with_half_cycle_));
+  if (method_ == DIM_METHOD_LEADING_PULSE)
+    ESP_LOGCONFIG(TAG, "   Method: leading pulse");
+  else if (method_ == DIM_METHOD_LEADING)
+    ESP_LOGCONFIG(TAG, "   Method: leading");
+  else
+    ESP_LOGCONFIG(TAG, "   Method: trailing");
+
+  LOG_FLOAT_OUTPUT(this);
+  ESP_LOGV(TAG, "  Estimated Frequency: %.3fHz", 1e6f / this->store_.cycle_time_us / 2);
+}
+
+}  // namespace ac_dimmer
+}  // namespace esphome
diff --git a/esphome/components/ac_dimmer/ac_dimmer.h b/esphome/components/ac_dimmer/ac_dimmer.h
new file mode 100644
index 0000000000..00da061cfd
--- /dev/null
+++ b/esphome/components/ac_dimmer/ac_dimmer.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
+#include "esphome/components/output/float_output.h"
+
+namespace esphome {
+namespace ac_dimmer {
+
+enum DimMethod { DIM_METHOD_LEADING_PULSE = 0, DIM_METHOD_LEADING, DIM_METHOD_TRAILING };
+
+struct AcDimmerDataStore {
+  /// Zero-cross pin
+  ISRInternalGPIOPin *zero_cross_pin;
+  /// Zero-cross pin number - used to share ZC pin across multiple dimmers
+  uint8_t zero_cross_pin_number;
+  /// Output pin to write to
+  ISRInternalGPIOPin *gate_pin;
+  /// Value of the dimmer - 0 to 65535.
+  uint16_t value;
+  /// Minimum power for activation
+  uint16_t min_power;
+  /// Time between the last two ZC pulses
+  uint32_t cycle_time_us;
+  /// Time (in micros()) of last ZC signal
+  uint32_t crossed_zero_at;
+  /// Time since last ZC pulse to enable gate pin. 0 means not set.
+  uint32_t enable_time_us;
+  /// Time since last ZC pulse to disable gate pin. 0 means no disable.
+  uint32_t disable_time_us;
+  /// Set to send the first half ac cycle complete
+  bool init_cycle;
+  /// Dimmer method
+  DimMethod method;
+
+  uint32_t timer_intr(uint32_t now);
+
+  void gpio_intr();
+  static void s_gpio_intr(AcDimmerDataStore *store);
+#ifdef ARDUINO_ARCH_ESP32
+  static void s_timer_intr();
+#endif
+};
+
+class AcDimmer : public output::FloatOutput, public Component {
+ public:
+  void setup() override;
+
+  void dump_config() override;
+  void set_gate_pin(GPIOPin *gate_pin) { gate_pin_ = gate_pin; }
+  void set_zero_cross_pin(GPIOPin *zero_cross_pin) { zero_cross_pin_ = zero_cross_pin; }
+  void set_init_with_half_cycle(bool init_with_half_cycle) { init_with_half_cycle_ = init_with_half_cycle; }
+  void set_method(DimMethod method) { method_ = method; }
+
+ protected:
+  void write_state(float state) override;
+
+  GPIOPin *gate_pin_;
+  GPIOPin *zero_cross_pin_;
+  AcDimmerDataStore store_;
+  bool init_with_half_cycle_;
+  DimMethod method_;
+};
+
+}  // namespace ac_dimmer
+}  // namespace esphome
diff --git a/esphome/components/ac_dimmer/output.py b/esphome/components/ac_dimmer/output.py
new file mode 100644
index 0000000000..16f04ac984
--- /dev/null
+++ b/esphome/components/ac_dimmer/output.py
@@ -0,0 +1,43 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import output
+from esphome.const import CONF_ID, CONF_MIN_POWER, CONF_METHOD
+
+ac_dimmer_ns = cg.esphome_ns.namespace('ac_dimmer')
+AcDimmer = ac_dimmer_ns.class_('AcDimmer', output.FloatOutput, cg.Component)
+
+DimMethod = ac_dimmer_ns.enum('DimMethod')
+DIM_METHODS = {
+    'LEADING_PULSE': DimMethod.DIM_METHOD_LEADING_PULSE,
+    'LEADING': DimMethod.DIM_METHOD_LEADING,
+    'TRAILING': DimMethod.DIM_METHOD_TRAILING,
+}
+
+CONF_GATE_PIN = 'gate_pin'
+CONF_ZERO_CROSS_PIN = 'zero_cross_pin'
+CONF_INIT_WITH_HALF_CYCLE = 'init_with_half_cycle'
+CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend({
+    cv.Required(CONF_ID): cv.declare_id(AcDimmer),
+    cv.Required(CONF_GATE_PIN): pins.internal_gpio_output_pin_schema,
+    cv.Required(CONF_ZERO_CROSS_PIN): pins.internal_gpio_input_pin_schema,
+    cv.Optional(CONF_INIT_WITH_HALF_CYCLE, default=True): cv.boolean,
+    cv.Optional(CONF_METHOD, default='leading pulse'): cv.enum(DIM_METHODS, upper=True, space='_'),
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+
+    # override default min power to 10%
+    if CONF_MIN_POWER not in config:
+        config[CONF_MIN_POWER] = 0.1
+    yield output.register_output(var, config)
+
+    pin = yield cg.gpio_pin_expression(config[CONF_GATE_PIN])
+    cg.add(var.set_gate_pin(pin))
+    pin = yield cg.gpio_pin_expression(config[CONF_ZERO_CROSS_PIN])
+    cg.add(var.set_zero_cross_pin(pin))
+    cg.add(var.set_init_with_half_cycle(config[CONF_INIT_WITH_HALF_CYCLE]))
+    cg.add(var.set_method(config[CONF_METHOD]))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 8483281b59..16fc382b2f 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1012,6 +1012,10 @@ output:
     id: id24
     pin: GPIO26
     period: 15s
+  - platform: ac_dimmer
+    id: dimmer1
+    gate_pin: GPIO5
+    zero_cross_pin: GPIO26
 
 light:
   - platform: binary
diff --git a/tests/test3.yaml b/tests/test3.yaml
index e7c3da18de..2a37095aca 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -649,6 +649,10 @@ output:
       return {s};
     outputs:
       - id: custom_float
+  - platform: ac_dimmer
+    id: dimmer1
+    gate_pin: GPIO5
+    zero_cross_pin: GPIO12
 
 mcp23017:
   id: mcp23017_hub

From c1dfed5c08dcd00f967d1fe53befefbdff1c0b1f Mon Sep 17 00:00:00 2001
From: Alex Reid <alex-reid@live.ca>
Date: Sun, 12 Apr 2020 15:07:10 -0400
Subject: [PATCH 184/412] feat: Add support for MCP23016 IO Expander (#1012)

* feat: Add support for MCP23016 IO extander

* fix: Fix style
---
 esphome/components/mcp23016/__init__.py  | 50 +++++++++++++
 esphome/components/mcp23016/mcp23016.cpp | 91 ++++++++++++++++++++++++
 esphome/components/mcp23016/mcp23016.h   | 71 ++++++++++++++++++
 tests/test1.yaml                         | 18 +++++
 4 files changed, 230 insertions(+)
 create mode 100644 esphome/components/mcp23016/__init__.py
 create mode 100644 esphome/components/mcp23016/mcp23016.cpp
 create mode 100644 esphome/components/mcp23016/mcp23016.h

diff --git a/esphome/components/mcp23016/__init__.py b/esphome/components/mcp23016/__init__.py
new file mode 100644
index 0000000000..93c3d3843c
--- /dev/null
+++ b/esphome/components/mcp23016/__init__.py
@@ -0,0 +1,50 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import i2c
+from esphome.const import CONF_ID, CONF_NUMBER, CONF_MODE, CONF_INVERTED
+
+DEPENDENCIES = ['i2c']
+MULTI_CONF = True
+
+mcp23016_ns = cg.esphome_ns.namespace('mcp23016')
+MCP23016GPIOMode = mcp23016_ns.enum('MCP23016GPIOMode')
+MCP23016_GPIO_MODES = {
+    'INPUT': MCP23016GPIOMode.MCP23016_INPUT,
+    'OUTPUT': MCP23016GPIOMode.MCP23016_OUTPUT,
+}
+
+MCP23016 = mcp23016_ns.class_('MCP23016', cg.Component, i2c.I2CDevice)
+MCP23016GPIOPin = mcp23016_ns.class_('MCP23016GPIOPin', cg.GPIOPin)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.Required(CONF_ID): cv.declare_id(MCP23016),
+}).extend(cv.COMPONENT_SCHEMA).extend(i2c.i2c_device_schema(0x20))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield i2c.register_i2c_device(var, config)
+
+
+CONF_MCP23016 = 'mcp23016'
+MCP23016_OUTPUT_PIN_SCHEMA = cv.Schema({
+    cv.Required(CONF_MCP23016): cv.use_id(MCP23016),
+    cv.Required(CONF_NUMBER): cv.int_,
+    cv.Optional(CONF_MODE, default="OUTPUT"): cv.enum(MCP23016_GPIO_MODES, upper=True),
+    cv.Optional(CONF_INVERTED, default=False): cv.boolean,
+})
+MCP23016_INPUT_PIN_SCHEMA = cv.Schema({
+    cv.Required(CONF_MCP23016): cv.use_id(MCP23016),
+    cv.Required(CONF_NUMBER): cv.int_,
+    cv.Optional(CONF_MODE, default="INPUT"): cv.enum(MCP23016_GPIO_MODES, upper=True),
+    cv.Optional(CONF_INVERTED, default=False): cv.boolean,
+})
+
+
+@pins.PIN_SCHEMA_REGISTRY.register(CONF_MCP23016,
+                                   (MCP23016_OUTPUT_PIN_SCHEMA, MCP23016_INPUT_PIN_SCHEMA))
+def mcp23016_pin_to_code(config):
+    parent = yield cg.get_variable(config[CONF_MCP23016])
+    yield MCP23016GPIOPin.new(parent, config[CONF_NUMBER], config[CONF_MODE], config[CONF_INVERTED])
diff --git a/esphome/components/mcp23016/mcp23016.cpp b/esphome/components/mcp23016/mcp23016.cpp
new file mode 100644
index 0000000000..bd04486965
--- /dev/null
+++ b/esphome/components/mcp23016/mcp23016.cpp
@@ -0,0 +1,91 @@
+#include "mcp23016.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace mcp23016 {
+
+static const char *TAG = "mcp23016";
+
+void MCP23016::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up MCP23016...");
+  uint8_t iocon;
+  if (!this->read_reg_(MCP23016_IOCON0, &iocon)) {
+    this->mark_failed();
+    return;
+  }
+
+  // all pins input
+  this->write_reg_(MCP23016_IODIR0, 0xFF);
+  this->write_reg_(MCP23016_IODIR1, 0xFF);
+}
+bool MCP23016::digital_read(uint8_t pin) {
+  uint8_t bit = pin % 8;
+  uint8_t reg_addr = pin < 8 ? MCP23016_GP0 : MCP23016_GP1;
+  uint8_t value = 0;
+  this->read_reg_(reg_addr, &value);
+  return value & (1 << bit);
+}
+void MCP23016::digital_write(uint8_t pin, bool value) {
+  uint8_t reg_addr = pin < 8 ? MCP23016_OLAT0 : MCP23016_OLAT1;
+  this->update_reg_(pin, value, reg_addr);
+}
+void MCP23016::pin_mode(uint8_t pin, uint8_t mode) {
+  uint8_t iodir = pin < 8 ? MCP23016_IODIR0 : MCP23016_IODIR1;
+  switch (mode) {
+    case MCP23016_INPUT:
+      this->update_reg_(pin, true, iodir);
+      break;
+    case MCP23016_OUTPUT:
+      this->update_reg_(pin, false, iodir);
+      break;
+    default:
+      break;
+  }
+}
+float MCP23016::get_setup_priority() const { return setup_priority::HARDWARE; }
+bool MCP23016::read_reg_(uint8_t reg, uint8_t *value) {
+  if (this->is_failed())
+    return false;
+
+  return this->read_byte(reg, value);
+}
+bool MCP23016::write_reg_(uint8_t reg, uint8_t value) {
+  if (this->is_failed())
+    return false;
+
+  return this->write_byte(reg, value);
+}
+void MCP23016::update_reg_(uint8_t pin, bool pin_value, uint8_t reg_addr) {
+  uint8_t bit = pin % 8;
+  uint8_t reg_value = 0;
+  if (reg_addr == MCP23016_OLAT0) {
+    reg_value = this->olat_0_;
+  } else if (reg_addr == MCP23016_OLAT1) {
+    reg_value = this->olat_1_;
+  } else {
+    this->read_reg_(reg_addr, &reg_value);
+  }
+
+  if (pin_value)
+    reg_value |= 1 << bit;
+  else
+    reg_value &= ~(1 << bit);
+
+  this->write_reg_(reg_addr, reg_value);
+
+  if (reg_addr == MCP23016_OLAT0) {
+    this->olat_0_ = reg_value;
+  } else if (reg_addr == MCP23016_OLAT1) {
+    this->olat_1_ = reg_value;
+  }
+}
+
+MCP23016GPIOPin::MCP23016GPIOPin(MCP23016 *parent, uint8_t pin, uint8_t mode, bool inverted)
+    : GPIOPin(pin, mode, inverted), parent_(parent) {}
+void MCP23016GPIOPin::setup() { this->pin_mode(this->mode_); }
+void MCP23016GPIOPin::pin_mode(uint8_t mode) { this->parent_->pin_mode(this->pin_, mode); }
+bool MCP23016GPIOPin::digital_read() { return this->parent_->digital_read(this->pin_) != this->inverted_; }
+void MCP23016GPIOPin::digital_write(bool value) { this->parent_->digital_write(this->pin_, value != this->inverted_); }
+
+}  // namespace mcp23016
+}  // namespace esphome
diff --git a/esphome/components/mcp23016/mcp23016.h b/esphome/components/mcp23016/mcp23016.h
new file mode 100644
index 0000000000..53502f80eb
--- /dev/null
+++ b/esphome/components/mcp23016/mcp23016.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace mcp23016 {
+
+/// Modes for MCP23016 pins
+enum MCP23016GPIOMode : uint8_t {
+  MCP23016_INPUT = INPUT,   // 0x00
+  MCP23016_OUTPUT = OUTPUT  // 0x01
+};
+
+enum MCP23016GPIORegisters {
+  // 0 side
+  MCP23016_GP0 = 0x00,
+  MCP23016_OLAT0 = 0x02,
+  MCP23016_IPOL0 = 0x04,
+  MCP23016_IODIR0 = 0x06,
+  MCP23016_INTCAP0 = 0x08,
+  MCP23016_IOCON0 = 0x0A,
+  // 1 side
+  MCP23016_GP1 = 0x01,
+  MCP23016_OLAT1 = 0x03,
+  MCP23016_IPOL1 = 0x04,
+  MCP23016_IODIR1 = 0x07,
+  MCP23016_INTCAP1 = 0x08,
+  MCP23016_IOCON1 = 0x0B,
+};
+
+class MCP23016 : public Component, public i2c::I2CDevice {
+ public:
+  MCP23016() = default;
+
+  void setup() override;
+
+  bool digital_read(uint8_t pin);
+  void digital_write(uint8_t pin, bool value);
+  void pin_mode(uint8_t pin, uint8_t mode);
+
+  float get_setup_priority() const override;
+
+ protected:
+  // read a given register
+  bool read_reg_(uint8_t reg, uint8_t *value);
+  // write a value to a given register
+  bool write_reg_(uint8_t reg, uint8_t value);
+  // update registers with given pin value.
+  void update_reg_(uint8_t pin, bool pin_value, uint8_t reg_a);
+
+  uint8_t olat_0_{0x00};
+  uint8_t olat_1_{0x00};
+};
+
+class MCP23016GPIOPin : public GPIOPin {
+ public:
+  MCP23016GPIOPin(MCP23016 *parent, uint8_t pin, uint8_t mode, bool inverted = false);
+
+  void setup() override;
+  void pin_mode(uint8_t mode) override;
+  bool digital_read() override;
+  void digital_write(bool value) override;
+
+ protected:
+  MCP23016 *parent_;
+};
+
+}  // namespace mcp23016
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 16fc382b2f..8019148e07 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -867,6 +867,13 @@ binary_sensor:
       number: 7
       mode: INPUT_PULLUP
       inverted: False
+  - platform: gpio
+    name: "MCP23 binary sensor"
+    pin:
+      mcp23016: mcp23016_hub
+      number: 7
+      mode: INPUT
+      inverted: False
 
   - platform: remote_receiver
     name: "Raw Remote Receiver Test"
@@ -990,6 +997,13 @@ output:
       number: 0
       mode: OUTPUT
       inverted: False
+  - platform: gpio
+    id: id25
+    pin:
+      mcp23016: mcp23016_hub
+      number: 0
+      mode: OUTPUT
+      inverted: False
   - platform: my9231
     id: my_0
     channel: 0
@@ -1569,6 +1583,10 @@ mcp23008:
   - id: 'mcp23008_hub'
     address: 0x22
 
+mcp23016:
+  - id: 'mcp23016_hub'
+    address: 0x23
+
 stepper:
 - platform: a4988
   id: my_stepper

From 65f4d30fd006ced61b1a1852c3fbaa958b655dfd Mon Sep 17 00:00:00 2001
From: puuu <puuu@users.noreply.github.com>
Date: Fri, 17 Apr 2020 06:57:58 +0900
Subject: [PATCH 185/412] Daikin climate receiver support (#1001)

* climate.daikin: implement remote receive

* climate.daikin: fix temperature value in special modes

* climate.daikin: tweak timing to fit better to ir-remote signal
---
 esphome/components/daikin/climate.py |   2 +-
 esphome/components/daikin/daikin.cpp | 101 ++++++++++++++++++++++++++-
 esphome/components/daikin/daikin.h   |  10 ++-
 3 files changed, 109 insertions(+), 4 deletions(-)

diff --git a/esphome/components/daikin/climate.py b/esphome/components/daikin/climate.py
index f1d5c7ed4a..ff3f506fb2 100644
--- a/esphome/components/daikin/climate.py
+++ b/esphome/components/daikin/climate.py
@@ -8,7 +8,7 @@ AUTO_LOAD = ['climate_ir']
 daikin_ns = cg.esphome_ns.namespace('daikin')
 DaikinClimate = daikin_ns.class_('DaikinClimate', climate_ir.ClimateIR)
 
-CONFIG_SCHEMA = climate_ir.CLIMATE_IR_SCHEMA.extend({
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(DaikinClimate),
 })
 
diff --git a/esphome/components/daikin/daikin.cpp b/esphome/components/daikin/daikin.cpp
index eabbb96014..b6e80d62a7 100644
--- a/esphome/components/daikin/daikin.cpp
+++ b/esphome/components/daikin/daikin.cpp
@@ -115,7 +115,8 @@ uint8_t DaikinClimate::temperature_() {
   // Force special temperatures depending on the mode
   switch (this->mode) {
     case climate::CLIMATE_MODE_FAN_ONLY:
-      return 25;
+      return 0x32;
+    case climate::CLIMATE_MODE_AUTO:
     case climate::CLIMATE_MODE_DRY:
       return 0xc0;
     default:
@@ -124,5 +125,103 @@ uint8_t DaikinClimate::temperature_() {
   }
 }
 
+bool DaikinClimate::parse_state_frame_(const uint8_t frame[]) {
+  uint8_t checksum = 0;
+  for (int i = 0; i < (DAIKIN_STATE_FRAME_SIZE - 1); i++) {
+    checksum += frame[i];
+  }
+  if (frame[DAIKIN_STATE_FRAME_SIZE - 1] != checksum)
+    return false;
+  uint8_t mode = frame[5];
+  if (mode & DAIKIN_MODE_ON) {
+    switch (mode & 0xF0) {
+      case DAIKIN_MODE_COOL:
+        this->mode = climate::CLIMATE_MODE_COOL;
+        break;
+      case DAIKIN_MODE_DRY:
+        this->mode = climate::CLIMATE_MODE_DRY;
+        break;
+      case DAIKIN_MODE_HEAT:
+        this->mode = climate::CLIMATE_MODE_HEAT;
+        break;
+      case DAIKIN_MODE_AUTO:
+        this->mode = climate::CLIMATE_MODE_AUTO;
+        break;
+      case DAIKIN_MODE_FAN:
+        this->mode = climate::CLIMATE_MODE_FAN_ONLY;
+        break;
+    }
+  } else {
+    this->mode = climate::CLIMATE_MODE_OFF;
+  }
+  uint8_t temperature = frame[6];
+  if (!(temperature & 0xC0)) {
+    this->target_temperature = temperature >> 1;
+  }
+  uint8_t fan_mode = frame[8];
+  if (fan_mode & 0xF)
+    this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
+  else
+    this->swing_mode = climate::CLIMATE_SWING_OFF;
+  switch (fan_mode & 0xF0) {
+    case DAIKIN_FAN_1:
+    case DAIKIN_FAN_2:
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+      break;
+    case DAIKIN_FAN_3:
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+      break;
+    case DAIKIN_FAN_4:
+    case DAIKIN_FAN_5:
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+      break;
+    case DAIKIN_FAN_AUTO:
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+      break;
+  }
+  this->publish_state();
+  return true;
+}
+
+bool DaikinClimate::on_receive(remote_base::RemoteReceiveData data) {
+  uint8_t state_frame[DAIKIN_STATE_FRAME_SIZE] = {};
+  if (!data.expect_item(DAIKIN_HEADER_MARK, DAIKIN_HEADER_SPACE)) {
+    return false;
+  }
+  for (uint8_t pos = 0; pos < DAIKIN_STATE_FRAME_SIZE; pos++) {
+    uint8_t byte = 0;
+    for (int8_t bit = 0; bit < 8; bit++) {
+      if (data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ONE_SPACE))
+        byte |= 1 << bit;
+      else if (!data.expect_item(DAIKIN_BIT_MARK, DAIKIN_ZERO_SPACE)) {
+        return false;
+      }
+    }
+    state_frame[pos] = byte;
+    if (pos == 0) {
+      // frame header
+      if (byte != 0x11)
+        return false;
+    } else if (pos == 1) {
+      // frame header
+      if (byte != 0xDA)
+        return false;
+    } else if (pos == 2) {
+      // frame header
+      if (byte != 0x27)
+        return false;
+    } else if (pos == 3) {
+      // frame header
+      if (byte != 0x00)
+        return false;
+    } else if (pos == 4) {
+      // frame type
+      if (byte != 0x00)
+        return false;
+    }
+  }
+  return this->parse_state_frame_(state_frame);
+}
+
 }  // namespace daikin
 }  // namespace esphome
diff --git a/esphome/components/daikin/daikin.h b/esphome/components/daikin/daikin.h
index ea69256701..4671d57570 100644
--- a/esphome/components/daikin/daikin.h
+++ b/esphome/components/daikin/daikin.h
@@ -31,11 +31,14 @@ const uint8_t DAIKIN_FAN_5 = 0x70;
 const uint32_t DAIKIN_IR_FREQUENCY = 38000;
 const uint32_t DAIKIN_HEADER_MARK = 3360;
 const uint32_t DAIKIN_HEADER_SPACE = 1760;
-const uint32_t DAIKIN_BIT_MARK = 360;
+const uint32_t DAIKIN_BIT_MARK = 520;
 const uint32_t DAIKIN_ONE_SPACE = 1370;
-const uint32_t DAIKIN_ZERO_SPACE = 520;
+const uint32_t DAIKIN_ZERO_SPACE = 360;
 const uint32_t DAIKIN_MESSAGE_SPACE = 32300;
 
+// State Frame size
+const uint8_t DAIKIN_STATE_FRAME_SIZE = 19;
+
 class DaikinClimate : public climate_ir::ClimateIR {
  public:
   DaikinClimate()
@@ -51,6 +54,9 @@ class DaikinClimate : public climate_ir::ClimateIR {
   uint8_t operation_mode_();
   uint8_t fan_speed_();
   uint8_t temperature_();
+  // Handle received IR Buffer
+  bool on_receive(remote_base::RemoteReceiveData data) override;
+  bool parse_state_frame_(const uint8_t frame[]);
 };
 
 }  // namespace daikin

From d44754889378e1359bd2b09bf78f095b90b92091 Mon Sep 17 00:00:00 2001
From: Tim Savage <tim@savage.company>
Date: Mon, 20 Apr 2020 10:05:58 +1000
Subject: [PATCH 187/412] Tests for CPP Code generation and some Python3
 improvements (#961)

* Basic pytest configuration

* Added unit_test script that triggers pytest

* Changed "fixtures" to fixture_path

This is consistent with pytest's tmp_path

* Initial unit tests for esphome.helpers

* Disabled coverage reporting for esphome/components.

Focus initial unittest efforts on the core code.

* Migrated some ip_address to hypothesis

* Added a hypothesis MAC address strategy

* Initial tests for core

* Added hypothesis to requirements

* Added tests for core classes

TestTimePeriod
Lambda
ID
DocumentLocation
DocumentRange
Define
Library

* Updated test config so package root is discovered

* Setup fixtures and inital tests for pins

* Added tests for validate GPIO

* Added tests for pin type

* Added initial config_validation tests

* Added more tests for config_validation

* Added comparison unit tests

* Added repr to core.TimePeriod. Simplified identifying faults in tests

* Fixed inverted gt/lt tests

* Some tests for Espcore

* Updated syntax for Python3

* Removed usage of kwarg that isn't required

* Started writing test cases

* Started writing test cases for cpp_generator

* Additional docs and more Python3 releated improvements

* More test cases for cpp_generator.

* Fixed linter errors

* Add codegen tests to ensure file API remains stable

* Add test cases for cpp_helpers
---
 esphome/components/globals/__init__.py        |   2 +-
 esphome/components/neopixelbus/light.py       |   2 +-
 .../components/waveshare_epaper/display.py    |   4 +-
 esphome/cpp_generator.py                      | 329 +++++++++---------
 requirements_test.txt                         |   1 +
 tests/unit_tests/test_codegen.py              |  26 ++
 tests/unit_tests/test_core.py                 |   2 +-
 tests/unit_tests/test_cpp_generator.py        | 293 ++++++++++++++++
 tests/unit_tests/test_cpp_helpers.py          |  85 +++++
 9 files changed, 574 insertions(+), 170 deletions(-)
 create mode 100644 tests/unit_tests/test_codegen.py
 create mode 100644 tests/unit_tests/test_cpp_generator.py
 create mode 100644 tests/unit_tests/test_cpp_helpers.py

diff --git a/esphome/components/globals/__init__.py b/esphome/components/globals/__init__.py
index d285f1e97f..e59a7e6acb 100644
--- a/esphome/components/globals/__init__.py
+++ b/esphome/components/globals/__init__.py
@@ -30,7 +30,7 @@ def to_code(config):
         initial_value = cg.RawExpression(config[CONF_INITIAL_VALUE])
 
     rhs = GlobalsComponent.new(template_args, initial_value)
-    glob = cg.Pvariable(config[CONF_ID], rhs, type=res_type)
+    glob = cg.Pvariable(config[CONF_ID], rhs, res_type)
     yield cg.register_component(glob, config)
 
     if config[CONF_RESTORE_VALUE]:
diff --git a/esphome/components/neopixelbus/light.py b/esphome/components/neopixelbus/light.py
index fb83e4740d..2b84882e59 100644
--- a/esphome/components/neopixelbus/light.py
+++ b/esphome/components/neopixelbus/light.py
@@ -169,7 +169,7 @@ def to_code(config):
     else:
         out_type = NeoPixelRGBLightOutput.template(template)
     rhs = out_type.new()
-    var = cg.Pvariable(config[CONF_OUTPUT_ID], rhs, type=out_type)
+    var = cg.Pvariable(config[CONF_OUTPUT_ID], rhs, out_type)
     yield light.register_light(var, config)
     yield cg.register_component(var, config)
 
diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index 77322cbb70..bbbd8c0d3a 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -57,10 +57,10 @@ def to_code(config):
     model_type, model = MODELS[config[CONF_MODEL]]
     if model_type == 'a':
         rhs = WaveshareEPaperTypeA.new(model)
-        var = cg.Pvariable(config[CONF_ID], rhs, type=WaveshareEPaperTypeA)
+        var = cg.Pvariable(config[CONF_ID], rhs, WaveshareEPaperTypeA)
     elif model_type == 'b':
         rhs = model.new()
-        var = cg.Pvariable(config[CONF_ID], rhs, type=model)
+        var = cg.Pvariable(config[CONF_ID], rhs, model)
     else:
         raise NotImplementedError()
 
diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index b5239e9413..e9bcdc7d1f 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -1,9 +1,9 @@
+import abc
 import inspect
-
 import math
 
 # pylint: disable=unused-import, wrong-import-order
-from typing import Any, Generator, List, Optional, Tuple, Type, Union, Dict, Callable  # noqa
+from typing import Any, Generator, List, Optional, Tuple, Type, Union, Sequence
 
 from esphome.core import (  # noqa
     CORE, HexInt, ID, Lambda, TimePeriod, TimePeriodMicroseconds,
@@ -13,29 +13,35 @@ from esphome.helpers import cpp_string_escape, indent_all_but_first_and_last
 from esphome.util import OrderedDict
 
 
-class Expression:
+class Expression(abc.ABC):
+    __slots__ = ()
+
+    @abc.abstractmethod
     def __str__(self):
-        raise NotImplementedError
+        """
+        Convert expression into C++ code
+        """
 
 
 SafeExpType = Union[Expression, bool, str, str, int, float, TimePeriod,
-                    Type[bool], Type[int], Type[float], List[Any]]
+                    Type[bool], Type[int], Type[float], Sequence[Any]]
 
 
 class RawExpression(Expression):
-    def __init__(self, text):  # type: (Union[str, str]) -> None
-        super().__init__()
+    __slots__ = ("text", )
+
+    def __init__(self, text: str):
         self.text = text
 
     def __str__(self):
-        return str(self.text)
+        return self.text
 
 
-# pylint: disable=redefined-builtin
 class AssignmentExpression(Expression):
-    def __init__(self, type, modifier, name, rhs, obj):
-        super().__init__()
-        self.type = type
+    __slots__ = ("type", "modifier", "name", "rhs", "obj")
+
+    def __init__(self, type_, modifier, name, rhs, obj):
+        self.type = type_
         self.modifier = modifier
         self.name = name
         self.rhs = safe_exp(rhs)
@@ -48,9 +54,10 @@ class AssignmentExpression(Expression):
 
 
 class VariableDeclarationExpression(Expression):
-    def __init__(self, type, modifier, name):
-        super().__init__()
-        self.type = type
+    __slots__ = ("type", "modifier", "name")
+
+    def __init__(self, type_, modifier, name):
+        self.type = type_
         self.modifier = modifier
         self.name = name
 
@@ -59,8 +66,9 @@ class VariableDeclarationExpression(Expression):
 
 
 class ExpressionList(Expression):
-    def __init__(self, *args):
-        super().__init__()
+    __slots__ = ("args", )
+
+    def __init__(self, *args: Optional[SafeExpType]):
         # Remove every None on end
         args = list(args)
         while args and args[-1] is None:
@@ -76,8 +84,9 @@ class ExpressionList(Expression):
 
 
 class TemplateArguments(Expression):
-    def __init__(self, *args):  # type: (*SafeExpType) -> None
-        super().__init__()
+    __slots__ = ("args", )
+
+    def __init__(self, *args: SafeExpType):
         self.args = ExpressionList(*args)
 
     def __str__(self):
@@ -88,8 +97,9 @@ class TemplateArguments(Expression):
 
 
 class CallExpression(Expression):
-    def __init__(self, base, *args):  # type: (Expression, *SafeExpType) -> None
-        super().__init__()
+    __slots__ = ("base", "template_args", "args")
+
+    def __init__(self, base: Expression, *args: SafeExpType):
         self.base = base
         if args and isinstance(args[0], TemplateArguments):
             self.template_args = args[0]
@@ -105,9 +115,11 @@ class CallExpression(Expression):
 
 
 class StructInitializer(Expression):
-    def __init__(self, base, *args):  # type: (Expression, *Tuple[str, SafeExpType]) -> None
-        super().__init__()
+    __slots__ = ("base", "args")
+
+    def __init__(self, base: Expression, *args: Tuple[str, Optional[SafeExpType]]):
         self.base = base
+        # TODO: args is always a Tuple, is this check required?
         if not isinstance(args, OrderedDict):
             args = OrderedDict(args)
         self.args = OrderedDict()
@@ -126,9 +138,10 @@ class StructInitializer(Expression):
 
 
 class ArrayInitializer(Expression):
-    def __init__(self, *args, **kwargs):  # type: (*Any, **Any) -> None
-        super().__init__()
-        self.multiline = kwargs.get('multiline', False)
+    __slots__ = ("multiline", "args")
+
+    def __init__(self, *args: Any, multiline: bool = False):
+        self.multiline = multiline
         self.args = []
         for arg in args:
             if arg is None:
@@ -150,18 +163,20 @@ class ArrayInitializer(Expression):
 
 
 class ParameterExpression(Expression):
-    def __init__(self, type, id):
-        super().__init__()
-        self.type = safe_exp(type)
-        self.id = id
+    __slots__ = ("type", "id")
+
+    def __init__(self, type_, id_):
+        self.type = safe_exp(type_)
+        self.id = id_
 
     def __str__(self):
         return f"{self.type} {self.id}"
 
 
 class ParameterListExpression(Expression):
-    def __init__(self, *parameters):
-        super().__init__()
+    __slots__ = ("parameters", )
+
+    def __init__(self, *parameters: Union[ParameterExpression, Tuple[SafeExpType, str]]):
         self.parameters = []
         for parameter in parameters:
             if not isinstance(parameter, ParameterExpression):
@@ -173,8 +188,9 @@ class ParameterListExpression(Expression):
 
 
 class LambdaExpression(Expression):
-    def __init__(self, parts, parameters, capture='=', return_type=None):
-        super().__init__()
+    __slots__ = ("parts", "parameters", "capture", "return_type")
+
+    def __init__(self, parts, parameters, capture: str = '=', return_type=None):
         self.parts = parts
         if not isinstance(parameters, ParameterListExpression):
             parameters = ParameterListExpression(*parameters)
@@ -194,23 +210,25 @@ class LambdaExpression(Expression):
         return ''.join(str(part) for part in self.parts)
 
 
-class Literal(Expression):
-    def __str__(self):
-        raise NotImplementedError
+# pylint: disable=abstract-method
+class Literal(Expression, metaclass=abc.ABCMeta):
+    __slots__ = ()
 
 
 class StringLiteral(Literal):
-    def __init__(self, string):  # type: (Union[str, str]) -> None
-        super().__init__()
+    __slots__ = ("string", )
+
+    def __init__(self, string: str):
         self.string = string
 
     def __str__(self):
-        return '{}'.format(cpp_string_escape(self.string))
+        return cpp_string_escape(self.string)
 
 
 class IntLiteral(Literal):
-    def __init__(self, i):  # type: (Union[int]) -> None
-        super().__init__()
+    __slots__ = ("i", )
+
+    def __init__(self, i: int):
         self.i = i
 
     def __str__(self):
@@ -224,7 +242,9 @@ class IntLiteral(Literal):
 
 
 class BoolLiteral(Literal):
-    def __init__(self, binary):  # type: (bool) -> None
+    __slots__ = ("binary", )
+
+    def __init__(self, binary: bool):
         super().__init__()
         self.binary = binary
 
@@ -233,8 +253,9 @@ class BoolLiteral(Literal):
 
 
 class HexIntLiteral(Literal):
-    def __init__(self, i):  # type: (int) -> None
-        super().__init__()
+    __slots__ = ("i", )
+
+    def __init__(self, i: int):
         self.i = HexInt(i)
 
     def __str__(self):
@@ -242,21 +263,18 @@ class HexIntLiteral(Literal):
 
 
 class FloatLiteral(Literal):
-    def __init__(self, value):  # type: (float) -> None
-        super().__init__()
-        self.float_ = value
+    __slots__ = ("f", )
+
+    def __init__(self, value: float):
+        self.f = value
 
     def __str__(self):
-        if math.isnan(self.float_):
+        if math.isnan(self.f):
             return "NAN"
-        return f"{self.float_}f"
+        return f"{self.f}f"
 
 
-# pylint: disable=bad-continuation
-def safe_exp(
-        obj  # type: Union[Expression, bool, str, int, float, TimePeriod, list]
-             ):
-    # type: (...) -> Expression
+def safe_exp(obj: SafeExpType) -> Expression:
     """Try to convert obj to an expression by automatically converting native python types to
     expressions/literals.
     """
@@ -301,17 +319,20 @@ def safe_exp(
     raise ValueError("Object is not an expression", obj)
 
 
-class Statement:
-    def __init__(self):
-        pass
+class Statement(abc.ABC):
+    __slots__ = ()
 
+    @abc.abstractmethod
     def __str__(self):
-        raise NotImplementedError
+        """
+        Convert statement into C++ code
+        """
 
 
 class RawStatement(Statement):
-    def __init__(self, text):
-        super().__init__()
+    __slots__ = ("text", )
+
+    def __init__(self, text: str):
         self.text = text
 
     def __str__(self):
@@ -319,8 +340,9 @@ class RawStatement(Statement):
 
 
 class ExpressionStatement(Statement):
+    __slots__ = ("expression", )
+
     def __init__(self, expression):
-        super().__init__()
         self.expression = safe_exp(expression)
 
     def __str__(self):
@@ -328,115 +350,105 @@ class ExpressionStatement(Statement):
 
 
 class LineComment(Statement):
-    def __init__(self, value):  # type: (str) -> None
-        super().__init__()
-        self._value = value
+    __slots__ = ("value", )
+
+    def __init__(self, value: str):
+        self.value = value
 
     def __str__(self):
-        parts = self._value.split('\n')
+        parts = self.value.split('\n')
         parts = [f'// {x}' for x in parts]
         return '\n'.join(parts)
 
 
 class ProgmemAssignmentExpression(AssignmentExpression):
-    def __init__(self, type, name, rhs, obj):
-        super().__init__(
-            type, '', name, rhs, obj
-        )
+    __slots__ = ()
+
+    def __init__(self, type_, name, rhs, obj):
+        super().__init__(type_, '', name, rhs, obj)
 
     def __str__(self):
-        type_ = self.type
-        return f"static const {type_} {self.name}[] PROGMEM = {self.rhs}"
+        return f"static const {self.type} {self.name}[] PROGMEM = {self.rhs}"
 
 
-def progmem_array(id, rhs):
+def progmem_array(id_, rhs) -> "MockObj":
     rhs = safe_exp(rhs)
-    obj = MockObj(id, '.')
-    assignment = ProgmemAssignmentExpression(id.type, id, rhs, obj)
+    obj = MockObj(id_, '.')
+    assignment = ProgmemAssignmentExpression(id_.type, id_, rhs, obj)
     CORE.add(assignment)
-    CORE.register_variable(id, obj)
+    CORE.register_variable(id_, obj)
     return obj
 
 
-def statement(expression):  # type: (Union[Expression, Statement]) -> Statement
+def statement(expression: Union[Expression, Statement]) -> Statement:
+    """Convert expression into a statement unless is already a statement.
+    """
     if isinstance(expression, Statement):
         return expression
     return ExpressionStatement(expression)
 
 
-def variable(id,  # type: ID
-             rhs,  # type: SafeExpType
-             type=None  # type: MockObj
-             ):
-    # type: (...) -> MockObj
+def variable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
     """Declare a new variable (not pointer type) in the code generation.
 
-    :param id: The ID used to declare the variable.
+    :param id_: The ID used to declare the variable.
     :param rhs: The expression to place on the right hand side of the assignment.
-    :param type: Manually define a type for the variable, only use this when it's not possible
+    :param type_: Manually define a type for the variable, only use this when it's not possible
       to do so during config validation phase (for example because of template arguments).
 
     :returns The new variable as a MockObj.
     """
-    assert isinstance(id, ID)
+    assert isinstance(id_, ID)
     rhs = safe_exp(rhs)
-    obj = MockObj(id, '.')
-    if type is not None:
-        id.type = type
-    assignment = AssignmentExpression(id.type, '', id, rhs, obj)
+    obj = MockObj(id_, '.')
+    if type_ is not None:
+        id_.type = type_
+    assignment = AssignmentExpression(id_.type, '', id_, rhs, obj)
     CORE.add(assignment)
-    CORE.register_variable(id, obj)
+    CORE.register_variable(id_, obj)
     return obj
 
 
-def Pvariable(id,  # type: ID
-              rhs,  # type: SafeExpType
-              type=None  # type: MockObj
-              ):
-    # type: (...) -> MockObj
+def Pvariable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
     """Declare a new pointer variable in the code generation.
 
-    :param id: The ID used to declare the variable.
+    :param id_: The ID used to declare the variable.
     :param rhs: The expression to place on the right hand side of the assignment.
-    :param type: Manually define a type for the variable, only use this when it's not possible
+    :param type_: Manually define a type for the variable, only use this when it's not possible
       to do so during config validation phase (for example because of template arguments).
 
     :returns The new variable as a MockObj.
     """
     rhs = safe_exp(rhs)
-    obj = MockObj(id, '->')
-    if type is not None:
-        id.type = type
-    decl = VariableDeclarationExpression(id.type, '*', id)
+    obj = MockObj(id_, '->')
+    if type_ is not None:
+        id_.type = type_
+    decl = VariableDeclarationExpression(id_.type, '*', id_)
     CORE.add_global(decl)
-    assignment = AssignmentExpression(None, None, id, rhs, obj)
+    assignment = AssignmentExpression(None, None, id_, rhs, obj)
     CORE.add(assignment)
-    CORE.register_variable(id, obj)
+    CORE.register_variable(id_, obj)
     return obj
 
 
-def new_Pvariable(id,  # type: ID
-                  *args  # type: *SafeExpType
-                  ):
+def new_Pvariable(id_: ID, *args: SafeExpType) -> Pvariable:
     """Declare a new pointer variable in the code generation by calling it's constructor
     with the given arguments.
 
-    :param id: The ID used to declare the variable (also specifies the type).
+    :param id_: The ID used to declare the variable (also specifies the type).
     :param args: The values to pass to the constructor.
 
     :returns The new variable as a MockObj.
     """
     if args and isinstance(args[0], TemplateArguments):
-        id = id.copy()
-        id.type = id.type.template(args[0])
+        id_ = id_.copy()
+        id_.type = id_.type.template(args[0])
         args = args[1:]
-    rhs = id.type.new(*args)
-    return Pvariable(id, rhs)
+    rhs = id_.type.new(*args)
+    return Pvariable(id_, rhs)
 
 
-def add(expression,  # type: Union[Expression, Statement]
-        ):
-    # type: (...) -> None
+def add(expression: Union[Expression, Statement]):
     """Add an expression to the codegen section.
 
     After this is called, the given given expression will
@@ -445,17 +457,12 @@ def add(expression,  # type: Union[Expression, Statement]
     CORE.add(expression)
 
 
-def add_global(expression,  # type: Union[SafeExpType, Statement]
-               ):
-    # type: (...) -> None
+def add_global(expression: Union[SafeExpType, Statement]):
     """Add an expression to the codegen global storage (above setup())."""
     CORE.add_global(expression)
 
 
-def add_library(name,  # type: str
-                version  # type: Optional[str]
-                ):
-    # type: (...) -> None
+def add_library(name: str, version: Optional[str]):
     """Add a library to the codegen library storage.
 
     :param name: The name of the library (for example 'AsyncTCP')
@@ -464,17 +471,12 @@ def add_library(name,  # type: str
     CORE.add_library(Library(name, version))
 
 
-def add_build_flag(build_flag,  # type: str
-                   ):
-    # type: (...) -> None
+def add_build_flag(build_flag: str):
     """Add a global build flag to the compiler flags."""
     CORE.add_build_flag(build_flag)
 
 
-def add_define(name,  # type: str
-               value=None,  # type: Optional[SafeExpType]
-               ):
-    # type: (...) -> None
+def add_define(name: str, value: SafeExpType = None):
     """Add a global define to the auto-generated defines.h file.
 
     Optionally define a value to set this define to.
@@ -486,42 +488,40 @@ def add_define(name,  # type: str
 
 
 @coroutine
-def get_variable(id):  # type: (ID) -> Generator[MockObj]
+def get_variable(id_: ID) -> Generator["MockObj", None, None]:
     """
     Wait for the given ID to be defined in the code generation and
     return it as a MockObj.
 
     This is a coroutine, you need to await it with a 'yield' expression!
 
-    :param id: The ID to retrieve
+    :param id_: The ID to retrieve
     :return: The variable as a MockObj.
     """
-    var = yield CORE.get_variable(id)
+    var = yield CORE.get_variable(id_)
     yield var
 
 
 @coroutine
-def get_variable_with_full_id(id):  # type: (ID) -> Generator[ID, MockObj]
+def get_variable_with_full_id(id_: ID) -> Generator[Tuple[ID, "MockObj"], None, None]:
     """
     Wait for the given ID to be defined in the code generation and
     return it as a MockObj.
 
     This is a coroutine, you need to await it with a 'yield' expression!
 
-    :param id: The ID to retrieve
+    :param id_: The ID to retrieve
     :return: The variable as a MockObj.
     """
-    full_id, var = yield CORE.get_variable_with_full_id(id)
+    full_id, var = yield CORE.get_variable_with_full_id(id_)
     yield full_id, var
 
 
 @coroutine
-def process_lambda(value,  # type: Lambda
-                   parameters,  # type: List[Tuple[SafeExpType, str]]
-                   capture='=',  # type: str
-                   return_type=None  # type: Optional[SafeExpType]
-                   ):
-    # type: (...) -> Generator[LambdaExpression]
+def process_lambda(
+        value: Lambda, parameters: List[Tuple[SafeExpType, str]],
+        capture: str = '=', return_type: SafeExpType = None
+) -> Generator[LambdaExpression, None, None]:
     """Process the given lambda value into a LambdaExpression.
 
     This is a coroutine because lambdas can depend on other IDs,
@@ -560,11 +560,10 @@ def is_template(value):
 
 
 @coroutine
-def templatable(value,  # type: Any
-                args,  # type: List[Tuple[SafeExpType, str]]
-                output_type,  # type: Optional[SafeExpType],
-                to_exp=None  # type: Optional[Any]
-                ):
+def templatable(value: Any,
+                args: List[Tuple[SafeExpType, str]],
+                output_type: Optional[SafeExpType],
+                to_exp: Any = None):
     """Generate code for a templatable config option.
 
     If `value` is a templated value, the lambda expression is returned.
@@ -593,12 +592,13 @@ class MockObj(Expression):
 
     Mostly consists of magic methods that allow ESPHome's codegen syntax.
     """
+    __slots__ = ("base", "op")
+
     def __init__(self, base, op='.'):
         self.base = base
         self.op = op
-        super().__init__()
 
-    def __getattr__(self, attr):  # type: (str) -> MockObj
+    def __getattr__(self, attr: str) -> "MockObj":
         next_op = '.'
         if attr.startswith('P') and self.op not in ['::', '']:
             attr = attr[1:]
@@ -611,55 +611,55 @@ class MockObj(Expression):
         call = CallExpression(self.base, *args)
         return MockObj(call, self.op)
 
-    def __str__(self):  # type: () -> str
+    def __str__(self):
         return str(self.base)
 
     def __repr__(self):
         return 'MockObj<{}>'.format(str(self.base))
 
     @property
-    def _(self):  # type: () -> MockObj
+    def _(self) -> "MockObj":
         return MockObj(f'{self.base}{self.op}')
 
     @property
-    def new(self):  # type: () -> MockObj
+    def new(self) -> "MockObj":
         return MockObj(f'new {self.base}', '->')
 
-    def template(self, *args):  # type: (*SafeExpType) -> MockObj
+    def template(self, *args: SafeExpType) -> "MockObj":
         if len(args) != 1 or not isinstance(args[0], TemplateArguments):
             args = TemplateArguments(*args)
         else:
             args = args[0]
         return MockObj(f'{self.base}{args}')
 
-    def namespace(self, name):  # type: (str) -> MockObj
+    def namespace(self, name: str) -> "MockObj":
         return MockObj(f'{self._}{name}', '::')
 
-    def class_(self, name, *parents):  # type: (str, *MockObjClass) -> MockObjClass
+    def class_(self, name: str, *parents: "MockObjClass") -> "MockObjClass":
         op = '' if self.op == '' else '::'
         return MockObjClass(f'{self.base}{op}{name}', '.', parents=parents)
 
-    def struct(self, name):  # type: (str) -> MockObjClass
+    def struct(self, name: str) -> "MockObjClass":
         return self.class_(name)
 
-    def enum(self, name, is_class=False):  # type: (str, bool) -> MockObj
+    def enum(self, name: str, is_class: bool = False) -> "MockObj":
         return MockObjEnum(enum=name, is_class=is_class, base=self.base, op=self.op)
 
-    def operator(self, name):  # type: (str) -> MockObj
+    def operator(self, name: str) -> "MockObj":
         if name == 'ref':
             return MockObj(f'{self.base} &', '')
         if name == 'ptr':
             return MockObj(f'{self.base} *', '')
         if name == "const":
             return MockObj(f'const {self.base}', '')
-        raise NotImplementedError
+        raise ValueError("Expected one of ref, ptr, const.")
 
     @property
-    def using(self):  # type: () -> MockObj
+    def using(self) -> "MockObj":
         assert self.op == '::'
         return MockObj(f'using namespace {self.base}')
 
-    def __getitem__(self, item):  # type: (Union[str, Expression]) -> MockObj
+    def __getitem__(self, item: Union[str, Expression]) -> "MockObj":
         next_op = '.'
         if isinstance(item, str) and item.startswith('P'):
             item = item[1:]
@@ -678,13 +678,13 @@ class MockObjEnum(MockObj):
         kwargs['base'] = base
         MockObj.__init__(self, *args, **kwargs)
 
-    def __str__(self):  # type: () -> str
+    def __str__(self):
         if self._is_class:
             return super().__str__()
         return f'{self.base}{self.op}{self._enum}'
 
     def __repr__(self):
-        return 'MockObj<{}>'.format(str(self.base))
+        return f'MockObj<{str(self.base)}>'
 
 
 class MockObjClass(MockObj):
@@ -699,7 +699,7 @@ class MockObjClass(MockObj):
             # pylint: disable=protected-access
             self._parents += paren._parents
 
-    def inherits_from(self, other):  # type: (MockObjClass) -> bool
+    def inherits_from(self, other: "MockObjClass") -> bool:
         if self == other:
             return True
         for parent in self._parents:
@@ -707,8 +707,7 @@ class MockObjClass(MockObj):
                 return True
         return False
 
-    def template(self, *args):
-        # type: (*SafeExpType) -> MockObjClass
+    def template(self, *args: SafeExpType) -> "MockObjClass":
         if len(args) != 1 or not isinstance(args[0], TemplateArguments):
             args = TemplateArguments(*args)
         else:
@@ -718,4 +717,4 @@ class MockObjClass(MockObj):
         return MockObjClass(f'{self.base}{args}', parents=new_parents)
 
     def __repr__(self):
-        return 'MockObjClass<{}, parents={}>'.format(str(self.base), self._parents)
+        return f'MockObjClass<{str(self.base)}, parents={self._parents}>'
diff --git a/requirements_test.txt b/requirements_test.txt
index 85f7d511a8..268f78fcdf 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -21,4 +21,5 @@ pexpect
 pytest==5.3.2
 pytest-cov==2.8.1
 pytest-mock==1.13.0
+asyncmock==0.4.2
 hypothesis==4.57.0
diff --git a/tests/unit_tests/test_codegen.py b/tests/unit_tests/test_codegen.py
new file mode 100644
index 0000000000..931e191de6
--- /dev/null
+++ b/tests/unit_tests/test_codegen.py
@@ -0,0 +1,26 @@
+import pytest
+
+from esphome import codegen as cg
+
+
+# Test interface remains the same.
+@pytest.mark.parametrize("attr", (
+    # from cpp_generator
+    "Expression", "RawExpression", "RawStatement", "TemplateArguments",
+    "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",
+    "MockObjClass",
+    # from cpp_helpers
+    "gpio_pin_expression", "register_component", "build_registry_entry",
+    "build_registry_list", "extract_registry_entry_config", "register_parented",
+    "global_ns", "void", "nullptr", "float_", "double", "bool_", "int_", "std_ns", "std_string",
+    "std_vector", "uint8", "uint16", "uint32", "int32", "const_char_ptr", "NAN",
+    "esphome_ns", "App", "Nameable", "Component", "ComponentPtr",
+    # from cpp_types
+    "PollingComponent", "Application", "optional", "arduino_json_ns", "JsonObject",
+    "JsonObjectRef", "JsonObjectConstRef", "Controller", "GPIOPin"
+))
+def test_exists(attr):
+    assert hasattr(cg, attr)
diff --git a/tests/unit_tests/test_core.py b/tests/unit_tests/test_core.py
index 14f6990bd9..cd0b0947f3 100644
--- a/tests/unit_tests/test_core.py
+++ b/tests/unit_tests/test_core.py
@@ -459,13 +459,13 @@ class TestEsphomeCore:
         target.config_path = "foo/config"
         return target
 
+    @pytest.mark.xfail(reason="raw_config and config differ, should they?")
     def test_reset(self, target):
         """Call reset on target and compare to new instance"""
         other = core.EsphomeCore()
 
         target.reset()
 
-        # TODO: raw_config and config differ, should they?
         assert target.__dict__ == other.__dict__
 
     def test_address__none(self, target):
diff --git a/tests/unit_tests/test_cpp_generator.py b/tests/unit_tests/test_cpp_generator.py
new file mode 100644
index 0000000000..b130124b54
--- /dev/null
+++ b/tests/unit_tests/test_cpp_generator.py
@@ -0,0 +1,293 @@
+from typing import Iterator
+
+import math
+
+import pytest
+
+from esphome import cpp_generator as cg
+from esphome import cpp_types as ct
+
+
+class TestExpressions:
+    @pytest.mark.parametrize("target, expected", (
+        (cg.RawExpression("foo && bar"), "foo && bar"),
+
+        (cg.AssignmentExpression(None, None, "foo", "bar", None), 'foo = "bar"'),
+        (cg.AssignmentExpression(ct.float_, "*", "foo", 1, None), 'float *foo = 1'),
+        (cg.AssignmentExpression(ct.float_, "", "foo", 1, None), 'float foo = 1'),
+
+        (cg.VariableDeclarationExpression(ct.int32, "*", "foo"), "int32_t *foo"),
+        (cg.VariableDeclarationExpression(ct.int32, "", "foo"), "int32_t foo"),
+
+        (cg.ParameterExpression(ct.std_string, "foo"), "std::string foo"),
+    ))
+    def test_str__simple(self, target: cg.Expression, expected: str):
+        actual = str(target)
+
+        assert actual == expected
+
+
+class TestExpressionList:
+    SAMPLE_ARGS = (1, "2", True, None, None)
+
+    def test_str(self):
+        target = cg.ExpressionList(*self.SAMPLE_ARGS)
+
+        actual = str(target)
+
+        assert actual == '1, "2", true'
+
+    def test_iter(self):
+        target = cg.ExpressionList(*self.SAMPLE_ARGS)
+
+        actual = iter(target)
+
+        assert isinstance(actual, Iterator)
+        assert len(tuple(actual)) == 3
+
+
+class TestTemplateArguments:
+    SAMPLE_ARGS = (int, 1, "2", True, None, None)
+
+    def test_str(self):
+        target = cg.TemplateArguments(*self.SAMPLE_ARGS)
+
+        actual = str(target)
+
+        assert actual == '<int32_t, 1, "2", true>'
+
+    def test_iter(self):
+        target = cg.TemplateArguments(*self.SAMPLE_ARGS)
+
+        actual = iter(target)
+
+        assert isinstance(actual, Iterator)
+        assert len(tuple(actual)) == 4
+
+
+class TestCallExpression:
+    def test_str__no_template_args(self):
+        target = cg.CallExpression(
+            cg.RawExpression("my_function"),
+            1, "2", False
+        )
+
+        actual = str(target)
+
+        assert actual == 'my_function(1, "2", false)'
+
+    def test_str__with_template_args(self):
+        target = cg.CallExpression(
+            cg.RawExpression("my_function"),
+            cg.TemplateArguments(int, float),
+            1, "2", False
+        )
+
+        actual = str(target)
+
+        assert actual == 'my_function<int32_t, float>(1, "2", false)'
+
+
+class TestStructInitializer:
+    def test_str(self):
+        target = cg.StructInitializer(
+            cg.MockObjClass("foo::MyStruct", parents=()),
+            ("state", "on"),
+            ("min_length", 1),
+            ("max_length", 5),
+            ("foo", None),
+        )
+
+        actual = str(target)
+
+        assert actual == 'foo::MyStruct{\n' \
+                         '  .state = "on",\n' \
+                         '  .min_length = 1,\n' \
+                         '  .max_length = 5,\n' \
+                         '}'
+
+
+class TestArrayInitializer:
+    def test_str__empty(self):
+        target = cg.ArrayInitializer(
+            None, None
+        )
+
+        actual = str(target)
+
+        assert actual == "{}"
+
+    def test_str__not_multiline(self):
+        target = cg.ArrayInitializer(
+            1, 2, 3, 4
+        )
+
+        actual = str(target)
+
+        assert actual == "{1, 2, 3, 4}"
+
+    def test_str__multiline(self):
+        target = cg.ArrayInitializer(
+            1, 2, 3, 4, multiline=True
+        )
+
+        actual = str(target)
+
+        assert actual == "{\n  1,\n  2,\n  3,\n  4,\n}"
+
+
+class TestParameterListExpression:
+    def test_str(self):
+        target = cg.ParameterListExpression(
+            cg.ParameterExpression(int, "foo"),
+            (float, "bar"),
+        )
+
+        actual = str(target)
+
+        assert actual == "int32_t foo, float bar"
+
+
+class TestLambdaExpression:
+    def test_str__no_return(self):
+        target = cg.LambdaExpression(
+            (
+                "if ((foo == 5) && (bar < 10))) {\n",
+                "}",
+            ),
+            ((int, "foo"), (float, "bar")),
+        )
+
+        actual = str(target)
+
+        assert actual == (
+            "[=](int32_t foo, float bar) {\n"
+            "  if ((foo == 5) && (bar < 10))) {\n"
+            "  }\n"
+            "}"
+        )
+
+    def test_str__with_return(self):
+        target = cg.LambdaExpression(
+            ("return (foo == 5) && (bar < 10));", ),
+            cg.ParameterListExpression((int, "foo"), (float, "bar")),
+            "=",
+            bool,
+        )
+
+        actual = str(target)
+
+        assert actual == (
+            "[=](int32_t foo, float bar) -> bool {\n"
+            "  return (foo == 5) && (bar < 10));\n"
+            "}"
+        )
+
+
+class TestLiterals:
+    @pytest.mark.parametrize("target, expected", (
+        (cg.StringLiteral("foo"), '"foo"'),
+
+        (cg.IntLiteral(0), "0"),
+        (cg.IntLiteral(42), "42"),
+        (cg.IntLiteral(4304967295), "4304967295ULL"),
+        (cg.IntLiteral(2150483647), "2150483647UL"),
+        (cg.IntLiteral(-2150083647), "-2150083647LL"),
+
+        (cg.BoolLiteral(True), "true"),
+        (cg.BoolLiteral(False), "false"),
+
+        (cg.HexIntLiteral(0), "0x00"),
+        (cg.HexIntLiteral(42), "0x2A"),
+        (cg.HexIntLiteral(682), "0x2AA"),
+
+        (cg.FloatLiteral(0.0), "0.0f"),
+        (cg.FloatLiteral(4.2), "4.2f"),
+        (cg.FloatLiteral(1.23456789), "1.23456789f"),
+        (cg.FloatLiteral(math.nan), "NAN"),
+    ))
+    def test_str__simple(self, target: cg.Literal, expected: str):
+        actual = str(target)
+
+        assert actual == expected
+
+
+FAKE_ENUM_VALUE = cg.EnumValue()
+FAKE_ENUM_VALUE.enum_value = "foo"
+
+
+@pytest.mark.parametrize("obj, expected_type", (
+        (cg.RawExpression("foo"), cg.RawExpression),
+        (FAKE_ENUM_VALUE, cg.StringLiteral),
+        (True, cg.BoolLiteral),
+        ("foo", cg.StringLiteral),
+        (cg.HexInt(42), cg.HexIntLiteral),
+        (42, cg.IntLiteral),
+        (42.1, cg.FloatLiteral),
+        (cg.TimePeriodMicroseconds(microseconds=42), cg.IntLiteral),
+        (cg.TimePeriodMilliseconds(milliseconds=42), cg.IntLiteral),
+        (cg.TimePeriodSeconds(seconds=42), cg.IntLiteral),
+        (cg.TimePeriodMinutes(minutes=42), cg.IntLiteral),
+        ((1, 2, 3), cg.ArrayInitializer),
+        ([1, 2, 3], cg.ArrayInitializer),
+))
+def test_safe_exp__allowed_values(obj, expected_type):
+    actual = cg.safe_exp(obj)
+
+    assert isinstance(actual, expected_type)
+
+
+@pytest.mark.parametrize("obj, expected_type", (
+        (bool, ct.bool_),
+        (int, ct.int32),
+        (float, ct.float_),
+))
+def test_safe_exp__allowed_types(obj, expected_type):
+    actual = cg.safe_exp(obj)
+
+    assert actual is expected_type
+
+
+@pytest.mark.parametrize("obj, expected_error", (
+        (cg.ID("foo"), "Object foo is an ID."),
+        ((x for x in "foo"), r"Object <.*> is a coroutine."),
+        (None, "Object is not an expression"),
+))
+def test_safe_exp__invalid_values(obj, expected_error):
+    with pytest.raises(ValueError, match=expected_error):
+        cg.safe_exp(obj)
+
+
+class TestStatements:
+    @pytest.mark.parametrize("target, expected", (
+        (cg.RawStatement("foo && bar"), "foo && bar"),
+
+        (cg.ExpressionStatement("foo"), '"foo";'),
+        (cg.ExpressionStatement(42), '42;'),
+
+        (cg.LineComment("The point of foo is..."), "// The point of foo is..."),
+        (cg.LineComment("Help help\nI'm being repressed"), "// Help help\n// I'm being repressed"),
+
+        (
+            cg.ProgmemAssignmentExpression(ct.uint16, "foo", "bar", None),
+            'static const uint16_t foo[] PROGMEM = "bar"'
+        )
+    ))
+    def test_str__simple(self, target: cg.Statement, expected: str):
+        actual = str(target)
+
+        assert actual == expected
+
+
+# TODO: This method has side effects in CORE
+# def test_progmem_array():
+#     pass
+
+
+class TestMockObj:
+    def test_getattr(self):
+        target = cg.MockObj("foo")
+        actual = target.eek
+        assert isinstance(actual, cg.MockObj)
+        assert actual.base == "foo.eek"
+        assert actual.op == "."
diff --git a/tests/unit_tests/test_cpp_helpers.py b/tests/unit_tests/test_cpp_helpers.py
new file mode 100644
index 0000000000..d8f32e7a51
--- /dev/null
+++ b/tests/unit_tests/test_cpp_helpers.py
@@ -0,0 +1,85 @@
+import pytest
+from mock import Mock
+
+from esphome import cpp_helpers as ch
+from esphome import const
+from esphome.cpp_generator import MockObj
+
+
+def test_gpio_pin_expression__conf_is_none(monkeypatch):
+    target = ch.gpio_pin_expression(None)
+
+    actual = next(target)
+
+    assert actual is None
+
+
+def test_gpio_pin_expression__new_pin(monkeypatch):
+    target = ch.gpio_pin_expression({
+        const.CONF_NUMBER: 42,
+        const.CONF_MODE: "input",
+        const.CONF_INVERTED: False
+    })
+
+    actual = next(target)
+
+    assert isinstance(actual, MockObj)
+
+
+def test_register_component(monkeypatch):
+    var = Mock(base="foo.bar")
+
+    app_mock = Mock(register_component=Mock(return_value=var))
+    monkeypatch.setattr(ch, "App", app_mock)
+
+    core_mock = Mock(component_ids=["foo.bar"])
+    monkeypatch.setattr(ch, "CORE", core_mock)
+
+    add_mock = Mock()
+    monkeypatch.setattr(ch, "add", add_mock)
+
+    target = ch.register_component(var, {})
+
+    actual = next(target)
+
+    assert actual is var
+    add_mock.assert_called_once()
+    app_mock.register_component.assert_called_with(var)
+    assert core_mock.component_ids == []
+
+
+def test_register_component__no_component_id(monkeypatch):
+    var = Mock(base="foo.eek")
+
+    core_mock = Mock(component_ids=["foo.bar"])
+    monkeypatch.setattr(ch, "CORE", core_mock)
+
+    with pytest.raises(ValueError, match="Component ID foo.eek was not declared to"):
+        target = ch.register_component(var, {})
+        next(target)
+
+
+def test_register_component__with_setup_priority(monkeypatch):
+    var = Mock(base="foo.bar")
+
+    app_mock = Mock(register_component=Mock(return_value=var))
+    monkeypatch.setattr(ch, "App", app_mock)
+
+    core_mock = Mock(component_ids=["foo.bar"])
+    monkeypatch.setattr(ch, "CORE", core_mock)
+
+    add_mock = Mock()
+    monkeypatch.setattr(ch, "add", add_mock)
+
+    target = ch.register_component(var, {
+        const.CONF_SETUP_PRIORITY: "123",
+        const.CONF_UPDATE_INTERVAL: "456",
+    })
+
+    actual = next(target)
+
+    assert actual is var
+    add_mock.assert_called()
+    assert add_mock.call_count == 3
+    app_mock.register_component.assert_called_with(var)
+    assert core_mock.component_ids == []

From 8040e3cf95d097bd76110bb071f11fac7d7c96d3 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 21 Apr 2020 22:53:14 -0300
Subject: [PATCH 188/412] Climate whirlpool (#1029)

* wip

* transmitter ready

* climate.whirlpool receiver implemented (#971)

* receiver implemented

* Support for two models of temp ranges

* temperature type and lint

* more lint

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>

* add test

* not mess line endings

Co-authored-by: mmanza <40872469+mmanza@users.noreply.github.com>
---
 esphome/components/whirlpool/__init__.py   |   0
 esphome/components/whirlpool/climate.py    |  26 ++
 esphome/components/whirlpool/whirlpool.cpp | 289 +++++++++++++++++++++
 esphome/components/whirlpool/whirlpool.h   |  63 +++++
 tests/test1.yaml                           |   2 +
 5 files changed, 380 insertions(+)
 create mode 100644 esphome/components/whirlpool/__init__.py
 create mode 100644 esphome/components/whirlpool/climate.py
 create mode 100644 esphome/components/whirlpool/whirlpool.cpp
 create mode 100644 esphome/components/whirlpool/whirlpool.h

diff --git a/esphome/components/whirlpool/__init__.py b/esphome/components/whirlpool/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/whirlpool/climate.py b/esphome/components/whirlpool/climate.py
new file mode 100644
index 0000000000..1083b86618
--- /dev/null
+++ b/esphome/components/whirlpool/climate.py
@@ -0,0 +1,26 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID, CONF_MODEL
+
+AUTO_LOAD = ['climate_ir']
+
+whirlpool_ns = cg.esphome_ns.namespace('whirlpool')
+WhirlpoolClimate = whirlpool_ns.class_('WhirlpoolClimate', climate_ir.ClimateIR)
+
+Model = whirlpool_ns.enum('Model')
+MODELS = {
+    'DG11J1-3A': Model.MODEL_DG11J1_3A,
+    'DG11J1-91': Model.MODEL_DG11J1_91,
+}
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(WhirlpoolClimate),
+    cv.Optional(CONF_MODEL, default='DG11J1-3A'): cv.enum(MODELS, upper=True)
+})
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield climate_ir.register_climate_ir(var, config)
+    cg.add(var.set_model(config[CONF_MODEL]))
diff --git a/esphome/components/whirlpool/whirlpool.cpp b/esphome/components/whirlpool/whirlpool.cpp
new file mode 100644
index 0000000000..0956f816ce
--- /dev/null
+++ b/esphome/components/whirlpool/whirlpool.cpp
@@ -0,0 +1,289 @@
+#include "whirlpool.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace whirlpool {
+
+static const char *TAG = "whirlpool.climate";
+
+const uint16_t WHIRLPOOL_HEADER_MARK = 9000;
+const uint16_t WHIRLPOOL_HEADER_SPACE = 4494;
+const uint16_t WHIRLPOOL_BIT_MARK = 572;
+const uint16_t WHIRLPOOL_ONE_SPACE = 1659;
+const uint16_t WHIRLPOOL_ZERO_SPACE = 553;
+const uint32_t WHIRLPOOL_GAP = 7960;
+
+const uint32_t WHIRLPOOL_CARRIER_FREQUENCY = 38000;
+
+const uint8_t WHIRLPOOL_STATE_LENGTH = 21;
+
+const uint8_t WHIRLPOOL_HEAT = 0;
+const uint8_t WHIRLPOOL_DRY = 3;
+const uint8_t WHIRLPOOL_COOL = 2;
+const uint8_t WHIRLPOOL_FAN = 4;
+const uint8_t WHIRLPOOL_AUTO = 1;
+
+const uint8_t WHIRLPOOL_FAN_AUTO = 0;
+const uint8_t WHIRLPOOL_FAN_HIGH = 1;
+const uint8_t WHIRLPOOL_FAN_MED = 2;
+const uint8_t WHIRLPOOL_FAN_LOW = 3;
+
+const uint8_t WHIRLPOOL_SWING_MASK = 128;
+
+const uint8_t WHIRLPOOL_POWER = 0x04;
+
+void WhirlpoolClimate::transmit_state() {
+  uint8_t remote_state[WHIRLPOOL_STATE_LENGTH] = {0};
+  remote_state[0] = 0x83;
+  remote_state[1] = 0x06;
+  remote_state[6] = 0x80;
+  // MODEL DG11J191
+  remote_state[18] = 0x08;
+
+  auto powered_on = this->mode != climate::CLIMATE_MODE_OFF;
+  if (powered_on != this->powered_on_assumed_) {
+    // Set power toggle command
+    remote_state[2] = 4;
+    remote_state[15] = 1;
+    this->powered_on_assumed_ = powered_on;
+  }
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_AUTO:
+      // set fan auto
+      // set temp auto temp
+      // set sleep false
+      remote_state[3] = WHIRLPOOL_AUTO;
+      remote_state[15] = 0x17;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      remote_state[3] = WHIRLPOOL_HEAT;
+      remote_state[15] = 6;
+      break;
+    case climate::CLIMATE_MODE_COOL:
+      remote_state[3] = WHIRLPOOL_COOL;
+      remote_state[15] = 6;
+      break;
+    case climate::CLIMATE_MODE_DRY:
+      remote_state[3] = WHIRLPOOL_DRY;
+      remote_state[15] = 6;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      remote_state[3] = WHIRLPOOL_FAN;
+      remote_state[15] = 6;
+      break;
+    case climate::CLIMATE_MODE_OFF:
+    default:
+      break;
+  }
+
+  // Temperature
+  auto temp = (uint8_t) roundf(clamp(this->target_temperature, this->temperature_min_(), this->temperature_max_()));
+  remote_state[3] |= (uint8_t)(temp - this->temperature_min_()) << 4;
+
+  // Fan speed
+  switch (this->fan_mode) {
+    case climate::CLIMATE_FAN_HIGH:
+      remote_state[2] |= WHIRLPOOL_FAN_HIGH;
+      break;
+    case climate::CLIMATE_FAN_MEDIUM:
+      remote_state[2] |= WHIRLPOOL_FAN_MED;
+      break;
+    case climate::CLIMATE_FAN_LOW:
+      remote_state[2] |= WHIRLPOOL_FAN_LOW;
+      break;
+    default:
+      break;
+  }
+
+  // Swing
+  ESP_LOGV(TAG, "send swing %s", this->send_swing_cmd_ ? "true" : "false");
+  if (this->send_swing_cmd_) {
+    if (this->swing_mode == climate::CLIMATE_SWING_VERTICAL || this->swing_mode == climate::CLIMATE_SWING_OFF) {
+      remote_state[2] |= 128;
+      remote_state[8] |= 64;
+    }
+  }
+
+  // Checksum
+  for (uint8_t i = 2; i < 12; i++)
+    remote_state[13] ^= remote_state[i];
+  for (uint8_t i = 14; i < 20; i++)
+    remote_state[20] ^= remote_state[i];
+
+  ESP_LOGV(TAG,
+           "Sending: %02X %02X %02X %02X   %02X %02X %02X %02X   %02X %02X %02X %02X   %02X %02X %02X %02X   %02X %02X "
+           "%02X %02X   %02X",
+           remote_state[0], remote_state[1], remote_state[2], remote_state[3], remote_state[4], remote_state[5],
+           remote_state[6], remote_state[7], remote_state[8], remote_state[9], remote_state[10], remote_state[11],
+           remote_state[12], remote_state[13], remote_state[14], remote_state[15], remote_state[16], remote_state[17],
+           remote_state[18], remote_state[19], remote_state[20]);
+
+  // Send code
+  auto transmit = this->transmitter_->transmit();
+  auto data = transmit.get_data();
+
+  data->set_carrier_frequency(38000);
+
+  // Header
+  data->mark(WHIRLPOOL_HEADER_MARK);
+  data->space(WHIRLPOOL_HEADER_SPACE);
+  // Data
+  auto bytes_sent = 0;
+  for (uint8_t i : remote_state) {
+    for (uint8_t j = 0; j < 8; j++) {
+      data->mark(WHIRLPOOL_BIT_MARK);
+      bool bit = i & (1 << j);
+      data->space(bit ? WHIRLPOOL_ONE_SPACE : WHIRLPOOL_ZERO_SPACE);
+    }
+    bytes_sent++;
+    if (bytes_sent == 6 || bytes_sent == 14) {
+      // Divider
+      data->mark(WHIRLPOOL_BIT_MARK);
+      data->space(WHIRLPOOL_GAP);
+    }
+  }
+  // Footer
+  data->mark(WHIRLPOOL_BIT_MARK);
+
+  transmit.perform();
+}
+
+bool WhirlpoolClimate::on_receive(remote_base::RemoteReceiveData data) {
+  // Validate header
+  if (!data.expect_item(WHIRLPOOL_HEADER_MARK, WHIRLPOOL_HEADER_SPACE)) {
+    ESP_LOGV(TAG, "Header fail");
+    return false;
+  }
+
+  uint8_t remote_state[WHIRLPOOL_STATE_LENGTH] = {0};
+  // Read all bytes.
+  for (int i = 0; i < WHIRLPOOL_STATE_LENGTH; i++) {
+    // Read bit
+    if (i == 6 || i == 14) {
+      if (!data.expect_item(WHIRLPOOL_BIT_MARK, WHIRLPOOL_GAP))
+        return false;
+    }
+    for (int j = 0; j < 8; j++) {
+      if (data.expect_item(WHIRLPOOL_BIT_MARK, WHIRLPOOL_ONE_SPACE))
+        remote_state[i] |= 1 << j;
+
+      else if (!data.expect_item(WHIRLPOOL_BIT_MARK, WHIRLPOOL_ZERO_SPACE)) {
+        ESP_LOGV(TAG, "Byte %d bit %d fail", i, j);
+        return false;
+      }
+    }
+
+    ESP_LOGVV(TAG, "Byte %d %02X", i, remote_state[i]);
+  }
+  // Validate footer
+  if (!data.expect_mark(WHIRLPOOL_BIT_MARK)) {
+    ESP_LOGV(TAG, "Footer fail");
+    return false;
+  }
+
+  uint8_t checksum13 = 0;
+  uint8_t checksum20 = 0;
+  // Calculate  checksum and compare with signal value.
+  for (uint8_t i = 2; i < 12; i++)
+    checksum13 ^= remote_state[i];
+  for (uint8_t i = 14; i < 20; i++)
+    checksum20 ^= remote_state[i];
+
+  if (checksum13 != remote_state[13] || checksum20 != remote_state[20]) {
+    ESP_LOGVV(TAG, "Checksum fail");
+    return false;
+  }
+
+  ESP_LOGV(
+      TAG,
+      "Received: %02X %02X %02X %02X   %02X %02X %02X %02X   %02X %02X %02X %02X   %02X %02X %02X %02X   %02X %02X "
+      "%02X %02X   %02X",
+      remote_state[0], remote_state[1], remote_state[2], remote_state[3], remote_state[4], remote_state[5],
+      remote_state[6], remote_state[7], remote_state[8], remote_state[9], remote_state[10], remote_state[11],
+      remote_state[12], remote_state[13], remote_state[14], remote_state[15], remote_state[16], remote_state[17],
+      remote_state[18], remote_state[19], remote_state[20]);
+
+  // verify header remote code
+  if (remote_state[0] != 0x83 || remote_state[1] != 0x06)
+    return false;
+
+  // powr on/off button
+  ESP_LOGV(TAG, "Power: %02X", (remote_state[2] & WHIRLPOOL_POWER));
+
+  if ((remote_state[2] & WHIRLPOOL_POWER) == WHIRLPOOL_POWER) {
+    auto powered_on = this->mode != climate::CLIMATE_MODE_OFF;
+
+    if (powered_on) {
+      this->mode = climate::CLIMATE_MODE_OFF;
+      this->powered_on_assumed_ = false;
+    } else {
+      this->powered_on_assumed_ = true;
+    }
+  }
+
+  // Set received mode
+  if (powered_on_assumed_) {
+    auto mode = remote_state[3] & 0x7;
+    ESP_LOGV(TAG, "Mode: %02X", mode);
+    switch (mode) {
+      case WHIRLPOOL_HEAT:
+        this->mode = climate::CLIMATE_MODE_HEAT;
+        break;
+      case WHIRLPOOL_COOL:
+        this->mode = climate::CLIMATE_MODE_COOL;
+        break;
+      case WHIRLPOOL_DRY:
+        this->mode = climate::CLIMATE_MODE_DRY;
+        break;
+      case WHIRLPOOL_FAN:
+        this->mode = climate::CLIMATE_MODE_FAN_ONLY;
+        break;
+      case WHIRLPOOL_AUTO:
+        this->mode = climate::CLIMATE_MODE_AUTO;
+        break;
+    }
+  }
+
+  // Set received temp
+  int temp = remote_state[3] & 0xF0;
+  ESP_LOGVV(TAG, "Temperature Raw: %02X", temp);
+  temp = (uint8_t) temp >> 4;
+  temp += static_cast<int>(this->temperature_min_());
+  ESP_LOGVV(TAG, "Temperature Climate: %u", temp);
+  this->target_temperature = temp;
+
+  // Set received fan speed
+  auto fan = remote_state[2] & 0x03;
+  ESP_LOGVV(TAG, "Fan: %02X", fan);
+  switch (fan) {
+    case WHIRLPOOL_FAN_HIGH:
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+      break;
+    case WHIRLPOOL_FAN_MED:
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+      break;
+    case WHIRLPOOL_FAN_LOW:
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+      break;
+    case WHIRLPOOL_FAN_AUTO:
+    default:
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+      break;
+  }
+
+  // Set received swing status
+  if ((remote_state[2] & WHIRLPOOL_SWING_MASK) == WHIRLPOOL_SWING_MASK && remote_state[8] == 0x40) {
+    ESP_LOGVV(TAG, "Swing toggle pressed ");
+    if (this->swing_mode == climate::CLIMATE_SWING_OFF) {
+      this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
+    } else {
+      this->swing_mode = climate::CLIMATE_SWING_OFF;
+    }
+  }
+
+  this->publish_state();
+  return true;
+}
+
+}  // namespace whirlpool
+}  // namespace esphome
diff --git a/esphome/components/whirlpool/whirlpool.h b/esphome/components/whirlpool/whirlpool.h
new file mode 100644
index 0000000000..44116b340c
--- /dev/null
+++ b/esphome/components/whirlpool/whirlpool.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace whirlpool {
+
+/// Simple enum to represent models.
+enum Model {
+  MODEL_DG11J1_3A = 0,  /// Temperature range is from 18 to 32
+  MODEL_DG11J1_91 = 1,  /// Temperature range is from 16 to 30
+};
+
+// Temperature
+const float WHIRLPOOL_DG11J1_3A_TEMP_MAX = 32.0;
+const float WHIRLPOOL_DG11J1_3A_TEMP_MIN = 18.0;
+const float WHIRLPOOL_DG11J1_91_TEMP_MAX = 30.0;
+const float WHIRLPOOL_DG11J1_91_TEMP_MIN = 16.0;
+
+class WhirlpoolClimate : public climate_ir::ClimateIR {
+ public:
+  WhirlpoolClimate()
+      : climate_ir::ClimateIR(temperature_min_(), temperature_max_(), 1.0f, true, true,
+                              {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
+                               climate::CLIMATE_FAN_HIGH},
+                              {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL}) {}
+
+  void setup() override {
+    climate_ir::ClimateIR::setup();
+
+    this->powered_on_assumed_ = this->mode != climate::CLIMATE_MODE_OFF;
+  }
+
+  /// Override control to change settings of the climate device.
+  void control(const climate::ClimateCall &call) override {
+    send_swing_cmd_ = call.get_swing_mode().has_value();
+    climate_ir::ClimateIR::control(call);
+  }
+
+  void set_model(Model model) { this->model_ = model; }
+
+ protected:
+  /// Transmit via IR the state of this climate controller.
+  void transmit_state() override;
+  /// Handle received IR Buffer
+  bool on_receive(remote_base::RemoteReceiveData data) override;
+
+  // used to track when to send the power toggle command
+  bool powered_on_assumed_;
+
+  bool send_swing_cmd_{false};
+  Model model_;
+
+  float temperature_min_() {
+    return (model_ == MODEL_DG11J1_3A) ? WHIRLPOOL_DG11J1_3A_TEMP_MIN : WHIRLPOOL_DG11J1_91_TEMP_MIN;
+  }
+  float temperature_max_() {
+    return (model_ == MODEL_DG11J1_3A) ? WHIRLPOOL_DG11J1_3A_TEMP_MAX : WHIRLPOOL_DG11J1_91_TEMP_MAX;
+  }
+};
+
+}  // namespace whirlpool
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 8019148e07..dcc6700b45 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1228,6 +1228,8 @@ climate:
     name: Yashima Climate
   - platform: mitsubishi
     name: Mitsubishi
+  - platform: whirlpool
+    name: Whirlpool Climate
 
 switch:
   - platform: gpio

From 6123cb7c69464ff4af4f5aa3cd9020b4590820ee Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Fri, 24 Apr 2020 20:58:32 -0300
Subject: [PATCH 189/412] add mac address to wifi info (#1030)

* add mac address to wifi info

* add test

* lint
---
 esphome/components/wifi_info/text_sensor.py            | 7 ++++++-
 esphome/components/wifi_info/wifi_info_text_sensor.cpp | 1 +
 esphome/components/wifi_info/wifi_info_text_sensor.h   | 7 +++++++
 tests/test1.yaml                                       | 2 ++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/esphome/components/wifi_info/text_sensor.py b/esphome/components/wifi_info/text_sensor.py
index 81ee787848..56670b4173 100644
--- a/esphome/components/wifi_info/text_sensor.py
+++ b/esphome/components/wifi_info/text_sensor.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import text_sensor
-from esphome.const import CONF_BSSID, CONF_ID, CONF_IP_ADDRESS, CONF_SSID
+from esphome.const import CONF_BSSID, CONF_ID, CONF_IP_ADDRESS, CONF_SSID, CONF_MAC_ADDRESS
 from esphome.core import coroutine
 
 DEPENDENCIES = ['wifi']
@@ -10,6 +10,7 @@ wifi_info_ns = cg.esphome_ns.namespace('wifi_info')
 IPAddressWiFiInfo = wifi_info_ns.class_('IPAddressWiFiInfo', text_sensor.TextSensor, cg.Component)
 SSIDWiFiInfo = wifi_info_ns.class_('SSIDWiFiInfo', text_sensor.TextSensor, cg.Component)
 BSSIDWiFiInfo = wifi_info_ns.class_('BSSIDWiFiInfo', text_sensor.TextSensor, cg.Component)
+MacAddressWifiInfo = wifi_info_ns.class_('MacAddressWifiInfo', text_sensor.TextSensor, cg.Component)
 
 CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_IP_ADDRESS): text_sensor.TEXT_SENSOR_SCHEMA.extend({
@@ -21,6 +22,9 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_BSSID): text_sensor.TEXT_SENSOR_SCHEMA.extend({
         cv.GenerateID(): cv.declare_id(BSSIDWiFiInfo),
     }),
+    cv.Optional(CONF_MAC_ADDRESS): text_sensor.TEXT_SENSOR_SCHEMA.extend({
+        cv.GenerateID(): cv.declare_id(MacAddressWifiInfo),
+    })
 })
 
 
@@ -37,3 +41,4 @@ def to_code(config):
     yield setup_conf(config, CONF_IP_ADDRESS)
     yield setup_conf(config, CONF_SSID)
     yield setup_conf(config, CONF_BSSID)
+    yield setup_conf(config, CONF_MAC_ADDRESS)
diff --git a/esphome/components/wifi_info/wifi_info_text_sensor.cpp b/esphome/components/wifi_info/wifi_info_text_sensor.cpp
index 704d9b3099..08a69998fb 100644
--- a/esphome/components/wifi_info/wifi_info_text_sensor.cpp
+++ b/esphome/components/wifi_info/wifi_info_text_sensor.cpp
@@ -9,6 +9,7 @@ static const char *TAG = "wifi_info";
 void IPAddressWiFiInfo::dump_config() { LOG_TEXT_SENSOR("", "WifiInfo IPAddress", this); }
 void SSIDWiFiInfo::dump_config() { LOG_TEXT_SENSOR("", "WifiInfo SSID", this); }
 void BSSIDWiFiInfo::dump_config() { LOG_TEXT_SENSOR("", "WifiInfo BSSID", this); }
+void MacAddressWifiInfo::dump_config() { LOG_TEXT_SENSOR("", "WifiInfo Mac Address", this); }
 
 }  // namespace wifi_info
 }  // namespace esphome
diff --git a/esphome/components/wifi_info/wifi_info_text_sensor.h b/esphome/components/wifi_info/wifi_info_text_sensor.h
index 9dfa684b4b..6d2be08fa0 100644
--- a/esphome/components/wifi_info/wifi_info_text_sensor.h
+++ b/esphome/components/wifi_info/wifi_info_text_sensor.h
@@ -60,5 +60,12 @@ class BSSIDWiFiInfo : public Component, public text_sensor::TextSensor {
   wifi::bssid_t last_bssid_;
 };
 
+class MacAddressWifiInfo : public Component, public text_sensor::TextSensor {
+ public:
+  void setup() override { this->publish_state(get_mac_address_pretty()); }
+  std::string unique_id() override { return get_mac_address() + "-wifiinfo-macadr"; }
+  void dump_config() override;
+};
+
 }  // namespace wifi_info
 }  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index dcc6700b45..dbb3a4bdb3 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1644,3 +1644,5 @@ text_sensor:
     name: "SSID"
   bssid:
     name: "BSSID"
+  mac_address:
+    name: "Mac Address"

From c9e224e9998918c0c0ad240225c8be56985e00ba Mon Sep 17 00:00:00 2001
From: Derek Hageman <hageman@inthat.cloud>
Date: Fri, 24 Apr 2020 19:10:41 -0600
Subject: [PATCH 190/412] SHTC3: Wake up the sensor during setup (#993)

Since we put the sensor to sleep when not measuring, make sure to wake
it up during setup.  It does not respond to any other I2C commands
(including reset) while asleep, so if we've done a soft reboot while
it was sleeping then setup() would fail since it wouldn't respond to
anything.
---
 esphome/components/shtcx/shtcx.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/shtcx/shtcx.cpp b/esphome/components/shtcx/shtcx.cpp
index b8daceb1af..d67031febf 100644
--- a/esphome/components/shtcx/shtcx.cpp
+++ b/esphome/components/shtcx/shtcx.cpp
@@ -25,6 +25,7 @@ inline const char *to_string(SHTCXType type) {
 
 void SHTCXComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up SHTCx...");
+  this->wake_up();
   this->soft_reset();
 
   if (!this->write_command_(SHTCX_COMMAND_READ_ID_REGISTER)) {

From bab0ba9c0fcb16a941e97ac33ed74019d7f94b2c Mon Sep 17 00:00:00 2001
From: ukewea <60734042+ukewea@users.noreply.github.com>
Date: Sat, 25 Apr 2020 22:00:52 +0800
Subject: [PATCH 191/412] Change buffer sending process for waveshare_epaper
 (2.70in) (#1031)

* Change buffer sending process for waveshare_epaper (2.70in)

The current way ESPhome sending buffer to WaveshareEPaper2P7In does not show the expected content on the display, this commit is changing the data transferring process so the content is showing as expected.

The process is adapted from the demo code provided by Waveshare, manufacturer of the E-paper display.

* Fix linting eror
---
 .../waveshare_epaper/waveshare_epaper.cpp          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index fd869b46ec..695ba9c455 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -425,20 +425,22 @@ void WaveshareEPaper2P7In::initialize() {
     this->data(i);
 }
 void HOT WaveshareEPaper2P7In::display() {
+  uint32_t buf_len = this->get_buffer_length_();
+
   // COMMAND DATA START TRANSMISSION 1
   this->command(0x10);
   delay(2);
-  this->start_data_();
-  this->write_array(this->buffer_, this->get_buffer_length_());
-  this->end_data_();
+  for (uint32_t i = 0; i < buf_len; i++) {
+    this->data(this->buffer_[i]);
+  }
   delay(2);
 
   // COMMAND DATA START TRANSMISSION 2
   this->command(0x13);
   delay(2);
-  this->start_data_();
-  this->write_array(this->buffer_, this->get_buffer_length_());
-  this->end_data_();
+  for (uint32_t i = 0; i < buf_len; i++) {
+    this->data(this->buffer_[i]);
+  }
 
   // COMMAND DISPLAY REFRESH
   this->command(0x12);

From 31ae337931399922b5d5fd3bbdeb545533af263b Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sat, 25 Apr 2020 15:39:34 -0300
Subject: [PATCH 192/412] add lights on off triggers (#1037)

* add lights on off triggers

* add test
---
 esphome/components/light/__init__.py  | 20 ++++++++++++++--
 esphome/components/light/automation.h | 34 +++++++++++++++++++++++++++
 esphome/components/light/types.py     |  4 ++++
 tests/test1.yaml                      |  8 +++++++
 4 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/esphome/components/light/__init__.py b/esphome/components/light/__init__.py
index 63aac69462..2a44b044b9 100644
--- a/esphome/components/light/__init__.py
+++ b/esphome/components/light/__init__.py
@@ -1,15 +1,18 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+import esphome.automation as auto
 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_POWER_SUPPLY, CONF_RESTORE_MODE
+    CONF_INTERNAL, CONF_NAME, CONF_MQTT_ID, CONF_POWER_SUPPLY, CONF_RESTORE_MODE, \
+    CONF_ON_TURN_OFF, CONF_ON_TURN_ON, CONF_TRIGGER_ID
 from esphome.core import coroutine, coroutine_with_priority
 from .automation import light_control_to_code  # noqa
 from .effects import validate_effects, BINARY_EFFECTS, \
     MONOCHROMATIC_EFFECTS, RGB_EFFECTS, ADDRESSABLE_EFFECTS, EFFECTS_REGISTRY
 from .types import (  # noqa
-    LightState, AddressableLightState, light_ns, LightOutput, AddressableLight)
+    LightState, AddressableLightState, light_ns, LightOutput, AddressableLight, \
+    LightTurnOnTrigger, LightTurnOffTrigger)
 
 IS_PLATFORM_COMPONENT = True
 
@@ -26,6 +29,12 @@ LIGHT_SCHEMA = cv.MQTT_COMMAND_COMPONENT_SCHEMA.extend({
     cv.OnlyWith(CONF_MQTT_ID, 'mqtt'): cv.declare_id(mqtt.MQTTJSONLightComponent),
     cv.Optional(CONF_RESTORE_MODE, default='restore_default_off'):
         cv.enum(RESTORE_MODES, upper=True, space='_'),
+    cv.Optional(CONF_ON_TURN_ON): auto.validate_automation({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(LightTurnOnTrigger),
+    }),
+    cv.Optional(CONF_ON_TURN_OFF): auto.validate_automation({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(LightTurnOffTrigger),
+    }),
 })
 
 BINARY_LIGHT_SCHEMA = LIGHT_SCHEMA.extend({
@@ -62,6 +71,13 @@ def setup_light_core_(light_var, output_var, config):
     effects = yield cg.build_registry_list(EFFECTS_REGISTRY, config.get(CONF_EFFECTS, []))
     cg.add(light_var.add_effects(effects))
 
+    for conf in config.get(CONF_ON_TURN_ON, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], light_var)
+        yield auto.build_automation(trigger, [], conf)
+    for conf in config.get(CONF_ON_TURN_OFF, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], light_var)
+        yield auto.build_automation(trigger, [], conf)
+
     if CONF_COLOR_CORRECT in config:
         cg.add(output_var.set_correction(*config[CONF_COLOR_CORRECT]))
 
diff --git a/esphome/components/light/automation.h b/esphome/components/light/automation.h
index 2cd55ab6f6..dfab780658 100644
--- a/esphome/components/light/automation.h
+++ b/esphome/components/light/automation.h
@@ -98,6 +98,40 @@ template<typename... Ts> class LightIsOffCondition : public Condition<Ts...> {
   LightState *state_;
 };
 
+class LightTurnOnTrigger : public Trigger<> {
+ public:
+  LightTurnOnTrigger(LightState *a_light) {
+    a_light->add_new_remote_values_callback([this, a_light]() {
+      auto is_on = a_light->current_values.is_on();
+      if (is_on && !last_on_) {
+        this->trigger();
+      }
+      last_on_ = is_on;
+    });
+    last_on_ = a_light->current_values.is_on();
+  }
+
+ protected:
+  bool last_on_;
+};
+
+class LightTurnOffTrigger : public Trigger<> {
+ public:
+  LightTurnOffTrigger(LightState *a_light) {
+    a_light->add_new_remote_values_callback([this, a_light]() {
+      auto is_on = a_light->current_values.is_on();
+      if (!is_on && last_on_) {
+        this->trigger();
+      }
+      last_on_ = is_on;
+    });
+    last_on_ = a_light->current_values.is_on();
+  }
+
+ protected:
+  bool last_on_;
+};
+
 template<typename... Ts> class AddressableSet : public Action<Ts...> {
  public:
   explicit AddressableSet(LightState *parent) : parent_(parent) {}
diff --git a/esphome/components/light/types.py b/esphome/components/light/types.py
index fb88d021f2..d32ef0214c 100644
--- a/esphome/components/light/types.py
+++ b/esphome/components/light/types.py
@@ -21,6 +21,10 @@ AddressableSet = light_ns.class_('AddressableSet', automation.Action)
 LightIsOnCondition = light_ns.class_('LightIsOnCondition', automation.Condition)
 LightIsOffCondition = light_ns.class_('LightIsOffCondition', automation.Condition)
 
+# Triggers
+LightTurnOnTrigger = light_ns.class_('LightTurnOnTrigger', automation.Trigger.template())
+LightTurnOffTrigger = light_ns.class_('LightTurnOffTrigger', automation.Trigger.template())
+
 # Effects
 LightEffect = light_ns.class_('LightEffect')
 RandomLightEffect = light_ns.class_('RandomLightEffect', LightEffect)
diff --git a/tests/test1.yaml b/tests/test1.yaml
index dbb3a4bdb3..59b64b0b6d 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1044,6 +1044,14 @@ light:
               duration: 250ms
             - state: False
               duration: 250ms
+    on_turn_on:
+      - switch.template.publish:
+          id: livingroom_lights
+          state: yes
+    on_turn_off:
+      - switch.template.publish:
+          id: livingroom_lights
+          state: yes
   - platform: monochromatic
     name: "Kitchen Lights"
     id: kitchen

From ba1222eae444ef498fa0af0f6a363b7585f4161f Mon Sep 17 00:00:00 2001
From: puuu <puuu@users.noreply.github.com>
Date: Tue, 28 Apr 2020 08:57:02 +0900
Subject: [PATCH 193/412] Bluetooth advertising automation (#995)

* esp32_ble_tracker: introduce UUID comparison function

* ble_presence, ble_rssi: use new UUID comparison function

* esp32_ble_tracker: introduce automation on BLE advertising

* test2.yaml: remove deep_sleep due to firmware size restrictions
---
 .../ble_presence/ble_presence_device.h        | 33 +-------
 esphome/components/ble_rssi/ble_rssi_sensor.h | 33 +-------
 .../components/esp32_ble_tracker/__init__.py  | 59 ++++++++++++-
 .../components/esp32_ble_tracker/automation.h | 82 +++++++++++++++++++
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   | 49 ++++++++++-
 .../esp32_ble_tracker/esp32_ble_tracker.h     |  4 +
 esphome/const.py                              |  4 +
 tests/test2.yaml                              | 23 +++++-
 8 files changed, 221 insertions(+), 66 deletions(-)
 create mode 100644 esphome/components/esp32_ble_tracker/automation.h

diff --git a/esphome/components/ble_presence/ble_presence_device.h b/esphome/components/ble_presence/ble_presence_device.h
index e721db7dcd..bce6a9cf98 100644
--- a/esphome/components/ble_presence/ble_presence_device.h
+++ b/esphome/components/ble_presence/ble_presence_device.h
@@ -43,35 +43,10 @@ class BLEPresenceDevice : public binary_sensor::BinarySensorInitiallyOff,
       }
     } else {
       for (auto uuid : device.get_service_uuids()) {
-        switch (this->uuid_.get_uuid().len) {
-          case ESP_UUID_LEN_16:
-            if (uuid.get_uuid().len == ESP_UUID_LEN_16 &&
-                uuid.get_uuid().uuid.uuid16 == this->uuid_.get_uuid().uuid.uuid16) {
-              this->publish_state(true);
-              this->found_ = true;
-              return true;
-            }
-            break;
-          case ESP_UUID_LEN_32:
-            if (uuid.get_uuid().len == ESP_UUID_LEN_32 &&
-                uuid.get_uuid().uuid.uuid32 == this->uuid_.get_uuid().uuid.uuid32) {
-              this->publish_state(true);
-              this->found_ = true;
-              return true;
-            }
-            break;
-          case ESP_UUID_LEN_128:
-            if (uuid.get_uuid().len == ESP_UUID_LEN_128) {
-              for (int i = 0; i < ESP_UUID_LEN_128; i++) {
-                if (this->uuid_.get_uuid().uuid.uuid128[i] != uuid.get_uuid().uuid.uuid128[i]) {
-                  return false;
-                }
-              }
-              this->publish_state(true);
-              this->found_ = true;
-              return true;
-            }
-            break;
+        if (this->uuid_ == uuid) {
+          this->publish_state(device.get_rssi());
+          this->found_ = true;
+          return true;
         }
       }
     }
diff --git a/esphome/components/ble_rssi/ble_rssi_sensor.h b/esphome/components/ble_rssi/ble_rssi_sensor.h
index 17dd0d4a7d..2082a52469 100644
--- a/esphome/components/ble_rssi/ble_rssi_sensor.h
+++ b/esphome/components/ble_rssi/ble_rssi_sensor.h
@@ -41,35 +41,10 @@ class BLERSSISensor : public sensor::Sensor, public esp32_ble_tracker::ESPBTDevi
       }
     } else {
       for (auto uuid : device.get_service_uuids()) {
-        switch (this->uuid_.get_uuid().len) {
-          case ESP_UUID_LEN_16:
-            if (uuid.get_uuid().len == ESP_UUID_LEN_16 &&
-                uuid.get_uuid().uuid.uuid16 == this->uuid_.get_uuid().uuid.uuid16) {
-              this->publish_state(device.get_rssi());
-              this->found_ = true;
-              return true;
-            }
-            break;
-          case ESP_UUID_LEN_32:
-            if (uuid.get_uuid().len == ESP_UUID_LEN_32 &&
-                uuid.get_uuid().uuid.uuid32 == this->uuid_.get_uuid().uuid.uuid32) {
-              this->publish_state(device.get_rssi());
-              this->found_ = true;
-              return true;
-            }
-            break;
-          case ESP_UUID_LEN_128:
-            if (uuid.get_uuid().len == ESP_UUID_LEN_128) {
-              for (int i = 0; i < ESP_UUID_LEN_128; i++) {
-                if (uuid.get_uuid().uuid.uuid128[i] != this->uuid_.get_uuid().uuid.uuid128[i]) {
-                  return false;
-                }
-              }
-              this->publish_state(device.get_rssi());
-              this->found_ = true;
-              return true;
-            }
-            break;
+        if (this->uuid_ == uuid) {
+          this->publish_state(device.get_rssi());
+          this->found_ = true;
+          return true;
         }
       }
     }
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 3311801b6c..c4cc7260fd 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -1,8 +1,11 @@
 import re
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import automation
 from esphome.const import CONF_ID, ESP_PLATFORM_ESP32, CONF_INTERVAL, \
-    CONF_DURATION
+    CONF_DURATION, CONF_TRIGGER_ID, CONF_MAC_ADDRESS, CONF_SERVICE_UUID, CONF_MANUFACTURER_ID, \
+    CONF_ON_BLE_ADVERTISE, CONF_ON_BLE_SERVICE_DATA_ADVERTISE, \
+    CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE
 from esphome.core import coroutine
 
 ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
@@ -15,6 +18,17 @@ CONF_ACTIVE = 'active'
 esp32_ble_tracker_ns = cg.esphome_ns.namespace('esp32_ble_tracker')
 ESP32BLETracker = esp32_ble_tracker_ns.class_('ESP32BLETracker', cg.Component)
 ESPBTDeviceListener = esp32_ble_tracker_ns.class_('ESPBTDeviceListener')
+ESPBTDevice = esp32_ble_tracker_ns.class_('ESPBTDevice')
+ESPBTDeviceConstRef = ESPBTDevice.operator('ref').operator('const')
+adv_data_t = cg.std_vector.template(cg.uint8)
+adv_data_t_const_ref = adv_data_t.operator('ref').operator('const')
+# Triggers
+ESPBTAdvertiseTrigger = esp32_ble_tracker_ns.class_(
+    'ESPBTAdvertiseTrigger', automation.Trigger.template(ESPBTDeviceConstRef))
+BLEServiceDataAdvertiseTrigger = esp32_ble_tracker_ns.class_(
+    'BLEServiceDataAdvertiseTrigger', automation.Trigger.template(adv_data_t_const_ref))
+BLEManufacturerDataAdvertiseTrigger = esp32_ble_tracker_ns.class_(
+    'BLEManufacturerDataAdvertiseTrigger', automation.Trigger.template(adv_data_t_const_ref))
 
 
 def validate_scan_parameters(config):
@@ -85,6 +99,20 @@ CONFIG_SCHEMA = cv.Schema({
         cv.Optional(CONF_WINDOW, default='30ms'): cv.positive_time_period_milliseconds,
         cv.Optional(CONF_ACTIVE, default=True): cv.boolean,
     }), validate_scan_parameters),
+    cv.Optional(CONF_ON_BLE_ADVERTISE): automation.validate_automation({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ESPBTAdvertiseTrigger),
+        cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
+    }),
+    cv.Optional(CONF_ON_BLE_SERVICE_DATA_ADVERTISE): automation.validate_automation({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(BLEServiceDataAdvertiseTrigger),
+        cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
+        cv.Required(CONF_SERVICE_UUID): bt_uuid,
+    }),
+    cv.Optional(CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE): automation.validate_automation({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(BLEManufacturerDataAdvertiseTrigger),
+        cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
+        cv.Required(CONF_MANUFACTURER_ID): bt_uuid,
+    }),
 
     cv.Optional('scan_interval'): cv.invalid("This option has been removed in 1.14 (Reason: "
                                              "it never had an effect)"),
@@ -103,6 +131,35 @@ def to_code(config):
     cg.add(var.set_scan_interval(int(params[CONF_INTERVAL].total_milliseconds / 0.625)))
     cg.add(var.set_scan_window(int(params[CONF_WINDOW].total_milliseconds / 0.625)))
     cg.add(var.set_scan_active(params[CONF_ACTIVE]))
+    for conf in config.get(CONF_ON_BLE_ADVERTISE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        if CONF_MAC_ADDRESS in conf:
+            cg.add(trigger.set_address(conf[CONF_MAC_ADDRESS].as_hex))
+        yield automation.build_automation(trigger, [(ESPBTDeviceConstRef, 'x')], conf)
+    for conf in config.get(CONF_ON_BLE_SERVICE_DATA_ADVERTISE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        if len(conf[CONF_SERVICE_UUID]) == len(bt_uuid16_format):
+            cg.add(trigger.set_service_uuid16(as_hex(conf[CONF_SERVICE_UUID])))
+        elif len(conf[CONF_SERVICE_UUID]) == len(bt_uuid32_format):
+            cg.add(trigger.set_service_uuid32(as_hex(conf[CONF_SERVICE_UUID])))
+        elif len(conf[CONF_SERVICE_UUID]) == len(bt_uuid128_format):
+            uuid128 = as_hex_array(conf[CONF_SERVICE_UUID])
+            cg.add(trigger.set_service_uuid128(uuid128))
+        if CONF_MAC_ADDRESS in conf:
+            cg.add(trigger.set_address(conf[CONF_MAC_ADDRESS].as_hex))
+        yield automation.build_automation(trigger, [(adv_data_t_const_ref, 'x')], conf)
+    for conf in config.get(CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        if len(conf[CONF_MANUFACTURER_ID]) == len(bt_uuid16_format):
+            cg.add(trigger.set_manufacturer_uuid16(as_hex(conf[CONF_MANUFACTURER_ID])))
+        elif len(conf[CONF_MANUFACTURER_ID]) == len(bt_uuid32_format):
+            cg.add(trigger.set_manufacturer_uuid32(as_hex(conf[CONF_MANUFACTURER_ID])))
+        elif len(conf[CONF_MANUFACTURER_ID]) == len(bt_uuid128_format):
+            uuid128 = as_hex_array(conf[CONF_MANUFACTURER_ID])
+            cg.add(trigger.set_manufacturer_uuid128(uuid128))
+        if CONF_MAC_ADDRESS in conf:
+            cg.add(trigger.set_address(conf[CONF_MAC_ADDRESS].as_hex))
+        yield automation.build_automation(trigger, [(adv_data_t_const_ref, 'x')], conf)
 
 
 @coroutine
diff --git a/esphome/components/esp32_ble_tracker/automation.h b/esphome/components/esp32_ble_tracker/automation.h
new file mode 100644
index 0000000000..9df2587ede
--- /dev/null
+++ b/esphome/components/esp32_ble_tracker/automation.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace esp32_ble_tracker {
+class ESPBTAdvertiseTrigger : public Trigger<const ESPBTDevice &>, public ESPBTDeviceListener {
+ public:
+  explicit ESPBTAdvertiseTrigger(ESP32BLETracker *parent) { parent->register_listener(this); }
+  void set_address(uint64_t address) { this->address_ = address; }
+
+  bool parse_device(const ESPBTDevice &device) override {
+    if (this->address_ && device.address_uint64() != this->address_) {
+      return false;
+    }
+    this->trigger(device);
+    return true;
+  }
+
+ protected:
+  uint64_t address_ = 0;
+};
+
+class BLEServiceDataAdvertiseTrigger : public Trigger<const adv_data_t &>, public ESPBTDeviceListener {
+ public:
+  explicit BLEServiceDataAdvertiseTrigger(ESP32BLETracker *parent) { parent->register_listener(this); }
+  void set_address(uint64_t address) { this->address_ = address; }
+  void set_service_uuid16(uint16_t uuid) { this->uuid_ = ESPBTUUID::from_uint16(uuid); }
+  void set_service_uuid32(uint32_t uuid) { this->uuid_ = ESPBTUUID::from_uint32(uuid); }
+  void set_service_uuid128(uint8_t *uuid) { this->uuid_ = ESPBTUUID::from_raw(uuid); }
+
+  bool parse_device(const ESPBTDevice &device) override {
+    if (this->address_ && device.address_uint64() != this->address_) {
+      return false;
+    }
+    for (auto &service_data : device.get_service_datas()) {
+      if (service_data.uuid == this->uuid_) {
+        this->trigger(service_data.data);
+        return true;
+      }
+    }
+    return false;
+  }
+
+ protected:
+  uint64_t address_ = 0;
+  ESPBTUUID uuid_;
+};
+
+class BLEManufacturerDataAdvertiseTrigger : public Trigger<const adv_data_t &>, public ESPBTDeviceListener {
+ public:
+  explicit BLEManufacturerDataAdvertiseTrigger(ESP32BLETracker *parent) { parent->register_listener(this); }
+  void set_address(uint64_t address) { this->address_ = address; }
+  void set_manufacturer_uuid16(uint16_t uuid) { this->uuid_ = ESPBTUUID::from_uint16(uuid); }
+  void set_manufacturer_uuid32(uint32_t uuid) { this->uuid_ = ESPBTUUID::from_uint32(uuid); }
+  void set_manufacturer_uuid128(uint8_t *uuid) { this->uuid_ = ESPBTUUID::from_raw(uuid); }
+
+  bool parse_device(const ESPBTDevice &device) override {
+    if (this->address_ && device.address_uint64() != this->address_) {
+      return false;
+    }
+    for (auto &manufacturer_data : device.get_manufacturer_datas()) {
+      if (manufacturer_data.uuid == this->uuid_) {
+        this->trigger(manufacturer_data.data);
+        return true;
+      }
+    }
+    return false;
+  }
+
+ protected:
+  uint64_t address_ = 0;
+  ESPBTUUID uuid_;
+};
+
+}  // namespace esp32_ble_tracker
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index ab6bfa681c..5109af21fa 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -223,6 +223,22 @@ ESPBTUUID ESPBTUUID::from_raw(const uint8_t *data) {
     ret.uuid_.uuid.uuid128[i] = data[i];
   return ret;
 }
+ESPBTUUID ESPBTUUID::as_128bit() const {
+  if (this->uuid_.len == ESP_UUID_LEN_128) {
+    return *this;
+  }
+  uint8_t data[] = {0xFB, 0x34, 0x9B, 0x5F, 0x80, 0x00, 0x00, 0x80, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+  uint32_t uuid32;
+  if (this->uuid_.len == ESP_UUID_LEN_32) {
+    uuid32 = this->uuid_.uuid.uuid32;
+  } else {
+    uuid32 = this->uuid_.uuid.uuid16;
+  }
+  for (uint8_t i = 0; i < this->uuid_.len; i++) {
+    data[12 + i] = ((uuid32 >> i * 8) & 0xFF);
+  }
+  return ESPBTUUID::from_raw(data);
+}
 bool ESPBTUUID::contains(uint8_t data1, uint8_t data2) const {
   if (this->uuid_.len == ESP_UUID_LEN_16) {
     return (this->uuid_.uuid.uuid16 >> 8) == data2 || (this->uuid_.uuid.uuid16 & 0xFF) == data1;
@@ -241,16 +257,43 @@ bool ESPBTUUID::contains(uint8_t data1, uint8_t data2) const {
   }
   return false;
 }
+bool ESPBTUUID::operator==(const ESPBTUUID &uuid) const {
+  if (this->uuid_.len == uuid.uuid_.len) {
+    switch (this->uuid_.len) {
+      case ESP_UUID_LEN_16:
+        if (uuid.uuid_.uuid.uuid16 == this->uuid_.uuid.uuid16) {
+          return true;
+        }
+        break;
+      case ESP_UUID_LEN_32:
+        if (uuid.uuid_.uuid.uuid32 == this->uuid_.uuid.uuid32) {
+          return true;
+        }
+        break;
+      case ESP_UUID_LEN_128:
+        for (int i = 0; i < ESP_UUID_LEN_128; i++) {
+          if (uuid.uuid_.uuid.uuid128[i] != this->uuid_.uuid.uuid128[i]) {
+            return false;
+          }
+        }
+        return true;
+        break;
+    }
+  } else {
+    return this->as_128bit() == uuid.as_128bit();
+  }
+  return false;
+}
 esp_bt_uuid_t ESPBTUUID::get_uuid() { return this->uuid_; }
 std::string ESPBTUUID::to_string() {
   char sbuf[64];
   switch (this->uuid_.len) {
     case ESP_UUID_LEN_16:
-      sprintf(sbuf, "%02X:%02X", this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16);
+      sprintf(sbuf, "%02X:%02X", this->uuid_.uuid.uuid16 >> 8, this->uuid_.uuid.uuid16 & 0xff);
       break;
     case ESP_UUID_LEN_32:
-      sprintf(sbuf, "%02X:%02X:%02X:%02X", this->uuid_.uuid.uuid32 >> 24, this->uuid_.uuid.uuid32 >> 16,
-              this->uuid_.uuid.uuid32 >> 8, this->uuid_.uuid.uuid32);
+      sprintf(sbuf, "%02X:%02X:%02X:%02X", this->uuid_.uuid.uuid32 >> 24, (this->uuid_.uuid.uuid32 >> 16 & 0xff),
+              (this->uuid_.uuid.uuid32 >> 8 & 0xff), this->uuid_.uuid.uuid32 & 0xff);
       break;
     default:
     case ESP_UUID_LEN_128:
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 5456adbfe5..8d011abfe3 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -23,8 +23,12 @@ class ESPBTUUID {
 
   static ESPBTUUID from_raw(const uint8_t *data);
 
+  ESPBTUUID as_128bit() const;
+
   bool contains(uint8_t data1, uint8_t data2) const;
 
+  bool operator==(const ESPBTUUID &uuid) const;
+
   esp_bt_uuid_t get_uuid();
 
   std::string to_string();
diff --git a/esphome/const.py b/esphome/const.py
index 36ffbed254..8974009d30 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -235,6 +235,7 @@ CONF_MAC_ADDRESS = 'mac_address'
 CONF_MAINS_FILTER = 'mains_filter'
 CONF_MAKE_ID = 'make_id'
 CONF_MANUAL_IP = 'manual_ip'
+CONF_MANUFACTURER_ID = 'manufacturer_id'
 CONF_MASK_DISTURBER = 'mask_disturber'
 CONF_MAX_CURRENT = 'max_current'
 CONF_MAX_DURATION = 'max_duration'
@@ -280,6 +281,9 @@ CONF_NUM_LEDS = 'num_leds'
 CONF_NUMBER = 'number'
 CONF_OFFSET = 'offset'
 CONF_ON = 'on'
+CONF_ON_BLE_ADVERTISE = 'on_ble_advertise'
+CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE = 'on_ble_manufacturer_data_advertise'
+CONF_ON_BLE_SERVICE_DATA_ADVERTISE = 'on_ble_service_data_advertise'
 CONF_ON_BOOT = 'on_boot'
 CONF_ON_CLICK = 'on_click'
 CONF_ON_DOUBLE_CLICK = 'on_double_click'
diff --git a/tests/test2.yaml b/tests/test2.yaml
index bcc777b83b..d02c093b86 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -49,10 +49,6 @@ web_server:
     username: admin
     password: admin
 
-deep_sleep:
-  run_duration: 20s
-  sleep_duration: 50s
-
 as3935_i2c:
   irq_pin: GPIO12
 
@@ -233,6 +229,25 @@ binary_sensor:
     name: "Storm Alert"
 
 esp32_ble_tracker:
+  on_ble_advertise:
+    - mac_address: AC:37:43:77:5F:4C
+      then:
+        - lambda: !lambda |-
+            ESP_LOGD("main", "The device address is %s", x.address_str().c_str());
+    - then:
+        - lambda: !lambda |-
+            ESP_LOGD("main", "The device address is %s", x.address_str().c_str());
+  on_ble_service_data_advertise:
+    - service_uuid: ABCD
+      then:
+        - lambda: !lambda |-
+            ESP_LOGD("main", "Length of service data is %i", x.size());
+  on_ble_manufacturer_data_advertise:
+    - manufacturer_id: ABCD
+      then:
+        - lambda: !lambda |-
+            ESP_LOGD("main", "Length of manufacturer data is %i", x.size());
+
 
 #esp32_ble_beacon:
 #  type: iBeacon

From a2a83c5004dfe49b179cf45788c1673951f3a679 Mon Sep 17 00:00:00 2001
From: C W <something@fake-url.com>
Date: Tue, 28 Apr 2020 08:22:33 -0700
Subject: [PATCH 194/412] Fix missing yield in uart causing watchdog timer
 resets in esp32 when blocking waiting on serial responses. (#1016)

---
 esphome/components/uart/uart.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/uart/uart.cpp b/esphome/components/uart/uart.cpp
index 205e9e2300..08fc0a326e 100644
--- a/esphome/components/uart/uart.cpp
+++ b/esphome/components/uart/uart.cpp
@@ -96,6 +96,7 @@ bool UARTComponent::check_read_timeout_(size_t len) {
       ESP_LOGE(TAG, "Reading from UART timed out at byte %u!", this->available());
       return false;
     }
+    yield();
   }
   return true;
 }

From 39b35b79ba24146dfd7d399bdceca7c4d25cd75e Mon Sep 17 00:00:00 2001
From: Niklas Wagner <Skaro@Skaronator.com>
Date: Wed, 29 Apr 2020 00:24:06 +0200
Subject: [PATCH 195/412] Make initial run variable available to
 addressable_lambda (#1035)

* Make initial run variable available to addressable_lambda

* Fix linting

* Remove if clause
---
 esphome/components/light/addressable_light_effect.h | 10 +++++++---
 esphome/components/light/effects.py                 |  2 +-
 tests/test1.yaml                                    |  4 +++-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/esphome/components/light/addressable_light_effect.h b/esphome/components/light/addressable_light_effect.h
index 78ae41baad..e6528fcd8a 100644
--- a/esphome/components/light/addressable_light_effect.h
+++ b/esphome/components/light/addressable_light_effect.h
@@ -50,21 +50,25 @@ class AddressableLightEffect : public LightEffect {
 
 class AddressableLambdaLightEffect : public AddressableLightEffect {
  public:
-  AddressableLambdaLightEffect(const std::string &name, const std::function<void(AddressableLight &, ESPColor)> &f,
+  AddressableLambdaLightEffect(const std::string &name,
+                               const std::function<void(AddressableLight &, ESPColor, bool initial_run)> &f,
                                uint32_t update_interval)
       : AddressableLightEffect(name), f_(f), update_interval_(update_interval) {}
+  void start() override { this->initial_run_ = true; }
   void apply(AddressableLight &it, const ESPColor &current_color) override {
     const uint32_t now = millis();
     if (now - this->last_run_ >= this->update_interval_) {
       this->last_run_ = now;
-      this->f_(it, current_color);
+      this->f_(it, current_color, this->initial_run_);
+      this->initial_run_ = false;
     }
   }
 
  protected:
-  std::function<void(AddressableLight &, ESPColor)> f_;
+  std::function<void(AddressableLight &, ESPColor, bool initial_run)> f_;
   uint32_t update_interval_;
   uint32_t last_run_{0};
+  bool initial_run_;
 };
 
 class AddressableRainbowLightEffect : public AddressableLightEffect {
diff --git a/esphome/components/light/effects.py b/esphome/components/light/effects.py
index d08e7f08f5..d8c709b8ad 100644
--- a/esphome/components/light/effects.py
+++ b/esphome/components/light/effects.py
@@ -162,7 +162,7 @@ def flicker_effect_to_code(config, effect_id):
     }
 )
 def addressable_lambda_effect_to_code(config, effect_id):
-    args = [(AddressableLightRef, 'it'), (ESPColor, 'current_color')]
+    args = [(AddressableLightRef, 'it'), (ESPColor, 'current_color'), (bool, 'initial_run')]
     lambda_ = yield cg.process_lambda(config[CONF_LAMBDA], args, return_type=cg.void)
     var = cg.new_Pvariable(effect_id, config[CONF_NAME], lambda_,
                            config[CONF_UPDATE_INTERVAL])
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 59b64b0b6d..18adcf70a3 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1155,7 +1155,9 @@ light:
     - addressable_lambda:
           name: "Test For Custom Lambda Effect"
           lambda: |-
-            it[0] = current_color;
+            if (initial_run) {
+              it[0] = current_color;
+            }
 
     - automation:
         name: Custom Effect

From af66753c1b49f230e57685d44ae2ef2eb7ddc60e Mon Sep 17 00:00:00 2001
From: Jonathan Adams <813248+jonathanadams@users.noreply.github.com>
Date: Wed, 29 Apr 2020 14:04:05 +0100
Subject: [PATCH 196/412] Dashboard Updates (#1025)

* Restructuring of static files directory

* Update jQuery to v3.5.0

* Update jQuery UI to v1.12.1

* Update jQuery Validate to v1.19.1

* Improve login page layout and color scheme

* Updated header & footer colour scheme & added ESPHome logo

* Restructuring of fonts directory

* Restructuring of fonts directory

* Corrected icon reference error

* Update node layout and styling

* Update Ace to v1.4.10

* JS file reorganisation

* Rewrite of LogModal class including refactorization of js & html

* Updated delete node function

* Rewrite of editor modal

* Update Materialize Stepper to v3.1.0

* Updates to the wizard modal

* Added wizard validators back in and removed comments

* Merge old stylesheet into new

* Linting errors

* Fixed dashboard layout issue when no nodes present

* Introduced dynamic 3 column layout for large screens

* Removed unnecessary code

* Update data attribute names

* Added loading indicator to editor

* Open validator websocket on document ready

* Automatically restart validator websocket if it closes

* Minor styling updates

* Improvements to on boarding process

* Node display filename and then path on hover

* Removing console.logs

* Minor styling revisions

* Added toast on begin

* Fix lint

Co-authored-by: Sergio Mayoral Martinez <sergiomayoralmartinez@gmail.com>
---
 esphome/dashboard/static/ace.js               |   16 -
 esphome/dashboard/static/css/esphome.css      |  393 ++++++
 .../materialize-stepper.min.css               |   10 +
 .../vendor/materialize}/materialize.min.css   |    0
 esphome/dashboard/static/esphome.css          |  256 ----
 esphome/dashboard/static/esphome.js           |  782 ------------
 esphome/dashboard/static/ext-searchbox.js     |    7 -
 .../static/fonts/{ => material-icons}/LICENSE |    0
 .../MaterialIcons-Regular.woff                |  Bin
 .../MaterialIcons-Regular.woff2               |  Bin
 .../fonts/{ => material-icons}/README.md      |    0
 .../{ => material-icons}/material-icons.css   |    0
 .../dashboard/static/{ => images}/favicon.ico |  Bin
 esphome/dashboard/static/jquery-ui.min.js     |  401 ------
 esphome/dashboard/static/jquery.min.js        |    4 -
 .../dashboard/static/jquery.validate.min.js   |    4 -
 esphome/dashboard/static/js/esphome.js        | 1005 +++++++++++++++
 esphome/dashboard/static/js/vendor/ace/ace.js |   16 +
 .../static/js/vendor/ace/ext-searchbox.js     |    7 +
 .../static/js/vendor/ace/mode-yaml.js         |    7 +
 .../static/js/vendor/ace/theme-dreamweaver.js |    7 +
 .../js/vendor/jquery-ui/jquery-ui.min.js      |   13 +
 .../jquery-validate/jquery.validate.min.js    |    4 +
 .../static/js/vendor/jquery/jquery.min.js     |    2 +
 .../materialize-stepper.min.js                |   10 +
 .../vendor/materialize}/materialize.min.js    |    0
 .../static/materialize-stepper.min.css        |    5 -
 .../static/materialize-stepper.min.js         |    5 -
 esphome/dashboard/static/mode-yaml.js         |    7 -
 esphome/dashboard/static/theme-dreamweaver.js |    7 -
 esphome/dashboard/templates/index.html        | 1129 +++++++++--------
 esphome/dashboard/templates/login.html        |  136 +-
 32 files changed, 2174 insertions(+), 2059 deletions(-)
 delete mode 100644 esphome/dashboard/static/ace.js
 create mode 100644 esphome/dashboard/static/css/esphome.css
 create mode 100644 esphome/dashboard/static/css/vendor/materialize-stepper/materialize-stepper.min.css
 rename esphome/dashboard/static/{ => css/vendor/materialize}/materialize.min.css (100%)
 delete mode 100644 esphome/dashboard/static/esphome.css
 delete mode 100644 esphome/dashboard/static/esphome.js
 delete mode 100644 esphome/dashboard/static/ext-searchbox.js
 rename esphome/dashboard/static/fonts/{ => material-icons}/LICENSE (100%)
 rename esphome/dashboard/static/fonts/{ => material-icons}/MaterialIcons-Regular.woff (100%)
 rename esphome/dashboard/static/fonts/{ => material-icons}/MaterialIcons-Regular.woff2 (100%)
 rename esphome/dashboard/static/fonts/{ => material-icons}/README.md (100%)
 rename esphome/dashboard/static/fonts/{ => material-icons}/material-icons.css (100%)
 rename esphome/dashboard/static/{ => images}/favicon.ico (100%)
 delete mode 100644 esphome/dashboard/static/jquery-ui.min.js
 delete mode 100644 esphome/dashboard/static/jquery.min.js
 delete mode 100644 esphome/dashboard/static/jquery.validate.min.js
 create mode 100644 esphome/dashboard/static/js/esphome.js
 create mode 100644 esphome/dashboard/static/js/vendor/ace/ace.js
 create mode 100644 esphome/dashboard/static/js/vendor/ace/ext-searchbox.js
 create mode 100644 esphome/dashboard/static/js/vendor/ace/mode-yaml.js
 create mode 100644 esphome/dashboard/static/js/vendor/ace/theme-dreamweaver.js
 create mode 100644 esphome/dashboard/static/js/vendor/jquery-ui/jquery-ui.min.js
 create mode 100644 esphome/dashboard/static/js/vendor/jquery-validate/jquery.validate.min.js
 create mode 100644 esphome/dashboard/static/js/vendor/jquery/jquery.min.js
 create mode 100644 esphome/dashboard/static/js/vendor/materialize-stepper/materialize-stepper.min.js
 rename esphome/dashboard/static/{ => js/vendor/materialize}/materialize.min.js (100%)
 delete mode 100644 esphome/dashboard/static/materialize-stepper.min.css
 delete mode 100644 esphome/dashboard/static/materialize-stepper.min.js
 delete mode 100644 esphome/dashboard/static/mode-yaml.js
 delete mode 100644 esphome/dashboard/static/theme-dreamweaver.js

diff --git a/esphome/dashboard/static/ace.js b/esphome/dashboard/static/ace.js
deleted file mode 100644
index f5fca22af2..0000000000
--- a/esphome/dashboard/static/ace.js
+++ /dev/null
@@ -1,16 +0,0 @@
-(function(){function o(n){var i=e;n&&(e[n]||(e[n]={}),i=e[n]);if(!i.define||!i.define.packaged)t.original=i.define,i.define=t,i.define.packaged=!0;if(!i.require||!i.require.packaged)r.original=i.require,i.require=r,i.require.packaged=!0}var ACE_NAMESPACE = "ace",e=function(){return this}();!e&&typeof window!="undefined"&&(e=window);if(!ACE_NAMESPACE&&typeof requirejs!="undefined")return;var t=function(e,n,r){if(typeof e!="string"){t.original?t.original.apply(this,arguments):(console.error("dropping module because define wasn't a string."),console.trace());return}arguments.length==2&&(r=n),t.modules[e]||(t.payloads[e]=r,t.modules[e]=null)};t.modules={},t.payloads={};var n=function(e,t,n){if(typeof t=="string"){var i=s(e,t);if(i!=undefined)return n&&n(),i}else if(Object.prototype.toString.call(t)==="[object Array]"){var o=[];for(var u=0,a=t.length;u<a;++u){var f=s(e,t[u]);if(f==undefined&&r.original)return;o.push(f)}return n&&n.apply(null,o)||!0}},r=function(e,t){var i=n("",e,t);return i==undefined&&r.original?r.original.apply(this,arguments):i},i=function(e,t){if(t.indexOf("!")!==-1){var n=t.split("!");return i(e,n[0])+"!"+i(e,n[1])}if(t.charAt(0)=="."){var r=e.split("/").slice(0,-1).join("/");t=r+"/"+t;while(t.indexOf(".")!==-1&&s!=t){var s=t;t=t.replace(/\/\.\//,"/").replace(/[^\/]+\/\.\.\//,"")}}return t},s=function(e,r){r=i(e,r);var s=t.modules[r];if(!s){s=t.payloads[r];if(typeof s=="function"){var o={},u={id:r,uri:"",exports:o,packaged:!0},a=function(e,t){return n(r,e,t)},f=s(a,o,u);o=f||u.exports,t.modules[r]=o,delete t.payloads[r]}s=t.modules[r]=o||s}return s};o(ACE_NAMESPACE)})(),ace.define("ace/lib/regexp",["require","exports","module"],function(e,t,n){"use strict";function o(e){return(e.global?"g":"")+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.extended?"x":"")+(e.sticky?"y":"")}function u(e,t,n){if(Array.prototype.indexOf)return e.indexOf(t,n);for(var r=n||0;r<e.length;r++)if(e[r]===t)return r;return-1}var r={exec:RegExp.prototype.exec,test:RegExp.prototype.test,match:String.prototype.match,replace:String.prototype.replace,split:String.prototype.split},i=r.exec.call(/()??/,"")[1]===undefined,s=function(){var e=/^/g;return r.test.call(e,""),!e.lastIndex}();if(s&&i)return;RegExp.prototype.exec=function(e){var t=r.exec.apply(this,arguments),n,a;if(typeof e=="string"&&t){!i&&t.length>1&&u(t,"")>-1&&(a=RegExp(this.source,r.replace.call(o(this),"g","")),r.replace.call(e.slice(t.index),a,function(){for(var e=1;e<arguments.length-2;e++)arguments[e]===undefined&&(t[e]=undefined)}));if(this._xregexp&&this._xregexp.captureNames)for(var f=1;f<t.length;f++)n=this._xregexp.captureNames[f-1],n&&(t[n]=t[f]);!s&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--}return t},s||(RegExp.prototype.test=function(e){var t=r.exec.call(this,e);return t&&this.global&&!t[0].length&&this.lastIndex>t.index&&this.lastIndex--,!!t})}),ace.define("ace/lib/es5-shim",["require","exports","module"],function(e,t,n){function r(){}function w(e){try{return Object.defineProperty(e,"sentinel",{}),"sentinel"in e}catch(t){}}function H(e){return e=+e,e!==e?e=0:e!==0&&e!==1/0&&e!==-1/0&&(e=(e>0||-1)*Math.floor(Math.abs(e))),e}function B(e){var t=typeof e;return e===null||t==="undefined"||t==="boolean"||t==="number"||t==="string"}function j(e){var t,n,r;if(B(e))return e;n=e.valueOf;if(typeof n=="function"){t=n.call(e);if(B(t))return t}r=e.toString;if(typeof r=="function"){t=r.call(e);if(B(t))return t}throw new TypeError}Function.prototype.bind||(Function.prototype.bind=function(t){var n=this;if(typeof n!="function")throw new TypeError("Function.prototype.bind called on incompatible "+n);var i=u.call(arguments,1),s=function(){if(this instanceof s){var e=n.apply(this,i.concat(u.call(arguments)));return Object(e)===e?e:this}return n.apply(t,i.concat(u.call(arguments)))};return n.prototype&&(r.prototype=n.prototype,s.prototype=new r,r.prototype=null),s});var i=Function.prototype.call,s=Array.prototype,o=Object.prototype,u=s.slice,a=i.bind(o.toString),f=i.bind(o.hasOwnProperty),l,c,h,p,d;if(d=f(o,"__defineGetter__"))l=i.bind(o.__defineGetter__),c=i.bind(o.__defineSetter__),h=i.bind(o.__lookupGetter__),p=i.bind(o.__lookupSetter__);if([1,2].splice(0).length!=2)if(!function(){function e(e){var t=new Array(e+2);return t[0]=t[1]=0,t}var t=[],n;t.splice.apply(t,e(20)),t.splice.apply(t,e(26)),n=t.length,t.splice(5,0,"XXX"),n+1==t.length;if(n+1==t.length)return!0}())Array.prototype.splice=function(e,t){var n=this.length;e>0?e>n&&(e=n):e==void 0?e=0:e<0&&(e=Math.max(n+e,0)),e+t<n||(t=n-e);var r=this.slice(e,e+t),i=u.call(arguments,2),s=i.length;if(e===n)s&&this.push.apply(this,i);else{var o=Math.min(t,n-e),a=e+o,f=a+s-o,l=n-a,c=n-o;if(f<a)for(var h=0;h<l;++h)this[f+h]=this[a+h];else if(f>a)for(h=l;h--;)this[f+h]=this[a+h];if(s&&e===c)this.length=c,this.push.apply(this,i);else{this.length=c+s;for(h=0;h<s;++h)this[e+h]=i[h]}}return r};else{var v=Array.prototype.splice;Array.prototype.splice=function(e,t){return arguments.length?v.apply(this,[e===void 0?0:e,t===void 0?this.length-e:t].concat(u.call(arguments,2))):[]}}Array.isArray||(Array.isArray=function(t){return a(t)=="[object Array]"});var m=Object("a"),g=m[0]!="a"||!(0 in m);Array.prototype.forEach||(Array.prototype.forEach=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=arguments[1],s=-1,o=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError;while(++s<o)s in r&&t.call(i,r[s],s,n)}),Array.prototype.map||(Array.prototype.map=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=Array(i),o=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var u=0;u<i;u++)u in r&&(s[u]=t.call(o,r[u],u,n));return s}),Array.prototype.filter||(Array.prototype.filter=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=[],o,u=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var f=0;f<i;f++)f in r&&(o=r[f],t.call(u,o,f,n)&&s.push(o));return s}),Array.prototype.every||(Array.prototype.every=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&!t.call(s,r[o],o,n))return!1;return!0}),Array.prototype.some||(Array.prototype.some=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0,s=arguments[1];if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");for(var o=0;o<i;o++)if(o in r&&t.call(s,r[o],o,n))return!0;return!1}),Array.prototype.reduce||(Array.prototype.reduce=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduce of empty array with no initial value");var s=0,o;if(arguments.length>=2)o=arguments[1];else do{if(s in r){o=r[s++];break}if(++s>=i)throw new TypeError("reduce of empty array with no initial value")}while(!0);for(;s<i;s++)s in r&&(o=t.call(void 0,o,r[s],s,n));return o}),Array.prototype.reduceRight||(Array.prototype.reduceRight=function(t){var n=F(this),r=g&&a(this)=="[object String]"?this.split(""):n,i=r.length>>>0;if(a(t)!="[object Function]")throw new TypeError(t+" is not a function");if(!i&&arguments.length==1)throw new TypeError("reduceRight of empty array with no initial value");var s,o=i-1;if(arguments.length>=2)s=arguments[1];else do{if(o in r){s=r[o--];break}if(--o<0)throw new TypeError("reduceRight of empty array with no initial value")}while(!0);do o in this&&(s=t.call(void 0,s,r[o],o,n));while(o--);return s});if(!Array.prototype.indexOf||[0,1].indexOf(1,2)!=-1)Array.prototype.indexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=0;arguments.length>1&&(i=H(arguments[1])),i=i>=0?i:Math.max(0,r+i);for(;i<r;i++)if(i in n&&n[i]===t)return i;return-1};if(!Array.prototype.lastIndexOf||[0,1].lastIndexOf(0,-3)!=-1)Array.prototype.lastIndexOf=function(t){var n=g&&a(this)=="[object String]"?this.split(""):F(this),r=n.length>>>0;if(!r)return-1;var i=r-1;arguments.length>1&&(i=Math.min(i,H(arguments[1]))),i=i>=0?i:r-Math.abs(i);for(;i>=0;i--)if(i in n&&t===n[i])return i;return-1};Object.getPrototypeOf||(Object.getPrototypeOf=function(t){return t.__proto__||(t.constructor?t.constructor.prototype:o)});if(!Object.getOwnPropertyDescriptor){var y="Object.getOwnPropertyDescriptor called on a non-object: ";Object.getOwnPropertyDescriptor=function(t,n){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(y+t);if(!f(t,n))return;var r,i,s;r={enumerable:!0,configurable:!0};if(d){var u=t.__proto__;t.__proto__=o;var i=h(t,n),s=p(t,n);t.__proto__=u;if(i||s)return i&&(r.get=i),s&&(r.set=s),r}return r.value=t[n],r}}Object.getOwnPropertyNames||(Object.getOwnPropertyNames=function(t){return Object.keys(t)});if(!Object.create){var b;Object.prototype.__proto__===null?b=function(){return{__proto__:null}}:b=function(){var e={};for(var t in e)e[t]=null;return e.constructor=e.hasOwnProperty=e.propertyIsEnumerable=e.isPrototypeOf=e.toLocaleString=e.toString=e.valueOf=e.__proto__=null,e},Object.create=function(t,n){var r;if(t===null)r=b();else{if(typeof t!="object")throw new TypeError("typeof prototype["+typeof t+"] != 'object'");var i=function(){};i.prototype=t,r=new i,r.__proto__=t}return n!==void 0&&Object.defineProperties(r,n),r}}if(Object.defineProperty){var E=w({}),S=typeof document=="undefined"||w(document.createElement("div"));if(!E||!S)var x=Object.defineProperty}if(!Object.defineProperty||x){var T="Property description must be an object: ",N="Object.defineProperty called on non-object: ",C="getters & setters can not be defined on this javascript engine";Object.defineProperty=function(t,n,r){if(typeof t!="object"&&typeof t!="function"||t===null)throw new TypeError(N+t);if(typeof r!="object"&&typeof r!="function"||r===null)throw new TypeError(T+r);if(x)try{return x.call(Object,t,n,r)}catch(i){}if(f(r,"value"))if(d&&(h(t,n)||p(t,n))){var s=t.__proto__;t.__proto__=o,delete t[n],t[n]=r.value,t.__proto__=s}else t[n]=r.value;else{if(!d)throw new TypeError(C);f(r,"get")&&l(t,n,r.get),f(r,"set")&&c(t,n,r.set)}return t}}Object.defineProperties||(Object.defineProperties=function(t,n){for(var r in n)f(n,r)&&Object.defineProperty(t,r,n[r]);return t}),Object.seal||(Object.seal=function(t){return t}),Object.freeze||(Object.freeze=function(t){return t});try{Object.freeze(function(){})}catch(k){Object.freeze=function(t){return function(n){return typeof n=="function"?n:t(n)}}(Object.freeze)}Object.preventExtensions||(Object.preventExtensions=function(t){return t}),Object.isSealed||(Object.isSealed=function(t){return!1}),Object.isFrozen||(Object.isFrozen=function(t){return!1}),Object.isExtensible||(Object.isExtensible=function(t){if(Object(t)===t)throw new TypeError;var n="";while(f(t,n))n+="?";t[n]=!0;var r=f(t,n);return delete t[n],r});if(!Object.keys){var L=!0,A=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],O=A.length;for(var M in{toString:null})L=!1;Object.keys=function I(e){if(typeof e!="object"&&typeof e!="function"||e===null)throw new TypeError("Object.keys called on a non-object");var I=[];for(var t in e)f(e,t)&&I.push(t);if(L)for(var n=0,r=O;n<r;n++){var i=A[n];f(e,i)&&I.push(i)}return I}}Date.now||(Date.now=function(){return(new Date).getTime()});var _="	\n\x0b\f\r \u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff";if(!String.prototype.trim||_.trim()){_="["+_+"]";var D=new RegExp("^"+_+_+"*"),P=new RegExp(_+_+"*$");String.prototype.trim=function(){return String(this).replace(D,"").replace(P,"")}}var F=function(e){if(e==null)throw new TypeError("can't convert "+e+" to object");return Object(e)}}),ace.define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"],function(e,t,n){"use strict";e("./regexp"),e("./es5-shim"),typeof Element!="undefined"&&!Element.prototype.remove&&Object.defineProperty(Element.prototype,"remove",{enumerable:!1,writable:!0,configurable:!0,value:function(){this.parentNode&&this.parentNode.removeChild(this)}})}),ace.define("ace/lib/useragent",["require","exports","module"],function(e,t,n){"use strict";t.OS={LINUX:"LINUX",MAC:"MAC",WINDOWS:"WINDOWS"},t.getOS=function(){return t.isMac?t.OS.MAC:t.isLinux?t.OS.LINUX:t.OS.WINDOWS};if(typeof navigator!="object")return;var r=(navigator.platform.match(/mac|win|linux/i)||["other"])[0].toLowerCase(),i=navigator.userAgent;t.isWin=r=="win",t.isMac=r=="mac",t.isLinux=r=="linux",t.isIE=navigator.appName=="Microsoft Internet Explorer"||navigator.appName.indexOf("MSAppHost")>=0?parseFloat((i.match(/(?:MSIE |Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]):parseFloat((i.match(/(?:Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/)||[])[1]),t.isOldIE=t.isIE&&t.isIE<9,t.isGecko=t.isMozilla=i.match(/ Gecko\/\d+/),t.isOpera=window.opera&&Object.prototype.toString.call(window.opera)=="[object Opera]",t.isWebKit=parseFloat(i.split("WebKit/")[1])||undefined,t.isChrome=parseFloat(i.split(" Chrome/")[1])||undefined,t.isEdge=parseFloat(i.split(" Edge/")[1])||undefined,t.isAIR=i.indexOf("AdobeAIR")>=0,t.isIPad=i.indexOf("iPad")>=0,t.isAndroid=i.indexOf("Android")>=0,t.isChromeOS=i.indexOf(" CrOS ")>=0,t.isIOS=/iPad|iPhone|iPod/.test(i)&&!window.MSStream,t.isIOS&&(t.isMac=!0),t.isMobile=t.isIPad||t.isAndroid}),ace.define("ace/lib/dom",["require","exports","module","ace/lib/useragent"],function(e,t,n){"use strict";var r=e("./useragent"),i="http://www.w3.org/1999/xhtml";t.buildDom=function o(e,t,n){if(typeof e=="string"&&e){var r=document.createTextNode(e);return t&&t.appendChild(r),r}if(!Array.isArray(e))return e;if(typeof e[0]!="string"||!e[0]){var i=[];for(var s=0;s<e.length;s++){var u=o(e[s],t,n);u&&i.push(u)}return i}var a=document.createElement(e[0]),f=e[1],l=1;f&&typeof f=="object"&&!Array.isArray(f)&&(l=2);for(var s=l;s<e.length;s++)o(e[s],a,n);return l==2&&Object.keys(f).forEach(function(e){var t=f[e];e==="class"?a.className=Array.isArray(t)?t.join(" "):t:typeof t=="function"||e=="value"?a[e]=t:e==="ref"?n&&(n[t]=a):t!=null&&a.setAttribute(e,t)}),t&&t.appendChild(a),a},t.getDocumentHead=function(e){return e||(e=document),e.head||e.getElementsByTagName("head")[0]||e.documentElement},t.createElement=function(e,t){return document.createElementNS?document.createElementNS(t||i,e):document.createElement(e)},t.removeChildren=function(e){e.innerHTML=""},t.createTextNode=function(e,t){var n=t?t.ownerDocument:document;return n.createTextNode(e)},t.createFragment=function(e){var t=e?e.ownerDocument:document;return t.createDocumentFragment()},t.hasCssClass=function(e,t){var n=(e.className+"").split(/\s+/g);return n.indexOf(t)!==-1},t.addCssClass=function(e,n){t.hasCssClass(e,n)||(e.className+=" "+n)},t.removeCssClass=function(e,t){var n=e.className.split(/\s+/g);for(;;){var r=n.indexOf(t);if(r==-1)break;n.splice(r,1)}e.className=n.join(" ")},t.toggleCssClass=function(e,t){var n=e.className.split(/\s+/g),r=!0;for(;;){var i=n.indexOf(t);if(i==-1)break;r=!1,n.splice(i,1)}return r&&n.push(t),e.className=n.join(" "),r},t.setCssClass=function(e,n,r){r?t.addCssClass(e,n):t.removeCssClass(e,n)},t.hasCssString=function(e,t){var n=0,r;t=t||document;if(r=t.querySelectorAll("style"))while(n<r.length)if(r[n++].id===e)return!0},t.importCssString=function(n,r,i){var s=i;if(!i||!i.getRootNode)s=document;else{s=i.getRootNode();if(!s||s==i)s=document}var o=s.ownerDocument||s;if(r&&t.hasCssString(r,s))return null;r&&(n+="\n/*# sourceURL=ace/css/"+r+" */");var u=t.createElement("style");u.appendChild(o.createTextNode(n)),r&&(u.id=r),s==o&&(s=t.getDocumentHead(o)),s.insertBefore(u,s.firstChild)},t.importCssStylsheet=function(e,n){t.buildDom(["link",{rel:"stylesheet",href:e}],t.getDocumentHead(n))},t.scrollbarWidth=function(e){var n=t.createElement("ace_inner");n.style.width="100%",n.style.minWidth="0px",n.style.height="200px",n.style.display="block";var r=t.createElement("ace_outer"),i=r.style;i.position="absolute",i.left="-10000px",i.overflow="hidden",i.width="200px",i.minWidth="0px",i.height="150px",i.display="block",r.appendChild(n);var s=e.documentElement;s.appendChild(r);var o=n.offsetWidth;i.overflow="scroll";var u=n.offsetWidth;return o==u&&(u=r.clientWidth),s.removeChild(r),o-u},typeof document=="undefined"&&(t.importCssString=function(){}),t.computedStyle=function(e,t){return window.getComputedStyle(e,"")||{}},t.setStyle=function(e,t,n){e[t]!==n&&(e[t]=n)},t.HAS_CSS_ANIMATION=!1,t.HAS_CSS_TRANSFORMS=!1,t.HI_DPI=r.isWin?typeof window!="undefined"&&window.devicePixelRatio>=1.5:!0;if(typeof document!="undefined"){var s=document.createElement("div");t.HI_DPI&&s.style.transform!==undefined&&(t.HAS_CSS_TRANSFORMS=!0),!r.isEdge&&typeof s.style.animationName!="undefined"&&(t.HAS_CSS_ANIMATION=!0),s=null}t.HAS_CSS_TRANSFORMS?t.translate=function(e,t,n){e.style.transform="translate("+Math.round(t)+"px, "+Math.round(n)+"px)"}:t.translate=function(e,t,n){e.style.top=Math.round(n)+"px",e.style.left=Math.round(t)+"px"}}),ace.define("ace/lib/oop",["require","exports","module"],function(e,t,n){"use strict";t.inherits=function(e,t){e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}})},t.mixin=function(e,t){for(var n in t)e[n]=t[n];return e},t.implement=function(e,n){t.mixin(e,n)}}),ace.define("ace/lib/keys",["require","exports","module","ace/lib/oop"],function(e,t,n){"use strict";var r=e("./oop"),i=function(){var e={MODIFIER_KEYS:{16:"Shift",17:"Ctrl",18:"Alt",224:"Meta"},KEY_MODS:{ctrl:1,alt:2,option:2,shift:4,"super":8,meta:8,command:8,cmd:8},FUNCTION_KEYS:{8:"Backspace",9:"Tab",13:"Return",19:"Pause",27:"Esc",32:"Space",33:"PageUp",34:"PageDown",35:"End",36:"Home",37:"Left",38:"Up",39:"Right",40:"Down",44:"Print",45:"Insert",46:"Delete",96:"Numpad0",97:"Numpad1",98:"Numpad2",99:"Numpad3",100:"Numpad4",101:"Numpad5",102:"Numpad6",103:"Numpad7",104:"Numpad8",105:"Numpad9","-13":"NumpadEnter",112:"F1",113:"F2",114:"F3",115:"F4",116:"F5",117:"F6",118:"F7",119:"F8",120:"F9",121:"F10",122:"F11",123:"F12",144:"Numlock",145:"Scrolllock"},PRINTABLE_KEYS:{32:" ",48:"0",49:"1",50:"2",51:"3",52:"4",53:"5",54:"6",55:"7",56:"8",57:"9",59:";",61:"=",65:"a",66:"b",67:"c",68:"d",69:"e",70:"f",71:"g",72:"h",73:"i",74:"j",75:"k",76:"l",77:"m",78:"n",79:"o",80:"p",81:"q",82:"r",83:"s",84:"t",85:"u",86:"v",87:"w",88:"x",89:"y",90:"z",107:"+",109:"-",110:".",186:";",187:"=",188:",",189:"-",190:".",191:"/",192:"`",219:"[",220:"\\",221:"]",222:"'",111:"/",106:"*"}},t,n;for(n in e.FUNCTION_KEYS)t=e.FUNCTION_KEYS[n].toLowerCase(),e[t]=parseInt(n,10);for(n in e.PRINTABLE_KEYS)t=e.PRINTABLE_KEYS[n].toLowerCase(),e[t]=parseInt(n,10);return r.mixin(e,e.MODIFIER_KEYS),r.mixin(e,e.PRINTABLE_KEYS),r.mixin(e,e.FUNCTION_KEYS),e.enter=e["return"],e.escape=e.esc,e.del=e["delete"],e[173]="-",function(){var t=["cmd","ctrl","alt","shift"];for(var n=Math.pow(2,t.length);n--;)e.KEY_MODS[n]=t.filter(function(t){return n&e.KEY_MODS[t]}).join("-")+"-"}(),e.KEY_MODS[0]="",e.KEY_MODS[-1]="input-",e}();r.mixin(t,i),t.keyCodeToString=function(e){var t=i[e];return typeof t!="string"&&(t=String.fromCharCode(e)),t.toLowerCase()}}),ace.define("ace/lib/event",["require","exports","module","ace/lib/keys","ace/lib/useragent"],function(e,t,n){"use strict";function a(e,t,n){var a=u(t);if(!i.isMac&&s){t.getModifierState&&(t.getModifierState("OS")||t.getModifierState("Win"))&&(a|=8);if(s.altGr){if((3&a)==3)return;s.altGr=0}if(n===18||n===17){var f="location"in t?t.location:t.keyLocation;if(n===17&&f===1)s[n]==1&&(o=t.timeStamp);else if(n===18&&a===3&&f===2){var l=t.timeStamp-o;l<50&&(s.altGr=!0)}}}n in r.MODIFIER_KEYS&&(n=-1),a&8&&n>=91&&n<=93&&(n=-1);if(!a&&n===13){var f="location"in t?t.location:t.keyLocation;if(f===3){e(t,a,-n);if(t.defaultPrevented)return}}if(i.isChromeOS&&a&8){e(t,a,n);if(t.defaultPrevented)return;a&=-9}return!!a||n in r.FUNCTION_KEYS||n in r.PRINTABLE_KEYS?e(t,a,n):!1}function f(){s=Object.create(null)}var r=e("./keys"),i=e("./useragent"),s=null,o=0;t.addListener=function(e,t,n){if(e.addEventListener)return e.addEventListener(t,n,!1);if(e.attachEvent){var r=function(){n.call(e,window.event)};n._wrapper=r,e.attachEvent("on"+t,r)}},t.removeListener=function(e,t,n){if(e.removeEventListener)return e.removeEventListener(t,n,!1);e.detachEvent&&e.detachEvent("on"+t,n._wrapper||n)},t.stopEvent=function(e){return t.stopPropagation(e),t.preventDefault(e),!1},t.stopPropagation=function(e){e.stopPropagation?e.stopPropagation():e.cancelBubble=!0},t.preventDefault=function(e){e.preventDefault?e.preventDefault():e.returnValue=!1},t.getButton=function(e){return e.type=="dblclick"?0:e.type=="contextmenu"||i.isMac&&e.ctrlKey&&!e.altKey&&!e.shiftKey?2:e.preventDefault?e.button:{1:0,2:2,4:1}[e.button]},t.capture=function(e,n,r){function i(e){n&&n(e),r&&r(e),t.removeListener(document,"mousemove",n,!0),t.removeListener(document,"mouseup",i,!0),t.removeListener(document,"dragstart",i,!0)}return t.addListener(document,"mousemove",n,!0),t.addListener(document,"mouseup",i,!0),t.addListener(document,"dragstart",i,!0),i},t.addTouchMoveListener=function(e,n){var r,i;t.addListener(e,"touchstart",function(e){var t=e.touches,n=t[0];r=n.clientX,i=n.clientY}),t.addListener(e,"touchmove",function(e){var t=e.touches;if(t.length>1)return;var s=t[0];e.wheelX=r-s.clientX,e.wheelY=i-s.clientY,r=s.clientX,i=s.clientY,n(e)})},t.addMouseWheelListener=function(e,n){"onmousewheel"in e?t.addListener(e,"mousewheel",function(e){var t=8;e.wheelDeltaX!==undefined?(e.wheelX=-e.wheelDeltaX/t,e.wheelY=-e.wheelDeltaY/t):(e.wheelX=0,e.wheelY=-e.wheelDelta/t),n(e)}):"onwheel"in e?t.addListener(e,"wheel",function(e){var t=.35;switch(e.deltaMode){case e.DOM_DELTA_PIXEL:e.wheelX=e.deltaX*t||0,e.wheelY=e.deltaY*t||0;break;case e.DOM_DELTA_LINE:case e.DOM_DELTA_PAGE:e.wheelX=(e.deltaX||0)*5,e.wheelY=(e.deltaY||0)*5}n(e)}):t.addListener(e,"DOMMouseScroll",function(e){e.axis&&e.axis==e.HORIZONTAL_AXIS?(e.wheelX=(e.detail||0)*5,e.wheelY=0):(e.wheelX=0,e.wheelY=(e.detail||0)*5),n(e)})},t.addMultiMouseDownListener=function(e,n,r,s){function c(e){t.getButton(e)!==0?o=0:e.detail>1?(o++,o>4&&(o=1)):o=1;if(i.isIE){var c=Math.abs(e.clientX-u)>5||Math.abs(e.clientY-a)>5;if(!f||c)o=1;f&&clearTimeout(f),f=setTimeout(function(){f=null},n[o-1]||600),o==1&&(u=e.clientX,a=e.clientY)}e._clicks=o,r[s]("mousedown",e);if(o>4)o=0;else if(o>1)return r[s](l[o],e)}function h(e){o=2,f&&clearTimeout(f),f=setTimeout(function(){f=null},n[o-1]||600),r[s]("mousedown",e),r[s](l[o],e)}var o=0,u,a,f,l={2:"dblclick",3:"tripleclick",4:"quadclick"};Array.isArray(e)||(e=[e]),e.forEach(function(e){t.addListener(e,"mousedown",c),i.isOldIE&&t.addListener(e,"dblclick",h)})};var u=!i.isMac||!i.isOpera||"KeyboardEvent"in window?function(e){return 0|(e.ctrlKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.metaKey?8:0)}:function(e){return 0|(e.metaKey?1:0)|(e.altKey?2:0)|(e.shiftKey?4:0)|(e.ctrlKey?8:0)};t.getModifierString=function(e){return r.KEY_MODS[u(e)]},t.addCommandKeyListener=function(e,n){var r=t.addListener;if(i.isOldGecko||i.isOpera&&!("KeyboardEvent"in window)){var o=null;r(e,"keydown",function(e){o=e.keyCode}),r(e,"keypress",function(e){return a(n,e,o)})}else{var u=null;r(e,"keydown",function(e){s[e.keyCode]=(s[e.keyCode]||0)+1;var t=a(n,e,e.keyCode);return u=e.defaultPrevented,t}),r(e,"keypress",function(e){u&&(e.ctrlKey||e.altKey||e.shiftKey||e.metaKey)&&(t.stopEvent(e),u=null)}),r(e,"keyup",function(e){s[e.keyCode]=null}),s||(f(),r(window,"focus",f))}};if(typeof window=="object"&&window.postMessage&&!i.isOldIE){var l=1;t.nextTick=function(e,n){n=n||window;var r="zero-timeout-message-"+l++,i=function(s){s.data==r&&(t.stopPropagation(s),t.removeListener(n,"message",i),e())};t.addListener(n,"message",i),n.postMessage(r,"*")}}t.$idleBlocked=!1,t.onIdle=function(e,n){return setTimeout(function r(){t.$idleBlocked?setTimeout(r,100):e()},n)},t.$idleBlockId=null,t.blockIdle=function(e){t.$idleBlockId&&clearTimeout(t.$idleBlockId),t.$idleBlocked=!0,t.$idleBlockId=setTimeout(function(){t.$idleBlocked=!1},e||100)},t.nextFrame=typeof window=="object"&&(window.requestAnimationFrame||window.mozRequestAnimationFrame||window.webkitRequestAnimationFrame||window.msRequestAnimationFrame||window.oRequestAnimationFrame),t.nextFrame?t.nextFrame=t.nextFrame.bind(window):t.nextFrame=function(e){setTimeout(e,17)}}),ace.define("ace/range",["require","exports","module"],function(e,t,n){"use strict";var r=function(e,t){return e.row-t.row||e.column-t.column},i=function(e,t,n,r){this.start={row:e,column:t},this.end={row:n,column:r}};(function(){this.isEqual=function(e){return this.start.row===e.start.row&&this.end.row===e.end.row&&this.start.column===e.start.column&&this.end.column===e.end.column},this.toString=function(){return"Range: ["+this.start.row+"/"+this.start.column+"] -> ["+this.end.row+"/"+this.end.column+"]"},this.contains=function(e,t){return this.compare(e,t)==0},this.compareRange=function(e){var t,n=e.end,r=e.start;return t=this.compare(n.row,n.column),t==1?(t=this.compare(r.row,r.column),t==1?2:t==0?1:0):t==-1?-2:(t=this.compare(r.row,r.column),t==-1?-1:t==1?42:0)},this.comparePoint=function(e){return this.compare(e.row,e.column)},this.containsRange=function(e){return this.comparePoint(e.start)==0&&this.comparePoint(e.end)==0},this.intersects=function(e){var t=this.compareRange(e);return t==-1||t==0||t==1},this.isEnd=function(e,t){return this.end.row==e&&this.end.column==t},this.isStart=function(e,t){return this.start.row==e&&this.start.column==t},this.setStart=function(e,t){typeof e=="object"?(this.start.column=e.column,this.start.row=e.row):(this.start.row=e,this.start.column=t)},this.setEnd=function(e,t){typeof e=="object"?(this.end.column=e.column,this.end.row=e.row):(this.end.row=e,this.end.column=t)},this.inside=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)||this.isStart(e,t)?!1:!0:!1},this.insideStart=function(e,t){return this.compare(e,t)==0?this.isEnd(e,t)?!1:!0:!1},this.insideEnd=function(e,t){return this.compare(e,t)==0?this.isStart(e,t)?!1:!0:!1},this.compare=function(e,t){return!this.isMultiLine()&&e===this.start.row?t<this.start.column?-1:t>this.end.column?1:0:e<this.start.row?-1:e>this.end.row?1:this.start.row===e?t>=this.start.column?0:-1:this.end.row===e?t<=this.end.column?0:1:0},this.compareStart=function(e,t){return this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.compareEnd=function(e,t){return this.end.row==e&&this.end.column==t?1:this.compare(e,t)},this.compareInside=function(e,t){return this.end.row==e&&this.end.column==t?1:this.start.row==e&&this.start.column==t?-1:this.compare(e,t)},this.clipRows=function(e,t){if(this.end.row>t)var n={row:t+1,column:0};else if(this.end.row<e)var n={row:e,column:0};if(this.start.row>t)var r={row:t+1,column:0};else if(this.start.row<e)var r={row:e,column:0};return i.fromPoints(r||this.start,n||this.end)},this.extend=function(e,t){var n=this.compare(e,t);if(n==0)return this;if(n==-1)var r={row:e,column:t};else var s={row:e,column:t};return i.fromPoints(r||this.start,s||this.end)},this.isEmpty=function(){return this.start.row===this.end.row&&this.start.column===this.end.column},this.isMultiLine=function(){return this.start.row!==this.end.row},this.clone=function(){return i.fromPoints(this.start,this.end)},this.collapseRows=function(){return this.end.column==0?new i(this.start.row,0,Math.max(this.start.row,this.end.row-1),0):new i(this.start.row,0,this.end.row,0)},this.toScreenRange=function(e){var t=e.documentToScreenPosition(this.start),n=e.documentToScreenPosition(this.end);return new i(t.row,t.column,n.row,n.column)},this.moveBy=function(e,t){this.start.row+=e,this.start.column+=t,this.end.row+=e,this.end.column+=t}}).call(i.prototype),i.fromPoints=function(e,t){return new i(e.row,e.column,t.row,t.column)},i.comparePoints=r,i.comparePoints=function(e,t){return e.row-t.row||e.column-t.column},t.Range=i}),ace.define("ace/lib/lang",["require","exports","module"],function(e,t,n){"use strict";t.last=function(e){return e[e.length-1]},t.stringReverse=function(e){return e.split("").reverse().join("")},t.stringRepeat=function(e,t){var n="";while(t>0){t&1&&(n+=e);if(t>>=1)e+=e}return n};var r=/^\s\s*/,i=/\s\s*$/;t.stringTrimLeft=function(e){return e.replace(r,"")},t.stringTrimRight=function(e){return e.replace(i,"")},t.copyObject=function(e){var t={};for(var n in e)t[n]=e[n];return t},t.copyArray=function(e){var t=[];for(var n=0,r=e.length;n<r;n++)e[n]&&typeof e[n]=="object"?t[n]=this.copyObject(e[n]):t[n]=e[n];return t},t.deepCopy=function s(e){if(typeof e!="object"||!e)return e;var t;if(Array.isArray(e)){t=[];for(var n=0;n<e.length;n++)t[n]=s(e[n]);return t}if(Object.prototype.toString.call(e)!=="[object Object]")return e;t={};for(var n in e)t[n]=s(e[n]);return t},t.arrayToMap=function(e){var t={};for(var n=0;n<e.length;n++)t[e[n]]=1;return t},t.createMap=function(e){var t=Object.create(null);for(var n in e)t[n]=e[n];return t},t.arrayRemove=function(e,t){for(var n=0;n<=e.length;n++)t===e[n]&&e.splice(n,1)},t.escapeRegExp=function(e){return e.replace(/([.*+?^${}()|[\]\/\\])/g,"\\$1")},t.escapeHTML=function(e){return(""+e).replace(/&/g,"&#38;").replace(/"/g,"&#34;").replace(/'/g,"&#39;").replace(/</g,"&#60;")},t.getMatchOffsets=function(e,t){var n=[];return e.replace(t,function(e){n.push({offset:arguments[arguments.length-2],length:e.length})}),n},t.deferredCall=function(e){var t=null,n=function(){t=null,e()},r=function(e){return r.cancel(),t=setTimeout(n,e||0),r};return r.schedule=r,r.call=function(){return this.cancel(),e(),r},r.cancel=function(){return clearTimeout(t),t=null,r},r.isPending=function(){return t},r},t.delayedCall=function(e,t){var n=null,r=function(){n=null,e()},i=function(e){n==null&&(n=setTimeout(r,e||t))};return i.delay=function(e){n&&clearTimeout(n),n=setTimeout(r,e||t)},i.schedule=i,i.call=function(){this.cancel(),e()},i.cancel=function(){n&&clearTimeout(n),n=null},i.isPending=function(){return n},i}}),ace.define("ace/keyboard/textinput",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/dom","ace/lib/lang","ace/lib/keys"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=e("../lib/dom"),o=e("../lib/lang"),u=i.isChrome<18,a=i.isIE,f=i.isChrome>63,l=400,c=e("../lib/keys"),h=c.KEY_MODS,p=i.isIOS,d=p?/\s/:/\n/,v=function(e,t){function W(){x=!0,n.blur(),n.focus(),x=!1}function V(e){e.keyCode==27&&n.value.length<n.selectionStart&&(g||(T=n.value),N=C=-1,A()),X()}function J(){clearTimeout($),$=setTimeout(function(){b&&(n.style.cssText=b,b=""),t.renderer.$keepTextAreaAtCursor==null&&(t.renderer.$keepTextAreaAtCursor=!0,t.renderer.$moveTextAreaToCursor())},0)}function Q(e,t,n){var r=null,i=!1;n.addEventListener("keydown",function(e){r&&clearTimeout(r),i=!0},!0),n.addEventListener("keyup",function(e){r=setTimeout(function(){i=!1},100)},!0);var s=function(e){if(document.activeElement!==n)return;if(i||g)return;if(v)return;var r=n.selectionStart,s=n.selectionEnd,o=null,u=0;console.log(r,s);if(r==0)o=c.up;else if(r==1)o=c.home;else if(s>C&&T[s]=="\n")o=c.end;else if(r<N&&T[r-1]==" ")o=c.left,u=h.option;else if(r<N||r==N&&C!=N&&r==s)o=c.left;else if(s>C&&T.slice(0,s).split("\n").length>2)o=c.down;else if(s>C&&T[s-1]==" ")o=c.right,u=h.option;else if(s>C||s==C&&C!=N&&r==s)o=c.right;r!==s&&(u|=h.shift),o&&(t.onCommandKey(null,u,o),N=r,C=s,A(""))};document.addEventListener("selectionchange",s),t.on("destroy",function(){document.removeEventListener("selectionchange",s)})}var n=s.createElement("textarea");n.className="ace_text-input",n.setAttribute("wrap","off"),n.setAttribute("autocorrect","off"),n.setAttribute("autocapitalize","off"),n.setAttribute("spellcheck",!1),n.style.opacity="0",e.insertBefore(n,e.firstChild);var v=!1,m=!1,g=!1,y=!1,b="",w=!0,E=!1;i.isMobile||(n.style.fontSize="1px");var S=!1,x=!1,T="",N=0,C=0;try{var k=document.activeElement===n}catch(L){}r.addListener(n,"blur",function(e){if(x)return;t.onBlur(e),k=!1}),r.addListener(n,"focus",function(e){if(x)return;k=!0;if(i.isEdge)try{if(!document.hasFocus())return}catch(e){}t.onFocus(e),i.isEdge?setTimeout(A):A()}),this.$focusScroll=!1,this.focus=function(){if(b||f||this.$focusScroll=="browser")return n.focus({preventScroll:!0});var e=n.style.top;n.style.position="fixed",n.style.top="0px";try{var t=n.getBoundingClientRect().top!=0}catch(r){return}var i=[];if(t){var s=n.parentElement;while(s&&s.nodeType==1)i.push(s),s.setAttribute("ace_nocontext",!0),!s.parentElement&&s.getRootNode?s=s.getRootNode().host:s=s.parentElement}n.focus({preventScroll:!0}),t&&i.forEach(function(e){e.removeAttribute("ace_nocontext")}),setTimeout(function(){n.style.position="",n.style.top=="0px"&&(n.style.top=e)},0)},this.blur=function(){n.blur()},this.isFocused=function(){return k},t.on("beforeEndOperation",function(){if(t.curOp&&t.curOp.command.name=="insertstring")return;g&&(T=n.value="",z()),A()});var A=p?function(e){if(!k||v&&!e)return;e||(e="");var r="\n ab"+e+"cde fg\n";r!=n.value&&(n.value=T=r);var i=4,s=4+(e.length||(t.selection.isEmpty()?0:1));(N!=i||C!=s)&&n.setSelectionRange(i,s),N=i,C=s}:function(){if(g||y)return;if(!k&&!D)return;g=!0;var e=t.selection,r=e.getRange(),i=e.cursor.row,s=r.start.column,o=r.end.column,u=t.session.getLine(i);if(r.start.row!=i){var a=t.session.getLine(i-1);s=r.start.row<i-1?0:s,o+=a.length+1,u=a+"\n"+u}else if(r.end.row!=i){var f=t.session.getLine(i+1);o=r.end.row>i+1?f.length:o,o+=u.length+1,u=u+"\n"+f}u.length>l&&(s<l&&o<l?u=u.slice(0,l):(u="\n",s=0,o=1));var c=u+"\n\n";c!=T&&(n.value=T=c,N=C=c.length),D&&(N=n.selectionStart,C=n.selectionEnd);if(C!=o||N!=s||n.selectionEnd!=C)try{n.setSelectionRange(s,o),N=s,C=o}catch(h){}g=!1};k&&t.onFocus();var O=function(e){return e.selectionStart===0&&e.selectionEnd>=T.length&&e.value===T&&T&&e.selectionEnd!==C},M=function(e){if(g)return;v?v=!1:O(n)&&(t.selectAll(),A())},_=null;this.setInputHandler=function(e){_=e},this.getInputHandler=function(){return _};var D=!1,P=function(e,r){D&&(D=!1);if(m)return A(),e&&t.onPaste(e),m=!1,"";var i=n.selectionStart,s=n.selectionEnd,o=N,u=T.length-C,a=e,f=e.length-i,l=e.length-s,c=0;while(o>0&&T[c]==e[c])c++,o--;a=a.slice(c),c=1;while(u>0&&T.length-c>N-1&&T[T.length-c]==e[e.length-c])c++,u--;return f-=c-1,l-=c-1,a=a.slice(0,a.length-c+1),!r&&f==a.length&&!o&&!u&&!l?"":(y=!0,a&&!o&&!u&&!f&&!l||S?t.onTextInput(a):t.onTextInput(a,{extendLeft:o,extendRight:u,restoreStart:f,restoreEnd:l}),y=!1,T=e,N=i,C=s,a)},H=function(e){if(g)return U();var t=n.value,r=P(t,!0);(t.length>l+100||d.test(r))&&A()},B=function(e,t,n){var r=e.clipboardData||window.clipboardData;if(!r||u)return;var i=a||n?"Text":"text/plain";try{return t?r.setData(i,t)!==!1:r.getData(i)}catch(e){if(!n)return B(e,t,!0)}},j=function(e,i){var s=t.getCopyText();if(!s)return r.preventDefault(e);B(e,s)?(p&&(A(s),v=s,setTimeout(function(){v=!1},10)),i?t.onCut():t.onCopy(),r.preventDefault(e)):(v=!0,n.value=s,n.select(),setTimeout(function(){v=!1,A(),i?t.onCut():t.onCopy()}))},F=function(e){j(e,!0)},I=function(e){j(e,!1)},q=function(e){var s=B(e);typeof s=="string"?(s&&t.onPaste(s,e),i.isIE&&setTimeout(A),r.preventDefault(e)):(n.value="",m=!0)};r.addCommandKeyListener(n,t.onCommandKey.bind(t)),r.addListener(n,"select",M),r.addListener(n,"input",H),r.addListener(n,"cut",F),r.addListener(n,"copy",I),r.addListener(n,"paste",q),(!("oncut"in n)||!("oncopy"in n)||!("onpaste"in n))&&r.addListener(e,"keydown",function(e){if(i.isMac&&!e.metaKey||!e.ctrlKey)return;switch(e.keyCode){case 67:I(e);break;case 86:q(e);break;case 88:F(e)}});var R=function(e){if(g||!t.onCompositionStart||t.$readOnly)return;g={};if(S)return;setTimeout(U,0),t.on("mousedown",W);var r=t.getSelectionRange();r.end.row=r.start.row,r.end.column=r.start.column,g.markerRange=r,g.selectionStart=N,t.onCompositionStart(g),g.useTextareaForIME?(n.value="",T="",N=0,C=0):(n.msGetInputContext&&(g.context=n.msGetInputContext()),n.getInputContext&&(g.context=n.getInputContext()))},U=function(){if(!g||!t.onCompositionUpdate||t.$readOnly)return;if(S)return W();if(g.useTextareaForIME)t.onCompositionUpdate(n.value);else{var e=n.value;P(e),g.markerRange&&(g.context&&(g.markerRange.start.column=g.selectionStart=g.context.compositionStartOffset),g.markerRange.end.column=g.markerRange.start.column+C-g.selectionStart)}},z=function(e){if(!t.onCompositionEnd||t.$readOnly)return;g=!1,t.onCompositionEnd(),t.off("mousedown",W),e&&H()},X=o.delayedCall(U,50).schedule.bind(null,null);r.addListener(n,"compositionstart",R),r.addListener(n,"compositionupdate",U),r.addListener(n,"keyup",V),r.addListener(n,"keydown",X),r.addListener(n,"compositionend",z),this.getElement=function(){return n},this.setCommandMode=function(e){S=e,n.readOnly=!1},this.setReadOnly=function(e){S||(n.readOnly=e)},this.setCopyWithEmptySelection=function(e){E=e},this.onContextMenu=function(e){D=!0,A(),t._emit("nativecontextmenu",{target:t,domEvent:e}),this.moveToMouse(e,!0)},this.moveToMouse=function(e,o){b||(b=n.style.cssText),n.style.cssText=(o?"z-index:100000;":"")+(i.isIE?"opacity:0.1;":"")+"text-indent: -"+(N+C)*t.renderer.characterWidth*.5+"px;";var u=t.container.getBoundingClientRect(),a=s.computedStyle(t.container),f=u.top+(parseInt(a.borderTopWidth)||0),l=u.left+(parseInt(u.borderLeftWidth)||0),c=u.bottom-f-n.clientHeight-2,h=function(e){n.style.left=e.clientX-l-2+"px",n.style.top=Math.min(e.clientY-f-2,c)+"px"};h(e);if(e.type!="mousedown")return;t.renderer.$keepTextAreaAtCursor&&(t.renderer.$keepTextAreaAtCursor=null),clearTimeout($),i.isWin&&r.capture(t.container,h,J)},this.onContextMenuClose=J;var $,K=function(e){t.textInput.onContextMenu(e),J()};r.addListener(n,"mouseup",K),r.addListener(n,"mousedown",function(e){e.preventDefault(),J()}),r.addListener(t.renderer.scroller,"contextmenu",K),r.addListener(n,"contextmenu",K),p&&Q(e,t,n)};t.TextInput=v}),ace.define("ace/mouse/default_handlers",["require","exports","module","ace/lib/useragent"],function(e,t,n){"use strict";function o(e){e.$clickSelection=null;var t=e.editor;t.setDefaultHandler("mousedown",this.onMouseDown.bind(e)),t.setDefaultHandler("dblclick",this.onDoubleClick.bind(e)),t.setDefaultHandler("tripleclick",this.onTripleClick.bind(e)),t.setDefaultHandler("quadclick",this.onQuadClick.bind(e)),t.setDefaultHandler("mousewheel",this.onMouseWheel.bind(e)),t.setDefaultHandler("touchmove",this.onTouchMove.bind(e));var n=["select","startSelect","selectEnd","selectAllEnd","selectByWordsEnd","selectByLinesEnd","dragWait","dragWaitEnd","focusWait"];n.forEach(function(t){e[t]=this[t]},this),e.selectByLines=this.extendSelectionBy.bind(e,"getLineRange"),e.selectByWords=this.extendSelectionBy.bind(e,"getWordRange")}function u(e,t,n,r){return Math.sqrt(Math.pow(n-e,2)+Math.pow(r-t,2))}function a(e,t){if(e.start.row==e.end.row)var n=2*t.column-e.start.column-e.end.column;else if(e.start.row==e.end.row-1&&!e.start.column&&!e.end.column)var n=t.column-4;else var n=2*t.row-e.start.row-e.end.row;return n<0?{cursor:e.start,anchor:e.end}:{cursor:e.end,anchor:e.start}}var r=e("../lib/useragent"),i=0,s=550;(function(){this.onMouseDown=function(e){var t=e.inSelection(),n=e.getDocumentPosition();this.mousedownEvent=e;var i=this.editor,s=e.getButton();if(s!==0){var o=i.getSelectionRange(),u=o.isEmpty();(u||s==1)&&i.selection.moveToPosition(n),s==2&&(i.textInput.onContextMenu(e.domEvent),r.isMozilla||e.preventDefault());return}this.mousedownEvent.time=Date.now();if(t&&!i.isFocused()){i.focus();if(this.$focusTimeout&&!this.$clickSelection&&!i.inMultiSelectMode){this.setState("focusWait"),this.captureMouse(e);return}}return this.captureMouse(e),this.startSelect(n,e.domEvent._clicks>1),e.preventDefault()},this.startSelect=function(e,t){e=e||this.editor.renderer.screenToTextCoordinates(this.x,this.y);var n=this.editor;if(!this.mousedownEvent)return;this.mousedownEvent.getShiftKey()?n.selection.selectToPosition(e):t||n.selection.moveToPosition(e),t||this.select(),n.renderer.scroller.setCapture&&n.renderer.scroller.setCapture(),n.setStyle("ace_selecting"),this.setState("select")},this.select=function(){var e,t=this.editor,n=t.renderer.screenToTextCoordinates(this.x,this.y);if(this.$clickSelection){var r=this.$clickSelection.comparePoint(n);if(r==-1)e=this.$clickSelection.end;else if(r==1)e=this.$clickSelection.start;else{var i=a(this.$clickSelection,n);n=i.cursor,e=i.anchor}t.selection.setSelectionAnchor(e.row,e.column)}t.selection.selectToPosition(n),t.renderer.scrollCursorIntoView()},this.extendSelectionBy=function(e){var t,n=this.editor,r=n.renderer.screenToTextCoordinates(this.x,this.y),i=n.selection[e](r.row,r.column);if(this.$clickSelection){var s=this.$clickSelection.comparePoint(i.start),o=this.$clickSelection.comparePoint(i.end);if(s==-1&&o<=0){t=this.$clickSelection.end;if(i.end.row!=r.row||i.end.column!=r.column)r=i.start}else if(o==1&&s>=0){t=this.$clickSelection.start;if(i.start.row!=r.row||i.start.column!=r.column)r=i.end}else if(s==-1&&o==1)r=i.end,t=i.start;else{var u=a(this.$clickSelection,r);r=u.cursor,t=u.anchor}n.selection.setSelectionAnchor(t.row,t.column)}n.selection.selectToPosition(r),n.renderer.scrollCursorIntoView()},this.selectEnd=this.selectAllEnd=this.selectByWordsEnd=this.selectByLinesEnd=function(){this.$clickSelection=null,this.editor.unsetStyle("ace_selecting"),this.editor.renderer.scroller.releaseCapture&&this.editor.renderer.scroller.releaseCapture()},this.focusWait=function(){var e=u(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y),t=Date.now();(e>i||t-this.mousedownEvent.time>this.$focusTimeout)&&this.startSelect(this.mousedownEvent.getDocumentPosition())},this.onDoubleClick=function(e){var t=e.getDocumentPosition(),n=this.editor,r=n.session,i=r.getBracketRange(t);i?(i.isEmpty()&&(i.start.column--,i.end.column++),this.setState("select")):(i=n.selection.getWordRange(t.row,t.column),this.setState("selectByWords")),this.$clickSelection=i,this.select()},this.onTripleClick=function(e){var t=e.getDocumentPosition(),n=this.editor;this.setState("selectByLines");var r=n.getSelectionRange();r.isMultiLine()&&r.contains(t.row,t.column)?(this.$clickSelection=n.selection.getLineRange(r.start.row),this.$clickSelection.end=n.selection.getLineRange(r.end.row).end):this.$clickSelection=n.selection.getLineRange(t.row),this.select()},this.onQuadClick=function(e){var t=this.editor;t.selectAll(),this.$clickSelection=t.getSelectionRange(),this.setState("selectAll")},this.onMouseWheel=function(e){if(e.getAccelKey())return;e.getShiftKey()&&e.wheelY&&!e.wheelX&&(e.wheelX=e.wheelY,e.wheelY=0);var t=this.editor;this.$lastScroll||(this.$lastScroll={t:0,vx:0,vy:0,allowed:0});var n=this.$lastScroll,r=e.domEvent.timeStamp,i=r-n.t,o=i?e.wheelX/i:n.vx,u=i?e.wheelY/i:n.vy;i<s&&(o=(o+n.vx)/2,u=(u+n.vy)/2);var a=Math.abs(o/u),f=!1;a>=1&&t.renderer.isScrollableBy(e.wheelX*e.speed,0)&&(f=!0),a<=1&&t.renderer.isScrollableBy(0,e.wheelY*e.speed)&&(f=!0);if(f)n.allowed=r;else if(r-n.allowed<s){var l=Math.abs(o)<=1.5*Math.abs(n.vx)&&Math.abs(u)<=1.5*Math.abs(n.vy);l?(f=!0,n.allowed=r):n.allowed=0}n.t=r,n.vx=o,n.vy=u;if(f)return t.renderer.scrollBy(e.wheelX*e.speed,e.wheelY*e.speed),e.stop()},this.onTouchMove=function(e){this.editor._emit("mousewheel",e)}}).call(o.prototype),t.DefaultHandlers=o}),ace.define("ace/tooltip",["require","exports","module","ace/lib/oop","ace/lib/dom"],function(e,t,n){"use strict";function s(e){this.isOpen=!1,this.$element=null,this.$parentNode=e}var r=e("./lib/oop"),i=e("./lib/dom");(function(){this.$init=function(){return this.$element=i.createElement("div"),this.$element.className="ace_tooltip",this.$element.style.display="none",this.$parentNode.appendChild(this.$element),this.$element},this.getElement=function(){return this.$element||this.$init()},this.setText=function(e){this.getElement().textContent=e},this.setHtml=function(e){this.getElement().innerHTML=e},this.setPosition=function(e,t){this.getElement().style.left=e+"px",this.getElement().style.top=t+"px"},this.setClassName=function(e){i.addCssClass(this.getElement(),e)},this.show=function(e,t,n){e!=null&&this.setText(e),t!=null&&n!=null&&this.setPosition(t,n),this.isOpen||(this.getElement().style.display="block",this.isOpen=!0)},this.hide=function(){this.isOpen&&(this.getElement().style.display="none",this.isOpen=!1)},this.getHeight=function(){return this.getElement().offsetHeight},this.getWidth=function(){return this.getElement().offsetWidth},this.destroy=function(){this.isOpen=!1,this.$element&&this.$element.parentNode&&this.$element.parentNode.removeChild(this.$element)}}).call(s.prototype),t.Tooltip=s}),ace.define("ace/mouse/default_gutter_handler",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event","ace/tooltip"],function(e,t,n){"use strict";function u(e){function l(){var r=u.getDocumentPosition().row,s=n.$annotations[r];if(!s)return c();var o=t.session.getLength();if(r==o){var a=t.renderer.pixelToScreenCoordinates(0,u.y).row,l=u.$pos;if(a>t.session.documentToScreenRow(l.row,l.column))return c()}if(f==s)return;f=s.text.join("<br/>"),i.setHtml(f),i.show(),t._signal("showGutterTooltip",i),t.on("mousewheel",c);if(e.$tooltipFollowsMouse)h(u);else{var p=u.domEvent.target,d=p.getBoundingClientRect(),v=i.getElement().style;v.left=d.right+"px",v.top=d.bottom+"px"}}function c(){o&&(o=clearTimeout(o)),f&&(i.hide(),f=null,t._signal("hideGutterTooltip",i),t.removeEventListener("mousewheel",c))}function h(e){i.setPosition(e.x,e.y)}var t=e.editor,n=t.renderer.$gutterLayer,i=new a(t.container);e.editor.setDefaultHandler("guttermousedown",function(r){if(!t.isFocused()||r.getButton()!=0)return;var i=n.getRegion(r);if(i=="foldWidgets")return;var s=r.getDocumentPosition().row,o=t.session.selection;if(r.getShiftKey())o.selectTo(s,0);else{if(r.domEvent.detail==2)return t.selectAll(),r.preventDefault();e.$clickSelection=t.selection.getLineRange(s)}return e.setState("selectByLines"),e.captureMouse(r),r.preventDefault()});var o,u,f;e.editor.setDefaultHandler("guttermousemove",function(t){var n=t.domEvent.target||t.domEvent.srcElement;if(r.hasCssClass(n,"ace_fold-widget"))return c();f&&e.$tooltipFollowsMouse&&h(t),u=t;if(o)return;o=setTimeout(function(){o=null,u&&!e.isMousePressed?l():c()},50)}),s.addListener(t.renderer.$gutter,"mouseout",function(e){u=null;if(!f||o)return;o=setTimeout(function(){o=null,c()},50)}),t.on("changeSession",c)}function a(e){o.call(this,e)}var r=e("../lib/dom"),i=e("../lib/oop"),s=e("../lib/event"),o=e("../tooltip").Tooltip;i.inherits(a,o),function(){this.setPosition=function(e,t){var n=window.innerWidth||document.documentElement.clientWidth,r=window.innerHeight||document.documentElement.clientHeight,i=this.getWidth(),s=this.getHeight();e+=15,t+=15,e+i>n&&(e-=e+i-n),t+s>r&&(t-=20+s),o.prototype.setPosition.call(this,e,t)}}.call(a.prototype),t.GutterHandler=u}),ace.define("ace/mouse/mouse_event",["require","exports","module","ace/lib/event","ace/lib/useragent"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=t.MouseEvent=function(e,t){this.domEvent=e,this.editor=t,this.x=this.clientX=e.clientX,this.y=this.clientY=e.clientY,this.$pos=null,this.$inSelection=null,this.propagationStopped=!1,this.defaultPrevented=!1};(function(){this.stopPropagation=function(){r.stopPropagation(this.domEvent),this.propagationStopped=!0},this.preventDefault=function(){r.preventDefault(this.domEvent),this.defaultPrevented=!0},this.stop=function(){this.stopPropagation(),this.preventDefault()},this.getDocumentPosition=function(){return this.$pos?this.$pos:(this.$pos=this.editor.renderer.screenToTextCoordinates(this.clientX,this.clientY),this.$pos)},this.inSelection=function(){if(this.$inSelection!==null)return this.$inSelection;var e=this.editor,t=e.getSelectionRange();if(t.isEmpty())this.$inSelection=!1;else{var n=this.getDocumentPosition();this.$inSelection=t.contains(n.row,n.column)}return this.$inSelection},this.getButton=function(){return r.getButton(this.domEvent)},this.getShiftKey=function(){return this.domEvent.shiftKey},this.getAccelKey=i.isMac?function(){return this.domEvent.metaKey}:function(){return this.domEvent.ctrlKey}}).call(s.prototype)}),ace.define("ace/mouse/dragdrop_handler",["require","exports","module","ace/lib/dom","ace/lib/event","ace/lib/useragent"],function(e,t,n){"use strict";function f(e){function T(e,n){var r=Date.now(),i=!n||e.row!=n.row,s=!n||e.column!=n.column;if(!S||i||s)t.moveCursorToPosition(e),S=r,x={x:p,y:d};else{var o=l(x.x,x.y,p,d);o>a?S=null:r-S>=u&&(t.renderer.scrollCursorIntoView(),S=null)}}function N(e,n){var r=Date.now(),i=t.renderer.layerConfig.lineHeight,s=t.renderer.layerConfig.characterWidth,u=t.renderer.scroller.getBoundingClientRect(),a={x:{left:p-u.left,right:u.right-p},y:{top:d-u.top,bottom:u.bottom-d}},f=Math.min(a.x.left,a.x.right),l=Math.min(a.y.top,a.y.bottom),c={row:e.row,column:e.column};f/s<=2&&(c.column+=a.x.left<a.x.right?-3:2),l/i<=1&&(c.row+=a.y.top<a.y.bottom?-1:1);var h=e.row!=c.row,v=e.column!=c.column,m=!n||e.row!=n.row;h||v&&!m?E?r-E>=o&&t.renderer.scrollCursorIntoView(c):E=r:E=null}function C(){var e=g;g=t.renderer.screenToTextCoordinates(p,d),T(g,e),N(g,e)}function k(){m=t.selection.toOrientedRange(),h=t.session.addMarker(m,"ace_selection",t.getSelectionStyle()),t.clearSelection(),t.isFocused()&&t.renderer.$cursorLayer.setBlinking(!1),clearInterval(v),C(),v=setInterval(C,20),y=0,i.addListener(document,"mousemove",O)}function L(){clearInterval(v),t.session.removeMarker(h),h=null,t.selection.fromOrientedRange(m),t.isFocused()&&!w&&t.renderer.$cursorLayer.setBlinking(!t.getReadOnly()),m=null,g=null,y=0,E=null,S=null,i.removeListener(document,"mousemove",O)}function O(){A==null&&(A=setTimeout(function(){A!=null&&h&&L()},20))}function M(e){var t=e.types;return!t||Array.prototype.some.call(t,function(e){return e=="text/plain"||e=="Text"})}function _(e){var t=["copy","copymove","all","uninitialized"],n=["move","copymove","linkmove","all","uninitialized"],r=s.isMac?e.altKey:e.ctrlKey,i="uninitialized";try{i=e.dataTransfer.effectAllowed.toLowerCase()}catch(e){}var o="none";return r&&t.indexOf(i)>=0?o="copy":n.indexOf(i)>=0?o="move":t.indexOf(i)>=0&&(o="copy"),o}var t=e.editor,n=r.createElement("img");n.src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==",s.isOpera&&(n.style.cssText="width:1px;height:1px;position:fixed;top:0;left:0;z-index:2147483647;opacity:0;");var f=["dragWait","dragWaitEnd","startDrag","dragReadyEnd","onMouseDrag"];f.forEach(function(t){e[t]=this[t]},this),t.addEventListener("mousedown",this.onMouseDown.bind(e));var c=t.container,h,p,d,v,m,g,y=0,b,w,E,S,x;this.onDragStart=function(e){if(this.cancelDrag||!c.draggable){var r=this;return setTimeout(function(){r.startSelect(),r.captureMouse(e)},0),e.preventDefault()}m=t.getSelectionRange();var i=e.dataTransfer;i.effectAllowed=t.getReadOnly()?"copy":"copyMove",s.isOpera&&(t.container.appendChild(n),n.scrollTop=0),i.setDragImage&&i.setDragImage(n,0,0),s.isOpera&&t.container.removeChild(n),i.clearData(),i.setData("Text",t.session.getTextRange()),w=!0,this.setState("drag")},this.onDragEnd=function(e){c.draggable=!1,w=!1,this.setState(null);if(!t.getReadOnly()){var n=e.dataTransfer.dropEffect;!b&&n=="move"&&t.session.remove(t.getSelectionRange()),t.renderer.$cursorLayer.setBlinking(!0)}this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle("")},this.onDragEnter=function(e){if(t.getReadOnly()||!M(e.dataTransfer))return;return p=e.clientX,d=e.clientY,h||k(),y++,e.dataTransfer.dropEffect=b=_(e),i.preventDefault(e)},this.onDragOver=function(e){if(t.getReadOnly()||!M(e.dataTransfer))return;return p=e.clientX,d=e.clientY,h||(k(),y++),A!==null&&(A=null),e.dataTransfer.dropEffect=b=_(e),i.preventDefault(e)},this.onDragLeave=function(e){y--;if(y<=0&&h)return L(),b=null,i.preventDefault(e)},this.onDrop=function(e){if(!g)return;var n=e.dataTransfer;if(w)switch(b){case"move":m.contains(g.row,g.column)?m={start:g,end:g}:m=t.moveText(m,g);break;case"copy":m=t.moveText(m,g,!0)}else{var r=n.getData("Text");m={start:g,end:t.session.insert(g,r)},t.focus(),b=null}return L(),i.preventDefault(e)},i.addListener(c,"dragstart",this.onDragStart.bind(e)),i.addListener(c,"dragend",this.onDragEnd.bind(e)),i.addListener(c,"dragenter",this.onDragEnter.bind(e)),i.addListener(c,"dragover",this.onDragOver.bind(e)),i.addListener(c,"dragleave",this.onDragLeave.bind(e)),i.addListener(c,"drop",this.onDrop.bind(e));var A=null}function l(e,t,n,r){return Math.sqrt(Math.pow(n-e,2)+Math.pow(r-t,2))}var r=e("../lib/dom"),i=e("../lib/event"),s=e("../lib/useragent"),o=200,u=200,a=5;(function(){this.dragWait=function(){var e=Date.now()-this.mousedownEvent.time;e>this.editor.getDragDelay()&&this.startDrag()},this.dragWaitEnd=function(){var e=this.editor.container;e.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition()),this.selectEnd()},this.dragReadyEnd=function(e){this.editor.renderer.$cursorLayer.setBlinking(!this.editor.getReadOnly()),this.editor.unsetStyle("ace_dragging"),this.editor.renderer.setCursorStyle(""),this.dragWaitEnd()},this.startDrag=function(){this.cancelDrag=!1;var e=this.editor,t=e.container;t.draggable=!0,e.renderer.$cursorLayer.setBlinking(!1),e.setStyle("ace_dragging");var n=s.isWin?"default":"move";e.renderer.setCursorStyle(n),this.setState("dragReady")},this.onMouseDrag=function(e){var t=this.editor.container;if(s.isIE&&this.state=="dragReady"){var n=l(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y);n>3&&t.dragDrop()}if(this.state==="dragWait"){var n=l(this.mousedownEvent.x,this.mousedownEvent.y,this.x,this.y);n>0&&(t.draggable=!1,this.startSelect(this.mousedownEvent.getDocumentPosition()))}},this.onMouseDown=function(e){if(!this.$dragEnabled)return;this.mousedownEvent=e;var t=this.editor,n=e.inSelection(),r=e.getButton(),i=e.domEvent.detail||1;if(i===1&&r===0&&n){if(e.editor.inMultiSelectMode&&(e.getAccelKey()||e.getShiftKey()))return;this.mousedownEvent.time=Date.now();var o=e.domEvent.target||e.domEvent.srcElement;"unselectable"in o&&(o.unselectable="on");if(t.getDragDelay()){if(s.isWebKit){this.cancelDrag=!0;var u=t.container;u.draggable=!0}this.setState("dragWait")}else this.startDrag();this.captureMouse(e,this.onMouseDrag.bind(this)),e.defaultPrevented=!0}}}).call(f.prototype),t.DragdropHandler=f}),ace.define("ace/lib/net",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("./dom");t.get=function(e,t){var n=new XMLHttpRequest;n.open("GET",e,!0),n.onreadystatechange=function(){n.readyState===4&&t(n.responseText)},n.send(null)},t.loadScript=function(e,t){var n=r.getDocumentHead(),i=document.createElement("script");i.src=e,n.appendChild(i),i.onload=i.onreadystatechange=function(e,n){if(n||!i.readyState||i.readyState=="loaded"||i.readyState=="complete")i=i.onload=i.onreadystatechange=null,n||t()}},t.qualifyURL=function(e){var t=document.createElement("a");return t.href=e,t.href}}),ace.define("ace/lib/event_emitter",["require","exports","module"],function(e,t,n){"use strict";var r={},i=function(){this.propagationStopped=!0},s=function(){this.defaultPrevented=!0};r._emit=r._dispatchEvent=function(e,t){this._eventRegistry||(this._eventRegistry={}),this._defaultHandlers||(this._defaultHandlers={});var n=this._eventRegistry[e]||[],r=this._defaultHandlers[e];if(!n.length&&!r)return;if(typeof t!="object"||!t)t={};t.type||(t.type=e),t.stopPropagation||(t.stopPropagation=i),t.preventDefault||(t.preventDefault=s),n=n.slice();for(var o=0;o<n.length;o++){n[o](t,this);if(t.propagationStopped)break}if(r&&!t.defaultPrevented)return r(t,this)},r._signal=function(e,t){var n=(this._eventRegistry||{})[e];if(!n)return;n=n.slice();for(var r=0;r<n.length;r++)n[r](t,this)},r.once=function(e,t){var n=this;this.addEventListener(e,function r(){n.removeEventListener(e,r),t.apply(null,arguments)});if(!t)return new Promise(function(e){t=e})},r.setDefaultHandler=function(e,t){var n=this._defaultHandlers;n||(n=this._defaultHandlers={_disabled_:{}});if(n[e]){var r=n[e],i=n._disabled_[e];i||(n._disabled_[e]=i=[]),i.push(r);var s=i.indexOf(t);s!=-1&&i.splice(s,1)}n[e]=t},r.removeDefaultHandler=function(e,t){var n=this._defaultHandlers;if(!n)return;var r=n._disabled_[e];if(n[e]==t)r&&this.setDefaultHandler(e,r.pop());else if(r){var i=r.indexOf(t);i!=-1&&r.splice(i,1)}},r.on=r.addEventListener=function(e,t,n){this._eventRegistry=this._eventRegistry||{};var r=this._eventRegistry[e];return r||(r=this._eventRegistry[e]=[]),r.indexOf(t)==-1&&r[n?"unshift":"push"](t),t},r.off=r.removeListener=r.removeEventListener=function(e,t){this._eventRegistry=this._eventRegistry||{};var n=this._eventRegistry[e];if(!n)return;var r=n.indexOf(t);r!==-1&&n.splice(r,1)},r.removeAllListeners=function(e){this._eventRegistry&&(this._eventRegistry[e]=[])},t.EventEmitter=r}),ace.define("ace/lib/app_config",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"no use strict";function o(e){typeof console!="undefined"&&console.warn&&console.warn.apply(console,arguments)}function u(e,t){var n=new Error(e);n.data=t,typeof console=="object"&&console.error&&console.error(n),setTimeout(function(){throw n})}var r=e("./oop"),i=e("./event_emitter").EventEmitter,s={setOptions:function(e){Object.keys(e).forEach(function(t){this.setOption(t,e[t])},this)},getOptions:function(e){var t={};if(!e){var n=this.$options;e=Object.keys(n).filter(function(e){return!n[e].hidden})}else Array.isArray(e)||(t=e,e=Object.keys(t));return e.forEach(function(e){t[e]=this.getOption(e)},this),t},setOption:function(e,t){if(this["$"+e]===t)return;var n=this.$options[e];if(!n)return o('misspelled option "'+e+'"');if(n.forwardTo)return this[n.forwardTo]&&this[n.forwardTo].setOption(e,t);n.handlesSet||(this["$"+e]=t),n&&n.set&&n.set.call(this,t)},getOption:function(e){var t=this.$options[e];return t?t.forwardTo?this[t.forwardTo]&&this[t.forwardTo].getOption(e):t&&t.get?t.get.call(this):this["$"+e]:o('misspelled option "'+e+'"')}},a=function(){this.$defaultOptions={}};(function(){r.implement(this,i),this.defineOptions=function(e,t,n){return e.$options||(this.$defaultOptions[t]=e.$options={}),Object.keys(n).forEach(function(t){var r=n[t];typeof r=="string"&&(r={forwardTo:r}),r.name||(r.name=t),e.$options[r.name]=r,"initialValue"in r&&(e["$"+r.name]=r.initialValue)}),r.implement(e,s),this},this.resetOptions=function(e){Object.keys(e.$options).forEach(function(t){var n=e.$options[t];"value"in n&&e.setOption(t,n.value)})},this.setDefaultValue=function(e,t,n){var r=this.$defaultOptions[e]||(this.$defaultOptions[e]={});r[t]&&(r.forwardTo?this.setDefaultValue(r.forwardTo,t,n):r[t].value=n)},this.setDefaultValues=function(e,t){Object.keys(t).forEach(function(n){this.setDefaultValue(e,n,t[n])},this)},this.warn=o,this.reportError=u}).call(a.prototype),t.AppConfig=a}),ace.define("ace/config",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/lib/net","ace/lib/app_config"],function(e,t,n){"no use strict";function l(r){if(!u||!u.document)return;a.packaged=r||e.packaged||n.packaged||u.define&&define.packaged;var i={},s="",o=document.currentScript||document._currentScript,f=o&&o.ownerDocument||document,l=f.getElementsByTagName("script");for(var h=0;h<l.length;h++){var p=l[h],d=p.src||p.getAttribute("src");if(!d)continue;var v=p.attributes;for(var m=0,g=v.length;m<g;m++){var y=v[m];y.name.indexOf("data-ace-")===0&&(i[c(y.name.replace(/^data-ace-/,""))]=y.value)}var b=d.match(/^(.*)\/ace(\-\w+)?\.js(\?|$)/);b&&(s=b[1])}s&&(i.base=i.base||s,i.packaged=!0),i.basePath=i.base,i.workerPath=i.workerPath||i.base,i.modePath=i.modePath||i.base,i.themePath=i.themePath||i.base,delete i.base;for(var w in i)typeof i[w]!="undefined"&&t.set(w,i[w])}function c(e){return e.replace(/-(.)/g,function(e,t){return t.toUpperCase()})}var r=e("./lib/lang"),i=e("./lib/oop"),s=e("./lib/net"),o=e("./lib/app_config").AppConfig;n.exports=t=new o;var u=function(){return this||typeof window!="undefined"&&window}(),a={packaged:!1,workerPath:null,modePath:null,themePath:null,basePath:"",suffix:".js",$moduleUrls:{}};t.get=function(e){if(!a.hasOwnProperty(e))throw new Error("Unknown config key: "+e);return a[e]},t.set=function(e,t){if(!a.hasOwnProperty(e))throw new Error("Unknown config key: "+e);a[e]=t},t.all=function(){return r.copyObject(a)},t.$modes={},t.moduleUrl=function(e,t){if(a.$moduleUrls[e])return a.$moduleUrls[e];var n=e.split("/");t=t||n[n.length-2]||"";var r=t=="snippets"?"/":"-",i=n[n.length-1];if(t=="worker"&&r=="-"){var s=new RegExp("^"+t+"[\\-_]|[\\-_]"+t+"$","g");i=i.replace(s,"")}(!i||i==t)&&n.length>1&&(i=n[n.length-2]);var o=a[t+"Path"];return o==null?o=a.basePath:r=="/"&&(t=r=""),o&&o.slice(-1)!="/"&&(o+="/"),o+t+r+i+this.get("suffix")},t.setModuleUrl=function(e,t){return a.$moduleUrls[e]=t},t.$loading={},t.loadModule=function(n,r){var i,o;Array.isArray(n)&&(o=n[0],n=n[1]);try{i=e(n)}catch(u){}if(i&&!t.$loading[n])return r&&r(i);t.$loading[n]||(t.$loading[n]=[]),t.$loading[n].push(r);if(t.$loading[n].length>1)return;var a=function(){e([n],function(e){t._emit("load.module",{name:n,module:e});var r=t.$loading[n];t.$loading[n]=null,r.forEach(function(t){t&&t(e)})})};if(!t.get("packaged"))return a();s.loadScript(t.moduleUrl(n,o),a),f()};var f=function(){!a.basePath&&!a.workerPath&&!a.modePath&&!a.themePath&&!Object.keys(a.$moduleUrls).length&&(console.error("Unable to infer path to ace from script src,","use ace.config.set('basePath', 'path') to enable dynamic loading of modes and themes","or with webpack use ace/webpack-resolver"),f=function(){})};t.init=l}),ace.define("ace/mouse/mouse_handler",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/mouse/default_handlers","ace/mouse/default_gutter_handler","ace/mouse/mouse_event","ace/mouse/dragdrop_handler","ace/config"],function(e,t,n){"use strict";var r=e("../lib/event"),i=e("../lib/useragent"),s=e("./default_handlers").DefaultHandlers,o=e("./default_gutter_handler").GutterHandler,u=e("./mouse_event").MouseEvent,a=e("./dragdrop_handler").DragdropHandler,f=e("../config"),l=function(e){var t=this;this.editor=e,new s(this),new o(this),new a(this);var n=function(t){var n=!document.hasFocus||!document.hasFocus()||!e.isFocused()&&document.activeElement==(e.textInput&&e.textInput.getElement());n&&window.focus(),e.focus()},u=e.renderer.getMouseEventTarget();r.addListener(u,"click",this.onMouseEvent.bind(this,"click")),r.addListener(u,"mousemove",this.onMouseMove.bind(this,"mousemove")),r.addMultiMouseDownListener([u,e.renderer.scrollBarV&&e.renderer.scrollBarV.inner,e.renderer.scrollBarH&&e.renderer.scrollBarH.inner,e.textInput&&e.textInput.getElement()].filter(Boolean),[400,300,250],this,"onMouseEvent"),r.addMouseWheelListener(e.container,this.onMouseWheel.bind(this,"mousewheel")),r.addTouchMoveListener(e.container,this.onTouchMove.bind(this,"touchmove"));var f=e.renderer.$gutter;r.addListener(f,"mousedown",this.onMouseEvent.bind(this,"guttermousedown")),r.addListener(f,"click",this.onMouseEvent.bind(this,"gutterclick")),r.addListener(f,"dblclick",this.onMouseEvent.bind(this,"gutterdblclick")),r.addListener(f,"mousemove",this.onMouseEvent.bind(this,"guttermousemove")),r.addListener(u,"mousedown",n),r.addListener(f,"mousedown",n),i.isIE&&e.renderer.scrollBarV&&(r.addListener(e.renderer.scrollBarV.element,"mousedown",n),r.addListener(e.renderer.scrollBarH.element,"mousedown",n)),e.on("mousemove",function(n){if(t.state||t.$dragDelay||!t.$dragEnabled)return;var r=e.renderer.screenToTextCoordinates(n.x,n.y),i=e.session.selection.getRange(),s=e.renderer;!i.isEmpty()&&i.insideStart(r.row,r.column)?s.setCursorStyle("default"):s.setCursorStyle("")})};(function(){this.onMouseEvent=function(e,t){this.editor._emit(e,new u(t,this.editor))},this.onMouseMove=function(e,t){var n=this.editor._eventRegistry&&this.editor._eventRegistry.mousemove;if(!n||!n.length)return;this.editor._emit(e,new u(t,this.editor))},this.onMouseWheel=function(e,t){var n=new u(t,this.editor);n.speed=this.$scrollSpeed*2,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.onTouchMove=function(e,t){var n=new u(t,this.editor);n.speed=1,n.wheelX=t.wheelX,n.wheelY=t.wheelY,this.editor._emit(e,n)},this.setState=function(e){this.state=e},this.captureMouse=function(e,t){this.x=e.x,this.y=e.y,this.isMousePressed=!0;var n=this.editor,s=this.editor.renderer;s.$keepTextAreaAtCursor&&(s.$keepTextAreaAtCursor=null);var o=this,a=function(e){if(!e)return;if(i.isWebKit&&!e.which&&o.releaseMouse)return o.releaseMouse();o.x=e.clientX,o.y=e.clientY,t&&t(e),o.mouseEvent=new u(e,o.editor),o.$mouseMoved=!0},f=function(e){n.off("beforeEndOperation",c),clearInterval(h),l(),o[o.state+"End"]&&o[o.state+"End"](e),o.state="",s.$keepTextAreaAtCursor==null&&(s.$keepTextAreaAtCursor=!0,s.$moveTextAreaToCursor()),o.isMousePressed=!1,o.$onCaptureMouseMove=o.releaseMouse=null,e&&o.onMouseEvent("mouseup",e),n.endOperation()},l=function(){o[o.state]&&o[o.state](),o.$mouseMoved=!1};if(i.isOldIE&&e.domEvent.type=="dblclick")return setTimeout(function(){f(e)});var c=function(e){if(!o.releaseMouse)return;n.curOp.command.name&&n.curOp.selectionChanged&&(o[o.state+"End"]&&o[o.state+"End"](),o.state="",o.releaseMouse())};n.on("beforeEndOperation",c),n.startOperation({command:{name:"mouse"}}),o.$onCaptureMouseMove=a,o.releaseMouse=r.capture(this.editor.container,a,f);var h=setInterval(l,20)},this.releaseMouse=null,this.cancelContextMenu=function(){var e=function(t){if(t&&t.domEvent&&t.domEvent.type!="contextmenu")return;this.editor.off("nativecontextmenu",e),t&&t.domEvent&&r.stopEvent(t.domEvent)}.bind(this);setTimeout(e,10),this.editor.on("nativecontextmenu",e)}}).call(l.prototype),f.defineOptions(l.prototype,"mouseHandler",{scrollSpeed:{initialValue:2},dragDelay:{initialValue:i.isMac?150:0},dragEnabled:{initialValue:!0},focusTimeout:{initialValue:0},tooltipFollowsMouse:{initialValue:!0}}),t.MouseHandler=l}),ace.define("ace/mouse/fold_handler",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";function i(e){e.on("click",function(t){var n=t.getDocumentPosition(),i=e.session,s=i.getFoldAt(n.row,n.column,1);s&&(t.getAccelKey()?i.removeFold(s):i.expandFold(s),t.stop());var o=t.domEvent&&t.domEvent.target;o&&r.hasCssClass(o,"ace_inline_button")&&r.hasCssClass(o,"ace_toggle_wrap")&&(i.setOption("wrap",!0),e.renderer.scrollCursorIntoView())}),e.on("gutterclick",function(t){var n=e.renderer.$gutterLayer.getRegion(t);if(n=="foldWidgets"){var r=t.getDocumentPosition().row,i=e.session;i.foldWidgets&&i.foldWidgets[r]&&e.session.onFoldWidgetClick(r,t),e.isFocused()||e.focus(),t.stop()}}),e.on("gutterdblclick",function(t){var n=e.renderer.$gutterLayer.getRegion(t);if(n=="foldWidgets"){var r=t.getDocumentPosition().row,i=e.session,s=i.getParentFoldRangeData(r,!0),o=s.range||s.firstRange;if(o){r=o.start.row;var u=i.getFoldAt(r,i.getLine(r).length,1);u?i.removeFold(u):(i.addFold("...",o),e.renderer.scrollCursorIntoView({row:o.start.row,column:0}))}t.stop()}})}var r=e("../lib/dom");t.FoldHandler=i}),ace.define("ace/keyboard/keybinding",["require","exports","module","ace/lib/keys","ace/lib/event"],function(e,t,n){"use strict";var r=e("../lib/keys"),i=e("../lib/event"),s=function(e){this.$editor=e,this.$data={editor:e},this.$handlers=[],this.setDefaultHandler(e.commands)};(function(){this.setDefaultHandler=function(e){this.removeKeyboardHandler(this.$defaultHandler),this.$defaultHandler=e,this.addKeyboardHandler(e,0)},this.setKeyboardHandler=function(e){var t=this.$handlers;if(t[t.length-1]==e)return;while(t[t.length-1]&&t[t.length-1]!=this.$defaultHandler)this.removeKeyboardHandler(t[t.length-1]);this.addKeyboardHandler(e,1)},this.addKeyboardHandler=function(e,t){if(!e)return;typeof e=="function"&&!e.handleKeyboard&&(e.handleKeyboard=e);var n=this.$handlers.indexOf(e);n!=-1&&this.$handlers.splice(n,1),t==undefined?this.$handlers.push(e):this.$handlers.splice(t,0,e),n==-1&&e.attach&&e.attach(this.$editor)},this.removeKeyboardHandler=function(e){var t=this.$handlers.indexOf(e);return t==-1?!1:(this.$handlers.splice(t,1),e.detach&&e.detach(this.$editor),!0)},this.getKeyboardHandler=function(){return this.$handlers[this.$handlers.length-1]},this.getStatusText=function(){var e=this.$data,t=e.editor;return this.$handlers.map(function(n){return n.getStatusText&&n.getStatusText(t,e)||""}).filter(Boolean).join(" ")},this.$callKeyboardHandlers=function(e,t,n,r){var s,o=!1,u=this.$editor.commands;for(var a=this.$handlers.length;a--;){s=this.$handlers[a].handleKeyboard(this.$data,e,t,n,r);if(!s||!s.command)continue;s.command=="null"?o=!0:o=u.exec(s.command,this.$editor,s.args,r),o&&r&&e!=-1&&s.passEvent!=1&&s.command.passEvent!=1&&i.stopEvent(r);if(o)break}return!o&&e==-1&&(s={command:"insertstring"},o=u.exec("insertstring",this.$editor,t)),o&&this.$editor._signal&&this.$editor._signal("keyboardActivity",s),o},this.onCommandKey=function(e,t,n){var i=r.keyCodeToString(n);this.$callKeyboardHandlers(t,i,n,e)},this.onTextInput=function(e){this.$callKeyboardHandlers(-1,e)}}).call(s.prototype),t.KeyBinding=s}),ace.define("ace/lib/bidiutil",["require","exports","module"],function(e,t,n){"use strict";function F(e,t,n,r){var i=s?d:p,c=null,h=null,v=null,m=0,g=null,y=null,b=-1,w=null,E=null,T=[];if(!r)for(w=0,r=[];w<n;w++)r[w]=R(e[w]);o=s,u=!1,a=!1,f=!1,l=!1;for(E=0;E<n;E++){c=m,T[E]=h=q(e,r,T,E),m=i[c][h],g=m&240,m&=15,t[E]=v=i[m][5];if(g>0)if(g==16){for(w=b;w<E;w++)t[w]=1;b=-1}else b=-1;y=i[m][6];if(y)b==-1&&(b=E);else if(b>-1){for(w=b;w<E;w++)t[w]=v;b=-1}r[E]==S&&(t[E]=0),o|=v}if(l)for(w=0;w<n;w++)if(r[w]==x){t[w]=s;for(var C=w-1;C>=0;C--){if(r[C]!=N)break;t[C]=s}}}function I(e,t,n){if(o<e)return;if(e==1&&s==m&&!f){n.reverse();return}var r=n.length,i=0,u,a,l,c;while(i<r){if(t[i]>=e){u=i+1;while(u<r&&t[u]>=e)u++;for(a=i,l=u-1;a<l;a++,l--)c=n[a],n[a]=n[l],n[l]=c;i=u}i++}}function q(e,t,n,r){var i=t[r],o,c,h,p;switch(i){case g:case y:u=!1;case E:case w:return i;case b:return u?w:b;case T:return u=!0,a=!0,y;case N:return E;case C:if(r<1||r+1>=t.length||(o=n[r-1])!=b&&o!=w||(c=t[r+1])!=b&&c!=w)return E;return u&&(c=w),c==o?c:E;case k:o=r>0?n[r-1]:S;if(o==b&&r+1<t.length&&t[r+1]==b)return b;return E;case L:if(r>0&&n[r-1]==b)return b;if(u)return E;p=r+1,h=t.length;while(p<h&&t[p]==L)p++;if(p<h&&t[p]==b)return b;return E;case A:h=t.length,p=r+1;while(p<h&&t[p]==A)p++;if(p<h){var d=e[r],v=d>=1425&&d<=2303||d==64286;o=t[p];if(v&&(o==y||o==T))return y}if(r<1||(o=t[r-1])==S)return E;return n[r-1];case S:return u=!1,f=!0,s;case x:return l=!0,E;case O:case M:case D:case P:case _:u=!1;case H:return E}}function R(e){var t=e.charCodeAt(0),n=t>>8;return n==0?t>191?g:B[t]:n==5?/[\u0591-\u05f4]/.test(e)?y:g:n==6?/[\u0610-\u061a\u064b-\u065f\u06d6-\u06e4\u06e7-\u06ed]/.test(e)?A:/[\u0660-\u0669\u066b-\u066c]/.test(e)?w:t==1642?L:/[\u06f0-\u06f9]/.test(e)?b:T:n==32&&t<=8287?j[t&255]:n==254?t>=65136?T:E:E}function U(e){return e>="\u064b"&&e<="\u0655"}var r=["\u0621","\u0641"],i=["\u063a","\u064a"],s=0,o=0,u=!1,a=!1,f=!1,l=!1,c=!1,h=!1,p=[[0,3,0,1,0,0,0],[0,3,0,1,2,2,0],[0,3,0,17,2,0,1],[0,3,5,5,4,1,0],[0,3,21,21,4,0,1],[0,3,5,5,4,2,0]],d=[[2,0,1,1,0,1,0],[2,0,1,1,0,2,0],[2,0,2,1,3,2,0],[2,0,2,33,3,1,1]],v=0,m=1,g=0,y=1,b=2,w=3,E=4,S=5,x=6,T=7,N=8,C=9,k=10,L=11,A=12,O=13,M=14,_=15,D=16,P=17,H=18,B=[H,H,H,H,H,H,H,H,H,x,S,x,N,S,H,H,H,H,H,H,H,H,H,H,H,H,H,H,S,S,S,x,N,E,E,L,L,L,E,E,E,E,E,k,C,k,C,C,b,b,b,b,b,b,b,b,b,b,C,E,E,E,E,E,E,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,E,E,E,E,E,E,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,g,E,E,E,E,H,H,H,H,H,H,S,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,H,C,E,L,L,L,L,E,E,E,E,g,E,E,H,E,E,L,L,b,b,E,g,E,E,E,b,g,E,E,E,E,E],j=[N,N,N,N,N,N,N,N,N,N,N,H,H,H,g,y,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,N,S,O,M,_,D,P,C,L,L,L,L,L,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,C,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,E,N];t.L=g,t.R=y,t.EN=b,t.ON_R=3,t.AN=4,t.R_H=5,t.B=6,t.RLE=7,t.DOT="\u00b7",t.doBidiReorder=function(e,n,r){if(e.length<2)return{};var i=e.split(""),o=new Array(i.length),u=new Array(i.length),a=[];s=r?m:v,F(i,a,i.length,n);for(var f=0;f<o.length;o[f]=f,f++);I(2,a,o),I(1,a,o);for(var f=0;f<o.length-1;f++)n[f]===w?a[f]=t.AN:a[f]===y&&(n[f]>T&&n[f]<O||n[f]===E||n[f]===H)?a[f]=t.ON_R:f>0&&i[f-1]==="\u0644"&&/\u0622|\u0623|\u0625|\u0627/.test(i[f])&&(a[f-1]=a[f]=t.R_H,f++);i[i.length-1]===t.DOT&&(a[i.length-1]=t.B),i[0]==="\u202b"&&(a[0]=t.RLE);for(var f=0;f<o.length;f++)u[f]=a[o[f]];return{logicalFromVisual:o,bidiLevels:u}},t.hasBidiCharacters=function(e,t){var n=!1;for(var r=0;r<e.length;r++)t[r]=R(e.charAt(r)),!n&&(t[r]==y||t[r]==T||t[r]==w)&&(n=!0);return n},t.getVisualFromLogicalIdx=function(e,t){for(var n=0;n<t.logicalFromVisual.length;n++)if(t.logicalFromVisual[n]==e)return n;return 0}}),ace.define("ace/bidihandler",["require","exports","module","ace/lib/bidiutil","ace/lib/lang"],function(e,t,n){"use strict";var r=e("./lib/bidiutil"),i=e("./lib/lang"),s=/[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac\u202B]/,o=function(e){this.session=e,this.bidiMap={},this.currentRow=null,this.bidiUtil=r,this.charWidths=[],this.EOL="\u00ac",this.showInvisibles=!0,this.isRtlDir=!1,this.line="",this.wrapIndent=0,this.EOF="\u00b6",this.RLE="\u202b",this.contentWidth=0,this.fontMetrics=null,this.rtlLineOffset=0,this.wrapOffset=0,this.isMoveLeftOperation=!1,this.seenBidi=s.test(e.getValue())};(function(){this.isBidiRow=function(e,t,n){return this.seenBidi?(e!==this.currentRow&&(this.currentRow=e,this.updateRowLine(t,n),this.updateBidiMap()),this.bidiMap.bidiLevels):!1},this.onChange=function(e){this.seenBidi?this.currentRow=null:e.action=="insert"&&s.test(e.lines.join("\n"))&&(this.seenBidi=!0,this.currentRow=null)},this.getDocumentRow=function(){var e=0,t=this.session.$screenRowCache;if(t.length){var n=this.session.$getRowCacheIndex(t,this.currentRow);n>=0&&(e=this.session.$docRowCache[n])}return e},this.getSplitIndex=function(){var e=0,t=this.session.$screenRowCache;if(t.length){var n,r=this.session.$getRowCacheIndex(t,this.currentRow);while(this.currentRow-e>0){n=this.session.$getRowCacheIndex(t,this.currentRow-e-1);if(n!==r)break;r=n,e++}}else e=this.currentRow;return e},this.updateRowLine=function(e,t){e===undefined&&(e=this.getDocumentRow());var n=e===this.session.getLength()-1,s=n?this.EOF:this.EOL;this.wrapIndent=0,this.line=this.session.getLine(e),this.isRtlDir=this.line.charAt(0)===this.RLE;if(this.session.$useWrapMode){var o=this.session.$wrapData[e];o&&(t===undefined&&(t=this.getSplitIndex()),t>0&&o.length?(this.wrapIndent=o.indent,this.wrapOffset=this.wrapIndent*this.charWidths[r.L],this.line=t<o.length?this.line.substring(o[t-1],o[t]):this.line.substring(o[o.length-1])):this.line=this.line.substring(0,o[t])),t==o.length&&(this.line+=this.showInvisibles?s:r.DOT)}else this.line+=this.showInvisibles?s:r.DOT;var u=this.session,a=0,f;this.line=this.line.replace(/\t|[\u1100-\u2029, \u202F-\uFFE6]/g,function(e,t){return e==="	"||u.isFullWidth(e.charCodeAt(0))?(f=e==="	"?u.getScreenTabSize(t+a):2,a+=f-1,i.stringRepeat(r.DOT,f)):e}),this.isRtlDir&&(this.fontMetrics.$main.innerHTML=this.line.charAt(this.line.length-1)==r.DOT?this.line.substr(0,this.line.length-1):this.line,this.rtlLineOffset=this.contentWidth-this.fontMetrics.$main.getBoundingClientRect().width)},this.updateBidiMap=function(){var e=[];r.hasBidiCharacters(this.line,e)||this.isRtlDir?this.bidiMap=r.doBidiReorder(this.line,e,this.isRtlDir):this.bidiMap={}},this.markAsDirty=function(){this.currentRow=null},this.updateCharacterWidths=function(e){if(this.characterWidth===e.$characterSize.width)return;this.fontMetrics=e;var t=this.characterWidth=e.$characterSize.width,n=e.$measureCharWidth("\u05d4");this.charWidths[r.L]=this.charWidths[r.EN]=this.charWidths[r.ON_R]=t,this.charWidths[r.R]=this.charWidths[r.AN]=n,this.charWidths[r.R_H]=n*.45,this.charWidths[r.B]=this.charWidths[r.RLE]=0,this.currentRow=null},this.setShowInvisibles=function(e){this.showInvisibles=e,this.currentRow=null},this.setEolChar=function(e){this.EOL=e},this.setContentWidth=function(e){this.contentWidth=e},this.isRtlLine=function(e){return e!=undefined?this.session.getLine(e).charAt(0)==this.RLE:this.isRtlDir},this.setRtlDirection=function(e,t){var n=e.getCursorPosition();for(var r=e.selection.getSelectionAnchor().row;r<=n.row;r++)!t&&e.session.getLine(r).charAt(0)===e.session.$bidiHandler.RLE?e.session.doc.removeInLine(r,0,1):t&&e.session.getLine(r).charAt(0)!==e.session.$bidiHandler.RLE&&e.session.doc.insert({column:0,row:r},e.session.$bidiHandler.RLE)},this.getPosLeft=function(e){e-=this.wrapIndent;var t=this.line.charAt(0)===this.RLE?1:0,n=e>t?this.session.getOverwrite()?e:e-1:t,i=r.getVisualFromLogicalIdx(n,this.bidiMap),s=this.bidiMap.bidiLevels,o=0;!this.session.getOverwrite()&&e<=t&&s[i]%2!==0&&i++;for(var u=0;u<i;u++)o+=this.charWidths[s[u]];return!this.session.getOverwrite()&&e>t&&s[i]%2===0&&(o+=this.charWidths[s[i]]),this.wrapIndent&&(o+=this.isRtlDir?-1*this.wrapOffset:this.wrapOffset),this.isRtlDir&&(o+=this.rtlLineOffset),o},this.getSelections=function(e,t){var n=this.bidiMap,r=n.bidiLevels,i,s=[],o=0,u=Math.min(e,t)-this.wrapIndent,a=Math.max(e,t)-this.wrapIndent,f=!1,l=!1,c=0;this.wrapIndent&&(o+=this.isRtlDir?-1*this.wrapOffset:this.wrapOffset);for(var h,p=0;p<r.length;p++)h=n.logicalFromVisual[p],i=r[p],f=h>=u&&h<a,f&&!l?c=o:!f&&l&&s.push({left:c,width:o-c}),o+=this.charWidths[i],l=f;f&&p===r.length&&s.push({left:c,width:o-c});if(this.isRtlDir)for(var d=0;d<s.length;d++)s[d].left+=this.rtlLineOffset;return s},this.offsetToCol=function(e){this.isRtlDir&&(e-=this.rtlLineOffset);var t=0,e=Math.max(e,0),n=0,r=0,i=this.bidiMap.bidiLevels,s=this.charWidths[i[r]];this.wrapIndent&&(e-=this.isRtlDir?-1*this.wrapOffset:this.wrapOffset);while(e>n+s/2){n+=s;if(r===i.length-1){s=0;break}s=this.charWidths[i[++r]]}return r>0&&i[r-1]%2!==0&&i[r]%2===0?(e<n&&r--,t=this.bidiMap.logicalFromVisual[r]):r>0&&i[r-1]%2===0&&i[r]%2!==0?t=1+(e>n?this.bidiMap.logicalFromVisual[r]:this.bidiMap.logicalFromVisual[r-1]):this.isRtlDir&&r===i.length-1&&s===0&&i[r-1]%2===0||!this.isRtlDir&&r===0&&i[r]%2!==0?t=1+this.bidiMap.logicalFromVisual[r]:(r>0&&i[r-1]%2!==0&&s!==0&&r--,t=this.bidiMap.logicalFromVisual[r]),t===0&&this.isRtlDir&&t++,t+this.wrapIndent}}).call(o.prototype),t.BidiHandler=o}),ace.define("ace/selection",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/range"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/lang"),s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=function(e){this.session=e,this.doc=e.getDocument(),this.clearSelection(),this.cursor=this.lead=this.doc.createAnchor(0,0),this.anchor=this.doc.createAnchor(0,0),this.$silent=!1;var t=this;this.cursor.on("change",function(e){t.$cursorChanged=!0,t.$silent||t._emit("changeCursor"),!t.$isEmpty&&!t.$silent&&t._emit("changeSelection"),!t.$keepDesiredColumnOnChange&&e.old.column!=e.value.column&&(t.$desiredColumn=null)}),this.anchor.on("change",function(){t.$anchorChanged=!0,!t.$isEmpty&&!t.$silent&&t._emit("changeSelection")})};(function(){r.implement(this,s),this.isEmpty=function(){return this.$isEmpty||this.anchor.row==this.lead.row&&this.anchor.column==this.lead.column},this.isMultiLine=function(){return!this.$isEmpty&&this.anchor.row!=this.cursor.row},this.getCursor=function(){return this.lead.getPosition()},this.setSelectionAnchor=function(e,t){this.$isEmpty=!1,this.anchor.setPosition(e,t)},this.getAnchor=this.getSelectionAnchor=function(){return this.$isEmpty?this.getSelectionLead():this.anchor.getPosition()},this.getSelectionLead=function(){return this.lead.getPosition()},this.isBackwards=function(){var e=this.anchor,t=this.lead;return e.row>t.row||e.row==t.row&&e.column>t.column},this.getRange=function(){var e=this.anchor,t=this.lead;return this.$isEmpty?o.fromPoints(t,t):this.isBackwards()?o.fromPoints(t,e):o.fromPoints(e,t)},this.clearSelection=function(){this.$isEmpty||(this.$isEmpty=!0,this._emit("changeSelection"))},this.selectAll=function(){this.$setSelection(0,0,Number.MAX_VALUE,Number.MAX_VALUE)},this.setRange=this.setSelectionRange=function(e,t){var n=t?e.end:e.start,r=t?e.start:e.end;this.$setSelection(n.row,n.column,r.row,r.column)},this.$setSelection=function(e,t,n,r){var i=this.$isEmpty,s=this.inMultiSelectMode;this.$silent=!0,this.$cursorChanged=this.$anchorChanged=!1,this.anchor.setPosition(e,t),this.cursor.setPosition(n,r),this.$isEmpty=!o.comparePoints(this.anchor,this.cursor),this.$silent=!1,this.$cursorChanged&&this._emit("changeCursor"),(this.$cursorChanged||this.$anchorChanged||i!=this.$isEmpty||s)&&this._emit("changeSelection")},this.$moveSelection=function(e){var t=this.lead;this.$isEmpty&&this.setSelectionAnchor(t.row,t.column),e.call(this)},this.selectTo=function(e,t){this.$moveSelection(function(){this.moveCursorTo(e,t)})},this.selectToPosition=function(e){this.$moveSelection(function(){this.moveCursorToPosition(e)})},this.moveTo=function(e,t){this.clearSelection(),this.moveCursorTo(e,t)},this.moveToPosition=function(e){this.clearSelection(),this.moveCursorToPosition(e)},this.selectUp=function(){this.$moveSelection(this.moveCursorUp)},this.selectDown=function(){this.$moveSelection(this.moveCursorDown)},this.selectRight=function(){this.$moveSelection(this.moveCursorRight)},this.selectLeft=function(){this.$moveSelection(this.moveCursorLeft)},this.selectLineStart=function(){this.$moveSelection(this.moveCursorLineStart)},this.selectLineEnd=function(){this.$moveSelection(this.moveCursorLineEnd)},this.selectFileEnd=function(){this.$moveSelection(this.moveCursorFileEnd)},this.selectFileStart=function(){this.$moveSelection(this.moveCursorFileStart)},this.selectWordRight=function(){this.$moveSelection(this.moveCursorWordRight)},this.selectWordLeft=function(){this.$moveSelection(this.moveCursorWordLeft)},this.getWordRange=function(e,t){if(typeof t=="undefined"){var n=e||this.lead;e=n.row,t=n.column}return this.session.getWordRange(e,t)},this.selectWord=function(){this.setSelectionRange(this.getWordRange())},this.selectAWord=function(){var e=this.getCursor(),t=this.session.getAWordRange(e.row,e.column);this.setSelectionRange(t)},this.getLineRange=function(e,t){var n=typeof e=="number"?e:this.lead.row,r,i=this.session.getFoldLine(n);return i?(n=i.start.row,r=i.end.row):r=n,t===!0?new o(n,0,r,this.session.getLine(r).length):new o(n,0,r+1,0)},this.selectLine=function(){this.setSelectionRange(this.getLineRange())},this.moveCursorUp=function(){this.moveCursorBy(-1,0)},this.moveCursorDown=function(){this.moveCursorBy(1,0)},this.wouldMoveIntoSoftTab=function(e,t,n){var r=e.column,i=e.column+t;return n<0&&(r=e.column-t,i=e.column),this.session.isTabStop(e)&&this.doc.getLine(e.row).slice(r,i).split(" ").length-1==t},this.moveCursorLeft=function(){var e=this.lead.getPosition(),t;if(t=this.session.getFoldAt(e.row,e.column,-1))this.moveCursorTo(t.start.row,t.start.column);else if(e.column===0)e.row>0&&this.moveCursorTo(e.row-1,this.doc.getLine(e.row-1).length);else{var n=this.session.getTabSize();this.wouldMoveIntoSoftTab(e,n,-1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,-n):this.moveCursorBy(0,-1)}},this.moveCursorRight=function(){var e=this.lead.getPosition(),t;if(t=this.session.getFoldAt(e.row,e.column,1))this.moveCursorTo(t.end.row,t.end.column);else if(this.lead.column==this.doc.getLine(this.lead.row).length)this.lead.row<this.doc.getLength()-1&&this.moveCursorTo(this.lead.row+1,0);else{var n=this.session.getTabSize(),e=this.lead;this.wouldMoveIntoSoftTab(e,n,1)&&!this.session.getNavigateWithinSoftTabs()?this.moveCursorBy(0,n):this.moveCursorBy(0,1)}},this.moveCursorLineStart=function(){var e=this.lead.row,t=this.lead.column,n=this.session.documentToScreenRow(e,t),r=this.session.screenToDocumentPosition(n,0),i=this.session.getDisplayLine(e,null,r.row,r.column),s=i.match(/^\s*/);s[0].length!=t&&!this.session.$useEmacsStyleLineStart&&(r.column+=s[0].length),this.moveCursorToPosition(r)},this.moveCursorLineEnd=function(){var e=this.lead,t=this.session.getDocumentLastRowColumnPosition(e.row,e.column);if(this.lead.column==t.column){var n=this.session.getLine(t.row);if(t.column==n.length){var r=n.search(/\s+$/);r>0&&(t.column=r)}}this.moveCursorTo(t.row,t.column)},this.moveCursorFileEnd=function(){var e=this.doc.getLength()-1,t=this.doc.getLine(e).length;this.moveCursorTo(e,t)},this.moveCursorFileStart=function(){this.moveCursorTo(0,0)},this.moveCursorLongWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),r=n.substring(t);this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0;var i=this.session.getFoldAt(e,t,1);if(i){this.moveCursorTo(i.end.row,i.end.column);return}this.session.nonTokenRe.exec(r)&&(t+=this.session.nonTokenRe.lastIndex,this.session.nonTokenRe.lastIndex=0,r=n.substring(t));if(t>=n.length){this.moveCursorTo(e,n.length),this.moveCursorRight(),e<this.doc.getLength()-1&&this.moveCursorWordRight();return}this.session.tokenRe.exec(r)&&(t+=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0),this.moveCursorTo(e,t)},this.moveCursorLongWordLeft=function(){var e=this.lead.row,t=this.lead.column,n;if(n=this.session.getFoldAt(e,t,-1)){this.moveCursorTo(n.start.row,n.start.column);return}var r=this.session.getFoldStringAt(e,t,-1);r==null&&(r=this.doc.getLine(e).substring(0,t));var s=i.stringReverse(r);this.session.nonTokenRe.lastIndex=0,this.session.tokenRe.lastIndex=0,this.session.nonTokenRe.exec(s)&&(t-=this.session.nonTokenRe.lastIndex,s=s.slice(this.session.nonTokenRe.lastIndex),this.session.nonTokenRe.lastIndex=0);if(t<=0){this.moveCursorTo(e,0),this.moveCursorLeft(),e>0&&this.moveCursorWordLeft();return}this.session.tokenRe.exec(s)&&(t-=this.session.tokenRe.lastIndex,this.session.tokenRe.lastIndex=0),this.moveCursorTo(e,t)},this.$shortWordEndIndex=function(e){var t=0,n,r=/\s/,i=this.session.tokenRe;i.lastIndex=0;if(this.session.tokenRe.exec(e))t=this.session.tokenRe.lastIndex;else{while((n=e[t])&&r.test(n))t++;if(t<1){i.lastIndex=0;while((n=e[t])&&!i.test(n)){i.lastIndex=0,t++;if(r.test(n)){if(t>2){t--;break}while((n=e[t])&&r.test(n))t++;if(t>2)break}}}}return i.lastIndex=0,t},this.moveCursorShortWordRight=function(){var e=this.lead.row,t=this.lead.column,n=this.doc.getLine(e),r=n.substring(t),i=this.session.getFoldAt(e,t,1);if(i)return this.moveCursorTo(i.end.row,i.end.column);if(t==n.length){var s=this.doc.getLength();do e++,r=this.doc.getLine(e);while(e<s&&/^\s*$/.test(r));/^\s+/.test(r)||(r=""),t=0}var o=this.$shortWordEndIndex(r);this.moveCursorTo(e,t+o)},this.moveCursorShortWordLeft=function(){var e=this.lead.row,t=this.lead.column,n;if(n=this.session.getFoldAt(e,t,-1))return this.moveCursorTo(n.start.row,n.start.column);var r=this.session.getLine(e).substring(0,t);if(t===0){do e--,r=this.doc.getLine(e);while(e>0&&/^\s*$/.test(r));t=r.length,/\s+$/.test(r)||(r="")}var s=i.stringReverse(r),o=this.$shortWordEndIndex(s);return this.moveCursorTo(e,t-o)},this.moveCursorWordRight=function(){this.session.$selectLongWords?this.moveCursorLongWordRight():this.moveCursorShortWordRight()},this.moveCursorWordLeft=function(){this.session.$selectLongWords?this.moveCursorLongWordLeft():this.moveCursorShortWordLeft()},this.moveCursorBy=function(e,t){var n=this.session.documentToScreenPosition(this.lead.row,this.lead.column),r;t===0&&(e!==0&&(this.session.$bidiHandler.isBidiRow(n.row,this.lead.row)?(r=this.session.$bidiHandler.getPosLeft(n.column),n.column=Math.round(r/this.session.$bidiHandler.charWidths[0])):r=n.column*this.session.$bidiHandler.charWidths[0]),this.$desiredColumn?n.column=this.$desiredColumn:this.$desiredColumn=n.column);var i=this.session.screenToDocumentPosition(n.row+e,n.column,r);e!==0&&t===0&&i.row===this.lead.row&&i.column===this.lead.column&&this.session.lineWidgets&&this.session.lineWidgets[i.row]&&(i.row>0||e>0)&&i.row++,this.moveCursorTo(i.row,i.column+t,t===0)},this.moveCursorToPosition=function(e){this.moveCursorTo(e.row,e.column)},this.moveCursorTo=function(e,t,n){var r=this.session.getFoldAt(e,t,1);r&&(e=r.start.row,t=r.start.column),this.$keepDesiredColumnOnChange=!0;var i=this.session.getLine(e);/[\uDC00-\uDFFF]/.test(i.charAt(t))&&i.charAt(t-1)&&(this.lead.row==e&&this.lead.column==t+1?t-=1:t+=1),this.lead.setPosition(e,t),this.$keepDesiredColumnOnChange=!1,n||(this.$desiredColumn=null)},this.moveCursorToScreen=function(e,t,n){var r=this.session.screenToDocumentPosition(e,t);this.moveCursorTo(r.row,r.column,n)},this.detach=function(){this.lead.detach(),this.anchor.detach(),this.session=this.doc=null},this.fromOrientedRange=function(e){this.setSelectionRange(e,e.cursor==e.start),this.$desiredColumn=e.desiredColumn||this.$desiredColumn},this.toOrientedRange=function(e){var t=this.getRange();return e?(e.start.column=t.start.column,e.start.row=t.start.row,e.end.column=t.end.column,e.end.row=t.end.row):e=t,e.cursor=this.isBackwards()?e.start:e.end,e.desiredColumn=this.$desiredColumn,e},this.getRangeOfMovements=function(e){var t=this.getCursor();try{e(this);var n=this.getCursor();return o.fromPoints(t,n)}catch(r){return o.fromPoints(t,t)}finally{this.moveCursorToPosition(t)}},this.toJSON=function(){if(this.rangeCount)var e=this.ranges.map(function(e){var t=e.clone();return t.isBackwards=e.cursor==e.start,t});else{var e=this.getRange();e.isBackwards=this.isBackwards()}return e},this.fromJSON=function(e){if(e.start==undefined){if(this.rangeList){this.toSingleRange(e[0]);for(var t=e.length;t--;){var n=o.fromPoints(e[t].start,e[t].end);e[t].isBackwards&&(n.cursor=n.start),this.addRange(n,!0)}return}e=e[0]}this.rangeList&&this.toSingleRange(e),this.setSelectionRange(e,e.isBackwards)},this.isEqual=function(e){if((e.length||this.rangeCount)&&e.length!=this.rangeCount)return!1;if(!e.length||!this.ranges)return this.getRange().isEqual(e);for(var t=this.ranges.length;t--;)if(!this.ranges[t].isEqual(e[t]))return!1;return!0}}).call(u.prototype),t.Selection=u}),ace.define("ace/tokenizer",["require","exports","module","ace/config"],function(e,t,n){"use strict";var r=e("./config"),i=2e3,s=function(e){this.states=e,this.regExps={},this.matchMappings={};for(var t in this.states){var n=this.states[t],r=[],i=0,s=this.matchMappings[t]={defaultToken:"text"},o="g",u=[];for(var a=0;a<n.length;a++){var f=n[a];f.defaultToken&&(s.defaultToken=f.defaultToken),f.caseInsensitive&&(o="gi");if(f.regex==null)continue;f.regex instanceof RegExp&&(f.regex=f.regex.toString().slice(1,-1));var l=f.regex,c=(new RegExp("(?:("+l+")|(.))")).exec("a").length-2;Array.isArray(f.token)?f.token.length==1||c==1?f.token=f.token[0]:c-1!=f.token.length?(this.reportError("number of classes and regexp groups doesn't match",{rule:f,groupCount:c-1}),f.token=f.token[0]):(f.tokenArray=f.token,f.token=null,f.onMatch=this.$arrayTokens):typeof f.token=="function"&&!f.onMatch&&(c>1?f.onMatch=this.$applyToken:f.onMatch=f.token),c>1&&(/\\\d/.test(f.regex)?l=f.regex.replace(/\\([0-9]+)/g,function(e,t){return"\\"+(parseInt(t,10)+i+1)}):(c=1,l=this.removeCapturingGroups(f.regex)),!f.splitRegex&&typeof f.token!="string"&&u.push(f)),s[i]=a,i+=c,r.push(l),f.onMatch||(f.onMatch=null)}r.length||(s[0]=0,r.push("$")),u.forEach(function(e){e.splitRegex=this.createSplitterRegexp(e.regex,o)},this),this.regExps[t]=new RegExp("("+r.join(")|(")+")|($)",o)}};(function(){this.$setMaxTokenCount=function(e){i=e|0},this.$applyToken=function(e){var t=this.splitRegex.exec(e).slice(1),n=this.token.apply(this,t);if(typeof n=="string")return[{type:n,value:e}];var r=[];for(var i=0,s=n.length;i<s;i++)t[i]&&(r[r.length]={type:n[i],value:t[i]});return r},this.$arrayTokens=function(e){if(!e)return[];var t=this.splitRegex.exec(e);if(!t)return"text";var n=[],r=this.tokenArray;for(var i=0,s=r.length;i<s;i++)t[i+1]&&(n[n.length]={type:r[i],value:t[i+1]});return n},this.removeCapturingGroups=function(e){var t=e.replace(/\\.|\[(?:\\.|[^\\\]])*|\(\?[:=!]|(\()/g,function(e,t){return t?"(?:":e});return t},this.createSplitterRegexp=function(e,t){if(e.indexOf("(?=")!=-1){var n=0,r=!1,i={};e.replace(/(\\.)|(\((?:\?[=!])?)|(\))|([\[\]])/g,function(e,t,s,o,u,a){return r?r=u!="]":u?r=!0:o?(n==i.stack&&(i.end=a+1,i.stack=-1),n--):s&&(n++,s.length!=1&&(i.stack=n,i.start=a)),e}),i.end!=null&&/^\)*$/.test(e.substr(i.end))&&(e=e.substring(0,i.start)+e.substr(i.end))}return e.charAt(0)!="^"&&(e="^"+e),e.charAt(e.length-1)!="$"&&(e+="$"),new RegExp(e,(t||"").replace("g",""))},this.getLineTokens=function(e,t){if(t&&typeof t!="string"){var n=t.slice(0);t=n[0],t==="#tmp"&&(n.shift(),t=n.shift())}else var n=[];var r=t||"start",s=this.states[r];s||(r="start",s=this.states[r]);var o=this.matchMappings[r],u=this.regExps[r];u.lastIndex=0;var a,f=[],l=0,c=0,h={type:null,value:""};while(a=u.exec(e)){var p=o.defaultToken,d=null,v=a[0],m=u.lastIndex;if(m-v.length>l){var g=e.substring(l,m-v.length);h.type==p?h.value+=g:(h.type&&f.push(h),h={type:p,value:g})}for(var y=0;y<a.length-2;y++){if(a[y+1]===undefined)continue;d=s[o[y]],d.onMatch?p=d.onMatch(v,r,n,e):p=d.token,d.next&&(typeof d.next=="string"?r=d.next:r=d.next(r,n),s=this.states[r],s||(this.reportError("state doesn't exist",r),r="start",s=this.states[r]),o=this.matchMappings[r],l=m,u=this.regExps[r],u.lastIndex=m),d.consumeLineEnd&&(l=m);break}if(v)if(typeof p=="string")!!d&&d.merge===!1||h.type!==p?(h.type&&f.push(h),h={type:p,value:v}):h.value+=v;else if(p){h.type&&f.push(h),h={type:null,value:""};for(var y=0;y<p.length;y++)f.push(p[y])}if(l==e.length)break;l=m;if(c++>i){c>2*e.length&&this.reportError("infinite loop with in ace tokenizer",{startState:t,line:e});while(l<e.length)h.type&&f.push(h),h={value:e.substring(l,l+=2e3),type:"overflow"};r="start",n=[];break}}return h.type&&f.push(h),n.length>1&&n[0]!==r&&n.unshift("#tmp",r),{tokens:f,state:n.length?n:r}},this.reportError=r.reportError}).call(s.prototype),t.Tokenizer=s}),ace.define("ace/mode/text_highlight_rules",["require","exports","module","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../lib/lang"),i=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{defaultToken:"text"}]}};(function(){this.addRules=function(e,t){if(!t){for(var n in e)this.$rules[n]=e[n];return}for(var n in e){var r=e[n];for(var i=0;i<r.length;i++){var s=r[i];if(s.next||s.onMatch)typeof s.next=="string"&&s.next.indexOf(t)!==0&&(s.next=t+s.next),s.nextState&&s.nextState.indexOf(t)!==0&&(s.nextState=t+s.nextState)}this.$rules[t+n]=r}},this.getRules=function(){return this.$rules},this.embedRules=function(e,t,n,i,s){var o=typeof e=="function"?(new e).getRules():e;if(i)for(var u=0;u<i.length;u++)i[u]=t+i[u];else{i=[];for(var a in o)i.push(t+a)}this.addRules(o,t);if(n){var f=Array.prototype[s?"push":"unshift"];for(var u=0;u<i.length;u++)f.apply(this.$rules[i[u]],r.deepCopy(n))}this.$embeds||(this.$embeds=[]),this.$embeds.push(t)},this.getEmbeds=function(){return this.$embeds};var e=function(e,t){return(e!="start"||t.length)&&t.unshift(this.nextState,e),this.nextState},t=function(e,t){return t.shift(),t.shift()||"start"};this.normalizeRules=function(){function i(s){var o=r[s];o.processed=!0;for(var u=0;u<o.length;u++){var a=o[u],f=null;Array.isArray(a)&&(f=a,a={}),!a.regex&&a.start&&(a.regex=a.start,a.next||(a.next=[]),a.next.push({defaultToken:a.token},{token:a.token+".end",regex:a.end||a.start,next:"pop"}),a.token=a.token+".start",a.push=!0);var l=a.next||a.push;if(l&&Array.isArray(l)){var c=a.stateName;c||(c=a.token,typeof c!="string"&&(c=c[0]||""),r[c]&&(c+=n++)),r[c]=l,a.next=c,i(c)}else l=="pop"&&(a.next=t);a.push&&(a.nextState=a.next||a.push,a.next=e,delete a.push);if(a.rules)for(var h in a.rules)r[h]?r[h].push&&r[h].push.apply(r[h],a.rules[h]):r[h]=a.rules[h];var p=typeof a=="string"?a:a.include;p&&(Array.isArray(p)?f=p.map(function(e){return r[e]}):f=r[p]);if(f){var d=[u,1].concat(f);a.noEscape&&(d=d.filter(function(e){return!e.next})),o.splice.apply(o,d),u--}a.keywordMap&&(a.token=this.createKeywordMapper(a.keywordMap,a.defaultToken||"text",a.caseInsensitive),delete a.defaultToken)}}var n=0,r=this.$rules;Object.keys(r).forEach(i,this)},this.createKeywordMapper=function(e,t,n,r){var i=Object.create(null);return Object.keys(e).forEach(function(t){var s=e[t];n&&(s=s.toLowerCase());var o=s.split(r||"|");for(var u=o.length;u--;)i[o[u]]=t}),Object.getPrototypeOf(i)&&(i.__proto__=null),this.$keywordList=Object.keys(i),e=null,n?function(e){return i[e.toLowerCase()]||t}:function(e){return i[e]||t}},this.getKeywords=function(){return this.$keywords}}).call(i.prototype),t.TextHighlightRules=i}),ace.define("ace/mode/behaviour",["require","exports","module"],function(e,t,n){"use strict";var r=function(){this.$behaviours={}};(function(){this.add=function(e,t,n){switch(undefined){case this.$behaviours:this.$behaviours={};case this.$behaviours[e]:this.$behaviours[e]={}}this.$behaviours[e][t]=n},this.addBehaviours=function(e){for(var t in e)for(var n in e[t])this.add(t,n,e[t][n])},this.remove=function(e){this.$behaviours&&this.$behaviours[e]&&delete this.$behaviours[e]},this.inherit=function(e,t){if(typeof e=="function")var n=(new e).getBehaviours(t);else var n=e.getBehaviours(t);this.addBehaviours(n)},this.getBehaviours=function(e){if(!e)return this.$behaviours;var t={};for(var n=0;n<e.length;n++)this.$behaviours[e[n]]&&(t[e[n]]=this.$behaviours[e[n]]);return t}}).call(r.prototype),t.Behaviour=r}),ace.define("ace/token_iterator",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("./range").Range,i=function(e,t,n){this.$session=e,this.$row=t,this.$rowTokens=e.getTokens(t);var r=e.getTokenAt(t,n);this.$tokenIndex=r?r.index:-1};(function(){this.stepBackward=function(){this.$tokenIndex-=1;while(this.$tokenIndex<0){this.$row-=1;if(this.$row<0)return this.$row=0,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=this.$rowTokens.length-1}return this.$rowTokens[this.$tokenIndex]},this.stepForward=function(){this.$tokenIndex+=1;var e;while(this.$tokenIndex>=this.$rowTokens.length){this.$row+=1,e||(e=this.$session.getLength());if(this.$row>=e)return this.$row=e-1,null;this.$rowTokens=this.$session.getTokens(this.$row),this.$tokenIndex=0}return this.$rowTokens[this.$tokenIndex]},this.getCurrentToken=function(){return this.$rowTokens[this.$tokenIndex]},this.getCurrentTokenRow=function(){return this.$row},this.getCurrentTokenColumn=function(){var e=this.$rowTokens,t=this.$tokenIndex,n=e[t].start;if(n!==undefined)return n;n=0;while(t>0)t-=1,n+=e[t].value.length;return n},this.getCurrentTokenPosition=function(){return{row:this.$row,column:this.getCurrentTokenColumn()}},this.getCurrentTokenRange=function(){var e=this.$rowTokens[this.$tokenIndex],t=this.getCurrentTokenColumn();return new r(this.$row,t,this.$row,t+e.value.length)}}).call(i.prototype),t.TokenIterator=i}),ace.define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("../behaviour").Behaviour,s=e("../../token_iterator").TokenIterator,o=e("../../lib/lang"),u=["text","paren.rparen","punctuation.operator"],a=["text","paren.rparen","punctuation.operator","comment"],f,l={},c={'"':'"',"'":"'"},h=function(e){var t=-1;e.multiSelect&&(t=e.selection.index,l.rangeCount!=e.multiSelect.rangeCount&&(l={rangeCount:e.multiSelect.rangeCount}));if(l[t])return f=l[t];f=l[t]={autoInsertedBrackets:0,autoInsertedRow:-1,autoInsertedLineEnd:"",maybeInsertedBrackets:0,maybeInsertedRow:-1,maybeInsertedLineStart:"",maybeInsertedLineEnd:""}},p=function(e,t,n,r){var i=e.end.row-e.start.row;return{text:n+t+r,selection:[0,e.start.column+1,i,e.end.column+(i?0:1)]}},d=function(e){this.add("braces","insertion",function(t,n,r,i,s){var u=r.getCursorPosition(),a=i.doc.getLine(u.row);if(s=="{"){h(r);var l=r.getSelectionRange(),c=i.doc.getTextRange(l);if(c!==""&&c!=="{"&&r.getWrapBehavioursEnabled())return p(l,c,"{","}");if(d.isSaneInsertion(r,i))return/[\]\}\)]/.test(a[u.column])||r.inMultiSelectMode||e&&e.braces?(d.recordAutoInsert(r,i,"}"),{text:"{}",selection:[1,1]}):(d.recordMaybeInsert(r,i,"{"),{text:"{",selection:[1,1]})}else if(s=="}"){h(r);var v=a.substring(u.column,u.column+1);if(v=="}"){var m=i.$findOpeningBracket("}",{column:u.column+1,row:u.row});if(m!==null&&d.isAutoInsertedClosing(u,a,s))return d.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}else{if(s=="\n"||s=="\r\n"){h(r);var g="";d.isMaybeInsertedClosing(u,a)&&(g=o.stringRepeat("}",f.maybeInsertedBrackets),d.clearMaybeInsertedClosing());var v=a.substring(u.column,u.column+1);if(v==="}"){var y=i.findMatchingBracket({row:u.row,column:u.column+1},"}");if(!y)return null;var b=this.$getIndent(i.getLine(y.row))}else{if(!g){d.clearMaybeInsertedClosing();return}var b=this.$getIndent(a)}var w=b+i.getTabString();return{text:"\n"+w+"\n"+b+g,selection:[1,w.length,1,w.length]}}d.clearMaybeInsertedClosing()}}),this.add("braces","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="{"){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.end.column,i.end.column+1);if(u=="}")return i.end.column++,i;f.maybeInsertedBrackets--}}),this.add("parens","insertion",function(e,t,n,r,i){if(i=="("){h(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return p(s,o,"(",")");if(d.isSaneInsertion(n,r))return d.recordAutoInsert(n,r,")"),{text:"()",selection:[1,1]}}else if(i==")"){h(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f==")"){var l=r.$findOpeningBracket(")",{column:u.column+1,row:u.row});if(l!==null&&d.isAutoInsertedClosing(u,a,i))return d.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="("){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u==")")return i.end.column++,i}}),this.add("brackets","insertion",function(e,t,n,r,i){if(i=="["){h(n);var s=n.getSelectionRange(),o=r.doc.getTextRange(s);if(o!==""&&n.getWrapBehavioursEnabled())return p(s,o,"[","]");if(d.isSaneInsertion(n,r))return d.recordAutoInsert(n,r,"]"),{text:"[]",selection:[1,1]}}else if(i=="]"){h(n);var u=n.getCursorPosition(),a=r.doc.getLine(u.row),f=a.substring(u.column,u.column+1);if(f=="]"){var l=r.$findOpeningBracket("]",{column:u.column+1,row:u.row});if(l!==null&&d.isAutoInsertedClosing(u,a,i))return d.popAutoInsertedClosing(),{text:"",selection:[1,1]}}}}),this.add("brackets","deletion",function(e,t,n,r,i){var s=r.doc.getTextRange(i);if(!i.isMultiLine()&&s=="["){h(n);var o=r.doc.getLine(i.start.row),u=o.substring(i.start.column+1,i.start.column+2);if(u=="]")return i.end.column++,i}}),this.add("string_dquotes","insertion",function(e,t,n,r,i){var s=r.$mode.$quotes||c;if(i.length==1&&s[i]){if(this.lineCommentStart&&this.lineCommentStart.indexOf(i)!=-1)return;h(n);var o=i,u=n.getSelectionRange(),a=r.doc.getTextRange(u);if(a!==""&&(a.length!=1||!s[a])&&n.getWrapBehavioursEnabled())return p(u,a,o,o);if(!a){var f=n.getCursorPosition(),l=r.doc.getLine(f.row),d=l.substring(f.column-1,f.column),v=l.substring(f.column,f.column+1),m=r.getTokenAt(f.row,f.column),g=r.getTokenAt(f.row,f.column+1);if(d=="\\"&&m&&/escape/.test(m.type))return null;var y=m&&/string|escape/.test(m.type),b=!g||/string|escape/.test(g.type),w;if(v==o)w=y!==b,w&&/string\.end/.test(g.type)&&(w=!1);else{if(y&&!b)return null;if(y&&b)return null;var E=r.$mode.tokenRe;E.lastIndex=0;var S=E.test(d);E.lastIndex=0;var x=E.test(d);if(S||x)return null;if(v&&!/[\s;,.})\]\\]/.test(v))return null;w=!0}return{text:w?o+o:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(e,t,n,r,i){var s=r.$mode.$quotes||c,o=r.doc.getTextRange(i);if(!i.isMultiLine()&&s.hasOwnProperty(o)){h(n);var u=r.doc.getLine(i.start.row),a=u.substring(i.start.column+1,i.start.column+2);if(a==o)return i.end.column++,i}})};d.isSaneInsertion=function(e,t){var n=e.getCursorPosition(),r=new s(t,n.row,n.column);if(!this.$matchTokenType(r.getCurrentToken()||"text",u)){var i=new s(t,n.row,n.column+1);if(!this.$matchTokenType(i.getCurrentToken()||"text",u))return!1}return r.stepForward(),r.getCurrentTokenRow()!==n.row||this.$matchTokenType(r.getCurrentToken()||"text",a)},d.$matchTokenType=function(e,t){return t.indexOf(e.type||e)>-1},d.recordAutoInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isAutoInsertedClosing(r,i,f.autoInsertedLineEnd[0])||(f.autoInsertedBrackets=0),f.autoInsertedRow=r.row,f.autoInsertedLineEnd=n+i.substr(r.column),f.autoInsertedBrackets++},d.recordMaybeInsert=function(e,t,n){var r=e.getCursorPosition(),i=t.doc.getLine(r.row);this.isMaybeInsertedClosing(r,i)||(f.maybeInsertedBrackets=0),f.maybeInsertedRow=r.row,f.maybeInsertedLineStart=i.substr(0,r.column)+n,f.maybeInsertedLineEnd=i.substr(r.column),f.maybeInsertedBrackets++},d.isAutoInsertedClosing=function(e,t,n){return f.autoInsertedBrackets>0&&e.row===f.autoInsertedRow&&n===f.autoInsertedLineEnd[0]&&t.substr(e.column)===f.autoInsertedLineEnd},d.isMaybeInsertedClosing=function(e,t){return f.maybeInsertedBrackets>0&&e.row===f.maybeInsertedRow&&t.substr(e.column)===f.maybeInsertedLineEnd&&t.substr(0,e.column)==f.maybeInsertedLineStart},d.popAutoInsertedClosing=function(){f.autoInsertedLineEnd=f.autoInsertedLineEnd.substr(1),f.autoInsertedBrackets--},d.clearMaybeInsertedClosing=function(){f&&(f.maybeInsertedBrackets=0,f.maybeInsertedRow=-1)},r.inherits(d,i),t.CstyleBehaviour=d}),ace.define("ace/unicode",["require","exports","module"],function(e,t,n){"use strict";var r=[48,9,8,25,5,0,2,25,48,0,11,0,5,0,6,22,2,30,2,457,5,11,15,4,8,0,2,0,18,116,2,1,3,3,9,0,2,2,2,0,2,19,2,82,2,138,2,4,3,155,12,37,3,0,8,38,10,44,2,0,2,1,2,1,2,0,9,26,6,2,30,10,7,61,2,9,5,101,2,7,3,9,2,18,3,0,17,58,3,100,15,53,5,0,6,45,211,57,3,18,2,5,3,11,3,9,2,1,7,6,2,2,2,7,3,1,3,21,2,6,2,0,4,3,3,8,3,1,3,3,9,0,5,1,2,4,3,11,16,2,2,5,5,1,3,21,2,6,2,1,2,1,2,1,3,0,2,4,5,1,3,2,4,0,8,3,2,0,8,15,12,2,2,8,2,2,2,21,2,6,2,1,2,4,3,9,2,2,2,2,3,0,16,3,3,9,18,2,2,7,3,1,3,21,2,6,2,1,2,4,3,8,3,1,3,2,9,1,5,1,2,4,3,9,2,0,17,1,2,5,4,2,2,3,4,1,2,0,2,1,4,1,4,2,4,11,5,4,4,2,2,3,3,0,7,0,15,9,18,2,2,7,2,2,2,22,2,9,2,4,4,7,2,2,2,3,8,1,2,1,7,3,3,9,19,1,2,7,2,2,2,22,2,9,2,4,3,8,2,2,2,3,8,1,8,0,2,3,3,9,19,1,2,7,2,2,2,22,2,15,4,7,2,2,2,3,10,0,9,3,3,9,11,5,3,1,2,17,4,23,2,8,2,0,3,6,4,0,5,5,2,0,2,7,19,1,14,57,6,14,2,9,40,1,2,0,3,1,2,0,3,0,7,3,2,6,2,2,2,0,2,0,3,1,2,12,2,2,3,4,2,0,2,5,3,9,3,1,35,0,24,1,7,9,12,0,2,0,2,0,5,9,2,35,5,19,2,5,5,7,2,35,10,0,58,73,7,77,3,37,11,42,2,0,4,328,2,3,3,6,2,0,2,3,3,40,2,3,3,32,2,3,3,6,2,0,2,3,3,14,2,56,2,3,3,66,5,0,33,15,17,84,13,619,3,16,2,25,6,74,22,12,2,6,12,20,12,19,13,12,2,2,2,1,13,51,3,29,4,0,5,1,3,9,34,2,3,9,7,87,9,42,6,69,11,28,4,11,5,11,11,39,3,4,12,43,5,25,7,10,38,27,5,62,2,28,3,10,7,9,14,0,89,75,5,9,18,8,13,42,4,11,71,55,9,9,4,48,83,2,2,30,14,230,23,280,3,5,3,37,3,5,3,7,2,0,2,0,2,0,2,30,3,52,2,6,2,0,4,2,2,6,4,3,3,5,5,12,6,2,2,6,67,1,20,0,29,0,14,0,17,4,60,12,5,0,4,11,18,0,5,0,3,9,2,0,4,4,7,0,2,0,2,0,2,3,2,10,3,3,6,4,5,0,53,1,2684,46,2,46,2,132,7,6,15,37,11,53,10,0,17,22,10,6,2,6,2,6,2,6,2,6,2,6,2,6,2,6,2,31,48,0,470,1,36,5,2,4,6,1,5,85,3,1,3,2,2,89,2,3,6,40,4,93,18,23,57,15,513,6581,75,20939,53,1164,68,45,3,268,4,27,21,31,3,13,13,1,2,24,9,69,11,1,38,8,3,102,3,1,111,44,25,51,13,68,12,9,7,23,4,0,5,45,3,35,13,28,4,64,15,10,39,54,10,13,3,9,7,22,4,1,5,66,25,2,227,42,2,1,3,9,7,11171,13,22,5,48,8453,301,3,61,3,105,39,6,13,4,6,11,2,12,2,4,2,0,2,1,2,1,2,107,34,362,19,63,3,53,41,11,5,15,17,6,13,1,25,2,33,4,2,134,20,9,8,25,5,0,2,25,12,88,4,5,3,5,3,5,3,2],i=0,s=[];for(var o=0;o<r.length;o+=2)s.push(i+=r[o]),r[o+1]&&s.push(45,i+=r[o+1]);t.wordChars=String.fromCharCode.apply(null,s)}),ace.define("ace/mode/text",["require","exports","module","ace/config","ace/tokenizer","ace/mode/text_highlight_rules","ace/mode/behaviour/cstyle","ace/unicode","ace/lib/lang","ace/token_iterator","ace/range"],function(e,t,n){"use strict";var r=e("../config"),i=e("../tokenizer").Tokenizer,s=e("./text_highlight_rules").TextHighlightRules,o=e("./behaviour/cstyle").CstyleBehaviour,u=e("../unicode"),a=e("../lib/lang"),f=e("../token_iterator").TokenIterator,l=e("../range").Range,c=function(){this.HighlightRules=s};(function(){this.$defaultBehaviour=new o,this.tokenRe=new RegExp("^["+u.wordChars+"\\$_]+","g"),this.nonTokenRe=new RegExp("^(?:[^"+u.wordChars+"\\$_]|\\s])+","g"),this.getTokenizer=function(){return this.$tokenizer||(this.$highlightRules=this.$highlightRules||new this.HighlightRules(this.$highlightRuleConfig),this.$tokenizer=new i(this.$highlightRules.getRules())),this.$tokenizer},this.lineCommentStart="",this.blockComment="",this.toggleCommentLines=function(e,t,n,r){function w(e){for(var t=n;t<=r;t++)e(i.getLine(t),t)}var i=t.doc,s=!0,o=!0,u=Infinity,f=t.getTabSize(),l=!1;if(!this.lineCommentStart){if(!this.blockComment)return!1;var c=this.blockComment.start,h=this.blockComment.end,p=new RegExp("^(\\s*)(?:"+a.escapeRegExp(c)+")"),d=new RegExp("(?:"+a.escapeRegExp(h)+")\\s*$"),v=function(e,t){if(g(e,t))return;if(!s||/\S/.test(e))i.insertInLine({row:t,column:e.length},h),i.insertInLine({row:t,column:u},c)},m=function(e,t){var n;(n=e.match(d))&&i.removeInLine(t,e.length-n[0].length,e.length),(n=e.match(p))&&i.removeInLine(t,n[1].length,n[0].length)},g=function(e,n){if(p.test(e))return!0;var r=t.getTokens(n);for(var i=0;i<r.length;i++)if(r[i].type==="comment")return!0}}else{if(Array.isArray(this.lineCommentStart))var p=this.lineCommentStart.map(a.escapeRegExp).join("|"),c=this.lineCommentStart[0];else var p=a.escapeRegExp(this.lineCommentStart),c=this.lineCommentStart;p=new RegExp("^(\\s*)(?:"+p+") ?"),l=t.getUseSoftTabs();var m=function(e,t){var n=e.match(p);if(!n)return;var r=n[1].length,s=n[0].length;!b(e,r,s)&&n[0][s-1]==" "&&s--,i.removeInLine(t,r,s)},y=c+" ",v=function(e,t){if(!s||/\S/.test(e))b(e,u,u)?i.insertInLine({row:t,column:u},y):i.insertInLine({row:t,column:u},c)},g=function(e,t){return p.test(e)},b=function(e,t,n){var r=0;while(t--&&e.charAt(t)==" ")r++;if(r%f!=0)return!1;var r=0;while(e.charAt(n++)==" ")r++;return f>2?r%f!=f-1:r%f==0}}var E=Infinity;w(function(e,t){var n=e.search(/\S/);n!==-1?(n<u&&(u=n),o&&!g(e,t)&&(o=!1)):E>e.length&&(E=e.length)}),u==Infinity&&(u=E,s=!1,o=!1),l&&u%f!=0&&(u=Math.floor(u/f)*f),w(o?m:v)},this.toggleBlockComment=function(e,t,n,r){var i=this.blockComment;if(!i)return;!i.start&&i[0]&&(i=i[0]);var s=new f(t,r.row,r.column),o=s.getCurrentToken(),u=t.selection,a=t.selection.toOrientedRange(),c,h;if(o&&/comment/.test(o.type)){var p,d;while(o&&/comment/.test(o.type)){var v=o.value.indexOf(i.start);if(v!=-1){var m=s.getCurrentTokenRow(),g=s.getCurrentTokenColumn()+v;p=new l(m,g,m,g+i.start.length);break}o=s.stepBackward()}var s=new f(t,r.row,r.column),o=s.getCurrentToken();while(o&&/comment/.test(o.type)){var v=o.value.indexOf(i.end);if(v!=-1){var m=s.getCurrentTokenRow(),g=s.getCurrentTokenColumn()+v;d=new l(m,g,m,g+i.end.length);break}o=s.stepForward()}d&&t.remove(d),p&&(t.remove(p),c=p.start.row,h=-i.start.length)}else h=i.start.length,c=n.start.row,t.insert(n.end,i.end),t.insert(n.start,i.start);a.start.row==c&&(a.start.column+=h),a.end.row==c&&(a.end.column+=h),t.selection.fromOrientedRange(a)},this.getNextLineIndent=function(e,t,n){return this.$getIndent(t)},this.checkOutdent=function(e,t,n){return!1},this.autoOutdent=function(e,t,n){},this.$getIndent=function(e){return e.match(/^\s*/)[0]},this.createWorker=function(e){return null},this.createModeDelegates=function(e){this.$embeds=[],this.$modes={};for(var t in e)if(e[t]){var n=e[t],i=n.prototype.$id,s=r.$modes[i];s||(r.$modes[i]=s=new n),r.$modes[t]||(r.$modes[t]=s),this.$embeds.push(t),this.$modes[t]=s}var o=["toggleBlockComment","toggleCommentLines","getNextLineIndent","checkOutdent","autoOutdent","transformAction","getCompletions"];for(var t=0;t<o.length;t++)(function(e){var n=o[t],r=e[n];e[o[t]]=function(){return this.$delegator(n,arguments,r)}})(this)},this.$delegator=function(e,t,n){var r=t[0];if(typeof r!="string"){if(Array.isArray(r[2])){var i=r[2][r[2].length-1],s=this.$modes[i];if(s)return s[e].apply(s,[r[1]].concat([].slice.call(t,1)))}r=r[0]}for(var o=0;o<this.$embeds.length;o++){if(!this.$modes[this.$embeds[o]])continue;var u=r.split(this.$embeds[o]);if(!u[0]&&u[1]){t[0]=u[1];var s=this.$modes[this.$embeds[o]];return s[e].apply(s,t)}}var a=n.apply(this,t);return n?a:undefined},this.transformAction=function(e,t,n,r,i){if(this.$behaviour){var s=this.$behaviour.getBehaviours();for(var o in s)if(s[o][t]){var u=s[o][t].apply(this,arguments);if(u)return u}}},this.getKeywords=function(e){if(!this.completionKeywords){var t=this.$tokenizer.rules,n=[];for(var r in t){var i=t[r];for(var s=0,o=i.length;s<o;s++)if(typeof i[s].token=="string")/keyword|support|storage/.test(i[s].token)&&n.push(i[s].regex);else if(typeof i[s].token=="object")for(var u=0,a=i[s].token.length;u<a;u++)if(/keyword|support|storage/.test(i[s].token[u])){var r=i[s].regex.match(/\(.+?\)/g)[u];n.push(r.substr(1,r.length-2))}}this.completionKeywords=n}return e?n.concat(this.$keywordList||[]):this.$keywordList},this.$createKeywordList=function(){return this.$highlightRules||this.getTokenizer(),this.$keywordList=this.$highlightRules.$keywordList||[]},this.getCompletions=function(e,t,n,r){var i=this.$keywordList||this.$createKeywordList();return i.map(function(e){return{name:e,value:e,score:0,meta:"keyword"}})},this.$id="ace/mode/text"}).call(c.prototype),t.Mode=c}),ace.define("ace/apply_delta",["require","exports","module"],function(e,t,n){"use strict";function r(e,t){throw console.log("Invalid Delta:",e),"Invalid Delta: "+t}function i(e,t){return t.row>=0&&t.row<e.length&&t.column>=0&&t.column<=e[t.row].length}function s(e,t){t.action!="insert"&&t.action!="remove"&&r(t,"delta.action must be 'insert' or 'remove'"),t.lines instanceof Array||r(t,"delta.lines must be an Array"),(!t.start||!t.end)&&r(t,"delta.start/end must be an present");var n=t.start;i(e,t.start)||r(t,"delta.start must be contained in document");var s=t.end;t.action=="remove"&&!i(e,s)&&r(t,"delta.end must contained in document for 'remove' actions");var o=s.row-n.row,u=s.column-(o==0?n.column:0);(o!=t.lines.length-1||t.lines[o].length!=u)&&r(t,"delta.range must match delta lines")}t.applyDelta=function(e,t,n){var r=t.start.row,i=t.start.column,s=e[r]||"";switch(t.action){case"insert":var o=t.lines;if(o.length===1)e[r]=s.substring(0,i)+t.lines[0]+s.substring(i);else{var u=[r,1].concat(t.lines);e.splice.apply(e,u),e[r]=s.substring(0,i)+e[r],e[r+t.lines.length-1]+=s.substring(i)}break;case"remove":var a=t.end.column,f=t.end.row;r===f?e[r]=s.substring(0,i)+s.substring(a):e.splice(r,f-r+1,s.substring(0,i)+e[f].substring(a))}}}),ace.define("ace/anchor",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=t.Anchor=function(e,t,n){this.$onChange=this.onChange.bind(this),this.attach(e),typeof n=="undefined"?this.setPosition(t.row,t.column):this.setPosition(t,n)};(function(){function e(e,t,n){var r=n?e.column<=t.column:e.column<t.column;return e.row<t.row||e.row==t.row&&r}function t(t,n,r){var i=t.action=="insert",s=(i?1:-1)*(t.end.row-t.start.row),o=(i?1:-1)*(t.end.column-t.start.column),u=t.start,a=i?u:t.end;return e(n,u,r)?{row:n.row,column:n.column}:e(a,n,!r)?{row:n.row+s,column:n.column+(n.row==a.row?o:0)}:{row:u.row,column:u.column}}r.implement(this,i),this.getPosition=function(){return this.$clipPositionToDocument(this.row,this.column)},this.getDocument=function(){return this.document},this.$insertRight=!1,this.onChange=function(e){if(e.start.row==e.end.row&&e.start.row!=this.row)return;if(e.start.row>this.row)return;var n=t(e,{row:this.row,column:this.column},this.$insertRight);this.setPosition(n.row,n.column,!0)},this.setPosition=function(e,t,n){var r;n?r={row:e,column:t}:r=this.$clipPositionToDocument(e,t);if(this.row==r.row&&this.column==r.column)return;var i={row:this.row,column:this.column};this.row=r.row,this.column=r.column,this._signal("change",{old:i,value:r})},this.detach=function(){this.document.removeEventListener("change",this.$onChange)},this.attach=function(e){this.document=e||this.document,this.document.on("change",this.$onChange)},this.$clipPositionToDocument=function(e,t){var n={};return e>=this.document.getLength()?(n.row=Math.max(0,this.document.getLength()-1),n.column=this.document.getLine(n.row).length):e<0?(n.row=0,n.column=0):(n.row=e,n.column=Math.min(this.document.getLine(n.row).length,Math.max(0,t))),t<0&&(n.column=0),n}}).call(s.prototype)}),ace.define("ace/document",["require","exports","module","ace/lib/oop","ace/apply_delta","ace/lib/event_emitter","ace/range","ace/anchor"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./apply_delta").applyDelta,s=e("./lib/event_emitter").EventEmitter,o=e("./range").Range,u=e("./anchor").Anchor,a=function(e){this.$lines=[""],e.length===0?this.$lines=[""]:Array.isArray(e)?this.insertMergedLines({row:0,column:0},e):this.insert({row:0,column:0},e)};(function(){r.implement(this,s),this.setValue=function(e){var t=this.getLength()-1;this.remove(new o(0,0,t,this.getLine(t).length)),this.insert({row:0,column:0},e)},this.getValue=function(){return this.getAllLines().join(this.getNewLineCharacter())},this.createAnchor=function(e,t){return new u(this,e,t)},"aaa".split(/a/).length===0?this.$split=function(e){return e.replace(/\r\n|\r/g,"\n").split("\n")}:this.$split=function(e){return e.split(/\r\n|\r|\n/)},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r\n|\r|\n)/m);this.$autoNewLine=t?t[1]:"\n",this._signal("changeNewLineMode")},this.getNewLineCharacter=function(){switch(this.$newLineMode){case"windows":return"\r\n";case"unix":return"\n";default:return this.$autoNewLine||"\n"}},this.$autoNewLine="",this.$newLineMode="auto",this.setNewLineMode=function(e){if(this.$newLineMode===e)return;this.$newLineMode=e,this._signal("changeNewLineMode")},this.getNewLineMode=function(){return this.$newLineMode},this.isNewLine=function(e){return e=="\r\n"||e=="\r"||e=="\n"},this.getLine=function(e){return this.$lines[e]||""},this.getLines=function(e,t){return this.$lines.slice(e,t+1)},this.getAllLines=function(){return this.getLines(0,this.getLength())},this.getLength=function(){return this.$lines.length},this.getTextRange=function(e){return this.getLinesForRange(e).join(this.getNewLineCharacter())},this.getLinesForRange=function(e){var t;if(e.start.row===e.end.row)t=[this.getLine(e.start.row).substring(e.start.column,e.end.column)];else{t=this.getLines(e.start.row,e.end.row),t[0]=(t[0]||"").substring(e.start.column);var n=t.length-1;e.end.row-e.start.row==n&&(t[n]=t[n].substring(0,e.end.column))}return t},this.insertLines=function(e,t){return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."),this.insertFullLines(e,t)},this.removeLines=function(e,t){return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."),this.removeFullLines(e,t)},this.insertNewLine=function(e){return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."),this.insertMergedLines(e,["",""])},this.insert=function(e,t){return this.getLength()<=1&&this.$detectNewLine(t),this.insertMergedLines(e,this.$split(t))},this.insertInLine=function(e,t){var n=this.clippedPos(e.row,e.column),r=this.pos(e.row,e.column+t.length);return this.applyDelta({start:n,end:r,action:"insert",lines:[t]},!0),this.clonePos(r)},this.clippedPos=function(e,t){var n=this.getLength();e===undefined?e=n:e<0?e=0:e>=n&&(e=n-1,t=undefined);var r=this.getLine(e);return t==undefined&&(t=r.length),t=Math.min(Math.max(t,0),r.length),{row:e,column:t}},this.clonePos=function(e){return{row:e.row,column:e.column}},this.pos=function(e,t){return{row:e,column:t}},this.$clipPosition=function(e){var t=this.getLength();return e.row>=t?(e.row=Math.max(0,t-1),e.column=this.getLine(t-1).length):(e.row=Math.max(0,e.row),e.column=Math.min(Math.max(e.column,0),this.getLine(e.row).length)),e},this.insertFullLines=function(e,t){e=Math.min(Math.max(e,0),this.getLength());var n=0;e<this.getLength()?(t=t.concat([""]),n=0):(t=[""].concat(t),e--,n=this.$lines[e].length),this.insertMergedLines({row:e,column:n},t)},this.insertMergedLines=function(e,t){var n=this.clippedPos(e.row,e.column),r={row:n.row+t.length-1,column:(t.length==1?n.column:0)+t[t.length-1].length};return this.applyDelta({start:n,end:r,action:"insert",lines:t}),this.clonePos(r)},this.remove=function(e){var t=this.clippedPos(e.start.row,e.start.column),n=this.clippedPos(e.end.row,e.end.column);return this.applyDelta({start:t,end:n,action:"remove",lines:this.getLinesForRange({start:t,end:n})}),this.clonePos(t)},this.removeInLine=function(e,t,n){var r=this.clippedPos(e,t),i=this.clippedPos(e,n);return this.applyDelta({start:r,end:i,action:"remove",lines:this.getLinesForRange({start:r,end:i})},!0),this.clonePos(r)},this.removeFullLines=function(e,t){e=Math.min(Math.max(0,e),this.getLength()-1),t=Math.min(Math.max(0,t),this.getLength()-1);var n=t==this.getLength()-1&&e>0,r=t<this.getLength()-1,i=n?e-1:e,s=n?this.getLine(i).length:0,u=r?t+1:t,a=r?0:this.getLine(u).length,f=new o(i,s,u,a),l=this.$lines.slice(e,t+1);return this.applyDelta({start:f.start,end:f.end,action:"remove",lines:this.getLinesForRange(f)}),l},this.removeNewLine=function(e){e<this.getLength()-1&&e>=0&&this.applyDelta({start:this.pos(e,this.getLine(e).length),end:this.pos(e+1,0),action:"remove",lines:["",""]})},this.replace=function(e,t){e instanceof o||(e=o.fromPoints(e.start,e.end));if(t.length===0&&e.isEmpty())return e.start;if(t==this.getTextRange(e))return e.end;this.remove(e);var n;return t?n=this.insert(e.start,t):n=e.start,n},this.applyDeltas=function(e){for(var t=0;t<e.length;t++)this.applyDelta(e[t])},this.revertDeltas=function(e){for(var t=e.length-1;t>=0;t--)this.revertDelta(e[t])},this.applyDelta=function(e,t){var n=e.action=="insert";if(n?e.lines.length<=1&&!e.lines[0]:!o.comparePoints(e.start,e.end))return;n&&e.lines.length>2e4?this.$splitAndapplyLargeDelta(e,2e4):(i(this.$lines,e,t),this._signal("change",e))},this.$splitAndapplyLargeDelta=function(e,t){var n=e.lines,r=n.length-t+1,i=e.start.row,s=e.start.column;for(var o=0,u=0;o<r;o=u){u+=t-1;var a=n.slice(o,u);a.push(""),this.applyDelta({start:this.pos(i+o,s),end:this.pos(i+u,s=0),action:e.action,lines:a},!0)}e.lines=n.slice(o),e.start.row=i+o,e.start.column=s,this.applyDelta(e,!0)},this.revertDelta=function(e){this.applyDelta({start:this.clonePos(e.start),end:this.clonePos(e.end),action:e.action=="insert"?"remove":"insert",lines:e.lines.slice()})},this.indexToPosition=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length;for(var i=t||0,s=n.length;i<s;i++){e-=n[i].length+r;if(e<0)return{row:i,column:e+n[i].length+r}}return{row:s-1,column:e+n[s-1].length+r}},this.positionToIndex=function(e,t){var n=this.$lines||this.getAllLines(),r=this.getNewLineCharacter().length,i=0,s=Math.min(e.row,n.length);for(var o=t||0;o<s;++o)i+=n[o].length+r;return i+e.column}}).call(a.prototype),t.Document=a}),ace.define("ace/background_tokenizer",["require","exports","module","ace/lib/oop","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/event_emitter").EventEmitter,s=function(e,t){this.running=!1,this.lines=[],this.states=[],this.currentLine=0,this.tokenizer=e;var n=this;this.$worker=function(){if(!n.running)return;var e=new Date,t=n.currentLine,r=-1,i=n.doc,s=t;while(n.lines[t])t++;var o=i.getLength(),u=0;n.running=!1;while(t<o){n.$tokenizeRow(t),r=t;do t++;while(n.lines[t]);u++;if(u%5===0&&new Date-e>20){n.running=setTimeout(n.$worker,20);break}}n.currentLine=t,r==-1&&(r=t),s<=r&&n.fireUpdateEvent(s,r)}};(function(){r.implement(this,i),this.setTokenizer=function(e){this.tokenizer=e,this.lines=[],this.states=[],this.start(0)},this.setDocument=function(e){this.doc=e,this.lines=[],this.states=[],this.stop()},this.fireUpdateEvent=function(e,t){var n={first:e,last:t};this._signal("update",{data:n})},this.start=function(e){this.currentLine=Math.min(e||0,this.currentLine,this.doc.getLength()),this.lines.splice(this.currentLine,this.lines.length),this.states.splice(this.currentLine,this.states.length),this.stop(),this.running=setTimeout(this.$worker,700)},this.scheduleStart=function(){this.running||(this.running=setTimeout(this.$worker,700))},this.$updateOnChange=function(e){var t=e.start.row,n=e.end.row-t;if(n===0)this.lines[t]=null;else if(e.action=="remove")this.lines.splice(t,n+1,null),this.states.splice(t,n+1,null);else{var r=Array(n+1);r.unshift(t,1),this.lines.splice.apply(this.lines,r),this.states.splice.apply(this.states,r)}this.currentLine=Math.min(t,this.currentLine,this.doc.getLength()),this.stop()},this.stop=function(){this.running&&clearTimeout(this.running),this.running=!1},this.getTokens=function(e){return this.lines[e]||this.$tokenizeRow(e)},this.getState=function(e){return this.currentLine==e&&this.$tokenizeRow(e),this.states[e]||"start"},this.$tokenizeRow=function(e){var t=this.doc.getLine(e),n=this.states[e-1],r=this.tokenizer.getLineTokens(t,n,e);return this.states[e]+""!=r.state+""?(this.states[e]=r.state,this.lines[e+1]=null,this.currentLine>e+1&&(this.currentLine=e+1)):this.currentLine==e&&(this.currentLine=e+1),this.lines[e]=r.tokens}}).call(s.prototype),t.BackgroundTokenizer=s}),ace.define("ace/search_highlight",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(e,t,n){"use strict";var r=e("./lib/lang"),i=e("./lib/oop"),s=e("./range").Range,o=function(e,t,n){this.setRegexp(e),this.clazz=t,this.type=n||"text"};(function(){this.MAX_RANGES=500,this.setRegexp=function(e){if(this.regExp+""==e+"")return;this.regExp=e,this.cache=[]},this.update=function(e,t,n,i){if(!this.regExp)return;var o=i.firstRow,u=i.lastRow;for(var a=o;a<=u;a++){var f=this.cache[a];f==null&&(f=r.getMatchOffsets(n.getLine(a),this.regExp),f.length>this.MAX_RANGES&&(f=f.slice(0,this.MAX_RANGES)),f=f.map(function(e){return new s(a,e.offset,a,e.offset+e.length)}),this.cache[a]=f.length?f:"");for(var l=f.length;l--;)t.drawSingleLineMarker(e,f[l].toScreenRange(n),this.clazz,i)}}}).call(o.prototype),t.SearchHighlight=o}),ace.define("ace/edit_session/fold_line",["require","exports","module","ace/range"],function(e,t,n){"use strict";function i(e,t){this.foldData=e,Array.isArray(t)?this.folds=t:t=this.folds=[t];var n=t[t.length-1];this.range=new r(t[0].start.row,t[0].start.column,n.end.row,n.end.column),this.start=this.range.start,this.end=this.range.end,this.folds.forEach(function(e){e.setFoldLine(this)},this)}var r=e("../range").Range;(function(){this.shiftRow=function(e){this.start.row+=e,this.end.row+=e,this.folds.forEach(function(t){t.start.row+=e,t.end.row+=e})},this.addFold=function(e){if(e.sameRow){if(e.start.row<this.startRow||e.endRow>this.endRow)throw new Error("Can't add a fold to this FoldLine as it has no connection");this.folds.push(e),this.folds.sort(function(e,t){return-e.range.compareEnd(t.start.row,t.start.column)}),this.range.compareEnd(e.start.row,e.start.column)>0?(this.end.row=e.end.row,this.end.column=e.end.column):this.range.compareStart(e.end.row,e.end.column)<0&&(this.start.row=e.start.row,this.start.column=e.start.column)}else if(e.start.row==this.end.row)this.folds.push(e),this.end.row=e.end.row,this.end.column=e.end.column;else{if(e.end.row!=this.start.row)throw new Error("Trying to add fold to FoldRow that doesn't have a matching row");this.folds.unshift(e),this.start.row=e.start.row,this.start.column=e.start.column}e.foldLine=this},this.containsRow=function(e){return e>=this.start.row&&e<=this.end.row},this.walk=function(e,t,n){var r=0,i=this.folds,s,o,u,a=!0;t==null&&(t=this.end.row,n=this.end.column);for(var f=0;f<i.length;f++){s=i[f],o=s.range.compareStart(t,n);if(o==-1){e(null,t,n,r,a);return}u=e(null,s.start.row,s.start.column,r,a),u=!u&&e(s.placeholder,s.start.row,s.start.column,r);if(u||o===0)return;a=!s.sameRow,r=s.end.column}e(null,t,n,r,a)},this.getNextFoldTo=function(e,t){var n,r;for(var i=0;i<this.folds.length;i++){n=this.folds[i],r=n.range.compareEnd(e,t);if(r==-1)return{fold:n,kind:"after"};if(r===0)return{fold:n,kind:"inside"}}return null},this.addRemoveChars=function(e,t,n){var r=this.getNextFoldTo(e,t),i,s;if(r){i=r.fold;if(r.kind=="inside"&&i.start.column!=t&&i.start.row!=e)window.console&&window.console.log(e,t,i);else if(i.start.row==e){s=this.folds;var o=s.indexOf(i);o===0&&(this.start.column+=n);for(o;o<s.length;o++){i=s[o],i.start.column+=n;if(!i.sameRow)return;i.end.column+=n}this.end.column+=n}}},this.split=function(e,t){var n=this.getNextFoldTo(e,t);if(!n||n.kind=="inside")return null;var r=n.fold,s=this.folds,o=this.foldData,u=s.indexOf(r),a=s[u-1];this.end.row=a.end.row,this.end.column=a.end.column,s=s.splice(u,s.length-u);var f=new i(o,s);return o.splice(o.indexOf(this)+1,0,f),f},this.merge=function(e){var t=e.folds;for(var n=0;n<t.length;n++)this.addFold(t[n]);var r=this.foldData;r.splice(r.indexOf(e),1)},this.toString=function(){var e=[this.range.toString()+": ["];return this.folds.forEach(function(t){e.push("  "+t.toString())}),e.push("]"),e.join("\n")},this.idxToPosition=function(e){var t=0;for(var n=0;n<this.folds.length;n++){var r=this.folds[n];e-=r.start.column-t;if(e<0)return{row:r.start.row,column:r.start.column+e};e-=r.placeholder.length;if(e<0)return r.start;t=r.end.column}return{row:this.end.row,column:this.end.column+e}}}).call(i.prototype),t.FoldLine=i}),ace.define("ace/range_list",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("./range").Range,i=r.comparePoints,s=function(){this.ranges=[]};(function(){this.comparePoints=i,this.pointIndex=function(e,t,n){var r=this.ranges;for(var s=n||0;s<r.length;s++){var o=r[s],u=i(e,o.end);if(u>0)continue;var a=i(e,o.start);return u===0?t&&a!==0?-s-2:s:a>0||a===0&&!t?s:-s-1}return-s-1},this.add=function(e){var t=!e.isEmpty(),n=this.pointIndex(e.start,t);n<0&&(n=-n-1);var r=this.pointIndex(e.end,t,n);return r<0?r=-r-1:r++,this.ranges.splice(n,r-n,e)},this.addList=function(e){var t=[];for(var n=e.length;n--;)t.push.apply(t,this.add(e[n]));return t},this.substractPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges.splice(t,1)},this.merge=function(){var e=[],t=this.ranges;t=t.sort(function(e,t){return i(e.start,t.start)});var n=t[0],r;for(var s=1;s<t.length;s++){r=n,n=t[s];var o=i(r.end,n.start);if(o<0)continue;if(o==0&&!r.isEmpty()&&!n.isEmpty())continue;i(r.end,n.end)<0&&(r.end.row=n.end.row,r.end.column=n.end.column),t.splice(s,1),e.push(n),n=r,s--}return this.ranges=t,e},this.contains=function(e,t){return this.pointIndex({row:e,column:t})>=0},this.containsPoint=function(e){return this.pointIndex(e)>=0},this.rangeAtPoint=function(e){var t=this.pointIndex(e);if(t>=0)return this.ranges[t]},this.clipRows=function(e,t){var n=this.ranges;if(n[0].start.row>t||n[n.length-1].start.row<e)return[];var r=this.pointIndex({row:e,column:0});r<0&&(r=-r-1);var i=this.pointIndex({row:t,column:0},r);i<0&&(i=-i-1);var s=[];for(var o=r;o<i;o++)s.push(n[o]);return s},this.removeAll=function(){return this.ranges.splice(0,this.ranges.length)},this.attach=function(e){this.session&&this.detach(),this.session=e,this.onChange=this.$onChange.bind(this),this.session.on("change",this.onChange)},this.detach=function(){if(!this.session)return;this.session.removeListener("change",this.onChange),this.session=null},this.$onChange=function(e){var t=e.start,n=e.end,r=t.row,i=n.row,s=this.ranges;for(var o=0,u=s.length;o<u;o++){var a=s[o];if(a.end.row>=r)break}if(e.action=="insert"){var f=i-r,l=-t.column+n.column;for(;o<u;o++){var a=s[o];if(a.start.row>r)break;a.start.row==r&&a.start.column>=t.column&&(a.start.column!=t.column||!this.$insertRight)&&(a.start.column+=l,a.start.row+=f);if(a.end.row==r&&a.end.column>=t.column){if(a.end.column==t.column&&this.$insertRight)continue;a.end.column==t.column&&l>0&&o<u-1&&a.end.column>a.start.column&&a.end.column==s[o+1].start.column&&(a.end.column-=l),a.end.column+=l,a.end.row+=f}}}else{var f=r-i,l=t.column-n.column;for(;o<u;o++){var a=s[o];if(a.start.row>i)break;if(a.end.row<i&&(r<a.end.row||r==a.end.row&&t.column<a.end.column))a.end.row=r,a.end.column=t.column;else if(a.end.row==i)if(a.end.column<=n.column){if(f||a.end.column>t.column)a.end.column=t.column,a.end.row=t.row}else a.end.column+=l,a.end.row+=f;else a.end.row>i&&(a.end.row+=f);if(a.start.row<i&&(r<a.start.row||r==a.start.row&&t.column<a.start.column))a.start.row=r,a.start.column=t.column;else if(a.start.row==i)if(a.start.column<=n.column){if(f||a.start.column>t.column)a.start.column=t.column,a.start.row=t.row}else a.start.column+=l,a.start.row+=f;else a.start.row>i&&(a.start.row+=f)}}if(f!=0&&o<u)for(;o<u;o++){var a=s[o];a.start.row+=f,a.end.row+=f}}}).call(s.prototype),t.RangeList=s}),ace.define("ace/edit_session/fold",["require","exports","module","ace/range","ace/range_list","ace/lib/oop"],function(e,t,n){"use strict";function u(e,t){e.row-=t.row,e.row==0&&(e.column-=t.column)}function a(e,t){u(e.start,t),u(e.end,t)}function f(e,t){e.row==0&&(e.column+=t.column),e.row+=t.row}function l(e,t){f(e.start,t),f(e.end,t)}var r=e("../range").Range,i=e("../range_list").RangeList,s=e("../lib/oop"),o=t.Fold=function(e,t){this.foldLine=null,this.placeholder=t,this.range=e,this.start=e.start,this.end=e.end,this.sameRow=e.start.row==e.end.row,this.subFolds=this.ranges=[]};s.inherits(o,i),function(){this.toString=function(){return'"'+this.placeholder+'" '+this.range.toString()},this.setFoldLine=function(e){this.foldLine=e,this.subFolds.forEach(function(t){t.setFoldLine(e)})},this.clone=function(){var e=this.range.clone(),t=new o(e,this.placeholder);return this.subFolds.forEach(function(e){t.subFolds.push(e.clone())}),t.collapseChildren=this.collapseChildren,t},this.addSubFold=function(e){if(this.range.isEqual(e))return;if(!this.range.containsRange(e))throw new Error("A fold can't intersect already existing fold"+e.range+this.range);a(e,this.start);var t=e.start.row,n=e.start.column;for(var r=0,i=-1;r<this.subFolds.length;r++){i=this.subFolds[r].range.compare(t,n);if(i!=1)break}var s=this.subFolds[r];if(i==0)return s.addSubFold(e);var t=e.range.end.row,n=e.range.end.column;for(var o=r,i=-1;o<this.subFolds.length;o++){i=this.subFolds[o].range.compare(t,n);if(i!=1)break}var u=this.subFolds[o];if(i==0)throw new Error("A fold can't intersect already existing fold"+e.range+this.range);var f=this.subFolds.splice(r,o-r,e);return e.setFoldLine(this.foldLine),e},this.restoreRange=function(e){return l(e,this.start)}}.call(o.prototype)}),ace.define("ace/edit_session/folding",["require","exports","module","ace/range","ace/edit_session/fold_line","ace/edit_session/fold","ace/token_iterator"],function(e,t,n){"use strict";function u(){this.getFoldAt=function(e,t,n){var r=this.getFoldLine(e);if(!r)return null;var i=r.folds;for(var s=0;s<i.length;s++){var o=i[s];if(o.range.contains(e,t)){if(n==1&&o.range.isEnd(e,t))continue;if(n==-1&&o.range.isStart(e,t))continue;return o}}},this.getFoldsInRange=function(e){var t=e.start,n=e.end,r=this.$foldData,i=[];t.column+=1,n.column-=1;for(var s=0;s<r.length;s++){var o=r[s].range.compareRange(e);if(o==2)continue;if(o==-2)break;var u=r[s].folds;for(var a=0;a<u.length;a++){var f=u[a];o=f.range.compareRange(e);if(o==-2)break;if(o==2)continue;if(o==42)break;i.push(f)}}return t.column-=1,n.column+=1,i},this.getFoldsInRangeList=function(e){if(Array.isArray(e)){var t=[];e.forEach(function(e){t=t.concat(this.getFoldsInRange(e))},this)}else var t=this.getFoldsInRange(e);return t},this.getAllFolds=function(){var e=[],t=this.$foldData;for(var n=0;n<t.length;n++)for(var r=0;r<t[n].folds.length;r++)e.push(t[n].folds[r]);return e},this.getFoldStringAt=function(e,t,n,r){r=r||this.getFoldLine(e);if(!r)return null;var i={end:{column:0}},s,o;for(var u=0;u<r.folds.length;u++){o=r.folds[u];var a=o.range.compareEnd(e,t);if(a==-1){s=this.getLine(o.start.row).substring(i.end.column,o.start.column);break}if(a===0)return null;i=o}return s||(s=this.getLine(o.start.row).substring(i.end.column)),n==-1?s.substring(0,t-i.end.column):n==1?s.substring(t-i.end.column):s},this.getFoldLine=function(e,t){var n=this.$foldData,r=0;t&&(r=n.indexOf(t)),r==-1&&(r=0);for(r;r<n.length;r++){var i=n[r];if(i.start.row<=e&&i.end.row>=e)return i;if(i.end.row>e)return null}return null},this.getNextFoldLine=function(e,t){var n=this.$foldData,r=0;t&&(r=n.indexOf(t)),r==-1&&(r=0);for(r;r<n.length;r++){var i=n[r];if(i.end.row>=e)return i}return null},this.getFoldedRowCount=function(e,t){var n=this.$foldData,r=t-e+1;for(var i=0;i<n.length;i++){var s=n[i],o=s.end.row,u=s.start.row;if(o>=t){u<t&&(u>=e?r-=t-u:r=0);break}o>=e&&(u>=e?r-=o-u:r-=o-e+1)}return r},this.$addFoldLine=function(e){return this.$foldData.push(e),this.$foldData.sort(function(e,t){return e.start.row-t.start.row}),e},this.addFold=function(e,t){var n=this.$foldData,r=!1,o;e instanceof s?o=e:(o=new s(t,e),o.collapseChildren=t.collapseChildren),this.$clipRangeToDocument(o.range);var u=o.start.row,a=o.start.column,f=o.end.row,l=o.end.column;if(u<f||u==f&&a<=l-2){var c=this.getFoldAt(u,a,1),h=this.getFoldAt(f,l,-1);if(c&&h==c)return c.addSubFold(o);c&&!c.range.isStart(u,a)&&this.removeFold(c),h&&!h.range.isEnd(f,l)&&this.removeFold(h);var p=this.getFoldsInRange(o.range);p.length>0&&(this.removeFolds(p),p.forEach(function(e){o.addSubFold(e)}));for(var d=0;d<n.length;d++){var v=n[d];if(f==v.start.row){v.addFold(o),r=!0;break}if(u==v.end.row){v.addFold(o),r=!0;if(!o.sameRow){var m=n[d+1];if(m&&m.start.row==f){v.merge(m);break}}break}if(f<=v.start.row)break}return r||(v=this.$addFoldLine(new i(this.$foldData,o))),this.$useWrapMode?this.$updateWrapData(v.start.row,v.start.row):this.$updateRowLengthCache(v.start.row,v.start.row),this.$modified=!0,this._signal("changeFold",{data:o,action:"add"}),o}throw new Error("The range has to be at least 2 characters width")},this.addFolds=function(e){e.forEach(function(e){this.addFold(e)},this)},this.removeFold=function(e){var t=e.foldLine,n=t.start.row,r=t.end.row,i=this.$foldData,s=t.folds;if(s.length==1)i.splice(i.indexOf(t),1);else if(t.range.isEnd(e.end.row,e.end.column))s.pop(),t.end.row=s[s.length-1].end.row,t.end.column=s[s.length-1].end.column;else if(t.range.isStart(e.start.row,e.start.column))s.shift(),t.start.row=s[0].start.row,t.start.column=s[0].start.column;else if(e.sameRow)s.splice(s.indexOf(e),1);else{var o=t.split(e.start.row,e.start.column);s=o.folds,s.shift(),o.start.row=s[0].start.row,o.start.column=s[0].start.column}this.$updating||(this.$useWrapMode?this.$updateWrapData(n,r):this.$updateRowLengthCache(n,r)),this.$modified=!0,this._signal("changeFold",{data:e,action:"remove"})},this.removeFolds=function(e){var t=[];for(var n=0;n<e.length;n++)t.push(e[n]);t.forEach(function(e){this.removeFold(e)},this),this.$modified=!0},this.expandFold=function(e){this.removeFold(e),e.subFolds.forEach(function(t){e.restoreRange(t),this.addFold(t)},this),e.collapseChildren>0&&this.foldAll(e.start.row+1,e.end.row,e.collapseChildren-1),e.subFolds=[]},this.expandFolds=function(e){e.forEach(function(e){this.expandFold(e)},this)},this.unfold=function(e,t){var n,i;e==null?(n=new r(0,0,this.getLength(),0),t=!0):typeof e=="number"?n=new r(e,0,e,this.getLine(e).length):"row"in e?n=r.fromPoints(e,e):n=e,i=this.getFoldsInRangeList(n);if(t)this.removeFolds(i);else{var s=i;while(s.length)this.expandFolds(s),s=this.getFoldsInRangeList(n)}if(i.length)return i},this.isRowFolded=function(e,t){return!!this.getFoldLine(e,t)},this.getRowFoldEnd=function(e,t){var n=this.getFoldLine(e,t);return n?n.end.row:e},this.getRowFoldStart=function(e,t){var n=this.getFoldLine(e,t);return n?n.start.row:e},this.getFoldDisplayLine=function(e,t,n,r,i){r==null&&(r=e.start.row),i==null&&(i=0),t==null&&(t=e.end.row),n==null&&(n=this.getLine(t).length);var s=this.doc,o="";return e.walk(function(e,t,n,u){if(t<r)return;if(t==r){if(n<i)return;u=Math.max(i,u)}e!=null?o+=e:o+=s.getLine(t).substring(u,n)},t,n),o},this.getDisplayLine=function(e,t,n,r){var i=this.getFoldLine(e);if(!i){var s;return s=this.doc.getLine(e),s.substring(r||0,t||s.length)}return this.getFoldDisplayLine(i,e,t,n,r)},this.$cloneFoldData=function(){var e=[];return e=this.$foldData.map(function(t){var n=t.folds.map(function(e){return e.clone()});return new i(e,n)}),e},this.toggleFold=function(e){var t=this.selection,n=t.getRange(),r,i;if(n.isEmpty()){var s=n.start;r=this.getFoldAt(s.row,s.column);if(r){this.expandFold(r);return}(i=this.findMatchingBracket(s))?n.comparePoint(i)==1?n.end=i:(n.start=i,n.start.column++,n.end.column--):(i=this.findMatchingBracket({row:s.row,column:s.column+1}))?(n.comparePoint(i)==1?n.end=i:n.start=i,n.start.column++):n=this.getCommentFoldRange(s.row,s.column)||n}else{var o=this.getFoldsInRange(n);if(e&&o.length){this.expandFolds(o);return}o.length==1&&(r=o[0])}r||(r=this.getFoldAt(n.start.row,n.start.column));if(r&&r.range.toString()==n.toString()){this.expandFold(r);return}var u="...";if(!n.isMultiLine()){u=this.getTextRange(n);if(u.length<4)return;u=u.trim().substring(0,2)+".."}this.addFold(u,n)},this.getCommentFoldRange=function(e,t,n){var i=new o(this,e,t),s=i.getCurrentToken(),u=s.type;if(s&&/^comment|string/.test(u)){u=u.match(/comment|string/)[0],u=="comment"&&(u+="|doc-start");var a=new RegExp(u),f=new r;if(n!=1){do s=i.stepBackward();while(s&&a.test(s.type));i.stepForward()}f.start.row=i.getCurrentTokenRow(),f.start.column=i.getCurrentTokenColumn()+2,i=new o(this,e,t);if(n!=-1){var l=-1;do{s=i.stepForward();if(l==-1){var c=this.getState(i.$row);a.test(c)||(l=i.$row)}else if(i.$row>l)break}while(s&&a.test(s.type));s=i.stepBackward()}else s=i.getCurrentToken();return f.end.row=i.getCurrentTokenRow(),f.end.column=i.getCurrentTokenColumn()+s.value.length-2,f}},this.foldAll=function(e,t,n){n==undefined&&(n=1e5);var r=this.foldWidgets;if(!r)return;t=t||this.getLength(),e=e||0;for(var i=e;i<t;i++){r[i]==null&&(r[i]=this.getFoldWidget(i));if(r[i]!="start")continue;var s=this.getFoldWidgetRange(i);if(s&&s.isMultiLine()&&s.end.row<=t&&s.start.row>=e){i=s.end.row;try{var o=this.addFold("...",s);o&&(o.collapseChildren=n)}catch(u){}}}},this.$foldStyles={manual:1,markbegin:1,markbeginend:1},this.$foldStyle="markbegin",this.setFoldStyle=function(e){if(!this.$foldStyles[e])throw new Error("invalid fold style: "+e+"["+Object.keys(this.$foldStyles).join(", ")+"]");if(this.$foldStyle==e)return;this.$foldStyle=e,e=="manual"&&this.unfold();var t=this.$foldMode;this.$setFolding(null),this.$setFolding(t)},this.$setFolding=function(e){if(this.$foldMode==e)return;this.$foldMode=e,this.off("change",this.$updateFoldWidgets),this.off("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets),this._signal("changeAnnotation");if(!e||this.$foldStyle=="manual"){this.foldWidgets=null;return}this.foldWidgets=[],this.getFoldWidget=e.getFoldWidget.bind(e,this,this.$foldStyle),this.getFoldWidgetRange=e.getFoldWidgetRange.bind(e,this,this.$foldStyle),this.$updateFoldWidgets=this.updateFoldWidgets.bind(this),this.$tokenizerUpdateFoldWidgets=this.tokenizerUpdateFoldWidgets.bind(this),this.on("change",this.$updateFoldWidgets),this.on("tokenizerUpdate",this.$tokenizerUpdateFoldWidgets)},this.getParentFoldRangeData=function(e,t){var n=this.foldWidgets;if(!n||t&&n[e])return{};var r=e-1,i;while(r>=0){var s=n[r];s==null&&(s=n[r]=this.getFoldWidget(r));if(s=="start"){var o=this.getFoldWidgetRange(r);i||(i=o);if(o&&o.end.row>=e)break}r--}return{range:r!==-1&&o,firstRange:i}},this.onFoldWidgetClick=function(e,t){t=t.domEvent;var n={children:t.shiftKey,all:t.ctrlKey||t.metaKey,siblings:t.altKey},r=this.$toggleFoldWidget(e,n);if(!r){var i=t.target||t.srcElement;i&&/ace_fold-widget/.test(i.className)&&(i.className+=" ace_invalid")}},this.$toggleFoldWidget=function(e,t){if(!this.getFoldWidget)return;var n=this.getFoldWidget(e),r=this.getLine(e),i=n==="end"?-1:1,s=this.getFoldAt(e,i===-1?0:r.length,i);if(s)return t.children||t.all?this.removeFold(s):this.expandFold(s),s;var o=this.getFoldWidgetRange(e,!0);if(o&&!o.isMultiLine()){s=this.getFoldAt(o.start.row,o.start.column,1);if(s&&o.isEqual(s.range))return this.removeFold(s),s}if(t.siblings){var u=this.getParentFoldRangeData(e);if(u.range)var a=u.range.start.row+1,f=u.range.end.row;this.foldAll(a,f,t.all?1e4:0)}else t.children?(f=o?o.end.row:this.getLength(),this.foldAll(e+1,f,t.all?1e4:0)):o&&(t.all&&(o.collapseChildren=1e4),this.addFold("...",o));return o},this.toggleFoldWidget=function(e){var t=this.selection.getCursor().row;t=this.getRowFoldStart(t);var n=this.$toggleFoldWidget(t,{});if(n)return;var r=this.getParentFoldRangeData(t,!0);n=r.range||r.firstRange;if(n){t=n.start.row;var i=this.getFoldAt(t,this.getLine(t).length,1);i?this.removeFold(i):this.addFold("...",n)}},this.updateFoldWidgets=function(e){var t=e.start.row,n=e.end.row-t;if(n===0)this.foldWidgets[t]=null;else if(e.action=="remove")this.foldWidgets.splice(t,n+1,null);else{var r=Array(n+1);r.unshift(t,1),this.foldWidgets.splice.apply(this.foldWidgets,r)}},this.tokenizerUpdateFoldWidgets=function(e){var t=e.data;t.first!=t.last&&this.foldWidgets.length>t.first&&this.foldWidgets.splice(t.first,this.foldWidgets.length)}}var r=e("../range").Range,i=e("./fold_line").FoldLine,s=e("./fold").Fold,o=e("../token_iterator").TokenIterator;t.Folding=u}),ace.define("ace/edit_session/bracket_match",["require","exports","module","ace/token_iterator","ace/range"],function(e,t,n){"use strict";function s(){this.findMatchingBracket=function(e,t){if(e.column==0)return null;var n=t||this.getLine(e.row).charAt(e.column-1);if(n=="")return null;var r=n.match(/([\(\[\{])|([\)\]\}])/);return r?r[1]?this.$findClosingBracket(r[1],e):this.$findOpeningBracket(r[2],e):null},this.getBracketRange=function(e){var t=this.getLine(e.row),n=!0,r,s=t.charAt(e.column-1),o=s&&s.match(/([\(\[\{])|([\)\]\}])/);o||(s=t.charAt(e.column),e={row:e.row,column:e.column+1},o=s&&s.match(/([\(\[\{])|([\)\]\}])/),n=!1);if(!o)return null;if(o[1]){var u=this.$findClosingBracket(o[1],e);if(!u)return null;r=i.fromPoints(e,u),n||(r.end.column++,r.start.column--),r.cursor=r.end}else{var u=this.$findOpeningBracket(o[2],e);if(!u)return null;r=i.fromPoints(u,e),n||(r.start.column++,r.end.column--),r.cursor=r.start}return r},this.$brackets={")":"(","(":")","]":"[","[":"]","{":"}","}":"{"},this.$findOpeningBracket=function(e,t,n){var i=this.$brackets[e],s=1,o=new r(this,t.row,t.column),u=o.getCurrentToken();u||(u=o.stepForward());if(!u)return;n||(n=new RegExp("(\\.?"+u.type.replace(".","\\.").replace("rparen",".paren").replace(/\b(?:end)\b/,"(?:start|begin|end)")+")+"));var a=t.column-o.getCurrentTokenColumn()-2,f=u.value;for(;;){while(a>=0){var l=f.charAt(a);if(l==i){s-=1;if(s==0)return{row:o.getCurrentTokenRow(),column:a+o.getCurrentTokenColumn()}}else l==e&&(s+=1);a-=1}do u=o.stepBackward();while(u&&!n.test(u.type));if(u==null)break;f=u.value,a=f.length-1}return null},this.$findClosingBracket=function(e,t,n){var i=this.$brackets[e],s=1,o=new r(this,t.row,t.column),u=o.getCurrentToken();u||(u=o.stepForward());if(!u)return;n||(n=new RegExp("(\\.?"+u.type.replace(".","\\.").replace("lparen",".paren").replace(/\b(?:start|begin)\b/,"(?:start|begin|end)")+")+"));var a=t.column-o.getCurrentTokenColumn();for(;;){var f=u.value,l=f.length;while(a<l){var c=f.charAt(a);if(c==i){s-=1;if(s==0)return{row:o.getCurrentTokenRow(),column:a+o.getCurrentTokenColumn()}}else c==e&&(s+=1);a+=1}do u=o.stepForward();while(u&&!n.test(u.type));if(u==null)break;a=0}return null}}var r=e("../token_iterator").TokenIterator,i=e("../range").Range;t.BracketMatch=s}),ace.define("ace/edit_session",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/bidihandler","ace/config","ace/lib/event_emitter","ace/selection","ace/mode/text","ace/range","ace/document","ace/background_tokenizer","ace/search_highlight","ace/edit_session/folding","ace/edit_session/bracket_match"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/lang"),s=e("./bidihandler").BidiHandler,o=e("./config"),u=e("./lib/event_emitter").EventEmitter,a=e("./selection").Selection,f=e("./mode/text").Mode,l=e("./range").Range,c=e("./document").Document,h=e("./background_tokenizer").BackgroundTokenizer,p=e("./search_highlight").SearchHighlight,d=function(e,t){this.$breakpoints=[],this.$decorations=[],this.$frontMarkers={},this.$backMarkers={},this.$markerId=1,this.$undoSelect=!0,this.$foldData=[],this.id="session"+ ++d.$uid,this.$foldData.toString=function(){return this.join("\n")},this.on("changeFold",this.onChangeFold.bind(this)),this.$onChange=this.onChange.bind(this);if(typeof e!="object"||!e.getLine)e=new c(e);this.setDocument(e),this.selection=new a(this),this.$bidiHandler=new s(this),o.resetOptions(this),this.setMode(t),o._signal("session",this)};d.$uid=0,function(){function m(e){return e<4352?!1:e>=4352&&e<=4447||e>=4515&&e<=4519||e>=4602&&e<=4607||e>=9001&&e<=9002||e>=11904&&e<=11929||e>=11931&&e<=12019||e>=12032&&e<=12245||e>=12272&&e<=12283||e>=12288&&e<=12350||e>=12353&&e<=12438||e>=12441&&e<=12543||e>=12549&&e<=12589||e>=12593&&e<=12686||e>=12688&&e<=12730||e>=12736&&e<=12771||e>=12784&&e<=12830||e>=12832&&e<=12871||e>=12880&&e<=13054||e>=13056&&e<=19903||e>=19968&&e<=42124||e>=42128&&e<=42182||e>=43360&&e<=43388||e>=44032&&e<=55203||e>=55216&&e<=55238||e>=55243&&e<=55291||e>=63744&&e<=64255||e>=65040&&e<=65049||e>=65072&&e<=65106||e>=65108&&e<=65126||e>=65128&&e<=65131||e>=65281&&e<=65376||e>=65504&&e<=65510}r.implement(this,u),this.setDocument=function(e){this.doc&&this.doc.removeListener("change",this.$onChange),this.doc=e,e.on("change",this.$onChange),this.bgTokenizer&&this.bgTokenizer.setDocument(this.getDocument()),this.resetCaches()},this.getDocument=function(){return this.doc},this.$resetRowCache=function(e){if(!e){this.$docRowCache=[],this.$screenRowCache=[];return}var t=this.$docRowCache.length,n=this.$getRowCacheIndex(this.$docRowCache,e)+1;t>n&&(this.$docRowCache.splice(n,t),this.$screenRowCache.splice(n,t))},this.$getRowCacheIndex=function(e,t){var n=0,r=e.length-1;while(n<=r){var i=n+r>>1,s=e[i];if(t>s)n=i+1;else{if(!(t<s))return i;r=i-1}}return n-1},this.resetCaches=function(){this.$modified=!0,this.$wrapData=[],this.$rowLengthCache=[],this.$resetRowCache(0),this.bgTokenizer&&this.bgTokenizer.start(0)},this.onChangeFold=function(e){var t=e.data;this.$resetRowCache(t.start.row)},this.onChange=function(e){this.$modified=!0,this.$bidiHandler.onChange(e),this.$resetRowCache(e.start.row);var t=this.$updateInternalDataOnChange(e);!this.$fromUndo&&this.$undoManager&&(t&&t.length&&(this.$undoManager.add({action:"removeFolds",folds:t},this.mergeUndoDeltas),this.mergeUndoDeltas=!0),this.$undoManager.add(e,this.mergeUndoDeltas),this.mergeUndoDeltas=!0,this.$informUndoManager.schedule()),this.bgTokenizer&&this.bgTokenizer.$updateOnChange(e),this._signal("change",e)},this.setValue=function(e){this.doc.setValue(e),this.selection.moveTo(0,0),this.$resetRowCache(0),this.setUndoManager(this.$undoManager),this.getUndoManager().reset()},this.getValue=this.toString=function(){return this.doc.getValue()},this.getSelection=function(){return this.selection},this.getState=function(e){return this.bgTokenizer.getState(e)},this.getTokens=function(e){return this.bgTokenizer.getTokens(e)},this.getTokenAt=function(e,t){var n=this.bgTokenizer.getTokens(e),r,i=0;if(t==null){var s=n.length-1;i=this.getLine(e).length}else for(var s=0;s<n.length;s++){i+=n[s].value.length;if(i>=t)break}return r=n[s],r?(r.index=s,r.start=i-r.value.length,r):null},this.setUndoManager=function(e){this.$undoManager=e,this.$informUndoManager&&this.$informUndoManager.cancel();if(e){var t=this;e.addSession(this),this.$syncInformUndoManager=function(){t.$informUndoManager.cancel(),t.mergeUndoDeltas=!1},this.$informUndoManager=i.delayedCall(this.$syncInformUndoManager)}else this.$syncInformUndoManager=function(){}},this.markUndoGroup=function(){this.$syncInformUndoManager&&this.$syncInformUndoManager()},this.$defaultUndoManager={undo:function(){},redo:function(){},reset:function(){},add:function(){},addSelection:function(){},startNewGroup:function(){},addSession:function(){}},this.getUndoManager=function(){return this.$undoManager||this.$defaultUndoManager},this.getTabString=function(){return this.getUseSoftTabs()?i.stringRepeat(" ",this.getTabSize()):"	"},this.setUseSoftTabs=function(e){this.setOption("useSoftTabs",e)},this.getUseSoftTabs=function(){return this.$useSoftTabs&&!this.$mode.$indentWithTabs},this.setTabSize=function(e){this.setOption("tabSize",e)},this.getTabSize=function(){return this.$tabSize},this.isTabStop=function(e){return this.$useSoftTabs&&e.column%this.$tabSize===0},this.setNavigateWithinSoftTabs=function(e){this.setOption("navigateWithinSoftTabs",e)},this.getNavigateWithinSoftTabs=function(){return this.$navigateWithinSoftTabs},this.$overwrite=!1,this.setOverwrite=function(e){this.setOption("overwrite",e)},this.getOverwrite=function(){return this.$overwrite},this.toggleOverwrite=function(){this.setOverwrite(!this.$overwrite)},this.addGutterDecoration=function(e,t){this.$decorations[e]||(this.$decorations[e]=""),this.$decorations[e]+=" "+t,this._signal("changeBreakpoint",{})},this.removeGutterDecoration=function(e,t){this.$decorations[e]=(this.$decorations[e]||"").replace(" "+t,""),this._signal("changeBreakpoint",{})},this.getBreakpoints=function(){return this.$breakpoints},this.setBreakpoints=function(e){this.$breakpoints=[];for(var t=0;t<e.length;t++)this.$breakpoints[e[t]]="ace_breakpoint";this._signal("changeBreakpoint",{})},this.clearBreakpoints=function(){this.$breakpoints=[],this._signal("changeBreakpoint",{})},this.setBreakpoint=function(e,t){t===undefined&&(t="ace_breakpoint"),t?this.$breakpoints[e]=t:delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.clearBreakpoint=function(e){delete this.$breakpoints[e],this._signal("changeBreakpoint",{})},this.addMarker=function(e,t,n,r){var i=this.$markerId++,s={range:e,type:n||"line",renderer:typeof n=="function"?n:null,clazz:t,inFront:!!r,id:i};return r?(this.$frontMarkers[i]=s,this._signal("changeFrontMarker")):(this.$backMarkers[i]=s,this._signal("changeBackMarker")),i},this.addDynamicMarker=function(e,t){if(!e.update)return;var n=this.$markerId++;return e.id=n,e.inFront=!!t,t?(this.$frontMarkers[n]=e,this._signal("changeFrontMarker")):(this.$backMarkers[n]=e,this._signal("changeBackMarker")),e},this.removeMarker=function(e){var t=this.$frontMarkers[e]||this.$backMarkers[e];if(!t)return;var n=t.inFront?this.$frontMarkers:this.$backMarkers;delete n[e],this._signal(t.inFront?"changeFrontMarker":"changeBackMarker")},this.getMarkers=function(e){return e?this.$frontMarkers:this.$backMarkers},this.highlight=function(e){if(!this.$searchHighlight){var t=new p(null,"ace_selected-word","text");this.$searchHighlight=this.addDynamicMarker(t)}this.$searchHighlight.setRegexp(e)},this.highlightLines=function(e,t,n,r){typeof t!="number"&&(n=t,t=e),n||(n="ace_step");var i=new l(e,0,t,Infinity);return i.id=this.addMarker(i,n,"fullLine",r),i},this.setAnnotations=function(e){this.$annotations=e,this._signal("changeAnnotation",{})},this.getAnnotations=function(){return this.$annotations||[]},this.clearAnnotations=function(){this.setAnnotations([])},this.$detectNewLine=function(e){var t=e.match(/^.*?(\r?\n)/m);t?this.$autoNewLine=t[1]:this.$autoNewLine="\n"},this.getWordRange=function(e,t){var n=this.getLine(e),r=!1;t>0&&(r=!!n.charAt(t-1).match(this.tokenRe)),r||(r=!!n.charAt(t).match(this.tokenRe));if(r)var i=this.tokenRe;else if(/^\s+$/.test(n.slice(t-1,t+1)))var i=/\s/;else var i=this.nonTokenRe;var s=t;if(s>0){do s--;while(s>=0&&n.charAt(s).match(i));s++}var o=t;while(o<n.length&&n.charAt(o).match(i))o++;return new l(e,s,e,o)},this.getAWordRange=function(e,t){var n=this.getWordRange(e,t),r=this.getLine(n.end.row);while(r.charAt(n.end.column).match(/[ \t]/))n.end.column+=1;return n},this.setNewLineMode=function(e){this.doc.setNewLineMode(e)},this.getNewLineMode=function(){return this.doc.getNewLineMode()},this.setUseWorker=function(e){this.setOption("useWorker",e)},this.getUseWorker=function(){return this.$useWorker},this.onReloadTokenizer=function(e){var t=e.data;this.bgTokenizer.start(t.first),this._signal("tokenizerUpdate",e)},this.$modes=o.$modes,this.$mode=null,this.$modeId=null,this.setMode=function(e,t){if(e&&typeof e=="object"){if(e.getTokenizer)return this.$onChangeMode(e);var n=e,r=n.path}else r=e||"ace/mode/text";this.$modes["ace/mode/text"]||(this.$modes["ace/mode/text"]=new f);if(this.$modes[r]&&!n){this.$onChangeMode(this.$modes[r]),t&&t();return}this.$modeId=r,o.loadModule(["mode",r],function(e){if(this.$modeId!==r)return t&&t();this.$modes[r]&&!n?this.$onChangeMode(this.$modes[r]):e&&e.Mode&&(e=new e.Mode(n),n||(this.$modes[r]=e,e.$id=r),this.$onChangeMode(e)),t&&t()}.bind(this)),this.$mode||this.$onChangeMode(this.$modes["ace/mode/text"],!0)},this.$onChangeMode=function(e,t){t||(this.$modeId=e.$id);if(this.$mode===e)return;this.$mode=e,this.$stopWorker(),this.$useWorker&&this.$startWorker();var n=e.getTokenizer();if(n.addEventListener!==undefined){var r=this.onReloadTokenizer.bind(this);n.addEventListener("update",r)}if(!this.bgTokenizer){this.bgTokenizer=new h(n);var i=this;this.bgTokenizer.addEventListener("update",function(e){i._signal("tokenizerUpdate",e)})}else this.bgTokenizer.setTokenizer(n);this.bgTokenizer.setDocument(this.getDocument()),this.tokenRe=e.tokenRe,this.nonTokenRe=e.nonTokenRe,t||(e.attachToSession&&e.attachToSession(this),this.$options.wrapMethod.set.call(this,this.$wrapMethod),this.$setFolding(e.foldingRules),this.bgTokenizer.start(0),this._emit("changeMode"))},this.$stopWorker=function(){this.$worker&&(this.$worker.terminate(),this.$worker=null)},this.$startWorker=function(){try{this.$worker=this.$mode.createWorker(this)}catch(e){o.warn("Could not load worker",e),this.$worker=null}},this.getMode=function(){return this.$mode},this.$scrollTop=0,this.setScrollTop=function(e){if(this.$scrollTop===e||isNaN(e))return;this.$scrollTop=e,this._signal("changeScrollTop",e)},this.getScrollTop=function(){return this.$scrollTop},this.$scrollLeft=0,this.setScrollLeft=function(e){if(this.$scrollLeft===e||isNaN(e))return;this.$scrollLeft=e,this._signal("changeScrollLeft",e)},this.getScrollLeft=function(){return this.$scrollLeft},this.getScreenWidth=function(){return this.$computeWidth(),this.lineWidgets?Math.max(this.getLineWidgetMaxWidth(),this.screenWidth):this.screenWidth},this.getLineWidgetMaxWidth=function(){if(this.lineWidgetsWidth!=null)return this.lineWidgetsWidth;var e=0;return this.lineWidgets.forEach(function(t){t&&t.screenWidth>e&&(e=t.screenWidth)}),this.lineWidgetWidth=e},this.$computeWidth=function(e){if(this.$modified||e){this.$modified=!1;if(this.$useWrapMode)return this.screenWidth=this.$wrapLimit;var t=this.doc.getAllLines(),n=this.$rowLengthCache,r=0,i=0,s=this.$foldData[i],o=s?s.start.row:Infinity,u=t.length;for(var a=0;a<u;a++){if(a>o){a=s.end.row+1;if(a>=u)break;s=this.$foldData[i++],o=s?s.start.row:Infinity}n[a]==null&&(n[a]=this.$getStringScreenWidth(t[a])[0]),n[a]>r&&(r=n[a])}this.screenWidth=r}},this.getLine=function(e){return this.doc.getLine(e)},this.getLines=function(e,t){return this.doc.getLines(e,t)},this.getLength=function(){return this.doc.getLength()},this.getTextRange=function(e){return this.doc.getTextRange(e||this.selection.getRange())},this.insert=function(e,t){return this.doc.insert(e,t)},this.remove=function(e){return this.doc.remove(e)},this.removeFullLines=function(e,t){return this.doc.removeFullLines(e,t)},this.undoChanges=function(e,t){if(!e.length)return;this.$fromUndo=!0;for(var n=e.length-1;n!=-1;n--){var r=e[n];r.action=="insert"||r.action=="remove"?this.doc.revertDelta(r):r.folds&&this.addFolds(r.folds)}!t&&this.$undoSelect&&(e.selectionBefore?this.selection.fromJSON(e.selectionBefore):this.selection.setRange(this.$getUndoSelection(e,!0))),this.$fromUndo=!1},this.redoChanges=function(e,t){if(!e.length)return;this.$fromUndo=!0;for(var n=0;n<e.length;n++){var r=e[n];(r.action=="insert"||r.action=="remove")&&this.doc.applyDelta(r)}!t&&this.$undoSelect&&(e.selectionAfter?this.selection.fromJSON(e.selectionAfter):this.selection.setRange(this.$getUndoSelection(e,!1))),this.$fromUndo=!1},this.setUndoSelect=function(e){this.$undoSelect=e},this.$getUndoSelection=function(e,t){function n(e){return t?e.action!=="insert":e.action==="insert"}var r,i,s;for(var o=0;o<e.length;o++){var u=e[o];if(!u.start)continue;if(!r){n(u)?(r=l.fromPoints(u.start,u.end),s=!0):(r=l.fromPoints(u.start,u.start),s=!1);continue}n(u)?(i=u.start,r.compare(i.row,i.column)==-1&&r.setStart(i),i=u.end,r.compare(i.row,i.column)==1&&r.setEnd(i),s=!0):(i=u.start,r.compare(i.row,i.column)==-1&&(r=l.fromPoints(u.start,u.start)),s=!1)}return r},this.replace=function(e,t){return this.doc.replace(e,t)},this.moveText=function(e,t,n){var r=this.getTextRange(e),i=this.getFoldsInRange(e),s=l.fromPoints(t,t);if(!n){this.remove(e);var o=e.start.row-e.end.row,u=o?-e.end.column:e.start.column-e.end.column;u&&(s.start.row==e.end.row&&s.start.column>e.end.column&&(s.start.column+=u),s.end.row==e.end.row&&s.end.column>e.end.column&&(s.end.column+=u)),o&&s.start.row>=e.end.row&&(s.start.row+=o,s.end.row+=o)}s.end=this.insert(s.start,r);if(i.length){var a=e.start,f=s.start,o=f.row-a.row,u=f.column-a.column;this.addFolds(i.map(function(e){return e=e.clone(),e.start.row==a.row&&(e.start.column+=u),e.end.row==a.row&&(e.end.column+=u),e.start.row+=o,e.end.row+=o,e}))}return s},this.indentRows=function(e,t,n){n=n.replace(/\t/g,this.getTabString());for(var r=e;r<=t;r++)this.doc.insertInLine({row:r,column:0},n)},this.outdentRows=function(e){var t=e.collapseRows(),n=new l(0,0,0,0),r=this.getTabSize();for(var i=t.start.row;i<=t.end.row;++i){var s=this.getLine(i);n.start.row=i,n.end.row=i;for(var o=0;o<r;++o)if(s.charAt(o)!=" ")break;o<r&&s.charAt(o)=="	"?(n.start.column=o,n.end.column=o+1):(n.start.column=0,n.end.column=o),this.remove(n)}},this.$moveLines=function(e,t,n){e=this.getRowFoldStart(e),t=this.getRowFoldEnd(t);if(n<0){var r=this.getRowFoldStart(e+n);if(r<0)return 0;var i=r-e}else if(n>0){var r=this.getRowFoldEnd(t+n);if(r>this.doc.getLength()-1)return 0;var i=r-t}else{e=this.$clipRowToDocument(e),t=this.$clipRowToDocument(t);var i=t-e+1}var s=new l(e,0,t,Number.MAX_VALUE),o=this.getFoldsInRange(s).map(function(e){return e=e.clone(),e.start.row+=i,e.end.row+=i,e}),u=n==0?this.doc.getLines(e,t):this.doc.removeFullLines(e,t);return this.doc.insertFullLines(e+i,u),o.length&&this.addFolds(o),i},this.moveLinesUp=function(e,t){return this.$moveLines(e,t,-1)},this.moveLinesDown=function(e,t){return this.$moveLines(e,t,1)},this.duplicateLines=function(e,t){return this.$moveLines(e,t,0)},this.$clipRowToDocument=function(e){return Math.max(0,Math.min(e,this.doc.getLength()-1))},this.$clipColumnToRow=function(e,t){return t<0?0:Math.min(this.doc.getLine(e).length,t)},this.$clipPositionToDocument=function(e,t){t=Math.max(0,t);if(e<0)e=0,t=0;else{var n=this.doc.getLength();e>=n?(e=n-1,t=this.doc.getLine(n-1).length):t=Math.min(this.doc.getLine(e).length,t)}return{row:e,column:t}},this.$clipRangeToDocument=function(e){e.start.row<0?(e.start.row=0,e.start.column=0):e.start.column=this.$clipColumnToRow(e.start.row,e.start.column);var t=this.doc.getLength()-1;return e.end.row>t?(e.end.row=t,e.end.column=this.doc.getLine(t).length):e.end.column=this.$clipColumnToRow(e.end.row,e.end.column),e},this.$wrapLimit=80,this.$useWrapMode=!1,this.$wrapLimitRange={min:null,max:null},this.setUseWrapMode=function(e){if(e!=this.$useWrapMode){this.$useWrapMode=e,this.$modified=!0,this.$resetRowCache(0);if(e){var t=this.getLength();this.$wrapData=Array(t),this.$updateWrapData(0,t-1)}this._signal("changeWrapMode")}},this.getUseWrapMode=function(){return this.$useWrapMode},this.setWrapLimitRange=function(e,t){if(this.$wrapLimitRange.min!==e||this.$wrapLimitRange.max!==t)this.$wrapLimitRange={min:e,max:t},this.$modified=!0,this.$bidiHandler.markAsDirty(),this.$useWrapMode&&this._signal("changeWrapMode")},this.adjustWrapLimit=function(e,t){var n=this.$wrapLimitRange;n.max<0&&(n={min:t,max:t});var r=this.$constrainWrapLimit(e,n.min,n.max);return r!=this.$wrapLimit&&r>1?(this.$wrapLimit=r,this.$modified=!0,this.$useWrapMode&&(this.$updateWrapData(0,this.getLength()-1),this.$resetRowCache(0),this._signal("changeWrapLimit")),!0):!1},this.$constrainWrapLimit=function(e,t,n){return t&&(e=Math.max(t,e)),n&&(e=Math.min(n,e)),e},this.getWrapLimit=function(){return this.$wrapLimit},this.setWrapLimit=function(e){this.setWrapLimitRange(e,e)},this.getWrapLimitRange=function(){return{min:this.$wrapLimitRange.min,max:this.$wrapLimitRange.max}},this.$updateInternalDataOnChange=function(e){var t=this.$useWrapMode,n=e.action,r=e.start,i=e.end,s=r.row,o=i.row,u=o-s,a=null;this.$updating=!0;if(u!=0)if(n==="remove"){this[t?"$wrapData":"$rowLengthCache"].splice(s,u);var f=this.$foldData;a=this.getFoldsInRange(e),this.removeFolds(a);var l=this.getFoldLine(i.row),c=0;if(l){l.addRemoveChars(i.row,i.column,r.column-i.column),l.shiftRow(-u);var h=this.getFoldLine(s);h&&h!==l&&(h.merge(l),l=h),c=f.indexOf(l)+1}for(c;c<f.length;c++){var l=f[c];l.start.row>=i.row&&l.shiftRow(-u)}o=s}else{var p=Array(u);p.unshift(s,0);var d=t?this.$wrapData:this.$rowLengthCache;d.splice.apply(d,p);var f=this.$foldData,l=this.getFoldLine(s),c=0;if(l){var v=l.range.compareInside(r.row,r.column);v==0?(l=l.split(r.row,r.column),l&&(l.shiftRow(u),l.addRemoveChars(o,0,i.column-r.column))):v==-1&&(l.addRemoveChars(s,0,i.column-r.column),l.shiftRow(u)),c=f.indexOf(l)+1}for(c;c<f.length;c++){var l=f[c];l.start.row>=s&&l.shiftRow(u)}}else{u=Math.abs(e.start.column-e.end.column),n==="remove"&&(a=this.getFoldsInRange(e),this.removeFolds(a),u=-u);var l=this.getFoldLine(s);l&&l.addRemoveChars(s,r.column,u)}return t&&this.$wrapData.length!=this.doc.getLength()&&console.error("doc.getLength() and $wrapData.length have to be the same!"),this.$updating=!1,t?this.$updateWrapData(s,o):this.$updateRowLengthCache(s,o),a},this.$updateRowLengthCache=function(e,t,n){this.$rowLengthCache[e]=null,this.$rowLengthCache[t]=null},this.$updateWrapData=function(e,t){var r=this.doc.getAllLines(),i=this.getTabSize(),o=this.$wrapData,u=this.$wrapLimit,a,f,l=e;t=Math.min(t,r.length-1);while(l<=t)f=this.getFoldLine(l,f),f?(a=[],f.walk(function(e,t,i,o){var u;if(e!=null){u=this.$getDisplayTokens(e,a.length),u[0]=n;for(var f=1;f<u.length;f++)u[f]=s}else u=this.$getDisplayTokens(r[t].substring(o,i),a.length);a=a.concat(u)}.bind(this),f.end.row,r[f.end.row].length+1),o[f.start.row]=this.$computeWrapSplits(a,u,i),l=f.end.row+1):(a=this.$getDisplayTokens(r[l]),o[l]=this.$computeWrapSplits(a,u,i),l++)};var e=1,t=2,n=3,s=4,a=9,c=10,d=11,v=12;this.$computeWrapSplits=function(e,r,i){function g(){var t=0;if(m===0)return t;if(p)for(var n=0;n<e.length;n++){var r=e[n];if(r==c)t+=1;else{if(r!=d){if(r==v)continue;break}t+=i}}return h&&p!==!1&&(t+=i),Math.min(t,m)}function y(t){var n=t-f;for(var r=f;r<t;r++){var i=e[r];if(i===12||i===2)n-=1}o.length||(b=g(),o.indent=b),l+=n,o.push(l),f=t}if(e.length==0)return[];var o=[],u=e.length,f=0,l=0,h=this.$wrapAsCode,p=this.$indentedSoftWrap,m=r<=Math.max(2*i,8)||p===!1?0:Math.floor(r/2),b=0;while(u-f>r-b){var w=f+r-b;if(e[w-1]>=c&&e[w]>=c){y(w);continue}if(e[w]==n||e[w]==s){for(w;w!=f-1;w--)if(e[w]==n)break;if(w>f){y(w);continue}w=f+r;for(w;w<e.length;w++)if(e[w]!=s)break;if(w==e.length)break;y(w);continue}var E=Math.max(w-(r-(r>>2)),f-1);while(w>E&&e[w]<n)w--;if(h){while(w>E&&e[w]<n)w--;while(w>E&&e[w]==a)w--}else while(w>E&&e[w]<c)w--;if(w>E){y(++w);continue}w=f+r,e[w]==t&&w--,y(w-b)}return o},this.$getDisplayTokens=function(n,r){var i=[],s;r=r||0;for(var o=0;o<n.length;o++){var u=n.charCodeAt(o);if(u==9){s=this.getScreenTabSize(i.length+r),i.push(d);for(var f=1;f<s;f++)i.push(v)}else u==32?i.push(c):u>39&&u<48||u>57&&u<64?i.push(a):u>=4352&&m(u)?i.push(e,t):i.push(e)}return i},this.$getStringScreenWidth=function(e,t,n){if(t==0)return[0,0];t==null&&(t=Infinity),n=n||0;var r,i;for(i=0;i<e.length;i++){r=e.charCodeAt(i),r==9?n+=this.getScreenTabSize(n):r>=4352&&m(r)?n+=2:n+=1;if(n>t)break}return[n,i]},this.lineWidgets=null,this.getRowLength=function(e){if(this.lineWidgets)var t=this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0;else t=0;return!this.$useWrapMode||!this.$wrapData[e]?1+t:this.$wrapData[e].length+1+t},this.getRowLineCount=function(e){return!this.$useWrapMode||!this.$wrapData[e]?1:this.$wrapData[e].length+1},this.getRowWrapIndent=function(e){if(this.$useWrapMode){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE),n=this.$wrapData[t.row];return n.length&&n[0]<t.column?n.indent:0}return 0},this.getScreenLastRowColumn=function(e){var t=this.screenToDocumentPosition(e,Number.MAX_VALUE);return this.documentToScreenColumn(t.row,t.column)},this.getDocumentLastRowColumn=function(e,t){var n=this.documentToScreenRow(e,t);return this.getScreenLastRowColumn(n)},this.getDocumentLastRowColumnPosition=function(e,t){var n=this.documentToScreenRow(e,t);return this.screenToDocumentPosition(n,Number.MAX_VALUE/10)},this.getRowSplitData=function(e){return this.$useWrapMode?this.$wrapData[e]:undefined},this.getScreenTabSize=function(e){return this.$tabSize-e%this.$tabSize},this.screenToDocumentRow=function(e,t){return this.screenToDocumentPosition(e,t).row},this.screenToDocumentColumn=function(e,t){return this.screenToDocumentPosition(e,t).column},this.screenToDocumentPosition=function(e,t,n){if(e<0)return{row:0,column:0};var r,i=0,s=0,o,u=0,a=0,f=this.$screenRowCache,l=this.$getRowCacheIndex(f,e),c=f.length;if(c&&l>=0)var u=f[l],i=this.$docRowCache[l],h=e>f[c-1];else var h=!c;var p=this.getLength()-1,d=this.getNextFoldLine(i),v=d?d.start.row:Infinity;while(u<=e){a=this.getRowLength(i);if(u+a>e||i>=p)break;u+=a,i++,i>v&&(i=d.end.row+1,d=this.getNextFoldLine(i,d),v=d?d.start.row:Infinity),h&&(this.$docRowCache.push(i),this.$screenRowCache.push(u))}if(d&&d.start.row<=i)r=this.getFoldDisplayLine(d),i=d.start.row;else{if(u+a<=e||i>p)return{row:p,column:this.getLine(p).length};r=this.getLine(i),d=null}var m=0,g=Math.floor(e-u);if(this.$useWrapMode){var y=this.$wrapData[i];y&&(o=y[g],g>0&&y.length&&(m=y.indent,s=y[g-1]||y[y.length-1],r=r.substring(s)))}return n!==undefined&&this.$bidiHandler.isBidiRow(u+g,i,g)&&(t=this.$bidiHandler.offsetToCol(n)),s+=this.$getStringScreenWidth(r,t-m)[1],this.$useWrapMode&&s>=o&&(s=o-1),d?d.idxToPosition(s):{row:i,column:s}},this.documentToScreenPosition=function(e,t){if(typeof t=="undefined")var n=this.$clipPositionToDocument(e.row,e.column);else n=this.$clipPositionToDocument(e,t);e=n.row,t=n.column;var r=0,i=null,s=null;s=this.getFoldAt(e,t,1),s&&(e=s.start.row,t=s.start.column);var o,u=0,a=this.$docRowCache,f=this.$getRowCacheIndex(a,e),l=a.length;if(l&&f>=0)var u=a[f],r=this.$screenRowCache[f],c=e>a[l-1];else var c=!l;var h=this.getNextFoldLine(u),p=h?h.start.row:Infinity;while(u<e){if(u>=p){o=h.end.row+1;if(o>e)break;h=this.getNextFoldLine(o,h),p=h?h.start.row:Infinity}else o=u+1;r+=this.getRowLength(u),u=o,c&&(this.$docRowCache.push(u),this.$screenRowCache.push(r))}var d="";h&&u>=p?(d=this.getFoldDisplayLine(h,e,t),i=h.start.row):(d=this.getLine(e).substring(0,t),i=e);var v=0;if(this.$useWrapMode){var m=this.$wrapData[i];if(m){var g=0;while(d.length>=m[g])r++,g++;d=d.substring(m[g-1]||0,d.length),v=g>0?m.indent:0}}return{row:r,column:v+this.$getStringScreenWidth(d)[0]}},this.documentToScreenColumn=function(e,t){return this.documentToScreenPosition(e,t).column},this.documentToScreenRow=function(e,t){return this.documentToScreenPosition(e,t).row},this.getScreenLength=function(){var e=0,t=null;if(!this.$useWrapMode){e=this.getLength();var n=this.$foldData;for(var r=0;r<n.length;r++)t=n[r],e-=t.end.row-t.start.row}else{var i=this.$wrapData.length,s=0,r=0,t=this.$foldData[r++],o=t?t.start.row:Infinity;while(s<i){var u=this.$wrapData[s];e+=u?u.length+1:1,s++,s>o&&(s=t.end.row+1,t=this.$foldData[r++],o=t?t.start.row:Infinity)}}return this.lineWidgets&&(e+=this.$getWidgetScreenLength()),e},this.$setFontMetrics=function(e){if(!this.$enableVarChar)return;this.$getStringScreenWidth=function(t,n,r){if(n===0)return[0,0];n||(n=Infinity),r=r||0;var i,s;for(s=0;s<t.length;s++){i=t.charAt(s),i==="	"?r+=this.getScreenTabSize(r):r+=e.getCharacterWidth(i);if(r>n)break}return[r,s]}},this.destroy=function(){this.bgTokenizer&&(this.bgTokenizer.setDocument(null),this.bgTokenizer=null),this.$stopWorker()},this.isFullWidth=m}.call(d.prototype),e("./edit_session/folding").Folding.call(d.prototype),e("./edit_session/bracket_match").BracketMatch.call(d.prototype),o.defineOptions(d.prototype,"session",{wrap:{set:function(e){!e||e=="off"?e=!1:e=="free"?e=!0:e=="printMargin"?e=-1:typeof e=="string"&&(e=parseInt(e,10)||!1);if(this.$wrap==e)return;this.$wrap=e;if(!e)this.setUseWrapMode(!1);else{var t=typeof e=="number"?e:null;this.setWrapLimitRange(t,t),this.setUseWrapMode(!0)}},get:function(){return this.getUseWrapMode()?this.$wrap==-1?"printMargin":this.getWrapLimitRange().min?this.$wrap:"free":"off"},handlesSet:!0},wrapMethod:{set:function(e){e=e=="auto"?this.$mode.type!="text":e!="text",e!=this.$wrapAsCode&&(this.$wrapAsCode=e,this.$useWrapMode&&(this.$useWrapMode=!1,this.setUseWrapMode(!0)))},initialValue:"auto"},indentedSoftWrap:{set:function(){this.$useWrapMode&&(this.$useWrapMode=!1,this.setUseWrapMode(!0))},initialValue:!0},firstLineNumber:{set:function(){this._signal("changeBreakpoint")},initialValue:1},useWorker:{set:function(e){this.$useWorker=e,this.$stopWorker(),e&&this.$startWorker()},initialValue:!0},useSoftTabs:{initialValue:!0},tabSize:{set:function(e){if(isNaN(e)||this.$tabSize===e)return;this.$modified=!0,this.$rowLengthCache=[],this.$tabSize=e,this._signal("changeTabSize")},initialValue:4,handlesSet:!0},navigateWithinSoftTabs:{initialValue:!1},foldStyle:{set:function(e){this.setFoldStyle(e)},handlesSet:!0},overwrite:{set:function(e){this._signal("changeOverwrite")},initialValue:!1},newLineMode:{set:function(e){this.doc.setNewLineMode(e)},get:function(){return this.doc.getNewLineMode()},handlesSet:!0},mode:{set:function(e){this.setMode(e)},get:function(){return this.$modeId},handlesSet:!0}}),t.EditSession=d}),ace.define("ace/search",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/range"],function(e,t,n){"use strict";function u(e,t){function n(e){return/\w/.test(e)||t.regExp?"\\b":""}return n(e[0])+e+n(e[e.length-1])}var r=e("./lib/lang"),i=e("./lib/oop"),s=e("./range").Range,o=function(){this.$options={}};(function(){this.set=function(e){return i.mixin(this.$options,e),this},this.getOptions=function(){return r.copyObject(this.$options)},this.setOptions=function(e){this.$options=e},this.find=function(e){var t=this.$options,n=this.$matchIterator(e,t);if(!n)return!1;var r=null;return n.forEach(function(e,n,i,o){return r=new s(e,n,i,o),n==o&&t.start&&t.start.start&&t.skipCurrent!=0&&r.isEqual(t.start)?(r=null,!1):!0}),r},this.findAll=function(e){var t=this.$options;if(!t.needle)return[];this.$assembleRegExp(t);var n=t.range,i=n?e.getLines(n.start.row,n.end.row):e.doc.getAllLines(),o=[],u=t.re;if(t.$isMultiLine){var a=u.length,f=i.length-a,l;e:for(var c=u.offset||0;c<=f;c++){for(var h=0;h<a;h++)if(i[c+h].search(u[h])==-1)continue e;var p=i[c],d=i[c+a-1],v=p.length-p.match(u[0])[0].length,m=d.match(u[a-1])[0].length;if(l&&l.end.row===c&&l.end.column>v)continue;o.push(l=new s(c,v,c+a-1,m)),a>2&&(c=c+a-2)}}else for(var g=0;g<i.length;g++){var y=r.getMatchOffsets(i[g],u);for(var h=0;h<y.length;h++){var b=y[h];o.push(new s(g,b.offset,g,b.offset+b.length))}}if(n){var w=n.start.column,E=n.start.column,g=0,h=o.length-1;while(g<h&&o[g].start.column<w&&o[g].start.row==n.start.row)g++;while(g<h&&o[h].end.column>E&&o[h].end.row==n.end.row)h--;o=o.slice(g,h+1);for(g=0,h=o.length;g<h;g++)o[g].start.row+=n.start.row,o[g].end.row+=n.start.row}return o},this.replace=function(e,t){var n=this.$options,r=this.$assembleRegExp(n);if(n.$isMultiLine)return t;if(!r)return;var i=r.exec(e);if(!i||i[0].length!=e.length)return null;t=e.replace(r,t);if(n.preserveCase){t=t.split("");for(var s=Math.min(e.length,e.length);s--;){var o=e[s];o&&o.toLowerCase()!=o?t[s]=t[s].toUpperCase():t[s]=t[s].toLowerCase()}t=t.join("")}return t},this.$assembleRegExp=function(e,t){if(e.needle instanceof RegExp)return e.re=e.needle;var n=e.needle;if(!e.needle)return e.re=!1;e.regExp||(n=r.escapeRegExp(n)),e.wholeWord&&(n=u(n,e));var i=e.caseSensitive?"gm":"gmi";e.$isMultiLine=!t&&/[\n\r]/.test(n);if(e.$isMultiLine)return e.re=this.$assembleMultilineRegExp(n,i);try{var s=new RegExp(n,i)}catch(o){s=!1}return e.re=s},this.$assembleMultilineRegExp=function(e,t){var n=e.replace(/\r\n|\r|\n/g,"$\n^").split("\n"),r=[];for(var i=0;i<n.length;i++)try{r.push(new RegExp(n[i],t))}catch(s){return!1}return r},this.$matchIterator=function(e,t){var n=this.$assembleRegExp(t);if(!n)return!1;var r=t.backwards==1,i=t.skipCurrent!=0,s=t.range,o=t.start;o||(o=s?s[r?"end":"start"]:e.selection.getRange()),o.start&&(o=o[i!=r?"end":"start"]);var u=s?s.start.row:0,a=s?s.end.row:e.getLength()-1;if(r)var f=function(e){var n=o.row;if(c(n,o.column,e))return;for(n--;n>=u;n--)if(c(n,Number.MAX_VALUE,e))return;if(t.wrap==0)return;for(n=a,u=o.row;n>=u;n--)if(c(n,Number.MAX_VALUE,e))return};else var f=function(e){var n=o.row;if(c(n,o.column,e))return;for(n+=1;n<=a;n++)if(c(n,0,e))return;if(t.wrap==0)return;for(n=u,a=o.row;n<=a;n++)if(c(n,0,e))return};if(t.$isMultiLine)var l=n.length,c=function(t,i,s){var o=r?t-l+1:t;if(o<0)return;var u=e.getLine(o),a=u.search(n[0]);if(!r&&a<i||a===-1)return;for(var f=1;f<l;f++){u=e.getLine(o+f);if(u.search(n[f])==-1)return}var c=u.match(n[l-1])[0].length;if(r&&c>i)return;if(s(o,a,o+l-1,c))return!0};else if(r)var c=function(t,r,i){var s=e.getLine(t),o=[],u,a=0;n.lastIndex=0;while(u=n.exec(s)){var f=u[0].length;a=u.index;if(!f){if(a>=s.length)break;n.lastIndex=a+=1}if(u.index+f>r)break;o.push(u.index,f)}for(var l=o.length-1;l>=0;l-=2){var c=o[l-1],f=o[l];if(i(t,c,t,c+f))return!0}};else var c=function(t,r,i){var s=e.getLine(t),o,u;n.lastIndex=r;while(u=n.exec(s)){var a=u[0].length;o=u.index;if(i(t,o,t,o+a))return!0;if(!a){n.lastIndex=o+=1;if(o>=s.length)return!1}}};return{forEach:f}}}).call(o.prototype),t.Search=o}),ace.define("ace/keyboard/hash_handler",["require","exports","module","ace/lib/keys","ace/lib/useragent"],function(e,t,n){"use strict";function o(e,t){this.platform=t||(i.isMac?"mac":"win"),this.commands={},this.commandKeyBinding={},this.addCommands(e),this.$singleCommand=!0}function u(e,t){o.call(this,e,t),this.$singleCommand=!1}var r=e("../lib/keys"),i=e("../lib/useragent"),s=r.KEY_MODS;u.prototype=o.prototype,function(){function e(e){return typeof e=="object"&&e.bindKey&&e.bindKey.position||(e.isDefault?-100:0)}this.addCommand=function(e){this.commands[e.name]&&this.removeCommand(e),this.commands[e.name]=e,e.bindKey&&this._buildKeyHash(e)},this.removeCommand=function(e,t){var n=e&&(typeof e=="string"?e:e.name);e=this.commands[n],t||delete this.commands[n];var r=this.commandKeyBinding;for(var i in r){var s=r[i];if(s==e)delete r[i];else if(Array.isArray(s)){var o=s.indexOf(e);o!=-1&&(s.splice(o,1),s.length==1&&(r[i]=s[0]))}}},this.bindKey=function(e,t,n){typeof e=="object"&&e&&(n==undefined&&(n=e.position),e=e[this.platform]);if(!e)return;if(typeof t=="function")return this.addCommand({exec:t,bindKey:e,name:t.name||e});e.split("|").forEach(function(e){var r="";if(e.indexOf(" ")!=-1){var i=e.split(/\s+/);e=i.pop(),i.forEach(function(e){var t=this.parseKeys(e),n=s[t.hashId]+t.key;r+=(r?" ":"")+n,this._addCommandToBinding(r,"chainKeys")},this),r+=" "}var o=this.parseKeys(e),u=s[o.hashId]+o.key;this._addCommandToBinding(r+u,t,n)},this)},this._addCommandToBinding=function(t,n,r){var i=this.commandKeyBinding,s;if(!n)delete i[t];else if(!i[t]||this.$singleCommand)i[t]=n;else{Array.isArray(i[t])?(s=i[t].indexOf(n))!=-1&&i[t].splice(s,1):i[t]=[i[t]],typeof r!="number"&&(r=e(n));var o=i[t];for(s=0;s<o.length;s++){var u=o[s],a=e(u);if(a>r)break}o.splice(s,0,n)}},this.addCommands=function(e){e&&Object.keys(e).forEach(function(t){var n=e[t];if(!n)return;if(typeof n=="string")return this.bindKey(n,t);typeof n=="function"&&(n={exec:n});if(typeof n!="object")return;n.name||(n.name=t),this.addCommand(n)},this)},this.removeCommands=function(e){Object.keys(e).forEach(function(t){this.removeCommand(e[t])},this)},this.bindKeys=function(e){Object.keys(e).forEach(function(t){this.bindKey(t,e[t])},this)},this._buildKeyHash=function(e){this.bindKey(e.bindKey,e)},this.parseKeys=function(e){var t=e.toLowerCase().split(/[\-\+]([\-\+])?/).filter(function(e){return e}),n=t.pop(),i=r[n];if(r.FUNCTION_KEYS[i])n=r.FUNCTION_KEYS[i].toLowerCase();else{if(!t.length)return{key:n,hashId:-1};if(t.length==1&&t[0]=="shift")return{key:n.toUpperCase(),hashId:-1}}var s=0;for(var o=t.length;o--;){var u=r.KEY_MODS[t[o]];if(u==null)return typeof console!="undefined"&&console.error("invalid modifier "+t[o]+" in "+e),!1;s|=u}return{key:n,hashId:s}},this.findKeyCommand=function(t,n){var r=s[t]+n;return this.commandKeyBinding[r]},this.handleKeyboard=function(e,t,n,r){if(r<0)return;var i=s[t]+n,o=this.commandKeyBinding[i];e.$keyChain&&(e.$keyChain+=" "+i,o=this.commandKeyBinding[e.$keyChain]||o);if(o)if(o=="chainKeys"||o[o.length-1]=="chainKeys")return e.$keyChain=e.$keyChain||i,{command:"null"};if(e.$keyChain)if(!!t&&t!=4||n.length!=1){if(t==-1||r>0)e.$keyChain=""}else e.$keyChain=e.$keyChain.slice(0,-i.length-1);return{command:o}},this.getStatusText=function(e,t){return t.$keyChain||""}}.call(o.prototype),t.HashHandler=o,t.MultiHashHandler=u}),ace.define("ace/commands/command_manager",["require","exports","module","ace/lib/oop","ace/keyboard/hash_handler","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../keyboard/hash_handler").MultiHashHandler,s=e("../lib/event_emitter").EventEmitter,o=function(e,t){i.call(this,t,e),this.byName=this.commands,this.setDefaultHandler("exec",function(e){return e.command.exec(e.editor,e.args||{})})};r.inherits(o,i),function(){r.implement(this,s),this.exec=function(e,t,n){if(Array.isArray(e)){for(var r=e.length;r--;)if(this.exec(e[r],t,n))return!0;return!1}typeof e=="string"&&(e=this.commands[e]);if(!e)return!1;if(t&&t.$readOnly&&!e.readOnly)return!1;if(this.$checkCommandState!=0&&e.isAvailable&&!e.isAvailable(t))return!1;var i={editor:t,command:e,args:n};return i.returnValue=this._emit("exec",i),this._signal("afterExec",i),i.returnValue===!1?!1:!0},this.toggleRecording=function(e){if(this.$inReplay)return;return e&&e._emit("changeStatus"),this.recording?(this.macro.pop(),this.removeEventListener("exec",this.$addCommandToMacro),this.macro.length||(this.macro=this.oldMacro),this.recording=!1):(this.$addCommandToMacro||(this.$addCommandToMacro=function(e){this.macro.push([e.command,e.args])}.bind(this)),this.oldMacro=this.macro,this.macro=[],this.on("exec",this.$addCommandToMacro),this.recording=!0)},this.replay=function(e){if(this.$inReplay||!this.macro)return;if(this.recording)return this.toggleRecording(e);try{this.$inReplay=!0,this.macro.forEach(function(t){typeof t=="string"?this.exec(t,e):this.exec(t[0],e,t[1])},this)}finally{this.$inReplay=!1}},this.trimMacro=function(e){return e.map(function(e){return typeof e[0]!="string"&&(e[0]=e[0].name),e[1]||(e=e[0]),e})}}.call(o.prototype),t.CommandManager=o}),ace.define("ace/commands/default_commands",["require","exports","module","ace/lib/lang","ace/config","ace/range"],function(e,t,n){"use strict";function o(e,t){return{win:e,mac:t}}var r=e("../lib/lang"),i=e("../config"),s=e("../range").Range;t.commands=[{name:"showSettingsMenu",bindKey:o("Ctrl-,","Command-,"),exec:function(e){i.loadModule("ace/ext/settings_menu",function(t){t.init(e),e.showSettingsMenu()})},readOnly:!0},{name:"goToNextError",bindKey:o("Alt-E","F4"),exec:function(e){i.loadModule("./ext/error_marker",function(t){t.showErrorMarker(e,1)})},scrollIntoView:"animate",readOnly:!0},{name:"goToPreviousError",bindKey:o("Alt-Shift-E","Shift-F4"),exec:function(e){i.loadModule("./ext/error_marker",function(t){t.showErrorMarker(e,-1)})},scrollIntoView:"animate",readOnly:!0},{name:"selectall",bindKey:o("Ctrl-A","Command-A"),exec:function(e){e.selectAll()},readOnly:!0},{name:"centerselection",bindKey:o(null,"Ctrl-L"),exec:function(e){e.centerSelection()},readOnly:!0},{name:"gotoline",bindKey:o("Ctrl-L","Command-L"),exec:function(e,t){typeof t!="number"&&(t=parseInt(prompt("Enter line number:"),10)),isNaN(t)||e.gotoLine(t)},readOnly:!0},{name:"fold",bindKey:o("Alt-L|Ctrl-F1","Command-Alt-L|Command-F1"),exec:function(e){e.session.toggleFold(!1)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"unfold",bindKey:o("Alt-Shift-L|Ctrl-Shift-F1","Command-Alt-Shift-L|Command-Shift-F1"),exec:function(e){e.session.toggleFold(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleFoldWidget",bindKey:o("F2","F2"),exec:function(e){e.session.toggleFoldWidget()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"toggleParentFoldWidget",bindKey:o("Alt-F2","Alt-F2"),exec:function(e){e.session.toggleFoldWidget(!0)},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"foldall",bindKey:o(null,"Ctrl-Command-Option-0"),exec:function(e){e.session.foldAll()},scrollIntoView:"center",readOnly:!0},{name:"foldOther",bindKey:o("Alt-0","Command-Option-0"),exec:function(e){e.session.foldAll(),e.session.unfold(e.selection.getAllRanges())},scrollIntoView:"center",readOnly:!0},{name:"unfoldall",bindKey:o("Alt-Shift-0","Command-Option-Shift-0"),exec:function(e){e.session.unfold()},scrollIntoView:"center",readOnly:!0},{name:"findnext",bindKey:o("Ctrl-K","Command-G"),exec:function(e){e.findNext()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"findprevious",bindKey:o("Ctrl-Shift-K","Command-Shift-G"),exec:function(e){e.findPrevious()},multiSelectAction:"forEach",scrollIntoView:"center",readOnly:!0},{name:"selectOrFindNext",bindKey:o("Alt-K","Ctrl-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findNext()},readOnly:!0},{name:"selectOrFindPrevious",bindKey:o("Alt-Shift-K","Ctrl-Shift-G"),exec:function(e){e.selection.isEmpty()?e.selection.selectWord():e.findPrevious()},readOnly:!0},{name:"find",bindKey:o("Ctrl-F","Command-F"),exec:function(e){i.loadModule("ace/ext/searchbox",function(t){t.Search(e)})},readOnly:!0},{name:"overwrite",bindKey:"Insert",exec:function(e){e.toggleOverwrite()},readOnly:!0},{name:"selecttostart",bindKey:o("Ctrl-Shift-Home","Command-Shift-Home|Command-Shift-Up"),exec:function(e){e.getSelection().selectFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotostart",bindKey:o("Ctrl-Home","Command-Home|Command-Up"),exec:function(e){e.navigateFileStart()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectup",bindKey:o("Shift-Up","Shift-Up|Ctrl-Shift-P"),exec:function(e){e.getSelection().selectUp()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golineup",bindKey:o("Up","Up|Ctrl-P"),exec:function(e,t){e.navigateUp(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttoend",bindKey:o("Ctrl-Shift-End","Command-Shift-End|Command-Shift-Down"),exec:function(e){e.getSelection().selectFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"gotoend",bindKey:o("Ctrl-End","Command-End|Command-Down"),exec:function(e){e.navigateFileEnd()},multiSelectAction:"forEach",readOnly:!0,scrollIntoView:"animate",aceCommandGroup:"fileJump"},{name:"selectdown",bindKey:o("Shift-Down","Shift-Down|Ctrl-Shift-N"),exec:function(e){e.getSelection().selectDown()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"golinedown",bindKey:o("Down","Down|Ctrl-N"),exec:function(e,t){e.navigateDown(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordleft",bindKey:o("Ctrl-Shift-Left","Option-Shift-Left"),exec:function(e){e.getSelection().selectWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordleft",bindKey:o("Ctrl-Left","Option-Left"),exec:function(e){e.navigateWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolinestart",bindKey:o("Alt-Shift-Left","Command-Shift-Left|Ctrl-Shift-A"),exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolinestart",bindKey:o("Alt-Left|Home","Command-Left|Home|Ctrl-A"),exec:function(e){e.navigateLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectleft",bindKey:o("Shift-Left","Shift-Left|Ctrl-Shift-B"),exec:function(e){e.getSelection().selectLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoleft",bindKey:o("Left","Left|Ctrl-B"),exec:function(e,t){e.navigateLeft(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectwordright",bindKey:o("Ctrl-Shift-Right","Option-Shift-Right"),exec:function(e){e.getSelection().selectWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotowordright",bindKey:o("Ctrl-Right","Option-Right"),exec:function(e){e.navigateWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selecttolineend",bindKey:o("Alt-Shift-Right","Command-Shift-Right|Shift-End|Ctrl-Shift-E"),exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotolineend",bindKey:o("Alt-Right|End","Command-Right|End|Ctrl-E"),exec:function(e){e.navigateLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectright",bindKey:o("Shift-Right","Shift-Right"),exec:function(e){e.getSelection().selectRight()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"gotoright",bindKey:o("Right","Right|Ctrl-F"),exec:function(e,t){e.navigateRight(t.times)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectpagedown",bindKey:"Shift-PageDown",exec:function(e){e.selectPageDown()},readOnly:!0},{name:"pagedown",bindKey:o(null,"Option-PageDown"),exec:function(e){e.scrollPageDown()},readOnly:!0},{name:"gotopagedown",bindKey:o("PageDown","PageDown|Ctrl-V"),exec:function(e){e.gotoPageDown()},readOnly:!0},{name:"selectpageup",bindKey:"Shift-PageUp",exec:function(e){e.selectPageUp()},readOnly:!0},{name:"pageup",bindKey:o(null,"Option-PageUp"),exec:function(e){e.scrollPageUp()},readOnly:!0},{name:"gotopageup",bindKey:"PageUp",exec:function(e){e.gotoPageUp()},readOnly:!0},{name:"scrollup",bindKey:o("Ctrl-Up",null),exec:function(e){e.renderer.scrollBy(0,-2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"scrolldown",bindKey:o("Ctrl-Down",null),exec:function(e){e.renderer.scrollBy(0,2*e.renderer.layerConfig.lineHeight)},readOnly:!0},{name:"selectlinestart",bindKey:"Shift-Home",exec:function(e){e.getSelection().selectLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"selectlineend",bindKey:"Shift-End",exec:function(e){e.getSelection().selectLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"togglerecording",bindKey:o("Ctrl-Alt-E","Command-Option-E"),exec:function(e){e.commands.toggleRecording(e)},readOnly:!0},{name:"replaymacro",bindKey:o("Ctrl-Shift-E","Command-Shift-E"),exec:function(e){e.commands.replay(e)},readOnly:!0},{name:"jumptomatching",bindKey:o("Ctrl-P","Ctrl-P"),exec:function(e){e.jumpToMatching()},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"selecttomatching",bindKey:o("Ctrl-Shift-P","Ctrl-Shift-P"),exec:function(e){e.jumpToMatching(!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"expandToMatching",bindKey:o("Ctrl-Shift-M","Ctrl-Shift-M"),exec:function(e){e.jumpToMatching(!0,!0)},multiSelectAction:"forEach",scrollIntoView:"animate",readOnly:!0},{name:"passKeysToBrowser",bindKey:o(null,null),exec:function(){},passEvent:!0,readOnly:!0},{name:"copy",exec:function(e){},readOnly:!0},{name:"cut",exec:function(e){var t=e.$copyWithEmptySelection&&e.selection.isEmpty(),n=t?e.selection.getLineRange():e.selection.getRange();e._emit("cut",n),n.isEmpty()||e.session.remove(n),e.clearSelection()},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"paste",exec:function(e,t){e.$handlePaste(t)},scrollIntoView:"cursor"},{name:"removeline",bindKey:o("Ctrl-D","Command-D"),exec:function(e){e.removeLines()},scrollIntoView:"cursor",multiSelectAction:"forEachLine"},{name:"duplicateSelection",bindKey:o("Ctrl-Shift-D","Command-Shift-D"),exec:function(e){e.duplicateSelection()},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"sortlines",bindKey:o("Ctrl-Alt-S","Command-Alt-S"),exec:function(e){e.sortLines()},scrollIntoView:"selection",multiSelectAction:"forEachLine"},{name:"togglecomment",bindKey:o("Ctrl-/","Command-/"),exec:function(e){e.toggleCommentLines()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"toggleBlockComment",bindKey:o("Ctrl-Shift-/","Command-Shift-/"),exec:function(e){e.toggleBlockComment()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"modifyNumberUp",bindKey:o("Ctrl-Shift-Up","Alt-Shift-Up"),exec:function(e){e.modifyNumber(1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"modifyNumberDown",bindKey:o("Ctrl-Shift-Down","Alt-Shift-Down"),exec:function(e){e.modifyNumber(-1)},scrollIntoView:"cursor",multiSelectAction:"forEach"},{name:"replace",bindKey:o("Ctrl-H","Command-Option-F"),exec:function(e){i.loadModule("ace/ext/searchbox",function(t){t.Search(e,!0)})}},{name:"undo",bindKey:o("Ctrl-Z","Command-Z"),exec:function(e){e.undo()}},{name:"redo",bindKey:o("Ctrl-Shift-Z|Ctrl-Y","Command-Shift-Z|Command-Y"),exec:function(e){e.redo()}},{name:"copylinesup",bindKey:o("Alt-Shift-Up","Command-Option-Up"),exec:function(e){e.copyLinesUp()},scrollIntoView:"cursor"},{name:"movelinesup",bindKey:o("Alt-Up","Option-Up"),exec:function(e){e.moveLinesUp()},scrollIntoView:"cursor"},{name:"copylinesdown",bindKey:o("Alt-Shift-Down","Command-Option-Down"),exec:function(e){e.copyLinesDown()},scrollIntoView:"cursor"},{name:"movelinesdown",bindKey:o("Alt-Down","Option-Down"),exec:function(e){e.moveLinesDown()},scrollIntoView:"cursor"},{name:"del",bindKey:o("Delete","Delete|Ctrl-D|Shift-Delete"),exec:function(e){e.remove("right")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"backspace",bindKey:o("Shift-Backspace|Backspace","Ctrl-Backspace|Shift-Backspace|Backspace|Ctrl-H"),exec:function(e){e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"cut_or_delete",bindKey:o("Shift-Delete",null),exec:function(e){if(!e.selection.isEmpty())return!1;e.remove("left")},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolinestart",bindKey:o("Alt-Backspace","Command-Backspace"),exec:function(e){e.removeToLineStart()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolineend",bindKey:o("Alt-Delete","Ctrl-K|Command-Delete"),exec:function(e){e.removeToLineEnd()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolinestarthard",bindKey:o("Ctrl-Shift-Backspace",null),exec:function(e){var t=e.selection.getRange();t.start.column=0,e.session.remove(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removetolineendhard",bindKey:o("Ctrl-Shift-Delete",null),exec:function(e){var t=e.selection.getRange();t.end.column=Number.MAX_VALUE,e.session.remove(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordleft",bindKey:o("Ctrl-Backspace","Alt-Backspace|Ctrl-Alt-Backspace"),exec:function(e){e.removeWordLeft()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"removewordright",bindKey:o("Ctrl-Delete","Alt-Delete"),exec:function(e){e.removeWordRight()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"outdent",bindKey:o("Shift-Tab","Shift-Tab"),exec:function(e){e.blockOutdent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"indent",bindKey:o("Tab","Tab"),exec:function(e){e.indent()},multiSelectAction:"forEach",scrollIntoView:"selectionPart"},{name:"blockoutdent",bindKey:o("Ctrl-[","Ctrl-["),exec:function(e){e.blockOutdent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"blockindent",bindKey:o("Ctrl-]","Ctrl-]"),exec:function(e){e.blockIndent()},multiSelectAction:"forEachLine",scrollIntoView:"selectionPart"},{name:"insertstring",exec:function(e,t){e.insert(t)},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"inserttext",exec:function(e,t){e.insert(r.stringRepeat(t.text||"",t.times||1))},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"splitline",bindKey:o(null,"Ctrl-O"),exec:function(e){e.splitLine()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"transposeletters",bindKey:o("Alt-Shift-X","Ctrl-T"),exec:function(e){e.transposeLetters()},multiSelectAction:function(e){e.transposeSelections(1)},scrollIntoView:"cursor"},{name:"touppercase",bindKey:o("Ctrl-U","Ctrl-U"),exec:function(e){e.toUpperCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"tolowercase",bindKey:o("Ctrl-Shift-U","Ctrl-Shift-U"),exec:function(e){e.toLowerCase()},multiSelectAction:"forEach",scrollIntoView:"cursor"},{name:"expandtoline",bindKey:o("Ctrl-Shift-L","Command-Shift-L"),exec:function(e){var t=e.selection.getRange();t.start.column=t.end.column=0,t.end.row++,e.selection.setRange(t,!1)},multiSelectAction:"forEach",scrollIntoView:"cursor",readOnly:!0},{name:"joinlines",bindKey:o(null,null),exec:function(e){var t=e.selection.isBackwards(),n=t?e.selection.getSelectionLead():e.selection.getSelectionAnchor(),i=t?e.selection.getSelectionAnchor():e.selection.getSelectionLead(),o=e.session.doc.getLine(n.row).length,u=e.session.doc.getTextRange(e.selection.getRange()),a=u.replace(/\n\s*/," ").length,f=e.session.doc.getLine(n.row);for(var l=n.row+1;l<=i.row+1;l++){var c=r.stringTrimLeft(r.stringTrimRight(e.session.doc.getLine(l)));c.length!==0&&(c=" "+c),f+=c}i.row+1<e.session.doc.getLength()-1&&(f+=e.session.doc.getNewLineCharacter()),e.clearSelection(),e.session.doc.replace(new s(n.row,0,i.row+2,0),f),a>0?(e.selection.moveCursorTo(n.row,n.column),e.selection.selectTo(n.row,n.column+a)):(o=e.session.doc.getLine(n.row).length>o?o+1:o,e.selection.moveCursorTo(n.row,o))},multiSelectAction:"forEach",readOnly:!0},{name:"invertSelection",bindKey:o(null,null),exec:function(e){var t=e.session.doc.getLength()-1,n=e.session.doc.getLine(t).length,r=e.selection.rangeList.ranges,i=[];r.length<1&&(r=[e.selection.getRange()]);for(var o=0;o<r.length;o++)o==r.length-1&&(r[o].end.row!==t||r[o].end.column!==n)&&i.push(new s(r[o].end.row,r[o].end.column,t,n)),o===0?(r[o].start.row!==0||r[o].start.column!==0)&&i.push(new s(0,0,r[o].start.row,r[o].start.column)):i.push(new s(r[o-1].end.row,r[o-1].end.column,r[o].start.row,r[o].start.column));e.exitMultiSelectMode(),e.clearSelection();for(var o=0;o<i.length;o++)e.selection.addRange(i[o],!1)},readOnly:!0,scrollIntoView:"none"}]}),ace.define("ace/clipboard",["require","exports","module"],function(e,t,n){"use strict";n.exports={lineMode:!1}}),ace.define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands","ace/config","ace/token_iterator","ace/clipboard"],function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./lib/lang"),o=e("./lib/useragent"),u=e("./keyboard/textinput").TextInput,a=e("./mouse/mouse_handler").MouseHandler,f=e("./mouse/fold_handler").FoldHandler,l=e("./keyboard/keybinding").KeyBinding,c=e("./edit_session").EditSession,h=e("./search").Search,p=e("./range").Range,d=e("./lib/event_emitter").EventEmitter,v=e("./commands/command_manager").CommandManager,m=e("./commands/default_commands").commands,g=e("./config"),y=e("./token_iterator").TokenIterator,b=e("./clipboard"),w=function(e,t,n){var r=e.getContainerElement();this.container=r,this.renderer=e,this.id="editor"+ ++w.$uid,this.commands=new v(o.isMac?"mac":"win",m),typeof document=="object"&&(this.textInput=new u(e.getTextAreaContainer(),this),this.renderer.textarea=this.textInput.getElement(),this.$mouseHandler=new a(this),new f(this)),this.keyBinding=new l(this),this.$search=(new h).set({wrap:!0}),this.$historyTracker=this.$historyTracker.bind(this),this.commands.on("exec",this.$historyTracker),this.$initOperationListeners(),this._$emitInputEvent=s.delayedCall(function(){this._signal("input",{}),this.session&&this.session.bgTokenizer&&this.session.bgTokenizer.scheduleStart()}.bind(this)),this.on("change",function(e,t){t._$emitInputEvent.schedule(31)}),this.setSession(t||n&&n.session||new c("")),g.resetOptions(this),n&&this.setOptions(n),g._signal("editor",this)};w.$uid=0,function(){r.implement(this,d),this.$initOperationListeners=function(){this.commands.on("exec",this.startOperation.bind(this),!0),this.commands.on("afterExec",this.endOperation.bind(this),!0),this.$opResetTimer=s.delayedCall(this.endOperation.bind(this,!0)),this.on("change",function(){this.curOp||(this.startOperation(),this.curOp.selectionBefore=this.$lastSel),this.curOp.docChanged=!0}.bind(this),!0),this.on("changeSelection",function(){this.curOp||(this.startOperation(),this.curOp.selectionBefore=this.$lastSel),this.curOp.selectionChanged=!0}.bind(this),!0)},this.curOp=null,this.prevOp={},this.startOperation=function(e){if(this.curOp){if(!e||this.curOp.command)return;this.prevOp=this.curOp}e||(this.previousCommand=null,e={}),this.$opResetTimer.schedule(),this.curOp=this.session.curOp={command:e.command||{},args:e.args,scrollTop:this.renderer.scrollTop},this.curOp.selectionBefore=this.selection.toJSON()},this.endOperation=function(e){if(this.curOp){if(e&&e.returnValue===!1)return this.curOp=null;if(e==1&&this.curOp.command&&this.curOp.command.name=="mouse")return;this._signal("beforeEndOperation");if(!this.curOp)return;var t=this.curOp.command,n=t&&t.scrollIntoView;if(n){switch(n){case"center-animate":n="animate";case"center":this.renderer.scrollCursorIntoView(null,.5);break;case"animate":case"cursor":this.renderer.scrollCursorIntoView();break;case"selectionPart":var r=this.selection.getRange(),i=this.renderer.layerConfig;(r.start.row>=i.lastRow||r.end.row<=i.firstRow)&&this.renderer.scrollSelectionIntoView(this.selection.anchor,this.selection.lead);break;default:}n=="animate"&&this.renderer.animateScrolling(this.curOp.scrollTop)}var s=this.selection.toJSON();this.curOp.selectionAfter=s,this.$lastSel=this.selection.toJSON(),this.session.getUndoManager().addSelection(s),this.prevOp=this.curOp,this.curOp=null}},this.$mergeableCommands=["backspace","del","insertstring"],this.$historyTracker=function(e){if(!this.$mergeUndoDeltas)return;var t=this.prevOp,n=this.$mergeableCommands,r=t.command&&e.command.name==t.command.name;if(e.command.name=="insertstring"){var i=e.args;this.mergeNextCommand===undefined&&(this.mergeNextCommand=!0),r=r&&this.mergeNextCommand&&(!/\s/.test(i)||/\s/.test(t.args)),this.mergeNextCommand=!0}else r=r&&n.indexOf(e.command.name)!==-1;this.$mergeUndoDeltas!="always"&&Date.now()-this.sequenceStartTime>2e3&&(r=!1),r?this.session.mergeUndoDeltas=!0:n.indexOf(e.command.name)!==-1&&(this.sequenceStartTime=Date.now())},this.setKeyboardHandler=function(e,t){if(e&&typeof e=="string"&&e!="ace"){this.$keybindingId=e;var n=this;g.loadModule(["keybinding",e],function(r){n.$keybindingId==e&&n.keyBinding.setKeyboardHandler(r&&r.handler),t&&t()})}else this.$keybindingId=null,this.keyBinding.setKeyboardHandler(e),t&&t()},this.getKeyboardHandler=function(){return this.keyBinding.getKeyboardHandler()},this.setSession=function(e){if(this.session==e)return;this.curOp&&this.endOperation(),this.curOp={};var t=this.session;if(t){this.session.off("change",this.$onDocumentChange),this.session.off("changeMode",this.$onChangeMode),this.session.off("tokenizerUpdate",this.$onTokenizerUpdate),this.session.off("changeTabSize",this.$onChangeTabSize),this.session.off("changeWrapLimit",this.$onChangeWrapLimit),this.session.off("changeWrapMode",this.$onChangeWrapMode),this.session.off("changeFold",this.$onChangeFold),this.session.off("changeFrontMarker",this.$onChangeFrontMarker),this.session.off("changeBackMarker",this.$onChangeBackMarker),this.session.off("changeBreakpoint",this.$onChangeBreakpoint),this.session.off("changeAnnotation",this.$onChangeAnnotation),this.session.off("changeOverwrite",this.$onCursorChange),this.session.off("changeScrollTop",this.$onScrollTopChange),this.session.off("changeScrollLeft",this.$onScrollLeftChange);var n=this.session.getSelection();n.off("changeCursor",this.$onCursorChange),n.off("changeSelection",this.$onSelectionChange)}this.session=e,e?(this.$onDocumentChange=this.onDocumentChange.bind(this),e.on("change",this.$onDocumentChange),this.renderer.setSession(e),this.$onChangeMode=this.onChangeMode.bind(this),e.on("changeMode",this.$onChangeMode),this.$onTokenizerUpdate=this.onTokenizerUpdate.bind(this),e.on("tokenizerUpdate",this.$onTokenizerUpdate),this.$onChangeTabSize=this.renderer.onChangeTabSize.bind(this.renderer),e.on("changeTabSize",this.$onChangeTabSize),this.$onChangeWrapLimit=this.onChangeWrapLimit.bind(this),e.on("changeWrapLimit",this.$onChangeWrapLimit),this.$onChangeWrapMode=this.onChangeWrapMode.bind(this),e.on("changeWrapMode",this.$onChangeWrapMode),this.$onChangeFold=this.onChangeFold.bind(this),e.on("changeFold",this.$onChangeFold),this.$onChangeFrontMarker=this.onChangeFrontMarker.bind(this),this.session.on("changeFrontMarker",this.$onChangeFrontMarker),this.$onChangeBackMarker=this.onChangeBackMarker.bind(this),this.session.on("changeBackMarker",this.$onChangeBackMarker),this.$onChangeBreakpoint=this.onChangeBreakpoint.bind(this),this.session.on("changeBreakpoint",this.$onChangeBreakpoint),this.$onChangeAnnotation=this.onChangeAnnotation.bind(this),this.session.on("changeAnnotation",this.$onChangeAnnotation),this.$onCursorChange=this.onCursorChange.bind(this),this.session.on("changeOverwrite",this.$onCursorChange),this.$onScrollTopChange=this.onScrollTopChange.bind(this),this.session.on("changeScrollTop",this.$onScrollTopChange),this.$onScrollLeftChange=this.onScrollLeftChange.bind(this),this.session.on("changeScrollLeft",this.$onScrollLeftChange),this.selection=e.getSelection(),this.selection.on("changeCursor",this.$onCursorChange),this.$onSelectionChange=this.onSelectionChange.bind(this),this.selection.on("changeSelection",this.$onSelectionChange),this.onChangeMode(),this.onCursorChange(),this.onScrollTopChange(),this.onScrollLeftChange(),this.onSelectionChange(),this.onChangeFrontMarker(),this.onChangeBackMarker(),this.onChangeBreakpoint(),this.onChangeAnnotation(),this.session.getUseWrapMode()&&this.renderer.adjustWrapLimit(),this.renderer.updateFull()):(this.selection=null,this.renderer.setSession(e)),this._signal("changeSession",{session:e,oldSession:t}),this.curOp=null,t&&t._signal("changeEditor",{oldEditor:this}),e&&e._signal("changeEditor",{editor:this}),e&&e.bgTokenizer&&e.bgTokenizer.scheduleStart()},this.getSession=function(){return this.session},this.setValue=function(e,t){return this.session.doc.setValue(e),t?t==1?this.navigateFileEnd():t==-1&&this.navigateFileStart():this.selectAll(),e},this.getValue=function(){return this.session.getValue()},this.getSelection=function(){return this.selection},this.resize=function(e){this.renderer.onResize(e)},this.setTheme=function(e,t){this.renderer.setTheme(e,t)},this.getTheme=function(){return this.renderer.getTheme()},this.setStyle=function(e){this.renderer.setStyle(e)},this.unsetStyle=function(e){this.renderer.unsetStyle(e)},this.getFontSize=function(){return this.getOption("fontSize")||i.computedStyle(this.container).fontSize},this.setFontSize=function(e){this.setOption("fontSize",e)},this.$highlightBrackets=function(){this.session.$bracketHighlight&&(this.session.removeMarker(this.session.$bracketHighlight),this.session.$bracketHighlight=null);if(this.$highlightPending)return;var e=this;this.$highlightPending=!0,setTimeout(function(){e.$highlightPending=!1;var t=e.session;if(!t||!t.bgTokenizer)return;var n=t.findMatchingBracket(e.getCursorPosition());if(n)var r=new p(n.row,n.column,n.row,n.column+1);else if(t.$mode.getMatching)var r=t.$mode.getMatching(e.session);r&&(t.$bracketHighlight=t.addMarker(r,"ace_bracket","text"))},50)},this.$highlightTags=function(){if(this.$highlightTagPending)return;var e=this;this.$highlightTagPending=!0,setTimeout(function(){e.$highlightTagPending=!1;var t=e.session;if(!t||!t.bgTokenizer)return;var n=e.getCursorPosition(),r=new y(e.session,n.row,n.column),i=r.getCurrentToken();if(!i||!/\b(?:tag-open|tag-name)/.test(i.type)){t.removeMarker(t.$tagHighlight),t.$tagHighlight=null;return}if(i.type.indexOf("tag-open")!=-1){i=r.stepForward();if(!i)return}var s=i.value,o=0,u=r.stepBackward();if(u.value=="<"){do u=i,i=r.stepForward(),i&&i.value===s&&i.type.indexOf("tag-name")!==-1&&(u.value==="<"?o++:u.value==="</"&&o--);while(i&&o>=0)}else{do i=u,u=r.stepBackward(),i&&i.value===s&&i.type.indexOf("tag-name")!==-1&&(u.value==="<"?o++:u.value==="</"&&o--);while(u&&o<=0);r.stepForward()}if(!i){t.removeMarker(t.$tagHighlight),t.$tagHighlight=null;return}var a=r.getCurrentTokenRow(),f=r.getCurrentTokenColumn(),l=new p(a,f,a,f+i.value.length),c=t.$backMarkers[t.$tagHighlight];t.$tagHighlight&&c!=undefined&&l.compareRange(c.range)!==0&&(t.removeMarker(t.$tagHighlight),t.$tagHighlight=null),t.$tagHighlight||(t.$tagHighlight=t.addMarker(l,"ace_bracket","text"))},50)},this.focus=function(){var e=this;setTimeout(function(){e.isFocused()||e.textInput.focus()}),this.textInput.focus()},this.isFocused=function(){return this.textInput.isFocused()},this.blur=function(){this.textInput.blur()},this.onFocus=function(e){if(this.$isFocused)return;this.$isFocused=!0,this.renderer.showCursor(),this.renderer.visualizeFocus(),this._emit("focus",e)},this.onBlur=function(e){if(!this.$isFocused)return;this.$isFocused=!1,this.renderer.hideCursor(),this.renderer.visualizeBlur(),this._emit("blur",e)},this.$cursorChange=function(){this.renderer.updateCursor()},this.onDocumentChange=function(e){var t=this.session.$useWrapMode,n=e.start.row==e.end.row?e.end.row:Infinity;this.renderer.updateLines(e.start.row,n,t),this._signal("change",e),this.$cursorChange(),this.$updateHighlightActiveLine()},this.onTokenizerUpdate=function(e){var t=e.data;this.renderer.updateLines(t.first,t.last)},this.onScrollTopChange=function(){this.renderer.scrollToY(this.session.getScrollTop())},this.onScrollLeftChange=function(){this.renderer.scrollToX(this.session.getScrollLeft())},this.onCursorChange=function(){this.$cursorChange(),this.$highlightBrackets(),this.$highlightTags(),this.$updateHighlightActiveLine(),this._signal("changeSelection")},this.$updateHighlightActiveLine=function(){var e=this.getSession(),t;if(this.$highlightActiveLine){if(this.$selectionStyle!="line"||!this.selection.isMultiLine())t=this.getCursorPosition();this.renderer.theme&&this.renderer.theme.$selectionColorConflict&&!this.selection.isEmpty()&&(t=!1),this.renderer.$maxLines&&this.session.getLength()===1&&!(this.renderer.$minLines>1)&&(t=!1)}if(e.$highlightLineMarker&&!t)e.removeMarker(e.$highlightLineMarker.id),e.$highlightLineMarker=null;else if(!e.$highlightLineMarker&&t){var n=new p(t.row,t.column,t.row,Infinity);n.id=e.addMarker(n,"ace_active-line","screenLine"),e.$highlightLineMarker=n}else t&&(e.$highlightLineMarker.start.row=t.row,e.$highlightLineMarker.end.row=t.row,e.$highlightLineMarker.start.column=t.column,e._signal("changeBackMarker"))},this.onSelectionChange=function(e){var t=this.session;t.$selectionMarker&&t.removeMarker(t.$selectionMarker),t.$selectionMarker=null;if(!this.selection.isEmpty()){var n=this.selection.getRange(),r=this.getSelectionStyle();t.$selectionMarker=t.addMarker(n,"ace_selection",r)}else this.$updateHighlightActiveLine();var i=this.$highlightSelectedWord&&this.$getSelectionHighLightRegexp();this.session.highlight(i),this._signal("changeSelection")},this.$getSelectionHighLightRegexp=function(){var e=this.session,t=this.getSelectionRange();if(t.isEmpty()||t.isMultiLine())return;var n=t.start.column,r=t.end.column,i=e.getLine(t.start.row),s=i.substring(n,r);if(s.length>5e3||!/[\w\d]/.test(s))return;var o=this.$search.$assembleRegExp({wholeWord:!0,caseSensitive:!0,needle:s}),u=i.substring(n-1,r+1);if(!o.test(u))return;return o},this.onChangeFrontMarker=function(){this.renderer.updateFrontMarkers()},this.onChangeBackMarker=function(){this.renderer.updateBackMarkers()},this.onChangeBreakpoint=function(){this.renderer.updateBreakpoints()},this.onChangeAnnotation=function(){this.renderer.setAnnotations(this.session.getAnnotations())},this.onChangeMode=function(e){this.renderer.updateText(),this._emit("changeMode",e)},this.onChangeWrapLimit=function(){this.renderer.updateFull()},this.onChangeWrapMode=function(){this.renderer.onResize(!0)},this.onChangeFold=function(){this.$updateHighlightActiveLine(),this.renderer.updateFull()},this.getSelectedText=function(){return this.session.getTextRange(this.getSelectionRange())},this.getCopyText=function(){var e=this.getSelectedText(),t=this.session.doc.getNewLineCharacter(),n=!1;if(!e&&this.$copyWithEmptySelection){n=!0;var r=this.selection.getAllRanges();for(var i=0;i<r.length;i++){var s=r[i];if(i&&r[i-1].start.row==s.start.row)continue;e+=this.session.getLine(s.start.row)+t}}var o={text:e};return this._signal("copy",o),b.lineMode=n?o.text:"",o.text},this.onCopy=function(){this.commands.exec("copy",this)},this.onCut=function(){this.commands.exec("cut",this)},this.onPaste=function(e,t){var n={text:e,event:t};this.commands.exec("paste",this,n)},this.$handlePaste=function(e){typeof e=="string"&&(e={text:e}),this._signal("paste",e);var t=e.text,n=t==b.lineMode,r=this.session;if(!this.inMultiSelectMode||this.inVirtualSelectionMode)n?r.insert({row:this.selection.lead.row,column:0},t):this.insert(t);else if(n)this.selection.rangeList.ranges.forEach(function(e){r.insert({row:e.start.row,column:0},t)});else{var i=t.split(/\r\n|\r|\n/),s=this.selection.rangeList.ranges;if(i.length>s.length||i.length<2||!i[1])return this.commands.exec("insertstring",this,t);for(var o=s.length;o--;){var u=s[o];u.isEmpty()||r.remove(u),r.insert(u.start,i[o])}}},this.execCommand=function(e,t){return this.commands.exec(e,this,t)},this.insert=function(e,t){var n=this.session,r=n.getMode(),i=this.getCursorPosition();if(this.getBehavioursEnabled()&&!t){var s=r.transformAction(n.getState(i.row),"insertion",this,n,e);s&&(e!==s.text&&(this.inVirtualSelectionMode||(this.session.mergeUndoDeltas=!1,this.mergeNextCommand=!1)),e=s.text)}e=="	"&&(e=this.session.getTabString());if(!this.selection.isEmpty()){var o=this.getSelectionRange();i=this.session.remove(o),this.clearSelection()}else if(this.session.getOverwrite()&&e.indexOf("\n")==-1){var o=new p.fromPoints(i,i);o.end.column+=e.length,this.session.remove(o)}if(e=="\n"||e=="\r\n"){var u=n.getLine(i.row);if(i.column>u.search(/\S|$/)){var a=u.substr(i.column).search(/\S|$/);n.doc.removeInLine(i.row,i.column,i.column+a)}}this.clearSelection();var f=i.column,l=n.getState(i.row),u=n.getLine(i.row),c=r.checkOutdent(l,u,e),h=n.insert(i,e);s&&s.selection&&(s.selection.length==2?this.selection.setSelectionRange(new p(i.row,f+s.selection[0],i.row,f+s.selection[1])):this.selection.setSelectionRange(new p(i.row+s.selection[0],s.selection[1],i.row+s.selection[2],s.selection[3])));if(n.getDocument().isNewLine(e)){var d=r.getNextLineIndent(l,u.slice(0,i.column),n.getTabString());n.insert({row:i.row+1,column:0},d)}c&&r.autoOutdent(l,n,i.row)},this.onTextInput=function(e,t){if(!t)return this.keyBinding.onTextInput(e);this.startOperation({command:{name:"insertstring"}});var n=this.applyComposition.bind(this,e,t);this.selection.rangeCount?this.forEachSelection(n):n(),this.endOperation()},this.applyComposition=function(e,t){if(t.extendLeft||t.extendRight){var n=this.selection.getRange();n.start.column-=t.extendLeft,n.end.column+=t.extendRight,this.selection.setRange(n),!e&&!n.isEmpty()&&this.remove()}(e||!this.selection.isEmpty())&&this.insert(e,!0);if(t.restoreStart||t.restoreEnd){var n=this.selection.getRange();n.start.column-=t.restoreStart,n.end.column-=t.restoreEnd,this.selection.setRange(n)}},this.onCommandKey=function(e,t,n){this.keyBinding.onCommandKey(e,t,n)},this.setOverwrite=function(e){this.session.setOverwrite(e)},this.getOverwrite=function(){return this.session.getOverwrite()},this.toggleOverwrite=function(){this.session.toggleOverwrite()},this.setScrollSpeed=function(e){this.setOption("scrollSpeed",e)},this.getScrollSpeed=function(){return this.getOption("scrollSpeed")},this.setDragDelay=function(e){this.setOption("dragDelay",e)},this.getDragDelay=function(){return this.getOption("dragDelay")},this.setSelectionStyle=function(e){this.setOption("selectionStyle",e)},this.getSelectionStyle=function(){return this.getOption("selectionStyle")},this.setHighlightActiveLine=function(e){this.setOption("highlightActiveLine",e)},this.getHighlightActiveLine=function(){return this.getOption("highlightActiveLine")},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.setHighlightSelectedWord=function(e){this.setOption("highlightSelectedWord",e)},this.getHighlightSelectedWord=function(){return this.$highlightSelectedWord},this.setAnimatedScroll=function(e){this.renderer.setAnimatedScroll(e)},this.getAnimatedScroll=function(){return this.renderer.getAnimatedScroll()},this.setShowInvisibles=function(e){this.renderer.setShowInvisibles(e)},this.getShowInvisibles=function(){return this.renderer.getShowInvisibles()},this.setDisplayIndentGuides=function(e){this.renderer.setDisplayIndentGuides(e)},this.getDisplayIndentGuides=function(){return this.renderer.getDisplayIndentGuides()},this.setShowPrintMargin=function(e){this.renderer.setShowPrintMargin(e)},this.getShowPrintMargin=function(){return this.renderer.getShowPrintMargin()},this.setPrintMarginColumn=function(e){this.renderer.setPrintMarginColumn(e)},this.getPrintMarginColumn=function(){return this.renderer.getPrintMarginColumn()},this.setReadOnly=function(e){this.setOption("readOnly",e)},this.getReadOnly=function(){return this.getOption("readOnly")},this.setBehavioursEnabled=function(e){this.setOption("behavioursEnabled",e)},this.getBehavioursEnabled=function(){return this.getOption("behavioursEnabled")},this.setWrapBehavioursEnabled=function(e){this.setOption("wrapBehavioursEnabled",e)},this.getWrapBehavioursEnabled=function(){return this.getOption("wrapBehavioursEnabled")},this.setShowFoldWidgets=function(e){this.setOption("showFoldWidgets",e)},this.getShowFoldWidgets=function(){return this.getOption("showFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.remove=function(e){this.selection.isEmpty()&&(e=="left"?this.selection.selectLeft():this.selection.selectRight());var t=this.getSelectionRange();if(this.getBehavioursEnabled()){var n=this.session,r=n.getState(t.start.row),i=n.getMode().transformAction(r,"deletion",this,n,t);if(t.end.column===0){var s=n.getTextRange(t);if(s[s.length-1]=="\n"){var o=n.getLine(t.end.row);/^\s+$/.test(o)&&(t.end.column=o.length)}}i&&(t=i)}this.session.remove(t),this.clearSelection()},this.removeWordRight=function(){this.selection.isEmpty()&&this.selection.selectWordRight(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeWordLeft=function(){this.selection.isEmpty()&&this.selection.selectWordLeft(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineStart=function(){this.selection.isEmpty()&&this.selection.selectLineStart(),this.session.remove(this.getSelectionRange()),this.clearSelection()},this.removeToLineEnd=function(){this.selection.isEmpty()&&this.selection.selectLineEnd();var e=this.getSelectionRange();e.start.column==e.end.column&&e.start.row==e.end.row&&(e.end.column=0,e.end.row++),this.session.remove(e),this.clearSelection()},this.splitLine=function(){this.selection.isEmpty()||(this.session.remove(this.getSelectionRange()),this.clearSelection());var e=this.getCursorPosition();this.insert("\n"),this.moveCursorToPosition(e)},this.transposeLetters=function(){if(!this.selection.isEmpty())return;var e=this.getCursorPosition(),t=e.column;if(t===0)return;var n=this.session.getLine(e.row),r,i;t<n.length?(r=n.charAt(t)+n.charAt(t-1),i=new p(e.row,t-1,e.row,t+1)):(r=n.charAt(t-1)+n.charAt(t-2),i=new p(e.row,t-2,e.row,t)),this.session.replace(i,r),this.session.selection.moveToPosition(i.end)},this.toLowerCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toLowerCase()),this.selection.setSelectionRange(e)},this.toUpperCase=function(){var e=this.getSelectionRange();this.selection.isEmpty()&&this.selection.selectWord();var t=this.getSelectionRange(),n=this.session.getTextRange(t);this.session.replace(t,n.toUpperCase()),this.selection.setSelectionRange(e)},this.indent=function(){var e=this.session,t=this.getSelectionRange();if(t.start.row<t.end.row){var n=this.$getSelectedRows();e.indentRows(n.first,n.last,"	");return}if(t.start.column<t.end.column){var r=e.getTextRange(t);if(!/^\s+$/.test(r)){var n=this.$getSelectedRows();e.indentRows(n.first,n.last,"	");return}}var i=e.getLine(t.start.row),o=t.start,u=e.getTabSize(),a=e.documentToScreenColumn(o.row,o.column);if(this.session.getUseSoftTabs())var f=u-a%u,l=s.stringRepeat(" ",f);else{var f=a%u;while(i[t.start.column-1]==" "&&f)t.start.column--,f--;this.selection.setSelectionRange(t),l="	"}return this.insert(l)},this.blockIndent=function(){var e=this.$getSelectedRows();this.session.indentRows(e.first,e.last,"	")},this.blockOutdent=function(){var e=this.session.getSelection();this.session.outdentRows(e.getRange())},this.sortLines=function(){var e=this.$getSelectedRows(),t=this.session,n=[];for(var r=e.first;r<=e.last;r++)n.push(t.getLine(r));n.sort(function(e,t){return e.toLowerCase()<t.toLowerCase()?-1:e.toLowerCase()>t.toLowerCase()?1:0});var i=new p(0,0,0,0);for(var r=e.first;r<=e.last;r++){var s=t.getLine(r);i.start.row=r,i.end.row=r,i.end.column=s.length,t.replace(i,n[r-e.first])}},this.toggleCommentLines=function(){var e=this.session.getState(this.getCursorPosition().row),t=this.$getSelectedRows();this.session.getMode().toggleCommentLines(e,this.session,t.first,t.last)},this.toggleBlockComment=function(){var e=this.getCursorPosition(),t=this.session.getState(e.row),n=this.getSelectionRange();this.session.getMode().toggleBlockComment(t,this.session,n,e)},this.getNumberAt=function(e,t){var n=/[\-]?[0-9]+(?:\.[0-9]+)?/g;n.lastIndex=0;var r=this.session.getLine(e);while(n.lastIndex<t){var i=n.exec(r);if(i.index<=t&&i.index+i[0].length>=t){var s={value:i[0],start:i.index,end:i.index+i[0].length};return s}}return null},this.modifyNumber=function(e){var t=this.selection.getCursor().row,n=this.selection.getCursor().column,r=new p(t,n-1,t,n),i=this.session.getTextRange(r);if(!isNaN(parseFloat(i))&&isFinite(i)){var s=this.getNumberAt(t,n);if(s){var o=s.value.indexOf(".")>=0?s.start+s.value.indexOf(".")+1:s.end,u=s.start+s.value.length-o,a=parseFloat(s.value);a*=Math.pow(10,u),o!==s.end&&n<o?e*=Math.pow(10,s.end-n-1):e*=Math.pow(10,s.end-n),a+=e,a/=Math.pow(10,u);var f=a.toFixed(u),l=new p(t,s.start,t,s.end);this.session.replace(l,f),this.moveCursorTo(t,Math.max(s.start+1,n+f.length-s.value.length))}}else this.toggleWord()},this.$toggleWordPairs=[["first","last"],["true","false"],["yes","no"],["width","height"],["top","bottom"],["right","left"],["on","off"],["x","y"],["get","set"],["max","min"],["horizontal","vertical"],["show","hide"],["add","remove"],["up","down"],["before","after"],["even","odd"],["inside","outside"],["next","previous"],["increase","decrease"],["attach","detach"],["&&","||"],["==","!="]],this.toggleWord=function(){var e=this.selection.getCursor().row,t=this.selection.getCursor().column;this.selection.selectWord();var n=this.getSelectedText(),r=this.selection.getWordRange().start.column,i=n.replace(/([a-z]+|[A-Z]+)(?=[A-Z_]|$)/g,"$1 ").split(/\s/),o=t-r-1;o<0&&(o=0);var u=0,a=0,f=this;n.match(/[A-Za-z0-9_]+/)&&i.forEach(function(t,i){a=u+t.length,o>=u&&o<=a&&(n=t,f.selection.clearSelection(),f.moveCursorTo(e,u+r),f.selection.selectTo(e,a+r)),u=a});var l=this.$toggleWordPairs,c;for(var h=0;h<l.length;h++){var p=l[h];for(var d=0;d<=1;d++){var v=+!d,m=n.match(new RegExp("^\\s?_?("+s.escapeRegExp(p[d])+")\\s?$","i"));if(m){var g=n.match(new RegExp("([_]|^|\\s)("+s.escapeRegExp(m[1])+")($|\\s)","g"));g&&(c=n.replace(new RegExp(s.escapeRegExp(p[d]),"i"),function(e){var t=p[v];return e.toUpperCase()==e?t=t.toUpperCase():e.charAt(0).toUpperCase()==e.charAt(0)&&(t=t.substr(0,0)+p[v].charAt(0).toUpperCase()+t.substr(1)),t}),this.insert(c),c="")}}}},this.removeLines=function(){var e=this.$getSelectedRows();this.session.removeFullLines(e.first,e.last),this.clearSelection()},this.duplicateSelection=function(){var e=this.selection,t=this.session,n=e.getRange(),r=e.isBackwards();if(n.isEmpty()){var i=n.start.row;t.duplicateLines(i,i)}else{var s=r?n.start:n.end,o=t.insert(s,t.getTextRange(n),!1);n.start=s,n.end=o,e.setSelectionRange(n,r)}},this.moveLinesDown=function(){this.$moveLines(1,!1)},this.moveLinesUp=function(){this.$moveLines(-1,!1)},this.moveText=function(e,t,n){return this.session.moveText(e,t,n)},this.copyLinesUp=function(){this.$moveLines(-1,!0)},this.copyLinesDown=function(){this.$moveLines(1,!0)},this.$moveLines=function(e,t){var n,r,i=this.selection;if(!i.inMultiSelectMode||this.inVirtualSelectionMode){var s=i.toOrientedRange();n=this.$getSelectedRows(s),r=this.session.$moveLines(n.first,n.last,t?0:e),t&&e==-1&&(r=0),s.moveBy(r,0),i.fromOrientedRange(s)}else{var o=i.rangeList.ranges;i.rangeList.detach(this.session),this.inVirtualSelectionMode=!0;var u=0,a=0,f=o.length;for(var l=0;l<f;l++){var c=l;o[l].moveBy(u,0),n=this.$getSelectedRows(o[l]);var h=n.first,p=n.last;while(++l<f){a&&o[l].moveBy(a,0);var d=this.$getSelectedRows(o[l]);if(t&&d.first!=p)break;if(!t&&d.first>p+1)break;p=d.last}l--,u=this.session.$moveLines(h,p,t?0:e),t&&e==-1&&(c=l+1);while(c<=l)o[c].moveBy(u,0),c++;t||(u=0),a+=u}i.fromOrientedRange(i.ranges[0]),i.rangeList.attach(this.session),this.inVirtualSelectionMode=!1}},this.$getSelectedRows=function(e){return e=(e||this.getSelectionRange()).collapseRows(),{first:this.session.getRowFoldStart(e.start.row),last:this.session.getRowFoldEnd(e.end.row)}},this.onCompositionStart=function(e){this.renderer.showComposition(e)},this.onCompositionUpdate=function(e){this.renderer.setCompositionText(e)},this.onCompositionEnd=function(){this.renderer.hideComposition()},this.getFirstVisibleRow=function(){return this.renderer.getFirstVisibleRow()},this.getLastVisibleRow=function(){return this.renderer.getLastVisibleRow()},this.isRowVisible=function(e){return e>=this.getFirstVisibleRow()&&e<=this.getLastVisibleRow()},this.isRowFullyVisible=function(e){return e>=this.renderer.getFirstFullyVisibleRow()&&e<=this.renderer.getLastFullyVisibleRow()},this.$getVisibleRowCount=function(){return this.renderer.getScrollBottomRow()-this.renderer.getScrollTopRow()+1},this.$moveByPage=function(e,t){var n=this.renderer,r=this.renderer.layerConfig,i=e*Math.floor(r.height/r.lineHeight);t===!0?this.selection.$moveSelection(function(){this.moveCursorBy(i,0)}):t===!1&&(this.selection.moveCursorBy(i,0),this.selection.clearSelection());var s=n.scrollTop;n.scrollBy(0,i*r.lineHeight),t!=null&&n.scrollCursorIntoView(null,.5),n.animateScrolling(s)},this.selectPageDown=function(){this.$moveByPage(1,!0)},this.selectPageUp=function(){this.$moveByPage(-1,!0)},this.gotoPageDown=function(){this.$moveByPage(1,!1)},this.gotoPageUp=function(){this.$moveByPage(-1,!1)},this.scrollPageDown=function(){this.$moveByPage(1)},this.scrollPageUp=function(){this.$moveByPage(-1)},this.scrollToRow=function(e){this.renderer.scrollToRow(e)},this.scrollToLine=function(e,t,n,r){this.renderer.scrollToLine(e,t,n,r)},this.centerSelection=function(){var e=this.getSelectionRange(),t={row:Math.floor(e.start.row+(e.end.row-e.start.row)/2),column:Math.floor(e.start.column+(e.end.column-e.start.column)/2)};this.renderer.alignCursor(t,.5)},this.getCursorPosition=function(){return this.selection.getCursor()},this.getCursorPositionScreen=function(){return this.session.documentToScreenPosition(this.getCursorPosition())},this.getSelectionRange=function(){return this.selection.getRange()},this.selectAll=function(){this.selection.selectAll()},this.clearSelection=function(){this.selection.clearSelection()},this.moveCursorTo=function(e,t){this.selection.moveCursorTo(e,t)},this.moveCursorToPosition=function(e){this.selection.moveCursorToPosition(e)},this.jumpToMatching=function(e,t){var n=this.getCursorPosition(),r=new y(this.session,n.row,n.column),i=r.getCurrentToken(),s=i||r.stepForward();if(!s)return;var o,u=!1,a={},f=n.column-s.start,l,c={")":"(","(":"(","]":"[","[":"[","{":"{","}":"{"};do{if(s.value.match(/[{}()\[\]]/g))for(;f<s.value.length&&!u;f++){if(!c[s.value[f]])continue;l=c[s.value[f]]+"."+s.type.replace("rparen","lparen"),isNaN(a[l])&&(a[l]=0);switch(s.value[f]){case"(":case"[":case"{":a[l]++;break;case")":case"]":case"}":a[l]--,a[l]===-1&&(o="bracket",u=!0)}}else s.type.indexOf("tag-name")!==-1&&(isNaN(a[s.value])&&(a[s.value]=0),i.value==="<"?a[s.value]++:i.value==="</"&&a[s.value]--,a[s.value]===-1&&(o="tag",u=!0));u||(i=s,s=r.stepForward(),f=0)}while(s&&!u);if(!o)return;var h,d;if(o==="bracket"){h=this.session.getBracketRange(n);if(!h){h=new p(r.getCurrentTokenRow(),r.getCurrentTokenColumn()+f-1,r.getCurrentTokenRow(),r.getCurrentTokenColumn()+f-1),d=h.start;if(t||d.row===n.row&&Math.abs(d.column-n.column)<2)h=this.session.getBracketRange(d)}}else if(o==="tag"){if(!s||s.type.indexOf("tag-name")===-1)return;var v=s.value;h=new p(r.getCurrentTokenRow(),r.getCurrentTokenColumn()-2,r.getCurrentTokenRow(),r.getCurrentTokenColumn()-2);if(h.compare(n.row,n.column)===0){u=!1;do s=i,i=r.stepBackward(),i&&(i.type.indexOf("tag-close")!==-1&&h.setEnd(r.getCurrentTokenRow(),r.getCurrentTokenColumn()+1),s.value===v&&s.type.indexOf("tag-name")!==-1&&(i.value==="<"?a[v]++:i.value==="</"&&a[v]--,a[v]===0&&(u=!0)));while(i&&!u)}s&&s.type.indexOf("tag-name")&&(d=h.start,d.row==n.row&&Math.abs(d.column-n.column)<2&&(d=h.end))}d=h&&h.cursor||d,d&&(e?h&&t?this.selection.setRange(h):h&&h.isEqual(this.getSelectionRange())?this.clearSelection():this.selection.selectTo(d.row,d.column):this.selection.moveTo(d.row,d.column))},this.gotoLine=function(e,t,n){this.selection.clearSelection(),this.session.unfold({row:e-1,column:t||0}),this.exitMultiSelectMode&&this.exitMultiSelectMode(),this.moveCursorTo(e-1,t||0),this.isRowFullyVisible(e-1)||this.scrollToLine(e-1,!0,n)},this.navigateTo=function(e,t){this.selection.moveTo(e,t)},this.navigateUp=function(e){if(this.selection.isMultiLine()&&!this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(-e||-1,0)},this.navigateDown=function(e){if(this.selection.isMultiLine()&&this.selection.isBackwards()){var t=this.selection.anchor.getPosition();return this.moveCursorToPosition(t)}this.selection.clearSelection(),this.selection.moveCursorBy(e||1,0)},this.navigateLeft=function(e){if(!this.selection.isEmpty()){var t=this.getSelectionRange().start;this.moveCursorToPosition(t)}else{e=e||1;while(e--)this.selection.moveCursorLeft()}this.clearSelection()},this.navigateRight=function(e){if(!this.selection.isEmpty()){var t=this.getSelectionRange().end;this.moveCursorToPosition(t)}else{e=e||1;while(e--)this.selection.moveCursorRight()}this.clearSelection()},this.navigateLineStart=function(){this.selection.moveCursorLineStart(),this.clearSelection()},this.navigateLineEnd=function(){this.selection.moveCursorLineEnd(),this.clearSelection()},this.navigateFileEnd=function(){this.selection.moveCursorFileEnd(),this.clearSelection()},this.navigateFileStart=function(){this.selection.moveCursorFileStart(),this.clearSelection()},this.navigateWordRight=function(){this.selection.moveCursorWordRight(),this.clearSelection()},this.navigateWordLeft=function(){this.selection.moveCursorWordLeft(),this.clearSelection()},this.replace=function(e,t){t&&this.$search.set(t);var n=this.$search.find(this.session),r=0;return n?(this.$tryReplace(n,e)&&(r=1),this.selection.setSelectionRange(n),this.renderer.scrollSelectionIntoView(n.start,n.end),r):r},this.replaceAll=function(e,t){t&&this.$search.set(t);var n=this.$search.findAll(this.session),r=0;if(!n.length)return r;var i=this.getSelectionRange();this.selection.moveTo(0,0);for(var s=n.length-1;s>=0;--s)this.$tryReplace(n[s],e)&&r++;return this.selection.setSelectionRange(i),r},this.$tryReplace=function(e,t){var n=this.session.getTextRange(e);return t=this.$search.replace(n,t),t!==null?(e.end=this.session.replace(e,t),e):null},this.getLastSearchOptions=function(){return this.$search.getOptions()},this.find=function(e,t,n){t||(t={}),typeof e=="string"||e instanceof RegExp?t.needle=e:typeof e=="object"&&r.mixin(t,e);var i=this.selection.getRange();t.needle==null&&(e=this.session.getTextRange(i)||this.$search.$options.needle,e||(i=this.session.getWordRange(i.start.row,i.start.column),e=this.session.getTextRange(i)),this.$search.set({needle:e})),this.$search.set(t),t.start||this.$search.set({start:i});var s=this.$search.find(this.session);if(t.preventScroll)return s;if(s)return this.revealRange(s,n),s;t.backwards?i.start=i.end:i.end=i.start,this.selection.setRange(i)},this.findNext=function(e,t){this.find({skipCurrent:!0,backwards:!1},e,t)},this.findPrevious=function(e,t){this.find(e,{skipCurrent:!0,backwards:!0},t)},this.revealRange=function(e,t){this.session.unfold(e),this.selection.setSelectionRange(e);var n=this.renderer.scrollTop;this.renderer.scrollSelectionIntoView(e.start,e.end,.5),t!==!1&&this.renderer.animateScrolling(n)},this.undo=function(){this.session.getUndoManager().undo(this.session),this.renderer.scrollCursorIntoView(null,.5)},this.redo=function(){this.session.getUndoManager().redo(this.session),this.renderer.scrollCursorIntoView(null,.5)},this.destroy=function(){this.renderer.destroy(),this._signal("destroy",this),this.session&&this.session.destroy()},this.setAutoScrollEditorIntoView=function(e){if(!e)return;var t,n=this,r=!1;this.$scrollAnchor||(this.$scrollAnchor=document.createElement("div"));var i=this.$scrollAnchor;i.style.cssText="position:absolute",this.container.insertBefore(i,this.container.firstChild);var s=this.on("changeSelection",function(){r=!0}),o=this.renderer.on("beforeRender",function(){r&&(t=n.renderer.container.getBoundingClientRect())}),u=this.renderer.on("afterRender",function(){if(r&&t&&(n.isFocused()||n.searchBox&&n.searchBox.isFocused())){var e=n.renderer,s=e.$cursorLayer.$pixelPos,o=e.layerConfig,u=s.top-o.offset;s.top>=0&&u+t.top<0?r=!0:s.top<o.height&&s.top+t.top+o.lineHeight>window.innerHeight?r=!1:r=null,r!=null&&(i.style.top=u+"px",i.style.left=s.left+"px",i.style.height=o.lineHeight+"px",i.scrollIntoView(r)),r=t=null}});this.setAutoScrollEditorIntoView=function(e){if(e)return;delete this.setAutoScrollEditorIntoView,this.off("changeSelection",s),this.renderer.off("afterRender",u),this.renderer.off("beforeRender",o)}},this.$resetCursorStyle=function(){var e=this.$cursorStyle||"ace",t=this.renderer.$cursorLayer;if(!t)return;t.setSmoothBlinking(/smooth/.test(e)),t.isBlinking=!this.$readOnly&&e!="wide",i.setCssClass(t.element,"ace_slim-cursors",/slim/.test(e))}}.call(w.prototype),g.defineOptions(w.prototype,"editor",{selectionStyle:{set:function(e){this.onSelectionChange(),this._signal("changeSelectionStyle",{data:e})},initialValue:"line"},highlightActiveLine:{set:function(){this.$updateHighlightActiveLine()},initialValue:!0},highlightSelectedWord:{set:function(e){this.$onSelectionChange()},initialValue:!0},readOnly:{set:function(e){this.textInput.setReadOnly(e),this.$resetCursorStyle()},initialValue:!1},copyWithEmptySelection:{set:function(e){this.textInput.setCopyWithEmptySelection(e)},initialValue:!1},cursorStyle:{set:function(e){this.$resetCursorStyle()},values:["ace","slim","smooth","wide"],initialValue:"ace"},mergeUndoDeltas:{values:[!1,!0,"always"],initialValue:!0},behavioursEnabled:{initialValue:!0},wrapBehavioursEnabled:{initialValue:!0},autoScrollEditorIntoView:{set:function(e){this.setAutoScrollEditorIntoView(e)}},keyboardHandler:{set:function(e){this.setKeyboardHandler(e)},get:function(){return this.$keybindingId},handlesSet:!0},value:{set:function(e){this.session.setValue(e)},get:function(){return this.getValue()},handlesSet:!0,hidden:!0},session:{set:function(e){this.setSession(e)},get:function(){return this.session},handlesSet:!0,hidden:!0},showLineNumbers:{set:function(e){this.renderer.$gutterLayer.setShowLineNumbers(e),this.renderer.$loop.schedule(this.renderer.CHANGE_GUTTER),e&&this.$relativeLineNumbers?E.attach(this):E.detach(this)},initialValue:!0},relativeLineNumbers:{set:function(e){this.$showLineNumbers&&e?E.attach(this):E.detach(this)}},hScrollBarAlwaysVisible:"renderer",vScrollBarAlwaysVisible:"renderer",highlightGutterLine:"renderer",animatedScroll:"renderer",showInvisibles:"renderer",showPrintMargin:"renderer",printMarginColumn:"renderer",printMargin:"renderer",fadeFoldWidgets:"renderer",showFoldWidgets:"renderer",displayIndentGuides:"renderer",showGutter:"renderer",fontSize:"renderer",fontFamily:"renderer",maxLines:"renderer",minLines:"renderer",scrollPastEnd:"renderer",fixedWidthGutter:"renderer",theme:"renderer",hasCssTransforms:"renderer",maxPixelHeight:"renderer",useTextareaForIME:"renderer",scrollSpeed:"$mouseHandler",dragDelay:"$mouseHandler",dragEnabled:"$mouseHandler",focusTimeout:"$mouseHandler",tooltipFollowsMouse:"$mouseHandler",firstLineNumber:"session",overwrite:"session",newLineMode:"session",useWorker:"session",useSoftTabs:"session",navigateWithinSoftTabs:"session",tabSize:"session",wrap:"session",indentedSoftWrap:"session",foldStyle:"session",mode:"session"});var E={getText:function(e,t){return(Math.abs(e.selection.lead.row-t)||t+1+(t<9?"\u00b7":""))+""},getWidth:function(e,t,n){return Math.max(t.toString().length,(n.lastRow+1).toString().length,2)*n.characterWidth},update:function(e,t){t.renderer.$loop.schedule(t.renderer.CHANGE_GUTTER)},attach:function(e){e.renderer.$gutterLayer.$renderer=this,e.on("changeSelection",this.update),this.update(null,e)},detach:function(e){e.renderer.$gutterLayer.$renderer==this&&(e.renderer.$gutterLayer.$renderer=null),e.off("changeSelection",this.update),this.update(null,e)}};t.Editor=w}),ace.define("ace/undomanager",["require","exports","module","ace/range"],function(e,t,n){"use strict";function i(e,t){for(var n=t;n--;){var r=e[n];if(r&&!r[0].ignore){while(n<t-1){var i=d(e[n],e[n+1]);e[n]=i[0],e[n+1]=i[1],n++}return!0}}}function a(e){var t=e.action=="insert",n=e.start,r=e.end,i=(r.row-n.row)*(t?1:-1),s=(r.column-n.column)*(t?1:-1);t&&(r=n);for(var o in this.marks){var a=this.marks[o],f=u(a,n);if(f<0)continue;if(f===0&&t){if(a.bias!=1){a.bias==-1;continue}f=1}var l=t?f:u(a,r);if(l>0){a.row+=i,a.column+=a.row==r.row?s:0;continue}!t&&l<=0&&(a.row=n.row,a.column=n.column,l===0&&(a.bias=1))}}function f(e){return{row:e.row,column:e.column}}function l(e){return{start:f(e.start),end:f(e.end),action:e.action,lines:e.lines.slice()}}function c(e){e=e||this;if(Array.isArray(e))return e.map(c).join("\n");var t="";e.action?(t=e.action=="insert"?"+":"-",t+="["+e.lines+"]"):e.value&&(Array.isArray(e.value)?t=e.value.map(h).join("\n"):t=h(e.value)),e.start&&(t+=h(e));if(e.id||e.rev)t+="	("+(e.id||e.rev)+")";return t}function h(e){return e.start.row+":"+e.start.column+"=>"+e.end.row+":"+e.end.column}function p(e,t){var n=e.action=="insert",r=t.action=="insert";if(n&&r)if(o(t.start,e.end)>=0)m(t,e,-1);else{if(!(o(t.start,e.start)<=0))return null;m(e,t,1)}else if(n&&!r)if(o(t.start,e.end)>=0)m(t,e,-1);else{if(!(o(t.end,e.start)<=0))return null;m(e,t,-1)}else if(!n&&r)if(o(t.start,e.start)>=0)m(t,e,1);else{if(!(o(t.start,e.start)<=0))return null;m(e,t,1)}else if(!n&&!r)if(o(t.start,e.start)>=0)m(t,e,1);else{if(!(o(t.end,e.start)<=0))return null;m(e,t,-1)}return[t,e]}function d(e,t){for(var n=e.length;n--;)for(var r=0;r<t.length;r++)if(!p(e[n],t[r])){while(n<e.length){while(r--)p(t[r],e[n]);r=t.length,n++}return[e,t]}return e.selectionBefore=t.selectionBefore=e.selectionAfter=t.selectionAfter=null,[t,e]}function v(e,t){var n=e.action=="insert",r=t.action=="insert";if(n&&r)o(e.start,t.start)<0?m(t,e,1):m(e,t,1);else if(n&&!r)o(e.start,t.end)>=0?m(e,t,-1):o(e.start,t.start)<=0?m(t,e,1):(m(e,s.fromPoints(t.start,e.start),-1),m(t,e,1));else if(!n&&r)o(t.start,e.end)>=0?m(t,e,-1):o(t.start,e.start)<=0?m(e,t,1):(m(t,s.fromPoints(e.start,t.start),-1),m(e,t,1));else if(!n&&!r)if(o(t.start,e.end)>=0)m(t,e,-1);else{if(!(o(t.end,e.start)<=0)){var i,u;return o(e.start,t.start)<0&&(i=e,e=y(e,t.start)),o(e.end,t.end)>0&&(u=y(e,t.end)),g(t.end,e.start,e.end,-1),u&&!i&&(e.lines=u.lines,e.start=u.start,e.end=u.end,u=e),[t,i,u].filter(Boolean)}m(e,t,-1)}return[t,e]}function m(e,t,n){g(e.start,t.start,t.end,n),g(e.end,t.start,t.end,n)}function g(e,t,n,r){e.row==(r==1?t:n).row&&(e.column+=r*(n.column-t.column)),e.row+=r*(n.row-t.row)}function y(e,t){var n=e.lines,r=e.end;e.end=f(t);var i=e.end.row-e.start.row,s=n.splice(i,n.length),o=i?t.column:t.column-e.start.column;n.push(s[0].substring(0,o)),s[0]=s[0].substr(o);var u={start:f(t),end:r,lines:s,action:e.action};return u}function b(e,t){t=l(t);for(var n=e.length;n--;){var r=e[n];for(var i=0;i<r.length;i++){var s=r[i],o=v(s,t);t=o[0],o.length!=2&&(o[2]?(r.splice(i+1,1,o[1],o[2]),i++):o[1]||(r.splice(i,1),i--))}r.length||e.splice(n,1)}return e}function w(e,t){for(var n=0;n<t.length;n++){var r=t[n];for(var i=0;i<r.length;i++)b(e,r[i])}}var r=function(){this.$maxRev=0,this.$fromUndo=!1,this.reset()};(function(){this.addSession=function(e){this.$session=e},this.add=function(e,t,n){if(this.$fromUndo)return;if(e==this.$lastDelta)return;if(t===!1||!this.lastDeltas)this.lastDeltas=[],this.$undoStack.push(this.lastDeltas),e.id=this.$rev=++this.$maxRev;if(e.action=="remove"||e.action=="insert")this.$lastDelta=e;this.lastDeltas.push(e)},this.addSelection=function(e,t){this.selections.push({value:e,rev:t||this.$rev})},this.startNewGroup=function(){return this.lastDeltas=null,this.$rev},this.markIgnored=function(e,t){t==null&&(t=this.$rev+1);var n=this.$undoStack;for(var r=n.length;r--;){var i=n[r][0];if(i.id<=e)break;i.id<t&&(i.ignore=!0)}this.lastDeltas=null},this.getSelection=function(e,t){var n=this.selections;for(var r=n.length;r--;){var i=n[r];if(i.rev<e)return t&&(i=n[r+1]),i}},this.getRevision=function(){return this.$rev},this.getDeltas=function(e,t){t==null&&(t=this.$rev+1);var n=this.$undoStack,r=null,i=0;for(var s=n.length;s--;){var o=n[s][0];o.id<t&&!r&&(r=s+1);if(o.id<=e){i=s+1;break}}return n.slice(i,r)},this.getChangedRanges=function(e,t){t==null&&(t=this.$rev+1)},this.getChangedLines=function(e,t){t==null&&(t=this.$rev+1)},this.undo=function(e,t){this.lastDeltas=null;var n=this.$undoStack;if(!i(n,n.length))return;e||(e=this.$session),this.$redoStackBaseRev!==this.$rev&&this.$redoStack.length&&(this.$redoStack=[]),this.$fromUndo=!0;var r=n.pop(),s=null;return r&&r.length&&(s=e.undoChanges(r,t),this.$redoStack.push(r),this.$syncRev()),this.$fromUndo=!1,s},this.redo=function(e,t){this.lastDeltas=null,e||(e=this.$session),this.$fromUndo=!0;if(this.$redoStackBaseRev!=this.$rev){var n=this.getDeltas(this.$redoStackBaseRev,this.$rev+1);w(this.$redoStack,n),this.$redoStackBaseRev=this.$rev,this.$redoStack.forEach(function(e){e[0].id=++this.$maxRev},this)}var r=this.$redoStack.pop(),i=null;return r&&(i=e.redoChanges(r,t),this.$undoStack.push(r),this.$syncRev()),this.$fromUndo=!1,i},this.$syncRev=function(){var e=this.$undoStack,t=e[e.length-1],n=t&&t[0].id||0;this.$redoStackBaseRev=n,this.$rev=n},this.reset=function(){this.lastDeltas=null,this.$lastDelta=null,this.$undoStack=[],this.$redoStack=[],this.$rev=0,this.mark=0,this.$redoStackBaseRev=this.$rev,this.selections=[]},this.canUndo=function(){return this.$undoStack.length>0},this.canRedo=function(){return this.$redoStack.length>0},this.bookmark=function(e){e==undefined&&(e=this.$rev),this.mark=e},this.isAtBookmark=function(){return this.$rev===this.mark},this.toJSON=function(){},this.fromJSON=function(){},this.hasUndo=this.canUndo,this.hasRedo=this.canRedo,this.isClean=this.isAtBookmark,this.markClean=this.bookmark,this.$prettyPrint=function(e){return e?c(e):c(this.$undoStack)+"\n---\n"+c(this.$redoStack)}}).call(r.prototype);var s=e("./range").Range,o=s.comparePoints,u=s.comparePoints;t.UndoManager=r}),ace.define("ace/layer/lines",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../lib/dom"),i=function(e,t){this.element=e,this.canvasHeight=t||5e5,this.element.style.height=this.canvasHeight*2+"px",this.cells=[],this.cellCache=[],this.$offsetCoefficient=0};(function(){this.moveContainer=function(e){r.translate(this.element,0,-(e.firstRowScreen*e.lineHeight%this.canvasHeight)-e.offset*this.$offsetCoefficient)},this.pageChanged=function(e,t){return Math.floor(e.firstRowScreen*e.lineHeight/this.canvasHeight)!==Math.floor(t.firstRowScreen*t.lineHeight/this.canvasHeight)},this.computeLineTop=function(e,t,n){var r=t.firstRowScreen*t.lineHeight,i=Math.floor(r/this.canvasHeight),s=n.documentToScreenRow(e,0)*t.lineHeight;return s-i*this.canvasHeight},this.computeLineHeight=function(e,t,n){return t.lineHeight*n.getRowLength(e)},this.getLength=function(){return this.cells.length},this.get=function(e){return this.cells[e]},this.shift=function(){this.$cacheCell(this.cells.shift())},this.pop=function(){this.$cacheCell(this.cells.pop())},this.push=function(e){if(Array.isArray(e)){this.cells.push.apply(this.cells,e);var t=r.createFragment(this.element);for(var n=0;n<e.length;n++)t.appendChild(e[n].element);this.element.appendChild(t)}else this.cells.push(e),this.element.appendChild(e.element)},this.unshift=function(e){if(Array.isArray(e)){this.cells.unshift.apply(this.cells,e);var t=r.createFragment(this.element);for(var n=0;n<e.length;n++)t.appendChild(e[n].element);this.element.firstChild?this.element.insertBefore(t,this.element.firstChild):this.element.appendChild(t)}else this.cells.unshift(e),this.element.insertAdjacentElement("afterbegin",e.element)},this.last=function(){return this.cells.length?this.cells[this.cells.length-1]:null},this.$cacheCell=function(e){if(!e)return;e.element.remove(),this.cellCache.push(e)},this.createCell=function(e,t,n,i){var s=this.cellCache.pop();if(!s){var o=r.createElement("div");i&&i(o),this.element.appendChild(o),s={element:o,text:"",row:e}}return s.row=e,s}}).call(i.prototype),t.Lines=i}),ace.define("ace/layer/gutter",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/lang","ace/lib/event_emitter","ace/layer/lines"],function(e,t,n){"use strict";function f(e){var t=document.createTextNode("");e.appendChild(t);var n=r.createElement("span");return e.appendChild(n),e}var r=e("../lib/dom"),i=e("../lib/oop"),s=e("../lib/lang"),o=e("../lib/event_emitter").EventEmitter,u=e("./lines").Lines,a=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_gutter-layer",e.appendChild(this.element),this.setShowFoldWidgets(this.$showFoldWidgets),this.gutterWidth=0,this.$annotations=[],this.$updateAnnotations=this.$updateAnnotations.bind(this),this.$lines=new u(this.element),this.$lines.$offsetCoefficient=1};(function(){i.implement(this,o),this.setSession=function(e){this.session&&this.session.removeEventListener("change",this.$updateAnnotations),this.session=e,e&&e.on("change",this.$updateAnnotations)},this.addGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.addGutterDecoration"),this.session.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){window.console&&console.warn&&console.warn("deprecated use session.removeGutterDecoration"),this.session.removeGutterDecoration(e,t)},this.setAnnotations=function(e){this.$annotations=[];for(var t=0;t<e.length;t++){var n=e[t],r=n.row,i=this.$annotations[r];i||(i=this.$annotations[r]={text:[]});var o=n.text;o=o?s.escapeHTML(o):n.html||"",i.text.indexOf(o)===-1&&i.text.push(o);var u=n.type;u=="error"?i.className=" ace_error":u=="warning"&&i.className!=" ace_error"?i.className=" ace_warning":u=="info"&&!i.className&&(i.className=" ace_info")}},this.$updateAnnotations=function(e){if(!this.$annotations.length)return;var t=e.start.row,n=e.end.row-t;if(n!==0)if(e.action=="remove")this.$annotations.splice(t,n+1,null);else{var r=new Array(n+1);r.unshift(t,1),this.$annotations.splice.apply(this.$annotations,r)}},this.update=function(e){this.config=e;var t=this.session,n=e.firstRow,r=Math.min(e.lastRow+e.gutterOffset,t.getLength()-1);this.oldLastRow=r,this.config=e,this.$lines.moveContainer(e),this.$updateCursorRow();var i=t.getNextFoldLine(n),s=i?i.start.row:Infinity,o=null,u=-1,a=n;for(;;){a>s&&(a=i.end.row+1,i=t.getNextFoldLine(a,i),s=i?i.start.row:Infinity);if(a>r){while(this.$lines.getLength()>u+1)this.$lines.pop();break}o=this.$lines.get(++u),o?o.row=a:(o=this.$lines.createCell(a,e,this.session,f),this.$lines.push(o)),this.$renderCell(o,e,i,a),a++}this._signal("afterRender"),this.$updateGutterWidth(e)},this.$updateGutterWidth=function(e){var t=this.session,n=t.gutterRenderer||this.$renderer,r=t.$firstLineNumber,i=this.$lines.last()?this.$lines.last().text:"";if(this.$fixedWidth||t.$useWrapMode)i=t.getLength()+r-1;var s=n?n.getWidth(t,i,e):i.toString().length*e.characterWidth,o=this.$padding||this.$computePadding();s+=o.left+o.right,s!==this.gutterWidth&&!isNaN(s)&&(this.gutterWidth=s,this.element.parentNode.style.width=this.element.style.width=Math.ceil(this.gutterWidth)+"px",this._signal("changeGutterWidth",s))},this.$updateCursorRow=function(){if(!this.$highlightGutterLine)return;var e=this.session.selection.getCursor();if(this.$cursorRow===e.row)return;this.$cursorRow=e.row},this.updateLineHighlight=function(){if(!this.$highlightGutterLine)return;var e=this.session.selection.cursor.row;this.$cursorRow=e;if(this.$cursorCell&&this.$cursorCell.row==e)return;this.$cursorCell&&(this.$cursorCell.element.className=this.$cursorCell.element.className.replace("ace_gutter-active-line ",""));var t=this.$lines.cells;this.$cursorCell=null;for(var n=0;n<t.length;n++){var r=t[n];if(r.row>=this.$cursorRow){if(r.row>this.$cursorRow){var i=this.session.getFoldLine(this.$cursorRow);if(!(n>0&&i&&i.start.row==t[n-1].row))break;r=t[n-1]}r.element.className="ace_gutter-active-line "+r.element.className,this.$cursorCell=r;break}}},this.scrollLines=function(e){var t=this.config;this.config=e,this.$updateCursorRow();if(this.$lines.pageChanged(t,e))return this.update(e);this.$lines.moveContainer(e);var n=Math.min(e.lastRow+e.gutterOffset,this.session.getLength()-1),r=this.oldLastRow;this.oldLastRow=n;if(!t||r<e.firstRow)return this.update(e);if(n<t.firstRow)return this.update(e);if(t.firstRow<e.firstRow)for(var i=this.session.getFoldedRowCount(t.firstRow,e.firstRow-1);i>0;i--)this.$lines.shift();if(r>n)for(var i=this.session.getFoldedRowCount(n+1,r);i>0;i--)this.$lines.pop();e.firstRow<t.firstRow&&this.$lines.unshift(this.$renderLines(e,e.firstRow,t.firstRow-1)),n>r&&this.$lines.push(this.$renderLines(e,r+1,n)),this.updateLineHighlight(),this._signal("afterRender"),this.$updateGutterWidth(e)},this.$renderLines=function(e,t,n){var r=[],i=t,s=this.session.getNextFoldLine(i),o=s?s.start.row:Infinity;for(;;){i>o&&(i=s.end.row+1,s=this.session.getNextFoldLine(i,s),o=s?s.start.row:Infinity);if(i>n)break;var u=this.$lines.createCell(i,e,this.session,f);this.$renderCell(u,e,s,i),r.push(u),i++}return r},this.$renderCell=function(e,t,n,i){var s=e.element,o=this.session,u=s.childNodes[0],a=s.childNodes[1],f=o.$firstLineNumber,l=o.$breakpoints,c=o.$decorations,h=o.gutterRenderer||this.$renderer,p=this.$showFoldWidgets&&o.foldWidgets,d=n?n.start.row:Number.MAX_VALUE,v="ace_gutter-cell ";this.$highlightGutterLine&&(i==this.$cursorRow||n&&i<this.$cursorRow&&i>=d&&this.$cursorRow<=n.end.row)&&(v+="ace_gutter-active-line ",this.$cursorCell!=e&&(this.$cursorCell&&(this.$cursorCell.element.className=this.$cursorCell.element.className.replace("ace_gutter-active-line ","")),this.$cursorCell=e)),l[i]&&(v+=l[i]),c[i]&&(v+=c[i]),this.$annotations[i]&&(v+=this.$annotations[i].className),s.className!=v&&(s.className=v);if(p){var m=p[i];m==null&&(m=p[i]=o.getFoldWidget(i))}if(m){var v="ace_fold-widget ace_"+m;m=="start"&&i==d&&i<n.end.row?v+=" ace_closed":v+=" ace_open",a.className!=v&&(a.className=v);var g=t.lineHeight+"px";r.setStyle(a.style,"height",g),r.setStyle(a.style,"display","inline-block")}else a&&r.setStyle(a.style,"display","none");var y=(h?h.getText(o,i):i+f).toString();return y!==u.data&&(u.data=y),r.setStyle(e.element.style,"height",this.$lines.computeLineHeight(i,t,o)+"px"),r.setStyle(e.element.style,"top",this.$lines.computeLineTop(i,t,o)+"px"),e.text=y,e},this.$fixedWidth=!1,this.$highlightGutterLine=!0,this.$renderer="",this.setHighlightGutterLine=function(e){this.$highlightGutterLine=e},this.$showLineNumbers=!0,this.$renderer="",this.setShowLineNumbers=function(e){this.$renderer=!e&&{getWidth:function(){return 0},getText:function(){return""}}},this.getShowLineNumbers=function(){return this.$showLineNumbers},this.$showFoldWidgets=!0,this.setShowFoldWidgets=function(e){e?r.addCssClass(this.element,"ace_folding-enabled"):r.removeCssClass(this.element,"ace_folding-enabled"),this.$showFoldWidgets=e,this.$padding=null},this.getShowFoldWidgets=function(){return this.$showFoldWidgets},this.$computePadding=function(){if(!this.element.firstChild)return{left:0,right:0};var e=r.computedStyle(this.element.firstChild);return this.$padding={},this.$padding.left=(parseInt(e.borderLeftWidth)||0)+(parseInt(e.paddingLeft)||0)+1,this.$padding.right=(parseInt(e.borderRightWidth)||0)+(parseInt(e.paddingRight)||0),this.$padding},this.getRegion=function(e){var t=this.$padding||this.$computePadding(),n=this.element.getBoundingClientRect();if(e.x<t.left+n.left)return"markers";if(this.$showFoldWidgets&&e.x>n.right-t.right)return"foldWidgets"}}).call(a.prototype),t.Gutter=a}),ace.define("ace/layer/marker",["require","exports","module","ace/range","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../range").Range,i=e("../lib/dom"),s=function(e){this.element=i.createElement("div"),this.element.className="ace_layer ace_marker-layer",e.appendChild(this.element)};(function(){function e(e,t,n,r){return(e?1:0)|(t?2:0)|(n?4:0)|(r?8:0)}this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setMarkers=function(e){this.markers=e},this.elt=function(e,t){var n=this.i!=-1&&this.element.childNodes[this.i];n?this.i++:(n=document.createElement("div"),this.element.appendChild(n),this.i=-1),n.style.cssText=t,n.className=e},this.update=function(e){if(!e)return;this.config=e,this.i=0;var t;for(var n in this.markers){var r=this.markers[n];if(!r.range){r.update(t,this,this.session,e);continue}var i=r.range.clipRows(e.firstRow,e.lastRow);if(i.isEmpty())continue;i=i.toScreenRange(this.session);if(r.renderer){var s=this.$getTop(i.start.row,e),o=this.$padding+i.start.column*e.characterWidth;r.renderer(t,i,o,s,e)}else r.type=="fullLine"?this.drawFullLineMarker(t,i,r.clazz,e):r.type=="screenLine"?this.drawScreenLineMarker(t,i,r.clazz,e):i.isMultiLine()?r.type=="text"?this.drawTextMarker(t,i,r.clazz,e):this.drawMultiLineMarker(t,i,r.clazz,e):this.drawSingleLineMarker(t,i,r.clazz+" ace_start"+" ace_br15",e)}if(this.i!=-1)while(this.i<this.element.childElementCount)this.element.removeChild(this.element.lastChild)},this.$getTop=function(e,t){return(e-t.firstRowScreen)*t.lineHeight},this.drawTextMarker=function(t,n,i,s,o){var u=this.session,a=n.start.row,f=n.end.row,l=a,c=0,h=0,p=u.getScreenLastRowColumn(l),d=new r(l,n.start.column,l,h);for(;l<=f;l++)d.start.row=d.end.row=l,d.start.column=l==a?n.start.column:u.getRowWrapIndent(l),d.end.column=p,c=h,h=p,p=l+1<f?u.getScreenLastRowColumn(l+1):l==f?0:n.end.column,this.drawSingleLineMarker(t,d,i+(l==a?" ace_start":"")+" ace_br"+e(l==a||l==a+1&&n.start.column,c<h,h>p,l==f),s,l==f?0:1,o)},this.drawMultiLineMarker=function(e,t,n,r,i){var s=this.$padding,o=r.lineHeight,u=this.$getTop(t.start.row,r),a=s+t.start.column*r.characterWidth;i=i||"";if(this.session.$bidiHandler.isBidiRow(t.start.row)){var f=t.clone();f.end.row=f.start.row,f.end.column=this.session.getLine(f.start.row).length,this.drawBidiSingleLineMarker(e,f,n+" ace_br1 ace_start",r,null,i)}else this.elt(n+" ace_br1 ace_start","height:"+o+"px;"+"right:0;"+"top:"+u+"px;left:"+a+"px;"+(i||""));if(this.session.$bidiHandler.isBidiRow(t.end.row)){var f=t.clone();f.start.row=f.end.row,f.start.column=0,this.drawBidiSingleLineMarker(e,f,n+" ace_br12",r,null,i)}else{u=this.$getTop(t.end.row,r);var l=t.end.column*r.characterWidth;this.elt(n+" ace_br12","height:"+o+"px;"+"width:"+l+"px;"+"top:"+u+"px;"+"left:"+s+"px;"+(i||""))}o=(t.end.row-t.start.row-1)*r.lineHeight;if(o<=0)return;u=this.$getTop(t.start.row+1,r);var c=(t.start.column?1:0)|(t.end.column?0:8);this.elt(n+(c?" ace_br"+c:""),"height:"+o+"px;"+"right:0;"+"top:"+u+"px;"+"left:"+s+"px;"+(i||""))},this.drawSingleLineMarker=function(e,t,n,r,i,s){if(this.session.$bidiHandler.isBidiRow(t.start.row))return this.drawBidiSingleLineMarker(e,t,n,r,i,s);var o=r.lineHeight,u=(t.end.column+(i||0)-t.start.column)*r.characterWidth,a=this.$getTop(t.start.row,r),f=this.$padding+t.start.column*r.characterWidth;this.elt(n,"height:"+o+"px;"+"width:"+u+"px;"+"top:"+a+"px;"+"left:"+f+"px;"+(s||""))},this.drawBidiSingleLineMarker=function(e,t,n,r,i,s){var o=r.lineHeight,u=this.$getTop(t.start.row,r),a=this.$padding,f=this.session.$bidiHandler.getSelections(t.start.column,t.end.column);f.forEach(function(e){this.elt(n,"height:"+o+"px;"+"width:"+e.width+(i||0)+"px;"+"top:"+u+"px;"+"left:"+(a+e.left)+"px;"+(s||""))},this)},this.drawFullLineMarker=function(e,t,n,r,i){var s=this.$getTop(t.start.row,r),o=r.lineHeight;t.start.row!=t.end.row&&(o+=this.$getTop(t.end.row,r)-s),this.elt(n,"height:"+o+"px;"+"top:"+s+"px;"+"left:0;right:0;"+(i||""))},this.drawScreenLineMarker=function(e,t,n,r,i){var s=this.$getTop(t.start.row,r),o=r.lineHeight;this.elt(n,"height:"+o+"px;"+"top:"+s+"px;"+"left:0;right:0;"+(i||""))}}).call(s.prototype),t.Marker=s}),ace.define("ace/layer/text",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/layer/lines","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("../lib/dom"),s=e("../lib/lang"),o=e("./lines").Lines,u=e("../lib/event_emitter").EventEmitter,a=function(e){this.dom=i,this.element=this.dom.createElement("div"),this.element.className="ace_layer ace_text-layer",e.appendChild(this.element),this.$updateEolChar=this.$updateEolChar.bind(this),this.$lines=new o(this.element)};(function(){r.implement(this,u),this.EOF_CHAR="\u00b6",this.EOL_CHAR_LF="\u00ac",this.EOL_CHAR_CRLF="\u00a4",this.EOL_CHAR=this.EOL_CHAR_LF,this.TAB_CHAR="\u2014",this.SPACE_CHAR="\u00b7",this.$padding=0,this.MAX_LINE_LENGTH=1e4,this.$updateEolChar=function(){var e=this.session.doc,t=e.getNewLineCharacter()=="\n"&&e.getNewLineMode()!="windows",n=t?this.EOL_CHAR_LF:this.EOL_CHAR_CRLF;if(this.EOL_CHAR!=n)return this.EOL_CHAR=n,!0},this.setPadding=function(e){this.$padding=e,this.element.style.margin="0 "+e+"px"},this.getLineHeight=function(){return this.$fontMetrics.$characterSize.height||0},this.getCharacterWidth=function(){return this.$fontMetrics.$characterSize.width||0},this.$setFontMetrics=function(e){this.$fontMetrics=e,this.$fontMetrics.on("changeCharacterSize",function(e){this._signal("changeCharacterSize",e)}.bind(this)),this.$pollSizeChanges()},this.checkForSizeChanges=function(){this.$fontMetrics.checkForSizeChanges()},this.$pollSizeChanges=function(){return this.$pollSizeChangesTimer=this.$fontMetrics.$pollSizeChanges()},this.setSession=function(e){this.session=e,e&&this.$computeTabString()},this.showInvisibles=!1,this.setShowInvisibles=function(e){return this.showInvisibles==e?!1:(this.showInvisibles=e,this.$computeTabString(),!0)},this.displayIndentGuides=!0,this.setDisplayIndentGuides=function(e){return this.displayIndentGuides==e?!1:(this.displayIndentGuides=e,this.$computeTabString(),!0)},this.$tabStrings=[],this.onChangeTabSize=this.$computeTabString=function(){var e=this.session.getTabSize();this.tabSize=e;var t=this.$tabStrings=[0];for(var n=1;n<e+1;n++)if(this.showInvisibles){var r=this.dom.createElement("span");r.className="ace_invisible ace_invisible_tab",r.textContent=s.stringRepeat(this.TAB_CHAR,n),t.push(r)}else t.push(this.dom.createTextNode(s.stringRepeat(" ",n),this.element));if(this.displayIndentGuides){this.$indentGuideRe=/\s\S| \t|\t |\s$/;var i="ace_indent-guide",o="",u="";if(this.showInvisibles){i+=" ace_invisible",o=" ace_invisible_space",u=" ace_invisible_tab";var a=s.stringRepeat(this.SPACE_CHAR,this.tabSize),f=s.stringRepeat(this.TAB_CHAR,this.tabSize)}else var a=s.stringRepeat(" ",this.tabSize),f=a;var r=this.dom.createElement("span");r.className=i+o,r.textContent=a,this.$tabStrings[" "]=r;var r=this.dom.createElement("span");r.className=i+u,r.textContent=f,this.$tabStrings["	"]=r}},this.updateLines=function(e,t,n){if(this.config.lastRow!=e.lastRow||this.config.firstRow!=e.firstRow)return this.update(e);this.config=e;var r=Math.max(t,e.firstRow),i=Math.min(n,e.lastRow),s=this.element.childNodes,o=0;for(var u=e.firstRow;u<r;u++){var a=this.session.getFoldLine(u);if(a){if(a.containsRow(r)){r=a.start.row;break}u=a.end.row}o++}var f=!1,u=r,a=this.session.getNextFoldLine(u),l=a?a.start.row:Infinity;for(;;){u>l&&(u=a.end.row+1,a=this.session.getNextFoldLine(u,a),l=a?a.start.row:Infinity);if(u>i)break;var c=s[o++];if(c){this.dom.removeChildren(c),this.$renderLine(c,u,u==l?a:!1);var h=e.lineHeight*this.session.getRowLength(u)+"px";c.style.height!=h&&(f=!0,c.style.height=h)}u++}if(f)while(o<this.$lines.cells.length){var p=this.$lines.cells[o++];p.element.style.top=this.$lines.computeLineTop(p.row,e,this.session)+"px"}},this.scrollLines=function(e){var t=this.config;this.config=e;if(this.$lines.pageChanged(t,e))return this.update(e);this.$lines.moveContainer(e);var n=e.lastRow,r=t?t.lastRow:-1;if(!t||r<e.firstRow)return this.update(e);if(n<t.firstRow)return this.update(e);if(!t||t.lastRow<e.firstRow)return this.update(e);if(e.lastRow<t.firstRow)return this.update(e);if(t.firstRow<e.firstRow)for(var i=this.session.getFoldedRowCount(t.firstRow,e.firstRow-1);i>0;i--)this.$lines.shift();if(t.lastRow>e.lastRow)for(var i=this.session.getFoldedRowCount(e.lastRow+1,t.lastRow);i>0;i--)this.$lines.pop();e.firstRow<t.firstRow&&this.$lines.unshift(this.$renderLinesFragment(e,e.firstRow,t.firstRow-1)),e.lastRow>t.lastRow&&this.$lines.push(this.$renderLinesFragment(e,t.lastRow+1,e.lastRow))},this.$renderLinesFragment=function(e,t,n){var r=[],s=t,o=this.session.getNextFoldLine(s),u=o?o.start.row:Infinity;for(;;){s>u&&(s=o.end.row+1,o=this.session.getNextFoldLine(s,o),u=o?o.start.row:Infinity);if(s>n)break;var a=this.$lines.createCell(s,e,this.session),f=a.element;this.dom.removeChildren(f),i.setStyle(f.style,"height",this.$lines.computeLineHeight(s,e,this.session)+"px"),i.setStyle(f.style,"top",this.$lines.computeLineTop(s,e,this.session)+"px"),this.$renderLine(f,s,s==u?o:!1),this.$useLineGroups()?f.className="ace_line_group":f.className="ace_line",r.push(a),s++}return r},this.update=function(e){this.$lines.moveContainer(e),this.config=e;var t=e.firstRow,n=e.lastRow,r=this.$lines;while(r.getLength())r.pop();r.push(this.$renderLinesFragment(e,t,n))},this.$textToken={text:!0,rparen:!0,lparen:!0},this.$renderToken=function(e,t,n,r){var o=this,u=/(\t)|( +)|([\x00-\x1f\x80-\xa0\xad\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\uFEFF\uFFF9-\uFFFC]+)|(\u3000)|([\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3001-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]|[\uD800-\uDBFF][\uDC00-\uDFFF])/g,a=this.dom.createFragment(this.element),f,l=0;while(f=u.exec(r)){var c=f[1],h=f[2],p=f[3],d=f[4],v=f[5];if(!o.showInvisibles&&h)continue;var m=l!=f.index?r.slice(l,f.index):"";l=f.index+f[0].length,m&&a.appendChild(this.dom.createTextNode(m,this.element));if(c){var g=o.session.getScreenTabSize(t+f.index);a.appendChild(o.$tabStrings[g].cloneNode(!0)),t+=g-1}else if(h)if(o.showInvisibles){var y=this.dom.createElement("span");y.className="ace_invisible ace_invisible_space",y.textContent=s.stringRepeat(o.SPACE_CHAR,h.length),a.appendChild(y)}else a.appendChild(this.com.createTextNode(h,this.element));else if(p){var y=this.dom.createElement("span");y.className="ace_invisible ace_invisible_space ace_invalid",y.textContent=s.stringRepeat(o.SPACE_CHAR,p.length),a.appendChild(y)}else if(d){var b=o.showInvisibles?o.SPACE_CHAR:"";t+=1;var y=this.dom.createElement("span");y.style.width=o.config.characterWidth*2+"px",y.className=o.showInvisibles?"ace_cjk ace_invisible ace_invisible_space":"ace_cjk",y.textContent=o.showInvisibles?o.SPACE_CHAR:"",a.appendChild(y)}else if(v){t+=1;var y=i.createElement("span");y.style.width=o.config.characterWidth*2+"px",y.className="ace_cjk",y.textContent=v,a.appendChild(y)}}a.appendChild(this.dom.createTextNode(l?r.slice(l):r,this.element));if(!this.$textToken[n.type]){var w="ace_"+n.type.replace(/\./g," ace_"),y=this.dom.createElement("span");n.type=="fold"&&(y.style.width=n.value.length*this.config.characterWidth+"px"),y.className=w,y.appendChild(a),e.appendChild(y)}else e.appendChild(a);return t+r.length},this.renderIndentGuide=function(e,t,n){var r=t.search(this.$indentGuideRe);if(r<=0||r>=n)return t;if(t[0]==" "){r-=r%this.tabSize;var i=r/this.tabSize;for(var s=0;s<i;s++)e.appendChild(this.$tabStrings[" "].cloneNode(!0));return t.substr(r)}if(t[0]=="	"){for(var s=0;s<r;s++)e.appendChild(this.$tabStrings["	"].cloneNode(!0));return t.substr(r)}return t},this.$createLineElement=function(e){var t=this.dom.createElement("div");return t.className="ace_line",t.style.height=this.config.lineHeight+"px",t},this.$renderWrappedLine=function(e,t,n){var r=0,i=0,o=n[0],u=0,a=this.$createLineElement();e.appendChild(a);for(var f=0;f<t.length;f++){var l=t[f],c=l.value;if(f==0&&this.displayIndentGuides){r=c.length,c=this.renderIndentGuide(a,c,o);if(!c)continue;r-=c.length}if(r+c.length<o)u=this.$renderToken(a,u,l,c),r+=c.length;else{while(r+c.length>=o)u=this.$renderToken(a,u,l,c.substring(0,o-r)),c=c.substring(o-r),r=o,a=this.$createLineElement(),e.appendChild(a),a.appendChild(this.dom.createTextNode(s.stringRepeat("\u00a0",n.indent),this.element)),i++,u=0,o=n[i]||Number.MAX_VALUE;c.length!=0&&(r+=c.length,u=this.$renderToken(a,u,l,c))}}},this.$renderSimpleLine=function(e,t){var n=0,r=t[0],i=r.value;this.displayIndentGuides&&(i=this.renderIndentGuide(e,i)),i&&(n=this.$renderToken(e,n,r,i));for(var s=1;s<t.length;s++){r=t[s],i=r.value;if(n+i.length>this.MAX_LINE_LENGTH)return this.$renderOverflowMessage(e,n,r,i);n=this.$renderToken(e,n,r,i)}},this.$renderOverflowMessage=function(e,t,n,r){this.$renderToken(e,t,n,r.slice(0,this.MAX_LINE_LENGTH-t));var i=this.dom.createElement("span");i.className="ace_inline_button ace_keyword ace_toggle_wrap",i.style.position="absolute",i.style.right="0",i.textContent="<click to see more...>",e.appendChild(i)},this.$renderLine=function(e,t,n){!n&&n!=0&&(n=this.session.getFoldLine(t));if(n)var r=this.$getFoldLineTokens(t,n);else var r=this.session.getTokens(t);var i=e;if(r.length){var s=this.session.getRowSplitData(t);if(s&&s.length){this.$renderWrappedLine(e,r,s);var i=e.lastChild}else{var i=e;this.$useLineGroups()&&(i=this.$createLineElement(),e.appendChild(i)),this.$renderSimpleLine(i,r)}}else this.$useLineGroups()&&(i=this.$createLineElement(),e.appendChild(i));if(this.showInvisibles&&i){n&&(t=n.end.row);var o=this.dom.createElement("span");o.className="ace_invisible ace_invisible_eol",o.textContent=t==this.session.getLength()-1?this.EOF_CHAR:this.EOL_CHAR,i.appendChild(o)}},this.$getFoldLineTokens=function(e,t){function i(e,t,n){var i=0,s=0;while(s+e[i].value.length<t){s+=e[i].value.length,i++;if(i==e.length)return}if(s!=t){var o=e[i].value.substring(t-s);o.length>n-t&&(o=o.substring(0,n-t)),r.push({type:e[i].type,value:o}),s=t+o.length,i+=1}while(s<n&&i<e.length){var o=e[i].value;o.length+s>n?r.push({type:e[i].type,value:o.substring(0,n-s)}):r.push(e[i]),s+=o.length,i+=1}}var n=this.session,r=[],s=n.getTokens(e);return t.walk(function(e,t,o,u,a){e!=null?r.push({type:"fold",value:e}):(a&&(s=n.getTokens(t)),s.length&&i(s,u,o))},t.end.row,this.session.getLine(t.end.row).length),r},this.$useLineGroups=function(){return this.session.getUseWrapMode()},this.destroy=function(){}}).call(a.prototype),t.Text=a}),ace.define("ace/layer/cursor",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";var r=e("../lib/dom"),i=function(e){this.element=r.createElement("div"),this.element.className="ace_layer ace_cursor-layer",e.appendChild(this.element),this.isVisible=!1,this.isBlinking=!0,this.blinkInterval=1e3,this.smoothBlinking=!1,this.cursors=[],this.cursor=this.addCursor(),r.addCssClass(this.element,"ace_hidden-cursors"),this.$updateCursors=this.$updateOpacity.bind(this)};(function(){this.$updateOpacity=function(e){var t=this.cursors;for(var n=t.length;n--;)r.setStyle(t[n].style,"opacity",e?"":"0")},this.$startCssAnimation=function(){var e=this.cursors;for(var t=e.length;t--;)e[t].style.animationDuration=this.blinkInterval+"ms";setTimeout(function(){r.addCssClass(this.element,"ace_animate-blinking")}.bind(this))},this.$stopCssAnimation=function(){r.removeCssClass(this.element,"ace_animate-blinking")},this.$padding=0,this.setPadding=function(e){this.$padding=e},this.setSession=function(e){this.session=e},this.setBlinking=function(e){e!=this.isBlinking&&(this.isBlinking=e,this.restartTimer())},this.setBlinkInterval=function(e){e!=this.blinkInterval&&(this.blinkInterval=e,this.restartTimer())},this.setSmoothBlinking=function(e){e!=this.smoothBlinking&&(this.smoothBlinking=e,r.setCssClass(this.element,"ace_smooth-blinking",e),this.$updateCursors(!0),this.restartTimer())},this.addCursor=function(){var e=r.createElement("div");return e.className="ace_cursor",this.element.appendChild(e),this.cursors.push(e),e},this.removeCursor=function(){if(this.cursors.length>1){var e=this.cursors.pop();return e.parentNode.removeChild(e),e}},this.hideCursor=function(){this.isVisible=!1,r.addCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.showCursor=function(){this.isVisible=!0,r.removeCssClass(this.element,"ace_hidden-cursors"),this.restartTimer()},this.restartTimer=function(){var e=this.$updateCursors;clearInterval(this.intervalId),clearTimeout(this.timeoutId),this.$stopCssAnimation(),this.smoothBlinking&&r.removeCssClass(this.element,"ace_smooth-blinking"),e(!0);if(!this.isBlinking||!this.blinkInterval||!this.isVisible){this.$stopCssAnimation();return}this.smoothBlinking&&setTimeout(function(){r.addCssClass(this.element,"ace_smooth-blinking")}.bind(this));if(r.HAS_CSS_ANIMATION)this.$startCssAnimation();else{var t=function(){this.timeoutId=setTimeout(function(){e(!1)},.6*this.blinkInterval)}.bind(this);this.intervalId=setInterval(function(){e(!0),t()},this.blinkInterval),t()}},this.getPixelPosition=function(e,t){if(!this.config||!this.session)return{left:0,top:0};e||(e=this.session.selection.getCursor());var n=this.session.documentToScreenPosition(e),r=this.$padding+(this.session.$bidiHandler.isBidiRow(n.row,e.row)?this.session.$bidiHandler.getPosLeft(n.column):n.column*this.config.characterWidth),i=(n.row-(t?this.config.firstRowScreen:0))*this.config.lineHeight;return{left:r,top:i}},this.isCursorInView=function(e,t){return e.top>=0&&e.top<t.maxHeight},this.update=function(e){this.config=e;var t=this.session.$selectionMarkers,n=0,i=0;if(t===undefined||t.length===0)t=[{cursor:null}];for(var n=0,s=t.length;n<s;n++){var o=this.getPixelPosition(t[n].cursor,!0);if((o.top>e.height+e.offset||o.top<0)&&n>1)continue;var u=this.cursors[i++]||this.addCursor(),a=u.style;this.drawCursor?this.drawCursor(u,o,e,t[n],this.session):this.isCursorInView(o,e)?(r.setStyle(a,"display","block"),r.translate(u,o.left,o.top),r.setStyle(a,"width",Math.round(e.characterWidth)+"px"),r.setStyle(a,"height",e.lineHeight+"px")):r.setStyle(a,"display","none")}while(this.cursors.length>i)this.removeCursor();var f=this.session.getOverwrite();this.$setOverwrite(f),this.$pixelPos=o,this.restartTimer()},this.drawCursor=null,this.$setOverwrite=function(e){e!=this.overwrite&&(this.overwrite=e,e?r.addCssClass(this.element,"ace_overwrite-cursors"):r.removeCssClass(this.element,"ace_overwrite-cursors"))},this.destroy=function(){clearInterval(this.intervalId),clearTimeout(this.timeoutId)}}).call(i.prototype),t.Cursor=i}),ace.define("ace/scrollbar",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/event","ace/lib/event_emitter"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./lib/event"),o=e("./lib/event_emitter").EventEmitter,u=32768,a=function(e){this.element=i.createElement("div"),this.element.className="ace_scrollbar ace_scrollbar"+this.classSuffix,this.inner=i.createElement("div"),this.inner.className="ace_scrollbar-inner",this.element.appendChild(this.inner),e.appendChild(this.element),this.setVisible(!1),this.skipEvent=!1,s.addListener(this.element,"scroll",this.onScroll.bind(this)),s.addListener(this.element,"mousedown",s.preventDefault)};(function(){r.implement(this,o),this.setVisible=function(e){this.element.style.display=e?"":"none",this.isVisible=e,this.coeff=1}}).call(a.prototype);var f=function(e,t){a.call(this,e),this.scrollTop=0,this.scrollHeight=0,t.$scrollbarWidth=this.width=i.scrollbarWidth(e.ownerDocument),this.inner.style.width=this.element.style.width=(this.width||15)+5+"px",this.$minWidth=0};r.inherits(f,a),function(){this.classSuffix="-v",this.onScroll=function(){if(!this.skipEvent){this.scrollTop=this.element.scrollTop;if(this.coeff!=1){var e=this.element.clientHeight/this.scrollHeight;this.scrollTop=this.scrollTop*(1-e)/(this.coeff-e)}this._emit("scroll",{data:this.scrollTop})}this.skipEvent=!1},this.getWidth=function(){return Math.max(this.isVisible?this.width:0,this.$minWidth||0)},this.setHeight=function(e){this.element.style.height=e+"px"},this.setInnerHeight=this.setScrollHeight=function(e){this.scrollHeight=e,e>u?(this.coeff=u/e,e=u):this.coeff!=1&&(this.coeff=1),this.inner.style.height=e+"px"},this.setScrollTop=function(e){this.scrollTop!=e&&(this.skipEvent=!0,this.scrollTop=e,this.element.scrollTop=e*this.coeff)}}.call(f.prototype);var l=function(e,t){a.call(this,e),this.scrollLeft=0,this.height=t.$scrollbarWidth,this.inner.style.height=this.element.style.height=(this.height||15)+5+"px"};r.inherits(l,a),function(){this.classSuffix="-h",this.onScroll=function(){this.skipEvent||(this.scrollLeft=this.element.scrollLeft,this._emit("scroll",{data:this.scrollLeft})),this.skipEvent=!1},this.getHeight=function(){return this.isVisible?this.height:0},this.setWidth=function(e){this.element.style.width=e+"px"},this.setInnerWidth=function(e){this.inner.style.width=e+"px"},this.setScrollWidth=function(e){this.inner.style.width=e+"px"},this.setScrollLeft=function(e){this.scrollLeft!=e&&(this.skipEvent=!0,this.scrollLeft=this.element.scrollLeft=e)}}.call(l.prototype),t.ScrollBar=f,t.ScrollBarV=f,t.ScrollBarH=l,t.VScrollBar=f,t.HScrollBar=l}),ace.define("ace/renderloop",["require","exports","module","ace/lib/event"],function(e,t,n){"use strict";var r=e("./lib/event"),i=function(e,t){this.onRender=e,this.pending=!1,this.changes=0,this.$recursionLimit=2,this.window=t||window;var n=this;this._flush=function(e){n.pending=!1;var t=n.changes;t&&(r.blockIdle(100),n.changes=0,n.onRender(t));if(n.changes){if(n.$recursionLimit--<0)return;n.schedule()}else n.$recursionLimit=2}};(function(){this.schedule=function(e){this.changes=this.changes|e,this.changes&&!this.pending&&(r.nextFrame(this._flush),this.pending=!0)},this.clear=function(e){var t=this.changes;return this.changes=0,t}}).call(i.prototype),t.RenderLoop=i}),ace.define("ace/layer/font_metrics",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/event","ace/lib/useragent","ace/lib/event_emitter"],function(e,t,n){var r=e("../lib/oop"),i=e("../lib/dom"),s=e("../lib/lang"),o=e("../lib/event"),u=e("../lib/useragent"),a=e("../lib/event_emitter").EventEmitter,f=256,l=typeof ResizeObserver=="function",c=200,h=t.FontMetrics=function(e){this.el=i.createElement("div"),this.$setMeasureNodeStyles(this.el.style,!0),this.$main=i.createElement("div"),this.$setMeasureNodeStyles(this.$main.style),this.$measureNode=i.createElement("div"),this.$setMeasureNodeStyles(this.$measureNode.style),this.el.appendChild(this.$main),this.el.appendChild(this.$measureNode),e.appendChild(this.el),this.$measureNode.innerHTML=s.stringRepeat("X",f),this.$characterSize={width:0,height:0},l?this.$addObserver():this.checkForSizeChanges()};(function(){r.implement(this,a),this.$characterSize={width:0,height:0},this.$setMeasureNodeStyles=function(e,t){e.width=e.height="auto",e.left=e.top="0px",e.visibility="hidden",e.position="absolute",e.whiteSpace="pre",u.isIE<8?e["font-family"]="inherit":e.font="inherit",e.overflow=t?"hidden":"visible"},this.checkForSizeChanges=function(e){e===undefined&&(e=this.$measureSizes());if(e&&(this.$characterSize.width!==e.width||this.$characterSize.height!==e.height)){this.$measureNode.style.fontWeight="bold";var t=this.$measureSizes();this.$measureNode.style.fontWeight="",this.$characterSize=e,this.charSizes=Object.create(null),this.allowBoldFonts=t&&t.width===e.width&&t.height===e.height,this._emit("changeCharacterSize",{data:e})}},this.$addObserver=function(){var e=this;this.$observer=new window.ResizeObserver(function(t){var n=t[0].contentRect;e.checkForSizeChanges({height:n.height,width:n.width/f})}),this.$observer.observe(this.$measureNode)},this.$pollSizeChanges=function(){if(this.$pollSizeChangesTimer||this.$observer)return this.$pollSizeChangesTimer;var e=this;return this.$pollSizeChangesTimer=o.onIdle(function t(){e.checkForSizeChanges(),o.onIdle(t,500)},500)},this.setPolling=function(e){e?this.$pollSizeChanges():this.$pollSizeChangesTimer&&(clearInterval(this.$pollSizeChangesTimer),this.$pollSizeChangesTimer=0)},this.$measureSizes=function(e){var t={height:(e||this.$measureNode).clientHeight,width:(e||this.$measureNode).clientWidth/f};return t.width===0||t.height===0?null:t},this.$measureCharWidth=function(e){this.$main.innerHTML=s.stringRepeat(e,f);var t=this.$main.getBoundingClientRect();return t.width/f},this.getCharacterWidth=function(e){var t=this.charSizes[e];return t===undefined&&(t=this.charSizes[e]=this.$measureCharWidth(e)/this.$characterSize.width),t},this.destroy=function(){clearInterval(this.$pollSizeChangesTimer),this.$observer&&this.$observer.disconnect(),this.el&&this.el.parentNode&&this.el.parentNode.removeChild(this.el)},this.$getZoom=function e(t){return t?(window.getComputedStyle(t).zoom||1)*e(t.parentElement):1},this.$initTransformMeasureNodes=function(){var e=function(e,t){return["div",{style:"position: absolute;top:"+e+"px;left:"+t+"px;"}]};this.els=i.buildDom([e(0,0),e(c,0),e(0,c),e(c,c)],this.el)},this.transformCoordinates=function(e,t){function r(e,t,n){var r=e[1]*t[0]-e[0]*t[1];return[(-t[1]*n[0]+t[0]*n[1])/r,(+e[1]*n[0]-e[0]*n[1])/r]}function i(e,t){return[e[0]-t[0],e[1]-t[1]]}function s(e,t){return[e[0]+t[0],e[1]+t[1]]}function o(e,t){return[e*t[0],e*t[1]]}function u(e){var t=e.getBoundingClientRect();return[t.left,t.top]}if(e){var n=this.$getZoom(this.el);e=o(1/n,e)}this.els||this.$initTransformMeasureNodes();var a=u(this.els[0]),f=u(this.els[1]),l=u(this.els[2]),h=u(this.els[3]),p=r(i(h,f),i(h,l),i(s(f,l),s(h,a))),d=o(1+p[0],i(f,a)),v=o(1+p[1],i(l,a));if(t){var m=t,g=p[0]*m[0]/c+p[1]*m[1]/c+1,y=s(o(m[0],d),o(m[1],v));return s(o(1/g/c,y),a)}var b=i(e,a),w=r(i(d,o(p[0],b)),i(v,o(p[1],b)),b);return o(c,w)}}).call(h.prototype)}),ace.define("ace/virtual_renderer",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/config","ace/layer/gutter","ace/layer/marker","ace/layer/text","ace/layer/cursor","ace/scrollbar","ace/scrollbar","ace/renderloop","ace/layer/font_metrics","ace/lib/event_emitter","ace/lib/useragent"],function(e,t,n){"use strict";var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./config"),o=e("./layer/gutter").Gutter,u=e("./layer/marker").Marker,a=e("./layer/text").Text,f=e("./layer/cursor").Cursor,l=e("./scrollbar").HScrollBar,c=e("./scrollbar").VScrollBar,h=e("./renderloop").RenderLoop,p=e("./layer/font_metrics").FontMetrics,d=e("./lib/event_emitter").EventEmitter,v='.ace_br1 {border-top-left-radius    : 3px;}.ace_br2 {border-top-right-radius   : 3px;}.ace_br3 {border-top-left-radius    : 3px; border-top-right-radius:    3px;}.ace_br4 {border-bottom-right-radius: 3px;}.ace_br5 {border-top-left-radius    : 3px; border-bottom-right-radius: 3px;}.ace_br6 {border-top-right-radius   : 3px; border-bottom-right-radius: 3px;}.ace_br7 {border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px;}.ace_br8 {border-bottom-left-radius : 3px;}.ace_br9 {border-top-left-radius    : 3px; border-bottom-left-radius:  3px;}.ace_br10{border-top-right-radius   : 3px; border-bottom-left-radius:  3px;}.ace_br11{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-left-radius:  3px;}.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br13{border-top-left-radius    : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br14{border-top-right-radius   : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br15{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}.ace_editor {position: relative;overflow: hidden;font: 12px/normal \'Monaco\', \'Menlo\', \'Ubuntu Mono\', \'Consolas\', \'source-code-pro\', monospace;direction: ltr;text-align: left;-webkit-tap-highlight-color: rgba(0, 0, 0, 0);}.ace_scroller {position: absolute;overflow: hidden;top: 0;bottom: 0;background-color: inherit;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;cursor: text;}.ace_content {position: absolute;box-sizing: border-box;min-width: 100%;contain: style size layout;}.ace_dragging .ace_scroller:before{position: absolute;top: 0;left: 0;right: 0;bottom: 0;content: \'\';background: rgba(250, 250, 250, 0.01);z-index: 1000;}.ace_dragging.ace_dark .ace_scroller:before{background: rgba(0, 0, 0, 0.01);}.ace_selecting, .ace_selecting * {cursor: text !important;}.ace_gutter {position: absolute;overflow : hidden;width: auto;top: 0;bottom: 0;left: 0;cursor: default;z-index: 4;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;contain: style size layout;}.ace_gutter-active-line {position: absolute;left: 0;right: 0;}.ace_scroller.ace_scroll-left {box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset;}.ace_gutter-cell {position: absolute;top: 0;left: 0;right: 0;padding-left: 19px;padding-right: 6px;background-repeat: no-repeat;}.ace_gutter-cell.ace_error {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABOFBMVEX/////////QRswFAb/Ui4wFAYwFAYwFAaWGAfDRymzOSH/PxswFAb/SiUwFAYwFAbUPRvjQiDllog5HhHdRybsTi3/Tyv9Tir+Syj/UC3////XurebMBIwFAb/RSHbPx/gUzfdwL3kzMivKBAwFAbbvbnhPx66NhowFAYwFAaZJg8wFAaxKBDZurf/RB6mMxb/SCMwFAYwFAbxQB3+RB4wFAb/Qhy4Oh+4QifbNRcwFAYwFAYwFAb/QRzdNhgwFAYwFAbav7v/Uy7oaE68MBK5LxLewr/r2NXewLswFAaxJw4wFAbkPRy2PyYwFAaxKhLm1tMwFAazPiQwFAaUGAb/QBrfOx3bvrv/VC/maE4wFAbRPBq6MRO8Qynew8Dp2tjfwb0wFAbx6eju5+by6uns4uH9/f36+vr/GkHjAAAAYnRSTlMAGt+64rnWu/bo8eAA4InH3+DwoN7j4eLi4xP99Nfg4+b+/u9B/eDs1MD1mO7+4PHg2MXa347g7vDizMLN4eG+Pv7i5evs/v79yu7S3/DV7/498Yv24eH+4ufQ3Ozu/v7+y13sRqwAAADLSURBVHjaZc/XDsFgGIBhtDrshlitmk2IrbHFqL2pvXf/+78DPokj7+Fz9qpU/9UXJIlhmPaTaQ6QPaz0mm+5gwkgovcV6GZzd5JtCQwgsxoHOvJO15kleRLAnMgHFIESUEPmawB9ngmelTtipwwfASilxOLyiV5UVUyVAfbG0cCPHig+GBkzAENHS0AstVF6bacZIOzgLmxsHbt2OecNgJC83JERmePUYq8ARGkJx6XtFsdddBQgZE2nPR6CICZhawjA4Fb/chv+399kfR+MMMDGOQAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: 2px center;}.ace_gutter-cell.ace_warning {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAmVBMVEX///8AAAD///8AAAAAAABPSzb/5sAAAAB/blH/73z/ulkAAAAAAAD85pkAAAAAAAACAgP/vGz/rkDerGbGrV7/pkQICAf////e0IsAAAD/oED/qTvhrnUAAAD/yHD/njcAAADuv2r/nz//oTj/p064oGf/zHAAAAA9Nir/tFIAAAD/tlTiuWf/tkIAAACynXEAAAAAAAAtIRW7zBpBAAAAM3RSTlMAABR1m7RXO8Ln31Z36zT+neXe5OzooRDfn+TZ4p3h2hTf4t3k3ucyrN1K5+Xaks52Sfs9CXgrAAAAjklEQVR42o3PbQ+CIBQFYEwboPhSYgoYunIqqLn6/z8uYdH8Vmdnu9vz4WwXgN/xTPRD2+sgOcZjsge/whXZgUaYYvT8QnuJaUrjrHUQreGczuEafQCO/SJTufTbroWsPgsllVhq3wJEk2jUSzX3CUEDJC84707djRc5MTAQxoLgupWRwW6UB5fS++NV8AbOZgnsC7BpEAAAAABJRU5ErkJggg==");background-position: 2px center;}.ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAJ0Uk5TAAB2k804AAAAPklEQVQY02NgIB68QuO3tiLznjAwpKTgNyDbMegwisCHZUETUZV0ZqOquBpXj2rtnpSJT1AEnnRmL2OgGgAAIKkRQap2htgAAAAASUVORK5CYII=");background-position: 2px center;}.ace_dark .ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAJFBMVEUAAAChoaGAgIAqKiq+vr6tra1ZWVmUlJSbm5s8PDxubm56enrdgzg3AAAAAXRSTlMAQObYZgAAAClJREFUeNpjYMAPdsMYHegyJZFQBlsUlMFVCWUYKkAZMxZAGdxlDMQBAG+TBP4B6RyJAAAAAElFTkSuQmCC");}.ace_scrollbar {contain: strict;position: absolute;right: 0;bottom: 0;z-index: 6;}.ace_scrollbar-inner {position: absolute;cursor: text;left: 0;top: 0;}.ace_scrollbar-v{overflow-x: hidden;overflow-y: scroll;top: 0;}.ace_scrollbar-h {overflow-x: scroll;overflow-y: hidden;left: 0;}.ace_print-margin {position: absolute;height: 100%;}.ace_text-input {position: absolute;z-index: 0;width: 0.5em;height: 1em;opacity: 0;background: transparent;-moz-appearance: none;appearance: none;border: none;resize: none;outline: none;overflow: hidden;font: inherit;padding: 0 1px;margin: 0 -1px;contain: strict;-ms-user-select: text;-moz-user-select: text;-webkit-user-select: text;user-select: text;white-space: pre!important;}.ace_text-input.ace_composition {background: transparent;color: inherit;z-index: 1000;opacity: 1;}.ace_composition_placeholder { color: transparent }.ace_composition_marker { border-bottom: 1px solid;position: absolute;border-radius: 0;margin-top: 1px;}[ace_nocontext=true] {transform: none!important;filter: none!important;perspective: none!important;clip-path: none!important;mask : none!important;contain: none!important;perspective: none!important;mix-blend-mode: initial!important;z-index: auto;}.ace_layer {z-index: 1;position: absolute;overflow: hidden;word-wrap: normal;white-space: pre;height: 100%;width: 100%;box-sizing: border-box;pointer-events: none;}.ace_gutter-layer {position: relative;width: auto;text-align: right;pointer-events: auto;height: 1000000px;contain: style size layout;}.ace_text-layer {font: inherit !important;position: absolute;height: 1000000px;width: 1000000px;contain: style size layout;}.ace_text-layer > .ace_line, .ace_text-layer > .ace_line_group {contain: style size layout;position: absolute;top: 0;left: 0;right: 0;}.ace_hidpi .ace_text-layer,.ace_hidpi .ace_gutter-layer,.ace_hidpi .ace_content,.ace_hidpi .ace_gutter {contain: strict;will-change: transform;}.ace_hidpi .ace_text-layer > .ace_line, .ace_hidpi .ace_text-layer > .ace_line_group {contain: strict;}.ace_cjk {display: inline-block;text-align: center;}.ace_cursor-layer {z-index: 4;}.ace_cursor {z-index: 4;position: absolute;box-sizing: border-box;border-left: 2px solid;transform: translatez(0);}.ace_multiselect .ace_cursor {border-left-width: 1px;}.ace_slim-cursors .ace_cursor {border-left-width: 1px;}.ace_overwrite-cursors .ace_cursor {border-left-width: 0;border-bottom: 1px solid;}.ace_hidden-cursors .ace_cursor {opacity: 0.2;}.ace_smooth-blinking .ace_cursor {transition: opacity 0.18s;}.ace_animate-blinking .ace_cursor {animation-duration: 1000ms;animation-timing-function: step-end;animation-name: blink-ace-animate;animation-iteration-count: infinite;}.ace_animate-blinking.ace_smooth-blinking .ace_cursor {animation-duration: 1000ms;animation-timing-function: ease-in-out;animation-name: blink-ace-animate-smooth;}@keyframes blink-ace-animate {from, to { opacity: 1; }60% { opacity: 0; }}@keyframes blink-ace-animate-smooth {from, to { opacity: 1; }45% { opacity: 1; }60% { opacity: 0; }85% { opacity: 0; }}.ace_marker-layer .ace_step, .ace_marker-layer .ace_stack {position: absolute;z-index: 3;}.ace_marker-layer .ace_selection {position: absolute;z-index: 5;}.ace_marker-layer .ace_bracket {position: absolute;z-index: 6;}.ace_marker-layer .ace_active-line {position: absolute;z-index: 2;}.ace_marker-layer .ace_selected-word {position: absolute;z-index: 4;box-sizing: border-box;}.ace_line .ace_fold {box-sizing: border-box;display: inline-block;height: 11px;margin-top: -2px;vertical-align: middle;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACJJREFUeNpi+P//fxgTAwPDBxDxD078RSX+YeEyDFMCIMAAI3INmXiwf2YAAAAASUVORK5CYII=");background-repeat: no-repeat, repeat-x;background-position: center center, top left;color: transparent;border: 1px solid black;border-radius: 2px;cursor: pointer;pointer-events: auto;}.ace_dark .ace_fold {}.ace_fold:hover{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACBJREFUeNpi+P//fz4TAwPDZxDxD5X4i5fLMEwJgAADAEPVDbjNw87ZAAAAAElFTkSuQmCC");}.ace_tooltip {background-color: #FFF;background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));border: 1px solid gray;border-radius: 1px;box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);color: black;max-width: 100%;padding: 3px 4px;position: fixed;z-index: 999999;box-sizing: border-box;cursor: default;white-space: pre;word-wrap: break-word;line-height: normal;font-style: normal;font-weight: normal;letter-spacing: normal;pointer-events: none;}.ace_folding-enabled > .ace_gutter-cell {padding-right: 13px;}.ace_fold-widget {box-sizing: border-box;margin: 0 -12px 0 1px;display: none;width: 11px;vertical-align: top;background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42mWKsQ0AMAzC8ixLlrzQjzmBiEjp0A6WwBCSPgKAXoLkqSot7nN3yMwR7pZ32NzpKkVoDBUxKAAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: center;border-radius: 3px;border: 1px solid transparent;cursor: pointer;}.ace_folding-enabled .ace_fold-widget {display: inline-block;   }.ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42m3HwQkAMAhD0YzsRchFKI7sAikeWkrxwScEB0nh5e7KTPWimZki4tYfVbX+MNl4pyZXejUO1QAAAABJRU5ErkJggg==");}.ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGCAYAAAAG5SQMAAAAOUlEQVR42jXKwQkAMAgDwKwqKD4EwQ26sSOkVWjgIIHAzPiCgaqiqnJHZnKICBERHN194O5b9vbLuAVRL+l0YWnZAAAAAElFTkSuQmCCXA==");}.ace_fold-widget:hover {border: 1px solid rgba(0, 0, 0, 0.3);background-color: rgba(255, 255, 255, 0.2);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);}.ace_fold-widget:active {border: 1px solid rgba(0, 0, 0, 0.4);background-color: rgba(0, 0, 0, 0.05);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);}.ace_dark .ace_fold-widget {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC");}.ace_dark .ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget:hover {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);background-color: rgba(255, 255, 255, 0.1);}.ace_dark .ace_fold-widget:active {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);}.ace_inline_button {border: 1px solid lightgray;display: inline-block;margin: -1px 8px;padding: 0 5px;pointer-events: auto;cursor: pointer;}.ace_inline_button:hover {border-color: gray;background: rgba(200,200,200,0.2);display: inline-block;pointer-events: auto;}.ace_fold-widget.ace_invalid {background-color: #FFB4B4;border-color: #DE5555;}.ace_fade-fold-widgets .ace_fold-widget {transition: opacity 0.4s ease 0.05s;opacity: 0;}.ace_fade-fold-widgets:hover .ace_fold-widget {transition: opacity 0.05s ease 0.05s;opacity:1;}.ace_underline {text-decoration: underline;}.ace_bold {font-weight: bold;}.ace_nobold .ace_bold {font-weight: normal;}.ace_italic {font-style: italic;}.ace_error-marker {background-color: rgba(255, 0, 0,0.2);position: absolute;z-index: 9;}.ace_highlight-marker {background-color: rgba(255, 255, 0,0.2);position: absolute;z-index: 8;}',m=e("./lib/useragent"),g=m.isIE;i.importCssString(v,"ace_editor.css");var y=function(e,t){var n=this;this.container=e||i.createElement("div"),i.addCssClass(this.container,"ace_editor"),i.HI_DPI&&i.addCssClass(this.container,"ace_hidpi"),this.setTheme(t),this.$gutter=i.createElement("div"),this.$gutter.className="ace_gutter",this.container.appendChild(this.$gutter),this.$gutter.setAttribute("aria-hidden",!0),this.scroller=i.createElement("div"),this.scroller.className="ace_scroller",this.container.appendChild(this.scroller),this.content=i.createElement("div"),this.content.className="ace_content",this.scroller.appendChild(this.content),this.$gutterLayer=new o(this.$gutter),this.$gutterLayer.on("changeGutterWidth",this.onGutterResize.bind(this)),this.$markerBack=new u(this.content);var r=this.$textLayer=new a(this.content);this.canvas=r.element,this.$markerFront=new u(this.content),this.$cursorLayer=new f(this.content),this.$horizScroll=!1,this.$vScroll=!1,this.scrollBar=this.scrollBarV=new c(this.container,this),this.scrollBarH=new l(this.container,this),this.scrollBarV.addEventListener("scroll",function(e){n.$scrollAnimation||n.session.setScrollTop(e.data-n.scrollMargin.top)}),this.scrollBarH.addEventListener("scroll",function(e){n.$scrollAnimation||n.session.setScrollLeft(e.data-n.scrollMargin.left)}),this.scrollTop=0,this.scrollLeft=0,this.cursorPos={row:0,column:0},this.$fontMetrics=new p(this.container),this.$textLayer.$setFontMetrics(this.$fontMetrics),this.$textLayer.addEventListener("changeCharacterSize",function(e){n.updateCharacterSize(),n.onResize(!0,n.gutterWidth,n.$size.width,n.$size.height),n._signal("changeCharacterSize",e)}),this.$size={width:0,height:0,scrollerHeight:0,scrollerWidth:0,$dirty:!0},this.layerConfig={width:1,padding:0,firstRow:0,firstRowScreen:0,lastRow:0,lineHeight:0,characterWidth:0,minHeight:1,maxHeight:1,offset:0,height:1,gutterOffset:1},this.scrollMargin={left:0,right:0,top:0,bottom:0,v:0,h:0},this.margin={left:0,right:0,top:0,bottom:0,v:0,h:0},this.$keepTextAreaAtCursor=!m.isIOS,this.$loop=new h(this.$renderChanges.bind(this),this.container.ownerDocument.defaultView),this.$loop.schedule(this.CHANGE_FULL),this.updateCharacterSize(),this.setPadding(4),s.resetOptions(this),s._emit("renderer",this)};(function(){this.CHANGE_CURSOR=1,this.CHANGE_MARKER=2,this.CHANGE_GUTTER=4,this.CHANGE_SCROLL=8,this.CHANGE_LINES=16,this.CHANGE_TEXT=32,this.CHANGE_SIZE=64,this.CHANGE_MARKER_BACK=128,this.CHANGE_MARKER_FRONT=256,this.CHANGE_FULL=512,this.CHANGE_H_SCROLL=1024,r.implement(this,d),this.updateCharacterSize=function(){this.$textLayer.allowBoldFonts!=this.$allowBoldFonts&&(this.$allowBoldFonts=this.$textLayer.allowBoldFonts,this.setStyle("ace_nobold",!this.$allowBoldFonts)),this.layerConfig.characterWidth=this.characterWidth=this.$textLayer.getCharacterWidth(),this.layerConfig.lineHeight=this.lineHeight=this.$textLayer.getLineHeight(),this.$updatePrintMargin()},this.setSession=function(e){this.session&&this.session.doc.off("changeNewLineMode",this.onChangeNewLineMode),this.session=e,e&&this.scrollMargin.top&&e.getScrollTop()<=0&&e.setScrollTop(-this.scrollMargin.top),this.$cursorLayer.setSession(e),this.$markerBack.setSession(e),this.$markerFront.setSession(e),this.$gutterLayer.setSession(e),this.$textLayer.setSession(e);if(!e)return;this.$loop.schedule(this.CHANGE_FULL),this.session.$setFontMetrics(this.$fontMetrics),this.scrollBarH.scrollLeft=this.scrollBarV.scrollTop=null,this.onChangeNewLineMode=this.onChangeNewLineMode.bind(this),this.onChangeNewLineMode(),this.session.doc.on("changeNewLineMode",this.onChangeNewLineMode)},this.updateLines=function(e,t,n){t===undefined&&(t=Infinity),this.$changedLines?(this.$changedLines.firstRow>e&&(this.$changedLines.firstRow=e),this.$changedLines.lastRow<t&&(this.$changedLines.lastRow=t)):this.$changedLines={firstRow:e,lastRow:t};if(this.$changedLines.lastRow<this.layerConfig.firstRow){if(!n)return;this.$changedLines.lastRow=this.layerConfig.lastRow}if(this.$changedLines.firstRow>this.layerConfig.lastRow)return;this.$loop.schedule(this.CHANGE_LINES)},this.onChangeNewLineMode=function(){this.$loop.schedule(this.CHANGE_TEXT),this.$textLayer.$updateEolChar(),this.session.$bidiHandler.setEolChar(this.$textLayer.EOL_CHAR)},this.onChangeTabSize=function(){this.$loop.schedule(this.CHANGE_TEXT|this.CHANGE_MARKER),this.$textLayer.onChangeTabSize()},this.updateText=function(){this.$loop.schedule(this.CHANGE_TEXT)},this.updateFull=function(e){e?this.$renderChanges(this.CHANGE_FULL,!0):this.$loop.schedule(this.CHANGE_FULL)},this.updateFontSize=function(){this.$textLayer.checkForSizeChanges()},this.$changes=0,this.$updateSizeAsync=function(){this.$loop.pending?this.$size.$dirty=!0:this.onResize()},this.onResize=function(e,t,n,r){if(this.resizing>2)return;this.resizing>0?this.resizing++:this.resizing=e?1:0;var i=this.container;r||(r=i.clientHeight||i.scrollHeight),n||(n=i.clientWidth||i.scrollWidth);var s=this.$updateCachedSize(e,t,n,r);if(!this.$size.scrollerHeight||!n&&!r)return this.resizing=0;e&&(this.$gutterLayer.$padding=null),e?this.$renderChanges(s|this.$changes,!0):this.$loop.schedule(s|this.$changes),this.resizing&&(this.resizing=0),this.scrollBarV.scrollLeft=this.scrollBarV.scrollTop=null},this.$updateCachedSize=function(e,t,n,r){r-=this.$extraHeight||0;var s=0,o=this.$size,u={width:o.width,height:o.height,scrollerHeight:o.scrollerHeight,scrollerWidth:o.scrollerWidth};r&&(e||o.height!=r)&&(o.height=r,s|=this.CHANGE_SIZE,o.scrollerHeight=o.height,this.$horizScroll&&(o.scrollerHeight-=this.scrollBarH.getHeight()),this.scrollBarV.element.style.bottom=this.scrollBarH.getHeight()+"px",s|=this.CHANGE_SCROLL);if(n&&(e||o.width!=n)){s|=this.CHANGE_SIZE,o.width=n,t==null&&(t=this.$showGutter?this.$gutter.offsetWidth:0),this.gutterWidth=t,i.setStyle(this.scrollBarH.element.style,"left",t+"px"),i.setStyle(this.scroller.style,"left",t+this.margin.left+"px"),o.scrollerWidth=Math.max(0,n-t-this.scrollBarV.getWidth()-this.margin.h),i.setStyle(this.$gutter.style,"left",this.margin.left+"px");var a=this.scrollBarV.getWidth()+"px";i.setStyle(this.scrollBarH.element.style,"right",a),i.setStyle(this.scroller.style,"right",a),i.setStyle(this.scroller.style,"bottom",this.scrollBarH.getHeight());if(this.session&&this.session.getUseWrapMode()&&this.adjustWrapLimit()||e)s|=this.CHANGE_FULL}return o.$dirty=!n||!r,s&&this._signal("resize",u),s},this.onGutterResize=function(e){var t=this.$showGutter?e:0;t!=this.gutterWidth&&(this.$changes|=this.$updateCachedSize(!0,t,this.$size.width,this.$size.height)),this.session.getUseWrapMode()&&this.adjustWrapLimit()?this.$loop.schedule(this.CHANGE_FULL):this.$size.$dirty?this.$loop.schedule(this.CHANGE_FULL):this.$computeLayerConfig()},this.adjustWrapLimit=function(){var e=this.$size.scrollerWidth-this.$padding*2,t=Math.floor(e/this.characterWidth);return this.session.adjustWrapLimit(t,this.$showPrintMargin&&this.$printMarginColumn)},this.setAnimatedScroll=function(e){this.setOption("animatedScroll",e)},this.getAnimatedScroll=function(){return this.$animatedScroll},this.setShowInvisibles=function(e){this.setOption("showInvisibles",e),this.session.$bidiHandler.setShowInvisibles(e)},this.getShowInvisibles=function(){return this.getOption("showInvisibles")},this.getDisplayIndentGuides=function(){return this.getOption("displayIndentGuides")},this.setDisplayIndentGuides=function(e){this.setOption("displayIndentGuides",e)},this.setShowPrintMargin=function(e){this.setOption("showPrintMargin",e)},this.getShowPrintMargin=function(){return this.getOption("showPrintMargin")},this.setPrintMarginColumn=function(e){this.setOption("printMarginColumn",e)},this.getPrintMarginColumn=function(){return this.getOption("printMarginColumn")},this.getShowGutter=function(){return this.getOption("showGutter")},this.setShowGutter=function(e){return this.setOption("showGutter",e)},this.getFadeFoldWidgets=function(){return this.getOption("fadeFoldWidgets")},this.setFadeFoldWidgets=function(e){this.setOption("fadeFoldWidgets",e)},this.setHighlightGutterLine=function(e){this.setOption("highlightGutterLine",e)},this.getHighlightGutterLine=function(){return this.getOption("highlightGutterLine")},this.$updatePrintMargin=function(){if(!this.$showPrintMargin&&!this.$printMarginEl)return;if(!this.$printMarginEl){var e=i.createElement("div");e.className="ace_layer ace_print-margin-layer",this.$printMarginEl=i.createElement("div"),this.$printMarginEl.className="ace_print-margin",e.appendChild(this.$printMarginEl),this.content.insertBefore(e,this.content.firstChild)}var t=this.$printMarginEl.style;t.left=Math.round(this.characterWidth*this.$printMarginColumn+this.$padding)+"px",t.visibility=this.$showPrintMargin?"visible":"hidden",this.session&&this.session.$wrap==-1&&this.adjustWrapLimit()},this.getContainerElement=function(){return this.container},this.getMouseEventTarget=function(){return this.scroller},this.getTextAreaContainer=function(){return this.container},this.$moveTextAreaToCursor=function(){var e=this.textarea.style;if(!this.$keepTextAreaAtCursor){i.translate(this.textarea,-100,0);return}var t=this.$cursorLayer.$pixelPos;if(!t)return;var n=this.$composition;n&&n.markerRange&&(t=this.$cursorLayer.getPixelPosition(n.markerRange.start,!0));var r=this.layerConfig,s=t.top,o=t.left;s-=r.offset;var u=n&&n.useTextareaForIME?this.lineHeight:g?0:1;if(s<0||s>r.height-u){i.translate(this.textarea,0,0);return}var a=1;if(!n)s+=this.lineHeight;else if(n.useTextareaForIME){var f=this.textarea.value;a=this.characterWidth*this.session.$getStringScreenWidth(f)[0],u+=2}else s+=this.lineHeight+2;o-=this.scrollLeft,o>this.$size.scrollerWidth-a&&(o=this.$size.scrollerWidth-a),o+=this.gutterWidth+this.margin.left,i.setStyle(e,"height",u+"px"),i.setStyle(e,"width",a+"px"),i.translate(this.textarea,Math.min(o,this.$size.scrollerWidth-a),Math.min(s,this.$size.height-u))},this.getFirstVisibleRow=function(){return this.layerConfig.firstRow},this.getFirstFullyVisibleRow=function(){return this.layerConfig.firstRow+(this.layerConfig.offset===0?0:1)},this.getLastFullyVisibleRow=function(){var e=this.layerConfig,t=e.lastRow,n=this.session.documentToScreenRow(t,0)*e.lineHeight;return n-this.session.getScrollTop()>e.height-e.lineHeight?t-1:t},this.getLastVisibleRow=function(){return this.layerConfig.lastRow},this.$padding=null,this.setPadding=function(e){this.$padding=e,this.$textLayer.setPadding(e),this.$cursorLayer.setPadding(e),this.$markerFront.setPadding(e),this.$markerBack.setPadding(e),this.$loop.schedule(this.CHANGE_FULL),this.$updatePrintMargin()},this.setScrollMargin=function(e,t,n,r){var i=this.scrollMargin;i.top=e|0,i.bottom=t|0,i.right=r|0,i.left=n|0,i.v=i.top+i.bottom,i.h=i.left+i.right,i.top&&this.scrollTop<=0&&this.session&&this.session.setScrollTop(-i.top),this.updateFull()},this.setMargin=function(e,t,n,r){var i=this.margin;i.top=e|0,i.bottom=t|0,i.right=r|0,i.left=n|0,i.v=i.top+i.bottom,i.h=i.left+i.right,this.$updateCachedSize(!0,this.gutterWidth,this.$size.width,this.$size.height),this.updateFull()},this.getHScrollBarAlwaysVisible=function(){return this.$hScrollBarAlwaysVisible},this.setHScrollBarAlwaysVisible=function(e){this.setOption("hScrollBarAlwaysVisible",e)},this.getVScrollBarAlwaysVisible=function(){return this.$vScrollBarAlwaysVisible},this.setVScrollBarAlwaysVisible=function(e){this.setOption("vScrollBarAlwaysVisible",e)},this.$updateScrollBarV=function(){var e=this.layerConfig.maxHeight,t=this.$size.scrollerHeight;!this.$maxLines&&this.$scrollPastEnd&&(e-=(t-this.lineHeight)*this.$scrollPastEnd,this.scrollTop>e-t&&(e=this.scrollTop+t,this.scrollBarV.scrollTop=null)),this.scrollBarV.setScrollHeight(e+this.scrollMargin.v),this.scrollBarV.setScrollTop(this.scrollTop+this.scrollMargin.top)},this.$updateScrollBarH=function(){this.scrollBarH.setScrollWidth(this.layerConfig.width+2*this.$padding+this.scrollMargin.h),this.scrollBarH.setScrollLeft(this.scrollLeft+this.scrollMargin.left)},this.$frozen=!1,this.freeze=function(){this.$frozen=!0},this.unfreeze=function(){this.$frozen=!1},this.$renderChanges=function(e,t){this.$changes&&(e|=this.$changes,this.$changes=0);if(!this.session||!this.container.offsetWidth||this.$frozen||!e&&!t){this.$changes|=e;return}if(this.$size.$dirty)return this.$changes|=e,this.onResize(!0);this.lineHeight||this.$textLayer.checkForSizeChanges(),this._signal("beforeRender"),this.session&&this.session.$bidiHandler&&this.session.$bidiHandler.updateCharacterWidths(this.$fontMetrics);var n=this.layerConfig;if(e&this.CHANGE_FULL||e&this.CHANGE_SIZE||e&this.CHANGE_TEXT||e&this.CHANGE_LINES||e&this.CHANGE_SCROLL||e&this.CHANGE_H_SCROLL){e|=this.$computeLayerConfig()|this.$loop.clear();if(n.firstRow!=this.layerConfig.firstRow&&n.firstRowScreen==this.layerConfig.firstRowScreen){var r=this.scrollTop+(n.firstRow-this.layerConfig.firstRow)*this.lineHeight;r>0&&(this.scrollTop=r,e|=this.CHANGE_SCROLL,e|=this.$computeLayerConfig()|this.$loop.clear())}n=this.layerConfig,this.$updateScrollBarV(),e&this.CHANGE_H_SCROLL&&this.$updateScrollBarH(),i.translate(this.content,-this.scrollLeft,-n.offset);var s=n.width+2*this.$padding+"px",o=n.minHeight+"px";i.setStyle(this.content.style,"width",s),i.setStyle(this.content.style,"height",o)}e&this.CHANGE_H_SCROLL&&(i.translate(this.content,-this.scrollLeft,-n.offset),this.scroller.className=this.scrollLeft<=0?"ace_scroller":"ace_scroller ace_scroll-left");if(e&this.CHANGE_FULL){this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),this._signal("afterRender");return}if(e&this.CHANGE_SCROLL){e&this.CHANGE_TEXT||e&this.CHANGE_LINES?this.$textLayer.update(n):this.$textLayer.scrollLines(n),this.$showGutter&&(e&this.CHANGE_GUTTER||e&this.CHANGE_LINES?this.$gutterLayer.update(n):this.$gutterLayer.scrollLines(n)),this.$markerBack.update(n),this.$markerFront.update(n),this.$cursorLayer.update(n),this.$moveTextAreaToCursor(),this._signal("afterRender");return}e&this.CHANGE_TEXT?(this.$textLayer.update(n),this.$showGutter&&this.$gutterLayer.update(n)):e&this.CHANGE_LINES?(this.$updateLines()||e&this.CHANGE_GUTTER&&this.$showGutter)&&this.$gutterLayer.update(n):e&this.CHANGE_TEXT||e&this.CHANGE_GUTTER?this.$showGutter&&this.$gutterLayer.update(n):e&this.CHANGE_CURSOR&&this.$highlightGutterLine&&this.$gutterLayer.updateLineHighlight(n),e&this.CHANGE_CURSOR&&(this.$cursorLayer.update(n),this.$moveTextAreaToCursor()),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_FRONT)&&this.$markerFront.update(n),e&(this.CHANGE_MARKER|this.CHANGE_MARKER_BACK)&&this.$markerBack.update(n),this._signal("afterRender")},this.$autosize=function(){var e=this.session.getScreenLength()*this.lineHeight,t=this.$maxLines*this.lineHeight,n=Math.min(t,Math.max((this.$minLines||1)*this.lineHeight,e))+this.scrollMargin.v+(this.$extraHeight||0);this.$horizScroll&&(n+=this.scrollBarH.getHeight()),this.$maxPixelHeight&&n>this.$maxPixelHeight&&(n=this.$maxPixelHeight);var r=n<=2*this.lineHeight,i=!r&&e>t;if(n!=this.desiredHeight||this.$size.height!=this.desiredHeight||i!=this.$vScroll){i!=this.$vScroll&&(this.$vScroll=i,this.scrollBarV.setVisible(i));var s=this.container.clientWidth;this.container.style.height=n+"px",this.$updateCachedSize(!0,this.$gutterWidth,s,n),this.desiredHeight=n,this._signal("autosize")}},this.$computeLayerConfig=function(){var e=this.session,t=this.$size,n=t.height<=2*this.lineHeight,r=this.session.getScreenLength(),i=r*this.lineHeight,s=this.$getLongestLine(),o=!n&&(this.$hScrollBarAlwaysVisible||t.scrollerWidth-s-2*this.$padding<0),u=this.$horizScroll!==o;u&&(this.$horizScroll=o,this.scrollBarH.setVisible(o));var a=this.$vScroll;this.$maxLines&&this.lineHeight>1&&this.$autosize();var f=t.scrollerHeight+this.lineHeight,l=!this.$maxLines&&this.$scrollPastEnd?(t.scrollerHeight-this.lineHeight)*this.$scrollPastEnd:0;i+=l;var c=this.scrollMargin;this.session.setScrollTop(Math.max(-c.top,Math.min(this.scrollTop,i-t.scrollerHeight+c.bottom))),this.session.setScrollLeft(Math.max(-c.left,Math.min(this.scrollLeft,s+2*this.$padding-t.scrollerWidth+c.right)));var h=!n&&(this.$vScrollBarAlwaysVisible||t.scrollerHeight-i+l<0||this.scrollTop>c.top),p=a!==h;p&&(this.$vScroll=h,this.scrollBarV.setVisible(h));var d=this.scrollTop%this.lineHeight,v=Math.ceil(f/this.lineHeight)-1,m=Math.max(0,Math.round((this.scrollTop-d)/this.lineHeight)),g=m+v,y,b,w=this.lineHeight;m=e.screenToDocumentRow(m,0);var E=e.getFoldLine(m);E&&(m=E.start.row),y=e.documentToScreenRow(m,0),b=e.getRowLength(m)*w,g=Math.min(e.screenToDocumentRow(g,0),e.getLength()-1),f=t.scrollerHeight+e.getRowLength(g)*w+b,d=this.scrollTop-y*w;var S=0;if(this.layerConfig.width!=s||u)S=this.CHANGE_H_SCROLL;if(u||p)S=this.$updateCachedSize(!0,this.gutterWidth,t.width,t.height),this._signal("scrollbarVisibilityChanged"),p&&(s=this.$getLongestLine());return this.layerConfig={width:s,padding:this.$padding,firstRow:m,firstRowScreen:y,lastRow:g,lineHeight:w,characterWidth:this.characterWidth,minHeight:f,maxHeight:i,offset:d,gutterOffset:w?Math.max(0,Math.ceil((d+t.height-t.scrollerHeight)/w)):0,height:this.$size.scrollerHeight},this.session.$bidiHandler&&this.session.$bidiHandler.setContentWidth(s-this.$padding),S},this.$updateLines=function(){if(!this.$changedLines)return;var e=this.$changedLines.firstRow,t=this.$changedLines.lastRow;this.$changedLines=null;var n=this.layerConfig;if(e>n.lastRow+1)return;if(t<n.firstRow)return;if(t===Infinity){this.$showGutter&&this.$gutterLayer.update(n),this.$textLayer.update(n);return}return this.$textLayer.updateLines(n,e,t),!0},this.$getLongestLine=function(){var e=this.session.getScreenWidth();return this.showInvisibles&&!this.session.$useWrapMode&&(e+=1),this.$textLayer&&e>this.$textLayer.MAX_LINE_LENGTH&&(e=this.$textLayer.MAX_LINE_LENGTH+30),Math.max(this.$size.scrollerWidth-2*this.$padding,Math.round(e*this.characterWidth))},this.updateFrontMarkers=function(){this.$markerFront.setMarkers(this.session.getMarkers(!0)),this.$loop.schedule(this.CHANGE_MARKER_FRONT)},this.updateBackMarkers=function(){this.$markerBack.setMarkers(this.session.getMarkers()),this.$loop.schedule(this.CHANGE_MARKER_BACK)},this.addGutterDecoration=function(e,t){this.$gutterLayer.addGutterDecoration(e,t)},this.removeGutterDecoration=function(e,t){this.$gutterLayer.removeGutterDecoration(e,t)},this.updateBreakpoints=function(e){this.$loop.schedule(this.CHANGE_GUTTER)},this.setAnnotations=function(e){this.$gutterLayer.setAnnotations(e),this.$loop.schedule(this.CHANGE_GUTTER)},this.updateCursor=function(){this.$loop.schedule(this.CHANGE_CURSOR)},this.hideCursor=function(){this.$cursorLayer.hideCursor()},this.showCursor=function(){this.$cursorLayer.showCursor()},this.scrollSelectionIntoView=function(e,t,n){this.scrollCursorIntoView(e,n),this.scrollCursorIntoView(t,n)},this.scrollCursorIntoView=function(e,t,n){if(this.$size.scrollerHeight===0)return;var r=this.$cursorLayer.getPixelPosition(e),i=r.left,s=r.top,o=n&&n.top||0,u=n&&n.bottom||0,a=this.$scrollAnimation?this.session.getScrollTop():this.scrollTop;a+o>s?(t&&a+o>s+this.lineHeight&&(s-=t*this.$size.scrollerHeight),s===0&&(s=-this.scrollMargin.top),this.session.setScrollTop(s)):a+this.$size.scrollerHeight-u<s+this.lineHeight&&(t&&a+this.$size.scrollerHeight-u<s-this.lineHeight&&(s+=t*this.$size.scrollerHeight),this.session.setScrollTop(s+this.lineHeight+u-this.$size.scrollerHeight));var f=this.scrollLeft;f>i?(i<this.$padding+2*this.layerConfig.characterWidth&&(i=-this.scrollMargin.left),this.session.setScrollLeft(i)):f+this.$size.scrollerWidth<i+this.characterWidth?this.session.setScrollLeft(Math.round(i+this.characterWidth-this.$size.scrollerWidth)):f<=this.$padding&&i-f<this.characterWidth&&this.session.setScrollLeft(0)},this.getScrollTop=function(){return this.session.getScrollTop()},this.getScrollLeft=function(){return this.session.getScrollLeft()},this.getScrollTopRow=function(){return this.scrollTop/this.lineHeight},this.getScrollBottomRow=function(){return Math.max(0,Math.floor((this.scrollTop+this.$size.scrollerHeight)/this.lineHeight)-1)},this.scrollToRow=function(e){this.session.setScrollTop(e*this.lineHeight)},this.alignCursor=function(e,t){typeof e=="number"&&(e={row:e,column:0});var n=this.$cursorLayer.getPixelPosition(e),r=this.$size.scrollerHeight-this.lineHeight,i=n.top-r*(t||0);return this.session.setScrollTop(i),i},this.STEPS=8,this.$calcSteps=function(e,t){var n=0,r=this.STEPS,i=[],s=function(e,t,n){return n*(Math.pow(e-1,3)+1)+t};for(n=0;n<r;++n)i.push(s(n/this.STEPS,e,t-e));return i},this.scrollToLine=function(e,t,n,r){var i=this.$cursorLayer.getPixelPosition({row:e,column:0}),s=i.top;t&&(s-=this.$size.scrollerHeight/2);var o=this.scrollTop;this.session.setScrollTop(s),n!==!1&&this.animateScrolling(o,r)},this.animateScrolling=function(e,t){var n=this.scrollTop;if(!this.$animatedScroll)return;var r=this;if(e==n)return;if(this.$scrollAnimation){var i=this.$scrollAnimation.steps;if(i.length){e=i[0];if(e==n)return}}var s=r.$calcSteps(e,n);this.$scrollAnimation={from:e,to:n,steps:s},clearInterval(this.$timer),r.session.setScrollTop(s.shift()),r.session.$scrollTop=n,this.$timer=setInterval(function(){s.length?(r.session.setScrollTop(s.shift()),r.session.$scrollTop=n):n!=null?(r.session.$scrollTop=-1,r.session.setScrollTop(n),n=null):(r.$timer=clearInterval(r.$timer),r.$scrollAnimation=null,t&&t())},10)},this.scrollToY=function(e){this.scrollTop!==e&&(this.$loop.schedule(this.CHANGE_SCROLL),this.scrollTop=e)},this.scrollToX=function(e){this.scrollLeft!==e&&(this.scrollLeft=e),this.$loop.schedule(this.CHANGE_H_SCROLL)},this.scrollTo=function(e,t){this.session.setScrollTop(t),this.session.setScrollLeft(t)},this.scrollBy=function(e,t){t&&this.session.setScrollTop(this.session.getScrollTop()+t),e&&this.session.setScrollLeft(this.session.getScrollLeft()+e)},this.isScrollableBy=function(e,t){if(t<0&&this.session.getScrollTop()>=1-this.scrollMargin.top)return!0;if(t>0&&this.session.getScrollTop()+this.$size.scrollerHeight-this.layerConfig.maxHeight<-1+this.scrollMargin.bottom)return!0;if(e<0&&this.session.getScrollLeft()>=1-this.scrollMargin.left)return!0;if(e>0&&this.session.getScrollLeft()+this.$size.scrollerWidth-this.layerConfig.width<-1+this.scrollMargin.right)return!0},this.pixelToScreenCoordinates=function(e,t){var n;if(this.$hasCssTransforms){n={top:0,left:0};var r=this.$fontMetrics.transformCoordinates([e,t]);e=r[1]-this.gutterWidth-this.margin.left,t=r[0]}else n=this.scroller.getBoundingClientRect();var i=e+this.scrollLeft-n.left-this.$padding,s=i/this.characterWidth,o=Math.floor((t+this.scrollTop-n.top)/this.lineHeight),u=this.$blockCursor?Math.floor(s):Math.round(s);return{row:o,column:u,side:s-u>0?1:-1,offsetX:i}},this.screenToTextCoordinates=function(e,t){var n;if(this.$hasCssTransforms){n={top:0,left:0};var r=this.$fontMetrics.transformCoordinates([e,t]);e=r[1]-this.gutterWidth-this.margin.left,t=r[0]}else n=this.scroller.getBoundingClientRect();var i=e+this.scrollLeft-n.left-this.$padding,s=i/this.characterWidth,o=this.$blockCursor?Math.floor(s):Math.round(s),u=Math.floor((t+this.scrollTop-n.top)/this.lineHeight);return this.session.screenToDocumentPosition(u,Math.max(o,0),i)},this.textToScreenCoordinates=function(e,t){var n=this.scroller.getBoundingClientRect(),r=this.session.documentToScreenPosition(e,t),i=this.$padding+(this.session.$bidiHandler.isBidiRow(r.row,e)?this.session.$bidiHandler.getPosLeft(r.column):Math.round(r.column*this.characterWidth)),s=r.row*this.lineHeight;return{pageX:n.left+i-this.scrollLeft,pageY:n.top+s-this.scrollTop}},this.visualizeFocus=function(){i.addCssClass(this.container,"ace_focus")},this.visualizeBlur=function(){i.removeCssClass(this.container,"ace_focus")},this.showComposition=function(e){this.$composition=e,e.cssText||(e.cssText=this.textarea.style.cssText,e.keepTextAreaAtCursor=this.$keepTextAreaAtCursor),e.useTextareaForIME=this.$useTextareaForIME,this.$useTextareaForIME?(this.$keepTextAreaAtCursor=!0,i.addCssClass(this.textarea,"ace_composition"),this.textarea.style.cssText="",this.$moveTextAreaToCursor(),this.$cursorLayer.element.style.display="none"):e.markerId=this.session.addMarker(e.markerRange,"ace_composition_marker","text")},this.setCompositionText=function(e){var t=this.session.selection.cursor;this.addToken(e,"composition_placeholder",t.row,t.column),this.$moveTextAreaToCursor()},this.hideComposition=function(){if(!this.$composition)return;this.$composition.markerId&&this.session.removeMarker(this.$composition.markerId),i.removeCssClass(this.textarea,"ace_composition"),this.$keepTextAreaAtCursor=this.$composition.keepTextAreaAtCursor,this.textarea.style.cssText=this.$composition.cssText,this.$composition=null,this.$cursorLayer.element.style.display=""},this.addToken=function(e,t,n,r){var i=this.session;i.bgTokenizer.lines[n]=null;var s={type:t,value:e},o=i.getTokens(n);if(r==null)o.push(s);else{var u=0;for(var a=0;a<o.length;a++){var f=o[a];u+=f.value.length;if(r<=u){var l=f.value.length-(u-r),c=f.value.slice(0,l),h=f.value.slice(l);o.splice(a,1,{type:f.type,value:c},s,{type:f.type,value:h});break}}}this.updateLines(n,n)},this.setTheme=function(e,t){function o(r){if(n.$themeId!=e)return t&&t();if(!r||!r.cssClass)throw new Error("couldn't load module "+e+" or it didn't call define");r.$id&&(n.$themeId=r.$id),i.importCssString(r.cssText,r.cssClass,n.container),n.theme&&i.removeCssClass(n.container,n.theme.cssClass);var s="padding"in r?r.padding:"padding"in(n.theme||{})?4:n.$padding;n.$padding&&s!=n.$padding&&n.setPadding(s),n.$theme=r.cssClass,n.theme=r,i.addCssClass(n.container,r.cssClass),i.setCssClass(n.container,"ace_dark",r.isDark),n.$size&&(n.$size.width=0,n.$updateSizeAsync()),n._dispatchEvent("themeLoaded",{theme:r}),t&&t()}var n=this;this.$themeId=e,n._dispatchEvent("themeChange",{theme:e});if(!e||typeof e=="string"){var r=e||this.$options.theme.initialValue;s.loadModule(["theme",r],o)}else o(e)},this.getTheme=function(){return this.$themeId},this.setStyle=function(e,t){i.setCssClass(this.container,e,t!==!1)},this.unsetStyle=function(e){i.removeCssClass(this.container,e)},this.setCursorStyle=function(e){i.setStyle(this.scroller.style,"cursor",e)},this.setMouseCursor=function(e){i.setStyle(this.scroller.style,"cursor",e)},this.attachToShadowRoot=function(){i.importCssString(v,"ace_editor.css",this.container)},this.destroy=function(){this.$fontMetrics.destroy(),this.$cursorLayer.destroy()}}).call(y.prototype),s.defineOptions(y.prototype,"renderer",{animatedScroll:{initialValue:!1},showInvisibles:{set:function(e){this.$textLayer.setShowInvisibles(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!1},showPrintMargin:{set:function(){this.$updatePrintMargin()},initialValue:!0},printMarginColumn:{set:function(){this.$updatePrintMargin()},initialValue:80},printMargin:{set:function(e){typeof e=="number"&&(this.$printMarginColumn=e),this.$showPrintMargin=!!e,this.$updatePrintMargin()},get:function(){return this.$showPrintMargin&&this.$printMarginColumn}},showGutter:{set:function(e){this.$gutter.style.display=e?"block":"none",this.$loop.schedule(this.CHANGE_FULL),this.onGutterResize()},initialValue:!0},fadeFoldWidgets:{set:function(e){i.setCssClass(this.$gutter,"ace_fade-fold-widgets",e)},initialValue:!1},showFoldWidgets:{set:function(e){this.$gutterLayer.setShowFoldWidgets(e),this.$loop.schedule(this.CHANGE_GUTTER)},initialValue:!0},displayIndentGuides:{set:function(e){this.$textLayer.setDisplayIndentGuides(e)&&this.$loop.schedule(this.CHANGE_TEXT)},initialValue:!0},highlightGutterLine:{set:function(e){this.$gutterLayer.setHighlightGutterLine(e),this.$loop.schedule(this.CHANGE_GUTTER)},initialValue:!0},hScrollBarAlwaysVisible:{set:function(e){(!this.$hScrollBarAlwaysVisible||!this.$horizScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},vScrollBarAlwaysVisible:{set:function(e){(!this.$vScrollBarAlwaysVisible||!this.$vScroll)&&this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:!1},fontSize:{set:function(e){typeof e=="number"&&(e+="px"),this.container.style.fontSize=e,this.updateFontSize()},initialValue:12},fontFamily:{set:function(e){this.container.style.fontFamily=e,this.updateFontSize()}},maxLines:{set:function(e){this.updateFull()}},minLines:{set:function(e){this.$minLines<562949953421311||(this.$minLines=0),this.updateFull()}},maxPixelHeight:{set:function(e){this.updateFull()},initialValue:0},scrollPastEnd:{set:function(e){e=+e||0;if(this.$scrollPastEnd==e)return;this.$scrollPastEnd=e,this.$loop.schedule(this.CHANGE_SCROLL)},initialValue:0,handlesSet:!0},fixedWidthGutter:{set:function(e){this.$gutterLayer.$fixedWidth=!!e,this.$loop.schedule(this.CHANGE_GUTTER)}},theme:{set:function(e){this.setTheme(e)},get:function(){return this.$themeId||this.theme},initialValue:"./theme/textmate",handlesSet:!0},hasCssTransforms:{},useTextareaForIME:{initialValue:!m.isMobile&&!m.isIE}}),t.VirtualRenderer=y}),ace.define("ace/worker/worker_client",["require","exports","module","ace/lib/oop","ace/lib/net","ace/lib/event_emitter","ace/config"],function(e,t,n){"use strict";function u(e){var t="importScripts('"+i.qualifyURL(e)+"');";try{return new Blob([t],{type:"application/javascript"})}catch(n){var r=window.BlobBuilder||window.WebKitBlobBuilder||window.MozBlobBuilder,s=new r;return s.append(t),s.getBlob("application/javascript")}}function a(e){if(typeof Worker=="undefined")return{postMessage:function(){},terminate:function(){}};var t=u(e),n=window.URL||window.webkitURL,r=n.createObjectURL(t);return new Worker(r)}var r=e("../lib/oop"),i=e("../lib/net"),s=e("../lib/event_emitter").EventEmitter,o=e("../config"),f=function(t,n,r,i,s){this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.onMessage=this.onMessage.bind(this),e.nameToUrl&&!e.toUrl&&(e.toUrl=e.nameToUrl);if(o.get("packaged")||!e.toUrl)i=i||o.moduleUrl(n,"worker");else{var u=this.$normalizePath;i=i||u(e.toUrl("ace/worker/worker.js",null,"_"));var f={};t.forEach(function(t){f[t]=u(e.toUrl(t,null,"_").replace(/(\.js)?(\?.*)?$/,""))})}this.$worker=a(i),s&&this.send("importScripts",s),this.$worker.postMessage({init:!0,tlns:f,module:n,classname:r}),this.callbackId=1,this.callbacks={},this.$worker.onmessage=this.onMessage};(function(){r.implement(this,s),this.onMessage=function(e){var t=e.data;switch(t.type){case"event":this._signal(t.name,{data:t.data});break;case"call":var n=this.callbacks[t.id];n&&(n(t.data),delete this.callbacks[t.id]);break;case"error":this.reportError(t.data);break;case"log":window.console&&console.log&&console.log.apply(console,t.data)}},this.reportError=function(e){window.console&&console.error&&console.error(e)},this.$normalizePath=function(e){return i.qualifyURL(e)},this.terminate=function(){this._signal("terminate",{}),this.deltaQueue=null,this.$worker.terminate(),this.$worker=null,this.$doc&&this.$doc.off("change",this.changeListener),this.$doc=null},this.send=function(e,t){this.$worker.postMessage({command:e,args:t})},this.call=function(e,t,n){if(n){var r=this.callbackId++;this.callbacks[r]=n,t.push(r)}this.send(e,t)},this.emit=function(e,t){try{t.data&&t.data.err&&(t.data.err={message:t.data.err.message,stack:t.data.err.stack,code:t.data.err.code}),this.$worker.postMessage({event:e,data:{data:t.data}})}catch(n){console.error(n.stack)}},this.attachToDocument=function(e){this.$doc&&this.terminate(),this.$doc=e,this.call("setValue",[e.getValue()]),e.on("change",this.changeListener)},this.changeListener=function(e){this.deltaQueue||(this.deltaQueue=[],setTimeout(this.$sendDeltaQueue,0)),e.action=="insert"?this.deltaQueue.push(e.start,e.lines):this.deltaQueue.push(e.start,e.end)},this.$sendDeltaQueue=function(){var e=this.deltaQueue;if(!e)return;this.deltaQueue=null,e.length>50&&e.length>this.$doc.getLength()>>1?this.call("setValue",[this.$doc.getValue()]):this.emit("change",{data:e})}}).call(f.prototype);var l=function(e,t,n){this.$sendDeltaQueue=this.$sendDeltaQueue.bind(this),this.changeListener=this.changeListener.bind(this),this.callbackId=1,this.callbacks={},this.messageBuffer=[];var r=null,i=!1,u=Object.create(s),a=this;this.$worker={},this.$worker.terminate=function(){},this.$worker.postMessage=function(e){a.messageBuffer.push(e),r&&(i?setTimeout(f):f())},this.setEmitSync=function(e){i=e};var f=function(){var e=a.messageBuffer.shift();e.command?r[e.command].apply(r,e.args):e.event&&u._signal(e.event,e.data)};u.postMessage=function(e){a.onMessage({data:e})},u.callback=function(e,t){this.postMessage({type:"call",id:t,data:e})},u.emit=function(e,t){this.postMessage({type:"event",name:e,data:t})},o.loadModule(["worker",t],function(e){r=new e[n](u);while(a.messageBuffer.length)f()})};l.prototype=f.prototype,t.UIWorkerClient=l,t.WorkerClient=f,t.createWorker=a}),ace.define("ace/placeholder",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/oop"],function(e,t,n){"use strict";var r=e("./range").Range,i=e("./lib/event_emitter").EventEmitter,s=e("./lib/oop"),o=function(e,t,n,r,i,s){var o=this;this.length=t,this.session=e,this.doc=e.getDocument(),this.mainClass=i,this.othersClass=s,this.$onUpdate=this.onUpdate.bind(this),this.doc.on("change",this.$onUpdate),this.$others=r,this.$onCursorChange=function(){setTimeout(function(){o.onCursorChange()})},this.$pos=n;var u=e.getUndoManager().$undoStack||e.getUndoManager().$undostack||{length:-1};this.$undoStackDepth=u.length,this.setup(),e.selection.on("changeCursor",this.$onCursorChange)};(function(){s.implement(this,i),this.setup=function(){var e=this,t=this.doc,n=this.session;this.selectionBefore=n.selection.toJSON(),n.selection.inMultiSelectMode&&n.selection.toSingleRange(),this.pos=t.createAnchor(this.$pos.row,this.$pos.column);var i=this.pos;i.$insertRight=!0,i.detach(),i.markerId=n.addMarker(new r(i.row,i.column,i.row,i.column+this.length),this.mainClass,null,!1),this.others=[],this.$others.forEach(function(n){var r=t.createAnchor(n.row,n.column);r.$insertRight=!0,r.detach(),e.others.push(r)}),n.setUndoSelect(!1)},this.showOtherMarkers=function(){if(this.othersActive)return;var e=this.session,t=this;this.othersActive=!0,this.others.forEach(function(n){n.markerId=e.addMarker(new r(n.row,n.column,n.row,n.column+t.length),t.othersClass,null,!1)})},this.hideOtherMarkers=function(){if(!this.othersActive)return;this.othersActive=!1;for(var e=0;e<this.others.length;e++)this.session.removeMarker(this.others[e].markerId)},this.onUpdate=function(e){if(this.$updating)return this.updateAnchors(e);var t=e;if(t.start.row!==t.end.row)return;if(t.start.row!==this.pos.row)return;this.$updating=!0;var n=e.action==="insert"?t.end.column-t.start.column:t.start.column-t.end.column,i=t.start.column>=this.pos.column&&t.start.column<=this.pos.column+this.length+1,s=t.start.column-this.pos.column;this.updateAnchors(e),i&&(this.length+=n);if(i&&!this.session.$fromUndo)if(e.action==="insert")for(var o=this.others.length-1;o>=0;o--){var u=this.others[o],a={row:u.row,column:u.column+s};this.doc.insertMergedLines(a,e.lines)}else if(e.action==="remove")for(var o=this.others.length-1;o>=0;o--){var u=this.others[o],a={row:u.row,column:u.column+s};this.doc.remove(new r(a.row,a.column,a.row,a.column-n))}this.$updating=!1,this.updateMarkers()},this.updateAnchors=function(e){this.pos.onChange(e);for(var t=this.others.length;t--;)this.others[t].onChange(e);this.updateMarkers()},this.updateMarkers=function(){if(this.$updating)return;var e=this,t=this.session,n=function(n,i){t.removeMarker(n.markerId),n.markerId=t.addMarker(new r(n.row,n.column,n.row,n.column+e.length),i,null,!1)};n(this.pos,this.mainClass);for(var i=this.others.length;i--;)n(this.others[i],this.othersClass)},this.onCursorChange=function(e){if(this.$updating||!this.session)return;var t=this.session.selection.getCursor();t.row===this.pos.row&&t.column>=this.pos.column&&t.column<=this.pos.column+this.length?(this.showOtherMarkers(),this._emit("cursorEnter",e)):(this.hideOtherMarkers(),this._emit("cursorLeave",e))},this.detach=function(){this.session.removeMarker(this.pos&&this.pos.markerId),this.hideOtherMarkers(),this.doc.removeEventListener("change",this.$onUpdate),this.session.selection.removeEventListener("changeCursor",this.$onCursorChange),this.session.setUndoSelect(!0),this.session=null},this.cancel=function(){if(this.$undoStackDepth===-1)return;var e=this.session.getUndoManager(),t=(e.$undoStack||e.$undostack).length-this.$undoStackDepth;for(var n=0;n<t;n++)e.undo(this.session,!0);this.selectionBefore&&this.session.selection.fromJSON(this.selectionBefore)}}).call(o.prototype),t.PlaceHolder=o}),ace.define("ace/mouse/multi_select_handler",["require","exports","module","ace/lib/event","ace/lib/useragent"],function(e,t,n){function s(e,t){return e.row==t.row&&e.column==t.column}function o(e){var t=e.domEvent,n=t.altKey,o=t.shiftKey,u=t.ctrlKey,a=e.getAccelKey(),f=e.getButton();u&&i.isMac&&(f=t.button);if(e.editor.inMultiSelectMode&&f==2){e.editor.textInput.onContextMenu(e.domEvent);return}if(!u&&!n&&!a){f===0&&e.editor.inMultiSelectMode&&e.editor.exitMultiSelectMode();return}if(f!==0)return;var l=e.editor,c=l.selection,h=l.inMultiSelectMode,p=e.getDocumentPosition(),d=c.getCursor(),v=e.inSelection()||c.isEmpty()&&s(p,d),m=e.x,g=e.y,y=function(e){m=e.clientX,g=e.clientY},b=l.session,w=l.renderer.pixelToScreenCoordinates(m,g),E=w,S;if(l.$mouseHandler.$enableJumpToDef)u&&n||a&&n?S=o?"block":"add":n&&l.$blockSelectEnabled&&(S="block");else if(a&&!n){S="add";if(!h&&o)return}else n&&l.$blockSelectEnabled&&(S="block");S&&i.isMac&&t.ctrlKey&&l.$mouseHandler.cancelContextMenu();if(S=="add"){if(!h&&v)return;if(!h){var x=c.toOrientedRange();l.addSelectionMarker(x)}var T=c.rangeList.rangeAtPoint(p);l.inVirtualSelectionMode=!0,o&&(T=null,x=c.ranges[0]||x,l.removeSelectionMarker(x)),l.once("mouseup",function(){var e=c.toOrientedRange();T&&e.isEmpty()&&s(T.cursor,e.cursor)?c.substractPoint(e.cursor):(o?c.substractPoint(x.cursor):x&&(l.removeSelectionMarker(x),c.addRange(x)),c.addRange(e)),l.inVirtualSelectionMode=!1})}else if(S=="block"){e.stop(),l.inVirtualSelectionMode=!0;var N,C=[],k=function(){var e=l.renderer.pixelToScreenCoordinates(m,g),t=b.screenToDocumentPosition(e.row,e.column,e.offsetX);if(s(E,e)&&s(t,c.lead))return;E=e,l.selection.moveToPosition(t),l.renderer.scrollCursorIntoView(),l.removeSelectionMarkers(C),C=c.rectangularRangeBlock(E,w),l.$mouseHandler.$clickSelection&&C.length==1&&C[0].isEmpty()&&(C[0]=l.$mouseHandler.$clickSelection.clone()),C.forEach(l.addSelectionMarker,l),l.updateSelectionMarkers()};h&&!a?c.toSingleRange():!h&&a&&(N=c.toOrientedRange(),l.addSelectionMarker(N)),o?w=b.documentToScreenPosition(c.lead):c.moveToPosition(p),E={row:-1,column:-1};var L=function(e){k(),clearInterval(O),l.removeSelectionMarkers(C),C.length||(C=[c.toOrientedRange()]),N&&(l.removeSelectionMarker(N),c.toSingleRange(N));for(var t=0;t<C.length;t++)c.addRange(C[t]);l.inVirtualSelectionMode=!1,l.$mouseHandler.$clickSelection=null},A=k;r.capture(l.container,y,L);var O=setInterval(function(){A()},20);return e.preventDefault()}}var r=e("../lib/event"),i=e("../lib/useragent");t.onMouseDown=o}),ace.define("ace/commands/multi_select_commands",["require","exports","module","ace/keyboard/hash_handler"],function(e,t,n){t.defaultCommands=[{name:"addCursorAbove",exec:function(e){e.selectMoreLines(-1)},bindKey:{win:"Ctrl-Alt-Up",mac:"Ctrl-Alt-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelow",exec:function(e){e.selectMoreLines(1)},bindKey:{win:"Ctrl-Alt-Down",mac:"Ctrl-Alt-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorAboveSkipCurrent",exec:function(e){e.selectMoreLines(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Up",mac:"Ctrl-Alt-Shift-Up"},scrollIntoView:"cursor",readOnly:!0},{name:"addCursorBelowSkipCurrent",exec:function(e){e.selectMoreLines(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Down",mac:"Ctrl-Alt-Shift-Down"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreBefore",exec:function(e){e.selectMore(-1)},bindKey:{win:"Ctrl-Alt-Left",mac:"Ctrl-Alt-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectMoreAfter",exec:function(e){e.selectMore(1)},bindKey:{win:"Ctrl-Alt-Right",mac:"Ctrl-Alt-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextBefore",exec:function(e){e.selectMore(-1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Left",mac:"Ctrl-Alt-Shift-Left"},scrollIntoView:"cursor",readOnly:!0},{name:"selectNextAfter",exec:function(e){e.selectMore(1,!0)},bindKey:{win:"Ctrl-Alt-Shift-Right",mac:"Ctrl-Alt-Shift-Right"},scrollIntoView:"cursor",readOnly:!0},{name:"splitIntoLines",exec:function(e){e.multiSelect.splitIntoLines()},bindKey:{win:"Ctrl-Alt-L",mac:"Ctrl-Alt-L"},readOnly:!0},{name:"alignCursors",exec:function(e){e.alignCursors()},bindKey:{win:"Ctrl-Alt-A",mac:"Ctrl-Alt-A"},scrollIntoView:"cursor"},{name:"findAll",exec:function(e){e.findAll()},bindKey:{win:"Ctrl-Alt-K",mac:"Ctrl-Alt-G"},scrollIntoView:"cursor",readOnly:!0}],t.multiSelectCommands=[{name:"singleSelection",bindKey:"esc",exec:function(e){e.exitMultiSelectMode()},scrollIntoView:"cursor",readOnly:!0,isAvailable:function(e){return e&&e.inMultiSelectMode}}];var r=e("../keyboard/hash_handler").HashHandler;t.keyboardHandler=new r(t.multiSelectCommands)}),ace.define("ace/multi_select",["require","exports","module","ace/range_list","ace/range","ace/selection","ace/mouse/multi_select_handler","ace/lib/event","ace/lib/lang","ace/commands/multi_select_commands","ace/search","ace/edit_session","ace/editor","ace/config"],function(e,t,n){function h(e,t,n){return c.$options.wrap=!0,c.$options.needle=t,c.$options.backwards=n==-1,c.find(e)}function v(e,t){return e.row==t.row&&e.column==t.column}function m(e){if(e.$multiselectOnSessionChange)return;e.$onAddRange=e.$onAddRange.bind(e),e.$onRemoveRange=e.$onRemoveRange.bind(e),e.$onMultiSelect=e.$onMultiSelect.bind(e),e.$onSingleSelect=e.$onSingleSelect.bind(e),e.$multiselectOnSessionChange=t.onSessionChange.bind(e),e.$checkMultiselectChange=e.$checkMultiselectChange.bind(e),e.$multiselectOnSessionChange(e),e.on("changeSession",e.$multiselectOnSessionChange),e.on("mousedown",o),e.commands.addCommands(f.defaultCommands),g(e)}function g(e){function r(t){n&&(e.renderer.setMouseCursor(""),n=!1)}var t=e.textInput.getElement(),n=!1;u.addListener(t,"keydown",function(t){var i=t.keyCode==18&&!(t.ctrlKey||t.shiftKey||t.metaKey);e.$blockSelectEnabled&&i?n||(e.renderer.setMouseCursor("crosshair"),n=!0):n&&r()}),u.addListener(t,"keyup",r),u.addListener(t,"blur",r)}var r=e("./range_list").RangeList,i=e("./range").Range,s=e("./selection").Selection,o=e("./mouse/multi_select_handler").onMouseDown,u=e("./lib/event"),a=e("./lib/lang"),f=e("./commands/multi_select_commands");t.commands=f.defaultCommands.concat(f.multiSelectCommands);var l=e("./search").Search,c=new l,p=e("./edit_session").EditSession;(function(){this.getSelectionMarkers=function(){return this.$selectionMarkers}}).call(p.prototype),function(){this.ranges=null,this.rangeList=null,this.addRange=function(e,t){if(!e)return;if(!this.inMultiSelectMode&&this.rangeCount===0){var n=this.toOrientedRange();this.rangeList.add(n),this.rangeList.add(e);if(this.rangeList.ranges.length!=2)return this.rangeList.removeAll(),t||this.fromOrientedRange(e);this.rangeList.removeAll(),this.rangeList.add(n),this.$onAddRange(n)}e.cursor||(e.cursor=e.end);var r=this.rangeList.add(e);return this.$onAddRange(e),r.length&&this.$onRemoveRange(r),this.rangeCount>1&&!this.inMultiSelectMode&&(this._signal("multiSelect"),this.inMultiSelectMode=!0,this.session.$undoSelect=!1,this.rangeList.attach(this.session)),t||this.fromOrientedRange(e)},this.toSingleRange=function(e){e=e||this.ranges[0];var t=this.rangeList.removeAll();t.length&&this.$onRemoveRange(t),e&&this.fromOrientedRange(e)},this.substractPoint=function(e){var t=this.rangeList.substractPoint(e);if(t)return this.$onRemoveRange(t),t[0]},this.mergeOverlappingRanges=function(){var e=this.rangeList.merge();e.length&&this.$onRemoveRange(e)},this.$onAddRange=function(e){this.rangeCount=this.rangeList.ranges.length,this.ranges.unshift(e),this._signal("addRange",{range:e})},this.$onRemoveRange=function(e){this.rangeCount=this.rangeList.ranges.length;if(this.rangeCount==1&&this.inMultiSelectMode){var t=this.rangeList.ranges.pop();e.push(t),this.rangeCount=0}for(var n=e.length;n--;){var r=this.ranges.indexOf(e[n]);this.ranges.splice(r,1)}this._signal("removeRange",{ranges:e}),this.rangeCount===0&&this.inMultiSelectMode&&(this.inMultiSelectMode=!1,this._signal("singleSelect"),this.session.$undoSelect=!0,this.rangeList.detach(this.session)),t=t||this.ranges[0],t&&!t.isEqual(this.getRange())&&this.fromOrientedRange(t)},this.$initRangeList=function(){if(this.rangeList)return;this.rangeList=new r,this.ranges=[],this.rangeCount=0},this.getAllRanges=function(){return this.rangeCount?this.rangeList.ranges.concat():[this.getRange()]},this.splitIntoLines=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=i.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{var n=this.getRange(),r=this.isBackwards(),s=n.start.row,o=n.end.row;if(s==o){if(r)var u=n.end,a=n.start;else var u=n.start,a=n.end;this.addRange(i.fromPoints(a,a)),this.addRange(i.fromPoints(u,u));return}var f=[],l=this.getLineRange(s,!0);l.start.column=n.start.column,f.push(l);for(var c=s+1;c<o;c++)f.push(this.getLineRange(c,!0));l=this.getLineRange(o,!0),l.end.column=n.end.column,f.push(l),f.forEach(this.addRange,this)}},this.toggleBlockSelection=function(){if(this.rangeCount>1){var e=this.rangeList.ranges,t=e[e.length-1],n=i.fromPoints(e[0].start,t.end);this.toSingleRange(),this.setSelectionRange(n,t.cursor==t.start)}else{var r=this.session.documentToScreenPosition(this.cursor),s=this.session.documentToScreenPosition(this.anchor),o=this.rectangularRangeBlock(r,s);o.forEach(this.addRange,this)}},this.rectangularRangeBlock=function(e,t,n){var r=[],s=e.column<t.column;if(s)var o=e.column,u=t.column,a=e.offsetX,f=t.offsetX;else var o=t.column,u=e.column,a=t.offsetX,f=e.offsetX;var l=e.row<t.row;if(l)var c=e.row,h=t.row;else var c=t.row,h=e.row;o<0&&(o=0),c<0&&(c=0),c==h&&(n=!0);var p;for(var d=c;d<=h;d++){var m=i.fromPoints(this.session.screenToDocumentPosition(d,o,a),this.session.screenToDocumentPosition(d,u,f));if(m.isEmpty()){if(p&&v(m.end,p))break;p=m.end}m.cursor=s?m.start:m.end,r.push(m)}l&&r.reverse();if(!n){var g=r.length-1;while(r[g].isEmpty()&&g>0)g--;if(g>0){var y=0;while(r[y].isEmpty())y++}for(var b=g;b>=y;b--)r[b].isEmpty()&&r.splice(b,1)}return r}}.call(s.prototype);var d=e("./editor").Editor;(function(){this.updateSelectionMarkers=function(){this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.addSelectionMarker=function(e){e.cursor||(e.cursor=e.end);var t=this.getSelectionStyle();return e.marker=this.session.addMarker(e,"ace_selection",t),this.session.$selectionMarkers.push(e),this.session.selectionMarkerCount=this.session.$selectionMarkers.length,e},this.removeSelectionMarker=function(e){if(!e.marker)return;this.session.removeMarker(e.marker);var t=this.session.$selectionMarkers.indexOf(e);t!=-1&&this.session.$selectionMarkers.splice(t,1),this.session.selectionMarkerCount=this.session.$selectionMarkers.length},this.removeSelectionMarkers=function(e){var t=this.session.$selectionMarkers;for(var n=e.length;n--;){var r=e[n];if(!r.marker)continue;this.session.removeMarker(r.marker);var i=t.indexOf(r);i!=-1&&t.splice(i,1)}this.session.selectionMarkerCount=t.length},this.$onAddRange=function(e){this.addSelectionMarker(e.range),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onRemoveRange=function(e){this.removeSelectionMarkers(e.ranges),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onMultiSelect=function(e){if(this.inMultiSelectMode)return;this.inMultiSelectMode=!0,this.setStyle("ace_multiselect"),this.keyBinding.addKeyboardHandler(f.keyboardHandler),this.commands.setDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers()},this.$onSingleSelect=function(e){if(this.session.multiSelect.inVirtualMode)return;this.inMultiSelectMode=!1,this.unsetStyle("ace_multiselect"),this.keyBinding.removeKeyboardHandler(f.keyboardHandler),this.commands.removeDefaultHandler("exec",this.$onMultiSelectExec),this.renderer.updateCursor(),this.renderer.updateBackMarkers(),this._emit("changeSelection")},this.$onMultiSelectExec=function(e){var t=e.command,n=e.editor;if(!n.multiSelect)return;if(!t.multiSelectAction){var r=t.exec(n,e.args||{});n.multiSelect.addRange(n.multiSelect.toOrientedRange()),n.multiSelect.mergeOverlappingRanges()}else t.multiSelectAction=="forEach"?r=n.forEachSelection(t,e.args):t.multiSelectAction=="forEachLine"?r=n.forEachSelection(t,e.args,!0):t.multiSelectAction=="single"?(n.exitMultiSelectMode(),r=t.exec(n,e.args||{})):r=t.multiSelectAction(n,e.args||{});return r},this.forEachSelection=function(e,t,n){if(this.inVirtualSelectionMode)return;var r=n&&n.keepOrder,i=n==1||n&&n.$byLines,o=this.session,u=this.selection,a=u.rangeList,f=(r?u:a).ranges,l;if(!f.length)return e.exec?e.exec(this,t||{}):e(this,t||{});var c=u._eventRegistry;u._eventRegistry={};var h=new s(o);this.inVirtualSelectionMode=!0;for(var p=f.length;p--;){if(i)while(p>0&&f[p].start.row==f[p-1].end.row)p--;h.fromOrientedRange(f[p]),h.index=p,this.selection=o.selection=h;var d=e.exec?e.exec(this,t||{}):e(this,t||{});!l&&d!==undefined&&(l=d),h.toOrientedRange(f[p])}h.detach(),this.selection=o.selection=u,this.inVirtualSelectionMode=!1,u._eventRegistry=c,u.mergeOverlappingRanges(),u.ranges[0]&&u.fromOrientedRange(u.ranges[0]);var v=this.renderer.$scrollAnimation;return this.onCursorChange(),this.onSelectionChange(),v&&v.from==v.to&&this.renderer.animateScrolling(v.from),l},this.exitMultiSelectMode=function(){if(!this.inMultiSelectMode||this.inVirtualSelectionMode)return;this.multiSelect.toSingleRange()},this.getSelectedText=function(){var e="";if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){var t=this.multiSelect.rangeList.ranges,n=[];for(var r=0;r<t.length;r++)n.push(this.session.getTextRange(t[r]));var i=this.session.getDocument().getNewLineCharacter();e=n.join(i),e.length==(n.length-1)*i.length&&(e="")}else this.selection.isEmpty()||(e=this.session.getTextRange(this.getSelectionRange()));return e},this.$checkMultiselectChange=function(e,t){if(this.inMultiSelectMode&&!this.inVirtualSelectionMode){var n=this.multiSelect.ranges[0];if(this.multiSelect.isEmpty()&&t==this.multiSelect.anchor)return;var r=t==this.multiSelect.anchor?n.cursor==n.start?n.end:n.start:n.cursor;r.row!=t.row||this.session.$clipPositionToDocument(r.row,r.column).column!=t.column?this.multiSelect.toSingleRange(this.multiSelect.toOrientedRange()):this.multiSelect.mergeOverlappingRanges()}},this.findAll=function(e,t,n){t=t||{},t.needle=e||t.needle;if(t.needle==undefined){var r=this.selection.isEmpty()?this.selection.getWordRange():this.selection.getRange();t.needle=this.session.getTextRange(r)}this.$search.set(t);var i=this.$search.findAll(this.session);if(!i.length)return 0;var s=this.multiSelect;n||s.toSingleRange(i[0]);for(var o=i.length;o--;)s.addRange(i[o],!0);return r&&s.rangeList.rangeAtPoint(r.start)&&s.addRange(r,!0),i.length},this.selectMoreLines=function(e,t){var n=this.selection.toOrientedRange(),r=n.cursor==n.end,s=this.session.documentToScreenPosition(n.cursor);this.selection.$desiredColumn&&(s.column=this.selection.$desiredColumn);var o=this.session.screenToDocumentPosition(s.row+e,s.column);if(!n.isEmpty())var u=this.session.documentToScreenPosition(r?n.end:n.start),a=this.session.screenToDocumentPosition(u.row+e,u.column);else var a=o;if(r){var f=i.fromPoints(o,a);f.cursor=f.start}else{var f=i.fromPoints(a,o);f.cursor=f.end}f.desiredColumn=s.column;if(!this.selection.inMultiSelectMode)this.selection.addRange(n);else if(t)var l=n.cursor;this.selection.addRange(f),l&&this.selection.substractPoint(l)},this.transposeSelections=function(e){var t=this.session,n=t.multiSelect,r=n.ranges;for(var i=r.length;i--;){var s=r[i];if(s.isEmpty()){var o=t.getWordRange(s.start.row,s.start.column);s.start.row=o.start.row,s.start.column=o.start.column,s.end.row=o.end.row,s.end.column=o.end.column}}n.mergeOverlappingRanges();var u=[];for(var i=r.length;i--;){var s=r[i];u.unshift(t.getTextRange(s))}e<0?u.unshift(u.pop()):u.push(u.shift());for(var i=r.length;i--;){var s=r[i],o=s.clone();t.replace(s,u[i]),s.start.row=o.start.row,s.start.column=o.start.column}n.fromOrientedRange(n.ranges[0])},this.selectMore=function(e,t,n){var r=this.session,i=r.multiSelect,s=i.toOrientedRange();if(s.isEmpty()){s=r.getWordRange(s.start.row,s.start.column),s.cursor=e==-1?s.start:s.end,this.multiSelect.addRange(s);if(n)return}var o=r.getTextRange(s),u=h(r,o,e);u&&(u.cursor=e==-1?u.start:u.end,this.session.unfold(u),this.multiSelect.addRange(u),this.renderer.scrollCursorIntoView(null,.5)),t&&this.multiSelect.substractPoint(s.cursor)},this.alignCursors=function(){var e=this.session,t=e.multiSelect,n=t.ranges,r=-1,s=n.filter(function(e){if(e.cursor.row==r)return!0;r=e.cursor.row});if(!n.length||s.length==n.length-1){var o=this.selection.getRange(),u=o.start.row,f=o.end.row,l=u==f;if(l){var c=this.session.getLength(),h;do h=this.session.getLine(f);while(/[=:]/.test(h)&&++f<c);do h=this.session.getLine(u);while(/[=:]/.test(h)&&--u>0);u<0&&(u=0),f>=c&&(f=c-1)}var p=this.session.removeFullLines(u,f);p=this.$reAlignText(p,l),this.session.insert({row:u,column:0},p.join("\n")+"\n"),l||(o.start.column=0,o.end.column=p[p.length-1].length),this.selection.setRange(o)}else{s.forEach(function(e){t.substractPoint(e.cursor)});var d=0,v=Infinity,m=n.map(function(t){var n=t.cursor,r=e.getLine(n.row),i=r.substr(n.column).search(/\S/g);return i==-1&&(i=0),n.column>d&&(d=n.column),i<v&&(v=i),i});n.forEach(function(t,n){var r=t.cursor,s=d-r.column,o=m[n]-v;s>o?e.insert(r,a.stringRepeat(" ",s-o)):e.remove(new i(r.row,r.column,r.row,r.column-s+o)),t.start.column=t.end.column=d,t.start.row=t.end.row=r.row,t.cursor=t.end}),t.fromOrientedRange(n[0]),this.renderer.updateCursor(),this.renderer.updateBackMarkers()}},this.$reAlignText=function(e,t){function u(e){return a.stringRepeat(" ",e)}function f(e){return e[2]?u(i)+e[2]+u(s-e[2].length+o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}function l(e){return e[2]?u(i+s-e[2].length)+e[2]+u(o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}function c(e){return e[2]?u(i)+e[2]+u(o)+e[4].replace(/^([=:])\s+/,"$1 "):e[0]}var n=!0,r=!0,i,s,o;return e.map(function(e){var t=e.match(/(\s*)(.*?)(\s*)([=:].*)/);return t?i==null?(i=t[1].length,s=t[2].length,o=t[3].length,t):(i+s+o!=t[1].length+t[2].length+t[3].length&&(r=!1),i!=t[1].length&&(n=!1),i>t[1].length&&(i=t[1].length),s<t[2].length&&(s=t[2].length),o>t[3].length&&(o=t[3].length),t):[e]}).map(t?f:n?r?l:f:c)}}).call(d.prototype),t.onSessionChange=function(e){var t=e.session;t&&!t.multiSelect&&(t.$selectionMarkers=[],t.selection.$initRangeList(),t.multiSelect=t.selection),this.multiSelect=t&&t.multiSelect;var n=e.oldSession;n&&(n.multiSelect.off("addRange",this.$onAddRange),n.multiSelect.off("removeRange",this.$onRemoveRange),n.multiSelect.off("multiSelect",this.$onMultiSelect),n.multiSelect.off("singleSelect",this.$onSingleSelect),n.multiSelect.lead.off("change",this.$checkMultiselectChange),n.multiSelect.anchor.off("change",this.$checkMultiselectChange)),t&&(t.multiSelect.on("addRange",this.$onAddRange),t.multiSelect.on("removeRange",this.$onRemoveRange),t.multiSelect.on("multiSelect",this.$onMultiSelect),t.multiSelect.on("singleSelect",this.$onSingleSelect),t.multiSelect.lead.on("change",this.$checkMultiselectChange),t.multiSelect.anchor.on("change",this.$checkMultiselectChange)),t&&this.inMultiSelectMode!=t.selection.inMultiSelectMode&&(t.selection.inMultiSelectMode?this.$onMultiSelect():this.$onSingleSelect())},t.MultiSelect=m,e("./config").defineOptions(d.prototype,"editor",{enableMultiselect:{set:function(e){m(this),e?(this.on("changeSession",this.$multiselectOnSessionChange),this.on("mousedown",o)):(this.off("changeSession",this.$multiselectOnSessionChange),this.off("mousedown",o))},value:!0},enableBlockSelect:{set:function(e){this.$blockSelectEnabled=e},value:!0}})}),ace.define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../../range").Range,i=t.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(e,t,n){var r=e.getLine(n);return this.foldingStartMarker.test(r)?"start":t=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(r)?"end":""},this.getFoldWidgetRange=function(e,t,n){return null},this.indentationBlock=function(e,t,n){var i=/\S/,s=e.getLine(t),o=s.search(i);if(o==-1)return;var u=n||s.length,a=e.getLength(),f=t,l=t;while(++t<a){var c=e.getLine(t).search(i);if(c==-1)continue;if(c<=o)break;l=t}if(l>f){var h=e.getLine(l).length;return new r(f,u,l,h)}},this.openingBracketBlock=function(e,t,n,i,s){var o={row:n,column:i+1},u=e.$findClosingBracket(t,o,s);if(!u)return;var a=e.foldWidgets[u.row];return a==null&&(a=e.getFoldWidget(u.row)),a=="start"&&u.row>o.row&&(u.row--,u.column=e.getLine(u.row).length),r.fromPoints(o,u)},this.closingBracketBlock=function(e,t,n,i,s){var o={row:n,column:i},u=e.$findOpeningBracket(t,o);if(!u)return;return u.column++,o.column--,r.fromPoints(u,o)}}).call(i.prototype)}),ace.define("ace/theme/textmate",["require","exports","module","ace/lib/dom"],function(e,t,n){"use strict";t.isDark=!1,t.cssClass="ace-tm",t.cssText='.ace-tm .ace_gutter {background: #f0f0f0;color: #333;}.ace-tm .ace_print-margin {width: 1px;background: #e8e8e8;}.ace-tm .ace_fold {background-color: #6B72E6;}.ace-tm {background-color: #FFFFFF;color: black;}.ace-tm .ace_cursor {color: black;}.ace-tm .ace_invisible {color: rgb(191, 191, 191);}.ace-tm .ace_storage,.ace-tm .ace_keyword {color: blue;}.ace-tm .ace_constant {color: rgb(197, 6, 11);}.ace-tm .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-tm .ace_constant.ace_language {color: rgb(88, 92, 246);}.ace-tm .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-tm .ace_invalid {background-color: rgba(255, 0, 0, 0.1);color: red;}.ace-tm .ace_support.ace_function {color: rgb(60, 76, 114);}.ace-tm .ace_support.ace_constant {color: rgb(6, 150, 14);}.ace-tm .ace_support.ace_type,.ace-tm .ace_support.ace_class {color: rgb(109, 121, 222);}.ace-tm .ace_keyword.ace_operator {color: rgb(104, 118, 135);}.ace-tm .ace_string {color: rgb(3, 106, 7);}.ace-tm .ace_comment {color: rgb(76, 136, 107);}.ace-tm .ace_comment.ace_doc {color: rgb(0, 102, 255);}.ace-tm .ace_comment.ace_doc.ace_tag {color: rgb(128, 159, 191);}.ace-tm .ace_constant.ace_numeric {color: rgb(0, 0, 205);}.ace-tm .ace_variable {color: rgb(49, 132, 149);}.ace-tm .ace_xml-pe {color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {color: #0000A2;}.ace-tm .ace_heading {color: rgb(12, 7, 255);}.ace-tm .ace_list {color:rgb(185, 6, 144);}.ace-tm .ace_meta.ace_tag {color:rgb(0, 22, 142);}.ace-tm .ace_string.ace_regex {color: rgb(255, 0, 0)}.ace-tm .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-tm.ace_multiselect .ace_selection.ace_start {box-shadow: 0 0 3px 0px white;}.ace-tm .ace_marker-layer .ace_step {background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active-line {background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_gutter-active-line {background-color : #dcdcdc;}.ace-tm .ace_marker-layer .ace_selected-word {background: rgb(250, 250, 255);border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}',t.$id="ace/theme/textmate";var r=e("../lib/dom");r.importCssString(t.cssText,t.cssClass)}),ace.define("ace/line_widgets",["require","exports","module","ace/lib/oop","ace/lib/dom","ace/range"],function(e,t,n){"use strict";function o(e){this.session=e,this.session.widgetManager=this,this.session.getRowLength=this.getRowLength,this.session.$getWidgetScreenLength=this.$getWidgetScreenLength,this.updateOnChange=this.updateOnChange.bind(this),this.renderWidgets=this.renderWidgets.bind(this),this.measureWidgets=this.measureWidgets.bind(this),this.session._changedWidgets=[],this.$onChangeEditor=this.$onChangeEditor.bind(this),this.session.on("change",this.updateOnChange),this.session.on("changeFold",this.updateOnFold),this.session.on("changeEditor",this.$onChangeEditor)}var r=e("./lib/oop"),i=e("./lib/dom"),s=e("./range").Range;(function(){this.getRowLength=function(e){var t;return this.lineWidgets?t=this.lineWidgets[e]&&this.lineWidgets[e].rowCount||0:t=0,!this.$useWrapMode||!this.$wrapData[e]?1+t:this.$wrapData[e].length+1+t},this.$getWidgetScreenLength=function(){var e=0;return this.lineWidgets.forEach(function(t){t&&t.rowCount&&!t.hidden&&(e+=t.rowCount)}),e},this.$onChangeEditor=function(e){this.attach(e.editor)},this.attach=function(e){e&&e.widgetManager&&e.widgetManager!=this&&e.widgetManager.detach();if(this.editor==e)return;this.detach(),this.editor=e,e&&(e.widgetManager=this,e.renderer.on("beforeRender",this.measureWidgets),e.renderer.on("afterRender",this.renderWidgets))},this.detach=function(e){var t=this.editor;if(!t)return;this.editor=null,t.widgetManager=null,t.renderer.off("beforeRender",this.measureWidgets),t.renderer.off("afterRender",this.renderWidgets);var n=this.session.lineWidgets;n&&n.forEach(function(e){e&&e.el&&e.el.parentNode&&(e._inDocument=!1,e.el.parentNode.removeChild(e.el))})},this.updateOnFold=function(e,t){var n=t.lineWidgets;if(!n||!e.action)return;var r=e.data,i=r.start.row,s=r.end.row,o=e.action=="add";for(var u=i+1;u<s;u++)n[u]&&(n[u].hidden=o);n[s]&&(o?n[i]?n[s].hidden=o:n[i]=n[s]:(n[i]==n[s]&&(n[i]=undefined),n[s].hidden=o))},this.updateOnChange=function(e){var t=this.session.lineWidgets;if(!t)return;var n=e.start.row,r=e.end.row-n;if(r!==0)if(e.action=="remove"){var i=t.splice(n+1,r);i.forEach(function(e){e&&this.removeLineWidget(e)},this),this.$updateRows()}else{var s=new Array(r);s.unshift(n,0),t.splice.apply(t,s),this.$updateRows()}},this.$updateRows=function(){var e=this.session.lineWidgets;if(!e)return;var t=!0;e.forEach(function(e,n){if(e){t=!1,e.row=n;while(e.$oldWidget)e.$oldWidget.row=n,e=e.$oldWidget}}),t&&(this.session.lineWidgets=null)},this.addLineWidget=function(e){this.session.lineWidgets||(this.session.lineWidgets=new Array(this.session.getLength()));var t=this.session.lineWidgets[e.row];t&&(e.$oldWidget=t,t.el&&t.el.parentNode&&(t.el.parentNode.removeChild(t.el),t._inDocument=!1)),this.session.lineWidgets[e.row]=e,e.session=this.session;var n=this.editor.renderer;e.html&&!e.el&&(e.el=i.createElement("div"),e.el.innerHTML=e.html),e.el&&(i.addCssClass(e.el,"ace_lineWidgetContainer"),e.el.style.position="absolute",e.el.style.zIndex=5,n.container.appendChild(e.el),e._inDocument=!0),e.coverGutter||(e.el.style.zIndex=3),e.pixelHeight==null&&(e.pixelHeight=e.el.offsetHeight),e.rowCount==null&&(e.rowCount=e.pixelHeight/n.layerConfig.lineHeight);var r=this.session.getFoldAt(e.row,0);e.$fold=r;if(r){var s=this.session.lineWidgets;e.row==r.end.row&&!s[r.start.row]?s[r.start.row]=e:e.hidden=!0}return this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows(),this.renderWidgets(null,n),this.onWidgetChanged(e),e},this.removeLineWidget=function(e){e._inDocument=!1,e.session=null,e.el&&e.el.parentNode&&e.el.parentNode.removeChild(e.el);if(e.editor&&e.editor.destroy)try{e.editor.destroy()}catch(t){}if(this.session.lineWidgets){var n=this.session.lineWidgets[e.row];if(n==e)this.session.lineWidgets[e.row]=e.$oldWidget,e.$oldWidget&&this.onWidgetChanged(e.$oldWidget);else while(n){if(n.$oldWidget==e){n.$oldWidget=e.$oldWidget;break}n=n.$oldWidget}}this.session._emit("changeFold",{data:{start:{row:e.row}}}),this.$updateRows()},this.getWidgetsAtRow=function(e){var t=this.session.lineWidgets,n=t&&t[e],r=[];while(n)r.push(n),n=n.$oldWidget;return r},this.onWidgetChanged=function(e){this.session._changedWidgets.push(e),this.editor&&this.editor.renderer.updateFull()},this.measureWidgets=function(e,t){var n=this.session._changedWidgets,r=t.layerConfig;if(!n||!n.length)return;var i=Infinity;for(var s=0;s<n.length;s++){var o=n[s];if(!o||!o.el)continue;if(o.session!=this.session)continue;if(!o._inDocument){if(this.session.lineWidgets[o.row]!=o)continue;o._inDocument=!0,t.container.appendChild(o.el)}o.h=o.el.offsetHeight,o.fixedWidth||(o.w=o.el.offsetWidth,o.screenWidth=Math.ceil(o.w/r.characterWidth));var u=o.h/r.lineHeight;o.coverLine&&(u-=this.session.getRowLineCount(o.row),u<0&&(u=0)),o.rowCount!=u&&(o.rowCount=u,o.row<i&&(i=o.row))}i!=Infinity&&(this.session._emit("changeFold",{data:{start:{row:i}}}),this.session.lineWidgetWidth=null),this.session._changedWidgets=[]},this.renderWidgets=function(e,t){var n=t.layerConfig,r=this.session.lineWidgets;if(!r)return;var i=Math.min(this.firstRow,n.firstRow),s=Math.max(this.lastRow,n.lastRow,r.length);while(i>0&&!r[i])i--;this.firstRow=n.firstRow,this.lastRow=n.lastRow,t.$cursorLayer.config=n;for(var o=i;o<=s;o++){var u=r[o];if(!u||!u.el)continue;if(u.hidden){u.el.style.top=-100-(u.pixelHeight||0)+"px";continue}u._inDocument||(u._inDocument=!0,t.container.appendChild(u.el));var a=t.$cursorLayer.getPixelPosition({row:o,column:0},!0).top;u.coverLine||(a+=n.lineHeight*this.session.getRowLineCount(u.row)),u.el.style.top=a-n.offset+"px";var f=u.coverGutter?0:t.gutterWidth;u.fixedWidth||(f-=t.scrollLeft),u.el.style.left=f+"px",u.fullWidth&&u.screenWidth&&(u.el.style.minWidth=n.width+2*n.padding+"px"),u.fixedWidth?u.el.style.right=t.scrollBar.getWidth()+"px":u.el.style.right=""}}}).call(o.prototype),t.LineWidgets=o}),ace.define("ace/ext/error_marker",["require","exports","module","ace/line_widgets","ace/lib/dom","ace/range"],function(e,t,n){"use strict";function o(e,t,n){var r=0,i=e.length-1;while(r<=i){var s=r+i>>1,o=n(t,e[s]);if(o>0)r=s+1;else{if(!(o<0))return s;i=s-1}}return-(r+1)}function u(e,t,n){var r=e.getAnnotations().sort(s.comparePoints);if(!r.length)return;var i=o(r,{row:t,column:-1},s.comparePoints);i<0&&(i=-i-1),i>=r.length?i=n>0?0:r.length-1:i===0&&n<0&&(i=r.length-1);var u=r[i];if(!u||!n)return;if(u.row===t){do u=r[i+=n];while(u&&u.row===t);if(!u)return r.slice()}var a=[];t=u.row;do a[n<0?"unshift":"push"](u),u=r[i+=n];while(u&&u.row==t);return a.length&&a}var r=e("../line_widgets").LineWidgets,i=e("../lib/dom"),s=e("../range").Range;t.showErrorMarker=function(e,t){var n=e.session;n.widgetManager||(n.widgetManager=new r(n),n.widgetManager.attach(e));var s=e.getCursorPosition(),o=s.row,a=n.widgetManager.getWidgetsAtRow(o).filter(function(e){return e.type=="errorMarker"})[0];a?a.destroy():o-=t;var f=u(n,o,t),l;if(f){var c=f[0];s.column=(c.pos&&typeof c.column!="number"?c.pos.sc:c.column)||0,s.row=c.row,l=e.renderer.$gutterLayer.$annotations[s.row]}else{if(a)return;l={text:["Looks good!"],className:"ace_ok"}}e.session.unfold(s.row),e.selection.moveToPosition(s);var h={row:s.row,fixedWidth:!0,coverGutter:!0,el:i.createElement("div"),type:"errorMarker"},p=h.el.appendChild(i.createElement("div")),d=h.el.appendChild(i.createElement("div"));d.className="error_widget_arrow "+l.className;var v=e.renderer.$cursorLayer.getPixelPosition(s).left;d.style.left=v+e.renderer.gutterWidth-5+"px",h.el.className="error_widget_wrapper",p.className="error_widget "+l.className,p.innerHTML=l.text.join("<br>"),p.appendChild(i.createElement("div"));var m=function(e,t,n){if(t===0&&(n==="esc"||n==="return"))return h.destroy(),{command:"null"}};h.destroy=function(){if(e.$mouseHandler.isMousePressed)return;e.keyBinding.removeKeyboardHandler(m),n.widgetManager.removeLineWidget(h),e.off("changeSelection",h.destroy),e.off("changeSession",h.destroy),e.off("mouseup",h.destroy),e.off("change",h.destroy)},e.keyBinding.addKeyboardHandler(m),e.on("changeSelection",h.destroy),e.on("changeSession",h.destroy),e.on("mouseup",h.destroy),e.on("change",h.destroy),e.session.widgetManager.addLineWidget(h),h.el.onmousedown=e.focus.bind(e),e.renderer.scrollCursorIntoView(null,.5,{bottom:h.el.offsetHeight})},i.importCssString("    .error_widget_wrapper {        background: inherit;        color: inherit;        border:none    }    .error_widget {        border-top: solid 2px;        border-bottom: solid 2px;        margin: 5px 0;        padding: 10px 40px;        white-space: pre-wrap;    }    .error_widget.ace_error, .error_widget_arrow.ace_error{        border-color: #ff5a5a    }    .error_widget.ace_warning, .error_widget_arrow.ace_warning{        border-color: #F1D817    }    .error_widget.ace_info, .error_widget_arrow.ace_info{        border-color: #5a5a5a    }    .error_widget.ace_ok, .error_widget_arrow.ace_ok{        border-color: #5aaa5a    }    .error_widget_arrow {        position: absolute;        border: solid 5px;        border-top-color: transparent!important;        border-right-color: transparent!important;        border-left-color: transparent!important;        top: -5px;    }","")}),ace.define("ace/ace",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/dom","ace/lib/event","ace/range","ace/editor","ace/edit_session","ace/undomanager","ace/virtual_renderer","ace/worker/worker_client","ace/keyboard/hash_handler","ace/placeholder","ace/multi_select","ace/mode/folding/fold_mode","ace/theme/textmate","ace/ext/error_marker","ace/config"],function(e,t,n){"use strict";e("./lib/fixoldbrowsers");var r=e("./lib/dom"),i=e("./lib/event"),s=e("./range").Range,o=e("./editor").Editor,u=e("./edit_session").EditSession,a=e("./undomanager").UndoManager,f=e("./virtual_renderer").VirtualRenderer;e("./worker/worker_client"),e("./keyboard/hash_handler"),e("./placeholder"),e("./multi_select"),e("./mode/folding/fold_mode"),e("./theme/textmate"),e("./ext/error_marker"),t.config=e("./config"),t.require=e,typeof define=="function"&&(t.define=define),t.edit=function(e,n){if(typeof e=="string"){var s=e;e=document.getElementById(s);if(!e)throw new Error("ace.edit can't find div #"+s)}if(e&&e.env&&e.env.editor instanceof o)return e.env.editor;var u="";if(e&&/input|textarea/i.test(e.tagName)){var a=e;u=a.value,e=r.createElement("pre"),a.parentNode.replaceChild(e,a)}else e&&(u=e.textContent,e.innerHTML="");var l=t.createEditSession(u),c=new o(new f(e),l,n),h={document:l,editor:c,onResize:c.resize.bind(c,null)};return a&&(h.textarea=a),i.addListener(window,"resize",h.onResize),c.on("destroy",function(){i.removeListener(window,"resize",h.onResize),h.editor.container.env=null}),c.container.env=c.env=h,c},t.createEditSession=function(e,t){var n=new u(e,t);return n.setUndoManager(new a),n},t.Range=s,t.Editor=o,t.EditSession=u,t.UndoManager=a,t.VirtualRenderer=f,t.version="1.4.2"});            (function() {
-                ace.require(["ace/ace"], function(a) {
-                    if (a) {
-                        a.config.init(true);
-                        a.define = ace.define;
-                    }
-                    if (!window.ace)
-                        window.ace = a;
-                    for (var key in a) if (a.hasOwnProperty(key))
-                        window.ace[key] = a[key];
-                    window.ace["default"] = window.ace;
-                    if (typeof module == "object" && typeof exports == "object" && module) {
-                        module.exports = window.ace;
-                    }
-                });
-            })();
diff --git a/esphome/dashboard/static/css/esphome.css b/esphome/dashboard/static/css/esphome.css
new file mode 100644
index 0000000000..db0ac55985
--- /dev/null
+++ b/esphome/dashboard/static/css/esphome.css
@@ -0,0 +1,393 @@
+/* Base */
+
+:root {
+  /* Colors */
+  --primary-bg-color: #fafafa;
+
+  --alert-standard-color: #666666;
+  --alert-standard-color-bg: #e6e6e6;
+  --alert-info-color: #00539f;
+  --alert-info-color-bg: #E6EEF5;
+  --alert-success-color: #4CAF50;
+  --alert-success-color-bg: #EDF7EE;
+  --alert-warning-color: #FF9800;
+  --alert-warning-color-bg: #FFF5E6;
+  --alert-error-color: #D93025;
+  --alert-error-color-bg: #FAEFEB;
+}
+
+body {
+  display: flex;
+  min-height: 100vh;
+  flex-direction: column;
+  background-color: var(--primary-bg-color);
+}
+
+/* Layout */
+.valign-wrapper {
+  position: absolute;
+  width:100vw;
+  height:100vh;
+}
+
+.valign {
+  width: 100%;
+}
+
+main {
+  flex: 1 0 auto;
+}
+
+/* Alerts & Errors */
+.alert {
+  width: 100%;
+  margin: 10px auto;
+  padding: 10px;
+  border-radius: 2px;
+  border-left-width: 4px;
+  border-left-style: solid;
+}
+
+.alert .title {
+  font-weight: bold;
+}
+
+.alert .title::after {
+  content: "\A";
+  white-space: pre;
+}
+
+.alert.alert-error {
+  color: var(--alert-error-color);
+  border-left-color: var(--alert-error-color);
+  background-color: var(--alert-error-color-bg);
+}
+
+.card.card-error, .card.status-offline {
+  border-top: 4px solid var(--alert-error-color);
+}
+
+.card.status-online {
+  border-top: 4px solid var(--alert-success-color);
+}
+
+.card.status-not-responding {
+  border-top: 4px solid var(--alert-warning-color);
+}
+
+.card.status-unknown {
+  border-top: 4px solid var(--alert-standard-color);
+}
+
+/* Login Page */
+#login-page .row.no-bottom-margin {
+  margin-bottom: 0 !important;
+}
+
+#login-page .logo {
+  display: block;
+  width: auto;
+  max-width: 300px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+#login-page .input-field input:focus + label  {
+  color: #000;
+}
+
+#login-page .input-field input:focus {
+  border-bottom: 1px solid #000;
+  box-shadow: 0 1px 0 0 #000;
+}
+
+#login-page .input-field .prefix.active {
+  color: #000;
+}
+
+#login-page .version-number {
+  display: block;
+  text-align: center;
+  margin-bottom: 20px;;
+  color:#808080;
+  font-size: 12px;
+}
+
+#login-page footer {
+  color: #757575;
+  font-size: 12px;
+}
+
+#login-page footer a {
+  color: #424242;
+}
+
+#login-page footer p {
+  -webkit-margin-before: 0px;
+  margin-block-start: 0px;
+  -webkit-margin-after: 5px;
+  margin-block-end: 5px;
+}
+
+#login-page footer p:last-child {
+  -webkit-margin-after: 0px;
+  margin-block-end: 0px;
+}
+
+/* Dashboard */
+.logo-wrapper {
+  height: 64px;
+  height: 100%;
+  width: 0;
+  margin-left: 24px;
+}
+
+.logo {
+  width: auto;
+  height: 48px;
+  margin: 8px 0;
+}
+
+@media only screen and (max-width: 601px) {
+  .logo {
+    height: 38px;
+    margin: 9px 0;
+  }
+}
+
+.nav-icons {
+  margin-right: 24px;
+}
+
+.nav-icons i {
+  color: black;
+}
+
+.select-port-container {
+  margin-top: 8px;
+  margin-right: 10px;
+  width: 350px;
+}
+
+.serial-port-select {
+  margin-top: 8px;
+  margin-right: 10px;
+  width: 350px;
+}
+
+.serial-port-select .select-dropdown {
+  color: black;
+}
+
+.serial-port-select .select-dropdown:focus {
+  border-bottom: 1px solid #607d8b !important;
+}
+
+.serial-port-select .caret {
+  fill: black;
+}
+
+.serial-port-select .dropdown-content li>span {
+  color: black;
+}
+
+#nav-dropdown li a,  .node-dropdown li a {
+  color: black;
+}
+
+main .container {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  width: 90%;
+  max-width: 1920px;
+}
+
+#nodes .card-content {
+  height: calc(100% - 47px);
+}
+
+#nodes .card-content, #nodes .card-action  {
+  padding: 12px;
+}
+
+#nodes .grid-1-col {
+  display: grid;
+  grid-template-columns: 1fr;
+}
+
+#nodes .grid-2-col {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-column-gap: 1.5rem;
+}
+
+#nodes .grid-3-col {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  grid-column-gap: 1.5rem;
+}
+
+@media only screen and (max-width: 1100px) {
+  #nodes .grid-3-col {
+    grid-template-columns: 1fr 1fr;
+    grid-column-gap: 1.5rem;
+  }
+}
+
+@media only screen and (max-width: 750px) {
+  #nodes .grid-2-col {
+    grid-template-columns: 1fr;
+    grid-column-gap: 0;
+  }
+
+  #nodes .grid-3-col {
+    grid-template-columns: 1fr;
+    grid-column-gap: 0;
+  }
+}
+
+i.node-update-avaliable {
+  color:#3f51b5;
+}
+
+i.node-webserver {
+  color:#039be5;
+}
+
+.node-config-path {
+  margin-top: -8px;
+  margin-bottom: 8px;
+  font-size: 14px;
+}
+
+.node-card-comment {
+  color: #444;
+  font-style: italic;
+}
+
+.card-action a, .card-dropdown-action a {
+  cursor: pointer;
+}
+
+.tooltipped {
+  cursor: help;
+}
+
+#js-loading-indicator {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+}
+
+.editor {
+  margin-top: 0;
+  margin-bottom: 0;
+  border-radius: 3px;
+  height: calc(100% - 56px);
+}
+
+.inlinecode {
+  box-sizing: border-box;
+  padding: 0.2em 0.4em;
+  margin: 0;
+  font-size: 85%;
+  background-color: rgba(27,31,35,0.05);
+  border-radius: 3px;
+  font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
+}
+
+.log {
+  height: 100%;
+  max-height: calc(100% - 56px);
+  background-color: #1c1c1c;
+  margin-top: 0;
+  margin-bottom: 0;
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+  font-size: 12px;
+  padding: 16px;
+  overflow: auto;
+  line-height: 1.45;
+  border-radius: 3px;
+  white-space: pre-wrap;
+  overflow-wrap: break-word;
+  color: #DDD;
+}
+
+.log-bold { font-weight: bold; }
+.log-italic { font-style: italic; }
+.log-underline { text-decoration: underline; }
+.log-strikethrough { text-decoration: line-through; }
+.log-underline.log-strikethrough { text-decoration: underline line-through; }
+.log-secret {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.log-secret-redacted {
+  opacity: 0;
+  width: 1px;
+  font-size: 1px;
+}
+.log-fg-black { color: rgb(128,128,128); }
+.log-fg-red { color: rgb(255,0,0); }
+.log-fg-green { color: rgb(0,255,0); }
+.log-fg-yellow { color: rgb(255,255,0); }
+.log-fg-blue { color: rgb(0,0,255); }
+.log-fg-magenta { color: rgb(255,0,255); }
+.log-fg-cyan { color: rgb(0,255,255); }
+.log-fg-white { color: rgb(187,187,187); }
+.log-bg-black { background-color: rgb(0,0,0); }
+.log-bg-red { background-color: rgb(255,0,0); }
+.log-bg-green { background-color: rgb(0,255,0); }
+.log-bg-yellow { background-color: rgb(255,255,0); }
+.log-bg-blue { background-color: rgb(0,0,255); }
+.log-bg-magenta { background-color: rgb(255,0,255); }
+.log-bg-cyan { background-color: rgb(0,255,255); }
+.log-bg-white { background-color: rgb(255,255,255); }
+
+ul.browser-default {
+  padding-left: 30px;
+  margin-top: 10px;
+  margin-bottom: 15px;
+}
+
+ul.browser-default li {
+  list-style-type: initial;
+}
+
+ul.stepper:not(.horizontal) .step.active::before, ul.stepper:not(.horizontal) .step.done::before, ul.stepper.horizontal .step.active .step-title::before, ul.stepper.horizontal .step.done .step-title::before {
+  background-color: #3f51b5 !important;
+}
+
+.select-action {
+  width: auto !important;
+  height: auto !important;
+  white-space: nowrap;
+}
+
+.modal {
+  width: 95%;
+  max-height: 90%;
+  height: 85% !important;
+}
+
+.page-footer {
+  display: flex;
+  align-items: center;
+  min-height: 50px;
+  padding-top: 0;
+  color: grey;
+}
+
+.page-footer a {
+  color: #afafaf;
+}
+
+@media only screen and (max-width: 992px) {
+  .page-footer .left, .page-footer .right {
+    width: 100%;
+    text-align: center;
+  }
+}
diff --git a/esphome/dashboard/static/css/vendor/materialize-stepper/materialize-stepper.min.css b/esphome/dashboard/static/css/vendor/materialize-stepper/materialize-stepper.min.css
new file mode 100644
index 0000000000..390f16a011
--- /dev/null
+++ b/esphome/dashboard/static/css/vendor/materialize-stepper/materialize-stepper.min.css
@@ -0,0 +1,10 @@
+/**
+ * Materialize Stepper - A little plugin that implements a stepper to Materializecss framework.
+ * @version v3.1.0
+ * @author Igor Marcossi (Kinark) <igormarcossi@gmail.com>.
+ * @link https://github.com/Kinark/Materialize-stepper
+ *
+ * Licensed under the MIT License (https://github.com/Kinark/Materialize-stepper/blob/master/LICENSE).
+ */
+
+ .card-content ul.stepper{margin:1em -24px;padding:0 24px}@media only screen and (min-width:993px){.card-content ul.stepper.horizontal{margin-left:-24px;margin-right:-24px;padding-left:24px;padding-right:24px}.card-content ul.stepper.horizontal:first-child{margin-top:-24px}.card-content ul.stepper.horizontal .step.step-content{padding-left:40px;padding-right:40px}.card-content ul.stepper.horizontal .step.step-content .step-actions{padding-left:40px;padding-right:40px}}ul.stepper{counter-reset:section;overflow-y:auto;overflow-x:hidden}ul.stepper .wait-feedback{left:0;right:0;top:0;z-index:2;position:absolute;width:100%;height:100%;text-align:center;display:flex;justify-content:center;align-items:center}ul.stepper .step{position:relative;transition:height .4s cubic-bezier(.4,0,.2,1),padding-bottom .4s cubic-bezier(.4,0,.2,1)}ul.stepper .step .step-title{margin:0 -24px;cursor:pointer;padding:15.5px 44px 24px 64px;display:block}ul.stepper .step .step-title:hover{background-color:rgba(0,0,0,.06)}ul.stepper .step .step-title::after{content:attr(data-step-label);display:block;position:absolute;font-size:12.8px;font-size:.8rem;color:#424242;font-weight:400}ul.stepper .step .step-content{position:relative;display:none;height:0;transition:height .4s cubic-bezier(.4,0,.2,1);width:inherit;overflow:visible;margin-left:41px;margin-right:24px}ul.stepper .step .step-content .step-actions{padding-top:16px;padding-bottom:4px;display:flex;justify-content:flex-start}ul.stepper .step .step-content .step-actions .btn-flat:not(:last-child),ul.stepper .step .step-content .step-actions .btn-large:not(:last-child),ul.stepper .step .step-content .step-actions .btn:not(:last-child){margin-right:5px}ul.stepper .step .step-content .row{margin-bottom:7px}ul.stepper .step::before{position:absolute;counter-increment:section;content:counter(section);height:26px;width:26px;color:#fff;background-color:#b2b2b2;border-radius:50%;text-align:center;line-height:26px;font-weight:400;transition:background-color .4s cubic-bezier(.4,0,.2,1);font-size:14px;left:1px;top:13px}ul.stepper .step.active .step-title{font-weight:500}ul.stepper .step.active .step-content{height:auto;display:block}ul.stepper .step.active::before,ul.stepper .step.done::before{background-color:#2196f3}ul.stepper .step.done::before{content:'\e5ca';font-size:16px;font-family:'Material Icons'}ul.stepper .step.wrong::before{content:'\e001';font-size:24px;font-family:'Material Icons';background-color:red}ul.stepper .step.feedbacking .step-content>:not(.wait-feedback){opacity:.1}ul.stepper .step:not(:last-of-type)::after{content:'';position:absolute;top:52px;left:13.5px;width:1px;height:40%;height:calc(100% - 52px);background-color:rgba(0,0,0,.1);transition:height .4s cubic-bezier(.4,0,.2,1)}ul.stepper .step:not(:last-of-type).active{padding-bottom:36px}ul.stepper>li:not(:last-of-type){padding-bottom:10px}@media only screen and (min-width:993px){ul.stepper.horizontal{position:relative;display:flex;justify-content:space-between;min-height:458px;overflow:hidden}ul.stepper.horizontal::before{content:'';background-color:transparent;width:100%;min-height:84px;box-shadow:0 2px 1px -1px rgba(0,0,0,.2),0 1px 1px 0 rgba(0,0,0,.14),0 1px 3px 0 rgba(0,0,0,.12);position:absolute;left:0}ul.stepper.horizontal .step{position:static;padding:0!important;width:100%;display:flex;align-items:center;height:84px}ul.stepper.horizontal .step::before{content:none}ul.stepper.horizontal .step:last-of-type{width:auto!important}ul.stepper.horizontal .step.active:not(:last-of-type)::after,ul.stepper.horizontal .step:not(:last-of-type)::after{content:'';position:static;display:inline-block;width:100%;height:1px}ul.stepper.horizontal .step .step-title{line-height:84px;height:84px;margin:0;padding:0 25px 0 65px;display:inline-block;max-width:220px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;flex-shrink:0}ul.stepper.horizontal .step .step-title::before{position:absolute;counter-increment:section;content:counter(section);height:26px;width:26px;color:#fff;background-color:#b2b2b2;border-radius:50%;text-align:center;line-height:26px;font-weight:400;transition:background-color .4s cubic-bezier(.4,0,.2,1);font-size:14px;left:1px;top:28.5px;left:19px}ul.stepper.horizontal .step .step-title::after{top:15px}ul.stepper.horizontal .step.active~.step .step-content{left:100%}ul.stepper.horizontal .step.active .step-content{left:0!important}ul.stepper.horizontal .step.active .step-title::before,ul.stepper.horizontal .step.done .step-title::before{background-color:#2196f3}ul.stepper.horizontal .step.done .step-title::before{content:'\e5ca';font-size:16px;font-family:'Material Icons'}ul.stepper.horizontal .step.wrong .step-title::before{content:'\e001';font-size:24px;font-family:'Material Icons';background-color:red}ul.stepper.horizontal .step .step-content{position:absolute;height:calc(100% - 84px);top:84px;display:block;left:-100%;width:100%;overflow-y:auto;overflow-x:hidden;margin:0;padding:20px 20px 76px 20px;transition:left .4s cubic-bezier(.4,0,.2,1)}ul.stepper.horizontal .step .step-content .step-actions{position:absolute;bottom:0;left:0;width:100%;padding:20px;background-color:transparent;flex-direction:row-reverse}ul.stepper.horizontal .step .step-content .step-actions .btn-flat:not(:last-child),ul.stepper.horizontal .step .step-content .step-actions .btn-large:not(:last-child),ul.stepper.horizontal .step .step-content .step-actions .btn:not(:last-child){margin-left:5px;margin-right:0}}
diff --git a/esphome/dashboard/static/materialize.min.css b/esphome/dashboard/static/css/vendor/materialize/materialize.min.css
similarity index 100%
rename from esphome/dashboard/static/materialize.min.css
rename to esphome/dashboard/static/css/vendor/materialize/materialize.min.css
diff --git a/esphome/dashboard/static/esphome.css b/esphome/dashboard/static/esphome.css
deleted file mode 100644
index fddfb5cf86..0000000000
--- a/esphome/dashboard/static/esphome.css
+++ /dev/null
@@ -1,256 +0,0 @@
-nav .brand-logo {
-  margin-left: 48px;
-  font-size: 20px;
-}
-
-main .container {
-  margin-top: -12vh;
-  flex-shrink: 0;
-}
-
-.ribbon {
-  width: 100%;
-  height: 17vh;
-  background-color: #3F51B5;
-  flex-shrink: 0;
-}
-
-.ribbon-fab:not(.tap-target-origin) {
-  position: absolute;
-  right: 24px;
-  top: calc(17vh + 34px);
-}
-
-i.very-large {
-  font-size: 8rem;
-  padding-top: 2px;
-  color: #424242;
-}
-
-.card .card-content {
-  padding-left: 18px;
-  padding-bottom: 10px;
-}
-
-.card-action a, .card-dropdown-action a {
-  cursor: pointer;
-}
-
-.inlinecode {
-  box-sizing: border-box;
-  padding: 0.2em 0.4em;
-  margin: 0;
-  font-size: 85%;
-  background-color: rgba(27,31,35,0.05);
-  border-radius: 3px;
-  font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
-}
-
-.log {
-  height: 100%;
-  max-height: calc(100% - 56px);
-  background-color: #1c1c1c;
-  margin-top: 0;
-  margin-bottom: 0;
-  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
-  font-size: 12px;
-  padding: 16px;
-  overflow: auto;
-  line-height: 1.45;
-  border-radius: 3px;
-  white-space: pre-wrap;
-  overflow-wrap: break-word;
-  color: #DDD;
-}
-
-.log-bold { font-weight: bold; }
-.log-italic { font-style: italic; }
-.log-underline { text-decoration: underline; }
-.log-strikethrough { text-decoration: line-through; }
-.log-underline.log-strikethrough { text-decoration: underline line-through; }
-.log-secret {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-.log-secret-redacted {
-  opacity: 0;
-  width: 1px;
-  font-size: 1px;
-}
-.log-fg-black { color: rgb(128,128,128); }
-.log-fg-red { color: rgb(255,0,0); }
-.log-fg-green { color: rgb(0,255,0); }
-.log-fg-yellow { color: rgb(255,255,0); }
-.log-fg-blue { color: rgb(0,0,255); }
-.log-fg-magenta { color: rgb(255,0,255); }
-.log-fg-cyan { color: rgb(0,255,255); }
-.log-fg-white { color: rgb(187,187,187); }
-.log-bg-black { background-color: rgb(0,0,0); }
-.log-bg-red { background-color: rgb(255,0,0); }
-.log-bg-green { background-color: rgb(0,255,0); }
-.log-bg-yellow { background-color: rgb(255,255,0); }
-.log-bg-blue { background-color: rgb(0,0,255); }
-.log-bg-magenta { background-color: rgb(255,0,255); }
-.log-bg-cyan { background-color: rgb(0,255,255); }
-.log-bg-white { background-color: rgb(255,255,255); }
-
-.modal {
-  width: 95%;
-  max-height: 90%;
-  height: 85% !important;
-}
-
-.page-footer {
-  padding-top: 0;
-}
-
-body {
-  display: flex;
-  min-height: 100vh;
-  flex-direction: column;
-}
-
-main {
-  flex: 1 0 auto;
-}
-
-ul.browser-default {
-  padding-left: 30px;
-  margin-top: 10px;
-  margin-bottom: 15px;
-}
-
-ul.browser-default li {
-  list-style-type: initial;
-}
-
-ul.stepper:not(.horizontal) .step.active::before, ul.stepper:not(.horizontal) .step.done::before, ul.stepper.horizontal .step.active .step-title::before, ul.stepper.horizontal .step.done .step-title::before {
-  background-color: #3f51b5 !important;
-}
-
-.select-port-container {
-  margin-top: 8px;
-  margin-right: 10px;
-  width: 350px;
-}
-
-#dropdown-nav-trigger {
-  margin-right: 24px;
-}
-
-.select-port-container .select-dropdown {
-  color: #fff;
-}
-
-.select-port-container .caret {
-  fill: #fff;
-}
-
-.dropdown-trigger {
-  cursor: pointer;
-}
-
-.select-action {
-  width: auto !important;
-  height: auto !important;
-  white-space: nowrap;
-}
-
-.tap-target-wrapper {
-  position: fixed !important;
-}
-
-/* https://github.com/tnhu/status-indicator/blob/master/styles.css */
-.status-indicator .status-indicator-icon {
-  display: inline-block;
-  border-radius: 50%;
-  width: 10px;
-  height: 10px;
-}
-
-.status-indicator.unknown .status-indicator-icon {
-  background-color: rgb(216, 226, 233);
-}
-
-.status-indicator.unknown .status-indicator-text::after {
-  content: "Unknown status";
-}
-
-.status-indicator.offline .status-indicator-icon {
-  background-color: rgb(255, 77, 77);
-}
-
-.status-indicator.offline .status-indicator-text::after {
-  content: "Offline";
-}
-
-.status-indicator.not-responding .status-indicator-icon {
-  background-color: rgb(255, 170, 0);
-}
-
-.status-indicator.not-responding .status-indicator-text::after {
-  content: "Not Responding";
-}
-
-@keyframes status-indicator-pulse-online {
-  0%   {
-    box-shadow: 0 0 0 0 rgba(75, 210, 143, .5);
-  }
-  25%  {
-    box-shadow: 0 0 0 10px rgba(75, 210, 143, 0);
-  }
-  30% {
-    box-shadow: 0 0 0 0 rgba(75, 210, 143, 0);
-  }
-}
-
-.status-indicator.online .status-indicator-icon {
-  background-color: rgb(75, 210, 143);
-  animation-duration: 5s;
-  animation-timing-function: ease-in-out;
-  animation-iteration-count: infinite;
-  animation-direction: normal;
-  animation-delay: 0s;
-  animation-fill-mode: none;
-  animation-name: status-indicator-pulse-online;
-}
-
-.status-indicator.online .status-indicator-text::after {
-  content: "Online";
-}
-
-#editor {
-  margin-top: 0;
-  margin-bottom: 0;
-  border-radius: 3px;
-  height: calc(100% - 56px);
-}
-
-.update-available i {
-  vertical-align: bottom;
-  font-size: 20px !important;
-  color: #3F51B5 !important;
-  margin-right: -4.5px;
-  margin-left: -5.5px;
-}
-
-.flash-using-esphomeflasher {
-  vertical-align: middle;
-  color: #666 !important;
-}
-
-.error {
-  background: #e53935;
-  color: #fff;
-  padding: 10px 15px;
-  margin-top: 15px;
-}
-
-.card-comment {
-  margin-bottom: 8px;
-  font-size: 14px;
-  color: #444;
-  font-style: italic;
-}
diff --git a/esphome/dashboard/static/esphome.js b/esphome/dashboard/static/esphome.js
deleted file mode 100644
index e284690ac6..0000000000
--- a/esphome/dashboard/static/esphome.js
+++ /dev/null
@@ -1,782 +0,0 @@
-// Disclaimer: This file was written in a hurry and by someone
-// who does not know JS at all. This file desperately needs cleanup.
-
-// ============================= Global Vars =============================
-document.addEventListener('DOMContentLoaded', () => {
-  M.AutoInit(document.body);
-});
-const loc = window.location;
-const wsLoc = new URL("./",`${loc.protocol}//${loc.host}${loc.pathname}`);
-wsLoc.protocol = 'ws:';
-if (loc.protocol === "https:") {
-  wsLoc.protocol = 'wss:';
-}
-const wsUrl = wsLoc.href;
-
-// ============================= Color Log Parsing =============================
-const initializeColorState = () => {
-  return {
-    bold: false,
-    italic: false,
-    underline: false,
-    strikethrough: false,
-    foregroundColor: false,
-    backgroundColor: false,
-    carriageReturn: false,
-    secret: false,
-  };
-};
-
-const colorReplace = (pre, state, text) => {
-  const re = /(?:\033|\\033)(?:\[(.*?)[@-~]|\].*?(?:\007|\033\\))/g;
-  let i = 0;
-
-  if (state.carriageReturn) {
-    if (text !== "\n") {
-      // don't remove if \r\n
-      pre.removeChild(pre.lastChild);
-    }
-    state.carriageReturn = false;
-  }
-
-  if (text.includes("\r")) {
-    state.carriageReturn = true;
-  }
-
-  const lineSpan = document.createElement("span");
-  lineSpan.classList.add("line");
-  pre.appendChild(lineSpan);
-
-  const addSpan = (content) => {
-    if (content === "")
-      return;
-
-    const span = document.createElement("span");
-    if (state.bold) span.classList.add("log-bold");
-    if (state.italic) span.classList.add("log-italic");
-    if (state.underline) span.classList.add("log-underline");
-    if (state.strikethrough) span.classList.add("log-strikethrough");
-    if (state.secret) span.classList.add("log-secret");
-    if (state.foregroundColor !== null) span.classList.add(`log-fg-${state.foregroundColor}`);
-    if (state.backgroundColor !== null) span.classList.add(`log-bg-${state.backgroundColor}`);
-    span.appendChild(document.createTextNode(content));
-    lineSpan.appendChild(span);
-
-    if (state.secret) {
-      const redacted = document.createElement("span");
-      redacted.classList.add("log-secret-redacted");
-      redacted.appendChild(document.createTextNode("[redacted]"));
-      lineSpan.appendChild(redacted);
-    }
-  };
-
-
-  while (true) {
-    const match = re.exec(text);
-    if (match === null)
-      break;
-
-    const j = match.index;
-    addSpan(text.substring(i, j));
-    i = j + match[0].length;
-
-    if (match[1] === undefined) continue;
-
-    for (const colorCode of match[1].split(";")) {
-      switch (parseInt(colorCode)) {
-        case 0:
-          // reset
-          state.bold = false;
-          state.italic = false;
-          state.underline = false;
-          state.strikethrough = false;
-          state.foregroundColor = null;
-          state.backgroundColor = null;
-          state.secret = false;
-          break;
-        case 1:
-          state.bold = true;
-          break;
-        case 3:
-          state.italic = true;
-          break;
-        case 4:
-          state.underline = true;
-          break;
-        case 5:
-          state.secret = true;
-          break;
-        case 6:
-          state.secret = false;
-          break;
-        case 9:
-          state.strikethrough = true;
-          break;
-        case 22:
-          state.bold = false;
-          break;
-        case 23:
-          state.italic = false;
-          break;
-        case 24:
-          state.underline = false;
-          break;
-        case 29:
-          state.strikethrough = false;
-          break;
-        case 30:
-          state.foregroundColor = "black";
-          break;
-        case 31:
-          state.foregroundColor = "red";
-          break;
-        case 32:
-          state.foregroundColor = "green";
-          break;
-        case 33:
-          state.foregroundColor = "yellow";
-          break;
-        case 34:
-          state.foregroundColor = "blue";
-          break;
-        case 35:
-          state.foregroundColor = "magenta";
-          break;
-        case 36:
-          state.foregroundColor = "cyan";
-          break;
-        case 37:
-          state.foregroundColor = "white";
-          break;
-        case 39:
-          state.foregroundColor = null;
-          break;
-        case 41:
-          state.backgroundColor = "red";
-          break;
-        case 42:
-          state.backgroundColor = "green";
-          break;
-        case 43:
-          state.backgroundColor = "yellow";
-          break;
-        case 44:
-          state.backgroundColor = "blue";
-          break;
-        case 45:
-          state.backgroundColor = "magenta";
-          break;
-        case 46:
-          state.backgroundColor = "cyan";
-          break;
-        case 47:
-          state.backgroundColor = "white";
-          break;
-        case 40:
-        case 49:
-          state.backgroundColor = null;
-          break;
-      }
-    }
-  }
-  addSpan(text.substring(i));
-  if (pre.scrollTop + 56 >= (pre.scrollHeight - pre.offsetHeight)) {
-    // at bottom
-    pre.scrollTop = pre.scrollHeight;
-  }
-};
-
-// ============================= Online/Offline Status Indicators =============================
-let isFetchingPing = false;
-const fetchPing = () => {
-  if (isFetchingPing)
-      return;
-  isFetchingPing = true;
-
-  fetch(`./ping`, {credentials: "same-origin"}).then(res => res.json())
-    .then(response => {
-      for (let filename in response) {
-        let node = document.querySelector(`.status-indicator[data-node="${filename}"]`);
-        if (node === null)
-          continue;
-
-        let status = response[filename];
-        let klass;
-        if (status === null) {
-          klass = 'unknown';
-        } else if (status === true) {
-          klass = 'online';
-          node.setAttribute('data-last-connected', Date.now().toString());
-        } else if (node.hasAttribute('data-last-connected')) {
-          const attr = parseInt(node.getAttribute('data-last-connected'));
-          if (Date.now() - attr <= 5000) {
-            klass = 'not-responding';
-          } else {
-            klass = 'offline';
-          }
-        } else {
-          klass = 'offline';
-        }
-
-        if (node.classList.contains(klass))
-          continue;
-
-        node.classList.remove('unknown', 'online', 'offline', 'not-responding');
-        node.classList.add(klass);
-      }
-
-      isFetchingPing = false;
-    });
-};
-setInterval(fetchPing, 2000);
-fetchPing();
-
-// ============================= Serial Port Selector =============================
-const portSelect = document.querySelector('.nav-wrapper select');
-let ports = [];
-
-const fetchSerialPorts = (begin=false) => {
-  fetch(`./serial-ports`, {credentials: "same-origin"}).then(res => res.json())
-    .then(response => {
-      if (ports.length === response.length) {
-        let allEqual = true;
-        for (let i = 0; i < response.length; i++) {
-          if (ports[i].port !== response[i].port) {
-            allEqual = false;
-            break;
-          }
-        }
-        if (allEqual)
-          return;
-      }
-      const hasNewPort = response.length >= ports.length;
-
-      ports = response;
-
-      const inst = M.FormSelect.getInstance(portSelect);
-      if (inst !== undefined) {
-        inst.destroy();
-      }
-
-      portSelect.innerHTML = "";
-      const prevSelected = getUploadPort();
-      for (let i = 0; i < response.length; i++) {
-        const val = response[i];
-        if (val.port === prevSelected) {
-          portSelect.innerHTML += `<option value="${val.port}" selected>${val.port} (${val.desc})</option>`;
-        } else {
-          portSelect.innerHTML += `<option value="${val.port}">${val.port} (${val.desc})</option>`;
-        }
-      }
-
-      M.FormSelect.init(portSelect, {});
-      if (!begin && hasNewPort)
-        M.toast({html: "Discovered new serial port."});
-    });
-};
-
-const getUploadPort = () => {
-  const inst = M.FormSelect.getInstance(portSelect);
-  if (inst === undefined) {
-    return "OTA";
-  }
-
-  inst._setSelectedStates();
-  return inst.getSelectedValues()[0];
-};
-setInterval(fetchSerialPorts, 5000);
-fetchSerialPorts(true);
-
-
-// ============================= Logs Button =============================
-
-class LogModalElem {
-  constructor({
-                name,
-                onPrepare = (modalElem, config) => {},
-                onProcessExit = (modalElem, code) => {},
-                onSocketClose = (modalElem) => {},
-                dismissible = true,
-  }) {
-    this.modalId = `modal-${name}`;
-    this.actionClass = `action-${name}`;
-    this.wsUrl = `${wsUrl}${name}`;
-    this.dismissible = dismissible;
-    this.activeConfig = null;
-
-    this.modalElem = document.getElementById(this.modalId);
-    this.logElem = this.modalElem.querySelector('.log');
-    this.onPrepare = onPrepare;
-    this.onProcessExit = onProcessExit;
-    this.onSocketClose = onSocketClose;
-  }
-
-  setup() {
-    const boundOnPress = this._onPress.bind(this);
-    document.querySelectorAll(`.${this.actionClass}`).forEach((btn) => {
-      btn.addEventListener('click', boundOnPress);
-    });
-  }
-
-  _setupModalInstance() {
-    this.modalInstance = M.Modal.getInstance(this.modalElem);
-    this.modalInstance.options.dismissible = this.dismissible;
-    this._boundKeydown = this._onKeydown.bind(this);
-    this.modalInstance.options.onOpenStart = () => {
-      document.addEventListener('keydown', this._boundKeydown);
-    };
-    this.modalInstance.options.onCloseStart = this._onCloseStart.bind(this);
-  }
-
-  _onCloseStart() {
-    document.removeEventListener('keydown', this._boundKeydown);
-    this.activeSocket.close();
-  }
-
-  open(event) {
-    this._onPress(event);
-  }
-
-  _onPress(event) {
-    this.activeConfig = event.target.getAttribute('data-node');
-    this._setupModalInstance();
-    // clear log
-    this.logElem.innerHTML = "";
-    const colorlogState = initializeColorState();
-    // prepare modal
-    this.modalElem.querySelectorAll('.filename').forEach((field) => {
-      field.innerHTML = this.activeConfig;
-    });
-    this.onPrepare(this.modalElem, this.activeConfig);
-    document.addEventListener('keydown', this._onKeydown);
-
-    let stopped = false;
-
-    // open modal
-    this.modalInstance.open();
-
-    const socket = new WebSocket(this.wsUrl);
-    this.activeSocket = socket;
-    socket.addEventListener('message', (event) => {
-      const data = JSON.parse(event.data);
-      if (data.event === "line") {
-        colorReplace(this.logElem, colorlogState, data.data);
-      } else if (data.event === "exit") {
-        this.onProcessExit(this.modalElem, data.code);
-        stopped = true;
-      }
-    });
-    socket.addEventListener('open', () => {
-      const msg = JSON.stringify(this.encodeSpawnMessage(this.activeConfig));
-      socket.send(msg);
-    });
-    socket.addEventListener('close', () => {
-      if (!stopped) {
-        this.onSocketClose(this.modalElem);
-      }
-    });
-  }
-
-  _onKeydown(event) {
-    if (event.keyCode === 27) {
-      this.modalInstance.close();
-    }
-  }
-
-  encodeSpawnMessage(config) {
-    return {
-      type: 'spawn',
-      configuration: config,
-      port: getUploadPort(),
-    };
-  }
-}
-
-const logsModal = new LogModalElem({
-  name: "logs",
-  onPrepare: (modalElem, config) => {
-    modalElem.querySelector(".stop-logs").innerHTML = "Stop";
-  },
-  onProcessExit: (modalElem, code) => {
-    if (code === 0) {
-      M.toast({html: "Program exited successfully."});
-    } else {
-      M.toast({html: `Program failed with code ${code}`});
-    }
-    modalElem.querySelector(".stop-logs").innerHTML = "Close";
-  },
-  onSocketClose: (modalElem) => {
-    M.toast({html: 'Terminated process.'});
-  },
-});
-logsModal.setup();
-
-const retryUploadButton = document.querySelector('.retry-upload');
-const editAfterUploadButton = document.querySelector('.edit-after-upload');
-const downloadAfterUploadButton = document.querySelector('.download-after-upload');
-const uploadModal = new LogModalElem({
-  name: 'upload',
-  onPrepare: (modalElem, config) => {
-    downloadAfterUploadButton.classList.add('disabled');
-    retryUploadButton.setAttribute('data-node', uploadModal.activeConfig);
-    retryUploadButton.classList.add('disabled');
-    editAfterUploadButton.setAttribute('data-node', uploadModal.activeConfig);
-    modalElem.querySelector(".stop-logs").innerHTML = "Stop";
-  },
-  onProcessExit: (modalElem, code) => {
-    if (code === 0) {
-      M.toast({html: "Program exited successfully."});
-      // if compilation succeeds but OTA fails, you can still download the binary and upload manually
-      downloadAfterUploadButton.classList.remove('disabled');
-    } else {
-      M.toast({html: `Program failed with code ${code}`});
-      downloadAfterUploadButton.classList.add('disabled');
-      retryUploadButton.classList.remove('disabled');
-    }
-    modalElem.querySelector(".stop-logs").innerHTML = "Close";
-  },
-  onSocketClose: (modalElem) => {
-    M.toast({html: 'Terminated process.'});
-  },
-  dismissible: false,
-});
-uploadModal.setup();
-downloadAfterUploadButton.addEventListener('click', () => {
-  const link = document.createElement("a");
-  link.download = name;
-  link.href = `./download.bin?configuration=${encodeURIComponent(uploadModal.activeConfig)}`;
-  document.body.appendChild(link);
-  link.click();
-  link.remove();
-});
-
-const validateModal = new LogModalElem({
-  name: 'validate',
-  onPrepare: (modalElem, config) => {
-    modalElem.querySelector(".stop-logs").innerHTML = "Stop";
-    modalElem.querySelector(".action-edit").setAttribute('data-node', validateModal.activeConfig);
-    modalElem.querySelector(".action-upload").setAttribute('data-node', validateModal.activeConfig);
-    modalElem.querySelector(".action-upload").classList.add('disabled');
-  },
-  onProcessExit: (modalElem, code) => {
-    if (code === 0) {
-      M.toast({
-        html: `<code class="inlinecode">${validateModal.activeConfig}</code> is valid 👍`,
-        displayLength: 5000,
-      });
-      modalElem.querySelector(".action-upload").classList.remove('disabled');
-    } else {
-      M.toast({
-        html: `<code class="inlinecode">${validateModal.activeConfig}</code> is invalid 😕`,
-        displayLength: 5000,
-      });
-    }
-    modalElem.querySelector(".stop-logs").innerHTML = "Close";
-  },
-  onSocketClose: (modalElem) => {
-    M.toast({html: 'Terminated process.'});
-  },
-});
-validateModal.setup();
-
-const downloadButton = document.querySelector('.download-binary');
-const compileModal = new LogModalElem({
-  name: 'compile',
-  onPrepare: (modalElem, config) => {
-    modalElem.querySelector('.stop-logs').innerHTML = "Stop";
-    downloadButton.classList.add('disabled');
-  },
-  onProcessExit: (modalElem, code) => {
-    if (code === 0) {
-      M.toast({html: "Program exited successfully."});
-      downloadButton.classList.remove('disabled');
-    } else {
-      M.toast({html: `Program failed with code ${data.code}`});
-    }
-    modalElem.querySelector(".stop-logs").innerHTML = "Close";
-  },
-  onSocketClose: (modalElem) => {
-    M.toast({html: 'Terminated process.'});
-  },
-  dismissible: false,
-});
-compileModal.setup();
-downloadButton.addEventListener('click', () => {
-  const link = document.createElement("a");
-  link.download = name;
-  link.href = `./download.bin?configuration=${encodeURIComponent(compileModal.activeConfig)}`;
-  document.body.appendChild(link);
-  link.click();
-  link.remove();
-});
-
-const cleanMqttModal = new LogModalElem({
-  name: 'clean-mqtt',
-  onPrepare: (modalElem, config) => {
-    modalElem.querySelector('.stop-logs').innerHTML = "Stop";
-  },
-  onProcessExit: (modalElem, code) => {
-    modalElem.querySelector(".stop-logs").innerHTML = "Close";
-  },
-  onSocketClose: (modalElem) => {
-    M.toast({html: 'Terminated process.'});
-  },
-});
-cleanMqttModal.setup();
-
-const cleanModal = new LogModalElem({
-  name: 'clean',
-  onPrepare: (modalElem, config) => {
-    modalElem.querySelector(".stop-logs").innerHTML = "Stop";
-  },
-  onProcessExit: (modalElem, code) => {
-    if (code === 0) {
-      M.toast({html: "Program exited successfully."});
-    } else {
-      M.toast({html: `Program failed with code ${code}`});
-    }
-    modalElem.querySelector(".stop-logs").innerHTML = "Close";
-  },
-  onSocketClose: (modalElem) => {
-    M.toast({html: 'Terminated process.'});
-  },
-});
-cleanModal.setup();
-
-document.querySelectorAll(".action-delete").forEach((btn) => {
-  btn.addEventListener('click', (e) => {
-    let configuration = e.target.getAttribute('data-node');
-
-    fetch(`./delete?configuration=${configuration}`, {
-      credentials: "same-origin",
-      method: "POST",
-    }).then(res => res.text()).then(() => {
-        const toastHtml = `<span>Deleted <code class="inlinecode">${configuration}</code>
-                           <button class="btn-flat toast-action">Undo</button></button>`;
-        const toast = M.toast({html: toastHtml});
-        const undoButton = toast.el.querySelector('.toast-action');
-
-        document.querySelector(`.entry-row[data-node="${configuration}"]`).remove();
-
-        undoButton.addEventListener('click', () => {
-          fetch(`./undo-delete?configuration=${configuration}`, {
-            credentials: "same-origin",
-            method: "POST",
-          }).then(res => res.text()).then(() => {
-              window.location.reload(false);
-          });
-        });
-    });
-  });
-});
-
-const editModalElem = document.getElementById("modal-editor");
-const editorElem = editModalElem.querySelector("#editor");
-const editor = ace.edit(editorElem);
-let activeEditorConfig = null;
-let activeEditorSecrets = false;
-let aceWs = null;
-let aceValidationScheduled = false;
-let aceValidationRunning = false;
-const startAceWebsocket = () => {
-  aceWs = new WebSocket(`${wsUrl}ace`);
-  aceWs.addEventListener('message', (event) => {
-    const raw = JSON.parse(event.data);
-    if (raw.event === "line") {
-      const msg = JSON.parse(raw.data);
-      if (msg.type === "result") {
-        const arr = [];
-
-        for (const v of msg.validation_errors) {
-          let o = {
-            text: v.message,
-            type: 'error',
-            row: 0,
-            column: 0
-          };
-          if (v.range != null) {
-            o.row = v.range.start_line;
-            o.column = v.range.start_col;
-          }
-          arr.push(o);
-        }
-        for (const v of msg.yaml_errors) {
-          arr.push({
-            text: v.message,
-            type: 'error',
-            row: 0,
-            column: 0
-          });
-        }
-
-        editor.session.setAnnotations(arr);
-
-        if(arr.length) {
-          editorUploadButton.classList.add('disabled');
-        } else {
-          editorUploadButton.classList.remove('disabled');
-        }
-
-        aceValidationRunning = false;
-      } else if (msg.type === "read_file") {
-        sendAceStdin({
-          type: 'file_response',
-          content: editor.getValue()
-        });
-      }
-    }
-  });
-  aceWs.addEventListener('open', () => {
-    const msg = JSON.stringify({type: 'spawn'});
-    aceWs.send(msg);
-  });
-  aceWs.addEventListener('close', () => {
-    aceWs = null;
-    setTimeout(startAceWebsocket, 5000)
-  });
-};
-const sendAceStdin = (data) => {
-  let send = JSON.stringify({
-    type: 'stdin',
-    data: JSON.stringify(data)+'\n',
-  });
-  aceWs.send(send);
-};
-startAceWebsocket();
-
-editor.setTheme("ace/theme/dreamweaver");
-editor.session.setMode("ace/mode/yaml");
-editor.session.setOption('useSoftTabs', true);
-editor.session.setOption('tabSize', 2);
-editor.session.setOption('useWorker', false);
-
-const saveButton = editModalElem.querySelector(".save-button");
-const editorUploadButton = editModalElem.querySelector(".editor-upload-button");
-const saveEditor = () => {
-  fetch(`./edit?configuration=${activeEditorConfig}`, {
-      credentials: "same-origin",
-      method: "POST",
-      body: editor.getValue()
-    }).then(res => res.text()).then(() => {
-      M.toast({
-        html: `Saved <code class="inlinecode">${activeEditorConfig}</code>`
-      });
-    });
-};
-
-const debounce = (func, wait) => {
-  let timeout;
-  return function() {
-    let context = this, args = arguments;
-    let later = function() {
-      timeout = null;
-      func.apply(context, args);
-    };
-    clearTimeout(timeout);
-    timeout = setTimeout(later, wait);
-  };
-};
-
-editor.commands.addCommand({
-  name: 'saveCommand',
-  bindKey: {win: 'Ctrl-S',  mac: 'Command-S'},
-  exec: saveEditor,
-  readOnly: false
-});
-
-editor.session.on('change', debounce(() => {
-  aceValidationScheduled = !activeEditorSecrets;
-}, 250));
-
-setInterval(() => {
-  if (!aceValidationScheduled || aceValidationRunning)
-    return;
-  if (aceWs == null)
-    return;
-
-  sendAceStdin({
-      type: 'validate',
-      file: activeEditorConfig
-  });
-  aceValidationRunning = true;
-  aceValidationScheduled = false;
-}, 100);
-
-saveButton.addEventListener('click', saveEditor);
-editorUploadButton.addEventListener('click', saveEditor);
-
-document.querySelectorAll(".action-edit").forEach((btn) => {
-  btn.addEventListener('click', (e) => {
-    activeEditorConfig = e.target.getAttribute('data-node');
-    activeEditorSecrets = activeEditorConfig === 'secrets.yaml';
-    const modalInstance = M.Modal.getInstance(editModalElem);
-    const filenameField = editModalElem.querySelector('.filename');
-    editorUploadButton.setAttribute('data-node', activeEditorConfig);
-    if (activeEditorSecrets) {
-      editorUploadButton.classList.add('disabled');
-    }
-    filenameField.innerHTML = activeEditorConfig;
-
-    editor.setValue("Loading configuration yaml...");
-    editor.setOption('readOnly', true);
-    fetch(`./edit?configuration=${activeEditorConfig}`, {credentials: "same-origin"})
-      .then(res => res.text()).then(response => {
-        editor.setValue(response, -1);
-        editor.setOption('readOnly', false);
-    });
-
-    modalInstance.open();
-  });
-});
-
-const modalSetupElem = document.getElementById("modal-wizard");
-const setupWizardStart = document.getElementById('setup-wizard-start');
-const startWizard = () => {
-  const modalInstance = M.Modal.getInstance(modalSetupElem);
-  modalInstance.open();
-
-  $('.stepper').activateStepper({
-    linearStepsNavigation: false,
-    autoFocusInput: true,
-    autoFormCreation: true,
-    showFeedbackLoader: true,
-    parallel: false
-  });
-};
-
-setupWizardStart.addEventListener('click', startWizard);
-
-jQuery.validator.addMethod("nospaces", (value, element) => {
-  return value.indexOf(' ') < 0;
-}, "Name must not contain spaces.");
-
-jQuery.validator.addMethod("lowercase", (value, element) => {
-  return value === value.toLowerCase();
-}, "Name must be lowercase.");
-
-const updateAllModal = new LogModalElem({
-  name: 'update-all',
-  onPrepare: (modalElem, config) => {
-    modalElem.querySelector('.stop-logs').innerHTML = "Stop";
-    downloadButton.classList.add('disabled');
-  },
-  onProcessExit: (modalElem, code) => {
-    if (code === 0) {
-      M.toast({html: "Program exited successfully."});
-      downloadButton.classList.remove('disabled');
-    } else {
-      M.toast({html: `Program failed with code ${data.code}`});
-    }
-    modalElem.querySelector(".stop-logs").innerHTML = "Close";
-  },
-  onSocketClose: (modalElem) => {
-    M.toast({html: 'Terminated process.'});
-  },
-  dismissible: false,
-});
-updateAllModal.setup();
-
-const updateAllButton = document.getElementById('update-all-button');
-updateAllButton.addEventListener('click', (e) => {
-  updateAllModal.open(e);
-});
diff --git a/esphome/dashboard/static/ext-searchbox.js b/esphome/dashboard/static/ext-searchbox.js
deleted file mode 100644
index c6379623a7..0000000000
--- a/esphome/dashboard/static/ext-searchbox.js
+++ /dev/null
@@ -1,7 +0,0 @@
-ace.define("ace/ext/searchbox",["require","exports","module","ace/lib/dom","ace/lib/lang","ace/lib/event","ace/keyboard/hash_handler","ace/lib/keys"],function(e,t,n){"use strict";var r=e("../lib/dom"),i=e("../lib/lang"),s=e("../lib/event"),o='.ace_search {background-color: #ddd;color: #666;border: 1px solid #cbcbcb;border-top: 0 none;overflow: hidden;margin: 0;padding: 4px 6px 0 4px;position: absolute;top: 0;z-index: 99;white-space: normal;}.ace_search.left {border-left: 0 none;border-radius: 0px 0px 5px 0px;left: 0;}.ace_search.right {border-radius: 0px 0px 0px 5px;border-right: 0 none;right: 0;}.ace_search_form, .ace_replace_form {margin: 0 20px 4px 0;overflow: hidden;line-height: 1.9;}.ace_replace_form {margin-right: 0;}.ace_search_form.ace_nomatch {outline: 1px solid red;}.ace_search_field {border-radius: 3px 0 0 3px;background-color: white;color: black;border: 1px solid #cbcbcb;border-right: 0 none;outline: 0;padding: 0;font-size: inherit;margin: 0;line-height: inherit;padding: 0 6px;min-width: 17em;vertical-align: top;min-height: 1.8em;box-sizing: content-box;}.ace_searchbtn {border: 1px solid #cbcbcb;line-height: inherit;display: inline-block;padding: 0 6px;background: #fff;border-right: 0 none;border-left: 1px solid #dcdcdc;cursor: pointer;margin: 0;position: relative;color: #666;}.ace_searchbtn:last-child {border-radius: 0 3px 3px 0;border-right: 1px solid #cbcbcb;}.ace_searchbtn:disabled {background: none;cursor: default;}.ace_searchbtn:hover {background-color: #eef1f6;}.ace_searchbtn.prev, .ace_searchbtn.next {padding: 0px 0.7em}.ace_searchbtn.prev:after, .ace_searchbtn.next:after {content: "";border: solid 2px #888;width: 0.5em;height: 0.5em;border-width:  2px 0 0 2px;display:inline-block;transform: rotate(-45deg);}.ace_searchbtn.next:after {border-width: 0 2px 2px 0 ;}.ace_searchbtn_close {background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAcCAYAAABRVo5BAAAAZ0lEQVR42u2SUQrAMAhDvazn8OjZBilCkYVVxiis8H4CT0VrAJb4WHT3C5xU2a2IQZXJjiQIRMdkEoJ5Q2yMqpfDIo+XY4k6h+YXOyKqTIj5REaxloNAd0xiKmAtsTHqW8sR2W5f7gCu5nWFUpVjZwAAAABJRU5ErkJggg==) no-repeat 50% 0;border-radius: 50%;border: 0 none;color: #656565;cursor: pointer;font: 16px/16px Arial;padding: 0;height: 14px;width: 14px;top: 9px;right: 7px;position: absolute;}.ace_searchbtn_close:hover {background-color: #656565;background-position: 50% 100%;color: white;}.ace_button {margin-left: 2px;cursor: pointer;-webkit-user-select: none;-moz-user-select: none;-o-user-select: none;-ms-user-select: none;user-select: none;overflow: hidden;opacity: 0.7;border: 1px solid rgba(100,100,100,0.23);padding: 1px;box-sizing:    border-box!important;color: black;}.ace_button:hover {background-color: #eee;opacity:1;}.ace_button:active {background-color: #ddd;}.ace_button.checked {border-color: #3399ff;opacity:1;}.ace_search_options{margin-bottom: 3px;text-align: right;-webkit-user-select: none;-moz-user-select: none;-o-user-select: none;-ms-user-select: none;user-select: none;clear: both;}.ace_search_counter {float: left;font-family: arial;padding: 0 8px;}',u=e("../keyboard/hash_handler").HashHandler,a=e("../lib/keys"),f=999;r.importCssString(o,"ace_searchbox");var l='<div class="ace_search right">    <span action="hide" class="ace_searchbtn_close"></span>    <div class="ace_search_form">        <input class="ace_search_field" placeholder="Search for" spellcheck="false"></input>        <span action="findPrev" class="ace_searchbtn prev"></span>        <span action="findNext" class="ace_searchbtn next"></span>        <span action="findAll" class="ace_searchbtn" title="Alt-Enter">All</span>    </div>    <div class="ace_replace_form">        <input class="ace_search_field" placeholder="Replace with" spellcheck="false"></input>        <span action="replaceAndFindNext" class="ace_searchbtn">Replace</span>        <span action="replaceAll" class="ace_searchbtn">All</span>    </div>    <div class="ace_search_options">        <span action="toggleReplace" class="ace_button" title="Toggle Replace mode"            style="float:left;margin-top:-2px;padding:0 5px;">+</span>        <span class="ace_search_counter"></span>        <span action="toggleRegexpMode" class="ace_button" title="RegExp Search">.*</span>        <span action="toggleCaseSensitive" class="ace_button" title="CaseSensitive Search">Aa</span>        <span action="toggleWholeWords" class="ace_button" title="Whole Word Search">\\b</span>        <span action="searchInSelection" class="ace_button" title="Search In Selection">S</span>    </div></div>'.replace(/> +/g,">"),c=function(e,t,n){var i=r.createElement("div");i.innerHTML=l,this.element=i.firstChild,this.setSession=this.setSession.bind(this),this.$init(),this.setEditor(e),r.importCssString(o,"ace_searchbox",e.container)};(function(){this.setEditor=function(e){e.searchBox=this,e.renderer.scroller.appendChild(this.element),this.editor=e},this.setSession=function(e){this.searchRange=null,this.$syncOptions(!0)},this.$initElements=function(e){this.searchBox=e.querySelector(".ace_search_form"),this.replaceBox=e.querySelector(".ace_replace_form"),this.searchOption=e.querySelector("[action=searchInSelection]"),this.replaceOption=e.querySelector("[action=toggleReplace]"),this.regExpOption=e.querySelector("[action=toggleRegexpMode]"),this.caseSensitiveOption=e.querySelector("[action=toggleCaseSensitive]"),this.wholeWordOption=e.querySelector("[action=toggleWholeWords]"),this.searchInput=this.searchBox.querySelector(".ace_search_field"),this.replaceInput=this.replaceBox.querySelector(".ace_search_field"),this.searchCounter=e.querySelector(".ace_search_counter")},this.$init=function(){var e=this.element;this.$initElements(e);var t=this;s.addListener(e,"mousedown",function(e){setTimeout(function(){t.activeInput.focus()},0),s.stopPropagation(e)}),s.addListener(e,"click",function(e){var n=e.target||e.srcElement,r=n.getAttribute("action");r&&t[r]?t[r]():t.$searchBarKb.commands[r]&&t.$searchBarKb.commands[r].exec(t),s.stopPropagation(e)}),s.addCommandKeyListener(e,function(e,n,r){var i=a.keyCodeToString(r),o=t.$searchBarKb.findKeyCommand(n,i);o&&o.exec&&(o.exec(t),s.stopEvent(e))}),this.$onChange=i.delayedCall(function(){t.find(!1,!1)}),s.addListener(this.searchInput,"input",function(){t.$onChange.schedule(20)}),s.addListener(this.searchInput,"focus",function(){t.activeInput=t.searchInput,t.searchInput.value&&t.highlight()}),s.addListener(this.replaceInput,"focus",function(){t.activeInput=t.replaceInput,t.searchInput.value&&t.highlight()})},this.$closeSearchBarKb=new u([{bindKey:"Esc",name:"closeSearchBar",exec:function(e){e.searchBox.hide()}}]),this.$searchBarKb=new u,this.$searchBarKb.bindKeys({"Ctrl-f|Command-f":function(e){var t=e.isReplace=!e.isReplace;e.replaceBox.style.display=t?"":"none",e.replaceOption.checked=!1,e.$syncOptions(),e.searchInput.focus()},"Ctrl-H|Command-Option-F":function(e){if(e.editor.getReadOnly())return;e.replaceOption.checked=!0,e.$syncOptions(),e.replaceInput.focus()},"Ctrl-G|Command-G":function(e){e.findNext()},"Ctrl-Shift-G|Command-Shift-G":function(e){e.findPrev()},esc:function(e){setTimeout(function(){e.hide()})},Return:function(e){e.activeInput==e.replaceInput&&e.replace(),e.findNext()},"Shift-Return":function(e){e.activeInput==e.replaceInput&&e.replace(),e.findPrev()},"Alt-Return":function(e){e.activeInput==e.replaceInput&&e.replaceAll(),e.findAll()},Tab:function(e){(e.activeInput==e.replaceInput?e.searchInput:e.replaceInput).focus()}}),this.$searchBarKb.addCommands([{name:"toggleRegexpMode",bindKey:{win:"Alt-R|Alt-/",mac:"Ctrl-Alt-R|Ctrl-Alt-/"},exec:function(e){e.regExpOption.checked=!e.regExpOption.checked,e.$syncOptions()}},{name:"toggleCaseSensitive",bindKey:{win:"Alt-C|Alt-I",mac:"Ctrl-Alt-R|Ctrl-Alt-I"},exec:function(e){e.caseSensitiveOption.checked=!e.caseSensitiveOption.checked,e.$syncOptions()}},{name:"toggleWholeWords",bindKey:{win:"Alt-B|Alt-W",mac:"Ctrl-Alt-B|Ctrl-Alt-W"},exec:function(e){e.wholeWordOption.checked=!e.wholeWordOption.checked,e.$syncOptions()}},{name:"toggleReplace",exec:function(e){e.replaceOption.checked=!e.replaceOption.checked,e.$syncOptions()}},{name:"searchInSelection",exec:function(e){e.searchOption.checked=!e.searchRange,e.setSearchRange(e.searchOption.checked&&e.editor.getSelectionRange()),e.$syncOptions()}}]),this.setSearchRange=function(e){this.searchRange=e,e?this.searchRangeMarker=this.editor.session.addMarker(e,"ace_active-line"):this.searchRangeMarker&&(this.editor.session.removeMarker(this.searchRangeMarker),this.searchRangeMarker=null)},this.$syncOptions=function(e){r.setCssClass(this.replaceOption,"checked",this.searchRange),r.setCssClass(this.searchOption,"checked",this.searchOption.checked),this.replaceOption.textContent=this.replaceOption.checked?"-":"+",r.setCssClass(this.regExpOption,"checked",this.regExpOption.checked),r.setCssClass(this.wholeWordOption,"checked",this.wholeWordOption.checked),r.setCssClass(this.caseSensitiveOption,"checked",this.caseSensitiveOption.checked);var t=this.editor.getReadOnly();this.replaceOption.style.display=t?"none":"",this.replaceBox.style.display=this.replaceOption.checked&&!t?"":"none",this.find(!1,!1,e)},this.highlight=function(e){this.editor.session.highlight(e||this.editor.$search.$options.re),this.editor.renderer.updateBackMarkers()},this.find=function(e,t,n){var i=this.editor.find(this.searchInput.value,{skipCurrent:e,backwards:t,wrap:!0,regExp:this.regExpOption.checked,caseSensitive:this.caseSensitiveOption.checked,wholeWord:this.wholeWordOption.checked,preventScroll:n,range:this.searchRange}),s=!i&&this.searchInput.value;r.setCssClass(this.searchBox,"ace_nomatch",s),this.editor._emit("findSearchBox",{match:!s}),this.highlight(),this.updateCounter()},this.updateCounter=function(){var e=this.editor,t=e.$search.$options.re,n=0,r=0;if(t){var i=this.searchRange?e.session.getTextRange(this.searchRange):e.getValue(),s=e.session.doc.positionToIndex(e.selection.anchor);this.searchRange&&(s-=e.session.doc.positionToIndex(this.searchRange.start));var o=t.lastIndex=0,u;while(u=t.exec(i)){n++,o=u.index,o<=s&&r++;if(n>f)break;if(!u[0]){t.lastIndex=o+=1;if(o>=i.length)break}}}this.searchCounter.textContent=r+" of "+(n>f?f+"+":n)},this.findNext=function(){this.find(!0,!1)},this.findPrev=function(){this.find(!0,!0)},this.findAll=function(){var e=this.editor.findAll(this.searchInput.value,{regExp:this.regExpOption.checked,caseSensitive:this.caseSensitiveOption.checked,wholeWord:this.wholeWordOption.checked}),t=!e&&this.searchInput.value;r.setCssClass(this.searchBox,"ace_nomatch",t),this.editor._emit("findSearchBox",{match:!t}),this.highlight(),this.hide()},this.replace=function(){this.editor.getReadOnly()||this.editor.replace(this.replaceInput.value)},this.replaceAndFindNext=function(){this.editor.getReadOnly()||(this.editor.replace(this.replaceInput.value),this.findNext())},this.replaceAll=function(){this.editor.getReadOnly()||this.editor.replaceAll(this.replaceInput.value)},this.hide=function(){this.active=!1,this.setSearchRange(null),this.editor.off("changeSession",this.setSession),this.element.style.display="none",this.editor.keyBinding.removeKeyboardHandler(this.$closeSearchBarKb),this.editor.focus()},this.show=function(e,t){this.active=!0,this.editor.on("changeSession",this.setSession),this.element.style.display="",this.replaceOption.checked=t,e&&(this.searchInput.value=e),this.searchInput.focus(),this.searchInput.select(),this.editor.keyBinding.addKeyboardHandler(this.$closeSearchBarKb),this.$syncOptions(!0)},this.isFocused=function(){var e=document.activeElement;return e==this.searchInput||e==this.replaceInput}}).call(c.prototype),t.SearchBox=c,t.Search=function(e,t){var n=e.searchBox||new c(e);n.show(e.session.getTextRange(),t)}});                (function() {
-                    ace.require(["ace/ext/searchbox"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
diff --git a/esphome/dashboard/static/fonts/LICENSE b/esphome/dashboard/static/fonts/material-icons/LICENSE
similarity index 100%
rename from esphome/dashboard/static/fonts/LICENSE
rename to esphome/dashboard/static/fonts/material-icons/LICENSE
diff --git a/esphome/dashboard/static/fonts/MaterialIcons-Regular.woff b/esphome/dashboard/static/fonts/material-icons/MaterialIcons-Regular.woff
similarity index 100%
rename from esphome/dashboard/static/fonts/MaterialIcons-Regular.woff
rename to esphome/dashboard/static/fonts/material-icons/MaterialIcons-Regular.woff
diff --git a/esphome/dashboard/static/fonts/MaterialIcons-Regular.woff2 b/esphome/dashboard/static/fonts/material-icons/MaterialIcons-Regular.woff2
similarity index 100%
rename from esphome/dashboard/static/fonts/MaterialIcons-Regular.woff2
rename to esphome/dashboard/static/fonts/material-icons/MaterialIcons-Regular.woff2
diff --git a/esphome/dashboard/static/fonts/README.md b/esphome/dashboard/static/fonts/material-icons/README.md
similarity index 100%
rename from esphome/dashboard/static/fonts/README.md
rename to esphome/dashboard/static/fonts/material-icons/README.md
diff --git a/esphome/dashboard/static/fonts/material-icons.css b/esphome/dashboard/static/fonts/material-icons/material-icons.css
similarity index 100%
rename from esphome/dashboard/static/fonts/material-icons.css
rename to esphome/dashboard/static/fonts/material-icons/material-icons.css
diff --git a/esphome/dashboard/static/favicon.ico b/esphome/dashboard/static/images/favicon.ico
similarity index 100%
rename from esphome/dashboard/static/favicon.ico
rename to esphome/dashboard/static/images/favicon.ico
diff --git a/esphome/dashboard/static/jquery-ui.min.js b/esphome/dashboard/static/jquery-ui.min.js
deleted file mode 100644
index a4c69733c0..0000000000
--- a/esphome/dashboard/static/jquery-ui.min.js
+++ /dev/null
@@ -1,401 +0,0 @@
-/*!
- * jQuery UI 1.8.5
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.5",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
-NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
-"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
-if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"));if(!isNaN(b)&&b!=0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind("mousedown.ui-disableSelection selectstart.ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
-"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c.style(this,h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c.style(this,
-h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
-c(function(){var a=document.createElement("div"),b=document.body;c.extend(a.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.appendChild(a).offsetHeight===100;b.removeChild(a).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,
-d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
-(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
-a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.substring(0,1)===
-"_")return h;e?this.each(function(){var g=b.data(this,a);if(!g)throw"cannot call methods on "+a+" prior to initialization; attempted to call method '"+d+"'";if(!b.isFunction(g[d]))throw"no such method '"+d+"' for "+a+" widget instance";var i=g[d].apply(g,f);if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",
-widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,b.metadata&&b.metadata.get(c)[this.widgetName],a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._init()},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
-"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a,e=this;if(arguments.length===0)return b.extend({},e.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}b.each(d,function(f,h){e._setOption(f,h)});return e},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},enable:function(){return this._setOption("disabled",
-false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
-(function(c){c.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(b){return a._mouseDown(b)}).bind("click."+this.widgetName,function(b){if(a._preventClickEvent){a._preventClickEvent=false;b.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent=a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&
-this._mouseUp(a);this._mouseDownEvent=a;var b=this,e=a.which==1,f=typeof this.options.cancel=="string"?c(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){b.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();
-return true}}this._mouseMoveDelegate=function(d){return b._mouseMove(d)};this._mouseUpDelegate=function(d){return b._mouseUp(d)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);c.browser.safari||a.preventDefault();return a.originalEvent.mouseHandled=true}},_mouseMove:function(a){if(c.browser.msie&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&
-this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=a.target==this._mouseDownEvent.target;this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-
-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
-(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
-"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
-this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;return true},_mouseStart:function(a){var b=this.options;this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-
-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();
-d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||
-this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if(!this.element[0]||!this.element[0].parentNode)return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,
-b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==
-a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone():this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||
-0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
-this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-
-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment==
-"parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&
-a.containment.constructor!=Array){var b=d(a.containment)[0];if(b){a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),
-10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
-this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():
-f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])e=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+
-this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])e=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;e=this.originalPageX+
-Math.round((e-this.originalPageX)/b.grid[0])*b.grid[0];e=this.containment?!(e-this.offset.click.left<this.containment[0]||e-this.offset.click.left>this.containment[2])?e:!(e-this.offset.click.left<this.containment[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-
-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=
-this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.5"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var g=d.data(this,"sortable");
-if(g&&!g.options.disabled){c.sortables.push({instance:g,shouldRevert:g.options.revert});g._refreshItems();g._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;
-c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=
-1;this.instance.currentItem=d(f).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;
-this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=
-this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","iframeFix",{start:function(){var a=
-d(this).data("draggable").options;d(a.iframeFix===true?"iframe":a.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")})},stop:function(){d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;
-if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!=
-"HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-
-b.overflowOffset.left<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-
-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,
-width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,g=b.offset.left,n=g+c.helperProportions.width,m=b.offset.top,o=m+c.helperProportions.height,h=c.snapElements.length-1;h>=0;h--){var i=c.snapElements[h].left,k=i+c.snapElements[h].width,j=c.snapElements[h].top,l=j+c.snapElements[h].height;if(i-e<g&&g<k+e&&j-e<m&&m<l+e||i-e<g&&g<k+e&&j-e<o&&o<l+e||i-e<n&&n<k+e&&j-e<m&&m<l+e||i-e<n&&n<k+e&&j-e<o&&
-o<l+e){if(f.snapMode!="inner"){var p=Math.abs(j-o)<=e,q=Math.abs(l-m)<=e,r=Math.abs(i-n)<=e,s=Math.abs(k-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k}).left-c.margins.left}var t=
-p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(j-m)<=e;q=Math.abs(l-o)<=e;r=Math.abs(i-g)<=e;s=Math.abs(k-n)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:j,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[h].snapping&&
-(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=p||q||r||s||t}else{c.snapElements[h].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),
-10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
-(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
-a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
-this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
-this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
-d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
-a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.5"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
-switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
-i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
-"none";if(c[f].visible){c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight};e=="mousedown"&&c[f]._activate.call(c[f],b)}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
-a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=
-d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})}}})(jQuery);
-(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
-_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
-top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
-this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
-nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
-String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),k=0;k=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,k);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
-this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){e(this).removeClass("ui-resizable-autohide");b._handles.show()},function(){if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};
-if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),
-d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=
-this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:
-this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",
-b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;
-f={width:c.size.width-(f?0:c.sizeDiff.width),height:c.size.height-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",
-b);this._helper&&this.helper.remove();return false},_updateCache:function(b){this.offset=this.helper.offset();if(l(b.left))this.position.left=b.left;if(l(b.top))this.position.top=b.top;if(l(b.height))this.size.height=b.height;if(l(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(b.height)b.width=c.height*this.aspectRatio;else if(b.width)b.height=c.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=
-a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this.options,c=this.axis,d=l(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=l(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=l(b.width)&&a.minWidth&&a.minWidth>b.width,h=l(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,
-k=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&k)b.left=i-a.minWidth;if(d&&k)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),
-c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=
-this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+
-a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,
-arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,
-{version:"1.8.5"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,
-function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var k=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:k.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=
-(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(k.css("position"))){c._revertToRelativePosition=true;k.css({position:"absolute",top:"auto",left:"auto"})}k.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=
-false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-
-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",
-b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top",
-"Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,
-f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=
-a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+
-a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&
-e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",
-height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=
-d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},l=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
-(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
-selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
-c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
-c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
-this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
-a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
-!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
-e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.5"})})(jQuery);
-(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){this.containerCache={};this.element.addClass("ui-sortable");
-this.refresh();this.floating=this.items.length?/left|right/.test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a==="disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,
-arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=
-c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,
-{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();
-if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",
-a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");
-if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+
-this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+
-b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+
-"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,
-c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==
-document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp();this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",
-null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):
-d(this.domPosition.parent).prepend(this.currentItem);return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||
-"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+
-this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?
-2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},
-_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=
-this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=
-this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");
-if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=
-0;b--){var c=this.items[b],e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=
-this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},
-update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=
-null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));
-this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,
-null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||
-d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a==
-"string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition==
-"absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition==
-"relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},
-_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-
-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),
-10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?
-this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=
-this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+
-this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?
-g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():
-e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==
-f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem[0].parentNode&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]="";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",
-f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",
-g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=
-0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
-this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});
-d.extend(d.ui.sortable,{version:"1.8.5"})})(jQuery);
-jQuery.effects||function(f,j){function l(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
-16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return m.transparent;return m[f.trim(c).toLowerCase()]}function r(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return l(b)}function n(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
-a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function o(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in s||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function t(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
-a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:f.fx.speeds[b]||f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=r(b.elem,a);b.end=l(b.end);b.colorInit=
-true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var m={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,
-183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,
-165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},p=["add","remove","toggle"],s={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,d){if(f.isFunction(b)){d=b;b=null}return this.each(function(){var e=f(this),g=e.attr("style")||" ",h=o(n.call(this)),q,u=e.attr("className");f.each(p,function(v,
-i){c[i]&&e[i+"Class"](c[i])});q=o(n.call(this));e.attr("className",u);e.animate(t(h,q),a,b,function(){f.each(p,function(v,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments)})})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?
-f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.5",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==
-null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case "top":b=0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();
-var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0});c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});
-c.css({position:"relative",top:0,left:0})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments);a={options:a[1],duration:a[2],callback:a[3]};var b=f.effects[c];return b&&!f.fx.off?b.call(this,a):this},_show:f.fn.show,show:function(c){if(!c||
-typeof c=="number"||f.fx.speeds[c]||!f.effects[c])return this._show.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(!c||typeof c=="number"||f.fx.speeds[c]||!f.effects[c])return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(!c||typeof c=="number"||f.fx.speeds[c]||!f.effects[c]||typeof c==
-"boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,
-a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=
-e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+
-b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/
-2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*
-a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;
-return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,
-a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
-(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","left"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,g);b.effects.removeWrapper(a);
-c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
-(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","left"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
-3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
-b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
-(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","left","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,c/2)}var h={};h[g.size]=
-f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
-(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","left","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e=="show"?1:
-0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
-0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
-e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
-(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","left"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],10)/100*
-f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
-(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
-this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
-a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
-(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
-b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
-1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","left","width","height","overflow","opacity"],g=["position","top","left","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],p=c.effects.setMode(a,
-b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};if(m=="box"||m=="both"){if(d.from.y!=
-d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);a.css("overflow","hidden").css(a.from);
-if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);child.to=c.effects.setTransition(child,
-f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,n?e:g);c.effects.removeWrapper(a);b.callback&&
-b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","left"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=(h=="pos"?"-=":"+=")+
-e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
-(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","left"],e=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(e=="show")a.css(f,b=="pos"?-g:g);var i={};i[f]=(e=="show"?b=="pos"?
-"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
-b.dequeue()})})}})(jQuery);
-(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");
-a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
-if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var f=d.closest(".ui-accordion-header");a.active=f.length?f:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion",function(g){return a._keydown(g)}).next().attr("role",
-"tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(g){a._clickHandler.call(a,g,this);g.preventDefault()})},_createIcons:function(){var a=this.options;if(a.icons){c("<span></span>").addClass("ui-icon "+a.icons.header).prependTo(this.headers);
-this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("tabIndex");
-this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons();
-b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,f=this.headers.index(a.target),g=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:g=this.headers[(f+1)%d];break;case b.LEFT:case b.UP:g=this.headers[(f-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target);
-a.preventDefault()}if(g){c(a.target).attr("tabIndex",-1);c(g).attr("tabIndex",0);g.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+
-c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options;
-if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);
-a.next().addClass("ui-accordion-content-active")}h=a.next();f=this.active.next();g={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):h,oldContent:f};d=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(h,f,g,b,d)}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);
-this.active.next().addClass("ui-accordion-content-active");var f=this.active.next(),g={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:f},h=this.active=c([]);this._toggle(h,f,g)}},_toggle:function(a,b,d,f,g){var h=this,e=h.options;h.toShow=a;h.toHide=b;h.data=d;var j=function(){if(h)return h._completed.apply(h,arguments)};h._trigger("changestart",null,h.data);h.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&f?{toShow:c([]),toHide:b,complete:j,
-down:g,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:g,autoHeight:e.autoHeight||e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;f=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!f[k]&&!c.easing[k])k="slide";f[k]||(f[k]=function(l){this.slide(l,{easing:k,duration:i||700})});
-f[k](d)}else{if(e.collapsible&&f)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false",tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.5",animations:{slide:function(a,
-b){a=c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),f=0,g={},h={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){h[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/);g[i]={value:j[1],
-unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(h,{step:function(j,i){if(i.prop=="height")f=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=f*g[i.prop].value+g[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide",paddingTop:"hide",
-paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery);
-(function(e){e.widget("ui.autocomplete",{options:{appendTo:"body",delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},_create:function(){var a=this,b=this.element[0].ownerDocument;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!a.options.disabled){var d=e.ui.keyCode;switch(c.keyCode){case d.PAGE_UP:a._move("previousPage",
-c);break;case d.PAGE_DOWN:a._move("nextPage",c);break;case d.UP:a._move("previous",c);c.preventDefault();break;case d.DOWN:a._move("next",c);c.preventDefault();break;case d.ENTER:case d.NUMPAD_ENTER:a.menu.element.is(":visible")&&c.preventDefault();case d.TAB:if(!a.menu.active)return;a.menu.select(c);break;case d.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=a.element.val()){a.selectedItem=null;a.search(null,c)}},a.options.delay);
-break}}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};this.menu=e("<ul></ul>").addClass("ui-autocomplete").appendTo(e(this.options.appendTo||"body",b)[0]).mousedown(function(c){var d=a.menu.element[0];
-c.target===d&&setTimeout(function(){e(document).one("mousedown",function(f){f.target!==a.element[0]&&f.target!==d&&!e.ui.contains(d,f.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,d){d=d.item.data("item.autocomplete");false!==a._trigger("focus",null,{item:d})&&/^key/.test(c.originalEvent.type)&&a.element.val(d.value)},selected:function(c,d){d=d.item.data("item.autocomplete");var f=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();
-a.previous=f}if(false!==a._trigger("select",c,{item:d})){a.term=d.value;a.element.val(d.value)}a.close(c);a.selectedItem=d},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");e.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");
-this.menu.element.remove();e.Widget.prototype.destroy.call(this)},_setOption:function(a,b){e.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(e(b||"body",this.element[0].ownerDocument)[0])},_initSource:function(){var a=this,b,c;if(e.isArray(this.options.source)){b=this.options.source;this.source=function(d,f){f(e.ui.autocomplete.filter(b,d.term))}}else if(typeof this.options.source==="string"){c=this.options.source;this.source=
-function(d,f){a.xhr&&a.xhr.abort();a.xhr=e.getJSON(c,d,function(g,i,h){h===a.xhr&&f(g);a.xhr=null})}}else this.source=this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search")!==false)return this._search(a)},_search:function(a){this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(a.length){a=
-this._normalize(a);this._suggest(a);this._trigger("open")}else this.close();this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this._trigger("close",a);this.menu.element.hide();this.menu.deactivate()}},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return e.map(a,function(b){if(typeof b===
-"string")return{label:b,value:b};return e.extend({label:b.label||b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1),c;this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();this.menu.element.show().position(e.extend({of:this.element},this.options.position));a=b.width("").outerWidth();c=this.element.outerWidth();b.outerWidth(Math.max(a,c))},_renderMenu:function(a,b){var c=this;e.each(b,function(d,f){c._renderItem(a,f)})},
-_renderItem:function(a,b){return e("<li></li>").data("item.autocomplete",b).append(e("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);else this.search(null,b)},widget:function(){return this.menu.element}});e.extend(e.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&")},
-filter:function(a,b){var c=new RegExp(e.ui.autocomplete.escapeRegex(b),"i");return e.grep(a,function(d){return c.test(d.label||d.value||d)})}})})(jQuery);
-(function(e){e.widget("ui.menu",{_create:function(){var a=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(b){if(e(b.target).closest(".ui-menu-item a").length){b.preventDefault();a.select(b)}});this.refresh()},refresh:function(){var a=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
--1).mouseenter(function(b){a.activate(b,e(this).parent())}).mouseleave(function(){a.deactivate()})},activate:function(a,b){this.deactivate();if(this.hasScroll()){var c=b.offset().top-this.element.offset().top,d=this.element.attr("scrollTop"),f=this.element.height();if(c<0)this.element.attr("scrollTop",d+c);else c>=f&&this.element.attr("scrollTop",d+c-f+b.height())}this.active=b.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",a,{item:b})},
-deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");this._trigger("blur");this.active=null}},next:function(a){this.move("next",".ui-menu-item:first",a)},previous:function(a){this.move("prev",".ui-menu-item:last",a)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(a,b,c){if(this.active){a=this.active[a+"All"](".ui-menu-item").eq(0);
-a.length?this.activate(c,a):this.activate(c,this.element.children(b))}else this.activate(c,this.element.children(b))},nextPage:function(a){if(this.hasScroll())if(!this.active||this.last())this.activate(a,this.element.children(":first"));else{var b=this.active.offset().top,c=this.element.height(),d=this.element.children("li").filter(function(){var f=e(this).offset().top-b-c+e(this).height();return f<10&&f>-10});d.length||(d=this.element.children(":last"));this.activate(a,d)}else this.activate(a,this.element.children(!this.active||
-this.last()?":first":":last"))},previousPage:function(a){if(this.hasScroll())if(!this.active||this.first())this.activate(a,this.element.children(":last"));else{var b=this.active.offset().top,c=this.element.height();result=this.element.children("li").filter(function(){var d=e(this).offset().top-b+c-e(this).height();return d<10&&d>-10});result.length||(result=this.element.children(":first"));this.activate(a,result)}else this.activate(a,this.element.children(!this.active||this.first()?":last":":first"))},
-hasScroll:function(){return this.element.height()<this.element.attr("scrollHeight")},select:function(a){this._trigger("selected",a,{item:this.active})}})})(jQuery);
-(function(a){var g,i=function(b){a(":ui-button",b.target.form).each(function(){var c=a(this).data("button");setTimeout(function(){c.refresh()},1)})},h=function(b){var c=b.name,d=b.form,e=a([]);if(c)e=d?a(d).find("[name='"+c+"']"):a("[name='"+c+"']",b.ownerDocument).filter(function(){return!this.form});return e};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",
-i);if(typeof this.options.disabled!=="boolean")this.options.disabled=this.element.attr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,c=this.options,d=this.type==="checkbox"||this.type==="radio",e="ui-state-hover"+(!d?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",
-function(){if(!c.disabled){a(this).addClass("ui-state-hover");this===g&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||a(this).removeClass(e)}).bind("focus.button",function(){a(this).addClass("ui-state-focus")}).bind("blur.button",function(){a(this).removeClass("ui-state-focus")});d&&this.element.bind("change.button",function(){b.refresh()});if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).toggleClass("ui-state-active");
-b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed",true);var f=b.element[0];h(f).not(f).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed",false)});else{this.buttonElement.bind("mousedown.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");
-g=this;a(document).one("mouseup",function(){g=null})}).bind("mouseup.button",function(){if(c.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(f){if(c.disabled)return false;if(f.keyCode==a.ui.keyCode.SPACE||f.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(f){f.keyCode===a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",
-c.disabled)},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type==="radio"){this.buttonElement=this.element.parents().last().find("label[for="+this.element.attr("id")+"]");this.element.addClass("ui-helper-hidden-accessible");var b=this.element.is(":checked");b&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=
-this.element},widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||
-this.buttonElement.removeAttr("title");a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")c?this.element.attr("disabled",true):this.element.removeAttr("disabled");this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")h(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
-true):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed",false)});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed",true):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed",false)},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
-c=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,e=d.primary&&d.secondary;if(d.primary||d.secondary){b.addClass("ui-button-text-icon"+(e?"s":d.primary?"-primary":"-secondary"));d.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+d.primary+"'></span>");d.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+d.secondary+"'></span>");if(!this.options.text){b.addClass(e?"ui-button-icons-only":"ui-button-icon-only").removeClass("ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary");
-this.hasTitle||b.attr("title",c)}}else b.addClass("ui-button-text-only")}}});a.widget("ui.buttonset",{_create:function(){this.element.addClass("ui-buttonset");this._init()},_init:function(){this.refresh()},_setOption:function(b,c){b==="disabled"&&this.buttons.button("option",b,c);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){this.buttons=this.element.find(":button, :submit, :reset, :checkbox, :radio, a, :data(button)").filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":visible").filter(":first").addClass("ui-corner-left").end().filter(":last").addClass("ui-corner-right").end().end().end()},
-destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");a.Widget.prototype.destroy.call(this)}})})(jQuery);
-(function(d,G){function L(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
-"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
-"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
-minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-helper-hidden-accessible"></div>')}function E(a,b){d.extend(a,
-b);for(var c in b)if(b[c]==null||b[c]==G)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.5"}});var y=(new Date).getTime();d.extend(L.prototype,{markerClassName:"hasDatepicker",log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){E(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=
-f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_])/g,"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')}},
-_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&
-b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==
-""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,
-c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),
-true);this._updateDatepicker(b);this._updateAlternate(b)}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}E(a.settings,e||{});b=b&&b.constructor==
-Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);
-d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},
-_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().removeClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=
-d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().addClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;
-for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&
-this._hideDatepicker();var h=this._getDateDatepicker(a,true);E(e.settings,f);this._attachments(d(a),e);this._autoSize(e);this._setDateDatepicker(a,h);this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&
-!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass,b.dpDiv).add(d("td."+d.datepicker._currentClass,b.dpDiv));c[0]?d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]):d.datepicker._hideDatepicker();
-return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||
-a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,
-a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));
-var c=String.fromCharCode(a.charCode==G?a.keyCode:a.charCode);return a.ctrlKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||
-a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);d.datepicker._curInst&&d.datepicker._curInst!=b&&d.datepicker._curInst.dpDiv.stop(true,true);var c=d.datepicker._get(b,"beforeShow");E(b.settings,c?c.apply(a,[a,b]):{});b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);
-d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&
-d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){d.datepicker._datepickerShowing=true;var i=d.datepicker._getBorders(b.dpDiv);b.dpDiv.find("iframe.ui-datepicker-cover").css({left:-i[0],top:-i[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})};b.dpDiv.zIndex(d(a).zIndex()+1);d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,
-h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}},_updateDatepicker:function(a){var b=this,c=d.datepicker._getBorders(a.dpDiv);a.dpDiv.empty().append(this._generateHTML(a)).find("iframe.ui-datepicker-cover").css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()}).end().find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout",function(){d(this).removeClass("ui-state-hover");
-this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).removeClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).removeClass("ui-datepicker-next-hover")}).bind("mouseover",function(){if(!b._isDisabledDatepicker(a.inline?a.dpDiv.parent()[0]:a.input[0])){d(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");d(this).addClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).addClass("ui-datepicker-prev-hover");
-this.className.indexOf("ui-datepicker-next")!=-1&&d(this).addClass("ui-datepicker-next-hover")}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end();c=this._getNumberOfMonths(a);var e=c[1];e>1?a.dpDiv.addClass("ui-datepicker-multi-"+e).css("width",17*e+"em"):a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");a.dpDiv[(c[0]!=1||c[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");
-a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&a.input.focus()},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),
-k=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>k&&k>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1);)a=a[b?"previousSibling":"nextSibling"];
-a=d(a).offset();return[a.left,a.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();if(a=this._get(b,"onClose"))a.apply(b.input?b.input[0]:null,[b.input?b.input.val():
-"",b]);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&
-!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;
-b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear=false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=
-this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear=!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=
-d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,
-"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b==
-"object"?b.toString():b+"";if(b=="")return null;for(var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff,f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,k=c=-1,l=-1,u=-1,j=false,o=function(p){(p=z+1<a.length&&a.charAt(z+1)==p)&&z++;return p},m=function(p){o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"?4:p=="o"?
-3:2)+"}");p=b.substring(s).match(p);if(!p)throw"Missing number at position "+s;s+=p[0].length;return parseInt(p[0],10)},n=function(p,w,H){p=o(p)?H:w;for(w=0;w<p.length;w++)if(b.substr(s,p[w].length).toLowerCase()==p[w].toLowerCase()){s+=p[w].length;return w+1}throw"Unknown name at position "+s;},r=function(){if(b.charAt(s)!=a.charAt(z))throw"Unexpected literal at position "+s;s++},s=0,z=0;z<a.length;z++)if(j)if(a.charAt(z)=="'"&&!o("'"))j=false;else r();else switch(a.charAt(z)){case "d":l=m("d");
-break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":k=m("m");break;case "M":k=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new Date(m("@"));c=v.getFullYear();k=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();k=v.getMonth()+1;l=v.getDate();break;case "'":if(o("'"))r();else j=true;break;default:r()}if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>
--1){k=1;l=u;do{e=this._getDaysInMonth(c,k-1);if(l<=e)break;k++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,k-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=k||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*
-60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=j+1<a.length&&a.charAt(j+1)==o)&&j++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},k=function(o,m,n,r){return i(o)?r[m]:n[m]},l="",u=false;if(b)for(var j=0;j<a.length;j++)if(u)if(a.charAt(j)==
-"'"&&!i("'"))u=false;else l+=a.charAt(j);else switch(a.charAt(j)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=k("D",b.getDay(),e,f);break;case "o":l+=g("o",(b.getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864E5,3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=k("M",b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+=
-"'";else u=true;break;default:l+=a.charAt(j)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==G?a.settings[b]:this._defaults[b]},
-_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,
-this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,k=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,j=u.exec(h);j;){switch(j[2]||"d"){case "d":case "D":g+=
-parseInt(j[1],10);break;case "w":case "W":g+=parseInt(j[1],10)*7;break;case "m":case "M":l+=parseInt(j[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(k,l));break;case "y":case "Y":k+=parseInt(j[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(k,l));break}j=u.exec(h)}return new Date(k,l,g)};if(b=(b=b==null?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):b)&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},
-_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?
-"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),k=
-this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),j=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=j&&n<j?j:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,
-"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-k,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', -"+k+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+
-n+"</span></a>";var r=this._get(a,"nextText");r=!h?r:this.formatDate(r,this._daylightSavingAdjust(new Date(m,g+k,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', +"+k+", 'M');\" title=\""+r+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+r+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+r+'"><span class="ui-icon ui-icon-circle-triangle-'+
-(c?"w":"e")+'">'+r+"</span></a>";k=this._get(a,"currentText");r=this._get(a,"gotoCurrent")&&a.currentDay?u:b;k=!h?k:this.formatDate(k,r,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+y+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,r)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
-y+".datepicker._gotoToday('#"+a.id+"');\">"+k+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;k=this._get(a,"showWeek");r=this._get(a,"dayNames");this._get(a,"dayNamesShort");var s=this._get(a,"dayNamesMin"),z=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),w=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var M=this._getDefaultDate(a),I="",C=0;C<i[0];C++){for(var N=
-"",D=0;D<i[1];D++){var J=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",x="";if(l){x+='<div class="ui-datepicker-group';if(i[1]>1)switch(D){case 0:x+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:x+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:x+=" ui-datepicker-group-middle";t="";break}x+='">'}x+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&C==0?c?
-f:n:"")+(/all|right/.test(t)&&C==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,j,o,C>0||D>0,z,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var A=k?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var q=(t+h)%7;A+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+r[q]+'">'+s[q]+"</span></th>"}x+=A+"</tr></thead><tbody>";A=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,
-A);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;A=l?6:Math.ceil((t+A)/7);q=this._daylightSavingAdjust(new Date(m,g,1-t));for(var O=0;O<A;O++){x+="<tr>";var P=!k?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(q)+"</td>";for(t=0;t<7;t++){var F=p?p.apply(a.input?a.input[0]:null,[q]):[true,""],B=q.getMonth()!=g,K=B&&!H||!F[0]||j&&q<j||o&&q>o;P+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(B?" ui-datepicker-other-month":"")+(q.getTime()==J.getTime()&&g==a.selectedMonth&&
-a._keyEvent||M.getTime()==q.getTime()&&M.getTime()==J.getTime()?" "+this._dayOverClass:"")+(K?" "+this._unselectableClass+" ui-state-disabled":"")+(B&&!w?"":" "+F[1]+(q.getTime()==u.getTime()?" "+this._currentClass:"")+(q.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!B||w)&&F[2]?' title="'+F[2]+'"':"")+(K?"":' onclick="DP_jQuery_'+y+".datepicker._selectDay('#"+a.id+"',"+q.getMonth()+","+q.getFullYear()+', this);return false;"')+">"+(B&&!w?"&#xa0;":K?'<span class="ui-state-default">'+q.getDate()+
-"</span>":'<a class="ui-state-default'+(q.getTime()==b.getTime()?" ui-state-highlight":"")+(q.getTime()==J.getTime()?" ui-state-active":"")+(B?" ui-priority-secondary":"")+'" href="#">'+q.getDate()+"</a>")+"</td>";q.setDate(q.getDate()+1);q=this._daylightSavingAdjust(q)}x+=P+"</tr>"}g++;if(g>11){g=0;m++}x+="</tbody></table>"+(l?"</div>"+(i[0]>0&&D==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");N+=x}I+=N}I+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
-"");a._keyEvent=false;return I},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var k=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),j='<div class="ui-datepicker-title">',o="";if(h||!k)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+
-a.id+"');\">";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(j+=o+(h||!(k&&l)?"&#xa0;":""));if(h||!l)j+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var r=(new Date).getFullYear();i=function(s){s=s.match(/c[+-].*/)?c+parseInt(s.substring(1),10):s.match(/[+-].*/)?r+parseInt(s,10):parseInt(s,10);return isNaN(s)?r:s};b=i(g[0]);g=Math.max(b,
-i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(j+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+a.id+"');\">";b<=g;b++)j+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";j+="</select>"}j+=this._get(a,"yearSuffix");if(u)j+=(h||!(k&&l)?"&#xa0;":"")+o;j+="</div>";return j},_adjustInstDate:function(a,b,c){var e=
-a.drawYear+(c=="Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,
-"onChangeMonthYear");if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);
-c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,
-"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=
-function(a){if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));
-return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new L;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.5";window["DP_jQuery_"+y]=d})(jQuery);
-(function(c,j){c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,position:{my:"center",at:"center",of:window,collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");
-if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",f=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog",
-"aria-labelledby":f}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var e=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);
-return false}).appendTo(e);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",f).html(d).prependTo(e);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;e.find("*").add(e).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&
-g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");
-b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==b.uiDialog[0])d=Math.max(d,c(this).css("z-index"))});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,f=d.options;if(f.modal&&!a||!f.stack&&!f.modal)return d._trigger("focus",b);if(f.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=
-f.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+=1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;d.next().length&&d.appendTo("body");a._size();a._position(b.position);d.show(b.show);
-a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(f){if(f.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),e=g.filter(":first");g=g.filter(":last");if(f.target===g[0]&&!f.shiftKey){e.focus(1);return false}else if(f.target===e[0]&&f.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,
-f=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(f);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,function(){return!(d=true)});if(d){c.each(a,function(e,h){h=c.isFunction(h)?{click:h,text:e}:h;e=c("<button></button>",h).unbind("click").click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.fn.button&&e.button()});f.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(e){return{position:e.position,
-offset:e.offset}}var b=this,d=b.options,f=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(e,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",e,a(h))},drag:function(e,h){b._trigger("drag",e,a(h))},stop:function(e,h){d.position=[h.position.left-f.scrollLeft(),h.position.top-f.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);
-b._trigger("dragStop",e,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(e){return{originalPosition:e.originalPosition,originalSize:e.originalSize,position:e.position,size:e.size}}a=a===j?this.options.resizable:a;var d=this,f=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:f.maxWidth,maxHeight:f.maxHeight,minWidth:f.minWidth,minHeight:d._minHeight(),
-handles:a,start:function(e,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",e,b(h))},resize:function(e,h){d._trigger("resize",e,b(h))},stop:function(e,h){c(this).removeClass("ui-dialog-resizing");f.height=c(this).height();f.width=c(this).width();d._trigger("resizeStop",e,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,
-a.height)},_position:function(a){var b=[],d=[0,0],f;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):[a[0],a[1]];if(b.length===1)b[1]=b[0];c.each(["left","top"],function(g,e){if(+b[g]===b[g]){d[g]=b[g];b[g]=e}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(f=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(a);
-f||this.uiDialog.hide()},_setOption:function(a,b){var d=this,f=d.uiDialog,g=f.is(":data(resizable)"),e=false;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);e=true;break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":f.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?f.addClass("ui-dialog-disabled"):f.removeClass("ui-dialog-disabled");break;case "draggable":b?
-d._makeDraggable():f.draggable("destroy");break;case "height":e=true;break;case "maxHeight":g&&f.resizable("option","maxHeight",b);e=true;break;case "maxWidth":g&&f.resizable("option","maxWidth",b);e=true;break;case "minHeight":g&&f.resizable("option","minHeight",b);e=true;break;case "minWidth":g&&f.resizable("option","minWidth",b);e=true;break;case "position":d._position(b);break;case "resizable":g&&!b&&f.resizable("destroy");g&&typeof b==="string"&&f.resizable("option","handles",b);!g&&b!==false&&
-d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break;case "width":e=true;break}c.Widget.prototype._setOption.apply(d,arguments);e&&d._size()},_size:function(){var a=this.options,b;this.element.css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();this.element.css(a.height==="auto"?{minHeight:Math.max(a.minHeight-b,0),height:c.support.minHeight?"auto":Math.max(a.minHeight-
-b,0)}:{minHeight:0,height:Math.max(a.height-b,0)}).show();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.5",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),
-function(a){return a+".dialog-overlay"}).join(" "),create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=
-(this.oldInstances.pop()||c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){this.oldInstances.push(this.instances.splice(c.inArray(a,this.instances),1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var b=0;c.each(this.instances,function(){b=Math.max(b,this.css("z-index"))});this.maxZ=b},height:function(){var a,
-b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<
-b?c(window).width()+"px":a+"px"}else return c(document).width()+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
-(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.scrollTo&&d.document){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j=
-{top:b.of.pageY,left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/
-2;if(b.at[1]==="bottom")j.top+=k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+parseInt(c.curCSS(this,"marginRight",true))||0,w=m+q+parseInt(c.curCSS(this,"marginBottom",true))||0,i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]===
-"center")i.top-=m/2;i.left=parseInt(i.left);i.top=parseInt(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();
-b.left=d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];
-b.left+=a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=
-c(b),g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
-(function(b,c){b.widget("ui.progressbar",{options:{value:0},min:0,max:100,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
-this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===c)return this._value();this._setOption("value",a);return this},_setOption:function(a,d){if(a==="value"){this.options.value=d;this._refreshValue();this._trigger("change")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.max,Math.max(this.min,a))},_refreshValue:function(){var a=this.value();this.valueDiv.toggleClass("ui-corner-right",
-a===this.max).width(a+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.5"})})(jQuery);
-(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options;this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");b.disabled&&this.element.addClass("ui-slider-disabled ui-disabled");
-this.range=d([]);if(b.range){if(b.range===true){this.range=d("<div></div>");if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}else this.range=d("<div></div>");this.range.appendTo(this.element).addClass("ui-slider-range");if(b.range==="min"||b.range==="max")this.range.addClass("ui-slider-range-"+b.range);this.range.addClass("ui-widget-header")}d(".ui-slider-handle",this.element).length===0&&d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");
-if(b.values&&b.values.length)for(;d(".ui-slider-handle",this.element).length<b.values.length;)d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");this.handles=d(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(c){c.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();
-else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(c){d(this).data("index.ui-slider-handle",c)});this.handles.keydown(function(c){var e=true,f=d(this).data("index.ui-slider-handle"),h,g,i;if(!a.options.disabled){switch(c.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:e=
-false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");h=a._start(c,f);if(h===false)return}break}i=a.options.step;h=a.options.values&&a.options.values.length?(g=a.values(f)):(g=a.value());switch(c.keyCode){case d.ui.keyCode.HOME:g=a._valueMin();break;case d.ui.keyCode.END:g=a._valueMax();break;case d.ui.keyCode.PAGE_UP:g=a._trimAlignValue(h+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:g=a._trimAlignValue(h-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(h===
-a._valueMax())return;g=a._trimAlignValue(h+i);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(h===a._valueMin())return;g=a._trimAlignValue(h-i);break}a._slide(c,f,g);return e}}).keyup(function(c){var e=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(c,e);a._change(c,e);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");
-this._mouseDestroy();return this},_mouseCapture:function(a){var b=this.options,c,e,f,h,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});e=this._valueMax()-this._valueMin()+1;h=this;this.handles.each(function(i){var j=Math.abs(c-h.values(i));if(e>j){e=j;f=d(this);g=i}});if(b.range===true&&this.values(1)===b.min){g+=1;f=d(this.handles[g])}if(this._start(a,
-g)===false)return false;this._mouseSliding=true;h._handleIndex=g;f.addClass("ui-state-active").focus();b=f.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-f.width()/2,top:a.pageY-b.top-f.height()/2-(parseInt(f.css("borderTopWidth"),10)||0)-(parseInt(f.css("borderBottomWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0)};this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b=
-this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b=
-this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);
-c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var e;if(this.options.values&&this.options.values.length){e=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>e||b===1&&c<e))c=e;if(c!==this.values(b)){e=this.values();e[b]=c;a=this._trigger("slide",a,{handle:this.handles[b],value:c,values:e});this.values(b?0:1);a!==false&&this.values(b,c,true)}}else if(c!==this.value()){a=this._trigger("slide",a,{handle:this.handles[b],value:c});
-a!==false&&this.value(c)}},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=
-this._trimAlignValue(a);this._refreshValue();this._change(null,0)}return this._value()},values:function(a,b){var c,e,f;if(arguments.length>1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;e=arguments[0];for(f=0;f<c.length;f+=1){c[f]=this._trimAlignValue(e[f]);this._change(null,f)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(a):this.value();
-else return this._values()},_setOption:function(a,b){var c,e=0;if(d.isArray(this.options.values))e=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(a){case "disabled":if(b){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled");this.element.addClass("ui-disabled")}else{this.handles.removeAttr("disabled");this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
-this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<e;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c;if(arguments.length){b=this.options.values[a];
-return b=this._trimAlignValue(b)}else{b=this.options.values.slice();for(c=0;c<b.length;c+=1)b[c]=this._trimAlignValue(b[c]);return b}},_trimAlignValue:function(a){if(a<this._valueMin())return this._valueMin();if(a>this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=a%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a=
-this.options.range,b=this.options,c=this,e=!this._animateOff?b.animate:false,f,h={},g,i,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(k){f=(c.values(k)-c._valueMin())/(c._valueMax()-c._valueMin())*100;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";d(this).stop(1,1)[e?"animate":"css"](h,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(k===0)c.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},b.animate);if(k===1)c.range[e?"animate":"css"]({width:f-
-g+"%"},{queue:false,duration:b.animate})}else{if(k===0)c.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},b.animate);if(k===1)c.range[e?"animate":"css"]({height:f-g+"%"},{queue:false,duration:b.animate})}g=f});else{i=this.value();j=this._valueMin();l=this._valueMax();f=l!==j?(i-j)/(l-j)*100:0;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";this.handle.stop(1,1)[e?"animate":"css"](h,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[e?"animate":"css"]({width:f+"%"},
-b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[e?"animate":"css"]({width:100-f+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[e?"animate":"css"]({height:100-f+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.5"})})(jQuery);
-(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(a,e){if(a=="selected")this.options.collapsible&&
-e==this.options.selected||this.select(e);else{this.options[a]=e;this._tabify()}},_tabId:function(a){return a.title&&a.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:function(){var a=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[a].concat(d.makeArray(arguments)))},_ui:function(a,e){return{tab:a,panel:e,index:this.anchors.index(a)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var a=
-d(this);a.html(a.data("label.tabs")).removeData("label.tabs")})},_tabify:function(a){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var b=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
-(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))b.panels=b.panels.add(b._sanitizeSelector(i));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=b._tabId(f);f.href="#"+i;f=d("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(b.panels[g-1]||b.list);f.data("destroy.tabs",true)}b.panels=b.panels.add(f)}else c.disabled.push(g)});if(a){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
-this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(b._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
-this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return b.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
-if(c.selected>=0&&this.anchors.length){this.panels.eq(c.selected).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");b.element.queue("tabs",function(){b._trigger("show",null,b._ui(b.anchors[c.selected],b.panels[c.selected]))});this.load(c.selected)}d(window).bind("unload",function(){b.lis.add(b.anchors).unbind(".tabs");b.lis=b.anchors=b.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));this.element[c.collapsible?"addClass":
-"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);a=0;for(var j;j=this.lis[a];a++)d(j)[d.inArray(a,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+g)};this.lis.bind("mouseover.tabs",
-function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",function(){e(f,o);b._trigger("show",
-null,b._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");b._trigger("show",null,b._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){b.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);b.element.dequeue("tabs")})}:function(g,f){b.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");b.element.dequeue("tabs")};this.anchors.bind(c.event+".tabs",
-function(){var g=this,f=d(g).closest("li"),i=b.panels.filter(":not(.ui-tabs-hide)"),l=d(b._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||b.panels.filter(":animated").length||b._trigger("select",null,b._ui(this,l[0]))===false){this.blur();return false}c.selected=b.anchors.index(this);b.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=-1;c.cookie&&b._cookie(c.selected,c.cookie);b.element.queue("tabs",
-function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&b._cookie(c.selected,c.cookie);b.element.queue("tabs",function(){r(g,l)});b.load(b.anchors.index(this));this.blur();return false}c.cookie&&b._cookie(c.selected,c.cookie);if(l.length){i.length&&b.element.queue("tabs",function(){s(g,i)});b.element.queue("tabs",function(){r(g,l)});b.load(b.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",
-function(){return false})},_getIndex:function(a){if(typeof a=="string")a=this.anchors.index(this.anchors.filter("[href$="+a+"]"));return a},destroy:function(){var a=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=d.data(this,"href.tabs");if(e)this.href=
-e;var b=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){b.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});a.cookie&&this._cookie(null,a.cookie);return this},add:function(a,e,b){if(b===p)b=this.anchors.length;
-var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,a).replace(/#\{label\}/g,e));a=!a.indexOf("#")?a.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=d("#"+a);j.length||(j=d(h.panelTemplate).attr("id",a).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(b>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[b]);
-j.insertBefore(this.panels[b])}h.disabled=d.map(h.disabled,function(k){return k>=b?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[b],this.panels[b]));return this},remove:function(a){a=this._getIndex(a);var e=this.options,b=this.lis.eq(a).remove(),c=this.panels.eq(a).remove();
-if(b.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(a+(a+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=a}),function(h){return h>=a?--h:h});this._tabify();this._trigger("remove",null,this._ui(b.find("a")[0],c[0]));return this},enable:function(a){a=this._getIndex(a);var e=this.options;if(d.inArray(a,e.disabled)!=-1){this.lis.eq(a).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(b){return b!=a});this._trigger("enable",null,
-this._ui(this.anchors[a],this.panels[a]));return this}},disable:function(a){a=this._getIndex(a);var e=this.options;if(a!=e.selected){this.lis.eq(a).addClass("ui-state-disabled");e.disabled.push(a);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[a],this.panels[a]))}return this},select:function(a){a=this._getIndex(a);if(a==-1)if(this.options.collapsible&&this.options.selected!=-1)a=this.options.selected;else return this;this.anchors.eq(a).trigger(this.options.event+".tabs");return this},
-load:function(a){a=this._getIndex(a);var e=this,b=this.options,c=this.anchors.eq(a)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(a).addClass("ui-state-processing");if(b.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(b.spinner)}this.xhr=d.ajax(d.extend({},b.ajaxOptions,{url:h,success:function(k,n){d(e._sanitizeSelector(c.hash)).html(k);e._cleanup();b.cache&&d.data(c,"cache.tabs",
-true);e._trigger("load",null,e._ui(e.anchors[a],e.panels[a]));try{b.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[a],e.panels[a]));try{b.ajaxOptions.error(k,n,a,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},url:function(a,
-e){this.anchors.eq(a).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.5"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(a,e){var b=this,c=this.options,h=b._rotate||(b._rotate=function(j){clearTimeout(b.rotation);b.rotation=setTimeout(function(){var k=c.selected;b.select(++k<b.anchors.length?k:0)},a);j&&j.stopPropagation()});e=b._unrotate||(b._unrotate=!e?function(j){j.clientX&&b.rotate(null)}:
-function(){t=c.selected;h()});if(a){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(b.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
diff --git a/esphome/dashboard/static/jquery.min.js b/esphome/dashboard/static/jquery.min.js
deleted file mode 100644
index 4024b6622b..0000000000
--- a/esphome/dashboard/static/jquery.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v2.2.4 | (c) jQuery Foundation | jquery.org/license */
-!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=a.document,e=c.slice,f=c.concat,g=c.push,h=c.indexOf,i={},j=i.toString,k=i.hasOwnProperty,l={},m="2.2.4",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return e.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:e.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a){return n.each(this,a)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(e.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:g,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=a&&a.toString();return!n.isArray(a)&&b-parseFloat(b)+1>=0},isPlainObject:function(a){var b;if("object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;if(a.constructor&&!k.call(a,"constructor")&&!k.call(a.constructor.prototype||{},"isPrototypeOf"))return!1;for(b in a);return void 0===b||k.call(a,b)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?i[j.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=d.createElement("script"),b.text=a,d.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b){var c,d=0;if(s(a)){for(c=a.length;c>d;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):g.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:h.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,g=0,h=[];if(s(a))for(d=a.length;d>g;g++)e=b(a[g],g,c),null!=e&&h.push(e);else for(g in a)e=b(a[g],g,c),null!=e&&h.push(e);return f.apply([],h)},guid:1,proxy:function(a,b){var c,d,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(d=e.call(arguments,2),f=function(){return a.apply(b||this,d.concat(e.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:l}),"function"==typeof Symbol&&(n.fn[Symbol.iterator]=c[Symbol.iterator]),n.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){i["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=!!a&&"length"in a&&a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ga(),z=ga(),A=ga(),B=function(a,b){return a===b&&(l=!0),0},C=1<<31,D={}.hasOwnProperty,E=[],F=E.pop,G=E.push,H=E.push,I=E.slice,J=function(a,b){for(var c=0,d=a.length;d>c;c++)if(a[c]===b)return c;return-1},K="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",L="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",N="\\["+L+"*("+M+")(?:"+L+"*([*^$|!~]?=)"+L+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+M+"))|)"+L+"*\\]",O=":("+M+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+N+")*)|.*)\\)|)",P=new RegExp(L+"+","g"),Q=new RegExp("^"+L+"+|((?:^|[^\\\\])(?:\\\\.)*)"+L+"+$","g"),R=new RegExp("^"+L+"*,"+L+"*"),S=new RegExp("^"+L+"*([>+~]|"+L+")"+L+"*"),T=new RegExp("="+L+"*([^\\]'\"]*?)"+L+"*\\]","g"),U=new RegExp(O),V=new RegExp("^"+M+"$"),W={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),TAG:new RegExp("^("+M+"|[*])"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+L+"*(even|odd|(([+-]|)(\\d*)n|)"+L+"*(?:([+-]|)"+L+"*(\\d+)|))"+L+"*\\)|)","i"),bool:new RegExp("^(?:"+K+")$","i"),needsContext:new RegExp("^"+L+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+L+"*((?:-\\d)?\\d*)"+L+"*\\)|)(?=[^-]|$)","i")},X=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Z=/^[^{]+\{\s*\[native \w/,$=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,_=/[+~]/,aa=/'|\\/g,ba=new RegExp("\\\\([\\da-f]{1,6}"+L+"?|("+L+")|.)","ig"),ca=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},da=function(){m()};try{H.apply(E=I.call(v.childNodes),v.childNodes),E[v.childNodes.length].nodeType}catch(ea){H={apply:E.length?function(a,b){G.apply(a,I.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fa(a,b,d,e){var f,h,j,k,l,o,r,s,w=b&&b.ownerDocument,x=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==x&&9!==x&&11!==x)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==x&&(o=$.exec(a)))if(f=o[1]){if(9===x){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(w&&(j=w.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(o[2])return H.apply(d,b.getElementsByTagName(a)),d;if((f=o[3])&&c.getElementsByClassName&&b.getElementsByClassName)return H.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==x)w=b,s=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(aa,"\\$&"):b.setAttribute("id",k=u),r=g(a),h=r.length,l=V.test(k)?"#"+k:"[id='"+k+"']";while(h--)r[h]=l+" "+qa(r[h]);s=r.join(","),w=_.test(a)&&oa(b.parentNode)||b}if(s)try{return H.apply(d,w.querySelectorAll(s)),d}catch(y){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(Q,"$1"),b,d,e)}function ga(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ha(a){return a[u]=!0,a}function ia(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ja(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function ka(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||C)-(~a.sourceIndex||C);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function la(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function na(a){return ha(function(b){return b=+b,ha(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function oa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=fa.support={},f=fa.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fa.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ia(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ia(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Z.test(n.getElementsByClassName),c.getById=ia(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ba,ca);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return"undefined"!=typeof b.getElementsByClassName&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=Z.test(n.querySelectorAll))&&(ia(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+L+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+L+"*(?:value|"+K+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ia(function(a){var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+L+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Z.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ia(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",O)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Z.test(o.compareDocumentPosition),t=b||Z.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?J(k,a)-J(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?J(k,a)-J(k,b):0;if(e===f)return ka(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?ka(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},fa.matches=function(a,b){return fa(a,null,null,b)},fa.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(T,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fa(b,n,null,[a]).length>0},fa.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fa.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&D.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fa.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fa.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fa.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fa.selectors={cacheLength:50,createPseudo:ha,match:W,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ba,ca),a[3]=(a[3]||a[4]||a[5]||"").replace(ba,ca),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fa.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fa.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return W.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&U.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ba,ca).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+L+")"+a+"("+L+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fa.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(P," ")+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fa.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ha(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=J(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ha(function(a){var b=[],c=[],d=h(a.replace(Q,"$1"));return d[u]?ha(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ha(function(a){return function(b){return fa(a,b).length>0}}),contains:ha(function(a){return a=a.replace(ba,ca),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ha(function(a){return V.test(a||"")||fa.error("unsupported lang: "+a),a=a.replace(ba,ca).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Y.test(a.nodeName)},input:function(a){return X.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:na(function(){return[0]}),last:na(function(a,b){return[b-1]}),eq:na(function(a,b,c){return[0>c?c+b:c]}),even:na(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:na(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:na(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:na(function(a,b,c){for(var d=0>c?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=la(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=ma(b);function pa(){}pa.prototype=d.filters=d.pseudos,d.setFilters=new pa,g=fa.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=R.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=S.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(Q," ")}),h=h.slice(c.length));for(g in d.filter)!(e=W[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?fa.error(a):z(a,i).slice(0)};function qa(a){for(var b=0,c=a.length,d="";c>b;b++)d+=a[b].value;return d}function ra(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j,k=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(j=b[u]||(b[u]={}),i=j[b.uniqueID]||(j[b.uniqueID]={}),(h=i[d])&&h[0]===w&&h[1]===f)return k[2]=h[2];if(i[d]=k,k[2]=a(b,c,g))return!0}}}function sa(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function ta(a,b,c){for(var d=0,e=b.length;e>d;d++)fa(a,b[d],c);return c}function ua(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function va(a,b,c,d,e,f){return d&&!d[u]&&(d=va(d)),e&&!e[u]&&(e=va(e,f)),ha(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||ta(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ua(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ua(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?J(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ua(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):H.apply(g,r)})}function wa(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ra(function(a){return a===b},h,!0),l=ra(function(a){return J(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];f>i;i++)if(c=d.relative[a[i].type])m=[ra(sa(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return va(i>1&&sa(m),i>1&&qa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(Q,"$1"),c,e>i&&wa(a.slice(i,e)),f>e&&wa(a=a.slice(e)),f>e&&qa(a))}m.push(c)}return sa(m)}function xa(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=F.call(i));u=ua(u)}H.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&fa.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ha(f):f}return h=fa.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wa(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xa(e,d)),f.selector=a}return f},i=fa.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(ba,ca),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=W.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(ba,ca),_.test(j[0].type)&&oa(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qa(j),!a)return H.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,!b||_.test(a)&&oa(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ia(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ia(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ja("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ia(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ja("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ia(function(a){return null==a.getAttribute("disabled")})||ja(K,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fa}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.uniqueSort=n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},v=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},w=n.expr.match.needsContext,x=/^<([\w-]+)\s*\/?>(?:<\/\1>|)$/,y=/^.[^:#\[\.,]*$/;function z(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(y.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return h.call(b,a)>-1!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(z(this,a||[],!1))},not:function(a){return this.pushStack(z(this,a||[],!0))},is:function(a){return!!z(this,"string"==typeof a&&w.test(a)?n(a):a||[],!1).length}});var A,B=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=n.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||A,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:B.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),x.test(e[1])&&n.isPlainObject(b))for(e in b)n.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&f.parentNode&&(this.length=1,this[0]=f),this.context=d,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==c.ready?c.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};C.prototype=n.fn,A=n(d);var D=/^(?:parents|prev(?:Until|All))/,E={children:!0,contents:!0,next:!0,prev:!0};n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=w.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?h.call(n(a),this[0]):h.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.uniqueSort(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function F(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return u(a,"parentNode")},parentsUntil:function(a,b,c){return u(a,"parentNode",c)},next:function(a){return F(a,"nextSibling")},prev:function(a){return F(a,"previousSibling")},nextAll:function(a){return u(a,"nextSibling")},prevAll:function(a){return u(a,"previousSibling")},nextUntil:function(a,b,c){return u(a,"nextSibling",c)},prevUntil:function(a,b,c){return u(a,"previousSibling",c)},siblings:function(a){return v((a.parentNode||{}).firstChild,a)},children:function(a){return v(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(E[a]||n.uniqueSort(e),D.test(a)&&e.reverse()),this.pushStack(e)}});var G=/\S+/g;function H(a){var b={};return n.each(a.match(G)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?H(a):n.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){n.each(b,function(b,c){n.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==n.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return n.each(arguments,function(a,b){var c;while((c=n.inArray(b,f,c))>-1)f.splice(c,1),h>=c&&h--}),this},has:function(a){return a?n.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().progress(c.notify).done(c.resolve).fail(c.reject):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=e.call(arguments),d=c.length,f=1!==d||a&&n.isFunction(a.promise)?d:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?e.call(arguments):d,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(d>1)for(i=new Array(d),j=new Array(d),k=new Array(d);d>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().progress(h(b,j,i)).done(h(b,k,c)).fail(g.reject):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(d,[n]),n.fn.triggerHandler&&(n(d).triggerHandler("ready"),n(d).off("ready"))))}});function J(){d.removeEventListener("DOMContentLoaded",J),a.removeEventListener("load",J),n.ready()}n.ready.promise=function(b){return I||(I=n.Deferred(),"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(n.ready):(d.addEventListener("DOMContentLoaded",J),a.addEventListener("load",J))),I.promise(b)},n.ready.promise();var K=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)K(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},L=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function M(){this.expando=n.expando+M.uid++}M.uid=1,M.prototype={register:function(a,b){var c=b||{};return a.nodeType?a[this.expando]=c:Object.defineProperty(a,this.expando,{value:c,writable:!0,configurable:!0}),a[this.expando]},cache:function(a){if(!L(a))return{};var b=a[this.expando];return b||(b={},L(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[b]=c;else for(d in b)e[d]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=a[this.expando];if(void 0!==f){if(void 0===b)this.register(a);else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in f?d=[b,e]:(d=e,d=d in f?[d]:d.match(G)||[])),c=d.length;while(c--)delete f[d[c]]}(void 0===b||n.isEmptyObject(f))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!n.isEmptyObject(b)}};var N=new M,O=new M,P=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Q=/[A-Z]/g;function R(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Q,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:P.test(c)?n.parseJSON(c):c;
-}catch(e){}O.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return O.hasData(a)||N.hasData(a)},data:function(a,b,c){return O.access(a,b,c)},removeData:function(a,b){O.remove(a,b)},_data:function(a,b,c){return N.access(a,b,c)},_removeData:function(a,b){N.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=O.get(f),1===f.nodeType&&!N.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),R(f,d,e[d])));N.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){O.set(this,a)}):K(this,function(b){var c,d;if(f&&void 0===b){if(c=O.get(f,a)||O.get(f,a.replace(Q,"-$&").toLowerCase()),void 0!==c)return c;if(d=n.camelCase(a),c=O.get(f,d),void 0!==c)return c;if(c=R(f,d,void 0),void 0!==c)return c}else d=n.camelCase(a),this.each(function(){var c=O.get(this,d);O.set(this,d,b),a.indexOf("-")>-1&&void 0!==c&&O.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){O.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=N.get(a,b),c&&(!d||n.isArray(c)?d=N.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return N.get(a,c)||N.access(a,c,{empty:n.Callbacks("once memory").add(function(){N.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?n.queue(this[0],a):void 0===b?this:this.each(function(){var c=n.queue(this,a,b);n._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&n.dequeue(this,a)})},dequeue:function(a){return this.each(function(){n.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=n.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=N.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var S=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=new RegExp("^(?:([+-])=|)("+S+")([a-z%]*)$","i"),U=["Top","Right","Bottom","Left"],V=function(a,b){return a=b||a,"none"===n.css(a,"display")||!n.contains(a.ownerDocument,a)};function W(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return n.css(a,b,"")},i=h(),j=c&&c[3]||(n.cssNumber[b]?"":"px"),k=(n.cssNumber[b]||"px"!==j&&+i)&&T.exec(n.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,n.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var X=/^(?:checkbox|radio)$/i,Y=/<([\w:-]+)/,Z=/^$|\/(?:java|ecma)script/i,$={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};$.optgroup=$.option,$.tbody=$.tfoot=$.colgroup=$.caption=$.thead,$.th=$.td;function _(a,b){var c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function aa(a,b){for(var c=0,d=a.length;d>c;c++)N.set(a[c],"globalEval",!b||N.get(b[c],"globalEval"))}var ba=/<|&#?\w+;/;function ca(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],o=0,p=a.length;p>o;o++)if(f=a[o],f||0===f)if("object"===n.type(f))n.merge(m,f.nodeType?[f]:f);else if(ba.test(f)){g=g||l.appendChild(b.createElement("div")),h=(Y.exec(f)||["",""])[1].toLowerCase(),i=$[h]||$._default,g.innerHTML=i[1]+n.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;n.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",o=0;while(f=m[o++])if(d&&n.inArray(f,d)>-1)e&&e.push(f);else if(j=n.contains(f.ownerDocument,f),g=_(l.appendChild(f),"script"),j&&aa(g),c){k=0;while(f=g[k++])Z.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var da=/^key/,ea=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,fa=/^([^.]*)(?:\.(.+)|)/;function ga(){return!0}function ha(){return!1}function ia(){try{return d.activeElement}catch(a){}}function ja(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ja(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=ha;else if(!e)return a;return 1===f&&(g=e,e=function(a){return n().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=n.guid++)),a.each(function(){n.event.add(this,b,e,d,c)})}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return"undefined"!=typeof n&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(G)||[""],j=b.length;while(j--)h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=N.hasData(a)&&N.get(a);if(r&&(i=r.events)){b=(b||"").match(G)||[""],j=b.length;while(j--)if(h=fa.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&N.remove(a,"handle events")}},dispatch:function(a){a=n.event.fix(a);var b,c,d,f,g,h=[],i=e.call(arguments),j=(N.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())a.rnamespace&&!a.rnamespace.test(g.namespace)||(a.handleObj=g,a.data=g.data,d=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==d&&(a.result=d)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&("click"!==a.type||isNaN(a.button)||a.button<1))for(;i!==this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>-1:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h<b.length&&g.push({elem:this,handlers:b.slice(h)}),g},props:"altKey bubbles cancelable ctrlKey currentTarget detail eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return null==a.which&&(a.which=null!=b.charCode?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,b){var c,e,f,g=b.button;return null==a.pageX&&null!=b.clientX&&(c=a.target.ownerDocument||d,e=c.documentElement,f=c.body,a.pageX=b.clientX+(e&&e.scrollLeft||f&&f.scrollLeft||0)-(e&&e.clientLeft||f&&f.clientLeft||0),a.pageY=b.clientY+(e&&e.scrollTop||f&&f.scrollTop||0)-(e&&e.clientTop||f&&f.clientTop||0)),a.which||void 0===g||(a.which=1&g?1:2&g?3:4&g?2:0),a}},fix:function(a){if(a[n.expando])return a;var b,c,e,f=a.type,g=a,h=this.fixHooks[f];h||(this.fixHooks[f]=h=ea.test(f)?this.mouseHooks:da.test(f)?this.keyHooks:{}),e=h.props?this.props.concat(h.props):this.props,a=new n.Event(g),b=e.length;while(b--)c=e[b],a[c]=g[c];return a.target||(a.target=d),3===a.target.nodeType&&(a.target=a.target.parentNode),h.filter?h.filter(a,g):a},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==ia()&&this.focus?(this.focus(),!1):void 0},delegateType:"focusin"},blur:{trigger:function(){return this===ia()&&this.blur?(this.blur(),!1):void 0},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&n.nodeName(this,"input")?(this.click(),!1):void 0},_default:function(a){return n.nodeName(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},n.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},n.Event=function(a,b){return this instanceof n.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?ga:ha):this.type=a,b&&n.extend(this,b),this.timeStamp=a&&a.timeStamp||n.now(),void(this[n.expando]=!0)):new n.Event(a,b)},n.Event.prototype={constructor:n.Event,isDefaultPrevented:ha,isPropagationStopped:ha,isImmediatePropagationStopped:ha,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=ga,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=ga,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=ga,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},n.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){n.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||n.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),n.fn.extend({on:function(a,b,c,d){return ja(this,a,b,c,d)},one:function(a,b,c,d){return ja(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,n(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=ha),this.each(function(){n.event.remove(this,a,c,b)})}});var ka=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,la=/<script|<style|<link/i,ma=/checked\s*(?:[^=]|=\s*.checked.)/i,na=/^true\/(.*)/,oa=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function pa(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function qa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function ra(a){var b=na.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function sa(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(N.hasData(a)&&(f=N.access(a),g=N.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}O.hasData(a)&&(h=O.access(a),i=n.extend({},h),O.set(b,i))}}function ta(a,b){var c=b.nodeName.toLowerCase();"input"===c&&X.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function ua(a,b,c,d){b=f.apply([],b);var e,g,h,i,j,k,m=0,o=a.length,p=o-1,q=b[0],r=n.isFunction(q);if(r||o>1&&"string"==typeof q&&!l.checkClone&&ma.test(q))return a.each(function(e){var f=a.eq(e);r&&(b[0]=q.call(this,e,f.html())),ua(f,b,c,d)});if(o&&(e=ca(b,a[0].ownerDocument,!1,a,d),g=e.firstChild,1===e.childNodes.length&&(e=g),g||d)){for(h=n.map(_(e,"script"),qa),i=h.length;o>m;m++)j=e,m!==p&&(j=n.clone(j,!0,!0),i&&n.merge(h,_(j,"script"))),c.call(a[m],j,m);if(i)for(k=h[h.length-1].ownerDocument,n.map(h,ra),m=0;i>m;m++)j=h[m],Z.test(j.type||"")&&!N.access(j,"globalEval")&&n.contains(k,j)&&(j.src?n._evalUrl&&n._evalUrl(j.src):n.globalEval(j.textContent.replace(oa,"")))}return a}function va(a,b,c){for(var d,e=b?n.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||n.cleanData(_(d)),d.parentNode&&(c&&n.contains(d.ownerDocument,d)&&aa(_(d,"script")),d.parentNode.removeChild(d));return a}n.extend({htmlPrefilter:function(a){return a.replace(ka,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=_(h),f=_(a),d=0,e=f.length;e>d;d++)ta(f[d],g[d]);if(b)if(c)for(f=f||_(a),g=g||_(h),d=0,e=f.length;e>d;d++)sa(f[d],g[d]);else sa(a,h);return g=_(h,"script"),g.length>0&&aa(g,!i&&_(a,"script")),h},cleanData:function(a){for(var b,c,d,e=n.event.special,f=0;void 0!==(c=a[f]);f++)if(L(c)){if(b=c[N.expando]){if(b.events)for(d in b.events)e[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);c[N.expando]=void 0}c[O.expando]&&(c[O.expando]=void 0)}}}),n.fn.extend({domManip:ua,detach:function(a){return va(this,a,!0)},remove:function(a){return va(this,a)},text:function(a){return K(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.appendChild(a)}})},prepend:function(){return ua(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=pa(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return ua(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(_(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return K(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!la.test(a)&&!$[(Y.exec(a)||["",""])[1].toLowerCase()]){a=n.htmlPrefilter(a);try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(_(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return ua(this,arguments,function(b){var c=this.parentNode;n.inArray(this,a)<0&&(n.cleanData(_(this)),c&&c.replaceChild(b,this))},a)}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),f=e.length-1,h=0;f>=h;h++)c=h===f?this:this.clone(!0),n(e[h])[b](c),g.apply(d,c.get());return this.pushStack(d)}});var wa,xa={HTML:"block",BODY:"block"};function ya(a,b){var c=n(b.createElement(a)).appendTo(b.body),d=n.css(c[0],"display");return c.detach(),d}function za(a){var b=d,c=xa[a];return c||(c=ya(a,b),"none"!==c&&c||(wa=(wa||n("<iframe frameborder='0' width='0' height='0'/>")).appendTo(b.documentElement),b=wa[0].contentDocument,b.write(),b.close(),c=ya(a,b),wa.detach()),xa[a]=c),c}var Aa=/^margin/,Ba=new RegExp("^("+S+")(?!px)[a-z%]+$","i"),Ca=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)},Da=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e},Ea=d.documentElement;!function(){var b,c,e,f,g=d.createElement("div"),h=d.createElement("div");if(h.style){h.style.backgroundClip="content-box",h.cloneNode(!0).style.backgroundClip="",l.clearCloneStyle="content-box"===h.style.backgroundClip,g.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",g.appendChild(h);function i(){h.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",h.innerHTML="",Ea.appendChild(g);var d=a.getComputedStyle(h);b="1%"!==d.top,f="2px"===d.marginLeft,c="4px"===d.width,h.style.marginRight="50%",e="4px"===d.marginRight,Ea.removeChild(g)}n.extend(l,{pixelPosition:function(){return i(),b},boxSizingReliable:function(){return null==c&&i(),c},pixelMarginRight:function(){return null==c&&i(),e},reliableMarginLeft:function(){return null==c&&i(),f},reliableMarginRight:function(){var b,c=h.appendChild(d.createElement("div"));return c.style.cssText=h.style.cssText="-webkit-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",h.style.width="1px",Ea.appendChild(g),b=!parseFloat(a.getComputedStyle(c).marginRight),Ea.removeChild(g),h.removeChild(c),b}})}}();function Fa(a,b,c){var d,e,f,g,h=a.style;return c=c||Ca(a),g=c?c.getPropertyValue(b)||c[b]:void 0,""!==g&&void 0!==g||n.contains(a.ownerDocument,a)||(g=n.style(a,b)),c&&!l.pixelMarginRight()&&Ba.test(g)&&Aa.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f),void 0!==g?g+"":g}function Ga(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Ha=/^(none|table(?!-c[ea]).+)/,Ia={position:"absolute",visibility:"hidden",display:"block"},Ja={letterSpacing:"0",fontWeight:"400"},Ka=["Webkit","O","Moz","ms"],La=d.createElement("div").style;function Ma(a){if(a in La)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ka.length;while(c--)if(a=Ka[c]+b,a in La)return a}function Na(a,b,c){var d=T.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Oa(a,b,c,d,e){for(var f=c===(d?"border":"content")?4:"width"===b?1:0,g=0;4>f;f+=2)"margin"===c&&(g+=n.css(a,c+U[f],!0,e)),d?("content"===c&&(g-=n.css(a,"padding"+U[f],!0,e)),"margin"!==c&&(g-=n.css(a,"border"+U[f]+"Width",!0,e))):(g+=n.css(a,"padding"+U[f],!0,e),"padding"!==c&&(g+=n.css(a,"border"+U[f]+"Width",!0,e)));return g}function Pa(a,b,c){var d=!0,e="width"===b?a.offsetWidth:a.offsetHeight,f=Ca(a),g="border-box"===n.css(a,"boxSizing",!1,f);if(0>=e||null==e){if(e=Fa(a,b,f),(0>e||null==e)&&(e=a.style[b]),Ba.test(e))return e;d=g&&(l.boxSizingReliable()||e===a.style[b]),e=parseFloat(e)||0}return e+Oa(a,b,c||(g?"border":"content"),d,f)+"px"}function Qa(a,b){for(var c,d,e,f=[],g=0,h=a.length;h>g;g++)d=a[g],d.style&&(f[g]=N.get(d,"olddisplay"),c=d.style.display,b?(f[g]||"none"!==c||(d.style.display=""),""===d.style.display&&V(d)&&(f[g]=N.access(d,"olddisplay",za(d.nodeName)))):(e=V(d),"none"===c&&e||N.set(d,"olddisplay",e?c:n.css(d,"display"))));for(g=0;h>g;g++)d=a[g],d.style&&(b&&"none"!==d.style.display&&""!==d.style.display||(d.style.display=b?f[g]||"":"none"));return a}n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Fa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=T.exec(c))&&e[1]&&(c=W(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(n.cssNumber[h]?"":"px")),l.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Ma(h)||h),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Fa(a,b,d)),"normal"===e&&b in Ja&&(e=Ja[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?Ha.test(n.css(a,"display"))&&0===a.offsetWidth?Da(a,Ia,function(){return Pa(a,b,d)}):Pa(a,b,d):void 0},set:function(a,c,d){var e,f=d&&Ca(a),g=d&&Oa(a,b,d,"border-box"===n.css(a,"boxSizing",!1,f),f);return g&&(e=T.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=n.css(a,b)),Na(a,c,g)}}}),n.cssHooks.marginLeft=Ga(l.reliableMarginLeft,function(a,b){return b?(parseFloat(Fa(a,"marginLeft"))||a.getBoundingClientRect().left-Da(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px":void 0}),n.cssHooks.marginRight=Ga(l.reliableMarginRight,function(a,b){return b?Da(a,{display:"inline-block"},Fa,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+U[d]+b]=f[d]||f[d-2]||f[0];return e}},Aa.test(a)||(n.cssHooks[a+b].set=Na)}),n.fn.extend({css:function(a,b){return K(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=Ca(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Qa(this,!0)},hide:function(){return Qa(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){V(this)?n(this).show():n(this).hide()})}});function Ra(a,b,c,d,e){return new Ra.prototype.init(a,b,c,d,e)}n.Tween=Ra,Ra.prototype={constructor:Ra,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||n.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Ra.propHooks[this.prop];return a&&a.get?a.get(this):Ra.propHooks._default.get(this)},run:function(a){var b,c=Ra.propHooks[this.prop];return this.options.duration?this.pos=b=n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Ra.propHooks._default.set(this),this}},Ra.prototype.init.prototype=Ra.prototype,Ra.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[n.cssProps[a.prop]]&&!n.cssHooks[a.prop]?a.elem[a.prop]=a.now:n.style(a.elem,a.prop,a.now+a.unit)}}},Ra.propHooks.scrollTop=Ra.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},n.fx=Ra.prototype.init,n.fx.step={};var Sa,Ta,Ua=/^(?:toggle|show|hide)$/,Va=/queueHooks$/;function Wa(){return a.setTimeout(function(){Sa=void 0}),Sa=n.now()}function Xa(a,b){var c,d=0,e={height:a};for(b=b?1:0;4>d;d+=2-b)c=U[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function Ya(a,b,c){for(var d,e=(_a.tweeners[b]||[]).concat(_a.tweeners["*"]),f=0,g=e.length;g>f;f++)if(d=e[f].call(c,b,a))return d}function Za(a,b,c){var d,e,f,g,h,i,j,k,l=this,m={},o=a.style,p=a.nodeType&&V(a),q=N.get(a,"fxshow");c.queue||(h=n._queueHooks(a,"fx"),null==h.unqueued&&(h.unqueued=0,i=h.empty.fire,h.empty.fire=function(){h.unqueued||i()}),h.unqueued++,l.always(function(){l.always(function(){h.unqueued--,n.queue(a,"fx").length||h.empty.fire()})})),1===a.nodeType&&("height"in b||"width"in b)&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=n.css(a,"display"),k="none"===j?N.get(a,"olddisplay")||za(a.nodeName):j,"inline"===k&&"none"===n.css(a,"float")&&(o.display="inline-block")),c.overflow&&(o.overflow="hidden",l.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]}));for(d in b)if(e=b[d],Ua.exec(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}m[d]=q&&q[d]||n.style(a,d)}else j=void 0;if(n.isEmptyObject(m))"inline"===("none"===j?za(a.nodeName):j)&&(o.display=j);else{q?"hidden"in q&&(p=q.hidden):q=N.access(a,"fxshow",{}),f&&(q.hidden=!p),p?n(a).show():l.done(function(){n(a).hide()}),l.done(function(){var b;N.remove(a,"fxshow");for(b in m)n.style(a,b,m[b])});for(d in m)g=Ya(p?q[d]:0,d,l),d in q||(q[d]=g.start,p&&(g.end=g.start,g.start="width"===d||"height"===d?1:0))}}function $a(a,b){var c,d,e,f,g;for(c in a)if(d=n.camelCase(c),e=b[d],f=a[c],n.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=n.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function _a(a,b,c){var d,e,f=0,g=_a.prefilters.length,h=n.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=Sa||Wa(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;i>g;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),1>f&&i?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:n.extend({},b),opts:n.extend(!0,{specialEasing:{},easing:n.easing._default},c),originalProperties:b,originalOptions:c,startTime:Sa||Wa(),duration:c.duration,tweens:[],createTween:function(b,c){var d=n.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;d>c;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for($a(k,j.opts.specialEasing);g>f;f++)if(d=_a.prefilters[f].call(j,a,k,j.opts))return n.isFunction(d.stop)&&(n._queueHooks(j.elem,j.opts.queue).stop=n.proxy(d.stop,d)),d;return n.map(k,Ya,j),n.isFunction(j.opts.start)&&j.opts.start.call(a,j),n.fx.timer(n.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}n.Animation=n.extend(_a,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return W(c.elem,a,T.exec(b),c),c}]},tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.match(G);for(var c,d=0,e=a.length;e>d;d++)c=a[d],_a.tweeners[c]=_a.tweeners[c]||[],_a.tweeners[c].unshift(b)},prefilters:[Za],prefilter:function(a,b){b?_a.prefilters.unshift(a):_a.prefilters.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(V).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=_a(this,n.extend({},a),f);(e||N.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=N.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Va.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||n.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=N.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Xa(b,!0),a,d,e)}}),n.each({slideDown:Xa("show"),slideUp:Xa("hide"),slideToggle:Xa("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Sa=n.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||n.fx.stop(),Sa=void 0},n.fx.timer=function(a){n.timers.push(a),a()?n.fx.start():n.timers.pop()},n.fx.interval=13,n.fx.start=function(){Ta||(Ta=a.setInterval(n.fx.tick,n.fx.interval))},n.fx.stop=function(){a.clearInterval(Ta),Ta=null},n.fx.speeds={slow:600,fast:200,_default:400},n.fn.delay=function(b,c){return b=n.fx?n.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",l.checkOn=""!==a.value,l.optSelected=c.selected,b.disabled=!0,l.optDisabled=!c.disabled,a=d.createElement("input"),a.value="t",a.type="radio",l.radioValue="t"===a.value}();var ab,bb=n.expr.attrHandle;n.fn.extend({attr:function(a,b){return K(this,n.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),e=n.attrHooks[b]||(n.expr.match.bool.test(b)?ab:void 0)),void 0!==c?null===c?void n.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=n.find.attr(a,b),null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!l.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(G);if(f&&1===a.nodeType)while(c=f[e++])d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)}}),ab={set:function(a,b,c){return b===!1?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=bb[b]||n.find.attr;bb[b]=function(a,b,d){var e,f;return d||(f=bb[b],bb[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,bb[b]=f),e}});var cb=/^(?:input|select|textarea|button)$/i,db=/^(?:a|area)$/i;n.fn.extend({prop:function(a,b){return K(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&n.isXMLDoc(a)||(b=n.propFix[b]||b,e=n.propHooks[b]),
-void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=n.find.attr(a,"tabindex");return b?parseInt(b,10):cb.test(a.nodeName)||db.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),l.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var eb=/[\t\r\n\f]/g;function fb(a){return a.getAttribute&&a.getAttribute("class")||""}n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,fb(this)))});if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,fb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(G)||[];while(c=this[i++])if(e=fb(c),d=1===c.nodeType&&(" "+e+" ").replace(eb," ")){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=n.trim(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):n.isFunction(a)?this.each(function(c){n(this).toggleClass(a.call(this,c,fb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=n(this),f=a.match(G)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=fb(this),b&&N.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":N.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+fb(c)+" ").replace(eb," ").indexOf(b)>-1)return!0;return!1}});var gb=/\r/g,hb=/[\x20\t\r\n\f]+/g;n.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(gb,""):null==c?"":c)}}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a)).replace(hb," ")}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],(c.selected||i===e)&&(l.optDisabled?!c.disabled:null===c.getAttribute("disabled"))&&(!c.parentNode.disabled||!n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){var c,d,e=a.options,f=n.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=n.inArray(n.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>-1:void 0}},l.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var ib=/^(?:focusinfocus|focusoutblur)$/;n.extend(n.event,{trigger:function(b,c,e,f){var g,h,i,j,l,m,o,p=[e||d],q=k.call(b,"type")?b.type:b,r=k.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!ib.test(q+n.event.triggered)&&(q.indexOf(".")>-1&&(r=q.split("."),q=r.shift(),r.sort()),l=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=r.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},f||!o.trigger||o.trigger.apply(e,c)!==!1)){if(!f&&!o.noBubble&&!n.isWindow(e)){for(j=o.delegateType||q,ib.test(j+q)||(h=h.parentNode);h;h=h.parentNode)p.push(h),i=h;i===(e.ownerDocument||d)&&p.push(i.defaultView||i.parentWindow||a)}g=0;while((h=p[g++])&&!b.isPropagationStopped())b.type=g>1?j:o.bindType||q,m=(N.get(h,"events")||{})[b.type]&&N.get(h,"handle"),m&&m.apply(h,c),m=l&&h[l],m&&m.apply&&L(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=q,f||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!L(e)||l&&n.isFunction(e[q])&&!n.isWindow(e)&&(i=e[l],i&&(e[l]=null),n.event.triggered=q,e[q](),n.event.triggered=void 0,i&&(e[l]=i)),b.result}},simulate:function(a,b,c){var d=n.extend(new n.Event,c,{type:a,isSimulated:!0});n.event.trigger(d,null,b)}}),n.fn.extend({trigger:function(a,b){return this.each(function(){n.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];return c?n.event.trigger(a,b,c,!0):void 0}}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),l.focusin="onfocusin"in a,l.focusin||n.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){n.event.simulate(b,a.target,n.event.fix(a))};n.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=N.access(d,b);e||d.addEventListener(a,c,!0),N.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=N.access(d,b)-1;e?N.access(d,b,e):(d.removeEventListener(a,c,!0),N.remove(d,b))}}});var jb=a.location,kb=n.now(),lb=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||n.error("Invalid XML: "+b),c};var mb=/#.*$/,nb=/([?&])_=[^&]*/,ob=/^(.*?):[ \t]*([^\r\n]*)$/gm,pb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,qb=/^(?:GET|HEAD)$/,rb=/^\/\//,sb={},tb={},ub="*/".concat("*"),vb=d.createElement("a");vb.href=jb.href;function wb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(G)||[];if(n.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function xb(a,b,c,d){var e={},f=a===tb;function g(h){var i;return e[h]=!0,n.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function yb(a,b){var c,d,e=n.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&n.extend(!0,a,d),a}function zb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}return f?(f!==i[0]&&i.unshift(f),c[f]):void 0}function Ab(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:jb.href,type:"GET",isLocal:pb.test(jb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":ub,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?yb(yb(a,n.ajaxSettings),b):yb(n.ajaxSettings,a)},ajaxPrefilter:wb(sb),ajaxTransport:wb(tb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m=n.ajaxSetup({},c),o=m.context||m,p=m.context&&(o.nodeType||o.jquery)?n(o):n.event,q=n.Deferred(),r=n.Callbacks("once memory"),s=m.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,getResponseHeader:function(a){var b;if(2===v){if(!h){h={};while(b=ob.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===v?g:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return v||(a=u[c]=u[c]||a,t[a]=b),this},overrideMimeType:function(a){return v||(m.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>v)for(b in a)s[b]=[s[b],a[b]];else x.always(a[x.status]);return this},abort:function(a){var b=a||w;return e&&e.abort(b),z(0,b),this}};if(q.promise(x).complete=r.add,x.success=x.done,x.error=x.fail,m.url=((b||m.url||jb.href)+"").replace(mb,"").replace(rb,jb.protocol+"//"),m.type=c.method||c.type||m.method||m.type,m.dataTypes=n.trim(m.dataType||"*").toLowerCase().match(G)||[""],null==m.crossDomain){j=d.createElement("a");try{j.href=m.url,j.href=j.href,m.crossDomain=vb.protocol+"//"+vb.host!=j.protocol+"//"+j.host}catch(y){m.crossDomain=!0}}if(m.data&&m.processData&&"string"!=typeof m.data&&(m.data=n.param(m.data,m.traditional)),xb(sb,m,c,x),2===v)return x;k=n.event&&m.global,k&&0===n.active++&&n.event.trigger("ajaxStart"),m.type=m.type.toUpperCase(),m.hasContent=!qb.test(m.type),f=m.url,m.hasContent||(m.data&&(f=m.url+=(lb.test(f)?"&":"?")+m.data,delete m.data),m.cache===!1&&(m.url=nb.test(f)?f.replace(nb,"$1_="+kb++):f+(lb.test(f)?"&":"?")+"_="+kb++)),m.ifModified&&(n.lastModified[f]&&x.setRequestHeader("If-Modified-Since",n.lastModified[f]),n.etag[f]&&x.setRequestHeader("If-None-Match",n.etag[f])),(m.data&&m.hasContent&&m.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",m.contentType),x.setRequestHeader("Accept",m.dataTypes[0]&&m.accepts[m.dataTypes[0]]?m.accepts[m.dataTypes[0]]+("*"!==m.dataTypes[0]?", "+ub+"; q=0.01":""):m.accepts["*"]);for(l in m.headers)x.setRequestHeader(l,m.headers[l]);if(m.beforeSend&&(m.beforeSend.call(o,x,m)===!1||2===v))return x.abort();w="abort";for(l in{success:1,error:1,complete:1})x[l](m[l]);if(e=xb(tb,m,c,x)){if(x.readyState=1,k&&p.trigger("ajaxSend",[x,m]),2===v)return x;m.async&&m.timeout>0&&(i=a.setTimeout(function(){x.abort("timeout")},m.timeout));try{v=1,e.send(t,z)}catch(y){if(!(2>v))throw y;z(-1,y)}}else z(-1,"No Transport");function z(b,c,d,h){var j,l,t,u,w,y=c;2!==v&&(v=2,i&&a.clearTimeout(i),e=void 0,g=h||"",x.readyState=b>0?4:0,j=b>=200&&300>b||304===b,d&&(u=zb(m,x,d)),u=Ab(m,u,x,j),j?(m.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(n.lastModified[f]=w),w=x.getResponseHeader("etag"),w&&(n.etag[f]=w)),204===b||"HEAD"===m.type?y="nocontent":304===b?y="notmodified":(y=u.state,l=u.data,t=u.error,j=!t)):(t=y,!b&&y||(y="error",0>b&&(b=0))),x.status=b,x.statusText=(c||y)+"",j?q.resolveWith(o,[l,y,x]):q.rejectWith(o,[x,y,t]),x.statusCode(s),s=void 0,k&&p.trigger(j?"ajaxSuccess":"ajaxError",[x,m,j?l:t]),r.fireWith(o,[x,y]),k&&(p.trigger("ajaxComplete",[x,m]),--n.active||n.event.trigger("ajaxStop")))}return x},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax(n.extend({url:a,type:b,dataType:e,data:c,success:d},n.isPlainObject(a)&&a))}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return n.isFunction(a)?this.each(function(b){n(this).wrapInner(a.call(this,b))}):this.each(function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return!n.expr.filters.visible(a)},n.expr.filters.visible=function(a){return a.offsetWidth>0||a.offsetHeight>0||a.getClientRects().length>0};var Bb=/%20/g,Cb=/\[\]$/,Db=/\r?\n/g,Eb=/^(?:submit|button|image|reset|file)$/i,Fb=/^(?:input|select|textarea|keygen)/i;function Gb(a,b,c,d){var e;if(n.isArray(b))n.each(b,function(b,e){c||Cb.test(a)?d(a,e):Gb(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==n.type(b))d(a,b);else for(e in b)Gb(a+"["+e+"]",b[e],c,d)}n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Gb(c,a[c],b,e);return d.join("&").replace(Bb,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Fb.test(this.nodeName)&&!Eb.test(a)&&(this.checked||!X.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(Db,"\r\n")}}):{name:b.name,value:c.replace(Db,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Hb={0:200,1223:204},Ib=n.ajaxSettings.xhr();l.cors=!!Ib&&"withCredentials"in Ib,l.ajax=Ib=!!Ib,n.ajaxTransport(function(b){var c,d;return l.cors||Ib&&!b.crossDomain?{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Hb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=n("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Jb=[],Kb=/(=)\?(?=&|$)|\?\?/;n.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Jb.pop()||n.expando+"_"+kb++;return this[a]=!0,a}}),n.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Kb.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Kb.test(b.data)&&"data");return h||"jsonp"===b.dataTypes[0]?(e=b.jsonpCallback=n.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Kb,"$1"+e):b.jsonp!==!1&&(b.url+=(lb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||n.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?n(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Jb.push(e)),g&&n.isFunction(f)&&f(g[0]),g=f=void 0}),"script"):void 0}),n.parseHTML=function(a,b,c){if(!a||"string"!=typeof a)return null;"boolean"==typeof b&&(c=b,b=!1),b=b||d;var e=x.exec(a),f=!c&&[];return e?[b.createElement(e[1])]:(e=ca([a],b,f),f&&f.length&&n(f).remove(),n.merge([],e.childNodes))};var Lb=n.fn.load;n.fn.load=function(a,b,c){if("string"!=typeof a&&Lb)return Lb.apply(this,arguments);var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=n.trim(a.slice(h)),a=a.slice(0,h)),n.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&n.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?n("<div>").append(n.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n.expr.filters.animated=function(a){return n.grep(n.timers,function(b){return a===b.elem}).length};function Mb(a){return n.isWindow(a)?a:9===a.nodeType&&a.defaultView}n.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=n.css(a,"position"),l=n(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=n.css(a,"top"),i=n.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),n.isFunction(b)&&(b=b.call(a,c,n.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},n.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){n.offset.setOffset(this,a,b)});var b,c,d=this[0],e={top:0,left:0},f=d&&d.ownerDocument;if(f)return b=f.documentElement,n.contains(b,d)?(e=d.getBoundingClientRect(),c=Mb(f),{top:e.top+c.pageYOffset-b.clientTop,left:e.left+c.pageXOffset-b.clientLeft}):e},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===n.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),n.nodeName(a[0],"html")||(d=a.offset()),d.top+=n.css(a[0],"borderTopWidth",!0),d.left+=n.css(a[0],"borderLeftWidth",!0)),{top:b.top-d.top-n.css(c,"marginTop",!0),left:b.left-d.left-n.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===n.css(a,"position"))a=a.offsetParent;return a||Ea})}}),n.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;n.fn[a]=function(d){return K(this,function(a,d,e){var f=Mb(a);return void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),n.each(["top","left"],function(a,b){n.cssHooks[b]=Ga(l.pixelPosition,function(a,c){return c?(c=Fa(a,b),Ba.test(c)?n(a).position()[b]+"px":c):void 0})}),n.each({Height:"height",Width:"width"},function(a,b){n.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){n.fn[d]=function(d,e){var f=arguments.length&&(c||"boolean"!=typeof d),g=c||(d===!0||e===!0?"margin":"border");return K(this,function(b,c,d){var e;return n.isWindow(b)?b.document.documentElement["client"+a]:9===b.nodeType?(e=b.documentElement,Math.max(b.body["scroll"+a],e["scroll"+a],b.body["offset"+a],e["offset"+a],e["client"+a])):void 0===d?n.css(b,c,g):n.style(b,c,d,g)},b,f?d:void 0,f,null)}})}),n.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)},size:function(){return this.length}}),n.fn.andSelf=n.fn.addBack,"function"==typeof define&&define.amd&&define("jquery",[],function(){return n});var Nb=a.jQuery,Ob=a.$;return n.noConflict=function(b){return a.$===n&&(a.$=Ob),b&&a.jQuery===n&&(a.jQuery=Nb),n},b||(a.jQuery=a.$=n),n});
diff --git a/esphome/dashboard/static/jquery.validate.min.js b/esphome/dashboard/static/jquery.validate.min.js
deleted file mode 100644
index 36d155fe1a..0000000000
--- a/esphome/dashboard/static/jquery.validate.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery Validation Plugin - v1.15.0 - 2/24/2016
- * http://jqueryvalidation.org/
- * Copyright (c) 2016 Jörn Zaefferer; Licensed MIT */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.settings.submitHandler&&(c.submitButton=b.target),a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.settings.submitHandler?(c.submitButton&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),e=c.settings.submitHandler.call(c,c.currentForm,b),c.submitButton&&d.remove(),void 0!==e?e:!1):!0}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){if(this.length){var d,e,f,g,h,i,j=this[0];if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(b,c){i[c]=f[c],delete f[c],"required"===c&&a(j).removeAttr("aria-required")}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g),a(j).attr("aria-required","true")),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}}),a.extend(a.expr[":"],{blank:function(b){return!a.trim(""+a(b).val())},filled:function(b){var c=a(b).val();return null!==c&&!!a.trim(""+c)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||-1!==a.inArray(c.keyCode,d)||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date ( ISO ).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c=a.data(this.form,"validator"),d="on"+b.type.replace(/^validate/,""),e=c.settings;e[d]&&!a(this).is(e.ignore)&&e[d].call(c,this,b)}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){d[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], [type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], [type='radio'], [type='checkbox'], [contenteditable]",b).on("click.validate","select, option, [type='radio'], [type='checkbox']",b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler),a(this.currentForm).find("[required], [data-rule-required], .required").attr("aria-required","true")},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=h&&g.check(e)))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)a[b]&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").focus().trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea, [contenteditable]").not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),this.hasAttribute("contenteditable")&&(this.form=a(this).closest("form")[0]),d in c||!b.objectLength(a(this).rules())?!1:(c[d]=!0,!0)})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type;return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=b.hasAttribute("contenteditable")?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f=a(b).rules(),g=a.map(f,function(a,b){return b}).length,h=!1,i=this.elementValue(b);if("function"==typeof f.normalizer){if(i=f.normalizer.call(b,i),"string"!=typeof i)throw new TypeError("The normalizer should return a string value.");delete f.normalizer}for(d in f){e={method:d,parameters:f[d]};try{if(c=a.validator.methods[d].call(this,i,b,e.parameters),"dependency-mismatch"===c&&1===g){h=!0;continue}if(h=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(j){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",j),j instanceof TypeError&&(j.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),j}}if(!h)return this.objectLength(f)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),h.html(c)):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass).html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement(d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return a.replace(/([\\!"#$%&'()*+,./:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return this.dependTypes[typeof a]?this.dependTypes[typeof a](a,b):!0},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()?(a(this.currentForm).submit(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},previousValue:function(b,c){return a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a[c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0!==e.param?e.param:!0:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(d,e){b[d]=a.isFunction(e)&&"normalizer"!==d?e(c):e}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var c;b[this]&&(a.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(c=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(c[0]),Number(c[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[/?#]\S*)?$/i.test(a)},date:function(a,b){return this.optional(b)||!/Invalid|NaN/.test(new Date(a).toString())},dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e>=d},maxlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||d>=e},rangelength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e>=d[0]&&e<=d[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||c>=a},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e=a(c).attr("type"),f="Step attribute on input type "+e+" is not supported.",g=["text","number","range"],h=new RegExp("\\b"+e+"\\b"),i=e&&!h.test(g.join());if(i)throw new Error(f);return this.optional(c)||b%d===0},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),i.old===h?i.valid:(i.old=h,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:"validate"+c.name,dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.resetInternals(),f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var b,c={};a.ajaxPrefilter?a.ajaxPrefilter(function(a,b,d){var e=a.port;"abort"===a.mode&&(c[e]&&c[e].abort(),c[e]=d)}):(b=a.ajax,a.ajax=function(d){var e=("mode"in d?d:a.ajaxSettings).mode,f=("port"in d?d:a.ajaxSettings).port;return"abort"===e?(c[f]&&c[f].abort(),c[f]=b.apply(this,arguments),c[f]):b.apply(this,arguments)})});
diff --git a/esphome/dashboard/static/js/esphome.js b/esphome/dashboard/static/js/esphome.js
new file mode 100644
index 0000000000..f6e9979eb2
--- /dev/null
+++ b/esphome/dashboard/static/js/esphome.js
@@ -0,0 +1,1005 @@
+'use strict';
+
+// Document Ready
+$(document).ready(function () {
+  M.AutoInit(document.body);
+  nodeGrid();
+  startAceWebsocket();
+});
+
+// WebSocket URL Helper
+const loc = window.location;
+const wsLoc = new URL("./", `${loc.protocol}//${loc.host}${loc.pathname}`);
+wsLoc.protocol = 'ws:';
+if (loc.protocol === "https:") {
+  wsLoc.protocol = 'wss:';
+}
+const wsUrl = wsLoc.href;
+
+
+/**
+ *  Dashboard Dynamic Grid
+ */
+const nodeGrid = () => {
+  const nodeCount = document.querySelectorAll("#nodes .card").length;
+  const nodeGrid = document.querySelector("#nodes #grid");
+
+  if (nodeCount <= 3) {
+    nodeGrid.classList.add("grid-1-col");
+  } else if (nodeCount <= 6) {
+    nodeGrid.classList.add("grid-2-col");
+  } else {
+    nodeGrid.classList.add("grid-3-col");
+  }
+}
+
+/**
+ *  Online/ Offline Status Indication
+ */
+
+let isFetchingPing = false;
+
+const fetchPing = () => {
+  if (isFetchingPing) {
+    return;
+  }
+
+  isFetchingPing = true;
+
+  fetch(`./ping`, { credentials: "same-origin" }).then(res => res.json())
+    .then(response => {
+      for (let filename in response) {
+        let node = document.querySelector(`#nodes .card[data-filename="${filename}"]`);
+
+        if (node === null) {
+          continue;
+        }
+
+        let status = response[filename];
+        let className;
+
+        if (status === null) {
+          className = 'status-unknown';
+        } else if (status === true) {
+          className = 'status-online';
+          node.setAttribute('data-last-connected', Date.now().toString());
+        } else if (node.hasAttribute('data-last-connected')) {
+          const attr = parseInt(node.getAttribute('data-last-connected'));
+          if (Date.now() - attr <= 5000) {
+            className = 'status-not-responding';
+          } else {
+            className = 'status-offline';
+          }
+        } else {
+          className = 'status-offline';
+        }
+
+        if (node.classList.contains(className)) {
+          continue;
+        }
+
+        node.classList.remove('status-unknown', 'status-online', 'status-offline', 'status-not-responding');
+        node.classList.add(className);
+      }
+
+      isFetchingPing = false;
+    });
+};
+setInterval(fetchPing, 2000);
+fetchPing();
+
+/**
+ *  Log Color Parsing
+ */
+
+const initializeColorState = () => {
+  return {
+    bold: false,
+    italic: false,
+    underline: false,
+    strikethrough: false,
+    foregroundColor: false,
+    backgroundColor: false,
+    carriageReturn: false,
+    secret: false,
+  };
+};
+
+const colorReplace = (pre, state, text) => {
+  const re = /(?:\033|\\033)(?:\[(.*?)[@-~]|\].*?(?:\007|\033\\))/g;
+  let i = 0;
+
+  if (state.carriageReturn) {
+    if (text !== "\n") {
+      // don't remove if \r\n
+      pre.removeChild(pre.lastChild);
+    }
+    state.carriageReturn = false;
+  }
+
+  if (text.includes("\r")) {
+    state.carriageReturn = true;
+  }
+
+  const lineSpan = document.createElement("span");
+  lineSpan.classList.add("line");
+  pre.appendChild(lineSpan);
+
+  const addSpan = (content) => {
+    if (content === "")
+      return;
+
+    const span = document.createElement("span");
+    if (state.bold) span.classList.add("log-bold");
+    if (state.italic) span.classList.add("log-italic");
+    if (state.underline) span.classList.add("log-underline");
+    if (state.strikethrough) span.classList.add("log-strikethrough");
+    if (state.secret) span.classList.add("log-secret");
+    if (state.foregroundColor !== null) span.classList.add(`log-fg-${state.foregroundColor}`);
+    if (state.backgroundColor !== null) span.classList.add(`log-bg-${state.backgroundColor}`);
+    span.appendChild(document.createTextNode(content));
+    lineSpan.appendChild(span);
+
+    if (state.secret) {
+      const redacted = document.createElement("span");
+      redacted.classList.add("log-secret-redacted");
+      redacted.appendChild(document.createTextNode("[redacted]"));
+      lineSpan.appendChild(redacted);
+    }
+  };
+
+
+  while (true) {
+    const match = re.exec(text);
+    if (match === null)
+      break;
+
+    const j = match.index;
+    addSpan(text.substring(i, j));
+    i = j + match[0].length;
+
+    if (match[1] === undefined) continue;
+
+    for (const colorCode of match[1].split(";")) {
+      switch (parseInt(colorCode)) {
+        case 0:
+          // reset
+          state.bold = false;
+          state.italic = false;
+          state.underline = false;
+          state.strikethrough = false;
+          state.foregroundColor = null;
+          state.backgroundColor = null;
+          state.secret = false;
+          break;
+        case 1:
+          state.bold = true;
+          break;
+        case 3:
+          state.italic = true;
+          break;
+        case 4:
+          state.underline = true;
+          break;
+        case 5:
+          state.secret = true;
+          break;
+        case 6:
+          state.secret = false;
+          break;
+        case 9:
+          state.strikethrough = true;
+          break;
+        case 22:
+          state.bold = false;
+          break;
+        case 23:
+          state.italic = false;
+          break;
+        case 24:
+          state.underline = false;
+          break;
+        case 29:
+          state.strikethrough = false;
+          break;
+        case 30:
+          state.foregroundColor = "black";
+          break;
+        case 31:
+          state.foregroundColor = "red";
+          break;
+        case 32:
+          state.foregroundColor = "green";
+          break;
+        case 33:
+          state.foregroundColor = "yellow";
+          break;
+        case 34:
+          state.foregroundColor = "blue";
+          break;
+        case 35:
+          state.foregroundColor = "magenta";
+          break;
+        case 36:
+          state.foregroundColor = "cyan";
+          break;
+        case 37:
+          state.foregroundColor = "white";
+          break;
+        case 39:
+          state.foregroundColor = null;
+          break;
+        case 41:
+          state.backgroundColor = "red";
+          break;
+        case 42:
+          state.backgroundColor = "green";
+          break;
+        case 43:
+          state.backgroundColor = "yellow";
+          break;
+        case 44:
+          state.backgroundColor = "blue";
+          break;
+        case 45:
+          state.backgroundColor = "magenta";
+          break;
+        case 46:
+          state.backgroundColor = "cyan";
+          break;
+        case 47:
+          state.backgroundColor = "white";
+          break;
+        case 40:
+        case 49:
+          state.backgroundColor = null;
+          break;
+      }
+    }
+  }
+  addSpan(text.substring(i));
+  if (pre.scrollTop + 56 >= (pre.scrollHeight - pre.offsetHeight)) {
+    // at bottom
+    pre.scrollTop = pre.scrollHeight;
+  }
+};
+
+/**
+ *  Serial Port Selection
+ */
+
+const portSelect = document.querySelector('.nav-wrapper select');
+let ports = [];
+
+const fetchSerialPorts = (begin = false) => {
+  fetch(`./serial-ports`, { credentials: "same-origin" }).then(res => res.json())
+    .then(response => {
+      if (ports.length === response.length) {
+        let allEqual = true;
+        for (let i = 0; i < response.length; i++) {
+          if (ports[i].port !== response[i].port) {
+            allEqual = false;
+            break;
+          }
+        }
+        if (allEqual)
+          return;
+      }
+      const hasNewPort = response.length >= ports.length;
+
+      ports = response;
+
+      const inst = M.FormSelect.getInstance(portSelect);
+      if (inst !== undefined) {
+        inst.destroy();
+      }
+
+      portSelect.innerHTML = "";
+      const prevSelected = getUploadPort();
+      for (let i = 0; i < response.length; i++) {
+        const val = response[i];
+        if (val.port === prevSelected) {
+          portSelect.innerHTML += `<option value="${val.port}" selected>${val.port} (${val.desc})</option>`;
+        } else {
+          portSelect.innerHTML += `<option value="${val.port}">${val.port} (${val.desc})</option>`;
+        }
+      }
+
+      M.FormSelect.init(portSelect, {});
+      if (!begin && hasNewPort)
+        M.toast({ html: "Discovered new serial port." });
+    });
+};
+
+const getUploadPort = () => {
+  const inst = M.FormSelect.getInstance(portSelect);
+  if (inst === undefined) {
+    return "OTA";
+  }
+
+  inst._setSelectedStates();
+  return inst.getSelectedValues()[0];
+};
+setInterval(fetchSerialPorts, 5000);
+fetchSerialPorts(true);
+
+/**
+ * Log Elements
+ */
+
+// Log Modal Class
+class LogModal {
+  constructor({
+    name,
+    onPrepare = (modalElement, config) => { },
+    onProcessExit = (modalElement, code) => { },
+    onSocketClose = (modalElement) => { },
+    dismissible = true
+  }) {
+    this.modalId = `js-${name}-modal`;
+    this.dataAction = `${name}`;
+    this.wsUrl = `${wsUrl}${name}`;
+    this.dismissible = dismissible;
+    this.activeFilename = null;
+
+    this.modalElement = document.getElementById(this.modalId);
+    this.nodeFilenameElement = document.querySelector(`#${this.modalId} #js-node-filename`);
+    this.logElement = document.querySelector(`#${this.modalId} #js-log-area`);
+    this.onPrepare = onPrepare;
+    this.onProcessExit = onProcessExit;
+    this.onSocketClose = onSocketClose;
+  }
+
+  setup() {
+    const boundOnPress = this._onPress.bind(this);
+    document.querySelectorAll(`[data-action="${this.dataAction}"]`).forEach((button) => {
+      button.addEventListener('click', boundOnPress);
+    });
+  }
+
+  _setupModalInstance() {
+    this.modalInstance = M.Modal.init(this.modalElement, {
+      onOpenStart: this._onOpenStart.bind(this),
+      onCloseStart: this._onCloseStart.bind(this),
+      dismissible: this.dismissible
+    })
+  }
+
+  _onOpenStart() {
+    document.addEventListener('keydown', this._boundKeydown);
+  }
+
+  _onCloseStart() {
+    document.removeEventListener('keydown', this._boundKeydown);
+    this.activeSocket.close();
+  }
+
+  open(event) {
+    this._onPress(event);
+  }
+
+  _onPress(event) {
+    this.activeFilename = event.target.getAttribute('data-filename');
+
+    this._setupModalInstance();
+    this.nodeFilenameElement.innerHTML = this.activeFilename;
+
+    this.logElement.innerHTML = "";
+    const colorLogState = initializeColorState();
+
+    this.onPrepare(this.modalElement, this.activeFilename);
+
+    let stopped = false;
+
+    this.modalInstance.open();
+
+    const socket = new WebSocket(this.wsUrl);
+    this.activeSocket = socket;
+    socket.addEventListener('message', (event) => {
+      const data = JSON.parse(event.data);
+      if (data.event === "line") {
+        colorReplace(this.logElement, colorLogState, data.data);
+      } else if (data.event === "exit") {
+        this.onProcessExit(this.modalElement, data.code);
+        stopped = true;
+      }
+    });
+
+    socket.addEventListener('open', () => {
+      const msg = JSON.stringify(this._encodeSpawnMessage(this.activeFilename));
+      socket.send(msg);
+    });
+
+    socket.addEventListener('close', () => {
+      if (!stopped) {
+        this.onSocketClose(this.modalElement);
+      }
+    });
+  }
+
+  _onKeyDown(event) {
+    // Close on escape key
+    if (event.keyCode === 27) {
+      this.modalInstance.close();
+    }
+  }
+
+  _encodeSpawnMessage(filename) {
+    return {
+      type: 'spawn',
+      configuration: filename,
+      port: getUploadPort(),
+    };
+  }
+}
+
+// Logs Modal
+const logsModal = new LogModal({
+  name: "logs",
+
+  onPrepare: (modalElement, activeFilename) => {
+    modalElement.querySelector("[data-action='stop-logs']").innerHTML = "Stop";
+  },
+
+  onProcessExit: (modalElement, code) => {
+    if (code === 0) {
+      M.toast({
+        html: "Program exited successfully",
+        displayLength: 10000
+      });
+    } else {
+      M.toast({
+        html: `Program failed with code ${code}`,
+        displayLength: 10000
+      });
+    }
+    modalElem.querySelector("data-action='stop-logs'").innerHTML = "Close";
+  },
+
+  onSocketClose: (modalElement) => {
+    M.toast({
+      html: 'Terminated process',
+      displayLength: 10000
+    });
+  }
+})
+
+logsModal.setup();
+
+// Upload Modal
+const uploadModal = new LogModal({
+  name: "upload",
+  onPrepare: (modalElement, activeFilename) => {
+    modalElement.querySelector("#js-upload-modal [data-action='download-binary']").classList.add('disabled');
+    modalElement.querySelector("#js-upload-modal [data-action='upload']").setAttribute('data-filename', activeFilename);
+    modalElement.querySelector("#js-upload-modal [data-action='upload']").classList.add('disabled');
+    modalElement.querySelector("#js-upload-modal [data-action='edit']").setAttribute('data-filename', activeFilename);
+    modalElement.querySelector("#js-upload-modal [data-action='stop-logs']").innerHTML = "Stop";
+  },
+
+  onProcessExit: (modalElement, code) => {
+    if (code === 0) {
+      M.toast({
+        html: "Program exited successfully",
+        displayLength: 10000
+      });
+
+      modalElement.querySelector("#js-upload-modal [data-action='download-binary']").classList.remove('disabled');
+    } else {
+      M.toast({
+        html: `Program failed with code ${code}`,
+        displayLength: 10000
+      });
+
+      modalElement.querySelector("#js-upload-modal [data-action='upload']").classList.add('disabled');
+      modalElement.querySelector("#js-upload-modal [data-action='upload']").classList.remove('disabled');
+    }
+    modalElement.querySelector("#js-upload-modal [data-action='stop-logs']").innerHTML = "Close";
+  },
+
+  onSocketClose: (modalElement) => {
+    M.toast({
+      html: 'Terminated process',
+      displayLength: 10000
+    });
+  },
+
+  dismissible: false
+})
+
+uploadModal.setup();
+
+const downloadAfterUploadButton = document.querySelector("#js-upload-modal [data-action='download-binary']");
+downloadAfterUploadButton.addEventListener('click', () => {
+  const link = document.createElement("a");
+  link.download = name;
+  link.href = `./download.bin?configuration=${encodeURIComponent(uploadModal.activeFilename)}`;
+  document.body.appendChild(link);
+  link.click();
+  link.remove();
+});
+
+// Validate Modal
+const validateModal = new LogModal({
+  name: 'validate',
+  onPrepare: (modalElement, activeFilename) => {
+    modalElement.querySelector("#js-validate-modal [data-action='stop-logs']").innerHTML = "Stop";
+    modalElement.querySelector("#js-validate-modal [data-action='edit']").setAttribute('data-filename', activeFilename);
+    modalElement.querySelector("#js-validate-modal [data-action='upload']").setAttribute('data-filename', activeFilename);
+    modalElement.querySelector("#js-validate-modal [data-action='upload']").classList.add('disabled');
+  },
+  onProcessExit: (modalElement, code) => {
+    if (code === 0) {
+      M.toast({
+        html: `<code class="inlinecode">${validateModal.activeFilename}</code> is valid 👍`,
+        displayLength: 10000,
+      });
+      modalElement.querySelector("#js-validate-modal [data-action='upload']").classList.remove('disabled');
+    } else {
+      M.toast({
+        html: `<code class="inlinecode">${validateModal.activeFilename}</code> is invalid 😕`,
+        displayLength: 10000,
+      });
+    }
+    modalElement.querySelector("#js-validate-modal [data-action='stop-logs']").innerHTML = "Close";
+  },
+  onSocketClose: (modalElement) => {
+    M.toast({
+      html: 'Terminated process',
+      displayLength: 10000,
+    });
+  },
+});
+
+validateModal.setup();
+
+// Compile Modal
+const compileModal = new LogModal({
+  name: 'compile',
+  onPrepare: (modalElement, activeFilename) => {
+    modalElement.querySelector("#js-compile-modal [data-action='stop-logs']").innerHTML = "Stop";
+    modalElement.querySelector("#js-compile-modal [data-action='download-binary']").classList.add('disabled');
+  },
+  onProcessExit: (modalElement, code) => {
+    if (code === 0) {
+      M.toast({
+        html: "Program exited successfully",
+        displayLength: 10000,
+      });
+      modalElement.querySelector("#js-compile-modal [data-action='download-binary']").classList.remove('disabled');
+    } else {
+      M.toast({
+        html: `Program failed with code ${data.code}`,
+        displayLength: 10000,
+      });
+    }
+    modalElement.querySelector("#js-compile-modal [data-action='stop-logs']").innerHTML = "Close";
+  },
+  onSocketClose: (modalElement) => {
+    M.toast({
+      html: 'Terminated process',
+      displayLength: 10000,
+    });
+  },
+  dismissible: false,
+});
+
+compileModal.setup();
+
+const downloadAfterCompileButton = document.querySelector("#js-compile-modal [data-action='download-binary']");
+downloadAfterCompileButton.addEventListener('click', () => {
+  const link = document.createElement("a");
+  link.download = name;
+  link.href = `./download.bin?configuration=${encodeURIComponent(compileModal.activeFilename)}`;
+  document.body.appendChild(link);
+  link.click();
+  link.remove();
+});
+
+// Clean MQTT Modal
+const cleanMqttModal = new LogModal({
+  name: 'clean-mqtt',
+  onPrepare: (modalElement, activeFilename) => {
+    modalElement.querySelector("#js-clean-mqtt-modal [data-action='stop-logs']").innerHTML = "Stop";
+  },
+  onProcessExit: (modalElement, code) => {
+    if (code === 0) {
+      M.toast({
+        html: "Program exited successfully",
+        displayLength: 10000,
+      });
+    } else {
+      M.toast({
+        html: `Program failed with code ${code}`,
+        displayLength: 10000,
+      });
+    }
+    modalElement.querySelector("#js-clean-mqtt-modal [data-action='stop-logs']").innerHTML = "Close";
+  },
+  onSocketClose: (modalElement) => {
+    M.toast({
+      html: 'Terminated process',
+      displayLength: 10000,
+    });
+  },
+});
+
+cleanMqttModal.setup();
+
+// Clean Build Files Modal
+const cleanModal = new LogModal({
+  name: 'clean',
+  onPrepare: (modalElement, activeFilename) => {
+    modalElement.querySelector("#js-clean-modal [data-action='stop-logs']").innerHTML = "Stop";
+  },
+  onProcessExit: (modalElement, code) => {
+    if (code === 0) {
+      M.toast({
+        html: "Program exited successfully",
+        displayLength: 10000,
+      });
+    } else {
+      M.toast({
+        html: `Program failed with code ${code}`,
+        displayLength: 10000,
+      });
+    }
+    modalElement.querySelector("#js-clean-modal [data-action='stop-logs']").innerHTML = "Close";
+  },
+  onSocketClose: (modalElement) => {
+    M.toast({
+      html: 'Terminated process',
+      displayLength: 10000,
+    });
+  },
+});
+
+cleanModal.setup();
+
+// Update All Modal
+const updateAllModal = new LogModal({
+  name: 'update-all',
+  onPrepare: (modalElement, activeFilename) => {
+    modalElement.querySelector("#js-update-all-modal [data-action='stop-logs']").innerHTML = "Stop";
+    modalElement.querySelector("#js-update-all-modal #js-node-filename").style.visibility = "hidden";
+  },
+  onProcessExit: (modalElement, code) => {
+    if (code === 0) {
+      M.toast({
+        html: "Program exited successfully",
+        displayLength: 10000,
+      });
+      downloadButton.classList.remove('disabled');
+    } else {
+      M.toast({
+        html: `Program failed with code ${data.code}`,
+        displayLength: 10000,
+      });
+    }
+    modalElement.querySelector("#js-update-all-modal [data-action='stop-logs']").innerHTML = "Close";
+  },
+  onSocketClose: (modalElement) => {
+    M.toast({
+      html: 'Terminated process',
+      displayLength: 10000,
+    });
+  },
+  dismissible: false,
+});
+
+updateAllModal.setup();
+
+/**
+ *  Node Editing
+ */
+
+let editorActiveFilename = null;
+let editorActiveSecrets = false;
+let editorActiveWebSocket = null;
+let editorValidationScheduled = false;
+let editorValidationRunning = false;
+
+// Setup Editor
+const editorElement = document.querySelector("#js-editor-modal #js-editor-area");
+const editor = ace.edit(editorElement);
+
+editor.setOptions({
+  highlightActiveLine: true,
+  showPrintMargin: true,
+  useSoftTabs: true,
+  tabSize: 2,
+  useWorker: false,
+  theme: 'ace/theme/dreamweaver',
+  mode: 'ace/mode/yaml'
+});
+
+editor.commands.addCommand({
+  name: 'saveCommand',
+  bindKey: { win: 'Ctrl-S', mac: 'Command-S' },
+  exec: function () {
+    saveFile(editorActiveFilename);
+  },
+  readOnly: false
+});
+
+// Edit Button Listener
+document.querySelectorAll("[data-action='edit']").forEach((button) => {
+  button.addEventListener('click', (event) => {
+
+    editorActiveFilename = event.target.getAttribute("data-filename");
+    const filenameField = document.querySelector("#js-editor-modal #js-node-filename");
+    filenameField.innerHTML = editorActiveFilename;
+
+    const saveButton = document.querySelector("#js-editor-modal [data-action='save']");
+    const uploadButton = document.querySelector("#js-editor-modal [data-action='upload']");
+    const closeButton = document.querySelector("#js-editor-modal [data-action='close']");
+    saveButton.setAttribute('data-filename', editorActiveFilename);
+    uploadButton.setAttribute('data-filename', editorActiveFilename);
+    if (editorActiveFilename === "secrets.yaml") {
+      uploadButton.classList.add("disabled");
+      editorActiveSecrets = true;
+    } else {
+      uploadButton.classList.remove("disabled");
+      editorActiveSecrets = false;
+    }
+    closeButton.setAttribute('data-filename', editorActiveFilename);
+
+    const loadingIndicator = document.querySelector("#js-editor-modal #js-loading-indicator");
+    const editorArea = document.querySelector("#js-editor-modal #js-editor-area");
+
+    loadingIndicator.style.display = "block";
+    editorArea.style.display = "none";
+
+    editor.setOption('readOnly', true);
+    fetch(`./edit?configuration=${editorActiveFilename}`, { credentials: "same-origin" })
+      .then(res => res.text()).then(response => {
+        editor.setValue(response, -1);
+        editor.setOption('readOnly', false);
+        loadingIndicator.style.display = "none";
+        editorArea.style.display = "block";
+      });
+    editor.focus();
+
+    const editModalElement = document.getElementById("js-editor-modal");
+    const editorModal = M.Modal.init(editModalElement, {
+      onOpenStart: function () {
+        editorModalOnOpen()
+      },
+      onCloseStart: function () {
+        editorModalOnClose()
+      },
+      dismissible: false
+    })
+
+    editorModal.open();
+
+  });
+});
+
+// Editor On Open
+const editorModalOnOpen = () => {
+  return
+}
+
+// Editor On Close
+const editorModalOnClose = () => {
+  editorActiveFilename = null;
+}
+
+// Editor WebSocket Validation
+const startAceWebsocket = () => {
+  editorActiveWebSocket = new WebSocket(`${wsUrl}ace`);
+
+  editorActiveWebSocket.addEventListener('message', (event) => {
+    const raw = JSON.parse(event.data);
+    if (raw.event === "line") {
+      const msg = JSON.parse(raw.data);
+      if (msg.type === "result") {
+        const arr = [];
+
+        for (const v of msg.validation_errors) {
+          let o = {
+            text: v.message,
+            type: 'error',
+            row: 0,
+            column: 0
+          };
+          if (v.range != null) {
+            o.row = v.range.start_line;
+            o.column = v.range.start_col;
+          }
+          arr.push(o);
+        }
+        for (const v of msg.yaml_errors) {
+          arr.push({
+            text: v.message,
+            type: 'error',
+            row: 0,
+            column: 0
+          });
+        }
+
+        editor.session.setAnnotations(arr);
+
+        if (arr.length) {
+          document.querySelector("#js-editor-modal [data-action='upload']").classList.add('disabled');
+        } else {
+          document.querySelector("#js-editor-modal [data-action='upload']").classList.remove('disabled');
+        }
+
+        editorValidationRunning = false;
+      } else if (msg.type === "read_file") {
+        sendAceStdin({
+          type: 'file_response',
+          content: editor.getValue()
+        });
+      }
+    }
+  })
+
+  editorActiveWebSocket.addEventListener('open', () => {
+    const msg = JSON.stringify({ type: 'spawn' });
+    editorActiveWebSocket.send(msg);
+  });
+
+  editorActiveWebSocket.addEventListener('close', () => {
+    editorActiveWebSocket = null;
+    setTimeout(startAceWebsocket, 5000);
+  });
+};
+
+const sendAceStdin = (data) => {
+  let send = JSON.stringify({
+    type: 'stdin',
+    data: JSON.stringify(data) + '\n',
+  });
+  editorActiveWebSocket.send(send);
+};
+
+const debounce = (func, wait) => {
+  let timeout;
+  return function () {
+    let context = this, args = arguments;
+    let later = function () {
+      timeout = null;
+      func.apply(context, args);
+    };
+    clearTimeout(timeout);
+    timeout = setTimeout(later, wait);
+  };
+};
+
+editor.session.on('change', debounce(() => {
+  editorValidationScheduled = !editorActiveSecrets;
+}, 250));
+
+setInterval(() => {
+  if (!editorValidationScheduled || editorValidationRunning)
+    return;
+  if (editorActiveWebSocket == null)
+    return;
+
+  sendAceStdin({
+    type: 'validate',
+    file: editorActiveFilename
+  });
+  editorValidationRunning = true;
+  editorValidationScheduled = false;
+}, 100);
+
+// Save File
+const saveFile = (filename) => {
+  const extensionRegex = new RegExp("(?:\.([^.]+))?$");
+
+  if (filename.match(extensionRegex)[0] !== ".yaml") {
+    M.toast({
+      html: `❌ File <code class="inlinecode">${filename}</code> cannot be saved as it is not a YAML file!`,
+      displayLength: 10000
+    });
+    return;
+  }
+
+  fetch(`./edit?configuration=${filename}`, {
+    credentials: "same-origin",
+    method: "POST",
+    body: editor.getValue()
+  })
+    .then((response) => {
+      response.text();
+    })
+    .then(() => {
+      M.toast({
+        html: `✅ Saved <code class="inlinecode">${filename}</code>`,
+        displayLength: 10000
+      });
+    })
+    .catch((error) => {
+      M.toast({
+        html: `❌ An error occured saving <code class="inlinecode">${filename}</code>`,
+        displayLength: 10000
+      });
+    })
+}
+
+document.querySelectorAll("[data-action='save']").forEach((btn) => {
+  btn.addEventListener("click", (e) => {
+    saveFile(editorActiveFilename);
+  });
+});
+
+// Delete Node
+document.querySelectorAll("[data-action='delete']").forEach((btn) => {
+  btn.addEventListener("click", (e) => {
+    const filename = e.target.getAttribute("data-filename");
+
+    fetch(`./delete?configuration=${filename}`, {
+      credentials: "same-origin",
+      method: "POST",
+    })
+      .then((res) => {
+        res.text()
+      })
+      .then(() => {
+        const toastHtml = `<span>🗑️ Deleted <code class="inlinecode">${filename}</code>
+                           <button class="btn-flat toast-action">Undo</button>`;
+        const toast = M.toast({
+          html: toastHtml,
+          displayLength: 10000
+        });
+        const undoButton = toast.el.querySelector('.toast-action');
+
+        document.querySelector(`.card[data-filename="${filename}"]`).remove();
+
+        undoButton.addEventListener('click', () => {
+          fetch(`./undo-delete?configuration=${filename}`, {
+            credentials: "same-origin",
+            method: "POST",
+          })
+            .then((res) => {
+              res.text()
+            })
+            .then(() => {
+              window.location.reload(false);
+            });
+        });
+      });
+
+  });
+});
+
+/**
+ *  Wizard
+ */
+
+const wizardTriggerElement = document.querySelector("[data-action='wizard']");
+const wizardModal = document.getElementById("js-wizard-modal");
+const wizardCloseButton = document.querySelector("[data-action='wizard-close']");
+
+const wizardStepper = document.querySelector('#js-wizard-modal .stepper');
+const wizardStepperInstace = new MStepper(wizardStepper, {
+  firstActive: 0,
+  stepTitleNavigation: false,
+  autoFocusInput: true,
+  showFeedbackLoader: true,
+})
+
+const startWizard = () => {
+  M.Modal.init(wizardModal, {
+    dismissible: false
+  }).open();
+}
+
+document.querySelectorAll("[data-action='wizard']").forEach((btn) => {
+  btn.addEventListener("click", (event) => {
+    startWizard();
+  })
+});
+
+jQuery.validator.addMethod("nospaces", (value, element) => {
+  return value.indexOf(' ') < 0;
+}, "Name cannot contain any spaces!");
+
+jQuery.validator.addMethod("lowercase", (value, element) => {
+  return value === value.toLowerCase();
+}, "Name must be all lower case!");
+
diff --git a/esphome/dashboard/static/js/vendor/ace/ace.js b/esphome/dashboard/static/js/vendor/ace/ace.js
new file mode 100644
index 0000000000..0a66043d67
--- /dev/null
+++ b/esphome/dashboard/static/js/vendor/ace/ace.js
@@ -0,0 +1,16 @@
+(function () { function o(n) { var i = e; n && (e[n] || (e[n] = {}), i = e[n]); if (!i.define || !i.define.packaged) t.original = i.define, i.define = t, i.define.packaged = !0; if (!i.require || !i.require.packaged) r.original = i.require, i.require = r, i.require.packaged = !0 } var ACE_NAMESPACE = "", e = function () { return this }(); !e && typeof window != "undefined" && (e = window); if (!ACE_NAMESPACE && typeof requirejs != "undefined") return; var t = function (e, n, r) { if (typeof e != "string") { t.original ? t.original.apply(this, arguments) : (console.error("dropping module because define wasn't a string."), console.trace()); return } arguments.length == 2 && (r = n), t.modules[e] || (t.payloads[e] = r, t.modules[e] = null) }; t.modules = {}, t.payloads = {}; var n = function (e, t, n) { if (typeof t == "string") { var i = s(e, t); if (i != undefined) return n && n(), i } else if (Object.prototype.toString.call(t) === "[object Array]") { var o = []; for (var u = 0, a = t.length; u < a; ++u) { var f = s(e, t[u]); if (f == undefined && r.original) return; o.push(f) } return n && n.apply(null, o) || !0 } }, r = function (e, t) { var i = n("", e, t); return i == undefined && r.original ? r.original.apply(this, arguments) : i }, i = function (e, t) { if (t.indexOf("!") !== -1) { var n = t.split("!"); return i(e, n[0]) + "!" + i(e, n[1]) } if (t.charAt(0) == ".") { var r = e.split("/").slice(0, -1).join("/"); t = r + "/" + t; while (t.indexOf(".") !== -1 && s != t) { var s = t; t = t.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "") } } return t }, s = function (e, r) { r = i(e, r); var s = t.modules[r]; if (!s) { s = t.payloads[r]; if (typeof s == "function") { var o = {}, u = { id: r, uri: "", exports: o, packaged: !0 }, a = function (e, t) { return n(r, e, t) }, f = s(a, o, u); o = f || u.exports, t.modules[r] = o, delete t.payloads[r] } s = t.modules[r] = o || s } return s }; o(ACE_NAMESPACE) })(), define("ace/lib/regexp", ["require", "exports", "module"], function (e, t, n) { "use strict"; function o(e) { return (e.global ? "g" : "") + (e.ignoreCase ? "i" : "") + (e.multiline ? "m" : "") + (e.extended ? "x" : "") + (e.sticky ? "y" : "") } function u(e, t, n) { if (Array.prototype.indexOf) return e.indexOf(t, n); for (var r = n || 0; r < e.length; r++)if (e[r] === t) return r; return -1 } var r = { exec: RegExp.prototype.exec, test: RegExp.prototype.test, match: String.prototype.match, replace: String.prototype.replace, split: String.prototype.split }, i = r.exec.call(/()??/, "")[1] === undefined, s = function () { var e = /^/g; return r.test.call(e, ""), !e.lastIndex }(); if (s && i) return; RegExp.prototype.exec = function (e) { var t = r.exec.apply(this, arguments), n, a; if (typeof e == "string" && t) { !i && t.length > 1 && u(t, "") > -1 && (a = RegExp(this.source, r.replace.call(o(this), "g", "")), r.replace.call(e.slice(t.index), a, function () { for (var e = 1; e < arguments.length - 2; e++)arguments[e] === undefined && (t[e] = undefined) })); if (this._xregexp && this._xregexp.captureNames) for (var f = 1; f < t.length; f++)n = this._xregexp.captureNames[f - 1], n && (t[n] = t[f]); !s && this.global && !t[0].length && this.lastIndex > t.index && this.lastIndex-- } return t }, s || (RegExp.prototype.test = function (e) { var t = r.exec.call(this, e); return t && this.global && !t[0].length && this.lastIndex > t.index && this.lastIndex--, !!t }) }), define("ace/lib/es5-shim", ["require", "exports", "module"], function (e, t, n) { function r() { } function w(e) { try { return Object.defineProperty(e, "sentinel", {}), "sentinel" in e } catch (t) { } } function H(e) { return e = +e, e !== e ? e = 0 : e !== 0 && e !== 1 / 0 && e !== -1 / 0 && (e = (e > 0 || -1) * Math.floor(Math.abs(e))), e } function B(e) { var t = typeof e; return e === null || t === "undefined" || t === "boolean" || t === "number" || t === "string" } function j(e) { var t, n, r; if (B(e)) return e; n = e.valueOf; if (typeof n == "function") { t = n.call(e); if (B(t)) return t } r = e.toString; if (typeof r == "function") { t = r.call(e); if (B(t)) return t } throw new TypeError } Function.prototype.bind || (Function.prototype.bind = function (t) { var n = this; if (typeof n != "function") throw new TypeError("Function.prototype.bind called on incompatible " + n); var i = u.call(arguments, 1), s = function () { if (this instanceof s) { var e = n.apply(this, i.concat(u.call(arguments))); return Object(e) === e ? e : this } return n.apply(t, i.concat(u.call(arguments))) }; return n.prototype && (r.prototype = n.prototype, s.prototype = new r, r.prototype = null), s }); var i = Function.prototype.call, s = Array.prototype, o = Object.prototype, u = s.slice, a = i.bind(o.toString), f = i.bind(o.hasOwnProperty), l, c, h, p, d; if (d = f(o, "__defineGetter__")) l = i.bind(o.__defineGetter__), c = i.bind(o.__defineSetter__), h = i.bind(o.__lookupGetter__), p = i.bind(o.__lookupSetter__); if ([1, 2].splice(0).length != 2) if (!function () { function e(e) { var t = new Array(e + 2); return t[0] = t[1] = 0, t } var t = [], n; t.splice.apply(t, e(20)), t.splice.apply(t, e(26)), n = t.length, t.splice(5, 0, "XXX"), n + 1 == t.length; if (n + 1 == t.length) return !0 }()) Array.prototype.splice = function (e, t) { var n = this.length; e > 0 ? e > n && (e = n) : e == void 0 ? e = 0 : e < 0 && (e = Math.max(n + e, 0)), e + t < n || (t = n - e); var r = this.slice(e, e + t), i = u.call(arguments, 2), s = i.length; if (e === n) s && this.push.apply(this, i); else { var o = Math.min(t, n - e), a = e + o, f = a + s - o, l = n - a, c = n - o; if (f < a) for (var h = 0; h < l; ++h)this[f + h] = this[a + h]; else if (f > a) for (h = l; h--;)this[f + h] = this[a + h]; if (s && e === c) this.length = c, this.push.apply(this, i); else { this.length = c + s; for (h = 0; h < s; ++h)this[e + h] = i[h] } } return r }; else { var v = Array.prototype.splice; Array.prototype.splice = function (e, t) { return arguments.length ? v.apply(this, [e === void 0 ? 0 : e, t === void 0 ? this.length - e : t].concat(u.call(arguments, 2))) : [] } } Array.isArray || (Array.isArray = function (t) { return a(t) == "[object Array]" }); var m = Object("a"), g = m[0] != "a" || !(0 in m); Array.prototype.forEach || (Array.prototype.forEach = function (t) { var n = F(this), r = g && a(this) == "[object String]" ? this.split("") : n, i = arguments[1], s = -1, o = r.length >>> 0; if (a(t) != "[object Function]") throw new TypeError; while (++s < o) s in r && t.call(i, r[s], s, n) }), Array.prototype.map || (Array.prototype.map = function (t) { var n = F(this), r = g && a(this) == "[object String]" ? this.split("") : n, i = r.length >>> 0, s = Array(i), o = arguments[1]; if (a(t) != "[object Function]") throw new TypeError(t + " is not a function"); for (var u = 0; u < i; u++)u in r && (s[u] = t.call(o, r[u], u, n)); return s }), Array.prototype.filter || (Array.prototype.filter = function (t) { var n = F(this), r = g && a(this) == "[object String]" ? this.split("") : n, i = r.length >>> 0, s = [], o, u = arguments[1]; if (a(t) != "[object Function]") throw new TypeError(t + " is not a function"); for (var f = 0; f < i; f++)f in r && (o = r[f], t.call(u, o, f, n) && s.push(o)); return s }), Array.prototype.every || (Array.prototype.every = function (t) { var n = F(this), r = g && a(this) == "[object String]" ? this.split("") : n, i = r.length >>> 0, s = arguments[1]; if (a(t) != "[object Function]") throw new TypeError(t + " is not a function"); for (var o = 0; o < i; o++)if (o in r && !t.call(s, r[o], o, n)) return !1; return !0 }), Array.prototype.some || (Array.prototype.some = function (t) { var n = F(this), r = g && a(this) == "[object String]" ? this.split("") : n, i = r.length >>> 0, s = arguments[1]; if (a(t) != "[object Function]") throw new TypeError(t + " is not a function"); for (var o = 0; o < i; o++)if (o in r && t.call(s, r[o], o, n)) return !0; return !1 }), Array.prototype.reduce || (Array.prototype.reduce = function (t) { var n = F(this), r = g && a(this) == "[object String]" ? this.split("") : n, i = r.length >>> 0; if (a(t) != "[object Function]") throw new TypeError(t + " is not a function"); if (!i && arguments.length == 1) throw new TypeError("reduce of empty array with no initial value"); var s = 0, o; if (arguments.length >= 2) o = arguments[1]; else do { if (s in r) { o = r[s++]; break } if (++s >= i) throw new TypeError("reduce of empty array with no initial value") } while (!0); for (; s < i; s++)s in r && (o = t.call(void 0, o, r[s], s, n)); return o }), Array.prototype.reduceRight || (Array.prototype.reduceRight = function (t) { var n = F(this), r = g && a(this) == "[object String]" ? this.split("") : n, i = r.length >>> 0; if (a(t) != "[object Function]") throw new TypeError(t + " is not a function"); if (!i && arguments.length == 1) throw new TypeError("reduceRight of empty array with no initial value"); var s, o = i - 1; if (arguments.length >= 2) s = arguments[1]; else do { if (o in r) { s = r[o--]; break } if (--o < 0) throw new TypeError("reduceRight of empty array with no initial value") } while (!0); do o in this && (s = t.call(void 0, s, r[o], o, n)); while (o--); return s }); if (!Array.prototype.indexOf || [0, 1].indexOf(1, 2) != -1) Array.prototype.indexOf = function (t) { var n = g && a(this) == "[object String]" ? this.split("") : F(this), r = n.length >>> 0; if (!r) return -1; var i = 0; arguments.length > 1 && (i = H(arguments[1])), i = i >= 0 ? i : Math.max(0, r + i); for (; i < r; i++)if (i in n && n[i] === t) return i; return -1 }; if (!Array.prototype.lastIndexOf || [0, 1].lastIndexOf(0, -3) != -1) Array.prototype.lastIndexOf = function (t) { var n = g && a(this) == "[object String]" ? this.split("") : F(this), r = n.length >>> 0; if (!r) return -1; var i = r - 1; arguments.length > 1 && (i = Math.min(i, H(arguments[1]))), i = i >= 0 ? i : r - Math.abs(i); for (; i >= 0; i--)if (i in n && t === n[i]) return i; return -1 }; Object.getPrototypeOf || (Object.getPrototypeOf = function (t) { return t.__proto__ || (t.constructor ? t.constructor.prototype : o) }); if (!Object.getOwnPropertyDescriptor) { var y = "Object.getOwnPropertyDescriptor called on a non-object: "; Object.getOwnPropertyDescriptor = function (t, n) { if (typeof t != "object" && typeof t != "function" || t === null) throw new TypeError(y + t); if (!f(t, n)) return; var r, i, s; r = { enumerable: !0, configurable: !0 }; if (d) { var u = t.__proto__; t.__proto__ = o; var i = h(t, n), s = p(t, n); t.__proto__ = u; if (i || s) return i && (r.get = i), s && (r.set = s), r } return r.value = t[n], r } } Object.getOwnPropertyNames || (Object.getOwnPropertyNames = function (t) { return Object.keys(t) }); if (!Object.create) { var b; Object.prototype.__proto__ === null ? b = function () { return { __proto__: null } } : b = function () { var e = {}; for (var t in e) e[t] = null; return e.constructor = e.hasOwnProperty = e.propertyIsEnumerable = e.isPrototypeOf = e.toLocaleString = e.toString = e.valueOf = e.__proto__ = null, e }, Object.create = function (t, n) { var r; if (t === null) r = b(); else { if (typeof t != "object") throw new TypeError("typeof prototype[" + typeof t + "] != 'object'"); var i = function () { }; i.prototype = t, r = new i, r.__proto__ = t } return n !== void 0 && Object.defineProperties(r, n), r } } if (Object.defineProperty) { var E = w({}), S = typeof document == "undefined" || w(document.createElement("div")); if (!E || !S) var x = Object.defineProperty } if (!Object.defineProperty || x) { var T = "Property description must be an object: ", N = "Object.defineProperty called on non-object: ", C = "getters & setters can not be defined on this javascript engine"; Object.defineProperty = function (t, n, r) { if (typeof t != "object" && typeof t != "function" || t === null) throw new TypeError(N + t); if (typeof r != "object" && typeof r != "function" || r === null) throw new TypeError(T + r); if (x) try { return x.call(Object, t, n, r) } catch (i) { } if (f(r, "value")) if (d && (h(t, n) || p(t, n))) { var s = t.__proto__; t.__proto__ = o, delete t[n], t[n] = r.value, t.__proto__ = s } else t[n] = r.value; else { if (!d) throw new TypeError(C); f(r, "get") && l(t, n, r.get), f(r, "set") && c(t, n, r.set) } return t } } Object.defineProperties || (Object.defineProperties = function (t, n) { for (var r in n) f(n, r) && Object.defineProperty(t, r, n[r]); return t }), Object.seal || (Object.seal = function (t) { return t }), Object.freeze || (Object.freeze = function (t) { return t }); try { Object.freeze(function () { }) } catch (k) { Object.freeze = function (t) { return function (n) { return typeof n == "function" ? n : t(n) } }(Object.freeze) } Object.preventExtensions || (Object.preventExtensions = function (t) { return t }), Object.isSealed || (Object.isSealed = function (t) { return !1 }), Object.isFrozen || (Object.isFrozen = function (t) { return !1 }), Object.isExtensible || (Object.isExtensible = function (t) { if (Object(t) === t) throw new TypeError; var n = ""; while (f(t, n)) n += "?"; t[n] = !0; var r = f(t, n); return delete t[n], r }); if (!Object.keys) { var L = !0, A = ["toString", "toLocaleString", "valueOf", "hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable", "constructor"], O = A.length; for (var M in { toString: null }) L = !1; Object.keys = function I(e) { if (typeof e != "object" && typeof e != "function" || e === null) throw new TypeError("Object.keys called on a non-object"); var I = []; for (var t in e) f(e, t) && I.push(t); if (L) for (var n = 0, r = O; n < r; n++) { var i = A[n]; f(e, i) && I.push(i) } return I } } Date.now || (Date.now = function () { return (new Date).getTime() }); var _ = "  \n\x0b\f\r \u00a0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000\u2028\u2029\ufeff"; if (!String.prototype.trim) { _ = "[" + _ + "]"; var D = new RegExp("^" + _ + _ + "*"), P = new RegExp(_ + _ + "*$"); String.prototype.trim = function () { return String(this).replace(D, "").replace(P, "") } } var F = function (e) { if (e == null) throw new TypeError("can't convert " + e + " to object"); return Object(e) } }), define("ace/lib/fixoldbrowsers", ["require", "exports", "module", "ace/lib/regexp", "ace/lib/es5-shim"], function (e, t, n) { "use strict"; e("./regexp"), e("./es5-shim"), typeof Element != "undefined" && !Element.prototype.remove && Object.defineProperty(Element.prototype, "remove", { enumerable: !1, writable: !0, configurable: !0, value: function () { this.parentNode && this.parentNode.removeChild(this) } }) }), define("ace/lib/useragent", ["require", "exports", "module"], function (e, t, n) { "use strict"; t.OS = { LINUX: "LINUX", MAC: "MAC", WINDOWS: "WINDOWS" }, t.getOS = function () { return t.isMac ? t.OS.MAC : t.isLinux ? t.OS.LINUX : t.OS.WINDOWS }; var r = typeof navigator == "object" ? navigator : {}, i = (/mac|win|linux/i.exec(r.platform) || ["other"])[0].toLowerCase(), s = r.userAgent || "", o = r.appName || ""; t.isWin = i == "win", t.isMac = i == "mac", t.isLinux = i == "linux", t.isIE = o == "Microsoft Internet Explorer" || o.indexOf("MSAppHost") >= 0 ? parseFloat((s.match(/(?:MSIE |Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/) || [])[1]) : parseFloat((s.match(/(?:Trident\/[0-9]+[\.0-9]+;.*rv:)([0-9]+[\.0-9]+)/) || [])[1]), t.isOldIE = t.isIE && t.isIE < 9, t.isGecko = t.isMozilla = s.match(/ Gecko\/\d+/), t.isOpera = typeof opera == "object" && Object.prototype.toString.call(window.opera) == "[object Opera]", t.isWebKit = parseFloat(s.split("WebKit/")[1]) || undefined, t.isChrome = parseFloat(s.split(" Chrome/")[1]) || undefined, t.isEdge = parseFloat(s.split(" Edge/")[1]) || undefined, t.isAIR = s.indexOf("AdobeAIR") >= 0, t.isAndroid = s.indexOf("Android") >= 0, t.isChromeOS = s.indexOf(" CrOS ") >= 0, t.isIOS = /iPad|iPhone|iPod/.test(s) && !window.MSStream, t.isIOS && (t.isMac = !0), t.isMobile = t.isIOS || t.isAndroid }), define("ace/lib/dom", ["require", "exports", "module", "ace/lib/useragent"], function (e, t, n) { "use strict"; var r = e("./useragent"), i = "http://www.w3.org/1999/xhtml"; t.buildDom = function o(e, t, n) { if (typeof e == "string" && e) { var r = document.createTextNode(e); return t && t.appendChild(r), r } if (!Array.isArray(e)) return e && e.appendChild && t && t.appendChild(e), e; if (typeof e[0] != "string" || !e[0]) { var i = []; for (var s = 0; s < e.length; s++) { var u = o(e[s], t, n); u && i.push(u) } return i } var a = document.createElement(e[0]), f = e[1], l = 1; f && typeof f == "object" && !Array.isArray(f) && (l = 2); for (var s = l; s < e.length; s++)o(e[s], a, n); return l == 2 && Object.keys(f).forEach(function (e) { var t = f[e]; e === "class" ? a.className = Array.isArray(t) ? t.join(" ") : t : typeof t == "function" || e == "value" || e[0] == "$" ? a[e] = t : e === "ref" ? n && (n[t] = a) : t != null && a.setAttribute(e, t) }), t && t.appendChild(a), a }, t.getDocumentHead = function (e) { return e || (e = document), e.head || e.getElementsByTagName("head")[0] || e.documentElement }, t.createElement = function (e, t) { return document.createElementNS ? document.createElementNS(t || i, e) : document.createElement(e) }, t.removeChildren = function (e) { e.innerHTML = "" }, t.createTextNode = function (e, t) { var n = t ? t.ownerDocument : document; return n.createTextNode(e) }, t.createFragment = function (e) { var t = e ? e.ownerDocument : document; return t.createDocumentFragment() }, t.hasCssClass = function (e, t) { var n = (e.className + "").split(/\s+/g); return n.indexOf(t) !== -1 }, t.addCssClass = function (e, n) { t.hasCssClass(e, n) || (e.className += " " + n) }, t.removeCssClass = function (e, t) { var n = e.className.split(/\s+/g); for (; ;) { var r = n.indexOf(t); if (r == -1) break; n.splice(r, 1) } e.className = n.join(" ") }, t.toggleCssClass = function (e, t) { var n = e.className.split(/\s+/g), r = !0; for (; ;) { var i = n.indexOf(t); if (i == -1) break; r = !1, n.splice(i, 1) } return r && n.push(t), e.className = n.join(" "), r }, t.setCssClass = function (e, n, r) { r ? t.addCssClass(e, n) : t.removeCssClass(e, n) }, t.hasCssString = function (e, t) { var n = 0, r; t = t || document; if (r = t.querySelectorAll("style")) while (n < r.length) if (r[n++].id === e) return !0 }, t.importCssString = function (n, r, i) { var s = i; if (!i || !i.getRootNode) s = document; else { s = i.getRootNode(); if (!s || s == i) s = document } var o = s.ownerDocument || s; if (r && t.hasCssString(r, s)) return null; r && (n += "\n/*# sourceURL=ace/css/" + r + " */"); var u = t.createElement("style"); u.appendChild(o.createTextNode(n)), r && (u.id = r), s == o && (s = t.getDocumentHead(o)), s.insertBefore(u, s.firstChild) }, t.importCssStylsheet = function (e, n) { t.buildDom(["link", { rel: "stylesheet", href: e }], t.getDocumentHead(n)) }, t.scrollbarWidth = function (e) { var n = t.createElement("ace_inner"); n.style.width = "100%", n.style.minWidth = "0px", n.style.height = "200px", n.style.display = "block"; var r = t.createElement("ace_outer"), i = r.style; i.position = "absolute", i.left = "-10000px", i.overflow = "hidden", i.width = "200px", i.minWidth = "0px", i.height = "150px", i.display = "block", r.appendChild(n); var s = e.documentElement; s.appendChild(r); var o = n.offsetWidth; i.overflow = "scroll"; var u = n.offsetWidth; return o == u && (u = r.clientWidth), s.removeChild(r), o - u }, typeof document == "undefined" && (t.importCssString = function () { }), t.computedStyle = function (e, t) { return window.getComputedStyle(e, "") || {} }, t.setStyle = function (e, t, n) { e[t] !== n && (e[t] = n) }, t.HAS_CSS_ANIMATION = !1, t.HAS_CSS_TRANSFORMS = !1, t.HI_DPI = r.isWin ? typeof window != "undefined" && window.devicePixelRatio >= 1.5 : !0; if (typeof document != "undefined") { var s = document.createElement("div"); t.HI_DPI && s.style.transform !== undefined && (t.HAS_CSS_TRANSFORMS = !0), !r.isEdge && typeof s.style.animationName != "undefined" && (t.HAS_CSS_ANIMATION = !0), s = null } t.HAS_CSS_TRANSFORMS ? t.translate = function (e, t, n) { e.style.transform = "translate(" + Math.round(t) + "px, " + Math.round(n) + "px)" } : t.translate = function (e, t, n) { e.style.top = Math.round(n) + "px", e.style.left = Math.round(t) + "px" } }), define("ace/lib/oop", ["require", "exports", "module"], function (e, t, n) { "use strict"; t.inherits = function (e, t) { e.super_ = t, e.prototype = Object.create(t.prototype, { constructor: { value: e, enumerable: !1, writable: !0, configurable: !0 } }) }, t.mixin = function (e, t) { for (var n in t) e[n] = t[n]; return e }, t.implement = function (e, n) { t.mixin(e, n) } }), define("ace/lib/keys", ["require", "exports", "module", "ace/lib/oop"], function (e, t, n) { "use strict"; var r = e("./oop"), i = function () { var e = { MODIFIER_KEYS: { 16: "Shift", 17: "Ctrl", 18: "Alt", 224: "Meta", 91: "MetaLeft", 92: "MetaRight", 93: "ContextMenu" }, KEY_MODS: { ctrl: 1, alt: 2, option: 2, shift: 4, "super": 8, meta: 8, command: 8, cmd: 8, control: 1 }, FUNCTION_KEYS: { 8: "Backspace", 9: "Tab", 13: "Return", 19: "Pause", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End", 36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "Print", 45: "Insert", 46: "Delete", 96: "Numpad0", 97: "Numpad1", 98: "Numpad2", 99: "Numpad3", 100: "Numpad4", 101: "Numpad5", 102: "Numpad6", 103: "Numpad7", 104: "Numpad8", 105: "Numpad9", "-13": "NumpadEnter", 112: "F1", 113: "F2", 114: "F3", 115: "F4", 116: "F5", 117: "F6", 118: "F7", 119: "F8", 120: "F9", 121: "F10", 122: "F11", 123: "F12", 144: "Numlock", 145: "Scrolllock" }, PRINTABLE_KEYS: { 32: " ", 48: "0", 49: "1", 50: "2", 51: "3", 52: "4", 53: "5", 54: "6", 55: "7", 56: "8", 57: "9", 59: ";", 61: "=", 65: "a", 66: "b", 67: "c", 68: "d", 69: "e", 70: "f", 71: "g", 72: "h", 73: "i", 74: "j", 75: "k", 76: "l", 77: "m", 78: "n", 79: "o", 80: "p", 81: "q", 82: "r", 83: "s", 84: "t", 85: "u", 86: "v", 87: "w", 88: "x", 89: "y", 90: "z", 107: "+", 109: "-", 110: ".", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\", 221: "]", 222: "'", 111: "/", 106: "*" } }, t, n; for (n in e.FUNCTION_KEYS) t = e.FUNCTION_KEYS[n].toLowerCase(), e[t] = parseInt(n, 10); for (n in e.PRINTABLE_KEYS) t = e.PRINTABLE_KEYS[n].toLowerCase(), e[t] = parseInt(n, 10); return r.mixin(e, e.MODIFIER_KEYS), r.mixin(e, e.PRINTABLE_KEYS), r.mixin(e, e.FUNCTION_KEYS), e.enter = e["return"], e.escape = e.esc, e.del = e["delete"], e[173] = "-", function () { var t = ["cmd", "ctrl", "alt", "shift"]; for (var n = Math.pow(2, t.length); n--;)e.KEY_MODS[n] = t.filter(function (t) { return n & e.KEY_MODS[t] }).join("-") + "-" }(), e.KEY_MODS[0] = "", e.KEY_MODS[-1] = "input-", e }(); r.mixin(t, i), t.keyCodeToString = function (e) { var t = i[e]; return typeof t != "string" && (t = String.fromCharCode(e)), t.toLowerCase() } }), define("ace/lib/event", ["require", "exports", "module", "ace/lib/keys", "ace/lib/useragent"], function (e, t, n) { "use strict"; function a() { u = !1; try { document.createComment("").addEventListener("test", function () { }, { get passive() { u = { passive: !1 } } }) } catch (e) { } } function f() { return u == undefined && a(), u } function l(e, t, n) { this.elem = e, this.type = t, this.callback = n } function d(e, t, n) { var u = p(t); if (!i.isMac && s) { t.getModifierState && (t.getModifierState("OS") || t.getModifierState("Win")) && (u |= 8); if (s.altGr) { if ((3 & u) == 3) return; s.altGr = 0 } if (n === 18 || n === 17) { var a = "location" in t ? t.location : t.keyLocation; if (n === 17 && a === 1) s[n] == 1 && (o = t.timeStamp); else if (n === 18 && u === 3 && a === 2) { var f = t.timeStamp - o; f < 50 && (s.altGr = !0) } } } n in r.MODIFIER_KEYS && (n = -1); if (!u && n === 13) { var a = "location" in t ? t.location : t.keyLocation; if (a === 3) { e(t, u, -n); if (t.defaultPrevented) return } } if (i.isChromeOS && u & 8) { e(t, u, n); if (t.defaultPrevented) return; u &= -9 } return !!u || n in r.FUNCTION_KEYS || n in r.PRINTABLE_KEYS ? e(t, u, n) : !1 } function v() { s = Object.create(null) } var r = e("./keys"), i = e("./useragent"), s = null, o = 0, u; l.prototype.destroy = function () { h(this.elem, this.type, this.callback), this.elem = this.type = this.callback = undefined }; var c = t.addListener = function (e, t, n, r) { e.addEventListener(t, n, f()), r && r.$toDestroy.push(new l(e, t, n)) }, h = t.removeListener = function (e, t, n) { e.removeEventListener(t, n, f()) }; t.stopEvent = function (e) { return t.stopPropagation(e), t.preventDefault(e), !1 }, t.stopPropagation = function (e) { e.stopPropagation && e.stopPropagation() }, t.preventDefault = function (e) { e.preventDefault && e.preventDefault() }, t.getButton = function (e) { return e.type == "dblclick" ? 0 : e.type == "contextmenu" || i.isMac && e.ctrlKey && !e.altKey && !e.shiftKey ? 2 : e.button }, t.capture = function (e, t, n) { function r(e) { t && t(e), n && n(e), h(document, "mousemove", t), h(document, "mouseup", r), h(document, "dragstart", r) } return c(document, "mousemove", t), c(document, "mouseup", r), c(document, "dragstart", r), r }, t.addMouseWheelListener = function (e, t, n) { "onmousewheel" in e ? c(e, "mousewheel", function (e) { var n = 8; e.wheelDeltaX !== undefined ? (e.wheelX = -e.wheelDeltaX / n, e.wheelY = -e.wheelDeltaY / n) : (e.wheelX = 0, e.wheelY = -e.wheelDelta / n), t(e) }, n) : "onwheel" in e ? c(e, "wheel", function (e) { var n = .35; switch (e.deltaMode) { case e.DOM_DELTA_PIXEL: e.wheelX = e.deltaX * n || 0, e.wheelY = e.deltaY * n || 0; break; case e.DOM_DELTA_LINE: case e.DOM_DELTA_PAGE: e.wheelX = (e.deltaX || 0) * 5, e.wheelY = (e.deltaY || 0) * 5 }t(e) }, n) : c(e, "DOMMouseScroll", function (e) { e.axis && e.axis == e.HORIZONTAL_AXIS ? (e.wheelX = (e.detail || 0) * 5, e.wheelY = 0) : (e.wheelX = 0, e.wheelY = (e.detail || 0) * 5), t(e) }, n) }, t.addMultiMouseDownListener = function (e, n, r, s, o) { function p(e) { t.getButton(e) !== 0 ? u = 0 : e.detail > 1 ? (u++, u > 4 && (u = 1)) : u = 1; if (i.isIE) { var o = Math.abs(e.clientX - a) > 5 || Math.abs(e.clientY - f) > 5; if (!l || o) u = 1; l && clearTimeout(l), l = setTimeout(function () { l = null }, n[u - 1] || 600), u == 1 && (a = e.clientX, f = e.clientY) } e._clicks = u, r[s]("mousedown", e); if (u > 4) u = 0; else if (u > 1) return r[s](h[u], e) } var u = 0, a, f, l, h = { 2: "dblclick", 3: "tripleclick", 4: "quadclick" }; Array.isArray(e) || (e = [e]), e.forEach(function (e) { c(e, "mousedown", p, o) }) }; var p = function (e) { return 0 | (e.ctrlKey ? 1 : 0) | (e.altKey ? 2 : 0) | (e.shiftKey ? 4 : 0) | (e.metaKey ? 8 : 0) }; t.getModifierString = function (e) { return r.KEY_MODS[p(e)] }, t.addCommandKeyListener = function (e, n, r) { if (i.isOldGecko || i.isOpera && !("KeyboardEvent" in window)) { var o = null; c(e, "keydown", function (e) { o = e.keyCode }, r), c(e, "keypress", function (e) { return d(n, e, o) }, r) } else { var u = null; c(e, "keydown", function (e) { s[e.keyCode] = (s[e.keyCode] || 0) + 1; var t = d(n, e, e.keyCode); return u = e.defaultPrevented, t }, r), c(e, "keypress", function (e) { u && (e.ctrlKey || e.altKey || e.shiftKey || e.metaKey) && (t.stopEvent(e), u = null) }, r), c(e, "keyup", function (e) { s[e.keyCode] = null }, r), s || (v(), c(window, "focus", v)) } }; if (typeof window == "object" && window.postMessage && !i.isOldIE) { var m = 1; t.nextTick = function (e, n) { n = n || window; var r = "zero-timeout-message-" + m++, i = function (s) { s.data == r && (t.stopPropagation(s), h(n, "message", i), e()) }; c(n, "message", i), n.postMessage(r, "*") } } t.$idleBlocked = !1, t.onIdle = function (e, n) { return setTimeout(function r() { t.$idleBlocked ? setTimeout(r, 100) : e() }, n) }, t.$idleBlockId = null, t.blockIdle = function (e) { t.$idleBlockId && clearTimeout(t.$idleBlockId), t.$idleBlocked = !0, t.$idleBlockId = setTimeout(function () { t.$idleBlocked = !1 }, e || 100) }, t.nextFrame = typeof window == "object" && (window.requestAnimationFrame || window.mozRequestAnimationFrame || window.webkitRequestAnimationFrame || window.msRequestAnimationFrame || window.oRequestAnimationFrame), t.nextFrame ? t.nextFrame = t.nextFrame.bind(window) : t.nextFrame = function (e) { setTimeout(e, 17) } }), define("ace/range", ["require", "exports", "module"], function (e, t, n) { "use strict"; var r = function (e, t) { return e.row - t.row || e.column - t.column }, i = function (e, t, n, r) { this.start = { row: e, column: t }, this.end = { row: n, column: r } }; (function () { this.isEqual = function (e) { return this.start.row === e.start.row && this.end.row === e.end.row && this.start.column === e.start.column && this.end.column === e.end.column }, this.toString = function () { return "Range: [" + this.start.row + "/" + this.start.column + "] -> [" + this.end.row + "/" + this.end.column + "]" }, this.contains = function (e, t) { return this.compare(e, t) == 0 }, this.compareRange = function (e) { var t, n = e.end, r = e.start; return t = this.compare(n.row, n.column), t == 1 ? (t = this.compare(r.row, r.column), t == 1 ? 2 : t == 0 ? 1 : 0) : t == -1 ? -2 : (t = this.compare(r.row, r.column), t == -1 ? -1 : t == 1 ? 42 : 0) }, this.comparePoint = function (e) { return this.compare(e.row, e.column) }, this.containsRange = function (e) { return this.comparePoint(e.start) == 0 && this.comparePoint(e.end) == 0 }, this.intersects = function (e) { var t = this.compareRange(e); return t == -1 || t == 0 || t == 1 }, this.isEnd = function (e, t) { return this.end.row == e && this.end.column == t }, this.isStart = function (e, t) { return this.start.row == e && this.start.column == t }, this.setStart = function (e, t) { typeof e == "object" ? (this.start.column = e.column, this.start.row = e.row) : (this.start.row = e, this.start.column = t) }, this.setEnd = function (e, t) { typeof e == "object" ? (this.end.column = e.column, this.end.row = e.row) : (this.end.row = e, this.end.column = t) }, this.inside = function (e, t) { return this.compare(e, t) == 0 ? this.isEnd(e, t) || this.isStart(e, t) ? !1 : !0 : !1 }, this.insideStart = function (e, t) { return this.compare(e, t) == 0 ? this.isEnd(e, t) ? !1 : !0 : !1 }, this.insideEnd = function (e, t) { return this.compare(e, t) == 0 ? this.isStart(e, t) ? !1 : !0 : !1 }, this.compare = function (e, t) { return !this.isMultiLine() && e === this.start.row ? t < this.start.column ? -1 : t > this.end.column ? 1 : 0 : e < this.start.row ? -1 : e > this.end.row ? 1 : this.start.row === e ? t >= this.start.column ? 0 : -1 : this.end.row === e ? t <= this.end.column ? 0 : 1 : 0 }, this.compareStart = function (e, t) { return this.start.row == e && this.start.column == t ? -1 : this.compare(e, t) }, this.compareEnd = function (e, t) { return this.end.row == e && this.end.column == t ? 1 : this.compare(e, t) }, this.compareInside = function (e, t) { return this.end.row == e && this.end.column == t ? 1 : this.start.row == e && this.start.column == t ? -1 : this.compare(e, t) }, this.clipRows = function (e, t) { if (this.end.row > t) var n = { row: t + 1, column: 0 }; else if (this.end.row < e) var n = { row: e, column: 0 }; if (this.start.row > t) var r = { row: t + 1, column: 0 }; else if (this.start.row < e) var r = { row: e, column: 0 }; return i.fromPoints(r || this.start, n || this.end) }, this.extend = function (e, t) { var n = this.compare(e, t); if (n == 0) return this; if (n == -1) var r = { row: e, column: t }; else var s = { row: e, column: t }; return i.fromPoints(r || this.start, s || this.end) }, this.isEmpty = function () { return this.start.row === this.end.row && this.start.column === this.end.column }, this.isMultiLine = function () { return this.start.row !== this.end.row }, this.clone = function () { return i.fromPoints(this.start, this.end) }, this.collapseRows = function () { return this.end.column == 0 ? new i(this.start.row, 0, Math.max(this.start.row, this.end.row - 1), 0) : new i(this.start.row, 0, this.end.row, 0) }, this.toScreenRange = function (e) { var t = e.documentToScreenPosition(this.start), n = e.documentToScreenPosition(this.end); return new i(t.row, t.column, n.row, n.column) }, this.moveBy = function (e, t) { this.start.row += e, this.start.column += t, this.end.row += e, this.end.column += t } }).call(i.prototype), i.fromPoints = function (e, t) { return new i(e.row, e.column, t.row, t.column) }, i.comparePoints = r, i.comparePoints = function (e, t) { return e.row - t.row || e.column - t.column }, t.Range = i }), define("ace/lib/lang", ["require", "exports", "module"], function (e, t, n) { "use strict"; t.last = function (e) { return e[e.length - 1] }, t.stringReverse = function (e) { return e.split("").reverse().join("") }, t.stringRepeat = function (e, t) { var n = ""; while (t > 0) { t & 1 && (n += e); if (t >>= 1) e += e } return n }; var r = /^\s\s*/, i = /\s\s*$/; t.stringTrimLeft = function (e) { return e.replace(r, "") }, t.stringTrimRight = function (e) { return e.replace(i, "") }, t.copyObject = function (e) { var t = {}; for (var n in e) t[n] = e[n]; return t }, t.copyArray = function (e) { var t = []; for (var n = 0, r = e.length; n < r; n++)e[n] && typeof e[n] == "object" ? t[n] = this.copyObject(e[n]) : t[n] = e[n]; return t }, t.deepCopy = function s(e) { if (typeof e != "object" || !e) return e; var t; if (Array.isArray(e)) { t = []; for (var n = 0; n < e.length; n++)t[n] = s(e[n]); return t } if (Object.prototype.toString.call(e) !== "[object Object]") return e; t = {}; for (var n in e) t[n] = s(e[n]); return t }, t.arrayToMap = function (e) { var t = {}; for (var n = 0; n < e.length; n++)t[e[n]] = 1; return t }, t.createMap = function (e) { var t = Object.create(null); for (var n in e) t[n] = e[n]; return t }, t.arrayRemove = function (e, t) { for (var n = 0; n <= e.length; n++)t === e[n] && e.splice(n, 1) }, t.escapeRegExp = function (e) { return e.replace(/([.*+?^${}()|[\]\/\\])/g, "\\$1") }, t.escapeHTML = function (e) { return ("" + e).replace(/&/g, "&#38;").replace(/"/g, "&#34;").replace(/'/g, "&#39;").replace(/</g, "&#60;") }, t.getMatchOffsets = function (e, t) { var n = []; return e.replace(t, function (e) { n.push({ offset: arguments[arguments.length - 2], length: e.length }) }), n }, t.deferredCall = function (e) { var t = null, n = function () { t = null, e() }, r = function (e) { return r.cancel(), t = setTimeout(n, e || 0), r }; return r.schedule = r, r.call = function () { return this.cancel(), e(), r }, r.cancel = function () { return clearTimeout(t), t = null, r }, r.isPending = function () { return t }, r }, t.delayedCall = function (e, t) { var n = null, r = function () { n = null, e() }, i = function (e) { n == null && (n = setTimeout(r, e || t)) }; return i.delay = function (e) { n && clearTimeout(n), n = setTimeout(r, e || t) }, i.schedule = i, i.call = function () { this.cancel(), e() }, i.cancel = function () { n && clearTimeout(n), n = null }, i.isPending = function () { return n }, i } }), define("ace/clipboard", ["require", "exports", "module"], function (e, t, n) { "use strict"; var r; n.exports = { lineMode: !1, pasteCancelled: function () { return r && r > Date.now() - 50 ? !0 : r = !1 }, cancel: function () { r = Date.now() } } }), define("ace/keyboard/textinput", ["require", "exports", "module", "ace/lib/event", "ace/lib/useragent", "ace/lib/dom", "ace/lib/lang", "ace/clipboard", "ace/lib/keys"], function (e, t, n) { "use strict"; var r = e("../lib/event"), i = e("../lib/useragent"), s = e("../lib/dom"), o = e("../lib/lang"), u = e("../clipboard"), a = i.isChrome < 18, f = i.isIE, l = i.isChrome > 63, c = 400, h = e("../lib/keys"), p = h.KEY_MODS, d = i.isIOS, v = d ? /\s/ : /\n/, m = i.isMobile, g = function (e, t) { function X() { x = !0, n.blur(), n.focus(), x = !1 } function $(e) { e.keyCode == 27 && n.value.length < n.selectionStart && (b || (T = n.value), N = C = -1, O()), V() } function K() { clearTimeout(J), J = setTimeout(function () { E && (n.style.cssText = E, E = ""), t.renderer.$isMousePressed = !1, t.renderer.$keepTextAreaAtCursor && t.renderer.$moveTextAreaToCursor() }, 0) } function G(e, t, n) { var r = null, i = !1; n.addEventListener("keydown", function (e) { r && clearTimeout(r), i = !0 }, !0), n.addEventListener("keyup", function (e) { r = setTimeout(function () { i = !1 }, 100) }, !0); var s = function (e) { if (document.activeElement !== n) return; if (i || b || t.$mouseHandler.isMousePressed) return; if (g) return; var r = n.selectionStart, s = n.selectionEnd, o = null, u = 0; if (r == 0) o = h.up; else if (r == 1) o = h.home; else if (s > C && T[s] == "\n") o = h.end; else if (r < N && T[r - 1] == " ") o = h.left, u = p.option; else if (r < N || r == N && C != N && r == s) o = h.left; else if (s > C && T.slice(0, s).split("\n").length > 2) o = h.down; else if (s > C && T[s - 1] == " ") o = h.right, u = p.option; else if (s > C || s == C && C != N && r == s) o = h.right; r !== s && (u |= p.shift); if (o) { var a = t.onCommandKey({}, u, o); if (!a && t.commands) { o = h.keyCodeToString(o); var f = t.commands.findKeyCommand(u, o); f && t.execCommand(f) } N = r, C = s, O("") } }; document.addEventListener("selectionchange", s), t.on("destroy", function () { document.removeEventListener("selectionchange", s) }) } var n = s.createElement("textarea"); n.className = "ace_text-input", n.setAttribute("wrap", "off"), n.setAttribute("autocorrect", "off"), n.setAttribute("autocapitalize", "off"), n.setAttribute("spellcheck", !1), n.style.opacity = "0", e.insertBefore(n, e.firstChild); var g = !1, y = !1, b = !1, w = !1, E = ""; m || (n.style.fontSize = "1px"); var S = !1, x = !1, T = "", N = 0, C = 0, k = 0; try { var L = document.activeElement === n } catch (A) { } r.addListener(n, "blur", function (e) { if (x) return; t.onBlur(e), L = !1 }, t), r.addListener(n, "focus", function (e) { if (x) return; L = !0; if (i.isEdge) try { if (!document.hasFocus()) return } catch (e) { } t.onFocus(e), i.isEdge ? setTimeout(O) : O() }, t), this.$focusScroll = !1, this.focus = function () { if (E || l || this.$focusScroll == "browser") return n.focus({ preventScroll: !0 }); var e = n.style.top; n.style.position = "fixed", n.style.top = "0px"; try { var t = n.getBoundingClientRect().top != 0 } catch (r) { return } var i = []; if (t) { var s = n.parentElement; while (s && s.nodeType == 1) i.push(s), s.setAttribute("ace_nocontext", !0), !s.parentElement && s.getRootNode ? s = s.getRootNode().host : s = s.parentElement } n.focus({ preventScroll: !0 }), t && i.forEach(function (e) { e.removeAttribute("ace_nocontext") }), setTimeout(function () { n.style.position = "", n.style.top == "0px" && (n.style.top = e) }, 0) }, this.blur = function () { n.blur() }, this.isFocused = function () { return L }, t.on("beforeEndOperation", function () { var e = t.curOp, r = e && e.command && e.command.name; if (r == "insertstring") return; var i = r && (e.docChanged || e.selectionChanged); b && i && (T = n.value = "", W()), O() }); var O = d ? function (e) { if (!L || g && !e || w) return; e || (e = ""); var r = "\n ab" + e + "cde fg\n"; r != n.value && (n.value = T = r); var i = 4, s = 4 + (e.length || (t.selection.isEmpty() ? 0 : 1)); (N != i || C != s) && n.setSelectionRange(i, s), N = i, C = s } : function () { if (b || w) return; if (!L && !P) return; b = !0; var e = 0, r = 0, i = ""; if (t.session) { var s = t.selection, o = s.getRange(), u = s.cursor.row; e = o.start.column, r = o.end.column, i = t.session.getLine(u); if (o.start.row != u) { var a = t.session.getLine(u - 1); e = o.start.row < u - 1 ? 0 : e, r += a.length + 1, i = a + "\n" + i } else if (o.end.row != u) { var f = t.session.getLine(u + 1); r = o.end.row > u + 1 ? f.length : r, r += i.length + 1, i = i + "\n" + f } else m && u > 0 && (i = "\n" + i, r += 1, e += 1); i.length > c && (e < c && r < c ? i = i.slice(0, c) : (i = "\n", e = 0, r = 1)) } var l = i + "\n\n"; l != T && (n.value = T = l, N = C = l.length), P && (N = n.selectionStart, C = n.selectionEnd); if (C != r || N != e || n.selectionEnd != C) try { n.setSelectionRange(e, r), N = e, C = r } catch (h) { } b = !1 }; this.resetSelection = O, L && t.onFocus(); var M = function (e) { return e.selectionStart === 0 && e.selectionEnd >= T.length && e.value === T && T && e.selectionEnd !== C }, _ = function (e) { if (b) return; g ? g = !1 : M(n) ? (t.selectAll(), O()) : m && n.selectionStart != N && O() }, D = null; this.setInputHandler = function (e) { D = e }, this.getInputHandler = function () { return D }; var P = !1, H = function (e, r) { P && (P = !1); if (y) return O(), e && t.onPaste(e), y = !1, ""; var i = n.selectionStart, s = n.selectionEnd, o = N, u = T.length - C, a = e, f = e.length - i, l = e.length - s, c = 0; while (o > 0 && T[c] == e[c]) c++, o--; a = a.slice(c), c = 1; while (u > 0 && T.length - c > N - 1 && T[T.length - c] == e[e.length - c]) c++, u--; f -= c - 1, l -= c - 1; var h = a.length - c + 1; return h < 0 && (o = -h, h = 0), a = a.slice(0, h), !r && !a && !f && !o && !u && !l ? "" : (w = !0, a && !o && !u && !f && !l || S ? t.onTextInput(a) : t.onTextInput(a, { extendLeft: o, extendRight: u, restoreStart: f, restoreEnd: l }), w = !1, T = e, N = i, C = s, k = l, a) }, B = function (e) { if (b) return z(); if (e && e.inputType) { if (e.inputType == "historyUndo") return t.execCommand("undo"); if (e.inputType == "historyRedo") return t.execCommand("redo") } var r = n.value, i = H(r, !0); (r.length > c + 100 || v.test(i) || m && N < 1 && N == C) && O() }, j = function (e, t, n) { var r = e.clipboardData || window.clipboardData; if (!r || a) return; var i = f || n ? "Text" : "text/plain"; try { return t ? r.setData(i, t) !== !1 : r.getData(i) } catch (e) { if (!n) return j(e, t, !0) } }, F = function (e, i) { var s = t.getCopyText(); if (!s) return r.preventDefault(e); j(e, s) ? (d && (O(s), g = s, setTimeout(function () { g = !1 }, 10)), i ? t.onCut() : t.onCopy(), r.preventDefault(e)) : (g = !0, n.value = s, n.select(), setTimeout(function () { g = !1, O(), i ? t.onCut() : t.onCopy() })) }, I = function (e) { F(e, !0) }, q = function (e) { F(e, !1) }, R = function (e) { var s = j(e); if (u.pasteCancelled()) return; typeof s == "string" ? (s && t.onPaste(s, e), i.isIE && setTimeout(O), r.preventDefault(e)) : (n.value = "", y = !0) }; r.addCommandKeyListener(n, t.onCommandKey.bind(t), t), r.addListener(n, "select", _, t), r.addListener(n, "input", B, t), r.addListener(n, "cut", I, t), r.addListener(n, "copy", q, t), r.addListener(n, "paste", R, t), (!("oncut" in n) || !("oncopy" in n) || !("onpaste" in n)) && r.addListener(e, "keydown", function (e) { if (i.isMac && !e.metaKey || !e.ctrlKey) return; switch (e.keyCode) { case 67: q(e); break; case 86: R(e); break; case 88: I(e) } }, t); var U = function (e) { if (b || !t.onCompositionStart || t.$readOnly) return; b = {}; if (S) return; e.data && (b.useTextareaForIME = !1), setTimeout(z, 0), t._signal("compositionStart"), t.on("mousedown", X); var r = t.getSelectionRange(); r.end.row = r.start.row, r.end.column = r.start.column, b.markerRange = r, b.selectionStart = N, t.onCompositionStart(b), b.useTextareaForIME ? (T = n.value = "", N = 0, C = 0) : (n.msGetInputContext && (b.context = n.msGetInputContext()), n.getInputContext && (b.context = n.getInputContext())) }, z = function () { if (!b || !t.onCompositionUpdate || t.$readOnly) return; if (S) return X(); if (b.useTextareaForIME) t.onCompositionUpdate(n.value); else { var e = n.value; H(e), b.markerRange && (b.context && (b.markerRange.start.column = b.selectionStart = b.context.compositionStartOffset), b.markerRange.end.column = b.markerRange.start.column + C - b.selectionStart + k) } }, W = function (e) { if (!t.onCompositionEnd || t.$readOnly) return; b = !1, t.onCompositionEnd(), t.off("mousedown", X), e && B() }, V = o.delayedCall(z, 50).schedule.bind(null, null); r.addListener(n, "compositionstart", U, t), r.addListener(n, "compositionupdate", z, t), r.addListener(n, "keyup", $, t), r.addListener(n, "keydown", V, t), r.addListener(n, "compositionend", W, t), this.getElement = function () { return n }, this.setCommandMode = function (e) { S = e, n.readOnly = !1 }, this.setReadOnly = function (e) { S || (n.readOnly = e) }, this.setCopyWithEmptySelection = function (e) { }, this.onContextMenu = function (e) { P = !0, O(), t._emit("nativecontextmenu", { target: t, domEvent: e }), this.moveToMouse(e, !0) }, this.moveToMouse = function (e, o) { E || (E = n.style.cssText), n.style.cssText = (o ? "z-index:100000;" : "") + (i.isIE ? "opacity:0.1;" : "") + "text-indent: -" + (N + C) * t.renderer.characterWidth * .5 + "px;"; var u = t.container.getBoundingClientRect(), a = s.computedStyle(t.container), f = u.top + (parseInt(a.borderTopWidth) || 0), l = u.left + (parseInt(u.borderLeftWidth) || 0), c = u.bottom - f - n.clientHeight - 2, h = function (e) { s.translate(n, e.clientX - l - 2, Math.min(e.clientY - f - 2, c)) }; h(e); if (e.type != "mousedown") return; t.renderer.$isMousePressed = !0, clearTimeout(J), i.isWin && r.capture(t.container, h, K) }, this.onContextMenuClose = K; var J, Q = function (e) { t.textInput.onContextMenu(e), K() }; r.addListener(n, "mouseup", Q, t), r.addListener(n, "mousedown", function (e) { e.preventDefault(), K() }, t), r.addListener(t.renderer.scroller, "contextmenu", Q, t), r.addListener(n, "contextmenu", Q, t), d && G(e, t, n) }; t.TextInput = g, t.$setUserAgentForTests = function (e, t) { m = e, d = t } }), define("ace/mouse/default_handlers", ["require", "exports", "module", "ace/lib/useragent"], function (e, t, n) { "use strict"; function o(e) { e.$clickSelection = null; var t = e.editor; t.setDefaultHandler("mousedown", this.onMouseDown.bind(e)), t.setDefaultHandler("dblclick", this.onDoubleClick.bind(e)), t.setDefaultHandler("tripleclick", this.onTripleClick.bind(e)), t.setDefaultHandler("quadclick", this.onQuadClick.bind(e)), t.setDefaultHandler("mousewheel", this.onMouseWheel.bind(e)); var n = ["select", "startSelect", "selectEnd", "selectAllEnd", "selectByWordsEnd", "selectByLinesEnd", "dragWait", "dragWaitEnd", "focusWait"]; n.forEach(function (t) { e[t] = this[t] }, this), e.selectByLines = this.extendSelectionBy.bind(e, "getLineRange"), e.selectByWords = this.extendSelectionBy.bind(e, "getWordRange") } function u(e, t, n, r) { return Math.sqrt(Math.pow(n - e, 2) + Math.pow(r - t, 2)) } function a(e, t) { if (e.start.row == e.end.row) var n = 2 * t.column - e.start.column - e.end.column; else if (e.start.row == e.end.row - 1 && !e.start.column && !e.end.column) var n = t.column - 4; else var n = 2 * t.row - e.start.row - e.end.row; return n < 0 ? { cursor: e.start, anchor: e.end } : { cursor: e.end, anchor: e.start } } var r = e("../lib/useragent"), i = 0, s = 550; (function () { this.onMouseDown = function (e) { var t = e.inSelection(), n = e.getDocumentPosition(); this.mousedownEvent = e; var i = this.editor, s = e.getButton(); if (s !== 0) { var o = i.getSelectionRange(), u = o.isEmpty(); (u || s == 1) && i.selection.moveToPosition(n), s == 2 && (i.textInput.onContextMenu(e.domEvent), r.isMozilla || e.preventDefault()); return } this.mousedownEvent.time = Date.now(); if (t && !i.isFocused()) { i.focus(); if (this.$focusTimeout && !this.$clickSelection && !i.inMultiSelectMode) { this.setState("focusWait"), this.captureMouse(e); return } } return this.captureMouse(e), this.startSelect(n, e.domEvent._clicks > 1), e.preventDefault() }, this.startSelect = function (e, t) { e = e || this.editor.renderer.screenToTextCoordinates(this.x, this.y); var n = this.editor; if (!this.mousedownEvent) return; this.mousedownEvent.getShiftKey() ? n.selection.selectToPosition(e) : t || n.selection.moveToPosition(e), t || this.select(), n.renderer.scroller.setCapture && n.renderer.scroller.setCapture(), n.setStyle("ace_selecting"), this.setState("select") }, this.select = function () { var e, t = this.editor, n = t.renderer.screenToTextCoordinates(this.x, this.y); if (this.$clickSelection) { var r = this.$clickSelection.comparePoint(n); if (r == -1) e = this.$clickSelection.end; else if (r == 1) e = this.$clickSelection.start; else { var i = a(this.$clickSelection, n); n = i.cursor, e = i.anchor } t.selection.setSelectionAnchor(e.row, e.column) } t.selection.selectToPosition(n), t.renderer.scrollCursorIntoView() }, this.extendSelectionBy = function (e) { var t, n = this.editor, r = n.renderer.screenToTextCoordinates(this.x, this.y), i = n.selection[e](r.row, r.column); if (this.$clickSelection) { var s = this.$clickSelection.comparePoint(i.start), o = this.$clickSelection.comparePoint(i.end); if (s == -1 && o <= 0) { t = this.$clickSelection.end; if (i.end.row != r.row || i.end.column != r.column) r = i.start } else if (o == 1 && s >= 0) { t = this.$clickSelection.start; if (i.start.row != r.row || i.start.column != r.column) r = i.end } else if (s == -1 && o == 1) r = i.end, t = i.start; else { var u = a(this.$clickSelection, r); r = u.cursor, t = u.anchor } n.selection.setSelectionAnchor(t.row, t.column) } n.selection.selectToPosition(r), n.renderer.scrollCursorIntoView() }, this.selectEnd = this.selectAllEnd = this.selectByWordsEnd = this.selectByLinesEnd = function () { this.$clickSelection = null, this.editor.unsetStyle("ace_selecting"), this.editor.renderer.scroller.releaseCapture && this.editor.renderer.scroller.releaseCapture() }, this.focusWait = function () { var e = u(this.mousedownEvent.x, this.mousedownEvent.y, this.x, this.y), t = Date.now(); (e > i || t - this.mousedownEvent.time > this.$focusTimeout) && this.startSelect(this.mousedownEvent.getDocumentPosition()) }, this.onDoubleClick = function (e) { var t = e.getDocumentPosition(), n = this.editor, r = n.session, i = r.getBracketRange(t); i ? (i.isEmpty() && (i.start.column--, i.end.column++), this.setState("select")) : (i = n.selection.getWordRange(t.row, t.column), this.setState("selectByWords")), this.$clickSelection = i, this.select() }, this.onTripleClick = function (e) { var t = e.getDocumentPosition(), n = this.editor; this.setState("selectByLines"); var r = n.getSelectionRange(); r.isMultiLine() && r.contains(t.row, t.column) ? (this.$clickSelection = n.selection.getLineRange(r.start.row), this.$clickSelection.end = n.selection.getLineRange(r.end.row).end) : this.$clickSelection = n.selection.getLineRange(t.row), this.select() }, this.onQuadClick = function (e) { var t = this.editor; t.selectAll(), this.$clickSelection = t.getSelectionRange(), this.setState("selectAll") }, this.onMouseWheel = function (e) { if (e.getAccelKey()) return; e.getShiftKey() && e.wheelY && !e.wheelX && (e.wheelX = e.wheelY, e.wheelY = 0); var t = this.editor; this.$lastScroll || (this.$lastScroll = { t: 0, vx: 0, vy: 0, allowed: 0 }); var n = this.$lastScroll, r = e.domEvent.timeStamp, i = r - n.t, o = i ? e.wheelX / i : n.vx, u = i ? e.wheelY / i : n.vy; i < s && (o = (o + n.vx) / 2, u = (u + n.vy) / 2); var a = Math.abs(o / u), f = !1; a >= 1 && t.renderer.isScrollableBy(e.wheelX * e.speed, 0) && (f = !0), a <= 1 && t.renderer.isScrollableBy(0, e.wheelY * e.speed) && (f = !0); if (f) n.allowed = r; else if (r - n.allowed < s) { var l = Math.abs(o) <= 1.5 * Math.abs(n.vx) && Math.abs(u) <= 1.5 * Math.abs(n.vy); l ? (f = !0, n.allowed = r) : n.allowed = 0 } n.t = r, n.vx = o, n.vy = u; if (f) return t.renderer.scrollBy(e.wheelX * e.speed, e.wheelY * e.speed), e.stop() } }).call(o.prototype), t.DefaultHandlers = o }), define("ace/tooltip", ["require", "exports", "module", "ace/lib/oop", "ace/lib/dom"], function (e, t, n) { "use strict"; function s(e) { this.isOpen = !1, this.$element = null, this.$parentNode = e } var r = e("./lib/oop"), i = e("./lib/dom"); (function () { this.$init = function () { return this.$element = i.createElement("div"), this.$element.className = "ace_tooltip", this.$element.style.display = "none", this.$parentNode.appendChild(this.$element), this.$element }, this.getElement = function () { return this.$element || this.$init() }, this.setText = function (e) { this.getElement().textContent = e }, this.setHtml = function (e) { this.getElement().innerHTML = e }, this.setPosition = function (e, t) { this.getElement().style.left = e + "px", this.getElement().style.top = t + "px" }, this.setClassName = function (e) { i.addCssClass(this.getElement(), e) }, this.show = function (e, t, n) { e != null && this.setText(e), t != null && n != null && this.setPosition(t, n), this.isOpen || (this.getElement().style.display = "block", this.isOpen = !0) }, this.hide = function () { this.isOpen && (this.getElement().style.display = "none", this.isOpen = !1) }, this.getHeight = function () { return this.getElement().offsetHeight }, this.getWidth = function () { return this.getElement().offsetWidth }, this.destroy = function () { this.isOpen = !1, this.$element && this.$element.parentNode && this.$element.parentNode.removeChild(this.$element) } }).call(s.prototype), t.Tooltip = s }), define("ace/mouse/default_gutter_handler", ["require", "exports", "module", "ace/lib/dom", "ace/lib/oop", "ace/lib/event", "ace/tooltip"], function (e, t, n) { "use strict"; function u(e) { function l() { var r = u.getDocumentPosition().row, s = n.$annotations[r]; if (!s) return c(); var o = t.session.getLength(); if (r == o) { var a = t.renderer.pixelToScreenCoordinates(0, u.y).row, l = u.$pos; if (a > t.session.documentToScreenRow(l.row, l.column)) return c() } if (f == s) return; f = s.text.join("<br/>"), i.setHtml(f), i.show(), t._signal("showGutterTooltip", i), t.on("mousewheel", c); if (e.$tooltipFollowsMouse) h(u); else { var p = u.domEvent.target, d = p.getBoundingClientRect(), v = i.getElement().style; v.left = d.right + "px", v.top = d.bottom + "px" } } function c() { o && (o = clearTimeout(o)), f && (i.hide(), f = null, t._signal("hideGutterTooltip", i), t.off("mousewheel", c)) } function h(e) { i.setPosition(e.x, e.y) } var t = e.editor, n = t.renderer.$gutterLayer, i = new a(t.container); e.editor.setDefaultHandler("guttermousedown", function (r) { if (!t.isFocused() || r.getButton() != 0) return; var i = n.getRegion(r); if (i == "foldWidgets") return; var s = r.getDocumentPosition().row, o = t.session.selection; if (r.getShiftKey()) o.selectTo(s, 0); else { if (r.domEvent.detail == 2) return t.selectAll(), r.preventDefault(); e.$clickSelection = t.selection.getLineRange(s) } return e.setState("selectByLines"), e.captureMouse(r), r.preventDefault() }); var o, u, f; e.editor.setDefaultHandler("guttermousemove", function (t) { var n = t.domEvent.target || t.domEvent.srcElement; if (r.hasCssClass(n, "ace_fold-widget")) return c(); f && e.$tooltipFollowsMouse && h(t), u = t; if (o) return; o = setTimeout(function () { o = null, u && !e.isMousePressed ? l() : c() }, 50) }), s.addListener(t.renderer.$gutter, "mouseout", function (e) { u = null; if (!f || o) return; o = setTimeout(function () { o = null, c() }, 50) }, t), t.on("changeSession", c) } function a(e) { o.call(this, e) } var r = e("../lib/dom"), i = e("../lib/oop"), s = e("../lib/event"), o = e("../tooltip").Tooltip; i.inherits(a, o), function () { this.setPosition = function (e, t) { var n = window.innerWidth || document.documentElement.clientWidth, r = window.innerHeight || document.documentElement.clientHeight, i = this.getWidth(), s = this.getHeight(); e += 15, t += 15, e + i > n && (e -= e + i - n), t + s > r && (t -= 20 + s), o.prototype.setPosition.call(this, e, t) } }.call(a.prototype), t.GutterHandler = u }), define("ace/mouse/mouse_event", ["require", "exports", "module", "ace/lib/event", "ace/lib/useragent"], function (e, t, n) { "use strict"; var r = e("../lib/event"), i = e("../lib/useragent"), s = t.MouseEvent = function (e, t) { this.domEvent = e, this.editor = t, this.x = this.clientX = e.clientX, this.y = this.clientY = e.clientY, this.$pos = null, this.$inSelection = null, this.propagationStopped = !1, this.defaultPrevented = !1 }; (function () { this.stopPropagation = function () { r.stopPropagation(this.domEvent), this.propagationStopped = !0 }, this.preventDefault = function () { r.preventDefault(this.domEvent), this.defaultPrevented = !0 }, this.stop = function () { this.stopPropagation(), this.preventDefault() }, this.getDocumentPosition = function () { return this.$pos ? this.$pos : (this.$pos = this.editor.renderer.screenToTextCoordinates(this.clientX, this.clientY), this.$pos) }, this.inSelection = function () { if (this.$inSelection !== null) return this.$inSelection; var e = this.editor, t = e.getSelectionRange(); if (t.isEmpty()) this.$inSelection = !1; else { var n = this.getDocumentPosition(); this.$inSelection = t.contains(n.row, n.column) } return this.$inSelection }, this.getButton = function () { return r.getButton(this.domEvent) }, this.getShiftKey = function () { return this.domEvent.shiftKey }, this.getAccelKey = i.isMac ? function () { return this.domEvent.metaKey } : function () { return this.domEvent.ctrlKey } }).call(s.prototype) }), define("ace/mouse/dragdrop_handler", ["require", "exports", "module", "ace/lib/dom", "ace/lib/event", "ace/lib/useragent"], function (e, t, n) { "use strict"; function f(e) { function T(e, n) { var r = Date.now(), i = !n || e.row != n.row, s = !n || e.column != n.column; if (!S || i || s) t.moveCursorToPosition(e), S = r, x = { x: p, y: d }; else { var o = l(x.x, x.y, p, d); o > a ? S = null : r - S >= u && (t.renderer.scrollCursorIntoView(), S = null) } } function N(e, n) { var r = Date.now(), i = t.renderer.layerConfig.lineHeight, s = t.renderer.layerConfig.characterWidth, u = t.renderer.scroller.getBoundingClientRect(), a = { x: { left: p - u.left, right: u.right - p }, y: { top: d - u.top, bottom: u.bottom - d } }, f = Math.min(a.x.left, a.x.right), l = Math.min(a.y.top, a.y.bottom), c = { row: e.row, column: e.column }; f / s <= 2 && (c.column += a.x.left < a.x.right ? -3 : 2), l / i <= 1 && (c.row += a.y.top < a.y.bottom ? -1 : 1); var h = e.row != c.row, v = e.column != c.column, m = !n || e.row != n.row; h || v && !m ? E ? r - E >= o && t.renderer.scrollCursorIntoView(c) : E = r : E = null } function C() { var e = g; g = t.renderer.screenToTextCoordinates(p, d), T(g, e), N(g, e) } function k() { m = t.selection.toOrientedRange(), h = t.session.addMarker(m, "ace_selection", t.getSelectionStyle()), t.clearSelection(), t.isFocused() && t.renderer.$cursorLayer.setBlinking(!1), clearInterval(v), C(), v = setInterval(C, 20), y = 0, i.addListener(document, "mousemove", O) } function L() { clearInterval(v), t.session.removeMarker(h), h = null, t.selection.fromOrientedRange(m), t.isFocused() && !w && t.$resetCursorStyle(), m = null, g = null, y = 0, E = null, S = null, i.removeListener(document, "mousemove", O) } function O() { A == null && (A = setTimeout(function () { A != null && h && L() }, 20)) } function M(e) { var t = e.types; return !t || Array.prototype.some.call(t, function (e) { return e == "text/plain" || e == "Text" }) } function _(e) { var t = ["copy", "copymove", "all", "uninitialized"], n = ["move", "copymove", "linkmove", "all", "uninitialized"], r = s.isMac ? e.altKey : e.ctrlKey, i = "uninitialized"; try { i = e.dataTransfer.effectAllowed.toLowerCase() } catch (e) { } var o = "none"; return r && t.indexOf(i) >= 0 ? o = "copy" : n.indexOf(i) >= 0 ? o = "move" : t.indexOf(i) >= 0 && (o = "copy"), o } var t = e.editor, n = r.createElement("img"); n.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==", s.isOpera && (n.style.cssText = "width:1px;height:1px;position:fixed;top:0;left:0;z-index:2147483647;opacity:0;"); var f = ["dragWait", "dragWaitEnd", "startDrag", "dragReadyEnd", "onMouseDrag"]; f.forEach(function (t) { e[t] = this[t] }, this), t.on("mousedown", this.onMouseDown.bind(e)); var c = t.container, h, p, d, v, m, g, y = 0, b, w, E, S, x; this.onDragStart = function (e) { if (this.cancelDrag || !c.draggable) { var r = this; return setTimeout(function () { r.startSelect(), r.captureMouse(e) }, 0), e.preventDefault() } m = t.getSelectionRange(); var i = e.dataTransfer; i.effectAllowed = t.getReadOnly() ? "copy" : "copyMove", s.isOpera && (t.container.appendChild(n), n.scrollTop = 0), i.setDragImage && i.setDragImage(n, 0, 0), s.isOpera && t.container.removeChild(n), i.clearData(), i.setData("Text", t.session.getTextRange()), w = !0, this.setState("drag") }, this.onDragEnd = function (e) { c.draggable = !1, w = !1, this.setState(null); if (!t.getReadOnly()) { var n = e.dataTransfer.dropEffect; !b && n == "move" && t.session.remove(t.getSelectionRange()), t.$resetCursorStyle() } this.editor.unsetStyle("ace_dragging"), this.editor.renderer.setCursorStyle("") }, this.onDragEnter = function (e) { if (t.getReadOnly() || !M(e.dataTransfer)) return; return p = e.clientX, d = e.clientY, h || k(), y++, e.dataTransfer.dropEffect = b = _(e), i.preventDefault(e) }, this.onDragOver = function (e) { if (t.getReadOnly() || !M(e.dataTransfer)) return; return p = e.clientX, d = e.clientY, h || (k(), y++), A !== null && (A = null), e.dataTransfer.dropEffect = b = _(e), i.preventDefault(e) }, this.onDragLeave = function (e) { y--; if (y <= 0 && h) return L(), b = null, i.preventDefault(e) }, this.onDrop = function (e) { if (!g) return; var n = e.dataTransfer; if (w) switch (b) { case "move": m.contains(g.row, g.column) ? m = { start: g, end: g } : m = t.moveText(m, g); break; case "copy": m = t.moveText(m, g, !0) } else { var r = n.getData("Text"); m = { start: g, end: t.session.insert(g, r) }, t.focus(), b = null } return L(), i.preventDefault(e) }, i.addListener(c, "dragstart", this.onDragStart.bind(e), t), i.addListener(c, "dragend", this.onDragEnd.bind(e), t), i.addListener(c, "dragenter", this.onDragEnter.bind(e), t), i.addListener(c, "dragover", this.onDragOver.bind(e), t), i.addListener(c, "dragleave", this.onDragLeave.bind(e), t), i.addListener(c, "drop", this.onDrop.bind(e), t); var A = null } function l(e, t, n, r) { return Math.sqrt(Math.pow(n - e, 2) + Math.pow(r - t, 2)) } var r = e("../lib/dom"), i = e("../lib/event"), s = e("../lib/useragent"), o = 200, u = 200, a = 5; (function () { this.dragWait = function () { var e = Date.now() - this.mousedownEvent.time; e > this.editor.getDragDelay() && this.startDrag() }, this.dragWaitEnd = function () { var e = this.editor.container; e.draggable = !1, this.startSelect(this.mousedownEvent.getDocumentPosition()), this.selectEnd() }, this.dragReadyEnd = function (e) { this.editor.$resetCursorStyle(), this.editor.unsetStyle("ace_dragging"), this.editor.renderer.setCursorStyle(""), this.dragWaitEnd() }, this.startDrag = function () { this.cancelDrag = !1; var e = this.editor, t = e.container; t.draggable = !0, e.renderer.$cursorLayer.setBlinking(!1), e.setStyle("ace_dragging"); var n = s.isWin ? "default" : "move"; e.renderer.setCursorStyle(n), this.setState("dragReady") }, this.onMouseDrag = function (e) { var t = this.editor.container; if (s.isIE && this.state == "dragReady") { var n = l(this.mousedownEvent.x, this.mousedownEvent.y, this.x, this.y); n > 3 && t.dragDrop() } if (this.state === "dragWait") { var n = l(this.mousedownEvent.x, this.mousedownEvent.y, this.x, this.y); n > 0 && (t.draggable = !1, this.startSelect(this.mousedownEvent.getDocumentPosition())) } }, this.onMouseDown = function (e) { if (!this.$dragEnabled) return; this.mousedownEvent = e; var t = this.editor, n = e.inSelection(), r = e.getButton(), i = e.domEvent.detail || 1; if (i === 1 && r === 0 && n) { if (e.editor.inMultiSelectMode && (e.getAccelKey() || e.getShiftKey())) return; this.mousedownEvent.time = Date.now(); var o = e.domEvent.target || e.domEvent.srcElement; "unselectable" in o && (o.unselectable = "on"); if (t.getDragDelay()) { if (s.isWebKit) { this.cancelDrag = !0; var u = t.container; u.draggable = !0 } this.setState("dragWait") } else this.startDrag(); this.captureMouse(e, this.onMouseDrag.bind(this)), e.defaultPrevented = !0 } } }).call(f.prototype), t.DragdropHandler = f }), define("ace/mouse/touch_handler", ["require", "exports", "module", "ace/mouse/mouse_event", "ace/lib/event", "ace/lib/dom"], function (e, t, n) { "use strict"; var r = e("./mouse_event").MouseEvent, i = e("../lib/event"), s = e("../lib/dom"); t.addTouchListeners = function (e, t) { function b() { var e = window.navigator && window.navigator.clipboard, r = !1, i = function () { var n = t.getCopyText(), i = t.session.getUndoManager().hasUndo(); y.replaceChild(s.buildDom(r ? ["span", !n && ["span", { "class": "ace_mobile-button", action: "selectall" }, "Select All"], n && ["span", { "class": "ace_mobile-button", action: "copy" }, "Copy"], n && ["span", { "class": "ace_mobile-button", action: "cut" }, "Cut"], e && ["span", { "class": "ace_mobile-button", action: "paste" }, "Paste"], i && ["span", { "class": "ace_mobile-button", action: "undo" }, "Undo"], ["span", { "class": "ace_mobile-button", action: "find" }, "Find"], ["span", { "class": "ace_mobile-button", action: "openCommandPallete" }, "Pallete"]] : ["span"]), y.firstChild) }, o = function (n) { var s = n.target.getAttribute("action"); if (s == "more" || !r) return r = !r, i(); if (s == "paste") e.readText().then(function (e) { t.execCommand(s, e) }); else if (s) { if (s == "cut" || s == "copy") e ? e.writeText(t.getCopyText()) : document.execCommand("copy"); t.execCommand(s) } y.firstChild.style.display = "none", r = !1, s != "openCommandPallete" && t.focus() }; y = s.buildDom(["div", { "class": "ace_mobile-menu", ontouchstart: function (e) { n = "menu", e.stopPropagation(), e.preventDefault(), t.textInput.focus() }, ontouchend: function (e) { e.stopPropagation(), e.preventDefault(), o(e) }, onclick: o }, ["span"], ["span", { "class": "ace_mobile-button", action: "more" }, "..."]], t.container) } function w() { y || b(); var e = t.selection.cursor, n = t.renderer.textToScreenCoordinates(e.row, e.column), r = t.container.getBoundingClientRect(); y.style.top = n.pageY - r.top - 3 + "px", y.style.right = "10px", y.style.display = "", y.firstChild.style.display = "none", t.on("input", E) } function E(e) { y && (y.style.display = "none"), t.off("input", E) } function S() { l = null, clearTimeout(l); var e = t.selection.getRange(), r = e.contains(p.row, p.column); if (e.isEmpty() || !r) t.selection.moveToPosition(p), t.selection.selectWord(); n = "wait", w() } function x() { l = null, clearTimeout(l), t.selection.moveToPosition(p); var e = d >= 2 ? t.selection.getLineRange(p.row) : t.session.getBracketRange(p); e && !e.isEmpty() ? t.selection.setRange(e) : t.selection.selectWord(), n = "wait" } function T() { h += 60, c = setInterval(function () { h-- <= 0 && (clearInterval(c), c = null), Math.abs(v) < .01 && (v = 0), Math.abs(m) < .01 && (m = 0), h < 20 && (v = .9 * v), h < 20 && (m = .9 * m); var e = t.session.getScrollTop(); t.renderer.scrollBy(10 * v, 10 * m), e == t.session.getScrollTop() && (h = 0) }, 10) } var n = "scroll", o, u, a, f, l, c, h = 0, p, d = 0, v = 0, m = 0, g, y; i.addListener(e, "contextmenu", function (e) { if (!g) return; var n = t.textInput.getElement(); n.focus() }, t), i.addListener(e, "touchstart", function (e) { var i = e.touches; if (l || i.length > 1) { clearTimeout(l), l = null, a = -1, n = "zoom"; return } g = t.$mouseHandler.isMousePressed = !0; var s = t.renderer.layerConfig.lineHeight, c = t.renderer.layerConfig.lineHeight, y = e.timeStamp; f = y; var b = i[0], w = b.clientX, E = b.clientY; Math.abs(o - w) + Math.abs(u - E) > s && (a = -1), o = e.clientX = w, u = e.clientY = E, v = m = 0; var T = new r(e, t); p = T.getDocumentPosition(); if (y - a < 500 && i.length == 1 && !h) d++, e.preventDefault(), e.button = 0, x(); else { d = 0; var N = t.selection.cursor, C = t.selection.isEmpty() ? N : t.selection.anchor, k = t.renderer.$cursorLayer.getPixelPosition(N, !0), L = t.renderer.$cursorLayer.getPixelPosition(C, !0), A = t.renderer.scroller.getBoundingClientRect(), O = function (e, t) { return e /= c, t = t / s - .75, e * e + t * t }; if (e.clientX < A.left) { n = "zoom"; return } var M = O(e.clientX - A.left - k.left, e.clientY - A.top - k.top), _ = O(e.clientX - A.left - L.left, e.clientY - A.top - L.top); M < 3.5 && _ < 3.5 && (n = M > _ ? "cursor" : "anchor"), _ < 3.5 ? n = "anchor" : M < 3.5 ? n = "cursor" : n = "scroll", l = setTimeout(S, 450) } a = y }, t), i.addListener(e, "touchend", function (e) { g = t.$mouseHandler.isMousePressed = !1, c && clearInterval(c), n == "zoom" ? (n = "", h = 0) : l ? (t.selection.moveToPosition(p), h = 0, w()) : n == "scroll" ? (T(), E()) : w(), clearTimeout(l), l = null }, t), i.addListener(e, "touchmove", function (e) { l && (clearTimeout(l), l = null); var i = e.touches; if (i.length > 1 || n == "zoom") return; var s = i[0], a = o - s.clientX, c = u - s.clientY; if (n == "wait") { if (!(a * a + c * c > 4)) return e.preventDefault(); n = "cursor" } o = s.clientX, u = s.clientY, e.clientX = s.clientX, e.clientY = s.clientY; var h = e.timeStamp, p = h - f; f = h; if (n == "scroll") { var d = new r(e, t); d.speed = 1, d.wheelX = a, d.wheelY = c, 10 * Math.abs(a) < Math.abs(c) && (a = 0), 10 * Math.abs(c) < Math.abs(a) && (c = 0), p != 0 && (v = a / p, m = c / p), t._emit("mousewheel", d), d.propagationStopped || (v = m = 0) } else { var g = new r(e, t), y = g.getDocumentPosition(); n == "cursor" ? t.selection.moveCursorToPosition(y) : n == "anchor" && t.selection.setSelectionAnchor(y.row, y.column), t.renderer.scrollCursorIntoView(y), e.preventDefault() } }, t) } }), define("ace/lib/net", ["require", "exports", "module", "ace/lib/dom"], function (e, t, n) { "use strict"; var r = e("./dom"); t.get = function (e, t) { var n = new XMLHttpRequest; n.open("GET", e, !0), n.onreadystatechange = function () { n.readyState === 4 && t(n.responseText) }, n.send(null) }, t.loadScript = function (e, t) { var n = r.getDocumentHead(), i = document.createElement("script"); i.src = e, n.appendChild(i), i.onload = i.onreadystatechange = function (e, n) { if (n || !i.readyState || i.readyState == "loaded" || i.readyState == "complete") i = i.onload = i.onreadystatechange = null, n || t() } }, t.qualifyURL = function (e) { var t = document.createElement("a"); return t.href = e, t.href } }), define("ace/lib/event_emitter", ["require", "exports", "module"], function (e, t, n) { "use strict"; var r = {}, i = function () { this.propagationStopped = !0 }, s = function () { this.defaultPrevented = !0 }; r._emit = r._dispatchEvent = function (e, t) { this._eventRegistry || (this._eventRegistry = {}), this._defaultHandlers || (this._defaultHandlers = {}); var n = this._eventRegistry[e] || [], r = this._defaultHandlers[e]; if (!n.length && !r) return; if (typeof t != "object" || !t) t = {}; t.type || (t.type = e), t.stopPropagation || (t.stopPropagation = i), t.preventDefault || (t.preventDefault = s), n = n.slice(); for (var o = 0; o < n.length; o++) { n[o](t, this); if (t.propagationStopped) break } if (r && !t.defaultPrevented) return r(t, this) }, r._signal = function (e, t) { var n = (this._eventRegistry || {})[e]; if (!n) return; n = n.slice(); for (var r = 0; r < n.length; r++)n[r](t, this) }, r.once = function (e, t) { var n = this; this.on(e, function r() { n.off(e, r), t.apply(null, arguments) }); if (!t) return new Promise(function (e) { t = e }) }, r.setDefaultHandler = function (e, t) { var n = this._defaultHandlers; n || (n = this._defaultHandlers = { _disabled_: {} }); if (n[e]) { var r = n[e], i = n._disabled_[e]; i || (n._disabled_[e] = i = []), i.push(r); var s = i.indexOf(t); s != -1 && i.splice(s, 1) } n[e] = t }, r.removeDefaultHandler = function (e, t) { var n = this._defaultHandlers; if (!n) return; var r = n._disabled_[e]; if (n[e] == t) r && this.setDefaultHandler(e, r.pop()); else if (r) { var i = r.indexOf(t); i != -1 && r.splice(i, 1) } }, r.on = r.addEventListener = function (e, t, n) { this._eventRegistry = this._eventRegistry || {}; var r = this._eventRegistry[e]; return r || (r = this._eventRegistry[e] = []), r.indexOf(t) == -1 && r[n ? "unshift" : "push"](t), t }, r.off = r.removeListener = r.removeEventListener = function (e, t) { this._eventRegistry = this._eventRegistry || {}; var n = this._eventRegistry[e]; if (!n) return; var r = n.indexOf(t); r !== -1 && n.splice(r, 1) }, r.removeAllListeners = function (e) { e || (this._eventRegistry = this._defaultHandlers = undefined), this._eventRegistry && (this._eventRegistry[e] = undefined), this._defaultHandlers && (this._defaultHandlers[e] = undefined) }, t.EventEmitter = r }), define("ace/lib/app_config", ["require", "exports", "module", "ace/lib/oop", "ace/lib/event_emitter"], function (e, t, n) { "no use strict"; function o(e) { typeof console != "undefined" && console.warn && console.warn.apply(console, arguments) } function u(e, t) { var n = new Error(e); n.data = t, typeof console == "object" && console.error && console.error(n), setTimeout(function () { throw n }) } var r = e("./oop"), i = e("./event_emitter").EventEmitter, s = { setOptions: function (e) { Object.keys(e).forEach(function (t) { this.setOption(t, e[t]) }, this) }, getOptions: function (e) { var t = {}; if (!e) { var n = this.$options; e = Object.keys(n).filter(function (e) { return !n[e].hidden }) } else Array.isArray(e) || (t = e, e = Object.keys(t)); return e.forEach(function (e) { t[e] = this.getOption(e) }, this), t }, setOption: function (e, t) { if (this["$" + e] === t) return; var n = this.$options[e]; if (!n) return o('misspelled option "' + e + '"'); if (n.forwardTo) return this[n.forwardTo] && this[n.forwardTo].setOption(e, t); n.handlesSet || (this["$" + e] = t), n && n.set && n.set.call(this, t) }, getOption: function (e) { var t = this.$options[e]; return t ? t.forwardTo ? this[t.forwardTo] && this[t.forwardTo].getOption(e) : t && t.get ? t.get.call(this) : this["$" + e] : o('misspelled option "' + e + '"') } }, a = function () { this.$defaultOptions = {} }; (function () { r.implement(this, i), this.defineOptions = function (e, t, n) { return e.$options || (this.$defaultOptions[t] = e.$options = {}), Object.keys(n).forEach(function (t) { var r = n[t]; typeof r == "string" && (r = { forwardTo: r }), r.name || (r.name = t), e.$options[r.name] = r, "initialValue" in r && (e["$" + r.name] = r.initialValue) }), r.implement(e, s), this }, this.resetOptions = function (e) { Object.keys(e.$options).forEach(function (t) { var n = e.$options[t]; "value" in n && e.setOption(t, n.value) }) }, this.setDefaultValue = function (e, t, n) { if (!e) { for (e in this.$defaultOptions) if (this.$defaultOptions[e][t]) break; if (!this.$defaultOptions[e][t]) return !1 } var r = this.$defaultOptions[e] || (this.$defaultOptions[e] = {}); r[t] && (r.forwardTo ? this.setDefaultValue(r.forwardTo, t, n) : r[t].value = n) }, this.setDefaultValues = function (e, t) { Object.keys(t).forEach(function (n) { this.setDefaultValue(e, n, t[n]) }, this) }, this.warn = o, this.reportError = u }).call(a.prototype), t.AppConfig = a }), define("ace/config", ["require", "exports", "module", "ace/lib/lang", "ace/lib/oop", "ace/lib/net", "ace/lib/app_config"], function (e, t, n) { "no use strict"; function l(r) { if (!u || !u.document) return; a.packaged = r || e.packaged || n.packaged || u.define && define.packaged; var i = {}, s = "", o = document.currentScript || document._currentScript, f = o && o.ownerDocument || document, l = f.getElementsByTagName("script"); for (var h = 0; h < l.length; h++) { var p = l[h], d = p.src || p.getAttribute("src"); if (!d) continue; var v = p.attributes; for (var m = 0, g = v.length; m < g; m++) { var y = v[m]; y.name.indexOf("data-ace-") === 0 && (i[c(y.name.replace(/^data-ace-/, ""))] = y.value) } var b = d.match(/^(.*)\/ace(\-\w+)?\.js(\?|$)/); b && (s = b[1]) } s && (i.base = i.base || s, i.packaged = !0), i.basePath = i.base, i.workerPath = i.workerPath || i.base, i.modePath = i.modePath || i.base, i.themePath = i.themePath || i.base, delete i.base; for (var w in i) typeof i[w] != "undefined" && t.set(w, i[w]) } function c(e) { return e.replace(/-(.)/g, function (e, t) { return t.toUpperCase() }) } var r = e("./lib/lang"), i = e("./lib/oop"), s = e("./lib/net"), o = e("./lib/app_config").AppConfig; n.exports = t = new o; var u = function () { return this || typeof window != "undefined" && window }(), a = { packaged: !1, workerPath: null, modePath: null, themePath: null, basePath: "", suffix: ".js", $moduleUrls: {}, loadWorkerFromBlob: !0, sharedPopups: !1 }; t.get = function (e) { if (!a.hasOwnProperty(e)) throw new Error("Unknown config key: " + e); return a[e] }, t.set = function (e, t) { if (a.hasOwnProperty(e)) a[e] = t; else if (this.setDefaultValue("", e, t) == 0) throw new Error("Unknown config key: " + e) }, t.all = function () { return r.copyObject(a) }, t.$modes = {}, t.moduleUrl = function (e, t) { if (a.$moduleUrls[e]) return a.$moduleUrls[e]; var n = e.split("/"); t = t || n[n.length - 2] || ""; var r = t == "snippets" ? "/" : "-", i = n[n.length - 1]; if (t == "worker" && r == "-") { var s = new RegExp("^" + t + "[\\-_]|[\\-_]" + t + "$", "g"); i = i.replace(s, "") } (!i || i == t) && n.length > 1 && (i = n[n.length - 2]); var o = a[t + "Path"]; return o == null ? o = a.basePath : r == "/" && (t = r = ""), o && o.slice(-1) != "/" && (o += "/"), o + t + r + i + this.get("suffix") }, t.setModuleUrl = function (e, t) { return a.$moduleUrls[e] = t }, t.$loading = {}, t.loadModule = function (n, r) { var i, o; Array.isArray(n) && (o = n[0], n = n[1]); try { i = e(n) } catch (u) { } if (i && !t.$loading[n]) return r && r(i); t.$loading[n] || (t.$loading[n] = []), t.$loading[n].push(r); if (t.$loading[n].length > 1) return; var a = function () { e([n], function (e) { t._emit("load.module", { name: n, module: e }); var r = t.$loading[n]; t.$loading[n] = null, r.forEach(function (t) { t && t(e) }) }) }; if (!t.get("packaged")) return a(); s.loadScript(t.moduleUrl(n, o), a), f() }; var f = function () { !a.basePath && !a.workerPath && !a.modePath && !a.themePath && !Object.keys(a.$moduleUrls).length && (console.error("Unable to infer path to ace from script src,", "use ace.config.set('basePath', 'path') to enable dynamic loading of modes and themes", "or with webpack use ace/webpack-resolver"), f = function () { }) }; t.init = l, t.version = "1.4.10" }), define("ace/mouse/mouse_handler", ["require", "exports", "module", "ace/lib/event", "ace/lib/useragent", "ace/mouse/default_handlers", "ace/mouse/default_gutter_handler", "ace/mouse/mouse_event", "ace/mouse/dragdrop_handler", "ace/mouse/touch_handler", "ace/config"], function (e, t, n) { "use strict"; var r = e("../lib/event"), i = e("../lib/useragent"), s = e("./default_handlers").DefaultHandlers, o = e("./default_gutter_handler").GutterHandler, u = e("./mouse_event").MouseEvent, a = e("./dragdrop_handler").DragdropHandler, f = e("./touch_handler").addTouchListeners, l = e("../config"), c = function (e) { var t = this; this.editor = e, new s(this), new o(this), new a(this); var n = function (t) { var n = !document.hasFocus || !document.hasFocus() || !e.isFocused() && document.activeElement == (e.textInput && e.textInput.getElement()); n && window.focus(), e.focus() }, u = e.renderer.getMouseEventTarget(); r.addListener(u, "click", this.onMouseEvent.bind(this, "click"), e), r.addListener(u, "mousemove", this.onMouseMove.bind(this, "mousemove"), e), r.addMultiMouseDownListener([u, e.renderer.scrollBarV && e.renderer.scrollBarV.inner, e.renderer.scrollBarH && e.renderer.scrollBarH.inner, e.textInput && e.textInput.getElement()].filter(Boolean), [400, 300, 250], this, "onMouseEvent", e), r.addMouseWheelListener(e.container, this.onMouseWheel.bind(this, "mousewheel"), e), f(e.container, e); var l = e.renderer.$gutter; r.addListener(l, "mousedown", this.onMouseEvent.bind(this, "guttermousedown"), e), r.addListener(l, "click", this.onMouseEvent.bind(this, "gutterclick"), e), r.addListener(l, "dblclick", this.onMouseEvent.bind(this, "gutterdblclick"), e), r.addListener(l, "mousemove", this.onMouseEvent.bind(this, "guttermousemove"), e), r.addListener(u, "mousedown", n, e), r.addListener(l, "mousedown", n, e), i.isIE && e.renderer.scrollBarV && (r.addListener(e.renderer.scrollBarV.element, "mousedown", n, e), r.addListener(e.renderer.scrollBarH.element, "mousedown", n, e)), e.on("mousemove", function (n) { if (t.state || t.$dragDelay || !t.$dragEnabled) return; var r = e.renderer.screenToTextCoordinates(n.x, n.y), i = e.session.selection.getRange(), s = e.renderer; !i.isEmpty() && i.insideStart(r.row, r.column) ? s.setCursorStyle("default") : s.setCursorStyle("") }, e) }; (function () { this.onMouseEvent = function (e, t) { this.editor._emit(e, new u(t, this.editor)) }, this.onMouseMove = function (e, t) { var n = this.editor._eventRegistry && this.editor._eventRegistry.mousemove; if (!n || !n.length) return; this.editor._emit(e, new u(t, this.editor)) }, this.onMouseWheel = function (e, t) { var n = new u(t, this.editor); n.speed = this.$scrollSpeed * 2, n.wheelX = t.wheelX, n.wheelY = t.wheelY, this.editor._emit(e, n) }, this.setState = function (e) { this.state = e }, this.captureMouse = function (e, t) { this.x = e.x, this.y = e.y, this.isMousePressed = !0; var n = this.editor, s = this.editor.renderer; s.$isMousePressed = !0; var o = this, a = function (e) { if (!e) return; if (i.isWebKit && !e.which && o.releaseMouse) return o.releaseMouse(); o.x = e.clientX, o.y = e.clientY, t && t(e), o.mouseEvent = new u(e, o.editor), o.$mouseMoved = !0 }, f = function (e) { n.off("beforeEndOperation", c), clearInterval(h), l(), o[o.state + "End"] && o[o.state + "End"](e), o.state = "", o.isMousePressed = s.$isMousePressed = !1, s.$keepTextAreaAtCursor && s.$moveTextAreaToCursor(), o.$onCaptureMouseMove = o.releaseMouse = null, e && o.onMouseEvent("mouseup", e), n.endOperation() }, l = function () { o[o.state] && o[o.state](), o.$mouseMoved = !1 }; if (i.isOldIE && e.domEvent.type == "dblclick") return setTimeout(function () { f(e) }); var c = function (e) { if (!o.releaseMouse) return; n.curOp.command.name && n.curOp.selectionChanged && (o[o.state + "End"] && o[o.state + "End"](), o.state = "", o.releaseMouse()) }; n.on("beforeEndOperation", c), n.startOperation({ command: { name: "mouse" } }), o.$onCaptureMouseMove = a, o.releaseMouse = r.capture(this.editor.container, a, f); var h = setInterval(l, 20) }, this.releaseMouse = null, this.cancelContextMenu = function () { var e = function (t) { if (t && t.domEvent && t.domEvent.type != "contextmenu") return; this.editor.off("nativecontextmenu", e), t && t.domEvent && r.stopEvent(t.domEvent) }.bind(this); setTimeout(e, 10), this.editor.on("nativecontextmenu", e) } }).call(c.prototype), l.defineOptions(c.prototype, "mouseHandler", { scrollSpeed: { initialValue: 2 }, dragDelay: { initialValue: i.isMac ? 150 : 0 }, dragEnabled: { initialValue: !0 }, focusTimeout: { initialValue: 0 }, tooltipFollowsMouse: { initialValue: !0 } }), t.MouseHandler = c }), define("ace/mouse/fold_handler", ["require", "exports", "module", "ace/lib/dom"], function (e, t, n) { "use strict"; function i(e) { e.on("click", function (t) { var n = t.getDocumentPosition(), i = e.session, s = i.getFoldAt(n.row, n.column, 1); s && (t.getAccelKey() ? i.removeFold(s) : i.expandFold(s), t.stop()); var o = t.domEvent && t.domEvent.target; o && r.hasCssClass(o, "ace_inline_button") && r.hasCssClass(o, "ace_toggle_wrap") && (i.setOption("wrap", !i.getUseWrapMode()), e.renderer.scrollCursorIntoView()) }), e.on("gutterclick", function (t) { var n = e.renderer.$gutterLayer.getRegion(t); if (n == "foldWidgets") { var r = t.getDocumentPosition().row, i = e.session; i.foldWidgets && i.foldWidgets[r] && e.session.onFoldWidgetClick(r, t), e.isFocused() || e.focus(), t.stop() } }), e.on("gutterdblclick", function (t) { var n = e.renderer.$gutterLayer.getRegion(t); if (n == "foldWidgets") { var r = t.getDocumentPosition().row, i = e.session, s = i.getParentFoldRangeData(r, !0), o = s.range || s.firstRange; if (o) { r = o.start.row; var u = i.getFoldAt(r, i.getLine(r).length, 1); u ? i.removeFold(u) : (i.addFold("...", o), e.renderer.scrollCursorIntoView({ row: o.start.row, column: 0 })) } t.stop() } }) } var r = e("../lib/dom"); t.FoldHandler = i }), define("ace/keyboard/keybinding", ["require", "exports", "module", "ace/lib/keys", "ace/lib/event"], function (e, t, n) { "use strict"; var r = e("../lib/keys"), i = e("../lib/event"), s = function (e) { this.$editor = e, this.$data = { editor: e }, this.$handlers = [], this.setDefaultHandler(e.commands) }; (function () { this.setDefaultHandler = function (e) { this.removeKeyboardHandler(this.$defaultHandler), this.$defaultHandler = e, this.addKeyboardHandler(e, 0) }, this.setKeyboardHandler = function (e) { var t = this.$handlers; if (t[t.length - 1] == e) return; while (t[t.length - 1] && t[t.length - 1] != this.$defaultHandler) this.removeKeyboardHandler(t[t.length - 1]); this.addKeyboardHandler(e, 1) }, this.addKeyboardHandler = function (e, t) { if (!e) return; typeof e == "function" && !e.handleKeyboard && (e.handleKeyboard = e); var n = this.$handlers.indexOf(e); n != -1 && this.$handlers.splice(n, 1), t == undefined ? this.$handlers.push(e) : this.$handlers.splice(t, 0, e), n == -1 && e.attach && e.attach(this.$editor) }, this.removeKeyboardHandler = function (e) { var t = this.$handlers.indexOf(e); return t == -1 ? !1 : (this.$handlers.splice(t, 1), e.detach && e.detach(this.$editor), !0) }, this.getKeyboardHandler = function () { return this.$handlers[this.$handlers.length - 1] }, this.getStatusText = function () { var e = this.$data, t = e.editor; return this.$handlers.map(function (n) { return n.getStatusText && n.getStatusText(t, e) || "" }).filter(Boolean).join(" ") }, this.$callKeyboardHandlers = function (e, t, n, r) { var s, o = !1, u = this.$editor.commands; for (var a = this.$handlers.length; a--;) { s = this.$handlers[a].handleKeyboard(this.$data, e, t, n, r); if (!s || !s.command) continue; s.command == "null" ? o = !0 : o = u.exec(s.command, this.$editor, s.args, r), o && r && e != -1 && s.passEvent != 1 && s.command.passEvent != 1 && i.stopEvent(r); if (o) break } return !o && e == -1 && (s = { command: "insertstring" }, o = u.exec("insertstring", this.$editor, t)), o && this.$editor._signal && this.$editor._signal("keyboardActivity", s), o }, this.onCommandKey = function (e, t, n) { var i = r.keyCodeToString(n); return this.$callKeyboardHandlers(t, i, n, e) }, this.onTextInput = function (e) { return this.$callKeyboardHandlers(-1, e) } }).call(s.prototype), t.KeyBinding = s }), define("ace/lib/bidiutil", ["require", "exports", "module"], function (e, t, n) { "use strict"; function F(e, t, n, r) { var i = s ? d : p, c = null, h = null, v = null, m = 0, g = null, y = null, b = -1, w = null, E = null, T = []; if (!r) for (w = 0, r = []; w < n; w++)r[w] = R(e[w]); o = s, u = !1, a = !1, f = !1, l = !1; for (E = 0; E < n; E++) { c = m, T[E] = h = q(e, r, T, E), m = i[c][h], g = m & 240, m &= 15, t[E] = v = i[m][5]; if (g > 0) if (g == 16) { for (w = b; w < E; w++)t[w] = 1; b = -1 } else b = -1; y = i[m][6]; if (y) b == -1 && (b = E); else if (b > -1) { for (w = b; w < E; w++)t[w] = v; b = -1 } r[E] == S && (t[E] = 0), o |= v } if (l) for (w = 0; w < n; w++)if (r[w] == x) { t[w] = s; for (var C = w - 1; C >= 0; C--) { if (r[C] != N) break; t[C] = s } } } function I(e, t, n) { if (o < e) return; if (e == 1 && s == m && !f) { n.reverse(); return } var r = n.length, i = 0, u, a, l, c; while (i < r) { if (t[i] >= e) { u = i + 1; while (u < r && t[u] >= e) u++; for (a = i, l = u - 1; a < l; a++, l--)c = n[a], n[a] = n[l], n[l] = c; i = u } i++ } } function q(e, t, n, r) { var i = t[r], o, c, h, p; switch (i) { case g: case y: u = !1; case E: case w: return i; case b: return u ? w : b; case T: return u = !0, a = !0, y; case N: return E; case C: if (r < 1 || r + 1 >= t.length || (o = n[r - 1]) != b && o != w || (c = t[r + 1]) != b && c != w) return E; return u && (c = w), c == o ? c : E; case k: o = r > 0 ? n[r - 1] : S; if (o == b && r + 1 < t.length && t[r + 1] == b) return b; return E; case L: if (r > 0 && n[r - 1] == b) return b; if (u) return E; p = r + 1, h = t.length; while (p < h && t[p] == L) p++; if (p < h && t[p] == b) return b; return E; case A: h = t.length, p = r + 1; while (p < h && t[p] == A) p++; if (p < h) { var d = e[r], v = d >= 1425 && d <= 2303 || d == 64286; o = t[p]; if (v && (o == y || o == T)) return y } if (r < 1 || (o = t[r - 1]) == S) return E; return n[r - 1]; case S: return u = !1, f = !0, s; case x: return l = !0, E; case O: case M: case D: case P: case _: u = !1; case H: return E } } function R(e) { var t = e.charCodeAt(0), n = t >> 8; return n == 0 ? t > 191 ? g : B[t] : n == 5 ? /[\u0591-\u05f4]/.test(e) ? y : g : n == 6 ? /[\u0610-\u061a\u064b-\u065f\u06d6-\u06e4\u06e7-\u06ed]/.test(e) ? A : /[\u0660-\u0669\u066b-\u066c]/.test(e) ? w : t == 1642 ? L : /[\u06f0-\u06f9]/.test(e) ? b : T : n == 32 && t <= 8287 ? j[t & 255] : n == 254 ? t >= 65136 ? T : E : E } function U(e) { return e >= "\u064b" && e <= "\u0655" } var r = ["\u0621", "\u0641"], i = ["\u063a", "\u064a"], s = 0, o = 0, u = !1, a = !1, f = !1, l = !1, c = !1, h = !1, p = [[0, 3, 0, 1, 0, 0, 0], [0, 3, 0, 1, 2, 2, 0], [0, 3, 0, 17, 2, 0, 1], [0, 3, 5, 5, 4, 1, 0], [0, 3, 21, 21, 4, 0, 1], [0, 3, 5, 5, 4, 2, 0]], d = [[2, 0, 1, 1, 0, 1, 0], [2, 0, 1, 1, 0, 2, 0], [2, 0, 2, 1, 3, 2, 0], [2, 0, 2, 33, 3, 1, 1]], v = 0, m = 1, g = 0, y = 1, b = 2, w = 3, E = 4, S = 5, x = 6, T = 7, N = 8, C = 9, k = 10, L = 11, A = 12, O = 13, M = 14, _ = 15, D = 16, P = 17, H = 18, B = [H, H, H, H, H, H, H, H, H, x, S, x, N, S, H, H, H, H, H, H, H, H, H, H, H, H, H, H, S, S, S, x, N, E, E, L, L, L, E, E, E, E, E, k, C, k, C, C, b, b, b, b, b, b, b, b, b, b, C, E, E, E, E, E, E, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, E, E, E, E, E, E, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, g, E, E, E, E, H, H, H, H, H, H, S, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, H, C, E, L, L, L, L, E, E, E, E, g, E, E, H, E, E, L, L, b, b, E, g, E, E, E, b, g, E, E, E, E, E], j = [N, N, N, N, N, N, N, N, N, N, N, H, H, H, g, y, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, N, S, O, M, _, D, P, C, L, L, L, L, L, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, C, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, E, N]; t.L = g, t.R = y, t.EN = b, t.ON_R = 3, t.AN = 4, t.R_H = 5, t.B = 6, t.RLE = 7, t.DOT = "\u00b7", t.doBidiReorder = function (e, n, r) { if (e.length < 2) return {}; var i = e.split(""), o = new Array(i.length), u = new Array(i.length), a = []; s = r ? m : v, F(i, a, i.length, n); for (var f = 0; f < o.length; o[f] = f, f++); I(2, a, o), I(1, a, o); for (var f = 0; f < o.length - 1; f++)n[f] === w ? a[f] = t.AN : a[f] === y && (n[f] > T && n[f] < O || n[f] === E || n[f] === H) ? a[f] = t.ON_R : f > 0 && i[f - 1] === "\u0644" && /\u0622|\u0623|\u0625|\u0627/.test(i[f]) && (a[f - 1] = a[f] = t.R_H, f++); i[i.length - 1] === t.DOT && (a[i.length - 1] = t.B), i[0] === "\u202b" && (a[0] = t.RLE); for (var f = 0; f < o.length; f++)u[f] = a[o[f]]; return { logicalFromVisual: o, bidiLevels: u } }, t.hasBidiCharacters = function (e, t) { var n = !1; for (var r = 0; r < e.length; r++)t[r] = R(e.charAt(r)), !n && (t[r] == y || t[r] == T || t[r] == w) && (n = !0); return n }, t.getVisualFromLogicalIdx = function (e, t) { for (var n = 0; n < t.logicalFromVisual.length; n++)if (t.logicalFromVisual[n] == e) return n; return 0 } }), define("ace/bidihandler", ["require", "exports", "module", "ace/lib/bidiutil", "ace/lib/lang"], function (e, t, n) { "use strict"; var r = e("./lib/bidiutil"), i = e("./lib/lang"), s = /[\u0590-\u05f4\u0600-\u06ff\u0700-\u08ac\u202B]/, o = function (e) { this.session = e, this.bidiMap = {}, this.currentRow = null, this.bidiUtil = r, this.charWidths = [], this.EOL = "\u00ac", this.showInvisibles = !0, this.isRtlDir = !1, this.$isRtl = !1, this.line = "", this.wrapIndent = 0, this.EOF = "\u00b6", this.RLE = "\u202b", this.contentWidth = 0, this.fontMetrics = null, this.rtlLineOffset = 0, this.wrapOffset = 0, this.isMoveLeftOperation = !1, this.seenBidi = s.test(e.getValue()) }; (function () { this.isBidiRow = function (e, t, n) { return this.seenBidi ? (e !== this.currentRow && (this.currentRow = e, this.updateRowLine(t, n), this.updateBidiMap()), this.bidiMap.bidiLevels) : !1 }, this.onChange = function (e) { this.seenBidi ? this.currentRow = null : e.action == "insert" && s.test(e.lines.join("\n")) && (this.seenBidi = !0, this.currentRow = null) }, this.getDocumentRow = function () { var e = 0, t = this.session.$screenRowCache; if (t.length) { var n = this.session.$getRowCacheIndex(t, this.currentRow); n >= 0 && (e = this.session.$docRowCache[n]) } return e }, this.getSplitIndex = function () { var e = 0, t = this.session.$screenRowCache; if (t.length) { var n, r = this.session.$getRowCacheIndex(t, this.currentRow); while (this.currentRow - e > 0) { n = this.session.$getRowCacheIndex(t, this.currentRow - e - 1); if (n !== r) break; r = n, e++ } } else e = this.currentRow; return e }, this.updateRowLine = function (e, t) { e === undefined && (e = this.getDocumentRow()); var n = e === this.session.getLength() - 1, s = n ? this.EOF : this.EOL; this.wrapIndent = 0, this.line = this.session.getLine(e), this.isRtlDir = this.$isRtl || this.line.charAt(0) === this.RLE; if (this.session.$useWrapMode) { var o = this.session.$wrapData[e]; o && (t === undefined && (t = this.getSplitIndex()), t > 0 && o.length ? (this.wrapIndent = o.indent, this.wrapOffset = this.wrapIndent * this.charWidths[r.L], this.line = t < o.length ? this.line.substring(o[t - 1], o[t]) : this.line.substring(o[o.length - 1])) : this.line = this.line.substring(0, o[t])), t == o.length && (this.line += this.showInvisibles ? s : r.DOT) } else this.line += this.showInvisibles ? s : r.DOT; var u = this.session, a = 0, f; this.line = this.line.replace(/\t|[\u1100-\u2029, \u202F-\uFFE6]/g, function (e, t) { return e === "  " || u.isFullWidth(e.charCodeAt(0)) ? (f = e === "  " ? u.getScreenTabSize(t + a) : 2, a += f - 1, i.stringRepeat(r.DOT, f)) : e }), this.isRtlDir && (this.fontMetrics.$main.textContent = this.line.charAt(this.line.length - 1) == r.DOT ? this.line.substr(0, this.line.length - 1) : this.line, this.rtlLineOffset = this.contentWidth - this.fontMetrics.$main.getBoundingClientRect().width) }, this.updateBidiMap = function () { var e = []; r.hasBidiCharacters(this.line, e) || this.isRtlDir ? this.bidiMap = r.doBidiReorder(this.line, e, this.isRtlDir) : this.bidiMap = {} }, this.markAsDirty = function () { this.currentRow = null }, this.updateCharacterWidths = function (e) { if (this.characterWidth === e.$characterSize.width) return; this.fontMetrics = e; var t = this.characterWidth = e.$characterSize.width, n = e.$measureCharWidth("\u05d4"); this.charWidths[r.L] = this.charWidths[r.EN] = this.charWidths[r.ON_R] = t, this.charWidths[r.R] = this.charWidths[r.AN] = n, this.charWidths[r.R_H] = n * .45, this.charWidths[r.B] = this.charWidths[r.RLE] = 0, this.currentRow = null }, this.setShowInvisibles = function (e) { this.showInvisibles = e, this.currentRow = null }, this.setEolChar = function (e) { this.EOL = e }, this.setContentWidth = function (e) { this.contentWidth = e }, this.isRtlLine = function (e) { return this.$isRtl ? !0 : e != undefined ? this.session.getLine(e).charAt(0) == this.RLE : this.isRtlDir }, this.setRtlDirection = function (e, t) { var n = e.getCursorPosition(); for (var r = e.selection.getSelectionAnchor().row; r <= n.row; r++)!t && e.session.getLine(r).charAt(0) === e.session.$bidiHandler.RLE ? e.session.doc.removeInLine(r, 0, 1) : t && e.session.getLine(r).charAt(0) !== e.session.$bidiHandler.RLE && e.session.doc.insert({ column: 0, row: r }, e.session.$bidiHandler.RLE) }, this.getPosLeft = function (e) { e -= this.wrapIndent; var t = this.line.charAt(0) === this.RLE ? 1 : 0, n = e > t ? this.session.getOverwrite() ? e : e - 1 : t, i = r.getVisualFromLogicalIdx(n, this.bidiMap), s = this.bidiMap.bidiLevels, o = 0; !this.session.getOverwrite() && e <= t && s[i] % 2 !== 0 && i++; for (var u = 0; u < i; u++)o += this.charWidths[s[u]]; return !this.session.getOverwrite() && e > t && s[i] % 2 === 0 && (o += this.charWidths[s[i]]), this.wrapIndent && (o += this.isRtlDir ? -1 * this.wrapOffset : this.wrapOffset), this.isRtlDir && (o += this.rtlLineOffset), o }, this.getSelections = function (e, t) { var n = this.bidiMap, r = n.bidiLevels, i, s = [], o = 0, u = Math.min(e, t) - this.wrapIndent, a = Math.max(e, t) - this.wrapIndent, f = !1, l = !1, c = 0; this.wrapIndent && (o += this.isRtlDir ? -1 * this.wrapOffset : this.wrapOffset); for (var h, p = 0; p < r.length; p++)h = n.logicalFromVisual[p], i = r[p], f = h >= u && h < a, f && !l ? c = o : !f && l && s.push({ left: c, width: o - c }), o += this.charWidths[i], l = f; f && p === r.length && s.push({ left: c, width: o - c }); if (this.isRtlDir) for (var d = 0; d < s.length; d++)s[d].left += this.rtlLineOffset; return s }, this.offsetToCol = function (e) { this.isRtlDir && (e -= this.rtlLineOffset); var t = 0, e = Math.max(e, 0), n = 0, r = 0, i = this.bidiMap.bidiLevels, s = this.charWidths[i[r]]; this.wrapIndent && (e -= this.isRtlDir ? -1 * this.wrapOffset : this.wrapOffset); while (e > n + s / 2) { n += s; if (r === i.length - 1) { s = 0; break } s = this.charWidths[i[++r]] } return r > 0 && i[r - 1] % 2 !== 0 && i[r] % 2 === 0 ? (e < n && r--, t = this.bidiMap.logicalFromVisual[r]) : r > 0 && i[r - 1] % 2 === 0 && i[r] % 2 !== 0 ? t = 1 + (e > n ? this.bidiMap.logicalFromVisual[r] : this.bidiMap.logicalFromVisual[r - 1]) : this.isRtlDir && r === i.length - 1 && s === 0 && i[r - 1] % 2 === 0 || !this.isRtlDir && r === 0 && i[r] % 2 !== 0 ? t = 1 + this.bidiMap.logicalFromVisual[r] : (r > 0 && i[r - 1] % 2 !== 0 && s !== 0 && r--, t = this.bidiMap.logicalFromVisual[r]), t === 0 && this.isRtlDir && t++, t + this.wrapIndent } }).call(o.prototype), t.BidiHandler = o }), define("ace/selection", ["require", "exports", "module", "ace/lib/oop", "ace/lib/lang", "ace/lib/event_emitter", "ace/range"], function (e, t, n) { "use strict"; var r = e("./lib/oop"), i = e("./lib/lang"), s = e("./lib/event_emitter").EventEmitter, o = e("./range").Range, u = function (e) { this.session = e, this.doc = e.getDocument(), this.clearSelection(), this.cursor = this.lead = this.doc.createAnchor(0, 0), this.anchor = this.doc.createAnchor(0, 0), this.$silent = !1; var t = this; this.cursor.on("change", function (e) { t.$cursorChanged = !0, t.$silent || t._emit("changeCursor"), !t.$isEmpty && !t.$silent && t._emit("changeSelection"), !t.$keepDesiredColumnOnChange && e.old.column != e.value.column && (t.$desiredColumn = null) }), this.anchor.on("change", function () { t.$anchorChanged = !0, !t.$isEmpty && !t.$silent && t._emit("changeSelection") }) }; (function () { r.implement(this, s), this.isEmpty = function () { return this.$isEmpty || this.anchor.row == this.lead.row && this.anchor.column == this.lead.column }, this.isMultiLine = function () { return !this.$isEmpty && this.anchor.row != this.cursor.row }, this.getCursor = function () { return this.lead.getPosition() }, this.setSelectionAnchor = function (e, t) { this.$isEmpty = !1, this.anchor.setPosition(e, t) }, this.getAnchor = this.getSelectionAnchor = function () { return this.$isEmpty ? this.getSelectionLead() : this.anchor.getPosition() }, this.getSelectionLead = function () { return this.lead.getPosition() }, this.isBackwards = function () { var e = this.anchor, t = this.lead; return e.row > t.row || e.row == t.row && e.column > t.column }, this.getRange = function () { var e = this.anchor, t = this.lead; return this.$isEmpty ? o.fromPoints(t, t) : this.isBackwards() ? o.fromPoints(t, e) : o.fromPoints(e, t) }, this.clearSelection = function () { this.$isEmpty || (this.$isEmpty = !0, this._emit("changeSelection")) }, this.selectAll = function () { this.$setSelection(0, 0, Number.MAX_VALUE, Number.MAX_VALUE) }, this.setRange = this.setSelectionRange = function (e, t) { var n = t ? e.end : e.start, r = t ? e.start : e.end; this.$setSelection(n.row, n.column, r.row, r.column) }, this.$setSelection = function (e, t, n, r) { if (this.$silent) return; var i = this.$isEmpty, s = this.inMultiSelectMode; this.$silent = !0, this.$cursorChanged = this.$anchorChanged = !1, this.anchor.setPosition(e, t), this.cursor.setPosition(n, r), this.$isEmpty = !o.comparePoints(this.anchor, this.cursor), this.$silent = !1, this.$cursorChanged && this._emit("changeCursor"), (this.$cursorChanged || this.$anchorChanged || i != this.$isEmpty || s) && this._emit("changeSelection") }, this.$moveSelection = function (e) { var t = this.lead; this.$isEmpty && this.setSelectionAnchor(t.row, t.column), e.call(this) }, this.selectTo = function (e, t) { this.$moveSelection(function () { this.moveCursorTo(e, t) }) }, this.selectToPosition = function (e) { this.$moveSelection(function () { this.moveCursorToPosition(e) }) }, this.moveTo = function (e, t) { this.clearSelection(), this.moveCursorTo(e, t) }, this.moveToPosition = function (e) { this.clearSelection(), this.moveCursorToPosition(e) }, this.selectUp = function () { this.$moveSelection(this.moveCursorUp) }, this.selectDown = function () { this.$moveSelection(this.moveCursorDown) }, this.selectRight = function () { this.$moveSelection(this.moveCursorRight) }, this.selectLeft = function () { this.$moveSelection(this.moveCursorLeft) }, this.selectLineStart = function () { this.$moveSelection(this.moveCursorLineStart) }, this.selectLineEnd = function () { this.$moveSelection(this.moveCursorLineEnd) }, this.selectFileEnd = function () { this.$moveSelection(this.moveCursorFileEnd) }, this.selectFileStart = function () { this.$moveSelection(this.moveCursorFileStart) }, this.selectWordRight = function () { this.$moveSelection(this.moveCursorWordRight) }, this.selectWordLeft = function () { this.$moveSelection(this.moveCursorWordLeft) }, this.getWordRange = function (e, t) { if (typeof t == "undefined") { var n = e || this.lead; e = n.row, t = n.column } return this.session.getWordRange(e, t) }, this.selectWord = function () { this.setSelectionRange(this.getWordRange()) }, this.selectAWord = function () { var e = this.getCursor(), t = this.session.getAWordRange(e.row, e.column); this.setSelectionRange(t) }, this.getLineRange = function (e, t) { var n = typeof e == "number" ? e : this.lead.row, r, i = this.session.getFoldLine(n); return i ? (n = i.start.row, r = i.end.row) : r = n, t === !0 ? new o(n, 0, r, this.session.getLine(r).length) : new o(n, 0, r + 1, 0) }, this.selectLine = function () { this.setSelectionRange(this.getLineRange()) }, this.moveCursorUp = function () { this.moveCursorBy(-1, 0) }, this.moveCursorDown = function () { this.moveCursorBy(1, 0) }, this.wouldMoveIntoSoftTab = function (e, t, n) { var r = e.column, i = e.column + t; return n < 0 && (r = e.column - t, i = e.column), this.session.isTabStop(e) && this.doc.getLine(e.row).slice(r, i).split(" ").length - 1 == t }, this.moveCursorLeft = function () { var e = this.lead.getPosition(), t; if (t = this.session.getFoldAt(e.row, e.column, -1)) this.moveCursorTo(t.start.row, t.start.column); else if (e.column === 0) e.row > 0 && this.moveCursorTo(e.row - 1, this.doc.getLine(e.row - 1).length); else { var n = this.session.getTabSize(); this.wouldMoveIntoSoftTab(e, n, -1) && !this.session.getNavigateWithinSoftTabs() ? this.moveCursorBy(0, -n) : this.moveCursorBy(0, -1) } }, this.moveCursorRight = function () { var e = this.lead.getPosition(), t; if (t = this.session.getFoldAt(e.row, e.column, 1)) this.moveCursorTo(t.end.row, t.end.column); else if (this.lead.column == this.doc.getLine(this.lead.row).length) this.lead.row < this.doc.getLength() - 1 && this.moveCursorTo(this.lead.row + 1, 0); else { var n = this.session.getTabSize(), e = this.lead; this.wouldMoveIntoSoftTab(e, n, 1) && !this.session.getNavigateWithinSoftTabs() ? this.moveCursorBy(0, n) : this.moveCursorBy(0, 1) } }, this.moveCursorLineStart = function () { var e = this.lead.row, t = this.lead.column, n = this.session.documentToScreenRow(e, t), r = this.session.screenToDocumentPosition(n, 0), i = this.session.getDisplayLine(e, null, r.row, r.column), s = i.match(/^\s*/); s[0].length != t && !this.session.$useEmacsStyleLineStart && (r.column += s[0].length), this.moveCursorToPosition(r) }, this.moveCursorLineEnd = function () { var e = this.lead, t = this.session.getDocumentLastRowColumnPosition(e.row, e.column); if (this.lead.column == t.column) { var n = this.session.getLine(t.row); if (t.column == n.length) { var r = n.search(/\s+$/); r > 0 && (t.column = r) } } this.moveCursorTo(t.row, t.column) }, this.moveCursorFileEnd = function () { var e = this.doc.getLength() - 1, t = this.doc.getLine(e).length; this.moveCursorTo(e, t) }, this.moveCursorFileStart = function () { this.moveCursorTo(0, 0) }, this.moveCursorLongWordRight = function () { var e = this.lead.row, t = this.lead.column, n = this.doc.getLine(e), r = n.substring(t); this.session.nonTokenRe.lastIndex = 0, this.session.tokenRe.lastIndex = 0; var i = this.session.getFoldAt(e, t, 1); if (i) { this.moveCursorTo(i.end.row, i.end.column); return } this.session.nonTokenRe.exec(r) && (t += this.session.nonTokenRe.lastIndex, this.session.nonTokenRe.lastIndex = 0, r = n.substring(t)); if (t >= n.length) { this.moveCursorTo(e, n.length), this.moveCursorRight(), e < this.doc.getLength() - 1 && this.moveCursorWordRight(); return } this.session.tokenRe.exec(r) && (t += this.session.tokenRe.lastIndex, this.session.tokenRe.lastIndex = 0), this.moveCursorTo(e, t) }, this.moveCursorLongWordLeft = function () { var e = this.lead.row, t = this.lead.column, n; if (n = this.session.getFoldAt(e, t, -1)) { this.moveCursorTo(n.start.row, n.start.column); return } var r = this.session.getFoldStringAt(e, t, -1); r == null && (r = this.doc.getLine(e).substring(0, t)); var s = i.stringReverse(r); this.session.nonTokenRe.lastIndex = 0, this.session.tokenRe.lastIndex = 0, this.session.nonTokenRe.exec(s) && (t -= this.session.nonTokenRe.lastIndex, s = s.slice(this.session.nonTokenRe.lastIndex), this.session.nonTokenRe.lastIndex = 0); if (t <= 0) { this.moveCursorTo(e, 0), this.moveCursorLeft(), e > 0 && this.moveCursorWordLeft(); return } this.session.tokenRe.exec(s) && (t -= this.session.tokenRe.lastIndex, this.session.tokenRe.lastIndex = 0), this.moveCursorTo(e, t) }, this.$shortWordEndIndex = function (e) { var t = 0, n, r = /\s/, i = this.session.tokenRe; i.lastIndex = 0; if (this.session.tokenRe.exec(e)) t = this.session.tokenRe.lastIndex; else { while ((n = e[t]) && r.test(n)) t++; if (t < 1) { i.lastIndex = 0; while ((n = e[t]) && !i.test(n)) { i.lastIndex = 0, t++; if (r.test(n)) { if (t > 2) { t--; break } while ((n = e[t]) && r.test(n)) t++; if (t > 2) break } } } } return i.lastIndex = 0, t }, this.moveCursorShortWordRight = function () { var e = this.lead.row, t = this.lead.column, n = this.doc.getLine(e), r = n.substring(t), i = this.session.getFoldAt(e, t, 1); if (i) return this.moveCursorTo(i.end.row, i.end.column); if (t == n.length) { var s = this.doc.getLength(); do e++, r = this.doc.getLine(e); while (e < s && /^\s*$/.test(r)); /^\s+/.test(r) || (r = ""), t = 0 } var o = this.$shortWordEndIndex(r); this.moveCursorTo(e, t + o) }, this.moveCursorShortWordLeft = function () { var e = this.lead.row, t = this.lead.column, n; if (n = this.session.getFoldAt(e, t, -1)) return this.moveCursorTo(n.start.row, n.start.column); var r = this.session.getLine(e).substring(0, t); if (t === 0) { do e--, r = this.doc.getLine(e); while (e > 0 && /^\s*$/.test(r)); t = r.length, /\s+$/.test(r) || (r = "") } var s = i.stringReverse(r), o = this.$shortWordEndIndex(s); return this.moveCursorTo(e, t - o) }, this.moveCursorWordRight = function () { this.session.$selectLongWords ? this.moveCursorLongWordRight() : this.moveCursorShortWordRight() }, this.moveCursorWordLeft = function () { this.session.$selectLongWords ? this.moveCursorLongWordLeft() : this.moveCursorShortWordLeft() }, this.moveCursorBy = function (e, t) { var n = this.session.documentToScreenPosition(this.lead.row, this.lead.column), r; t === 0 && (e !== 0 && (this.session.$bidiHandler.isBidiRow(n.row, this.lead.row) ? (r = this.session.$bidiHandler.getPosLeft(n.column), n.column = Math.round(r / this.session.$bidiHandler.charWidths[0])) : r = n.column * this.session.$bidiHandler.charWidths[0]), this.$desiredColumn ? n.column = this.$desiredColumn : this.$desiredColumn = n.column); if (e != 0 && this.session.lineWidgets && this.session.lineWidgets[this.lead.row]) { var i = this.session.lineWidgets[this.lead.row]; e < 0 ? e -= i.rowsAbove || 0 : e > 0 && (e += i.rowCount - (i.rowsAbove || 0)) } var s = this.session.screenToDocumentPosition(n.row + e, n.column, r); e !== 0 && t === 0 && s.row === this.lead.row && s.column === this.lead.column, this.moveCursorTo(s.row, s.column + t, t === 0) }, this.moveCursorToPosition = function (e) { this.moveCursorTo(e.row, e.column) }, this.moveCursorTo = function (e, t, n) { var r = this.session.getFoldAt(e, t, 1); r && (e = r.start.row, t = r.start.column), this.$keepDesiredColumnOnChange = !0; var i = this.session.getLine(e); /[\uDC00-\uDFFF]/.test(i.charAt(t)) && i.charAt(t - 1) && (this.lead.row == e && this.lead.column == t + 1 ? t -= 1 : t += 1), this.lead.setPosition(e, t), this.$keepDesiredColumnOnChange = !1, n || (this.$desiredColumn = null) }, this.moveCursorToScreen = function (e, t, n) { var r = this.session.screenToDocumentPosition(e, t); this.moveCursorTo(r.row, r.column, n) }, this.detach = function () { this.lead.detach(), this.anchor.detach(), this.session = this.doc = null }, this.fromOrientedRange = function (e) { this.setSelectionRange(e, e.cursor == e.start), this.$desiredColumn = e.desiredColumn || this.$desiredColumn }, this.toOrientedRange = function (e) { var t = this.getRange(); return e ? (e.start.column = t.start.column, e.start.row = t.start.row, e.end.column = t.end.column, e.end.row = t.end.row) : e = t, e.cursor = this.isBackwards() ? e.start : e.end, e.desiredColumn = this.$desiredColumn, e }, this.getRangeOfMovements = function (e) { var t = this.getCursor(); try { e(this); var n = this.getCursor(); return o.fromPoints(t, n) } catch (r) { return o.fromPoints(t, t) } finally { this.moveCursorToPosition(t) } }, this.toJSON = function () { if (this.rangeCount) var e = this.ranges.map(function (e) { var t = e.clone(); return t.isBackwards = e.cursor == e.start, t }); else { var e = this.getRange(); e.isBackwards = this.isBackwards() } return e }, this.fromJSON = function (e) { if (e.start == undefined) { if (this.rangeList && e.length > 1) { this.toSingleRange(e[0]); for (var t = e.length; t--;) { var n = o.fromPoints(e[t].start, e[t].end); e[t].isBackwards && (n.cursor = n.start), this.addRange(n, !0) } return } e = e[0] } this.rangeList && this.toSingleRange(e), this.setSelectionRange(e, e.isBackwards) }, this.isEqual = function (e) { if ((e.length || this.rangeCount) && e.length != this.rangeCount) return !1; if (!e.length || !this.ranges) return this.getRange().isEqual(e); for (var t = this.ranges.length; t--;)if (!this.ranges[t].isEqual(e[t])) return !1; return !0 } }).call(u.prototype), t.Selection = u }), define("ace/tokenizer", ["require", "exports", "module", "ace/config"], function (e, t, n) { "use strict"; var r = e("./config"), i = 2e3, s = function (e) { this.states = e, this.regExps = {}, this.matchMappings = {}; for (var t in this.states) { var n = this.states[t], r = [], i = 0, s = this.matchMappings[t] = { defaultToken: "text" }, o = "g", u = []; for (var a = 0; a < n.length; a++) { var f = n[a]; f.defaultToken && (s.defaultToken = f.defaultToken), f.caseInsensitive && (o = "gi"); if (f.regex == null) continue; f.regex instanceof RegExp && (f.regex = f.regex.toString().slice(1, -1)); var l = f.regex, c = (new RegExp("(?:(" + l + ")|(.))")).exec("a").length - 2; Array.isArray(f.token) ? f.token.length == 1 || c == 1 ? f.token = f.token[0] : c - 1 != f.token.length ? (this.reportError("number of classes and regexp groups doesn't match", { rule: f, groupCount: c - 1 }), f.token = f.token[0]) : (f.tokenArray = f.token, f.token = null, f.onMatch = this.$arrayTokens) : typeof f.token == "function" && !f.onMatch && (c > 1 ? f.onMatch = this.$applyToken : f.onMatch = f.token), c > 1 && (/\\\d/.test(f.regex) ? l = f.regex.replace(/\\([0-9]+)/g, function (e, t) { return "\\" + (parseInt(t, 10) + i + 1) }) : (c = 1, l = this.removeCapturingGroups(f.regex)), !f.splitRegex && typeof f.token != "string" && u.push(f)), s[i] = a, i += c, r.push(l), f.onMatch || (f.onMatch = null) } r.length || (s[0] = 0, r.push("$")), u.forEach(function (e) { e.splitRegex = this.createSplitterRegexp(e.regex, o) }, this), this.regExps[t] = new RegExp("(" + r.join(")|(") + ")|($)", o) } }; (function () { this.$setMaxTokenCount = function (e) { i = e | 0 }, this.$applyToken = function (e) { var t = this.splitRegex.exec(e).slice(1), n = this.token.apply(this, t); if (typeof n == "string") return [{ type: n, value: e }]; var r = []; for (var i = 0, s = n.length; i < s; i++)t[i] && (r[r.length] = { type: n[i], value: t[i] }); return r }, this.$arrayTokens = function (e) { if (!e) return []; var t = this.splitRegex.exec(e); if (!t) return "text"; var n = [], r = this.tokenArray; for (var i = 0, s = r.length; i < s; i++)t[i + 1] && (n[n.length] = { type: r[i], value: t[i + 1] }); return n }, this.removeCapturingGroups = function (e) { var t = e.replace(/\\.|\[(?:\\.|[^\\\]])*|\(\?[:=!]|(\()/g, function (e, t) { return t ? "(?:" : e }); return t }, this.createSplitterRegexp = function (e, t) { if (e.indexOf("(?=") != -1) { var n = 0, r = !1, i = {}; e.replace(/(\\.)|(\((?:\?[=!])?)|(\))|([\[\]])/g, function (e, t, s, o, u, a) { return r ? r = u != "]" : u ? r = !0 : o ? (n == i.stack && (i.end = a + 1, i.stack = -1), n--) : s && (n++, s.length != 1 && (i.stack = n, i.start = a)), e }), i.end != null && /^\)*$/.test(e.substr(i.end)) && (e = e.substring(0, i.start) + e.substr(i.end)) } return e.charAt(0) != "^" && (e = "^" + e), e.charAt(e.length - 1) != "$" && (e += "$"), new RegExp(e, (t || "").replace("g", "")) }, this.getLineTokens = function (e, t) { if (t && typeof t != "string") { var n = t.slice(0); t = n[0], t === "#tmp" && (n.shift(), t = n.shift()) } else var n = []; var r = t || "start", s = this.states[r]; s || (r = "start", s = this.states[r]); var o = this.matchMappings[r], u = this.regExps[r]; u.lastIndex = 0; var a, f = [], l = 0, c = 0, h = { type: null, value: "" }; while (a = u.exec(e)) { var p = o.defaultToken, d = null, v = a[0], m = u.lastIndex; if (m - v.length > l) { var g = e.substring(l, m - v.length); h.type == p ? h.value += g : (h.type && f.push(h), h = { type: p, value: g }) } for (var y = 0; y < a.length - 2; y++) { if (a[y + 1] === undefined) continue; d = s[o[y]], d.onMatch ? p = d.onMatch(v, r, n, e) : p = d.token, d.next && (typeof d.next == "string" ? r = d.next : r = d.next(r, n), s = this.states[r], s || (this.reportError("state doesn't exist", r), r = "start", s = this.states[r]), o = this.matchMappings[r], l = m, u = this.regExps[r], u.lastIndex = m), d.consumeLineEnd && (l = m); break } if (v) if (typeof p == "string") !!d && d.merge === !1 || h.type !== p ? (h.type && f.push(h), h = { type: p, value: v }) : h.value += v; else if (p) { h.type && f.push(h), h = { type: null, value: "" }; for (var y = 0; y < p.length; y++)f.push(p[y]) } if (l == e.length) break; l = m; if (c++ > i) { c > 2 * e.length && this.reportError("infinite loop with in ace tokenizer", { startState: t, line: e }); while (l < e.length) h.type && f.push(h), h = { value: e.substring(l, l += 500), type: "overflow" }; r = "start", n = []; break } } return h.type && f.push(h), n.length > 1 && n[0] !== r && n.unshift("#tmp", r), { tokens: f, state: n.length ? n : r } }, this.reportError = r.reportError }).call(s.prototype), t.Tokenizer = s }), define("ace/mode/text_highlight_rules", ["require", "exports", "module", "ace/lib/lang"], function (e, t, n) { "use strict"; var r = e("../lib/lang"), i = function () { this.$rules = { start: [{ token: "empty_line", regex: "^$" }, { defaultToken: "text" }] } }; (function () { this.addRules = function (e, t) { if (!t) { for (var n in e) this.$rules[n] = e[n]; return } for (var n in e) { var r = e[n]; for (var i = 0; i < r.length; i++) { var s = r[i]; if (s.next || s.onMatch) typeof s.next == "string" && s.next.indexOf(t) !== 0 && (s.next = t + s.next), s.nextState && s.nextState.indexOf(t) !== 0 && (s.nextState = t + s.nextState) } this.$rules[t + n] = r } }, this.getRules = function () { return this.$rules }, this.embedRules = function (e, t, n, i, s) { var o = typeof e == "function" ? (new e).getRules() : e; if (i) for (var u = 0; u < i.length; u++)i[u] = t + i[u]; else { i = []; for (var a in o) i.push(t + a) } this.addRules(o, t); if (n) { var f = Array.prototype[s ? "push" : "unshift"]; for (var u = 0; u < i.length; u++)f.apply(this.$rules[i[u]], r.deepCopy(n)) } this.$embeds || (this.$embeds = []), this.$embeds.push(t) }, this.getEmbeds = function () { return this.$embeds }; var e = function (e, t) { return (e != "start" || t.length) && t.unshift(this.nextState, e), this.nextState }, t = function (e, t) { return t.shift(), t.shift() || "start" }; this.normalizeRules = function () { function i(s) { var o = r[s]; o.processed = !0; for (var u = 0; u < o.length; u++) { var a = o[u], f = null; Array.isArray(a) && (f = a, a = {}), !a.regex && a.start && (a.regex = a.start, a.next || (a.next = []), a.next.push({ defaultToken: a.token }, { token: a.token + ".end", regex: a.end || a.start, next: "pop" }), a.token = a.token + ".start", a.push = !0); var l = a.next || a.push; if (l && Array.isArray(l)) { var c = a.stateName; c || (c = a.token, typeof c != "string" && (c = c[0] || ""), r[c] && (c += n++)), r[c] = l, a.next = c, i(c) } else l == "pop" && (a.next = t); a.push && (a.nextState = a.next || a.push, a.next = e, delete a.push); if (a.rules) for (var h in a.rules) r[h] ? r[h].push && r[h].push.apply(r[h], a.rules[h]) : r[h] = a.rules[h]; var p = typeof a == "string" ? a : a.include; p && (Array.isArray(p) ? f = p.map(function (e) { return r[e] }) : f = r[p]); if (f) { var d = [u, 1].concat(f); a.noEscape && (d = d.filter(function (e) { return !e.next })), o.splice.apply(o, d), u-- } a.keywordMap && (a.token = this.createKeywordMapper(a.keywordMap, a.defaultToken || "text", a.caseInsensitive), delete a.defaultToken) } } var n = 0, r = this.$rules; Object.keys(r).forEach(i, this) }, this.createKeywordMapper = function (e, t, n, r) { var i = Object.create(null); return Object.keys(e).forEach(function (t) { var s = e[t]; n && (s = s.toLowerCase()); var o = s.split(r || "|"); for (var u = o.length; u--;)i[o[u]] = t }), Object.getPrototypeOf(i) && (i.__proto__ = null), this.$keywordList = Object.keys(i), e = null, n ? function (e) { return i[e.toLowerCase()] || t } : function (e) { return i[e] || t } }, this.getKeywords = function () { return this.$keywords } }).call(i.prototype), t.TextHighlightRules = i }), define("ace/mode/behaviour", ["require", "exports", "module"], function (e, t, n) { "use strict"; var r = function () { this.$behaviours = {} }; (function () { this.add = function (e, t, n) { switch (undefined) { case this.$behaviours: this.$behaviours = {}; case this.$behaviours[e]: this.$behaviours[e] = {} }this.$behaviours[e][t] = n }, this.addBehaviours = function (e) { for (var t in e) for (var n in e[t]) this.add(t, n, e[t][n]) }, this.remove = function (e) { this.$behaviours && this.$behaviours[e] && delete this.$behaviours[e] }, this.inherit = function (e, t) { if (typeof e == "function") var n = (new e).getBehaviours(t); else var n = e.getBehaviours(t); this.addBehaviours(n) }, this.getBehaviours = function (e) { if (!e) return this.$behaviours; var t = {}; for (var n = 0; n < e.length; n++)this.$behaviours[e[n]] && (t[e[n]] = this.$behaviours[e[n]]); return t } }).call(r.prototype), t.Behaviour = r }), define("ace/token_iterator", ["require", "exports", "module", "ace/range"], function (e, t, n) { "use strict"; var r = e("./range").Range, i = function (e, t, n) { this.$session = e, this.$row = t, this.$rowTokens = e.getTokens(t); var r = e.getTokenAt(t, n); this.$tokenIndex = r ? r.index : -1 }; (function () { this.stepBackward = function () { this.$tokenIndex -= 1; while (this.$tokenIndex < 0) { this.$row -= 1; if (this.$row < 0) return this.$row = 0, null; this.$rowTokens = this.$session.getTokens(this.$row), this.$tokenIndex = this.$rowTokens.length - 1 } return this.$rowTokens[this.$tokenIndex] }, this.stepForward = function () { this.$tokenIndex += 1; var e; while (this.$tokenIndex >= this.$rowTokens.length) { this.$row += 1, e || (e = this.$session.getLength()); if (this.$row >= e) return this.$row = e - 1, null; this.$rowTokens = this.$session.getTokens(this.$row), this.$tokenIndex = 0 } return this.$rowTokens[this.$tokenIndex] }, this.getCurrentToken = function () { return this.$rowTokens[this.$tokenIndex] }, this.getCurrentTokenRow = function () { return this.$row }, this.getCurrentTokenColumn = function () { var e = this.$rowTokens, t = this.$tokenIndex, n = e[t].start; if (n !== undefined) return n; n = 0; while (t > 0) t -= 1, n += e[t].value.length; return n }, this.getCurrentTokenPosition = function () { return { row: this.$row, column: this.getCurrentTokenColumn() } }, this.getCurrentTokenRange = function () { var e = this.$rowTokens[this.$tokenIndex], t = this.getCurrentTokenColumn(); return new r(this.$row, t, this.$row, t + e.value.length) } }).call(i.prototype), t.TokenIterator = i }), define("ace/mode/behaviour/cstyle", ["require", "exports", "module", "ace/lib/oop", "ace/mode/behaviour", "ace/token_iterator", "ace/lib/lang"], function (e, t, n) { "use strict"; var r = e("../../lib/oop"), i = e("../behaviour").Behaviour, s = e("../../token_iterator").TokenIterator, o = e("../../lib/lang"), u = ["text", "paren.rparen", "rparen", "paren", "punctuation.operator"], a = ["text", "paren.rparen", "rparen", "paren", "punctuation.operator", "comment"], f, l = {}, c = { '"': '"', "'": "'" }, h = function (e) { var t = -1; e.multiSelect && (t = e.selection.index, l.rangeCount != e.multiSelect.rangeCount && (l = { rangeCount: e.multiSelect.rangeCount })); if (l[t]) return f = l[t]; f = l[t] = { autoInsertedBrackets: 0, autoInsertedRow: -1, autoInsertedLineEnd: "", maybeInsertedBrackets: 0, maybeInsertedRow: -1, maybeInsertedLineStart: "", maybeInsertedLineEnd: "" } }, p = function (e, t, n, r) { var i = e.end.row - e.start.row; return { text: n + t + r, selection: [0, e.start.column + 1, i, e.end.column + (i ? 0 : 1)] } }, d = function (e) { this.add("braces", "insertion", function (t, n, r, i, s) { var u = r.getCursorPosition(), a = i.doc.getLine(u.row); if (s == "{") { h(r); var l = r.getSelectionRange(), c = i.doc.getTextRange(l); if (c !== "" && c !== "{" && r.getWrapBehavioursEnabled()) return p(l, c, "{", "}"); if (d.isSaneInsertion(r, i)) return /[\]\}\)]/.test(a[u.column]) || r.inMultiSelectMode || e && e.braces ? (d.recordAutoInsert(r, i, "}"), { text: "{}", selection: [1, 1] }) : (d.recordMaybeInsert(r, i, "{"), { text: "{", selection: [1, 1] }) } else if (s == "}") { h(r); var v = a.substring(u.column, u.column + 1); if (v == "}") { var m = i.$findOpeningBracket("}", { column: u.column + 1, row: u.row }); if (m !== null && d.isAutoInsertedClosing(u, a, s)) return d.popAutoInsertedClosing(), { text: "", selection: [1, 1] } } } else { if (s == "\n" || s == "\r\n") { h(r); var g = ""; d.isMaybeInsertedClosing(u, a) && (g = o.stringRepeat("}", f.maybeInsertedBrackets), d.clearMaybeInsertedClosing()); var v = a.substring(u.column, u.column + 1); if (v === "}") { var y = i.findMatchingBracket({ row: u.row, column: u.column + 1 }, "}"); if (!y) return null; var b = this.$getIndent(i.getLine(y.row)) } else { if (!g) { d.clearMaybeInsertedClosing(); return } var b = this.$getIndent(a) } var w = b + i.getTabString(); return { text: "\n" + w + "\n" + b + g, selection: [1, w.length, 1, w.length] } } d.clearMaybeInsertedClosing() } }), this.add("braces", "deletion", function (e, t, n, r, i) { var s = r.doc.getTextRange(i); if (!i.isMultiLine() && s == "{") { h(n); var o = r.doc.getLine(i.start.row), u = o.substring(i.end.column, i.end.column + 1); if (u == "}") return i.end.column++, i; f.maybeInsertedBrackets-- } }), this.add("parens", "insertion", function (e, t, n, r, i) { if (i == "(") { h(n); var s = n.getSelectionRange(), o = r.doc.getTextRange(s); if (o !== "" && n.getWrapBehavioursEnabled()) return p(s, o, "(", ")"); if (d.isSaneInsertion(n, r)) return d.recordAutoInsert(n, r, ")"), { text: "()", selection: [1, 1] } } else if (i == ")") { h(n); var u = n.getCursorPosition(), a = r.doc.getLine(u.row), f = a.substring(u.column, u.column + 1); if (f == ")") { var l = r.$findOpeningBracket(")", { column: u.column + 1, row: u.row }); if (l !== null && d.isAutoInsertedClosing(u, a, i)) return d.popAutoInsertedClosing(), { text: "", selection: [1, 1] } } } }), this.add("parens", "deletion", function (e, t, n, r, i) { var s = r.doc.getTextRange(i); if (!i.isMultiLine() && s == "(") { h(n); var o = r.doc.getLine(i.start.row), u = o.substring(i.start.column + 1, i.start.column + 2); if (u == ")") return i.end.column++, i } }), this.add("brackets", "insertion", function (e, t, n, r, i) { if (i == "[") { h(n); var s = n.getSelectionRange(), o = r.doc.getTextRange(s); if (o !== "" && n.getWrapBehavioursEnabled()) return p(s, o, "[", "]"); if (d.isSaneInsertion(n, r)) return d.recordAutoInsert(n, r, "]"), { text: "[]", selection: [1, 1] } } else if (i == "]") { h(n); var u = n.getCursorPosition(), a = r.doc.getLine(u.row), f = a.substring(u.column, u.column + 1); if (f == "]") { var l = r.$findOpeningBracket("]", { column: u.column + 1, row: u.row }); if (l !== null && d.isAutoInsertedClosing(u, a, i)) return d.popAutoInsertedClosing(), { text: "", selection: [1, 1] } } } }), this.add("brackets", "deletion", function (e, t, n, r, i) { var s = r.doc.getTextRange(i); if (!i.isMultiLine() && s == "[") { h(n); var o = r.doc.getLine(i.start.row), u = o.substring(i.start.column + 1, i.start.column + 2); if (u == "]") return i.end.column++, i } }), this.add("string_dquotes", "insertion", function (e, t, n, r, i) { var s = r.$mode.$quotes || c; if (i.length == 1 && s[i]) { if (this.lineCommentStart && this.lineCommentStart.indexOf(i) != -1) return; h(n); var o = i, u = n.getSelectionRange(), a = r.doc.getTextRange(u); if (a !== "" && (a.length != 1 || !s[a]) && n.getWrapBehavioursEnabled()) return p(u, a, o, o); if (!a) { var f = n.getCursorPosition(), l = r.doc.getLine(f.row), d = l.substring(f.column - 1, f.column), v = l.substring(f.column, f.column + 1), m = r.getTokenAt(f.row, f.column), g = r.getTokenAt(f.row, f.column + 1); if (d == "\\" && m && /escape/.test(m.type)) return null; var y = m && /string|escape/.test(m.type), b = !g || /string|escape/.test(g.type), w; if (v == o) w = y !== b, w && /string\.end/.test(g.type) && (w = !1); else { if (y && !b) return null; if (y && b) return null; var E = r.$mode.tokenRe; E.lastIndex = 0; var S = E.test(d); E.lastIndex = 0; var x = E.test(d); if (S || x) return null; if (v && !/[\s;,.})\]\\]/.test(v)) return null; var T = l[f.column - 2]; if (!(d != o || T != o && !E.test(T))) return null; w = !0 } return { text: w ? o + o : "", selection: [1, 1] } } } }), this.add("string_dquotes", "deletion", function (e, t, n, r, i) { var s = r.$mode.$quotes || c, o = r.doc.getTextRange(i); if (!i.isMultiLine() && s.hasOwnProperty(o)) { h(n); var u = r.doc.getLine(i.start.row), a = u.substring(i.start.column + 1, i.start.column + 2); if (a == o) return i.end.column++, i } }) }; d.isSaneInsertion = function (e, t) { var n = e.getCursorPosition(), r = new s(t, n.row, n.column); if (!this.$matchTokenType(r.getCurrentToken() || "text", u)) { if (/[)}\]]/.test(e.session.getLine(n.row)[n.column])) return !0; var i = new s(t, n.row, n.column + 1); if (!this.$matchTokenType(i.getCurrentToken() || "text", u)) return !1 } return r.stepForward(), r.getCurrentTokenRow() !== n.row || this.$matchTokenType(r.getCurrentToken() || "text", a) }, d.$matchTokenType = function (e, t) { return t.indexOf(e.type || e) > -1 }, d.recordAutoInsert = function (e, t, n) { var r = e.getCursorPosition(), i = t.doc.getLine(r.row); this.isAutoInsertedClosing(r, i, f.autoInsertedLineEnd[0]) || (f.autoInsertedBrackets = 0), f.autoInsertedRow = r.row, f.autoInsertedLineEnd = n + i.substr(r.column), f.autoInsertedBrackets++ }, d.recordMaybeInsert = function (e, t, n) { var r = e.getCursorPosition(), i = t.doc.getLine(r.row); this.isMaybeInsertedClosing(r, i) || (f.maybeInsertedBrackets = 0), f.maybeInsertedRow = r.row, f.maybeInsertedLineStart = i.substr(0, r.column) + n, f.maybeInsertedLineEnd = i.substr(r.column), f.maybeInsertedBrackets++ }, d.isAutoInsertedClosing = function (e, t, n) { return f.autoInsertedBrackets > 0 && e.row === f.autoInsertedRow && n === f.autoInsertedLineEnd[0] && t.substr(e.column) === f.autoInsertedLineEnd }, d.isMaybeInsertedClosing = function (e, t) { return f.maybeInsertedBrackets > 0 && e.row === f.maybeInsertedRow && t.substr(e.column) === f.maybeInsertedLineEnd && t.substr(0, e.column) == f.maybeInsertedLineStart }, d.popAutoInsertedClosing = function () { f.autoInsertedLineEnd = f.autoInsertedLineEnd.substr(1), f.autoInsertedBrackets-- }, d.clearMaybeInsertedClosing = function () { f && (f.maybeInsertedBrackets = 0, f.maybeInsertedRow = -1) }, r.inherits(d, i), t.CstyleBehaviour = d }), define("ace/unicode", ["require", "exports", "module"], function (e, t, n) { "use strict"; var r = [48, 9, 8, 25, 5, 0, 2, 25, 48, 0, 11, 0, 5, 0, 6, 22, 2, 30, 2, 457, 5, 11, 15, 4, 8, 0, 2, 0, 18, 116, 2, 1, 3, 3, 9, 0, 2, 2, 2, 0, 2, 19, 2, 82, 2, 138, 2, 4, 3, 155, 12, 37, 3, 0, 8, 38, 10, 44, 2, 0, 2, 1, 2, 1, 2, 0, 9, 26, 6, 2, 30, 10, 7, 61, 2, 9, 5, 101, 2, 7, 3, 9, 2, 18, 3, 0, 17, 58, 3, 100, 15, 53, 5, 0, 6, 45, 211, 57, 3, 18, 2, 5, 3, 11, 3, 9, 2, 1, 7, 6, 2, 2, 2, 7, 3, 1, 3, 21, 2, 6, 2, 0, 4, 3, 3, 8, 3, 1, 3, 3, 9, 0, 5, 1, 2, 4, 3, 11, 16, 2, 2, 5, 5, 1, 3, 21, 2, 6, 2, 1, 2, 1, 2, 1, 3, 0, 2, 4, 5, 1, 3, 2, 4, 0, 8, 3, 2, 0, 8, 15, 12, 2, 2, 8, 2, 2, 2, 21, 2, 6, 2, 1, 2, 4, 3, 9, 2, 2, 2, 2, 3, 0, 16, 3, 3, 9, 18, 2, 2, 7, 3, 1, 3, 21, 2, 6, 2, 1, 2, 4, 3, 8, 3, 1, 3, 2, 9, 1, 5, 1, 2, 4, 3, 9, 2, 0, 17, 1, 2, 5, 4, 2, 2, 3, 4, 1, 2, 0, 2, 1, 4, 1, 4, 2, 4, 11, 5, 4, 4, 2, 2, 3, 3, 0, 7, 0, 15, 9, 18, 2, 2, 7, 2, 2, 2, 22, 2, 9, 2, 4, 4, 7, 2, 2, 2, 3, 8, 1, 2, 1, 7, 3, 3, 9, 19, 1, 2, 7, 2, 2, 2, 22, 2, 9, 2, 4, 3, 8, 2, 2, 2, 3, 8, 1, 8, 0, 2, 3, 3, 9, 19, 1, 2, 7, 2, 2, 2, 22, 2, 15, 4, 7, 2, 2, 2, 3, 10, 0, 9, 3, 3, 9, 11, 5, 3, 1, 2, 17, 4, 23, 2, 8, 2, 0, 3, 6, 4, 0, 5, 5, 2, 0, 2, 7, 19, 1, 14, 57, 6, 14, 2, 9, 40, 1, 2, 0, 3, 1, 2, 0, 3, 0, 7, 3, 2, 6, 2, 2, 2, 0, 2, 0, 3, 1, 2, 12, 2, 2, 3, 4, 2, 0, 2, 5, 3, 9, 3, 1, 35, 0, 24, 1, 7, 9, 12, 0, 2, 0, 2, 0, 5, 9, 2, 35, 5, 19, 2, 5, 5, 7, 2, 35, 10, 0, 58, 73, 7, 77, 3, 37, 11, 42, 2, 0, 4, 328, 2, 3, 3, 6, 2, 0, 2, 3, 3, 40, 2, 3, 3, 32, 2, 3, 3, 6, 2, 0, 2, 3, 3, 14, 2, 56, 2, 3, 3, 66, 5, 0, 33, 15, 17, 84, 13, 619, 3, 16, 2, 25, 6, 74, 22, 12, 2, 6, 12, 20, 12, 19, 13, 12, 2, 2, 2, 1, 13, 51, 3, 29, 4, 0, 5, 1, 3, 9, 34, 2, 3, 9, 7, 87, 9, 42, 6, 69, 11, 28, 4, 11, 5, 11, 11, 39, 3, 4, 12, 43, 5, 25, 7, 10, 38, 27, 5, 62, 2, 28, 3, 10, 7, 9, 14, 0, 89, 75, 5, 9, 18, 8, 13, 42, 4, 11, 71, 55, 9, 9, 4, 48, 83, 2, 2, 30, 14, 230, 23, 280, 3, 5, 3, 37, 3, 5, 3, 7, 2, 0, 2, 0, 2, 0, 2, 30, 3, 52, 2, 6, 2, 0, 4, 2, 2, 6, 4, 3, 3, 5, 5, 12, 6, 2, 2, 6, 67, 1, 20, 0, 29, 0, 14, 0, 17, 4, 60, 12, 5, 0, 4, 11, 18, 0, 5, 0, 3, 9, 2, 0, 4, 4, 7, 0, 2, 0, 2, 0, 2, 3, 2, 10, 3, 3, 6, 4, 5, 0, 53, 1, 2684, 46, 2, 46, 2, 132, 7, 6, 15, 37, 11, 53, 10, 0, 17, 22, 10, 6, 2, 6, 2, 6, 2, 6, 2, 6, 2, 6, 2, 6, 2, 6, 2, 31, 48, 0, 470, 1, 36, 5, 2, 4, 6, 1, 5, 85, 3, 1, 3, 2, 2, 89, 2, 3, 6, 40, 4, 93, 18, 23, 57, 15, 513, 6581, 75, 20939, 53, 1164, 68, 45, 3, 268, 4, 27, 21, 31, 3, 13, 13, 1, 2, 24, 9, 69, 11, 1, 38, 8, 3, 102, 3, 1, 111, 44, 25, 51, 13, 68, 12, 9, 7, 23, 4, 0, 5, 45, 3, 35, 13, 28, 4, 64, 15, 10, 39, 54, 10, 13, 3, 9, 7, 22, 4, 1, 5, 66, 25, 2, 227, 42, 2, 1, 3, 9, 7, 11171, 13, 22, 5, 48, 8453, 301, 3, 61, 3, 105, 39, 6, 13, 4, 6, 11, 2, 12, 2, 4, 2, 0, 2, 1, 2, 1, 2, 107, 34, 362, 19, 63, 3, 53, 41, 11, 5, 15, 17, 6, 13, 1, 25, 2, 33, 4, 2, 134, 20, 9, 8, 25, 5, 0, 2, 25, 12, 88, 4, 5, 3, 5, 3, 5, 3, 2], i = 0, s = []; for (var o = 0; o < r.length; o += 2)s.push(i += r[o]), r[o + 1] && s.push(45, i += r[o + 1]); t.wordChars = String.fromCharCode.apply(null, s) }), define("ace/mode/text", ["require", "exports", "module", "ace/config", "ace/tokenizer", "ace/mode/text_highlight_rules", "ace/mode/behaviour/cstyle", "ace/unicode", "ace/lib/lang", "ace/token_iterator", "ace/range"], function (e, t, n) { "use strict"; var r = e("../config"), i = e("../tokenizer").Tokenizer, s = e("./text_highlight_rules").TextHighlightRules, o = e("./behaviour/cstyle").CstyleBehaviour, u = e("../unicode"), a = e("../lib/lang"), f = e("../token_iterator").TokenIterator, l = e("../range").Range, c = function () { this.HighlightRules = s }; (function () { this.$defaultBehaviour = new o, this.tokenRe = new RegExp("^[" + u.wordChars + "\\$_]+", "g"), this.nonTokenRe = new RegExp("^(?:[^" + u.wordChars + "\\$_]|\\s])+", "g"), this.getTokenizer = function () { return this.$tokenizer || (this.$highlightRules = this.$highlightRules || new this.HighlightRules(this.$highlightRuleConfig), this.$tokenizer = new i(this.$highlightRules.getRules())), this.$tokenizer }, this.lineCommentStart = "", this.blockComment = "", this.toggleCommentLines = function (e, t, n, r) { function w(e) { for (var t = n; t <= r; t++)e(i.getLine(t), t) } var i = t.doc, s = !0, o = !0, u = Infinity, f = t.getTabSize(), l = !1; if (!this.lineCommentStart) { if (!this.blockComment) return !1; var c = this.blockComment.start, h = this.blockComment.end, p = new RegExp("^(\\s*)(?:" + a.escapeRegExp(c) + ")"), d = new RegExp("(?:" + a.escapeRegExp(h) + ")\\s*$"), v = function (e, t) { if (g(e, t)) return; if (!s || /\S/.test(e)) i.insertInLine({ row: t, column: e.length }, h), i.insertInLine({ row: t, column: u }, c) }, m = function (e, t) { var n; (n = e.match(d)) && i.removeInLine(t, e.length - n[0].length, e.length), (n = e.match(p)) && i.removeInLine(t, n[1].length, n[0].length) }, g = function (e, n) { if (p.test(e)) return !0; var r = t.getTokens(n); for (var i = 0; i < r.length; i++)if (r[i].type === "comment") return !0 } } else { if (Array.isArray(this.lineCommentStart)) var p = this.lineCommentStart.map(a.escapeRegExp).join("|"), c = this.lineCommentStart[0]; else var p = a.escapeRegExp(this.lineCommentStart), c = this.lineCommentStart; p = new RegExp("^(\\s*)(?:" + p + ") ?"), l = t.getUseSoftTabs(); var m = function (e, t) { var n = e.match(p); if (!n) return; var r = n[1].length, s = n[0].length; !b(e, r, s) && n[0][s - 1] == " " && s--, i.removeInLine(t, r, s) }, y = c + " ", v = function (e, t) { if (!s || /\S/.test(e)) b(e, u, u) ? i.insertInLine({ row: t, column: u }, y) : i.insertInLine({ row: t, column: u }, c) }, g = function (e, t) { return p.test(e) }, b = function (e, t, n) { var r = 0; while (t-- && e.charAt(t) == " ") r++; if (r % f != 0) return !1; var r = 0; while (e.charAt(n++) == " ") r++; return f > 2 ? r % f != f - 1 : r % f == 0 } } var E = Infinity; w(function (e, t) { var n = e.search(/\S/); n !== -1 ? (n < u && (u = n), o && !g(e, t) && (o = !1)) : E > e.length && (E = e.length) }), u == Infinity && (u = E, s = !1, o = !1), l && u % f != 0 && (u = Math.floor(u / f) * f), w(o ? m : v) }, this.toggleBlockComment = function (e, t, n, r) { var i = this.blockComment; if (!i) return; !i.start && i[0] && (i = i[0]); var s = new f(t, r.row, r.column), o = s.getCurrentToken(), u = t.selection, a = t.selection.toOrientedRange(), c, h; if (o && /comment/.test(o.type)) { var p, d; while (o && /comment/.test(o.type)) { var v = o.value.indexOf(i.start); if (v != -1) { var m = s.getCurrentTokenRow(), g = s.getCurrentTokenColumn() + v; p = new l(m, g, m, g + i.start.length); break } o = s.stepBackward() } var s = new f(t, r.row, r.column), o = s.getCurrentToken(); while (o && /comment/.test(o.type)) { var v = o.value.indexOf(i.end); if (v != -1) { var m = s.getCurrentTokenRow(), g = s.getCurrentTokenColumn() + v; d = new l(m, g, m, g + i.end.length); break } o = s.stepForward() } d && t.remove(d), p && (t.remove(p), c = p.start.row, h = -i.start.length) } else h = i.start.length, c = n.start.row, t.insert(n.end, i.end), t.insert(n.start, i.start); a.start.row == c && (a.start.column += h), a.end.row == c && (a.end.column += h), t.selection.fromOrientedRange(a) }, this.getNextLineIndent = function (e, t, n) { return this.$getIndent(t) }, this.checkOutdent = function (e, t, n) { return !1 }, this.autoOutdent = function (e, t, n) { }, this.$getIndent = function (e) { return e.match(/^\s*/)[0] }, this.createWorker = function (e) { return null }, this.createModeDelegates = function (e) { this.$embeds = [], this.$modes = {}; for (var t in e) if (e[t]) { var n = e[t], i = n.prototype.$id, s = r.$modes[i]; s || (r.$modes[i] = s = new n), r.$modes[t] || (r.$modes[t] = s), this.$embeds.push(t), this.$modes[t] = s } var o = ["toggleBlockComment", "toggleCommentLines", "getNextLineIndent", "checkOutdent", "autoOutdent", "transformAction", "getCompletions"]; for (var t = 0; t < o.length; t++)(function (e) { var n = o[t], r = e[n]; e[o[t]] = function () { return this.$delegator(n, arguments, r) } })(this) }, this.$delegator = function (e, t, n) { var r = t[0] || "start"; if (typeof r != "string") { if (Array.isArray(r[2])) { var i = r[2][r[2].length - 1], s = this.$modes[i]; if (s) return s[e].apply(s, [r[1]].concat([].slice.call(t, 1))) } r = r[0] || "start" } for (var o = 0; o < this.$embeds.length; o++) { if (!this.$modes[this.$embeds[o]]) continue; var u = r.split(this.$embeds[o]); if (!u[0] && u[1]) { t[0] = u[1]; var s = this.$modes[this.$embeds[o]]; return s[e].apply(s, t) } } var a = n.apply(this, t); return n ? a : undefined }, this.transformAction = function (e, t, n, r, i) { if (this.$behaviour) { var s = this.$behaviour.getBehaviours(); for (var o in s) if (s[o][t]) { var u = s[o][t].apply(this, arguments); if (u) return u } } }, this.getKeywords = function (e) { if (!this.completionKeywords) { var t = this.$tokenizer.rules, n = []; for (var r in t) { var i = t[r]; for (var s = 0, o = i.length; s < o; s++)if (typeof i[s].token == "string") /keyword|support|storage/.test(i[s].token) && n.push(i[s].regex); else if (typeof i[s].token == "object") for (var u = 0, a = i[s].token.length; u < a; u++)if (/keyword|support|storage/.test(i[s].token[u])) { var r = i[s].regex.match(/\(.+?\)/g)[u]; n.push(r.substr(1, r.length - 2)) } } this.completionKeywords = n } return e ? n.concat(this.$keywordList || []) : this.$keywordList }, this.$createKeywordList = function () { return this.$highlightRules || this.getTokenizer(), this.$keywordList = this.$highlightRules.$keywordList || [] }, this.getCompletions = function (e, t, n, r) { var i = this.$keywordList || this.$createKeywordList(); return i.map(function (e) { return { name: e, value: e, score: 0, meta: "keyword" } }) }, this.$id = "ace/mode/text" }).call(c.prototype), t.Mode = c }), define("ace/apply_delta", ["require", "exports", "module"], function (e, t, n) { "use strict"; function r(e, t) { throw console.log("Invalid Delta:", e), "Invalid Delta: " + t } function i(e, t) { return t.row >= 0 && t.row < e.length && t.column >= 0 && t.column <= e[t.row].length } function s(e, t) { t.action != "insert" && t.action != "remove" && r(t, "delta.action must be 'insert' or 'remove'"), t.lines instanceof Array || r(t, "delta.lines must be an Array"), (!t.start || !t.end) && r(t, "delta.start/end must be an present"); var n = t.start; i(e, t.start) || r(t, "delta.start must be contained in document"); var s = t.end; t.action == "remove" && !i(e, s) && r(t, "delta.end must contained in document for 'remove' actions"); var o = s.row - n.row, u = s.column - (o == 0 ? n.column : 0); (o != t.lines.length - 1 || t.lines[o].length != u) && r(t, "delta.range must match delta lines") } t.applyDelta = function (e, t, n) { var r = t.start.row, i = t.start.column, s = e[r] || ""; switch (t.action) { case "insert": var o = t.lines; if (o.length === 1) e[r] = s.substring(0, i) + t.lines[0] + s.substring(i); else { var u = [r, 1].concat(t.lines); e.splice.apply(e, u), e[r] = s.substring(0, i) + e[r], e[r + t.lines.length - 1] += s.substring(i) } break; case "remove": var a = t.end.column, f = t.end.row; r === f ? e[r] = s.substring(0, i) + s.substring(a) : e.splice(r, f - r + 1, s.substring(0, i) + e[f].substring(a)) } } }), define("ace/anchor", ["require", "exports", "module", "ace/lib/oop", "ace/lib/event_emitter"], function (e, t, n) { "use strict"; var r = e("./lib/oop"), i = e("./lib/event_emitter").EventEmitter, s = t.Anchor = function (e, t, n) { this.$onChange = this.onChange.bind(this), this.attach(e), typeof n == "undefined" ? this.setPosition(t.row, t.column) : this.setPosition(t, n) }; (function () { function e(e, t, n) { var r = n ? e.column <= t.column : e.column < t.column; return e.row < t.row || e.row == t.row && r } function t(t, n, r) { var i = t.action == "insert", s = (i ? 1 : -1) * (t.end.row - t.start.row), o = (i ? 1 : -1) * (t.end.column - t.start.column), u = t.start, a = i ? u : t.end; return e(n, u, r) ? { row: n.row, column: n.column } : e(a, n, !r) ? { row: n.row + s, column: n.column + (n.row == a.row ? o : 0) } : { row: u.row, column: u.column } } r.implement(this, i), this.getPosition = function () { return this.$clipPositionToDocument(this.row, this.column) }, this.getDocument = function () { return this.document }, this.$insertRight = !1, this.onChange = function (e) { if (e.start.row == e.end.row && e.start.row != this.row) return; if (e.start.row > this.row) return; var n = t(e, { row: this.row, column: this.column }, this.$insertRight); this.setPosition(n.row, n.column, !0) }, this.setPosition = function (e, t, n) { var r; n ? r = { row: e, column: t } : r = this.$clipPositionToDocument(e, t); if (this.row == r.row && this.column == r.column) return; var i = { row: this.row, column: this.column }; this.row = r.row, this.column = r.column, this._signal("change", { old: i, value: r }) }, this.detach = function () { this.document.off("change", this.$onChange) }, this.attach = function (e) { this.document = e || this.document, this.document.on("change", this.$onChange) }, this.$clipPositionToDocument = function (e, t) { var n = {}; return e >= this.document.getLength() ? (n.row = Math.max(0, this.document.getLength() - 1), n.column = this.document.getLine(n.row).length) : e < 0 ? (n.row = 0, n.column = 0) : (n.row = e, n.column = Math.min(this.document.getLine(n.row).length, Math.max(0, t))), t < 0 && (n.column = 0), n } }).call(s.prototype) }), define("ace/document", ["require", "exports", "module", "ace/lib/oop", "ace/apply_delta", "ace/lib/event_emitter", "ace/range", "ace/anchor"], function (e, t, n) { "use strict"; var r = e("./lib/oop"), i = e("./apply_delta").applyDelta, s = e("./lib/event_emitter").EventEmitter, o = e("./range").Range, u = e("./anchor").Anchor, a = function (e) { this.$lines = [""], e.length === 0 ? this.$lines = [""] : Array.isArray(e) ? this.insertMergedLines({ row: 0, column: 0 }, e) : this.insert({ row: 0, column: 0 }, e) }; (function () { r.implement(this, s), this.setValue = function (e) { var t = this.getLength() - 1; this.remove(new o(0, 0, t, this.getLine(t).length)), this.insert({ row: 0, column: 0 }, e) }, this.getValue = function () { return this.getAllLines().join(this.getNewLineCharacter()) }, this.createAnchor = function (e, t) { return new u(this, e, t) }, "aaa".split(/a/).length === 0 ? this.$split = function (e) { return e.replace(/\r\n|\r/g, "\n").split("\n") } : this.$split = function (e) { return e.split(/\r\n|\r|\n/) }, this.$detectNewLine = function (e) { var t = e.match(/^.*?(\r\n|\r|\n)/m); this.$autoNewLine = t ? t[1] : "\n", this._signal("changeNewLineMode") }, this.getNewLineCharacter = function () { switch (this.$newLineMode) { case "windows": return "\r\n"; case "unix": return "\n"; default: return this.$autoNewLine || "\n" } }, this.$autoNewLine = "", this.$newLineMode = "auto", this.setNewLineMode = function (e) { if (this.$newLineMode === e) return; this.$newLineMode = e, this._signal("changeNewLineMode") }, this.getNewLineMode = function () { return this.$newLineMode }, this.isNewLine = function (e) { return e == "\r\n" || e == "\r" || e == "\n" }, this.getLine = function (e) { return this.$lines[e] || "" }, this.getLines = function (e, t) { return this.$lines.slice(e, t + 1) }, this.getAllLines = function () { return this.getLines(0, this.getLength()) }, this.getLength = function () { return this.$lines.length }, this.getTextRange = function (e) { return this.getLinesForRange(e).join(this.getNewLineCharacter()) }, this.getLinesForRange = function (e) { var t; if (e.start.row === e.end.row) t = [this.getLine(e.start.row).substring(e.start.column, e.end.column)]; else { t = this.getLines(e.start.row, e.end.row), t[0] = (t[0] || "").substring(e.start.column); var n = t.length - 1; e.end.row - e.start.row == n && (t[n] = t[n].substring(0, e.end.column)) } return t }, this.insertLines = function (e, t) { return console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead."), this.insertFullLines(e, t) }, this.removeLines = function (e, t) { return console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead."), this.removeFullLines(e, t) }, this.insertNewLine = function (e) { return console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead."), this.insertMergedLines(e, ["", ""]) }, this.insert = function (e, t) { return this.getLength() <= 1 && this.$detectNewLine(t), this.insertMergedLines(e, this.$split(t)) }, this.insertInLine = function (e, t) { var n = this.clippedPos(e.row, e.column), r = this.pos(e.row, e.column + t.length); return this.applyDelta({ start: n, end: r, action: "insert", lines: [t] }, !0), this.clonePos(r) }, this.clippedPos = function (e, t) { var n = this.getLength(); e === undefined ? e = n : e < 0 ? e = 0 : e >= n && (e = n - 1, t = undefined); var r = this.getLine(e); return t == undefined && (t = r.length), t = Math.min(Math.max(t, 0), r.length), { row: e, column: t } }, this.clonePos = function (e) { return { row: e.row, column: e.column } }, this.pos = function (e, t) { return { row: e, column: t } }, this.$clipPosition = function (e) { var t = this.getLength(); return e.row >= t ? (e.row = Math.max(0, t - 1), e.column = this.getLine(t - 1).length) : (e.row = Math.max(0, e.row), e.column = Math.min(Math.max(e.column, 0), this.getLine(e.row).length)), e }, this.insertFullLines = function (e, t) { e = Math.min(Math.max(e, 0), this.getLength()); var n = 0; e < this.getLength() ? (t = t.concat([""]), n = 0) : (t = [""].concat(t), e--, n = this.$lines[e].length), this.insertMergedLines({ row: e, column: n }, t) }, this.insertMergedLines = function (e, t) { var n = this.clippedPos(e.row, e.column), r = { row: n.row + t.length - 1, column: (t.length == 1 ? n.column : 0) + t[t.length - 1].length }; return this.applyDelta({ start: n, end: r, action: "insert", lines: t }), this.clonePos(r) }, this.remove = function (e) { var t = this.clippedPos(e.start.row, e.start.column), n = this.clippedPos(e.end.row, e.end.column); return this.applyDelta({ start: t, end: n, action: "remove", lines: this.getLinesForRange({ start: t, end: n }) }), this.clonePos(t) }, this.removeInLine = function (e, t, n) { var r = this.clippedPos(e, t), i = this.clippedPos(e, n); return this.applyDelta({ start: r, end: i, action: "remove", lines: this.getLinesForRange({ start: r, end: i }) }, !0), this.clonePos(r) }, this.removeFullLines = function (e, t) { e = Math.min(Math.max(0, e), this.getLength() - 1), t = Math.min(Math.max(0, t), this.getLength() - 1); var n = t == this.getLength() - 1 && e > 0, r = t < this.getLength() - 1, i = n ? e - 1 : e, s = n ? this.getLine(i).length : 0, u = r ? t + 1 : t, a = r ? 0 : this.getLine(u).length, f = new o(i, s, u, a), l = this.$lines.slice(e, t + 1); return this.applyDelta({ start: f.start, end: f.end, action: "remove", lines: this.getLinesForRange(f) }), l }, this.removeNewLine = function (e) { e < this.getLength() - 1 && e >= 0 && this.applyDelta({ start: this.pos(e, this.getLine(e).length), end: this.pos(e + 1, 0), action: "remove", lines: ["", ""] }) }, this.replace = function (e, t) { e instanceof o || (e = o.fromPoints(e.start, e.end)); if (t.length === 0 && e.isEmpty()) return e.start; if (t == this.getTextRange(e)) return e.end; this.remove(e); var n; return t ? n = this.insert(e.start, t) : n = e.start, n }, this.applyDeltas = function (e) { for (var t = 0; t < e.length; t++)this.applyDelta(e[t]) }, this.revertDeltas = function (e) { for (var t = e.length - 1; t >= 0; t--)this.revertDelta(e[t]) }, this.applyDelta = function (e, t) { var n = e.action == "insert"; if (n ? e.lines.length <= 1 && !e.lines[0] : !o.comparePoints(e.start, e.end)) return; n && e.lines.length > 2e4 ? this.$splitAndapplyLargeDelta(e, 2e4) : (i(this.$lines, e, t), this._signal("change", e)) }, this.$safeApplyDelta = function (e) { var t = this.$lines.length; (e.action == "remove" && e.start.row < t && e.end.row < t || e.action == "insert" && e.start.row <= t) && this.applyDelta(e) }, this.$splitAndapplyLargeDelta = function (e, t) { var n = e.lines, r = n.length - t + 1, i = e.start.row, s = e.start.column; for (var o = 0, u = 0; o < r; o = u) { u += t - 1; var a = n.slice(o, u); a.push(""), this.applyDelta({ start: this.pos(i + o, s), end: this.pos(i + u, s = 0), action: e.action, lines: a }, !0) } e.lines = n.slice(o), e.start.row = i + o, e.start.column = s, this.applyDelta(e, !0) }, this.revertDelta = function (e) { this.$safeApplyDelta({ start: this.clonePos(e.start), end: this.clonePos(e.end), action: e.action == "insert" ? "remove" : "insert", lines: e.lines.slice() }) }, this.indexToPosition = function (e, t) { var n = this.$lines || this.getAllLines(), r = this.getNewLineCharacter().length; for (var i = t || 0, s = n.length; i < s; i++) { e -= n[i].length + r; if (e < 0) return { row: i, column: e + n[i].length + r } } return { row: s - 1, column: e + n[s - 1].length + r } }, this.positionToIndex = function (e, t) { var n = this.$lines || this.getAllLines(), r = this.getNewLineCharacter().length, i = 0, s = Math.min(e.row, n.length); for (var o = t || 0; o < s; ++o)i += n[o].length + r; return i + e.column } }).call(a.prototype), t.Document = a }), define("ace/background_tokenizer", ["require", "exports", "module", "ace/lib/oop", "ace/lib/event_emitter"], function (e, t, n) { "use strict"; var r = e("./lib/oop"), i = e("./lib/event_emitter").EventEmitter, s = function (e, t) { this.running = !1, this.lines = [], this.states = [], this.currentLine = 0, this.tokenizer = e; var n = this; this.$worker = function () { if (!n.running) return; var e = new Date, t = n.currentLine, r = -1, i = n.doc, s = t; while (n.lines[t]) t++; var o = i.getLength(), u = 0; n.running = !1; while (t < o) { n.$tokenizeRow(t), r = t; do t++; while (n.lines[t]); u++; if (u % 5 === 0 && new Date - e > 20) { n.running = setTimeout(n.$worker, 20); break } } n.currentLine = t, r == -1 && (r = t), s <= r && n.fireUpdateEvent(s, r) } }; (function () { r.implement(this, i), this.setTokenizer = function (e) { this.tokenizer = e, this.lines = [], this.states = [], this.start(0) }, this.setDocument = function (e) { this.doc = e, this.lines = [], this.states = [], this.stop() }, this.fireUpdateEvent = function (e, t) { var n = { first: e, last: t }; this._signal("update", { data: n }) }, this.start = function (e) { this.currentLine = Math.min(e || 0, this.currentLine, this.doc.getLength()), this.lines.splice(this.currentLine, this.lines.length), this.states.splice(this.currentLine, this.states.length), this.stop(), this.running = setTimeout(this.$worker, 700) }, this.scheduleStart = function () { this.running || (this.running = setTimeout(this.$worker, 700)) }, this.$updateOnChange = function (e) { var t = e.start.row, n = e.end.row - t; if (n === 0) this.lines[t] = null; else if (e.action == "remove") this.lines.splice(t, n + 1, null), this.states.splice(t, n + 1, null); else { var r = Array(n + 1); r.unshift(t, 1), this.lines.splice.apply(this.lines, r), this.states.splice.apply(this.states, r) } this.currentLine = Math.min(t, this.currentLine, this.doc.getLength()), this.stop() }, this.stop = function () { this.running && clearTimeout(this.running), this.running = !1 }, this.getTokens = function (e) { return this.lines[e] || this.$tokenizeRow(e) }, this.getState = function (e) { return this.currentLine == e && this.$tokenizeRow(e), this.states[e] || "start" }, this.$tokenizeRow = function (e) { var t = this.doc.getLine(e), n = this.states[e - 1], r = this.tokenizer.getLineTokens(t, n, e); return this.states[e] + "" != r.state + "" ? (this.states[e] = r.state, this.lines[e + 1] = null, this.currentLine > e + 1 && (this.currentLine = e + 1)) : this.currentLine == e && (this.currentLine = e + 1), this.lines[e] = r.tokens } }).call(s.prototype), t.BackgroundTokenizer = s }), define("ace/search_highlight", ["require", "exports", "module", "ace/lib/lang", "ace/lib/oop", "ace/range"], function (e, t, n) { "use strict"; var r = e("./lib/lang"), i = e("./lib/oop"), s = e("./range").Range, o = function (e, t, n) { this.setRegexp(e), this.clazz = t, this.type = n || "text" }; (function () { this.MAX_RANGES = 500, this.setRegexp = function (e) { if (this.regExp + "" == e + "") return; this.regExp = e, this.cache = [] }, this.update = function (e, t, n, i) { if (!this.regExp) return; var o = i.firstRow, u = i.lastRow; for (var a = o; a <= u; a++) { var f = this.cache[a]; f == null && (f = r.getMatchOffsets(n.getLine(a), this.regExp), f.length > this.MAX_RANGES && (f = f.slice(0, this.MAX_RANGES)), f = f.map(function (e) { return new s(a, e.offset, a, e.offset + e.length) }), this.cache[a] = f.length ? f : ""); for (var l = f.length; l--;)t.drawSingleLineMarker(e, f[l].toScreenRange(n), this.clazz, i) } } }).call(o.prototype), t.SearchHighlight = o }), define("ace/edit_session/fold_line", ["require", "exports", "module", "ace/range"], function (e, t, n) { "use strict"; function i(e, t) { this.foldData = e, Array.isArray(t) ? this.folds = t : t = this.folds = [t]; var n = t[t.length - 1]; this.range = new r(t[0].start.row, t[0].start.column, n.end.row, n.end.column), this.start = this.range.start, this.end = this.range.end, this.folds.forEach(function (e) { e.setFoldLine(this) }, this) } var r = e("../range").Range; (function () { this.shiftRow = function (e) { this.start.row += e, this.end.row += e, this.folds.forEach(function (t) { t.start.row += e, t.end.row += e }) }, this.addFold = function (e) { if (e.sameRow) { if (e.start.row < this.startRow || e.endRow > this.endRow) throw new Error("Can't add a fold to this FoldLine as it has no connection"); this.folds.push(e), this.folds.sort(function (e, t) { return -e.range.compareEnd(t.start.row, t.start.column) }), this.range.compareEnd(e.start.row, e.start.column) > 0 ? (this.end.row = e.end.row, this.end.column = e.end.column) : this.range.compareStart(e.end.row, e.end.column) < 0 && (this.start.row = e.start.row, this.start.column = e.start.column) } else if (e.start.row == this.end.row) this.folds.push(e), this.end.row = e.end.row, this.end.column = e.end.column; else { if (e.end.row != this.start.row) throw new Error("Trying to add fold to FoldRow that doesn't have a matching row"); this.folds.unshift(e), this.start.row = e.start.row, this.start.column = e.start.column } e.foldLine = this }, this.containsRow = function (e) { return e >= this.start.row && e <= this.end.row }, this.walk = function (e, t, n) { var r = 0, i = this.folds, s, o, u, a = !0; t == null && (t = this.end.row, n = this.end.column); for (var f = 0; f < i.length; f++) { s = i[f], o = s.range.compareStart(t, n); if (o == -1) { e(null, t, n, r, a); return } u = e(null, s.start.row, s.start.column, r, a), u = !u && e(s.placeholder, s.start.row, s.start.column, r); if (u || o === 0) return; a = !s.sameRow, r = s.end.column } e(null, t, n, r, a) }, this.getNextFoldTo = function (e, t) { var n, r; for (var i = 0; i < this.folds.length; i++) { n = this.folds[i], r = n.range.compareEnd(e, t); if (r == -1) return { fold: n, kind: "after" }; if (r === 0) return { fold: n, kind: "inside" } } return null }, this.addRemoveChars = function (e, t, n) { var r = this.getNextFoldTo(e, t), i, s; if (r) { i = r.fold; if (r.kind == "inside" && i.start.column != t && i.start.row != e) window.console && window.console.log(e, t, i); else if (i.start.row == e) { s = this.folds; var o = s.indexOf(i); o === 0 && (this.start.column += n); for (o; o < s.length; o++) { i = s[o], i.start.column += n; if (!i.sameRow) return; i.end.column += n } this.end.column += n } } }, this.split = function (e, t) { var n = this.getNextFoldTo(e, t); if (!n || n.kind == "inside") return null; var r = n.fold, s = this.folds, o = this.foldData, u = s.indexOf(r), a = s[u - 1]; this.end.row = a.end.row, this.end.column = a.end.column, s = s.splice(u, s.length - u); var f = new i(o, s); return o.splice(o.indexOf(this) + 1, 0, f), f }, this.merge = function (e) { var t = e.folds; for (var n = 0; n < t.length; n++)this.addFold(t[n]); var r = this.foldData; r.splice(r.indexOf(e), 1) }, this.toString = function () { var e = [this.range.toString() + ": ["]; return this.folds.forEach(function (t) { e.push("  " + t.toString()) }), e.push("]"), e.join("\n") }, this.idxToPosition = function (e) { var t = 0; for (var n = 0; n < this.folds.length; n++) { var r = this.folds[n]; e -= r.start.column - t; if (e < 0) return { row: r.start.row, column: r.start.column + e }; e -= r.placeholder.length; if (e < 0) return r.start; t = r.end.column } return { row: this.end.row, column: this.end.column + e } } }).call(i.prototype), t.FoldLine = i }), define("ace/range_list", ["require", "exports", "module", "ace/range"], function (e, t, n) { "use strict"; var r = e("./range").Range, i = r.comparePoints, s = function () { this.ranges = [], this.$bias = 1 }; (function () { this.comparePoints = i, this.pointIndex = function (e, t, n) { var r = this.ranges; for (var s = n || 0; s < r.length; s++) { var o = r[s], u = i(e, o.end); if (u > 0) continue; var a = i(e, o.start); return u === 0 ? t && a !== 0 ? -s - 2 : s : a > 0 || a === 0 && !t ? s : -s - 1 } return -s - 1 }, this.add = function (e) { var t = !e.isEmpty(), n = this.pointIndex(e.start, t); n < 0 && (n = -n - 1); var r = this.pointIndex(e.end, t, n); return r < 0 ? r = -r - 1 : r++, this.ranges.splice(n, r - n, e) }, this.addList = function (e) { var t = []; for (var n = e.length; n--;)t.push.apply(t, this.add(e[n])); return t }, this.substractPoint = function (e) { var t = this.pointIndex(e); if (t >= 0) return this.ranges.splice(t, 1) }, this.merge = function () { var e = [], t = this.ranges; t = t.sort(function (e, t) { return i(e.start, t.start) }); var n = t[0], r; for (var s = 1; s < t.length; s++) { r = n, n = t[s]; var o = i(r.end, n.start); if (o < 0) continue; if (o == 0 && !r.isEmpty() && !n.isEmpty()) continue; i(r.end, n.end) < 0 && (r.end.row = n.end.row, r.end.column = n.end.column), t.splice(s, 1), e.push(n), n = r, s-- } return this.ranges = t, e }, this.contains = function (e, t) { return this.pointIndex({ row: e, column: t }) >= 0 }, this.containsPoint = function (e) { return this.pointIndex(e) >= 0 }, this.rangeAtPoint = function (e) { var t = this.pointIndex(e); if (t >= 0) return this.ranges[t] }, this.clipRows = function (e, t) { var n = this.ranges; if (n[0].start.row > t || n[n.length - 1].start.row < e) return []; var r = this.pointIndex({ row: e, column: 0 }); r < 0 && (r = -r - 1); var i = this.pointIndex({ row: t, column: 0 }, r); i < 0 && (i = -i - 1); var s = []; for (var o = r; o < i; o++)s.push(n[o]); return s }, this.removeAll = function () { return this.ranges.splice(0, this.ranges.length) }, this.attach = function (e) { this.session && this.detach(), this.session = e, this.onChange = this.$onChange.bind(this), this.session.on("change", this.onChange) }, this.detach = function () { if (!this.session) return; this.session.removeListener("change", this.onChange), this.session = null }, this.$onChange = function (e) { var t = e.start, n = e.end, r = t.row, i = n.row, s = this.ranges; for (var o = 0, u = s.length; o < u; o++) { var a = s[o]; if (a.end.row >= r) break } if (e.action == "insert") { var f = i - r, l = -t.column + n.column; for (; o < u; o++) { var a = s[o]; if (a.start.row > r) break; a.start.row == r && a.start.column >= t.column && (a.start.column == t.column && this.$bias <= 0 || (a.start.column += l, a.start.row += f)); if (a.end.row == r && a.end.column >= t.column) { if (a.end.column == t.column && this.$bias < 0) continue; a.end.column == t.column && l > 0 && o < u - 1 && a.end.column > a.start.column && a.end.column == s[o + 1].start.column && (a.end.column -= l), a.end.column += l, a.end.row += f } } } else { var f = r - i, l = t.column - n.column; for (; o < u; o++) { var a = s[o]; if (a.start.row > i) break; if (a.end.row < i && (r < a.end.row || r == a.end.row && t.column < a.end.column)) a.end.row = r, a.end.column = t.column; else if (a.end.row == i) if (a.end.column <= n.column) { if (f || a.end.column > t.column) a.end.column = t.column, a.end.row = t.row } else a.end.column += l, a.end.row += f; else a.end.row > i && (a.end.row += f); if (a.start.row < i && (r < a.start.row || r == a.start.row && t.column < a.start.column)) a.start.row = r, a.start.column = t.column; else if (a.start.row == i) if (a.start.column <= n.column) { if (f || a.start.column > t.column) a.start.column = t.column, a.start.row = t.row } else a.start.column += l, a.start.row += f; else a.start.row > i && (a.start.row += f) } } if (f != 0 && o < u) for (; o < u; o++) { var a = s[o]; a.start.row += f, a.end.row += f } } }).call(s.prototype), t.RangeList = s }), define("ace/edit_session/fold", ["require", "exports", "module", "ace/range_list", "ace/lib/oop"], function (e, t, n) { "use strict"; function o(e, t) { e.row -= t.row, e.row == 0 && (e.column -= t.column) } function u(e, t) { o(e.start, t), o(e.end, t) } function a(e, t) { e.row == 0 && (e.column += t.column), e.row += t.row } function f(e, t) { a(e.start, t), a(e.end, t) } var r = e("../range_list").RangeList, i = e("../lib/oop"), s = t.Fold = function (e, t) { this.foldLine = null, this.placeholder = t, this.range = e, this.start = e.start, this.end = e.end, this.sameRow = e.start.row == e.end.row, this.subFolds = this.ranges = [] }; i.inherits(s, r), function () { this.toString = function () { return '"' + this.placeholder + '" ' + this.range.toString() }, this.setFoldLine = function (e) { this.foldLine = e, this.subFolds.forEach(function (t) { t.setFoldLine(e) }) }, this.clone = function () { var e = this.range.clone(), t = new s(e, this.placeholder); return this.subFolds.forEach(function (e) { t.subFolds.push(e.clone()) }), t.collapseChildren = this.collapseChildren, t }, this.addSubFold = function (e) { if (this.range.isEqual(e)) return; u(e, this.start); var t = e.start.row, n = e.start.column; for (var r = 0, i = -1; r < this.subFolds.length; r++) { i = this.subFolds[r].range.compare(t, n); if (i != 1) break } var s = this.subFolds[r], o = 0; if (i == 0) { if (s.range.containsRange(e)) return s.addSubFold(e); o = 1 } var t = e.range.end.row, n = e.range.end.column; for (var a = r, i = -1; a < this.subFolds.length; a++) { i = this.subFolds[a].range.compare(t, n); if (i != 1) break } i == 0 && a++; var f = this.subFolds.splice(r, a - r, e), l = i == 0 ? f.length - 1 : f.length; for (var c = o; c < l; c++)e.addSubFold(f[c]); return e.setFoldLine(this.foldLine), e }, this.restoreRange = function (e) { return f(e, this.start) } }.call(s.prototype) }), define("ace/edit_session/folding", ["require", "exports", "module", "ace/range", "ace/edit_session/fold_line", "ace/edit_session/fold", "ace/token_iterator"], function (e, t, n) { "use strict"; function u() { this.getFoldAt = function (e, t, n) { var r = this.getFoldLine(e); if (!r) return null; var i = r.folds; for (var s = 0; s < i.length; s++) { var o = i[s].range; if (o.contains(e, t)) { if (n == 1 && o.isEnd(e, t) && !o.isEmpty()) continue; if (n == -1 && o.isStart(e, t) && !o.isEmpty()) continue; return i[s] } } }, this.getFoldsInRange = function (e) { var t = e.start, n = e.end, r = this.$foldData, i = []; t.column += 1, n.column -= 1; for (var s = 0; s < r.length; s++) { var o = r[s].range.compareRange(e); if (o == 2) continue; if (o == -2) break; var u = r[s].folds; for (var a = 0; a < u.length; a++) { var f = u[a]; o = f.range.compareRange(e); if (o == -2) break; if (o == 2) continue; if (o == 42) break; i.push(f) } } return t.column -= 1, n.column += 1, i }, this.getFoldsInRangeList = function (e) { if (Array.isArray(e)) { var t = []; e.forEach(function (e) { t = t.concat(this.getFoldsInRange(e)) }, this) } else var t = this.getFoldsInRange(e); return t }, this.getAllFolds = function () { var e = [], t = this.$foldData; for (var n = 0; n < t.length; n++)for (var r = 0; r < t[n].folds.length; r++)e.push(t[n].folds[r]); return e }, this.getFoldStringAt = function (e, t, n, r) { r = r || this.getFoldLine(e); if (!r) return null; var i = { end: { column: 0 } }, s, o; for (var u = 0; u < r.folds.length; u++) { o = r.folds[u]; var a = o.range.compareEnd(e, t); if (a == -1) { s = this.getLine(o.start.row).substring(i.end.column, o.start.column); break } if (a === 0) return null; i = o } return s || (s = this.getLine(o.start.row).substring(i.end.column)), n == -1 ? s.substring(0, t - i.end.column) : n == 1 ? s.substring(t - i.end.column) : s }, this.getFoldLine = function (e, t) { var n = this.$foldData, r = 0; t && (r = n.indexOf(t)), r == -1 && (r = 0); for (r; r < n.length; r++) { var i = n[r]; if (i.start.row <= e && i.end.row >= e) return i; if (i.end.row > e) return null } return null }, this.getNextFoldLine = function (e, t) { var n = this.$foldData, r = 0; t && (r = n.indexOf(t)), r == -1 && (r = 0); for (r; r < n.length; r++) { var i = n[r]; if (i.end.row >= e) return i } return null }, this.getFoldedRowCount = function (e, t) { var n = this.$foldData, r = t - e + 1; for (var i = 0; i < n.length; i++) { var s = n[i], o = s.end.row, u = s.start.row; if (o >= t) { u < t && (u >= e ? r -= t - u : r = 0); break } o >= e && (u >= e ? r -= o - u : r -= o - e + 1) } return r }, this.$addFoldLine = function (e) { return this.$foldData.push(e), this.$foldData.sort(function (e, t) { return e.start.row - t.start.row }), e }, this.addFold = function (e, t) { var n = this.$foldData, r = !1, o; e instanceof s ? o = e : (o = new s(t, e), o.collapseChildren = t.collapseChildren), this.$clipRangeToDocument(o.range); var u = o.start.row, a = o.start.column, f = o.end.row, l = o.end.column, c = this.getFoldAt(u, a, 1), h = this.getFoldAt(f, l, -1); if (c && h == c) return c.addSubFold(o); c && !c.range.isStart(u, a) && this.removeFold(c), h && !h.range.isEnd(f, l) && this.removeFold(h); var p = this.getFoldsInRange(o.range); p.length > 0 && (this.removeFolds(p), p.forEach(function (e) { o.addSubFold(e) })); for (var d = 0; d < n.length; d++) { var v = n[d]; if (f == v.start.row) { v.addFold(o), r = !0; break } if (u == v.end.row) { v.addFold(o), r = !0; if (!o.sameRow) { var m = n[d + 1]; if (m && m.start.row == f) { v.merge(m); break } } break } if (f <= v.start.row) break } return r || (v = this.$addFoldLine(new i(this.$foldData, o))), this.$useWrapMode ? this.$updateWrapData(v.start.row, v.start.row) : this.$updateRowLengthCache(v.start.row, v.start.row), this.$modified = !0, this._signal("changeFold", { data: o, action: "add" }), o }, this.addFolds = function (e) { e.forEach(function (e) { this.addFold(e) }, this) }, this.removeFold = function (e) { var t = e.foldLine, n = t.start.row, r = t.end.row, i = this.$foldData, s = t.folds; if (s.length == 1) i.splice(i.indexOf(t), 1); else if (t.range.isEnd(e.end.row, e.end.column)) s.pop(), t.end.row = s[s.length - 1].end.row, t.end.column = s[s.length - 1].end.column; else if (t.range.isStart(e.start.row, e.start.column)) s.shift(), t.start.row = s[0].start.row, t.start.column = s[0].start.column; else if (e.sameRow) s.splice(s.indexOf(e), 1); else { var o = t.split(e.start.row, e.start.column); s = o.folds, s.shift(), o.start.row = s[0].start.row, o.start.column = s[0].start.column } this.$updating || (this.$useWrapMode ? this.$updateWrapData(n, r) : this.$updateRowLengthCache(n, r)), this.$modified = !0, this._signal("changeFold", { data: e, action: "remove" }) }, this.removeFolds = function (e) { var t = []; for (var n = 0; n < e.length; n++)t.push(e[n]); t.forEach(function (e) { this.removeFold(e) }, this), this.$modified = !0 }, this.expandFold = function (e) { this.removeFold(e), e.subFolds.forEach(function (t) { e.restoreRange(t), this.addFold(t) }, this), e.collapseChildren > 0 && this.foldAll(e.start.row + 1, e.end.row, e.collapseChildren - 1), e.subFolds = [] }, this.expandFolds = function (e) { e.forEach(function (e) { this.expandFold(e) }, this) }, this.unfold = function (e, t) { var n, i; e == null ? (n = new r(0, 0, this.getLength(), 0), t = !0) : typeof e == "number" ? n = new r(e, 0, e, this.getLine(e).length) : "row" in e ? n = r.fromPoints(e, e) : n = e, i = this.getFoldsInRangeList(n); if (t) this.removeFolds(i); else { var s = i; while (s.length) this.expandFolds(s), s = this.getFoldsInRangeList(n) } if (i.length) return i }, this.isRowFolded = function (e, t) { return !!this.getFoldLine(e, t) }, this.getRowFoldEnd = function (e, t) { var n = this.getFoldLine(e, t); return n ? n.end.row : e }, this.getRowFoldStart = function (e, t) { var n = this.getFoldLine(e, t); return n ? n.start.row : e }, this.getFoldDisplayLine = function (e, t, n, r, i) { r == null && (r = e.start.row), i == null && (i = 0), t == null && (t = e.end.row), n == null && (n = this.getLine(t).length); var s = this.doc, o = ""; return e.walk(function (e, t, n, u) { if (t < r) return; if (t == r) { if (n < i) return; u = Math.max(i, u) } e != null ? o += e : o += s.getLine(t).substring(u, n) }, t, n), o }, this.getDisplayLine = function (e, t, n, r) { var i = this.getFoldLine(e); if (!i) { var s; return s = this.doc.getLine(e), s.substring(r || 0, t || s.length) } return this.getFoldDisplayLine(i, e, t, n, r) }, this.$cloneFoldData = function () { var e = []; return e = this.$foldData.map(function (t) { var n = t.folds.map(function (e) { return e.clone() }); return new i(e, n) }), e }, this.toggleFold = function (e) { var t = this.selection, n = t.getRange(), r, i; if (n.isEmpty()) { var s = n.start; r = this.getFoldAt(s.row, s.column); if (r) { this.expandFold(r); return } (i = this.findMatchingBracket(s)) ? n.comparePoint(i) == 1 ? n.end = i : (n.start = i, n.start.column++, n.end.column--) : (i = this.findMatchingBracket({ row: s.row, column: s.column + 1 })) ? (n.comparePoint(i) == 1 ? n.end = i : n.start = i, n.start.column++) : n = this.getCommentFoldRange(s.row, s.column) || n } else { var o = this.getFoldsInRange(n); if (e && o.length) { this.expandFolds(o); return } o.length == 1 && (r = o[0]) } r || (r = this.getFoldAt(n.start.row, n.start.column)); if (r && r.range.toString() == n.toString()) { this.expandFold(r); return } var u = "..."; if (!n.isMultiLine()) { u = this.getTextRange(n); if (u.length < 4) return; u = u.trim().substring(0, 2) + ".." } this.addFold(u, n) }, this.getCommentFoldRange = function (e, t, n) { var i = new o(this, e, t), s = i.getCurrentToken(), u = s.type; if (s && /^comment|string/.test(u)) { u = u.match(/comment|string/)[0], u == "comment" && (u += "|doc-start"); var a = new RegExp(u), f = new r; if (n != 1) { do s = i.stepBackward(); while (s && a.test(s.type)); i.stepForward() } f.start.row = i.getCurrentTokenRow(), f.start.column = i.getCurrentTokenColumn() + 2, i = new o(this, e, t); if (n != -1) { var l = -1; do { s = i.stepForward(); if (l == -1) { var c = this.getState(i.$row); a.test(c) || (l = i.$row) } else if (i.$row > l) break } while (s && a.test(s.type)); s = i.stepBackward() } else s = i.getCurrentToken(); return f.end.row = i.getCurrentTokenRow(), f.end.column = i.getCurrentTokenColumn() + s.value.length - 2, f } }, this.foldAll = function (e, t, n) { n == undefined && (n = 1e5); var r = this.foldWidgets; if (!r) return; t = t || this.getLength(), e = e || 0; for (var i = e; i < t; i++) { r[i] == null && (r[i] = this.getFoldWidget(i)); if (r[i] != "start") continue; var s = this.getFoldWidgetRange(i); if (s && s.isMultiLine() && s.end.row <= t && s.start.row >= e) { i = s.end.row; try { var o = this.addFold("...", s); o && (o.collapseChildren = n) } catch (u) { } } } }, this.$foldStyles = { manual: 1, markbegin: 1, markbeginend: 1 }, this.$foldStyle = "markbegin", this.setFoldStyle = function (e) { if (!this.$foldStyles[e]) throw new Error("invalid fold style: " + e + "[" + Object.keys(this.$foldStyles).join(", ") + "]"); if (this.$foldStyle == e) return; this.$foldStyle = e, e == "manual" && this.unfold(); var t = this.$foldMode; this.$setFolding(null), this.$setFolding(t) }, this.$setFolding = function (e) { if (this.$foldMode == e) return; this.$foldMode = e, this.off("change", this.$updateFoldWidgets), this.off("tokenizerUpdate", this.$tokenizerUpdateFoldWidgets), this._signal("changeAnnotation"); if (!e || this.$foldStyle == "manual") { this.foldWidgets = null; return } this.foldWidgets = [], this.getFoldWidget = e.getFoldWidget.bind(e, this, this.$foldStyle), this.getFoldWidgetRange = e.getFoldWidgetRange.bind(e, this, this.$foldStyle), this.$updateFoldWidgets = this.updateFoldWidgets.bind(this), this.$tokenizerUpdateFoldWidgets = this.tokenizerUpdateFoldWidgets.bind(this), this.on("change", this.$updateFoldWidgets), this.on("tokenizerUpdate", this.$tokenizerUpdateFoldWidgets) }, this.getParentFoldRangeData = function (e, t) { var n = this.foldWidgets; if (!n || t && n[e]) return {}; var r = e - 1, i; while (r >= 0) { var s = n[r]; s == null && (s = n[r] = this.getFoldWidget(r)); if (s == "start") { var o = this.getFoldWidgetRange(r); i || (i = o); if (o && o.end.row >= e) break } r-- } return { range: r !== -1 && o, firstRange: i } }, this.onFoldWidgetClick = function (e, t) { t = t.domEvent; var n = { children: t.shiftKey, all: t.ctrlKey || t.metaKey, siblings: t.altKey }, r = this.$toggleFoldWidget(e, n); if (!r) { var i = t.target || t.srcElement; i && /ace_fold-widget/.test(i.className) && (i.className += " ace_invalid") } }, this.$toggleFoldWidget = function (e, t) { if (!this.getFoldWidget) return; var n = this.getFoldWidget(e), r = this.getLine(e), i = n === "end" ? -1 : 1, s = this.getFoldAt(e, i === -1 ? 0 : r.length, i); if (s) return t.children || t.all ? this.removeFold(s) : this.expandFold(s), s; var o = this.getFoldWidgetRange(e, !0); if (o && !o.isMultiLine()) { s = this.getFoldAt(o.start.row, o.start.column, 1); if (s && o.isEqual(s.range)) return this.removeFold(s), s } if (t.siblings) { var u = this.getParentFoldRangeData(e); if (u.range) var a = u.range.start.row + 1, f = u.range.end.row; this.foldAll(a, f, t.all ? 1e4 : 0) } else t.children ? (f = o ? o.end.row : this.getLength(), this.foldAll(e + 1, f, t.all ? 1e4 : 0)) : o && (t.all && (o.collapseChildren = 1e4), this.addFold("...", o)); return o }, this.toggleFoldWidget = function (e) { var t = this.selection.getCursor().row; t = this.getRowFoldStart(t); var n = this.$toggleFoldWidget(t, {}); if (n) return; var r = this.getParentFoldRangeData(t, !0); n = r.range || r.firstRange; if (n) { t = n.start.row; var i = this.getFoldAt(t, this.getLine(t).length, 1); i ? this.removeFold(i) : this.addFold("...", n) } }, this.updateFoldWidgets = function (e) { var t = e.start.row, n = e.end.row - t; if (n === 0) this.foldWidgets[t] = null; else if (e.action == "remove") this.foldWidgets.splice(t, n + 1, null); else { var r = Array(n + 1); r.unshift(t, 1), this.foldWidgets.splice.apply(this.foldWidgets, r) } }, this.tokenizerUpdateFoldWidgets = function (e) { var t = e.data; t.first != t.last && this.foldWidgets.length > t.first && this.foldWidgets.splice(t.first, this.foldWidgets.length) } } var r = e("../range").Range, i = e("./fold_line").FoldLine, s = e("./fold").Fold, o = e("../token_iterator").TokenIterator; t.Folding = u }), define("ace/edit_session/bracket_match", ["require", "exports", "module", "ace/token_iterator", "ace/range"], function (e, t, n) { "use strict"; function s() { this.findMatchingBracket = function (e, t) { if (e.column == 0) return null; var n = t || this.getLine(e.row).charAt(e.column - 1); if (n == "") return null; var r = n.match(/([\(\[\{])|([\)\]\}])/); return r ? r[1] ? this.$findClosingBracket(r[1], e) : this.$findOpeningBracket(r[2], e) : null }, this.getBracketRange = function (e) { var t = this.getLine(e.row), n = !0, r, s = t.charAt(e.column - 1), o = s && s.match(/([\(\[\{])|([\)\]\}])/); o || (s = t.charAt(e.column), e = { row: e.row, column: e.column + 1 }, o = s && s.match(/([\(\[\{])|([\)\]\}])/), n = !1); if (!o) return null; if (o[1]) { var u = this.$findClosingBracket(o[1], e); if (!u) return null; r = i.fromPoints(e, u), n || (r.end.column++, r.start.column--), r.cursor = r.end } else { var u = this.$findOpeningBracket(o[2], e); if (!u) return null; r = i.fromPoints(u, e), n || (r.start.column++, r.end.column--), r.cursor = r.start } return r }, this.getMatchingBracketRanges = function (e) { var t = this.getLine(e.row), n = t.charAt(e.column - 1), r = n && n.match(/([\(\[\{])|([\)\]\}])/); r || (n = t.charAt(e.column), e = { row: e.row, column: e.column + 1 }, r = n && n.match(/([\(\[\{])|([\)\]\}])/)); if (!r) return null; var s = new i(e.row, e.column - 1, e.row, e.column), o = r[1] ? this.$findClosingBracket(r[1], e) : this.$findOpeningBracket(r[2], e); if (!o) return [s]; var u = new i(o.row, o.column, o.row, o.column + 1); return [s, u] }, this.$brackets = { ")": "(", "(": ")", "]": "[", "[": "]", "{": "}", "}": "{", "<": ">", ">": "<" }, this.$findOpeningBracket = function (e, t, n) { var i = this.$brackets[e], s = 1, o = new r(this, t.row, t.column), u = o.getCurrentToken(); u || (u = o.stepForward()); if (!u) return; n || (n = new RegExp("(\\.?" + u.type.replace(".", "\\.").replace("rparen", ".paren").replace(/\b(?:end)\b/, "(?:start|begin|end)") + ")+")); var a = t.column - o.getCurrentTokenColumn() - 2, f = u.value; for (; ;) { while (a >= 0) { var l = f.charAt(a); if (l == i) { s -= 1; if (s == 0) return { row: o.getCurrentTokenRow(), column: a + o.getCurrentTokenColumn() } } else l == e && (s += 1); a -= 1 } do u = o.stepBackward(); while (u && !n.test(u.type)); if (u == null) break; f = u.value, a = f.length - 1 } return null }, this.$findClosingBracket = function (e, t, n) { var i = this.$brackets[e], s = 1, o = new r(this, t.row, t.column), u = o.getCurrentToken(); u || (u = o.stepForward()); if (!u) return; n || (n = new RegExp("(\\.?" + u.type.replace(".", "\\.").replace("lparen", ".paren").replace(/\b(?:start|begin)\b/, "(?:start|begin|end)") + ")+")); var a = t.column - o.getCurrentTokenColumn(); for (; ;) { var f = u.value, l = f.length; while (a < l) { var c = f.charAt(a); if (c == i) { s -= 1; if (s == 0) return { row: o.getCurrentTokenRow(), column: a + o.getCurrentTokenColumn() } } else c == e && (s += 1); a += 1 } do u = o.stepForward(); while (u && !n.test(u.type)); if (u == null) break; a = 0 } return null } } var r = e("../token_iterator").TokenIterator, i = e("../range").Range; t.BracketMatch = s }), define("ace/edit_session", ["require", "exports", "module", "ace/lib/oop", "ace/lib/lang", "ace/bidihandler", "ace/config", "ace/lib/event_emitter", "ace/selection", "ace/mode/text", "ace/range", "ace/document", "ace/background_tokenizer", "ace/search_highlight", "ace/edit_session/folding", "ace/edit_session/bracket_match"], function (e, t, n) { "use strict"; var r = e("./lib/oop"), i = e("./lib/lang"), s = e("./bidihandler").BidiHandler, o = e("./config"), u = e("./lib/event_emitter").EventEmitter, a = e("./selection").Selection, f = e("./mode/text").Mode, l = e("./range").Range, c = e("./document").Document, h = e("./background_tokenizer").BackgroundTokenizer, p = e("./search_highlight").SearchHighlight, d = function (e, t) { this.$breakpoints = [], this.$decorations = [], this.$frontMarkers = {}, this.$backMarkers = {}, this.$markerId = 1, this.$undoSelect = !0, this.$foldData = [], this.id = "session" + ++d.$uid, this.$foldData.toString = function () { return this.join("\n") }, this.on("changeFold", this.onChangeFold.bind(this)), this.$onChange = this.onChange.bind(this); if (typeof e != "object" || !e.getLine) e = new c(e); this.setDocument(e), this.selection = new a(this), this.$bidiHandler = new s(this), o.resetOptions(this), this.setMode(t), o._signal("session", this) }; d.$uid = 0, function () { function m(e) { return e < 4352 ? !1 : e >= 4352 && e <= 4447 || e >= 4515 && e <= 4519 || e >= 4602 && e <= 4607 || e >= 9001 && e <= 9002 || e >= 11904 && e <= 11929 || e >= 11931 && e <= 12019 || e >= 12032 && e <= 12245 || e >= 12272 && e <= 12283 || e >= 12288 && e <= 12350 || e >= 12353 && e <= 12438 || e >= 12441 && e <= 12543 || e >= 12549 && e <= 12589 || e >= 12593 && e <= 12686 || e >= 12688 && e <= 12730 || e >= 12736 && e <= 12771 || e >= 12784 && e <= 12830 || e >= 12832 && e <= 12871 || e >= 12880 && e <= 13054 || e >= 13056 && e <= 19903 || e >= 19968 && e <= 42124 || e >= 42128 && e <= 42182 || e >= 43360 && e <= 43388 || e >= 44032 && e <= 55203 || e >= 55216 && e <= 55238 || e >= 55243 && e <= 55291 || e >= 63744 && e <= 64255 || e >= 65040 && e <= 65049 || e >= 65072 && e <= 65106 || e >= 65108 && e <= 65126 || e >= 65128 && e <= 65131 || e >= 65281 && e <= 65376 || e >= 65504 && e <= 65510 } r.implement(this, u), this.setDocument = function (e) { this.doc && this.doc.removeListener("change", this.$onChange), this.doc = e, e.on("change", this.$onChange), this.bgTokenizer && this.bgTokenizer.setDocument(this.getDocument()), this.resetCaches() }, this.getDocument = function () { return this.doc }, this.$resetRowCache = function (e) { if (!e) { this.$docRowCache = [], this.$screenRowCache = []; return } var t = this.$docRowCache.length, n = this.$getRowCacheIndex(this.$docRowCache, e) + 1; t > n && (this.$docRowCache.splice(n, t), this.$screenRowCache.splice(n, t)) }, this.$getRowCacheIndex = function (e, t) { var n = 0, r = e.length - 1; while (n <= r) { var i = n + r >> 1, s = e[i]; if (t > s) n = i + 1; else { if (!(t < s)) return i; r = i - 1 } } return n - 1 }, this.resetCaches = function () { this.$modified = !0, this.$wrapData = [], this.$rowLengthCache = [], this.$resetRowCache(0), this.bgTokenizer && this.bgTokenizer.start(0) }, this.onChangeFold = function (e) { var t = e.data; this.$resetRowCache(t.start.row) }, this.onChange = function (e) { this.$modified = !0, this.$bidiHandler.onChange(e), this.$resetRowCache(e.start.row); var t = this.$updateInternalDataOnChange(e); !this.$fromUndo && this.$undoManager && (t && t.length && (this.$undoManager.add({ action: "removeFolds", folds: t }, this.mergeUndoDeltas), this.mergeUndoDeltas = !0), this.$undoManager.add(e, this.mergeUndoDeltas), this.mergeUndoDeltas = !0, this.$informUndoManager.schedule()), this.bgTokenizer && this.bgTokenizer.$updateOnChange(e), this._signal("change", e) }, this.setValue = function (e) { this.doc.setValue(e), this.selection.moveTo(0, 0), this.$resetRowCache(0), this.setUndoManager(this.$undoManager), this.getUndoManager().reset() }, this.getValue = this.toString = function () { return this.doc.getValue() }, this.getSelection = function () { return this.selection }, this.getState = function (e) { return this.bgTokenizer.getState(e) }, this.getTokens = function (e) { return this.bgTokenizer.getTokens(e) }, this.getTokenAt = function (e, t) { var n = this.bgTokenizer.getTokens(e), r, i = 0; if (t == null) { var s = n.length - 1; i = this.getLine(e).length } else for (var s = 0; s < n.length; s++) { i += n[s].value.length; if (i >= t) break } return r = n[s], r ? (r.index = s, r.start = i - r.value.length, r) : null }, this.setUndoManager = function (e) { this.$undoManager = e, this.$informUndoManager && this.$informUndoManager.cancel(); if (e) { var t = this; e.addSession(this), this.$syncInformUndoManager = function () { t.$informUndoManager.cancel(), t.mergeUndoDeltas = !1 }, this.$informUndoManager = i.delayedCall(this.$syncInformUndoManager) } else this.$syncInformUndoManager = function () { } }, this.markUndoGroup = function () { this.$syncInformUndoManager && this.$syncInformUndoManager() }, this.$defaultUndoManager = { undo: function () { }, redo: function () { }, hasUndo: function () { }, hasRedo: function () { }, reset: function () { }, add: function () { }, addSelection: function () { }, startNewGroup: function () { }, addSession: function () { } }, this.getUndoManager = function () { return this.$undoManager || this.$defaultUndoManager }, this.getTabString = function () { return this.getUseSoftTabs() ? i.stringRepeat(" ", this.getTabSize()) : "  " }, this.setUseSoftTabs = function (e) { this.setOption("useSoftTabs", e) }, this.getUseSoftTabs = function () { return this.$useSoftTabs && !this.$mode.$indentWithTabs }, this.setTabSize = function (e) { this.setOption("tabSize", e) }, this.getTabSize = function () { return this.$tabSize }, this.isTabStop = function (e) { return this.$useSoftTabs && e.column % this.$tabSize === 0 }, this.setNavigateWithinSoftTabs = function (e) { this.setOption("navigateWithinSoftTabs", e) }, this.getNavigateWithinSoftTabs = function () { return this.$navigateWithinSoftTabs }, this.$overwrite = !1, this.setOverwrite = function (e) { this.setOption("overwrite", e) }, this.getOverwrite = function () { return this.$overwrite }, this.toggleOverwrite = function () { this.setOverwrite(!this.$overwrite) }, this.addGutterDecoration = function (e, t) { this.$decorations[e] || (this.$decorations[e] = ""), this.$decorations[e] += " " + t, this._signal("changeBreakpoint", {}) }, this.removeGutterDecoration = function (e, t) { this.$decorations[e] = (this.$decorations[e] || "").replace(" " + t, ""), this._signal("changeBreakpoint", {}) }, this.getBreakpoints = function () { return this.$breakpoints }, this.setBreakpoints = function (e) { this.$breakpoints = []; for (var t = 0; t < e.length; t++)this.$breakpoints[e[t]] = "ace_breakpoint"; this._signal("changeBreakpoint", {}) }, this.clearBreakpoints = function () { this.$breakpoints = [], this._signal("changeBreakpoint", {}) }, this.setBreakpoint = function (e, t) { t === undefined && (t = "ace_breakpoint"), t ? this.$breakpoints[e] = t : delete this.$breakpoints[e], this._signal("changeBreakpoint", {}) }, this.clearBreakpoint = function (e) { delete this.$breakpoints[e], this._signal("changeBreakpoint", {}) }, this.addMarker = function (e, t, n, r) { var i = this.$markerId++, s = { range: e, type: n || "line", renderer: typeof n == "function" ? n : null, clazz: t, inFront: !!r, id: i }; return r ? (this.$frontMarkers[i] = s, this._signal("changeFrontMarker")) : (this.$backMarkers[i] = s, this._signal("changeBackMarker")), i }, this.addDynamicMarker = function (e, t) { if (!e.update) return; var n = this.$markerId++; return e.id = n, e.inFront = !!t, t ? (this.$frontMarkers[n] = e, this._signal("changeFrontMarker")) : (this.$backMarkers[n] = e, this._signal("changeBackMarker")), e }, this.removeMarker = function (e) { var t = this.$frontMarkers[e] || this.$backMarkers[e]; if (!t) return; var n = t.inFront ? this.$frontMarkers : this.$backMarkers; delete n[e], this._signal(t.inFront ? "changeFrontMarker" : "changeBackMarker") }, this.getMarkers = function (e) { return e ? this.$frontMarkers : this.$backMarkers }, this.highlight = function (e) { if (!this.$searchHighlight) { var t = new p(null, "ace_selected-word", "text"); this.$searchHighlight = this.addDynamicMarker(t) } this.$searchHighlight.setRegexp(e) }, this.highlightLines = function (e, t, n, r) { typeof t != "number" && (n = t, t = e), n || (n = "ace_step"); var i = new l(e, 0, t, Infinity); return i.id = this.addMarker(i, n, "fullLine", r), i }, this.setAnnotations = function (e) { this.$annotations = e, this._signal("changeAnnotation", {}) }, this.getAnnotations = function () { return this.$annotations || [] }, this.clearAnnotations = function () { this.setAnnotations([]) }, this.$detectNewLine = function (e) { var t = e.match(/^.*?(\r?\n)/m); t ? this.$autoNewLine = t[1] : this.$autoNewLine = "\n" }, this.getWordRange = function (e, t) { var n = this.getLine(e), r = !1; t > 0 && (r = !!n.charAt(t - 1).match(this.tokenRe)), r || (r = !!n.charAt(t).match(this.tokenRe)); if (r) var i = this.tokenRe; else if (/^\s+$/.test(n.slice(t - 1, t + 1))) var i = /\s/; else var i = this.nonTokenRe; var s = t; if (s > 0) { do s--; while (s >= 0 && n.charAt(s).match(i)); s++ } var o = t; while (o < n.length && n.charAt(o).match(i)) o++; return new l(e, s, e, o) }, this.getAWordRange = function (e, t) { var n = this.getWordRange(e, t), r = this.getLine(n.end.row); while (r.charAt(n.end.column).match(/[ \t]/)) n.end.column += 1; return n }, this.setNewLineMode = function (e) { this.doc.setNewLineMode(e) }, this.getNewLineMode = function () { return this.doc.getNewLineMode() }, this.setUseWorker = function (e) { this.setOption("useWorker", e) }, this.getUseWorker = function () { return this.$useWorker }, this.onReloadTokenizer = function (e) { var t = e.data; this.bgTokenizer.start(t.first), this._signal("tokenizerUpdate", e) }, this.$modes = o.$modes, this.$mode = null, this.$modeId = null, this.setMode = function (e, t) { if (e && typeof e == "object") { if (e.getTokenizer) return this.$onChangeMode(e); var n = e, r = n.path } else r = e || "ace/mode/text"; this.$modes["ace/mode/text"] || (this.$modes["ace/mode/text"] = new f); if (this.$modes[r] && !n) { this.$onChangeMode(this.$modes[r]), t && t(); return } this.$modeId = r, o.loadModule(["mode", r], function (e) { if (this.$modeId !== r) return t && t(); this.$modes[r] && !n ? this.$onChangeMode(this.$modes[r]) : e && e.Mode && (e = new e.Mode(n), n || (this.$modes[r] = e, e.$id = r), this.$onChangeMode(e)), t && t() }.bind(this)), this.$mode || this.$onChangeMode(this.$modes["ace/mode/text"], !0) }, this.$onChangeMode = function (e, t) { t || (this.$modeId = e.$id); if (this.$mode === e) return; var n = this.$mode; this.$mode = e, this.$stopWorker(), this.$useWorker && this.$startWorker(); var r = e.getTokenizer(); if (r.on !== undefined) { var i = this.onReloadTokenizer.bind(this); r.on("update", i) } if (!this.bgTokenizer) { this.bgTokenizer = new h(r); var s = this; this.bgTokenizer.on("update", function (e) { s._signal("tokenizerUpdate", e) }) } else this.bgTokenizer.setTokenizer(r); this.bgTokenizer.setDocument(this.getDocument()), this.tokenRe = e.tokenRe, this.nonTokenRe = e.nonTokenRe, t || (e.attachToSession && e.attachToSession(this), this.$options.wrapMethod.set.call(this, this.$wrapMethod), this.$setFolding(e.foldingRules), this.bgTokenizer.start(0), this._emit("changeMode", { oldMode: n, mode: e })) }, this.$stopWorker = function () { this.$worker && (this.$worker.terminate(), this.$worker = null) }, this.$startWorker = function () { try { this.$worker = this.$mode.createWorker(this) } catch (e) { o.warn("Could not load worker", e), this.$worker = null } }, this.getMode = function () { return this.$mode }, this.$scrollTop = 0, this.setScrollTop = function (e) { if (this.$scrollTop === e || isNaN(e)) return; this.$scrollTop = e, this._signal("changeScrollTop", e) }, this.getScrollTop = function () { return this.$scrollTop }, this.$scrollLeft = 0, this.setScrollLeft = function (e) { if (this.$scrollLeft === e || isNaN(e)) return; this.$scrollLeft = e, this._signal("changeScrollLeft", e) }, this.getScrollLeft = function () { return this.$scrollLeft }, this.getScreenWidth = function () { return this.$computeWidth(), this.lineWidgets ? Math.max(this.getLineWidgetMaxWidth(), this.screenWidth) : this.screenWidth }, this.getLineWidgetMaxWidth = function () { if (this.lineWidgetsWidth != null) return this.lineWidgetsWidth; var e = 0; return this.lineWidgets.forEach(function (t) { t && t.screenWidth > e && (e = t.screenWidth) }), this.lineWidgetWidth = e }, this.$computeWidth = function (e) { if (this.$modified || e) { this.$modified = !1; if (this.$useWrapMode) return this.screenWidth = this.$wrapLimit; var t = this.doc.getAllLines(), n = this.$rowLengthCache, r = 0, i = 0, s = this.$foldData[i], o = s ? s.start.row : Infinity, u = t.length; for (var a = 0; a < u; a++) { if (a > o) { a = s.end.row + 1; if (a >= u) break; s = this.$foldData[i++], o = s ? s.start.row : Infinity } n[a] == null && (n[a] = this.$getStringScreenWidth(t[a])[0]), n[a] > r && (r = n[a]) } this.screenWidth = r } }, this.getLine = function (e) { return this.doc.getLine(e) }, this.getLines = function (e, t) { return this.doc.getLines(e, t) }, this.getLength = function () { return this.doc.getLength() }, this.getTextRange = function (e) { return this.doc.getTextRange(e || this.selection.getRange()) }, this.insert = function (e, t) { return this.doc.insert(e, t) }, this.remove = function (e) { return this.doc.remove(e) }, this.removeFullLines = function (e, t) { return this.doc.removeFullLines(e, t) }, this.undoChanges = function (e, t) { if (!e.length) return; this.$fromUndo = !0; for (var n = e.length - 1; n != -1; n--) { var r = e[n]; r.action == "insert" || r.action == "remove" ? this.doc.revertDelta(r) : r.folds && this.addFolds(r.folds) } !t && this.$undoSelect && (e.selectionBefore ? this.selection.fromJSON(e.selectionBefore) : this.selection.setRange(this.$getUndoSelection(e, !0))), this.$fromUndo = !1 }, this.redoChanges = function (e, t) { if (!e.length) return; this.$fromUndo = !0; for (var n = 0; n < e.length; n++) { var r = e[n]; (r.action == "insert" || r.action == "remove") && this.doc.$safeApplyDelta(r) } !t && this.$undoSelect && (e.selectionAfter ? this.selection.fromJSON(e.selectionAfter) : this.selection.setRange(this.$getUndoSelection(e, !1))), this.$fromUndo = !1 }, this.setUndoSelect = function (e) { this.$undoSelect = e }, this.$getUndoSelection = function (e, t) { function n(e) { return t ? e.action !== "insert" : e.action === "insert" } var r, i; for (var s = 0; s < e.length; s++) { var o = e[s]; if (!o.start) continue; if (!r) { n(o) ? r = l.fromPoints(o.start, o.end) : r = l.fromPoints(o.start, o.start); continue } n(o) ? (i = o.start, r.compare(i.row, i.column) == -1 && r.setStart(i), i = o.end, r.compare(i.row, i.column) == 1 && r.setEnd(i)) : (i = o.start, r.compare(i.row, i.column) == -1 && (r = l.fromPoints(o.start, o.start))) } return r }, this.replace = function (e, t) { return this.doc.replace(e, t) }, this.moveText = function (e, t, n) { var r = this.getTextRange(e), i = this.getFoldsInRange(e), s = l.fromPoints(t, t); if (!n) { this.remove(e); var o = e.start.row - e.end.row, u = o ? -e.end.column : e.start.column - e.end.column; u && (s.start.row == e.end.row && s.start.column > e.end.column && (s.start.column += u), s.end.row == e.end.row && s.end.column > e.end.column && (s.end.column += u)), o && s.start.row >= e.end.row && (s.start.row += o, s.end.row += o) } s.end = this.insert(s.start, r); if (i.length) { var a = e.start, f = s.start, o = f.row - a.row, u = f.column - a.column; this.addFolds(i.map(function (e) { return e = e.clone(), e.start.row == a.row && (e.start.column += u), e.end.row == a.row && (e.end.column += u), e.start.row += o, e.end.row += o, e })) } return s }, this.indentRows = function (e, t, n) { n = n.replace(/\t/g, this.getTabString()); for (var r = e; r <= t; r++)this.doc.insertInLine({ row: r, column: 0 }, n) }, this.outdentRows = function (e) { var t = e.collapseRows(), n = new l(0, 0, 0, 0), r = this.getTabSize(); for (var i = t.start.row; i <= t.end.row; ++i) { var s = this.getLine(i); n.start.row = i, n.end.row = i; for (var o = 0; o < r; ++o)if (s.charAt(o) != " ") break; o < r && s.charAt(o) == "  " ? (n.start.column = o, n.end.column = o + 1) : (n.start.column = 0, n.end.column = o), this.remove(n) } }, this.$moveLines = function (e, t, n) { e = this.getRowFoldStart(e), t = this.getRowFoldEnd(t); if (n < 0) { var r = this.getRowFoldStart(e + n); if (r < 0) return 0; var i = r - e } else if (n > 0) { var r = this.getRowFoldEnd(t + n); if (r > this.doc.getLength() - 1) return 0; var i = r - t } else { e = this.$clipRowToDocument(e), t = this.$clipRowToDocument(t); var i = t - e + 1 } var s = new l(e, 0, t, Number.MAX_VALUE), o = this.getFoldsInRange(s).map(function (e) { return e = e.clone(), e.start.row += i, e.end.row += i, e }), u = n == 0 ? this.doc.getLines(e, t) : this.doc.removeFullLines(e, t); return this.doc.insertFullLines(e + i, u), o.length && this.addFolds(o), i }, this.moveLinesUp = function (e, t) { return this.$moveLines(e, t, -1) }, this.moveLinesDown = function (e, t) { return this.$moveLines(e, t, 1) }, this.duplicateLines = function (e, t) { return this.$moveLines(e, t, 0) }, this.$clipRowToDocument = function (e) { return Math.max(0, Math.min(e, this.doc.getLength() - 1)) }, this.$clipColumnToRow = function (e, t) { return t < 0 ? 0 : Math.min(this.doc.getLine(e).length, t) }, this.$clipPositionToDocument = function (e, t) { t = Math.max(0, t); if (e < 0) e = 0, t = 0; else { var n = this.doc.getLength(); e >= n ? (e = n - 1, t = this.doc.getLine(n - 1).length) : t = Math.min(this.doc.getLine(e).length, t) } return { row: e, column: t } }, this.$clipRangeToDocument = function (e) { e.start.row < 0 ? (e.start.row = 0, e.start.column = 0) : e.start.column = this.$clipColumnToRow(e.start.row, e.start.column); var t = this.doc.getLength() - 1; return e.end.row > t ? (e.end.row = t, e.end.column = this.doc.getLine(t).length) : e.end.column = this.$clipColumnToRow(e.end.row, e.end.column), e }, this.$wrapLimit = 80, this.$useWrapMode = !1, this.$wrapLimitRange = { min: null, max: null }, this.setUseWrapMode = function (e) { if (e != this.$useWrapMode) { this.$useWrapMode = e, this.$modified = !0, this.$resetRowCache(0); if (e) { var t = this.getLength(); this.$wrapData = Array(t), this.$updateWrapData(0, t - 1) } this._signal("changeWrapMode") } }, this.getUseWrapMode = function () { return this.$useWrapMode }, this.setWrapLimitRange = function (e, t) { if (this.$wrapLimitRange.min !== e || this.$wrapLimitRange.max !== t) this.$wrapLimitRange = { min: e, max: t }, this.$modified = !0, this.$bidiHandler.markAsDirty(), this.$useWrapMode && this._signal("changeWrapMode") }, this.adjustWrapLimit = function (e, t) { var n = this.$wrapLimitRange; n.max < 0 && (n = { min: t, max: t }); var r = this.$constrainWrapLimit(e, n.min, n.max); return r != this.$wrapLimit && r > 1 ? (this.$wrapLimit = r, this.$modified = !0, this.$useWrapMode && (this.$updateWrapData(0, this.getLength() - 1), this.$resetRowCache(0), this._signal("changeWrapLimit")), !0) : !1 }, this.$constrainWrapLimit = function (e, t, n) { return t && (e = Math.max(t, e)), n && (e = Math.min(n, e)), e }, this.getWrapLimit = function () { return this.$wrapLimit }, this.setWrapLimit = function (e) { this.setWrapLimitRange(e, e) }, this.getWrapLimitRange = function () { return { min: this.$wrapLimitRange.min, max: this.$wrapLimitRange.max } }, this.$updateInternalDataOnChange = function (e) { var t = this.$useWrapMode, n = e.action, r = e.start, i = e.end, s = r.row, o = i.row, u = o - s, a = null; this.$updating = !0; if (u != 0) if (n === "remove") { this[t ? "$wrapData" : "$rowLengthCache"].splice(s, u); var f = this.$foldData; a = this.getFoldsInRange(e), this.removeFolds(a); var l = this.getFoldLine(i.row), c = 0; if (l) { l.addRemoveChars(i.row, i.column, r.column - i.column), l.shiftRow(-u); var h = this.getFoldLine(s); h && h !== l && (h.merge(l), l = h), c = f.indexOf(l) + 1 } for (c; c < f.length; c++) { var l = f[c]; l.start.row >= i.row && l.shiftRow(-u) } o = s } else { var p = Array(u); p.unshift(s, 0); var d = t ? this.$wrapData : this.$rowLengthCache; d.splice.apply(d, p); var f = this.$foldData, l = this.getFoldLine(s), c = 0; if (l) { var v = l.range.compareInside(r.row, r.column); v == 0 ? (l = l.split(r.row, r.column), l && (l.shiftRow(u), l.addRemoveChars(o, 0, i.column - r.column))) : v == -1 && (l.addRemoveChars(s, 0, i.column - r.column), l.shiftRow(u)), c = f.indexOf(l) + 1 } for (c; c < f.length; c++) { var l = f[c]; l.start.row >= s && l.shiftRow(u) } } else { u = Math.abs(e.start.column - e.end.column), n === "remove" && (a = this.getFoldsInRange(e), this.removeFolds(a), u = -u); var l = this.getFoldLine(s); l && l.addRemoveChars(s, r.column, u) } return t && this.$wrapData.length != this.doc.getLength() && console.error("doc.getLength() and $wrapData.length have to be the same!"), this.$updating = !1, t ? this.$updateWrapData(s, o) : this.$updateRowLengthCache(s, o), a }, this.$updateRowLengthCache = function (e, t, n) { this.$rowLengthCache[e] = null, this.$rowLengthCache[t] = null }, this.$updateWrapData = function (e, t) { var r = this.doc.getAllLines(), i = this.getTabSize(), o = this.$wrapData, u = this.$wrapLimit, a, f, l = e; t = Math.min(t, r.length - 1); while (l <= t) f = this.getFoldLine(l, f), f ? (a = [], f.walk(function (e, t, i, o) { var u; if (e != null) { u = this.$getDisplayTokens(e, a.length), u[0] = n; for (var f = 1; f < u.length; f++)u[f] = s } else u = this.$getDisplayTokens(r[t].substring(o, i), a.length); a = a.concat(u) }.bind(this), f.end.row, r[f.end.row].length + 1), o[f.start.row] = this.$computeWrapSplits(a, u, i), l = f.end.row + 1) : (a = this.$getDisplayTokens(r[l]), o[l] = this.$computeWrapSplits(a, u, i), l++) }; var e = 1, t = 2, n = 3, s = 4, a = 9, c = 10, d = 11, v = 12; this.$computeWrapSplits = function (e, r, i) { function g() { var t = 0; if (m === 0) return t; if (p) for (var n = 0; n < e.length; n++) { var r = e[n]; if (r == c) t += 1; else { if (r != d) { if (r == v) continue; break } t += i } } return h && p !== !1 && (t += i), Math.min(t, m) } function y(t) { var n = t - f; for (var r = f; r < t; r++) { var i = e[r]; if (i === 12 || i === 2) n -= 1 } o.length || (b = g(), o.indent = b), l += n, o.push(l), f = t } if (e.length == 0) return []; var o = [], u = e.length, f = 0, l = 0, h = this.$wrapAsCode, p = this.$indentedSoftWrap, m = r <= Math.max(2 * i, 8) || p === !1 ? 0 : Math.floor(r / 2), b = 0; while (u - f > r - b) { var w = f + r - b; if (e[w - 1] >= c && e[w] >= c) { y(w); continue } if (e[w] == n || e[w] == s) { for (w; w != f - 1; w--)if (e[w] == n) break; if (w > f) { y(w); continue } w = f + r; for (w; w < e.length; w++)if (e[w] != s) break; if (w == e.length) break; y(w); continue } var E = Math.max(w - (r - (r >> 2)), f - 1); while (w > E && e[w] < n) w--; if (h) { while (w > E && e[w] < n) w--; while (w > E && e[w] == a) w-- } else while (w > E && e[w] < c) w--; if (w > E) { y(++w); continue } w = f + r, e[w] == t && w--, y(w - b) } return o }, this.$getDisplayTokens = function (n, r) { var i = [], s; r = r || 0; for (var o = 0; o < n.length; o++) { var u = n.charCodeAt(o); if (u == 9) { s = this.getScreenTabSize(i.length + r), i.push(d); for (var f = 1; f < s; f++)i.push(v) } else u == 32 ? i.push(c) : u > 39 && u < 48 || u > 57 && u < 64 ? i.push(a) : u >= 4352 && m(u) ? i.push(e, t) : i.push(e) } return i }, this.$getStringScreenWidth = function (e, t, n) { if (t == 0) return [0, 0]; t == null && (t = Infinity), n = n || 0; var r, i; for (i = 0; i < e.length; i++) { r = e.charCodeAt(i), r == 9 ? n += this.getScreenTabSize(n) : r >= 4352 && m(r) ? n += 2 : n += 1; if (n > t) break } return [n, i] }, this.lineWidgets = null, this.getRowLength = function (e) { var t = 1; return this.lineWidgets && (t += this.lineWidgets[e] && this.lineWidgets[e].rowCount || 0), !this.$useWrapMode || !this.$wrapData[e] ? t : this.$wrapData[e].length + t }, this.getRowLineCount = function (e) { return !this.$useWrapMode || !this.$wrapData[e] ? 1 : this.$wrapData[e].length + 1 }, this.getRowWrapIndent = function (e) { if (this.$useWrapMode) { var t = this.screenToDocumentPosition(e, Number.MAX_VALUE), n = this.$wrapData[t.row]; return n.length && n[0] < t.column ? n.indent : 0 } return 0 }, this.getScreenLastRowColumn = function (e) { var t = this.screenToDocumentPosition(e, Number.MAX_VALUE); return this.documentToScreenColumn(t.row, t.column) }, this.getDocumentLastRowColumn = function (e, t) { var n = this.documentToScreenRow(e, t); return this.getScreenLastRowColumn(n) }, this.getDocumentLastRowColumnPosition = function (e, t) { var n = this.documentToScreenRow(e, t); return this.screenToDocumentPosition(n, Number.MAX_VALUE / 10) }, this.getRowSplitData = function (e) { return this.$useWrapMode ? this.$wrapData[e] : undefined }, this.getScreenTabSize = function (e) { return this.$tabSize - (e % this.$tabSize | 0) }, this.screenToDocumentRow = function (e, t) { return this.screenToDocumentPosition(e, t).row }, this.screenToDocumentColumn = function (e, t) { return this.screenToDocumentPosition(e, t).column }, this.screenToDocumentPosition = function (e, t, n) { if (e < 0) return { row: 0, column: 0 }; var r, i = 0, s = 0, o, u = 0, a = 0, f = this.$screenRowCache, l = this.$getRowCacheIndex(f, e), c = f.length; if (c && l >= 0) var u = f[l], i = this.$docRowCache[l], h = e > f[c - 1]; else var h = !c; var p = this.getLength() - 1, d = this.getNextFoldLine(i), v = d ? d.start.row : Infinity; while (u <= e) { a = this.getRowLength(i); if (u + a > e || i >= p) break; u += a, i++, i > v && (i = d.end.row + 1, d = this.getNextFoldLine(i, d), v = d ? d.start.row : Infinity), h && (this.$docRowCache.push(i), this.$screenRowCache.push(u)) } if (d && d.start.row <= i) r = this.getFoldDisplayLine(d), i = d.start.row; else { if (u + a <= e || i > p) return { row: p, column: this.getLine(p).length }; r = this.getLine(i), d = null } var m = 0, g = Math.floor(e - u); if (this.$useWrapMode) { var y = this.$wrapData[i]; y && (o = y[g], g > 0 && y.length && (m = y.indent, s = y[g - 1] || y[y.length - 1], r = r.substring(s))) } return n !== undefined && this.$bidiHandler.isBidiRow(u + g, i, g) && (t = this.$bidiHandler.offsetToCol(n)), s += this.$getStringScreenWidth(r, t - m)[1], this.$useWrapMode && s >= o && (s = o - 1), d ? d.idxToPosition(s) : { row: i, column: s } }, this.documentToScreenPosition = function (e, t) { if (typeof t == "undefined") var n = this.$clipPositionToDocument(e.row, e.column); else n = this.$clipPositionToDocument(e, t); e = n.row, t = n.column; var r = 0, i = null, s = null; s = this.getFoldAt(e, t, 1), s && (e = s.start.row, t = s.start.column); var o, u = 0, a = this.$docRowCache, f = this.$getRowCacheIndex(a, e), l = a.length; if (l && f >= 0) var u = a[f], r = this.$screenRowCache[f], c = e > a[l - 1]; else var c = !l; var h = this.getNextFoldLine(u), p = h ? h.start.row : Infinity; while (u < e) { if (u >= p) { o = h.end.row + 1; if (o > e) break; h = this.getNextFoldLine(o, h), p = h ? h.start.row : Infinity } else o = u + 1; r += this.getRowLength(u), u = o, c && (this.$docRowCache.push(u), this.$screenRowCache.push(r)) } var d = ""; h && u >= p ? (d = this.getFoldDisplayLine(h, e, t), i = h.start.row) : (d = this.getLine(e).substring(0, t), i = e); var v = 0; if (this.$useWrapMode) { var m = this.$wrapData[i]; if (m) { var g = 0; while (d.length >= m[g]) r++, g++; d = d.substring(m[g - 1] || 0, d.length), v = g > 0 ? m.indent : 0 } } return this.lineWidgets && this.lineWidgets[u] && this.lineWidgets[u].rowsAbove && (r += this.lineWidgets[u].rowsAbove), { row: r, column: v + this.$getStringScreenWidth(d)[0] } }, this.documentToScreenColumn = function (e, t) { return this.documentToScreenPosition(e, t).column }, this.documentToScreenRow = function (e, t) { return this.documentToScreenPosition(e, t).row }, this.getScreenLength = function () { var e = 0, t = null; if (!this.$useWrapMode) { e = this.getLength(); var n = this.$foldData; for (var r = 0; r < n.length; r++)t = n[r], e -= t.end.row - t.start.row } else { var i = this.$wrapData.length, s = 0, r = 0, t = this.$foldData[r++], o = t ? t.start.row : Infinity; while (s < i) { var u = this.$wrapData[s]; e += u ? u.length + 1 : 1, s++, s > o && (s = t.end.row + 1, t = this.$foldData[r++], o = t ? t.start.row : Infinity) } } return this.lineWidgets && (e += this.$getWidgetScreenLength()), e }, this.$setFontMetrics = function (e) { if (!this.$enableVarChar) return; this.$getStringScreenWidth = function (t, n, r) { if (n === 0) return [0, 0]; n || (n = Infinity), r = r || 0; var i, s; for (s = 0; s < t.length; s++) { i = t.charAt(s), i === "  " ? r += this.getScreenTabSize(r) : r += e.getCharacterWidth(i); if (r > n) break } return [r, s] } }, this.destroy = function () { this.bgTokenizer && (this.bgTokenizer.setDocument(null), this.bgTokenizer = null), this.$stopWorker(), this.removeAllListeners(), this.selection.detach() }, this.isFullWidth = m }.call(d.prototype), e("./edit_session/folding").Folding.call(d.prototype), e("./edit_session/bracket_match").BracketMatch.call(d.prototype), o.defineOptions(d.prototype, "session", { wrap: { set: function (e) { !e || e == "off" ? e = !1 : e == "free" ? e = !0 : e == "printMargin" ? e = -1 : typeof e == "string" && (e = parseInt(e, 10) || !1); if (this.$wrap == e) return; this.$wrap = e; if (!e) this.setUseWrapMode(!1); else { var t = typeof e == "number" ? e : null; this.setWrapLimitRange(t, t), this.setUseWrapMode(!0) } }, get: function () { return this.getUseWrapMode() ? this.$wrap == -1 ? "printMargin" : this.getWrapLimitRange().min ? this.$wrap : "free" : "off" }, handlesSet: !0 }, wrapMethod: { set: function (e) { e = e == "auto" ? this.$mode.type != "text" : e != "text", e != this.$wrapAsCode && (this.$wrapAsCode = e, this.$useWrapMode && (this.$useWrapMode = !1, this.setUseWrapMode(!0))) }, initialValue: "auto" }, indentedSoftWrap: { set: function () { this.$useWrapMode && (this.$useWrapMode = !1, this.setUseWrapMode(!0)) }, initialValue: !0 }, firstLineNumber: { set: function () { this._signal("changeBreakpoint") }, initialValue: 1 }, useWorker: { set: function (e) { this.$useWorker = e, this.$stopWorker(), e && this.$startWorker() }, initialValue: !0 }, useSoftTabs: { initialValue: !0 }, tabSize: { set: function (e) { e = parseInt(e), e > 0 && this.$tabSize !== e && (this.$modified = !0, this.$rowLengthCache = [], this.$tabSize = e, this._signal("changeTabSize")) }, initialValue: 4, handlesSet: !0 }, navigateWithinSoftTabs: { initialValue: !1 }, foldStyle: { set: function (e) { this.setFoldStyle(e) }, handlesSet: !0 }, overwrite: { set: function (e) { this._signal("changeOverwrite") }, initialValue: !1 }, newLineMode: { set: function (e) { this.doc.setNewLineMode(e) }, get: function () { return this.doc.getNewLineMode() }, handlesSet: !0 }, mode: { set: function (e) { this.setMode(e) }, get: function () { return this.$modeId }, handlesSet: !0 } }), t.EditSession = d }), define("ace/search", ["require", "exports", "module", "ace/lib/lang", "ace/lib/oop", "ace/range"], function (e, t, n) { "use strict"; function u(e, t) { function n(e) { return /\w/.test(e) || t.regExp ? "\\b" : "" } return n(e[0]) + e + n(e[e.length - 1]) } var r = e("./lib/lang"), i = e("./lib/oop"), s = e("./range").Range, o = function () { this.$options = {} }; (function () { this.set = function (e) { return i.mixin(this.$options, e), this }, this.getOptions = function () { return r.copyObject(this.$options) }, this.setOptions = function (e) { this.$options = e }, this.find = function (e) { var t = this.$options, n = this.$matchIterator(e, t); if (!n) return !1; var r = null; return n.forEach(function (e, n, i, o) { return r = new s(e, n, i, o), n == o && t.start && t.start.start && t.skipCurrent != 0 && r.isEqual(t.start) ? (r = null, !1) : !0 }), r }, this.findAll = function (e) { var t = this.$options; if (!t.needle) return []; this.$assembleRegExp(t); var n = t.range, i = n ? e.getLines(n.start.row, n.end.row) : e.doc.getAllLines(), o = [], u = t.re; if (t.$isMultiLine) { var a = u.length, f = i.length - a, l; e: for (var c = u.offset || 0; c <= f; c++) { for (var h = 0; h < a; h++)if (i[c + h].search(u[h]) == -1) continue e; var p = i[c], d = i[c + a - 1], v = p.length - p.match(u[0])[0].length, m = d.match(u[a - 1])[0].length; if (l && l.end.row === c && l.end.column > v) continue; o.push(l = new s(c, v, c + a - 1, m)), a > 2 && (c = c + a - 2) } } else for (var g = 0; g < i.length; g++) { var y = r.getMatchOffsets(i[g], u); for (var h = 0; h < y.length; h++) { var b = y[h]; o.push(new s(g, b.offset, g, b.offset + b.length)) } } if (n) { var w = n.start.column, E = n.start.column, g = 0, h = o.length - 1; while (g < h && o[g].start.column < w && o[g].start.row == n.start.row) g++; while (g < h && o[h].end.column > E && o[h].end.row == n.end.row) h--; o = o.slice(g, h + 1); for (g = 0, h = o.length; g < h; g++)o[g].start.row += n.start.row, o[g].end.row += n.start.row } return o }, this.replace = function (e, t) { var n = this.$options, r = this.$assembleRegExp(n); if (n.$isMultiLine) return t; if (!r) return; var i = r.exec(e); if (!i || i[0].length != e.length) return null; t = e.replace(r, t); if (n.preserveCase) { t = t.split(""); for (var s = Math.min(e.length, e.length); s--;) { var o = e[s]; o && o.toLowerCase() != o ? t[s] = t[s].toUpperCase() : t[s] = t[s].toLowerCase() } t = t.join("") } return t }, this.$assembleRegExp = function (e, t) { if (e.needle instanceof RegExp) return e.re = e.needle; var n = e.needle; if (!e.needle) return e.re = !1; e.regExp || (n = r.escapeRegExp(n)), e.wholeWord && (n = u(n, e)); var i = e.caseSensitive ? "gm" : "gmi"; e.$isMultiLine = !t && /[\n\r]/.test(n); if (e.$isMultiLine) return e.re = this.$assembleMultilineRegExp(n, i); try { var s = new RegExp(n, i) } catch (o) { s = !1 } return e.re = s }, this.$assembleMultilineRegExp = function (e, t) { var n = e.replace(/\r\n|\r|\n/g, "$\n^").split("\n"), r = []; for (var i = 0; i < n.length; i++)try { r.push(new RegExp(n[i], t)) } catch (s) { return !1 } return r }, this.$matchIterator = function (e, t) { var n = this.$assembleRegExp(t); if (!n) return !1; var r = t.backwards == 1, i = t.skipCurrent != 0, s = t.range, o = t.start; o || (o = s ? s[r ? "end" : "start"] : e.selection.getRange()), o.start && (o = o[i != r ? "end" : "start"]); var u = s ? s.start.row : 0, a = s ? s.end.row : e.getLength() - 1; if (r) var f = function (e) { var n = o.row; if (c(n, o.column, e)) return; for (n--; n >= u; n--)if (c(n, Number.MAX_VALUE, e)) return; if (t.wrap == 0) return; for (n = a, u = o.row; n >= u; n--)if (c(n, Number.MAX_VALUE, e)) return }; else var f = function (e) { var n = o.row; if (c(n, o.column, e)) return; for (n += 1; n <= a; n++)if (c(n, 0, e)) return; if (t.wrap == 0) return; for (n = u, a = o.row; n <= a; n++)if (c(n, 0, e)) return }; if (t.$isMultiLine) var l = n.length, c = function (t, i, s) { var o = r ? t - l + 1 : t; if (o < 0) return; var u = e.getLine(o), a = u.search(n[0]); if (!r && a < i || a === -1) return; for (var f = 1; f < l; f++) { u = e.getLine(o + f); if (u.search(n[f]) == -1) return } var c = u.match(n[l - 1])[0].length; if (r && c > i) return; if (s(o, a, o + l - 1, c)) return !0 }; else if (r) var c = function (t, r, i) { var s = e.getLine(t), o = [], u, a = 0; n.lastIndex = 0; while (u = n.exec(s)) { var f = u[0].length; a = u.index; if (!f) { if (a >= s.length) break; n.lastIndex = a += 1 } if (u.index + f > r) break; o.push(u.index, f) } for (var l = o.length - 1; l >= 0; l -= 2) { var c = o[l - 1], f = o[l]; if (i(t, c, t, c + f)) return !0 } }; else var c = function (t, r, i) { var s = e.getLine(t), o, u; n.lastIndex = r; while (u = n.exec(s)) { var a = u[0].length; o = u.index; if (i(t, o, t, o + a)) return !0; if (!a) { n.lastIndex = o += 1; if (o >= s.length) return !1 } } }; return { forEach: f } } }).call(o.prototype), t.Search = o }), define("ace/keyboard/hash_handler", ["require", "exports", "module", "ace/lib/keys", "ace/lib/useragent"], function (e, t, n) { "use strict"; function o(e, t) { this.platform = t || (i.isMac ? "mac" : "win"), this.commands = {}, this.commandKeyBinding = {}, this.addCommands(e), this.$singleCommand = !0 } function u(e, t) { o.call(this, e, t), this.$singleCommand = !1 } var r = e("../lib/keys"), i = e("../lib/useragent"), s = r.KEY_MODS; u.prototype = o.prototype, function () { function e(e) { return typeof e == "object" && e.bindKey && e.bindKey.position || (e.isDefault ? -100 : 0) } this.addCommand = function (e) { this.commands[e.name] && this.removeCommand(e), this.commands[e.name] = e, e.bindKey && this._buildKeyHash(e) }, this.removeCommand = function (e, t) { var n = e && (typeof e == "string" ? e : e.name); e = this.commands[n], t || delete this.commands[n]; var r = this.commandKeyBinding; for (var i in r) { var s = r[i]; if (s == e) delete r[i]; else if (Array.isArray(s)) { var o = s.indexOf(e); o != -1 && (s.splice(o, 1), s.length == 1 && (r[i] = s[0])) } } }, this.bindKey = function (e, t, n) { typeof e == "object" && e && (n == undefined && (n = e.position), e = e[this.platform]); if (!e) return; if (typeof t == "function") return this.addCommand({ exec: t, bindKey: e, name: t.name || e }); e.split("|").forEach(function (e) { var r = ""; if (e.indexOf(" ") != -1) { var i = e.split(/\s+/); e = i.pop(), i.forEach(function (e) { var t = this.parseKeys(e), n = s[t.hashId] + t.key; r += (r ? " " : "") + n, this._addCommandToBinding(r, "chainKeys") }, this), r += " " } var o = this.parseKeys(e), u = s[o.hashId] + o.key; this._addCommandToBinding(r + u, t, n) }, this) }, this._addCommandToBinding = function (t, n, r) { var i = this.commandKeyBinding, s; if (!n) delete i[t]; else if (!i[t] || this.$singleCommand) i[t] = n; else { Array.isArray(i[t]) ? (s = i[t].indexOf(n)) != -1 && i[t].splice(s, 1) : i[t] = [i[t]], typeof r != "number" && (r = e(n)); var o = i[t]; for (s = 0; s < o.length; s++) { var u = o[s], a = e(u); if (a > r) break } o.splice(s, 0, n) } }, this.addCommands = function (e) { e && Object.keys(e).forEach(function (t) { var n = e[t]; if (!n) return; if (typeof n == "string") return this.bindKey(n, t); typeof n == "function" && (n = { exec: n }); if (typeof n != "object") return; n.name || (n.name = t), this.addCommand(n) }, this) }, this.removeCommands = function (e) { Object.keys(e).forEach(function (t) { this.removeCommand(e[t]) }, this) }, this.bindKeys = function (e) { Object.keys(e).forEach(function (t) { this.bindKey(t, e[t]) }, this) }, this._buildKeyHash = function (e) { this.bindKey(e.bindKey, e) }, this.parseKeys = function (e) { var t = e.toLowerCase().split(/[\-\+]([\-\+])?/).filter(function (e) { return e }), n = t.pop(), i = r[n]; if (r.FUNCTION_KEYS[i]) n = r.FUNCTION_KEYS[i].toLowerCase(); else { if (!t.length) return { key: n, hashId: -1 }; if (t.length == 1 && t[0] == "shift") return { key: n.toUpperCase(), hashId: -1 } } var s = 0; for (var o = t.length; o--;) { var u = r.KEY_MODS[t[o]]; if (u == null) return typeof console != "undefined" && console.error("invalid modifier " + t[o] + " in " + e), !1; s |= u } return { key: n, hashId: s } }, this.findKeyCommand = function (t, n) { var r = s[t] + n; return this.commandKeyBinding[r] }, this.handleKeyboard = function (e, t, n, r) { if (r < 0) return; var i = s[t] + n, o = this.commandKeyBinding[i]; e.$keyChain && (e.$keyChain += " " + i, o = this.commandKeyBinding[e.$keyChain] || o); if (o) if (o == "chainKeys" || o[o.length - 1] == "chainKeys") return e.$keyChain = e.$keyChain || i, { command: "null" }; if (e.$keyChain) if (!!t && t != 4 || n.length != 1) { if (t == -1 || r > 0) e.$keyChain = "" } else e.$keyChain = e.$keyChain.slice(0, -i.length - 1); return { command: o } }, this.getStatusText = function (e, t) { return t.$keyChain || "" } }.call(o.prototype), t.HashHandler = o, t.MultiHashHandler = u }), define("ace/commands/command_manager", ["require", "exports", "module", "ace/lib/oop", "ace/keyboard/hash_handler", "ace/lib/event_emitter"], function (e, t, n) { "use strict"; var r = e("../lib/oop"), i = e("../keyboard/hash_handler").MultiHashHandler, s = e("../lib/event_emitter").EventEmitter, o = function (e, t) { i.call(this, t, e), this.byName = this.commands, this.setDefaultHandler("exec", function (e) { return e.command.exec(e.editor, e.args || {}) }) }; r.inherits(o, i), function () { r.implement(this, s), this.exec = function (e, t, n) { if (Array.isArray(e)) { for (var r = e.length; r--;)if (this.exec(e[r], t, n)) return !0; return !1 } typeof e == "string" && (e = this.commands[e]); if (!e) return !1; if (t && t.$readOnly && !e.readOnly) return !1; if (this.$checkCommandState != 0 && e.isAvailable && !e.isAvailable(t)) return !1; var i = { editor: t, command: e, args: n }; return i.returnValue = this._emit("exec", i), this._signal("afterExec", i), i.returnValue === !1 ? !1 : !0 }, this.toggleRecording = function (e) { if (this.$inReplay) return; return e && e._emit("changeStatus"), this.recording ? (this.macro.pop(), this.off("exec", this.$addCommandToMacro), this.macro.length || (this.macro = this.oldMacro), this.recording = !1) : (this.$addCommandToMacro || (this.$addCommandToMacro = function (e) { this.macro.push([e.command, e.args]) }.bind(this)), this.oldMacro = this.macro, this.macro = [], this.on("exec", this.$addCommandToMacro), this.recording = !0) }, this.replay = function (e) { if (this.$inReplay || !this.macro) return; if (this.recording) return this.toggleRecording(e); try { this.$inReplay = !0, this.macro.forEach(function (t) { typeof t == "string" ? this.exec(t, e) : this.exec(t[0], e, t[1]) }, this) } finally { this.$inReplay = !1 } }, this.trimMacro = function (e) { return e.map(function (e) { return typeof e[0] != "string" && (e[0] = e[0].name), e[1] || (e = e[0]), e }) } }.call(o.prototype), t.CommandManager = o }), define("ace/commands/default_commands", ["require", "exports", "module", "ace/lib/lang", "ace/config", "ace/range"], function (e, t, n) { "use strict"; function o(e, t) { return { win: e, mac: t } } var r = e("../lib/lang"), i = e("../config"), s = e("../range").Range; t.commands = [{ name: "showSettingsMenu", bindKey: o("Ctrl-,", "Command-,"), exec: function (e) { i.loadModule("ace/ext/settings_menu", function (t) { t.init(e), e.showSettingsMenu() }) }, readOnly: !0 }, { name: "goToNextError", bindKey: o("Alt-E", "F4"), exec: function (e) { i.loadModule("./ext/error_marker", function (t) { t.showErrorMarker(e, 1) }) }, scrollIntoView: "animate", readOnly: !0 }, { name: "goToPreviousError", bindKey: o("Alt-Shift-E", "Shift-F4"), exec: function (e) { i.loadModule("./ext/error_marker", function (t) { t.showErrorMarker(e, -1) }) }, scrollIntoView: "animate", readOnly: !0 }, { name: "selectall", description: "Select all", bindKey: o("Ctrl-A", "Command-A"), exec: function (e) { e.selectAll() }, readOnly: !0 }, { name: "centerselection", description: "Center selection", bindKey: o(null, "Ctrl-L"), exec: function (e) { e.centerSelection() }, readOnly: !0 }, { name: "gotoline", description: "Go to line...", bindKey: o("Ctrl-L", "Command-L"), exec: function (e, t) { typeof t == "number" && !isNaN(t) && e.gotoLine(t), e.prompt({ $type: "gotoLine" }) }, readOnly: !0 }, { name: "fold", bindKey: o("Alt-L|Ctrl-F1", "Command-Alt-L|Command-F1"), exec: function (e) { e.session.toggleFold(!1) }, multiSelectAction: "forEach", scrollIntoView: "center", readOnly: !0 }, { name: "unfold", bindKey: o("Alt-Shift-L|Ctrl-Shift-F1", "Command-Alt-Shift-L|Command-Shift-F1"), exec: function (e) { e.session.toggleFold(!0) }, multiSelectAction: "forEach", scrollIntoView: "center", readOnly: !0 }, { name: "toggleFoldWidget", bindKey: o("F2", "F2"), exec: function (e) { e.session.toggleFoldWidget() }, multiSelectAction: "forEach", scrollIntoView: "center", readOnly: !0 }, { name: "toggleParentFoldWidget", bindKey: o("Alt-F2", "Alt-F2"), exec: function (e) { e.session.toggleFoldWidget(!0) }, multiSelectAction: "forEach", scrollIntoView: "center", readOnly: !0 }, { name: "foldall", description: "Fold all", bindKey: o(null, "Ctrl-Command-Option-0"), exec: function (e) { e.session.foldAll() }, scrollIntoView: "center", readOnly: !0 }, { name: "foldOther", description: "Fold other", bindKey: o("Alt-0", "Command-Option-0"), exec: function (e) { e.session.foldAll(), e.session.unfold(e.selection.getAllRanges()) }, scrollIntoView: "center", readOnly: !0 }, { name: "unfoldall", description: "Unfold all", bindKey: o("Alt-Shift-0", "Command-Option-Shift-0"), exec: function (e) { e.session.unfold() }, scrollIntoView: "center", readOnly: !0 }, { name: "findnext", description: "Find next", bindKey: o("Ctrl-K", "Command-G"), exec: function (e) { e.findNext() }, multiSelectAction: "forEach", scrollIntoView: "center", readOnly: !0 }, { name: "findprevious", description: "Find previous", bindKey: o("Ctrl-Shift-K", "Command-Shift-G"), exec: function (e) { e.findPrevious() }, multiSelectAction: "forEach", scrollIntoView: "center", readOnly: !0 }, { name: "selectOrFindNext", description: "Select or find next", bindKey: o("Alt-K", "Ctrl-G"), exec: function (e) { e.selection.isEmpty() ? e.selection.selectWord() : e.findNext() }, readOnly: !0 }, { name: "selectOrFindPrevious", description: "Select or find previous", bindKey: o("Alt-Shift-K", "Ctrl-Shift-G"), exec: function (e) { e.selection.isEmpty() ? e.selection.selectWord() : e.findPrevious() }, readOnly: !0 }, { name: "find", description: "Find", bindKey: o("Ctrl-F", "Command-F"), exec: function (e) { i.loadModule("ace/ext/searchbox", function (t) { t.Search(e) }) }, readOnly: !0 }, { name: "overwrite", description: "Overwrite", bindKey: "Insert", exec: function (e) { e.toggleOverwrite() }, readOnly: !0 }, { name: "selecttostart", description: "Select to start", bindKey: o("Ctrl-Shift-Home", "Command-Shift-Home|Command-Shift-Up"), exec: function (e) { e.getSelection().selectFileStart() }, multiSelectAction: "forEach", readOnly: !0, scrollIntoView: "animate", aceCommandGroup: "fileJump" }, { name: "gotostart", description: "Go to start", bindKey: o("Ctrl-Home", "Command-Home|Command-Up"), exec: function (e) { e.navigateFileStart() }, multiSelectAction: "forEach", readOnly: !0, scrollIntoView: "animate", aceCommandGroup: "fileJump" }, { name: "selectup", description: "Select up", bindKey: o("Shift-Up", "Shift-Up|Ctrl-Shift-P"), exec: function (e) { e.getSelection().selectUp() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "golineup", description: "Go line up", bindKey: o("Up", "Up|Ctrl-P"), exec: function (e, t) { e.navigateUp(t.times) }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "selecttoend", description: "Select to end", bindKey: o("Ctrl-Shift-End", "Command-Shift-End|Command-Shift-Down"), exec: function (e) { e.getSelection().selectFileEnd() }, multiSelectAction: "forEach", readOnly: !0, scrollIntoView: "animate", aceCommandGroup: "fileJump" }, { name: "gotoend", description: "Go to end", bindKey: o("Ctrl-End", "Command-End|Command-Down"), exec: function (e) { e.navigateFileEnd() }, multiSelectAction: "forEach", readOnly: !0, scrollIntoView: "animate", aceCommandGroup: "fileJump" }, { name: "selectdown", description: "Select down", bindKey: o("Shift-Down", "Shift-Down|Ctrl-Shift-N"), exec: function (e) { e.getSelection().selectDown() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "golinedown", description: "Go line down", bindKey: o("Down", "Down|Ctrl-N"), exec: function (e, t) { e.navigateDown(t.times) }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "selectwordleft", description: "Select word left", bindKey: o("Ctrl-Shift-Left", "Option-Shift-Left"), exec: function (e) { e.getSelection().selectWordLeft() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "gotowordleft", description: "Go to word left", bindKey: o("Ctrl-Left", "Option-Left"), exec: function (e) { e.navigateWordLeft() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "selecttolinestart", description: "Select to line start", bindKey: o("Alt-Shift-Left", "Command-Shift-Left|Ctrl-Shift-A"), exec: function (e) { e.getSelection().selectLineStart() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "gotolinestart", description: "Go to line start", bindKey: o("Alt-Left|Home", "Command-Left|Home|Ctrl-A"), exec: function (e) { e.navigateLineStart() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "selectleft", description: "Select left", bindKey: o("Shift-Left", "Shift-Left|Ctrl-Shift-B"), exec: function (e) { e.getSelection().selectLeft() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "gotoleft", description: "Go to left", bindKey: o("Left", "Left|Ctrl-B"), exec: function (e, t) { e.navigateLeft(t.times) }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "selectwordright", description: "Select word right", bindKey: o("Ctrl-Shift-Right", "Option-Shift-Right"), exec: function (e) { e.getSelection().selectWordRight() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "gotowordright", description: "Go to word right", bindKey: o("Ctrl-Right", "Option-Right"), exec: function (e) { e.navigateWordRight() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "selecttolineend", description: "Select to line end", bindKey: o("Alt-Shift-Right", "Command-Shift-Right|Shift-End|Ctrl-Shift-E"), exec: function (e) { e.getSelection().selectLineEnd() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "gotolineend", description: "Go to line end", bindKey: o("Alt-Right|End", "Command-Right|End|Ctrl-E"), exec: function (e) { e.navigateLineEnd() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "selectright", description: "Select right", bindKey: o("Shift-Right", "Shift-Right"), exec: function (e) { e.getSelection().selectRight() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "gotoright", description: "Go to right", bindKey: o("Right", "Right|Ctrl-F"), exec: function (e, t) { e.navigateRight(t.times) }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "selectpagedown", description: "Select page down", bindKey: "Shift-PageDown", exec: function (e) { e.selectPageDown() }, readOnly: !0 }, { name: "pagedown", description: "Page down", bindKey: o(null, "Option-PageDown"), exec: function (e) { e.scrollPageDown() }, readOnly: !0 }, { name: "gotopagedown", description: "Go to page down", bindKey: o("PageDown", "PageDown|Ctrl-V"), exec: function (e) { e.gotoPageDown() }, readOnly: !0 }, { name: "selectpageup", description: "Select page up", bindKey: "Shift-PageUp", exec: function (e) { e.selectPageUp() }, readOnly: !0 }, { name: "pageup", description: "Page up", bindKey: o(null, "Option-PageUp"), exec: function (e) { e.scrollPageUp() }, readOnly: !0 }, { name: "gotopageup", description: "Go to page up", bindKey: "PageUp", exec: function (e) { e.gotoPageUp() }, readOnly: !0 }, { name: "scrollup", description: "Scroll up", bindKey: o("Ctrl-Up", null), exec: function (e) { e.renderer.scrollBy(0, -2 * e.renderer.layerConfig.lineHeight) }, readOnly: !0 }, { name: "scrolldown", description: "Scroll down", bindKey: o("Ctrl-Down", null), exec: function (e) { e.renderer.scrollBy(0, 2 * e.renderer.layerConfig.lineHeight) }, readOnly: !0 }, { name: "selectlinestart", description: "Select line start", bindKey: "Shift-Home", exec: function (e) { e.getSelection().selectLineStart() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "selectlineend", description: "Select line end", bindKey: "Shift-End", exec: function (e) { e.getSelection().selectLineEnd() }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "togglerecording", description: "Toggle recording", bindKey: o("Ctrl-Alt-E", "Command-Option-E"), exec: function (e) { e.commands.toggleRecording(e) }, readOnly: !0 }, { name: "replaymacro", description: "Replay macro", bindKey: o("Ctrl-Shift-E", "Command-Shift-E"), exec: function (e) { e.commands.replay(e) }, readOnly: !0 }, { name: "jumptomatching", description: "Jump to matching", bindKey: o("Ctrl-\\|Ctrl-P", "Command-\\"), exec: function (e) { e.jumpToMatching() }, multiSelectAction: "forEach", scrollIntoView: "animate", readOnly: !0 }, { name: "selecttomatching", description: "Select to matching", bindKey: o("Ctrl-Shift-\\|Ctrl-Shift-P", "Command-Shift-\\"), exec: function (e) { e.jumpToMatching(!0) }, multiSelectAction: "forEach", scrollIntoView: "animate", readOnly: !0 }, { name: "expandToMatching", description: "Expand to matching", bindKey: o("Ctrl-Shift-M", "Ctrl-Shift-M"), exec: function (e) { e.jumpToMatching(!0, !0) }, multiSelectAction: "forEach", scrollIntoView: "animate", readOnly: !0 }, { name: "passKeysToBrowser", description: "Pass keys to browser", bindKey: o(null, null), exec: function () { }, passEvent: !0, readOnly: !0 }, { name: "copy", description: "Copy", exec: function (e) { }, readOnly: !0 }, { name: "cut", description: "Cut", exec: function (e) { var t = e.$copyWithEmptySelection && e.selection.isEmpty(), n = t ? e.selection.getLineRange() : e.selection.getRange(); e._emit("cut", n), n.isEmpty() || e.session.remove(n), e.clearSelection() }, scrollIntoView: "cursor", multiSelectAction: "forEach" }, { name: "paste", description: "Paste", exec: function (e, t) { e.$handlePaste(t) }, scrollIntoView: "cursor" }, { name: "removeline", description: "Remove line", bindKey: o("Ctrl-D", "Command-D"), exec: function (e) { e.removeLines() }, scrollIntoView: "cursor", multiSelectAction: "forEachLine" }, { name: "duplicateSelection", description: "Duplicate selection", bindKey: o("Ctrl-Shift-D", "Command-Shift-D"), exec: function (e) { e.duplicateSelection() }, scrollIntoView: "cursor", multiSelectAction: "forEach" }, { name: "sortlines", description: "Sort lines", bindKey: o("Ctrl-Alt-S", "Command-Alt-S"), exec: function (e) { e.sortLines() }, scrollIntoView: "selection", multiSelectAction: "forEachLine" }, { name: "togglecomment", description: "Toggle comment", bindKey: o("Ctrl-/", "Command-/"), exec: function (e) { e.toggleCommentLines() }, multiSelectAction: "forEachLine", scrollIntoView: "selectionPart" }, { name: "toggleBlockComment", description: "Toggle block comment", bindKey: o("Ctrl-Shift-/", "Command-Shift-/"), exec: function (e) { e.toggleBlockComment() }, multiSelectAction: "forEach", scrollIntoView: "selectionPart" }, { name: "modifyNumberUp", description: "Modify number up", bindKey: o("Ctrl-Shift-Up", "Alt-Shift-Up"), exec: function (e) { e.modifyNumber(1) }, scrollIntoView: "cursor", multiSelectAction: "forEach" }, { name: "modifyNumberDown", description: "Modify number down", bindKey: o("Ctrl-Shift-Down", "Alt-Shift-Down"), exec: function (e) { e.modifyNumber(-1) }, scrollIntoView: "cursor", multiSelectAction: "forEach" }, { name: "replace", description: "Replace", bindKey: o("Ctrl-H", "Command-Option-F"), exec: function (e) { i.loadModule("ace/ext/searchbox", function (t) { t.Search(e, !0) }) } }, { name: "undo", description: "Undo", bindKey: o("Ctrl-Z", "Command-Z"), exec: function (e) { e.undo() } }, { name: "redo", description: "Redo", bindKey: o("Ctrl-Shift-Z|Ctrl-Y", "Command-Shift-Z|Command-Y"), exec: function (e) { e.redo() } }, { name: "copylinesup", description: "Copy lines up", bindKey: o("Alt-Shift-Up", "Command-Option-Up"), exec: function (e) { e.copyLinesUp() }, scrollIntoView: "cursor" }, { name: "movelinesup", description: "Move lines up", bindKey: o("Alt-Up", "Option-Up"), exec: function (e) { e.moveLinesUp() }, scrollIntoView: "cursor" }, { name: "copylinesdown", description: "Copy lines down", bindKey: o("Alt-Shift-Down", "Command-Option-Down"), exec: function (e) { e.copyLinesDown() }, scrollIntoView: "cursor" }, { name: "movelinesdown", description: "Move lines down", bindKey: o("Alt-Down", "Option-Down"), exec: function (e) { e.moveLinesDown() }, scrollIntoView: "cursor" }, { name: "del", description: "Delete", bindKey: o("Delete", "Delete|Ctrl-D|Shift-Delete"), exec: function (e) { e.remove("right") }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "backspace", description: "Backspace", bindKey: o("Shift-Backspace|Backspace", "Ctrl-Backspace|Shift-Backspace|Backspace|Ctrl-H"), exec: function (e) { e.remove("left") }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "cut_or_delete", description: "Cut or delete", bindKey: o("Shift-Delete", null), exec: function (e) { if (!e.selection.isEmpty()) return !1; e.remove("left") }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "removetolinestart", description: "Remove to line start", bindKey: o("Alt-Backspace", "Command-Backspace"), exec: function (e) { e.removeToLineStart() }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "removetolineend", description: "Remove to line end", bindKey: o("Alt-Delete", "Ctrl-K|Command-Delete"), exec: function (e) { e.removeToLineEnd() }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "removetolinestarthard", description: "Remove to line start hard", bindKey: o("Ctrl-Shift-Backspace", null), exec: function (e) { var t = e.selection.getRange(); t.start.column = 0, e.session.remove(t) }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "removetolineendhard", description: "Remove to line end hard", bindKey: o("Ctrl-Shift-Delete", null), exec: function (e) { var t = e.selection.getRange(); t.end.column = Number.MAX_VALUE, e.session.remove(t) }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "removewordleft", description: "Remove word left", bindKey: o("Ctrl-Backspace", "Alt-Backspace|Ctrl-Alt-Backspace"), exec: function (e) { e.removeWordLeft() }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "removewordright", description: "Remove word right", bindKey: o("Ctrl-Delete", "Alt-Delete"), exec: function (e) { e.removeWordRight() }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "outdent", description: "Outdent", bindKey: o("Shift-Tab", "Shift-Tab"), exec: function (e) { e.blockOutdent() }, multiSelectAction: "forEach", scrollIntoView: "selectionPart" }, { name: "indent", description: "Indent", bindKey: o("Tab", "Tab"), exec: function (e) { e.indent() }, multiSelectAction: "forEach", scrollIntoView: "selectionPart" }, { name: "blockoutdent", description: "Block outdent", bindKey: o("Ctrl-[", "Ctrl-["), exec: function (e) { e.blockOutdent() }, multiSelectAction: "forEachLine", scrollIntoView: "selectionPart" }, { name: "blockindent", description: "Block indent", bindKey: o("Ctrl-]", "Ctrl-]"), exec: function (e) { e.blockIndent() }, multiSelectAction: "forEachLine", scrollIntoView: "selectionPart" }, { name: "insertstring", description: "Insert string", exec: function (e, t) { e.insert(t) }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "inserttext", description: "Insert text", exec: function (e, t) { e.insert(r.stringRepeat(t.text || "", t.times || 1)) }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "splitline", description: "Split line", bindKey: o(null, "Ctrl-O"), exec: function (e) { e.splitLine() }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "transposeletters", description: "Transpose letters", bindKey: o("Alt-Shift-X", "Ctrl-T"), exec: function (e) { e.transposeLetters() }, multiSelectAction: function (e) { e.transposeSelections(1) }, scrollIntoView: "cursor" }, { name: "touppercase", description: "To uppercase", bindKey: o("Ctrl-U", "Ctrl-U"), exec: function (e) { e.toUpperCase() }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "tolowercase", description: "To lowercase", bindKey: o("Ctrl-Shift-U", "Ctrl-Shift-U"), exec: function (e) { e.toLowerCase() }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "autoindent", description: "Auto Indent", bindKey: o(null, null), exec: function (e) { e.autoIndent() }, multiSelectAction: "forEachLine", scrollIntoView: "animate" }, { name: "expandtoline", description: "Expand to line", bindKey: o("Ctrl-Shift-L", "Command-Shift-L"), exec: function (e) { var t = e.selection.getRange(); t.start.column = t.end.column = 0, t.end.row++, e.selection.setRange(t, !1) }, multiSelectAction: "forEach", scrollIntoView: "cursor", readOnly: !0 }, { name: "joinlines", description: "Join lines", bindKey: o(null, null), exec: function (e) { var t = e.selection.isBackwards(), n = t ? e.selection.getSelectionLead() : e.selection.getSelectionAnchor(), i = t ? e.selection.getSelectionAnchor() : e.selection.getSelectionLead(), o = e.session.doc.getLine(n.row).length, u = e.session.doc.getTextRange(e.selection.getRange()), a = u.replace(/\n\s*/, " ").length, f = e.session.doc.getLine(n.row); for (var l = n.row + 1; l <= i.row + 1; l++) { var c = r.stringTrimLeft(r.stringTrimRight(e.session.doc.getLine(l))); c.length !== 0 && (c = " " + c), f += c } i.row + 1 < e.session.doc.getLength() - 1 && (f += e.session.doc.getNewLineCharacter()), e.clearSelection(), e.session.doc.replace(new s(n.row, 0, i.row + 2, 0), f), a > 0 ? (e.selection.moveCursorTo(n.row, n.column), e.selection.selectTo(n.row, n.column + a)) : (o = e.session.doc.getLine(n.row).length > o ? o + 1 : o, e.selection.moveCursorTo(n.row, o)) }, multiSelectAction: "forEach", readOnly: !0 }, { name: "invertSelection", description: "Invert selection", bindKey: o(null, null), exec: function (e) { var t = e.session.doc.getLength() - 1, n = e.session.doc.getLine(t).length, r = e.selection.rangeList.ranges, i = []; r.length < 1 && (r = [e.selection.getRange()]); for (var o = 0; o < r.length; o++)o == r.length - 1 && (r[o].end.row !== t || r[o].end.column !== n) && i.push(new s(r[o].end.row, r[o].end.column, t, n)), o === 0 ? (r[o].start.row !== 0 || r[o].start.column !== 0) && i.push(new s(0, 0, r[o].start.row, r[o].start.column)) : i.push(new s(r[o - 1].end.row, r[o - 1].end.column, r[o].start.row, r[o].start.column)); e.exitMultiSelectMode(), e.clearSelection(); for (var o = 0; o < i.length; o++)e.selection.addRange(i[o], !1) }, readOnly: !0, scrollIntoView: "none" }, { name: "addLineAfter", exec: function (e) { e.selection.clearSelection(), e.navigateLineEnd(), e.insert("\n") }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "addLineBefore", exec: function (e) { e.selection.clearSelection(); var t = e.getCursorPosition(); e.selection.moveTo(t.row - 1, Number.MAX_VALUE), e.insert("\n"), t.row === 0 && e.navigateUp() }, multiSelectAction: "forEach", scrollIntoView: "cursor" }, { name: "openCommandPallete", description: "Open command pallete", bindKey: o("F1", "F1"), exec: function (e) { e.prompt({ $type: "commands" }) }, readOnly: !0 }, { name: "modeSelect", description: "Change language mode...", bindKey: o(null, null), exec: function (e) { e.prompt({ $type: "modes" }) }, readOnly: !0 }] }), define("ace/editor", ["require", "exports", "module", "ace/lib/fixoldbrowsers", "ace/lib/oop", "ace/lib/dom", "ace/lib/lang", "ace/lib/useragent", "ace/keyboard/textinput", "ace/mouse/mouse_handler", "ace/mouse/fold_handler", "ace/keyboard/keybinding", "ace/edit_session", "ace/search", "ace/range", "ace/lib/event_emitter", "ace/commands/command_manager", "ace/commands/default_commands", "ace/config", "ace/token_iterator", "ace/clipboard"], function (e, t, n) { "use strict"; e("./lib/fixoldbrowsers"); var r = e("./lib/oop"), i = e("./lib/dom"), s = e("./lib/lang"), o = e("./lib/useragent"), u = e("./keyboard/textinput").TextInput, a = e("./mouse/mouse_handler").MouseHandler, f = e("./mouse/fold_handler").FoldHandler, l = e("./keyboard/keybinding").KeyBinding, c = e("./edit_session").EditSession, h = e("./search").Search, p = e("./range").Range, d = e("./lib/event_emitter").EventEmitter, v = e("./commands/command_manager").CommandManager, m = e("./commands/default_commands").commands, g = e("./config"), y = e("./token_iterator").TokenIterator, b = e("./clipboard"), w = function (e, t, n) { this.$toDestroy = []; var r = e.getContainerElement(); this.container = r, this.renderer = e, this.id = "editor" + ++w.$uid, this.commands = new v(o.isMac ? "mac" : "win", m), typeof document == "object" && (this.textInput = new u(e.getTextAreaContainer(), this), this.renderer.textarea = this.textInput.getElement(), this.$mouseHandler = new a(this), new f(this)), this.keyBinding = new l(this), this.$search = (new h).set({ wrap: !0 }), this.$historyTracker = this.$historyTracker.bind(this), this.commands.on("exec", this.$historyTracker), this.$initOperationListeners(), this._$emitInputEvent = s.delayedCall(function () { this._signal("input", {}), this.session && this.session.bgTokenizer && this.session.bgTokenizer.scheduleStart() }.bind(this)), this.on("change", function (e, t) { t._$emitInputEvent.schedule(31) }), this.setSession(t || n && n.session || new c("")), g.resetOptions(this), n && this.setOptions(n), g._signal("editor", this) }; w.$uid = 0, function () { r.implement(this, d), this.$initOperationListeners = function () { this.commands.on("exec", this.startOperation.bind(this), !0), this.commands.on("afterExec", this.endOperation.bind(this), !0), this.$opResetTimer = s.delayedCall(this.endOperation.bind(this, !0)), this.on("change", function () { this.curOp || (this.startOperation(), this.curOp.selectionBefore = this.$lastSel), this.curOp.docChanged = !0 }.bind(this), !0), this.on("changeSelection", function () { this.curOp || (this.startOperation(), this.curOp.selectionBefore = this.$lastSel), this.curOp.selectionChanged = !0 }.bind(this), !0) }, this.curOp = null, this.prevOp = {}, this.startOperation = function (e) { if (this.curOp) { if (!e || this.curOp.command) return; this.prevOp = this.curOp } e || (this.previousCommand = null, e = {}), this.$opResetTimer.schedule(), this.curOp = this.session.curOp = { command: e.command || {}, args: e.args, scrollTop: this.renderer.scrollTop }, this.curOp.selectionBefore = this.selection.toJSON() }, this.endOperation = function (e) { if (this.curOp && this.session) { if (e && e.returnValue === !1 || !this.session) return this.curOp = null; if (e == 1 && this.curOp.command && this.curOp.command.name == "mouse") return; this._signal("beforeEndOperation"); if (!this.curOp) return; var t = this.curOp.command, n = t && t.scrollIntoView; if (n) { switch (n) { case "center-animate": n = "animate"; case "center": this.renderer.scrollCursorIntoView(null, .5); break; case "animate": case "cursor": this.renderer.scrollCursorIntoView(); break; case "selectionPart": var r = this.selection.getRange(), i = this.renderer.layerConfig; (r.start.row >= i.lastRow || r.end.row <= i.firstRow) && this.renderer.scrollSelectionIntoView(this.selection.anchor, this.selection.lead); break; default: }n == "animate" && this.renderer.animateScrolling(this.curOp.scrollTop) } var s = this.selection.toJSON(); this.curOp.selectionAfter = s, this.$lastSel = this.selection.toJSON(), this.session.getUndoManager().addSelection(s), this.prevOp = this.curOp, this.curOp = null } }, this.$mergeableCommands = ["backspace", "del", "insertstring"], this.$historyTracker = function (e) { if (!this.$mergeUndoDeltas) return; var t = this.prevOp, n = this.$mergeableCommands, r = t.command && e.command.name == t.command.name; if (e.command.name == "insertstring") { var i = e.args; this.mergeNextCommand === undefined && (this.mergeNextCommand = !0), r = r && this.mergeNextCommand && (!/\s/.test(i) || /\s/.test(t.args)), this.mergeNextCommand = !0 } else r = r && n.indexOf(e.command.name) !== -1; this.$mergeUndoDeltas != "always" && Date.now() - this.sequenceStartTime > 2e3 && (r = !1), r ? this.session.mergeUndoDeltas = !0 : n.indexOf(e.command.name) !== -1 && (this.sequenceStartTime = Date.now()) }, this.setKeyboardHandler = function (e, t) { if (e && typeof e == "string" && e != "ace") { this.$keybindingId = e; var n = this; g.loadModule(["keybinding", e], function (r) { n.$keybindingId == e && n.keyBinding.setKeyboardHandler(r && r.handler), t && t() }) } else this.$keybindingId = null, this.keyBinding.setKeyboardHandler(e), t && t() }, this.getKeyboardHandler = function () { return this.keyBinding.getKeyboardHandler() }, this.setSession = function (e) { if (this.session == e) return; this.curOp && this.endOperation(), this.curOp = {}; var t = this.session; if (t) { this.session.off("change", this.$onDocumentChange), this.session.off("changeMode", this.$onChangeMode), this.session.off("tokenizerUpdate", this.$onTokenizerUpdate), this.session.off("changeTabSize", this.$onChangeTabSize), this.session.off("changeWrapLimit", this.$onChangeWrapLimit), this.session.off("changeWrapMode", this.$onChangeWrapMode), this.session.off("changeFold", this.$onChangeFold), this.session.off("changeFrontMarker", this.$onChangeFrontMarker), this.session.off("changeBackMarker", this.$onChangeBackMarker), this.session.off("changeBreakpoint", this.$onChangeBreakpoint), this.session.off("changeAnnotation", this.$onChangeAnnotation), this.session.off("changeOverwrite", this.$onCursorChange), this.session.off("changeScrollTop", this.$onScrollTopChange), this.session.off("changeScrollLeft", this.$onScrollLeftChange); var n = this.session.getSelection(); n.off("changeCursor", this.$onCursorChange), n.off("changeSelection", this.$onSelectionChange) } this.session = e, e ? (this.$onDocumentChange = this.onDocumentChange.bind(this), e.on("change", this.$onDocumentChange), this.renderer.setSession(e), this.$onChangeMode = this.onChangeMode.bind(this), e.on("changeMode", this.$onChangeMode), this.$onTokenizerUpdate = this.onTokenizerUpdate.bind(this), e.on("tokenizerUpdate", this.$onTokenizerUpdate), this.$onChangeTabSize = this.renderer.onChangeTabSize.bind(this.renderer), e.on("changeTabSize", this.$onChangeTabSize), this.$onChangeWrapLimit = this.onChangeWrapLimit.bind(this), e.on("changeWrapLimit", this.$onChangeWrapLimit), this.$onChangeWrapMode = this.onChangeWrapMode.bind(this), e.on("changeWrapMode", this.$onChangeWrapMode), this.$onChangeFold = this.onChangeFold.bind(this), e.on("changeFold", this.$onChangeFold), this.$onChangeFrontMarker = this.onChangeFrontMarker.bind(this), this.session.on("changeFrontMarker", this.$onChangeFrontMarker), this.$onChangeBackMarker = this.onChangeBackMarker.bind(this), this.session.on("changeBackMarker", this.$onChangeBackMarker), this.$onChangeBreakpoint = this.onChangeBreakpoint.bind(this), this.session.on("changeBreakpoint", this.$onChangeBreakpoint), this.$onChangeAnnotation = this.onChangeAnnotation.bind(this), this.session.on("changeAnnotation", this.$onChangeAnnotation), this.$onCursorChange = this.onCursorChange.bind(this), this.session.on("changeOverwrite", this.$onCursorChange), this.$onScrollTopChange = this.onScrollTopChange.bind(this), this.session.on("changeScrollTop", this.$onScrollTopChange), this.$onScrollLeftChange = this.onScrollLeftChange.bind(this), this.session.on("changeScrollLeft", this.$onScrollLeftChange), this.selection = e.getSelection(), this.selection.on("changeCursor", this.$onCursorChange), this.$onSelectionChange = this.onSelectionChange.bind(this), this.selection.on("changeSelection", this.$onSelectionChange), this.onChangeMode(), this.onCursorChange(), this.onScrollTopChange(), this.onScrollLeftChange(), this.onSelectionChange(), this.onChangeFrontMarker(), this.onChangeBackMarker(), this.onChangeBreakpoint(), this.onChangeAnnotation(), this.session.getUseWrapMode() && this.renderer.adjustWrapLimit(), this.renderer.updateFull()) : (this.selection = null, this.renderer.setSession(e)), this._signal("changeSession", { session: e, oldSession: t }), this.curOp = null, t && t._signal("changeEditor", { oldEditor: this }), e && e._signal("changeEditor", { editor: this }), e && e.bgTokenizer && e.bgTokenizer.scheduleStart() }, this.getSession = function () { return this.session }, this.setValue = function (e, t) { return this.session.doc.setValue(e), t ? t == 1 ? this.navigateFileEnd() : t == -1 && this.navigateFileStart() : this.selectAll(), e }, this.getValue = function () { return this.session.getValue() }, this.getSelection = function () { return this.selection }, this.resize = function (e) { this.renderer.onResize(e) }, this.setTheme = function (e, t) { this.renderer.setTheme(e, t) }, this.getTheme = function () { return this.renderer.getTheme() }, this.setStyle = function (e) { this.renderer.setStyle(e) }, this.unsetStyle = function (e) { this.renderer.unsetStyle(e) }, this.getFontSize = function () { return this.getOption("fontSize") || i.computedStyle(this.container).fontSize }, this.setFontSize = function (e) { this.setOption("fontSize", e) }, this.$highlightBrackets = function () { if (this.$highlightPending) return; var e = this; this.$highlightPending = !0, setTimeout(function () { e.$highlightPending = !1; var t = e.session; if (!t || !t.bgTokenizer) return; t.$bracketHighlight && (t.$bracketHighlight.markerIds.forEach(function (e) { t.removeMarker(e) }), t.$bracketHighlight = null); var n = t.getMatchingBracketRanges(e.getCursorPosition()); !n && t.$mode.getMatching && (n = t.$mode.getMatching(e.session)); if (!n) return; var r = "ace_bracket"; Array.isArray(n) ? n.length == 1 && (r = "ace_error_bracket") : n = [n], n.length == 2 && (p.comparePoints(n[0].end, n[1].start) == 0 ? n = [p.fromPoints(n[0].start, n[1].end)] : p.comparePoints(n[0].start, n[1].end) == 0 && (n = [p.fromPoints(n[1].start, n[0].end)])), t.$bracketHighlight = { ranges: n, markerIds: n.map(function (e) { return t.addMarker(e, r, "text") }) } }, 50) }, this.$highlightTags = function () { if (this.$highlightTagPending) return; var e = this; this.$highlightTagPending = !0, setTimeout(function () { e.$highlightTagPending = !1; var t = e.session; if (!t || !t.bgTokenizer) return; var n = e.getCursorPosition(), r = new y(e.session, n.row, n.column), i = r.getCurrentToken(); if (!i || !/\b(?:tag-open|tag-name)/.test(i.type)) { t.removeMarker(t.$tagHighlight), t.$tagHighlight = null; return } if (i.type.indexOf("tag-open") != -1) { i = r.stepForward(); if (!i) return } var s = i.value, o = 0, u = r.stepBackward(); if (u.value == "<") { do u = i, i = r.stepForward(), i && i.value === s && i.type.indexOf("tag-name") !== -1 && (u.value === "<" ? o++ : u.value === "</" && o--); while (i && o >= 0) } else { do i = u, u = r.stepBackward(), i && i.value === s && i.type.indexOf("tag-name") !== -1 && (u.value === "<" ? o++ : u.value === "</" && o--); while (u && o <= 0); r.stepForward() } if (!i) { t.removeMarker(t.$tagHighlight), t.$tagHighlight = null; return } var a = r.getCurrentTokenRow(), f = r.getCurrentTokenColumn(), l = new p(a, f, a, f + i.value.length), c = t.$backMarkers[t.$tagHighlight]; t.$tagHighlight && c != undefined && l.compareRange(c.range) !== 0 && (t.removeMarker(t.$tagHighlight), t.$tagHighlight = null), t.$tagHighlight || (t.$tagHighlight = t.addMarker(l, "ace_bracket", "text")) }, 50) }, this.focus = function () { var e = this; setTimeout(function () { e.isFocused() || e.textInput.focus() }), this.textInput.focus() }, this.isFocused = function () { return this.textInput.isFocused() }, this.blur = function () { this.textInput.blur() }, this.onFocus = function (e) { if (this.$isFocused) return; this.$isFocused = !0, this.renderer.showCursor(), this.renderer.visualizeFocus(), this._emit("focus", e) }, this.onBlur = function (e) { if (!this.$isFocused) return; this.$isFocused = !1, this.renderer.hideCursor(), this.renderer.visualizeBlur(), this._emit("blur", e) }, this.$cursorChange = function () { this.renderer.updateCursor(), this.$highlightBrackets(), this.$highlightTags(), this.$updateHighlightActiveLine() }, this.onDocumentChange = function (e) { var t = this.session.$useWrapMode, n = e.start.row == e.end.row ? e.end.row : Infinity; this.renderer.updateLines(e.start.row, n, t), this._signal("change", e), this.$cursorChange() }, this.onTokenizerUpdate = function (e) { var t = e.data; this.renderer.updateLines(t.first, t.last) }, this.onScrollTopChange = function () { this.renderer.scrollToY(this.session.getScrollTop()) }, this.onScrollLeftChange = function () { this.renderer.scrollToX(this.session.getScrollLeft()) }, this.onCursorChange = function () { this.$cursorChange(), this._signal("changeSelection") }, this.$updateHighlightActiveLine = function () { var e = this.getSession(), t; if (this.$highlightActiveLine) { if (this.$selectionStyle != "line" || !this.selection.isMultiLine()) t = this.getCursorPosition(); this.renderer.theme && this.renderer.theme.$selectionColorConflict && !this.selection.isEmpty() && (t = !1), this.renderer.$maxLines && this.session.getLength() === 1 && !(this.renderer.$minLines > 1) && (t = !1) } if (e.$highlightLineMarker && !t) e.removeMarker(e.$highlightLineMarker.id), e.$highlightLineMarker = null; else if (!e.$highlightLineMarker && t) { var n = new p(t.row, t.column, t.row, Infinity); n.id = e.addMarker(n, "ace_active-line", "screenLine"), e.$highlightLineMarker = n } else t && (e.$highlightLineMarker.start.row = t.row, e.$highlightLineMarker.end.row = t.row, e.$highlightLineMarker.start.column = t.column, e._signal("changeBackMarker")) }, this.onSelectionChange = function (e) { var t = this.session; t.$selectionMarker && t.removeMarker(t.$selectionMarker), t.$selectionMarker = null; if (!this.selection.isEmpty()) { var n = this.selection.getRange(), r = this.getSelectionStyle(); t.$selectionMarker = t.addMarker(n, "ace_selection", r) } else this.$updateHighlightActiveLine(); var i = this.$highlightSelectedWord && this.$getSelectionHighLightRegexp(); this.session.highlight(i), this._signal("changeSelection") }, this.$getSelectionHighLightRegexp = function () { var e = this.session, t = this.getSelectionRange(); if (t.isEmpty() || t.isMultiLine()) return; var n = t.start.column, r = t.end.column, i = e.getLine(t.start.row), s = i.substring(n, r); if (s.length > 5e3 || !/[\w\d]/.test(s)) return; var o = this.$search.$assembleRegExp({ wholeWord: !0, caseSensitive: !0, needle: s }), u = i.substring(n - 1, r + 1); if (!o.test(u)) return; return o }, this.onChangeFrontMarker = function () { this.renderer.updateFrontMarkers() }, this.onChangeBackMarker = function () { this.renderer.updateBackMarkers() }, this.onChangeBreakpoint = function () { this.renderer.updateBreakpoints() }, this.onChangeAnnotation = function () { this.renderer.setAnnotations(this.session.getAnnotations()) }, this.onChangeMode = function (e) { this.renderer.updateText(), this._emit("changeMode", e) }, this.onChangeWrapLimit = function () { this.renderer.updateFull() }, this.onChangeWrapMode = function () { this.renderer.onResize(!0) }, this.onChangeFold = function () { this.$updateHighlightActiveLine(), this.renderer.updateFull() }, this.getSelectedText = function () { return this.session.getTextRange(this.getSelectionRange()) }, this.getCopyText = function () { var e = this.getSelectedText(), t = this.session.doc.getNewLineCharacter(), n = !1; if (!e && this.$copyWithEmptySelection) { n = !0; var r = this.selection.getAllRanges(); for (var i = 0; i < r.length; i++) { var s = r[i]; if (i && r[i - 1].start.row == s.start.row) continue; e += this.session.getLine(s.start.row) + t } } var o = { text: e }; return this._signal("copy", o), b.lineMode = n ? o.text : "", o.text }, this.onCopy = function () { this.commands.exec("copy", this) }, this.onCut = function () { this.commands.exec("cut", this) }, this.onPaste = function (e, t) { var n = { text: e, event: t }; this.commands.exec("paste", this, n) }, this.$handlePaste = function (e) { typeof e == "string" && (e = { text: e }), this._signal("paste", e); var t = e.text, n = t == b.lineMode, r = this.session; if (!this.inMultiSelectMode || this.inVirtualSelectionMode) n ? r.insert({ row: this.selection.lead.row, column: 0 }, t) : this.insert(t); else if (n) this.selection.rangeList.ranges.forEach(function (e) { r.insert({ row: e.start.row, column: 0 }, t) }); else { var i = t.split(/\r\n|\r|\n/), s = this.selection.rangeList.ranges, o = i.length == 2 && (!i[0] || !i[1]); if (i.length != s.length || o) return this.commands.exec("insertstring", this, t); for (var u = s.length; u--;) { var a = s[u]; a.isEmpty() || r.remove(a), r.insert(a.start, i[u]) } } }, this.execCommand = function (e, t) { return this.commands.exec(e, this, t) }, this.insert = function (e, t) { var n = this.session, r = n.getMode(), i = this.getCursorPosition(); if (this.getBehavioursEnabled() && !t) { var s = r.transformAction(n.getState(i.row), "insertion", this, n, e); s && (e !== s.text && (this.inVirtualSelectionMode || (this.session.mergeUndoDeltas = !1, this.mergeNextCommand = !1)), e = s.text) } e == "  " && (e = this.session.getTabString()); if (!this.selection.isEmpty()) { var o = this.getSelectionRange(); i = this.session.remove(o), this.clearSelection() } else if (this.session.getOverwrite() && e.indexOf("\n") == -1) { var o = new p.fromPoints(i, i); o.end.column += e.length, this.session.remove(o) } if (e == "\n" || e == "\r\n") { var u = n.getLine(i.row); if (i.column > u.search(/\S|$/)) { var a = u.substr(i.column).search(/\S|$/); n.doc.removeInLine(i.row, i.column, i.column + a) } } this.clearSelection(); var f = i.column, l = n.getState(i.row), u = n.getLine(i.row), c = r.checkOutdent(l, u, e); n.insert(i, e), s && s.selection && (s.selection.length == 2 ? this.selection.setSelectionRange(new p(i.row, f + s.selection[0], i.row, f + s.selection[1])) : this.selection.setSelectionRange(new p(i.row + s.selection[0], s.selection[1], i.row + s.selection[2], s.selection[3]))); if (this.$enableAutoIndent) { if (n.getDocument().isNewLine(e)) { var h = r.getNextLineIndent(l, u.slice(0, i.column), n.getTabString()); n.insert({ row: i.row + 1, column: 0 }, h) } c && r.autoOutdent(l, n, i.row) } }, this.autoIndent = function () { var e = this.session, t = e.getMode(), n, r; if (this.selection.isEmpty()) n = 0, r = e.doc.getLength() - 1; else { var i = this.getSelectionRange(); n = i.start.row, r = i.end.row } var s = "", o = "", u = "", a, f, l, c = e.getTabString(); for (var h = n; h <= r; h++)h > 0 && (s = e.getState(h - 1), o = e.getLine(h - 1), u = t.getNextLineIndent(s, o, c)), a = e.getLine(h), f = t.$getIndent(a), u !== f && (f.length > 0 && (l = new p(h, 0, h, f.length), e.remove(l)), u.length > 0 && e.insert({ row: h, column: 0 }, u)), t.autoOutdent(s, e, h) }, this.onTextInput = function (e, t) { if (!t) return this.keyBinding.onTextInput(e); this.startOperation({ command: { name: "insertstring" } }); var n = this.applyComposition.bind(this, e, t); this.selection.rangeCount ? this.forEachSelection(n) : n(), this.endOperation() }, this.applyComposition = function (e, t) { if (t.extendLeft || t.extendRight) { var n = this.selection.getRange(); n.start.column -= t.extendLeft, n.end.column += t.extendRight, n.start.column < 0 && (n.start.row--, n.start.column += this.session.getLine(n.start.row).length + 1), this.selection.setRange(n), !e && !n.isEmpty() && this.remove() } (e || !this.selection.isEmpty()) && this.insert(e, !0); if (t.restoreStart || t.restoreEnd) { var n = this.selection.getRange(); n.start.column -= t.restoreStart, n.end.column -= t.restoreEnd, this.selection.setRange(n) } }, this.onCommandKey = function (e, t, n) { return this.keyBinding.onCommandKey(e, t, n) }, this.setOverwrite = function (e) { this.session.setOverwrite(e) }, this.getOverwrite = function () { return this.session.getOverwrite() }, this.toggleOverwrite = function () { this.session.toggleOverwrite() }, this.setScrollSpeed = function (e) { this.setOption("scrollSpeed", e) }, this.getScrollSpeed = function () { return this.getOption("scrollSpeed") }, this.setDragDelay = function (e) { this.setOption("dragDelay", e) }, this.getDragDelay = function () { return this.getOption("dragDelay") }, this.setSelectionStyle = function (e) { this.setOption("selectionStyle", e) }, this.getSelectionStyle = function () { return this.getOption("selectionStyle") }, this.setHighlightActiveLine = function (e) { this.setOption("highlightActiveLine", e) }, this.getHighlightActiveLine = function () { return this.getOption("highlightActiveLine") }, this.setHighlightGutterLine = function (e) { this.setOption("highlightGutterLine", e) }, this.getHighlightGutterLine = function () { return this.getOption("highlightGutterLine") }, this.setHighlightSelectedWord = function (e) { this.setOption("highlightSelectedWord", e) }, this.getHighlightSelectedWord = function () { return this.$highlightSelectedWord }, this.setAnimatedScroll = function (e) { this.renderer.setAnimatedScroll(e) }, this.getAnimatedScroll = function () { return this.renderer.getAnimatedScroll() }, this.setShowInvisibles = function (e) { this.renderer.setShowInvisibles(e) }, this.getShowInvisibles = function () { return this.renderer.getShowInvisibles() }, this.setDisplayIndentGuides = function (e) { this.renderer.setDisplayIndentGuides(e) }, this.getDisplayIndentGuides = function () { return this.renderer.getDisplayIndentGuides() }, this.setShowPrintMargin = function (e) { this.renderer.setShowPrintMargin(e) }, this.getShowPrintMargin = function () { return this.renderer.getShowPrintMargin() }, this.setPrintMarginColumn = function (e) { this.renderer.setPrintMarginColumn(e) }, this.getPrintMarginColumn = function () { return this.renderer.getPrintMarginColumn() }, this.setReadOnly = function (e) { this.setOption("readOnly", e) }, this.getReadOnly = function () { return this.getOption("readOnly") }, this.setBehavioursEnabled = function (e) { this.setOption("behavioursEnabled", e) }, this.getBehavioursEnabled = function () { return this.getOption("behavioursEnabled") }, this.setWrapBehavioursEnabled = function (e) { this.setOption("wrapBehavioursEnabled", e) }, this.getWrapBehavioursEnabled = function () { return this.getOption("wrapBehavioursEnabled") }, this.setShowFoldWidgets = function (e) { this.setOption("showFoldWidgets", e) }, this.getShowFoldWidgets = function () { return this.getOption("showFoldWidgets") }, this.setFadeFoldWidgets = function (e) { this.setOption("fadeFoldWidgets", e) }, this.getFadeFoldWidgets = function () { return this.getOption("fadeFoldWidgets") }, this.remove = function (e) { this.selection.isEmpty() && (e == "left" ? this.selection.selectLeft() : this.selection.selectRight()); var t = this.getSelectionRange(); if (this.getBehavioursEnabled()) { var n = this.session, r = n.getState(t.start.row), i = n.getMode().transformAction(r, "deletion", this, n, t); if (t.end.column === 0) { var s = n.getTextRange(t); if (s[s.length - 1] == "\n") { var o = n.getLine(t.end.row); /^\s+$/.test(o) && (t.end.column = o.length) } } i && (t = i) } this.session.remove(t), this.clearSelection() }, this.removeWordRight = function () { this.selection.isEmpty() && this.selection.selectWordRight(), this.session.remove(this.getSelectionRange()), this.clearSelection() }, this.removeWordLeft = function () { this.selection.isEmpty() && this.selection.selectWordLeft(), this.session.remove(this.getSelectionRange()), this.clearSelection() }, this.removeToLineStart = function () { this.selection.isEmpty() && this.selection.selectLineStart(), this.selection.isEmpty() && this.selection.selectLeft(), this.session.remove(this.getSelectionRange()), this.clearSelection() }, this.removeToLineEnd = function () { this.selection.isEmpty() && this.selection.selectLineEnd(); var e = this.getSelectionRange(); e.start.column == e.end.column && e.start.row == e.end.row && (e.end.column = 0, e.end.row++), this.session.remove(e), this.clearSelection() }, this.splitLine = function () { this.selection.isEmpty() || (this.session.remove(this.getSelectionRange()), this.clearSelection()); var e = this.getCursorPosition(); this.insert("\n"), this.moveCursorToPosition(e) }, this.transposeLetters = function () { if (!this.selection.isEmpty()) return; var e = this.getCursorPosition(), t = e.column; if (t === 0) return; var n = this.session.getLine(e.row), r, i; t < n.length ? (r = n.charAt(t) + n.charAt(t - 1), i = new p(e.row, t - 1, e.row, t + 1)) : (r = n.charAt(t - 1) + n.charAt(t - 2), i = new p(e.row, t - 2, e.row, t)), this.session.replace(i, r), this.session.selection.moveToPosition(i.end) }, this.toLowerCase = function () { var e = this.getSelectionRange(); this.selection.isEmpty() && this.selection.selectWord(); var t = this.getSelectionRange(), n = this.session.getTextRange(t); this.session.replace(t, n.toLowerCase()), this.selection.setSelectionRange(e) }, this.toUpperCase = function () { var e = this.getSelectionRange(); this.selection.isEmpty() && this.selection.selectWord(); var t = this.getSelectionRange(), n = this.session.getTextRange(t); this.session.replace(t, n.toUpperCase()), this.selection.setSelectionRange(e) }, this.indent = function () { var e = this.session, t = this.getSelectionRange(); if (t.start.row < t.end.row) { var n = this.$getSelectedRows(); e.indentRows(n.first, n.last, "  "); return } if (t.start.column < t.end.column) { var r = e.getTextRange(t); if (!/^\s+$/.test(r)) { var n = this.$getSelectedRows(); e.indentRows(n.first, n.last, "  "); return } } var i = e.getLine(t.start.row), o = t.start, u = e.getTabSize(), a = e.documentToScreenColumn(o.row, o.column); if (this.session.getUseSoftTabs()) var f = u - a % u, l = s.stringRepeat(" ", f); else { var f = a % u; while (i[t.start.column - 1] == " " && f) t.start.column--, f--; this.selection.setSelectionRange(t), l = "  " } return this.insert(l) }, this.blockIndent = function () { var e = this.$getSelectedRows(); this.session.indentRows(e.first, e.last, "  ") }, this.blockOutdent = function () { var e = this.session.getSelection(); this.session.outdentRows(e.getRange()) }, this.sortLines = function () { var e = this.$getSelectedRows(), t = this.session, n = []; for (var r = e.first; r <= e.last; r++)n.push(t.getLine(r)); n.sort(function (e, t) { return e.toLowerCase() < t.toLowerCase() ? -1 : e.toLowerCase() > t.toLowerCase() ? 1 : 0 }); var i = new p(0, 0, 0, 0); for (var r = e.first; r <= e.last; r++) { var s = t.getLine(r); i.start.row = r, i.end.row = r, i.end.column = s.length, t.replace(i, n[r - e.first]) } }, this.toggleCommentLines = function () { var e = this.session.getState(this.getCursorPosition().row), t = this.$getSelectedRows(); this.session.getMode().toggleCommentLines(e, this.session, t.first, t.last) }, this.toggleBlockComment = function () { var e = this.getCursorPosition(), t = this.session.getState(e.row), n = this.getSelectionRange(); this.session.getMode().toggleBlockComment(t, this.session, n, e) }, this.getNumberAt = function (e, t) { var n = /[\-]?[0-9]+(?:\.[0-9]+)?/g; n.lastIndex = 0; var r = this.session.getLine(e); while (n.lastIndex < t) { var i = n.exec(r); if (i.index <= t && i.index + i[0].length >= t) { var s = { value: i[0], start: i.index, end: i.index + i[0].length }; return s } } return null }, this.modifyNumber = function (e) { var t = this.selection.getCursor().row, n = this.selection.getCursor().column, r = new p(t, n - 1, t, n), i = this.session.getTextRange(r); if (!isNaN(parseFloat(i)) && isFinite(i)) { var s = this.getNumberAt(t, n); if (s) { var o = s.value.indexOf(".") >= 0 ? s.start + s.value.indexOf(".") + 1 : s.end, u = s.start + s.value.length - o, a = parseFloat(s.value); a *= Math.pow(10, u), o !== s.end && n < o ? e *= Math.pow(10, s.end - n - 1) : e *= Math.pow(10, s.end - n), a += e, a /= Math.pow(10, u); var f = a.toFixed(u), l = new p(t, s.start, t, s.end); this.session.replace(l, f), this.moveCursorTo(t, Math.max(s.start + 1, n + f.length - s.value.length)) } } else this.toggleWord() }, this.$toggleWordPairs = [["first", "last"], ["true", "false"], ["yes", "no"], ["width", "height"], ["top", "bottom"], ["right", "left"], ["on", "off"], ["x", "y"], ["get", "set"], ["max", "min"], ["horizontal", "vertical"], ["show", "hide"], ["add", "remove"], ["up", "down"], ["before", "after"], ["even", "odd"], ["in", "out"], ["inside", "outside"], ["next", "previous"], ["increase", "decrease"], ["attach", "detach"], ["&&", "||"], ["==", "!="]], this.toggleWord = function () { var e = this.selection.getCursor().row, t = this.selection.getCursor().column; this.selection.selectWord(); var n = this.getSelectedText(), r = this.selection.getWordRange().start.column, i = n.replace(/([a-z]+|[A-Z]+)(?=[A-Z_]|$)/g, "$1 ").split(/\s/), o = t - r - 1; o < 0 && (o = 0); var u = 0, a = 0, f = this; n.match(/[A-Za-z0-9_]+/) && i.forEach(function (t, i) { a = u + t.length, o >= u && o <= a && (n = t, f.selection.clearSelection(), f.moveCursorTo(e, u + r), f.selection.selectTo(e, a + r)), u = a }); var l = this.$toggleWordPairs, c; for (var h = 0; h < l.length; h++) { var p = l[h]; for (var d = 0; d <= 1; d++) { var v = +!d, m = n.match(new RegExp("^\\s?_?(" + s.escapeRegExp(p[d]) + ")\\s?$", "i")); if (m) { var g = n.match(new RegExp("([_]|^|\\s)(" + s.escapeRegExp(m[1]) + ")($|\\s)", "g")); g && (c = n.replace(new RegExp(s.escapeRegExp(p[d]), "i"), function (e) { var t = p[v]; return e.toUpperCase() == e ? t = t.toUpperCase() : e.charAt(0).toUpperCase() == e.charAt(0) && (t = t.substr(0, 0) + p[v].charAt(0).toUpperCase() + t.substr(1)), t }), this.insert(c), c = "") } } } }, this.removeLines = function () { var e = this.$getSelectedRows(); this.session.removeFullLines(e.first, e.last), this.clearSelection() }, this.duplicateSelection = function () { var e = this.selection, t = this.session, n = e.getRange(), r = e.isBackwards(); if (n.isEmpty()) { var i = n.start.row; t.duplicateLines(i, i) } else { var s = r ? n.start : n.end, o = t.insert(s, t.getTextRange(n), !1); n.start = s, n.end = o, e.setSelectionRange(n, r) } }, this.moveLinesDown = function () { this.$moveLines(1, !1) }, this.moveLinesUp = function () { this.$moveLines(-1, !1) }, this.moveText = function (e, t, n) { return this.session.moveText(e, t, n) }, this.copyLinesUp = function () { this.$moveLines(-1, !0) }, this.copyLinesDown = function () { this.$moveLines(1, !0) }, this.$moveLines = function (e, t) { var n, r, i = this.selection; if (!i.inMultiSelectMode || this.inVirtualSelectionMode) { var s = i.toOrientedRange(); n = this.$getSelectedRows(s), r = this.session.$moveLines(n.first, n.last, t ? 0 : e), t && e == -1 && (r = 0), s.moveBy(r, 0), i.fromOrientedRange(s) } else { var o = i.rangeList.ranges; i.rangeList.detach(this.session), this.inVirtualSelectionMode = !0; var u = 0, a = 0, f = o.length; for (var l = 0; l < f; l++) { var c = l; o[l].moveBy(u, 0), n = this.$getSelectedRows(o[l]); var h = n.first, p = n.last; while (++l < f) { a && o[l].moveBy(a, 0); var d = this.$getSelectedRows(o[l]); if (t && d.first != p) break; if (!t && d.first > p + 1) break; p = d.last } l--, u = this.session.$moveLines(h, p, t ? 0 : e), t && e == -1 && (c = l + 1); while (c <= l) o[c].moveBy(u, 0), c++; t || (u = 0), a += u } i.fromOrientedRange(i.ranges[0]), i.rangeList.attach(this.session), this.inVirtualSelectionMode = !1 } }, this.$getSelectedRows = function (e) { return e = (e || this.getSelectionRange()).collapseRows(), { first: this.session.getRowFoldStart(e.start.row), last: this.session.getRowFoldEnd(e.end.row) } }, this.onCompositionStart = function (e) { this.renderer.showComposition(e) }, this.onCompositionUpdate = function (e) { this.renderer.setCompositionText(e) }, this.onCompositionEnd = function () { this.renderer.hideComposition() }, this.getFirstVisibleRow = function () { return this.renderer.getFirstVisibleRow() }, this.getLastVisibleRow = function () { return this.renderer.getLastVisibleRow() }, this.isRowVisible = function (e) { return e >= this.getFirstVisibleRow() && e <= this.getLastVisibleRow() }, this.isRowFullyVisible = function (e) { return e >= this.renderer.getFirstFullyVisibleRow() && e <= this.renderer.getLastFullyVisibleRow() }, this.$getVisibleRowCount = function () { return this.renderer.getScrollBottomRow() - this.renderer.getScrollTopRow() + 1 }, this.$moveByPage = function (e, t) { var n = this.renderer, r = this.renderer.layerConfig, i = e * Math.floor(r.height / r.lineHeight); t === !0 ? this.selection.$moveSelection(function () { this.moveCursorBy(i, 0) }) : t === !1 && (this.selection.moveCursorBy(i, 0), this.selection.clearSelection()); var s = n.scrollTop; n.scrollBy(0, i * r.lineHeight), t != null && n.scrollCursorIntoView(null, .5), n.animateScrolling(s) }, this.selectPageDown = function () { this.$moveByPage(1, !0) }, this.selectPageUp = function () { this.$moveByPage(-1, !0) }, this.gotoPageDown = function () { this.$moveByPage(1, !1) }, this.gotoPageUp = function () { this.$moveByPage(-1, !1) }, this.scrollPageDown = function () { this.$moveByPage(1) }, this.scrollPageUp = function () { this.$moveByPage(-1) }, this.scrollToRow = function (e) { this.renderer.scrollToRow(e) }, this.scrollToLine = function (e, t, n, r) { this.renderer.scrollToLine(e, t, n, r) }, this.centerSelection = function () { var e = this.getSelectionRange(), t = { row: Math.floor(e.start.row + (e.end.row - e.start.row) / 2), column: Math.floor(e.start.column + (e.end.column - e.start.column) / 2) }; this.renderer.alignCursor(t, .5) }, this.getCursorPosition = function () { return this.selection.getCursor() }, this.getCursorPositionScreen = function () { return this.session.documentToScreenPosition(this.getCursorPosition()) }, this.getSelectionRange = function () { return this.selection.getRange() }, this.selectAll = function () { this.selection.selectAll() }, this.clearSelection = function () { this.selection.clearSelection() }, this.moveCursorTo = function (e, t) { this.selection.moveCursorTo(e, t) }, this.moveCursorToPosition = function (e) { this.selection.moveCursorToPosition(e) }, this.jumpToMatching = function (e, t) { var n = this.getCursorPosition(), r = new y(this.session, n.row, n.column), i = r.getCurrentToken(), s = i || r.stepForward(); if (!s) return; var o, u = !1, a = {}, f = n.column - s.start, l, c = { ")": "(", "(": "(", "]": "[", "[": "[", "{": "{", "}": "{" }; do { if (s.value.match(/[{}()\[\]]/g)) for (; f < s.value.length && !u; f++) { if (!c[s.value[f]]) continue; l = c[s.value[f]] + "." + s.type.replace("rparen", "lparen"), isNaN(a[l]) && (a[l] = 0); switch (s.value[f]) { case "(": case "[": case "{": a[l]++; break; case ")": case "]": case "}": a[l]--, a[l] === -1 && (o = "bracket", u = !0) } } else s.type.indexOf("tag-name") !== -1 && (isNaN(a[s.value]) && (a[s.value] = 0), i.value === "<" ? a[s.value]++ : i.value === "</" && a[s.value]--, a[s.value] === -1 && (o = "tag", u = !0)); u || (i = s, s = r.stepForward(), f = 0) } while (s && !u); if (!o) return; var h, d; if (o === "bracket") { h = this.session.getBracketRange(n); if (!h) { h = new p(r.getCurrentTokenRow(), r.getCurrentTokenColumn() + f - 1, r.getCurrentTokenRow(), r.getCurrentTokenColumn() + f - 1), d = h.start; if (t || d.row === n.row && Math.abs(d.column - n.column) < 2) h = this.session.getBracketRange(d) } } else if (o === "tag") { if (!s || s.type.indexOf("tag-name") === -1) return; var v = s.value; h = new p(r.getCurrentTokenRow(), r.getCurrentTokenColumn() - 2, r.getCurrentTokenRow(), r.getCurrentTokenColumn() - 2); if (h.compare(n.row, n.column) === 0) { u = !1; do s = i, i = r.stepBackward(), i && (i.type.indexOf("tag-close") !== -1 && h.setEnd(r.getCurrentTokenRow(), r.getCurrentTokenColumn() + 1), s.value === v && s.type.indexOf("tag-name") !== -1 && (i.value === "<" ? a[v]++ : i.value === "</" && a[v]--, a[v] === 0 && (u = !0))); while (i && !u) } s && s.type.indexOf("tag-name") && (d = h.start, d.row == n.row && Math.abs(d.column - n.column) < 2 && (d = h.end)) } d = h && h.cursor || d, d && (e ? h && t ? this.selection.setRange(h) : h && h.isEqual(this.getSelectionRange()) ? this.clearSelection() : this.selection.selectTo(d.row, d.column) : this.selection.moveTo(d.row, d.column)) }, this.gotoLine = function (e, t, n) { this.selection.clearSelection(), this.session.unfold({ row: e - 1, column: t || 0 }), this.exitMultiSelectMode && this.exitMultiSelectMode(), this.moveCursorTo(e - 1, t || 0), this.isRowFullyVisible(e - 1) || this.scrollToLine(e - 1, !0, n) }, this.navigateTo = function (e, t) { this.selection.moveTo(e, t) }, this.navigateUp = function (e) { if (this.selection.isMultiLine() && !this.selection.isBackwards()) { var t = this.selection.anchor.getPosition(); return this.moveCursorToPosition(t) } this.selection.clearSelection(), this.selection.moveCursorBy(-e || -1, 0) }, this.navigateDown = function (e) { if (this.selection.isMultiLine() && this.selection.isBackwards()) { var t = this.selection.anchor.getPosition(); return this.moveCursorToPosition(t) } this.selection.clearSelection(), this.selection.moveCursorBy(e || 1, 0) }, this.navigateLeft = function (e) { if (!this.selection.isEmpty()) { var t = this.getSelectionRange().start; this.moveCursorToPosition(t) } else { e = e || 1; while (e--) this.selection.moveCursorLeft() } this.clearSelection() }, this.navigateRight = function (e) { if (!this.selection.isEmpty()) { var t = this.getSelectionRange().end; this.moveCursorToPosition(t) } else { e = e || 1; while (e--) this.selection.moveCursorRight() } this.clearSelection() }, this.navigateLineStart = function () { this.selection.moveCursorLineStart(), this.clearSelection() }, this.navigateLineEnd = function () { this.selection.moveCursorLineEnd(), this.clearSelection() }, this.navigateFileEnd = function () { this.selection.moveCursorFileEnd(), this.clearSelection() }, this.navigateFileStart = function () { this.selection.moveCursorFileStart(), this.clearSelection() }, this.navigateWordRight = function () { this.selection.moveCursorWordRight(), this.clearSelection() }, this.navigateWordLeft = function () { this.selection.moveCursorWordLeft(), this.clearSelection() }, this.replace = function (e, t) { t && this.$search.set(t); var n = this.$search.find(this.session), r = 0; return n ? (this.$tryReplace(n, e) && (r = 1), this.selection.setSelectionRange(n), this.renderer.scrollSelectionIntoView(n.start, n.end), r) : r }, this.replaceAll = function (e, t) { t && this.$search.set(t); var n = this.$search.findAll(this.session), r = 0; if (!n.length) return r; var i = this.getSelectionRange(); this.selection.moveTo(0, 0); for (var s = n.length - 1; s >= 0; --s)this.$tryReplace(n[s], e) && r++; return this.selection.setSelectionRange(i), r }, this.$tryReplace = function (e, t) { var n = this.session.getTextRange(e); return t = this.$search.replace(n, t), t !== null ? (e.end = this.session.replace(e, t), e) : null }, this.getLastSearchOptions = function () { return this.$search.getOptions() }, this.find = function (e, t, n) { t || (t = {}), typeof e == "string" || e instanceof RegExp ? t.needle = e : typeof e == "object" && r.mixin(t, e); var i = this.selection.getRange(); t.needle == null && (e = this.session.getTextRange(i) || this.$search.$options.needle, e || (i = this.session.getWordRange(i.start.row, i.start.column), e = this.session.getTextRange(i)), this.$search.set({ needle: e })), this.$search.set(t), t.start || this.$search.set({ start: i }); var s = this.$search.find(this.session); if (t.preventScroll) return s; if (s) return this.revealRange(s, n), s; t.backwards ? i.start = i.end : i.end = i.start, this.selection.setRange(i) }, this.findNext = function (e, t) { this.find({ skipCurrent: !0, backwards: !1 }, e, t) }, this.findPrevious = function (e, t) { this.find(e, { skipCurrent: !0, backwards: !0 }, t) }, this.revealRange = function (e, t) { this.session.unfold(e), this.selection.setSelectionRange(e); var n = this.renderer.scrollTop; this.renderer.scrollSelectionIntoView(e.start, e.end, .5), t !== !1 && this.renderer.animateScrolling(n) }, this.undo = function () { this.session.getUndoManager().undo(this.session), this.renderer.scrollCursorIntoView(null, .5) }, this.redo = function () { this.session.getUndoManager().redo(this.session), this.renderer.scrollCursorIntoView(null, .5) }, this.destroy = function () { this.$toDestroy && (this.$toDestroy.forEach(function (e) { e.destroy() }), this.$toDestroy = null), this.renderer.destroy(), this._signal("destroy", this), this.session && this.session.destroy(), this._$emitInputEvent && this._$emitInputEvent.cancel(), this.removeAllListeners() }, this.setAutoScrollEditorIntoView = function (e) { if (!e) return; var t, n = this, r = !1; this.$scrollAnchor || (this.$scrollAnchor = document.createElement("div")); var i = this.$scrollAnchor; i.style.cssText = "position:absolute", this.container.insertBefore(i, this.container.firstChild); var s = this.on("changeSelection", function () { r = !0 }), o = this.renderer.on("beforeRender", function () { r && (t = n.renderer.container.getBoundingClientRect()) }), u = this.renderer.on("afterRender", function () { if (r && t && (n.isFocused() || n.searchBox && n.searchBox.isFocused())) { var e = n.renderer, s = e.$cursorLayer.$pixelPos, o = e.layerConfig, u = s.top - o.offset; s.top >= 0 && u + t.top < 0 ? r = !0 : s.top < o.height && s.top + t.top + o.lineHeight > window.innerHeight ? r = !1 : r = null, r != null && (i.style.top = u + "px", i.style.left = s.left + "px", i.style.height = o.lineHeight + "px", i.scrollIntoView(r)), r = t = null } }); this.setAutoScrollEditorIntoView = function (e) { if (e) return; delete this.setAutoScrollEditorIntoView, this.off("changeSelection", s), this.renderer.off("afterRender", u), this.renderer.off("beforeRender", o) } }, this.$resetCursorStyle = function () { var e = this.$cursorStyle || "ace", t = this.renderer.$cursorLayer; if (!t) return; t.setSmoothBlinking(/smooth/.test(e)), t.isBlinking = !this.$readOnly && e != "wide", i.setCssClass(t.element, "ace_slim-cursors", /slim/.test(e)) }, this.prompt = function (e, t, n) { var r = this; g.loadModule("./ext/prompt", function (i) { i.prompt(r, e, t, n) }) } }.call(w.prototype), g.defineOptions(w.prototype, "editor", { selectionStyle: { set: function (e) { this.onSelectionChange(), this._signal("changeSelectionStyle", { data: e }) }, initialValue: "line" }, highlightActiveLine: { set: function () { this.$updateHighlightActiveLine() }, initialValue: !0 }, highlightSelectedWord: { set: function (e) { this.$onSelectionChange() }, initialValue: !0 }, readOnly: { set: function (e) { this.textInput.setReadOnly(e), this.$resetCursorStyle() }, initialValue: !1 }, copyWithEmptySelection: { set: function (e) { this.textInput.setCopyWithEmptySelection(e) }, initialValue: !1 }, cursorStyle: { set: function (e) { this.$resetCursorStyle() }, values: ["ace", "slim", "smooth", "wide"], initialValue: "ace" }, mergeUndoDeltas: { values: [!1, !0, "always"], initialValue: !0 }, behavioursEnabled: { initialValue: !0 }, wrapBehavioursEnabled: { initialValue: !0 }, enableAutoIndent: { initialValue: !0 }, autoScrollEditorIntoView: { set: function (e) { this.setAutoScrollEditorIntoView(e) } }, keyboardHandler: { set: function (e) { this.setKeyboardHandler(e) }, get: function () { return this.$keybindingId }, handlesSet: !0 }, value: { set: function (e) { this.session.setValue(e) }, get: function () { return this.getValue() }, handlesSet: !0, hidden: !0 }, session: { set: function (e) { this.setSession(e) }, get: function () { return this.session }, handlesSet: !0, hidden: !0 }, showLineNumbers: { set: function (e) { this.renderer.$gutterLayer.setShowLineNumbers(e), this.renderer.$loop.schedule(this.renderer.CHANGE_GUTTER), e && this.$relativeLineNumbers ? E.attach(this) : E.detach(this) }, initialValue: !0 }, relativeLineNumbers: { set: function (e) { this.$showLineNumbers && e ? E.attach(this) : E.detach(this) } }, placeholder: { set: function (e) { this.$updatePlaceholder || (this.$updatePlaceholder = function () { var e = this.session && (this.renderer.$composition || this.getValue()); if (e && this.renderer.placeholderNode) this.renderer.off("afterRender", this.$updatePlaceholder), i.removeCssClass(this.container, "ace_hasPlaceholder"), this.renderer.placeholderNode.remove(), this.renderer.placeholderNode = null; else if (!e && !this.renderer.placeholderNode) { this.renderer.on("afterRender", this.$updatePlaceholder), i.addCssClass(this.container, "ace_hasPlaceholder"); var t = i.createElement("div"); t.className = "ace_placeholder", t.textContent = this.$placeholder || "", this.renderer.placeholderNode = t, this.renderer.content.appendChild(this.renderer.placeholderNode) } else !e && this.renderer.placeholderNode && (this.renderer.placeholderNode.textContent = this.$placeholder || "") }.bind(this), this.on("input", this.$updatePlaceholder)), this.$updatePlaceholder() } }, hScrollBarAlwaysVisible: "renderer", vScrollBarAlwaysVisible: "renderer", highlightGutterLine: "renderer", animatedScroll: "renderer", showInvisibles: "renderer", showPrintMargin: "renderer", printMarginColumn: "renderer", printMargin: "renderer", fadeFoldWidgets: "renderer", showFoldWidgets: "renderer", displayIndentGuides: "renderer", showGutter: "renderer", fontSize: "renderer", fontFamily: "renderer", maxLines: "renderer", minLines: "renderer", scrollPastEnd: "renderer", fixedWidthGutter: "renderer", theme: "renderer", hasCssTransforms: "renderer", maxPixelHeight: "renderer", useTextareaForIME: "renderer", scrollSpeed: "$mouseHandler", dragDelay: "$mouseHandler", dragEnabled: "$mouseHandler", focusTimeout: "$mouseHandler", tooltipFollowsMouse: "$mouseHandler", firstLineNumber: "session", overwrite: "session", newLineMode: "session", useWorker: "session", useSoftTabs: "session", navigateWithinSoftTabs: "session", tabSize: "session", wrap: "session", indentedSoftWrap: "session", foldStyle: "session", mode: "session" }); var E = { getText: function (e, t) { return (Math.abs(e.selection.lead.row - t) || t + 1 + (t < 9 ? "\u00b7" : "")) + "" }, getWidth: function (e, t, n) { return Math.max(t.toString().length, (n.lastRow + 1).toString().length, 2) * n.characterWidth }, update: function (e, t) { t.renderer.$loop.schedule(t.renderer.CHANGE_GUTTER) }, attach: function (e) { e.renderer.$gutterLayer.$renderer = this, e.on("changeSelection", this.update), this.update(null, e) }, detach: function (e) { e.renderer.$gutterLayer.$renderer == this && (e.renderer.$gutterLayer.$renderer = null), e.off("changeSelection", this.update), this.update(null, e) } }; t.Editor = w }), define("ace/undomanager", ["require", "exports", "module", "ace/range"], function (e, t, n) { "use strict"; function i(e, t) { for (var n = t; n--;) { var r = e[n]; if (r && !r[0].ignore) { while (n < t - 1) { var i = d(e[n], e[n + 1]); e[n] = i[0], e[n + 1] = i[1], n++ } return !0 } } } function a(e) { var t = e.action == "insert", n = e.start, r = e.end, i = (r.row - n.row) * (t ? 1 : -1), s = (r.column - n.column) * (t ? 1 : -1); t && (r = n); for (var o in this.marks) { var a = this.marks[o], f = u(a, n); if (f < 0) continue; if (f === 0 && t) { if (a.bias != 1) { a.bias == -1; continue } f = 1 } var l = t ? f : u(a, r); if (l > 0) { a.row += i, a.column += a.row == r.row ? s : 0; continue } !t && l <= 0 && (a.row = n.row, a.column = n.column, l === 0 && (a.bias = 1)) } } function f(e) { return { row: e.row, column: e.column } } function l(e) { return { start: f(e.start), end: f(e.end), action: e.action, lines: e.lines.slice() } } function c(e) { e = e || this; if (Array.isArray(e)) return e.map(c).join("\n"); var t = ""; e.action ? (t = e.action == "insert" ? "+" : "-", t += "[" + e.lines + "]") : e.value && (Array.isArray(e.value) ? t = e.value.map(h).join("\n") : t = h(e.value)), e.start && (t += h(e)); if (e.id || e.rev) t += "  (" + (e.id || e.rev) + ")"; return t } function h(e) { return e.start.row + ":" + e.start.column + "=>" + e.end.row + ":" + e.end.column } function p(e, t) { var n = e.action == "insert", r = t.action == "insert"; if (n && r) if (o(t.start, e.end) >= 0) m(t, e, -1); else { if (!(o(t.start, e.start) <= 0)) return null; m(e, t, 1) } else if (n && !r) if (o(t.start, e.end) >= 0) m(t, e, -1); else { if (!(o(t.end, e.start) <= 0)) return null; m(e, t, -1) } else if (!n && r) if (o(t.start, e.start) >= 0) m(t, e, 1); else { if (!(o(t.start, e.start) <= 0)) return null; m(e, t, 1) } else if (!n && !r) if (o(t.start, e.start) >= 0) m(t, e, 1); else { if (!(o(t.end, e.start) <= 0)) return null; m(e, t, -1) } return [t, e] } function d(e, t) { for (var n = e.length; n--;)for (var r = 0; r < t.length; r++)if (!p(e[n], t[r])) { while (n < e.length) { while (r--) p(t[r], e[n]); r = t.length, n++ } return [e, t] } return e.selectionBefore = t.selectionBefore = e.selectionAfter = t.selectionAfter = null, [t, e] } function v(e, t) { var n = e.action == "insert", r = t.action == "insert"; if (n && r) o(e.start, t.start) < 0 ? m(t, e, 1) : m(e, t, 1); else if (n && !r) o(e.start, t.end) >= 0 ? m(e, t, -1) : o(e.start, t.start) <= 0 ? m(t, e, 1) : (m(e, s.fromPoints(t.start, e.start), -1), m(t, e, 1)); else if (!n && r) o(t.start, e.end) >= 0 ? m(t, e, -1) : o(t.start, e.start) <= 0 ? m(e, t, 1) : (m(t, s.fromPoints(e.start, t.start), -1), m(e, t, 1)); else if (!n && !r) if (o(t.start, e.end) >= 0) m(t, e, -1); else { if (!(o(t.end, e.start) <= 0)) { var i, u; return o(e.start, t.start) < 0 && (i = e, e = y(e, t.start)), o(e.end, t.end) > 0 && (u = y(e, t.end)), g(t.end, e.start, e.end, -1), u && !i && (e.lines = u.lines, e.start = u.start, e.end = u.end, u = e), [t, i, u].filter(Boolean) } m(e, t, -1) } return [t, e] } function m(e, t, n) { g(e.start, t.start, t.end, n), g(e.end, t.start, t.end, n) } function g(e, t, n, r) { e.row == (r == 1 ? t : n).row && (e.column += r * (n.column - t.column)), e.row += r * (n.row - t.row) } function y(e, t) { var n = e.lines, r = e.end; e.end = f(t); var i = e.end.row - e.start.row, s = n.splice(i, n.length), o = i ? t.column : t.column - e.start.column; n.push(s[0].substring(0, o)), s[0] = s[0].substr(o); var u = { start: f(t), end: r, lines: s, action: e.action }; return u } function b(e, t) { t = l(t); for (var n = e.length; n--;) { var r = e[n]; for (var i = 0; i < r.length; i++) { var s = r[i], o = v(s, t); t = o[0], o.length != 2 && (o[2] ? (r.splice(i + 1, 1, o[1], o[2]), i++) : o[1] || (r.splice(i, 1), i--)) } r.length || e.splice(n, 1) } return e } function w(e, t) { for (var n = 0; n < t.length; n++) { var r = t[n]; for (var i = 0; i < r.length; i++)b(e, r[i]) } } var r = function () { this.$maxRev = 0, this.$fromUndo = !1, this.reset() }; (function () { this.addSession = function (e) { this.$session = e }, this.add = function (e, t, n) { if (this.$fromUndo) return; if (e == this.$lastDelta) return; this.$keepRedoStack || (this.$redoStack.length = 0); if (t === !1 || !this.lastDeltas) this.lastDeltas = [], this.$undoStack.push(this.lastDeltas), e.id = this.$rev = ++this.$maxRev; if (e.action == "remove" || e.action == "insert") this.$lastDelta = e; this.lastDeltas.push(e) }, this.addSelection = function (e, t) { this.selections.push({ value: e, rev: t || this.$rev }) }, this.startNewGroup = function () { return this.lastDeltas = null, this.$rev }, this.markIgnored = function (e, t) { t == null && (t = this.$rev + 1); var n = this.$undoStack; for (var r = n.length; r--;) { var i = n[r][0]; if (i.id <= e) break; i.id < t && (i.ignore = !0) } this.lastDeltas = null }, this.getSelection = function (e, t) { var n = this.selections; for (var r = n.length; r--;) { var i = n[r]; if (i.rev < e) return t && (i = n[r + 1]), i } }, this.getRevision = function () { return this.$rev }, this.getDeltas = function (e, t) { t == null && (t = this.$rev + 1); var n = this.$undoStack, r = null, i = 0; for (var s = n.length; s--;) { var o = n[s][0]; o.id < t && !r && (r = s + 1); if (o.id <= e) { i = s + 1; break } } return n.slice(i, r) }, this.getChangedRanges = function (e, t) { t == null && (t = this.$rev + 1) }, this.getChangedLines = function (e, t) { t == null && (t = this.$rev + 1) }, this.undo = function (e, t) { this.lastDeltas = null; var n = this.$undoStack; if (!i(n, n.length)) return; e || (e = this.$session), this.$redoStackBaseRev !== this.$rev && this.$redoStack.length && (this.$redoStack = []), this.$fromUndo = !0; var r = n.pop(), s = null; return r && (s = e.undoChanges(r, t), this.$redoStack.push(r), this.$syncRev()), this.$fromUndo = !1, s }, this.redo = function (e, t) { this.lastDeltas = null, e || (e = this.$session), this.$fromUndo = !0; if (this.$redoStackBaseRev != this.$rev) { var n = this.getDeltas(this.$redoStackBaseRev, this.$rev + 1); w(this.$redoStack, n), this.$redoStackBaseRev = this.$rev, this.$redoStack.forEach(function (e) { e[0].id = ++this.$maxRev }, this) } var r = this.$redoStack.pop(), i = null; return r && (i = e.redoChanges(r, t), this.$undoStack.push(r), this.$syncRev()), this.$fromUndo = !1, i }, this.$syncRev = function () { var e = this.$undoStack, t = e[e.length - 1], n = t && t[0].id || 0; this.$redoStackBaseRev = n, this.$rev = n }, this.reset = function () { this.lastDeltas = null, this.$lastDelta = null, this.$undoStack = [], this.$redoStack = [], this.$rev = 0, this.mark = 0, this.$redoStackBaseRev = this.$rev, this.selections = [] }, this.canUndo = function () { return this.$undoStack.length > 0 }, this.canRedo = function () { return this.$redoStack.length > 0 }, this.bookmark = function (e) { e == undefined && (e = this.$rev), this.mark = e }, this.isAtBookmark = function () { return this.$rev === this.mark }, this.toJSON = function () { }, this.fromJSON = function () { }, this.hasUndo = this.canUndo, this.hasRedo = this.canRedo, this.isClean = this.isAtBookmark, this.markClean = this.bookmark, this.$prettyPrint = function (e) { return e ? c(e) : c(this.$undoStack) + "\n---\n" + c(this.$redoStack) } }).call(r.prototype); var s = e("./range").Range, o = s.comparePoints, u = s.comparePoints; t.UndoManager = r }), define("ace/layer/lines", ["require", "exports", "module", "ace/lib/dom"], function (e, t, n) { "use strict"; var r = e("../lib/dom"), i = function (e, t) { this.element = e, this.canvasHeight = t || 5e5, this.element.style.height = this.canvasHeight * 2 + "px", this.cells = [], this.cellCache = [], this.$offsetCoefficient = 0 }; (function () { this.moveContainer = function (e) { r.translate(this.element, 0, -(e.firstRowScreen * e.lineHeight % this.canvasHeight) - e.offset * this.$offsetCoefficient) }, this.pageChanged = function (e, t) { return Math.floor(e.firstRowScreen * e.lineHeight / this.canvasHeight) !== Math.floor(t.firstRowScreen * t.lineHeight / this.canvasHeight) }, this.computeLineTop = function (e, t, n) { var r = t.firstRowScreen * t.lineHeight, i = Math.floor(r / this.canvasHeight), s = n.documentToScreenRow(e, 0) * t.lineHeight; return s - i * this.canvasHeight }, this.computeLineHeight = function (e, t, n) { return t.lineHeight * n.getRowLineCount(e) }, this.getLength = function () { return this.cells.length }, this.get = function (e) { return this.cells[e] }, this.shift = function () { this.$cacheCell(this.cells.shift()) }, this.pop = function () { this.$cacheCell(this.cells.pop()) }, this.push = function (e) { if (Array.isArray(e)) { this.cells.push.apply(this.cells, e); var t = r.createFragment(this.element); for (var n = 0; n < e.length; n++)t.appendChild(e[n].element); this.element.appendChild(t) } else this.cells.push(e), this.element.appendChild(e.element) }, this.unshift = function (e) { if (Array.isArray(e)) { this.cells.unshift.apply(this.cells, e); var t = r.createFragment(this.element); for (var n = 0; n < e.length; n++)t.appendChild(e[n].element); this.element.firstChild ? this.element.insertBefore(t, this.element.firstChild) : this.element.appendChild(t) } else this.cells.unshift(e), this.element.insertAdjacentElement("afterbegin", e.element) }, this.last = function () { return this.cells.length ? this.cells[this.cells.length - 1] : null }, this.$cacheCell = function (e) { if (!e) return; e.element.remove(), this.cellCache.push(e) }, this.createCell = function (e, t, n, i) { var s = this.cellCache.pop(); if (!s) { var o = r.createElement("div"); i && i(o), this.element.appendChild(o), s = { element: o, text: "", row: e } } return s.row = e, s } }).call(i.prototype), t.Lines = i }), define("ace/layer/gutter", ["require", "exports", "module", "ace/lib/dom", "ace/lib/oop", "ace/lib/lang", "ace/lib/event_emitter", "ace/layer/lines"], function (e, t, n) { "use strict"; function f(e) { var t = document.createTextNode(""); e.appendChild(t); var n = r.createElement("span"); return e.appendChild(n), e } var r = e("../lib/dom"), i = e("../lib/oop"), s = e("../lib/lang"), o = e("../lib/event_emitter").EventEmitter, u = e("./lines").Lines, a = function (e) { this.element = r.createElement("div"), this.element.className = "ace_layer ace_gutter-layer", e.appendChild(this.element), this.setShowFoldWidgets(this.$showFoldWidgets), this.gutterWidth = 0, this.$annotations = [], this.$updateAnnotations = this.$updateAnnotations.bind(this), this.$lines = new u(this.element), this.$lines.$offsetCoefficient = 1 }; (function () { i.implement(this, o), this.setSession = function (e) { this.session && this.session.off("change", this.$updateAnnotations), this.session = e, e && e.on("change", this.$updateAnnotations) }, this.addGutterDecoration = function (e, t) { window.console && console.warn && console.warn("deprecated use session.addGutterDecoration"), this.session.addGutterDecoration(e, t) }, this.removeGutterDecoration = function (e, t) { window.console && console.warn && console.warn("deprecated use session.removeGutterDecoration"), this.session.removeGutterDecoration(e, t) }, this.setAnnotations = function (e) { this.$annotations = []; for (var t = 0; t < e.length; t++) { var n = e[t], r = n.row, i = this.$annotations[r]; i || (i = this.$annotations[r] = { text: [] }); var o = n.text; o = o ? s.escapeHTML(o) : n.html || "", i.text.indexOf(o) === -1 && i.text.push(o); var u = n.type; u == "error" ? i.className = " ace_error" : u == "warning" && i.className != " ace_error" ? i.className = " ace_warning" : u == "info" && !i.className && (i.className = " ace_info") } }, this.$updateAnnotations = function (e) { if (!this.$annotations.length) return; var t = e.start.row, n = e.end.row - t; if (n !== 0) if (e.action == "remove") this.$annotations.splice(t, n + 1, null); else { var r = new Array(n + 1); r.unshift(t, 1), this.$annotations.splice.apply(this.$annotations, r) } }, this.update = function (e) { this.config = e; var t = this.session, n = e.firstRow, r = Math.min(e.lastRow + e.gutterOffset, t.getLength() - 1); this.oldLastRow = r, this.config = e, this.$lines.moveContainer(e), this.$updateCursorRow(); var i = t.getNextFoldLine(n), s = i ? i.start.row : Infinity, o = null, u = -1, a = n; for (; ;) { a > s && (a = i.end.row + 1, i = t.getNextFoldLine(a, i), s = i ? i.start.row : Infinity); if (a > r) { while (this.$lines.getLength() > u + 1) this.$lines.pop(); break } o = this.$lines.get(++u), o ? o.row = a : (o = this.$lines.createCell(a, e, this.session, f), this.$lines.push(o)), this.$renderCell(o, e, i, a), a++ } this._signal("afterRender"), this.$updateGutterWidth(e) }, this.$updateGutterWidth = function (e) { var t = this.session, n = t.gutterRenderer || this.$renderer, r = t.$firstLineNumber, i = this.$lines.last() ? this.$lines.last().text : ""; if (this.$fixedWidth || t.$useWrapMode) i = t.getLength() + r - 1; var s = n ? n.getWidth(t, i, e) : i.toString().length * e.characterWidth, o = this.$padding || this.$computePadding(); s += o.left + o.right, s !== this.gutterWidth && !isNaN(s) && (this.gutterWidth = s, this.element.parentNode.style.width = this.element.style.width = Math.ceil(this.gutterWidth) + "px", this._signal("changeGutterWidth", s)) }, this.$updateCursorRow = function () { if (!this.$highlightGutterLine) return; var e = this.session.selection.getCursor(); if (this.$cursorRow === e.row) return; this.$cursorRow = e.row }, this.updateLineHighlight = function () { if (!this.$highlightGutterLine) return; var e = this.session.selection.cursor.row; this.$cursorRow = e; if (this.$cursorCell && this.$cursorCell.row == e) return; this.$cursorCell && (this.$cursorCell.element.className = this.$cursorCell.element.className.replace("ace_gutter-active-line ", "")); var t = this.$lines.cells; this.$cursorCell = null; for (var n = 0; n < t.length; n++) { var r = t[n]; if (r.row >= this.$cursorRow) { if (r.row > this.$cursorRow) { var i = this.session.getFoldLine(this.$cursorRow); if (!(n > 0 && i && i.start.row == t[n - 1].row)) break; r = t[n - 1] } r.element.className = "ace_gutter-active-line " + r.element.className, this.$cursorCell = r; break } } }, this.scrollLines = function (e) { var t = this.config; this.config = e, this.$updateCursorRow(); if (this.$lines.pageChanged(t, e)) return this.update(e); this.$lines.moveContainer(e); var n = Math.min(e.lastRow + e.gutterOffset, this.session.getLength() - 1), r = this.oldLastRow; this.oldLastRow = n; if (!t || r < e.firstRow) return this.update(e); if (n < t.firstRow) return this.update(e); if (t.firstRow < e.firstRow) for (var i = this.session.getFoldedRowCount(t.firstRow, e.firstRow - 1); i > 0; i--)this.$lines.shift(); if (r > n) for (var i = this.session.getFoldedRowCount(n + 1, r); i > 0; i--)this.$lines.pop(); e.firstRow < t.firstRow && this.$lines.unshift(this.$renderLines(e, e.firstRow, t.firstRow - 1)), n > r && this.$lines.push(this.$renderLines(e, r + 1, n)), this.updateLineHighlight(), this._signal("afterRender"), this.$updateGutterWidth(e) }, this.$renderLines = function (e, t, n) { var r = [], i = t, s = this.session.getNextFoldLine(i), o = s ? s.start.row : Infinity; for (; ;) { i > o && (i = s.end.row + 1, s = this.session.getNextFoldLine(i, s), o = s ? s.start.row : Infinity); if (i > n) break; var u = this.$lines.createCell(i, e, this.session, f); this.$renderCell(u, e, s, i), r.push(u), i++ } return r }, this.$renderCell = function (e, t, n, i) { var s = e.element, o = this.session, u = s.childNodes[0], a = s.childNodes[1], f = o.$firstLineNumber, l = o.$breakpoints, c = o.$decorations, h = o.gutterRenderer || this.$renderer, p = this.$showFoldWidgets && o.foldWidgets, d = n ? n.start.row : Number.MAX_VALUE, v = "ace_gutter-cell "; this.$highlightGutterLine && (i == this.$cursorRow || n && i < this.$cursorRow && i >= d && this.$cursorRow <= n.end.row) && (v += "ace_gutter-active-line ", this.$cursorCell != e && (this.$cursorCell && (this.$cursorCell.element.className = this.$cursorCell.element.className.replace("ace_gutter-active-line ", "")), this.$cursorCell = e)), l[i] && (v += l[i]), c[i] && (v += c[i]), this.$annotations[i] && (v += this.$annotations[i].className), s.className != v && (s.className = v); if (p) { var m = p[i]; m == null && (m = p[i] = o.getFoldWidget(i)) } if (m) { var v = "ace_fold-widget ace_" + m; m == "start" && i == d && i < n.end.row ? v += " ace_closed" : v += " ace_open", a.className != v && (a.className = v); var g = t.lineHeight + "px"; r.setStyle(a.style, "height", g), r.setStyle(a.style, "display", "inline-block") } else a && r.setStyle(a.style, "display", "none"); var y = (h ? h.getText(o, i) : i + f).toString(); return y !== u.data && (u.data = y), r.setStyle(e.element.style, "height", this.$lines.computeLineHeight(i, t, o) + "px"), r.setStyle(e.element.style, "top", this.$lines.computeLineTop(i, t, o) + "px"), e.text = y, e }, this.$fixedWidth = !1, this.$highlightGutterLine = !0, this.$renderer = "", this.setHighlightGutterLine = function (e) { this.$highlightGutterLine = e }, this.$showLineNumbers = !0, this.$renderer = "", this.setShowLineNumbers = function (e) { this.$renderer = !e && { getWidth: function () { return 0 }, getText: function () { return "" } } }, this.getShowLineNumbers = function () { return this.$showLineNumbers }, this.$showFoldWidgets = !0, this.setShowFoldWidgets = function (e) { e ? r.addCssClass(this.element, "ace_folding-enabled") : r.removeCssClass(this.element, "ace_folding-enabled"), this.$showFoldWidgets = e, this.$padding = null }, this.getShowFoldWidgets = function () { return this.$showFoldWidgets }, this.$computePadding = function () { if (!this.element.firstChild) return { left: 0, right: 0 }; var e = r.computedStyle(this.element.firstChild); return this.$padding = {}, this.$padding.left = (parseInt(e.borderLeftWidth) || 0) + (parseInt(e.paddingLeft) || 0) + 1, this.$padding.right = (parseInt(e.borderRightWidth) || 0) + (parseInt(e.paddingRight) || 0), this.$padding }, this.getRegion = function (e) { var t = this.$padding || this.$computePadding(), n = this.element.getBoundingClientRect(); if (e.x < t.left + n.left) return "markers"; if (this.$showFoldWidgets && e.x > n.right - t.right) return "foldWidgets" } }).call(a.prototype), t.Gutter = a }), define("ace/layer/marker", ["require", "exports", "module", "ace/range", "ace/lib/dom"], function (e, t, n) { "use strict"; var r = e("../range").Range, i = e("../lib/dom"), s = function (e) { this.element = i.createElement("div"), this.element.className = "ace_layer ace_marker-layer", e.appendChild(this.element) }; (function () { function e(e, t, n, r) { return (e ? 1 : 0) | (t ? 2 : 0) | (n ? 4 : 0) | (r ? 8 : 0) } this.$padding = 0, this.setPadding = function (e) { this.$padding = e }, this.setSession = function (e) { this.session = e }, this.setMarkers = function (e) { this.markers = e }, this.elt = function (e, t) { var n = this.i != -1 && this.element.childNodes[this.i]; n ? this.i++ : (n = document.createElement("div"), this.element.appendChild(n), this.i = -1), n.style.cssText = t, n.className = e }, this.update = function (e) { if (!e) return; this.config = e, this.i = 0; var t; for (var n in this.markers) { var r = this.markers[n]; if (!r.range) { r.update(t, this, this.session, e); continue } var i = r.range.clipRows(e.firstRow, e.lastRow); if (i.isEmpty()) continue; i = i.toScreenRange(this.session); if (r.renderer) { var s = this.$getTop(i.start.row, e), o = this.$padding + i.start.column * e.characterWidth; r.renderer(t, i, o, s, e) } else r.type == "fullLine" ? this.drawFullLineMarker(t, i, r.clazz, e) : r.type == "screenLine" ? this.drawScreenLineMarker(t, i, r.clazz, e) : i.isMultiLine() ? r.type == "text" ? this.drawTextMarker(t, i, r.clazz, e) : this.drawMultiLineMarker(t, i, r.clazz, e) : this.drawSingleLineMarker(t, i, r.clazz + " ace_start" + " ace_br15", e) } if (this.i != -1) while (this.i < this.element.childElementCount) this.element.removeChild(this.element.lastChild) }, this.$getTop = function (e, t) { return (e - t.firstRowScreen) * t.lineHeight }, this.drawTextMarker = function (t, n, i, s, o) { var u = this.session, a = n.start.row, f = n.end.row, l = a, c = 0, h = 0, p = u.getScreenLastRowColumn(l), d = new r(l, n.start.column, l, h); for (; l <= f; l++)d.start.row = d.end.row = l, d.start.column = l == a ? n.start.column : u.getRowWrapIndent(l), d.end.column = p, c = h, h = p, p = l + 1 < f ? u.getScreenLastRowColumn(l + 1) : l == f ? 0 : n.end.column, this.drawSingleLineMarker(t, d, i + (l == a ? " ace_start" : "") + " ace_br" + e(l == a || l == a + 1 && n.start.column, c < h, h > p, l == f), s, l == f ? 0 : 1, o) }, this.drawMultiLineMarker = function (e, t, n, r, i) { var s = this.$padding, o = r.lineHeight, u = this.$getTop(t.start.row, r), a = s + t.start.column * r.characterWidth; i = i || ""; if (this.session.$bidiHandler.isBidiRow(t.start.row)) { var f = t.clone(); f.end.row = f.start.row, f.end.column = this.session.getLine(f.start.row).length, this.drawBidiSingleLineMarker(e, f, n + " ace_br1 ace_start", r, null, i) } else this.elt(n + " ace_br1 ace_start", "height:" + o + "px;" + "right:0;" + "top:" + u + "px;left:" + a + "px;" + (i || "")); if (this.session.$bidiHandler.isBidiRow(t.end.row)) { var f = t.clone(); f.start.row = f.end.row, f.start.column = 0, this.drawBidiSingleLineMarker(e, f, n + " ace_br12", r, null, i) } else { u = this.$getTop(t.end.row, r); var l = t.end.column * r.characterWidth; this.elt(n + " ace_br12", "height:" + o + "px;" + "width:" + l + "px;" + "top:" + u + "px;" + "left:" + s + "px;" + (i || "")) } o = (t.end.row - t.start.row - 1) * r.lineHeight; if (o <= 0) return; u = this.$getTop(t.start.row + 1, r); var c = (t.start.column ? 1 : 0) | (t.end.column ? 0 : 8); this.elt(n + (c ? " ace_br" + c : ""), "height:" + o + "px;" + "right:0;" + "top:" + u + "px;" + "left:" + s + "px;" + (i || "")) }, this.drawSingleLineMarker = function (e, t, n, r, i, s) { if (this.session.$bidiHandler.isBidiRow(t.start.row)) return this.drawBidiSingleLineMarker(e, t, n, r, i, s); var o = r.lineHeight, u = (t.end.column + (i || 0) - t.start.column) * r.characterWidth, a = this.$getTop(t.start.row, r), f = this.$padding + t.start.column * r.characterWidth; this.elt(n, "height:" + o + "px;" + "width:" + u + "px;" + "top:" + a + "px;" + "left:" + f + "px;" + (s || "")) }, this.drawBidiSingleLineMarker = function (e, t, n, r, i, s) { var o = r.lineHeight, u = this.$getTop(t.start.row, r), a = this.$padding, f = this.session.$bidiHandler.getSelections(t.start.column, t.end.column); f.forEach(function (e) { this.elt(n, "height:" + o + "px;" + "width:" + e.width + (i || 0) + "px;" + "top:" + u + "px;" + "left:" + (a + e.left) + "px;" + (s || "")) }, this) }, this.drawFullLineMarker = function (e, t, n, r, i) { var s = this.$getTop(t.start.row, r), o = r.lineHeight; t.start.row != t.end.row && (o += this.$getTop(t.end.row, r) - s), this.elt(n, "height:" + o + "px;" + "top:" + s + "px;" + "left:0;right:0;" + (i || "")) }, this.drawScreenLineMarker = function (e, t, n, r, i) { var s = this.$getTop(t.start.row, r), o = r.lineHeight; this.elt(n, "height:" + o + "px;" + "top:" + s + "px;" + "left:0;right:0;" + (i || "")) } }).call(s.prototype), t.Marker = s }), define("ace/layer/text", ["require", "exports", "module", "ace/lib/oop", "ace/lib/dom", "ace/lib/lang", "ace/layer/lines", "ace/lib/event_emitter"], function (e, t, n) { "use strict"; var r = e("../lib/oop"), i = e("../lib/dom"), s = e("../lib/lang"), o = e("./lines").Lines, u = e("../lib/event_emitter").EventEmitter, a = function (e) { this.dom = i, this.element = this.dom.createElement("div"), this.element.className = "ace_layer ace_text-layer", e.appendChild(this.element), this.$updateEolChar = this.$updateEolChar.bind(this), this.$lines = new o(this.element) }; (function () { r.implement(this, u), this.EOF_CHAR = "\u00b6", this.EOL_CHAR_LF = "\u00ac", this.EOL_CHAR_CRLF = "\u00a4", this.EOL_CHAR = this.EOL_CHAR_LF, this.TAB_CHAR = "\u2014", this.SPACE_CHAR = "\u00b7", this.$padding = 0, this.MAX_LINE_LENGTH = 1e4, this.$updateEolChar = function () { var e = this.session.doc, t = e.getNewLineCharacter() == "\n" && e.getNewLineMode() != "windows", n = t ? this.EOL_CHAR_LF : this.EOL_CHAR_CRLF; if (this.EOL_CHAR != n) return this.EOL_CHAR = n, !0 }, this.setPadding = function (e) { this.$padding = e, this.element.style.margin = "0 " + e + "px" }, this.getLineHeight = function () { return this.$fontMetrics.$characterSize.height || 0 }, this.getCharacterWidth = function () { return this.$fontMetrics.$characterSize.width || 0 }, this.$setFontMetrics = function (e) { this.$fontMetrics = e, this.$fontMetrics.on("changeCharacterSize", function (e) { this._signal("changeCharacterSize", e) }.bind(this)), this.$pollSizeChanges() }, this.checkForSizeChanges = function () { this.$fontMetrics.checkForSizeChanges() }, this.$pollSizeChanges = function () { return this.$pollSizeChangesTimer = this.$fontMetrics.$pollSizeChanges() }, this.setSession = function (e) { this.session = e, e && this.$computeTabString() }, this.showInvisibles = !1, this.showSpaces = !1, this.showTabs = !1, this.showEOL = !1, this.setShowInvisibles = function (e) { return this.showInvisibles == e ? !1 : (this.showInvisibles = e, typeof e == "string" ? (this.showSpaces = /tab/i.test(e), this.showTabs = /space/i.test(e), this.showEOL = /eol/i.test(e)) : this.showSpaces = this.showTabs = this.showEOL = e, this.$computeTabString(), !0) }, this.displayIndentGuides = !0, this.setDisplayIndentGuides = function (e) { return this.displayIndentGuides == e ? !1 : (this.displayIndentGuides = e, this.$computeTabString(), !0) }, this.$tabStrings = [], this.onChangeTabSize = this.$computeTabString = function () { var e = this.session.getTabSize(); this.tabSize = e; var t = this.$tabStrings = [0]; for (var n = 1; n < e + 1; n++)if (this.showTabs) { var r = this.dom.createElement("span"); r.className = "ace_invisible ace_invisible_tab", r.textContent = s.stringRepeat(this.TAB_CHAR, n), t.push(r) } else t.push(this.dom.createTextNode(s.stringRepeat(" ", n), this.element)); if (this.displayIndentGuides) { this.$indentGuideRe = /\s\S| \t|\t |\s$/; var i = "ace_indent-guide", o = this.showSpaces ? " ace_invisible ace_invisible_space" : "", u = this.showSpaces ? s.stringRepeat(this.SPACE_CHAR, this.tabSize) : s.stringRepeat(" ", this.tabSize), a = this.showTabs ? " ace_invisible ace_invisible_tab" : "", f = this.showTabs ? s.stringRepeat(this.TAB_CHAR, this.tabSize) : u, r = this.dom.createElement("span"); r.className = i + o, r.textContent = u, this.$tabStrings[" "] = r; var r = this.dom.createElement("span"); r.className = i + a, r.textContent = f, this.$tabStrings["  "] = r } }, this.updateLines = function (e, t, n) { if (this.config.lastRow != e.lastRow || this.config.firstRow != e.firstRow) return this.update(e); this.config = e; var r = Math.max(t, e.firstRow), i = Math.min(n, e.lastRow), s = this.element.childNodes, o = 0; for (var u = e.firstRow; u < r; u++) { var a = this.session.getFoldLine(u); if (a) { if (a.containsRow(r)) { r = a.start.row; break } u = a.end.row } o++ } var f = !1, u = r, a = this.session.getNextFoldLine(u), l = a ? a.start.row : Infinity; for (; ;) { u > l && (u = a.end.row + 1, a = this.session.getNextFoldLine(u, a), l = a ? a.start.row : Infinity); if (u > i) break; var c = s[o++]; if (c) { this.dom.removeChildren(c), this.$renderLine(c, u, u == l ? a : !1), f && (c.style.top = this.$lines.computeLineTop(u, e, this.session) + "px"); var h = e.lineHeight * this.session.getRowLength(u) + "px"; c.style.height != h && (f = !0, c.style.height = h) } u++ } if (f) while (o < this.$lines.cells.length) { var p = this.$lines.cells[o++]; p.element.style.top = this.$lines.computeLineTop(p.row, e, this.session) + "px" } }, this.scrollLines = function (e) { var t = this.config; this.config = e; if (this.$lines.pageChanged(t, e)) return this.update(e); this.$lines.moveContainer(e); var n = e.lastRow, r = t ? t.lastRow : -1; if (!t || r < e.firstRow) return this.update(e); if (n < t.firstRow) return this.update(e); if (!t || t.lastRow < e.firstRow) return this.update(e); if (e.lastRow < t.firstRow) return this.update(e); if (t.firstRow < e.firstRow) for (var i = this.session.getFoldedRowCount(t.firstRow, e.firstRow - 1); i > 0; i--)this.$lines.shift(); if (t.lastRow > e.lastRow) for (var i = this.session.getFoldedRowCount(e.lastRow + 1, t.lastRow); i > 0; i--)this.$lines.pop(); e.firstRow < t.firstRow && this.$lines.unshift(this.$renderLinesFragment(e, e.firstRow, t.firstRow - 1)), e.lastRow > t.lastRow && this.$lines.push(this.$renderLinesFragment(e, t.lastRow + 1, e.lastRow)) }, this.$renderLinesFragment = function (e, t, n) { var r = [], s = t, o = this.session.getNextFoldLine(s), u = o ? o.start.row : Infinity; for (; ;) { s > u && (s = o.end.row + 1, o = this.session.getNextFoldLine(s, o), u = o ? o.start.row : Infinity); if (s > n) break; var a = this.$lines.createCell(s, e, this.session), f = a.element; this.dom.removeChildren(f), i.setStyle(f.style, "height", this.$lines.computeLineHeight(s, e, this.session) + "px"), i.setStyle(f.style, "top", this.$lines.computeLineTop(s, e, this.session) + "px"), this.$renderLine(f, s, s == u ? o : !1), this.$useLineGroups() ? f.className = "ace_line_group" : f.className = "ace_line", r.push(a), s++ } return r }, this.update = function (e) { this.$lines.moveContainer(e), this.config = e; var t = e.firstRow, n = e.lastRow, r = this.$lines; while (r.getLength()) r.pop(); r.push(this.$renderLinesFragment(e, t, n)) }, this.$textToken = { text: !0, rparen: !0, lparen: !0 }, this.$renderToken = function (e, t, n, r) { var i = this, o = /(\t)|( +)|([\x00-\x1f\x80-\xa0\xad\u1680\u180E\u2000-\u200f\u2028\u2029\u202F\u205F\uFEFF\uFFF9-\uFFFC]+)|(\u3000)|([\u1100-\u115F\u11A3-\u11A7\u11FA-\u11FF\u2329-\u232A\u2E80-\u2E99\u2E9B-\u2EF3\u2F00-\u2FD5\u2FF0-\u2FFB\u3001-\u303E\u3041-\u3096\u3099-\u30FF\u3105-\u312D\u3131-\u318E\u3190-\u31BA\u31C0-\u31E3\u31F0-\u321E\u3220-\u3247\u3250-\u32FE\u3300-\u4DBF\u4E00-\uA48C\uA490-\uA4C6\uA960-\uA97C\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFAFF\uFE10-\uFE19\uFE30-\uFE52\uFE54-\uFE66\uFE68-\uFE6B\uFF01-\uFF60\uFFE0-\uFFE6]|[\uD800-\uDBFF][\uDC00-\uDFFF])/g, u = this.dom.createFragment(this.element), a, f = 0; while (a = o.exec(r)) { var l = a[1], c = a[2], h = a[3], p = a[4], d = a[5]; if (!i.showSpaces && c) continue; var v = f != a.index ? r.slice(f, a.index) : ""; f = a.index + a[0].length, v && u.appendChild(this.dom.createTextNode(v, this.element)); if (l) { var m = i.session.getScreenTabSize(t + a.index); u.appendChild(i.$tabStrings[m].cloneNode(!0)), t += m - 1 } else if (c) if (i.showSpaces) { var g = this.dom.createElement("span"); g.className = "ace_invisible ace_invisible_space", g.textContent = s.stringRepeat(i.SPACE_CHAR, c.length), u.appendChild(g) } else u.appendChild(this.com.createTextNode(c, this.element)); else if (h) { var g = this.dom.createElement("span"); g.className = "ace_invisible ace_invisible_space ace_invalid", g.textContent = s.stringRepeat(i.SPACE_CHAR, h.length), u.appendChild(g) } else if (p) { t += 1; var g = this.dom.createElement("span"); g.style.width = i.config.characterWidth * 2 + "px", g.className = i.showSpaces ? "ace_cjk ace_invisible ace_invisible_space" : "ace_cjk", g.textContent = i.showSpaces ? i.SPACE_CHAR : p, u.appendChild(g) } else if (d) { t += 1; var g = this.dom.createElement("span"); g.style.width = i.config.characterWidth * 2 + "px", g.className = "ace_cjk", g.textContent = d, u.appendChild(g) } } u.appendChild(this.dom.createTextNode(f ? r.slice(f) : r, this.element)); if (!this.$textToken[n.type]) { var y = "ace_" + n.type.replace(/\./g, " ace_"), g = this.dom.createElement("span"); n.type == "fold" && (g.style.width = n.value.length * this.config.characterWidth + "px"), g.className = y, g.appendChild(u), e.appendChild(g) } else e.appendChild(u); return t + r.length }, this.renderIndentGuide = function (e, t, n) { var r = t.search(this.$indentGuideRe); if (r <= 0 || r >= n) return t; if (t[0] == " ") { r -= r % this.tabSize; var i = r / this.tabSize; for (var s = 0; s < i; s++)e.appendChild(this.$tabStrings[" "].cloneNode(!0)); return t.substr(r) } if (t[0] == "  ") { for (var s = 0; s < r; s++)e.appendChild(this.$tabStrings["  "].cloneNode(!0)); return t.substr(r) } return t }, this.$createLineElement = function (e) { var t = this.dom.createElement("div"); return t.className = "ace_line", t.style.height = this.config.lineHeight + "px", t }, this.$renderWrappedLine = function (e, t, n) { var r = 0, i = 0, o = n[0], u = 0, a = this.$createLineElement(); e.appendChild(a); for (var f = 0; f < t.length; f++) { var l = t[f], c = l.value; if (f == 0 && this.displayIndentGuides) { r = c.length, c = this.renderIndentGuide(a, c, o); if (!c) continue; r -= c.length } if (r + c.length < o) u = this.$renderToken(a, u, l, c), r += c.length; else { while (r + c.length >= o) u = this.$renderToken(a, u, l, c.substring(0, o - r)), c = c.substring(o - r), r = o, a = this.$createLineElement(), e.appendChild(a), a.appendChild(this.dom.createTextNode(s.stringRepeat("\u00a0", n.indent), this.element)), i++, u = 0, o = n[i] || Number.MAX_VALUE; c.length != 0 && (r += c.length, u = this.$renderToken(a, u, l, c)) } } n[n.length - 1] > this.MAX_LINE_LENGTH && this.$renderOverflowMessage(a, u, null, "", !0) }, this.$renderSimpleLine = function (e, t) { var n = 0, r = t[0], i = r.value; this.displayIndentGuides && (i = this.renderIndentGuide(e, i)), i && (n = this.$renderToken(e, n, r, i)); for (var s = 1; s < t.length; s++) { r = t[s], i = r.value; if (n + i.length > this.MAX_LINE_LENGTH) return this.$renderOverflowMessage(e, n, r, i); n = this.$renderToken(e, n, r, i) } }, this.$renderOverflowMessage = function (e, t, n, r, i) { n && this.$renderToken(e, t, n, r.slice(0, this.MAX_LINE_LENGTH - t)); var s = this.dom.createElement("span"); s.className = "ace_inline_button ace_keyword ace_toggle_wrap", s.textContent = i ? "<hide>" : "<click to see more...>", e.appendChild(s) }, this.$renderLine = function (e, t, n) { !n && n != 0 && (n = this.session.getFoldLine(t)); if (n) var r = this.$getFoldLineTokens(t, n); else var r = this.session.getTokens(t); var i = e; if (r.length) { var s = this.session.getRowSplitData(t); if (s && s.length) { this.$renderWrappedLine(e, r, s); var i = e.lastChild } else { var i = e; this.$useLineGroups() && (i = this.$createLineElement(), e.appendChild(i)), this.$renderSimpleLine(i, r) } } else this.$useLineGroups() && (i = this.$createLineElement(), e.appendChild(i)); if (this.showEOL && i) { n && (t = n.end.row); var o = this.dom.createElement("span"); o.className = "ace_invisible ace_invisible_eol", o.textContent = t == this.session.getLength() - 1 ? this.EOF_CHAR : this.EOL_CHAR, i.appendChild(o) } }, this.$getFoldLineTokens = function (e, t) { function i(e, t, n) { var i = 0, s = 0; while (s + e[i].value.length < t) { s += e[i].value.length, i++; if (i == e.length) return } if (s != t) { var o = e[i].value.substring(t - s); o.length > n - t && (o = o.substring(0, n - t)), r.push({ type: e[i].type, value: o }), s = t + o.length, i += 1 } while (s < n && i < e.length) { var o = e[i].value; o.length + s > n ? r.push({ type: e[i].type, value: o.substring(0, n - s) }) : r.push(e[i]), s += o.length, i += 1 } } var n = this.session, r = [], s = n.getTokens(e); return t.walk(function (e, t, o, u, a) { e != null ? r.push({ type: "fold", value: e }) : (a && (s = n.getTokens(t)), s.length && i(s, u, o)) }, t.end.row, this.session.getLine(t.end.row).length), r }, this.$useLineGroups = function () { return this.session.getUseWrapMode() }, this.destroy = function () { } }).call(a.prototype), t.Text = a }), define("ace/layer/cursor", ["require", "exports", "module", "ace/lib/dom"], function (e, t, n) { "use strict"; var r = e("../lib/dom"), i = function (e) { this.element = r.createElement("div"), this.element.className = "ace_layer ace_cursor-layer", e.appendChild(this.element), this.isVisible = !1, this.isBlinking = !0, this.blinkInterval = 1e3, this.smoothBlinking = !1, this.cursors = [], this.cursor = this.addCursor(), r.addCssClass(this.element, "ace_hidden-cursors"), this.$updateCursors = this.$updateOpacity.bind(this) }; (function () { this.$updateOpacity = function (e) { var t = this.cursors; for (var n = t.length; n--;)r.setStyle(t[n].style, "opacity", e ? "" : "0") }, this.$startCssAnimation = function () { var e = this.cursors; for (var t = e.length; t--;)e[t].style.animationDuration = this.blinkInterval + "ms"; setTimeout(function () { r.addCssClass(this.element, "ace_animate-blinking") }.bind(this)) }, this.$stopCssAnimation = function () { r.removeCssClass(this.element, "ace_animate-blinking") }, this.$padding = 0, this.setPadding = function (e) { this.$padding = e }, this.setSession = function (e) { this.session = e }, this.setBlinking = function (e) { e != this.isBlinking && (this.isBlinking = e, this.restartTimer()) }, this.setBlinkInterval = function (e) { e != this.blinkInterval && (this.blinkInterval = e, this.restartTimer()) }, this.setSmoothBlinking = function (e) { e != this.smoothBlinking && (this.smoothBlinking = e, r.setCssClass(this.element, "ace_smooth-blinking", e), this.$updateCursors(!0), this.restartTimer()) }, this.addCursor = function () { var e = r.createElement("div"); return e.className = "ace_cursor", this.element.appendChild(e), this.cursors.push(e), e }, this.removeCursor = function () { if (this.cursors.length > 1) { var e = this.cursors.pop(); return e.parentNode.removeChild(e), e } }, this.hideCursor = function () { this.isVisible = !1, r.addCssClass(this.element, "ace_hidden-cursors"), this.restartTimer() }, this.showCursor = function () { this.isVisible = !0, r.removeCssClass(this.element, "ace_hidden-cursors"), this.restartTimer() }, this.restartTimer = function () { var e = this.$updateCursors; clearInterval(this.intervalId), clearTimeout(this.timeoutId), this.$stopCssAnimation(), this.smoothBlinking && r.removeCssClass(this.element, "ace_smooth-blinking"), e(!0); if (!this.isBlinking || !this.blinkInterval || !this.isVisible) { this.$stopCssAnimation(); return } this.smoothBlinking && setTimeout(function () { r.addCssClass(this.element, "ace_smooth-blinking") }.bind(this)); if (r.HAS_CSS_ANIMATION) this.$startCssAnimation(); else { var t = function () { this.timeoutId = setTimeout(function () { e(!1) }, .6 * this.blinkInterval) }.bind(this); this.intervalId = setInterval(function () { e(!0), t() }, this.blinkInterval), t() } }, this.getPixelPosition = function (e, t) { if (!this.config || !this.session) return { left: 0, top: 0 }; e || (e = this.session.selection.getCursor()); var n = this.session.documentToScreenPosition(e), r = this.$padding + (this.session.$bidiHandler.isBidiRow(n.row, e.row) ? this.session.$bidiHandler.getPosLeft(n.column) : n.column * this.config.characterWidth), i = (n.row - (t ? this.config.firstRowScreen : 0)) * this.config.lineHeight; return { left: r, top: i } }, this.isCursorInView = function (e, t) { return e.top >= 0 && e.top < t.maxHeight }, this.update = function (e) { this.config = e; var t = this.session.$selectionMarkers, n = 0, i = 0; if (t === undefined || t.length === 0) t = [{ cursor: null }]; for (var n = 0, s = t.length; n < s; n++) { var o = this.getPixelPosition(t[n].cursor, !0); if ((o.top > e.height + e.offset || o.top < 0) && n > 1) continue; var u = this.cursors[i++] || this.addCursor(), a = u.style; this.drawCursor ? this.drawCursor(u, o, e, t[n], this.session) : this.isCursorInView(o, e) ? (r.setStyle(a, "display", "block"), r.translate(u, o.left, o.top), r.setStyle(a, "width", Math.round(e.characterWidth) + "px"), r.setStyle(a, "height", e.lineHeight + "px")) : r.setStyle(a, "display", "none") } while (this.cursors.length > i) this.removeCursor(); var f = this.session.getOverwrite(); this.$setOverwrite(f), this.$pixelPos = o, this.restartTimer() }, this.drawCursor = null, this.$setOverwrite = function (e) { e != this.overwrite && (this.overwrite = e, e ? r.addCssClass(this.element, "ace_overwrite-cursors") : r.removeCssClass(this.element, "ace_overwrite-cursors")) }, this.destroy = function () { clearInterval(this.intervalId), clearTimeout(this.timeoutId) } }).call(i.prototype), t.Cursor = i }), define("ace/scrollbar", ["require", "exports", "module", "ace/lib/oop", "ace/lib/dom", "ace/lib/event", "ace/lib/event_emitter"], function (e, t, n) { "use strict"; var r = e("./lib/oop"), i = e("./lib/dom"), s = e("./lib/event"), o = e("./lib/event_emitter").EventEmitter, u = 32768, a = function (e) { this.element = i.createElement("div"), this.element.className = "ace_scrollbar ace_scrollbar" + this.classSuffix, this.inner = i.createElement("div"), this.inner.className = "ace_scrollbar-inner", this.inner.textContent = "\u00a0", this.element.appendChild(this.inner), e.appendChild(this.element), this.setVisible(!1), this.skipEvent = !1, s.addListener(this.element, "scroll", this.onScroll.bind(this)), s.addListener(this.element, "mousedown", s.preventDefault) }; (function () { r.implement(this, o), this.setVisible = function (e) { this.element.style.display = e ? "" : "none", this.isVisible = e, this.coeff = 1 } }).call(a.prototype); var f = function (e, t) { a.call(this, e), this.scrollTop = 0, this.scrollHeight = 0, t.$scrollbarWidth = this.width = i.scrollbarWidth(e.ownerDocument), this.inner.style.width = this.element.style.width = (this.width || 15) + 5 + "px", this.$minWidth = 0 }; r.inherits(f, a), function () { this.classSuffix = "-v", this.onScroll = function () { if (!this.skipEvent) { this.scrollTop = this.element.scrollTop; if (this.coeff != 1) { var e = this.element.clientHeight / this.scrollHeight; this.scrollTop = this.scrollTop * (1 - e) / (this.coeff - e) } this._emit("scroll", { data: this.scrollTop }) } this.skipEvent = !1 }, this.getWidth = function () { return Math.max(this.isVisible ? this.width : 0, this.$minWidth || 0) }, this.setHeight = function (e) { this.element.style.height = e + "px" }, this.setInnerHeight = this.setScrollHeight = function (e) { this.scrollHeight = e, e > u ? (this.coeff = u / e, e = u) : this.coeff != 1 && (this.coeff = 1), this.inner.style.height = e + "px" }, this.setScrollTop = function (e) { this.scrollTop != e && (this.skipEvent = !0, this.scrollTop = e, this.element.scrollTop = e * this.coeff) } }.call(f.prototype); var l = function (e, t) { a.call(this, e), this.scrollLeft = 0, this.height = t.$scrollbarWidth, this.inner.style.height = this.element.style.height = (this.height || 15) + 5 + "px" }; r.inherits(l, a), function () { this.classSuffix = "-h", this.onScroll = function () { this.skipEvent || (this.scrollLeft = this.element.scrollLeft, this._emit("scroll", { data: this.scrollLeft })), this.skipEvent = !1 }, this.getHeight = function () { return this.isVisible ? this.height : 0 }, this.setWidth = function (e) { this.element.style.width = e + "px" }, this.setInnerWidth = function (e) { this.inner.style.width = e + "px" }, this.setScrollWidth = function (e) { this.inner.style.width = e + "px" }, this.setScrollLeft = function (e) { this.scrollLeft != e && (this.skipEvent = !0, this.scrollLeft = this.element.scrollLeft = e) } }.call(l.prototype), t.ScrollBar = f, t.ScrollBarV = f, t.ScrollBarH = l, t.VScrollBar = f, t.HScrollBar = l }), define("ace/renderloop", ["require", "exports", "module", "ace/lib/event"], function (e, t, n) { "use strict"; var r = e("./lib/event"), i = function (e, t) { this.onRender = e, this.pending = !1, this.changes = 0, this.$recursionLimit = 2, this.window = t || window; var n = this; this._flush = function (e) { n.pending = !1; var t = n.changes; t && (r.blockIdle(100), n.changes = 0, n.onRender(t)); if (n.changes) { if (n.$recursionLimit-- < 0) return; n.schedule() } else n.$recursionLimit = 2 } }; (function () { this.schedule = function (e) { this.changes = this.changes | e, this.changes && !this.pending && (r.nextFrame(this._flush), this.pending = !0) }, this.clear = function (e) { var t = this.changes; return this.changes = 0, t } }).call(i.prototype), t.RenderLoop = i }), define("ace/layer/font_metrics", ["require", "exports", "module", "ace/lib/oop", "ace/lib/dom", "ace/lib/lang", "ace/lib/event", "ace/lib/useragent", "ace/lib/event_emitter"], function (e, t, n) { var r = e("../lib/oop"), i = e("../lib/dom"), s = e("../lib/lang"), o = e("../lib/event"), u = e("../lib/useragent"), a = e("../lib/event_emitter").EventEmitter, f = 256, l = typeof ResizeObserver == "function", c = 200, h = t.FontMetrics = function (e) { this.el = i.createElement("div"), this.$setMeasureNodeStyles(this.el.style, !0), this.$main = i.createElement("div"), this.$setMeasureNodeStyles(this.$main.style), this.$measureNode = i.createElement("div"), this.$setMeasureNodeStyles(this.$measureNode.style), this.el.appendChild(this.$main), this.el.appendChild(this.$measureNode), e.appendChild(this.el), this.$measureNode.textContent = s.stringRepeat("X", f), this.$characterSize = { width: 0, height: 0 }, l ? this.$addObserver() : this.checkForSizeChanges() }; (function () { r.implement(this, a), this.$characterSize = { width: 0, height: 0 }, this.$setMeasureNodeStyles = function (e, t) { e.width = e.height = "auto", e.left = e.top = "0px", e.visibility = "hidden", e.position = "absolute", e.whiteSpace = "pre", u.isIE < 8 ? e["font-family"] = "inherit" : e.font = "inherit", e.overflow = t ? "hidden" : "visible" }, this.checkForSizeChanges = function (e) { e === undefined && (e = this.$measureSizes()); if (e && (this.$characterSize.width !== e.width || this.$characterSize.height !== e.height)) { this.$measureNode.style.fontWeight = "bold"; var t = this.$measureSizes(); this.$measureNode.style.fontWeight = "", this.$characterSize = e, this.charSizes = Object.create(null), this.allowBoldFonts = t && t.width === e.width && t.height === e.height, this._emit("changeCharacterSize", { data: e }) } }, this.$addObserver = function () { var e = this; this.$observer = new window.ResizeObserver(function (t) { e.checkForSizeChanges() }), this.$observer.observe(this.$measureNode) }, this.$pollSizeChanges = function () { if (this.$pollSizeChangesTimer || this.$observer) return this.$pollSizeChangesTimer; var e = this; return this.$pollSizeChangesTimer = o.onIdle(function t() { e.checkForSizeChanges(), o.onIdle(t, 500) }, 500) }, this.setPolling = function (e) { e ? this.$pollSizeChanges() : this.$pollSizeChangesTimer && (clearInterval(this.$pollSizeChangesTimer), this.$pollSizeChangesTimer = 0) }, this.$measureSizes = function (e) { var t = { height: (e || this.$measureNode).clientHeight, width: (e || this.$measureNode).clientWidth / f }; return t.width === 0 || t.height === 0 ? null : t }, this.$measureCharWidth = function (e) { this.$main.textContent = s.stringRepeat(e, f); var t = this.$main.getBoundingClientRect(); return t.width / f }, this.getCharacterWidth = function (e) { var t = this.charSizes[e]; return t === undefined && (t = this.charSizes[e] = this.$measureCharWidth(e) / this.$characterSize.width), t }, this.destroy = function () { clearInterval(this.$pollSizeChangesTimer), this.$observer && this.$observer.disconnect(), this.el && this.el.parentNode && this.el.parentNode.removeChild(this.el) }, this.$getZoom = function e(t) { return t ? (window.getComputedStyle(t).zoom || 1) * e(t.parentElement) : 1 }, this.$initTransformMeasureNodes = function () { var e = function (e, t) { return ["div", { style: "position: absolute;top:" + e + "px;left:" + t + "px;" }] }; this.els = i.buildDom([e(0, 0), e(c, 0), e(0, c), e(c, c)], this.el) }, this.transformCoordinates = function (e, t) { function r(e, t, n) { var r = e[1] * t[0] - e[0] * t[1]; return [(-t[1] * n[0] + t[0] * n[1]) / r, (+e[1] * n[0] - e[0] * n[1]) / r] } function i(e, t) { return [e[0] - t[0], e[1] - t[1]] } function s(e, t) { return [e[0] + t[0], e[1] + t[1]] } function o(e, t) { return [e * t[0], e * t[1]] } function u(e) { var t = e.getBoundingClientRect(); return [t.left, t.top] } if (e) { var n = this.$getZoom(this.el); e = o(1 / n, e) } this.els || this.$initTransformMeasureNodes(); var a = u(this.els[0]), f = u(this.els[1]), l = u(this.els[2]), h = u(this.els[3]), p = r(i(h, f), i(h, l), i(s(f, l), s(h, a))), d = o(1 + p[0], i(f, a)), v = o(1 + p[1], i(l, a)); if (t) { var m = t, g = p[0] * m[0] / c + p[1] * m[1] / c + 1, y = s(o(m[0], d), o(m[1], v)); return s(o(1 / g / c, y), a) } var b = i(e, a), w = r(i(d, o(p[0], b)), i(v, o(p[1], b)), b); return o(c, w) } }).call(h.prototype) }), define("ace/virtual_renderer", ["require", "exports", "module", "ace/lib/oop", "ace/lib/dom", "ace/config", "ace/layer/gutter", "ace/layer/marker", "ace/layer/text", "ace/layer/cursor", "ace/scrollbar", "ace/scrollbar", "ace/renderloop", "ace/layer/font_metrics", "ace/lib/event_emitter", "ace/lib/useragent"], function (e, t, n) { "use strict"; var r = e("./lib/oop"), i = e("./lib/dom"), s = e("./config"), o = e("./layer/gutter").Gutter, u = e("./layer/marker").Marker, a = e("./layer/text").Text, f = e("./layer/cursor").Cursor, l = e("./scrollbar").HScrollBar, c = e("./scrollbar").VScrollBar, h = e("./renderloop").RenderLoop, p = e("./layer/font_metrics").FontMetrics, d = e("./lib/event_emitter").EventEmitter, v = '.ace_br1 {border-top-left-radius    : 3px;}.ace_br2 {border-top-right-radius   : 3px;}.ace_br3 {border-top-left-radius    : 3px; border-top-right-radius:    3px;}.ace_br4 {border-bottom-right-radius: 3px;}.ace_br5 {border-top-left-radius    : 3px; border-bottom-right-radius: 3px;}.ace_br6 {border-top-right-radius   : 3px; border-bottom-right-radius: 3px;}.ace_br7 {border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px;}.ace_br8 {border-bottom-left-radius : 3px;}.ace_br9 {border-top-left-radius    : 3px; border-bottom-left-radius:  3px;}.ace_br10{border-top-right-radius   : 3px; border-bottom-left-radius:  3px;}.ace_br11{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-left-radius:  3px;}.ace_br12{border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br13{border-top-left-radius    : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br14{border-top-right-radius   : 3px; border-bottom-right-radius: 3px; border-bottom-left-radius:  3px;}.ace_br15{border-top-left-radius    : 3px; border-top-right-radius:    3px; border-bottom-right-radius: 3px; border-bottom-left-radius: 3px;}.ace_editor {position: relative;overflow: hidden;padding: 0;font: 12px/normal \'Monaco\', \'Menlo\', \'Ubuntu Mono\', \'Consolas\', \'source-code-pro\', monospace;direction: ltr;text-align: left;-webkit-tap-highlight-color: rgba(0, 0, 0, 0);}.ace_scroller {position: absolute;overflow: hidden;top: 0;bottom: 0;background-color: inherit;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;cursor: text;}.ace_content {position: absolute;box-sizing: border-box;min-width: 100%;contain: style size layout;font-variant-ligatures: no-common-ligatures;}.ace_dragging .ace_scroller:before{position: absolute;top: 0;left: 0;right: 0;bottom: 0;content: \'\';background: rgba(250, 250, 250, 0.01);z-index: 1000;}.ace_dragging.ace_dark .ace_scroller:before{background: rgba(0, 0, 0, 0.01);}.ace_selecting, .ace_selecting * {cursor: text !important;}.ace_gutter {position: absolute;overflow : hidden;width: auto;top: 0;bottom: 0;left: 0;cursor: default;z-index: 4;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;contain: style size layout;}.ace_gutter-active-line {position: absolute;left: 0;right: 0;}.ace_scroller.ace_scroll-left {box-shadow: 17px 0 16px -16px rgba(0, 0, 0, 0.4) inset;}.ace_gutter-cell {position: absolute;top: 0;left: 0;right: 0;padding-left: 19px;padding-right: 6px;background-repeat: no-repeat;}.ace_gutter-cell.ace_error {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAABOFBMVEX/////////QRswFAb/Ui4wFAYwFAYwFAaWGAfDRymzOSH/PxswFAb/SiUwFAYwFAbUPRvjQiDllog5HhHdRybsTi3/Tyv9Tir+Syj/UC3////XurebMBIwFAb/RSHbPx/gUzfdwL3kzMivKBAwFAbbvbnhPx66NhowFAYwFAaZJg8wFAaxKBDZurf/RB6mMxb/SCMwFAYwFAbxQB3+RB4wFAb/Qhy4Oh+4QifbNRcwFAYwFAYwFAb/QRzdNhgwFAYwFAbav7v/Uy7oaE68MBK5LxLewr/r2NXewLswFAaxJw4wFAbkPRy2PyYwFAaxKhLm1tMwFAazPiQwFAaUGAb/QBrfOx3bvrv/VC/maE4wFAbRPBq6MRO8Qynew8Dp2tjfwb0wFAbx6eju5+by6uns4uH9/f36+vr/GkHjAAAAYnRSTlMAGt+64rnWu/bo8eAA4InH3+DwoN7j4eLi4xP99Nfg4+b+/u9B/eDs1MD1mO7+4PHg2MXa347g7vDizMLN4eG+Pv7i5evs/v79yu7S3/DV7/498Yv24eH+4ufQ3Ozu/v7+y13sRqwAAADLSURBVHjaZc/XDsFgGIBhtDrshlitmk2IrbHFqL2pvXf/+78DPokj7+Fz9qpU/9UXJIlhmPaTaQ6QPaz0mm+5gwkgovcV6GZzd5JtCQwgsxoHOvJO15kleRLAnMgHFIESUEPmawB9ngmelTtipwwfASilxOLyiV5UVUyVAfbG0cCPHig+GBkzAENHS0AstVF6bacZIOzgLmxsHbt2OecNgJC83JERmePUYq8ARGkJx6XtFsdddBQgZE2nPR6CICZhawjA4Fb/chv+399kfR+MMMDGOQAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: 2px center;}.ace_gutter-cell.ace_warning {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAmVBMVEX///8AAAD///8AAAAAAABPSzb/5sAAAAB/blH/73z/ulkAAAAAAAD85pkAAAAAAAACAgP/vGz/rkDerGbGrV7/pkQICAf////e0IsAAAD/oED/qTvhrnUAAAD/yHD/njcAAADuv2r/nz//oTj/p064oGf/zHAAAAA9Nir/tFIAAAD/tlTiuWf/tkIAAACynXEAAAAAAAAtIRW7zBpBAAAAM3RSTlMAABR1m7RXO8Ln31Z36zT+neXe5OzooRDfn+TZ4p3h2hTf4t3k3ucyrN1K5+Xaks52Sfs9CXgrAAAAjklEQVR42o3PbQ+CIBQFYEwboPhSYgoYunIqqLn6/z8uYdH8Vmdnu9vz4WwXgN/xTPRD2+sgOcZjsge/whXZgUaYYvT8QnuJaUrjrHUQreGczuEafQCO/SJTufTbroWsPgsllVhq3wJEk2jUSzX3CUEDJC84707djRc5MTAQxoLgupWRwW6UB5fS++NV8AbOZgnsC7BpEAAAAABJRU5ErkJggg==");background-position: 2px center;}.ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAAAAAA6mKC9AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAJ0Uk5TAAB2k804AAAAPklEQVQY02NgIB68QuO3tiLznjAwpKTgNyDbMegwisCHZUETUZV0ZqOquBpXj2rtnpSJT1AEnnRmL2OgGgAAIKkRQap2htgAAAAASUVORK5CYII=");background-position: 2px center;}.ace_dark .ace_gutter-cell.ace_info {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQBAMAAADt3eJSAAAAJFBMVEUAAAChoaGAgIAqKiq+vr6tra1ZWVmUlJSbm5s8PDxubm56enrdgzg3AAAAAXRSTlMAQObYZgAAAClJREFUeNpjYMAPdsMYHegyJZFQBlsUlMFVCWUYKkAZMxZAGdxlDMQBAG+TBP4B6RyJAAAAAElFTkSuQmCC");}.ace_scrollbar {contain: strict;position: absolute;right: 0;bottom: 0;z-index: 6;}.ace_scrollbar-inner {position: absolute;cursor: text;left: 0;top: 0;}.ace_scrollbar-v{overflow-x: hidden;overflow-y: scroll;top: 0;}.ace_scrollbar-h {overflow-x: scroll;overflow-y: hidden;left: 0;}.ace_print-margin {position: absolute;height: 100%;}.ace_text-input {position: absolute;z-index: 0;width: 0.5em;height: 1em;opacity: 0;background: transparent;-moz-appearance: none;appearance: none;border: none;resize: none;outline: none;overflow: hidden;font: inherit;padding: 0 1px;margin: 0 -1px;contain: strict;-ms-user-select: text;-moz-user-select: text;-webkit-user-select: text;user-select: text;white-space: pre!important;}.ace_text-input.ace_composition {background: transparent;color: inherit;z-index: 1000;opacity: 1;}.ace_composition_placeholder { color: transparent }.ace_composition_marker { border-bottom: 1px solid;position: absolute;border-radius: 0;margin-top: 1px;}[ace_nocontext=true] {transform: none!important;filter: none!important;clip-path: none!important;mask : none!important;contain: none!important;perspective: none!important;mix-blend-mode: initial!important;z-index: auto;}.ace_layer {z-index: 1;position: absolute;overflow: hidden;word-wrap: normal;white-space: pre;height: 100%;width: 100%;box-sizing: border-box;pointer-events: none;}.ace_gutter-layer {position: relative;width: auto;text-align: right;pointer-events: auto;height: 1000000px;contain: style size layout;}.ace_text-layer {font: inherit !important;position: absolute;height: 1000000px;width: 1000000px;contain: style size layout;}.ace_text-layer > .ace_line, .ace_text-layer > .ace_line_group {contain: style size layout;position: absolute;top: 0;left: 0;right: 0;}.ace_hidpi .ace_text-layer,.ace_hidpi .ace_gutter-layer,.ace_hidpi .ace_content,.ace_hidpi .ace_gutter {contain: strict;will-change: transform;}.ace_hidpi .ace_text-layer > .ace_line, .ace_hidpi .ace_text-layer > .ace_line_group {contain: strict;}.ace_cjk {display: inline-block;text-align: center;}.ace_cursor-layer {z-index: 4;}.ace_cursor {z-index: 4;position: absolute;box-sizing: border-box;border-left: 2px solid;transform: translatez(0);}.ace_multiselect .ace_cursor {border-left-width: 1px;}.ace_slim-cursors .ace_cursor {border-left-width: 1px;}.ace_overwrite-cursors .ace_cursor {border-left-width: 0;border-bottom: 1px solid;}.ace_hidden-cursors .ace_cursor {opacity: 0.2;}.ace_hasPlaceholder .ace_hidden-cursors .ace_cursor {opacity: 0;}.ace_smooth-blinking .ace_cursor {transition: opacity 0.18s;}.ace_animate-blinking .ace_cursor {animation-duration: 1000ms;animation-timing-function: step-end;animation-name: blink-ace-animate;animation-iteration-count: infinite;}.ace_animate-blinking.ace_smooth-blinking .ace_cursor {animation-duration: 1000ms;animation-timing-function: ease-in-out;animation-name: blink-ace-animate-smooth;}@keyframes blink-ace-animate {from, to { opacity: 1; }60% { opacity: 0; }}@keyframes blink-ace-animate-smooth {from, to { opacity: 1; }45% { opacity: 1; }60% { opacity: 0; }85% { opacity: 0; }}.ace_marker-layer .ace_step, .ace_marker-layer .ace_stack {position: absolute;z-index: 3;}.ace_marker-layer .ace_selection {position: absolute;z-index: 5;}.ace_marker-layer .ace_bracket {position: absolute;z-index: 6;}.ace_marker-layer .ace_error_bracket {position: absolute;border-bottom: 1px solid #DE5555;border-radius: 0;}.ace_marker-layer .ace_active-line {position: absolute;z-index: 2;}.ace_marker-layer .ace_selected-word {position: absolute;z-index: 4;box-sizing: border-box;}.ace_line .ace_fold {box-sizing: border-box;display: inline-block;height: 11px;margin-top: -2px;vertical-align: middle;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACJJREFUeNpi+P//fxgTAwPDBxDxD078RSX+YeEyDFMCIMAAI3INmXiwf2YAAAAASUVORK5CYII=");background-repeat: no-repeat, repeat-x;background-position: center center, top left;color: transparent;border: 1px solid black;border-radius: 2px;cursor: pointer;pointer-events: auto;}.ace_dark .ace_fold {}.ace_fold:hover{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABEAAAAJCAYAAADU6McMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAJpJREFUeNpi/P//PwOlgAXGYGRklAVSokD8GmjwY1wasKljQpYACtpCFeADcHVQfQyMQAwzwAZI3wJKvCLkfKBaMSClBlR7BOQikCFGQEErIH0VqkabiGCAqwUadAzZJRxQr/0gwiXIal8zQQPnNVTgJ1TdawL0T5gBIP1MUJNhBv2HKoQHHjqNrA4WO4zY0glyNKLT2KIfIMAAQsdgGiXvgnYAAAAASUVORK5CYII="),url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA3CAYAAADNNiA5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAACBJREFUeNpi+P//fz4TAwPDZxDxD5X4i5fLMEwJgAADAEPVDbjNw87ZAAAAAElFTkSuQmCC");}.ace_tooltip {background-color: #FFF;background-image: linear-gradient(to bottom, transparent, rgba(0, 0, 0, 0.1));border: 1px solid gray;border-radius: 1px;box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);color: black;max-width: 100%;padding: 3px 4px;position: fixed;z-index: 999999;box-sizing: border-box;cursor: default;white-space: pre;word-wrap: break-word;line-height: normal;font-style: normal;font-weight: normal;letter-spacing: normal;pointer-events: none;}.ace_folding-enabled > .ace_gutter-cell {padding-right: 13px;}.ace_fold-widget {box-sizing: border-box;margin: 0 -12px 0 1px;display: none;width: 11px;vertical-align: top;background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42mWKsQ0AMAzC8ixLlrzQjzmBiEjp0A6WwBCSPgKAXoLkqSot7nN3yMwR7pZ32NzpKkVoDBUxKAAAAABJRU5ErkJggg==");background-repeat: no-repeat;background-position: center;border-radius: 3px;border: 1px solid transparent;cursor: pointer;}.ace_folding-enabled .ace_fold-widget {display: inline-block;   }.ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42m3HwQkAMAhD0YzsRchFKI7sAikeWkrxwScEB0nh5e7KTPWimZki4tYfVbX+MNl4pyZXejUO1QAAAABJRU5ErkJggg==");}.ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGCAYAAAAG5SQMAAAAOUlEQVR42jXKwQkAMAgDwKwqKD4EwQ26sSOkVWjgIIHAzPiCgaqiqnJHZnKICBERHN194O5b9vbLuAVRL+l0YWnZAAAAAElFTkSuQmCCXA==");}.ace_fold-widget:hover {border: 1px solid rgba(0, 0, 0, 0.3);background-color: rgba(255, 255, 255, 0.2);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);}.ace_fold-widget:active {border: 1px solid rgba(0, 0, 0, 0.4);background-color: rgba(0, 0, 0, 0.05);box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);}.ace_dark .ace_fold-widget {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC");}.ace_dark .ace_fold-widget.ace_end {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget.ace_closed {background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg==");}.ace_dark .ace_fold-widget:hover {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);background-color: rgba(255, 255, 255, 0.1);}.ace_dark .ace_fold-widget:active {box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);}.ace_inline_button {border: 1px solid lightgray;display: inline-block;margin: -1px 8px;padding: 0 5px;pointer-events: auto;cursor: pointer;}.ace_inline_button:hover {border-color: gray;background: rgba(200,200,200,0.2);display: inline-block;pointer-events: auto;}.ace_fold-widget.ace_invalid {background-color: #FFB4B4;border-color: #DE5555;}.ace_fade-fold-widgets .ace_fold-widget {transition: opacity 0.4s ease 0.05s;opacity: 0;}.ace_fade-fold-widgets:hover .ace_fold-widget {transition: opacity 0.05s ease 0.05s;opacity:1;}.ace_underline {text-decoration: underline;}.ace_bold {font-weight: bold;}.ace_nobold .ace_bold {font-weight: normal;}.ace_italic {font-style: italic;}.ace_error-marker {background-color: rgba(255, 0, 0,0.2);position: absolute;z-index: 9;}.ace_highlight-marker {background-color: rgba(255, 255, 0,0.2);position: absolute;z-index: 8;}.ace_mobile-menu {position: absolute;line-height: 1.5;border-radius: 4px;-ms-user-select: none;-moz-user-select: none;-webkit-user-select: none;user-select: none;background: white;box-shadow: 1px 3px 2px grey;border: 1px solid #dcdcdc;color: black;}.ace_dark > .ace_mobile-menu {background: #333;color: #ccc;box-shadow: 1px 3px 2px grey;border: 1px solid #444;}.ace_mobile-button {padding: 2px;cursor: pointer;overflow: hidden;}.ace_mobile-button:hover {background-color: #eee;opacity:1;}.ace_mobile-button:active {background-color: #ddd;}.ace_placeholder {font-family: arial;transform: scale(0.9);transform-origin: left;white-space: pre;opacity: 0.7;margin: 0 10px;}', m = e("./lib/useragent"), g = m.isIE; i.importCssString(v, "ace_editor.css"); var y = function (e, t) { var n = this; this.container = e || i.createElement("div"), i.addCssClass(this.container, "ace_editor"), i.HI_DPI && i.addCssClass(this.container, "ace_hidpi"), this.setTheme(t), this.$gutter = i.createElement("div"), this.$gutter.className = "ace_gutter", this.container.appendChild(this.$gutter), this.$gutter.setAttribute("aria-hidden", !0), this.scroller = i.createElement("div"), this.scroller.className = "ace_scroller", this.container.appendChild(this.scroller), this.content = i.createElement("div"), this.content.className = "ace_content", this.scroller.appendChild(this.content), this.$gutterLayer = new o(this.$gutter), this.$gutterLayer.on("changeGutterWidth", this.onGutterResize.bind(this)), this.$markerBack = new u(this.content); var r = this.$textLayer = new a(this.content); this.canvas = r.element, this.$markerFront = new u(this.content), this.$cursorLayer = new f(this.content), this.$horizScroll = !1, this.$vScroll = !1, this.scrollBar = this.scrollBarV = new c(this.container, this), this.scrollBarH = new l(this.container, this), this.scrollBarV.on("scroll", function (e) { n.$scrollAnimation || n.session.setScrollTop(e.data - n.scrollMargin.top) }), this.scrollBarH.on("scroll", function (e) { n.$scrollAnimation || n.session.setScrollLeft(e.data - n.scrollMargin.left) }), this.scrollTop = 0, this.scrollLeft = 0, this.cursorPos = { row: 0, column: 0 }, this.$fontMetrics = new p(this.container), this.$textLayer.$setFontMetrics(this.$fontMetrics), this.$textLayer.on("changeCharacterSize", function (e) { n.updateCharacterSize(), n.onResize(!0, n.gutterWidth, n.$size.width, n.$size.height), n._signal("changeCharacterSize", e) }), this.$size = { width: 0, height: 0, scrollerHeight: 0, scrollerWidth: 0, $dirty: !0 }, this.layerConfig = { width: 1, padding: 0, firstRow: 0, firstRowScreen: 0, lastRow: 0, lineHeight: 0, characterWidth: 0, minHeight: 1, maxHeight: 1, offset: 0, height: 1, gutterOffset: 1 }, this.scrollMargin = { left: 0, right: 0, top: 0, bottom: 0, v: 0, h: 0 }, this.margin = { left: 0, right: 0, top: 0, bottom: 0, v: 0, h: 0 }, this.$keepTextAreaAtCursor = !m.isIOS, this.$loop = new h(this.$renderChanges.bind(this), this.container.ownerDocument.defaultView), this.$loop.schedule(this.CHANGE_FULL), this.updateCharacterSize(), this.setPadding(4), s.resetOptions(this), s._signal("renderer", this) }; (function () { this.CHANGE_CURSOR = 1, this.CHANGE_MARKER = 2, this.CHANGE_GUTTER = 4, this.CHANGE_SCROLL = 8, this.CHANGE_LINES = 16, this.CHANGE_TEXT = 32, this.CHANGE_SIZE = 64, this.CHANGE_MARKER_BACK = 128, this.CHANGE_MARKER_FRONT = 256, this.CHANGE_FULL = 512, this.CHANGE_H_SCROLL = 1024, r.implement(this, d), this.updateCharacterSize = function () { this.$textLayer.allowBoldFonts != this.$allowBoldFonts && (this.$allowBoldFonts = this.$textLayer.allowBoldFonts, this.setStyle("ace_nobold", !this.$allowBoldFonts)), this.layerConfig.characterWidth = this.characterWidth = this.$textLayer.getCharacterWidth(), this.layerConfig.lineHeight = this.lineHeight = this.$textLayer.getLineHeight(), this.$updatePrintMargin(), i.setStyle(this.scroller.style, "line-height", this.lineHeight + "px") }, this.setSession = function (e) { this.session && this.session.doc.off("changeNewLineMode", this.onChangeNewLineMode), this.session = e, e && this.scrollMargin.top && e.getScrollTop() <= 0 && e.setScrollTop(-this.scrollMargin.top), this.$cursorLayer.setSession(e), this.$markerBack.setSession(e), this.$markerFront.setSession(e), this.$gutterLayer.setSession(e), this.$textLayer.setSession(e); if (!e) return; this.$loop.schedule(this.CHANGE_FULL), this.session.$setFontMetrics(this.$fontMetrics), this.scrollBarH.scrollLeft = this.scrollBarV.scrollTop = null, this.onChangeNewLineMode = this.onChangeNewLineMode.bind(this), this.onChangeNewLineMode(), this.session.doc.on("changeNewLineMode", this.onChangeNewLineMode) }, this.updateLines = function (e, t, n) { t === undefined && (t = Infinity), this.$changedLines ? (this.$changedLines.firstRow > e && (this.$changedLines.firstRow = e), this.$changedLines.lastRow < t && (this.$changedLines.lastRow = t)) : this.$changedLines = { firstRow: e, lastRow: t }; if (this.$changedLines.lastRow < this.layerConfig.firstRow) { if (!n) return; this.$changedLines.lastRow = this.layerConfig.lastRow } if (this.$changedLines.firstRow > this.layerConfig.lastRow) return; this.$loop.schedule(this.CHANGE_LINES) }, this.onChangeNewLineMode = function () { this.$loop.schedule(this.CHANGE_TEXT), this.$textLayer.$updateEolChar(), this.session.$bidiHandler.setEolChar(this.$textLayer.EOL_CHAR) }, this.onChangeTabSize = function () { this.$loop.schedule(this.CHANGE_TEXT | this.CHANGE_MARKER), this.$textLayer.onChangeTabSize() }, this.updateText = function () { this.$loop.schedule(this.CHANGE_TEXT) }, this.updateFull = function (e) { e ? this.$renderChanges(this.CHANGE_FULL, !0) : this.$loop.schedule(this.CHANGE_FULL) }, this.updateFontSize = function () { this.$textLayer.checkForSizeChanges() }, this.$changes = 0, this.$updateSizeAsync = function () { this.$loop.pending ? this.$size.$dirty = !0 : this.onResize() }, this.onResize = function (e, t, n, r) { if (this.resizing > 2) return; this.resizing > 0 ? this.resizing++ : this.resizing = e ? 1 : 0; var i = this.container; r || (r = i.clientHeight || i.scrollHeight), n || (n = i.clientWidth || i.scrollWidth); var s = this.$updateCachedSize(e, t, n, r); if (!this.$size.scrollerHeight || !n && !r) return this.resizing = 0; e && (this.$gutterLayer.$padding = null), e ? this.$renderChanges(s | this.$changes, !0) : this.$loop.schedule(s | this.$changes), this.resizing && (this.resizing = 0), this.scrollBarV.scrollLeft = this.scrollBarV.scrollTop = null }, this.$updateCachedSize = function (e, t, n, r) { r -= this.$extraHeight || 0; var s = 0, o = this.$size, u = { width: o.width, height: o.height, scrollerHeight: o.scrollerHeight, scrollerWidth: o.scrollerWidth }; r && (e || o.height != r) && (o.height = r, s |= this.CHANGE_SIZE, o.scrollerHeight = o.height, this.$horizScroll && (o.scrollerHeight -= this.scrollBarH.getHeight()), this.scrollBarV.element.style.bottom = this.scrollBarH.getHeight() + "px", s |= this.CHANGE_SCROLL); if (n && (e || o.width != n)) { s |= this.CHANGE_SIZE, o.width = n, t == null && (t = this.$showGutter ? this.$gutter.offsetWidth : 0), this.gutterWidth = t, i.setStyle(this.scrollBarH.element.style, "left", t + "px"), i.setStyle(this.scroller.style, "left", t + this.margin.left + "px"), o.scrollerWidth = Math.max(0, n - t - this.scrollBarV.getWidth() - this.margin.h), i.setStyle(this.$gutter.style, "left", this.margin.left + "px"); var a = this.scrollBarV.getWidth() + "px"; i.setStyle(this.scrollBarH.element.style, "right", a), i.setStyle(this.scroller.style, "right", a), i.setStyle(this.scroller.style, "bottom", this.scrollBarH.getHeight()); if (this.session && this.session.getUseWrapMode() && this.adjustWrapLimit() || e) s |= this.CHANGE_FULL } return o.$dirty = !n || !r, s && this._signal("resize", u), s }, this.onGutterResize = function (e) { var t = this.$showGutter ? e : 0; t != this.gutterWidth && (this.$changes |= this.$updateCachedSize(!0, t, this.$size.width, this.$size.height)), this.session.getUseWrapMode() && this.adjustWrapLimit() ? this.$loop.schedule(this.CHANGE_FULL) : this.$size.$dirty ? this.$loop.schedule(this.CHANGE_FULL) : this.$computeLayerConfig() }, this.adjustWrapLimit = function () { var e = this.$size.scrollerWidth - this.$padding * 2, t = Math.floor(e / this.characterWidth); return this.session.adjustWrapLimit(t, this.$showPrintMargin && this.$printMarginColumn) }, this.setAnimatedScroll = function (e) { this.setOption("animatedScroll", e) }, this.getAnimatedScroll = function () { return this.$animatedScroll }, this.setShowInvisibles = function (e) { this.setOption("showInvisibles", e), this.session.$bidiHandler.setShowInvisibles(e) }, this.getShowInvisibles = function () { return this.getOption("showInvisibles") }, this.getDisplayIndentGuides = function () { return this.getOption("displayIndentGuides") }, this.setDisplayIndentGuides = function (e) { this.setOption("displayIndentGuides", e) }, this.setShowPrintMargin = function (e) { this.setOption("showPrintMargin", e) }, this.getShowPrintMargin = function () { return this.getOption("showPrintMargin") }, this.setPrintMarginColumn = function (e) { this.setOption("printMarginColumn", e) }, this.getPrintMarginColumn = function () { return this.getOption("printMarginColumn") }, this.getShowGutter = function () { return this.getOption("showGutter") }, this.setShowGutter = function (e) { return this.setOption("showGutter", e) }, this.getFadeFoldWidgets = function () { return this.getOption("fadeFoldWidgets") }, this.setFadeFoldWidgets = function (e) { this.setOption("fadeFoldWidgets", e) }, this.setHighlightGutterLine = function (e) { this.setOption("highlightGutterLine", e) }, this.getHighlightGutterLine = function () { return this.getOption("highlightGutterLine") }, this.$updatePrintMargin = function () { if (!this.$showPrintMargin && !this.$printMarginEl) return; if (!this.$printMarginEl) { var e = i.createElement("div"); e.className = "ace_layer ace_print-margin-layer", this.$printMarginEl = i.createElement("div"), this.$printMarginEl.className = "ace_print-margin", e.appendChild(this.$printMarginEl), this.content.insertBefore(e, this.content.firstChild) } var t = this.$printMarginEl.style; t.left = Math.round(this.characterWidth * this.$printMarginColumn + this.$padding) + "px", t.visibility = this.$showPrintMargin ? "visible" : "hidden", this.session && this.session.$wrap == -1 && this.adjustWrapLimit() }, this.getContainerElement = function () { return this.container }, this.getMouseEventTarget = function () { return this.scroller }, this.getTextAreaContainer = function () { return this.container }, this.$moveTextAreaToCursor = function () { if (this.$isMousePressed) return; var e = this.textarea.style, t = this.$composition; if (!this.$keepTextAreaAtCursor && !t) { i.translate(this.textarea, -100, 0); return } var n = this.$cursorLayer.$pixelPos; if (!n) return; t && t.markerRange && (n = this.$cursorLayer.getPixelPosition(t.markerRange.start, !0)); var r = this.layerConfig, s = n.top, o = n.left; s -= r.offset; var u = t && t.useTextareaForIME ? this.lineHeight : g ? 0 : 1; if (s < 0 || s > r.height - u) { i.translate(this.textarea, 0, 0); return } var a = 1, f = this.$size.height - u; if (!t) s += this.lineHeight; else if (t.useTextareaForIME) { var l = this.textarea.value; a = this.characterWidth * this.session.$getStringScreenWidth(l)[0] } else s += this.lineHeight + 2; o -= this.scrollLeft, o > this.$size.scrollerWidth - a && (o = this.$size.scrollerWidth - a), o += this.gutterWidth + this.margin.left, i.setStyle(e, "height", u + "px"), i.setStyle(e, "width", a + "px"), i.translate(this.textarea, Math.min(o, this.$size.scrollerWidth - a), Math.min(s, f)) }, this.getFirstVisibleRow = function () { return this.layerConfig.firstRow }, this.getFirstFullyVisibleRow = function () { return this.layerConfig.firstRow + (this.layerConfig.offset === 0 ? 0 : 1) }, this.getLastFullyVisibleRow = function () { var e = this.layerConfig, t = e.lastRow, n = this.session.documentToScreenRow(t, 0) * e.lineHeight; return n - this.session.getScrollTop() > e.height - e.lineHeight ? t - 1 : t }, this.getLastVisibleRow = function () { return this.layerConfig.lastRow }, this.$padding = null, this.setPadding = function (e) { this.$padding = e, this.$textLayer.setPadding(e), this.$cursorLayer.setPadding(e), this.$markerFront.setPadding(e), this.$markerBack.setPadding(e), this.$loop.schedule(this.CHANGE_FULL), this.$updatePrintMargin() }, this.setScrollMargin = function (e, t, n, r) { var i = this.scrollMargin; i.top = e | 0, i.bottom = t | 0, i.right = r | 0, i.left = n | 0, i.v = i.top + i.bottom, i.h = i.left + i.right, i.top && this.scrollTop <= 0 && this.session && this.session.setScrollTop(-i.top), this.updateFull() }, this.setMargin = function (e, t, n, r) { var i = this.margin; i.top = e | 0, i.bottom = t | 0, i.right = r | 0, i.left = n | 0, i.v = i.top + i.bottom, i.h = i.left + i.right, this.$updateCachedSize(!0, this.gutterWidth, this.$size.width, this.$size.height), this.updateFull() }, this.getHScrollBarAlwaysVisible = function () { return this.$hScrollBarAlwaysVisible }, this.setHScrollBarAlwaysVisible = function (e) { this.setOption("hScrollBarAlwaysVisible", e) }, this.getVScrollBarAlwaysVisible = function () { return this.$vScrollBarAlwaysVisible }, this.setVScrollBarAlwaysVisible = function (e) { this.setOption("vScrollBarAlwaysVisible", e) }, this.$updateScrollBarV = function () { var e = this.layerConfig.maxHeight, t = this.$size.scrollerHeight; !this.$maxLines && this.$scrollPastEnd && (e -= (t - this.lineHeight) * this.$scrollPastEnd, this.scrollTop > e - t && (e = this.scrollTop + t, this.scrollBarV.scrollTop = null)), this.scrollBarV.setScrollHeight(e + this.scrollMargin.v), this.scrollBarV.setScrollTop(this.scrollTop + this.scrollMargin.top) }, this.$updateScrollBarH = function () { this.scrollBarH.setScrollWidth(this.layerConfig.width + 2 * this.$padding + this.scrollMargin.h), this.scrollBarH.setScrollLeft(this.scrollLeft + this.scrollMargin.left) }, this.$frozen = !1, this.freeze = function () { this.$frozen = !0 }, this.unfreeze = function () { this.$frozen = !1 }, this.$renderChanges = function (e, t) { this.$changes && (e |= this.$changes, this.$changes = 0); if (!this.session || !this.container.offsetWidth || this.$frozen || !e && !t) { this.$changes |= e; return } if (this.$size.$dirty) return this.$changes |= e, this.onResize(!0); this.lineHeight || this.$textLayer.checkForSizeChanges(), this._signal("beforeRender", e), this.session && this.session.$bidiHandler && this.session.$bidiHandler.updateCharacterWidths(this.$fontMetrics); var n = this.layerConfig; if (e & this.CHANGE_FULL || e & this.CHANGE_SIZE || e & this.CHANGE_TEXT || e & this.CHANGE_LINES || e & this.CHANGE_SCROLL || e & this.CHANGE_H_SCROLL) { e |= this.$computeLayerConfig() | this.$loop.clear(); if (n.firstRow != this.layerConfig.firstRow && n.firstRowScreen == this.layerConfig.firstRowScreen) { var r = this.scrollTop + (n.firstRow - this.layerConfig.firstRow) * this.lineHeight; r > 0 && (this.scrollTop = r, e |= this.CHANGE_SCROLL, e |= this.$computeLayerConfig() | this.$loop.clear()) } n = this.layerConfig, this.$updateScrollBarV(), e & this.CHANGE_H_SCROLL && this.$updateScrollBarH(), i.translate(this.content, -this.scrollLeft, -n.offset); var s = n.width + 2 * this.$padding + "px", o = n.minHeight + "px"; i.setStyle(this.content.style, "width", s), i.setStyle(this.content.style, "height", o) } e & this.CHANGE_H_SCROLL && (i.translate(this.content, -this.scrollLeft, -n.offset), this.scroller.className = this.scrollLeft <= 0 ? "ace_scroller" : "ace_scroller ace_scroll-left"); if (e & this.CHANGE_FULL) { this.$changedLines = null, this.$textLayer.update(n), this.$showGutter && this.$gutterLayer.update(n), this.$markerBack.update(n), this.$markerFront.update(n), this.$cursorLayer.update(n), this.$moveTextAreaToCursor(), this._signal("afterRender", e); return } if (e & this.CHANGE_SCROLL) { this.$changedLines = null, e & this.CHANGE_TEXT || e & this.CHANGE_LINES ? this.$textLayer.update(n) : this.$textLayer.scrollLines(n), this.$showGutter && (e & this.CHANGE_GUTTER || e & this.CHANGE_LINES ? this.$gutterLayer.update(n) : this.$gutterLayer.scrollLines(n)), this.$markerBack.update(n), this.$markerFront.update(n), this.$cursorLayer.update(n), this.$moveTextAreaToCursor(), this._signal("afterRender", e); return } e & this.CHANGE_TEXT ? (this.$changedLines = null, this.$textLayer.update(n), this.$showGutter && this.$gutterLayer.update(n)) : e & this.CHANGE_LINES ? (this.$updateLines() || e & this.CHANGE_GUTTER && this.$showGutter) && this.$gutterLayer.update(n) : e & this.CHANGE_TEXT || e & this.CHANGE_GUTTER ? this.$showGutter && this.$gutterLayer.update(n) : e & this.CHANGE_CURSOR && this.$highlightGutterLine && this.$gutterLayer.updateLineHighlight(n), e & this.CHANGE_CURSOR && (this.$cursorLayer.update(n), this.$moveTextAreaToCursor()), e & (this.CHANGE_MARKER | this.CHANGE_MARKER_FRONT) && this.$markerFront.update(n), e & (this.CHANGE_MARKER | this.CHANGE_MARKER_BACK) && this.$markerBack.update(n), this._signal("afterRender", e) }, this.$autosize = function () { var e = this.session.getScreenLength() * this.lineHeight, t = this.$maxLines * this.lineHeight, n = Math.min(t, Math.max((this.$minLines || 1) * this.lineHeight, e)) + this.scrollMargin.v + (this.$extraHeight || 0); this.$horizScroll && (n += this.scrollBarH.getHeight()), this.$maxPixelHeight && n > this.$maxPixelHeight && (n = this.$maxPixelHeight); var r = n <= 2 * this.lineHeight, i = !r && e > t; if (n != this.desiredHeight || this.$size.height != this.desiredHeight || i != this.$vScroll) { i != this.$vScroll && (this.$vScroll = i, this.scrollBarV.setVisible(i)); var s = this.container.clientWidth; this.container.style.height = n + "px", this.$updateCachedSize(!0, this.$gutterWidth, s, n), this.desiredHeight = n, this._signal("autosize") } }, this.$computeLayerConfig = function () { var e = this.session, t = this.$size, n = t.height <= 2 * this.lineHeight, r = this.session.getScreenLength(), i = r * this.lineHeight, s = this.$getLongestLine(), o = !n && (this.$hScrollBarAlwaysVisible || t.scrollerWidth - s - 2 * this.$padding < 0), u = this.$horizScroll !== o; u && (this.$horizScroll = o, this.scrollBarH.setVisible(o)); var a = this.$vScroll; this.$maxLines && this.lineHeight > 1 && this.$autosize(); var f = t.scrollerHeight + this.lineHeight, l = !this.$maxLines && this.$scrollPastEnd ? (t.scrollerHeight - this.lineHeight) * this.$scrollPastEnd : 0; i += l; var c = this.scrollMargin; this.session.setScrollTop(Math.max(-c.top, Math.min(this.scrollTop, i - t.scrollerHeight + c.bottom))), this.session.setScrollLeft(Math.max(-c.left, Math.min(this.scrollLeft, s + 2 * this.$padding - t.scrollerWidth + c.right))); var h = !n && (this.$vScrollBarAlwaysVisible || t.scrollerHeight - i + l < 0 || this.scrollTop > c.top), p = a !== h; p && (this.$vScroll = h, this.scrollBarV.setVisible(h)); var d = this.scrollTop % this.lineHeight, v = Math.ceil(f / this.lineHeight) - 1, m = Math.max(0, Math.round((this.scrollTop - d) / this.lineHeight)), g = m + v, y, b, w = this.lineHeight; m = e.screenToDocumentRow(m, 0); var E = e.getFoldLine(m); E && (m = E.start.row), y = e.documentToScreenRow(m, 0), b = e.getRowLength(m) * w, g = Math.min(e.screenToDocumentRow(g, 0), e.getLength() - 1), f = t.scrollerHeight + e.getRowLength(g) * w + b, d = this.scrollTop - y * w; var S = 0; if (this.layerConfig.width != s || u) S = this.CHANGE_H_SCROLL; if (u || p) S |= this.$updateCachedSize(!0, this.gutterWidth, t.width, t.height), this._signal("scrollbarVisibilityChanged"), p && (s = this.$getLongestLine()); return this.layerConfig = { width: s, padding: this.$padding, firstRow: m, firstRowScreen: y, lastRow: g, lineHeight: w, characterWidth: this.characterWidth, minHeight: f, maxHeight: i, offset: d, gutterOffset: w ? Math.max(0, Math.ceil((d + t.height - t.scrollerHeight) / w)) : 0, height: this.$size.scrollerHeight }, this.session.$bidiHandler && this.session.$bidiHandler.setContentWidth(s - this.$padding), S }, this.$updateLines = function () { if (!this.$changedLines) return; var e = this.$changedLines.firstRow, t = this.$changedLines.lastRow; this.$changedLines = null; var n = this.layerConfig; if (e > n.lastRow + 1) return; if (t < n.firstRow) return; if (t === Infinity) { this.$showGutter && this.$gutterLayer.update(n), this.$textLayer.update(n); return } return this.$textLayer.updateLines(n, e, t), !0 }, this.$getLongestLine = function () { var e = this.session.getScreenWidth(); return this.showInvisibles && !this.session.$useWrapMode && (e += 1), this.$textLayer && e > this.$textLayer.MAX_LINE_LENGTH && (e = this.$textLayer.MAX_LINE_LENGTH + 30), Math.max(this.$size.scrollerWidth - 2 * this.$padding, Math.round(e * this.characterWidth)) }, this.updateFrontMarkers = function () { this.$markerFront.setMarkers(this.session.getMarkers(!0)), this.$loop.schedule(this.CHANGE_MARKER_FRONT) }, this.updateBackMarkers = function () { this.$markerBack.setMarkers(this.session.getMarkers()), this.$loop.schedule(this.CHANGE_MARKER_BACK) }, this.addGutterDecoration = function (e, t) { this.$gutterLayer.addGutterDecoration(e, t) }, this.removeGutterDecoration = function (e, t) { this.$gutterLayer.removeGutterDecoration(e, t) }, this.updateBreakpoints = function (e) { this.$loop.schedule(this.CHANGE_GUTTER) }, this.setAnnotations = function (e) { this.$gutterLayer.setAnnotations(e), this.$loop.schedule(this.CHANGE_GUTTER) }, this.updateCursor = function () { this.$loop.schedule(this.CHANGE_CURSOR) }, this.hideCursor = function () { this.$cursorLayer.hideCursor() }, this.showCursor = function () { this.$cursorLayer.showCursor() }, this.scrollSelectionIntoView = function (e, t, n) { this.scrollCursorIntoView(e, n), this.scrollCursorIntoView(t, n) }, this.scrollCursorIntoView = function (e, t, n) { if (this.$size.scrollerHeight === 0) return; var r = this.$cursorLayer.getPixelPosition(e), i = r.left, s = r.top, o = n && n.top || 0, u = n && n.bottom || 0, a = this.$scrollAnimation ? this.session.getScrollTop() : this.scrollTop; a + o > s ? (t && a + o > s + this.lineHeight && (s -= t * this.$size.scrollerHeight), s === 0 && (s = -this.scrollMargin.top), this.session.setScrollTop(s)) : a + this.$size.scrollerHeight - u < s + this.lineHeight && (t && a + this.$size.scrollerHeight - u < s - this.lineHeight && (s += t * this.$size.scrollerHeight), this.session.setScrollTop(s + this.lineHeight + u - this.$size.scrollerHeight)); var f = this.scrollLeft; f > i ? (i < this.$padding + 2 * this.layerConfig.characterWidth && (i = -this.scrollMargin.left), this.session.setScrollLeft(i)) : f + this.$size.scrollerWidth < i + this.characterWidth ? this.session.setScrollLeft(Math.round(i + this.characterWidth - this.$size.scrollerWidth)) : f <= this.$padding && i - f < this.characterWidth && this.session.setScrollLeft(0) }, this.getScrollTop = function () { return this.session.getScrollTop() }, this.getScrollLeft = function () { return this.session.getScrollLeft() }, this.getScrollTopRow = function () { return this.scrollTop / this.lineHeight }, this.getScrollBottomRow = function () { return Math.max(0, Math.floor((this.scrollTop + this.$size.scrollerHeight) / this.lineHeight) - 1) }, this.scrollToRow = function (e) { this.session.setScrollTop(e * this.lineHeight) }, this.alignCursor = function (e, t) { typeof e == "number" && (e = { row: e, column: 0 }); var n = this.$cursorLayer.getPixelPosition(e), r = this.$size.scrollerHeight - this.lineHeight, i = n.top - r * (t || 0); return this.session.setScrollTop(i), i }, this.STEPS = 8, this.$calcSteps = function (e, t) { var n = 0, r = this.STEPS, i = [], s = function (e, t, n) { return n * (Math.pow(e - 1, 3) + 1) + t }; for (n = 0; n < r; ++n)i.push(s(n / this.STEPS, e, t - e)); return i }, this.scrollToLine = function (e, t, n, r) { var i = this.$cursorLayer.getPixelPosition({ row: e, column: 0 }), s = i.top; t && (s -= this.$size.scrollerHeight / 2); var o = this.scrollTop; this.session.setScrollTop(s), n !== !1 && this.animateScrolling(o, r) }, this.animateScrolling = function (e, t) { var n = this.scrollTop; if (!this.$animatedScroll) return; var r = this; if (e == n) return; if (this.$scrollAnimation) { var i = this.$scrollAnimation.steps; if (i.length) { e = i[0]; if (e == n) return } } var s = r.$calcSteps(e, n); this.$scrollAnimation = { from: e, to: n, steps: s }, clearInterval(this.$timer), r.session.setScrollTop(s.shift()), r.session.$scrollTop = n, this.$timer = setInterval(function () { if (!r.session) return clearInterval(r.$timer); s.length ? (r.session.setScrollTop(s.shift()), r.session.$scrollTop = n) : n != null ? (r.session.$scrollTop = -1, r.session.setScrollTop(n), n = null) : (r.$timer = clearInterval(r.$timer), r.$scrollAnimation = null, t && t()) }, 10) }, this.scrollToY = function (e) { this.scrollTop !== e && (this.$loop.schedule(this.CHANGE_SCROLL), this.scrollTop = e) }, this.scrollToX = function (e) { this.scrollLeft !== e && (this.scrollLeft = e), this.$loop.schedule(this.CHANGE_H_SCROLL) }, this.scrollTo = function (e, t) { this.session.setScrollTop(t), this.session.setScrollLeft(t) }, this.scrollBy = function (e, t) { t && this.session.setScrollTop(this.session.getScrollTop() + t), e && this.session.setScrollLeft(this.session.getScrollLeft() + e) }, this.isScrollableBy = function (e, t) { if (t < 0 && this.session.getScrollTop() >= 1 - this.scrollMargin.top) return !0; if (t > 0 && this.session.getScrollTop() + this.$size.scrollerHeight - this.layerConfig.maxHeight < -1 + this.scrollMargin.bottom) return !0; if (e < 0 && this.session.getScrollLeft() >= 1 - this.scrollMargin.left) return !0; if (e > 0 && this.session.getScrollLeft() + this.$size.scrollerWidth - this.layerConfig.width < -1 + this.scrollMargin.right) return !0 }, this.pixelToScreenCoordinates = function (e, t) { var n; if (this.$hasCssTransforms) { n = { top: 0, left: 0 }; var r = this.$fontMetrics.transformCoordinates([e, t]); e = r[1] - this.gutterWidth - this.margin.left, t = r[0] } else n = this.scroller.getBoundingClientRect(); var i = e + this.scrollLeft - n.left - this.$padding, s = i / this.characterWidth, o = Math.floor((t + this.scrollTop - n.top) / this.lineHeight), u = this.$blockCursor ? Math.floor(s) : Math.round(s); return { row: o, column: u, side: s - u > 0 ? 1 : -1, offsetX: i } }, this.screenToTextCoordinates = function (e, t) { var n; if (this.$hasCssTransforms) { n = { top: 0, left: 0 }; var r = this.$fontMetrics.transformCoordinates([e, t]); e = r[1] - this.gutterWidth - this.margin.left, t = r[0] } else n = this.scroller.getBoundingClientRect(); var i = e + this.scrollLeft - n.left - this.$padding, s = i / this.characterWidth, o = this.$blockCursor ? Math.floor(s) : Math.round(s), u = Math.floor((t + this.scrollTop - n.top) / this.lineHeight); return this.session.screenToDocumentPosition(u, Math.max(o, 0), i) }, this.textToScreenCoordinates = function (e, t) { var n = this.scroller.getBoundingClientRect(), r = this.session.documentToScreenPosition(e, t), i = this.$padding + (this.session.$bidiHandler.isBidiRow(r.row, e) ? this.session.$bidiHandler.getPosLeft(r.column) : Math.round(r.column * this.characterWidth)), s = r.row * this.lineHeight; return { pageX: n.left + i - this.scrollLeft, pageY: n.top + s - this.scrollTop } }, this.visualizeFocus = function () { i.addCssClass(this.container, "ace_focus") }, this.visualizeBlur = function () { i.removeCssClass(this.container, "ace_focus") }, this.showComposition = function (e) { this.$composition = e, e.cssText || (e.cssText = this.textarea.style.cssText), e.useTextareaForIME == undefined && (e.useTextareaForIME = this.$useTextareaForIME), this.$useTextareaForIME ? (i.addCssClass(this.textarea, "ace_composition"), this.textarea.style.cssText = "", this.$moveTextAreaToCursor(), this.$cursorLayer.element.style.display = "none") : e.markerId = this.session.addMarker(e.markerRange, "ace_composition_marker", "text") }, this.setCompositionText = function (e) { var t = this.session.selection.cursor; this.addToken(e, "composition_placeholder", t.row, t.column), this.$moveTextAreaToCursor() }, this.hideComposition = function () { if (!this.$composition) return; this.$composition.markerId && this.session.removeMarker(this.$composition.markerId), i.removeCssClass(this.textarea, "ace_composition"), this.textarea.style.cssText = this.$composition.cssText; var e = this.session.selection.cursor; this.removeExtraToken(e.row, e.column), this.$composition = null, this.$cursorLayer.element.style.display = "" }, this.addToken = function (e, t, n, r) { var i = this.session; i.bgTokenizer.lines[n] = null; var s = { type: t, value: e }, o = i.getTokens(n); if (r == null) o.push(s); else { var u = 0; for (var a = 0; a < o.length; a++) { var f = o[a]; u += f.value.length; if (r <= u) { var l = f.value.length - (u - r), c = f.value.slice(0, l), h = f.value.slice(l); o.splice(a, 1, { type: f.type, value: c }, s, { type: f.type, value: h }); break } } } this.updateLines(n, n) }, this.removeExtraToken = function (e, t) { this.updateLines(e, e) }, this.setTheme = function (e, t) { function o(r) { if (n.$themeId != e) return t && t(); if (!r || !r.cssClass) throw new Error("couldn't load module " + e + " or it didn't call define"); r.$id && (n.$themeId = r.$id), i.importCssString(r.cssText, r.cssClass, n.container), n.theme && i.removeCssClass(n.container, n.theme.cssClass); var s = "padding" in r ? r.padding : "padding" in (n.theme || {}) ? 4 : n.$padding; n.$padding && s != n.$padding && n.setPadding(s), n.$theme = r.cssClass, n.theme = r, i.addCssClass(n.container, r.cssClass), i.setCssClass(n.container, "ace_dark", r.isDark), n.$size && (n.$size.width = 0, n.$updateSizeAsync()), n._dispatchEvent("themeLoaded", { theme: r }), t && t() } var n = this; this.$themeId = e, n._dispatchEvent("themeChange", { theme: e }); if (!e || typeof e == "string") { var r = e || this.$options.theme.initialValue; s.loadModule(["theme", r], o) } else o(e) }, this.getTheme = function () { return this.$themeId }, this.setStyle = function (e, t) { i.setCssClass(this.container, e, t !== !1) }, this.unsetStyle = function (e) { i.removeCssClass(this.container, e) }, this.setCursorStyle = function (e) { i.setStyle(this.scroller.style, "cursor", e) }, this.setMouseCursor = function (e) { i.setStyle(this.scroller.style, "cursor", e) }, this.attachToShadowRoot = function () { i.importCssString(v, "ace_editor.css", this.container) }, this.destroy = function () { this.freeze(), this.$fontMetrics.destroy(), this.$cursorLayer.destroy(), this.removeAllListeners(), this.container.textContent = "" } }).call(y.prototype), s.defineOptions(y.prototype, "renderer", { animatedScroll: { initialValue: !1 }, showInvisibles: { set: function (e) { this.$textLayer.setShowInvisibles(e) && this.$loop.schedule(this.CHANGE_TEXT) }, initialValue: !1 }, showPrintMargin: { set: function () { this.$updatePrintMargin() }, initialValue: !0 }, printMarginColumn: { set: function () { this.$updatePrintMargin() }, initialValue: 80 }, printMargin: { set: function (e) { typeof e == "number" && (this.$printMarginColumn = e), this.$showPrintMargin = !!e, this.$updatePrintMargin() }, get: function () { return this.$showPrintMargin && this.$printMarginColumn } }, showGutter: { set: function (e) { this.$gutter.style.display = e ? "block" : "none", this.$loop.schedule(this.CHANGE_FULL), this.onGutterResize() }, initialValue: !0 }, fadeFoldWidgets: { set: function (e) { i.setCssClass(this.$gutter, "ace_fade-fold-widgets", e) }, initialValue: !1 }, showFoldWidgets: { set: function (e) { this.$gutterLayer.setShowFoldWidgets(e), this.$loop.schedule(this.CHANGE_GUTTER) }, initialValue: !0 }, displayIndentGuides: { set: function (e) { this.$textLayer.setDisplayIndentGuides(e) && this.$loop.schedule(this.CHANGE_TEXT) }, initialValue: !0 }, highlightGutterLine: { set: function (e) { this.$gutterLayer.setHighlightGutterLine(e), this.$loop.schedule(this.CHANGE_GUTTER) }, initialValue: !0 }, hScrollBarAlwaysVisible: { set: function (e) { (!this.$hScrollBarAlwaysVisible || !this.$horizScroll) && this.$loop.schedule(this.CHANGE_SCROLL) }, initialValue: !1 }, vScrollBarAlwaysVisible: { set: function (e) { (!this.$vScrollBarAlwaysVisible || !this.$vScroll) && this.$loop.schedule(this.CHANGE_SCROLL) }, initialValue: !1 }, fontSize: { set: function (e) { typeof e == "number" && (e += "px"), this.container.style.fontSize = e, this.updateFontSize() }, initialValue: 12 }, fontFamily: { set: function (e) { this.container.style.fontFamily = e, this.updateFontSize() } }, maxLines: { set: function (e) { this.updateFull() } }, minLines: { set: function (e) { this.$minLines < 562949953421311 || (this.$minLines = 0), this.updateFull() } }, maxPixelHeight: { set: function (e) { this.updateFull() }, initialValue: 0 }, scrollPastEnd: { set: function (e) { e = +e || 0; if (this.$scrollPastEnd == e) return; this.$scrollPastEnd = e, this.$loop.schedule(this.CHANGE_SCROLL) }, initialValue: 0, handlesSet: !0 }, fixedWidthGutter: { set: function (e) { this.$gutterLayer.$fixedWidth = !!e, this.$loop.schedule(this.CHANGE_GUTTER) } }, theme: { set: function (e) { this.setTheme(e) }, get: function () { return this.$themeId || this.theme }, initialValue: "./theme/textmate", handlesSet: !0 }, hasCssTransforms: {}, useTextareaForIME: { initialValue: !m.isMobile && !m.isIE } }), t.VirtualRenderer = y }), define("ace/worker/worker_client", ["require", "exports", "module", "ace/lib/oop", "ace/lib/net", "ace/lib/event_emitter", "ace/config"], function (e, t, n) { "use strict"; function u(e) { var t = "importScripts('" + i.qualifyURL(e) + "');"; try { return new Blob([t], { type: "application/javascript" }) } catch (n) { var r = window.BlobBuilder || window.WebKitBlobBuilder || window.MozBlobBuilder, s = new r; return s.append(t), s.getBlob("application/javascript") } } function a(e) { if (typeof Worker == "undefined") return { postMessage: function () { }, terminate: function () { } }; if (o.get("loadWorkerFromBlob")) { var t = u(e), n = window.URL || window.webkitURL, r = n.createObjectURL(t); return new Worker(r) } return new Worker(e) } var r = e("../lib/oop"), i = e("../lib/net"), s = e("../lib/event_emitter").EventEmitter, o = e("../config"), f = function (e) { e.postMessage || (e = this.$createWorkerFromOldConfig.apply(this, arguments)), this.$worker = e, this.$sendDeltaQueue = this.$sendDeltaQueue.bind(this), this.changeListener = this.changeListener.bind(this), this.onMessage = this.onMessage.bind(this), this.callbackId = 1, this.callbacks = {}, this.$worker.onmessage = this.onMessage }; (function () { r.implement(this, s), this.$createWorkerFromOldConfig = function (t, n, r, i, s) { e.nameToUrl && !e.toUrl && (e.toUrl = e.nameToUrl); if (o.get("packaged") || !e.toUrl) i = i || o.moduleUrl(n, "worker"); else { var u = this.$normalizePath; i = i || u(e.toUrl("ace/worker/worker.js", null, "_")); var f = {}; t.forEach(function (t) { f[t] = u(e.toUrl(t, null, "_").replace(/(\.js)?(\?.*)?$/, "")) }) } return this.$worker = a(i), s && this.send("importScripts", s), this.$worker.postMessage({ init: !0, tlns: f, module: n, classname: r }), this.$worker }, this.onMessage = function (e) { var t = e.data; switch (t.type) { case "event": this._signal(t.name, { data: t.data }); break; case "call": var n = this.callbacks[t.id]; n && (n(t.data), delete this.callbacks[t.id]); break; case "error": this.reportError(t.data); break; case "log": window.console && console.log && console.log.apply(console, t.data) } }, this.reportError = function (e) { window.console && console.error && console.error(e) }, this.$normalizePath = function (e) { return i.qualifyURL(e) }, this.terminate = function () { this._signal("terminate", {}), this.deltaQueue = null, this.$worker.terminate(), this.$worker = null, this.$doc && this.$doc.off("change", this.changeListener), this.$doc = null }, this.send = function (e, t) { this.$worker.postMessage({ command: e, args: t }) }, this.call = function (e, t, n) { if (n) { var r = this.callbackId++; this.callbacks[r] = n, t.push(r) } this.send(e, t) }, this.emit = function (e, t) { try { t.data && t.data.err && (t.data.err = { message: t.data.err.message, stack: t.data.err.stack, code: t.data.err.code }), this.$worker.postMessage({ event: e, data: { data: t.data } }) } catch (n) { console.error(n.stack) } }, this.attachToDocument = function (e) { this.$doc && this.terminate(), this.$doc = e, this.call("setValue", [e.getValue()]), e.on("change", this.changeListener) }, this.changeListener = function (e) { this.deltaQueue || (this.deltaQueue = [], setTimeout(this.$sendDeltaQueue, 0)), e.action == "insert" ? this.deltaQueue.push(e.start, e.lines) : this.deltaQueue.push(e.start, e.end) }, this.$sendDeltaQueue = function () { var e = this.deltaQueue; if (!e) return; this.deltaQueue = null, e.length > 50 && e.length > this.$doc.getLength() >> 1 ? this.call("setValue", [this.$doc.getValue()]) : this.emit("change", { data: e }) } }).call(f.prototype); var l = function (e, t, n) { var r = null, i = !1, u = Object.create(s), a = [], l = new f({ messageBuffer: a, terminate: function () { }, postMessage: function (e) { a.push(e); if (!r) return; i ? setTimeout(c) : c() } }); l.setEmitSync = function (e) { i = e }; var c = function () { var e = a.shift(); e.command ? r[e.command].apply(r, e.args) : e.event && u._signal(e.event, e.data) }; return u.postMessage = function (e) { l.onMessage({ data: e }) }, u.callback = function (e, t) { this.postMessage({ type: "call", id: t, data: e }) }, u.emit = function (e, t) { this.postMessage({ type: "event", name: e, data: t }) }, o.loadModule(["worker", t], function (e) { r = new e[n](u); while (a.length) c() }), l }; t.UIWorkerClient = l, t.WorkerClient = f, t.createWorker = a }), define("ace/placeholder", ["require", "exports", "module", "ace/range", "ace/lib/event_emitter", "ace/lib/oop"], function (e, t, n) { "use strict"; var r = e("./range").Range, i = e("./lib/event_emitter").EventEmitter, s = e("./lib/oop"), o = function (e, t, n, r, i, s) { var o = this; this.length = t, this.session = e, this.doc = e.getDocument(), this.mainClass = i, this.othersClass = s, this.$onUpdate = this.onUpdate.bind(this), this.doc.on("change", this.$onUpdate), this.$others = r, this.$onCursorChange = function () { setTimeout(function () { o.onCursorChange() }) }, this.$pos = n; var u = e.getUndoManager().$undoStack || e.getUndoManager().$undostack || { length: -1 }; this.$undoStackDepth = u.length, this.setup(), e.selection.on("changeCursor", this.$onCursorChange) }; (function () { s.implement(this, i), this.setup = function () { var e = this, t = this.doc, n = this.session; this.selectionBefore = n.selection.toJSON(), n.selection.inMultiSelectMode && n.selection.toSingleRange(), this.pos = t.createAnchor(this.$pos.row, this.$pos.column); var i = this.pos; i.$insertRight = !0, i.detach(), i.markerId = n.addMarker(new r(i.row, i.column, i.row, i.column + this.length), this.mainClass, null, !1), this.others = [], this.$others.forEach(function (n) { var r = t.createAnchor(n.row, n.column); r.$insertRight = !0, r.detach(), e.others.push(r) }), n.setUndoSelect(!1) }, this.showOtherMarkers = function () { if (this.othersActive) return; var e = this.session, t = this; this.othersActive = !0, this.others.forEach(function (n) { n.markerId = e.addMarker(new r(n.row, n.column, n.row, n.column + t.length), t.othersClass, null, !1) }) }, this.hideOtherMarkers = function () { if (!this.othersActive) return; this.othersActive = !1; for (var e = 0; e < this.others.length; e++)this.session.removeMarker(this.others[e].markerId) }, this.onUpdate = function (e) { if (this.$updating) return this.updateAnchors(e); var t = e; if (t.start.row !== t.end.row) return; if (t.start.row !== this.pos.row) return; this.$updating = !0; var n = e.action === "insert" ? t.end.column - t.start.column : t.start.column - t.end.column, i = t.start.column >= this.pos.column && t.start.column <= this.pos.column + this.length + 1, s = t.start.column - this.pos.column; this.updateAnchors(e), i && (this.length += n); if (i && !this.session.$fromUndo) if (e.action === "insert") for (var o = this.others.length - 1; o >= 0; o--) { var u = this.others[o], a = { row: u.row, column: u.column + s }; this.doc.insertMergedLines(a, e.lines) } else if (e.action === "remove") for (var o = this.others.length - 1; o >= 0; o--) { var u = this.others[o], a = { row: u.row, column: u.column + s }; this.doc.remove(new r(a.row, a.column, a.row, a.column - n)) } this.$updating = !1, this.updateMarkers() }, this.updateAnchors = function (e) { this.pos.onChange(e); for (var t = this.others.length; t--;)this.others[t].onChange(e); this.updateMarkers() }, this.updateMarkers = function () { if (this.$updating) return; var e = this, t = this.session, n = function (n, i) { t.removeMarker(n.markerId), n.markerId = t.addMarker(new r(n.row, n.column, n.row, n.column + e.length), i, null, !1) }; n(this.pos, this.mainClass); for (var i = this.others.length; i--;)n(this.others[i], this.othersClass) }, this.onCursorChange = function (e) { if (this.$updating || !this.session) return; var t = this.session.selection.getCursor(); t.row === this.pos.row && t.column >= this.pos.column && t.column <= this.pos.column + this.length ? (this.showOtherMarkers(), this._emit("cursorEnter", e)) : (this.hideOtherMarkers(), this._emit("cursorLeave", e)) }, this.detach = function () { this.session.removeMarker(this.pos && this.pos.markerId), this.hideOtherMarkers(), this.doc.off("change", this.$onUpdate), this.session.selection.off("changeCursor", this.$onCursorChange), this.session.setUndoSelect(!0), this.session = null }, this.cancel = function () { if (this.$undoStackDepth === -1) return; var e = this.session.getUndoManager(), t = (e.$undoStack || e.$undostack).length - this.$undoStackDepth; for (var n = 0; n < t; n++)e.undo(this.session, !0); this.selectionBefore && this.session.selection.fromJSON(this.selectionBefore) } }).call(o.prototype), t.PlaceHolder = o }), define("ace/mouse/multi_select_handler", ["require", "exports", "module", "ace/lib/event", "ace/lib/useragent"], function (e, t, n) { function s(e, t) { return e.row == t.row && e.column == t.column } function o(e) { var t = e.domEvent, n = t.altKey, o = t.shiftKey, u = t.ctrlKey, a = e.getAccelKey(), f = e.getButton(); u && i.isMac && (f = t.button); if (e.editor.inMultiSelectMode && f == 2) { e.editor.textInput.onContextMenu(e.domEvent); return } if (!u && !n && !a) { f === 0 && e.editor.inMultiSelectMode && e.editor.exitMultiSelectMode(); return } if (f !== 0) return; var l = e.editor, c = l.selection, h = l.inMultiSelectMode, p = e.getDocumentPosition(), d = c.getCursor(), v = e.inSelection() || c.isEmpty() && s(p, d), m = e.x, g = e.y, y = function (e) { m = e.clientX, g = e.clientY }, b = l.session, w = l.renderer.pixelToScreenCoordinates(m, g), E = w, S; if (l.$mouseHandler.$enableJumpToDef) u && n || a && n ? S = o ? "block" : "add" : n && l.$blockSelectEnabled && (S = "block"); else if (a && !n) { S = "add"; if (!h && o) return } else n && l.$blockSelectEnabled && (S = "block"); S && i.isMac && t.ctrlKey && l.$mouseHandler.cancelContextMenu(); if (S == "add") { if (!h && v) return; if (!h) { var x = c.toOrientedRange(); l.addSelectionMarker(x) } var T = c.rangeList.rangeAtPoint(p); l.inVirtualSelectionMode = !0, o && (T = null, x = c.ranges[0] || x, l.removeSelectionMarker(x)), l.once("mouseup", function () { var e = c.toOrientedRange(); T && e.isEmpty() && s(T.cursor, e.cursor) ? c.substractPoint(e.cursor) : (o ? c.substractPoint(x.cursor) : x && (l.removeSelectionMarker(x), c.addRange(x)), c.addRange(e)), l.inVirtualSelectionMode = !1 }) } else if (S == "block") { e.stop(), l.inVirtualSelectionMode = !0; var N, C = [], k = function () { var e = l.renderer.pixelToScreenCoordinates(m, g), t = b.screenToDocumentPosition(e.row, e.column, e.offsetX); if (s(E, e) && s(t, c.lead)) return; E = e, l.selection.moveToPosition(t), l.renderer.scrollCursorIntoView(), l.removeSelectionMarkers(C), C = c.rectangularRangeBlock(E, w), l.$mouseHandler.$clickSelection && C.length == 1 && C[0].isEmpty() && (C[0] = l.$mouseHandler.$clickSelection.clone()), C.forEach(l.addSelectionMarker, l), l.updateSelectionMarkers() }; h && !a ? c.toSingleRange() : !h && a && (N = c.toOrientedRange(), l.addSelectionMarker(N)), o ? w = b.documentToScreenPosition(c.lead) : c.moveToPosition(p), E = { row: -1, column: -1 }; var L = function (e) { k(), clearInterval(O), l.removeSelectionMarkers(C), C.length || (C = [c.toOrientedRange()]), N && (l.removeSelectionMarker(N), c.toSingleRange(N)); for (var t = 0; t < C.length; t++)c.addRange(C[t]); l.inVirtualSelectionMode = !1, l.$mouseHandler.$clickSelection = null }, A = k; r.capture(l.container, y, L); var O = setInterval(function () { A() }, 20); return e.preventDefault() } } var r = e("../lib/event"), i = e("../lib/useragent"); t.onMouseDown = o }), define("ace/commands/multi_select_commands", ["require", "exports", "module", "ace/keyboard/hash_handler"], function (e, t, n) { t.defaultCommands = [{ name: "addCursorAbove", description: "Add cursor above", exec: function (e) { e.selectMoreLines(-1) }, bindKey: { win: "Ctrl-Alt-Up", mac: "Ctrl-Alt-Up" }, scrollIntoView: "cursor", readOnly: !0 }, { name: "addCursorBelow", description: "Add cursor below", exec: function (e) { e.selectMoreLines(1) }, bindKey: { win: "Ctrl-Alt-Down", mac: "Ctrl-Alt-Down" }, scrollIntoView: "cursor", readOnly: !0 }, { name: "addCursorAboveSkipCurrent", description: "Add cursor above (skip current)", exec: function (e) { e.selectMoreLines(-1, !0) }, bindKey: { win: "Ctrl-Alt-Shift-Up", mac: "Ctrl-Alt-Shift-Up" }, scrollIntoView: "cursor", readOnly: !0 }, { name: "addCursorBelowSkipCurrent", description: "Add cursor below (skip current)", exec: function (e) { e.selectMoreLines(1, !0) }, bindKey: { win: "Ctrl-Alt-Shift-Down", mac: "Ctrl-Alt-Shift-Down" }, scrollIntoView: "cursor", readOnly: !0 }, { name: "selectMoreBefore", description: "Select more before", exec: function (e) { e.selectMore(-1) }, bindKey: { win: "Ctrl-Alt-Left", mac: "Ctrl-Alt-Left" }, scrollIntoView: "cursor", readOnly: !0 }, { name: "selectMoreAfter", description: "Select more after", exec: function (e) { e.selectMore(1) }, bindKey: { win: "Ctrl-Alt-Right", mac: "Ctrl-Alt-Right" }, scrollIntoView: "cursor", readOnly: !0 }, { name: "selectNextBefore", description: "Select next before", exec: function (e) { e.selectMore(-1, !0) }, bindKey: { win: "Ctrl-Alt-Shift-Left", mac: "Ctrl-Alt-Shift-Left" }, scrollIntoView: "cursor", readOnly: !0 }, { name: "selectNextAfter", description: "Select next after", exec: function (e) { e.selectMore(1, !0) }, bindKey: { win: "Ctrl-Alt-Shift-Right", mac: "Ctrl-Alt-Shift-Right" }, scrollIntoView: "cursor", readOnly: !0 }, { name: "toggleSplitSelectionIntoLines", description: "Split into lines", exec: function (e) { e.multiSelect.rangeCount > 1 ? e.multiSelect.joinSelections() : e.multiSelect.splitIntoLines() }, bindKey: { win: "Ctrl-Alt-L", mac: "Ctrl-Alt-L" }, readOnly: !0 }, { name: "splitSelectionIntoLines", description: "Split into lines", exec: function (e) { e.multiSelect.splitIntoLines() }, readOnly: !0 }, { name: "alignCursors", description: "Align cursors", exec: function (e) { e.alignCursors() }, bindKey: { win: "Ctrl-Alt-A", mac: "Ctrl-Alt-A" }, scrollIntoView: "cursor" }, { name: "findAll", description: "Find all", exec: function (e) { e.findAll() }, bindKey: { win: "Ctrl-Alt-K", mac: "Ctrl-Alt-G" }, scrollIntoView: "cursor", readOnly: !0 }], t.multiSelectCommands = [{ name: "singleSelection", description: "Single selection", bindKey: "esc", exec: function (e) { e.exitMultiSelectMode() }, scrollIntoView: "cursor", readOnly: !0, isAvailable: function (e) { return e && e.inMultiSelectMode } }]; var r = e("../keyboard/hash_handler").HashHandler; t.keyboardHandler = new r(t.multiSelectCommands) }), define("ace/multi_select", ["require", "exports", "module", "ace/range_list", "ace/range", "ace/selection", "ace/mouse/multi_select_handler", "ace/lib/event", "ace/lib/lang", "ace/commands/multi_select_commands", "ace/search", "ace/edit_session", "ace/editor", "ace/config"], function (e, t, n) { function h(e, t, n) { return c.$options.wrap = !0, c.$options.needle = t, c.$options.backwards = n == -1, c.find(e) } function v(e, t) { return e.row == t.row && e.column == t.column } function m(e) { if (e.$multiselectOnSessionChange) return; e.$onAddRange = e.$onAddRange.bind(e), e.$onRemoveRange = e.$onRemoveRange.bind(e), e.$onMultiSelect = e.$onMultiSelect.bind(e), e.$onSingleSelect = e.$onSingleSelect.bind(e), e.$multiselectOnSessionChange = t.onSessionChange.bind(e), e.$checkMultiselectChange = e.$checkMultiselectChange.bind(e), e.$multiselectOnSessionChange(e), e.on("changeSession", e.$multiselectOnSessionChange), e.on("mousedown", o), e.commands.addCommands(f.defaultCommands), g(e) } function g(e) { function r(t) { n && (e.renderer.setMouseCursor(""), n = !1) } if (!e.textInput) return; var t = e.textInput.getElement(), n = !1; u.addListener(t, "keydown", function (t) { var i = t.keyCode == 18 && !(t.ctrlKey || t.shiftKey || t.metaKey); e.$blockSelectEnabled && i ? n || (e.renderer.setMouseCursor("crosshair"), n = !0) : n && r() }, e), u.addListener(t, "keyup", r, e), u.addListener(t, "blur", r, e) } var r = e("./range_list").RangeList, i = e("./range").Range, s = e("./selection").Selection, o = e("./mouse/multi_select_handler").onMouseDown, u = e("./lib/event"), a = e("./lib/lang"), f = e("./commands/multi_select_commands"); t.commands = f.defaultCommands.concat(f.multiSelectCommands); var l = e("./search").Search, c = new l, p = e("./edit_session").EditSession; (function () { this.getSelectionMarkers = function () { return this.$selectionMarkers } }).call(p.prototype), function () { this.ranges = null, this.rangeList = null, this.addRange = function (e, t) { if (!e) return; if (!this.inMultiSelectMode && this.rangeCount === 0) { var n = this.toOrientedRange(); this.rangeList.add(n), this.rangeList.add(e); if (this.rangeList.ranges.length != 2) return this.rangeList.removeAll(), t || this.fromOrientedRange(e); this.rangeList.removeAll(), this.rangeList.add(n), this.$onAddRange(n) } e.cursor || (e.cursor = e.end); var r = this.rangeList.add(e); return this.$onAddRange(e), r.length && this.$onRemoveRange(r), this.rangeCount > 1 && !this.inMultiSelectMode && (this._signal("multiSelect"), this.inMultiSelectMode = !0, this.session.$undoSelect = !1, this.rangeList.attach(this.session)), t || this.fromOrientedRange(e) }, this.toSingleRange = function (e) { e = e || this.ranges[0]; var t = this.rangeList.removeAll(); t.length && this.$onRemoveRange(t), e && this.fromOrientedRange(e) }, this.substractPoint = function (e) { var t = this.rangeList.substractPoint(e); if (t) return this.$onRemoveRange(t), t[0] }, this.mergeOverlappingRanges = function () { var e = this.rangeList.merge(); e.length && this.$onRemoveRange(e) }, this.$onAddRange = function (e) { this.rangeCount = this.rangeList.ranges.length, this.ranges.unshift(e), this._signal("addRange", { range: e }) }, this.$onRemoveRange = function (e) { this.rangeCount = this.rangeList.ranges.length; if (this.rangeCount == 1 && this.inMultiSelectMode) { var t = this.rangeList.ranges.pop(); e.push(t), this.rangeCount = 0 } for (var n = e.length; n--;) { var r = this.ranges.indexOf(e[n]); this.ranges.splice(r, 1) } this._signal("removeRange", { ranges: e }), this.rangeCount === 0 && this.inMultiSelectMode && (this.inMultiSelectMode = !1, this._signal("singleSelect"), this.session.$undoSelect = !0, this.rangeList.detach(this.session)), t = t || this.ranges[0], t && !t.isEqual(this.getRange()) && this.fromOrientedRange(t) }, this.$initRangeList = function () { if (this.rangeList) return; this.rangeList = new r, this.ranges = [], this.rangeCount = 0 }, this.getAllRanges = function () { return this.rangeCount ? this.rangeList.ranges.concat() : [this.getRange()] }, this.splitIntoLines = function () { var e = this.ranges.length ? this.ranges : [this.getRange()], t = []; for (var n = 0; n < e.length; n++) { var r = e[n], s = r.start.row, o = r.end.row; if (s === o) t.push(r.clone()); else { t.push(new i(s, r.start.column, s, this.session.getLine(s).length)); while (++s < o) t.push(this.getLineRange(s, !0)); t.push(new i(o, 0, o, r.end.column)) } n == 0 && !this.isBackwards() && (t = t.reverse()) } this.toSingleRange(); for (var n = t.length; n--;)this.addRange(t[n]) }, this.joinSelections = function () { var e = this.rangeList.ranges, t = e[e.length - 1], n = i.fromPoints(e[0].start, t.end); this.toSingleRange(), this.setSelectionRange(n, t.cursor == t.start) }, this.toggleBlockSelection = function () { if (this.rangeCount > 1) { var e = this.rangeList.ranges, t = e[e.length - 1], n = i.fromPoints(e[0].start, t.end); this.toSingleRange(), this.setSelectionRange(n, t.cursor == t.start) } else { var r = this.session.documentToScreenPosition(this.cursor), s = this.session.documentToScreenPosition(this.anchor), o = this.rectangularRangeBlock(r, s); o.forEach(this.addRange, this) } }, this.rectangularRangeBlock = function (e, t, n) { var r = [], s = e.column < t.column; if (s) var o = e.column, u = t.column, a = e.offsetX, f = t.offsetX; else var o = t.column, u = e.column, a = t.offsetX, f = e.offsetX; var l = e.row < t.row; if (l) var c = e.row, h = t.row; else var c = t.row, h = e.row; o < 0 && (o = 0), c < 0 && (c = 0), c == h && (n = !0); var p; for (var d = c; d <= h; d++) { var m = i.fromPoints(this.session.screenToDocumentPosition(d, o, a), this.session.screenToDocumentPosition(d, u, f)); if (m.isEmpty()) { if (p && v(m.end, p)) break; p = m.end } m.cursor = s ? m.start : m.end, r.push(m) } l && r.reverse(); if (!n) { var g = r.length - 1; while (r[g].isEmpty() && g > 0) g--; if (g > 0) { var y = 0; while (r[y].isEmpty()) y++ } for (var b = g; b >= y; b--)r[b].isEmpty() && r.splice(b, 1) } return r } }.call(s.prototype); var d = e("./editor").Editor; (function () { this.updateSelectionMarkers = function () { this.renderer.updateCursor(), this.renderer.updateBackMarkers() }, this.addSelectionMarker = function (e) { e.cursor || (e.cursor = e.end); var t = this.getSelectionStyle(); return e.marker = this.session.addMarker(e, "ace_selection", t), this.session.$selectionMarkers.push(e), this.session.selectionMarkerCount = this.session.$selectionMarkers.length, e }, this.removeSelectionMarker = function (e) { if (!e.marker) return; this.session.removeMarker(e.marker); var t = this.session.$selectionMarkers.indexOf(e); t != -1 && this.session.$selectionMarkers.splice(t, 1), this.session.selectionMarkerCount = this.session.$selectionMarkers.length }, this.removeSelectionMarkers = function (e) { var t = this.session.$selectionMarkers; for (var n = e.length; n--;) { var r = e[n]; if (!r.marker) continue; this.session.removeMarker(r.marker); var i = t.indexOf(r); i != -1 && t.splice(i, 1) } this.session.selectionMarkerCount = t.length }, this.$onAddRange = function (e) { this.addSelectionMarker(e.range), this.renderer.updateCursor(), this.renderer.updateBackMarkers() }, this.$onRemoveRange = function (e) { this.removeSelectionMarkers(e.ranges), this.renderer.updateCursor(), this.renderer.updateBackMarkers() }, this.$onMultiSelect = function (e) { if (this.inMultiSelectMode) return; this.inMultiSelectMode = !0, this.setStyle("ace_multiselect"), this.keyBinding.addKeyboardHandler(f.keyboardHandler), this.commands.setDefaultHandler("exec", this.$onMultiSelectExec), this.renderer.updateCursor(), this.renderer.updateBackMarkers() }, this.$onSingleSelect = function (e) { if (this.session.multiSelect.inVirtualMode) return; this.inMultiSelectMode = !1, this.unsetStyle("ace_multiselect"), this.keyBinding.removeKeyboardHandler(f.keyboardHandler), this.commands.removeDefaultHandler("exec", this.$onMultiSelectExec), this.renderer.updateCursor(), this.renderer.updateBackMarkers(), this._emit("changeSelection") }, this.$onMultiSelectExec = function (e) { var t = e.command, n = e.editor; if (!n.multiSelect) return; if (!t.multiSelectAction) { var r = t.exec(n, e.args || {}); n.multiSelect.addRange(n.multiSelect.toOrientedRange()), n.multiSelect.mergeOverlappingRanges() } else t.multiSelectAction == "forEach" ? r = n.forEachSelection(t, e.args) : t.multiSelectAction == "forEachLine" ? r = n.forEachSelection(t, e.args, !0) : t.multiSelectAction == "single" ? (n.exitMultiSelectMode(), r = t.exec(n, e.args || {})) : r = t.multiSelectAction(n, e.args || {}); return r }, this.forEachSelection = function (e, t, n) { if (this.inVirtualSelectionMode) return; var r = n && n.keepOrder, i = n == 1 || n && n.$byLines, o = this.session, u = this.selection, a = u.rangeList, f = (r ? u : a).ranges, l; if (!f.length) return e.exec ? e.exec(this, t || {}) : e(this, t || {}); var c = u._eventRegistry; u._eventRegistry = {}; var h = new s(o); this.inVirtualSelectionMode = !0; for (var p = f.length; p--;) { if (i) while (p > 0 && f[p].start.row == f[p - 1].end.row) p--; h.fromOrientedRange(f[p]), h.index = p, this.selection = o.selection = h; var d = e.exec ? e.exec(this, t || {}) : e(this, t || {}); !l && d !== undefined && (l = d), h.toOrientedRange(f[p]) } h.detach(), this.selection = o.selection = u, this.inVirtualSelectionMode = !1, u._eventRegistry = c, u.mergeOverlappingRanges(), u.ranges[0] && u.fromOrientedRange(u.ranges[0]); var v = this.renderer.$scrollAnimation; return this.onCursorChange(), this.onSelectionChange(), v && v.from == v.to && this.renderer.animateScrolling(v.from), l }, this.exitMultiSelectMode = function () { if (!this.inMultiSelectMode || this.inVirtualSelectionMode) return; this.multiSelect.toSingleRange() }, this.getSelectedText = function () { var e = ""; if (this.inMultiSelectMode && !this.inVirtualSelectionMode) { var t = this.multiSelect.rangeList.ranges, n = []; for (var r = 0; r < t.length; r++)n.push(this.session.getTextRange(t[r])); var i = this.session.getDocument().getNewLineCharacter(); e = n.join(i), e.length == (n.length - 1) * i.length && (e = "") } else this.selection.isEmpty() || (e = this.session.getTextRange(this.getSelectionRange())); return e }, this.$checkMultiselectChange = function (e, t) { if (this.inMultiSelectMode && !this.inVirtualSelectionMode) { var n = this.multiSelect.ranges[0]; if (this.multiSelect.isEmpty() && t == this.multiSelect.anchor) return; var r = t == this.multiSelect.anchor ? n.cursor == n.start ? n.end : n.start : n.cursor; r.row != t.row || this.session.$clipPositionToDocument(r.row, r.column).column != t.column ? this.multiSelect.toSingleRange(this.multiSelect.toOrientedRange()) : this.multiSelect.mergeOverlappingRanges() } }, this.findAll = function (e, t, n) { t = t || {}, t.needle = e || t.needle; if (t.needle == undefined) { var r = this.selection.isEmpty() ? this.selection.getWordRange() : this.selection.getRange(); t.needle = this.session.getTextRange(r) } this.$search.set(t); var i = this.$search.findAll(this.session); if (!i.length) return 0; var s = this.multiSelect; n || s.toSingleRange(i[0]); for (var o = i.length; o--;)s.addRange(i[o], !0); return r && s.rangeList.rangeAtPoint(r.start) && s.addRange(r, !0), i.length }, this.selectMoreLines = function (e, t) { var n = this.selection.toOrientedRange(), r = n.cursor == n.end, s = this.session.documentToScreenPosition(n.cursor); this.selection.$desiredColumn && (s.column = this.selection.$desiredColumn); var o = this.session.screenToDocumentPosition(s.row + e, s.column); if (!n.isEmpty()) var u = this.session.documentToScreenPosition(r ? n.end : n.start), a = this.session.screenToDocumentPosition(u.row + e, u.column); else var a = o; if (r) { var f = i.fromPoints(o, a); f.cursor = f.start } else { var f = i.fromPoints(a, o); f.cursor = f.end } f.desiredColumn = s.column; if (!this.selection.inMultiSelectMode) this.selection.addRange(n); else if (t) var l = n.cursor; this.selection.addRange(f), l && this.selection.substractPoint(l) }, this.transposeSelections = function (e) { var t = this.session, n = t.multiSelect, r = n.ranges; for (var i = r.length; i--;) { var s = r[i]; if (s.isEmpty()) { var o = t.getWordRange(s.start.row, s.start.column); s.start.row = o.start.row, s.start.column = o.start.column, s.end.row = o.end.row, s.end.column = o.end.column } } n.mergeOverlappingRanges(); var u = []; for (var i = r.length; i--;) { var s = r[i]; u.unshift(t.getTextRange(s)) } e < 0 ? u.unshift(u.pop()) : u.push(u.shift()); for (var i = r.length; i--;) { var s = r[i], o = s.clone(); t.replace(s, u[i]), s.start.row = o.start.row, s.start.column = o.start.column } n.fromOrientedRange(n.ranges[0]) }, this.selectMore = function (e, t, n) { var r = this.session, i = r.multiSelect, s = i.toOrientedRange(); if (s.isEmpty()) { s = r.getWordRange(s.start.row, s.start.column), s.cursor = e == -1 ? s.start : s.end, this.multiSelect.addRange(s); if (n) return } var o = r.getTextRange(s), u = h(r, o, e); u && (u.cursor = e == -1 ? u.start : u.end, this.session.unfold(u), this.multiSelect.addRange(u), this.renderer.scrollCursorIntoView(null, .5)), t && this.multiSelect.substractPoint(s.cursor) }, this.alignCursors = function () { var e = this.session, t = e.multiSelect, n = t.ranges, r = -1, s = n.filter(function (e) { if (e.cursor.row == r) return !0; r = e.cursor.row }); if (!n.length || s.length == n.length - 1) { var o = this.selection.getRange(), u = o.start.row, f = o.end.row, l = u == f; if (l) { var c = this.session.getLength(), h; do h = this.session.getLine(f); while (/[=:]/.test(h) && ++f < c); do h = this.session.getLine(u); while (/[=:]/.test(h) && --u > 0); u < 0 && (u = 0), f >= c && (f = c - 1) } var p = this.session.removeFullLines(u, f); p = this.$reAlignText(p, l), this.session.insert({ row: u, column: 0 }, p.join("\n") + "\n"), l || (o.start.column = 0, o.end.column = p[p.length - 1].length), this.selection.setRange(o) } else { s.forEach(function (e) { t.substractPoint(e.cursor) }); var d = 0, v = Infinity, m = n.map(function (t) { var n = t.cursor, r = e.getLine(n.row), i = r.substr(n.column).search(/\S/g); return i == -1 && (i = 0), n.column > d && (d = n.column), i < v && (v = i), i }); n.forEach(function (t, n) { var r = t.cursor, s = d - r.column, o = m[n] - v; s > o ? e.insert(r, a.stringRepeat(" ", s - o)) : e.remove(new i(r.row, r.column, r.row, r.column - s + o)), t.start.column = t.end.column = d, t.start.row = t.end.row = r.row, t.cursor = t.end }), t.fromOrientedRange(n[0]), this.renderer.updateCursor(), this.renderer.updateBackMarkers() } }, this.$reAlignText = function (e, t) { function u(e) { return a.stringRepeat(" ", e) } function f(e) { return e[2] ? u(i) + e[2] + u(s - e[2].length + o) + e[4].replace(/^([=:])\s+/, "$1 ") : e[0] } function l(e) { return e[2] ? u(i + s - e[2].length) + e[2] + u(o) + e[4].replace(/^([=:])\s+/, "$1 ") : e[0] } function c(e) { return e[2] ? u(i) + e[2] + u(o) + e[4].replace(/^([=:])\s+/, "$1 ") : e[0] } var n = !0, r = !0, i, s, o; return e.map(function (e) { var t = e.match(/(\s*)(.*?)(\s*)([=:].*)/); return t ? i == null ? (i = t[1].length, s = t[2].length, o = t[3].length, t) : (i + s + o != t[1].length + t[2].length + t[3].length && (r = !1), i != t[1].length && (n = !1), i > t[1].length && (i = t[1].length), s < t[2].length && (s = t[2].length), o > t[3].length && (o = t[3].length), t) : [e] }).map(t ? f : n ? r ? l : f : c) } }).call(d.prototype), t.onSessionChange = function (e) { var t = e.session; t && !t.multiSelect && (t.$selectionMarkers = [], t.selection.$initRangeList(), t.multiSelect = t.selection), this.multiSelect = t && t.multiSelect; var n = e.oldSession; n && (n.multiSelect.off("addRange", this.$onAddRange), n.multiSelect.off("removeRange", this.$onRemoveRange), n.multiSelect.off("multiSelect", this.$onMultiSelect), n.multiSelect.off("singleSelect", this.$onSingleSelect), n.multiSelect.lead.off("change", this.$checkMultiselectChange), n.multiSelect.anchor.off("change", this.$checkMultiselectChange)), t && (t.multiSelect.on("addRange", this.$onAddRange), t.multiSelect.on("removeRange", this.$onRemoveRange), t.multiSelect.on("multiSelect", this.$onMultiSelect), t.multiSelect.on("singleSelect", this.$onSingleSelect), t.multiSelect.lead.on("change", this.$checkMultiselectChange), t.multiSelect.anchor.on("change", this.$checkMultiselectChange)), t && this.inMultiSelectMode != t.selection.inMultiSelectMode && (t.selection.inMultiSelectMode ? this.$onMultiSelect() : this.$onSingleSelect()) }, t.MultiSelect = m, e("./config").defineOptions(d.prototype, "editor", { enableMultiselect: { set: function (e) { m(this), e ? (this.on("changeSession", this.$multiselectOnSessionChange), this.on("mousedown", o)) : (this.off("changeSession", this.$multiselectOnSessionChange), this.off("mousedown", o)) }, value: !0 }, enableBlockSelect: { set: function (e) { this.$blockSelectEnabled = e }, value: !0 } }) }), define("ace/mode/folding/fold_mode", ["require", "exports", "module", "ace/range"], function (e, t, n) { "use strict"; var r = e("../../range").Range, i = t.FoldMode = function () { }; (function () { this.foldingStartMarker = null, this.foldingStopMarker = null, this.getFoldWidget = function (e, t, n) { var r = e.getLine(n); return this.foldingStartMarker.test(r) ? "start" : t == "markbeginend" && this.foldingStopMarker && this.foldingStopMarker.test(r) ? "end" : "" }, this.getFoldWidgetRange = function (e, t, n) { return null }, this.indentationBlock = function (e, t, n) { var i = /\S/, s = e.getLine(t), o = s.search(i); if (o == -1) return; var u = n || s.length, a = e.getLength(), f = t, l = t; while (++t < a) { var c = e.getLine(t).search(i); if (c == -1) continue; if (c <= o) { var h = e.getTokenAt(t, 0); if (!h || h.type !== "string") break } l = t } if (l > f) { var p = e.getLine(l).length; return new r(f, u, l, p) } }, this.openingBracketBlock = function (e, t, n, i, s) { var o = { row: n, column: i + 1 }, u = e.$findClosingBracket(t, o, s); if (!u) return; var a = e.foldWidgets[u.row]; return a == null && (a = e.getFoldWidget(u.row)), a == "start" && u.row > o.row && (u.row--, u.column = e.getLine(u.row).length), r.fromPoints(o, u) }, this.closingBracketBlock = function (e, t, n, i, s) { var o = { row: n, column: i }, u = e.$findOpeningBracket(t, o); if (!u) return; return u.column++, o.column--, r.fromPoints(u, o) } }).call(i.prototype) }), define("ace/theme/textmate", ["require", "exports", "module", "ace/lib/dom"], function (e, t, n) { "use strict"; t.isDark = !1, t.cssClass = "ace-tm", t.cssText = '.ace-tm .ace_gutter {background: #f0f0f0;color: #333;}.ace-tm .ace_print-margin {width: 1px;background: #e8e8e8;}.ace-tm .ace_fold {background-color: #6B72E6;}.ace-tm {background-color: #FFFFFF;color: black;}.ace-tm .ace_cursor {color: black;}.ace-tm .ace_invisible {color: rgb(191, 191, 191);}.ace-tm .ace_storage,.ace-tm .ace_keyword {color: blue;}.ace-tm .ace_constant {color: rgb(197, 6, 11);}.ace-tm .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-tm .ace_constant.ace_language {color: rgb(88, 92, 246);}.ace-tm .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-tm .ace_invalid {background-color: rgba(255, 0, 0, 0.1);color: red;}.ace-tm .ace_support.ace_function {color: rgb(60, 76, 114);}.ace-tm .ace_support.ace_constant {color: rgb(6, 150, 14);}.ace-tm .ace_support.ace_type,.ace-tm .ace_support.ace_class {color: rgb(109, 121, 222);}.ace-tm .ace_keyword.ace_operator {color: rgb(104, 118, 135);}.ace-tm .ace_string {color: rgb(3, 106, 7);}.ace-tm .ace_comment {color: rgb(76, 136, 107);}.ace-tm .ace_comment.ace_doc {color: rgb(0, 102, 255);}.ace-tm .ace_comment.ace_doc.ace_tag {color: rgb(128, 159, 191);}.ace-tm .ace_constant.ace_numeric {color: rgb(0, 0, 205);}.ace-tm .ace_variable {color: rgb(49, 132, 149);}.ace-tm .ace_xml-pe {color: rgb(104, 104, 91);}.ace-tm .ace_entity.ace_name.ace_function {color: #0000A2;}.ace-tm .ace_heading {color: rgb(12, 7, 255);}.ace-tm .ace_list {color:rgb(185, 6, 144);}.ace-tm .ace_meta.ace_tag {color:rgb(0, 22, 142);}.ace-tm .ace_string.ace_regex {color: rgb(255, 0, 0)}.ace-tm .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-tm.ace_multiselect .ace_selection.ace_start {box-shadow: 0 0 3px 0px white;}.ace-tm .ace_marker-layer .ace_step {background: rgb(252, 255, 0);}.ace-tm .ace_marker-layer .ace_stack {background: rgb(164, 229, 101);}.ace-tm .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-tm .ace_marker-layer .ace_active-line {background: rgba(0, 0, 0, 0.07);}.ace-tm .ace_gutter-active-line {background-color : #dcdcdc;}.ace-tm .ace_marker-layer .ace_selected-word {background: rgb(250, 250, 255);border: 1px solid rgb(200, 200, 250);}.ace-tm .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}', t.$id = "ace/theme/textmate"; var r = e("../lib/dom"); r.importCssString(t.cssText, t.cssClass) }), define("ace/line_widgets", ["require", "exports", "module", "ace/lib/dom"], function (e, t, n) { "use strict"; function i(e) { this.session = e, this.session.widgetManager = this, this.session.getRowLength = this.getRowLength, this.session.$getWidgetScreenLength = this.$getWidgetScreenLength, this.updateOnChange = this.updateOnChange.bind(this), this.renderWidgets = this.renderWidgets.bind(this), this.measureWidgets = this.measureWidgets.bind(this), this.session._changedWidgets = [], this.$onChangeEditor = this.$onChangeEditor.bind(this), this.session.on("change", this.updateOnChange), this.session.on("changeFold", this.updateOnFold), this.session.on("changeEditor", this.$onChangeEditor) } var r = e("./lib/dom"); (function () { this.getRowLength = function (e) { var t; return this.lineWidgets ? t = this.lineWidgets[e] && this.lineWidgets[e].rowCount || 0 : t = 0, !this.$useWrapMode || !this.$wrapData[e] ? 1 + t : this.$wrapData[e].length + 1 + t }, this.$getWidgetScreenLength = function () { var e = 0; return this.lineWidgets.forEach(function (t) { t && t.rowCount && !t.hidden && (e += t.rowCount) }), e }, this.$onChangeEditor = function (e) { this.attach(e.editor) }, this.attach = function (e) { e && e.widgetManager && e.widgetManager != this && e.widgetManager.detach(); if (this.editor == e) return; this.detach(), this.editor = e, e && (e.widgetManager = this, e.renderer.on("beforeRender", this.measureWidgets), e.renderer.on("afterRender", this.renderWidgets)) }, this.detach = function (e) { var t = this.editor; if (!t) return; this.editor = null, t.widgetManager = null, t.renderer.off("beforeRender", this.measureWidgets), t.renderer.off("afterRender", this.renderWidgets); var n = this.session.lineWidgets; n && n.forEach(function (e) { e && e.el && e.el.parentNode && (e._inDocument = !1, e.el.parentNode.removeChild(e.el)) }) }, this.updateOnFold = function (e, t) { var n = t.lineWidgets; if (!n || !e.action) return; var r = e.data, i = r.start.row, s = r.end.row, o = e.action == "add"; for (var u = i + 1; u < s; u++)n[u] && (n[u].hidden = o); n[s] && (o ? n[i] ? n[s].hidden = o : n[i] = n[s] : (n[i] == n[s] && (n[i] = undefined), n[s].hidden = o)) }, this.updateOnChange = function (e) { var t = this.session.lineWidgets; if (!t) return; var n = e.start.row, r = e.end.row - n; if (r !== 0) if (e.action == "remove") { var i = t.splice(n + 1, r); !t[n] && i[i.length - 1] && (t[n] = i.pop()), i.forEach(function (e) { e && this.removeLineWidget(e) }, this), this.$updateRows() } else { var s = new Array(r); t[n] && t[n].column != null && e.start.column > t[n].column && n++, s.unshift(n, 0), t.splice.apply(t, s), this.$updateRows() } }, this.$updateRows = function () { var e = this.session.lineWidgets; if (!e) return; var t = !0; e.forEach(function (e, n) { if (e) { t = !1, e.row = n; while (e.$oldWidget) e.$oldWidget.row = n, e = e.$oldWidget } }), t && (this.session.lineWidgets = null) }, this.$registerLineWidget = function (e) { this.session.lineWidgets || (this.session.lineWidgets = new Array(this.session.getLength())); var t = this.session.lineWidgets[e.row]; return t && (e.$oldWidget = t, t.el && t.el.parentNode && (t.el.parentNode.removeChild(t.el), t._inDocument = !1)), this.session.lineWidgets[e.row] = e, e }, this.addLineWidget = function (e) { this.$registerLineWidget(e), e.session = this.session; if (!this.editor) return e; var t = this.editor.renderer; e.html && !e.el && (e.el = r.createElement("div"), e.el.innerHTML = e.html), e.el && (r.addCssClass(e.el, "ace_lineWidgetContainer"), e.el.style.position = "absolute", e.el.style.zIndex = 5, t.container.appendChild(e.el), e._inDocument = !0, e.coverGutter || (e.el.style.zIndex = 3), e.pixelHeight == null && (e.pixelHeight = e.el.offsetHeight)), e.rowCount == null && (e.rowCount = e.pixelHeight / t.layerConfig.lineHeight); var n = this.session.getFoldAt(e.row, 0); e.$fold = n; if (n) { var i = this.session.lineWidgets; e.row == n.end.row && !i[n.start.row] ? i[n.start.row] = e : e.hidden = !0 } return this.session._emit("changeFold", { data: { start: { row: e.row } } }), this.$updateRows(), this.renderWidgets(null, t), this.onWidgetChanged(e), e }, this.removeLineWidget = function (e) { e._inDocument = !1, e.session = null, e.el && e.el.parentNode && e.el.parentNode.removeChild(e.el); if (e.editor && e.editor.destroy) try { e.editor.destroy() } catch (t) { } if (this.session.lineWidgets) { var n = this.session.lineWidgets[e.row]; if (n == e) this.session.lineWidgets[e.row] = e.$oldWidget, e.$oldWidget && this.onWidgetChanged(e.$oldWidget); else while (n) { if (n.$oldWidget == e) { n.$oldWidget = e.$oldWidget; break } n = n.$oldWidget } } this.session._emit("changeFold", { data: { start: { row: e.row } } }), this.$updateRows() }, this.getWidgetsAtRow = function (e) { var t = this.session.lineWidgets, n = t && t[e], r = []; while (n) r.push(n), n = n.$oldWidget; return r }, this.onWidgetChanged = function (e) { this.session._changedWidgets.push(e), this.editor && this.editor.renderer.updateFull() }, this.measureWidgets = function (e, t) { var n = this.session._changedWidgets, r = t.layerConfig; if (!n || !n.length) return; var i = Infinity; for (var s = 0; s < n.length; s++) { var o = n[s]; if (!o || !o.el) continue; if (o.session != this.session) continue; if (!o._inDocument) { if (this.session.lineWidgets[o.row] != o) continue; o._inDocument = !0, t.container.appendChild(o.el) } o.h = o.el.offsetHeight, o.fixedWidth || (o.w = o.el.offsetWidth, o.screenWidth = Math.ceil(o.w / r.characterWidth)); var u = o.h / r.lineHeight; o.coverLine && (u -= this.session.getRowLineCount(o.row), u < 0 && (u = 0)), o.rowCount != u && (o.rowCount = u, o.row < i && (i = o.row)) } i != Infinity && (this.session._emit("changeFold", { data: { start: { row: i } } }), this.session.lineWidgetWidth = null), this.session._changedWidgets = [] }, this.renderWidgets = function (e, t) { var n = t.layerConfig, r = this.session.lineWidgets; if (!r) return; var i = Math.min(this.firstRow, n.firstRow), s = Math.max(this.lastRow, n.lastRow, r.length); while (i > 0 && !r[i]) i--; this.firstRow = n.firstRow, this.lastRow = n.lastRow, t.$cursorLayer.config = n; for (var o = i; o <= s; o++) { var u = r[o]; if (!u || !u.el) continue; if (u.hidden) { u.el.style.top = -100 - (u.pixelHeight || 0) + "px"; continue } u._inDocument || (u._inDocument = !0, t.container.appendChild(u.el)); var a = t.$cursorLayer.getPixelPosition({ row: o, column: 0 }, !0).top; u.coverLine || (a += n.lineHeight * this.session.getRowLineCount(u.row)), u.el.style.top = a - n.offset + "px"; var f = u.coverGutter ? 0 : t.gutterWidth; u.fixedWidth || (f -= t.scrollLeft), u.el.style.left = f + "px", u.fullWidth && u.screenWidth && (u.el.style.minWidth = n.width + 2 * n.padding + "px"), u.fixedWidth ? u.el.style.right = t.scrollBar.getWidth() + "px" : u.el.style.right = "" } } }).call(i.prototype), t.LineWidgets = i }), define("ace/ext/error_marker", ["require", "exports", "module", "ace/line_widgets", "ace/lib/dom", "ace/range"], function (e, t, n) { "use strict"; function o(e, t, n) { var r = 0, i = e.length - 1; while (r <= i) { var s = r + i >> 1, o = n(t, e[s]); if (o > 0) r = s + 1; else { if (!(o < 0)) return s; i = s - 1 } } return -(r + 1) } function u(e, t, n) { var r = e.getAnnotations().sort(s.comparePoints); if (!r.length) return; var i = o(r, { row: t, column: -1 }, s.comparePoints); i < 0 && (i = -i - 1), i >= r.length ? i = n > 0 ? 0 : r.length - 1 : i === 0 && n < 0 && (i = r.length - 1); var u = r[i]; if (!u || !n) return; if (u.row === t) { do u = r[i += n]; while (u && u.row === t); if (!u) return r.slice() } var a = []; t = u.row; do a[n < 0 ? "unshift" : "push"](u), u = r[i += n]; while (u && u.row == t); return a.length && a } var r = e("../line_widgets").LineWidgets, i = e("../lib/dom"), s = e("../range").Range; t.showErrorMarker = function (e, t) { var n = e.session; n.widgetManager || (n.widgetManager = new r(n), n.widgetManager.attach(e)); var s = e.getCursorPosition(), o = s.row, a = n.widgetManager.getWidgetsAtRow(o).filter(function (e) { return e.type == "errorMarker" })[0]; a ? a.destroy() : o -= t; var f = u(n, o, t), l; if (f) { var c = f[0]; s.column = (c.pos && typeof c.column != "number" ? c.pos.sc : c.column) || 0, s.row = c.row, l = e.renderer.$gutterLayer.$annotations[s.row] } else { if (a) return; l = { text: ["Looks good!"], className: "ace_ok" } } e.session.unfold(s.row), e.selection.moveToPosition(s); var h = { row: s.row, fixedWidth: !0, coverGutter: !0, el: i.createElement("div"), type: "errorMarker" }, p = h.el.appendChild(i.createElement("div")), d = h.el.appendChild(i.createElement("div")); d.className = "error_widget_arrow " + l.className; var v = e.renderer.$cursorLayer.getPixelPosition(s).left; d.style.left = v + e.renderer.gutterWidth - 5 + "px", h.el.className = "error_widget_wrapper", p.className = "error_widget " + l.className, p.innerHTML = l.text.join("<br>"), p.appendChild(i.createElement("div")); var m = function (e, t, n) { if (t === 0 && (n === "esc" || n === "return")) return h.destroy(), { command: "null" } }; h.destroy = function () { if (e.$mouseHandler.isMousePressed) return; e.keyBinding.removeKeyboardHandler(m), n.widgetManager.removeLineWidget(h), e.off("changeSelection", h.destroy), e.off("changeSession", h.destroy), e.off("mouseup", h.destroy), e.off("change", h.destroy) }, e.keyBinding.addKeyboardHandler(m), e.on("changeSelection", h.destroy), e.on("changeSession", h.destroy), e.on("mouseup", h.destroy), e.on("change", h.destroy), e.session.widgetManager.addLineWidget(h), h.el.onmousedown = e.focus.bind(e), e.renderer.scrollCursorIntoView(null, .5, { bottom: h.el.offsetHeight }) }, i.importCssString("    .error_widget_wrapper {        background: inherit;        color: inherit;        border:none    }    .error_widget {        border-top: solid 2px;        border-bottom: solid 2px;        margin: 5px 0;        padding: 10px 40px;        white-space: pre-wrap;    }    .error_widget.ace_error, .error_widget_arrow.ace_error{        border-color: #ff5a5a    }    .error_widget.ace_warning, .error_widget_arrow.ace_warning{        border-color: #F1D817    }    .error_widget.ace_info, .error_widget_arrow.ace_info{        border-color: #5a5a5a    }    .error_widget.ace_ok, .error_widget_arrow.ace_ok{        border-color: #5aaa5a    }    .error_widget_arrow {        position: absolute;        border: solid 5px;        border-top-color: transparent!important;        border-right-color: transparent!important;        border-left-color: transparent!important;        top: -5px;    }", "") }), define("ace/ace", ["require", "exports", "module", "ace/lib/fixoldbrowsers", "ace/lib/dom", "ace/lib/event", "ace/range", "ace/editor", "ace/edit_session", "ace/undomanager", "ace/virtual_renderer", "ace/worker/worker_client", "ace/keyboard/hash_handler", "ace/placeholder", "ace/multi_select", "ace/mode/folding/fold_mode", "ace/theme/textmate", "ace/ext/error_marker", "ace/config"], function (e, t, n) { "use strict"; e("./lib/fixoldbrowsers"); var r = e("./lib/dom"), i = e("./lib/event"), s = e("./range").Range, o = e("./editor").Editor, u = e("./edit_session").EditSession, a = e("./undomanager").UndoManager, f = e("./virtual_renderer").VirtualRenderer; e("./worker/worker_client"), e("./keyboard/hash_handler"), e("./placeholder"), e("./multi_select"), e("./mode/folding/fold_mode"), e("./theme/textmate"), e("./ext/error_marker"), t.config = e("./config"), t.require = e, typeof define == "function" && (t.define = define), t.edit = function (e, n) { if (typeof e == "string") { var s = e; e = document.getElementById(s); if (!e) throw new Error("ace.edit can't find div #" + s) } if (e && e.env && e.env.editor instanceof o) return e.env.editor; var u = ""; if (e && /input|textarea/i.test(e.tagName)) { var a = e; u = a.value, e = r.createElement("pre"), a.parentNode.replaceChild(e, a) } else e && (u = e.textContent, e.innerHTML = ""); var l = t.createEditSession(u), c = new o(new f(e), l, n), h = { document: l, editor: c, onResize: c.resize.bind(c, null) }; return a && (h.textarea = a), i.addListener(window, "resize", h.onResize), c.on("destroy", function () { i.removeListener(window, "resize", h.onResize), h.editor.container.env = null }), c.container.env = c.env = h, c }, t.createEditSession = function (e, t) { var n = new u(e, t); return n.setUndoManager(new a), n }, t.Range = s, t.Editor = o, t.EditSession = u, t.UndoManager = a, t.VirtualRenderer = f, t.version = t.config.version }); (function () {
+  window.require(["ace/ace"], function (a) {
+    if (a) {
+      a.config.init(true);
+      a.define = window.define;
+    }
+    if (!window.ace)
+      window.ace = a;
+    for (var key in a) if (a.hasOwnProperty(key))
+      window.ace[key] = a[key];
+    window.ace["default"] = window.ace;
+    if (typeof module == "object" && typeof exports == "object" && module) {
+      module.exports = window.ace;
+    }
+  });
+})();
diff --git a/esphome/dashboard/static/js/vendor/ace/ext-searchbox.js b/esphome/dashboard/static/js/vendor/ace/ext-searchbox.js
new file mode 100644
index 0000000000..cf28c3b012
--- /dev/null
+++ b/esphome/dashboard/static/js/vendor/ace/ext-searchbox.js
@@ -0,0 +1,7 @@
+define("ace/ext/searchbox", ["require", "exports", "module", "ace/lib/dom", "ace/lib/lang", "ace/lib/event", "ace/keyboard/hash_handler", "ace/lib/keys"], function (e, t, n) { "use strict"; var r = e("../lib/dom"), i = e("../lib/lang"), s = e("../lib/event"), o = '.ace_search {background-color: #ddd;color: #666;border: 1px solid #cbcbcb;border-top: 0 none;overflow: hidden;margin: 0;padding: 4px 6px 0 4px;position: absolute;top: 0;z-index: 99;white-space: normal;}.ace_search.left {border-left: 0 none;border-radius: 0px 0px 5px 0px;left: 0;}.ace_search.right {border-radius: 0px 0px 0px 5px;border-right: 0 none;right: 0;}.ace_search_form, .ace_replace_form {margin: 0 20px 4px 0;overflow: hidden;line-height: 1.9;}.ace_replace_form {margin-right: 0;}.ace_search_form.ace_nomatch {outline: 1px solid red;}.ace_search_field {border-radius: 3px 0 0 3px;background-color: white;color: black;border: 1px solid #cbcbcb;border-right: 0 none;outline: 0;padding: 0;font-size: inherit;margin: 0;line-height: inherit;padding: 0 6px;min-width: 17em;vertical-align: top;min-height: 1.8em;box-sizing: content-box;}.ace_searchbtn {border: 1px solid #cbcbcb;line-height: inherit;display: inline-block;padding: 0 6px;background: #fff;border-right: 0 none;border-left: 1px solid #dcdcdc;cursor: pointer;margin: 0;position: relative;color: #666;}.ace_searchbtn:last-child {border-radius: 0 3px 3px 0;border-right: 1px solid #cbcbcb;}.ace_searchbtn:disabled {background: none;cursor: default;}.ace_searchbtn:hover {background-color: #eef1f6;}.ace_searchbtn.prev, .ace_searchbtn.next {padding: 0px 0.7em}.ace_searchbtn.prev:after, .ace_searchbtn.next:after {content: "";border: solid 2px #888;width: 0.5em;height: 0.5em;border-width:  2px 0 0 2px;display:inline-block;transform: rotate(-45deg);}.ace_searchbtn.next:after {border-width: 0 2px 2px 0 ;}.ace_searchbtn_close {background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAcCAYAAABRVo5BAAAAZ0lEQVR42u2SUQrAMAhDvazn8OjZBilCkYVVxiis8H4CT0VrAJb4WHT3C5xU2a2IQZXJjiQIRMdkEoJ5Q2yMqpfDIo+XY4k6h+YXOyKqTIj5REaxloNAd0xiKmAtsTHqW8sR2W5f7gCu5nWFUpVjZwAAAABJRU5ErkJggg==) no-repeat 50% 0;border-radius: 50%;border: 0 none;color: #656565;cursor: pointer;font: 16px/16px Arial;padding: 0;height: 14px;width: 14px;top: 9px;right: 7px;position: absolute;}.ace_searchbtn_close:hover {background-color: #656565;background-position: 50% 100%;color: white;}.ace_button {margin-left: 2px;cursor: pointer;-webkit-user-select: none;-moz-user-select: none;-o-user-select: none;-ms-user-select: none;user-select: none;overflow: hidden;opacity: 0.7;border: 1px solid rgba(100,100,100,0.23);padding: 1px;box-sizing:    border-box!important;color: black;}.ace_button:hover {background-color: #eee;opacity:1;}.ace_button:active {background-color: #ddd;}.ace_button.checked {border-color: #3399ff;opacity:1;}.ace_search_options{margin-bottom: 3px;text-align: right;-webkit-user-select: none;-moz-user-select: none;-o-user-select: none;-ms-user-select: none;user-select: none;clear: both;}.ace_search_counter {float: left;font-family: arial;padding: 0 8px;}', u = e("../keyboard/hash_handler").HashHandler, a = e("../lib/keys"), f = 999; r.importCssString(o, "ace_searchbox"); var l = function (e, t, n) { var i = r.createElement("div"); r.buildDom(["div", { "class": "ace_search right" }, ["span", { action: "hide", "class": "ace_searchbtn_close" }], ["div", { "class": "ace_search_form" }, ["input", { "class": "ace_search_field", placeholder: "Search for", spellcheck: "false" }], ["span", { action: "findPrev", "class": "ace_searchbtn prev" }, "\u200b"], ["span", { action: "findNext", "class": "ace_searchbtn next" }, "\u200b"], ["span", { action: "findAll", "class": "ace_searchbtn", title: "Alt-Enter" }, "All"]], ["div", { "class": "ace_replace_form" }, ["input", { "class": "ace_search_field", placeholder: "Replace with", spellcheck: "false" }], ["span", { action: "replaceAndFindNext", "class": "ace_searchbtn" }, "Replace"], ["span", { action: "replaceAll", "class": "ace_searchbtn" }, "All"]], ["div", { "class": "ace_search_options" }, ["span", { action: "toggleReplace", "class": "ace_button", title: "Toggle Replace mode", style: "float:left;margin-top:-2px;padding:0 5px;" }, "+"], ["span", { "class": "ace_search_counter" }], ["span", { action: "toggleRegexpMode", "class": "ace_button", title: "RegExp Search" }, ".*"], ["span", { action: "toggleCaseSensitive", "class": "ace_button", title: "CaseSensitive Search" }, "Aa"], ["span", { action: "toggleWholeWords", "class": "ace_button", title: "Whole Word Search" }, "\\b"], ["span", { action: "searchInSelection", "class": "ace_button", title: "Search In Selection" }, "S"]]], i), this.element = i.firstChild, this.setSession = this.setSession.bind(this), this.$init(), this.setEditor(e), r.importCssString(o, "ace_searchbox", e.container) }; (function () { this.setEditor = function (e) { e.searchBox = this, e.renderer.scroller.appendChild(this.element), this.editor = e }, this.setSession = function (e) { this.searchRange = null, this.$syncOptions(!0) }, this.$initElements = function (e) { this.searchBox = e.querySelector(".ace_search_form"), this.replaceBox = e.querySelector(".ace_replace_form"), this.searchOption = e.querySelector("[action=searchInSelection]"), this.replaceOption = e.querySelector("[action=toggleReplace]"), this.regExpOption = e.querySelector("[action=toggleRegexpMode]"), this.caseSensitiveOption = e.querySelector("[action=toggleCaseSensitive]"), this.wholeWordOption = e.querySelector("[action=toggleWholeWords]"), this.searchInput = this.searchBox.querySelector(".ace_search_field"), this.replaceInput = this.replaceBox.querySelector(".ace_search_field"), this.searchCounter = e.querySelector(".ace_search_counter") }, this.$init = function () { var e = this.element; this.$initElements(e); var t = this; s.addListener(e, "mousedown", function (e) { setTimeout(function () { t.activeInput.focus() }, 0), s.stopPropagation(e) }), s.addListener(e, "click", function (e) { var n = e.target || e.srcElement, r = n.getAttribute("action"); r && t[r] ? t[r]() : t.$searchBarKb.commands[r] && t.$searchBarKb.commands[r].exec(t), s.stopPropagation(e) }), s.addCommandKeyListener(e, function (e, n, r) { var i = a.keyCodeToString(r), o = t.$searchBarKb.findKeyCommand(n, i); o && o.exec && (o.exec(t), s.stopEvent(e)) }), this.$onChange = i.delayedCall(function () { t.find(!1, !1) }), s.addListener(this.searchInput, "input", function () { t.$onChange.schedule(20) }), s.addListener(this.searchInput, "focus", function () { t.activeInput = t.searchInput, t.searchInput.value && t.highlight() }), s.addListener(this.replaceInput, "focus", function () { t.activeInput = t.replaceInput, t.searchInput.value && t.highlight() }) }, this.$closeSearchBarKb = new u([{ bindKey: "Esc", name: "closeSearchBar", exec: function (e) { e.searchBox.hide() } }]), this.$searchBarKb = new u, this.$searchBarKb.bindKeys({ "Ctrl-f|Command-f": function (e) { var t = e.isReplace = !e.isReplace; e.replaceBox.style.display = t ? "" : "none", e.replaceOption.checked = !1, e.$syncOptions(), e.searchInput.focus() }, "Ctrl-H|Command-Option-F": function (e) { if (e.editor.getReadOnly()) return; e.replaceOption.checked = !0, e.$syncOptions(), e.replaceInput.focus() }, "Ctrl-G|Command-G": function (e) { e.findNext() }, "Ctrl-Shift-G|Command-Shift-G": function (e) { e.findPrev() }, esc: function (e) { setTimeout(function () { e.hide() }) }, Return: function (e) { e.activeInput == e.replaceInput && e.replace(), e.findNext() }, "Shift-Return": function (e) { e.activeInput == e.replaceInput && e.replace(), e.findPrev() }, "Alt-Return": function (e) { e.activeInput == e.replaceInput && e.replaceAll(), e.findAll() }, Tab: function (e) { (e.activeInput == e.replaceInput ? e.searchInput : e.replaceInput).focus() } }), this.$searchBarKb.addCommands([{ name: "toggleRegexpMode", bindKey: { win: "Alt-R|Alt-/", mac: "Ctrl-Alt-R|Ctrl-Alt-/" }, exec: function (e) { e.regExpOption.checked = !e.regExpOption.checked, e.$syncOptions() } }, { name: "toggleCaseSensitive", bindKey: { win: "Alt-C|Alt-I", mac: "Ctrl-Alt-R|Ctrl-Alt-I" }, exec: function (e) { e.caseSensitiveOption.checked = !e.caseSensitiveOption.checked, e.$syncOptions() } }, { name: "toggleWholeWords", bindKey: { win: "Alt-B|Alt-W", mac: "Ctrl-Alt-B|Ctrl-Alt-W" }, exec: function (e) { e.wholeWordOption.checked = !e.wholeWordOption.checked, e.$syncOptions() } }, { name: "toggleReplace", exec: function (e) { e.replaceOption.checked = !e.replaceOption.checked, e.$syncOptions() } }, { name: "searchInSelection", exec: function (e) { e.searchOption.checked = !e.searchRange, e.setSearchRange(e.searchOption.checked && e.editor.getSelectionRange()), e.$syncOptions() } }]), this.setSearchRange = function (e) { this.searchRange = e, e ? this.searchRangeMarker = this.editor.session.addMarker(e, "ace_active-line") : this.searchRangeMarker && (this.editor.session.removeMarker(this.searchRangeMarker), this.searchRangeMarker = null) }, this.$syncOptions = function (e) { r.setCssClass(this.replaceOption, "checked", this.searchRange), r.setCssClass(this.searchOption, "checked", this.searchOption.checked), this.replaceOption.textContent = this.replaceOption.checked ? "-" : "+", r.setCssClass(this.regExpOption, "checked", this.regExpOption.checked), r.setCssClass(this.wholeWordOption, "checked", this.wholeWordOption.checked), r.setCssClass(this.caseSensitiveOption, "checked", this.caseSensitiveOption.checked); var t = this.editor.getReadOnly(); this.replaceOption.style.display = t ? "none" : "", this.replaceBox.style.display = this.replaceOption.checked && !t ? "" : "none", this.find(!1, !1, e) }, this.highlight = function (e) { this.editor.session.highlight(e || this.editor.$search.$options.re), this.editor.renderer.updateBackMarkers() }, this.find = function (e, t, n) { var i = this.editor.find(this.searchInput.value, { skipCurrent: e, backwards: t, wrap: !0, regExp: this.regExpOption.checked, caseSensitive: this.caseSensitiveOption.checked, wholeWord: this.wholeWordOption.checked, preventScroll: n, range: this.searchRange }), s = !i && this.searchInput.value; r.setCssClass(this.searchBox, "ace_nomatch", s), this.editor._emit("findSearchBox", { match: !s }), this.highlight(), this.updateCounter() }, this.updateCounter = function () { var e = this.editor, t = e.$search.$options.re, n = 0, r = 0; if (t) { var i = this.searchRange ? e.session.getTextRange(this.searchRange) : e.getValue(), s = e.session.doc.positionToIndex(e.selection.anchor); this.searchRange && (s -= e.session.doc.positionToIndex(this.searchRange.start)); var o = t.lastIndex = 0, u; while (u = t.exec(i)) { n++, o = u.index, o <= s && r++; if (n > f) break; if (!u[0]) { t.lastIndex = o += 1; if (o >= i.length) break } } } this.searchCounter.textContent = r + " of " + (n > f ? f + "+" : n) }, this.findNext = function () { this.find(!0, !1) }, this.findPrev = function () { this.find(!0, !0) }, this.findAll = function () { var e = this.editor.findAll(this.searchInput.value, { regExp: this.regExpOption.checked, caseSensitive: this.caseSensitiveOption.checked, wholeWord: this.wholeWordOption.checked }), t = !e && this.searchInput.value; r.setCssClass(this.searchBox, "ace_nomatch", t), this.editor._emit("findSearchBox", { match: !t }), this.highlight(), this.hide() }, this.replace = function () { this.editor.getReadOnly() || this.editor.replace(this.replaceInput.value) }, this.replaceAndFindNext = function () { this.editor.getReadOnly() || (this.editor.replace(this.replaceInput.value), this.findNext()) }, this.replaceAll = function () { this.editor.getReadOnly() || this.editor.replaceAll(this.replaceInput.value) }, this.hide = function () { this.active = !1, this.setSearchRange(null), this.editor.off("changeSession", this.setSession), this.element.style.display = "none", this.editor.keyBinding.removeKeyboardHandler(this.$closeSearchBarKb), this.editor.focus() }, this.show = function (e, t) { this.active = !0, this.editor.on("changeSession", this.setSession), this.element.style.display = "", this.replaceOption.checked = t, e && (this.searchInput.value = e), this.searchInput.focus(), this.searchInput.select(), this.editor.keyBinding.addKeyboardHandler(this.$closeSearchBarKb), this.$syncOptions(!0) }, this.isFocused = function () { var e = document.activeElement; return e == this.searchInput || e == this.replaceInput } }).call(l.prototype), t.SearchBox = l, t.Search = function (e, t) { var n = e.searchBox || new l(e); n.show(e.session.getTextRange(), t) } }); (function () {
+  window.require(["ace/ext/searchbox"], function (m) {
+    if (typeof module == "object" && typeof exports == "object" && module) {
+      module.exports = m;
+    }
+  });
+})();
diff --git a/esphome/dashboard/static/js/vendor/ace/mode-yaml.js b/esphome/dashboard/static/js/vendor/ace/mode-yaml.js
new file mode 100644
index 0000000000..81cf343aa5
--- /dev/null
+++ b/esphome/dashboard/static/js/vendor/ace/mode-yaml.js
@@ -0,0 +1,7 @@
+define("ace/mode/yaml_highlight_rules", ["require", "exports", "module", "ace/lib/oop", "ace/mode/text_highlight_rules"], function (e, t, n) { "use strict"; var r = e("../lib/oop"), i = e("./text_highlight_rules").TextHighlightRules, s = function () { this.$rules = { start: [{ token: "comment", regex: "#.*$" }, { token: "list.markup", regex: /^(?:-{3}|\.{3})\s*(?=#|$)/ }, { token: "list.markup", regex: /^\s*[\-?](?:$|\s)/ }, { token: "constant", regex: "!![\\w//]+" }, { token: "constant.language", regex: "[&\\*][a-zA-Z0-9-_]+" }, { token: ["meta.tag", "keyword"], regex: /^(\s*\w.*?)(:(?=\s|$))/ }, { token: ["meta.tag", "keyword"], regex: /(\w+?)(\s*:(?=\s|$))/ }, { token: "keyword.operator", regex: "<<\\w*:\\w*" }, { token: "keyword.operator", regex: "-\\s*(?=[{])" }, { token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' }, { token: "string", regex: /[|>][-+\d]*(?:$|\s+(?:$|#))/, onMatch: function (e, t, n, r) { r = r.replace(/ #.*/, ""); var i = /^ *((:\s*)?-(\s*[^|>])?)?/.exec(r)[0].replace(/\S\s*$/, "").length, s = parseInt(/\d+[\s+-]*$/.exec(r)); return s ? (i += s - 1, this.next = "mlString") : this.next = "mlStringPre", n.length ? (n[0] = this.next, n[1] = i) : (n.push(this.next), n.push(i)), this.token }, next: "mlString" }, { token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']" }, { token: "constant.numeric", regex: /(\b|[+\-\.])[\d_]+(?:(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)(?=[^\d-\w]|$)/ }, { token: "constant.numeric", regex: /[+\-]?\.inf\b|NaN\b|0x[\dA-Fa-f_]+|0b[10_]+/ }, { token: "constant.language.boolean", regex: "\\b(?:true|false|TRUE|FALSE|True|False|yes|no)\\b" }, { token: "paren.lparen", regex: "[[({]" }, { token: "paren.rparen", regex: "[\\])}]" }, { token: "text", regex: /[^\s,:\[\]\{\}]+/ }], mlStringPre: [{ token: "indent", regex: /^ *$/ }, { token: "indent", regex: /^ */, onMatch: function (e, t, n) { var r = n[1]; return r >= e.length ? (this.next = "start", n.shift(), n.shift()) : (n[1] = e.length - 1, this.next = n[0] = "mlString"), this.token }, next: "mlString" }, { defaultToken: "string" }], mlString: [{ token: "indent", regex: /^ *$/ }, { token: "indent", regex: /^ */, onMatch: function (e, t, n) { var r = n[1]; return r >= e.length ? (this.next = "start", n.splice(0)) : this.next = "mlString", this.token }, next: "mlString" }, { token: "string", regex: ".+" }] }, this.normalizeRules() }; r.inherits(s, i), t.YamlHighlightRules = s }), define("ace/mode/matching_brace_outdent", ["require", "exports", "module", "ace/range"], function (e, t, n) { "use strict"; var r = e("../range").Range, i = function () { }; (function () { this.checkOutdent = function (e, t) { return /^\s+$/.test(e) ? /^\s*\}/.test(t) : !1 }, this.autoOutdent = function (e, t) { var n = e.getLine(t), i = n.match(/^(\s*\})/); if (!i) return 0; var s = i[1].length, o = e.findMatchingBracket({ row: t, column: s }); if (!o || o.row == t) return 0; var u = this.$getIndent(e.getLine(o.row)); e.replace(new r(t, 0, t, s - 1), u) }, this.$getIndent = function (e) { return e.match(/^\s*/)[0] } }).call(i.prototype), t.MatchingBraceOutdent = i }), define("ace/mode/folding/coffee", ["require", "exports", "module", "ace/lib/oop", "ace/mode/folding/fold_mode", "ace/range"], function (e, t, n) { "use strict"; var r = e("../../lib/oop"), i = e("./fold_mode").FoldMode, s = e("../../range").Range, o = t.FoldMode = function () { }; r.inherits(o, i), function () { this.getFoldWidgetRange = function (e, t, n) { var r = this.indentationBlock(e, n); if (r) return r; var i = /\S/, o = e.getLine(n), u = o.search(i); if (u == -1 || o[u] != "#") return; var a = o.length, f = e.getLength(), l = n, c = n; while (++n < f) { o = e.getLine(n); var h = o.search(i); if (h == -1) continue; if (o[h] != "#") break; c = n } if (c > l) { var p = e.getLine(c).length; return new s(l, a, c, p) } }, this.getFoldWidget = function (e, t, n) { var r = e.getLine(n), i = r.search(/\S/), s = e.getLine(n + 1), o = e.getLine(n - 1), u = o.search(/\S/), a = s.search(/\S/); if (i == -1) return e.foldWidgets[n - 1] = u != -1 && u < a ? "start" : "", ""; if (u == -1) { if (i == a && r[i] == "#" && s[i] == "#") return e.foldWidgets[n - 1] = "", e.foldWidgets[n + 1] = "", "start" } else if (u == i && r[i] == "#" && o[i] == "#" && e.getLine(n - 2).search(/\S/) == -1) return e.foldWidgets[n - 1] = "start", e.foldWidgets[n + 1] = "", ""; return u != -1 && u < i ? e.foldWidgets[n - 1] = "start" : e.foldWidgets[n - 1] = "", i < a ? "start" : "" } }.call(o.prototype) }), define("ace/mode/yaml", ["require", "exports", "module", "ace/lib/oop", "ace/mode/text", "ace/mode/yaml_highlight_rules", "ace/mode/matching_brace_outdent", "ace/mode/folding/coffee"], function (e, t, n) { "use strict"; var r = e("../lib/oop"), i = e("./text").Mode, s = e("./yaml_highlight_rules").YamlHighlightRules, o = e("./matching_brace_outdent").MatchingBraceOutdent, u = e("./folding/coffee").FoldMode, a = function () { this.HighlightRules = s, this.$outdent = new o, this.foldingRules = new u, this.$behaviour = this.$defaultBehaviour }; r.inherits(a, i), function () { this.lineCommentStart = ["#"], this.getNextLineIndent = function (e, t, n) { var r = this.$getIndent(t); if (e == "start") { var i = t.match(/^.*[\{\(\[]\s*$/); i && (r += n) } return r }, this.checkOutdent = function (e, t, n) { return this.$outdent.checkOutdent(t, n) }, this.autoOutdent = function (e, t, n) { this.$outdent.autoOutdent(t, n) }, this.$id = "ace/mode/yaml" }.call(a.prototype), t.Mode = a }); (function () {
+  window.require(["ace/mode/yaml"], function (m) {
+    if (typeof module == "object" && typeof exports == "object" && module) {
+      module.exports = m;
+    }
+  });
+})();
diff --git a/esphome/dashboard/static/js/vendor/ace/theme-dreamweaver.js b/esphome/dashboard/static/js/vendor/ace/theme-dreamweaver.js
new file mode 100644
index 0000000000..2335f6d773
--- /dev/null
+++ b/esphome/dashboard/static/js/vendor/ace/theme-dreamweaver.js
@@ -0,0 +1,7 @@
+define("ace/theme/dreamweaver", ["require", "exports", "module", "ace/lib/dom"], function (e, t, n) { t.isDark = !1, t.cssClass = "ace-dreamweaver", t.cssText = '.ace-dreamweaver .ace_gutter {background: #e8e8e8;color: #333;}.ace-dreamweaver .ace_print-margin {width: 1px;background: #e8e8e8;}.ace-dreamweaver {background-color: #FFFFFF;color: black;}.ace-dreamweaver .ace_fold {background-color: #757AD8;}.ace-dreamweaver .ace_cursor {color: black;}.ace-dreamweaver .ace_invisible {color: rgb(191, 191, 191);}.ace-dreamweaver .ace_storage,.ace-dreamweaver .ace_keyword {color: blue;}.ace-dreamweaver .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-dreamweaver .ace_constant.ace_language {color: rgb(88, 92, 246);}.ace-dreamweaver .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-dreamweaver .ace_invalid {background-color: rgb(153, 0, 0);color: white;}.ace-dreamweaver .ace_support.ace_function {color: rgb(60, 76, 114);}.ace-dreamweaver .ace_support.ace_constant {color: rgb(6, 150, 14);}.ace-dreamweaver .ace_support.ace_type,.ace-dreamweaver .ace_support.ace_class {color: #009;}.ace-dreamweaver .ace_support.ace_php_tag {color: #f00;}.ace-dreamweaver .ace_keyword.ace_operator {color: rgb(104, 118, 135);}.ace-dreamweaver .ace_string {color: #00F;}.ace-dreamweaver .ace_comment {color: rgb(76, 136, 107);}.ace-dreamweaver .ace_comment.ace_doc {color: rgb(0, 102, 255);}.ace-dreamweaver .ace_comment.ace_doc.ace_tag {color: rgb(128, 159, 191);}.ace-dreamweaver .ace_constant.ace_numeric {color: rgb(0, 0, 205);}.ace-dreamweaver .ace_variable {color: #06F}.ace-dreamweaver .ace_xml-pe {color: rgb(104, 104, 91);}.ace-dreamweaver .ace_entity.ace_name.ace_function {color: #00F;}.ace-dreamweaver .ace_heading {color: rgb(12, 7, 255);}.ace-dreamweaver .ace_list {color:rgb(185, 6, 144);}.ace-dreamweaver .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-dreamweaver .ace_marker-layer .ace_step {background: rgb(252, 255, 0);}.ace-dreamweaver .ace_marker-layer .ace_stack {background: rgb(164, 229, 101);}.ace-dreamweaver .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-dreamweaver .ace_marker-layer .ace_active-line {background: rgba(0, 0, 0, 0.07);}.ace-dreamweaver .ace_gutter-active-line {background-color : #DCDCDC;}.ace-dreamweaver .ace_marker-layer .ace_selected-word {background: rgb(250, 250, 255);border: 1px solid rgb(200, 200, 250);}.ace-dreamweaver .ace_meta.ace_tag {color:#009;}.ace-dreamweaver .ace_meta.ace_tag.ace_anchor {color:#060;}.ace-dreamweaver .ace_meta.ace_tag.ace_form {color:#F90;}.ace-dreamweaver .ace_meta.ace_tag.ace_image {color:#909;}.ace-dreamweaver .ace_meta.ace_tag.ace_script {color:#900;}.ace-dreamweaver .ace_meta.ace_tag.ace_style {color:#909;}.ace-dreamweaver .ace_meta.ace_tag.ace_table {color:#099;}.ace-dreamweaver .ace_string.ace_regex {color: rgb(255, 0, 0)}.ace-dreamweaver .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}'; var r = e("../lib/dom"); r.importCssString(t.cssText, t.cssClass) }); (function () {
+  window.require(["ace/theme/dreamweaver"], function (m) {
+    if (typeof module == "object" && typeof exports == "object" && module) {
+      module.exports = m;
+    }
+  });
+})();
diff --git a/esphome/dashboard/static/js/vendor/jquery-ui/jquery-ui.min.js b/esphome/dashboard/static/js/vendor/jquery-ui/jquery-ui.min.js
new file mode 100644
index 0000000000..862a649869
--- /dev/null
+++ b/esphome/dashboard/static/js/vendor/jquery-ui/jquery-ui.min.js
@@ -0,0 +1,13 @@
+/*! jQuery UI - v1.12.1 - 2016-09-14
+* http://jqueryui.com
+* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
+* Copyright jQuery Foundation and other contributors; Licensed MIT */
+
+(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}function i(t){for(var e,i;t.length&&t[0]!==document;){if(e=t.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.regional.en=t.extend(!0,{},this.regional[""]),this.regional["en-US"]=t.extend(!0,{},this.regional.en),this.dpDiv=n(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function n(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.on("mouseout",i,function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",i,o)}function o(){t.datepicker._isDisabledDatepicker(m.inline?m.dpDiv.parent()[0]:m.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))}function a(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}function r(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.ui=t.ui||{},t.ui.version="1.12.1";var h=0,l=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},h=e.split(".")[0];e=e.split(".")[1];var l=h+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][l.toLowerCase()]=function(e){return!!t.data(e,l)},t[h]=t[h]||{},n=t[h][e],o=t[h][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:h,widgetName:e,widgetFullName:l}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,n=l.call(arguments,1),o=0,a=n.length;a>o;o++)for(i in n[o])s=n[o][i],n[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(n){var o="string"==typeof n,a=l.call(arguments,1),r=this;return o?this.length||"instance"!==n?this.each(function(){var i,o=t.data(this,s);return"instance"===n?(r=o,!1):o?t.isFunction(o[n])&&"_"!==n.charAt(0)?(i=o[n].apply(o,a),i!==o&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+n+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+n+"'")}):r=void 0:(a.length&&(n=t.widget.extend.apply(null,[n].concat(a))),this.each(function(){var e=t.data(this,s);e?(e.option(n||{}),e._init&&e._init()):t.data(this,s,new i(n,this))})),r}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=h++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var h=s.match(/^([\w:-]*)\s*(.*)$/),l=h[1]+o.eventNamespace,c=h[2];c?n.on(l,c,r):i.on(l,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,h=/top|center|bottom/,l=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):h.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=h.test(i[1])?i[1]:"center",t=l.exec(i[0]),e=l.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,h=t(this),l=h.outerWidth(),c=h.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=l+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),I=e(k.my,h.outerWidth(),h.outerHeight());"right"===n.my[0]?D.left-=l:"center"===n.my[0]&&(D.left-=l/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=I[0],D.top+=I[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:l,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+I[0],u[1]+I[1]],my:n.my,at:n.at,within:b,elem:h})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-l,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:h,left:D.left,top:D.top,width:l,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};l>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),h.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,h=n-r,l=r+e.collisionWidth-a-n;e.collisionWidth>a?h>0&&0>=l?(i=t.left+h+e.collisionWidth-a-n,t.left+=h-i):t.left=l>0&&0>=h?n:h>l?n+a-e.collisionWidth:n:h>0?t.left+=h:l>0?t.left-=l:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,h=n-r,l=r+e.collisionHeight-a-n;e.collisionHeight>a?h>0&&0>=l?(i=t.top+h+e.collisionHeight-a-n,t.top+=h-i):t.top=l>0&&0>=h?n:h>l?n+a-e.collisionHeight:n:h>0?t.top+=h:l>0?t.top-=l:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,h=n.isWindow?n.scrollLeft:n.offset.left,l=t.left-e.collisionPosition.marginLeft,c=l-h,u=l+e.collisionWidth-r-h,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-h,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,h=n.isWindow?n.scrollTop:n.offset.top,l=t.top-e.collisionPosition.marginTop,c=l-h,u=l+e.collisionHeight-r-h,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-h,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}});var c="ui-effects-",u="ui-effects-style",d="ui-effects-animated",p=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=l(),n=s._rgba=[];return i=i.toLowerCase(),f(h,function(t,o){var a,r=o.re.exec(i),h=r&&o.parse(r),l=o.space||"rgba";return h?(a=s[l](h),s[c[l].cache]=a[c[l].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,h=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],l=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=l.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),l.fn=t.extend(l.prototype,{parse:function(n,a,r,h){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,h],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof l?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=l(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=l(t),n=s._space(),o=c[n],a=0===this.alpha()?l("transparent"):this,r=a[o.cache]||o.to(a._rgba),h=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],l=s[o],c=u[n.type]||{};null!==l&&(null===a?h[o]=l:(c.mod&&(l-a>c.mod/2?a+=c.mod:a-l>c.mod/2&&(a-=c.mod)),h[o]=i((l-a)*e+a,n)))}),this[n](h)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=l(e)._rgba;return l(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),l.fn.parse.prototype=l.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),h=Math.min(s,n,o),l=r-h,c=r+h,u=.5*c;return e=h===r?0:s===r?60*(n-o)/l+360:n===r?60*(o-s)/l+120:60*(s-n)/l+240,i=0===l?0:.5>=u?l/c:l/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,h=n.to,c=n.from;l.fn[s]=function(s){if(h&&!this[a]&&(this[a]=h(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=l(c(d)),n[a]=d,n):l(d)},f(o,function(e,i){l.fn[e]||(l.fn[e]=function(n){var o,a=t.type(n),h="alpha"===e?this._hsla?"hsla":"rgba":s,l=this[h](),c=l[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),l[i.idx]=n,this[h](l)))})})}),l.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=l(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(h){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(h){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=l(e.elem,i),e.end=l(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},l.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(p),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(p.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var h=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",l=h.children?a.find("*").addBack():a;l=l.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),l=l.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),l=l.map(function(){var e=this,i=t.Deferred(),s=t.extend({},h,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,l.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),h.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(d)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(c+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(c+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(u,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(u)||"",t.removeData(u)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(c+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=c+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){r.removeData(d),t.effects.cleanUp(r),"hide"===s.mode&&r.hide(),a()}function a(){t.isFunction(h)&&h.call(r[0]),t.isFunction(e)&&e()}var r=t(this);s.mode=c.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(r[l](),a()):n.call(r[0],s,i):(r.is(":hidden")?"hide"===l:"show"===l)?(r[l](),a()):n.call(r[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,r=a||"fx",h=s.complete,l=s.mode,c=[],u=function(e){var i=t(this),s=t.effects.mode(i,l)||o;i.data(d,!0),c.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?l?this[l](s.duration,h):this.each(function(){h&&h.call(this)}):a===!1?this.each(u).each(i):this.queue(r,u).queue(r,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n)
+}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,h=o?a.scrollLeft():0,l=n.offset(),c={top:l.top-r,left:l.left-h,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-h,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}();var f=t.effects;t.effects.define("blind","hide",function(e,i){var s={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},n=t(this),o=e.direction||"up",a=n.cssClip(),r={clip:t.extend({},a)},h=t.effects.createPlaceholder(n);r.clip[s[o][0]]=r.clip[s[o][1]],"show"===e.mode&&(n.cssClip(r.clip),h&&h.css(t.effects.clipToBox(r)),r.clip=a),h&&h.animate(t.effects.clipToBox(r),e.duration,e.easing),n.animate(r,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("bounce",function(e,i){var s,n,o,a=t(this),r=e.mode,h="hide"===r,l="show"===r,c=e.direction||"up",u=e.distance,d=e.times||5,p=2*d+(l||h?1:0),f=e.duration/p,g=e.easing,m="up"===c||"down"===c?"top":"left",_="up"===c||"left"===c,v=0,b=a.queue().length;for(t.effects.createPlaceholder(a),o=a.css(m),u||(u=a["top"===m?"outerHeight":"outerWidth"]()/3),l&&(n={opacity:1},n[m]=o,a.css("opacity",0).css(m,_?2*-u:2*u).animate(n,f,g)),h&&(u/=Math.pow(2,d-1)),n={},n[m]=o;d>v;v++)s={},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g).animate(n,f,g),u=h?2*u:u/2;h&&(s={opacity:0},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g)),a.queue(i),t.effects.unshift(a,b,p+1)}),t.effects.define("clip","hide",function(e,i){var s,n={},o=t(this),a=e.direction||"vertical",r="both"===a,h=r||"horizontal"===a,l=r||"vertical"===a;s=o.cssClip(),n.clip={top:l?(s.bottom-s.top)/2:s.top,right:h?(s.right-s.left)/2:s.right,bottom:l?(s.bottom-s.top)/2:s.bottom,left:h?(s.right-s.left)/2:s.left},t.effects.createPlaceholder(o),"show"===e.mode&&(o.cssClip(n.clip),n.clip=s),o.animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("drop","hide",function(e,i){var s,n=t(this),o=e.mode,a="show"===o,r=e.direction||"left",h="up"===r||"down"===r?"top":"left",l="up"===r||"left"===r?"-=":"+=",c="+="===l?"-=":"+=",u={opacity:0};t.effects.createPlaceholder(n),s=e.distance||n["top"===h?"outerHeight":"outerWidth"](!0)/2,u[h]=l+s,a&&(n.css(u),u[h]=c+s,u.opacity=1),n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("explode","hide",function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),i()}var o,a,r,h,l,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=e.mode,g="show"===f,m=p.show().css("visibility","hidden").offset(),_=Math.ceil(p.outerWidth()/d),v=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(h=m.top+o*v,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*_,l=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*_,top:-o*v}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:_,height:v,left:r+(g?l*_:0),top:h+(g?c*v:0),opacity:g?0:1}).animate({left:r+(g?0:l*_),top:h+(g?0:c*v),opacity:g?1:0},e.duration||500,e.easing,s)}),t.effects.define("fade","toggle",function(e,i){var s="show"===e.mode;t(this).css("opacity",s?0:1).animate({opacity:s?1:0},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("fold","hide",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=e.size||15,h=/([0-9]+)%/.exec(r),l=!!e.horizFirst,c=l?["right","bottom"]:["bottom","right"],u=e.duration/2,d=t.effects.createPlaceholder(s),p=s.cssClip(),f={clip:t.extend({},p)},g={clip:t.extend({},p)},m=[p[c[0]],p[c[1]]],_=s.queue().length;h&&(r=parseInt(h[1],10)/100*m[a?0:1]),f.clip[c[0]]=r,g.clip[c[0]]=r,g.clip[c[1]]=0,o&&(s.cssClip(g.clip),d&&d.css(t.effects.clipToBox(g)),g.clip=p),s.queue(function(i){d&&d.animate(t.effects.clipToBox(f),u,e.easing).animate(t.effects.clipToBox(g),u,e.easing),i()}).animate(f,u,e.easing).animate(g,u,e.easing).queue(i),t.effects.unshift(s,_,4)}),t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("size",function(e,i){var s,n,o,a=t(this),r=["fontSize"],h=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],l=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=e.mode,u="effect"!==c,d=e.scale||"both",p=e.origin||["middle","center"],f=a.css("position"),g=a.position(),m=t.effects.scaledDimensions(a),_=e.from||m,v=e.to||t.effects.scaledDimensions(a,0);t.effects.createPlaceholder(a),"show"===c&&(o=_,_=v,v=o),n={from:{y:_.height/m.height,x:_.width/m.width},to:{y:v.height/m.height,x:v.width/m.width}},("box"===d||"both"===d)&&(n.from.y!==n.to.y&&(_=t.effects.setTransition(a,h,n.from.y,_),v=t.effects.setTransition(a,h,n.to.y,v)),n.from.x!==n.to.x&&(_=t.effects.setTransition(a,l,n.from.x,_),v=t.effects.setTransition(a,l,n.to.x,v))),("content"===d||"both"===d)&&n.from.y!==n.to.y&&(_=t.effects.setTransition(a,r,n.from.y,_),v=t.effects.setTransition(a,r,n.to.y,v)),p&&(s=t.effects.getBaseline(p,m),_.top=(m.outerHeight-_.outerHeight)*s.y+g.top,_.left=(m.outerWidth-_.outerWidth)*s.x+g.left,v.top=(m.outerHeight-v.outerHeight)*s.y+g.top,v.left=(m.outerWidth-v.outerWidth)*s.x+g.left),a.css(_),("content"===d||"both"===d)&&(h=h.concat(["marginTop","marginBottom"]).concat(r),l=l.concat(["marginLeft","marginRight"]),a.find("*[width]").each(function(){var i=t(this),s=t.effects.scaledDimensions(i),o={height:s.height*n.from.y,width:s.width*n.from.x,outerHeight:s.outerHeight*n.from.y,outerWidth:s.outerWidth*n.from.x},a={height:s.height*n.to.y,width:s.width*n.to.x,outerHeight:s.height*n.to.y,outerWidth:s.width*n.to.x};n.from.y!==n.to.y&&(o=t.effects.setTransition(i,h,n.from.y,o),a=t.effects.setTransition(i,h,n.to.y,a)),n.from.x!==n.to.x&&(o=t.effects.setTransition(i,l,n.from.x,o),a=t.effects.setTransition(i,l,n.to.x,a)),u&&t.effects.saveStyle(i),i.css(o),i.animate(a,e.duration,e.easing,function(){u&&t.effects.restoreStyle(i)})})),a.animate(v,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){var e=a.offset();0===v.opacity&&a.css("opacity",_.opacity),u||(a.css("position","static"===f?"relative":f).offset(e),t.effects.saveStyle(a)),i()}})}),t.effects.define("scale",function(e,i){var s=t(this),n=e.mode,o=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"effect"!==n?0:100),a=t.extend(!0,{from:t.effects.scaledDimensions(s),to:t.effects.scaledDimensions(s,o,e.direction||"both"),origin:e.origin||["middle","center"]},e);e.fade&&(a.from.opacity=1,a.to.opacity=0),t.effects.effect.size.call(this,a,i)}),t.effects.define("puff","hide",function(e,i){var s=t.extend(!0,{},e,{fade:!0,percent:parseInt(e.percent,10)||150});t.effects.effect.scale.call(this,s,i)}),t.effects.define("pulsate","show",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=o||a,h=2*(e.times||5)+(r?1:0),l=e.duration/h,c=0,u=1,d=s.queue().length;for((o||!s.is(":visible"))&&(s.css("opacity",0).show(),c=1);h>u;u++)s.animate({opacity:c},l,e.easing),c=1-c;s.animate({opacity:c},l,e.easing),s.queue(i),t.effects.unshift(s,d,h+1)}),t.effects.define("shake",function(e,i){var s=1,n=t(this),o=e.direction||"left",a=e.distance||20,r=e.times||3,h=2*r+1,l=Math.round(e.duration/h),c="up"===o||"down"===o?"top":"left",u="up"===o||"left"===o,d={},p={},f={},g=n.queue().length;for(t.effects.createPlaceholder(n),d[c]=(u?"-=":"+=")+a,p[c]=(u?"+=":"-=")+2*a,f[c]=(u?"-=":"+=")+2*a,n.animate(d,l,e.easing);r>s;s++)n.animate(p,l,e.easing).animate(f,l,e.easing);n.animate(p,l,e.easing).animate(d,l/2,e.easing).queue(i),t.effects.unshift(n,g,h+1)}),t.effects.define("slide","show",function(e,i){var s,n,o=t(this),a={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},r=e.mode,h=e.direction||"left",l="up"===h||"down"===h?"top":"left",c="up"===h||"left"===h,u=e.distance||o["top"===l?"outerHeight":"outerWidth"](!0),d={};t.effects.createPlaceholder(o),s=o.cssClip(),n=o.position()[l],d[l]=(c?-1:1)*u+n,d.clip=o.cssClip(),d.clip[a[h][1]]=d.clip[a[h][0]],"show"===r&&(o.cssClip(d.clip),o.css(l,d[l]),d.clip=s,d[l]=n),o.animate(d,{queue:!1,duration:e.duration,easing:e.easing,complete:i})});var f;t.uiBackCompat!==!1&&(f=t.effects.define("transfer",function(e,i){t(this).transfer(e,i)})),t.ui.focusable=function(i,s){var n,o,a,r,h,l=i.nodeName.toLowerCase();return"area"===l?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(l)?(r=!i.disabled,r&&(h=t(i).closest("fieldset")[0],h&&(r=!h.disabled))):r="a"===l?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,.\/:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.widget("ui.accordion",{version:"1.12.1",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:"> li > :first-child, > :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t()}},_createIcons:function(){var e,i,s=this.options.icons;s&&(e=t("<span>"),this._addClass(e,"ui-accordion-header-icon","ui-icon "+s.header),e.prependTo(this.headers),i=this.active.children(".ui-accordion-header-icon"),this._removeClass(i,s.header)._addClass(i,null,s.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),void 0)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),t(o).trigger("focus"),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().trigger("focus")},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var e,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var e=t(this),i=e.uniqueId().attr("id"),s=e.next(),n=s.uniqueId().attr("id");e.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(e=n.height(),this.element.siblings(":visible").each(function(){var i=t(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(e-=i.outerHeight(!0))}),this.headers.each(function(){e-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,e-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===s&&(e=0,this.headers.next().each(function(){var i=t(this).is(":visible");i||t(this).show(),e=Math.max(e,t(this).css("height","").height()),i||t(this).hide()}).height(e))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i,s,n=this.options,o=this.active,a=t(e.currentTarget),r=a[0]===o[0],h=r&&n.collapsible,l=h?t():a.next(),c=o.next(),u={oldHeader:o,oldPanel:c,newHeader:h?t():a,newPanel:l};e.preventDefault(),r&&!n.collapsible||this._trigger("beforeActivate",e,u)===!1||(n.active=h?!1:this.headers.index(a),this.active=r?t():a,this._toggle(u),this._removeClass(o,"ui-accordion-header-active","ui-state-active"),n.icons&&(i=o.children(".ui-accordion-header-icon"),this._removeClass(i,null,n.icons.activeHeader)._addClass(i,null,n.icons.header)),r||(this._removeClass(a,"ui-accordion-header-collapsed")._addClass(a,"ui-accordion-header-active","ui-state-active"),n.icons&&(s=a.children(".ui-accordion-header-icon"),this._removeClass(s,null,n.icons.header)._addClass(s,null,n.icons.activeHeader)),this._addClass(a.next(),"ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(t(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,e,i){var s,n,o,a=this,r=0,h=t.css("box-sizing"),l=t.length&&(!e.length||t.index()<e.index()),c=this.options.animate||{},u=l&&c.down||c,d=function(){a._toggleComplete(i)};return"number"==typeof u&&(o=u),"string"==typeof u&&(n=u),n=n||u.easing||c.easing,o=o||u.duration||c.duration,e.length?t.length?(s=t.show().outerHeight(),e.animate(this.hideProps,{duration:o,easing:n,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(this.showProps,{duration:o,easing:n,complete:d,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?"content-box"===h&&(r+=i.now):"content"!==a.options.heightStyle&&(i.now=Math.round(s-e.outerHeight()-r),r=0)}}),void 0):e.animate(this.hideProps,o,n,d):t.animate(this.showProps,o,n,d)},_toggleComplete:function(t){var e=t.oldPanel,i=e.prev();this._removeClass(e,"ui-accordion-content-active"),this._removeClass(i,"ui-accordion-header-active")._addClass(i,"ui-accordion-header-collapsed"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}}),t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.widget("ui.menu",{version:"1.12.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,h=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=h.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("<span>").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=h.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)},_filterMenuItems:function(e){var i=e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(t.trim(t(this).children(".ui-menu-item-wrapper").text()))})}}),t.widget("ui.autocomplete",{version:"1.12.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;
+this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({},e,{label:e.label||e.value,value:e.value||e.label})})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<div>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("<div>").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete;var g=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var h=n[s]("widget");t.data(h[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(h[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var o=i.options.classes[n]||"";o=t.trim(o.replace(g,"")),s[n]=(o+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.extend(t.ui,{datepicker:{version:"1.12.1"}});var m;t.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return a(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var s=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?n(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(i),t.data(e,"datepicker",i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.off("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.on("focus",this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.on("click",function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,n,o){var r,h,l,c,u,d=this._dialogInst;return d||(this.uuid+=1,r="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+r+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),t("body").append(this._dialogInput),d=this._dialogInst=this._newInst(this._dialogInput,!1),d.settings={},t.data(this._dialogInput[0],"datepicker",d)),a(d.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(d,i):i,this._dialogInput.val(i),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(h=document.documentElement.clientWidth,l=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,u=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[h/2-100+c,l/2-150+u]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),d.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],"datepicker",d),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,"datepicker");s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),m===n&&(m=null))},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,i,s){var n,o,r,h,l=this._getInst(e);return 2===arguments.length&&"string"==typeof i?"defaults"===i?t.extend({},t.datepicker._defaults):l?"all"===i?t.extend({},l.settings):this._get(l,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),l&&(this._curInst===l&&this._hideDatepicker(),o=this._getDateDatepicker(e,!0),r=this._getMinMaxDate(l,"min"),h=this._getMinMaxDate(l,"max"),a(l.settings,n),null!==r&&void 0!==n.dateFormat&&void 0===n.minDate&&(l.settings.minDate=this._formatDate(l,r)),null!==h&&void 0!==n.dateFormat&&void 0===n.maxDate&&(l.settings.maxDate=this._formatDate(l,h)),"disabled"in n&&(n.disabled?this._disableDatepicker(e):this._enableDatepicker(e)),this._attachments(t(e),l),this._autoSize(l),this._setDate(l,o),this._updateAlternate(l),this._updateDatepicker(l)),void 0)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var i,s,n=t.datepicker._getInst(e.target);return t.datepicker._get(n,"constrainInput")?(i=t.datepicker._possibleChars(t.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),e.ctrlKey||e.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var s,n,o,r,h,l,c;s=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==s&&(t.datepicker._curInst.dpDiv.stop(!0,!0),s&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),n=t.datepicker._get(s,"beforeShow"),o=n?n.apply(e,[e,s]):{},o!==!1&&(a(s.settings,o),s.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(s),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),r=!1,t(e).parents().each(function(){return r|="fixed"===t(this).css("position"),!r}),h={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,s.dpDiv.empty(),s.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(s),h=t.datepicker._checkOffset(s,h,r),s.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":r?"fixed":"absolute",display:"none",left:h.left+"px",top:h.top+"px"}),s.inline||(l=t.datepicker._get(s,"showAnim"),c=t.datepicker._get(s,"duration"),s.dpDiv.css("z-index",i(t(e))+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[l]?s.dpDiv.show(l,t.datepicker._get(s,"showOptions"),c):s.dpDiv[l||"show"](l?c:null),t.datepicker._shouldFocusInput(s)&&s.input.trigger("focus"),t.datepicker._curInst=s))
+}},_updateDatepicker:function(e){this.maxRows=4,m=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var i,s=this._getNumberOfMonths(e),n=s[1],a=17,r=e.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.trigger("focus"),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,h=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),l=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>h&&h>n?Math.abs(i.left+n-h):0),i.top-=Math.min(i.top,i.top+o>l&&l>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,a=this._curInst;!a||e&&a!==t.data(e,"datepicker")||this._datepickerShowing&&(i=this._get(a,"showAnim"),s=this._get(a,"duration"),n=function(){t.datepicker._tidyDialog(a)},t.effects&&(t.effects.effect[i]||t.effects[i])?a.dpDiv.hide(i,t.datepicker._get(a,"showOptions"),s,n):a.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(a,"onClose"),o&&o.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).val(n))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(e,i,s){if(null==e||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,o,a,r,h=0,l=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,c="string"!=typeof l?l:(new Date).getFullYear()%100+parseInt(l,10),u=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,d=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,g=-1,m=-1,_=-1,v=-1,b=!1,y=function(t){var i=e.length>n+1&&e.charAt(n+1)===t;return i&&n++,i},w=function(t){var e=y(t),s="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n="y"===t?s:1,o=RegExp("^\\d{"+n+","+s+"}"),a=i.substring(h).match(o);if(!a)throw"Missing number at position "+h;return h+=a[0].length,parseInt(a[0],10)},k=function(e,s,n){var o=-1,a=t.map(y(e)?n:s,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(a,function(t,e){var s=e[1];return i.substr(h,s.length).toLowerCase()===s.toLowerCase()?(o=e[0],h+=s.length,!1):void 0}),-1!==o)return o+1;throw"Unknown name at position "+h},x=function(){if(i.charAt(h)!==e.charAt(n))throw"Unexpected literal at position "+h;h++};for(n=0;e.length>n;n++)if(b)"'"!==e.charAt(n)||y("'")?x():b=!1;else switch(e.charAt(n)){case"d":_=w("d");break;case"D":k("D",u,d);break;case"o":v=w("o");break;case"m":m=w("m");break;case"M":m=k("M",p,f);break;case"y":g=w("y");break;case"@":r=new Date(w("@")),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"!":r=new Date((w("!")-this._ticksTo1970)/1e4),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"'":y("'")?x():b=!0;break;default:x()}if(i.length>h&&(a=i.substr(h),!/^\s+/.test(a)))throw"Extra/unparsed characters found in date: "+a;if(-1===g?g=(new Date).getFullYear():100>g&&(g+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c>=g?0:-100)),v>-1)for(m=1,_=v;;){if(o=this._getDaysInMonth(g,m-1),o>=_)break;m++,_-=o}if(r=this._daylightSavingAdjust(new Date(g,m-1,_)),r.getFullYear()!==g||r.getMonth()+1!==m||r.getDate()!==_)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,h=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},l=function(t,e,i){var s=""+e;if(h(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return h(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||h("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=l("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=l("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=l("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=h("y")?e.getFullYear():(10>e.getFullYear()%100?"0":"")+e.getFullYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":h("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,e){return void 0!==t.settings[e]?t.settings[e]:this._defaults[e]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),h=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,l=h.exec(i);l;){switch(l[2]||"d"){case"d":case"D":r+=parseInt(l[1],10);break;case"w":case"W":r+=7*parseInt(l[1],10);break;case"m":case"M":a+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(l[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}l=h.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).on(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,h,l,c,u,d,p,f,g,m,_,v,b,y,w,k,x,C,D,I,T,P,M,S,H,z,O,A,N,W,E,F,L,R=new Date,B=this._daylightSavingAdjust(new Date(R.getFullYear(),R.getMonth(),R.getDate())),Y=this._get(t,"isRTL"),j=this._get(t,"showButtonPanel"),q=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),V=this._get(t,"showCurrentAtPos"),$=this._get(t,"stepMonths"),X=1!==U[0]||1!==U[1],G=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),Q=this._getMinMaxDate(t,"min"),J=this._getMinMaxDate(t,"max"),Z=t.drawMonth-V,te=t.drawYear;if(0>Z&&(Z+=12,te--),J)for(e=this._daylightSavingAdjust(new Date(J.getFullYear(),J.getMonth()-U[0]*U[1]+1,J.getDate())),e=Q&&Q>e?Q:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-$,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>":q?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+$,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>":q?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(Y?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?G:B,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,h=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",l=j?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(Y?h:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(Y?"":h)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),_=this._get(t,"showOtherMonths"),v=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,C=0;U[1]>C;C++){if(D=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),I=" ui-corner-all",T="",X){if(T+="<div class='ui-datepicker-group",U[1]>1)switch(C){case 0:T+=" ui-datepicker-group-first",I=" ui-corner-"+(Y?"right":"left");break;case U[1]-1:T+=" ui-datepicker-group-last",I=" ui-corner-"+(Y?"left":"right");break;default:T+=" ui-datepicker-group-middle",I=""}T+="'>"}for(T+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+I+"'>"+(/all|left/.test(I)&&0===k?Y?o:s:"")+(/all|right/.test(I)&&0===k?Y?s:o:"")+this._generateMonthYearHeader(t,Z,te,Q,J,k>0||C>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",P=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)M=(w+c)%7,P+="<th scope='col'"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[M]+"'>"+p[M]+"</span></th>";for(T+=P+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),H=(this._getFirstDayOfMonth(te,Z)-c+7)%7,z=Math.ceil((H+S)/7),O=X?this.maxRows>z?this.maxRows:z:z,this.maxRows=O,A=this._daylightSavingAdjust(new Date(te,Z,1-H)),N=0;O>N;N++){for(T+="<tr>",W=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(A)+"</td>":"",w=0;7>w;w++)E=m?m.apply(t.input?t.input[0]:null,[A]):[!0,""],F=A.getMonth()!==Z,L=F&&!v||!E[0]||Q&&Q>A||J&&A>J,W+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(A.getTime()===D.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===A.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!_?"":" "+E[1]+(A.getTime()===G.getTime()?" "+this._currentClass:"")+(A.getTime()===B.getTime()?" ui-datepicker-today":""))+"'"+(F&&!_||!E[2]?"":" title='"+E[2].replace(/'/g,"&#39;")+"'")+(L?"":" data-handler='selectDay' data-event='click' data-month='"+A.getMonth()+"' data-year='"+A.getFullYear()+"'")+">"+(F&&!_?"&#xa0;":L?"<span class='ui-state-default'>"+A.getDate()+"</span>":"<a class='ui-state-default"+(A.getTime()===B.getTime()?" ui-state-highlight":"")+(A.getTime()===G.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+A.getDate()+"</a>")+"</td>",A.setDate(A.getDate()+1),A=this._daylightSavingAdjust(A);T+=W+"</tr>"}Z++,Z>11&&(Z=0,te++),T+="</tbody></table>"+(X?"</div>"+(U[0]>0&&C===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=T}y+=x}return y+=l,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var h,l,c,u,d,p,f,g,m=this._get(t,"changeMonth"),_=this._get(t,"changeYear"),v=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(h=s&&s.getFullYear()===i,l=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!h||c>=s.getMonth())&&(!l||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(v||(b+=y+(!o&&m&&_?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!_)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),v&&(b+=(!o&&m&&_?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,h=this._get(t,"yearRange");return h&&(i=h.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).on("mousedown",t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new s,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.12.1",t.datepicker,t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var _=!1;t(document).on("mouseup",function(){_=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!_){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,n="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),_=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,_=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}
+},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),h=t.pageX,l=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(h=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(l=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(h=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(l=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((l-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,l=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((h-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,h=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(h=this.originalPageX),"x"===a.axis&&(l=this.originalPageY)),{top:l-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:h-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,h,l,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)h=s.snapElements[d].left-s.margins.left,l=h+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,h-g>_||m>l+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(h-_),r=g>=Math.abs(l-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(h-m),r=g>=Math.abs(l-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,h=this._change[o];return this._updatePrevProperties(),h?(i=h.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,h,l=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,h=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,l.animate||this.element.css(t.extend(a,{top:h,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!l.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,h=this.originalPosition.top+this.originalSize.height,l=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&l&&(t.left=r-e.minWidth),s&&l&&(t.left=r-e.maxWidth),a&&c&&(t.top=h-e.minHeight),n&&c&&(t.top=h-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-a},l=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(h,c&&l?{top:c,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,h=t(this).resizable("instance"),l=h.options,c=h.element,u=l.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(h.containerElement=t(d),/document/.test(u)||u===document?(h.containerOffset={left:0,top:0},h.containerPosition={left:0,top:0},h.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=h._num(e.css("padding"+s))}),h.containerOffset=e.offset(),h.containerPosition=e.position(),h.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=h.containerOffset,n=h.containerSize.height,o=h.containerSize.width,a=h._hasScroll(d,"left")?d.scrollWidth:o,r=h._hasScroll(d)?d.scrollHeight:n,h.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,h=a.containerOffset,l=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=h),l.left<(a._helper?h.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-h.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?h.left:0),l.top<(a._helper?h.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-h.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?h.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-h.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-h.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),h=a.outerWidth()-e.sizeDiff.width,l=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,h="number"==typeof s.grid?[s.grid,s.grid]:s.grid,l=h[0]||1,c=h[1]||1,u=Math.round((n.width-o.width)/l)*l,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=h,_&&(p+=l),v&&(f+=c),g&&(p-=l),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-l)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-l>0?(i.size.width=p,i.position.left=a.left-u):(p=l-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog
+},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var t=this._focusedElement;t||(t=this.element.find("[autofocus]")),t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).trigger("focus")},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:t("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),h=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(h>=0?"+":"")+h,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&v(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var v=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,h=a+e.helperProportions.height,l=i.offset.left,c=i.offset.top,u=l+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=l&&u>=r&&a>=c&&d>=h;case"intersect":return o+e.helperProportions.width/2>l&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>h-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,l,i.proportions().width);case"touch":return(a>=c&&d>=a||h>=c&&d>=h||c>a&&h>d)&&(o>=l&&u>=o||r>=l&&u>=r||l>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&v(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=v(e,this,this.options.tolerance,i),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===n}),o.length&&(s=t(o[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.progressbar",{version:"1.12.1",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=t("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){return void 0===t?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),void 0)},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).width(i.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,e===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}}),t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,h=e.pageY;return o>r&&(i=r,r=o,o=i),a>h&&(i=h,h=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:h-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),l=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?l=!(c.left>r||o>c.right||c.top>h||a>c.bottom):"fit"===n.tolerance&&(l=c.left>o&&r>c.right&&c.top>a&&h>c.bottom),l?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.selectmenu",[t.ui.formResetMixin,{version:"1.12.1",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=t()},_drawButton:function(){var e,i=this,s=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.focus(),t.preventDefault()}}),this.element.hide(),this.button=t("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),e=t("<span>").appendTo(this.button),this._addClass(e,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(s).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){i._rendered||i._refreshMenu()})},_drawMenu:function(){var e=this;this.menu=t("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=t("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,i){t.preventDefault(),e._setSelection(),e._select(i.item.data("ui-selectmenu-item"),t)},focus:function(t,i){var s=i.item.data("ui-selectmenu-item");null!=e.focusIndex&&s.index!==e.focusIndex&&(e._trigger("focus",t,{item:s}),e.isOpen||e._select(s,t)),e.focusIndex=s.index,e.button.attr("aria-activedescendant",e.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t,e=this.element.find("option");this.menu.empty(),this._parseOptions(e),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,e.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(t.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(e){var i=t("<span>");return this._setText(i,e.label),this._addClass(i,"ui-selectmenu-text"),i},_renderMenu:function(e,i){var s=this,n="";t.each(i,function(i,o){var a;o.optgroup!==n&&(a=t("<li>",{text:o.optgroup}),s._addClass(a,"ui-selectmenu-optgroup","ui-menu-divider"+(o.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),a.appendTo(e),n=o.optgroup),s._renderItemData(e,o)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(e,i){var s=t("<li>"),n=t("<div>",{title:i.element.attr("title")});return i.disabled&&this._addClass(s,null,"ui-state-disabled"),this._setText(n,i.label),s.append(n).appendTo(e)},_setText:function(t,e){e?t.text(e):t.html("&#160;")},_move:function(t,e){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),n+=":not(.ui-state-disabled)"),s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](n).eq(-1):i[t+"All"](n).eq(0),s.length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?(t=window.getSelection(),t.removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(e){this.isOpen&&(t(e.target).closest(".ui-selectmenu-menu, #"+t.ui.escapeSelector(this.ids.button)).length||this.close(e))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection(),t.rangeCount&&(this.range=t.getRangeAt(0))):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(e){var i=!0;switch(e.keyCode){case t.ui.keyCode.TAB:case t.ui.keyCode.ESCAPE:this.close(e),i=!1;break;case t.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(e);break;case t.ui.keyCode.UP:e.altKey?this._toggle(e):this._move("prev",e);break;case t.ui.keyCode.DOWN:e.altKey?this._toggle(e):this._move("next",e);break;case t.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(e):this._toggle(e);break;case t.ui.keyCode.LEFT:this._move("prev",e);break;case t.ui.keyCode.RIGHT:this._move("next",e);break;case t.ui.keyCode.HOME:case t.ui.keyCode.PAGE_UP:this._move("first",e);break;case t.ui.keyCode.END:case t.ui.keyCode.PAGE_DOWN:this._move("last",e);break;default:this.menu.trigger(e),i=!1}i&&e.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){var e=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":e,"aria-activedescendant":e}),this.menu.attr("aria-activedescendant",e)},_setOption:function(t,e){if("icons"===t){var i=this.button.find("span.ui-icon");this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)}this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;return t===!1?(this.button.css("width",""),void 0):(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t),void 0)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(e){var i=this,s=[];e.each(function(e,n){s.push(i._parseOption(t(n),e))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1
+},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,h,l,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),h=o.offset(),l=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:e.pageX-h.left-o.width()/2,top:e.pageY-h.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,h=this,l=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((h.values(s)-h._valueMin())/(h._valueMax()-h._valueMin())),c["horizontal"===h.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[l?"animate":"css"](c,r.animate),h.options.range===!0&&("horizontal"===h.orientation?(0===s&&h.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&h.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&h.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,h=r+t.height,l=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+l>r&&h>s+l,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&h>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],h=[],l=this._connectWith();if(l&&e)for(s=l.length-1;s>=0;s--)for(o=t(l[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&h.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(h.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=h.length-1;s>=0;s--)h[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,h,l,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,l=r.length;l>s;s++)h=t(r[s]),h.data(this.widgetName+"-item",a),c.push({item:h,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,h,l,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(h=this.items[s].item.offset()[a],l=!1,e[u]-h>this.items[s][r]/2&&(l=!0),n>Math.abs(e[u]-h)&&(n=Math.abs(e[u]-h),o=this.items[s],this.direction=l?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,h=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():h?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():h?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;
+this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),h=t(s).closest("li"),l=h.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=h.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),l&&h.data("ui-tabs-aria-controls",l),h.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,h=r?t():this._getPanelForTab(o),l=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:l,newTab:r?t():o,newPanel:h};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),l.length||h.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),h.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},h=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),h(n,e)},1)}).fail(function(t,e){setTimeout(function(){h(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){l.of=t,a.is(":hidden")||a.position(l)}var o,a,r,h,l=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),h=t("<div>").html(a.find(".ui-tooltip-content").html()),h.removeAttr("name").find("[name]").removeAttr("name"),h.removeAttr("id").find("[id]").removeAttr("id"),h.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(l.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip});
diff --git a/esphome/dashboard/static/js/vendor/jquery-validate/jquery.validate.min.js b/esphome/dashboard/static/js/vendor/jquery-validate/jquery.validate.min.js
new file mode 100644
index 0000000000..1ebe2e0b09
--- /dev/null
+++ b/esphome/dashboard/static/js/vendor/jquery-validate/jquery.validate.min.js
@@ -0,0 +1,4 @@
+/*! jQuery Validation Plugin - v1.19.1 - 6/15/2019
+ * https://jqueryvalidation.org/
+ * Copyright (c) 2019 Jörn Zaefferer; Licensed MIT */
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){a.extend(a.fn,{validate:function(b){if(!this.length)return void(b&&b.debug&&window.console&&console.warn("Nothing selected, can't validate, returning nothing."));var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.on("click.validate",":submit",function(b){c.submitButton=b.currentTarget,a(this).hasClass("cancel")&&(c.cancelSubmit=!0),void 0!==a(this).attr("formnovalidate")&&(c.cancelSubmit=!0)}),this.on("submit.validate",function(b){function d(){var d,e;return c.submitButton&&(c.settings.submitHandler||c.formSubmitted)&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(a(c.submitButton).val()).appendTo(c.currentForm)),!(c.settings.submitHandler&&!c.settings.debug)||(e=c.settings.submitHandler.call(c,c.currentForm,b),d&&d.remove(),void 0!==e&&e)}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){var b,c,d;return a(this[0]).is("form")?b=this.validate().form():(d=[],b=!0,c=a(this[0].form).validate(),this.each(function(){b=c.element(this)&&b,b||(d=d.concat(c.errorList))}),c.errorList=d),b},rules:function(b,c){var d,e,f,g,h,i,j=this[0],k="undefined"!=typeof this.attr("contenteditable")&&"false"!==this.attr("contenteditable");if(null!=j&&(!j.form&&k&&(j.form=this.closest("form")[0],j.name=this.attr("name")),null!=j.form)){if(b)switch(d=a.data(j.form,"validator").settings,e=d.rules,f=a.validator.staticRules(j),b){case"add":a.extend(f,a.validator.normalizeRule(c)),delete f.messages,e[j.name]=f,c.messages&&(d.messages[j.name]=a.extend(d.messages[j.name],c.messages));break;case"remove":return c?(i={},a.each(c.split(/\s/),function(a,b){i[b]=f[b],delete f[b]}),i):(delete e[j.name],f)}return g=a.validator.normalizeRules(a.extend({},a.validator.classRules(j),a.validator.attributeRules(j),a.validator.dataRules(j),a.validator.staticRules(j)),j),g.required&&(h=g.required,delete g.required,g=a.extend({required:h},g)),g.remote&&(h=g.remote,delete g.remote,g=a.extend(g,{remote:h})),g}}}),a.extend(a.expr.pseudos||a.expr[":"],{blank:function(b){return!a.trim(""+a(b).val())},filled:function(b){var c=a(b).val();return null!==c&&!!a.trim(""+c)},unchecked:function(b){return!a(b).prop("checked")}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return 1===arguments.length?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:void 0===c?b:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),function(){return c})}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",pendingClass:"pending",validClass:"valid",errorElement:"label",focusCleanup:!1,focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a){this.lastActive=a,this.settings.focusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.hideThese(this.errorsFor(a)))},onfocusout:function(a){this.checkable(a)||!(a.name in this.submitted)&&this.optional(a)||this.element(a)},onkeyup:function(b,c){var d=[16,17,18,20,35,36,37,38,39,40,45,144,225];9===c.which&&""===this.elementValue(b)||a.inArray(c.keyCode,d)!==-1||(b.name in this.submitted||b.name in this.invalid)&&this.element(b)},onclick:function(a){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){"radio"===b.type?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}."),step:a.validator.format("Please enter a multiple of {0}.")},autoCreateRanges:!1,prototype:{init:function(){function b(b){var c="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");if(!this.form&&c&&(this.form=a(this).closest("form")[0],this.name=a(this).attr("name")),d===this.form){var e=a.data(this.form,"validator"),f="on"+b.type.replace(/^validate/,""),g=e.settings;g[f]&&!a(this).is(g.ignore)&&g[f].call(e,this,b)}}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var c,d=this.currentForm,e=this.groups={};a.each(this.settings.groups,function(b,c){"string"==typeof c&&(c=c.split(/\s/)),a.each(c,function(a,c){e[c]=b})}),c=this.settings.rules,a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).on("focusin.validate focusout.validate keyup.validate",":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'], [type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'], [type='radio'], [type='checkbox'], [contenteditable], [type='button']",b).on("click.validate","select, option, [type='radio'], [type='checkbox']",b),this.settings.invalidHandler&&a(this.currentForm).on("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){var c,d,e=this.clean(b),f=this.validationTargetFor(e),g=this,h=!0;return void 0===f?delete this.invalid[e.name]:(this.prepareElement(f),this.currentElements=a(f),d=this.groups[f.name],d&&a.each(this.groups,function(a,b){b===d&&a!==f.name&&(e=g.validationTargetFor(g.clean(g.findByName(a))),e&&e.name in g.invalid&&(g.currentElements.push(e),h=g.check(e)&&h))}),c=this.check(f)!==!1,h=h&&c,c?this.invalid[f.name]=!1:this.invalid[f.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),a(b).attr("aria-invalid",!c)),h},showErrors:function(b){if(b){var c=this;a.extend(this.errorMap,b),this.errorList=a.map(this.errorMap,function(a,b){return{message:a,element:c.findByName(b)[0]}}),this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.invalid={},this.submitted={},this.prepareForm(),this.hideErrors();var b=this.elements().removeData("previousValue").removeAttr("aria-invalid");this.resetElements(b)},resetElements:function(a){var b;if(this.settings.unhighlight)for(b=0;a[b];b++)this.settings.unhighlight.call(this,a[b],this.settings.errorClass,""),this.findByName(a[b].name).removeClass(this.settings.validClass);else a.removeClass(this.settings.errorClass).removeClass(this.settings.validClass)},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b,c=0;for(b in a)void 0!==a[b]&&null!==a[b]&&a[b]!==!1&&c++;return c},hideErrors:function(){this.hideThese(this.toHide)},hideThese:function(a){a.not(this.containers).text(""),this.addWrapper(a).hide()},valid:function(){return 0===this.size()},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").trigger("focus").trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&1===a.grep(this.errorList,function(a){return a.element.name===b.name}).length&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea, [contenteditable]").not(":submit, :reset, :image, :disabled").not(this.settings.ignore).filter(function(){var d=this.name||a(this).attr("name"),e="undefined"!=typeof a(this).attr("contenteditable")&&"false"!==a(this).attr("contenteditable");return!d&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),e&&(this.form=a(this).closest("form")[0],this.name=d),this.form===b.currentForm&&(!(d in c||!b.objectLength(a(this).rules()))&&(c[d]=!0,!0))})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.split(" ").join(".");return a(this.settings.errorElement+"."+b,this.errorContext)},resetInternals:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([])},reset:function(){this.resetInternals(),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c,d,e=a(b),f=b.type,g="undefined"!=typeof e.attr("contenteditable")&&"false"!==e.attr("contenteditable");return"radio"===f||"checkbox"===f?this.findByName(b.name).filter(":checked").val():"number"===f&&"undefined"!=typeof b.validity?b.validity.badInput?"NaN":e.val():(c=g?e.text():e.val(),"file"===f?"C:\\fakepath\\"===c.substr(0,12)?c.substr(12):(d=c.lastIndexOf("/"),d>=0?c.substr(d+1):(d=c.lastIndexOf("\\"),d>=0?c.substr(d+1):c)):"string"==typeof c?c.replace(/\r/g,""):c)},check:function(b){b=this.validationTargetFor(this.clean(b));var c,d,e,f,g=a(b).rules(),h=a.map(g,function(a,b){return b}).length,i=!1,j=this.elementValue(b);"function"==typeof g.normalizer?f=g.normalizer:"function"==typeof this.settings.normalizer&&(f=this.settings.normalizer),f&&(j=f.call(b,j),delete g.normalizer);for(d in g){e={method:d,parameters:g[d]};try{if(c=a.validator.methods[d].call(this,j,b,e.parameters),"dependency-mismatch"===c&&1===h){i=!0;continue}if(i=!1,"pending"===c)return void(this.toHide=this.toHide.not(this.errorsFor(b)));if(!c)return this.formatAndAdd(b,e),!1}catch(k){throw this.settings.debug&&window.console&&console.log("Exception occurred when checking element "+b.id+", check the '"+e.method+"' method.",k),k instanceof TypeError&&(k.message+=".  Exception occurred when checking element "+b.id+", check the '"+e.method+"' method."),k}}if(!i)return this.objectLength(g)&&this.successList.push(b),!0},customDataMessage:function(b,c){return a(b).data("msg"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase())||a(b).data("msg")},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(void 0!==arguments[a])return arguments[a]},defaultMessage:function(b,c){"string"==typeof c&&(c={method:c});var d=this.findDefined(this.customMessage(b.name,c.method),this.customDataMessage(b,c.method),!this.settings.ignoreTitle&&b.title||void 0,a.validator.messages[c.method],"<strong>Warning: No message defined for "+b.name+"</strong>"),e=/\$?\{(\d+)\}/g;return"function"==typeof d?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),d},formatAndAdd:function(a,b){var c=this.defaultMessage(a,b);this.errorList.push({message:c,element:a,method:b.method}),this.errorMap[a.name]=c,this.submitted[a.name]=c},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b,c;for(a=0;this.errorList[a];a++)c=this.errorList[a],this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message);if(this.errorList.length&&(this.toShow=this.toShow.add(this.containers)),this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d,e,f,g,h=this.errorsFor(b),i=this.idOrName(b),j=a(b).attr("aria-describedby");h.length?(h.removeClass(this.settings.validClass).addClass(this.settings.errorClass),h.html(c)):(h=a("<"+this.settings.errorElement+">").attr("id",i+"-error").addClass(this.settings.errorClass).html(c||""),d=h,this.settings.wrapper&&(d=h.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.length?this.labelContainer.append(d):this.settings.errorPlacement?this.settings.errorPlacement.call(this,d,a(b)):d.insertAfter(b),h.is("label")?h.attr("for",i):0===h.parents("label[for='"+this.escapeCssMeta(i)+"']").length&&(f=h.attr("id"),j?j.match(new RegExp("\\b"+this.escapeCssMeta(f)+"\\b"))||(j+=" "+f):j=f,a(b).attr("aria-describedby",j),e=this.groups[b.name],e&&(g=this,a.each(g.groups,function(b,c){c===e&&a("[name='"+g.escapeCssMeta(b)+"']",g.currentForm).attr("aria-describedby",h.attr("id"))})))),!c&&this.settings.success&&(h.text(""),"string"==typeof this.settings.success?h.addClass(this.settings.success):this.settings.success(h,b)),this.toShow=this.toShow.add(h)},errorsFor:function(b){var c=this.escapeCssMeta(this.idOrName(b)),d=a(b).attr("aria-describedby"),e="label[for='"+c+"'], label[for='"+c+"'] *";return d&&(e=e+", #"+this.escapeCssMeta(d).replace(/\s+/g,", #")),this.errors().filter(e)},escapeCssMeta:function(a){return a.replace(/([\\!"#$%&'()*+,.\/:;<=>?@\[\]^`{|}~])/g,"\\$1")},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(b){return this.checkable(b)&&(b=this.findByName(b.name)),a(b).not(this.settings.ignore)[0]},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find("[name='"+this.escapeCssMeta(b)+"']")},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return!this.dependTypes[typeof a]||this.dependTypes[typeof a](a,b)},dependTypes:{"boolean":function(a){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},startRequest:function(b){this.pending[b.name]||(this.pendingRequest++,a(b).addClass(this.settings.pendingClass),this.pending[b.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],a(b).removeClass(this.settings.pendingClass),c&&0===this.pendingRequest&&this.formSubmitted&&this.form()?(a(this.currentForm).submit(),this.submitButton&&a("input:hidden[name='"+this.submitButton.name+"']",this.currentForm).remove(),this.formSubmitted=!1):!c&&0===this.pendingRequest&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},previousValue:function(b,c){return c="string"==typeof c&&c||"remote",a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,{method:c})})},destroy:function(){this.resetForm(),a(this.currentForm).off(".validate").removeData("validator").find(".validate-equalTo-blur").off(".validate-equalTo").removeClass("validate-equalTo-blur").find(".validate-lessThan-blur").off(".validate-lessThan").removeClass("validate-lessThan-blur").find(".validate-lessThanEqual-blur").off(".validate-lessThanEqual").removeClass("validate-lessThanEqual-blur").find(".validate-greaterThanEqual-blur").off(".validate-greaterThanEqual").removeClass("validate-greaterThanEqual-blur").find(".validate-greaterThan-blur").off(".validate-greaterThan").removeClass("validate-greaterThan-blur")}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},normalizeAttributeRule:function(a,b,c,d){/min|max|step/.test(c)&&(null===b||/number|range|text/.test(b))&&(d=Number(d),isNaN(d)&&(d=void 0)),d||0===d?a[c]=d:b===c&&"range"!==b&&(a[c]=!0)},attributeRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)"required"===c?(d=b.getAttribute(c),""===d&&(d=!0),d=!!d):d=f.attr(c),this.normalizeAttributeRule(e,g,c,d);return e.maxlength&&/-1|2147483647|524288/.test(e.maxlength)&&delete e.maxlength,e},dataRules:function(b){var c,d,e={},f=a(b),g=b.getAttribute("type");for(c in a.validator.methods)d=f.data("rule"+c.charAt(0).toUpperCase()+c.substring(1).toLowerCase()),""===d&&(d=!0),this.normalizeAttributeRule(e,g,c,d);return e},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1)return void delete b[d];if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=void 0===e.param||e.param:(a.data(c.form,"validator").resetElements(a(c)),delete b[d])}}),a.each(b,function(d,e){b[d]=a.isFunction(e)&&"normalizer"!==d?e(c):e}),a.each(["minlength","maxlength"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){var c;b[this]&&(a.isArray(b[this])?b[this]=[Number(b[this][0]),Number(b[this][1])]:"string"==typeof b[this]&&(c=b[this].replace(/[\[\]]/g,"").split(/[\s,]+/),b[this]=[Number(c[0]),Number(c[1])]))}),a.validator.autoCreateRanges&&(null!=b.min&&null!=b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),null!=b.minlength&&null!=b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b},normalizeRule:function(b){if("string"==typeof b){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=void 0!==d?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if("select"===c.nodeName.toLowerCase()){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:void 0!==b&&null!==b&&b.length>0},email:function(a,b){return this.optional(b)||/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/.test(a)},url:function(a,b){return this.optional(b)||/^(?:(?:(?:https?|ftp):)?\/\/)(?:\S+(?::\S*)?@)?(?:(?!(?:10|127)(?:\.\d{1,3}){3})(?!(?:169\.254|192\.168)(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})).?)(?::\d{2,5})?(?:[\/?#]\S*)?$/i.test(a)},date:function(){var a=!1;return function(b,c){return a||(a=!0,this.settings.debug&&window.console&&console.warn("The `date` method is deprecated and will be removed in version '2.0.0'.\nPlease don't use it, since it relies on the Date constructor, which\nbehaves very differently across browsers and locales. Use `dateISO`\ninstead or one of the locale specific methods in `localizations/`\nand `additional-methods.js`.")),this.optional(c)||!/Invalid|NaN/.test(new Date(b).toString())}}(),dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-](0?[1-9]|1[012])[\/\-](0?[1-9]|[12][0-9]|3[01])$/.test(a)},number:function(a,b){return this.optional(b)||/^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},minlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e>=d},maxlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e<=d},rangelength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(b,c);return this.optional(c)||e>=d[0]&&e<=d[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},step:function(b,c,d){var e,f=a(c).attr("type"),g="Step attribute on input type "+f+" is not supported.",h=["text","number","range"],i=new RegExp("\\b"+f+"\\b"),j=f&&!i.test(h.join()),k=function(a){var b=(""+a).match(/(?:\.(\d+))?$/);return b&&b[1]?b[1].length:0},l=function(a){return Math.round(a*Math.pow(10,e))},m=!0;if(j)throw new Error(g);return e=k(d),(k(b)>e||l(b)%l(d)!==0)&&(m=!1),this.optional(c)||m},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.not(".validate-equalTo-blur").length&&e.addClass("validate-equalTo-blur").on("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()},remote:function(b,c,d,e){if(this.optional(c))return"dependency-mismatch";e="string"==typeof e&&e||"remote";var f,g,h,i=this.previousValue(c,e);return this.settings.messages[c.name]||(this.settings.messages[c.name]={}),i.originalMessage=i.originalMessage||this.settings.messages[c.name][e],this.settings.messages[c.name][e]=i.message,d="string"==typeof d&&{url:d}||d,h=a.param(a.extend({data:b},d.data)),i.old===h?i.valid:(i.old=h,f=this,this.startRequest(c),g={},g[c.name]=b,a.ajax(a.extend(!0,{mode:"abort",port:"validate"+c.name,dataType:"json",data:g,context:f.currentForm,success:function(a){var d,g,h,j=a===!0||"true"===a;f.settings.messages[c.name][e]=i.originalMessage,j?(h=f.formSubmitted,f.resetInternals(),f.toHide=f.errorsFor(c),f.formSubmitted=h,f.successList.push(c),f.invalid[c.name]=!1,f.showErrors()):(d={},g=a||f.defaultMessage(c,{method:e,parameters:b}),d[c.name]=i.message=g,f.invalid[c.name]=!0,f.showErrors(d)),i.valid=j,f.stopRequest(c,j)}},d)),"pending")}}});var b,c={};return a.ajaxPrefilter?a.ajaxPrefilter(function(a,b,d){var e=a.port;"abort"===a.mode&&(c[e]&&c[e].abort(),c[e]=d)}):(b=a.ajax,a.ajax=function(d){var e=("mode"in d?d:a.ajaxSettings).mode,f=("port"in d?d:a.ajaxSettings).port;return"abort"===e?(c[f]&&c[f].abort(),c[f]=b.apply(this,arguments),c[f]):b.apply(this,arguments)}),a});
diff --git a/esphome/dashboard/static/js/vendor/jquery/jquery.min.js b/esphome/dashboard/static/js/vendor/jquery/jquery.min.js
new file mode 100644
index 0000000000..47b639702c
--- /dev/null
+++ b/esphome/dashboard/static/js/vendor/jquery/jquery.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.5.0 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t=Object.create(null),V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/esphome/dashboard/static/js/vendor/materialize-stepper/materialize-stepper.min.js b/esphome/dashboard/static/js/vendor/materialize-stepper/materialize-stepper.min.js
new file mode 100644
index 0000000000..4b097ad693
--- /dev/null
+++ b/esphome/dashboard/static/js/vendor/materialize-stepper/materialize-stepper.min.js
@@ -0,0 +1,10 @@
+/**
+ * Materialize Stepper - A little plugin that implements a stepper to Materializecss framework.
+ * @version v3.1.0
+ * @author Igor Marcossi (Kinark) <igormarcossi@gmail.com>.
+ * @link https://github.com/Kinark/Materialize-stepper
+ *
+ * Licensed under the MIT License (https://github.com/Kinark/Materialize-stepper/blob/master/LICENSE).
+ */
+
+"use strict"; function _classCallCheck(e, t) { if (!(e instanceof t)) throw new TypeError("Cannot call a class as a function") } function _defineProperties(e, t) { for (var n = 0; n < t.length; n++) { var i = t[n]; i.enumerable = i.enumerable || !1, i.configurable = !0, "value" in i && (i.writable = !0), Object.defineProperty(e, i.key, i) } } function _createClass(e, t, n) { return t && _defineProperties(e.prototype, t), n && _defineProperties(e, n), e } function _defineProperty(e, t, n) { return t in e ? Object.defineProperty(e, t, { value: n, enumerable: !0, configurable: !0, writable: !0 }) : e[t] = n, e } var MStepper = function () { function E(e) { var g = this, t = 1 < arguments.length && void 0 !== arguments[1] ? arguments[1] : {}; _classCallCheck(this, E), _defineProperty(this, "_init", function () { var e = g._formWrapperManager, t = g.getSteps, n = g.options, i = g._methodsBindingManager, r = g._openAction, s = t().steps; g.form = e(), r(s[n.firstActive], void 0, void 0, !0), i(s) }), _defineProperty(this, "_methodsBindingManager", function (e) { var t = 1 < arguments.length && void 0 !== arguments[1] && arguments[1], o = g.classes, a = g._formSubmitHandler, l = g._nextStepProxy, c = g._prevStepProxy, p = g._stepTitleClickHandler, d = g.form, v = g.options, n = E.nodesIterator, f = E.tabbingDisabler, u = t ? E.removeMultipleEventListeners : E.addMultipleEventListeners, i = function (e) { var t = e.getElementsByClassName(o.NEXTSTEPBTN), n = e.getElementsByClassName(o.PREVSTEPBTN), i = e.getElementsByClassName(o.STEPTITLE), r = e.querySelectorAll("input, select, textarea, button"), s = e.querySelectorAll('button[type="submit"]'); return u(t, "click", l, !1), u(n, "click", c, !1), v.stepTitleNavigation && u(i, "click", p), r.length && u(r[r.length - 1], "keydown", f), s && d && v.validationFunction && u(s, "keydown", a), e }; e instanceof Element ? i(e) : n(e, function (e) { return i(e) }) }), _defineProperty(this, "_formSubmitHandler", function (e) { g._validationFunctionCaller() || e.preventDefault() }), _defineProperty(this, "resetStepper", function () { g.form && (g.form.reset(), g.openStep(g.options.firstActive)) }), _defineProperty(this, "updateStepper", function () { var e = g.getSteps, t = g._methodsBindingManager, n = e().steps; t(n, !0), t(n) }), _defineProperty(this, "_openAction", function (e, t) { var n = !(2 < arguments.length && void 0 !== arguments[2]) || arguments[2], i = 3 < arguments.length ? arguments[3] : void 0, r = g._slideDown, s = g.classes, o = g.getSteps, a = g._closeAction, l = g.stepper, c = g.events, p = g.options, d = o().active.step; if (d && d.isSameNode(e)) return e; var v = e.getElementsByClassName(s.STEPCONTENT)[0]; return e.classList.remove(s.DONESTEP), window.innerWidth < 993 || !l.classList.contains(s.HORIZONTALSTEPPER) ? (r(v, s.ACTIVESTEP, e, t), i || r(v, s.ACTIVESTEP, e, function () { var e = v.querySelector("input, select, textarea"); p.autoFocusInput && e && e.focus(), t && "function" == typeof t && t() })) : e.classList.add(s.ACTIVESTEP), d && n && (a(d), l.dispatchEvent(c.STEPCHANGE)), l.dispatchEvent(c.STEPOPEN), e }), _defineProperty(this, "_closeAction", function (e, n) { var t = g._slideUp, i = g.classes, r = g.stepper, s = g.events, o = g._smartListenerUnbind, a = g._smartListenerBind, l = e.getElementsByClassName(i.STEPCONTENT)[0]; if (window.innerWidth < 993 || !r.classList.contains(i.HORIZONTALSTEPPER)) t(l, i.ACTIVESTEP, e, n); else { if (n) { a(l, "transitionend", function e(t) { "left" === t.propertyName && (o(l, "transitionend", e), n()) }) } e.classList.remove(i.ACTIVESTEP) } return r.dispatchEvent(s.STEPCLOSE), e }), _defineProperty(this, "_nextStepProxy", function (e) { return g.nextStep(void 0, void 0, e) }), _defineProperty(this, "_prevStepProxy", function (e) { return g.prevStep(void 0, e) }), _defineProperty(this, "_stepTitleClickHandler", function (e) { var t = g.getSteps, n = g.classes, i = g.nextStep, r = g.prevStep, s = g.stepper, o = g._openAction, a = t(), l = a.steps, c = a.active, p = e.target.closest(".".concat(n.STEP)); if (s.classList.contains(n.LINEAR)) { var d = Array.prototype.indexOf.call(l, p); d == c.index + 1 ? i() : d == c.index - 1 && r() } else o(p) }), _defineProperty(this, "nextStep", function (e, t, n) { n && n.preventDefault && n.preventDefault(); var i = g.options, r = g.getSteps, s = g.activateFeedback, o = g.form, a = g.wrongStep, l = g.classes, c = g._openAction, p = g.stepper, d = g.events, v = g.destroyFeedback, f = g._validationFunctionCaller, u = i.showFeedbackPreloader, E = i.validationFunction, h = r().active, y = r().steps[h.index + 1], P = n && n.target ? n.target.dataset.feedback : null; return E && !f() ? a() : P && !t ? (u && !h.step.dataset.nopreloader && s(), void window[P](v, o, h.step.querySelector(".".concat(l.STEPCONTENT)))) : (h.step.classList.add(l.DONESTEP), c(y, e), void p.dispatchEvent(d.NEXTSTEP)) }), _defineProperty(this, "prevStep", function (e, t) { t && t.preventDefault && t.preventDefault(); var n = g.getSteps, i = g._openAction, r = g.stepper, s = g.events, o = g.destroyFeedback, a = n().active, l = n().steps[a.index + -1]; o(), i(l, e), r.dispatchEvent(s.PREVSTEP) }), _defineProperty(this, "openStep", function (e, t) { var n = g.getSteps, i = g._openAction, r = g.destroyFeedback, s = n().steps[e]; r(), i(s, t) }), _defineProperty(this, "wrongStep", function () { var t = g.getSteps, n = g.classes, e = g.stepper, i = g.events; t().active.step.classList.add(n.WRONGSTEP); var r = t().active.step.querySelectorAll("input, select, textarea"); E.addMultipleEventListeners(r, "input", function e() { t().active.step.classList.remove(n.WRONGSTEP), E.removeMultipleEventListeners(r, "input", e) }), e.dispatchEvent(i.STEPERROR) }), _defineProperty(this, "activateFeedback", function () { var e = g.getSteps, t = g.classes, n = g.options, i = g.stepper, r = g.events, s = e().active.step; s.classList.add(t.FEEDBACKINGSTEP), s.getElementsByClassName(t.STEPCONTENT)[0].insertAdjacentHTML("afterBegin", '<div class="'.concat(t.PRELOADERWRAPPER, '">').concat(n.feedbackPreloader, "</div>")), i.dispatchEvent(r.FEEDBACKING) }), _defineProperty(this, "destroyFeedback", function (e) { var t = g.getSteps, n = g.classes, i = g.nextStep, r = g.stepper, s = g.events, o = t().active.step; if (o && o.classList.contains(n.FEEDBACKINGSTEP)) { o.classList.remove(n.FEEDBACKINGSTEP); var a = o.getElementsByClassName(n.PRELOADERWRAPPER)[0]; a.parentNode.removeChild(a), e && i(void 0, !0), r.dispatchEvent(s.FEEDBACKDESTROYED) } }), _defineProperty(this, "getSteps", function () { var e = g.stepper, t = g.classes, n = e.children, i = e.querySelector("li.".concat(t.STEP, ".").concat(t.ACTIVESTEP)); return { steps: n, active: { step: i, index: Array.prototype.indexOf.call(n, i) } } }), _defineProperty(this, "activateStep", function (e, t) { var n = g.getSteps, i = g._slideDown, r = g.stepper, s = g._methodsBindingManager, o = E.nodesIterator, a = n().steps, l = a.length > t, c = l ? a[t] : a[a.length - 1], p = null; if ("string" == typeof e) c.insertAdjacentHTML(l ? "beforeBegin" : "afterEnd", e.trim()), p = l ? c.previousSibling : c.nextSibling, i(p); else if (Array.isArray(e)) p = [], e.forEach(function (e) { c.insertAdjacentHTML(l ? "beforeBegin" : "afterEnd", e.trim()); var t = l ? c.previousSibling : c.nextSibling; p.push(t), i(t) }); else if (e instanceof Element || e instanceof HTMLCollection || e instanceof NodeList) { var d = l ? r.insertBefore : r.appendChild; p = d(e, c), e instanceof Element ? i(p) : o(p, function (e) { return i(e) }) } return p && s(p), p }), _defineProperty(this, "deactivateStep", function (t) { var n = g._slideUp, i = g.stepper, r = g._methodsBindingManager, e = E.nodesIterator, s = function (e) { i.contains(t) && (r(e, !0), n(e, void 0, void 0, function () { return i.removeChild(e) })) }; return t instanceof Element ? s(t) : (t instanceof HTMLCollection || t instanceof NodeList) && e(t, function (e) { return s(e) }), t }), _defineProperty(this, "_slideDown", function (n, e) { var t = 2 < arguments.length && void 0 !== arguments[2] ? arguments[2] : n, i = 3 < arguments.length ? arguments[3] : void 0, r = "".concat(E.getUnknownHeight(n), "px"), s = function e(t) { "height" === t.propertyName && (g._smartListenerUnbind(n, "transitionend", e), E.removeMultipleProperties(n, "visibility overflow height display"), i && i()) }; return requestAnimationFrame(function () { n.style.display = "none", requestAnimationFrame(function () { n.style.overflow = "hidden", n.style.height = "0", n.style.paddingBottom = "0", n.style.visibility = "unset", n.style.display = "block", requestAnimationFrame(function () { g._smartListenerBind(n, "transitionend", s), n.style.height = r, n.style.removeProperty("padding-bottom"), e && t.classList.add(e) }) }) }), n }), _defineProperty(this, "_slideUp", function (n, e) { var t = 2 < arguments.length && void 0 !== arguments[2] ? arguments[2] : n, i = 3 < arguments.length ? arguments[3] : void 0, r = "".concat(n.offsetHeight, "px"), s = function e(t) { "height" === t.propertyName && (g._smartListenerUnbind(n, "transitionend", e), n.style.display = "none", E.removeMultipleProperties(n, "visibility overflow height padding-bottom"), i && i()) }; return requestAnimationFrame(function () { n.style.overflow = "hidden", n.style.visibility = "unset", n.style.display = "block", n.style.height = r, requestAnimationFrame(function () { g._smartListenerBind(n, "transitionend", s), n.style.height = "0", n.style.paddingBottom = "0", e && t.classList.remove(e) }) }), n }), _defineProperty(this, "_formWrapperManager", function () { var e = g.stepper, t = g.options, n = e.closest("form"); if (n || !t.autoFormCreation) return n && n.length ? n : null; var i = e.dataset || {}, r = i.method || "GET", s = i.action || "?", o = document.createElement("form"); return o.method = r, o.action = s, e.parentNode.insertBefore(o, e), o.appendChild(e), o }), _defineProperty(this, "_validationFunctionCaller", function () { var e = g.options, t = g.getSteps, n = g.form, i = g.classes; return e.validationFunction(n, t().active.step.querySelector(".".concat(i.STEPCONTENT))) }), _defineProperty(this, "_smartListenerBind", function (e, t, n) { var i = !(3 < arguments.length && void 0 !== arguments[3]) || arguments[3], r = 4 < arguments.length && void 0 !== arguments[4] && arguments[4], s = g.listenerStore, o = { el: e, event: t, fn: n }; if (i) for (var a = 0; a < s.length; a++) { var l = s[a]; l.event === t && l.el.isSameNode(e) && l.el.removeEventListener(l.event, l.fn), r && l.fn() } else { var c = s.indexOf(o); if (-1 !== p) { var p = s[c]; p.el.removeEventListener(p.event, p.fn), r && p[c].fn() } } e.addEventListener(t, n), s.push(o) }), _defineProperty(this, "_smartListenerUnbind", function (e, t, n) { var i = g.listenerStore, r = i.indexOf({ el: e, event: t, fn: n }); e.removeEventListener(t, n), i.splice(r, 1) }), this.stepper = e, this.options = Object.assign({ firstActive: 0, autoFocusInput: !0, showFeedbackPreloader: !0, autoFormCreation: !0, validationFunction: E.defaultValidationFunction, stepTitleNavigation: !0, feedbackPreloader: '<div class="preloader-wrapper active"> <div class="spinner-layer spinner-blue-only"> <div class="circle-clipper left"> <div class="circle"></div></div><div class="gap-patch"> <div class="circle"></div></div><div class="circle-clipper right"> <div class="circle"></div></div></div></div>' }, t), this.classes = { HORIZONTALSTEPPER: "horizontal", LINEAR: "linear", NEXTSTEPBTN: "next-step", PREVSTEPBTN: "previous-step", STEPTITLE: "step-title", STEP: "step", STEPCONTENT: "step-content", PRELOADERWRAPPER: "wait-feedback", FEEDBACKINGSTEP: "feedbacking", ACTIVESTEP: "active", WRONGSTEP: "wrong", DONESTEP: "done" }, this.events = { STEPCHANGE: new Event("stepchange"), STEPOPEN: new Event("stepopen"), STEPCLOSE: new Event("stepclose"), NEXTSTEP: new Event("nextstep"), PREVSTEP: new Event("prevstep"), STEPERROR: new Event("steperror"), FEEDBACKING: new Event("feedbacking"), FEEDBACKDESTROYED: new Event("feedbackdestroyed") }, this.listenerStore = [], this.form = null, this._init() } return _createClass(E, null, [{ key: "addMultipleEventListeners", value: function (e, t, n) { var i = 3 < arguments.length && void 0 !== arguments[3] && arguments[3]; if (e instanceof Element) return e.addEventListener(t, n, i); for (var r = 0, s = e.length; r < s; r++)e[r].addEventListener(t, n, i) } }, { key: "removeMultipleEventListeners", value: function (e, t, n) { var i = 3 < arguments.length && void 0 !== arguments[3] && arguments[3]; if (e instanceof Element) return e.removeEventListener(t, n, i); for (var r = 0, s = e.length; r < s; r++)e[r].removeEventListener(t, n, i) } }, { key: "removeMultipleProperties", value: function (e, t) { for (var n = t.split(" "), i = 0; i < n.length; i++)e.style.removeProperty(n[i]) } }, { key: "nodesIterator", value: function (e, t) { for (var n = 0; n < e.length; n++)t(e[n]); return e } }, { key: "getUnknownHeight", value: function (e) { e.style.position = "fixed", e.style.display = "block", e.style.top = "-999999px", e.style.left = "-999999px", e.style.height = "auto", e.style.opacity = "0", e.style.zIndex = "-999999", e.style.pointerEvents = "none"; var t = e.offsetHeight; return E.removeMultipleProperties(e, "position display top left height opacity z-index pointer-events"), t } }, { key: "defaultValidationFunction", value: function (e, t) { for (var n = t.querySelectorAll("input, textarea, select"), i = 0; i < n.length; i++)if (!n[i].checkValidity()) return !1; return !0 } }, { key: "tabbingDisabler", value: function (e) { 9 === e.keyCode && e.preventDefault() } }]), E }(); window.Element && !Element.prototype.closest && (Element.prototype.closest = function (e) { var t, n = (this.document || this.ownerDocument).querySelectorAll(e), i = this; do { for (t = n.length; 0 <= --t && n.item(t) !== i;); } while (t < 0 && (i = i.parentElement)); return i }), "function" != typeof Object.assign && Object.defineProperty(Object, "assign", { value: function (e, t) { if (null == e) throw new TypeError("Cannot convert undefined or null to object"); for (var n = Object(e), i = 1; i < arguments.length; i++) { var r = arguments[i]; if (null != r) for (var s in r) Object.prototype.hasOwnProperty.call(r, s) && (n[s] = r[s]) } return n }, writable: !0, configurable: !0 });
diff --git a/esphome/dashboard/static/materialize.min.js b/esphome/dashboard/static/js/vendor/materialize/materialize.min.js
similarity index 100%
rename from esphome/dashboard/static/materialize.min.js
rename to esphome/dashboard/static/js/vendor/materialize/materialize.min.js
diff --git a/esphome/dashboard/static/materialize-stepper.min.css b/esphome/dashboard/static/materialize-stepper.min.css
deleted file mode 100644
index 753e3121b2..0000000000
--- a/esphome/dashboard/static/materialize-stepper.min.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Materializecss Stepper - By Kinark 2016
-// https://github.com/Kinark/Materialize-stepper
-// CSS.min v2.1.3
-*/
-label.invalid{font-size:12.8px;font-size:.8rem;font-weight:500;color:red!important;top:50px!important}label.invalid.active{-webkit-transform:translateY(0)!important;transform:translateY(0)!important}ul.stepper{counter-reset:section;overflow-y:auto;overflow-x:hidden}.card-content ul.stepper{margin:1em -24px;padding:0 24px}@media only screen and (min-width:993px){ul.stepper.horizontal{position:relative;display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-pack:justify;-webkit-box-pack:justify;justify-content:space-between;min-height:458px}.card-content ul.stepper.horizontal{margin-left:-24px;margin-right:-24px;padding-left:24px;padding-right:24px;overflow:hidden}.card-content ul.stepper.horizontal:first-child{margin-top:-24px}ul.stepper.horizontal:before{content:'';background-color:transparent;width:100%;min-height:84px;box-shadow:0 2px 1px -1px rgba(0,0,0,.2),0 1px 1px 0 rgba(0,0,0,.14),0 1px 3px 0 rgba(0,0,0,.12);position:absolute;left:0}}ul.stepper .wait-feedback{left:0;right:0;top:0;z-index:2;position:absolute;width:100%;height:100%;text-align:center;display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-pack:center;-webkit-box-pack:center;justify-content:center;-ms-flex-align:center;-webkit-box-align:center;align-items:center}ul.stepper .step{position:relative}ul.stepper .step.feedbacking .step-content>:not(.wait-feedback){opacity:.1;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=10)"}@media only screen and (min-width:993px){ul.stepper.horizontal .step{position:static;margin:0;width:100%;display:-ms-flexbox;display:-webkit-box;display:flex;-ms-flex-align:center;-webkit-box-align:center;align-items:center;height:84px!important}ul.stepper.horizontal>.step:last-of-type,ul.stepper.horizontal>.step[data-last=true]{width:auto!important}ul.stepper.horizontal .step:not(:last-of-type):after,ul.stepper.horizontal>.step.active:not(:last-of-type):after{content:'';position:static;display:inline-block;width:100%;height:1px}}ul.stepper>li:not(:last-of-type){margin-bottom:10px;-webkit-transition:margin-bottom .4s;transition:margin-bottom .4s}ul.stepper .step:not(:last-of-type).active{margin-bottom:36px}ul.stepper .step:before{position:absolute;top:12px;counter-increment:section;content:counter(section);height:28px;width:28px;color:#fff;background-color:rgba(0,0,0,.3);border-radius:50%;text-align:center;line-height:28px;font-weight:400}ul.stepper .step.active:before,ul.stepper .step.done:before{background-color:#2196f3}ul.stepper .step.done:before{content:'\e5ca';font-size:16px;font-family:'Material Icons'}ul.stepper .step.wrong:before{content:'\e001';font-size:24px;font-family:'Material Icons';background-color:red!important}ul.stepper .step-title{margin:0 -24px;cursor:pointer;padding:15.5px 44px 24px 64px;display:block}@media only screen and (min-width:993px){ul.stepper.horizontal .step.active .step-title:before,ul.stepper.horizontal .step.done .step-title:before{background-color:#2196f3}ul.stepper.horizontal .step.done .step-title:before{content:'\e5ca';font-size:16px;font-family:'Material Icons'}ul.stepper.horizontal .step.wrong .step-title:before{content:'\e001';font-size:24px;font-family:'Material Icons';background-color:red!important}ul.stepper.horizontal .step-title{line-height:84px;height:84px;margin:0;padding:0 25px 0 65px;display:inline-block;max-width:220px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-ms-flex-negative:0;flex-shrink:0}ul.stepper.horizontal .step:before{content:none}ul.stepper.horizontal .step .step-title:before{position:absolute;top:28.5px;left:19px;counter-increment:section;content:counter(section);height:28px;width:28px;color:#fff;background-color:rgba(0,0,0,.3);border-radius:50%;text-align:center;line-height:28px;font-weight:400}ul.stepper.horizontal .step-title:after{top:15px}}ul.stepper .step-title:after{content:attr(data-step-label);display:block;position:absolute;font-size:12.8px;font-size:.8rem;color:#424242;font-weight:400}ul.stepper .step-title:hover{background-color:rgba(0,0,0,.06)}ul.stepper .step.active .step-title{font-weight:500}ul.stepper .step-content{position:relative;display:none;height:calc(100% - 132px);width:inherit;overflow:visible;margin-left:41px;margin-right:24px}@media only screen and (min-width:993px){ul.stepper.horizontal .step-content{position:absolute;height:calc(100% - 84px);top:84px;left:0;width:100%;overflow-y:auto;overflow-x:hidden;margin:0;padding:20px 20px 76px}.card-content ul.stepper.horizontal .step-content{padding-left:40px;padding-right:40px}}ul.stepper>.step:not(:last-of-type):after{content:'';position:absolute;top:50px;left:13.5px;width:1px;height:40%;height:calc(100% - 38px);background-color:rgba(0,0,0,.1);-webkit-transition:all .4s;transition:all .4s}ul.stepper>.step.active:not(:last-child):after{height:93%;height:calc(100% - 12px)}ul.stepper>.step[data-last=true]:after{height:0;width:0}ul.stepper>.step[data-last=true]{margin-bottom:0}ul.stepper .step-actions{padding-top:16px;-webkit-display:flex;-moz-display:flex;-ms-display:flex;display:-webkit-box;display:flex;-ms-flex-pack:start;-webkit-box-pack:start;justify-content:flex-start}ul.stepper .step-actions .btn-flat:not(:last-child),ul.stepper .step-actions .btn-large:not(:last-child),ul.stepper .step-actions .btn:not(:last-child){margin-right:5px}@media only screen and (min-width:993px){ul.stepper.horizontal .step-actions .btn-flat:not(:last-child),ul.stepper.horizontal .step-actions .btn-large:not(:last-child),ul.stepper.horizontal .step-actions .btn:not(:last-child){margin-left:5px;margin-right:0}ul.stepper.horizontal .step-actions{position:absolute;bottom:0;left:0;width:100%;padding:20px;background-color:#fff;-ms-flex-direction:row-reverse;-webkit-box-orient:horizontal;-webkit-box-direction:reverse;flex-direction:row-reverse}.card-content ul.stepper.horizontal .step-actions{padding-left:40px;padding-right:40px}}ul.stepper .step-content .row{margin-bottom:7px}
diff --git a/esphome/dashboard/static/materialize-stepper.min.js b/esphome/dashboard/static/materialize-stepper.min.js
deleted file mode 100644
index d8c12e7eef..0000000000
--- a/esphome/dashboard/static/materialize-stepper.min.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Materializecss Stepper - By Kinark 2016
-// https://github.com/Kinark/Materialize-stepper
-// JS.min v2.1.3
-*/
-var validation=$.isFunction($.fn.valid)?1:0;$.fn.isValid=function(){return!validation||this.valid()},validation&&$.validator.setDefaults({errorClass:"invalid",validClass:"valid",errorPlacement:function(a,b){b.is(":radio")||b.is(":checkbox")?a.insertBefore($(b).parent()):a.insertAfter(b)},success:function(a){$(a).closest("li").find("label.invalid:not(:empty)").length||$(a).closest("li").removeClass("wrong")}}),$.fn.getActiveStep=function(){return active=this.find(".step.active"),$(this.children(".step:visible")).index($(active))+1},$.fn.activateStep=function(a){$(this).hasClass("step")||(stepper=$(this).closest("ul.stepper"),stepper.find(">li").removeAttr("data-last"),window.innerWidth<993||!stepper.hasClass("horizontal")?$(this).addClass("step").stop().slideDown(400,function(){$(this).css({height:"auto","margin-bottom":"",display:"inherit"}),a&&a(),stepper.find(">li.step").last().attr("data-last","true")}):$(this).addClass("step").stop().css({width:"0%",display:"inherit"}).animate({width:"100%"},400,function(){$(this).css({height:"auto","margin-bottom":"",display:"inherit"}),a&&a(),stepper.find(">li.step").last().attr("data-last","true")}))},$.fn.deactivateStep=function(a){$(this).hasClass("step")&&(stepper=$(this).closest("ul.stepper"),stepper.find(">li").removeAttr("data-last"),window.innerWidth<993||!stepper.hasClass("horizontal")?$(this).stop().css({transition:"none","-webkit-transition":"margin-bottom none"}).slideUp(400,function(){$(this).removeClass("step").css({height:"auto","margin-bottom":"",transition:"margin-bottom .4s","-webkit-transition":"margin-bottom .4s"}),a&&a(),stepper.find(">li").removeAttr("data-last"),stepper.find(">li.step").last().attr("data-last","true")}):$(this).stop().animate({width:"0%"},400,function(){$(this).removeClass("step").hide().css({height:"auto","margin-bottom":"",display:"none",width:""}),a&&a(),stepper.find(">li.step").last().attr("data-last","true")}))},$.fn.showError=function(a){if(validation){name=this.attr("name"),form=this.closest("form");var b={};b[name]=a,form.validate().showErrors(b),this.closest("li").addClass("wrong")}else this.removeClass("valid").addClass("invalid"),this.next().attr("data-error",a)},$.fn.activateFeedback=function(){active=this.find(".step.active:not(.feedbacking)").addClass("feedbacking").find(".step-content"),active.prepend('<div class="wait-feedback"> <div class="preloader-wrapper active"> <div class="spinner-layer spinner-blue"> <div class="circle-clipper left"> <div class="circle"></div></div><div class="gap-patch"> <div class="circle"></div></div><div class="circle-clipper right"> <div class="circle"></div></div></div><div class="spinner-layer spinner-red"> <div class="circle-clipper left"> <div class="circle"></div></div><div class="gap-patch"> <div class="circle"></div></div><div class="circle-clipper right"> <div class="circle"></div></div></div><div class="spinner-layer spinner-yellow"> <div class="circle-clipper left"> <div class="circle"></div></div><div class="gap-patch"> <div class="circle"></div></div><div class="circle-clipper right"> <div class="circle"></div></div></div><div class="spinner-layer spinner-green"> <div class="circle-clipper left"> <div class="circle"></div></div><div class="gap-patch"> <div class="circle"></div></div><div class="circle-clipper right"> <div class="circle"></div></div></div></div></div>')},$.fn.destroyFeedback=function(){return active=this.find(".step.active.feedbacking"),active&&(active.removeClass("feedbacking"),active.find(".wait-feedback").remove()),!0},$.fn.resetStepper=function(a){return a||(a=1),form=$(this).closest("form"),$(form)[0].reset(),Materialize.updateTextFields(),$(this).openStep(a)},$.fn.submitStepper=function(a){form=this.closest("form"),form.isValid()&&form.submit()},$.fn.nextStep=function(a,b,c){return stepper=this,settings=$(stepper).data("settings"),form=this.closest("form"),active=this.find(".step.active"),next=$(this.children(".step:visible")).index($(active))+2,feedback=active.find(".next-step").length>1?c?$(c.target).data("feedback"):void 0:active.find(".next-step").data("feedback"),form.isValid()?feedback&&b?(settings.showFeedbackLoader&&stepper.activateFeedback(),window[feedback].call()):(active.removeClass("wrong").addClass("done"),this.openStep(next,a),this.trigger("nextstep")):active.removeClass("done").addClass("wrong")},$.fn.prevStep=function(a){if(active=this.find(".step.active"),!active.hasClass("feedbacking"))return prev=$(this.children(".step:visible")).index($(active)),active.removeClass("wrong"),this.openStep(prev,a),this.trigger("prevstep")},$.fn.openStep=function(a,b){settings=$(this).closest("ul.stepper").data("settings"),$this=this,step_num=a-1,a=this.find(".step:visible:eq("+step_num+")"),a.hasClass("active")||(active=this.find(".step.active"),prev_active=next=$(this.children(".step:visible")).index($(active)),order=step_num>prev_active?1:0,active.hasClass("feedbacking")&&$this.destroyFeedback(),active.closeAction(order),a.openAction(order,function(){settings.autoFocusInput&&a.find("input:enabled:visible:first").focus(),$this.trigger("stepchange").trigger("step"+(step_num+1)),a.data("event")&&$this.trigger(a.data("event")),b&&b()}))},$.fn.closeAction=function(a,b){closable=this.removeClass("active").find(".step-content"),window.innerWidth<993||!this.closest("ul").hasClass("horizontal")?closable.stop().slideUp(300,"easeOutQuad",b):1==a?closable.animate({left:"-100%"},function(){closable.css({display:"none",left:"0%"},b)}):closable.animate({left:"100%"},function(){closable.css({display:"none",left:"0%"},b)})},$.fn.openAction=function(a,b){openable=this.removeClass("done").addClass("active").find(".step-content"),window.innerWidth<993||!this.closest("ul").hasClass("horizontal")?openable.slideDown(300,"easeOutQuad",b):1==a?openable.css({left:"100%",display:"block"}).animate({left:"0%"},b):openable.css({left:"-100%",display:"block"}).animate({left:"0%"},b)},$.fn.activateStepper=function(a){var b=$.extend({linearStepsNavigation:!0,autoFocusInput:!0,showFeedbackLoader:!0,autoFormCreation:!0},a);$(document).on("click",function(a){$(a.target).parents(".stepper").length||$(".stepper.focused").removeClass("focused")}),$(this).each(function(){var a=$(this);!a.parents("form").length&&b.autoFormCreation&&(method=a.data("method"),action=a.data("action"),method=method?method:"GET",action=action?action:"?",a.wrap('<form action="'+action+'" method="'+method+'"></div>')),a.data("settings",{linearStepsNavigation:b.linearStepsNavigation,autoFocusInput:b.autoFocusInput,showFeedbackLoader:b.showFeedbackLoader}),a.find("li.step.active").openAction(1),a.find(">li").removeAttr("data-last"),a.find(">li.step").last().attr("data-last","true"),a.on("click",".step:not(.active)",function(){object=$(a.children(".step:visible")).index($(this)),a.hasClass("linear")?b.linearStepsNavigation&&(active=a.find(".step.active"),$(a.children(".step:visible")).index($(active))+1==object?a.nextStep(void 0,!0,void 0):$(a.children(".step:visible")).index($(active))-1==object&&a.prevStep(void 0)):a.openStep(object+1)}).on("click",".next-step",function(b){b.preventDefault(),a.nextStep(void 0,!0,b)}).on("click",".previous-step",function(b){b.preventDefault(),a.prevStep(void 0)}).on("click","button:submit:not(.next-step, .previous-step)",function(b){if(b.preventDefault(),feedback=b?$(b.target).data("feedback"):void 0,form=a.closest("form"),form.isValid()){if(feedback)return stepper.activateFeedback(),window[feedback].call();form.submit()}}).on("click",function(){$(".stepper.focused").removeClass("focused"),$(this).addClass("focused")})})};
diff --git a/esphome/dashboard/static/mode-yaml.js b/esphome/dashboard/static/mode-yaml.js
deleted file mode 100644
index 998e39c9a4..0000000000
--- a/esphome/dashboard/static/mode-yaml.js
+++ /dev/null
@@ -1,7 +0,0 @@
-ace.define("ace/mode/yaml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text_highlight_rules").TextHighlightRules,s=function(){this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"list.markup",regex:/^(?:-{3}|\.{3})\s*(?=#|$)/},{token:"list.markup",regex:/^\s*[\-?](?:$|\s)/},{token:"constant",regex:"!![\\w//]+"},{token:"constant.language",regex:"[&\\*][a-zA-Z0-9-_]+"},{token:["meta.tag","keyword"],regex:/^(\s*\w.*?)(:(?=\s|$))/},{token:["meta.tag","keyword"],regex:/(\w+?)(\s*:(?=\s|$))/},{token:"keyword.operator",regex:"<<\\w*:\\w*"},{token:"keyword.operator",regex:"-\\s*(?=[{])"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:/[|>][-+\d\s]*$/,onMatch:function(e,t,n,r){var i=/^\s*/.exec(r)[0];return n.length<1?n.push(this.next):n[0]="mlString",n.length<2?n.push(i.length):n[1]=i.length,this.token},next:"mlString"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:/(\b|[+\-\.])[\d_]+(?:(?:\.[\d_]*)?(?:[eE][+\-]?[\d_]+)?)(?=[^\d-\w]|$)/},{token:"constant.numeric",regex:/[+\-]?\.inf\b|NaN\b|0x[\dA-Fa-f_]+|0b[10_]+/},{token:"constant.language.boolean",regex:"\\b(?:true|false|TRUE|FALSE|True|False|yes|no)\\b"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:/[^\s,:\[\]\{\}]+/}],mlString:[{token:"indent",regex:/^\s*$/},{token:"indent",regex:/^\s*/,onMatch:function(e,t,n){var r=n[1];return r>=e.length?(this.next="start",n.splice(0)):this.next="mlString",this.token},next:"mlString"},{token:"string",regex:".+"}]},this.normalizeRules()};r.inherits(s,i),t.YamlHighlightRules=s}),ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(e,t,n){"use strict";var r=e("../range").Range,i=function(){};(function(){this.checkOutdent=function(e,t){return/^\s+$/.test(e)?/^\s*\}/.test(t):!1},this.autoOutdent=function(e,t){var n=e.getLine(t),i=n.match(/^(\s*\})/);if(!i)return 0;var s=i[1].length,o=e.findMatchingBracket({row:t,column:s});if(!o||o.row==t)return 0;var u=this.$getIndent(e.getLine(o.row));e.replace(new r(t,0,t,s-1),u)},this.$getIndent=function(e){return e.match(/^\s*/)[0]}}).call(i.prototype),t.MatchingBraceOutdent=i}),ace.define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"],function(e,t,n){"use strict";var r=e("../../lib/oop"),i=e("./fold_mode").FoldMode,s=e("../../range").Range,o=t.FoldMode=function(){};r.inherits(o,i),function(){this.getFoldWidgetRange=function(e,t,n){var r=this.indentationBlock(e,n);if(r)return r;var i=/\S/,o=e.getLine(n),u=o.search(i);if(u==-1||o[u]!="#")return;var a=o.length,f=e.getLength(),l=n,c=n;while(++n<f){o=e.getLine(n);var h=o.search(i);if(h==-1)continue;if(o[h]!="#")break;c=n}if(c>l){var p=e.getLine(c).length;return new s(l,a,c,p)}},this.getFoldWidget=function(e,t,n){var r=e.getLine(n),i=r.search(/\S/),s=e.getLine(n+1),o=e.getLine(n-1),u=o.search(/\S/),a=s.search(/\S/);if(i==-1)return e.foldWidgets[n-1]=u!=-1&&u<a?"start":"","";if(u==-1){if(i==a&&r[i]=="#"&&s[i]=="#")return e.foldWidgets[n-1]="",e.foldWidgets[n+1]="","start"}else if(u==i&&r[i]=="#"&&o[i]=="#"&&e.getLine(n-2).search(/\S/)==-1)return e.foldWidgets[n-1]="start",e.foldWidgets[n+1]="","";return u!=-1&&u<i?e.foldWidgets[n-1]="start":e.foldWidgets[n-1]="",i<a?"start":""}}.call(o.prototype)}),ace.define("ace/mode/yaml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/yaml_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/coffee"],function(e,t,n){"use strict";var r=e("../lib/oop"),i=e("./text").Mode,s=e("./yaml_highlight_rules").YamlHighlightRules,o=e("./matching_brace_outdent").MatchingBraceOutdent,u=e("./folding/coffee").FoldMode,a=function(){this.HighlightRules=s,this.$outdent=new o,this.foldingRules=new u,this.$behaviour=this.$defaultBehaviour};r.inherits(a,i),function(){this.lineCommentStart=["#"],this.getNextLineIndent=function(e,t,n){var r=this.$getIndent(t);if(e=="start"){var i=t.match(/^.*[\{\(\[]\s*$/);i&&(r+=n)}return r},this.checkOutdent=function(e,t,n){return this.$outdent.checkOutdent(t,n)},this.autoOutdent=function(e,t,n){this.$outdent.autoOutdent(t,n)},this.$id="ace/mode/yaml"}.call(a.prototype),t.Mode=a});                (function() {
-                    ace.require(["ace/mode/yaml"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
diff --git a/esphome/dashboard/static/theme-dreamweaver.js b/esphome/dashboard/static/theme-dreamweaver.js
deleted file mode 100644
index a2fc54e022..0000000000
--- a/esphome/dashboard/static/theme-dreamweaver.js
+++ /dev/null
@@ -1,7 +0,0 @@
-ace.define("ace/theme/dreamweaver",["require","exports","module","ace/lib/dom"],function(e,t,n){t.isDark=!1,t.cssClass="ace-dreamweaver",t.cssText='.ace-dreamweaver .ace_gutter {background: #e8e8e8;color: #333;}.ace-dreamweaver .ace_print-margin {width: 1px;background: #e8e8e8;}.ace-dreamweaver {background-color: #FFFFFF;color: black;}.ace-dreamweaver .ace_fold {background-color: #757AD8;}.ace-dreamweaver .ace_cursor {color: black;}.ace-dreamweaver .ace_invisible {color: rgb(191, 191, 191);}.ace-dreamweaver .ace_storage,.ace-dreamweaver .ace_keyword {color: blue;}.ace-dreamweaver .ace_constant.ace_buildin {color: rgb(88, 72, 246);}.ace-dreamweaver .ace_constant.ace_language {color: rgb(88, 92, 246);}.ace-dreamweaver .ace_constant.ace_library {color: rgb(6, 150, 14);}.ace-dreamweaver .ace_invalid {background-color: rgb(153, 0, 0);color: white;}.ace-dreamweaver .ace_support.ace_function {color: rgb(60, 76, 114);}.ace-dreamweaver .ace_support.ace_constant {color: rgb(6, 150, 14);}.ace-dreamweaver .ace_support.ace_type,.ace-dreamweaver .ace_support.ace_class {color: #009;}.ace-dreamweaver .ace_support.ace_php_tag {color: #f00;}.ace-dreamweaver .ace_keyword.ace_operator {color: rgb(104, 118, 135);}.ace-dreamweaver .ace_string {color: #00F;}.ace-dreamweaver .ace_comment {color: rgb(76, 136, 107);}.ace-dreamweaver .ace_comment.ace_doc {color: rgb(0, 102, 255);}.ace-dreamweaver .ace_comment.ace_doc.ace_tag {color: rgb(128, 159, 191);}.ace-dreamweaver .ace_constant.ace_numeric {color: rgb(0, 0, 205);}.ace-dreamweaver .ace_variable {color: #06F}.ace-dreamweaver .ace_xml-pe {color: rgb(104, 104, 91);}.ace-dreamweaver .ace_entity.ace_name.ace_function {color: #00F;}.ace-dreamweaver .ace_heading {color: rgb(12, 7, 255);}.ace-dreamweaver .ace_list {color:rgb(185, 6, 144);}.ace-dreamweaver .ace_marker-layer .ace_selection {background: rgb(181, 213, 255);}.ace-dreamweaver .ace_marker-layer .ace_step {background: rgb(252, 255, 0);}.ace-dreamweaver .ace_marker-layer .ace_stack {background: rgb(164, 229, 101);}.ace-dreamweaver .ace_marker-layer .ace_bracket {margin: -1px 0 0 -1px;border: 1px solid rgb(192, 192, 192);}.ace-dreamweaver .ace_marker-layer .ace_active-line {background: rgba(0, 0, 0, 0.07);}.ace-dreamweaver .ace_gutter-active-line {background-color : #DCDCDC;}.ace-dreamweaver .ace_marker-layer .ace_selected-word {background: rgb(250, 250, 255);border: 1px solid rgb(200, 200, 250);}.ace-dreamweaver .ace_meta.ace_tag {color:#009;}.ace-dreamweaver .ace_meta.ace_tag.ace_anchor {color:#060;}.ace-dreamweaver .ace_meta.ace_tag.ace_form {color:#F90;}.ace-dreamweaver .ace_meta.ace_tag.ace_image {color:#909;}.ace-dreamweaver .ace_meta.ace_tag.ace_script {color:#900;}.ace-dreamweaver .ace_meta.ace_tag.ace_style {color:#909;}.ace-dreamweaver .ace_meta.ace_tag.ace_table {color:#099;}.ace-dreamweaver .ace_string.ace_regex {color: rgb(255, 0, 0)}.ace-dreamweaver .ace_indent-guide {background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==") right repeat-y;}';var r=e("../lib/dom");r.importCssString(t.cssText,t.cssClass)});                (function() {
-                    ace.require(["ace/theme/dreamweaver"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
diff --git a/esphome/dashboard/templates/index.html b/esphome/dashboard/templates/index.html
index 0aea1c8cef..1e546b037f 100644
--- a/esphome/dashboard/templates/index.html
+++ b/esphome/dashboard/templates/index.html
@@ -1,555 +1,676 @@
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
   <meta charset="UTF-8">
-  <title>ESPHome Dashboard</title>
-  <link rel="stylesheet" href="{{ get_static_file_url('fonts/material-icons.css') }}">
-  <link rel="stylesheet" href="{{ get_static_file_url('materialize.min.css') }}">
-  <link rel="stylesheet" href="{{ get_static_file_url('materialize-stepper.min.css') }}">
-  <link rel="stylesheet" href="{{ get_static_file_url('esphome.css') }}">
-  <link rel="shortcut icon" href="{{ get_static_file_url('favicon.ico') }}">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Dashboard - ESPHome</title>
 
-  <script src="{{ get_static_file_url('jquery.min.js') }}"></script>
-  <script src="{{ get_static_file_url('jquery-ui.min.js') }}"></script>
-  <script src="{{ get_static_file_url('materialize.min.js') }}"></script>
-  <script src="{{ get_static_file_url('jquery.validate.min.js') }}"></script>
+  <link rel="shortcut icon" href="{{ get_static_file_url('images/favicon.ico') }}">
 
-  <script src="{{ get_static_file_url('materialize-stepper.min.js') }}"></script>
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <link rel="stylesheet" href="{{ get_static_file_url('fonts/material-icons/material-icons.css') }}">
+  <link rel="stylesheet" href="{{ get_static_file_url('css/vendor/materialize/materialize.min.css') }}">
+  <link rel="stylesheet" href="{{ get_static_file_url('css/vendor/materialize-stepper/materialize-stepper.min.css') }}">
+  <link rel="stylesheet" href="{{ get_static_file_url('css/esphome.css') }}">
+
+  <script src="{{ get_static_file_url('js/vendor/jquery/jquery.min.js') }}"></script>
+  <script src="{{ get_static_file_url('js/vendor/jquery-ui/jquery-ui.min.js') }}"></script>
+  <script src="{{ get_static_file_url('js/vendor/jquery-validate/jquery.validate.min.js') }}"></script>
+  <script src="{{ get_static_file_url('js/vendor/materialize/materialize.min.js') }}"></script>
+  <script src="{{ get_static_file_url('js/vendor/materialize-stepper/materialize-stepper.min.js') }}"></script>
 
   {% if streamer_mode %}
-    <style>
-      .log-secret {
-        visibility: hidden !important;
-      }
-    </style>
+  <style>
+    .log-secret {
+      visibility: hidden !important;
+    }
+  </style>
   {% end %}
 </head>
+
 <body>
 
-<header>
-<nav>
-  <div class="nav-wrapper indigo">
-    <a href="#" class="brand-logo left">ESPHome Dashboard</a>
-    <i class="material-icons dropdown-trigger right" id="dropdown-nav-trigger" data-target="dropdown-nav-actions">more_vert</i>
-    <div class="select-port-container right" id="select-port-target">
-      <select></select>
-    </div>
-  </div>
+  <div class="navbar-fixed">
+    <nav>
+      <div class="nav-wrapper grey lighten-2">
+        <a href="#" class="black-text logo-wrapper">
+          <img src="https://esphome.io/_static/logo-text.svg" alt="ESPHome Logo" class="logo">
+        </a>
 
-  <ul id="dropdown-nav-actions" class="select-action dropdown-content card-dropdown-action">
-    <li><a id="logout-button" href="{{ relative_url }}logout">Logout</a></li>
-    <li><a id="update-all-button" data-node="{{ escape(config_dir) }}">Update All</a></li>
-    <li><a id="secrets-button" class="action-edit" data-node="secrets.yaml">Secrets Editor</a></li>
-  </ul>
-</nav>
+        <ul class="nav-icons right">
+          <li>
+            <a class="dropdown-trigger" href="#!" data-target="nav-dropdown"><i class="material-icons">more_vert</i></a>
+          </li>
+        </ul>
 
-{% if begin %}
-<div class="tap-target pink lighten-1 select-port" data-target="select-port-target">
-  <div class="tap-target-content">
-    <h5>Select Upload Port</h5>
-    <p>
-      Here you can select where ESPHome will attempt to show logs and upload firmwares to.
-      For newly plugged in serial devices to be detected, restart the add-on.
-      (Also see <a href="https://esphome.io/guides/faq#i-can-t-get-flashing-over-usb-to-work" target="_blank">
-      esphomeflasher</a>)
-    </p>
-  </div>
-</div>
-{% end %}
-
-<div class="ribbon"></div>
-</header>
-
-<main>
-<div class="container">
-  {% for i, entry in enumerate(entries) %}
-  <div class="row entry-row" data-node="{{ entry.filename }}">
-    <div class="col s12 m10 offset-m1 l12">
-      <div class="card horizontal">
-        <div class="card-image center-align hide-on-small-only">
-          <i class="material-icons very-large icon-grey">memory</i>
-        </div>
-        <div class="card-stacked">
-          <div class="card-content">
-            <span class="card-title">
-              {{ escape(entry.name) }}
-              {% if 'web_server' in entry.loaded_integrations %}
-                <a href="http://{{ escape(entry.address) }}" target="_blank"><i class="material-icons icon-grey">launch</i></a>
-              {% end %}
-              <i class="material-icons right dropdown-trigger" data-target="dropdown-{{ i }}">more_vert</i>
-            </span>
-            {% if entry.comment %}
-              <div class="card-comment">
-                {{ escape(entry.comment) }}
-              </div>
-            {% end %}
-            <p>
-              <span class="status-indicator unknown" data-node="{{ entry.filename }}">
-                <span class="status-indicator-icon"></span>
-                <span class="status-indicator-text"></span></span>.
-              Full path: <code class="inlinecode">{{ escape(entry.path) }}</code>
-            </p>
-            {% if entry.update_available %}
-              <p class="update-available" data-node="{{ entry.filename }}">
-                <i class="material-icons">system_update</i>
-                Update Available! {{ entry.update_old }} &#x27A1;&#xFE0F;{{ entry.update_new }}
-              </p>
-            {% end %}
-          </div>
-          <div class="card-action">
-            <a class="action-upload" data-node="{{ entry.filename }}">Upload</a>
-            <a class="action-edit" data-node="{{ entry.filename }}">Edit</a>
-            <a class="action-logs" data-node="{{ entry.filename }}">Show Logs</a>
-            <a class="action-validate" data-node="{{ entry.filename }}">Validate</a>
-          </div>
-          <ul id="dropdown-{{ i }}" class="select-action dropdown-content card-dropdown-action">
-            <li><a class="action-clean-mqtt" data-node="{{ entry.filename }}">Clean MQTT</a></li>
-            <li><a class="action-clean" data-node="{{ entry.filename }}">Clean Build</a></li>
-            <li><a class="action-compile" data-node="{{ entry.filename }}">Compile</a></li>
-            <li><a class="action-delete" data-node="{{ entry.filename }}">Delete</a></li>
-          </ul>
+        <div class="serial-port-select right" id="js-serial-port-select">
+          <select></select>
         </div>
       </div>
-    </div>
-  </div>
-  {% end %}
-</div>
 
-<div id="modal-logs" class="modal modal-fixed-footer">
-  <div class="modal-content">
-    <h4>Show Logs <code class="inlinecode filename"></code></h4>
-    <pre class="log"></pre>
+      <ul id="nav-dropdown" class="select-action dropdown-content">
+        <li><a data-action="update-all" data-filename="{{ escape(config_dir) }}">Update All</a></li>
+        <li><a data-action="edit" data-filename="secrets.yaml">Secrets Editor</a></li>
+        <li class="divider"></li>
+        <li><a href="{{ relative_url }}logout">Logout</a></li>
+      </ul>
+    </nav>
   </div>
-  <div class="modal-footer">
-    <a class="modal-close waves-effect waves-green btn-flat stop-logs">Close</a>
-  </div>
-</div>
 
-<div id="modal-upload" class="modal modal-fixed-footer">
-  <div class="modal-content">
-    <h4>Compile And Upload <code class="inlinecode filename"></code></h4>
-    <pre class="log"></pre>
-  </div>
-  <div class="modal-footer">
-    <a href="https://esphome.io/guides/faq.html#i-can-t-get-flashing-over-usb-to-work" target="_blank"
-       class="tooltipped" data-position="left" data-tooltip="Flash using esphomeflasher" rel="noreferrer">
-      <i class="material-icons flash-using-esphomeflasher">help_outline</i>
-    </a>
-    <a class="modal-close waves-effect waves-green btn-flat action-edit edit-after-upload">Edit</a>
-    <a class="modal-close waves-effect waves-green btn-flat stop-logs">Stop</a>
-    <div class="btn-flat"><i class="material-icons dropdown-trigger" data-target="dropdown-upload-actions">more_vert</i></div>
-  </div>
-  <ul id="dropdown-upload-actions" class="select-action dropdown-content card-dropdown-action">
-    <li><a class="modal-close waves-effect waves-green btn-flat disabled download-after-upload">Download Binary</a></li>
-    <li><a class="waves-effect waves-green btn-flat disabled action-upload retry-upload">Retry</a></li>
-  </ul>
-</div>
+  <main>
+    <div id="nodes" class="container">
 
-<div id="modal-compile" class="modal modal-fixed-footer">
-  <div class="modal-content">
-    <h4>Compile <code class="inlinecode filename"></code></h4>
-    <pre class="log"></pre>
-  </div>
-  <div class="modal-footer">
-      <a href="https://esphome.io/guides/faq.html#i-can-t-get-flashing-over-usb-to-work"
-         target="_blank"
-         class="tooltipped" data-position="left" data-tooltip="Flash using esphomeflasher" rel="noreferrer">
-      <i class="material-icons flash-using-esphomeflasher">help_outline</i>
-    </a>
-    <a class="modal-close waves-effect waves-green btn-flat disabled download-binary">Download Binary</a>
-    <a class="modal-close waves-effect waves-green btn-flat stop-logs">Stop</a>
-  </div>
-</div>
+      <div id="grid" class="grid">
 
-<div id="modal-validate" class="modal modal-fixed-footer">
-  <div class="modal-content">
-    <h4>Validate <code class="inlinecode filename"></code></h4>
-    <pre class="log"></pre>
-  </div>
-  <div class="modal-footer">
-    <a class="modal-close waves-effect waves-green btn-flat action-edit">Edit</a>
-    <a class="modal-close waves-effect waves-green btn-flat action-upload">Upload</a>
-    <a class="modal-close waves-effect waves-green btn-flat stop-logs">Stop</a>
-  </div>
-</div>
+        {% for i, entry in enumerate(entries) %}
+        <div class="card status-unknown" data-node-name="{{ entry.name }}" data-filename="{{ entry.filename }}">
+          <div class="card-content black-text">
+            <span class="card-title">
+              <span class="node-name">{{ escape(entry.name) }}</span>
 
-<div id="modal-wizard" class="modal">
-  <div class="modal-content">
-    <form action="./wizard.html" method="POST">
-    <ul class="stepper linear">
-      <li class="step active">
-        <div class="step-title waves-effect">Introduction And Name</div>
-        <div class="step-content">
-          <div class="row">
-            <p>
-              Hi there! This is the ESPHome setup wizard. It will guide you through setting up
-              your first ESP8266 or ESP32-powered device using ESPHome.
-            </p>
-              <a href="https://www.espressif.com/en/products/hardware/esp8266ex/overview" target="_blank">ESP8266s</a> and
-              their successors (the <a href="https://www.espressif.com/en/products/hardware/esp32/overview" target="_blank">ESP32s</a>)
-              are great low-cost microcontrollers that can communicate with the outside world using WiFi.
-              They're found in many devices such as the popular Sonoff/iTead, but also exist as development boards
-              such as the <a href="https://esphome.io/devices/nodemcu_esp8266.html" rel="noreferrer" target="_blank">NodeMCU</a>.
-            <p>
-            </p>
-              <a href="https://esphome.io/index.html" rel="noreferrer" target="_blank">ESPHome</a>,
-              the tool you're using here, creates custom firmwares for these devices using YAML configuration
-              files (similar to the ones you might be used to with Home Assistant).
-            <p>
-            </p>
-              This wizard will create a basic YAML configuration file for your "node" (the microcontroller).
-              Later, you will be able to customize this file and add some of ESPHome's many
-              integrations.
-            <p>
-            <p>
-              First, I need to know what this node should be called. Choose this name wisely, it should be unique among
-              all your ESPs.
+              <i class="material-icons right dropdown-trigger" data-target="dropdown-{{ i }}">more_vert</i>
 
-              Names must be <strong>lowercase</strong> and <strong>must not contain spaces</strong> (allowed characters: <code class="inlinecode">a-z</code>,
-              <code class="inlinecode">0-9</code> and <code class="inlinecode">_</code>)
-            </p>
-            <div class="input-field col s12">
-              <input id="node_name" class="validate" type="text" name="name" data-rule-nospaces="true" data-rule-lowercase="true" required>
-              <label for="node_name">Name of node</label>
+              {% if 'web_server' in entry.loaded_integrations %}
+              <a href="http://{{ escape(entry.address) }}" target="_blank"><i
+                  class="material-icons node-webserver right tooltipped" data-position="left"
+                  data-tooltip="Open Node Web Server Interface">launch</i></a>
+              {% end %}
+
+              {% if entry.update_available %}
+              <i class="material-icons node-update-avaliable right tooltipped" data-position="left"
+                data-tooltip="Update Available: {{ entry.update_old }} &#x27A1;&#xFE0F;{{ entry.update_new }}">system_update</i>
+              {% end %}
+            </span>
+
+            <div class="node-config-path">
+              Filename:
+              <code class="inlinecode tooltipped" data-position="bottom"
+                data-tooltip="Full Path: <code class=&quot;inlinecode&quot;>{{ escape(entry.path) }}</code>">
+                {{ escape(entry.filename) }}
+              </code>
             </div>
-          </div>
-          <div class="step-actions">
-            <button class="waves-effect waves-dark btn indigo next-step">CONTINUE</button>
-          </div>
-        </div>
-      </li>
-      <li class="step">
-        <div class="step-title waves-effect">Device Type</div>
-        <div class="step-content">
-          <div class="row">
-            <p>
-              Great! Now I need to know what type of microcontroller you're using so that I can compile firmware for them.
-              Please choose the board you're using below.
-            </p>
-            <p>
-              <em>If unsure you can also select a similar board or choose the "Generic" option.</em>
-            </p>
-            <div class="input-field col s12">
-              <select id="board" name="board" required>
-                <optgroup label="ESP8266">
-                  <option value="esp01_1m">Generic ESP8266 (for example Sonoff)</option>
-                  <option value="nodemcuv2">NodeMCU</option>
-                  <option value="d1_mini">Wemos D1 and Wemos D1 mini</option>
-                  <option value="d1_mini_lite">Wemos D1 mini Lite</option>
-                  <option value="d1_mini_pro">Wemos D1 mini Pro</option>
-                  <option value="huzzah">Adafruit HUZZAH ESP8266</option>
-                  <option value="oak">DigiStump Oak</option>
-                  <option value="thing">Sparkfun ESP8266 Thing</option>
-                  <option value="thingdev">Sparkfun ESP8266 Thing - Dev Board</option>
-                </optgroup>
-                <optgroup label="ESP32">
-                  <option value="esp-wrover-kit">Generic ESP32 (WROVER Module)</option>
-                  <option value="nodemcu-32s">NodeMCU-32S</option>
-                  <option value="lolin_d32">Wemos Lolin D32</option>
-                  <option value="lolin_d32_pro">Wemos Lolin D32 Pro</option>
-                  <option value="featheresp32">Adafruit ESP32 Feather</option>
-                  <option value="m5stack-core-esp32">M5Stack Core ESP32</option>
-                </optgroup>
-                <optgroup label="Other ESP8266s">
-                  <option value="gen4iod">4D Systems gen4 IoD Range</option>
-                  <option value="wifi_slot">Amperka WiFi Slot</option>
-                  <option value="espduino">Doit ESPDuino</option>
-                  <option value="espectro">DycodeX ESPectro Core</option>
-                  <option value="espino">ESPino</option>
-                  <option value="esp_wroom_02">Espressif ESP-WROOM-02 module</option>
-                  <option value="esp12e">Espressif ESP-12E module</option>
-                  <option value="esp01">Espressif ESP-01 512k module</option>
-                  <option value="esp07">Espressif ESP-07 module</option>
-                  <option value="esp8285">Generic ESP8285 module</option>
-                  <option value="espresso_lite_v1">ESPert ESPresso Lite 1.0</option>
-                  <option value="espresso_lite_v2">ESPert ESPresso Lite 2.0</option>
-                  <option value="phoenix_v1">ESPert Phoenix 1.0</option>
-                  <option value="wifinfo">WiFInfo</option>
-                  <option value="heltec_wifi_kit_8">Heltec WiFi kit 8</option>
-                  <option value="nodemcu">NodeMCU 0.9</option>
-                  <option value="modwifi">Olimex MOD-WIFI</option>
-                  <option value="wio_link">SeedStudio Wio Link</option>
-                  <option value="wio_node">SeedStudio Wio Node</option>
-                  <option value="sparkfunBlynk">Sparkfun Blynk Board</option>
-                  <option value="esp210">SweetPea ESP-210</option>
-                  <option value="espinotee">ThaiEasyElec ESPino</option>
-                  <option value="d1">Wemos D1 Revision 1</option>
-                  <option value="wifiduino">WiFiDuino</option>
-                  <option value="xinabox_cw01">XinaBox CW01</option>
-                </optgroup>
-                <optgroup label="Other ESP32s">
-                  <option value="lolin32">Wemos Lolin 32</option>
-                  <option value="m5stack-fire">M5Stack FIRE</option>
-                  <option value="wemosbat">Wemos WiFi &amp; Bluetooth Battery</option>
-                  <option value="node32s">Node32s</option>
 
-                  <option value="alksesp32">ALKS ESP32</option>
-                  <option value="bpi-bit">BPI-Bit</option>
-                  <option value="d-duino-32">D-duino-32</option>
-                  <option value="esp32-devkitlipo">OLIMEX ESP32-DevKit-LiPo</option>
-                  <option value="esp32-evb">OLIMEX ESP32-EVB</option>
-                  <option value="esp32-gateway">OLIMEX ESP32-GATEWAY</option>
-                  <option value="esp32-poe-iso">OLIMEX ESP32-PoE-ISO</option>
-                  <option value="esp32-poe">OLIMEX ESP32-PoE</option>
-                  <option value="esp32-pro">OLIMEX ESP32-PRO</option>
-                  <option value="esp320">Electronic SweetPeas ESP320</option>
-                  <option value="esp32cam">AI Thinker ESP32-CAM</option>
-                  <option value="esp32dev">Espressif ESP32 Dev Module</option>
-                  <option value="esp32doit-devkit-v1">DOIT ESP32 DEVKIT V1</option>
-                  <option value="esp32thing">SparkFun ESP32 Thing</option>
-                  <option value="esp32vn-iot-uno">ESP32vn IoT Uno</option>
-                  <option value="espea32">April Brother ESPea32</option>
-                  <option value="espectro32">ESPectro32</option>
-                  <option value="espino32">ESPino32</option>
-                  <option value="firebeetle32">FireBeetle-ESP32</option>
-                  <option value="fm-devkit">ESP32 FM DevKit</option>
-                  <option value="frogboard">Frog Board ESP32</option>
-                  <option value="heltec_wifi_kit_32">Heltec WiFi Kit 32</option>
-                  <option value="heltec_wifi_lora_32">Heltec WiFi LoRa 32</option>
-                  <option value="heltec_wifi_lora_32_V2">Heltec WiFi LoRa 32 (V2)</option>
-                  <option value="heltec_wireless_stick">Heltec Wireless Stick</option>
-                  <option value="hornbill32dev">Hornbill ESP32 Dev</option>
-                  <option value="hornbill32minima">Hornbill ESP32 Minima</option>
-                  <option value="intorobot">IntoRobot Fig</option>
-                  <option value="iotaap_magnolia">IoTaaP Magnolia</option>
-                  <option value="iotbusio">oddWires IoT-Bus Io</option>
-                  <option value="iotbusproteus">oddWires IoT-Bus Proteus</option>
-                  <option value="lopy">Pycom LoPy</option>
-                  <option value="lopy4">Pycom LoPy4</option>
-                  <option value="m5stack-grey">M5Stack GREY ESP32</option>
-                  <option value="m5stick-c">M5Stick-C</option>
-                  <option value="magicbit">MagicBit</option>
-                  <option value="mhetesp32devkit">MH ET LIVE ESP32DevKIT</option>
-                  <option value="mhetesp32minikit">MH ET LIVE ESP32MiniKit</option>
-                  <option value="microduino-core-esp32">Microduino Core ESP32</option>
-                  <option value="nano32">MakerAsia Nano32</option>
-                  <option value="nina_w10">u-blox NINA-W10 series</option>
-                  <option value="odroid_esp32">ODROID-GO</option>
-                  <option value="onehorse32dev">Onehorse ESP32 Dev Module</option>
-                  <option value="oroca_edubot">OROCA EduBot</option>
-                  <option value="pico32">ESP32 Pico Kit</option>
-                  <option value="pocket_32">Dongsen Tech Pocket 32</option>
-                  <option value="pycom_gpy">Pycom GPy</option>
-                  <option value="quantum">Noduino Quantum</option>
-                  <option value="sparkfun_lora_gateway_1-channel">SparkFun LoRa Gateway 1-Channel</option>
-                  <option value="tinypico">TinyPICO</option>
-                  <option value="ttgo-lora32-v1">TTGO LoRa32-OLED V1</option>
-                  <option value="ttgo-t-beam">TTGO T-Beam</option>
-                  <option value="ttgo-t-watch">TTGO T-Watch</option>
-                  <option value="ttgo-t1">TTGO T1</option>
-                  <option value="turta_iot_node">Turta IoT Node</option>
-                  <option value="vintlabs-devkit-v1">VintLabs ESP32 Devkit</option>
-                  <option value="wemos_d1_mini32">WeMos D1 MINI ESP32</option>
-                  <option value="wesp32">Silicognition wESP32</option>
-                  <option value="widora-air">Widora AIR</option>
-                  <option value="xinabox_cw02">XinaBox CW02</option>
-                </optgroup>
-              </select>
+            {% if entry.comment %}
+            <div class="node-card-comment">
+              {{ escape(entry.comment) }}
             </div>
-          </div>
-          <div class="step-actions">
-            <button class="waves-effect waves-dark btn indigo next-step">CONTINUE</button>
-          </div>
-        </div>
-      </li>
-      <li class="step">
-        <div class="step-title waves-effect">WiFi And Over-The-Air Updates</div>
-        <div class="step-content">
-          <div class="row">
-            <p>
-              Thanks! Now I need to know what WiFi Access Point I should instruct the node to connect to.
-              Please enter an SSID (name of the WiFi network) and password (leave empty for no password).
-            </p>
-            <div class="input-field col s12">
-              <input id="wifi_ssid" class="validate" type="text" name="ssid" required>
-              <label for="wifi_ssid">WiFi SSID</label>
-            </div>
-            <div class="input-field col s12">
-              <input id="wifi_password" name="psk" type="password">
-              <label for="wifi_password">WiFi Password</label>
-            </div>
-            <p>
-              ESPHome automatically sets up an Over-The-Air update server on the node
-              so that you only need to flash a firmware via USB once. This password
-              is also used to connect to the ESP from Home Assistant.
+            {% end %}
 
-              Optionally, you can set a password for this upload process here:
-            </p>
-            <div class="input-field col s12">
-              <input id="password" class="validate" name="password" type="password">
-              <label for="password">Access Password</label>
-            </div>
           </div>
-          <div class="step-actions">
-            <button class="waves-effect waves-dark btn indigo next-step">CONTINUE</button>
+          <div class="card-action">
+            <a data-action="edit" data-filename="{{ entry.filename }}">Edit</a>
+            <a data-action="validate" data-filename="{{ entry.filename }}">Validate</a>
+            <a data-action="upload" data-filename="{{ entry.filename }}">Upload</a>
+            <a data-action="logs" data-filename="{{ entry.filename }}">Logs</a>
           </div>
-        </div>
-      </li>
-      <li class="step">
-        <div class="step-title waves-effect">Done!</div>
-        <div class="step-content">
-          <p>
-            Hooray! 🎉🎉🎉 You've successfully created your first ESPHome configuration file.
-            When you click Submit, the wizard will save a configuration file under
-            <code class="inlinecode">&lt;HASS_CONFIG_FOLDER&gt;/esphome/&lt;NAME_OF_NODE&gt;.yaml</code>.
-          </p>
-          <h5>Next steps</h5>
-          <ul class="browser-default">
-            <li>
-              Flash the firmware. This can be done using the “UPLOAD” option in the dashboard. See
-              <a href="https://esphome.io/index.html#devices" rel="noreferrer" target="_blank">this</a>
-              for guides on how to flash different types of devices. For newly plugged in serial
-              devices to be detected, restart the add-on.
-            </li>
-            <li>
-              With the current configuration, your node will only connect to WiFi. To make it
-              actually <i>do</i> stuff, follow
-              <a href="https://esphome.io/guides/getting_started_hassio.html#adding-some-basic-features"
-                 rel="noreferrer">
-                the rest of the getting started guide
-              </a>.
-            </li>
-            <li>
-              See the <a href="https://esphome.io/index.html" rel="noreferrer"
-                         target="_blank">ESPHome index</a>
-              for a list of supported sensors/devices.
-            </li>
-            <li>
-              Join the <a href="https://discord.gg/KhAMKrd" target="_blank">Discord server</a> and
-              say hi! Discord's the best place to ask if you have issues/ideas.
-            </li>
-            <li>
-              Star <a href="https://github.com/esphome/esphome" target="_blank">ESPHome</a> on GitHub
-              if you find this software awesome and report issues using the bug trackers there.
-            </li>
+          <ul id="dropdown-{{ i }}" class="select-action dropdown-content card-dropdown-action node-dropdown">
+            <li><a data-action="clean-mqtt" data-filename="{{ entry.filename }}">Clean MQTT</a></li>
+            <li><a data-action="clean" data-filename="{{ entry.filename }}">Clean Build Files</a></li>
+            <li><a data-action="compile" data-filename="{{ entry.filename }}">Compile</a></li>
+            <li class="divider"></li>
+            <li><a data-action="delete" data-filename="{{ entry.filename }}">Delete</a></li>
           </ul>
-          <div class="step-actions">
-            <button class="waves-effect waves-dark btn indigo" type="submit">SUBMIT</button>
+        </div>
+        {% end %}
+
+      </div>
+
+    </div>
+
+    {% if len(entries) == 0 %}
+    <div class="center">
+      <h5>Welcome to ESPHome</h5>
+      <p>It looks like you don't yet have any Nodes configured.</p>
+      <p>Click on the pulsating button at the bottom right of the page to add a Node.</p>
+    </div>
+
+    <script>
+      document.addEventListener('DOMContentLoaded', () => {
+        const addNodeButton = document.querySelector("#js-wizard");
+        addNodeButton.classList.add("pulse");
+      });
+    </script>
+    {% end %}
+
+    <!-- Config Editor Modal -->
+    <div id="js-editor-modal" class="modal modal-fixed-footer no-autoinit">
+      <div class="modal-content">
+        <h4>Editing: <code id="js-node-filename" class="inlinecode"></code></h4>
+
+        <div id="js-loading-indicator">
+          <div class="preloader-wrapper big active">
+            <div class="spinner-layer spinner-blue-only">
+              <div class="circle-clipper left">
+                <div class="circle"></div>
+              </div>
+              <div class="gap-patch">
+                <div class="circle"></div>
+              </div>
+              <div class="circle-clipper right">
+                <div class="circle"></div>
+              </div>
+            </div>
           </div>
         </div>
-      </li>
-    </ul>
-    </form>
-  </div>
-  <div class="modal-footer">
-    <a class="modal-close waves-effect waves-green btn-flat">Abort</a>
-  </div>
-</div>
 
-<div id="modal-clean-mqtt" class="modal modal-fixed-footer">
-  <div class="modal-content">
-    <div>
-      <h4>Clean MQTT discovery <code class="inlinecode filename"></code></h4>
-      <pre class="log"></pre>
+        <div id="js-editor-area" class="editor"></div>
+      </div>
+      <div class="modal-footer">
+        <a class="waves-effect waves-green btn-flat" data-action="save">Save</a>
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="upload">Upload</a>
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="close">Close</a>
+      </div>
     </div>
-  </div>
-  <div class="modal-footer">
-    <a class="modal-close waves-effect waves-green btn-flat stop-logs">Close</a>
-  </div>
-</div>
 
-<div id="modal-clean" class="modal modal-fixed-footer">
-  <div class="modal-content">
-    <div>
-      <h4>Clean Build Files <code class="inlinecode filename"></code></h4>
-      <pre class="log"></pre>
+    <!-- Upload Modal -->
+    <div id="js-upload-modal" class="modal modal-fixed-footer no-autoinit">
+      <div class="modal-content">
+        <h4>Compiling & Uploading: <code id="js-node-filename" class="inlinecode"></code></h4>
+        <pre id="js-log-area" class="log"></pre>
+      </div>
+      <div class="modal-footer">
+        <a href="https://esphome.io/guides/faq.html#i-can-t-get-flashing-over-usb-to-work" target="_blank"
+          rel="noreferrer">
+          <i class="material-icons">help_outline</i>
+        </a>
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="edit">Edit</a>
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="stop-logs">Stop</a>
+        <div class="btn-flat"><i class="material-icons dropdown-trigger"
+            data-target="dropdown-upload-actions">more_vert</i>
+        </div>
+      </div>
+
+      <ul id="dropdown-upload-actions" class="select-action dropdown-content card-dropdown-action">
+        <li>
+          <a class="modal-close waves-effect waves-green btn-flat disabled" data-action="download-binary">
+            Download Binary
+          </a>
+        </li>
+        <li>
+          <a class="waves-effect waves-green btn-flat disabled action-upload" data-action="upload">Retry Upload</a>
+        </li>
+      </ul>
     </div>
-  </div>
-  <div class="modal-footer">
-    <a class="modal-close waves-effect waves-green btn-flat stop-logs">Stop</a>
-  </div>
-</div>
-
-<div id="modal-editor" class="modal modal-fixed-footer">
-  <div class="modal-content">
-    <h4>Edit <code class="inlinecode filename"></code></h4>
-    <div id="editor">
 
+    <!-- Update All Modal -->
+    <div id="js-update-all-modal" class="modal modal-fixed-footer no-autoinit">
+      <div class="modal-content">
+        <h4>Update All <code id="js-node-filename" class="inlinecode"></code></h4>
+        <pre id="js-log-area" class="log"></pre>
+      </div>
+      <div class="modal-footer">
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="stop-logs">Stop</a>
+      </div>
     </div>
-  </div>
-  <div class="modal-footer">
-    <a class="waves-effect waves-green btn-flat save-button">Save</a>
-    <a class="modal-close waves-effect waves-green btn-flat action-upload editor-upload-button">Upload</a>
-    <a class="modal-close waves-effect waves-green btn-flat">Close</a>
-  </div>
-</div>
 
-<div id="modal-update-all" class="modal modal-fixed-footer">
-  <div class="modal-content">
-    <h4>Update All</h4>
-    <pre class="log"></pre>
-  </div>
-  <div class="modal-footer">
-    <a class="modal-close waves-effect waves-green btn-flat stop-logs">Stop</a>
-  </div>
-</div>
+    <!-- Validate Modal -->
+    <div id="js-validate-modal" class="modal modal-fixed-footer no-autoinit">
+      <div class="modal-content">
+        <h4>Validate: <code id="js-node-filename" class="inlinecode"></code></h4>
+        <pre id="js-log-area" class="log"></pre>
+      </div>
+      <div class="modal-footer">
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="edit">Edit</a>
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="upload">Upload</a>
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="stop-logs">Stop</a>
+      </div>
+    </div>
 
-<a class="btn-floating btn-large ribbon-fab waves-effect waves-light pink accent-2" id="setup-wizard-start">
-  <i class="material-icons">add</i>
-</a>
+    <!-- Logs Modal -->
+    <div id="js-logs-modal" class="modal modal-fixed-footer no-autoinit">
+      <div class="modal-content">
+        <!-- TODO: Change `node-filename` to `node-name` -->
+        <h4>Showing Logs For: <code id="js-node-filename" class="inlinecode"></code></h4>
+        <pre id="js-log-area" class="log"></pre>
+      </div>
+      <div class="modal-footer">
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="stop-logs">Close</a>
+      </div>
+    </div>
 
-{% if len(entries) == 0 %}
-<div class="tap-target pink lighten-1 setup-wizard" data-target="setup-wizard-start">
-  <div class="tap-target-content">
-    <h5>Set up your first Node</h5>
-    <p>
-      Huh... It seems like you you don't have any ESPHome configuration files yet...
-      Fortunately, there's a setup wizard that will step you through setting up your first node 🎉
-    </p>
-  </div>
-</div>
-{% end %}
+    <!-- Compile Modal -->
+    <div id="js-compile-modal" class="modal modal-fixed-footer no-autoinit">
+      <div class="modal-content">
+        <h4>Compiling: <code id="js-node-filename" class="inlinecode"></code></h4>
+        <pre id="js-log-area" class="log"></pre>
+      </div>
+      <div class="modal-footer">
+        <a href="https://esphome.io/guides/faq.html#i-can-t-get-flashing-over-usb-to-work" target="_blank"
+          rel="noreferrer">
+          <i class="material-icons">help_outline</i>
+        </a>
+        <a class="modal-close waves-effect waves-green btn-flat disabled" data-action="download-binary">
+          Download Binary
+        </a>
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="stop-logs">Stop</a>
+      </div>
+    </div>
 
-</main>
+    <!-- Clean MQTT Modal -->
+    <div id="js-clean-mqtt-modal" class="modal modal-fixed-footer no-autoinit">
+      <div class="modal-content">
+        <div>
+          <!-- TODO: Change `node-filename` to `node-name` -->
+          <h4>Clean MQTT Discovery For: <code id="js-node-filename" class="inlinecode"></code></h4>
+          <pre id="js-log-area" class="log"></pre>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="stop-logs">Close</a>
+      </div>
+    </div>
 
-<footer class="page-footer indigo darken-1">
-  <div class="container">
+    <!-- Clean Build Files Modal -->
+    <div id="js-clean-modal" class="modal modal-fixed-footer no-autoinit">
+      <div class="modal-content">
+        <div>
+          <!-- TODO: Change `node-filename` to `node-name` -->
+          <h4>Clean Build Files For: <code id="js-node-filename" class="inlinecode"></code></h4>
+          <pre id="js-log-area" class="log"></pre>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <a class="modal-close waves-effect waves-green btn-flat" data-action="stop-logs">Stop</a>
+      </div>
+    </div>
 
-  </div>
-  <div class="footer-copyright">
+    <!-- Add New Node / Launch Wizard Button -->
+    <div class="fixed-action-btn">
+      <a class="btn-floating btn-large waves-effect waves-light green js-wizard" id="js-wizard" data-action="wizard">
+        <i class="large material-icons">add</i>
+      </a>
+    </div>
+
+    <!-- Wizard Modal -->
+    <div id="js-wizard-modal" class="modal modal-fixed-footer">
+      <div class="modal-content">
+        <h5>Create New Node</h5>
+        <form action="./wizard.html" method="POST">
+          <ul class="stepper">
+            {% if len(entries) == 0 %}
+            <!-- Step 0 (First Run - No Nodes) - Welcome -->
+            <li class="step active">
+              <div class="step-title waves-effect">Welcome</div>
+              <div class="step-content">
+                <p>
+                  Welcome to the ESPHome node setup wizard! As there are no nodes setup you will be guided through
+                  setting up your first ESP8266 or ESP32-powered device using ESPHome.
+                </p>
+
+                <p>
+                  <a href="https://www.espressif.com/en/products/hardware/esp8266ex/overview"
+                    target="_blank">ESP8266s</a> and
+                  their successors (the <a href="https://www.espressif.com/en/products/hardware/esp32/overview"
+                    target="_blank">ESP32s</a>)
+                  are great low-cost microcontrollers that can communicate with the outside world using WiFi.
+                  They're found in many devices such as the popular Sonoff/iTead, but also exist as development boards
+                  such as the <a href="https://esphome.io/devices/nodemcu_esp8266.html" rel="noreferrer"
+                    target="_blank">NodeMCU</a>.
+                </p>
+
+                <p>
+                  ESPHome, the tool you're using here, creates custom firmwares for these devices using YAML
+                  configuration files (similar to the ones you might be used to with <a href="https://home-assistant.io"
+                    target="_blank">Home Assistant</a>).
+                </p>
+
+                <p>
+                  This wizard will create a basic YAML configuration file for your "node" (the microcontroller) and
+                  later, you will be able to customize this file with some of ESPHome's many avaliable integrations.
+                </p>
+
+                <p>
+                  When you are ready click "begin" to move onto the next step!
+                </p>
+
+                <div class="step-actions">
+                  <button class="waves-effect waves-dark green btn next-step">Begin</button>
+                </div>
+              </div>
+            </li>
+            {% end %}
+
+            <!-- Step 1 - Node Name -->
+            {% if len(entries) == 0 %}
+            <li class="step">
+              {% end %}
+              {% if len(entries) >= 1 %}
+            <li class="step active">
+              {% end %}
+              <div class="step-title waves-effect">Node Name</div>
+              <div class="step-content">
+
+                {% if len(entries) == 0 %}
+                <p>
+                  Firstly, please decide on a name for the node. Choose this name wisely, it should be unique among all
+                  of your ESPHome nodes.
+                </p>
+                {% end %}
+
+
+                {% if len(entries) >= 1 %}
+                <p>
+                  Select a unique name for the node.
+                </p>
+                {% end %}
+
+                <p>
+                  Names must be all <strong>lowercase</strong> and <strong>must not contain any spaces</strong>!
+                  Characters that are allowed are: <code class="inlinecode">a-z</code>,
+                  <code class="inlinecode">0-9</code> and <code class="inlinecode">_</code>.
+                </p>
+
+                <div class="input-field col s12">
+                  <input id="node_name" class="validate" type="text" name="name" data-rule-nospaces="true"
+                    data-rule-lowercase="true" required>
+                  <label for="node_name">Node Name</label>
+                </div>
+
+                <div class="step-actions">
+                  <button class="waves-effect waves-dark green btn next-step">Next</button>
+                </div>
+              </div>
+            </li>
+
+            <!-- Step 2 - Device Type -->
+            <li class="step">
+              <div class="step-title waves-effect">Device Type</div>
+              <div class="step-content">
+
+                {% if len(entries) == 0 %}
+                <p>
+                  Now that you have named your node, please select what type of microcontroller you are using so that
+                  the firmware for your node can be compiled correctly.
+                </p>
+                {% end %}
+
+
+                {% if len(entries) >= 1 %}
+                <p>
+                  Select the type of microcontroller that you are using for the node.
+                </p>
+                {% end %}
+
+                <p>
+                  <em>If unsure you can also select a similar board or choose the "Generic" option.</em>
+                </p>
+
+                <div class="input-field col s12">
+                  <select class="browser-default" name="board" required>
+                    <optgroup label="ESP8266">
+                      <option value="esp01_1m">Generic ESP8266 (for example Sonoff)</option>
+                      <option value="nodemcuv2">NodeMCU</option>
+                      <option value="d1_mini">Wemos D1 and Wemos D1 mini</option>
+                      <option value="d1_mini_lite">Wemos D1 mini Lite</option>
+                      <option value="d1_mini_pro">Wemos D1 mini Pro</option>
+                      <option value="huzzah">Adafruit HUZZAH ESP8266</option>
+                      <option value="oak">DigiStump Oak</option>
+                      <option value="thing">Sparkfun ESP8266 Thing</option>
+                      <option value="thingdev">Sparkfun ESP8266 Thing - Dev Board</option>
+                    </optgroup>
+                    <optgroup label="ESP32">
+                      <option value="esp-wrover-kit">Generic ESP32 (WROVER Module)</option>
+                      <option value="nodemcu-32s">NodeMCU-32S</option>
+                      <option value="lolin_d32">Wemos Lolin D32</option>
+                      <option value="lolin_d32_pro">Wemos Lolin D32 Pro</option>
+                      <option value="featheresp32">Adafruit ESP32 Feather</option>
+                      <option value="m5stack-core-esp32">M5Stack Core ESP32</option>
+                    </optgroup>
+                    <optgroup label="Other ESP8266s">
+                      <option value="gen4iod">4D Systems gen4 IoD Range</option>
+                      <option value="wifi_slot">Amperka WiFi Slot</option>
+                      <option value="espduino">Doit ESPDuino</option>
+                      <option value="espectro">DycodeX ESPectro Core</option>
+                      <option value="espino">ESPino</option>
+                      <option value="esp_wroom_02">Espressif ESP-WROOM-02 module</option>
+                      <option value="esp12e">Espressif ESP-12E module</option>
+                      <option value="esp01">Espressif ESP-01 512k module</option>
+                      <option value="esp07">Espressif ESP-07 module</option>
+                      <option value="esp8285">Generic ESP8285 module</option>
+                      <option value="espresso_lite_v1">ESPert ESPresso Lite 1.0</option>
+                      <option value="espresso_lite_v2">ESPert ESPresso Lite 2.0</option>
+                      <option value="phoenix_v1">ESPert Phoenix 1.0</option>
+                      <option value="wifinfo">WiFInfo</option>
+                      <option value="heltec_wifi_kit_8">Heltec WiFi kit 8</option>
+                      <option value="nodemcu">NodeMCU 0.9</option>
+                      <option value="modwifi">Olimex MOD-WIFI</option>
+                      <option value="wio_link">SeedStudio Wio Link</option>
+                      <option value="wio_node">SeedStudio Wio Node</option>
+                      <option value="sparkfunBlynk">Sparkfun Blynk Board</option>
+                      <option value="esp210">SweetPea ESP-210</option>
+                      <option value="espinotee">ThaiEasyElec ESPino</option>
+                      <option value="d1">Wemos D1 Revision 1</option>
+                      <option value="wifiduino">WiFiDuino</option>
+                      <option value="xinabox_cw01">XinaBox CW01</option>
+                    </optgroup>
+                    <optgroup label="Other ESP32s">
+                      <option value="lolin32">Wemos Lolin 32</option>
+                      <option value="m5stack-fire">M5Stack FIRE</option>
+                      <option value="wemosbat">Wemos WiFi &amp; Bluetooth Battery</option>
+                      <option value="node32s">Node32s</option>
+                      <option value="alksesp32">ALKS ESP32</option>
+                      <option value="bpi-bit">BPI-Bit</option>
+                      <option value="d-duino-32">D-duino-32</option>
+                      <option value="esp32-devkitlipo">OLIMEX ESP32-DevKit-LiPo</option>
+                      <option value="esp32-evb">OLIMEX ESP32-EVB</option>
+                      <option value="esp32-gateway">OLIMEX ESP32-GATEWAY</option>
+                      <option value="esp32-poe-iso">OLIMEX ESP32-PoE-ISO</option>
+                      <option value="esp32-poe">OLIMEX ESP32-PoE</option>
+                      <option value="esp32-pro">OLIMEX ESP32-PRO</option>
+                      <option value="esp320">Electronic SweetPeas ESP320</option>
+                      <option value="esp32cam">AI Thinker ESP32-CAM</option>
+                      <option value="esp32dev">Espressif ESP32 Dev Module</option>
+                      <option value="esp32doit-devkit-v1">DOIT ESP32 DEVKIT V1</option>
+                      <option value="esp32thing">SparkFun ESP32 Thing</option>
+                      <option value="esp32vn-iot-uno">ESP32vn IoT Uno</option>
+                      <option value="espea32">April Brother ESPea32</option>
+                      <option value="espectro32">ESPectro32</option>
+                      <option value="espino32">ESPino32</option>
+                      <option value="firebeetle32">FireBeetle-ESP32</option>
+                      <option value="fm-devkit">ESP32 FM DevKit</option>
+                      <option value="frogboard">Frog Board ESP32</option>
+                      <option value="heltec_wifi_kit_32">Heltec WiFi Kit 32</option>
+                      <option value="heltec_wifi_lora_32">Heltec WiFi LoRa 32</option>
+                      <option value="heltec_wifi_lora_32_V2">Heltec WiFi LoRa 32 (V2)</option>
+                      <option value="heltec_wireless_stick">Heltec Wireless Stick</option>
+                      <option value="hornbill32dev">Hornbill ESP32 Dev</option>
+                      <option value="hornbill32minima">Hornbill ESP32 Minima</option>
+                      <option value="intorobot">IntoRobot Fig</option>
+                      <option value="iotaap_magnolia">IoTaaP Magnolia</option>
+                      <option value="iotbusio">oddWires IoT-Bus Io</option>
+                      <option value="iotbusproteus">oddWires IoT-Bus Proteus</option>
+                      <option value="lopy">Pycom LoPy</option>
+                      <option value="lopy4">Pycom LoPy4</option>
+                      <option value="m5stack-grey">M5Stack GREY ESP32</option>
+                      <option value="m5stick-c">M5Stick-C</option>
+                      <option value="magicbit">MagicBit</option>
+                      <option value="mhetesp32devkit">MH ET LIVE ESP32DevKIT</option>
+                      <option value="mhetesp32minikit">MH ET LIVE ESP32MiniKit</option>
+                      <option value="microduino-core-esp32">Microduino Core ESP32</option>
+                      <option value="nano32">MakerAsia Nano32</option>
+                      <option value="nina_w10">u-blox NINA-W10 series</option>
+                      <option value="odroid_esp32">ODROID-GO</option>
+                      <option value="onehorse32dev">Onehorse ESP32 Dev Module</option>
+                      <option value="oroca_edubot">OROCA EduBot</option>
+                      <option value="pico32">ESP32 Pico Kit</option>
+                      <option value="pocket_32">Dongsen Tech Pocket 32</option>
+                      <option value="pycom_gpy">Pycom GPy</option>
+                      <option value="quantum">Noduino Quantum</option>
+                      <option value="sparkfun_lora_gateway_1-channel">SparkFun LoRa Gateway 1-Channel</option>
+                      <option value="tinypico">TinyPICO</option>
+                      <option value="ttgo-lora32-v1">TTGO LoRa32-OLED V1</option>
+                      <option value="ttgo-t-beam">TTGO T-Beam</option>
+                      <option value="ttgo-t-watch">TTGO T-Watch</option>
+                      <option value="ttgo-t1">TTGO T1</option>
+                      <option value="turta_iot_node">Turta IoT Node</option>
+                      <option value="vintlabs-devkit-v1">VintLabs ESP32 Devkit</option>
+                      <option value="wemos_d1_mini32">WeMos D1 MINI ESP32</option>
+                      <option value="wesp32">Silicognition wESP32</option>
+                      <option value="widora-air">Widora AIR</option>
+                      <option value="xinabox_cw02">XinaBox CW02</option>
+                    </optgroup>
+                  </select>
+                </div>
+
+                <div class="step-actions">
+                  <button class="waves-effect waves-dark green btn next-step">Next</button>
+                </div>
+              </div>
+            </li>
+
+            <!-- Step 3 - WiFi & Updates -->
+            <li class="step">
+              <div class="step-title waves-effect">WiFi & Updates</div>
+              <div class="step-content">
+                {% if len(entries) == 0 %}
+                <p>
+                  Finally, please enter the details for the WiFi network you want the node to connect to.
+
+                  Please enter an SSID (name of the WiFi network) and the password needed to connect (if the network has
+                  no password then this can be left blank):
+                </p>
+                {% end %}
+
+
+                {% if len(entries) >= 1 %}
+                <p>
+                  Enter the details for the WiFi network the node can connect to:
+                </p>
+                {% end %}
+
+                <div class="input-field col s12">
+                  <input id="wifi_ssid" class="validate" type="text" name="ssid" required>
+                  <label for="wifi_ssid">WiFi SSID</label>
+                </div>
+
+                <div class="input-field col s12">
+                  <input id="wifi_password" name="psk" type="password">
+                  <label for="wifi_password">WiFi Password</label>
+                </div>
+
+                {% if len(entries) == 0 %}
+                <p>
+                  This wizard will automatically set up an Over-The-Air (OTA) update server on the node so that you only
+                  need
+                  to flash the firmware via USB once.
+
+                  You can optionally password protect this OTA update server by setting up a password here:
+                </p>
+                {% end %}
+
+
+                {% if len(entries) >= 1 %}
+                <p>
+                  Setup an optional password for the Over-The-Air (OTA) update server:
+                </p>
+                {% end %}
+
+                <div class="input-field col s12">
+                  <input id="password" class="validate" name="password" type="password">
+                  <label for="password">OTA Access Password</label>
+                </div>
+
+                <div class="step-actions">
+                  <!-- Here goes your actions buttons -->
+                  <button class="waves-effect waves-dark green btn next-step">Next</button>
+                </div>
+              </div>
+            </li>
+
+            <!-- Step 3 - Finish -->
+            <li class="step">
+              <div class="step-title waves-effect">Finish</div>
+              <div class="step-content">
+                {% if len(entries) == 0 %}
+                <p>
+                  Hooray! 🎉🎉🎉 You have successfully created your first ESPHome configuration file.
+                  When you click Submit, the wizard will save the configuration file as
+                  <code class="inlinecode">{{ escape(config_dir) }}/&lt;NAME_OF_NODE&gt;.yaml</code>.
+                </p>
+
+                <h5>Next steps</h5>
+                <ul class="browser-default">
+                  <li>
+                    Flash the firmware. This can be done using the “UPLOAD” option in the dashboard. See
+                    <a href="https://esphome.io/index.html#devices" rel="noreferrer" target="_blank">this</a>
+                    for guides on how to flash different types of devices. For newly plugged in serial
+                    devices to be detected, restart the add-on.
+                  </li>
+                  <li>
+                    With the current configuration, your node will only connect to WiFi. To make it
+                    actually <i>do</i> stuff, follow
+                    <a href="https://esphome.io/guides/getting_started_hassio.html#adding-some-basic-features"
+                      rel="noreferrer">
+                      the rest of the getting started guide
+                    </a>.
+                  </li>
+                  <li>
+                    See the <a href="https://esphome.io/index.html" rel="noreferrer" target="_blank">ESPHome
+                      Documentation</a>
+                    for a list of supported sensors/devices.
+                  </li>
+                  <li>
+                    Join the <a href="https://discord.gg/KhAMKrd" target="_blank">Discord server</a> and
+                    say hi! Discord's the best place to ask if you have issues/ideas.
+                  </li>
+                  <li>
+                    Star <a href="https://github.com/esphome/esphome" target="_blank">ESPHome</a> on GitHub
+                    if you find this software awesome and report issues using the bug trackers there.
+                  </li>
+                </ul>
+                {% end %}
+
+
+                {% if len(entries) >= 1 %}
+                <p>Click submit to finish creating the node!</p>
+                {% end %}
+
+
+                <div class="step-actions">
+                  <!-- Here goes your actions buttons -->
+                  <button class="waves-effect waves-dark green btn" type="submit">Submit</button>
+                </div>
+              </div>
+            </li>
+
+          </ul>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <a class="modal-close waves-effect waves-green btn-flat" onclick="wizardStepperInstace.resetStepper();">Exit
+          Wizard</a>
+      </div>
+    </div>
+
+  </main>
+
+  <footer class="page-footer grey darken-4">
     <div class="container">
-      © 2019 Copyright ESPHome, Made with <a class="grey-text text-lighten-4" href="https://materializecss.com/" target="_blank">Materialize</a>
-      <a class="grey-text text-lighten-4 right" href="{{ docs_link }}" target="_blank" rel="noreferrer">ESPHome {{ version }} Documentation</a>
+      <div class="left">
+        Copyright © 2019-2020 ESPHome | Made with <a href="https://materializecss.com/" target="_blank">Materialize</a>
+      </div>
+      <div class="right">
+        <a href="{{ docs_link }}" target="_blank" rel="noreferrer">v{{ version }}
+          Documentation</a>
+      </div>
     </div>
-  </div>
-</footer>
+  </footer>
 
-<script src="{{ get_static_file_url('ace.js') }}" type="text/javascript" charset="utf-8"></script>
-<script src="{{ get_static_file_url('esphome.js') }}" type="text/javascript"></script>
+  <script src="{{ get_static_file_url('js/vendor/ace/ace.js') }}" type="text/javascript" charset="utf-8"></script>
+  <script src="{{ get_static_file_url('js/esphome.js') }}" type="text/javascript"></script>
 
-{% if len(entries) == 0 %}
-<script>
-  document.addEventListener('DOMContentLoaded', () => {
-    const tapTargetElem = document.querySelector('.tap-target.setup-wizard');
-    const tapTargetInstance = M.TapTarget.getInstance(tapTargetElem);
-    tapTargetInstance.options.onOpen = () => {
-      $('.tap-target-origin').on('click', () => {
-        startWizard();
-      });
-    };
-    tapTargetInstance.open();
-  });
-</script>
-{% end %}
-
-{% if begin %}
-<script>
-  window.history.replaceState({}, document.title, "/");
-  document.addEventListener('DOMContentLoaded', () => {
-    const tapTargetElem = document.querySelector('.tap-target.select-port');
-    const tapTargetInstance = M.TapTarget.getInstance(tapTargetElem);
-    tapTargetInstance.open();
-
-    tapTargetInstance.contentEl.style["top"] = "300px";
-    tapTargetInstance.contentEl.style["padding"] = "250px";
-    tapTargetInstance.waveEl.style["top"] = "250px";
-    tapTargetInstance.waveEl.style["left"] = "250px";
-    tapTargetInstance.waveEl.style["width"] = "300px";
-    tapTargetInstance.waveEl.style["height"] = "300px";
-  });
-</script>
-{% end %}
+  {% if begin and len(entries) == 1 %}
+  <script>
+    window.history.replaceState({}, document.title, "/");
+    document.addEventListener('DOMContentLoaded', () => {
+      M.toast({
+        html: '🎉 Congratulations on adding your first Node!',
+        displayLength: 10000
+      })
+    });
+  </script>
+  {% end %}
 
 </body>
+
 </html>
diff --git a/esphome/dashboard/templates/login.html b/esphome/dashboard/templates/login.html
index 414617c17f..f8d1116dff 100644
--- a/esphome/dashboard/templates/login.html
+++ b/esphome/dashboard/templates/login.html
@@ -1,79 +1,93 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" id="login-page">
+
 <head>
   <meta charset="UTF-8">
-  <title>ESPHome Dashboard</title>
-  <link rel="stylesheet" href="{{ get_static_file_url('fonts/material-icons.css') }}">
-  <link rel="stylesheet" href="{{ get_static_file_url('materialize.min.css') }}">
-  <link rel="stylesheet" href="{{ get_static_file_url('esphome.css') }}">
-  <link rel="shortcut icon" href="{{ get_static_file_url('favicon.ico') }}">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Login - ESPHome</title>
 
-  <script src="{{ get_static_file_url('materialize.min.js') }}"></script>
+  <link rel="shortcut icon" href="{{ get_static_file_url('images/favicon.ico') }}">
 
-  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <link rel="stylesheet" href="{{ get_static_file_url('fonts/material-icons/material-icons.css') }}">
+  <link rel="stylesheet" href="{{ get_static_file_url('css/vendor/materialize/materialize.min.css') }}">
+  <link rel="stylesheet" href="{{ get_static_file_url('css/esphome.css') }}">
+
+  <script src="{{ get_static_file_url('js/vendor/jquery/jquery.min.js') }}"></script>
+  <script src="{{ get_static_file_url('js/vendor/materialize/materialize.min.js') }}"></script>
 </head>
+
 <body>
+  <div class="valign-wrapper">
+    <div class="valign">
+      <div class="container">
+        <div class="row">
+          <div class="col s12 m8 offset-m2 l8 offset-l2 xl6 offset-xl3">
+            <div class="card" id="login-card">
+              <div class="card-content">
+                <img src="https://esphome.io/_static/logo-text.svg" alt="ESPHome Logo" class="logo">
+                <span class="version-number center">v{{ version }}</span>
+                <span class="card-title black-text center">Dashboard Login</span>
+                <p class="center">
+                  {% if hassio %}
+                  Login by entering your Home Assistant login credentials.
+                  {% else %}
+                  Login by entering your ESPHome login credentials.
+                  {% end %}
+                </p>
 
-<header>
-<nav>
-  <div class="nav-wrapper indigo">
-      <a class="brand-logo left" href="#">ESPHome Dashboard</a>
-  </div>
-</nav>
+                {% if error is not None %}
+                <div class="alert alert-error">
+                  <span class="title">Error!</span>
+                  {{ escape(error) }}
+                </div>
 
-<div class="ribbon"></div>
-</header>
+                <script>
+                  $("#login-card").addClass("card-error");
+                </script>
+                {% end %}
 
-<main>
-<div class="container">
-  <div class="row">
-    <div class="col card s10 offset-s1 m10 offset-m1 l8 offset-l2">
-      <form action="./login" method="post">
-        <div class="card-content">
-          <span class="card-title">Enter credentials</span>
-          {% if hassio %}
-            <p>
-              Please login using your Home Assistant credentials.
-            </p>
-          {% end %}
-          {% if error is not None %}
-            <p class="error">
-              {{ escape(error) }}
-            </p>
-          {% end %}
-          <div class="row">
-            {% if has_username or hassio %}
-              <div class="input-field col s12">
-                <label for="username">Username</label>
-                <input type="text" class="validate" name="username" id="username" />
+                <form action="./login" method="post" id="login-form">
+                  {% if has_username or hassio %}
+                  <div class="row no-bottom-margin">
+                    <div class="input-field col s12">
+                      <i class="material-icons prefix">person</i>
+                      <input name="username" id="username" type="text">
+                      <label for="username">Username</label>
+                    </div>
+                  </div>
+                  {% end %}
+
+                  <div class="row no-bottom-margin">
+                    <div class="input-field col s12">
+                      <i class="material-icons prefix">lock</i>
+                      <input name="password" id="password" type="password">
+                      <label for="password">Password</label>
+                    </div>
+                  </div>
+                </form>
+              </div>
+
+              <div class="card-action center">
+                <input type="submit" class="btn blue-grey darken-2" name="action" form="login-form" value="Login">
               </div>
-            {% end %}
-            <div class="input-field col s12">
-              <label for="password">Password</label>
-              <input type="password" class="validate" name="password" id="password" />
             </div>
           </div>
         </div>
-        <div class="card-action right-align">
-          <button class="btn indigo waves-effect waves-light" type="submit" name="action">Login</button>
-        </div>
-      </form>
+      </div>
+
+      <footer class="center-align">
+        <p>Copyright © 2019-2020 ESPHome.</p>
+        <p>
+          <a href="{{ docs_link }}" target="_blank" rel="noreferrer">ESPHome
+            {{ version }} Documentation</a>
+        </p>
+        <p>
+          Made with <a href="https://materializecss.com/" target="_blank">Materialize.</a>
+        </p>
+      </footer>
+
     </div>
   </div>
-</div>
-</main>
-
-<footer class="page-footer indigo darken-1">
-  <div class="container">
-
-  </div>
-  <div class="footer-copyright">
-    <div class="container">
-      © 2019 Copyright ESPHome, Made with <a class="grey-text text-lighten-4" href="https://materializecss.com/" target="_blank">Materialize</a>
-        <a class="grey-text text-lighten-4 right" href="{{ docs_link }}"
-           target="_blank">ESPHome {{ version }} Documentation</a>
-    </div>
-  </div>
-</footer>
 </body>
+
 </html>

From d49ee470188939f2d197b950419f081f17d9c6fa Mon Sep 17 00:00:00 2001
From: puuu <puuu@users.noreply.github.com>
Date: Fri, 1 May 2020 10:59:51 +0900
Subject: [PATCH 197/412] esp32 remote: make RMT memory blocks configureable
 (#1002)

---
 .../components/remote_base/remote_base.cpp    | 16 ++++++++---
 esphome/components/remote_base/remote_base.h  | 27 ++++++++++---------
 .../components/remote_receiver/__init__.py    |  9 +++++--
 .../remote_receiver/remote_receiver.h         | 18 ++++++++++---
 .../remote_receiver/remote_receiver_esp32.cpp |  6 ++---
 .../remote_transmitter/remote_transmitter.h   |  9 ++++++-
 .../remote_transmitter_esp32.cpp              |  5 ++--
 esphome/const.py                              |  1 +
 8 files changed, 63 insertions(+), 28 deletions(-)

diff --git a/esphome/components/remote_base/remote_base.cpp b/esphome/components/remote_base/remote_base.cpp
index 3da1daff63..04407ad3b1 100644
--- a/esphome/components/remote_base/remote_base.cpp
+++ b/esphome/components/remote_base/remote_base.cpp
@@ -6,14 +6,24 @@ namespace remote_base {
 
 static const char *TAG = "remote_base";
 
-RemoteComponentBase::RemoteComponentBase(GPIOPin *pin) : pin_(pin) {
 #ifdef ARDUINO_ARCH_ESP32
+RemoteRMTChannel::RemoteRMTChannel(uint8_t mem_block_num) : mem_block_num_(mem_block_num) {
   static rmt_channel_t next_rmt_channel = RMT_CHANNEL_0;
   this->channel_ = next_rmt_channel;
-  next_rmt_channel = rmt_channel_t(int(next_rmt_channel) + 1);
-#endif
+  next_rmt_channel = rmt_channel_t(int(next_rmt_channel) + mem_block_num);
 }
 
+void RemoteRMTChannel::config_rmt(rmt_config_t &rmt) {
+  if (rmt_channel_t(int(this->channel_) + this->mem_block_num_) > RMT_CHANNEL_7) {
+    this->mem_block_num_ = int(RMT_CHANNEL_7) - int(this->channel_) + 1;
+    ESP_LOGW(TAG, "Not enough RMT memory blocks avaiable, reduced to %i blocks.", this->mem_block_num_);
+  }
+  rmt.channel = this->channel_;
+  rmt.clk_div = this->clock_divider_;
+  rmt.mem_block_num = this->mem_block_num_;
+}
+#endif
+
 void RemoteReceiverBinarySensorBase::dump_config() { LOG_BINARY_SENSOR("", "Remote Receiver Binary Sensor", this); }
 
 void RemoteTransmitterBase::send_(uint32_t send_times, uint32_t send_wait) {
diff --git a/esphome/components/remote_base/remote_base.h b/esphome/components/remote_base/remote_base.h
index 36be25add7..250b59e55e 100644
--- a/esphome/components/remote_base/remote_base.h
+++ b/esphome/components/remote_base/remote_base.h
@@ -146,15 +146,21 @@ template<typename T> class RemoteProtocol {
 
 class RemoteComponentBase {
  public:
-  explicit RemoteComponentBase(GPIOPin *pin);
-
-#ifdef ARDUINO_ARCH_ESP32
-  void set_channel(rmt_channel_t channel) { this->channel_ = channel; }
-  void set_clock_divider(uint8_t clock_divider) { this->clock_divider_ = clock_divider; }
-#endif
+  explicit RemoteComponentBase(GPIOPin *pin) : pin_(pin){};
 
  protected:
+  GPIOPin *pin_;
+};
+
 #ifdef ARDUINO_ARCH_ESP32
+class RemoteRMTChannel {
+ public:
+  explicit RemoteRMTChannel(uint8_t mem_block_num = 1);
+
+  void config_rmt(rmt_config_t &rmt);
+  void set_clock_divider(uint8_t clock_divider) { this->clock_divider_ = clock_divider; }
+
+ protected:
   uint32_t from_microseconds(uint32_t us) {
     const uint32_t ticks_per_ten_us = 80000000u / this->clock_divider_ / 100000u;
     return us * ticks_per_ten_us / 10;
@@ -163,15 +169,12 @@ class RemoteComponentBase {
     const uint32_t ticks_per_ten_us = 80000000u / this->clock_divider_ / 100000u;
     return (ticks * 10) / ticks_per_ten_us;
   }
-#endif
-
-  GPIOPin *pin_;
-#ifdef ARDUINO_ARCH_ESP32
+  RemoteComponentBase *remote_base_;
   rmt_channel_t channel_{RMT_CHANNEL_0};
+  uint8_t mem_block_num_;
   uint8_t clock_divider_{80};
-  esp_err_t error_code_{ESP_OK};
-#endif
 };
+#endif
 
 class RemoteTransmitterBase : public RemoteComponentBase {
  public:
diff --git a/esphome/components/remote_receiver/__init__.py b/esphome/components/remote_receiver/__init__.py
index 5742876e36..28570a7c62 100644
--- a/esphome/components/remote_receiver/__init__.py
+++ b/esphome/components/remote_receiver/__init__.py
@@ -3,7 +3,8 @@ import esphome.config_validation as cv
 from esphome import pins
 from esphome.components import remote_base
 from esphome.const import CONF_BUFFER_SIZE, CONF_DUMP, CONF_FILTER, CONF_ID, CONF_IDLE, \
-    CONF_PIN, CONF_TOLERANCE
+    CONF_PIN, CONF_TOLERANCE, CONF_MEMORY_BLOCKS
+from esphome.core import CORE
 
 AUTO_LOAD = ['remote_base']
 remote_receiver_ns = cg.esphome_ns.namespace('remote_receiver')
@@ -21,12 +22,16 @@ CONFIG_SCHEMA = remote_base.validate_triggers(cv.Schema({
     cv.SplitDefault(CONF_BUFFER_SIZE, esp32='10000b', esp8266='1000b'): cv.validate_bytes,
     cv.Optional(CONF_FILTER, default='50us'): cv.positive_time_period_microseconds,
     cv.Optional(CONF_IDLE, default='10ms'): cv.positive_time_period_microseconds,
+    cv.Optional(CONF_MEMORY_BLOCKS, default=3): cv.Range(min=1, max=8),
 }).extend(cv.COMPONENT_SCHEMA))
 
 
 def to_code(config):
     pin = yield cg.gpio_pin_expression(config[CONF_PIN])
-    var = cg.new_Pvariable(config[CONF_ID], pin)
+    if CORE.is_esp32:
+        var = cg.new_Pvariable(config[CONF_ID], pin, config[CONF_MEMORY_BLOCKS])
+    else:
+        var = cg.new_Pvariable(config[CONF_ID], pin)
 
     yield remote_base.build_dumpers(config[CONF_DUMP])
     yield remote_base.build_triggers(config)
diff --git a/esphome/components/remote_receiver/remote_receiver.h b/esphome/components/remote_receiver/remote_receiver.h
index 7a0accf65c..25262e3366 100644
--- a/esphome/components/remote_receiver/remote_receiver.h
+++ b/esphome/components/remote_receiver/remote_receiver.h
@@ -25,9 +25,20 @@ struct RemoteReceiverComponentStore {
 };
 #endif
 
-class RemoteReceiverComponent : public remote_base::RemoteReceiverBase, public Component {
+class RemoteReceiverComponent : public remote_base::RemoteReceiverBase,
+                                public Component
+#ifdef ARDUINO_ARCH_ESP32
+    ,
+                                public remote_base::RemoteRMTChannel
+#endif
+{
  public:
+#ifdef ARDUINO_ARCH_ESP32
+  RemoteReceiverComponent(GPIOPin *pin, uint8_t mem_block_num = 1)
+      : RemoteReceiverBase(pin), remote_base::RemoteRMTChannel(mem_block_num) {}
+#else
   RemoteReceiverComponent(GPIOPin *pin) : RemoteReceiverBase(pin) {}
+#endif
   void setup() override;
   void dump_config() override;
   void loop() override;
@@ -40,11 +51,10 @@ class RemoteReceiverComponent : public remote_base::RemoteReceiverBase, public C
  protected:
 #ifdef ARDUINO_ARCH_ESP32
   void decode_rmt_(rmt_item32_t *item, size_t len);
+  RingbufHandle_t ringbuf_;
+  esp_err_t error_code_{ESP_OK};
 #endif
 
-#ifdef ARDUINO_ARCH_ESP32
-  RingbufHandle_t ringbuf_;
-#endif
 #ifdef ARDUINO_ARCH_ESP8266
   RemoteReceiverComponentStore store_;
   HighFrequencyLoopRequester high_freq_;
diff --git a/esphome/components/remote_receiver/remote_receiver_esp32.cpp b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
index 3d2e6e4b9a..89de4da92a 100644
--- a/esphome/components/remote_receiver/remote_receiver_esp32.cpp
+++ b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
@@ -2,6 +2,7 @@
 #include "esphome/core/log.h"
 
 #ifdef ARDUINO_ARCH_ESP32
+#include <driver/rmt.h>
 
 namespace esphome {
 namespace remote_receiver {
@@ -11,10 +12,8 @@ static const char *TAG = "remote_receiver.esp32";
 void RemoteReceiverComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Remote Receiver...");
   rmt_config_t rmt{};
-  rmt.channel = this->channel_;
+  this->config_rmt(rmt);
   rmt.gpio_num = gpio_num_t(this->pin_->get_pin());
-  rmt.clk_div = this->clock_divider_;
-  rmt.mem_block_num = 1;
   rmt.rmt_mode = RMT_MODE_RX;
   if (this->filter_us_ == 0) {
     rmt.rx_config.filter_en = false;
@@ -58,6 +57,7 @@ void RemoteReceiverComponent::dump_config() {
                   "invert the signal using 'inverted: True' in the pin schema!");
   }
   ESP_LOGCONFIG(TAG, "  Channel: %d", this->channel_);
+  ESP_LOGCONFIG(TAG, "  RMT memory blocks: %d", this->mem_block_num_);
   ESP_LOGCONFIG(TAG, "  Clock divider: %u", this->clock_divider_);
   ESP_LOGCONFIG(TAG, "  Tolerance: %u%%", this->tolerance_);
   ESP_LOGCONFIG(TAG, "  Filter out pulses shorter than: %u us", this->filter_us_);
diff --git a/esphome/components/remote_transmitter/remote_transmitter.h b/esphome/components/remote_transmitter/remote_transmitter.h
index a746d43926..000fbabfee 100644
--- a/esphome/components/remote_transmitter/remote_transmitter.h
+++ b/esphome/components/remote_transmitter/remote_transmitter.h
@@ -6,7 +6,13 @@
 namespace esphome {
 namespace remote_transmitter {
 
-class RemoteTransmitterComponent : public remote_base::RemoteTransmitterBase, public Component {
+class RemoteTransmitterComponent : public remote_base::RemoteTransmitterBase,
+                                   public Component
+#ifdef ARDUINO_ARCH_ESP32
+    ,
+                                   public remote_base::RemoteRMTChannel
+#endif
+{
  public:
   explicit RemoteTransmitterComponent(GPIOPin *pin) : remote_base::RemoteTransmitterBase(pin) {}
 
@@ -34,6 +40,7 @@ class RemoteTransmitterComponent : public remote_base::RemoteTransmitterBase, pu
   uint32_t current_carrier_frequency_{UINT32_MAX};
   bool initialized_{false};
   std::vector<rmt_item32_t> rmt_temp_;
+  esp_err_t error_code_{ESP_OK};
 #endif
   uint8_t carrier_duty_percent_{50};
 };
diff --git a/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp b/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
index 0930d1cb18..d5e4a7b1b8 100644
--- a/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
+++ b/esphome/components/remote_transmitter/remote_transmitter_esp32.cpp
@@ -14,6 +14,7 @@ void RemoteTransmitterComponent::setup() {}
 void RemoteTransmitterComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "Remote Transmitter...");
   ESP_LOGCONFIG(TAG, "  Channel: %d", this->channel_);
+  ESP_LOGCONFIG(TAG, "  RMT memory blocks: %d", this->mem_block_num_);
   ESP_LOGCONFIG(TAG, "  Clock divider: %u", this->clock_divider_);
   LOG_PIN("  Pin: ", this->pin_);
 
@@ -29,11 +30,9 @@ void RemoteTransmitterComponent::dump_config() {
 void RemoteTransmitterComponent::configure_rmt() {
   rmt_config_t c{};
 
+  this->config_rmt(c);
   c.rmt_mode = RMT_MODE_TX;
-  c.channel = this->channel_;
-  c.clk_div = this->clock_divider_;
   c.gpio_num = gpio_num_t(this->pin_->get_pin());
-  c.mem_block_num = 1;
   c.tx_config.loop_en = false;
 
   if (this->current_carrier_frequency_ == 0 || this->carrier_duty_percent_ == 100) {
diff --git a/esphome/const.py b/esphome/const.py
index 8974009d30..31359e610d 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -250,6 +250,7 @@ CONF_MAX_VOLTAGE = 'max_voltage'
 CONF_MEASUREMENT_DURATION = 'measurement_duration'
 CONF_MEASUREMENT_SEQUENCE_NUMBER = 'measurement_sequence_number'
 CONF_MEDIUM = 'medium'
+CONF_MEMORY_BLOCKS = 'memory_blocks'
 CONF_METHOD = 'method'
 CONF_MIN_LENGTH = 'min_length'
 CONF_MIN_LEVEL = 'min_level'

From 14e9375262884a3c73264145109a7b6244aec824 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Thu, 30 Apr 2020 23:00:57 -0300
Subject: [PATCH 198/412] test disable no delay (#1026)

* test disable no delay

* removed set_nodelay code
---
 esphome/components/api/api_connection.cpp  |  3 --
 esphome/components/api/api_connection.h    |  6 ----
 esphome/components/api/api_pb2_service.cpp | 32 ----------------------
 esphome/components/api/proto.h             |  1 -
 script/api_protobuf/api_protobuf.py        |  2 +-
 5 files changed, 1 insertion(+), 43 deletions(-)

diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 8844aa1e1a..beccf91d27 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -137,7 +137,6 @@ void APIConnection::loop() {
       // bool done = 3;
       bool done = this->image_reader_.available() == to_send;
       buffer.encode_bool(3, done);
-      this->set_nodelay(false);
       bool success = this->send_buffer(buffer, 44);
 
       if (success) {
@@ -558,8 +557,6 @@ bool APIConnection::send_log_message(int level, const char *tag, const char *lin
   if (this->log_subscription_ < level)
     return false;
 
-  this->set_nodelay(false);
-
   // Send raw so that we don't copy too much
   auto buffer = this->create_buffer();
   // LogLevel level = 1;
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index f9c7ffa28d..3e91ead52c 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -138,12 +138,6 @@ class APIConnection : public APIServerConnection {
   void on_timeout_(uint32_t time);
   void on_data_(uint8_t *buf, size_t len);
   void parse_recv_buffer_();
-  void set_nodelay(bool nodelay) override {
-    if (nodelay == this->current_nodelay_)
-      return;
-    this->client_->setNoDelay(nodelay);
-    this->current_nodelay_ = nodelay;
-  }
 
   enum class ConnectionState {
     WAITING_FOR_HELLO,
diff --git a/esphome/components/api/api_pb2_service.cpp b/esphome/components/api/api_pb2_service.cpp
index ea6b647c72..06345296a7 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -10,69 +10,57 @@ static const char *TAG = "api.service";
 
 bool APIServerConnectionBase::send_hello_response(const HelloResponse &msg) {
   ESP_LOGVV(TAG, "send_hello_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<HelloResponse>(msg, 2);
 }
 bool APIServerConnectionBase::send_connect_response(const ConnectResponse &msg) {
   ESP_LOGVV(TAG, "send_connect_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<ConnectResponse>(msg, 4);
 }
 bool APIServerConnectionBase::send_disconnect_request(const DisconnectRequest &msg) {
   ESP_LOGVV(TAG, "send_disconnect_request: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<DisconnectRequest>(msg, 5);
 }
 bool APIServerConnectionBase::send_disconnect_response(const DisconnectResponse &msg) {
   ESP_LOGVV(TAG, "send_disconnect_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<DisconnectResponse>(msg, 6);
 }
 bool APIServerConnectionBase::send_ping_request(const PingRequest &msg) {
   ESP_LOGVV(TAG, "send_ping_request: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<PingRequest>(msg, 7);
 }
 bool APIServerConnectionBase::send_ping_response(const PingResponse &msg) {
   ESP_LOGVV(TAG, "send_ping_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<PingResponse>(msg, 8);
 }
 bool APIServerConnectionBase::send_device_info_response(const DeviceInfoResponse &msg) {
   ESP_LOGVV(TAG, "send_device_info_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<DeviceInfoResponse>(msg, 10);
 }
 bool APIServerConnectionBase::send_list_entities_done_response(const ListEntitiesDoneResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_done_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<ListEntitiesDoneResponse>(msg, 19);
 }
 #ifdef USE_BINARY_SENSOR
 bool APIServerConnectionBase::send_list_entities_binary_sensor_response(const ListEntitiesBinarySensorResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_binary_sensor_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesBinarySensorResponse>(msg, 12);
 }
 #endif
 #ifdef USE_BINARY_SENSOR
 bool APIServerConnectionBase::send_binary_sensor_state_response(const BinarySensorStateResponse &msg) {
   ESP_LOGVV(TAG, "send_binary_sensor_state_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<BinarySensorStateResponse>(msg, 21);
 }
 #endif
 #ifdef USE_COVER
 bool APIServerConnectionBase::send_list_entities_cover_response(const ListEntitiesCoverResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_cover_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesCoverResponse>(msg, 13);
 }
 #endif
 #ifdef USE_COVER
 bool APIServerConnectionBase::send_cover_state_response(const CoverStateResponse &msg) {
   ESP_LOGVV(TAG, "send_cover_state_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<CoverStateResponse>(msg, 22);
 }
 #endif
@@ -81,14 +69,12 @@ bool APIServerConnectionBase::send_cover_state_response(const CoverStateResponse
 #ifdef USE_FAN
 bool APIServerConnectionBase::send_list_entities_fan_response(const ListEntitiesFanResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_fan_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesFanResponse>(msg, 14);
 }
 #endif
 #ifdef USE_FAN
 bool APIServerConnectionBase::send_fan_state_response(const FanStateResponse &msg) {
   ESP_LOGVV(TAG, "send_fan_state_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<FanStateResponse>(msg, 23);
 }
 #endif
@@ -97,14 +83,12 @@ bool APIServerConnectionBase::send_fan_state_response(const FanStateResponse &ms
 #ifdef USE_LIGHT
 bool APIServerConnectionBase::send_list_entities_light_response(const ListEntitiesLightResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_light_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesLightResponse>(msg, 15);
 }
 #endif
 #ifdef USE_LIGHT
 bool APIServerConnectionBase::send_light_state_response(const LightStateResponse &msg) {
   ESP_LOGVV(TAG, "send_light_state_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<LightStateResponse>(msg, 24);
 }
 #endif
@@ -113,28 +97,24 @@ bool APIServerConnectionBase::send_light_state_response(const LightStateResponse
 #ifdef USE_SENSOR
 bool APIServerConnectionBase::send_list_entities_sensor_response(const ListEntitiesSensorResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_sensor_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesSensorResponse>(msg, 16);
 }
 #endif
 #ifdef USE_SENSOR
 bool APIServerConnectionBase::send_sensor_state_response(const SensorStateResponse &msg) {
   ESP_LOGVV(TAG, "send_sensor_state_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<SensorStateResponse>(msg, 25);
 }
 #endif
 #ifdef USE_SWITCH
 bool APIServerConnectionBase::send_list_entities_switch_response(const ListEntitiesSwitchResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_switch_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesSwitchResponse>(msg, 17);
 }
 #endif
 #ifdef USE_SWITCH
 bool APIServerConnectionBase::send_switch_state_response(const SwitchStateResponse &msg) {
   ESP_LOGVV(TAG, "send_switch_state_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<SwitchStateResponse>(msg, 26);
 }
 #endif
@@ -143,58 +123,48 @@ bool APIServerConnectionBase::send_switch_state_response(const SwitchStateRespon
 #ifdef USE_TEXT_SENSOR
 bool APIServerConnectionBase::send_list_entities_text_sensor_response(const ListEntitiesTextSensorResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_text_sensor_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesTextSensorResponse>(msg, 18);
 }
 #endif
 #ifdef USE_TEXT_SENSOR
 bool APIServerConnectionBase::send_text_sensor_state_response(const TextSensorStateResponse &msg) {
   ESP_LOGVV(TAG, "send_text_sensor_state_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<TextSensorStateResponse>(msg, 27);
 }
 #endif
 bool APIServerConnectionBase::send_subscribe_logs_response(const SubscribeLogsResponse &msg) {
-  this->set_nodelay(false);
   return this->send_message_<SubscribeLogsResponse>(msg, 29);
 }
 bool APIServerConnectionBase::send_homeassistant_service_response(const HomeassistantServiceResponse &msg) {
   ESP_LOGVV(TAG, "send_homeassistant_service_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<HomeassistantServiceResponse>(msg, 35);
 }
 bool APIServerConnectionBase::send_subscribe_home_assistant_state_response(
     const SubscribeHomeAssistantStateResponse &msg) {
   ESP_LOGVV(TAG, "send_subscribe_home_assistant_state_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<SubscribeHomeAssistantStateResponse>(msg, 39);
 }
 bool APIServerConnectionBase::send_get_time_request(const GetTimeRequest &msg) {
   ESP_LOGVV(TAG, "send_get_time_request: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<GetTimeRequest>(msg, 36);
 }
 bool APIServerConnectionBase::send_get_time_response(const GetTimeResponse &msg) {
   ESP_LOGVV(TAG, "send_get_time_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<GetTimeResponse>(msg, 37);
 }
 bool APIServerConnectionBase::send_list_entities_services_response(const ListEntitiesServicesResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_services_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesServicesResponse>(msg, 41);
 }
 #ifdef USE_ESP32_CAMERA
 bool APIServerConnectionBase::send_list_entities_camera_response(const ListEntitiesCameraResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_camera_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesCameraResponse>(msg, 43);
 }
 #endif
 #ifdef USE_ESP32_CAMERA
 bool APIServerConnectionBase::send_camera_image_response(const CameraImageResponse &msg) {
   ESP_LOGVV(TAG, "send_camera_image_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<CameraImageResponse>(msg, 44);
 }
 #endif
@@ -203,14 +173,12 @@ bool APIServerConnectionBase::send_camera_image_response(const CameraImageRespon
 #ifdef USE_CLIMATE
 bool APIServerConnectionBase::send_list_entities_climate_response(const ListEntitiesClimateResponse &msg) {
   ESP_LOGVV(TAG, "send_list_entities_climate_response: %s", msg.dump().c_str());
-  this->set_nodelay(false);
   return this->send_message_<ListEntitiesClimateResponse>(msg, 46);
 }
 #endif
 #ifdef USE_CLIMATE
 bool APIServerConnectionBase::send_climate_state_response(const ClimateStateResponse &msg) {
   ESP_LOGVV(TAG, "send_climate_state_response: %s", msg.dump().c_str());
-  this->set_nodelay(true);
   return this->send_message_<ClimateStateResponse>(msg, 47);
 }
 #endif
diff --git a/esphome/components/api/proto.h b/esphome/components/api/proto.h
index b0160bf240..f1486a2511 100644
--- a/esphome/components/api/proto.h
+++ b/esphome/components/api/proto.h
@@ -266,7 +266,6 @@ class ProtoService {
   virtual ProtoWriteBuffer create_buffer() = 0;
   virtual bool send_buffer(ProtoWriteBuffer buffer, uint32_t message_type) = 0;
   virtual bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) = 0;
-  virtual void set_nodelay(bool nodelay) = 0;
 
   template<class C> bool send_message_(const C &msg, uint32_t message_type) {
     auto buffer = this->create_buffer();
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 2ecaec10bd..e78eff76c7 100644
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -731,7 +731,7 @@ def build_service_message_type(mt):
         cout += f'bool {class_name}::{func}(const {mt.name} &msg) {{\n'
         if log:
             cout += f'  ESP_LOGVV(TAG, "{func}: %s", msg.dump().c_str());\n'
-        cout += f'  this->set_nodelay({str(nodelay).lower()});\n'
+        # cout += f'  this->set_nodelay({str(nodelay).lower()});\n'
         cout += f'  return this->send_message_<{mt.name}>(msg, {id_});\n'
         cout += f'}}\n'
     if source in (SOURCE_BOTH, SOURCE_CLIENT):

From 8b92456ded97c236846e959fb3797f51b9dda4fc Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Fri, 1 May 2020 05:05:11 +0300
Subject: [PATCH 199/412] http_request ESP32 insecure requests fix (#1041)

* Fixed #1175

* CI

Co-authored-by: Nikolay Vasilchuk <nikolay.vasilchuk@corp.mail.ru>
---
 .../components/http_request/http_request.cpp    | 17 +++++++++++------
 esphome/components/http_request/http_request.h  |  4 ++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/esphome/components/http_request/http_request.cpp b/esphome/components/http_request/http_request.cpp
index f2fe0cff54..390867c948 100644
--- a/esphome/components/http_request/http_request.cpp
+++ b/esphome/components/http_request/http_request.cpp
@@ -15,14 +15,15 @@ void HttpRequestComponent::dump_config() {
 void HttpRequestComponent::send() {
   bool begin_status = false;
   this->client_.setReuse(true);
+  static const String URL = this->url_.c_str();
 #ifdef ARDUINO_ARCH_ESP32
-  begin_status = this->client_.begin(this->url_);
+  begin_status = this->client_.begin(URL);
 #endif
 #ifdef ARDUINO_ARCH_ESP8266
 #ifndef CLANG_TIDY
   this->client_.setFollowRedirects(true);
   this->client_.setRedirectLimit(3);
-  begin_status = this->client_.begin(*this->get_wifi_client_(), this->url_);
+  begin_status = this->client_.begin(*this->get_wifi_client_(), URL);
 #endif
 #endif
 
@@ -43,19 +44,20 @@ void HttpRequestComponent::send() {
 
   int http_code = this->client_.sendRequest(this->method_, this->body_.c_str());
   if (http_code < 0) {
-    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s", this->url_, HTTPClient::errorToString(http_code).c_str());
+    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s", this->url_.c_str(),
+             HTTPClient::errorToString(http_code).c_str());
     this->status_set_warning();
     return;
   }
 
   if (http_code < 200 || http_code >= 300) {
-    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Code: %d", this->url_, http_code);
+    ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Code: %d", this->url_.c_str(), http_code);
     this->status_set_warning();
     return;
   }
 
   this->status_clear_warning();
-  ESP_LOGD(TAG, "HTTP Request completed; URL: %s; Code: %d", this->url_, http_code);
+  ESP_LOGD(TAG, "HTTP Request completed; URL: %s; Code: %d", this->url_.c_str(), http_code);
 }
 
 #ifdef ARDUINO_ARCH_ESP8266
@@ -78,7 +80,10 @@ WiFiClient *HttpRequestComponent::get_wifi_client_() {
 
 void HttpRequestComponent::close() { this->client_.end(); }
 
-const char *HttpRequestComponent::get_string() { return this->client_.getString().c_str(); }
+const char *HttpRequestComponent::get_string() {
+  static const String STR = this->client_.getString();
+  return STR.c_str();
+}
 
 }  // namespace http_request
 }  // namespace esphome
diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index 0c849f2ab0..e6c0510b32 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -28,7 +28,7 @@ class HttpRequestComponent : public Component {
   float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
 
   void set_url(std::string url) {
-    this->url_ = url.c_str();
+    this->url_ = url;
     this->secure_ = url.compare(0, 6, "https:") == 0;
   }
   void set_method(const char *method) { this->method_ = method; }
@@ -42,7 +42,7 @@ class HttpRequestComponent : public Component {
 
  protected:
   HTTPClient client_{};
-  const char *url_;
+  std::string url_;
   const char *method_;
   const char *useragent_{nullptr};
   bool secure_;

From da390d32f8cda845cbc9fb17c1baec366df35d05 Mon Sep 17 00:00:00 2001
From: Andrew Zaborowski <andrew.zaborowski@intel.com>
Date: Fri, 1 May 2020 00:11:26 +0200
Subject: [PATCH 200/412] Move stop/is_running implementation to Action base
 class

Try to fix issue #1105.  Until now if an UpdateComponentAction, a
LambdaAction, or any action that can contain those inside their
"else" or "then" action lists, resulted in a call to script.stop on
the script that contains them, the script would continue running,
because they didn't implement a stop() method.  Basically only
the asynchronous ones did: DelayAction, WaitUntilAction and
ScriptWaitAction.

With this change num_running_ in Action replaces
DelayAction::num_running_ and WaitUntilAction::triggered_ to provide
the same is_running logic to other actions.
---
 esphome/components/script/script.h | 13 ++------
 esphome/core/automation.h          | 17 ++++++++---
 esphome/core/base_automation.h     | 49 +++++++++++-------------------
 3 files changed, 34 insertions(+), 45 deletions(-)

diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index 3b97327da8..a6b208167f 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -53,41 +53,34 @@ template<typename... Ts> class ScriptWaitAction : public Action<Ts...>, public C
  public:
   ScriptWaitAction(Script *script) : script_(script) {}
 
-  void play(Ts... x) { /* ignore - see play_complex */
+  void play(Ts... x) override { /* ignore - see play_complex */
   }
 
   void play_complex(Ts... x) override {
+    this->num_running_++;
     // Check if we can continue immediately.
     if (!this->script_->is_running()) {
-      this->triggered_ = false;
       this->play_next(x...);
       return;
     }
     this->var_ = std::make_tuple(x...);
-    this->triggered_ = true;
     this->loop();
   }
 
-  void stop() override { this->triggered_ = false; }
-
   void loop() override {
-    if (!this->triggered_)
+    if (this->num_running_ == 0)
       return;
 
     if (this->script_->is_running())
       return;
 
-    this->triggered_ = false;
     this->play_next_tuple(this->var_);
   }
 
   float get_setup_priority() const override { return setup_priority::DATA; }
 
-  bool is_running() override { return this->triggered_ || this->is_running_next(); }
-
  protected:
   Script *script_;
-  bool triggered_{false};
   std::tuple<Ts...> var_{};
 };
 
diff --git a/esphome/core/automation.h b/esphome/core/automation.h
index cbe96a749e..6e595fc458 100644
--- a/esphome/core/automation.h
+++ b/esphome/core/automation.h
@@ -77,17 +77,24 @@ template<typename... Ts> class Action {
  public:
   virtual void play(Ts... x) = 0;
   virtual void play_complex(Ts... x) {
+    this->num_running_++;
     this->play(x...);
     this->play_next(x...);
   }
   void play_next(Ts... x) {
-    if (this->next_ != nullptr) {
-      this->next_->play_complex(x...);
+    if (this->num_running_ > 0) {
+      this->num_running_--;
+      if (this->next_ != nullptr) {
+        this->next_->play_complex(x...);
+      }
     }
   }
   virtual void stop() {}
   virtual void stop_complex() {
-    this->stop();
+    if (num_running_) {
+      this->stop();
+      this->num_running_ = 0;
+    }
     this->stop_next();
   }
   void stop_next() {
@@ -95,7 +102,7 @@ template<typename... Ts> class Action {
       this->next_->stop_complex();
     }
   }
-  virtual bool is_running() { return this->is_running_next(); }
+  virtual bool is_running() { return this->num_running_ > 0 || this->is_running_next(); }
   bool is_running_next() {
     if (this->next_ == nullptr)
       return false;
@@ -114,6 +121,8 @@ template<typename... Ts> class Action {
   }
 
   Action<Ts...> *next_ = nullptr;
+
+  int num_running_{0};
 };
 
 template<typename... Ts> class ActionList {
diff --git a/esphome/core/base_automation.h b/esphome/core/base_automation.h
index add3df0bb5..bd34009790 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -110,27 +110,17 @@ template<typename... Ts> class DelayAction : public Action<Ts...>, public Compon
 
   void stop() override {
     this->cancel_timeout("");
-    this->num_running_ = 0;
   }
 
   void play(Ts... x) override { /* ignore - see play_complex */
   }
 
   void play_complex(Ts... x) override {
-    auto f = std::bind(&DelayAction<Ts...>::delay_end_, this, x...);
+    auto f = std::bind(&Action<Ts...>::play_next, this, x...);
     this->num_running_++;
     this->set_timeout(this->delay_.value(x...), f);
   }
   float get_setup_priority() const override { return setup_priority::HARDWARE; }
-
-  bool is_running() override { return this->num_running_ > 0 || this->is_running_next(); }
-
- protected:
-  void delay_end_(Ts... x) {
-    this->num_running_--;
-    this->play_next(x...);
-  }
-  int num_running_{0};
 };
 
 template<typename... Ts> class LambdaAction : public Action<Ts...> {
@@ -160,17 +150,18 @@ template<typename... Ts> class IfAction : public Action<Ts...> {
   }
 
   void play_complex(Ts... x) override {
+    this->num_running_++;
     bool res = this->condition_->check(x...);
     if (res) {
       if (this->then_.empty()) {
         this->play_next(x...);
-      } else {
+      } else if (this->num_running_ > 0) {
         this->then_.play(x...);
       }
     } else {
       if (this->else_.empty()) {
         this->play_next(x...);
-      } else {
+      } else if (this->num_running_ > 0) {
         this->else_.play(x...);
       }
     }
@@ -181,8 +172,6 @@ template<typename... Ts> class IfAction : public Action<Ts...> {
     this->else_.stop();
   }
 
-  bool is_running() override { return this->then_.is_running() || this->else_.is_running() || this->is_running_next(); }
-
  protected:
   Condition<Ts...> *condition_;
   ActionList<Ts...> then_;
@@ -196,9 +185,11 @@ template<typename... Ts> class WhileAction : public Action<Ts...> {
   void add_then(const std::vector<Action<Ts...> *> &actions) {
     this->then_.add_actions(actions);
     this->then_.add_action(new LambdaAction<Ts...>([this](Ts... x) {
-      if (this->condition_->check_tuple(this->var_)) {
+      if (this->num_running_ > 0 && this->condition_->check_tuple(this->var_)) {
         // play again
-        this->then_.play_tuple(this->var_);
+        if (this->num_running_ > 0) {
+          this->then_.play_tuple(this->var_);
+        }
       } else {
         // condition false, play next
         this->play_next_tuple(this->var_);
@@ -210,6 +201,7 @@ template<typename... Ts> class WhileAction : public Action<Ts...> {
   }
 
   void play_complex(Ts... x) override {
+    this->num_running_++;
     // Store loop parameters
     this->var_ = std::make_tuple(x...);
     // Initial condition check
@@ -220,13 +212,13 @@ template<typename... Ts> class WhileAction : public Action<Ts...> {
       return;
     }
 
-    this->then_.play_tuple(this->var_);
+    if (this->num_running_ > 0) {
+      this->then_.play_tuple(this->var_);
+    }
   }
 
   void stop() override { this->then_.stop(); }
 
-  bool is_running() override { return this->then_.is_running() || this->is_running_next(); }
-
  protected:
   Condition<Ts...> *condition_;
   ActionList<Ts...> then_;
@@ -237,42 +229,37 @@ template<typename... Ts> class WaitUntilAction : public Action<Ts...>, public Co
  public:
   WaitUntilAction(Condition<Ts...> *condition) : condition_(condition) {}
 
-  void play(Ts... x) { /* ignore - see play_complex */
+  void play(Ts... x) override { /* ignore - see play_complex */
   }
 
   void play_complex(Ts... x) override {
+    this->num_running_++;
     // Check if we can continue immediately.
     if (this->condition_->check(x...)) {
-      this->triggered_ = false;
-      this->play_next(x...);
+      if (this->num_running_ > 0) {
+        this->play_next(x...);
+      }
       return;
     }
     this->var_ = std::make_tuple(x...);
-    this->triggered_ = true;
     this->loop();
   }
 
-  void stop() override { this->triggered_ = false; }
-
   void loop() override {
-    if (!this->triggered_)
+    if (this->num_running_ == 0)
       return;
 
     if (!this->condition_->check_tuple(this->var_)) {
       return;
     }
 
-    this->triggered_ = false;
     this->play_next_tuple(this->var_);
   }
 
   float get_setup_priority() const override { return setup_priority::DATA; }
 
-  bool is_running() override { return this->triggered_ || this->is_running_next(); }
-
  protected:
   Condition<Ts...> *condition_;
-  bool triggered_{false};
   std::tuple<Ts...> var_{};
 };
 

From a62b6548d238d71fc43cba86b809b5d091577919 Mon Sep 17 00:00:00 2001
From: Andrew Zaborowski <andrew.zaborowski@intel.com>
Date: Fri, 1 May 2020 12:38:34 +0200
Subject: [PATCH 201/412] Make some Action methods protected

Apparently play()/stop() etc. are not meant to be called directly by
users of the class and if they're called directly that would not give
the expected result for the classes that have an empty play().

Make all methods except play_complex, stop_comples and is_running
protected.  While there also make RemoteTransmitterActionBase::encode
protected.
---
 .../components/api/homeassistant_service.h    |  5 +-
 esphome/components/binary_sensor/automation.h |  5 +-
 esphome/components/climate/automation.h       |  4 +-
 esphome/components/cover/automation.h         | 36 +++++-----
 .../deep_sleep/deep_sleep_component.h         |  8 +--
 esphome/components/dfplayer/dfplayer.h        | 24 +++++--
 esphome/components/display/display_buffer.h   | 10 ++-
 esphome/components/esp8266_pwm/esp8266_pwm.h  |  4 +-
 esphome/components/fan/automation.h           | 12 ++--
 .../components/globals/globals_component.h    |  4 +-
 .../components/http_request/http_request.h    |  4 +-
 .../integration/integration_sensor.h          |  4 +-
 esphome/components/ledc/ledc_output.h         |  4 +-
 esphome/components/light/automation.h         | 16 ++---
 esphome/components/mhz19/mhz19.h              |  9 ++-
 esphome/components/mqtt/mqtt_client.h         | 10 +--
 esphome/components/output/automation.h        | 11 ++--
 esphome/components/pid/pid_climate.h          | 12 ++--
 esphome/components/remote_base/jvc_protocol.h |  4 +-
 esphome/components/remote_base/lg_protocol.h  |  4 +-
 esphome/components/remote_base/nec_protocol.h |  4 +-
 .../remote_base/panasonic_protocol.h          |  4 +-
 .../components/remote_base/pioneer_protocol.h |  4 +-
 esphome/components/remote_base/raw_protocol.h |  4 +-
 esphome/components/remote_base/rc5_protocol.h |  4 +-
 .../remote_base/rc_switch_protocol.h          | 15 +++--
 esphome/components/remote_base/remote_base.h  | 16 ++---
 .../components/remote_base/samsung_protocol.h |  4 +-
 .../components/remote_base/sony_protocol.h    |  4 +-
 esphome/components/rf_bridge/rf_bridge.h      |  8 +--
 .../rotary_encoder/rotary_encoder.h           |  2 +-
 esphome/components/script/script.h            | 18 ++---
 esphome/components/sensor/automation.h        |  2 +-
 esphome/components/servo/servo.h              |  4 +-
 esphome/components/sim800l/sim800l.h          |  4 +-
 esphome/components/stepper/stepper.h          | 12 ++--
 esphome/components/switch/automation.h        | 14 ++--
 esphome/components/text_sensor/automation.h   |  2 +-
 esphome/components/tm1651/tm1651.h            | 17 +++--
 esphome/components/uart/automation.h          |  5 +-
 esphome/core/automation.h                     | 51 ++++++++-------
 esphome/core/base_automation.h                | 65 ++++++++++---------
 42 files changed, 250 insertions(+), 203 deletions(-)

diff --git a/esphome/components/api/homeassistant_service.h b/esphome/components/api/homeassistant_service.h
index d68dac3b61..0877efbf26 100644
--- a/esphome/components/api/homeassistant_service.h
+++ b/esphome/components/api/homeassistant_service.h
@@ -29,7 +29,9 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
   template<typename T> void add_variable(std::string key, T value) {
     this->variables_.push_back(TemplatableKeyValuePair<Ts...>(key, value));
   }
-  void play(Ts... x) override {
+
+ protected:
+  void play_(Ts... x) override {
     HomeassistantServiceResponse resp;
     resp.service = this->service_.value(x...);
     resp.is_event = this->is_event_;
@@ -54,7 +56,6 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
     this->parent_->send_homeassistant_service_call(resp);
   }
 
- protected:
   APIServer *parent_;
   bool is_event_;
   std::vector<TemplatableKeyValuePair<Ts...>> data_;
diff --git a/esphome/components/binary_sensor/automation.h b/esphome/components/binary_sensor/automation.h
index e9ff37446d..b76fbdae0c 100644
--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -137,12 +137,13 @@ template<typename... Ts> class BinarySensorPublishAction : public Action<Ts...>
  public:
   explicit BinarySensorPublishAction(BinarySensor *sensor) : sensor_(sensor) {}
   TEMPLATABLE_VALUE(bool, state)
-  void play(Ts... x) override {
+
+ protected:
+  void play_(Ts... x) override {
     auto val = this->state_.value(x...);
     this->sensor_->publish_state(val);
   }
 
- protected:
   BinarySensor *sensor_;
 };
 
diff --git a/esphome/components/climate/automation.h b/esphome/components/climate/automation.h
index 0cd52b1036..2fd9d81e6b 100644
--- a/esphome/components/climate/automation.h
+++ b/esphome/components/climate/automation.h
@@ -18,7 +18,8 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(ClimateFanMode, fan_mode)
   TEMPLATABLE_VALUE(ClimateSwingMode, swing_mode)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     auto call = this->climate_->make_call();
     call.set_mode(this->mode_.optional_value(x...));
     call.set_target_temperature(this->target_temperature_.optional_value(x...));
@@ -30,7 +31,6 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
     call.perform();
   }
 
- protected:
   Climate *climate_;
 };
 
diff --git a/esphome/components/cover/automation.h b/esphome/components/cover/automation.h
index a8eb0cdf99..bad641c150 100644
--- a/esphome/components/cover/automation.h
+++ b/esphome/components/cover/automation.h
@@ -11,9 +11,9 @@ template<typename... Ts> class OpenAction : public Action<Ts...> {
  public:
   explicit OpenAction(Cover *cover) : cover_(cover) {}
 
-  void play(Ts... x) override { this->cover_->open(); }
-
  protected:
+  void play_(Ts... x) override { this->cover_->open(); }
+
   Cover *cover_;
 };
 
@@ -21,9 +21,9 @@ template<typename... Ts> class CloseAction : public Action<Ts...> {
  public:
   explicit CloseAction(Cover *cover) : cover_(cover) {}
 
-  void play(Ts... x) override { this->cover_->close(); }
-
  protected:
+  void play_(Ts... x) override { this->cover_->close(); }
+
   Cover *cover_;
 };
 
@@ -31,9 +31,9 @@ template<typename... Ts> class StopAction : public Action<Ts...> {
  public:
   explicit StopAction(Cover *cover) : cover_(cover) {}
 
-  void play(Ts... x) override { this->cover_->stop(); }
-
  protected:
+  void play_(Ts... x) override { this->cover_->stop(); }
+
   Cover *cover_;
 };
 
@@ -41,7 +41,12 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
  public:
   explicit ControlAction(Cover *cover) : cover_(cover) {}
 
-  void play(Ts... x) override {
+  TEMPLATABLE_VALUE(bool, stop)
+  TEMPLATABLE_VALUE(float, position)
+  TEMPLATABLE_VALUE(float, tilt)
+
+ protected:
+  void play_(Ts... x) override {
     auto call = this->cover_->make_call();
     if (this->stop_.has_value())
       call.set_stop(this->stop_.value(x...));
@@ -52,18 +57,18 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
     call.perform();
   }
 
-  TEMPLATABLE_VALUE(bool, stop)
-  TEMPLATABLE_VALUE(float, position)
-  TEMPLATABLE_VALUE(float, tilt)
-
- protected:
   Cover *cover_;
 };
 
 template<typename... Ts> class CoverPublishAction : public Action<Ts...> {
  public:
   CoverPublishAction(Cover *cover) : cover_(cover) {}
-  void play(Ts... x) override {
+  TEMPLATABLE_VALUE(float, position)
+  TEMPLATABLE_VALUE(float, tilt)
+  TEMPLATABLE_VALUE(CoverOperation, current_operation)
+
+ protected:
+  void play_(Ts... x) override {
     if (this->position_.has_value())
       this->cover_->position = this->position_.value(x...);
     if (this->tilt_.has_value())
@@ -73,11 +78,6 @@ template<typename... Ts> class CoverPublishAction : public Action<Ts...> {
     this->cover_->publish_state();
   }
 
-  TEMPLATABLE_VALUE(float, position)
-  TEMPLATABLE_VALUE(float, tilt)
-  TEMPLATABLE_VALUE(CoverOperation, current_operation)
-
- protected:
   Cover *cover_;
 };
 
diff --git a/esphome/components/deep_sleep/deep_sleep_component.h b/esphome/components/deep_sleep/deep_sleep_component.h
index 4372a3f66c..6287a2259a 100644
--- a/esphome/components/deep_sleep/deep_sleep_component.h
+++ b/esphome/components/deep_sleep/deep_sleep_component.h
@@ -85,9 +85,9 @@ template<typename... Ts> class EnterDeepSleepAction : public Action<Ts...> {
  public:
   EnterDeepSleepAction(DeepSleepComponent *deep_sleep) : deep_sleep_(deep_sleep) {}
 
-  void play(Ts... x) override { this->deep_sleep_->begin_sleep(true); }
-
  protected:
+  void play_(Ts... x) override { this->deep_sleep_->begin_sleep(true); }
+
   DeepSleepComponent *deep_sleep_;
 };
 
@@ -95,9 +95,9 @@ template<typename... Ts> class PreventDeepSleepAction : public Action<Ts...> {
  public:
   PreventDeepSleepAction(DeepSleepComponent *deep_sleep) : deep_sleep_(deep_sleep) {}
 
-  void play(Ts... x) override { this->deep_sleep_->prevent_deep_sleep(); }
-
  protected:
+  void play_(Ts... x) override { this->deep_sleep_->prevent_deep_sleep(); }
+
   DeepSleepComponent *deep_sleep_;
 };
 
diff --git a/esphome/components/dfplayer/dfplayer.h b/esphome/components/dfplayer/dfplayer.h
index 22ca11c3be..89f0fb691c 100644
--- a/esphome/components/dfplayer/dfplayer.h
+++ b/esphome/components/dfplayer/dfplayer.h
@@ -104,8 +104,8 @@ class DFPlayer : public uart::UARTDevice, public Component {
 
 #define DFPLAYER_SIMPLE_ACTION(ACTION_CLASS, ACTION_METHOD) \
   template<typename... Ts> class ACTION_CLASS : public Action<Ts...>, public Parented<DFPlayer> { \
-   public: \
-    void play(Ts... x) override { this->parent_->ACTION_METHOD(); } \
+   protected: \
+    void play_(Ts... x) override { this->parent_->ACTION_METHOD(); } \
   };
 
 DFPLAYER_SIMPLE_ACTION(NextAction, next)
@@ -115,7 +115,9 @@ template<typename... Ts> class PlayFileAction : public Action<Ts...>, public Par
  public:
   TEMPLATABLE_VALUE(uint16_t, file)
   TEMPLATABLE_VALUE(boolean, loop)
-  void play(Ts... x) override {
+
+ protected:
+  void play_(Ts... x) override {
     auto file = this->file_.value(x...);
     auto loop = this->loop_.value(x...);
     if (loop) {
@@ -131,7 +133,9 @@ template<typename... Ts> class PlayFolderAction : public Action<Ts...>, public P
   TEMPLATABLE_VALUE(uint16_t, folder)
   TEMPLATABLE_VALUE(uint16_t, file)
   TEMPLATABLE_VALUE(boolean, loop)
-  void play(Ts... x) override {
+
+ protected:
+  void play_(Ts... x) override {
     auto folder = this->folder_.value(x...);
     auto file = this->file_.value(x...);
     auto loop = this->loop_.value(x...);
@@ -146,7 +150,9 @@ template<typename... Ts> class PlayFolderAction : public Action<Ts...>, public P
 template<typename... Ts> class SetDeviceAction : public Action<Ts...>, public Parented<DFPlayer> {
  public:
   TEMPLATABLE_VALUE(Device, device)
-  void play(Ts... x) override {
+
+ protected:
+  void play_(Ts... x) override {
     auto device = this->device_.value(x...);
     this->parent_->set_device(device);
   }
@@ -155,7 +161,9 @@ template<typename... Ts> class SetDeviceAction : public Action<Ts...>, public Pa
 template<typename... Ts> class SetVolumeAction : public Action<Ts...>, public Parented<DFPlayer> {
  public:
   TEMPLATABLE_VALUE(uint8_t, volume)
-  void play(Ts... x) override {
+
+ protected:
+  void play_(Ts... x) override {
     auto volume = this->volume_.value(x...);
     this->parent_->set_volume(volume);
   }
@@ -164,7 +172,9 @@ template<typename... Ts> class SetVolumeAction : public Action<Ts...>, public Pa
 template<typename... Ts> class SetEqAction : public Action<Ts...>, public Parented<DFPlayer> {
  public:
   TEMPLATABLE_VALUE(EqPreset, eq)
-  void play(Ts... x) override {
+
+ protected:
+  void play_(Ts... x) override {
     auto eq = this->eq_.value(x...);
     this->parent_->set_eq(eq);
   }
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index b12fad8c8a..2a6ead3306 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -391,7 +391,9 @@ class Image {
 template<typename... Ts> class DisplayPageShowAction : public Action<Ts...> {
  public:
   TEMPLATABLE_VALUE(DisplayPage *, page)
-  void play(Ts... x) override {
+
+ protected:
+  void play_(Ts... x) override {
     auto *page = this->page_.value(x...);
     if (page != nullptr) {
       page->show();
@@ -402,18 +404,20 @@ template<typename... Ts> class DisplayPageShowAction : public Action<Ts...> {
 template<typename... Ts> class DisplayPageShowNextAction : public Action<Ts...> {
  public:
   DisplayPageShowNextAction(DisplayBuffer *buffer) : buffer_(buffer) {}
-  void play(Ts... x) override { this->buffer_->show_next_page(); }
 
  protected:
+  void play_(Ts... x) override { this->buffer_->show_next_page(); }
+
   DisplayBuffer *buffer_;
 };
 
 template<typename... Ts> class DisplayPageShowPrevAction : public Action<Ts...> {
  public:
   DisplayPageShowPrevAction(DisplayBuffer *buffer) : buffer_(buffer) {}
-  void play(Ts... x) override { this->buffer_->show_prev_page(); }
 
  protected:
+  void play_(Ts... x) override { this->buffer_->show_prev_page(); }
+
   DisplayBuffer *buffer_;
 };
 
diff --git a/esphome/components/esp8266_pwm/esp8266_pwm.h b/esphome/components/esp8266_pwm/esp8266_pwm.h
index b6839985b0..5871b0dcbc 100644
--- a/esphome/components/esp8266_pwm/esp8266_pwm.h
+++ b/esphome/components/esp8266_pwm/esp8266_pwm.h
@@ -38,12 +38,12 @@ template<typename... Ts> class SetFrequencyAction : public Action<Ts...> {
   SetFrequencyAction(ESP8266PWM *parent) : parent_(parent) {}
   TEMPLATABLE_VALUE(float, frequency);
 
-  void play(Ts... x) {
+ protected:
+  void play_(Ts... x) {
     float freq = this->frequency_.value(x...);
     this->parent_->update_frequency(freq);
   }
 
- protected:
   ESP8266PWM *parent_;
 };
 
diff --git a/esphome/components/fan/automation.h b/esphome/components/fan/automation.h
index dfa72a3ea6..f2435a220f 100644
--- a/esphome/components/fan/automation.h
+++ b/esphome/components/fan/automation.h
@@ -14,7 +14,8 @@ template<typename... Ts> class TurnOnAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(bool, oscillating)
   TEMPLATABLE_VALUE(FanSpeed, speed)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     auto call = this->state_->turn_on();
     if (this->oscillating_.has_value()) {
       call.set_oscillating(this->oscillating_.value(x...));
@@ -25,7 +26,6 @@ template<typename... Ts> class TurnOnAction : public Action<Ts...> {
     call.perform();
   }
 
- protected:
   FanState *state_;
 };
 
@@ -33,9 +33,9 @@ template<typename... Ts> class TurnOffAction : public Action<Ts...> {
  public:
   explicit TurnOffAction(FanState *state) : state_(state) {}
 
-  void play(Ts... x) override { this->state_->turn_off().perform(); }
-
  protected:
+  void play_(Ts... x) override { this->state_->turn_off().perform(); }
+
   FanState *state_;
 };
 
@@ -43,9 +43,9 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
  public:
   explicit ToggleAction(FanState *state) : state_(state) {}
 
-  void play(Ts... x) override { this->state_->toggle().perform(); }
-
  protected:
+  void play_(Ts... x) override { this->state_->toggle().perform(); }
+
   FanState *state_;
 };
 
diff --git a/esphome/components/globals/globals_component.h b/esphome/components/globals/globals_component.h
index 397c55f6c4..bf839b4256 100644
--- a/esphome/components/globals/globals_component.h
+++ b/esphome/components/globals/globals_component.h
@@ -59,9 +59,9 @@ template<class C, typename... Ts> class GlobalVarSetAction : public Action<Ts...
 
   TEMPLATABLE_VALUE(T, value);
 
-  void play(Ts... x) override { this->parent_->value() = this->value_.value(x...); }
-
  protected:
+  void play_(Ts... x) override { this->parent_->value() = this->value_.value(x...); }
+
   C *parent_;
 };
 
diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index e6c0510b32..4f164f3409 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -71,7 +71,8 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
 
   void set_json(std::function<void(Ts..., JsonObject &)> json_func) { this->json_func_ = json_func; }
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     this->parent_->set_url(this->url_.value(x...));
     this->parent_->set_method(this->method_.value(x...));
     if (this->body_.has_value()) {
@@ -106,7 +107,6 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
     this->parent_->close();
   }
 
- protected:
   void encode_json_(Ts... x, JsonObject &root) {
     for (const auto &item : this->json_) {
       auto val = item.second;
diff --git a/esphome/components/integration/integration_sensor.h b/esphome/components/integration/integration_sensor.h
index 2fcec069b2..85a89f6e43 100644
--- a/esphome/components/integration/integration_sensor.h
+++ b/esphome/components/integration/integration_sensor.h
@@ -76,9 +76,9 @@ template<typename... Ts> class ResetAction : public Action<Ts...> {
  public:
   explicit ResetAction(IntegrationSensor *parent) : parent_(parent) {}
 
-  void play(Ts... x) override { this->parent_->reset(); }
-
  protected:
+  void play_(Ts... x) override { this->parent_->reset(); }
+
   IntegrationSensor *parent_;
 };
 
diff --git a/esphome/components/ledc/ledc_output.h b/esphome/components/ledc/ledc_output.h
index 3f56f502b0..7ff0987e0e 100644
--- a/esphome/components/ledc/ledc_output.h
+++ b/esphome/components/ledc/ledc_output.h
@@ -43,12 +43,12 @@ template<typename... Ts> class SetFrequencyAction : public Action<Ts...> {
   SetFrequencyAction(LEDCOutput *parent) : parent_(parent) {}
   TEMPLATABLE_VALUE(float, frequency);
 
-  void play(Ts... x) {
+ protected:
+  void play_(Ts... x) {
     float freq = this->frequency_.value(x...);
     this->parent_->apply_frequency(freq);
   }
 
- protected:
   LEDCOutput *parent_;
 };
 
diff --git a/esphome/components/light/automation.h b/esphome/components/light/automation.h
index dfab780658..1c641562d4 100644
--- a/esphome/components/light/automation.h
+++ b/esphome/components/light/automation.h
@@ -13,13 +13,13 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
 
   TEMPLATABLE_VALUE(uint32_t, transition_length)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     auto call = this->state_->toggle();
     call.set_transition_length(this->transition_length_.optional_value(x...));
     call.perform();
   }
 
- protected:
   LightState *state_;
 };
 
@@ -38,7 +38,8 @@ template<typename... Ts> class LightControlAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(float, color_temperature)
   TEMPLATABLE_VALUE(std::string, effect)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     auto call = this->parent_->make_call();
     call.set_state(this->state_.optional_value(x...));
     call.set_brightness(this->brightness_.optional_value(x...));
@@ -53,7 +54,6 @@ template<typename... Ts> class LightControlAction : public Action<Ts...> {
     call.perform();
   }
 
- protected:
   LightState *parent_;
 };
 
@@ -64,7 +64,8 @@ template<typename... Ts> class DimRelativeAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(float, relative_brightness)
   TEMPLATABLE_VALUE(uint32_t, transition_length)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     auto call = this->parent_->make_call();
     float rel = this->relative_brightness_.value(x...);
     float cur;
@@ -77,7 +78,6 @@ template<typename... Ts> class DimRelativeAction : public Action<Ts...> {
     call.perform();
   }
 
- protected:
   LightState *parent_;
 };
 
@@ -143,7 +143,8 @@ template<typename... Ts> class AddressableSet : public Action<Ts...> {
   TEMPLATABLE_VALUE(uint8_t, blue)
   TEMPLATABLE_VALUE(uint8_t, white)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     auto *out = (AddressableLight *) this->parent_->get_output();
     int32_t range_from = this->range_from_.value_or(x..., 0);
     int32_t range_to = this->range_to_.value_or(x..., out->size() - 1) + 1;
@@ -159,7 +160,6 @@ template<typename... Ts> class AddressableSet : public Action<Ts...> {
     out->schedule_show();
   }
 
- protected:
   LightState *parent_;
 };
 
diff --git a/esphome/components/mhz19/mhz19.h b/esphome/components/mhz19/mhz19.h
index 2201fc87f0..bdb2c50d19 100644
--- a/esphome/components/mhz19/mhz19.h
+++ b/esphome/components/mhz19/mhz19.h
@@ -37,27 +37,30 @@ class MHZ19Component : public PollingComponent, public uart::UARTDevice {
 template<typename... Ts> class MHZ19CalibrateZeroAction : public Action<Ts...> {
  public:
   MHZ19CalibrateZeroAction(MHZ19Component *mhz19) : mhz19_(mhz19) {}
-  void play(Ts... x) override { this->mhz19_->calibrate_zero(); }
 
  protected:
+  void play_(Ts... x) override { this->mhz19_->calibrate_zero(); }
+
   MHZ19Component *mhz19_;
 };
 
 template<typename... Ts> class MHZ19ABCEnableAction : public Action<Ts...> {
  public:
   MHZ19ABCEnableAction(MHZ19Component *mhz19) : mhz19_(mhz19) {}
-  void play(Ts... x) override { this->mhz19_->abc_enable(); }
 
  protected:
+  void play_(Ts... x) override { this->mhz19_->abc_enable(); }
+
   MHZ19Component *mhz19_;
 };
 
 template<typename... Ts> class MHZ19ABCDisableAction : public Action<Ts...> {
  public:
   MHZ19ABCDisableAction(MHZ19Component *mhz19) : mhz19_(mhz19) {}
-  void play(Ts... x) override { this->mhz19_->abc_disable(); }
 
  protected:
+  void play_(Ts... x) override { this->mhz19_->abc_disable(); }
+
   MHZ19Component *mhz19_;
 };
 
diff --git a/esphome/components/mqtt/mqtt_client.h b/esphome/components/mqtt/mqtt_client.h
index 6f14b0c92c..fbd2435bfc 100644
--- a/esphome/components/mqtt/mqtt_client.h
+++ b/esphome/components/mqtt/mqtt_client.h
@@ -299,12 +299,12 @@ template<typename... Ts> class MQTTPublishAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(uint8_t, qos)
   TEMPLATABLE_VALUE(bool, retain)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     this->parent_->publish(this->topic_.value(x...), this->payload_.value(x...), this->qos_.value(x...),
                            this->retain_.value(x...));
   }
 
- protected:
   MQTTClientComponent *parent_;
 };
 
@@ -316,15 +316,15 @@ template<typename... Ts> class MQTTPublishJsonAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(bool, retain)
 
   void set_payload(std::function<void(Ts..., JsonObject &)> payload) { this->payload_ = payload; }
-  void play(Ts... x) override {
+
+ protected:
+  void play_(Ts... x) override {
     auto f = std::bind(&MQTTPublishJsonAction<Ts...>::encode_, this, x..., std::placeholders::_1);
     auto topic = this->topic_.value(x...);
     auto qos = this->qos_.value(x...);
     auto retain = this->retain_.value(x...);
     this->parent_->publish_json(topic, f, qos, retain);
   }
-
- protected:
   void encode_(Ts... x, JsonObject &root) { this->payload_(x..., root); }
   std::function<void(Ts..., JsonObject &)> payload_;
   MQTTClientComponent *parent_;
diff --git a/esphome/components/output/automation.h b/esphome/components/output/automation.h
index 8c8a5ab61b..c65b0d3f6e 100644
--- a/esphome/components/output/automation.h
+++ b/esphome/components/output/automation.h
@@ -12,9 +12,9 @@ template<typename... Ts> class TurnOffAction : public Action<Ts...> {
  public:
   TurnOffAction(BinaryOutput *output) : output_(output) {}
 
-  void play(Ts... x) override { this->output_->turn_off(); }
-
  protected:
+  void play_(Ts... x) override { this->output_->turn_off(); }
+
   BinaryOutput *output_;
 };
 
@@ -22,9 +22,9 @@ template<typename... Ts> class TurnOnAction : public Action<Ts...> {
  public:
   TurnOnAction(BinaryOutput *output) : output_(output) {}
 
-  void play(Ts... x) override { this->output_->turn_on(); }
-
  protected:
+  void play_(Ts... x) override { this->output_->turn_on(); }
+
   BinaryOutput *output_;
 };
 
@@ -33,9 +33,10 @@ template<typename... Ts> class SetLevelAction : public Action<Ts...> {
   SetLevelAction(FloatOutput *output) : output_(output) {}
 
   TEMPLATABLE_VALUE(float, level)
-  void play(Ts... x) override { this->output_->set_level(this->level_.value(x...)); }
 
  protected:
+  void play_(Ts... x) override { this->output_->set_level(this->level_.value(x...)); }
+
   FloatOutput *output_;
 };
 
diff --git a/esphome/components/pid/pid_climate.h b/esphome/components/pid/pid_climate.h
index 8f379c47b4..0c92cee798 100644
--- a/esphome/components/pid/pid_climate.h
+++ b/esphome/components/pid/pid_climate.h
@@ -71,7 +71,12 @@ template<typename... Ts> class PIDAutotuneAction : public Action<Ts...> {
  public:
   PIDAutotuneAction(PIDClimate *parent) : parent_(parent) {}
 
-  void play(Ts... x) {
+  void set_noiseband(float noiseband) { noiseband_ = noiseband; }
+  void set_positive_output(float positive_output) { positive_output_ = positive_output; }
+  void set_negative_output(float negative_output) { negative_output_ = negative_output; }
+
+ protected:
+  void play_(Ts... x) {
     auto tuner = make_unique<PIDAutotuner>();
     tuner->set_noiseband(this->noiseband_);
     tuner->set_output_negative(this->negative_output_);
@@ -79,11 +84,6 @@ template<typename... Ts> class PIDAutotuneAction : public Action<Ts...> {
     this->parent_->start_autotune(std::move(tuner));
   }
 
-  void set_noiseband(float noiseband) { noiseband_ = noiseband; }
-  void set_positive_output(float positive_output) { positive_output_ = positive_output; }
-  void set_negative_output(float negative_output) { negative_output_ = negative_output; }
-
- protected:
   float noiseband_;
   float positive_output_;
   float negative_output_;
diff --git a/esphome/components/remote_base/jvc_protocol.h b/esphome/components/remote_base/jvc_protocol.h
index 8a216f5348..af666bf131 100644
--- a/esphome/components/remote_base/jvc_protocol.h
+++ b/esphome/components/remote_base/jvc_protocol.h
@@ -23,7 +23,9 @@ DECLARE_REMOTE_PROTOCOL(JVC)
 template<typename... Ts> class JVCAction : public RemoteTransmitterActionBase<Ts...> {
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     JVCData data{};
     data.data = this->data_.value(x...);
     JVCProtocol().encode(dst, data);
diff --git a/esphome/components/remote_base/lg_protocol.h b/esphome/components/remote_base/lg_protocol.h
index b810115f58..a2e9489d09 100644
--- a/esphome/components/remote_base/lg_protocol.h
+++ b/esphome/components/remote_base/lg_protocol.h
@@ -26,7 +26,9 @@ template<typename... Ts> class LGAction : public RemoteTransmitterActionBase<Ts.
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
   TEMPLATABLE_VALUE(uint8_t, nbits)
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     LGData data{};
     data.data = this->data_.value(x...);
     data.nbits = this->nbits_.value(x...);
diff --git a/esphome/components/remote_base/nec_protocol.h b/esphome/components/remote_base/nec_protocol.h
index c794991eab..8c1db632b6 100644
--- a/esphome/components/remote_base/nec_protocol.h
+++ b/esphome/components/remote_base/nec_protocol.h
@@ -25,7 +25,9 @@ template<typename... Ts> class NECAction : public RemoteTransmitterActionBase<Ts
  public:
   TEMPLATABLE_VALUE(uint16_t, address)
   TEMPLATABLE_VALUE(uint16_t, command)
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     NECData data{};
     data.address = this->address_.value(x...);
     data.command = this->command_.value(x...);
diff --git a/esphome/components/remote_base/panasonic_protocol.h b/esphome/components/remote_base/panasonic_protocol.h
index b13bd3e92d..1a09b2ffd6 100644
--- a/esphome/components/remote_base/panasonic_protocol.h
+++ b/esphome/components/remote_base/panasonic_protocol.h
@@ -26,7 +26,9 @@ template<typename... Ts> class PanasonicAction : public RemoteTransmitterActionB
  public:
   TEMPLATABLE_VALUE(uint16_t, address)
   TEMPLATABLE_VALUE(uint32_t, command)
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     PanasonicData data{};
     data.address = this->address_.value(x...);
     data.command = this->command_.value(x...);
diff --git a/esphome/components/remote_base/pioneer_protocol.h b/esphome/components/remote_base/pioneer_protocol.h
index f93e51a033..8761762232 100644
--- a/esphome/components/remote_base/pioneer_protocol.h
+++ b/esphome/components/remote_base/pioneer_protocol.h
@@ -25,7 +25,9 @@ template<typename... Ts> class PioneerAction : public RemoteTransmitterActionBas
  public:
   TEMPLATABLE_VALUE(uint16_t, rc_code_1)
   TEMPLATABLE_VALUE(uint16_t, rc_code_2)
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     PioneerData data{};
     data.rc_code_1 = this->rc_code_1_.value(x...);
     data.rc_code_2 = this->rc_code_2_.value(x...);
diff --git a/esphome/components/remote_base/raw_protocol.h b/esphome/components/remote_base/raw_protocol.h
index 1d9f1c5acc..39da5fa8fb 100644
--- a/esphome/components/remote_base/raw_protocol.h
+++ b/esphome/components/remote_base/raw_protocol.h
@@ -46,7 +46,8 @@ template<typename... Ts> class RawAction : public RemoteTransmitterActionBase<Ts
   }
   TEMPLATABLE_VALUE(uint32_t, carrier_frequency);
 
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     if (this->code_static_ != nullptr) {
       for (size_t i = 0; i < this->code_static_len_; i++) {
         auto val = this->code_static_[i];
@@ -61,7 +62,6 @@ template<typename... Ts> class RawAction : public RemoteTransmitterActionBase<Ts
     dst->set_carrier_frequency(this->carrier_frequency_.value(x...));
   }
 
- protected:
   std::function<std::vector<int32_t>(Ts...)> code_func_{};
   const int32_t *code_static_{nullptr};
   int32_t code_static_len_{0};
diff --git a/esphome/components/remote_base/rc5_protocol.h b/esphome/components/remote_base/rc5_protocol.h
index 2e1da74d9f..f90284c23c 100644
--- a/esphome/components/remote_base/rc5_protocol.h
+++ b/esphome/components/remote_base/rc5_protocol.h
@@ -26,7 +26,9 @@ template<typename... Ts> class RC5Action : public RemoteTransmitterActionBase<Ts
  public:
   TEMPLATABLE_VALUE(uint8_t, address)
   TEMPLATABLE_VALUE(uint8_t, command)
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     RC5Data data{};
     data.address = this->address_.value(x...);
     data.command = this->command_.value(x...);
diff --git a/esphome/components/remote_base/rc_switch_protocol.h b/esphome/components/remote_base/rc_switch_protocol.h
index 8362899cec..480f49ea92 100644
--- a/esphome/components/remote_base/rc_switch_protocol.h
+++ b/esphome/components/remote_base/rc_switch_protocol.h
@@ -71,7 +71,8 @@ template<typename... Ts> class RCSwitchRawAction : public RemoteTransmitterActio
   TEMPLATABLE_VALUE(RCSwitchBase, protocol);
   TEMPLATABLE_VALUE(std::string, code);
 
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     auto code = this->code_.value(x...);
     uint64_t the_code = decode_binary_string(code);
     uint8_t nbits = code.size();
@@ -88,7 +89,8 @@ template<typename... Ts> class RCSwitchTypeAAction : public RemoteTransmitterAct
   TEMPLATABLE_VALUE(std::string, device);
   TEMPLATABLE_VALUE(bool, state);
 
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     auto group = this->group_.value(x...);
     auto device = this->device_.value(x...);
     auto state = this->state_.value(x...);
@@ -111,7 +113,8 @@ template<typename... Ts> class RCSwitchTypeBAction : public RemoteTransmitterAct
   TEMPLATABLE_VALUE(uint8_t, channel);
   TEMPLATABLE_VALUE(bool, state);
 
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     auto address = this->address_.value(x...);
     auto channel = this->channel_.value(x...);
     auto state = this->state_.value(x...);
@@ -133,7 +136,8 @@ template<typename... Ts> class RCSwitchTypeCAction : public RemoteTransmitterAct
   TEMPLATABLE_VALUE(uint8_t, device);
   TEMPLATABLE_VALUE(bool, state);
 
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     auto family = this->family_.value(x...);
     auto group = this->group_.value(x...);
     auto device = this->device_.value(x...);
@@ -156,7 +160,8 @@ template<typename... Ts> class RCSwitchTypeDAction : public RemoteTransmitterAct
   TEMPLATABLE_VALUE(uint8_t, device);
   TEMPLATABLE_VALUE(bool, state);
 
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     auto group = this->group_.value(x...);
     auto device = this->device_.value(x...);
     auto state = this->state_.value(x...);
diff --git a/esphome/components/remote_base/remote_base.h b/esphome/components/remote_base/remote_base.h
index 250b59e55e..c9cae96c7a 100644
--- a/esphome/components/remote_base/remote_base.h
+++ b/esphome/components/remote_base/remote_base.h
@@ -323,20 +323,20 @@ template<typename... Ts> class RemoteTransmitterActionBase : public Action<Ts...
  public:
   void set_parent(RemoteTransmitterBase *parent) { this->parent_ = parent; }
 
-  void play(Ts... x) override {
+  TEMPLATABLE_VALUE(uint32_t, send_times);
+  TEMPLATABLE_VALUE(uint32_t, send_wait);
+
+ protected:
+  virtual void encode_(RemoteTransmitData *dst, Ts... x) = 0;
+
+  void play_(Ts... x) override {
     auto call = this->parent_->transmit();
-    this->encode(call.get_data(), x...);
+    this->encode_(call.get_data(), x...);
     call.set_send_times(this->send_times_.value_or(x..., 1));
     call.set_send_wait(this->send_wait_.value_or(x..., 0));
     call.perform();
   }
 
-  virtual void encode(RemoteTransmitData *dst, Ts... x) = 0;
-
-  TEMPLATABLE_VALUE(uint32_t, send_times);
-  TEMPLATABLE_VALUE(uint32_t, send_wait);
-
- protected:
   RemoteTransmitterBase *parent_{};
 };
 
diff --git a/esphome/components/remote_base/samsung_protocol.h b/esphome/components/remote_base/samsung_protocol.h
index 50ff02c1aa..0e1666b3b4 100644
--- a/esphome/components/remote_base/samsung_protocol.h
+++ b/esphome/components/remote_base/samsung_protocol.h
@@ -24,7 +24,9 @@ DECLARE_REMOTE_PROTOCOL(Samsung)
 template<typename... Ts> class SamsungAction : public RemoteTransmitterActionBase<Ts...> {
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     SamsungData data{};
     data.data = this->data_.value(x...);
     SamsungProtocol().encode(dst, data);
diff --git a/esphome/components/remote_base/sony_protocol.h b/esphome/components/remote_base/sony_protocol.h
index 9f0bcdf82f..a122d3758c 100644
--- a/esphome/components/remote_base/sony_protocol.h
+++ b/esphome/components/remote_base/sony_protocol.h
@@ -26,7 +26,9 @@ template<typename... Ts> class SonyAction : public RemoteTransmitterActionBase<T
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
   TEMPLATABLE_VALUE(uint8_t, nbits)
-  void encode(RemoteTransmitData *dst, Ts... x) override {
+
+ protected:
+  void encode_(RemoteTransmitData *dst, Ts... x) override {
     SonyData data{};
     data.data = this->data_.value(x...);
     data.nbits = this->nbits_.value(x...);
diff --git a/esphome/components/rf_bridge/rf_bridge.h b/esphome/components/rf_bridge/rf_bridge.h
index 86713b8a5c..c747be9972 100644
--- a/esphome/components/rf_bridge/rf_bridge.h
+++ b/esphome/components/rf_bridge/rf_bridge.h
@@ -68,7 +68,8 @@ template<typename... Ts> class RFBridgeSendCodeAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(uint16_t, high)
   TEMPLATABLE_VALUE(uint32_t, code)
 
-  void play(Ts... x) {
+ protected:
+  void play_(Ts... x) {
     RFBridgeData data{};
     data.sync = this->sync_.value(x...);
     data.low = this->low_.value(x...);
@@ -77,7 +78,6 @@ template<typename... Ts> class RFBridgeSendCodeAction : public Action<Ts...> {
     this->parent_->send_code(data);
   }
 
- protected:
   RFBridgeComponent *parent_;
 };
 
@@ -85,9 +85,9 @@ template<typename... Ts> class RFBridgeLearnAction : public Action<Ts...> {
  public:
   RFBridgeLearnAction(RFBridgeComponent *parent) : parent_(parent) {}
 
-  void play(Ts... x) { this->parent_->learn(); }
-
  protected:
+  void play_(Ts... x) { this->parent_->learn(); }
+
   RFBridgeComponent *parent_;
 };
 
diff --git a/esphome/components/rotary_encoder/rotary_encoder.h b/esphome/components/rotary_encoder/rotary_encoder.h
index 4220645478..0bbcf21ddb 100644
--- a/esphome/components/rotary_encoder/rotary_encoder.h
+++ b/esphome/components/rotary_encoder/rotary_encoder.h
@@ -74,9 +74,9 @@ template<typename... Ts> class RotaryEncoderSetValueAction : public Action<Ts...
  public:
   RotaryEncoderSetValueAction(RotaryEncoderSensor *encoder) : encoder_(encoder) {}
   TEMPLATABLE_VALUE(int, value)
-  void play(Ts... x) override { this->encoder_->set_value(this->value_.value(x...)); }
 
  protected:
+  void play_(Ts... x) override { this->encoder_->set_value(this->value_.value(x...)); }
   RotaryEncoderSensor *encoder_;
 };
 
diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index a6b208167f..92eba15e41 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -23,9 +23,9 @@ template<typename... Ts> class ScriptExecuteAction : public Action<Ts...> {
  public:
   ScriptExecuteAction(Script *script) : script_(script) {}
 
-  void play(Ts... x) override { this->script_->trigger(); }
-
  protected:
+  void play_(Ts... x) override { this->script_->trigger(); }
+
   Script *script_;
 };
 
@@ -33,9 +33,9 @@ template<typename... Ts> class ScriptStopAction : public Action<Ts...> {
  public:
   ScriptStopAction(Script *script) : script_(script) {}
 
-  void play(Ts... x) override { this->script_->stop(); }
-
  protected:
+  void play_(Ts... x) override { this->script_->stop(); }
+
   Script *script_;
 };
 
@@ -53,14 +53,11 @@ template<typename... Ts> class ScriptWaitAction : public Action<Ts...>, public C
  public:
   ScriptWaitAction(Script *script) : script_(script) {}
 
-  void play(Ts... x) override { /* ignore - see play_complex */
-  }
-
   void play_complex(Ts... x) override {
     this->num_running_++;
     // Check if we can continue immediately.
     if (!this->script_->is_running()) {
-      this->play_next(x...);
+      this->play_next_(x...);
       return;
     }
     this->var_ = std::make_tuple(x...);
@@ -74,12 +71,15 @@ template<typename... Ts> class ScriptWaitAction : public Action<Ts...>, public C
     if (this->script_->is_running())
       return;
 
-    this->play_next_tuple(this->var_);
+    this->play_next_tuple_(this->var_);
   }
 
   float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
+  void play_(Ts... x) override { /* ignore - see play_complex */
+  }
+
   Script *script_;
   std::tuple<Ts...> var_{};
 };
diff --git a/esphome/components/sensor/automation.h b/esphome/components/sensor/automation.h
index 079077dba0..e6ddc3b95c 100644
--- a/esphome/components/sensor/automation.h
+++ b/esphome/components/sensor/automation.h
@@ -25,9 +25,9 @@ template<typename... Ts> class SensorPublishAction : public Action<Ts...> {
  public:
   SensorPublishAction(Sensor *sensor) : sensor_(sensor) {}
   TEMPLATABLE_VALUE(float, state)
-  void play(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
 
  protected:
+  void play_(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
   Sensor *sensor_;
 };
 
diff --git a/esphome/components/servo/servo.h b/esphome/components/servo/servo.h
index a37188740c..b4076e8cd5 100644
--- a/esphome/components/servo/servo.h
+++ b/esphome/components/servo/servo.h
@@ -64,18 +64,18 @@ template<typename... Ts> class ServoWriteAction : public Action<Ts...> {
  public:
   ServoWriteAction(Servo *servo) : servo_(servo) {}
   TEMPLATABLE_VALUE(float, value)
-  void play(Ts... x) override { this->servo_->write(this->value_.value(x...)); }
 
  protected:
+  void play_(Ts... x) override { this->servo_->write(this->value_.value(x...)); }
   Servo *servo_;
 };
 
 template<typename... Ts> class ServoDetachAction : public Action<Ts...> {
  public:
   ServoDetachAction(Servo *servo) : servo_(servo) {}
-  void play(Ts... x) override { this->servo_->detach(); }
 
  protected:
+  void play_(Ts... x) override { this->servo_->detach(); }
   Servo *servo_;
 };
 
diff --git a/esphome/components/sim800l/sim800l.h b/esphome/components/sim800l/sim800l.h
index 696eb8890f..afdb504681 100644
--- a/esphome/components/sim800l/sim800l.h
+++ b/esphome/components/sim800l/sim800l.h
@@ -78,13 +78,13 @@ template<typename... Ts> class Sim800LSendSmsAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(std::string, recipient)
   TEMPLATABLE_VALUE(std::string, message)
 
-  void play(Ts... x) {
+ protected:
+  void play_(Ts... x) {
     auto recipient = this->recipient_.value(x...);
     auto message = this->message_.value(x...);
     this->parent_->send_sms(recipient, message);
   }
 
- protected:
   Sim800LComponent *parent_;
 };
 
diff --git a/esphome/components/stepper/stepper.h b/esphome/components/stepper/stepper.h
index 33777dce83..31bdf59bf9 100644
--- a/esphome/components/stepper/stepper.h
+++ b/esphome/components/stepper/stepper.h
@@ -43,9 +43,9 @@ template<typename... Ts> class SetTargetAction : public Action<Ts...> {
 
   TEMPLATABLE_VALUE(int32_t, target)
 
-  void play(Ts... x) override { this->parent_->set_target(this->target_.value(x...)); }
-
  protected:
+  void play_(Ts... x) override { this->parent_->set_target(this->target_.value(x...)); }
+
   Stepper *parent_;
 };
 
@@ -55,9 +55,9 @@ template<typename... Ts> class ReportPositionAction : public Action<Ts...> {
 
   TEMPLATABLE_VALUE(int32_t, position)
 
-  void play(Ts... x) override { this->parent_->report_position(this->position_.value(x...)); }
-
  protected:
+  void play_(Ts... x) override { this->parent_->report_position(this->position_.value(x...)); }
+
   Stepper *parent_;
 };
 
@@ -67,13 +67,13 @@ template<typename... Ts> class SetSpeedAction : public Action<Ts...> {
 
   TEMPLATABLE_VALUE(float, speed);
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     float speed = this->speed_.value(x...);
     this->parent_->set_max_speed(speed);
     this->parent_->on_update_speed();
   }
 
- protected:
   Stepper *parent_;
 };
 
diff --git a/esphome/components/switch/automation.h b/esphome/components/switch/automation.h
index 90bdabf0f4..c4824b106b 100644
--- a/esphome/components/switch/automation.h
+++ b/esphome/components/switch/automation.h
@@ -11,9 +11,9 @@ template<typename... Ts> class TurnOnAction : public Action<Ts...> {
  public:
   explicit TurnOnAction(Switch *a_switch) : switch_(a_switch) {}
 
-  void play(Ts... x) override { this->switch_->turn_on(); }
-
  protected:
+  void play_(Ts... x) override { this->switch_->turn_on(); }
+
   Switch *switch_;
 };
 
@@ -21,9 +21,9 @@ template<typename... Ts> class TurnOffAction : public Action<Ts...> {
  public:
   explicit TurnOffAction(Switch *a_switch) : switch_(a_switch) {}
 
-  void play(Ts... x) override { this->switch_->turn_off(); }
-
  protected:
+  void play_(Ts... x) override { this->switch_->turn_off(); }
+
   Switch *switch_;
 };
 
@@ -31,9 +31,9 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
  public:
   explicit ToggleAction(Switch *a_switch) : switch_(a_switch) {}
 
-  void play(Ts... x) override { this->switch_->toggle(); }
-
  protected:
+  void play_(Ts... x) override { this->switch_->toggle(); }
+
   Switch *switch_;
 };
 
@@ -73,9 +73,9 @@ template<typename... Ts> class SwitchPublishAction : public Action<Ts...> {
  public:
   SwitchPublishAction(Switch *a_switch) : switch_(a_switch) {}
   TEMPLATABLE_VALUE(bool, state)
-  void play(Ts... x) override { this->switch_->publish_state(this->state_.value(x...)); }
 
  protected:
+  void play_(Ts... x) override { this->switch_->publish_state(this->state_.value(x...)); }
   Switch *switch_;
 };
 
diff --git a/esphome/components/text_sensor/automation.h b/esphome/components/text_sensor/automation.h
index 496efb1cc3..9fac17c4cb 100644
--- a/esphome/components/text_sensor/automation.h
+++ b/esphome/components/text_sensor/automation.h
@@ -30,9 +30,9 @@ template<typename... Ts> class TextSensorPublishAction : public Action<Ts...> {
  public:
   TextSensorPublishAction(TextSensor *sensor) : sensor_(sensor) {}
   TEMPLATABLE_VALUE(std::string, state)
-  void play(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
 
  protected:
+  void play_(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
   TextSensor *sensor_;
 };
 
diff --git a/esphome/components/tm1651/tm1651.h b/esphome/components/tm1651/tm1651.h
index 6eab24687c..6291cf1ecf 100644
--- a/esphome/components/tm1651/tm1651.h
+++ b/esphome/components/tm1651/tm1651.h
@@ -43,7 +43,8 @@ template<typename... Ts> class SetLevelPercentAction : public Action<Ts...>, pub
  public:
   TEMPLATABLE_VALUE(uint8_t, level_percent)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     auto level_percent = this->level_percent_.value(x...);
     this->parent_->set_level_percent(level_percent);
   }
@@ -53,7 +54,8 @@ template<typename... Ts> class SetLevelAction : public Action<Ts...>, public Par
  public:
   TEMPLATABLE_VALUE(uint8_t, level)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     auto level = this->level_.value(x...);
     this->parent_->set_level(level);
   }
@@ -63,20 +65,21 @@ template<typename... Ts> class SetBrightnessAction : public Action<Ts...>, publi
  public:
   TEMPLATABLE_VALUE(uint8_t, brightness)
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     auto brightness = this->brightness_.value(x...);
     this->parent_->set_brightness(brightness);
   }
 };
 
 template<typename... Ts> class TurnOnAction : public Action<Ts...>, public Parented<TM1651Display> {
- public:
-  void play(Ts... x) override { this->parent_->turn_on(); }
+ protected:
+  void play_(Ts... x) override { this->parent_->turn_on(); }
 };
 
 template<typename... Ts> class TurnOffAction : public Action<Ts...>, public Parented<TM1651Display> {
- public:
-  void play(Ts... x) override { this->parent_->turn_off(); }
+ protected:
+  void play_(Ts... x) override { this->parent_->turn_off(); }
 };
 
 }  // namespace tm1651
diff --git a/esphome/components/uart/automation.h b/esphome/components/uart/automation.h
index 9686f94413..6889bc12e4 100644
--- a/esphome/components/uart/automation.h
+++ b/esphome/components/uart/automation.h
@@ -17,7 +17,8 @@ template<typename... Ts> class UARTWriteAction : public Action<Ts...>, public Pa
     this->static_ = true;
   }
 
-  void play(Ts... x) override {
+ protected:
+  void play_(Ts... x) override {
     if (this->static_) {
       this->parent_->write_array(this->data_static_);
     } else {
@@ -25,8 +26,6 @@ template<typename... Ts> class UARTWriteAction : public Action<Ts...>, public Pa
       this->parent_->write_array(val);
     }
   }
-
- protected:
   bool static_{false};
   std::function<std::vector<uint8_t>(Ts...)> data_func_{};
   std::vector<uint8_t> data_static_{};
diff --git a/esphome/core/automation.h b/esphome/core/automation.h
index 6e595fc458..cb95364675 100644
--- a/esphome/core/automation.h
+++ b/esphome/core/automation.h
@@ -75,13 +75,25 @@ template<typename... Ts> class ActionList;
 
 template<typename... Ts> class Action {
  public:
-  virtual void play(Ts... x) = 0;
   virtual void play_complex(Ts... x) {
     this->num_running_++;
-    this->play(x...);
-    this->play_next(x...);
+    this->play_(x...);
+    this->play_next_(x...);
   }
-  void play_next(Ts... x) {
+  virtual void stop_complex() {
+    if (num_running_) {
+      this->stop_();
+      this->num_running_ = 0;
+    }
+    this->stop_next_();
+  }
+  virtual bool is_running() { return this->num_running_ > 0 || this->is_running_next_(); }
+
+ protected:
+  friend ActionList<Ts...>;
+
+  virtual void play_(Ts... x) = 0;
+  void play_next_(Ts... x) {
     if (this->num_running_ > 0) {
       this->num_running_--;
       if (this->next_ != nullptr) {
@@ -89,37 +101,26 @@ template<typename... Ts> class Action {
       }
     }
   }
-  virtual void stop() {}
-  virtual void stop_complex() {
-    if (num_running_) {
-      this->stop();
-      this->num_running_ = 0;
-    }
-    this->stop_next();
+  template<int... S> void play_next_tuple_(const std::tuple<Ts...> &tuple, seq<S...>) {
+    this->play_next_(std::get<S>(tuple)...);
   }
-  void stop_next() {
+  void play_next_tuple_(const std::tuple<Ts...> &tuple) {
+    this->play_next_tuple_(tuple, typename gens<sizeof...(Ts)>::type());
+  }
+
+  virtual void stop_() {}
+  void stop_next_() {
     if (this->next_ != nullptr) {
       this->next_->stop_complex();
     }
   }
-  virtual bool is_running() { return this->num_running_ > 0 || this->is_running_next(); }
-  bool is_running_next() {
+
+  bool is_running_next_() {
     if (this->next_ == nullptr)
       return false;
     return this->next_->is_running();
   }
 
-  void play_next_tuple(const std::tuple<Ts...> &tuple) {
-    this->play_next_tuple_(tuple, typename gens<sizeof...(Ts)>::type());
-  }
-
- protected:
-  friend ActionList<Ts...>;
-
-  template<int... S> void play_next_tuple_(const std::tuple<Ts...> &tuple, seq<S...>) {
-    this->play_next(std::get<S>(tuple)...);
-  }
-
   Action<Ts...> *next_ = nullptr;
 
   int num_running_{0};
diff --git a/esphome/core/base_automation.h b/esphome/core/base_automation.h
index bd34009790..4edd459424 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -108,27 +108,29 @@ template<typename... Ts> class DelayAction : public Action<Ts...>, public Compon
 
   TEMPLATABLE_VALUE(uint32_t, delay)
 
-  void stop() override {
-    this->cancel_timeout("");
-  }
-
-  void play(Ts... x) override { /* ignore - see play_complex */
-  }
-
   void play_complex(Ts... x) override {
-    auto f = std::bind(&Action<Ts...>::play_next, this, x...);
+    auto f = std::bind(&DelayAction<Ts...>::play_next_, this, x...);
     this->num_running_++;
     this->set_timeout(this->delay_.value(x...), f);
   }
   float get_setup_priority() const override { return setup_priority::HARDWARE; }
+
+ protected:
+  void play_(Ts... x) override { /* ignore - see play_complex */
+  }
+
+  void stop_() override {
+    this->cancel_timeout("");
+  }
 };
 
 template<typename... Ts> class LambdaAction : public Action<Ts...> {
  public:
   explicit LambdaAction(std::function<void(Ts...)> &&f) : f_(std::move(f)) {}
-  void play(Ts... x) override { this->f_(x...); }
 
  protected:
+  void play_(Ts... x) override { this->f_(x...); }
+
   std::function<void(Ts...)> f_;
 };
 
@@ -138,15 +140,12 @@ template<typename... Ts> class IfAction : public Action<Ts...> {
 
   void add_then(const std::vector<Action<Ts...> *> &actions) {
     this->then_.add_actions(actions);
-    this->then_.add_action(new LambdaAction<Ts...>([this](Ts... x) { this->play_next(x...); }));
+    this->then_.add_action(new LambdaAction<Ts...>([this](Ts... x) { this->play_next_(x...); }));
   }
 
   void add_else(const std::vector<Action<Ts...> *> &actions) {
     this->else_.add_actions(actions);
-    this->else_.add_action(new LambdaAction<Ts...>([this](Ts... x) { this->play_next(x...); }));
-  }
-
-  void play(Ts... x) override { /* ignore - see play_complex */
+    this->else_.add_action(new LambdaAction<Ts...>([this](Ts... x) { this->play_next_(x...); }));
   }
 
   void play_complex(Ts... x) override {
@@ -154,25 +153,28 @@ template<typename... Ts> class IfAction : public Action<Ts...> {
     bool res = this->condition_->check(x...);
     if (res) {
       if (this->then_.empty()) {
-        this->play_next(x...);
+        this->play_next_(x...);
       } else if (this->num_running_ > 0) {
         this->then_.play(x...);
       }
     } else {
       if (this->else_.empty()) {
-        this->play_next(x...);
+        this->play_next_(x...);
       } else if (this->num_running_ > 0) {
         this->else_.play(x...);
       }
     }
   }
 
-  void stop() override {
+ protected:
+  void play_(Ts... x) override { /* ignore - see play_complex */
+  }
+
+  void stop_() override {
     this->then_.stop();
     this->else_.stop();
   }
 
- protected:
   Condition<Ts...> *condition_;
   ActionList<Ts...> then_;
   ActionList<Ts...> else_;
@@ -192,14 +194,11 @@ template<typename... Ts> class WhileAction : public Action<Ts...> {
         }
       } else {
         // condition false, play next
-        this->play_next_tuple(this->var_);
+        this->play_next_tuple_(this->var_);
       }
     }));
   }
 
-  void play(Ts... x) override { /* ignore - see play_complex */
-  }
-
   void play_complex(Ts... x) override {
     this->num_running_++;
     // Store loop parameters
@@ -208,7 +207,7 @@ template<typename... Ts> class WhileAction : public Action<Ts...> {
     if (!this->condition_->check_tuple(this->var_)) {
       // If new condition check failed, stop loop if running
       this->then_.stop();
-      this->play_next_tuple(this->var_);
+      this->play_next_tuple_(this->var_);
       return;
     }
 
@@ -217,9 +216,12 @@ template<typename... Ts> class WhileAction : public Action<Ts...> {
     }
   }
 
-  void stop() override { this->then_.stop(); }
-
  protected:
+  void play_(Ts... x) override { /* ignore - see play_complex */
+  }
+
+  void stop_() override { this->then_.stop(); }
+
   Condition<Ts...> *condition_;
   ActionList<Ts...> then_;
   std::tuple<Ts...> var_{};
@@ -229,15 +231,12 @@ template<typename... Ts> class WaitUntilAction : public Action<Ts...>, public Co
  public:
   WaitUntilAction(Condition<Ts...> *condition) : condition_(condition) {}
 
-  void play(Ts... x) override { /* ignore - see play_complex */
-  }
-
   void play_complex(Ts... x) override {
     this->num_running_++;
     // Check if we can continue immediately.
     if (this->condition_->check(x...)) {
       if (this->num_running_ > 0) {
-        this->play_next(x...);
+        this->play_next_(x...);
       }
       return;
     }
@@ -253,12 +252,15 @@ template<typename... Ts> class WaitUntilAction : public Action<Ts...>, public Co
       return;
     }
 
-    this->play_next_tuple(this->var_);
+    this->play_next_tuple_(this->var_);
   }
 
   float get_setup_priority() const override { return setup_priority::DATA; }
 
  protected:
+  void play_(Ts... x) override { /* ignore - see play_complex */
+  }
+
   Condition<Ts...> *condition_;
   std::tuple<Ts...> var_{};
 };
@@ -266,9 +268,10 @@ template<typename... Ts> class WaitUntilAction : public Action<Ts...>, public Co
 template<typename... Ts> class UpdateComponentAction : public Action<Ts...> {
  public:
   UpdateComponentAction(PollingComponent *component) : component_(component) {}
-  void play(Ts... x) override { this->component_->update(); }
 
  protected:
+  void play_(Ts... x) override { this->component_->update(); }
+
   PollingComponent *component_;
 };
 

From 0473c4c79f88c1700ca672266da933e400ef99d9 Mon Sep 17 00:00:00 2001
From: Team Super Panda <60556240+teamsuperpanda@users.noreply.github.com>
Date: Sat, 2 May 2020 09:53:41 +1200
Subject: [PATCH 202/412] Update __init__.py (#1020)

---
 esphome/components/fastled_base/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/fastled_base/__init__.py b/esphome/components/fastled_base/__init__.py
index b552c917c0..ffa49f43c2 100644
--- a/esphome/components/fastled_base/__init__.py
+++ b/esphome/components/fastled_base/__init__.py
@@ -35,5 +35,5 @@ def new_fastled_light(config):
 
     yield light.register_light(var, config)
     # https://github.com/FastLED/FastLED/blob/master/library.json
-    cg.add_library('FastLED', '3.2.9')
+    cg.add_library('FastLED', '3.3.3')
     yield var

From 4f2e2fa297070e4d7f55a37175359f4d8f74c0f0 Mon Sep 17 00:00:00 2001
From: buxtronix <bbuxton@gmail.com>
Date: Sat, 2 May 2020 09:05:09 +1000
Subject: [PATCH 203/412] Some max7219 updates. (#1021)

* Some max7219 updates. Disable test mode on startup and allow dynamic brightness

* fix formatting
---
 esphome/components/max7219/max7219.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/esphome/components/max7219/max7219.cpp b/esphome/components/max7219/max7219.cpp
index 6616da1a58..99eca6c14f 100644
--- a/esphome/components/max7219/max7219.cpp
+++ b/esphome/components/max7219/max7219.cpp
@@ -12,6 +12,7 @@ static const uint8_t MAX7219_REGISTER_DECODE_MODE = 0x09;
 static const uint8_t MAX7219_REGISTER_INTENSITY = 0x0A;
 static const uint8_t MAX7219_REGISTER_SCAN_LIMIT = 0x0B;
 static const uint8_t MAX7219_REGISTER_SHUTDOWN = 0x0C;
+static const uint8_t MAX7219_REGISTER_TEST = 0x0F;
 static const uint8_t MAX7219_UNKNOWN_CHAR = 0b11111111;
 
 const uint8_t MAX7219_ASCII_TO_RAW[95] PROGMEM = {
@@ -127,6 +128,7 @@ void MAX7219Component::setup() {
   this->send_to_all_(MAX7219_REGISTER_INTENSITY, this->intensity_);
   this->display();
   // power up
+  this->send_to_all_(MAX7219_REGISTER_TEST, 0);
   this->send_to_all_(MAX7219_REGISTER_SHUTDOWN, 1);
 }
 void MAX7219Component::dump_config() {
@@ -210,7 +212,10 @@ uint8_t MAX7219Component::printf(const char *format, ...) {
   return 0;
 }
 void MAX7219Component::set_writer(max7219_writer_t &&writer) { this->writer_ = writer; }
-void MAX7219Component::set_intensity(uint8_t intensity) { this->intensity_ = intensity; }
+void MAX7219Component::set_intensity(uint8_t intensity) {
+  this->intensity_ = intensity;
+  this->send_to_all_(MAX7219_REGISTER_INTENSITY, this->intensity_);
+}
 void MAX7219Component::set_num_chips(uint8_t num_chips) { this->num_chips_ = num_chips; }
 
 #ifdef USE_TIME

From 7fa5cab8e368bdfacb07b40bb826bf19c8f8cf46 Mon Sep 17 00:00:00 2001
From: sredfern <sam@redfern.st>
Date: Sat, 2 May 2020 10:30:52 +1000
Subject: [PATCH 204/412] Extending Support to 5.83in Waveshare eink B/W
 displays (#1009)

* Extending Support to 5.83in Waveshare eink B/W displays

* Fixed lint issues
---
 .../components/waveshare_epaper/display.py    |  2 +
 .../waveshare_epaper/waveshare_epaper.cpp     | 95 +++++++++++++++++++
 .../waveshare_epaper/waveshare_epaper.h       | 23 +++++
 3 files changed, 120 insertions(+)

diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index bbbd8c0d3a..a654e55981 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -14,6 +14,7 @@ WaveshareEPaperTypeA = waveshare_epaper_ns.class_('WaveshareEPaperTypeA', Wavesh
 WaveshareEPaper2P7In = waveshare_epaper_ns.class_('WaveshareEPaper2P7In', WaveshareEPaper)
 WaveshareEPaper2P9InB = waveshare_epaper_ns.class_('WaveshareEPaper2P9InB', WaveshareEPaper)
 WaveshareEPaper4P2In = waveshare_epaper_ns.class_('WaveshareEPaper4P2In', WaveshareEPaper)
+WaveshareEPaper5P8In = waveshare_epaper_ns.class_('WaveshareEPaper5P8In', WaveshareEPaper)
 WaveshareEPaper7P5In = waveshare_epaper_ns.class_('WaveshareEPaper7P5In', WaveshareEPaper)
 
 WaveshareEPaperTypeAModel = waveshare_epaper_ns.enum('WaveshareEPaperTypeAModel')
@@ -28,6 +29,7 @@ MODELS = {
     '2.70in': ('b', WaveshareEPaper2P7In),
     '2.90in-b': ('b', WaveshareEPaper2P9InB),
     '4.20in': ('b', WaveshareEPaper4P2In),
+    '5.83in': ('b', WaveshareEPaper5P8In),
     '7.50in': ('b', WaveshareEPaper7P5In),
 }
 
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index 695ba9c455..c145fb361c 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -657,6 +657,101 @@ void WaveshareEPaper4P2In::dump_config() {
   LOG_UPDATE_INTERVAL(this);
 }
 
+void WaveshareEPaper5P8In::initialize() {
+  // COMMAND POWER SETTING
+  this->command(0x01);
+  this->data(0x37);
+  this->data(0x00);
+
+  // COMMAND PANEL SETTING
+  this->command(0x00);
+  this->data(0xCF);
+  this->data(0x0B);
+
+  // COMMAND BOOSTER SOFT START
+  this->command(0x06);
+  this->data(0xC7);
+  this->data(0xCC);
+  this->data(0x28);
+
+  // COMMAND POWER ON
+  this->command(0x04);
+  this->wait_until_idle_();
+  delay(10);
+
+  // COMMAND PLL CONTROL
+  this->command(0x30);
+  this->data(0x3C);
+
+  // COMMAND TEMPERATURE SENSOR CALIBRATION
+  this->command(0x41);
+  this->data(0x00);
+
+  // COMMAND VCOM AND DATA INTERVAL SETTING
+  this->command(0x50);
+  this->data(0x77);
+
+  // COMMAND TCON SETTING
+  this->command(0x60);
+  this->data(0x22);
+
+  // COMMAND RESOLUTION SETTING
+  this->command(0x61);
+  this->data(0x02);
+  this->data(0x58);
+  this->data(0x01);
+  this->data(0xC0);
+
+  // COMMAND VCM DC SETTING REGISTER
+  this->command(0x82);
+  this->data(0x1E);
+
+  this->command(0xE5);
+  this->data(0x03);
+}
+void HOT WaveshareEPaper5P8In::display() {
+  // COMMAND DATA START TRANSMISSION 1
+  this->command(0x10);
+
+  this->start_data_();
+  for (size_t i = 0; i < this->get_buffer_length_(); i++) {
+    uint8_t temp1 = this->buffer_[i];
+    for (uint8_t j = 0; j < 8; j++) {
+      uint8_t temp2;
+      if (temp1 & 0x80)
+        temp2 = 0x03;
+      else
+        temp2 = 0x00;
+
+      temp2 <<= 4;
+      temp1 <<= 1;
+      j++;
+      if (temp1 & 0x80)
+        temp2 |= 0x03;
+      else
+        temp2 |= 0x00;
+      temp1 <<= 1;
+      this->write_byte(temp2);
+    }
+
+    App.feed_wdt();
+  }
+  this->end_data_();
+
+  // COMMAND DISPLAY REFRESH
+  this->command(0x12);
+}
+int WaveshareEPaper5P8In::get_width_internal() { return 600; }
+int WaveshareEPaper5P8In::get_height_internal() { return 448; }
+void WaveshareEPaper5P8In::dump_config() {
+  LOG_DISPLAY("", "Waveshare E-Paper", this);
+  ESP_LOGCONFIG(TAG, "  Model: 5.83in");
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Busy Pin: ", this->busy_pin_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
 void WaveshareEPaper7P5In::initialize() {
   // COMMAND POWER SETTING
   this->command(0x01);
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index c21cabcaf4..1ed7475350 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -190,6 +190,29 @@ class WaveshareEPaper4P2In : public WaveshareEPaper {
   int get_height_internal() override;
 };
 
+class WaveshareEPaper5P8In : public WaveshareEPaper {
+ public:
+  void initialize() override;
+
+  void display() override;
+
+  void dump_config() override;
+
+  void deep_sleep() override {
+    // COMMAND POWER OFF
+    this->command(0x02);
+    this->wait_until_idle_();
+    // COMMAND DEEP SLEEP
+    this->command(0x07);
+    this->data(0xA5);  // check byte
+  }
+
+ protected:
+  int get_width_internal() override;
+
+  int get_height_internal() override;
+};
+
 class WaveshareEPaper7P5In : public WaveshareEPaper {
  public:
   void initialize() override;

From 26d6738abbb8bfe0c341d63804c9514ac88e6759 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 19 May 2020 10:13:29 +1200
Subject: [PATCH 205/412] Allow tm1637 to use pins from IO expanders (#1058)

* Allow tm1637 to use pins from IO expanders

* Add test for io expander pins
---
 esphome/components/tm1637/display.py |  4 ++--
 tests/test1.yaml                     | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/esphome/components/tm1637/display.py b/esphome/components/tm1637/display.py
index 211d78a9d9..dcc4b82719 100644
--- a/esphome/components/tm1637/display.py
+++ b/esphome/components/tm1637/display.py
@@ -12,8 +12,8 @@ CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(TM1637Display),
 
     cv.Optional(CONF_INTENSITY, default=7): cv.All(cv.uint8_t, cv.Range(min=0, max=7)),
-    cv.Required(CONF_CLK_PIN): pins.internal_gpio_output_pin_schema,
-    cv.Required(CONF_DIO_PIN): pins.internal_gpio_output_pin_schema,
+    cv.Required(CONF_CLK_PIN): pins.gpio_output_pin_schema,
+    cv.Required(CONF_DIO_PIN): pins.gpio_output_pin_schema,
 }).extend(cv.polling_component_schema('1s'))
 
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 18adcf70a3..31da80ac36 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1478,6 +1478,16 @@ display:
   intensity: 3
   lambda: |-
       it.print("1234");
+- platform: tm1637
+  clk_pin:
+    mcp23017: mcp23017_hub
+    number: 1
+  dio_pin:
+    mcp23017: mcp23017_hub
+    number: 2
+  intensity: 3
+  lambda: |-
+      it.print("1234");
 - platform: nextion
   lambda: |-
     it.set_component_value("gauge", 50);

From 53986279d714108e7096407e8891b73afc7046b0 Mon Sep 17 00:00:00 2001
From: Jim Persson <jim@nurd.se>
Date: Tue, 19 May 2020 00:14:20 +0200
Subject: [PATCH 206/412] Fix fan oscillation trait not being used (#1048)

---
 esphome/components/fan/fan_traits.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/fan/fan_traits.h b/esphome/components/fan/fan_traits.h
index 67b0e33e88..c46adbf013 100644
--- a/esphome/components/fan/fan_traits.h
+++ b/esphome/components/fan/fan_traits.h
@@ -6,7 +6,7 @@ namespace fan {
 class FanTraits {
  public:
   FanTraits() = default;
-  FanTraits(bool oscillation, bool speed) : oscillation_(false), speed_(speed) {}
+  FanTraits(bool oscillation, bool speed) : oscillation_(oscillation), speed_(speed) {}
 
   /// Return if this fan supports oscillation.
   bool supports_oscillation() const { return this->oscillation_; }

From 1d9ce2afc5267d4dd76f57460aad52c261a952be Mon Sep 17 00:00:00 2001
From: nepozs <56661567+nepozs@users.noreply.github.com>
Date: Tue, 19 May 2020 01:10:03 +0200
Subject: [PATCH 207/412] Update tm1637.cpp (#1044)

* Update tm1637.cpp

Defined degree symbol.

* remove fixed array size

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/tm1637/tm1637.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/tm1637/tm1637.cpp b/esphome/components/tm1637/tm1637.cpp
index ebf2fff9d6..d9b9a870ff 100644
--- a/esphome/components/tm1637/tm1637.cpp
+++ b/esphome/components/tm1637/tm1637.cpp
@@ -20,7 +20,7 @@ const uint8_t TM1637_UNKNOWN_CHAR = 0b11111111;
 //     ---
 //      D   X
 // XABCDEFG
-const uint8_t TM1637_ASCII_TO_RAW[94] PROGMEM = {
+const uint8_t TM1637_ASCII_TO_RAW[] PROGMEM = {
     0b00000000,           // ' ', ord 0x20
     0b10110000,           // '!', ord 0x21
     0b00100010,           // '"', ord 0x22
@@ -115,6 +115,7 @@ const uint8_t TM1637_ASCII_TO_RAW[94] PROGMEM = {
     0b00110001,           // '{', ord 0x7B
     0b00000110,           // '|', ord 0x7C
     0b00000111,           // '}', ord 0x7D
+    0b01100011,           // '~', ord 0x7E (degree symbol)
 };
 void TM1637Display::setup() {
   ESP_LOGCONFIG(TAG, "Setting up TM1637...");

From 7df72ddb969bca32a72795e4137e01abe1b36f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robin=20Smidsr=C3=B8d?= <robin@smidsrod.no>
Date: Tue, 19 May 2020 01:24:13 +0200
Subject: [PATCH 208/412] dht: Fix sensor reading from DHT22 (#926)

* dht: Fix sensor reading from DHT22 (#239)

Looking at the datasheet for DHT22, it claims to need a delay of 18ms, not
800us. Change to use the same delay as DHT11. Tested working with NodeMCUv3
and DHT22 sensor with board with built-in resistor.

* dht: Add model DHT22_TYPE2 with 2ms delay instead of 0.8ms

The model DHT22_TYPE2 is exactly the same as DHT22, but uses a different
delay.

* dht: Fix bogus negative temperature reading on DHT22_TYPE2

The workaround for negative numbers associated with DHT22s can be skipped
on these sensors.
---
 esphome/components/dht/dht.cpp   | 4 +++-
 esphome/components/dht/dht.h     | 4 +++-
 esphome/components/dht/sensor.py | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/esphome/components/dht/dht.cpp b/esphome/components/dht/dht.cpp
index c311aa43ec..988a5300dd 100644
--- a/esphome/components/dht/dht.cpp
+++ b/esphome/components/dht/dht.cpp
@@ -92,6 +92,8 @@ bool HOT ICACHE_RAM_ATTR DHT::read_sensor_(float *temperature, float *humidity,
       delayMicroseconds(500);
       this->pin_->digital_write(true);
       delayMicroseconds(40);
+    } else if (this->model_ == DHT_MODEL_DHT22_TYPE2) {
+      delayMicroseconds(2000);
     } else {
       delayMicroseconds(800);
     }
@@ -208,7 +210,7 @@ bool HOT ICACHE_RAM_ATTR DHT::read_sensor_(float *temperature, float *humidity,
     uint16_t raw_humidity = (uint16_t(data[0] & 0xFF) << 8) | (data[1] & 0xFF);
     uint16_t raw_temperature = (uint16_t(data[2] & 0xFF) << 8) | (data[3] & 0xFF);
 
-    if ((raw_temperature & 0x8000) != 0)
+    if (this->model_ != DHT_MODEL_DHT22_TYPE2 && (raw_temperature & 0x8000) != 0)
       raw_temperature = ~(raw_temperature & 0x7FFF);
 
     if (raw_temperature == 1 && raw_humidity == 10) {
diff --git a/esphome/components/dht/dht.h b/esphome/components/dht/dht.h
index 4ed5d4e022..8826a3d2b7 100644
--- a/esphome/components/dht/dht.h
+++ b/esphome/components/dht/dht.h
@@ -12,7 +12,8 @@ enum DHTModel {
   DHT_MODEL_DHT22,
   DHT_MODEL_AM2302,
   DHT_MODEL_RHT03,
-  DHT_MODEL_SI7021
+  DHT_MODEL_SI7021,
+  DHT_MODEL_DHT22_TYPE2
 };
 
 /// Component for reading temperature/humidity measurements from DHT11/DHT22 sensors.
@@ -28,6 +29,7 @@ class DHT : public PollingComponent {
    *  - DHT_MODEL_AM2302
    *  - DHT_MODEL_RHT03
    *  - DHT_MODEL_SI7021
+   *  - DHT_MODEL_DHT22_TYPE2
    *
    * @param model The DHT model.
    */
diff --git a/esphome/components/dht/sensor.py b/esphome/components/dht/sensor.py
index 8455f74fb4..8749d85b52 100644
--- a/esphome/components/dht/sensor.py
+++ b/esphome/components/dht/sensor.py
@@ -15,6 +15,7 @@ DHT_MODELS = {
     'AM2302': DHTModel.DHT_MODEL_AM2302,
     'RHT03': DHTModel.DHT_MODEL_RHT03,
     'SI7021': DHTModel.DHT_MODEL_SI7021,
+    'DHT22_TYPE2': DHTModel.DHT_MODEL_DHT22_TYPE2,
 }
 DHT = dht_ns.class_('DHT', cg.PollingComponent)
 

From 1319ff1129d8f11439aa9e450bd6a052f14ba8f5 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 20 May 2020 12:02:10 +1200
Subject: [PATCH 209/412] Add lambda to devcontainer config (#1059)

---
 .devcontainer/devcontainer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5ce1768f5f..8f7d751437 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -22,6 +22,7 @@
     "terminal.integrated.shell.linux": "/bin/bash",
     "yaml.customTags": [
       "!secret scalar",
+      "!lambda scalar",
       "!include_dir_named scalar",
       "!include_dir_list scalar",
       "!include_dir_merge_list scalar",

From 153aadadae56ee6f3de8d83f41f99dd8b783f4fe Mon Sep 17 00:00:00 2001
From: Jozef Zuzelka <jozef.zuzelka@gmail.com>
Date: Wed, 20 May 2020 02:13:50 +0200
Subject: [PATCH 210/412] Ble scanner (#976)

* Added ble_scanner component

* ble_scanner: time.h changed to ctime

* ble_scanner: Test added.

* ble_scanner: fixed code formatting.

* Removed duplicate binary sensor tests from test2 and test3 to decrease memory requirements.

* Removed another duplicate test from test2.yaml and moved stepper test to yaml3.yaml to reduce memory requirements of test2.yaml.

* Reverted the last stepper test change

* Moved some sensor tests from test2.yaml to test3.yaml to save memory.

* Moved ruuvitag back to test2.yaml as it requires component esp32_ble_tracker.

* removed apds9960 as it is duplicated

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/ble_scanner/__init__.py    |  0
 .../components/ble_scanner/ble_scanner.cpp    | 16 ++++
 esphome/components/ble_scanner/ble_scanner.h  | 38 +++++++++
 esphome/components/ble_scanner/text_sensor.py | 22 +++++
 tests/test2.yaml                              | 82 +++----------------
 tests/test3.yaml                              | 35 +++++++-
 6 files changed, 120 insertions(+), 73 deletions(-)
 create mode 100644 esphome/components/ble_scanner/__init__.py
 create mode 100644 esphome/components/ble_scanner/ble_scanner.cpp
 create mode 100644 esphome/components/ble_scanner/ble_scanner.h
 create mode 100644 esphome/components/ble_scanner/text_sensor.py

diff --git a/esphome/components/ble_scanner/__init__.py b/esphome/components/ble_scanner/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/ble_scanner/ble_scanner.cpp b/esphome/components/ble_scanner/ble_scanner.cpp
new file mode 100644
index 0000000000..6735599850
--- /dev/null
+++ b/esphome/components/ble_scanner/ble_scanner.cpp
@@ -0,0 +1,16 @@
+#include "ble_scanner.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace ble_scanner {
+
+static const char *TAG = "ble_scanner";
+
+void BLEScanner::dump_config() { LOG_TEXT_SENSOR("", "BLE Scanner", this); }
+
+}  // namespace ble_scanner
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/ble_scanner/ble_scanner.h b/esphome/components/ble_scanner/ble_scanner.h
new file mode 100644
index 0000000000..194494144c
--- /dev/null
+++ b/esphome/components/ble_scanner/ble_scanner.h
@@ -0,0 +1,38 @@
+#pragma once
+
+#include <ctime>
+#include <string>
+
+#include "esphome/core/component.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/text_sensor/text_sensor.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace ble_scanner {
+
+class BLEScanner : public text_sensor::TextSensor, public esp32_ble_tracker::ESPBTDeviceListener, public Component {
+ public:
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
+    this->publish_state("{\"timestamp\":" + to_string(::time(NULL)) +
+                        ","
+                        "\"address\":\"" +
+                        device.address_str() +
+                        "\","
+                        "\"rssi\":" +
+                        to_string(device.get_rssi()) +
+                        ","
+                        "\"name\":\"" +
+                        device.get_name() + "\"}");
+
+    return true;
+  }
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+};
+
+}  // namespace ble_scanner
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/ble_scanner/text_sensor.py b/esphome/components/ble_scanner/text_sensor.py
new file mode 100644
index 0000000000..1a43ffb68a
--- /dev/null
+++ b/esphome/components/ble_scanner/text_sensor.py
@@ -0,0 +1,22 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import text_sensor, esp32_ble_tracker
+from esphome.const import CONF_ID
+
+DEPENDENCIES = ['esp32_ble_tracker']
+
+ble_scanner_ns = cg.esphome_ns.namespace('ble_scanner')
+BLEScanner = ble_scanner_ns.class_('BLEScanner', text_sensor.TextSensor, cg.Component,
+                                   esp32_ble_tracker.ESPBTDeviceListener)
+
+CONFIG_SCHEMA = cv.All(text_sensor.TEXT_SENSOR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(BLEScanner),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(
+    cv.COMPONENT_SCHEMA))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+    yield text_sensor.register_text_sensor(var, config)
diff --git a/tests/test2.yaml b/tests/test2.yaml
index d02c093b86..6bc0ac93c3 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -100,62 +100,6 @@ sensor:
       name: "Xiaomi CGG1 Humidity"
     battery_level:
       name: "Xiaomi CGG1 Battery Level"
-  - platform: pmsx003
-    type: PMSX003
-    pm_1_0:
-      name: "PM 1.0 Concentration"
-    pm_2_5:
-      name: "PM 2.5 Concentration"
-    pm_10_0:
-      name: "PM 10.0 Concentration"
-  - platform: pmsx003
-    type: PMS5003T
-    pm_2_5:
-      name: "PM 2.5 Concentration"
-    temperature:
-      name: "PMS Temperature"
-    humidity:
-      name: "PMS Humidity"
-  - platform: pmsx003
-    type: PMS5003ST
-    pm_2_5:
-      name: "PM 2.5 Concentration"
-    temperature:
-      name: "PMS Temperature"
-    humidity:
-      name: "PMS Humidity"
-    formaldehyde:
-      name: "PMS Formaldehyde Concentration"
-  - platform: cse7766
-    voltage:
-      name: "CSE7766 Voltage"
-    current:
-      name: "CSE7766 Current"
-    power:
-      name: "CSE776 Power"
-  - platform: apds9960
-    type: proximity
-    name: APDS9960 Proximity
-  - platform: apds9960
-    type: clear
-    name: APDS9960 Clear
-  - platform: apds9960
-    type: red
-    name: APDS9960 Red
-  - platform: apds9960
-    type: green
-    name: APDS9960 Green
-  - platform: apds9960
-    type: blue
-    name: APDS9960 Blue
-  - platform: homeassistant
-    entity_id: sensor.hello_world
-    id: ha_hello_world
-  - platform: as3935
-    lightning_energy:
-      name: "Lightning Energy"
-    distance:
-      name: "Distance Storm"
   - platform: ruuvitag
     mac_address: FF:56:D3:2F:7D:E8
     humidity:
@@ -178,6 +122,14 @@ sensor:
       name: "RuuviTag Movement Counter"
     measurement_sequence_number:
       name: "RuuviTag Measurement Sequence Number"
+  - platform: homeassistant
+    entity_id: sensor.hello_world
+    id: ha_hello_world
+  - platform: as3935
+    lightning_energy:
+      name: "Lightning Energy"
+    distance:
+      name: "Distance Storm"
 
 time:
 - platform: homeassistant
@@ -186,10 +138,6 @@ time:
       then:
         - logger.log: It's 16:00
 
-apds9960:
-  address: 0x20
-  update_interval: 60s
-
 esp32_touch:
   setup_mode: True
 
@@ -210,18 +158,6 @@ binary_sensor:
     name: "ESP32 Touch Pad GPIO27"
     pin: GPIO27
     threshold: 1000
-  - platform: apds9960
-    direction: up
-    name: APDS9960 Up
-  - platform: apds9960
-    direction: down
-    name: APDS9960 Down
-  - platform: apds9960
-    direction: left
-    name: APDS9960 Left
-  - platform: apds9960
-    direction: right
-    name: APDS9960 Right
   - platform: homeassistant
     entity_id: binary_sensor.hello_world
     id: ha_hello_world_binary
@@ -291,6 +227,8 @@ text_sensor:
   - platform: homeassistant
     entity_id: sensor.hello_world2
     id: ha_hello_world2
+  - platform: ble_scanner
+    name: Scanner
 
 script:
   - id: my_script
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 2a37095aca..0d8be590cf 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -221,7 +221,7 @@ sensor:
   - platform: homeassistant
     entity_id: sensor.hello_world
     id: ha_hello_world
-  - platform: aht10  
+  - platform: aht10
     temperature:
       name: "Temperature"
     humidity:
@@ -360,6 +360,39 @@ sensor:
       name: "PM2.5"
     pm_10_0:
       name: "PM10.0"
+  - platform: pmsx003
+    type: PMSX003
+    pm_1_0:
+      name: "PM 1.0 Concentration"
+    pm_2_5:
+      name: "PM 2.5 Concentration"
+    pm_10_0:
+      name: "PM 10.0 Concentration"
+  - platform: pmsx003
+    type: PMS5003T
+    pm_2_5:
+      name: "PM 2.5 Concentration"
+    temperature:
+      name: "PMS Temperature"
+    humidity:
+      name: "PMS Humidity"
+  - platform: pmsx003
+    type: PMS5003ST
+    pm_2_5:
+      name: "PM 2.5 Concentration"
+    temperature:
+      name: "PMS Temperature"
+    humidity:
+      name: "PMS Humidity"
+    formaldehyde:
+      name: "PMS Formaldehyde Concentration"
+  - platform: cse7766
+    voltage:
+      name: "CSE7766 Voltage"
+    current:
+      name: "CSE7766 Current"
+    power:
+      name: "CSE776 Power"
 
 time:
 - platform: homeassistant

From c2e0ea97d821731199d2e0cea77b12e9a1276c48 Mon Sep 17 00:00:00 2001
From: Niklas Wagner <Skaro@Skaronator.com>
Date: Sun, 24 May 2020 01:33:58 +0200
Subject: [PATCH 211/412] Upgrade dependencies

---
 esphome/core.py              |  2 ++
 esphome/core_config.py       | 11 ++++++-----
 esphome/cpp_generator.py     |  4 ++++
 esphome/voluptuous_schema.py |  2 +-
 platformio.ini               |  2 +-
 requirements.txt             | 14 +++++++-------
 requirements_test.txt        | 21 ++++++++++-----------
 setup.py                     | 14 +++++++-------
 8 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/esphome/core.py b/esphome/core.py
index 4b1d3b2115..7bbaf9c54c 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -578,10 +578,12 @@ class EsphomeCore:
         return os.path.basename(self.config_path)
 
     def relative_config_path(self, *path):
+        # pylint: disable=no-value-for-parameter
         path_ = os.path.expanduser(os.path.join(*path))
         return os.path.join(self.config_dir, path_)
 
     def relative_build_path(self, *path):
+        # pylint: disable=no-value-for-parameter
         path_ = os.path.expanduser(os.path.join(*path))
         return os.path.join(self.build_path, path_)
 
diff --git a/esphome/core_config.py b/esphome/core_config.py
index 35f2fa1f80..d447eaaffb 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -11,7 +11,8 @@ from esphome.const import ARDUINO_VERSION_ESP32_DEV, ARDUINO_VERSION_ESP8266_DEV
     CONF_NAME, CONF_ON_BOOT, CONF_ON_LOOP, CONF_ON_SHUTDOWN, CONF_PLATFORM, \
     CONF_PLATFORMIO_OPTIONS, CONF_PRIORITY, CONF_TRIGGER_ID, \
     CONF_ESP8266_RESTORE_FROM_FLASH, ARDUINO_VERSION_ESP8266_2_3_0, \
-    ARDUINO_VERSION_ESP8266_2_5_0, ARDUINO_VERSION_ESP8266_2_5_1, ARDUINO_VERSION_ESP8266_2_5_2
+    ARDUINO_VERSION_ESP8266_2_5_0, ARDUINO_VERSION_ESP8266_2_5_1, ARDUINO_VERSION_ESP8266_2_5_2, \
+    ESP_PLATFORMS
 from esphome.core import CORE, coroutine_with_priority
 from esphome.helpers import copy_file_if_changed, walk_files
 from esphome.pins import ESP8266_FLASH_SIZES, ESP8266_LD_SCRIPTS
@@ -42,10 +43,10 @@ def validate_board(value):
     return value
 
 
-validate_platform = cv.one_of('ESP32', 'ESP8266', upper=True)
+validate_platform = cv.one_of(*ESP_PLATFORMS, upper=True)
 
 PLATFORMIO_ESP8266_LUT = {
-    '2.6.3': 'espressif8266@2.3.2',
+    '2.6.3': 'espressif8266@2.4.0',
     '2.6.2': 'espressif8266@2.3.1',
     '2.6.1': 'espressif8266@2.3.0',
     '2.5.2': 'espressif8266@2.2.3',
@@ -65,8 +66,8 @@ PLATFORMIO_ESP32_LUT = {
     '1.0.1': 'espressif32@1.6.0',
     '1.0.2': 'espressif32@1.9.0',
     '1.0.3': 'espressif32@1.10.0',
-    '1.0.4': 'espressif32@1.11.0',
-    'RECOMMENDED': 'espressif32@1.11.0',
+    '1.0.4': 'espressif32@1.12.1',
+    'RECOMMENDED': 'espressif32@1.12.1',
     'LATEST': 'espressif32',
     'DEV': ARDUINO_VERSION_ESP32_DEV,
 }
diff --git a/esphome/cpp_generator.py b/esphome/cpp_generator.py
index e9bcdc7d1f..3f87257e26 100644
--- a/esphome/cpp_generator.py
+++ b/esphome/cpp_generator.py
@@ -219,6 +219,7 @@ class StringLiteral(Literal):
     __slots__ = ("string", )
 
     def __init__(self, string: str):
+        super().__init__()
         self.string = string
 
     def __str__(self):
@@ -229,6 +230,7 @@ class IntLiteral(Literal):
     __slots__ = ("i", )
 
     def __init__(self, i: int):
+        super().__init__()
         self.i = i
 
     def __str__(self):
@@ -256,6 +258,7 @@ class HexIntLiteral(Literal):
     __slots__ = ("i", )
 
     def __init__(self, i: int):
+        super().__init__()
         self.i = HexInt(i)
 
     def __str__(self):
@@ -266,6 +269,7 @@ class FloatLiteral(Literal):
     __slots__ = ("f", )
 
     def __init__(self, value: float):
+        super().__init__()
         self.f = value
 
     def __str__(self):
diff --git a/esphome/voluptuous_schema.py b/esphome/voluptuous_schema.py
index 8193c1317c..c30447a427 100644
--- a/esphome/voluptuous_schema.py
+++ b/esphome/voluptuous_schema.py
@@ -177,7 +177,7 @@ class _Schema(vol.Schema):
         self._extra_schemas.append(validator)
         return self
 
-    # pylint: disable=arguments-differ
+    # pylint: disable=signature-differs
     def extend(self, *schemas, **kwargs):
         extra = kwargs.pop('extra', None)
         if kwargs:
diff --git a/platformio.ini b/platformio.ini
index a6e9926de6..b3aec4c276 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -44,7 +44,7 @@ build_flags = ${common.build_flags}
 src_filter = ${common.src_filter} +<tests/livingroom8266.cpp>
 
 [env:livingroom32]
-platform = espressif32@1.11.0
+platform = espressif32@1.12.1
 board = nodemcu-32s
 framework = arduino
 lib_deps = ${common.lib_deps}
diff --git a/requirements.txt b/requirements.txt
index 8c763ef9a6..f999c4d98b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,12 +1,12 @@
 voluptuous==0.11.7
-PyYAML==5.2
+PyYAML==5.3.1
 paho-mqtt==1.5.0
-colorlog==4.0.2
-tornado==5.1.1
-protobuf==3.11.1
+colorlog==4.1.0
+tornado==6.0.4
+protobuf==3.11.3
 tzlocal==2.0.0
-pytz==2019.3
+pytz==2020.1
 pyserial==3.4
 ifaddr==0.1.6
-platformio==4.1.0
-esptool==2.7
+platformio==4.3.3
+esptool==2.8
diff --git a/requirements_test.txt b/requirements_test.txt
index 268f78fcdf..b90c4ea969 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,25 +1,24 @@
 voluptuous==0.11.7
-PyYAML==5.2
+PyYAML==5.3.1
 paho-mqtt==1.5.0
-colorlog==4.0.2
-tornado==5.1.1
-protobuf==3.11.1
+colorlog==4.1.0
+tornado==6.0.4
+protobuf==3.11.3
 tzlocal==2.0.0
-pytz==2019.3
+pytz==2020.1
 pyserial==3.4
 ifaddr==0.1.6
-platformio==4.1.0
-esptool==2.7
+platformio==4.3.3
+esptool==2.8
 
-pylint==1.9.4 ; python_version<"3"
-pylint==2.4.4 ; python_version>"3"
+pylint==2.5.0
 flake8==3.7.9
 pillow
 pexpect
 
 # Unit tests
-pytest==5.3.2
+pytest==5.4.1
 pytest-cov==2.8.1
 pytest-mock==1.13.0
 asyncmock==0.4.2
-hypothesis==4.57.0
+hypothesis==5.10.4
diff --git a/setup.py b/setup.py
index f78ec49f28..0a19dccf95 100755
--- a/setup.py
+++ b/setup.py
@@ -24,13 +24,13 @@ DOWNLOAD_URL = '{}/archive/v{}.zip'.format(GITHUB_URL, const.__version__)
 
 REQUIRES = [
     'voluptuous==0.11.7',
-    'PyYAML==5.2',
+    'PyYAML==5.3.1',
     'paho-mqtt==1.5.0',
-    'colorlog==4.0.2',
-    'tornado==5.1.1',
-    'protobuf==3.11.1',
+    'colorlog==4.1.0',
+    'tornado==6.0.4',
+    'protobuf==3.11.3',
     'tzlocal==2.0.0',
-    'pytz==2019.3',
+    'pytz==2020.1',
     'pyserial==3.4',
     'ifaddr==0.1.6',
 ]
@@ -40,8 +40,8 @@ REQUIRES = [
 # This means they have to be in your $PATH.
 if os.environ.get('ESPHOME_USE_SUBPROCESS') is None:
     REQUIRES.extend([
-        'platformio==4.1.0',
-        'esptool==2.7',
+        'platformio==4.3.3',
+        'esptool==2.8',
     ])
 
 CLASSIFIERS = [

From 021055f0b8c8f450fdfed5a57d34f796cae68b46 Mon Sep 17 00:00:00 2001
From: krahabb <davide.perteghella@mthree.it>
Date: Sun, 24 May 2020 02:52:29 +0200
Subject: [PATCH 212/412] Added auto discovery and setup to Dallas Platform
 (#1028)

* Added auto discovery and setup to Dallas Platform

* Added auto discovery and setup to Dallas Platform

* Added auto discovery and setup to Dallas Platform

* Added auto discovery and setup to Dallas Platform

* Added auto discovery and setup to Dallas Platform
---
 esphome/components/dallas/__init__.py         | 26 ++++++++++++-
 .../components/dallas/dallas_component.cpp    | 37 +++++++++++++++++++
 esphome/components/dallas/dallas_component.h  | 20 ++++++++++
 3 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/esphome/components/dallas/__init__.py b/esphome/components/dallas/__init__.py
index 85ab4300ee..28fc9785ad 100644
--- a/esphome/components/dallas/__init__.py
+++ b/esphome/components/dallas/__init__.py
@@ -1,12 +1,18 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
-from esphome.const import CONF_ID, CONF_PIN
+from esphome.const import CONF_ID, CONF_PIN, \
+    CONF_RESOLUTION, CONF_UNIT_OF_MEASUREMENT, UNIT_CELSIUS, \
+    CONF_ICON, ICON_THERMOMETER, CONF_ACCURACY_DECIMALS
 
 MULTI_CONF = True
 AUTO_LOAD = ['sensor']
 
 CONF_ONE_WIRE_ID = 'one_wire_id'
+CONF_AUTO_SETUP_SENSORS = 'auto_setup_sensors'
+CONF_SENSOR_NAME_TEMPLATE = 'sensor_name_template'
+SENSOR_NAME_TEMPLATE_DEFAULT = '%s.%s'
+
 dallas_ns = cg.esphome_ns.namespace('dallas')
 DallasComponent = dallas_ns.class_('DallasComponent', cg.PollingComponent)
 ESPOneWire = dallas_ns.class_('ESPOneWire')
@@ -15,6 +21,12 @@ CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(DallasComponent),
     cv.GenerateID(CONF_ONE_WIRE_ID): cv.declare_id(ESPOneWire),
     cv.Required(CONF_PIN): pins.gpio_input_pin_schema,
+    cv.Optional(CONF_AUTO_SETUP_SENSORS, default=False): cv.boolean,
+    cv.Optional(CONF_SENSOR_NAME_TEMPLATE, default=SENSOR_NAME_TEMPLATE_DEFAULT): cv.string_strict,
+    cv.Optional(CONF_RESOLUTION, default=12): cv.int_range(min=9, max=12),
+    cv.Optional(CONF_UNIT_OF_MEASUREMENT, default=UNIT_CELSIUS): cv.string_strict,
+    cv.Optional(CONF_ICON, default=ICON_THERMOMETER): cv.icon,
+    cv.Optional(CONF_ACCURACY_DECIMALS, default=1): cv.int_,
 }).extend(cv.polling_component_schema('60s'))
 
 
@@ -22,4 +34,16 @@ def to_code(config):
     pin = yield cg.gpio_pin_expression(config[CONF_PIN])
     one_wire = cg.new_Pvariable(config[CONF_ONE_WIRE_ID], pin)
     var = cg.new_Pvariable(config[CONF_ID], one_wire)
+    if CONF_AUTO_SETUP_SENSORS in config:
+        cg.add(var.set_auto_setup_sensors(config[CONF_AUTO_SETUP_SENSORS]))
+    if CONF_SENSOR_NAME_TEMPLATE in config:
+        cg.add(var.set_sensor_name_template(config[CONF_SENSOR_NAME_TEMPLATE]))
+    if CONF_RESOLUTION in config:
+        cg.add(var.set_resolution(config[CONF_RESOLUTION]))
+    if CONF_UNIT_OF_MEASUREMENT in config:
+        cg.add(var.set_unit_of_measurement(config[CONF_UNIT_OF_MEASUREMENT]))
+    if CONF_ICON in config:
+        cg.add(var.set_icon(config[CONF_ICON]))
+    if CONF_ACCURACY_DECIMALS in config:
+        cg.add(var.set_accuracy_decimals(config[CONF_ACCURACY_DECIMALS]))
     yield cg.register_component(var, config)
diff --git a/esphome/components/dallas/dallas_component.cpp b/esphome/components/dallas/dallas_component.cpp
index aa839e7331..d657f6c498 100644
--- a/esphome/components/dallas/dallas_component.cpp
+++ b/esphome/components/dallas/dallas_component.cpp
@@ -1,5 +1,6 @@
 #include "dallas_component.h"
 #include "esphome/core/log.h"
+#include "esphome/core/application.h"
 
 namespace esphome {
 namespace dallas {
@@ -52,6 +53,29 @@ void DallasComponent::setup() {
       continue;
     }
     this->found_sensors_.push_back(address);
+
+    if (this->auto_setup_sensors_) {
+      // avoid re-generating  pre-configured sensors
+      bool skip = false;
+      for (auto sensor : this->sensors_) {
+        if (sensor->get_address() == address) {
+          skip = true;
+          break;
+        }
+      }
+      if (!skip) {
+        auto dallastemperaturesensor = this->get_sensor_by_address(address, this->resolution_);
+        char sensor_name[64];
+        snprintf(sensor_name, sizeof(sensor_name), this->sensor_name_template_.c_str(), App.get_name().c_str(),
+                 s.c_str());
+        dallastemperaturesensor->set_name(sensor_name);
+        dallastemperaturesensor->set_unit_of_measurement(this->unit_of_measurement_);
+        dallastemperaturesensor->set_icon(this->icon_);
+        dallastemperaturesensor->set_accuracy_decimals(this->accuracy_decimals_);
+        dallastemperaturesensor->set_force_update(false);
+        App.register_sensor(dallastemperaturesensor);
+      }
+    }
   }
 
   for (auto sensor : this->sensors_) {
@@ -156,12 +180,25 @@ void DallasComponent::update() {
   }
 }
 DallasComponent::DallasComponent(ESPOneWire *one_wire) : one_wire_(one_wire) {}
+void DallasComponent::set_auto_setup_sensors(bool auto_setup_sensors) {
+  this->auto_setup_sensors_ = auto_setup_sensors;
+}
+void DallasComponent::set_sensor_name_template(const std::string &sensor_name_template) {
+  this->sensor_name_template_ = sensor_name_template;
+}
+void DallasComponent::set_resolution(uint8_t resolution) { this->resolution_ = resolution; }
+void DallasComponent::set_unit_of_measurement(const std::string &unit_of_measurement) {
+  this->unit_of_measurement_ = unit_of_measurement;
+}
+void DallasComponent::set_icon(const std::string &icon) { this->icon_ = icon; }
+void DallasComponent::set_accuracy_decimals(int8_t accuracy_decimals) { this->accuracy_decimals_ = accuracy_decimals; }
 
 DallasTemperatureSensor::DallasTemperatureSensor(uint64_t address, uint8_t resolution, DallasComponent *parent)
     : parent_(parent) {
   this->set_address(address);
   this->set_resolution(resolution);
 }
+const uint64_t &DallasTemperatureSensor::get_address() const { return this->address_; }
 void DallasTemperatureSensor::set_address(uint64_t address) { this->address_ = address; }
 uint8_t DallasTemperatureSensor::get_resolution() const { return this->resolution_; }
 void DallasTemperatureSensor::set_resolution(uint8_t resolution) { this->resolution_ = resolution; }
diff --git a/esphome/components/dallas/dallas_component.h b/esphome/components/dallas/dallas_component.h
index d32aec1758..f2acf09d75 100644
--- a/esphome/components/dallas/dallas_component.h
+++ b/esphome/components/dallas/dallas_component.h
@@ -22,12 +22,30 @@ class DallasComponent : public PollingComponent {
 
   void update() override;
 
+  /// Automatic sensors instantiation
+  bool get_auto_setup_sensors() const;
+  void set_auto_setup_sensors(bool auto_setup_sensors);
+
+  /// Get/Set properties for automatically generated sensors.
+  void set_sensor_name_template(const std::string &sensor_name_template);
+  void set_resolution(uint8_t resolution);
+  void set_unit_of_measurement(const std::string &unit_of_measurement);
+  void set_icon(const std::string &icon);
+  void set_accuracy_decimals(int8_t accuracy_decimals);
+
  protected:
   friend DallasTemperatureSensor;
 
   ESPOneWire *one_wire_;
   std::vector<DallasTemperatureSensor *> sensors_;
   std::vector<uint64_t> found_sensors_;
+
+  bool auto_setup_sensors_;
+  std::string sensor_name_template_;
+  uint8_t resolution_;
+  std::string unit_of_measurement_;
+  std::string icon_;
+  int8_t accuracy_decimals_;
 };
 
 /// Internal class that helps us create multiple sensors for one Dallas hub.
@@ -40,6 +58,8 @@ class DallasTemperatureSensor : public sensor::Sensor {
   /// Helper to create (and cache) the name for this sensor. For example "0xfe0000031f1eaf29".
   const std::string &get_address_name();
 
+  /// Get the 64-bit unsigned address of this sensor.
+  const uint64_t &get_address() const;
   /// Set the 64-bit unsigned address for this sensor.
   void set_address(uint64_t address);
   /// Get the index of this sensor. (0 if using address.)

From 39fbf9c56f556084d21e6508d99474ff47d5d8d9 Mon Sep 17 00:00:00 2001
From: Chris Talkington <chris@talkingtontech.com>
Date: Sat, 23 May 2020 20:53:15 -0500
Subject: [PATCH 213/412] expose mac address via discovery (#1038)

---
 esphome/core/util.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/core/util.cpp b/esphome/core/util.cpp
index ea5e347c72..867ba8421b 100644
--- a/esphome/core/util.cpp
+++ b/esphome/core/util.cpp
@@ -62,6 +62,7 @@ void network_setup_mdns(IPAddress address, int interface) {
       // DNS-SD (!=mDNS !) requires at least one TXT record for service discovery - let's add version
       MDNS.addServiceTxt("esphomelib", "tcp", "version", ESPHOME_VERSION);
       MDNS.addServiceTxt("esphomelib", "tcp", "address", network_get_address().c_str());
+      MDNS.addServiceTxt("esphomelib", "tcp", "mac", get_mac_address().c_str());
     } else {
 #endif
       // Publish "http" service if not using native API.

From 4de44a99eb49bbe9c1c8180b9fc09160abcf9bba Mon Sep 17 00:00:00 2001
From: Oskar Napieraj <napieraj@users.noreply.github.com>
Date: Sun, 24 May 2020 05:06:55 +0200
Subject: [PATCH 214/412] Add support for ESP32 DAC (#1071)

* Add support for ESP32 onboard DAC

* Newlines

* Tests
---
 esphome/components/esp32_dac/__init__.py   |  0
 esphome/components/esp32_dac/esp32_dac.cpp | 37 ++++++++++++++++++++++
 esphome/components/esp32_dac/esp32_dac.h   | 32 +++++++++++++++++++
 esphome/components/esp32_dac/output.py     | 31 ++++++++++++++++++
 tests/test1.yaml                           |  9 ++++++
 5 files changed, 109 insertions(+)
 create mode 100644 esphome/components/esp32_dac/__init__.py
 create mode 100644 esphome/components/esp32_dac/esp32_dac.cpp
 create mode 100644 esphome/components/esp32_dac/esp32_dac.h
 create mode 100644 esphome/components/esp32_dac/output.py

diff --git a/esphome/components/esp32_dac/__init__.py b/esphome/components/esp32_dac/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/esp32_dac/esp32_dac.cpp b/esphome/components/esp32_dac/esp32_dac.cpp
new file mode 100644
index 0000000000..cd0696b1ad
--- /dev/null
+++ b/esphome/components/esp32_dac/esp32_dac.cpp
@@ -0,0 +1,37 @@
+#include "esp32_dac.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+#include <esp32-hal-dac.h>
+
+namespace esphome {
+namespace esp32_dac {
+
+static const char *TAG = "esp32_dac";
+
+void ESP32DAC::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up ESP32 DAC Output...");
+  this->pin_->setup();
+  this->turn_off();
+}
+
+void ESP32DAC::dump_config() {
+  ESP_LOGCONFIG(TAG, "ESP32 DAC:");
+  LOG_PIN("  Pin: ", this->pin_);
+  LOG_FLOAT_OUTPUT(this);
+}
+
+void ESP32DAC::write_state(float state) {
+  if (this->pin_->is_inverted())
+    state = 1.0f - state;
+
+  state = state * 255;
+  dacWrite(this->pin_->get_pin(), state);
+}
+
+}  // namespace esp32_dac
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/esp32_dac/esp32_dac.h b/esphome/components/esp32_dac/esp32_dac.h
new file mode 100644
index 0000000000..648efcfe4f
--- /dev/null
+++ b/esphome/components/esp32_dac/esp32_dac.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/output/float_output.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace esp32_dac {
+
+class ESP32DAC : public output::FloatOutput, public Component {
+ public:
+  void set_pin(GPIOPin *pin) { pin_ = pin; }
+
+  /// Initialize pin
+  void setup() override;
+  void dump_config() override;
+  /// HARDWARE setup_priority
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+
+ protected:
+  void write_state(float state) override;
+
+  GPIOPin *pin_;
+};
+
+}  // namespace esp32_dac
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/esp32_dac/output.py b/esphome/components/esp32_dac/output.py
new file mode 100644
index 0000000000..bb0a8b60e9
--- /dev/null
+++ b/esphome/components/esp32_dac/output.py
@@ -0,0 +1,31 @@
+from esphome import pins
+from esphome.components import output
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_ID, CONF_NUMBER, CONF_PIN, ESP_PLATFORM_ESP32
+
+ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
+
+
+def valid_dac_pin(value):
+    num = value[CONF_NUMBER]
+    cv.one_of(25, 26)(num)
+    return value
+
+
+esp32_dac_ns = cg.esphome_ns.namespace('esp32_dac')
+ESP32DAC = esp32_dac_ns.class_('ESP32DAC', output.FloatOutput, cg.Component)
+
+CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend({
+    cv.Required(CONF_ID): cv.declare_id(ESP32DAC),
+    cv.Required(CONF_PIN): cv.All(pins.internal_gpio_output_pin_schema, valid_dac_pin),
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield output.register_output(var, config)
+
+    pin = yield cg.gpio_pin_expression(config[CONF_PIN])
+    cg.add(var.set_pin(pin))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 31da80ac36..6e63e8de31 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1030,6 +1030,9 @@ output:
     id: dimmer1
     gate_pin: GPIO5
     zero_cross_pin: GPIO26
+  - platform: esp32_dac
+    pin: GPIO25
+    id: dac_output
 
 light:
   - platform: binary
@@ -1358,6 +1361,12 @@ switch:
     - output.set_level:
         id: gpio_19
         level: !lambda 'return 0.5;'
+    - output.set_level:
+        id: dac_output
+        level: 50%
+    - output.set_level:
+        id: dac_output
+        level: !lambda 'return 0.5;'
     turn_off_action:
     - switch.turn_on: living_room_lights_off
     restore_state: False

From fb2b7ade41dc3f5fae8a68e034b6506bf5902b0b Mon Sep 17 00:00:00 2001
From: 0hax <43876620+0hax@users.noreply.github.com>
Date: Sun, 24 May 2020 23:59:07 +0200
Subject: [PATCH 215/412] Uart improvments (#1024)

* uart: Add support for specifying the number of bits and parity.

ESP8266SwSerial doesn't really check parity but just read the parity bit
and ignore it when receiving data.

Signed-off-by: 0hax <0hax@protonmail.com>

* uart: support begin and end methods.

A component may need to reset uart buffer/status by using begin() and
end() methods. This is useful for example when a component needs to be
sure it is not reading garbage from previously received data over uart.
For end() methods with software serial, disabling interrupt is
currently impossible because of a bug in esp8266 Core:
https://github.com/esp8266/Arduino/issues/6049

Signed-off-by: 0hax <0hax@protonmail.com>

* esphal: add support for detaching an interrupt.

That's needed when a component needs to enable/disable interrupt on a
gpio.

Signed-off-by: 0hax <0hax@protonmail.com>

* uart: rename CONF_NR_BITS to CONF_DATA_BITS_NUMBER.

Signed-off-by: 0hax <0hax@protonmail.com>

* uart: use static const uint32_t instead of #define.

Signed-off-by: 0hax <0hax@protonmail.com>

* uart: use an enum to handle parity.

Signed-off-by: 0hax <0hax@protonmail.com>

* uart: split between esp32 and esp8266.

Signed-off-by: 0hax <0hax@protonmail.com>

* uart: check_uart_settings for parity and number of data bits.

Signed-off-by: 0hax <0hax@protonmail.com>

* name param data_bits

* add new params to test

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/uart/__init__.py      |  14 +
 esphome/components/uart/uart.cpp         | 362 ++---------------------
 esphome/components/uart/uart.h           |  31 +-
 esphome/components/uart/uart_esp32.cpp   | 162 ++++++++++
 esphome/components/uart/uart_esp8266.cpp | 330 +++++++++++++++++++++
 esphome/core/esphal.cpp                  |  10 +
 esphome/core/esphal.h                    |   3 +-
 tests/test1.yaml                         |   3 +
 8 files changed, 572 insertions(+), 343 deletions(-)
 create mode 100644 esphome/components/uart/uart_esp32.cpp
 create mode 100644 esphome/components/uart/uart_esp8266.cpp

diff --git a/esphome/components/uart/__init__.py b/esphome/components/uart/__init__.py
index 4312bd5d10..06208dc621 100644
--- a/esphome/components/uart/__init__.py
+++ b/esphome/components/uart/__init__.py
@@ -28,13 +28,25 @@ def validate_rx_pin(value):
     return value
 
 
+UARTParityOptions = uart_ns.enum('UARTParityOptions')
+UART_PARITY_OPTIONS = {
+    'NONE': UARTParityOptions.UART_CONFIG_PARITY_NONE,
+    'EVEN': UARTParityOptions.UART_CONFIG_PARITY_EVEN,
+    'ODD': UARTParityOptions.UART_CONFIG_PARITY_ODD,
+}
+
 CONF_STOP_BITS = 'stop_bits'
+CONF_DATA_BITS = 'data_bits'
+CONF_PARITY = 'parity'
+
 CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.GenerateID(): cv.declare_id(UARTComponent),
     cv.Required(CONF_BAUD_RATE): cv.int_range(min=1),
     cv.Optional(CONF_TX_PIN): pins.output_pin,
     cv.Optional(CONF_RX_PIN): validate_rx_pin,
     cv.Optional(CONF_STOP_BITS, default=1): cv.one_of(1, 2, int=True),
+    cv.Optional(CONF_DATA_BITS, default=8): cv.int_range(min=5, max=8),
+    cv.Optional(CONF_PARITY, default="NONE"): cv.enum(UART_PARITY_OPTIONS, upper=True)
 }).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(CONF_TX_PIN, CONF_RX_PIN))
 
 
@@ -50,6 +62,8 @@ def to_code(config):
     if CONF_RX_PIN in config:
         cg.add(var.set_rx_pin(config[CONF_RX_PIN]))
     cg.add(var.set_stop_bits(config[CONF_STOP_BITS]))
+    cg.add(var.set_data_bits(config[CONF_DATA_BITS]))
+    cg.add(var.set_parity(config[CONF_PARITY]))
 
 
 # A schema to use for all UART devices, all UART integrations must extend this!
diff --git a/esphome/components/uart/uart.cpp b/esphome/components/uart/uart.cpp
index 08fc0a326e..cf2d00c929 100644
--- a/esphome/components/uart/uart.cpp
+++ b/esphome/components/uart/uart.cpp
@@ -13,345 +13,6 @@ namespace uart {
 
 static const char *TAG = "uart";
 
-#ifdef ARDUINO_ARCH_ESP32
-uint8_t next_uart_num = 1;
-#endif
-
-#ifdef ARDUINO_ARCH_ESP32
-void UARTComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up UART...");
-  // Use Arduino HardwareSerial UARTs if all used pins match the ones
-  // preconfigured by the platform. For example if RX disabled but TX pin
-  // is 1 we still want to use Serial.
-  if (this->tx_pin_.value_or(1) == 1 && this->rx_pin_.value_or(3) == 3) {
-    this->hw_serial_ = &Serial;
-  } else {
-    this->hw_serial_ = new HardwareSerial(next_uart_num++);
-  }
-  int8_t tx = this->tx_pin_.has_value() ? *this->tx_pin_ : -1;
-  int8_t rx = this->rx_pin_.has_value() ? *this->rx_pin_ : -1;
-  uint32_t config = SERIAL_8N1;
-  if (this->stop_bits_ == 2)
-    config = SERIAL_8N2;
-  this->hw_serial_->begin(this->baud_rate_, config, rx, tx);
-}
-
-void UARTComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "UART Bus:");
-  if (this->tx_pin_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  TX Pin: GPIO%d", *this->tx_pin_);
-  }
-  if (this->rx_pin_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  RX Pin: GPIO%d", *this->rx_pin_);
-  }
-  ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
-  ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
-  this->check_logger_conflict_();
-}
-
-void UARTComponent::write_byte(uint8_t data) {
-  this->hw_serial_->write(data);
-  ESP_LOGVV(TAG, "    Wrote 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data), data);
-}
-void UARTComponent::write_array(const uint8_t *data, size_t len) {
-  this->hw_serial_->write(data, len);
-  for (size_t i = 0; i < len; i++) {
-    ESP_LOGVV(TAG, "    Wrote 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data[i]), data[i]);
-  }
-}
-void UARTComponent::write_str(const char *str) {
-  this->hw_serial_->write(str);
-  ESP_LOGVV(TAG, "    Wrote \"%s\"", str);
-}
-bool UARTComponent::read_byte(uint8_t *data) {
-  if (!this->check_read_timeout_())
-    return false;
-  *data = this->hw_serial_->read();
-  ESP_LOGVV(TAG, "    Read 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(*data), *data);
-  return true;
-}
-bool UARTComponent::peek_byte(uint8_t *data) {
-  if (!this->check_read_timeout_())
-    return false;
-  *data = this->hw_serial_->peek();
-  return true;
-}
-bool UARTComponent::read_array(uint8_t *data, size_t len) {
-  if (!this->check_read_timeout_(len))
-    return false;
-  this->hw_serial_->readBytes(data, len);
-  for (size_t i = 0; i < len; i++) {
-    ESP_LOGVV(TAG, "    Read 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data[i]), data[i]);
-  }
-
-  return true;
-}
-bool UARTComponent::check_read_timeout_(size_t len) {
-  if (this->available() >= len)
-    return true;
-
-  uint32_t start_time = millis();
-  while (this->available() < len) {
-    if (millis() - start_time > 1000) {
-      ESP_LOGE(TAG, "Reading from UART timed out at byte %u!", this->available());
-      return false;
-    }
-    yield();
-  }
-  return true;
-}
-int UARTComponent::available() { return this->hw_serial_->available(); }
-void UARTComponent::flush() {
-  ESP_LOGVV(TAG, "    Flushing...");
-  this->hw_serial_->flush();
-}
-#endif  // ESP32
-
-#ifdef ARDUINO_ARCH_ESP8266
-void UARTComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up UART bus...");
-  // Use Arduino HardwareSerial UARTs if all used pins match the ones
-  // preconfigured by the platform. For example if RX disabled but TX pin
-  // is 1 we still want to use Serial.
-  uint32_t mode = UART_NB_BIT_8 | UART_PARITY_NONE;
-  if (this->stop_bits_ == 1)
-    mode |= UART_NB_STOP_BIT_1;
-  else
-    mode |= UART_NB_STOP_BIT_2;
-  SerialConfig config = static_cast<SerialConfig>(mode);
-  if (this->tx_pin_.value_or(1) == 1 && this->rx_pin_.value_or(3) == 3) {
-    this->hw_serial_ = &Serial;
-    this->hw_serial_->begin(this->baud_rate_, config);
-  } else if (this->tx_pin_.value_or(15) == 15 && this->rx_pin_.value_or(13) == 13) {
-    this->hw_serial_ = &Serial;
-    this->hw_serial_->begin(this->baud_rate_, config);
-    this->hw_serial_->swap();
-  } else if (this->tx_pin_.value_or(2) == 2 && this->rx_pin_.value_or(8) == 8) {
-    this->hw_serial_ = &Serial1;
-    this->hw_serial_->begin(this->baud_rate_, config);
-  } else {
-    this->sw_serial_ = new ESP8266SoftwareSerial();
-    int8_t tx = this->tx_pin_.has_value() ? *this->tx_pin_ : -1;
-    int8_t rx = this->rx_pin_.has_value() ? *this->rx_pin_ : -1;
-    this->sw_serial_->setup(tx, rx, this->baud_rate_, this->stop_bits_);
-  }
-}
-
-void UARTComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "UART Bus:");
-  if (this->tx_pin_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  TX Pin: GPIO%d", *this->tx_pin_);
-  }
-  if (this->rx_pin_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  RX Pin: GPIO%d", *this->rx_pin_);
-  }
-  ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
-  ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
-  if (this->hw_serial_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Using hardware serial interface.");
-  } else {
-    ESP_LOGCONFIG(TAG, "  Using software serial");
-  }
-  this->check_logger_conflict_();
-}
-
-void UARTComponent::write_byte(uint8_t data) {
-  if (this->hw_serial_ != nullptr) {
-    this->hw_serial_->write(data);
-  } else {
-    this->sw_serial_->write_byte(data);
-  }
-  ESP_LOGVV(TAG, "    Wrote 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data), data);
-}
-void UARTComponent::write_array(const uint8_t *data, size_t len) {
-  if (this->hw_serial_ != nullptr) {
-    this->hw_serial_->write(data, len);
-  } else {
-    for (size_t i = 0; i < len; i++)
-      this->sw_serial_->write_byte(data[i]);
-  }
-  for (size_t i = 0; i < len; i++) {
-    ESP_LOGVV(TAG, "    Wrote 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data[i]), data[i]);
-  }
-}
-void UARTComponent::write_str(const char *str) {
-  if (this->hw_serial_ != nullptr) {
-    this->hw_serial_->write(str);
-  } else {
-    const auto *data = reinterpret_cast<const uint8_t *>(str);
-    for (size_t i = 0; data[i] != 0; i++)
-      this->sw_serial_->write_byte(data[i]);
-  }
-  ESP_LOGVV(TAG, "    Wrote \"%s\"", str);
-}
-bool UARTComponent::read_byte(uint8_t *data) {
-  if (!this->check_read_timeout_())
-    return false;
-  if (this->hw_serial_ != nullptr) {
-    *data = this->hw_serial_->read();
-  } else {
-    *data = this->sw_serial_->read_byte();
-  }
-  ESP_LOGVV(TAG, "    Read 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(*data), *data);
-  return true;
-}
-bool UARTComponent::peek_byte(uint8_t *data) {
-  if (!this->check_read_timeout_())
-    return false;
-  if (this->hw_serial_ != nullptr) {
-    *data = this->hw_serial_->peek();
-  } else {
-    *data = this->sw_serial_->peek_byte();
-  }
-  return true;
-}
-bool UARTComponent::read_array(uint8_t *data, size_t len) {
-  if (!this->check_read_timeout_(len))
-    return false;
-  if (this->hw_serial_ != nullptr) {
-    this->hw_serial_->readBytes(data, len);
-  } else {
-    for (size_t i = 0; i < len; i++)
-      data[i] = this->sw_serial_->read_byte();
-  }
-  for (size_t i = 0; i < len; i++) {
-    ESP_LOGVV(TAG, "    Read 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data[i]), data[i]);
-  }
-
-  return true;
-}
-bool UARTComponent::check_read_timeout_(size_t len) {
-  if (this->available() >= int(len))
-    return true;
-
-  uint32_t start_time = millis();
-  while (this->available() < int(len)) {
-    if (millis() - start_time > 100) {
-      ESP_LOGE(TAG, "Reading from UART timed out at byte %u!", this->available());
-      return false;
-    }
-    yield();
-  }
-  return true;
-}
-int UARTComponent::available() {
-  if (this->hw_serial_ != nullptr) {
-    return this->hw_serial_->available();
-  } else {
-    return this->sw_serial_->available();
-  }
-}
-void UARTComponent::flush() {
-  ESP_LOGVV(TAG, "    Flushing...");
-  if (this->hw_serial_ != nullptr) {
-    this->hw_serial_->flush();
-  } else {
-    this->sw_serial_->flush();
-  }
-}
-
-void ESP8266SoftwareSerial::setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits) {
-  this->bit_time_ = F_CPU / baud_rate;
-  if (tx_pin != -1) {
-    auto pin = GPIOPin(tx_pin, OUTPUT);
-    pin.setup();
-    this->tx_pin_ = pin.to_isr();
-    this->tx_pin_->digital_write(true);
-  }
-  if (rx_pin != -1) {
-    auto pin = GPIOPin(rx_pin, INPUT);
-    pin.setup();
-    this->rx_pin_ = pin.to_isr();
-    this->rx_buffer_ = new uint8_t[this->rx_buffer_size_];
-    pin.attach_interrupt(ESP8266SoftwareSerial::gpio_intr, this, FALLING);
-  }
-  this->stop_bits_ = stop_bits;
-}
-void ICACHE_RAM_ATTR ESP8266SoftwareSerial::gpio_intr(ESP8266SoftwareSerial *arg) {
-  uint32_t wait = arg->bit_time_ + arg->bit_time_ / 3 - 500;
-  const uint32_t start = ESP.getCycleCount();
-  uint8_t rec = 0;
-  // Manually unroll the loop
-  rec |= arg->read_bit_(&wait, start) << 0;
-  rec |= arg->read_bit_(&wait, start) << 1;
-  rec |= arg->read_bit_(&wait, start) << 2;
-  rec |= arg->read_bit_(&wait, start) << 3;
-  rec |= arg->read_bit_(&wait, start) << 4;
-  rec |= arg->read_bit_(&wait, start) << 5;
-  rec |= arg->read_bit_(&wait, start) << 6;
-  rec |= arg->read_bit_(&wait, start) << 7;
-  // Stop bit
-  arg->wait_(&wait, start);
-  if (arg->stop_bits_ == 2)
-    arg->wait_(&wait, start);
-
-  arg->rx_buffer_[arg->rx_in_pos_] = rec;
-  arg->rx_in_pos_ = (arg->rx_in_pos_ + 1) % arg->rx_buffer_size_;
-  // Clear RX pin so that the interrupt doesn't re-trigger right away again.
-  arg->rx_pin_->clear_interrupt();
-}
-void ICACHE_RAM_ATTR HOT ESP8266SoftwareSerial::write_byte(uint8_t data) {
-  if (this->tx_pin_ == nullptr) {
-    ESP_LOGE(TAG, "UART doesn't have TX pins set!");
-    return;
-  }
-
-  {
-    InterruptLock lock;
-    uint32_t wait = this->bit_time_;
-    const uint32_t start = ESP.getCycleCount();
-    // Start bit
-    this->write_bit_(false, &wait, start);
-    this->write_bit_(data & (1 << 0), &wait, start);
-    this->write_bit_(data & (1 << 1), &wait, start);
-    this->write_bit_(data & (1 << 2), &wait, start);
-    this->write_bit_(data & (1 << 3), &wait, start);
-    this->write_bit_(data & (1 << 4), &wait, start);
-    this->write_bit_(data & (1 << 5), &wait, start);
-    this->write_bit_(data & (1 << 6), &wait, start);
-    this->write_bit_(data & (1 << 7), &wait, start);
-    // Stop bit
-    this->write_bit_(true, &wait, start);
-    if (this->stop_bits_ == 2)
-      this->wait_(&wait, start);
-  }
-}
-void ICACHE_RAM_ATTR ESP8266SoftwareSerial::wait_(uint32_t *wait, const uint32_t &start) {
-  while (ESP.getCycleCount() - start < *wait)
-    ;
-  *wait += this->bit_time_;
-}
-bool ICACHE_RAM_ATTR ESP8266SoftwareSerial::read_bit_(uint32_t *wait, const uint32_t &start) {
-  this->wait_(wait, start);
-  return this->rx_pin_->digital_read();
-}
-void ICACHE_RAM_ATTR ESP8266SoftwareSerial::write_bit_(bool bit, uint32_t *wait, const uint32_t &start) {
-  this->tx_pin_->digital_write(bit);
-  this->wait_(wait, start);
-}
-uint8_t ESP8266SoftwareSerial::read_byte() {
-  if (this->rx_in_pos_ == this->rx_out_pos_)
-    return 0;
-  uint8_t data = this->rx_buffer_[this->rx_out_pos_];
-  this->rx_out_pos_ = (this->rx_out_pos_ + 1) % this->rx_buffer_size_;
-  return data;
-}
-uint8_t ESP8266SoftwareSerial::peek_byte() {
-  if (this->rx_in_pos_ == this->rx_out_pos_)
-    return 0;
-  return this->rx_buffer_[this->rx_out_pos_];
-}
-void ESP8266SoftwareSerial::flush() {
-  // Flush is a NO-OP with software serial, all bytes are written immediately.
-}
-int ESP8266SoftwareSerial::available() {
-  int avail = int(this->rx_in_pos_) - int(this->rx_out_pos_);
-  if (avail < 0)
-    return avail + this->rx_buffer_size_;
-  return avail;
-}
-#endif  // ESP8266
-
 size_t UARTComponent::write(uint8_t data) {
   this->write_byte(data);
   return 1;
@@ -382,7 +43,7 @@ void UARTComponent::check_logger_conflict_() {
 #endif
 }
 
-void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits) {
+void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits, UARTParityOptions parity, uint8_t nr_bits) {
   if (this->parent_->baud_rate_ != baud_rate) {
     ESP_LOGE(TAG, "  Invalid baud_rate: Integration requested baud_rate %u but you have %u!", baud_rate,
              this->parent_->baud_rate_);
@@ -391,6 +52,27 @@ void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits) {
     ESP_LOGE(TAG, "  Invalid stop bits: Integration requested stop_bits %u but you have %u!", stop_bits,
              this->parent_->stop_bits_);
   }
+  if (this->parent_->nr_bits_ != nr_bits) {
+    ESP_LOGE(TAG, "  Invalid number of data bits: Integration requested %u data bits but you have %u!", nr_bits,
+             this->parent_->nr_bits_);
+  }
+  if (this->parent_->parity_ != parity) {
+    ESP_LOGE(TAG, "  Invalid parity: Integration requested parity %s but you have %s!", parity_to_str(parity),
+             parity_to_str(this->parent_->parity_));
+  }
+}
+
+const char *parity_to_str(UARTParityOptions parity) {
+  switch (parity) {
+    case UART_CONFIG_PARITY_NONE:
+      return "NONE";
+    case UART_CONFIG_PARITY_EVEN:
+      return "EVEN";
+    case UART_CONFIG_PARITY_ODD:
+      return "ODD";
+    default:
+      return "UNKNOWN";
+  }
 }
 
 }  // namespace uart
diff --git a/esphome/components/uart/uart.h b/esphome/components/uart/uart.h
index 76e7496b80..5528da1d5f 100644
--- a/esphome/components/uart/uart.h
+++ b/esphome/components/uart/uart.h
@@ -7,10 +7,19 @@
 namespace esphome {
 namespace uart {
 
+enum UARTParityOptions {
+  UART_CONFIG_PARITY_NONE,
+  UART_CONFIG_PARITY_EVEN,
+  UART_CONFIG_PARITY_ODD,
+};
+
+const char *parity_to_str(UARTParityOptions parity);
+
 #ifdef ARDUINO_ARCH_ESP8266
 class ESP8266SoftwareSerial {
  public:
-  void setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits);
+  void setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits, uint32_t nr_bits,
+             UARTParityOptions parity);
 
   uint8_t read_byte();
   uint8_t peek_byte();
@@ -21,6 +30,11 @@ class ESP8266SoftwareSerial {
 
   int available();
 
+  void begin();
+  void end();
+  GPIOPin *gpio_tx_pin_{nullptr};
+  GPIOPin *gpio_rx_pin_{nullptr};
+
  protected:
   static void gpio_intr(ESP8266SoftwareSerial *arg);
 
@@ -34,6 +48,8 @@ class ESP8266SoftwareSerial {
   volatile size_t rx_in_pos_{0};
   size_t rx_out_pos_{0};
   uint8_t stop_bits_;
+  uint8_t nr_bits_;
+  UARTParityOptions parity_;
   ISRInternalGPIOPin *tx_pin_{nullptr};
   ISRInternalGPIOPin *rx_pin_{nullptr};
 };
@@ -43,6 +59,8 @@ class UARTComponent : public Component, public Stream {
  public:
   void set_baud_rate(uint32_t baud_rate) { baud_rate_ = baud_rate; }
 
+  uint32_t get_config();
+
   void setup() override;
 
   void dump_config() override;
@@ -53,6 +71,8 @@ class UARTComponent : public Component, public Stream {
   void write_array(const std::vector<uint8_t> &data) { this->write_array(&data[0], data.size()); }
 
   void write_str(const char *str);
+  void end();
+  void begin();
 
   bool peek_byte(uint8_t *data);
 
@@ -74,6 +94,8 @@ class UARTComponent : public Component, public Stream {
   void set_tx_pin(uint8_t tx_pin) { this->tx_pin_ = tx_pin; }
   void set_rx_pin(uint8_t rx_pin) { this->rx_pin_ = rx_pin; }
   void set_stop_bits(uint8_t stop_bits) { this->stop_bits_ = stop_bits; }
+  void set_data_bits(uint8_t nr_bits) { this->nr_bits_ = nr_bits; }
+  void set_parity(UARTParityOptions parity) { this->parity_ = parity; }
 
  protected:
   void check_logger_conflict_();
@@ -88,6 +110,8 @@ class UARTComponent : public Component, public Stream {
   optional<uint8_t> rx_pin_;
   uint32_t baud_rate_;
   uint8_t stop_bits_;
+  uint8_t nr_bits_;
+  UARTParityOptions parity_;
 };
 
 #ifdef ARDUINO_ARCH_ESP32
@@ -130,9 +154,12 @@ class UARTDevice : public Stream {
   size_t write(uint8_t data) override { return this->parent_->write(data); }
   int read() override { return this->parent_->read(); }
   int peek() override { return this->parent_->peek(); }
+  void end() { this->parent_->end(); }
+  void begin() { this->parent_->begin(); }
 
   /// Check that the configuration of the UART bus matches the provided values and otherwise print a warning
-  void check_uart_settings(uint32_t baud_rate, uint8_t stop_bits = 1);
+  void check_uart_settings(uint32_t baud_rate, uint8_t stop_bits = 1,
+                           UARTParityOptions parity = UART_CONFIG_PARITY_NONE, uint8_t nr_bits = 8);
 
  protected:
   UARTComponent *parent_{nullptr};
diff --git a/esphome/components/uart/uart_esp32.cpp b/esphome/components/uart/uart_esp32.cpp
new file mode 100644
index 0000000000..cb6ac843d1
--- /dev/null
+++ b/esphome/components/uart/uart_esp32.cpp
@@ -0,0 +1,162 @@
+#ifdef ARDUINO_ARCH_ESP32
+#include "uart.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/application.h"
+#include "esphome/core/defines.h"
+
+namespace esphome {
+namespace uart {
+static const char *TAG = "uart_esp32";
+uint8_t next_uart_num = 1;
+
+static const uint32_t UART_PARITY_EVEN = 0 << 0;
+static const uint32_t UART_PARITY_ODD = 1 << 0;
+static const uint32_t UART_PARITY_EN = 1 << 1;
+static const uint32_t UART_NB_BIT_5 = 0 << 2;
+static const uint32_t UART_NB_BIT_6 = 1 << 2;
+static const uint32_t UART_NB_BIT_7 = 2 << 2;
+static const uint32_t UART_NB_BIT_8 = 3 << 2;
+static const uint32_t UART_NB_STOP_BIT_1 = 1 << 4;
+static const uint32_t UART_NB_STOP_BIT_2 = 3 << 4;
+static const uint32_t UART_TICK_APB_CLOCK = 1 << 27;
+
+uint32_t UARTComponent::get_config() {
+  uint32_t config = 0;
+
+  /*
+   * All bits numbers below come from
+   * framework-arduinoespressif32/cores/esp32/esp32-hal-uart.h
+   * And more specifically conf0 union in uart_dev_t.
+   *
+   * Below is bit used from conf0 union.
+   * <name>:<bits position>  <values>
+   * parity:0                0:even 1:odd
+   * parity_en:1             Set this bit to enable uart parity check.
+   * bit_num:2-4             0:5bits 1:6bits 2:7bits 3:8bits
+   * stop_bit_num:4-6        stop bit. 1:1bit  2:1.5bits  3:2bits
+   * tick_ref_always_on:27   select the clock.1：apb clock：ref_tick
+   */
+
+  if (this->parity_ == UART_CONFIG_PARITY_EVEN)
+    config |= UART_PARITY_EVEN | UART_PARITY_EN;
+  else if (this->parity_ == UART_CONFIG_PARITY_ODD)
+    config |= UART_PARITY_ODD | UART_PARITY_EN;
+
+  switch (this->nr_bits_) {
+    case 5:
+      config |= UART_NB_BIT_5;
+      break;
+    case 6:
+      config |= UART_NB_BIT_6;
+      break;
+    case 7:
+      config |= UART_NB_BIT_7;
+      break;
+    case 8:
+      config |= UART_NB_BIT_8;
+      break;
+  }
+
+  if (this->stop_bits_ == 1)
+    config |= UART_NB_STOP_BIT_1;
+  else
+    config |= UART_NB_STOP_BIT_2;
+
+  config |= UART_TICK_APB_CLOCK;
+
+  return config;
+}
+
+void UARTComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up UART...");
+  // Use Arduino HardwareSerial UARTs if all used pins match the ones
+  // preconfigured by the platform. For example if RX disabled but TX pin
+  // is 1 we still want to use Serial.
+  if (this->tx_pin_.value_or(1) == 1 && this->rx_pin_.value_or(3) == 3) {
+    this->hw_serial_ = &Serial;
+  } else {
+    this->hw_serial_ = new HardwareSerial(next_uart_num++);
+  }
+  int8_t tx = this->tx_pin_.has_value() ? *this->tx_pin_ : -1;
+  int8_t rx = this->rx_pin_.has_value() ? *this->rx_pin_ : -1;
+  this->hw_serial_->begin(this->baud_rate_, get_config(), rx, tx);
+}
+
+void UARTComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "UART Bus:");
+  if (this->tx_pin_.has_value()) {
+    ESP_LOGCONFIG(TAG, "  TX Pin: GPIO%d", *this->tx_pin_);
+  }
+  if (this->rx_pin_.has_value()) {
+    ESP_LOGCONFIG(TAG, "  RX Pin: GPIO%d", *this->rx_pin_);
+  }
+  ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
+  ESP_LOGCONFIG(TAG, "  Bits: %u", this->nr_bits_);
+  ESP_LOGCONFIG(TAG, "  Parity: %s", parity_to_str(this->parity_));
+  ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
+  this->check_logger_conflict_();
+}
+
+void UARTComponent::write_byte(uint8_t data) {
+  this->hw_serial_->write(data);
+  ESP_LOGVV(TAG, "    Wrote 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data), data);
+}
+void UARTComponent::write_array(const uint8_t *data, size_t len) {
+  this->hw_serial_->write(data, len);
+  for (size_t i = 0; i < len; i++) {
+    ESP_LOGVV(TAG, "    Wrote 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data[i]), data[i]);
+  }
+}
+void UARTComponent::write_str(const char *str) {
+  this->hw_serial_->write(str);
+  ESP_LOGVV(TAG, "    Wrote \"%s\"", str);
+}
+void UARTComponent::end() { this->hw_serial_->end(); }
+void UARTComponent::begin() { this->hw_serial_->begin(this->baud_rate_, get_config()); }
+bool UARTComponent::read_byte(uint8_t *data) {
+  if (!this->check_read_timeout_())
+    return false;
+  *data = this->hw_serial_->read();
+  ESP_LOGVV(TAG, "    Read 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(*data), *data);
+  return true;
+}
+bool UARTComponent::peek_byte(uint8_t *data) {
+  if (!this->check_read_timeout_())
+    return false;
+  *data = this->hw_serial_->peek();
+  return true;
+}
+bool UARTComponent::read_array(uint8_t *data, size_t len) {
+  if (!this->check_read_timeout_(len))
+    return false;
+  this->hw_serial_->readBytes(data, len);
+  for (size_t i = 0; i < len; i++) {
+    ESP_LOGVV(TAG, "    Read 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data[i]), data[i]);
+  }
+
+  return true;
+}
+bool UARTComponent::check_read_timeout_(size_t len) {
+  if (this->available() >= len)
+    return true;
+
+  uint32_t start_time = millis();
+  while (this->available() < len) {
+    if (millis() - start_time > 1000) {
+      ESP_LOGE(TAG, "Reading from UART timed out at byte %u!", this->available());
+      return false;
+    }
+    yield();
+  }
+  return true;
+}
+int UARTComponent::available() { return this->hw_serial_->available(); }
+void UARTComponent::flush() {
+  ESP_LOGVV(TAG, "    Flushing...");
+  this->hw_serial_->flush();
+}
+
+}  // namespace uart
+}  // namespace esphome
+#endif  // ESP32
diff --git a/esphome/components/uart/uart_esp8266.cpp b/esphome/components/uart/uart_esp8266.cpp
new file mode 100644
index 0000000000..59a08677b5
--- /dev/null
+++ b/esphome/components/uart/uart_esp8266.cpp
@@ -0,0 +1,330 @@
+#ifdef ARDUINO_ARCH_ESP8266
+#include "uart.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/application.h"
+#include "esphome/core/defines.h"
+#
+namespace esphome {
+namespace uart {
+
+static const char *TAG = "uart_esp8266";
+uint32_t UARTComponent::get_config() {
+  uint32_t config = 0;
+
+  if (this->parity_ == UART_CONFIG_PARITY_NONE)
+    config |= UART_PARITY_NONE;
+  else if (this->parity_ == UART_CONFIG_PARITY_EVEN)
+    config |= UART_PARITY_EVEN;
+  else if (this->parity_ == UART_CONFIG_PARITY_ODD)
+    config |= UART_PARITY_ODD;
+
+  switch (this->nr_bits_) {
+    case 5:
+      config |= UART_NB_BIT_5;
+      break;
+    case 6:
+      config |= UART_NB_BIT_6;
+      break;
+    case 7:
+      config |= UART_NB_BIT_7;
+      break;
+    case 8:
+      config |= UART_NB_BIT_8;
+      break;
+  }
+
+  if (this->stop_bits_ == 1)
+    config |= UART_NB_STOP_BIT_1;
+  else
+    config |= UART_NB_STOP_BIT_2;
+
+  return config;
+}
+
+void UARTComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up UART bus...");
+  // Use Arduino HardwareSerial UARTs if all used pins match the ones
+  // preconfigured by the platform. For example if RX disabled but TX pin
+  // is 1 we still want to use Serial.
+  SerialConfig config = static_cast<SerialConfig>(get_config());
+
+  if (this->tx_pin_.value_or(1) == 1 && this->rx_pin_.value_or(3) == 3) {
+    this->hw_serial_ = &Serial;
+    this->hw_serial_->begin(this->baud_rate_, config);
+  } else if (this->tx_pin_.value_or(15) == 15 && this->rx_pin_.value_or(13) == 13) {
+    this->hw_serial_ = &Serial;
+    this->hw_serial_->begin(this->baud_rate_, config);
+    this->hw_serial_->swap();
+  } else if (this->tx_pin_.value_or(2) == 2 && this->rx_pin_.value_or(8) == 8) {
+    this->hw_serial_ = &Serial1;
+    this->hw_serial_->begin(this->baud_rate_, config);
+  } else {
+    this->sw_serial_ = new ESP8266SoftwareSerial();
+    int8_t tx = this->tx_pin_.has_value() ? *this->tx_pin_ : -1;
+    int8_t rx = this->rx_pin_.has_value() ? *this->rx_pin_ : -1;
+    this->sw_serial_->setup(tx, rx, this->baud_rate_, this->stop_bits_, this->nr_bits_, this->parity_);
+  }
+}
+
+void UARTComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "UART Bus:");
+  if (this->tx_pin_.has_value()) {
+    ESP_LOGCONFIG(TAG, "  TX Pin: GPIO%d", *this->tx_pin_);
+  }
+  if (this->rx_pin_.has_value()) {
+    ESP_LOGCONFIG(TAG, "  RX Pin: GPIO%d", *this->rx_pin_);
+  }
+  ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
+  ESP_LOGCONFIG(TAG, "  Bits: %u", this->nr_bits_);
+  ESP_LOGCONFIG(TAG, "  Parity: %s", parity_to_str(this->parity_));
+  ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
+  if (this->hw_serial_ != nullptr) {
+    ESP_LOGCONFIG(TAG, "  Using hardware serial interface.");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Using software serial");
+  }
+  this->check_logger_conflict_();
+}
+
+void UARTComponent::write_byte(uint8_t data) {
+  if (this->hw_serial_ != nullptr) {
+    this->hw_serial_->write(data);
+  } else {
+    this->sw_serial_->write_byte(data);
+  }
+  ESP_LOGVV(TAG, "    Wrote 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data), data);
+}
+void UARTComponent::write_array(const uint8_t *data, size_t len) {
+  if (this->hw_serial_ != nullptr) {
+    this->hw_serial_->write(data, len);
+  } else {
+    for (size_t i = 0; i < len; i++)
+      this->sw_serial_->write_byte(data[i]);
+  }
+  for (size_t i = 0; i < len; i++) {
+    ESP_LOGVV(TAG, "    Wrote 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data[i]), data[i]);
+  }
+}
+void UARTComponent::write_str(const char *str) {
+  if (this->hw_serial_ != nullptr) {
+    this->hw_serial_->write(str);
+  } else {
+    const auto *data = reinterpret_cast<const uint8_t *>(str);
+    for (size_t i = 0; data[i] != 0; i++)
+      this->sw_serial_->write_byte(data[i]);
+  }
+  ESP_LOGVV(TAG, "    Wrote \"%s\"", str);
+}
+void UARTComponent::end() {
+  if (this->hw_serial_ != nullptr)
+    this->hw_serial_->end();
+  else if (this->sw_serial_ != nullptr)
+    this->sw_serial_->end();
+}
+void UARTComponent::begin() {
+  if (this->hw_serial_ != nullptr)
+    this->hw_serial_->begin(this->baud_rate_, static_cast<SerialConfig>(get_config()));
+  else if (this->sw_serial_ != nullptr)
+    this->sw_serial_->begin();
+}
+bool UARTComponent::read_byte(uint8_t *data) {
+  if (!this->check_read_timeout_())
+    return false;
+  if (this->hw_serial_ != nullptr) {
+    *data = this->hw_serial_->read();
+  } else {
+    *data = this->sw_serial_->read_byte();
+  }
+  ESP_LOGVV(TAG, "    Read 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(*data), *data);
+  return true;
+}
+bool UARTComponent::peek_byte(uint8_t *data) {
+  if (!this->check_read_timeout_())
+    return false;
+  if (this->hw_serial_ != nullptr) {
+    *data = this->hw_serial_->peek();
+  } else {
+    *data = this->sw_serial_->peek_byte();
+  }
+  return true;
+}
+bool UARTComponent::read_array(uint8_t *data, size_t len) {
+  if (!this->check_read_timeout_(len))
+    return false;
+  if (this->hw_serial_ != nullptr) {
+    this->hw_serial_->readBytes(data, len);
+  } else {
+    for (size_t i = 0; i < len; i++)
+      data[i] = this->sw_serial_->read_byte();
+  }
+  for (size_t i = 0; i < len; i++) {
+    ESP_LOGVV(TAG, "    Read 0b" BYTE_TO_BINARY_PATTERN " (0x%02X)", BYTE_TO_BINARY(data[i]), data[i]);
+  }
+
+  return true;
+}
+bool UARTComponent::check_read_timeout_(size_t len) {
+  if (this->available() >= int(len))
+    return true;
+
+  uint32_t start_time = millis();
+  while (this->available() < int(len)) {
+    if (millis() - start_time > 100) {
+      ESP_LOGE(TAG, "Reading from UART timed out at byte %u!", this->available());
+      return false;
+    }
+    yield();
+  }
+  return true;
+}
+int UARTComponent::available() {
+  if (this->hw_serial_ != nullptr) {
+    return this->hw_serial_->available();
+  } else {
+    return this->sw_serial_->available();
+  }
+}
+void UARTComponent::flush() {
+  ESP_LOGVV(TAG, "    Flushing...");
+  if (this->hw_serial_ != nullptr) {
+    this->hw_serial_->flush();
+  } else {
+    this->sw_serial_->flush();
+  }
+}
+void ESP8266SoftwareSerial::end() {
+  /* Because of this bug: https://github.com/esp8266/Arduino/issues/6049
+   * detach_interrupt can't called.
+   * So simply reset rx_in_pos and rx_out_pos even if it's totally racy with
+   * the interrupt.
+   */
+  // this->gpio_rx_pin_->detach_interrupt();
+  this->rx_in_pos_ = 0;
+  this->rx_out_pos_ = 0;
+}
+void ESP8266SoftwareSerial::begin() {
+  /* attach_interrupt() is also not safe because gpio_intr() may
+   * endup with arg == nullptr.
+   */
+  // this->gpio_rx_pin_->attach_interrupt(ESP8266SoftwareSerial::gpio_intr, this, FALLING);
+}
+void ESP8266SoftwareSerial::setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits, uint32_t nr_bits,
+                                  UARTParityOptions parity) {
+  this->bit_time_ = F_CPU / baud_rate;
+  this->stop_bits_ = stop_bits;
+  this->nr_bits_ = nr_bits;
+  this->parity_ = parity;
+  if (tx_pin != -1) {
+    auto pin = GPIOPin(tx_pin, OUTPUT);
+    this->gpio_tx_pin_ = &pin;
+    pin.setup();
+    this->tx_pin_ = pin.to_isr();
+    this->tx_pin_->digital_write(true);
+  }
+  if (rx_pin != -1) {
+    auto pin = GPIOPin(rx_pin, INPUT);
+    pin.setup();
+    this->gpio_rx_pin_ = &pin;
+    this->rx_pin_ = pin.to_isr();
+    this->rx_buffer_ = new uint8_t[this->rx_buffer_size_];
+    pin.attach_interrupt(ESP8266SoftwareSerial::gpio_intr, this, FALLING);
+  }
+}
+void ICACHE_RAM_ATTR ESP8266SoftwareSerial::gpio_intr(ESP8266SoftwareSerial *arg) {
+  uint32_t wait = arg->bit_time_ + arg->bit_time_ / 3 - 500;
+  const uint32_t start = ESP.getCycleCount();
+  uint8_t rec = 0;
+  // Manually unroll the loop
+  for (int i = 0; i < arg->nr_bits_; i++)
+    rec |= arg->read_bit_(&wait, start) << i;
+
+  /* If parity is enabled, just read it and ignore it. */
+  /* TODO: Should we check parity? Or is it too slow for nothing added..*/
+  if (arg->parity_ == UART_CONFIG_PARITY_EVEN)
+    arg->read_bit_(&wait, start);
+  else if (arg->parity_ == UART_CONFIG_PARITY_ODD)
+    arg->read_bit_(&wait, start);
+
+  // Stop bit
+  arg->wait_(&wait, start);
+  if (arg->stop_bits_ == 2)
+    arg->wait_(&wait, start);
+
+  arg->rx_buffer_[arg->rx_in_pos_] = rec;
+  arg->rx_in_pos_ = (arg->rx_in_pos_ + 1) % arg->rx_buffer_size_;
+  // Clear RX pin so that the interrupt doesn't re-trigger right away again.
+  arg->rx_pin_->clear_interrupt();
+}
+void ICACHE_RAM_ATTR HOT ESP8266SoftwareSerial::write_byte(uint8_t data) {
+  if (this->tx_pin_ == nullptr) {
+    ESP_LOGE(TAG, "UART doesn't have TX pins set!");
+    return;
+  }
+  bool parity_bit = false;
+  bool need_parity_bit = true;
+  if (this->parity_ == UART_CONFIG_PARITY_EVEN)
+    parity_bit = true;
+  else if (this->parity_ == UART_CONFIG_PARITY_ODD)
+    parity_bit = false;
+  else
+    need_parity_bit = false;
+
+  {
+    InterruptLock lock;
+    uint32_t wait = this->bit_time_;
+    const uint32_t start = ESP.getCycleCount();
+    // Start bit
+    this->write_bit_(false, &wait, start);
+    for (int i = 0; i < this->nr_bits_; i++) {
+      bool bit = data & (1 << i);
+      this->write_bit_(bit, &wait, start);
+      if (need_parity_bit)
+        parity_bit ^= bit;
+    }
+    if (need_parity_bit)
+      this->write_bit_(parity_bit, &wait, start);
+    // Stop bit
+    this->write_bit_(true, &wait, start);
+    if (this->stop_bits_ == 2)
+      this->wait_(&wait, start);
+  }
+}
+void ICACHE_RAM_ATTR ESP8266SoftwareSerial::wait_(uint32_t *wait, const uint32_t &start) {
+  while (ESP.getCycleCount() - start < *wait)
+    ;
+  *wait += this->bit_time_;
+}
+bool ICACHE_RAM_ATTR ESP8266SoftwareSerial::read_bit_(uint32_t *wait, const uint32_t &start) {
+  this->wait_(wait, start);
+  return this->rx_pin_->digital_read();
+}
+void ICACHE_RAM_ATTR ESP8266SoftwareSerial::write_bit_(bool bit, uint32_t *wait, const uint32_t &start) {
+  this->tx_pin_->digital_write(bit);
+  this->wait_(wait, start);
+}
+uint8_t ESP8266SoftwareSerial::read_byte() {
+  if (this->rx_in_pos_ == this->rx_out_pos_)
+    return 0;
+  uint8_t data = this->rx_buffer_[this->rx_out_pos_];
+  this->rx_out_pos_ = (this->rx_out_pos_ + 1) % this->rx_buffer_size_;
+  return data;
+}
+uint8_t ESP8266SoftwareSerial::peek_byte() {
+  if (this->rx_in_pos_ == this->rx_out_pos_)
+    return 0;
+  return this->rx_buffer_[this->rx_out_pos_];
+}
+void ESP8266SoftwareSerial::flush() {
+  // Flush is a NO-OP with software serial, all bytes are written immediately.
+}
+int ESP8266SoftwareSerial::available() {
+  int avail = int(this->rx_in_pos_) - int(this->rx_out_pos_);
+  if (avail < 0)
+    return avail + this->rx_buffer_size_;
+  return avail;
+}
+
+}  // namespace uart
+}  // namespace esphome
+#endif  // ESP8266
diff --git a/esphome/core/esphal.cpp b/esphome/core/esphal.cpp
index 13d54e726d..2389a2a7f6 100644
--- a/esphome/core/esphal.cpp
+++ b/esphome/core/esphal.cpp
@@ -12,6 +12,7 @@ typedef struct {        // NOLINT
 
 void ICACHE_RAM_ATTR __attachInterruptArg(uint8_t pin, void (*)(void *), void *fp,  // NOLINT
                                           int mode);
+void ICACHE_RAM_ATTR __detachInterrupt(uint8_t pin);  // NOLINT
 };
 #endif
 
@@ -226,6 +227,15 @@ void ICACHE_RAM_ATTR interrupt_handler(void *arg) {
 }
 #endif
 
+void GPIOPin::detach_interrupt() const { this->detach_interrupt_(); }
+void GPIOPin::detach_interrupt_() const {
+#ifdef ARDUINO_ARCH_ESP8266
+  __detachInterrupt(get_pin());
+#endif
+#ifdef ARDUINO_ARCH_ESP32
+  detachInterrupt(get_pin());
+#endif
+}
 void GPIOPin::attach_interrupt_(void (*func)(void *), void *arg, int mode) const {
   if (this->inverted_) {
     if (mode == RISING) {
diff --git a/esphome/core/esphal.h b/esphome/core/esphal.h
index 493f7f5e37..453e094acc 100644
--- a/esphome/core/esphal.h
+++ b/esphome/core/esphal.h
@@ -94,11 +94,13 @@ class GPIOPin {
   bool is_inverted() const;
 
   template<typename T> void attach_interrupt(void (*func)(T *), T *arg, int mode) const;
+  void detach_interrupt() const;
 
   ISRInternalGPIOPin *to_isr() const;
 
  protected:
   void attach_interrupt_(void (*func)(void *), void *arg, int mode) const;
+  void detach_interrupt_() const;
 
   const uint8_t pin_;
   const uint8_t mode_;
@@ -114,5 +116,4 @@ class GPIOPin {
 template<typename T> void GPIOPin::attach_interrupt(void (*func)(T *), T *arg, int mode) const {
   this->attach_interrupt_(reinterpret_cast<void (*)(void *)>(func), arg, mode);
 }
-
 }  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 6e63e8de31..2171be844a 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -132,6 +132,9 @@ uart:
   rx_pin: GPIO23
   baud_rate: 115200
   id: uart0
+  parity: NONE
+  data_bits: 8
+  stop_bits: 1
 
 ota:
   safe_mode: True

From e64246f6424fa7f07189cd9bc78969c295c9d190 Mon Sep 17 00:00:00 2001
From: declanshanaghy <dshanaghy@splunk.com>
Date: Sun, 24 May 2020 15:33:59 -0700
Subject: [PATCH 216/412] Adding support for MAX31856 Thermocouple Temperature
 Sensor (feature #700) (#1039)

---
 .gitignore                               |   1 +
 esphome/components/max31856/__init__.py  |   0
 esphome/components/max31856/max31856.cpp | 198 +++++++++++++++++++++++
 esphome/components/max31856/max31856.h   |  98 +++++++++++
 esphome/components/max31856/sensor.py    |  27 ++++
 esphome/components/max31865/max31865.cpp |   2 +-
 tests/test1.yaml                         |   5 +
 7 files changed, 330 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/max31856/__init__.py
 create mode 100644 esphome/components/max31856/max31856.cpp
 create mode 100644 esphome/components/max31856/max31856.h
 create mode 100644 esphome/components/max31856/sensor.py

diff --git a/.gitignore b/.gitignore
index fa4670769b..2de9dd40e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
+.esphome
 nosetests.xml
 coverage.xml
 *.cover
diff --git a/esphome/components/max31856/__init__.py b/esphome/components/max31856/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/max31856/max31856.cpp b/esphome/components/max31856/max31856.cpp
new file mode 100644
index 0000000000..b3e5b9277a
--- /dev/null
+++ b/esphome/components/max31856/max31856.cpp
@@ -0,0 +1,198 @@
+#include "max31856.h"
+
+#include "esphome/core/log.h"
+#include <cmath>
+
+namespace esphome {
+namespace max31856 {
+
+static const char *TAG = "max31856";
+
+// Based on Adafruit's library: https://github.com/adafruit/Adafruit_MAX31856
+
+void MAX31856Sensor::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up MAX31856Sensor '%s'...", this->name_.c_str());
+  this->spi_setup();
+
+  // assert on any fault
+  ESP_LOGCONFIG(TAG, "Setting up assertion on all faults");
+  this->write_register_(MAX31856_MASK_REG, 0x0);
+
+  ESP_LOGCONFIG(TAG, "Setting up open circuit fault detection");
+  this->write_register_(MAX31856_CR0_REG, MAX31856_CR0_OCFAULT01);
+
+  this->set_thermocouple_type_();
+  this->set_noise_filter_();
+
+  ESP_LOGCONFIG(TAG, "Completed setting up MAX31856Sensor '%s'...", this->name_.c_str());
+}
+
+void MAX31856Sensor::dump_config() {
+  LOG_SENSOR("", "MAX31856", this);
+  LOG_PIN("  CS Pin: ", this->cs_);
+  ESP_LOGCONFIG(TAG, "  Mains Filter: %s",
+                (filter_ == FILTER_60HZ ? "60 Hz" : (filter_ == FILTER_50HZ ? "50 Hz" : "Unknown!")));
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void MAX31856Sensor::update() {
+  ESP_LOGVV(TAG, "update");
+
+  this->one_shot_temperature_();
+
+  // Datasheet max conversion time for 1 shot is 155ms for 60Hz / 185ms for 50Hz
+  auto f = std::bind(&MAX31856Sensor::read_thermocouple_temperature_, this);
+  this->set_timeout("MAX31856Sensor::read_thermocouple_temperature_", filter_ == FILTER_60HZ ? 155 : 185, f);
+}
+
+void MAX31856Sensor::read_thermocouple_temperature_() {
+  if (this->has_fault_()) {
+    // Faults have been logged, clear it for next loop
+    this->clear_fault_();
+  } else {
+    int32_t temp24 = this->read_register24_(MAX31856_LTCBH_REG);
+    if (temp24 & 0x800000) {
+      temp24 |= 0xFF000000;  // fix sign
+    }
+
+    temp24 >>= 5;  // bottom 5 bits are unused
+
+    float temp_c = temp24;
+    temp_c *= 0.0078125;
+
+    ESP_LOGD(TAG, "Got thermocouple temperature: %.2f°C", temp_c);
+    this->publish_state(temp_c);
+  }
+}
+
+void MAX31856Sensor::one_shot_temperature_() {
+  ESP_LOGVV(TAG, "one_shot_temperature_");
+  this->write_register_(MAX31856_CJTO_REG, 0x0);
+
+  uint8_t t = this->read_register_(MAX31856_CR0_REG);
+
+  t &= ~MAX31856_CR0_AUTOCONVERT;  // turn off autoconversion mode
+  t |= MAX31856_CR0_1SHOT;         // turn on one shot mode
+
+  this->write_register_(MAX31856_CR0_REG, t);
+}
+
+bool MAX31856Sensor::has_fault_() {
+  ESP_LOGVV(TAG, "read_fault_");
+  uint8_t faults = this->read_register_(MAX31856_SR_REG);
+
+  if (faults == 0) {
+    ESP_LOGV(TAG, "status_set_warning");
+    this->status_clear_warning();
+    return false;
+  }
+
+  ESP_LOGV(TAG, "status_set_warning");
+  this->status_set_warning();
+
+  if ((faults & MAX31856_FAULT_CJRANGE) == MAX31856_FAULT_CJRANGE) {
+    ESP_LOGW(TAG, "Cold Junction Out-of-Range: '%s'...", this->name_.c_str());
+  }
+  if ((faults & MAX31856_FAULT_TCRANGE) == MAX31856_FAULT_TCRANGE) {
+    ESP_LOGW(TAG, "Thermocouple Out-of-Range: '%s'...", this->name_.c_str());
+  }
+  if ((faults & MAX31856_FAULT_CJHIGH) == MAX31856_FAULT_CJHIGH) {
+    ESP_LOGW(TAG, "Cold-Junction High Fault: '%s'...", this->name_.c_str());
+  }
+  if ((faults & MAX31856_FAULT_CJLOW) == MAX31856_FAULT_CJLOW) {
+    ESP_LOGW(TAG, "Cold-Junction Low Fault: '%s'...", this->name_.c_str());
+  }
+  if ((faults & MAX31856_FAULT_TCHIGH) == MAX31856_FAULT_TCHIGH) {
+    ESP_LOGW(TAG, "Thermocouple Temperature High Fault: '%s'...", this->name_.c_str());
+  }
+  if ((faults & MAX31856_FAULT_TCLOW) == MAX31856_FAULT_TCLOW) {
+    ESP_LOGW(TAG, "Thermocouple Temperature Low Fault: '%s'...", this->name_.c_str());
+  }
+  if ((faults & MAX31856_FAULT_OVUV) == MAX31856_FAULT_OVUV) {
+    ESP_LOGW(TAG, "Overvoltage or Undervoltage Input Fault: '%s'...", this->name_.c_str());
+  }
+  if ((faults & MAX31856_FAULT_OPEN) == MAX31856_FAULT_OPEN) {
+    ESP_LOGW(TAG, "Thermocouple Open-Circuit Fault (possibly not connected): '%s'...", this->name_.c_str());
+  }
+
+  return true;
+}
+
+void MAX31856Sensor::clear_fault_() {
+  ESP_LOGV(TAG, "clear_fault_");
+  uint8_t t = this->read_register_(MAX31856_CR0_REG);
+
+  t |= MAX31856_CR0_FAULT;     // turn on fault interrupt mode
+  t |= MAX31856_CR0_FAULTCLR;  // enable the fault status clear bit
+
+  this->write_register_(MAX31856_CR0_REG, t);
+}
+
+void MAX31856Sensor::set_thermocouple_type_() {
+  MAX31856ThermocoupleType type = MAX31856_TCTYPE_K;
+  ESP_LOGCONFIG(TAG, "set_thermocouple_type_: 0x%02X", type);
+  uint8_t t = this->read_register_(MAX31856_CR1_REG);
+  t &= 0xF0;  // mask off bottom 4 bits
+  t |= (uint8_t) type & 0x0F;
+  this->write_register_(MAX31856_CR1_REG, t);
+}
+
+void MAX31856Sensor::set_noise_filter_() {
+  ESP_LOGCONFIG(TAG, "set_noise_filter_: 0x%02X", filter_);
+  uint8_t t = this->read_register_(MAX31856_CR0_REG);
+  if (filter_ == FILTER_50HZ) {
+    t |= 0x01;
+    ESP_LOGCONFIG(TAG, "set_noise_filter_: 50 Hz, t==0x%02X", t);
+  } else {
+    t &= 0xfe;
+    ESP_LOGCONFIG(TAG, "set_noise_filter_: 60 Hz, t==0x%02X", t);
+  }
+  this->write_register_(MAX31856_CR0_REG, t);
+}
+
+void MAX31856Sensor::write_register_(uint8_t reg, uint8_t value) {
+  ESP_LOGVV(TAG, "write_register_ raw reg=0x%02X value=0x%02X", reg, value);
+  reg |= SPI_WRITE_M;
+  ESP_LOGVV(TAG, "write_register_ masked reg=0x%02X value=0x%02X", reg, value);
+  this->enable();
+  ESP_LOGVV(TAG, "write_byte reg=0x%02X", reg);
+  this->write_byte(reg);
+  ESP_LOGVV(TAG, "write_byte value=0x%02X", value);
+  this->write_byte(value);
+  this->disable();
+  ESP_LOGV(TAG, "write_register_ 0x%02X: 0x%02X", reg, value);
+}
+
+const uint8_t MAX31856Sensor::read_register_(uint8_t reg) {
+  ESP_LOGVV(TAG, "read_register_ 0x%02X", reg);
+  this->enable();
+  ESP_LOGVV(TAG, "write_byte reg=0x%02X", reg);
+  this->write_byte(reg);
+  const uint8_t value(this->read_byte());
+  ESP_LOGVV(TAG, "read_byte value=0x%02X", value);
+  this->disable();
+  ESP_LOGV(TAG, "read_register_ reg=0x%02X: value=0x%02X", reg, value);
+  return value;
+}
+
+const uint32_t MAX31856Sensor::read_register24_(uint8_t reg) {
+  ESP_LOGVV(TAG, "read_register_24_ 0x%02X", reg);
+  this->enable();
+  ESP_LOGVV(TAG, "write_byte reg=0x%02X", reg);
+  this->write_byte(reg);
+  const uint8_t msb(this->read_byte());
+  ESP_LOGVV(TAG, "read_byte msb=0x%02X", msb);
+  const uint8_t mid(this->read_byte());
+  ESP_LOGVV(TAG, "read_byte mid=0x%02X", mid);
+  const uint8_t lsb(this->read_byte());
+  ESP_LOGVV(TAG, "read_byte lsb=0x%02X", lsb);
+  this->disable();
+  const uint32_t value((msb << 16) | (mid << 8) | lsb);
+  ESP_LOGV(TAG, "read_register_24_ reg=0x%02X: value=0x%06X", reg, value);
+  return value;
+}
+
+float MAX31856Sensor::get_setup_priority() const { return setup_priority::DATA; }
+
+}  // namespace max31856
+}  // namespace esphome
diff --git a/esphome/components/max31856/max31856.h b/esphome/components/max31856/max31856.h
new file mode 100644
index 0000000000..779eb52c8e
--- /dev/null
+++ b/esphome/components/max31856/max31856.h
@@ -0,0 +1,98 @@
+#pragma once
+
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/spi/spi.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace max31856 {
+
+enum MAX31856RegisterMasks { SPI_WRITE_M = 0x80 };
+
+enum MAX31856Registers {
+  MAX31856_CR0_REG = 0x00,          ///< Config 0 register
+  MAX31856_CR0_AUTOCONVERT = 0x80,  ///< Config 0 Auto convert flag
+  MAX31856_CR0_1SHOT = 0x40,        ///< Config 0 one shot convert flag
+  MAX31856_CR0_OCFAULT00 = 0x00,    ///< Config 0 open circuit fault 00 flag
+  MAX31856_CR0_OCFAULT01 = 0x10,    ///< Config 0 open circuit fault 01 flag
+  MAX31856_CR0_OCFAULT10 = 0x20,    ///< Config 0 open circuit fault 10 flag
+  MAX31856_CR0_CJ = 0x08,           ///< Config 0 cold junction disable flag
+  MAX31856_CR0_FAULT = 0x04,        ///< Config 0 fault mode flag
+  MAX31856_CR0_FAULTCLR = 0x02,     ///< Config 0 fault clear flag
+
+  MAX31856_CR1_REG = 0x01,     ///< Config 1 register
+  MAX31856_MASK_REG = 0x02,    ///< Fault Mask register
+  MAX31856_CJHF_REG = 0x03,    ///< Cold junction High temp fault register
+  MAX31856_CJLF_REG = 0x04,    ///< Cold junction Low temp fault register
+  MAX31856_LTHFTH_REG = 0x05,  ///< Linearized Temperature High Fault Threshold Register, MSB
+  MAX31856_LTHFTL_REG = 0x06,  ///< Linearized Temperature High Fault Threshold Register, LSB
+  MAX31856_LTLFTH_REG = 0x07,  ///< Linearized Temperature Low Fault Threshold Register, MSB
+  MAX31856_LTLFTL_REG = 0x08,  ///< Linearized Temperature Low Fault Threshold Register, LSB
+  MAX31856_CJTO_REG = 0x09,    ///< Cold-Junction Temperature Offset Register
+  MAX31856_CJTH_REG = 0x0A,    ///< Cold-Junction Temperature Register, MSB
+  MAX31856_CJTL_REG = 0x0B,    ///< Cold-Junction Temperature Register, LSB
+  MAX31856_LTCBH_REG = 0x0C,   ///< Linearized TC Temperature, Byte 2
+  MAX31856_LTCBM_REG = 0x0D,   ///< Linearized TC Temperature, Byte 1
+  MAX31856_LTCBL_REG = 0x0E,   ///< Linearized TC Temperature, Byte 0
+  MAX31856_SR_REG = 0x0F,      ///< Fault Status Register
+
+  MAX31856_FAULT_CJRANGE = 0x80,  ///< Fault status Cold Junction Out-of-Range flag
+  MAX31856_FAULT_TCRANGE = 0x40,  ///< Fault status Thermocouple Out-of-Range flag
+  MAX31856_FAULT_CJHIGH = 0x20,   ///< Fault status Cold-Junction High Fault flag
+  MAX31856_FAULT_CJLOW = 0x10,    ///< Fault status Cold-Junction Low Fault flag
+  MAX31856_FAULT_TCHIGH = 0x08,   ///< Fault status Thermocouple Temperature High Fault flag
+  MAX31856_FAULT_TCLOW = 0x04,    ///< Fault status Thermocouple Temperature Low Fault flag
+  MAX31856_FAULT_OVUV = 0x02,     ///< Fault status Overvoltage or Undervoltage Input Fault flag
+  MAX31856_FAULT_OPEN = 0x01,     ///< Fault status Thermocouple Open-Circuit Fault flag
+};
+
+/**
+ * Multiple types of thermocouples supported by the chip.
+ * Currently only K type implemented here.
+ */
+enum MAX31856ThermocoupleType {
+  MAX31856_TCTYPE_B = 0b0000,   // 0x00
+  MAX31856_TCTYPE_E = 0b0001,   // 0x01
+  MAX31856_TCTYPE_J = 0b0010,   // 0x02
+  MAX31856_TCTYPE_K = 0b0011,   // 0x03
+  MAX31856_TCTYPE_N = 0b0100,   // 0x04
+  MAX31856_TCTYPE_R = 0b0101,   // 0x05
+  MAX31856_TCTYPE_S = 0b0110,   // 0x06
+  MAX31856_TCTYPE_T = 0b0111,   // 0x07
+  MAX31856_VMODE_G8 = 0b1000,   // 0x08
+  MAX31856_VMODE_G32 = 0b1100,  // 0x12
+};
+
+enum MAX31856ConfigFilter {
+  FILTER_60HZ = 0,
+  FILTER_50HZ = 1,
+};
+
+class MAX31856Sensor : public sensor::Sensor,
+                       public PollingComponent,
+                       public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                             spi::CLOCK_PHASE_TRAILING, spi::DATA_RATE_4MHZ> {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void set_filter(MAX31856ConfigFilter filter) { filter_ = filter; }
+  void update() override;
+
+ protected:
+  MAX31856ConfigFilter filter_;
+
+  const uint8_t read_register_(uint8_t reg);
+  const uint32_t read_register24_(uint8_t reg);
+  void write_register_(uint8_t reg, uint8_t value);
+
+  void one_shot_temperature_();
+  bool has_fault_();
+  void clear_fault_();
+  void read_thermocouple_temperature_();
+  void set_thermocouple_type_();
+  void set_noise_filter_();
+};
+
+}  // namespace max31856
+}  // namespace esphome
diff --git a/esphome/components/max31856/sensor.py b/esphome/components/max31856/sensor.py
new file mode 100644
index 0000000000..523b5301d4
--- /dev/null
+++ b/esphome/components/max31856/sensor.py
@@ -0,0 +1,27 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, spi
+from esphome.const import CONF_ID, CONF_MAINS_FILTER, ICON_THERMOMETER, UNIT_CELSIUS
+
+max31856_ns = cg.esphome_ns.namespace('max31856')
+MAX31856Sensor = max31856_ns.class_('MAX31856Sensor', sensor.Sensor, cg.PollingComponent,
+                                    spi.SPIDevice)
+
+MAX31865ConfigFilter = max31856_ns.enum('MAX31856ConfigFilter')
+FILTER = {
+    '50HZ': MAX31865ConfigFilter.FILTER_50HZ,
+    '60HZ': MAX31865ConfigFilter.FILTER_60HZ,
+}
+
+CONFIG_SCHEMA = sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1).extend({
+    cv.GenerateID(): cv.declare_id(MAX31856Sensor),
+    cv.Optional(CONF_MAINS_FILTER, default='60HZ'): cv.enum(FILTER, upper=True, space=''),
+}).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield spi.register_spi_device(var, config)
+    yield sensor.register_sensor(var, config)
+    cg.add(var.set_filter(config[CONF_MAINS_FILTER]))
diff --git a/esphome/components/max31865/max31865.cpp b/esphome/components/max31865/max31865.cpp
index a3c537a2c2..d6334a3c34 100644
--- a/esphome/components/max31865/max31865.cpp
+++ b/esphome/components/max31865/max31865.cpp
@@ -83,7 +83,7 @@ void MAX31865Sensor::dump_config() {
   LOG_UPDATE_INTERVAL(this);
   ESP_LOGCONFIG(TAG, "  Reference Resistance: %.2fΩ", reference_resistance_);
   ESP_LOGCONFIG(TAG, "  RTD: %u-wire %.2fΩ", rtd_wires_, rtd_nominal_resistance_);
-  ESP_LOGCONFIG(TAG, "  Filter: %s",
+  ESP_LOGCONFIG(TAG, "  Mains Filter: %s",
                 (filter_ == FILTER_60HZ ? "60 Hz" : (filter_ == FILTER_50HZ ? "50 Hz" : "Unknown!")));
 }
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 2171be844a..b7d6fe7a9d 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -498,6 +498,11 @@ sensor:
     update_interval: 15s
     reference_temperature:
       name: "MAX31855 Internal Temperature"
+  - platform: max31856
+    name: "BBQ Temperature"
+    cs_pin: GPIO17
+    update_interval: 15s
+    mains_filter: 50Hz
   - platform: max31865
     name: "Water Tank Temperature"
     cs_pin: GPIO23

From 1bec1faf6db9a7696e96c51152d92b94eda01b29 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 24 May 2020 23:27:28 -0300
Subject: [PATCH 217/412] lint

---
 .../components/api/homeassistant_service.h    |  4 +--
 esphome/components/binary_sensor/automation.h |  4 +--
 esphome/components/climate/automation.h       |  4 +--
 esphome/components/cover/automation.h         | 20 ++++++------
 .../deep_sleep/deep_sleep_component.h         |  8 ++---
 esphome/components/dfplayer/dfplayer.h        | 18 ++++-------
 esphome/components/display/display_buffer.h   |  9 ++----
 esphome/components/esp8266_pwm/esp8266_pwm.h  |  3 +-
 esphome/components/fan/automation.h           |  9 ++----
 .../components/globals/globals_component.h    |  4 +--
 .../components/http_request/http_request.h    |  4 +--
 .../integration/integration_sensor.h          |  4 +--
 esphome/components/ledc/ledc_output.h         |  4 +--
 esphome/components/light/automation.h         | 16 +++++-----
 esphome/components/mhz19/mhz19.h              | 12 +++----
 esphome/components/mqtt/mqtt_client.h         |  9 +++---
 esphome/components/output/automation.h        | 12 +++----
 esphome/components/pid/pid_climate.h          |  4 +--
 esphome/components/remote_base/jvc_protocol.h |  3 +-
 esphome/components/remote_base/lg_protocol.h  |  3 +-
 esphome/components/remote_base/nec_protocol.h |  3 +-
 .../remote_base/panasonic_protocol.h          |  3 +-
 .../components/remote_base/pioneer_protocol.h |  3 +-
 esphome/components/remote_base/raw_protocol.h |  4 +--
 esphome/components/remote_base/rc5_protocol.h |  3 +-
 .../remote_base/rc_switch_protocol.h          | 15 +++------
 esphome/components/remote_base/remote_base.h  | 10 +++---
 .../components/remote_base/samsung_protocol.h |  3 +-
 .../components/remote_base/sony_protocol.h    |  3 +-
 esphome/components/rf_bridge/rf_bridge.h      |  8 ++---
 .../rotary_encoder/rotary_encoder.h           |  3 +-
 esphome/components/script/script.h            | 12 +++----
 esphome/components/sensor/automation.h        |  3 +-
 esphome/components/servo/servo.h              |  6 ++--
 esphome/components/sim800l/sim800l.h          |  4 +--
 esphome/components/stepper/stepper.h          | 12 +++----
 esphome/components/switch/automation.h        | 15 ++++-----
 esphome/components/text_sensor/automation.h   |  3 +-
 esphome/components/tm1651/tm1651.h            | 17 +++++-----
 esphome/components/uart/automation.h          |  4 +--
 esphome/core/automation.h                     |  8 ++---
 esphome/core/base_automation.h                | 31 +++++++++----------
 42 files changed, 151 insertions(+), 176 deletions(-)

diff --git a/esphome/components/api/homeassistant_service.h b/esphome/components/api/homeassistant_service.h
index 0877efbf26..8a72765195 100644
--- a/esphome/components/api/homeassistant_service.h
+++ b/esphome/components/api/homeassistant_service.h
@@ -30,8 +30,7 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
     this->variables_.push_back(TemplatableKeyValuePair<Ts...>(key, value));
   }
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     HomeassistantServiceResponse resp;
     resp.service = this->service_.value(x...);
     resp.is_event = this->is_event_;
@@ -56,6 +55,7 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
     this->parent_->send_homeassistant_service_call(resp);
   }
 
+ protected:
   APIServer *parent_;
   bool is_event_;
   std::vector<TemplatableKeyValuePair<Ts...>> data_;
diff --git a/esphome/components/binary_sensor/automation.h b/esphome/components/binary_sensor/automation.h
index b76fbdae0c..6b0321628c 100644
--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -138,12 +138,12 @@ template<typename... Ts> class BinarySensorPublishAction : public Action<Ts...>
   explicit BinarySensorPublishAction(BinarySensor *sensor) : sensor_(sensor) {}
   TEMPLATABLE_VALUE(bool, state)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto val = this->state_.value(x...);
     this->sensor_->publish_state(val);
   }
 
+ protected:
   BinarySensor *sensor_;
 };
 
diff --git a/esphome/components/climate/automation.h b/esphome/components/climate/automation.h
index 2fd9d81e6b..0cd52b1036 100644
--- a/esphome/components/climate/automation.h
+++ b/esphome/components/climate/automation.h
@@ -18,8 +18,7 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(ClimateFanMode, fan_mode)
   TEMPLATABLE_VALUE(ClimateSwingMode, swing_mode)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto call = this->climate_->make_call();
     call.set_mode(this->mode_.optional_value(x...));
     call.set_target_temperature(this->target_temperature_.optional_value(x...));
@@ -31,6 +30,7 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
     call.perform();
   }
 
+ protected:
   Climate *climate_;
 };
 
diff --git a/esphome/components/cover/automation.h b/esphome/components/cover/automation.h
index bad641c150..0092f987f2 100644
--- a/esphome/components/cover/automation.h
+++ b/esphome/components/cover/automation.h
@@ -11,9 +11,9 @@ template<typename... Ts> class OpenAction : public Action<Ts...> {
  public:
   explicit OpenAction(Cover *cover) : cover_(cover) {}
 
- protected:
-  void play_(Ts... x) override { this->cover_->open(); }
+  void play(Ts... x) override { this->cover_->open(); }
 
+ protected:
   Cover *cover_;
 };
 
@@ -21,9 +21,9 @@ template<typename... Ts> class CloseAction : public Action<Ts...> {
  public:
   explicit CloseAction(Cover *cover) : cover_(cover) {}
 
- protected:
-  void play_(Ts... x) override { this->cover_->close(); }
+  void play(Ts... x) override { this->cover_->close(); }
 
+ protected:
   Cover *cover_;
 };
 
@@ -31,9 +31,9 @@ template<typename... Ts> class StopAction : public Action<Ts...> {
  public:
   explicit StopAction(Cover *cover) : cover_(cover) {}
 
- protected:
-  void play_(Ts... x) override { this->cover_->stop(); }
+  void play(Ts... x) override { this->cover_->stop(); }
 
+ protected:
   Cover *cover_;
 };
 
@@ -45,8 +45,7 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(float, position)
   TEMPLATABLE_VALUE(float, tilt)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto call = this->cover_->make_call();
     if (this->stop_.has_value())
       call.set_stop(this->stop_.value(x...));
@@ -57,6 +56,7 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
     call.perform();
   }
 
+ protected:
   Cover *cover_;
 };
 
@@ -67,8 +67,7 @@ template<typename... Ts> class CoverPublishAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(float, tilt)
   TEMPLATABLE_VALUE(CoverOperation, current_operation)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     if (this->position_.has_value())
       this->cover_->position = this->position_.value(x...);
     if (this->tilt_.has_value())
@@ -78,6 +77,7 @@ template<typename... Ts> class CoverPublishAction : public Action<Ts...> {
     this->cover_->publish_state();
   }
 
+ protected:
   Cover *cover_;
 };
 
diff --git a/esphome/components/deep_sleep/deep_sleep_component.h b/esphome/components/deep_sleep/deep_sleep_component.h
index 6287a2259a..4372a3f66c 100644
--- a/esphome/components/deep_sleep/deep_sleep_component.h
+++ b/esphome/components/deep_sleep/deep_sleep_component.h
@@ -85,9 +85,9 @@ template<typename... Ts> class EnterDeepSleepAction : public Action<Ts...> {
  public:
   EnterDeepSleepAction(DeepSleepComponent *deep_sleep) : deep_sleep_(deep_sleep) {}
 
- protected:
-  void play_(Ts... x) override { this->deep_sleep_->begin_sleep(true); }
+  void play(Ts... x) override { this->deep_sleep_->begin_sleep(true); }
 
+ protected:
   DeepSleepComponent *deep_sleep_;
 };
 
@@ -95,9 +95,9 @@ template<typename... Ts> class PreventDeepSleepAction : public Action<Ts...> {
  public:
   PreventDeepSleepAction(DeepSleepComponent *deep_sleep) : deep_sleep_(deep_sleep) {}
 
- protected:
-  void play_(Ts... x) override { this->deep_sleep_->prevent_deep_sleep(); }
+  void play(Ts... x) override { this->deep_sleep_->prevent_deep_sleep(); }
 
+ protected:
   DeepSleepComponent *deep_sleep_;
 };
 
diff --git a/esphome/components/dfplayer/dfplayer.h b/esphome/components/dfplayer/dfplayer.h
index 89f0fb691c..cb9686bb64 100644
--- a/esphome/components/dfplayer/dfplayer.h
+++ b/esphome/components/dfplayer/dfplayer.h
@@ -104,8 +104,7 @@ class DFPlayer : public uart::UARTDevice, public Component {
 
 #define DFPLAYER_SIMPLE_ACTION(ACTION_CLASS, ACTION_METHOD) \
   template<typename... Ts> class ACTION_CLASS : public Action<Ts...>, public Parented<DFPlayer> { \
-   protected: \
-    void play_(Ts... x) override { this->parent_->ACTION_METHOD(); } \
+    void play(Ts... x) override { this->parent_->ACTION_METHOD(); } \
   };
 
 DFPLAYER_SIMPLE_ACTION(NextAction, next)
@@ -116,8 +115,7 @@ template<typename... Ts> class PlayFileAction : public Action<Ts...>, public Par
   TEMPLATABLE_VALUE(uint16_t, file)
   TEMPLATABLE_VALUE(boolean, loop)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto file = this->file_.value(x...);
     auto loop = this->loop_.value(x...);
     if (loop) {
@@ -134,8 +132,7 @@ template<typename... Ts> class PlayFolderAction : public Action<Ts...>, public P
   TEMPLATABLE_VALUE(uint16_t, file)
   TEMPLATABLE_VALUE(boolean, loop)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto folder = this->folder_.value(x...);
     auto file = this->file_.value(x...);
     auto loop = this->loop_.value(x...);
@@ -151,8 +148,7 @@ template<typename... Ts> class SetDeviceAction : public Action<Ts...>, public Pa
  public:
   TEMPLATABLE_VALUE(Device, device)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto device = this->device_.value(x...);
     this->parent_->set_device(device);
   }
@@ -162,8 +158,7 @@ template<typename... Ts> class SetVolumeAction : public Action<Ts...>, public Pa
  public:
   TEMPLATABLE_VALUE(uint8_t, volume)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto volume = this->volume_.value(x...);
     this->parent_->set_volume(volume);
   }
@@ -173,8 +168,7 @@ template<typename... Ts> class SetEqAction : public Action<Ts...>, public Parent
  public:
   TEMPLATABLE_VALUE(EqPreset, eq)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto eq = this->eq_.value(x...);
     this->parent_->set_eq(eq);
   }
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 2a6ead3306..85871df16e 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -392,8 +392,7 @@ template<typename... Ts> class DisplayPageShowAction : public Action<Ts...> {
  public:
   TEMPLATABLE_VALUE(DisplayPage *, page)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto *page = this->page_.value(x...);
     if (page != nullptr) {
       page->show();
@@ -405,8 +404,7 @@ template<typename... Ts> class DisplayPageShowNextAction : public Action<Ts...>
  public:
   DisplayPageShowNextAction(DisplayBuffer *buffer) : buffer_(buffer) {}
 
- protected:
-  void play_(Ts... x) override { this->buffer_->show_next_page(); }
+  void play(Ts... x) override { this->buffer_->show_next_page(); }
 
   DisplayBuffer *buffer_;
 };
@@ -415,8 +413,7 @@ template<typename... Ts> class DisplayPageShowPrevAction : public Action<Ts...>
  public:
   DisplayPageShowPrevAction(DisplayBuffer *buffer) : buffer_(buffer) {}
 
- protected:
-  void play_(Ts... x) override { this->buffer_->show_prev_page(); }
+  void play(Ts... x) override { this->buffer_->show_prev_page(); }
 
   DisplayBuffer *buffer_;
 };
diff --git a/esphome/components/esp8266_pwm/esp8266_pwm.h b/esphome/components/esp8266_pwm/esp8266_pwm.h
index 5871b0dcbc..51b74f48ba 100644
--- a/esphome/components/esp8266_pwm/esp8266_pwm.h
+++ b/esphome/components/esp8266_pwm/esp8266_pwm.h
@@ -38,8 +38,7 @@ template<typename... Ts> class SetFrequencyAction : public Action<Ts...> {
   SetFrequencyAction(ESP8266PWM *parent) : parent_(parent) {}
   TEMPLATABLE_VALUE(float, frequency);
 
- protected:
-  void play_(Ts... x) {
+  void play(Ts... x) {
     float freq = this->frequency_.value(x...);
     this->parent_->update_frequency(freq);
   }
diff --git a/esphome/components/fan/automation.h b/esphome/components/fan/automation.h
index f2435a220f..d96ed994e8 100644
--- a/esphome/components/fan/automation.h
+++ b/esphome/components/fan/automation.h
@@ -14,8 +14,7 @@ template<typename... Ts> class TurnOnAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(bool, oscillating)
   TEMPLATABLE_VALUE(FanSpeed, speed)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto call = this->state_->turn_on();
     if (this->oscillating_.has_value()) {
       call.set_oscillating(this->oscillating_.value(x...));
@@ -33,8 +32,7 @@ template<typename... Ts> class TurnOffAction : public Action<Ts...> {
  public:
   explicit TurnOffAction(FanState *state) : state_(state) {}
 
- protected:
-  void play_(Ts... x) override { this->state_->turn_off().perform(); }
+  void play(Ts... x) override { this->state_->turn_off().perform(); }
 
   FanState *state_;
 };
@@ -43,8 +41,7 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
  public:
   explicit ToggleAction(FanState *state) : state_(state) {}
 
- protected:
-  void play_(Ts... x) override { this->state_->toggle().perform(); }
+  void play(Ts... x) override { this->state_->toggle().perform(); }
 
   FanState *state_;
 };
diff --git a/esphome/components/globals/globals_component.h b/esphome/components/globals/globals_component.h
index bf839b4256..397c55f6c4 100644
--- a/esphome/components/globals/globals_component.h
+++ b/esphome/components/globals/globals_component.h
@@ -59,9 +59,9 @@ template<class C, typename... Ts> class GlobalVarSetAction : public Action<Ts...
 
   TEMPLATABLE_VALUE(T, value);
 
- protected:
-  void play_(Ts... x) override { this->parent_->value() = this->value_.value(x...); }
+  void play(Ts... x) override { this->parent_->value() = this->value_.value(x...); }
 
+ protected:
   C *parent_;
 };
 
diff --git a/esphome/components/http_request/http_request.h b/esphome/components/http_request/http_request.h
index 4f164f3409..e6c0510b32 100644
--- a/esphome/components/http_request/http_request.h
+++ b/esphome/components/http_request/http_request.h
@@ -71,8 +71,7 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
 
   void set_json(std::function<void(Ts..., JsonObject &)> json_func) { this->json_func_ = json_func; }
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     this->parent_->set_url(this->url_.value(x...));
     this->parent_->set_method(this->method_.value(x...));
     if (this->body_.has_value()) {
@@ -107,6 +106,7 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
     this->parent_->close();
   }
 
+ protected:
   void encode_json_(Ts... x, JsonObject &root) {
     for (const auto &item : this->json_) {
       auto val = item.second;
diff --git a/esphome/components/integration/integration_sensor.h b/esphome/components/integration/integration_sensor.h
index 85a89f6e43..2fcec069b2 100644
--- a/esphome/components/integration/integration_sensor.h
+++ b/esphome/components/integration/integration_sensor.h
@@ -76,9 +76,9 @@ template<typename... Ts> class ResetAction : public Action<Ts...> {
  public:
   explicit ResetAction(IntegrationSensor *parent) : parent_(parent) {}
 
- protected:
-  void play_(Ts... x) override { this->parent_->reset(); }
+  void play(Ts... x) override { this->parent_->reset(); }
 
+ protected:
   IntegrationSensor *parent_;
 };
 
diff --git a/esphome/components/ledc/ledc_output.h b/esphome/components/ledc/ledc_output.h
index 7ff0987e0e..3f56f502b0 100644
--- a/esphome/components/ledc/ledc_output.h
+++ b/esphome/components/ledc/ledc_output.h
@@ -43,12 +43,12 @@ template<typename... Ts> class SetFrequencyAction : public Action<Ts...> {
   SetFrequencyAction(LEDCOutput *parent) : parent_(parent) {}
   TEMPLATABLE_VALUE(float, frequency);
 
- protected:
-  void play_(Ts... x) {
+  void play(Ts... x) {
     float freq = this->frequency_.value(x...);
     this->parent_->apply_frequency(freq);
   }
 
+ protected:
   LEDCOutput *parent_;
 };
 
diff --git a/esphome/components/light/automation.h b/esphome/components/light/automation.h
index 1c641562d4..dfab780658 100644
--- a/esphome/components/light/automation.h
+++ b/esphome/components/light/automation.h
@@ -13,13 +13,13 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
 
   TEMPLATABLE_VALUE(uint32_t, transition_length)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto call = this->state_->toggle();
     call.set_transition_length(this->transition_length_.optional_value(x...));
     call.perform();
   }
 
+ protected:
   LightState *state_;
 };
 
@@ -38,8 +38,7 @@ template<typename... Ts> class LightControlAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(float, color_temperature)
   TEMPLATABLE_VALUE(std::string, effect)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto call = this->parent_->make_call();
     call.set_state(this->state_.optional_value(x...));
     call.set_brightness(this->brightness_.optional_value(x...));
@@ -54,6 +53,7 @@ template<typename... Ts> class LightControlAction : public Action<Ts...> {
     call.perform();
   }
 
+ protected:
   LightState *parent_;
 };
 
@@ -64,8 +64,7 @@ template<typename... Ts> class DimRelativeAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(float, relative_brightness)
   TEMPLATABLE_VALUE(uint32_t, transition_length)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto call = this->parent_->make_call();
     float rel = this->relative_brightness_.value(x...);
     float cur;
@@ -78,6 +77,7 @@ template<typename... Ts> class DimRelativeAction : public Action<Ts...> {
     call.perform();
   }
 
+ protected:
   LightState *parent_;
 };
 
@@ -143,8 +143,7 @@ template<typename... Ts> class AddressableSet : public Action<Ts...> {
   TEMPLATABLE_VALUE(uint8_t, blue)
   TEMPLATABLE_VALUE(uint8_t, white)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto *out = (AddressableLight *) this->parent_->get_output();
     int32_t range_from = this->range_from_.value_or(x..., 0);
     int32_t range_to = this->range_to_.value_or(x..., out->size() - 1) + 1;
@@ -160,6 +159,7 @@ template<typename... Ts> class AddressableSet : public Action<Ts...> {
     out->schedule_show();
   }
 
+ protected:
   LightState *parent_;
 };
 
diff --git a/esphome/components/mhz19/mhz19.h b/esphome/components/mhz19/mhz19.h
index bdb2c50d19..151351be4c 100644
--- a/esphome/components/mhz19/mhz19.h
+++ b/esphome/components/mhz19/mhz19.h
@@ -38,9 +38,9 @@ template<typename... Ts> class MHZ19CalibrateZeroAction : public Action<Ts...> {
  public:
   MHZ19CalibrateZeroAction(MHZ19Component *mhz19) : mhz19_(mhz19) {}
 
- protected:
-  void play_(Ts... x) override { this->mhz19_->calibrate_zero(); }
+  void play(Ts... x) override { this->mhz19_->calibrate_zero(); }
 
+ protected:
   MHZ19Component *mhz19_;
 };
 
@@ -48,9 +48,9 @@ template<typename... Ts> class MHZ19ABCEnableAction : public Action<Ts...> {
  public:
   MHZ19ABCEnableAction(MHZ19Component *mhz19) : mhz19_(mhz19) {}
 
- protected:
-  void play_(Ts... x) override { this->mhz19_->abc_enable(); }
+  void play(Ts... x) override { this->mhz19_->abc_enable(); }
 
+ protected:
   MHZ19Component *mhz19_;
 };
 
@@ -58,9 +58,9 @@ template<typename... Ts> class MHZ19ABCDisableAction : public Action<Ts...> {
  public:
   MHZ19ABCDisableAction(MHZ19Component *mhz19) : mhz19_(mhz19) {}
 
- protected:
-  void play_(Ts... x) override { this->mhz19_->abc_disable(); }
+  void play(Ts... x) override { this->mhz19_->abc_disable(); }
 
+ protected:
   MHZ19Component *mhz19_;
 };
 
diff --git a/esphome/components/mqtt/mqtt_client.h b/esphome/components/mqtt/mqtt_client.h
index fbd2435bfc..2bbebff845 100644
--- a/esphome/components/mqtt/mqtt_client.h
+++ b/esphome/components/mqtt/mqtt_client.h
@@ -299,12 +299,12 @@ template<typename... Ts> class MQTTPublishAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(uint8_t, qos)
   TEMPLATABLE_VALUE(bool, retain)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     this->parent_->publish(this->topic_.value(x...), this->payload_.value(x...), this->qos_.value(x...),
                            this->retain_.value(x...));
   }
 
+ protected:
   MQTTClientComponent *parent_;
 };
 
@@ -317,14 +317,15 @@ template<typename... Ts> class MQTTPublishJsonAction : public Action<Ts...> {
 
   void set_payload(std::function<void(Ts..., JsonObject &)> payload) { this->payload_ = payload; }
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto f = std::bind(&MQTTPublishJsonAction<Ts...>::encode_, this, x..., std::placeholders::_1);
     auto topic = this->topic_.value(x...);
     auto qos = this->qos_.value(x...);
     auto retain = this->retain_.value(x...);
     this->parent_->publish_json(topic, f, qos, retain);
   }
+
+ protected:
   void encode_(Ts... x, JsonObject &root) { this->payload_(x..., root); }
   std::function<void(Ts..., JsonObject &)> payload_;
   MQTTClientComponent *parent_;
diff --git a/esphome/components/output/automation.h b/esphome/components/output/automation.h
index c65b0d3f6e..51c2849702 100644
--- a/esphome/components/output/automation.h
+++ b/esphome/components/output/automation.h
@@ -12,9 +12,9 @@ template<typename... Ts> class TurnOffAction : public Action<Ts...> {
  public:
   TurnOffAction(BinaryOutput *output) : output_(output) {}
 
- protected:
-  void play_(Ts... x) override { this->output_->turn_off(); }
+  void play(Ts... x) override { this->output_->turn_off(); }
 
+ protected:
   BinaryOutput *output_;
 };
 
@@ -22,9 +22,9 @@ template<typename... Ts> class TurnOnAction : public Action<Ts...> {
  public:
   TurnOnAction(BinaryOutput *output) : output_(output) {}
 
- protected:
-  void play_(Ts... x) override { this->output_->turn_on(); }
+  void play(Ts... x) override { this->output_->turn_on(); }
 
+ protected:
   BinaryOutput *output_;
 };
 
@@ -34,9 +34,9 @@ template<typename... Ts> class SetLevelAction : public Action<Ts...> {
 
   TEMPLATABLE_VALUE(float, level)
 
- protected:
-  void play_(Ts... x) override { this->output_->set_level(this->level_.value(x...)); }
+  void play(Ts... x) override { this->output_->set_level(this->level_.value(x...)); }
 
+ protected:
   FloatOutput *output_;
 };
 
diff --git a/esphome/components/pid/pid_climate.h b/esphome/components/pid/pid_climate.h
index 0c92cee798..3dae92af5f 100644
--- a/esphome/components/pid/pid_climate.h
+++ b/esphome/components/pid/pid_climate.h
@@ -75,8 +75,7 @@ template<typename... Ts> class PIDAutotuneAction : public Action<Ts...> {
   void set_positive_output(float positive_output) { positive_output_ = positive_output; }
   void set_negative_output(float negative_output) { negative_output_ = negative_output; }
 
- protected:
-  void play_(Ts... x) {
+  void play(Ts... x) {
     auto tuner = make_unique<PIDAutotuner>();
     tuner->set_noiseband(this->noiseband_);
     tuner->set_output_negative(this->negative_output_);
@@ -84,6 +83,7 @@ template<typename... Ts> class PIDAutotuneAction : public Action<Ts...> {
     this->parent_->start_autotune(std::move(tuner));
   }
 
+ protected:
   float noiseband_;
   float positive_output_;
   float negative_output_;
diff --git a/esphome/components/remote_base/jvc_protocol.h b/esphome/components/remote_base/jvc_protocol.h
index af666bf131..fc40a6a874 100644
--- a/esphome/components/remote_base/jvc_protocol.h
+++ b/esphome/components/remote_base/jvc_protocol.h
@@ -24,8 +24,7 @@ template<typename... Ts> class JVCAction : public RemoteTransmitterActionBase<Ts
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     JVCData data{};
     data.data = this->data_.value(x...);
     JVCProtocol().encode(dst, data);
diff --git a/esphome/components/remote_base/lg_protocol.h b/esphome/components/remote_base/lg_protocol.h
index a2e9489d09..6267560443 100644
--- a/esphome/components/remote_base/lg_protocol.h
+++ b/esphome/components/remote_base/lg_protocol.h
@@ -27,8 +27,7 @@ template<typename... Ts> class LGAction : public RemoteTransmitterActionBase<Ts.
   TEMPLATABLE_VALUE(uint32_t, data)
   TEMPLATABLE_VALUE(uint8_t, nbits)
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     LGData data{};
     data.data = this->data_.value(x...);
     data.nbits = this->nbits_.value(x...);
diff --git a/esphome/components/remote_base/nec_protocol.h b/esphome/components/remote_base/nec_protocol.h
index 8c1db632b6..593a3efe17 100644
--- a/esphome/components/remote_base/nec_protocol.h
+++ b/esphome/components/remote_base/nec_protocol.h
@@ -26,8 +26,7 @@ template<typename... Ts> class NECAction : public RemoteTransmitterActionBase<Ts
   TEMPLATABLE_VALUE(uint16_t, address)
   TEMPLATABLE_VALUE(uint16_t, command)
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     NECData data{};
     data.address = this->address_.value(x...);
     data.command = this->command_.value(x...);
diff --git a/esphome/components/remote_base/panasonic_protocol.h b/esphome/components/remote_base/panasonic_protocol.h
index 1a09b2ffd6..eae97a8a14 100644
--- a/esphome/components/remote_base/panasonic_protocol.h
+++ b/esphome/components/remote_base/panasonic_protocol.h
@@ -27,8 +27,7 @@ template<typename... Ts> class PanasonicAction : public RemoteTransmitterActionB
   TEMPLATABLE_VALUE(uint16_t, address)
   TEMPLATABLE_VALUE(uint32_t, command)
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     PanasonicData data{};
     data.address = this->address_.value(x...);
     data.command = this->command_.value(x...);
diff --git a/esphome/components/remote_base/pioneer_protocol.h b/esphome/components/remote_base/pioneer_protocol.h
index 8761762232..4cac4f9f32 100644
--- a/esphome/components/remote_base/pioneer_protocol.h
+++ b/esphome/components/remote_base/pioneer_protocol.h
@@ -26,8 +26,7 @@ template<typename... Ts> class PioneerAction : public RemoteTransmitterActionBas
   TEMPLATABLE_VALUE(uint16_t, rc_code_1)
   TEMPLATABLE_VALUE(uint16_t, rc_code_2)
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     PioneerData data{};
     data.rc_code_1 = this->rc_code_1_.value(x...);
     data.rc_code_2 = this->rc_code_2_.value(x...);
diff --git a/esphome/components/remote_base/raw_protocol.h b/esphome/components/remote_base/raw_protocol.h
index 39da5fa8fb..1d9f1c5acc 100644
--- a/esphome/components/remote_base/raw_protocol.h
+++ b/esphome/components/remote_base/raw_protocol.h
@@ -46,8 +46,7 @@ template<typename... Ts> class RawAction : public RemoteTransmitterActionBase<Ts
   }
   TEMPLATABLE_VALUE(uint32_t, carrier_frequency);
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     if (this->code_static_ != nullptr) {
       for (size_t i = 0; i < this->code_static_len_; i++) {
         auto val = this->code_static_[i];
@@ -62,6 +61,7 @@ template<typename... Ts> class RawAction : public RemoteTransmitterActionBase<Ts
     dst->set_carrier_frequency(this->carrier_frequency_.value(x...));
   }
 
+ protected:
   std::function<std::vector<int32_t>(Ts...)> code_func_{};
   const int32_t *code_static_{nullptr};
   int32_t code_static_len_{0};
diff --git a/esphome/components/remote_base/rc5_protocol.h b/esphome/components/remote_base/rc5_protocol.h
index f90284c23c..589c8d42de 100644
--- a/esphome/components/remote_base/rc5_protocol.h
+++ b/esphome/components/remote_base/rc5_protocol.h
@@ -27,8 +27,7 @@ template<typename... Ts> class RC5Action : public RemoteTransmitterActionBase<Ts
   TEMPLATABLE_VALUE(uint8_t, address)
   TEMPLATABLE_VALUE(uint8_t, command)
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     RC5Data data{};
     data.address = this->address_.value(x...);
     data.command = this->command_.value(x...);
diff --git a/esphome/components/remote_base/rc_switch_protocol.h b/esphome/components/remote_base/rc_switch_protocol.h
index 480f49ea92..8362899cec 100644
--- a/esphome/components/remote_base/rc_switch_protocol.h
+++ b/esphome/components/remote_base/rc_switch_protocol.h
@@ -71,8 +71,7 @@ template<typename... Ts> class RCSwitchRawAction : public RemoteTransmitterActio
   TEMPLATABLE_VALUE(RCSwitchBase, protocol);
   TEMPLATABLE_VALUE(std::string, code);
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     auto code = this->code_.value(x...);
     uint64_t the_code = decode_binary_string(code);
     uint8_t nbits = code.size();
@@ -89,8 +88,7 @@ template<typename... Ts> class RCSwitchTypeAAction : public RemoteTransmitterAct
   TEMPLATABLE_VALUE(std::string, device);
   TEMPLATABLE_VALUE(bool, state);
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     auto group = this->group_.value(x...);
     auto device = this->device_.value(x...);
     auto state = this->state_.value(x...);
@@ -113,8 +111,7 @@ template<typename... Ts> class RCSwitchTypeBAction : public RemoteTransmitterAct
   TEMPLATABLE_VALUE(uint8_t, channel);
   TEMPLATABLE_VALUE(bool, state);
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     auto address = this->address_.value(x...);
     auto channel = this->channel_.value(x...);
     auto state = this->state_.value(x...);
@@ -136,8 +133,7 @@ template<typename... Ts> class RCSwitchTypeCAction : public RemoteTransmitterAct
   TEMPLATABLE_VALUE(uint8_t, device);
   TEMPLATABLE_VALUE(bool, state);
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     auto family = this->family_.value(x...);
     auto group = this->group_.value(x...);
     auto device = this->device_.value(x...);
@@ -160,8 +156,7 @@ template<typename... Ts> class RCSwitchTypeDAction : public RemoteTransmitterAct
   TEMPLATABLE_VALUE(uint8_t, device);
   TEMPLATABLE_VALUE(bool, state);
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     auto group = this->group_.value(x...);
     auto device = this->device_.value(x...);
     auto state = this->state_.value(x...);
diff --git a/esphome/components/remote_base/remote_base.h b/esphome/components/remote_base/remote_base.h
index c9cae96c7a..916fe29c1f 100644
--- a/esphome/components/remote_base/remote_base.h
+++ b/esphome/components/remote_base/remote_base.h
@@ -326,17 +326,17 @@ template<typename... Ts> class RemoteTransmitterActionBase : public Action<Ts...
   TEMPLATABLE_VALUE(uint32_t, send_times);
   TEMPLATABLE_VALUE(uint32_t, send_wait);
 
- protected:
-  virtual void encode_(RemoteTransmitData *dst, Ts... x) = 0;
-
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto call = this->parent_->transmit();
-    this->encode_(call.get_data(), x...);
+    this->encode(call.get_data(), x...);
     call.set_send_times(this->send_times_.value_or(x..., 1));
     call.set_send_wait(this->send_wait_.value_or(x..., 0));
     call.perform();
   }
 
+ protected:
+  virtual void encode(RemoteTransmitData *dst, Ts... x) = 0;
+
   RemoteTransmitterBase *parent_{};
 };
 
diff --git a/esphome/components/remote_base/samsung_protocol.h b/esphome/components/remote_base/samsung_protocol.h
index 0e1666b3b4..f7a54788e5 100644
--- a/esphome/components/remote_base/samsung_protocol.h
+++ b/esphome/components/remote_base/samsung_protocol.h
@@ -25,8 +25,7 @@ template<typename... Ts> class SamsungAction : public RemoteTransmitterActionBas
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     SamsungData data{};
     data.data = this->data_.value(x...);
     SamsungProtocol().encode(dst, data);
diff --git a/esphome/components/remote_base/sony_protocol.h b/esphome/components/remote_base/sony_protocol.h
index a122d3758c..aecc8ab91c 100644
--- a/esphome/components/remote_base/sony_protocol.h
+++ b/esphome/components/remote_base/sony_protocol.h
@@ -27,8 +27,7 @@ template<typename... Ts> class SonyAction : public RemoteTransmitterActionBase<T
   TEMPLATABLE_VALUE(uint32_t, data)
   TEMPLATABLE_VALUE(uint8_t, nbits)
 
- protected:
-  void encode_(RemoteTransmitData *dst, Ts... x) override {
+  void encode(RemoteTransmitData *dst, Ts... x) override {
     SonyData data{};
     data.data = this->data_.value(x...);
     data.nbits = this->nbits_.value(x...);
diff --git a/esphome/components/rf_bridge/rf_bridge.h b/esphome/components/rf_bridge/rf_bridge.h
index c747be9972..86713b8a5c 100644
--- a/esphome/components/rf_bridge/rf_bridge.h
+++ b/esphome/components/rf_bridge/rf_bridge.h
@@ -68,8 +68,7 @@ template<typename... Ts> class RFBridgeSendCodeAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(uint16_t, high)
   TEMPLATABLE_VALUE(uint32_t, code)
 
- protected:
-  void play_(Ts... x) {
+  void play(Ts... x) {
     RFBridgeData data{};
     data.sync = this->sync_.value(x...);
     data.low = this->low_.value(x...);
@@ -78,6 +77,7 @@ template<typename... Ts> class RFBridgeSendCodeAction : public Action<Ts...> {
     this->parent_->send_code(data);
   }
 
+ protected:
   RFBridgeComponent *parent_;
 };
 
@@ -85,9 +85,9 @@ template<typename... Ts> class RFBridgeLearnAction : public Action<Ts...> {
  public:
   RFBridgeLearnAction(RFBridgeComponent *parent) : parent_(parent) {}
 
- protected:
-  void play_(Ts... x) { this->parent_->learn(); }
+  void play(Ts... x) { this->parent_->learn(); }
 
+ protected:
   RFBridgeComponent *parent_;
 };
 
diff --git a/esphome/components/rotary_encoder/rotary_encoder.h b/esphome/components/rotary_encoder/rotary_encoder.h
index 0bbcf21ddb..f0e47dfe0a 100644
--- a/esphome/components/rotary_encoder/rotary_encoder.h
+++ b/esphome/components/rotary_encoder/rotary_encoder.h
@@ -75,8 +75,9 @@ template<typename... Ts> class RotaryEncoderSetValueAction : public Action<Ts...
   RotaryEncoderSetValueAction(RotaryEncoderSensor *encoder) : encoder_(encoder) {}
   TEMPLATABLE_VALUE(int, value)
 
+  void play(Ts... x) override { this->encoder_->set_value(this->value_.value(x...)); }
+
  protected:
-  void play_(Ts... x) override { this->encoder_->set_value(this->value_.value(x...)); }
   RotaryEncoderSensor *encoder_;
 };
 
diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index 92eba15e41..8495014f00 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -23,9 +23,9 @@ template<typename... Ts> class ScriptExecuteAction : public Action<Ts...> {
  public:
   ScriptExecuteAction(Script *script) : script_(script) {}
 
- protected:
-  void play_(Ts... x) override { this->script_->trigger(); }
+  void play(Ts... x) override { this->script_->trigger(); }
 
+ protected:
   Script *script_;
 };
 
@@ -33,9 +33,9 @@ template<typename... Ts> class ScriptStopAction : public Action<Ts...> {
  public:
   ScriptStopAction(Script *script) : script_(script) {}
 
- protected:
-  void play_(Ts... x) override { this->script_->stop(); }
+  void play(Ts... x) override { this->script_->stop(); }
 
+ protected:
   Script *script_;
 };
 
@@ -76,10 +76,10 @@ template<typename... Ts> class ScriptWaitAction : public Action<Ts...>, public C
 
   float get_setup_priority() const override { return setup_priority::DATA; }
 
- protected:
-  void play_(Ts... x) override { /* ignore - see play_complex */
+  void play(Ts... x) override { /* ignore - see play_complex */
   }
 
+ protected:
   Script *script_;
   std::tuple<Ts...> var_{};
 };
diff --git a/esphome/components/sensor/automation.h b/esphome/components/sensor/automation.h
index e6ddc3b95c..c70fb93963 100644
--- a/esphome/components/sensor/automation.h
+++ b/esphome/components/sensor/automation.h
@@ -26,8 +26,9 @@ template<typename... Ts> class SensorPublishAction : public Action<Ts...> {
   SensorPublishAction(Sensor *sensor) : sensor_(sensor) {}
   TEMPLATABLE_VALUE(float, state)
 
+  void play(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
+
  protected:
-  void play_(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
   Sensor *sensor_;
 };
 
diff --git a/esphome/components/servo/servo.h b/esphome/components/servo/servo.h
index b4076e8cd5..b864efc877 100644
--- a/esphome/components/servo/servo.h
+++ b/esphome/components/servo/servo.h
@@ -65,8 +65,9 @@ template<typename... Ts> class ServoWriteAction : public Action<Ts...> {
   ServoWriteAction(Servo *servo) : servo_(servo) {}
   TEMPLATABLE_VALUE(float, value)
 
+  void play(Ts... x) override { this->servo_->write(this->value_.value(x...)); }
+
  protected:
-  void play_(Ts... x) override { this->servo_->write(this->value_.value(x...)); }
   Servo *servo_;
 };
 
@@ -74,8 +75,9 @@ template<typename... Ts> class ServoDetachAction : public Action<Ts...> {
  public:
   ServoDetachAction(Servo *servo) : servo_(servo) {}
 
+  void play(Ts... x) override { this->servo_->detach(); }
+
  protected:
-  void play_(Ts... x) override { this->servo_->detach(); }
   Servo *servo_;
 };
 
diff --git a/esphome/components/sim800l/sim800l.h b/esphome/components/sim800l/sim800l.h
index afdb504681..696eb8890f 100644
--- a/esphome/components/sim800l/sim800l.h
+++ b/esphome/components/sim800l/sim800l.h
@@ -78,13 +78,13 @@ template<typename... Ts> class Sim800LSendSmsAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(std::string, recipient)
   TEMPLATABLE_VALUE(std::string, message)
 
- protected:
-  void play_(Ts... x) {
+  void play(Ts... x) {
     auto recipient = this->recipient_.value(x...);
     auto message = this->message_.value(x...);
     this->parent_->send_sms(recipient, message);
   }
 
+ protected:
   Sim800LComponent *parent_;
 };
 
diff --git a/esphome/components/stepper/stepper.h b/esphome/components/stepper/stepper.h
index 31bdf59bf9..33777dce83 100644
--- a/esphome/components/stepper/stepper.h
+++ b/esphome/components/stepper/stepper.h
@@ -43,9 +43,9 @@ template<typename... Ts> class SetTargetAction : public Action<Ts...> {
 
   TEMPLATABLE_VALUE(int32_t, target)
 
- protected:
-  void play_(Ts... x) override { this->parent_->set_target(this->target_.value(x...)); }
+  void play(Ts... x) override { this->parent_->set_target(this->target_.value(x...)); }
 
+ protected:
   Stepper *parent_;
 };
 
@@ -55,9 +55,9 @@ template<typename... Ts> class ReportPositionAction : public Action<Ts...> {
 
   TEMPLATABLE_VALUE(int32_t, position)
 
- protected:
-  void play_(Ts... x) override { this->parent_->report_position(this->position_.value(x...)); }
+  void play(Ts... x) override { this->parent_->report_position(this->position_.value(x...)); }
 
+ protected:
   Stepper *parent_;
 };
 
@@ -67,13 +67,13 @@ template<typename... Ts> class SetSpeedAction : public Action<Ts...> {
 
   TEMPLATABLE_VALUE(float, speed);
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     float speed = this->speed_.value(x...);
     this->parent_->set_max_speed(speed);
     this->parent_->on_update_speed();
   }
 
+ protected:
   Stepper *parent_;
 };
 
diff --git a/esphome/components/switch/automation.h b/esphome/components/switch/automation.h
index c4824b106b..579daf4d24 100644
--- a/esphome/components/switch/automation.h
+++ b/esphome/components/switch/automation.h
@@ -11,9 +11,9 @@ template<typename... Ts> class TurnOnAction : public Action<Ts...> {
  public:
   explicit TurnOnAction(Switch *a_switch) : switch_(a_switch) {}
 
- protected:
-  void play_(Ts... x) override { this->switch_->turn_on(); }
+  void play(Ts... x) override { this->switch_->turn_on(); }
 
+ protected:
   Switch *switch_;
 };
 
@@ -21,9 +21,9 @@ template<typename... Ts> class TurnOffAction : public Action<Ts...> {
  public:
   explicit TurnOffAction(Switch *a_switch) : switch_(a_switch) {}
 
- protected:
-  void play_(Ts... x) override { this->switch_->turn_off(); }
+  void play(Ts... x) override { this->switch_->turn_off(); }
 
+ protected:
   Switch *switch_;
 };
 
@@ -31,9 +31,9 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
  public:
   explicit ToggleAction(Switch *a_switch) : switch_(a_switch) {}
 
- protected:
-  void play_(Ts... x) override { this->switch_->toggle(); }
+  void play(Ts... x) override { this->switch_->toggle(); }
 
+ protected:
   Switch *switch_;
 };
 
@@ -74,8 +74,9 @@ template<typename... Ts> class SwitchPublishAction : public Action<Ts...> {
   SwitchPublishAction(Switch *a_switch) : switch_(a_switch) {}
   TEMPLATABLE_VALUE(bool, state)
 
+  void play(Ts... x) override { this->switch_->publish_state(this->state_.value(x...)); }
+
  protected:
-  void play_(Ts... x) override { this->switch_->publish_state(this->state_.value(x...)); }
   Switch *switch_;
 };
 
diff --git a/esphome/components/text_sensor/automation.h b/esphome/components/text_sensor/automation.h
index 9fac17c4cb..6810d10b13 100644
--- a/esphome/components/text_sensor/automation.h
+++ b/esphome/components/text_sensor/automation.h
@@ -31,8 +31,9 @@ template<typename... Ts> class TextSensorPublishAction : public Action<Ts...> {
   TextSensorPublishAction(TextSensor *sensor) : sensor_(sensor) {}
   TEMPLATABLE_VALUE(std::string, state)
 
+  void play(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
+
  protected:
-  void play_(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
   TextSensor *sensor_;
 };
 
diff --git a/esphome/components/tm1651/tm1651.h b/esphome/components/tm1651/tm1651.h
index 6291cf1ecf..6eab24687c 100644
--- a/esphome/components/tm1651/tm1651.h
+++ b/esphome/components/tm1651/tm1651.h
@@ -43,8 +43,7 @@ template<typename... Ts> class SetLevelPercentAction : public Action<Ts...>, pub
  public:
   TEMPLATABLE_VALUE(uint8_t, level_percent)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto level_percent = this->level_percent_.value(x...);
     this->parent_->set_level_percent(level_percent);
   }
@@ -54,8 +53,7 @@ template<typename... Ts> class SetLevelAction : public Action<Ts...>, public Par
  public:
   TEMPLATABLE_VALUE(uint8_t, level)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto level = this->level_.value(x...);
     this->parent_->set_level(level);
   }
@@ -65,21 +63,20 @@ template<typename... Ts> class SetBrightnessAction : public Action<Ts...>, publi
  public:
   TEMPLATABLE_VALUE(uint8_t, brightness)
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     auto brightness = this->brightness_.value(x...);
     this->parent_->set_brightness(brightness);
   }
 };
 
 template<typename... Ts> class TurnOnAction : public Action<Ts...>, public Parented<TM1651Display> {
- protected:
-  void play_(Ts... x) override { this->parent_->turn_on(); }
+ public:
+  void play(Ts... x) override { this->parent_->turn_on(); }
 };
 
 template<typename... Ts> class TurnOffAction : public Action<Ts...>, public Parented<TM1651Display> {
- protected:
-  void play_(Ts... x) override { this->parent_->turn_off(); }
+ public:
+  void play(Ts... x) override { this->parent_->turn_off(); }
 };
 
 }  // namespace tm1651
diff --git a/esphome/components/uart/automation.h b/esphome/components/uart/automation.h
index 6889bc12e4..2212e58449 100644
--- a/esphome/components/uart/automation.h
+++ b/esphome/components/uart/automation.h
@@ -17,8 +17,7 @@ template<typename... Ts> class UARTWriteAction : public Action<Ts...>, public Pa
     this->static_ = true;
   }
 
- protected:
-  void play_(Ts... x) override {
+  void play(Ts... x) override {
     if (this->static_) {
       this->parent_->write_array(this->data_static_);
     } else {
@@ -26,6 +25,7 @@ template<typename... Ts> class UARTWriteAction : public Action<Ts...>, public Pa
       this->parent_->write_array(val);
     }
   }
+ protected:
   bool static_{false};
   std::function<std::vector<uint8_t>(Ts...)> data_func_{};
   std::vector<uint8_t> data_static_{};
diff --git a/esphome/core/automation.h b/esphome/core/automation.h
index cb95364675..02bd8bb299 100644
--- a/esphome/core/automation.h
+++ b/esphome/core/automation.h
@@ -77,12 +77,12 @@ template<typename... Ts> class Action {
  public:
   virtual void play_complex(Ts... x) {
     this->num_running_++;
-    this->play_(x...);
+    this->play(x...);
     this->play_next_(x...);
   }
   virtual void stop_complex() {
     if (num_running_) {
-      this->stop_();
+      this->stop();
       this->num_running_ = 0;
     }
     this->stop_next_();
@@ -92,7 +92,7 @@ template<typename... Ts> class Action {
  protected:
   friend ActionList<Ts...>;
 
-  virtual void play_(Ts... x) = 0;
+  virtual void play(Ts... x) = 0;
   void play_next_(Ts... x) {
     if (this->num_running_ > 0) {
       this->num_running_--;
@@ -108,7 +108,7 @@ template<typename... Ts> class Action {
     this->play_next_tuple_(tuple, typename gens<sizeof...(Ts)>::type());
   }
 
-  virtual void stop_() {}
+  virtual void stop() {}
   void stop_next_() {
     if (this->next_ != nullptr) {
       this->next_->stop_complex();
diff --git a/esphome/core/base_automation.h b/esphome/core/base_automation.h
index 4edd459424..d2656290bc 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -115,22 +115,19 @@ template<typename... Ts> class DelayAction : public Action<Ts...>, public Compon
   }
   float get_setup_priority() const override { return setup_priority::HARDWARE; }
 
- protected:
-  void play_(Ts... x) override { /* ignore - see play_complex */
+  void play(Ts... x) override { /* ignore - see play_complex */
   }
 
-  void stop_() override {
-    this->cancel_timeout("");
-  }
+  void stop() override { this->cancel_timeout(""); }
 };
 
 template<typename... Ts> class LambdaAction : public Action<Ts...> {
  public:
   explicit LambdaAction(std::function<void(Ts...)> &&f) : f_(std::move(f)) {}
 
- protected:
-  void play_(Ts... x) override { this->f_(x...); }
+  void play(Ts... x) override { this->f_(x...); }
 
+ protected:
   std::function<void(Ts...)> f_;
 };
 
@@ -166,15 +163,15 @@ template<typename... Ts> class IfAction : public Action<Ts...> {
     }
   }
 
- protected:
-  void play_(Ts... x) override { /* ignore - see play_complex */
+  void play(Ts... x) override { /* ignore - see play_complex */
   }
 
-  void stop_() override {
+  void stop() override {
     this->then_.stop();
     this->else_.stop();
   }
 
+ protected:
   Condition<Ts...> *condition_;
   ActionList<Ts...> then_;
   ActionList<Ts...> else_;
@@ -216,12 +213,12 @@ template<typename... Ts> class WhileAction : public Action<Ts...> {
     }
   }
 
- protected:
-  void play_(Ts... x) override { /* ignore - see play_complex */
+  void play(Ts... x) override { /* ignore - see play_complex */
   }
 
-  void stop_() override { this->then_.stop(); }
+  void stop() override { this->then_.stop(); }
 
+ protected:
   Condition<Ts...> *condition_;
   ActionList<Ts...> then_;
   std::tuple<Ts...> var_{};
@@ -257,10 +254,10 @@ template<typename... Ts> class WaitUntilAction : public Action<Ts...>, public Co
 
   float get_setup_priority() const override { return setup_priority::DATA; }
 
- protected:
-  void play_(Ts... x) override { /* ignore - see play_complex */
+  void play(Ts... x) override { /* ignore - see play_complex */
   }
 
+ protected:
   Condition<Ts...> *condition_;
   std::tuple<Ts...> var_{};
 };
@@ -269,9 +266,9 @@ template<typename... Ts> class UpdateComponentAction : public Action<Ts...> {
  public:
   UpdateComponentAction(PollingComponent *component) : component_(component) {}
 
- protected:
-  void play_(Ts... x) override { this->component_->update(); }
+  void play(Ts... x) override { this->component_->update(); }
 
+ protected:
   PollingComponent *component_;
 };
 

From 9e7e8ab116b47e784dd480dd870c4d23ad891ee9 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 24 May 2020 23:45:15 -0300
Subject: [PATCH 218/412] format

---
 esphome/components/uart/automation.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/uart/automation.h b/esphome/components/uart/automation.h
index 2212e58449..9686f94413 100644
--- a/esphome/components/uart/automation.h
+++ b/esphome/components/uart/automation.h
@@ -25,6 +25,7 @@ template<typename... Ts> class UARTWriteAction : public Action<Ts...>, public Pa
       this->parent_->write_array(val);
     }
   }
+
  protected:
   bool static_{false};
   std::function<std::vector<uint8_t>(Ts...)> data_func_{};

From 3fba3a5e2e812485a49dd7cf38aed7e1ff403c94 Mon Sep 17 00:00:00 2001
From: Alexander Pohl <alex@ahpohl.com>
Date: Wed, 27 May 2020 00:33:28 +0200
Subject: [PATCH 219/412] Add support for additional Xiaomi BLE sensors (#1027)
 (#1027)

---
 .travis.yml                                   |   1 +
 esphome/components/xiaomi_ble/xiaomi_ble.cpp  | 437 ++++++++++++------
 esphome/components/xiaomi_ble/xiaomi_ble.h    |  50 +-
 esphome/components/xiaomi_cgd1/__init__.py    |   0
 esphome/components/xiaomi_cgd1/sensor.py      |  43 ++
 .../components/xiaomi_cgd1/xiaomi_cgd1.cpp    |  77 +++
 esphome/components/xiaomi_cgd1/xiaomi_cgd1.h  |  36 ++
 .../components/xiaomi_cgg1/xiaomi_cgg1.cpp    |  42 ++
 esphome/components/xiaomi_cgg1/xiaomi_cgg1.h  |  17 +-
 esphome/components/xiaomi_gcls002/__init__.py |   0
 esphome/components/xiaomi_gcls002/sensor.py   |  45 ++
 .../xiaomi_gcls002/xiaomi_gcls002.cpp         |  66 +++
 .../xiaomi_gcls002/xiaomi_gcls002.h           |  37 ++
 esphome/components/xiaomi_hhccjcy01/sensor.py |   8 +-
 .../xiaomi_hhccjcy01/xiaomi_hhccjcy01.cpp     |  45 +-
 .../xiaomi_hhccjcy01/xiaomi_hhccjcy01.h       |  23 +-
 .../components/xiaomi_hhccpot002/__init__.py  |   0
 .../components/xiaomi_hhccpot002/sensor.py    |  35 ++
 .../xiaomi_hhccpot002/xiaomi_hhccpot002.cpp   |  60 +++
 .../xiaomi_hhccpot002/xiaomi_hhccpot002.h     |  33 ++
 .../components/xiaomi_jqjcy01ym/__init__.py   |   0
 esphome/components/xiaomi_jqjcy01ym/sensor.py |  44 ++
 .../xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.cpp     |  66 +++
 .../xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.h       |  37 ++
 .../xiaomi_lywsd02/xiaomi_lywsd02.cpp         |  40 ++
 .../xiaomi_lywsd02/xiaomi_lywsd02.h           |  15 +-
 .../components/xiaomi_lywsd03mmc/__init__.py  |   0
 .../components/xiaomi_lywsd03mmc/sensor.py    |  44 ++
 .../xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.cpp   |  81 ++++
 .../xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.h     |  36 ++
 .../xiaomi_lywsdcgq/xiaomi_lywsdcgq.cpp       |  42 ++
 .../xiaomi_lywsdcgq/xiaomi_lywsdcgq.h         |  17 +-
 .../components/xiaomi_mjyd02yla/__init__.py   |   0
 .../xiaomi_mjyd02yla/binary_sensor.py         |  47 ++
 .../xiaomi_mjyd02yla/xiaomi_mjyd02yla.cpp     |  79 ++++
 .../xiaomi_mjyd02yla/xiaomi_mjyd02yla.h       |  40 ++
 .../components/xiaomi_mue4094rt/__init__.py   |   0
 .../xiaomi_mue4094rt/binary_sensor.py         |  29 ++
 .../xiaomi_mue4094rt/xiaomi_mue4094rt.cpp     |  59 +++
 .../xiaomi_mue4094rt/xiaomi_mue4094rt.h       |  33 ++
 esphome/components/xiaomi_wx08zm/__init__.py  |   0
 .../components/xiaomi_wx08zm/binary_sensor.py |  36 ++
 .../xiaomi_wx08zm/xiaomi_wx08zm.cpp           |  64 +++
 .../components/xiaomi_wx08zm/xiaomi_wx08zm.h  |  36 ++
 esphome/config_validation.py                  |  17 +
 esphome/const.py                              |  10 +
 tests/test2.yaml                              | 151 ++++--
 tests/test4.yaml                              |  73 +++
 48 files changed, 1875 insertions(+), 276 deletions(-)
 create mode 100644 esphome/components/xiaomi_cgd1/__init__.py
 create mode 100644 esphome/components/xiaomi_cgd1/sensor.py
 create mode 100644 esphome/components/xiaomi_cgd1/xiaomi_cgd1.cpp
 create mode 100644 esphome/components/xiaomi_cgd1/xiaomi_cgd1.h
 create mode 100644 esphome/components/xiaomi_gcls002/__init__.py
 create mode 100644 esphome/components/xiaomi_gcls002/sensor.py
 create mode 100644 esphome/components/xiaomi_gcls002/xiaomi_gcls002.cpp
 create mode 100644 esphome/components/xiaomi_gcls002/xiaomi_gcls002.h
 create mode 100644 esphome/components/xiaomi_hhccpot002/__init__.py
 create mode 100644 esphome/components/xiaomi_hhccpot002/sensor.py
 create mode 100644 esphome/components/xiaomi_hhccpot002/xiaomi_hhccpot002.cpp
 create mode 100644 esphome/components/xiaomi_hhccpot002/xiaomi_hhccpot002.h
 create mode 100644 esphome/components/xiaomi_jqjcy01ym/__init__.py
 create mode 100644 esphome/components/xiaomi_jqjcy01ym/sensor.py
 create mode 100644 esphome/components/xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.cpp
 create mode 100644 esphome/components/xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.h
 create mode 100644 esphome/components/xiaomi_lywsd03mmc/__init__.py
 create mode 100644 esphome/components/xiaomi_lywsd03mmc/sensor.py
 create mode 100644 esphome/components/xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.cpp
 create mode 100644 esphome/components/xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.h
 create mode 100644 esphome/components/xiaomi_mjyd02yla/__init__.py
 create mode 100644 esphome/components/xiaomi_mjyd02yla/binary_sensor.py
 create mode 100644 esphome/components/xiaomi_mjyd02yla/xiaomi_mjyd02yla.cpp
 create mode 100644 esphome/components/xiaomi_mjyd02yla/xiaomi_mjyd02yla.h
 create mode 100644 esphome/components/xiaomi_mue4094rt/__init__.py
 create mode 100644 esphome/components/xiaomi_mue4094rt/binary_sensor.py
 create mode 100644 esphome/components/xiaomi_mue4094rt/xiaomi_mue4094rt.cpp
 create mode 100644 esphome/components/xiaomi_mue4094rt/xiaomi_mue4094rt.h
 create mode 100644 esphome/components/xiaomi_wx08zm/__init__.py
 create mode 100644 esphome/components/xiaomi_wx08zm/binary_sensor.py
 create mode 100644 esphome/components/xiaomi_wx08zm/xiaomi_wx08zm.cpp
 create mode 100644 esphome/components/xiaomi_wx08zm/xiaomi_wx08zm.h
 create mode 100644 tests/test4.yaml

diff --git a/.travis.yml b/.travis.yml
index ca0a3082db..3e6c7adccb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,7 @@ matrix:
         - esphome tests/test1.yaml compile
         - esphome tests/test2.yaml compile
         - esphome tests/test3.yaml compile
+        - esphome tests/test4.yaml compile
     - env: TARGET=Cpp-Lint
       dist: trusty
       sudo: required
diff --git a/esphome/components/xiaomi_ble/xiaomi_ble.cpp b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
index 030ee73d4b..2ca27bf51a 100644
--- a/esphome/components/xiaomi_ble/xiaomi_ble.cpp
+++ b/esphome/components/xiaomi_ble/xiaomi_ble.cpp
@@ -1,187 +1,322 @@
 #include "xiaomi_ble.h"
 #include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
 
 #ifdef ARDUINO_ARCH_ESP32
 
+#include <vector>
+#include "mbedtls/ccm.h"
+
 namespace esphome {
 namespace xiaomi_ble {
 
 static const char *TAG = "xiaomi_ble";
 
-bool parse_xiaomi_data_byte(uint8_t data_type, const uint8_t *data, uint8_t data_length, XiaomiParseResult &result) {
-  switch (data_type) {
-    case 0x0D: {  // temperature+humidity, 4 bytes, 16-bit signed integer (LE) each, 0.1 °C, 0.1 %
-      if (data_length != 4)
-        return false;
-      const int16_t temperature = uint16_t(data[0]) | (uint16_t(data[1]) << 8);
-      const int16_t humidity = uint16_t(data[2]) | (uint16_t(data[3]) << 8);
-      result.temperature = temperature / 10.0f;
-      result.humidity = humidity / 10.0f;
-      return true;
-    }
-    case 0x0A: {  // battery, 1 byte, 8-bit unsigned integer, 1 %
-      if (data_length != 1)
-        return false;
-      result.battery_level = data[0];
-      return true;
-    }
-    case 0x06: {  // humidity, 2 bytes, 16-bit signed integer (LE), 0.1 %
-      if (data_length != 2)
-        return false;
-      const int16_t humidity = uint16_t(data[0]) | (uint16_t(data[1]) << 8);
-      result.humidity = humidity / 10.0f;
-      return true;
-    }
-    case 0x04: {  // temperature, 2 bytes, 16-bit signed integer (LE), 0.1 °C
-      if (data_length != 2)
-        return false;
-      const int16_t temperature = uint16_t(data[0]) | (uint16_t(data[1]) << 8);
-      result.temperature = temperature / 10.0f;
-      return true;
-    }
-    case 0x09: {  // conductivity, 2 bytes, 16-bit unsigned integer (LE), 1 µS/cm
-      if (data_length != 2)
-        return false;
-      const uint16_t conductivity = uint16_t(data[0]) | (uint16_t(data[1]) << 8);
-      result.conductivity = conductivity;
-      return true;
-    }
-    case 0x07: {  // illuminance, 3 bytes, 24-bit unsigned integer (LE), 1 lx
-      if (data_length != 3)
-        return false;
-      const uint32_t illuminance = uint32_t(data[0]) | (uint32_t(data[1]) << 8) | (uint32_t(data[2]) << 16);
-      result.illuminance = illuminance;
-      return true;
-    }
-    case 0x08: {  // soil moisture, 1 byte, 8-bit unsigned integer, 1 %
-      if (data_length != 1)
-        return false;
-      result.moisture = data[0];
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool parse_xiaomi_service_data(XiaomiParseResult &result, const esp32_ble_tracker::ServiceData &service_data) {
-  if (!service_data.uuid.contains(0x95, 0xFE)) {
-    // ESP_LOGVV(TAG, "Xiaomi no service data UUID magic bytes");
+bool parse_xiaomi_message(const std::vector<uint8_t> &message, XiaomiParseResult &result) {
+  result.has_encryption = (message[0] & 0x08) ? true : false;  // update encryption status
+  if (result.has_encryption) {
+    ESP_LOGVV(TAG, "parse_xiaomi_message(): payload is encrypted, stop reading message.");
     return false;
   }
 
-  const auto raw = service_data.data;
-
-  if (raw.size() < 14) {
-    // ESP_LOGVV(TAG, "Xiaomi service data too short!");
-    return false;
-  }
-
-  bool is_lywsdcgq = (raw[1] & 0x20) == 0x20 && raw[2] == 0xAA && raw[3] == 0x01;
-  bool is_hhccjcy01 = (raw[1] & 0x20) == 0x20 && raw[2] == 0x98 && raw[3] == 0x00;
-  bool is_lywsd02 = (raw[1] & 0x20) == 0x20 && raw[2] == 0x5b && raw[3] == 0x04;
-  bool is_cgg1 = ((raw[1] & 0x30) == 0x30 || (raw[1] & 0x20) == 0x20) && raw[2] == 0x47 && raw[3] == 0x03;
-
-  if (!is_lywsdcgq && !is_hhccjcy01 && !is_lywsd02 && !is_cgg1) {
-    // ESP_LOGVV(TAG, "Xiaomi no magic bytes");
-    return false;
-  }
-
-  result.type = XiaomiParseResult::TYPE_HHCCJCY01;
-  if (is_lywsdcgq) {
-    result.type = XiaomiParseResult::TYPE_LYWSDCGQ;
-  } else if (is_lywsd02) {
-    result.type = XiaomiParseResult::TYPE_LYWSD02;
-  } else if (is_cgg1) {
-    result.type = XiaomiParseResult::TYPE_CGG1;
-  }
-
-  uint8_t raw_offset = is_lywsdcgq || is_cgg1 ? 11 : 12;
-
   // Data point specs
   // Byte 0: type
   // Byte 1: fixed 0x10
   // Byte 2: length
   // Byte 3..3+len-1: data point value
 
-  const uint8_t *raw_data = &raw[raw_offset];
-  uint8_t data_offset = 0;
-  uint8_t data_length = raw.size() - raw_offset;
-  bool success = false;
+  const uint8_t *raw = message.data() + result.raw_offset;
+  const uint8_t *data = raw + 3;
+  const uint8_t data_length = raw[2];
 
-  while (true) {
-    if (data_length < 4)
-      // at least 4 bytes required
-      // type, fixed 0x10, length, 1 byte value
-      break;
-
-    const uint8_t datapoint_type = raw_data[data_offset + 0];
-    const uint8_t datapoint_length = raw_data[data_offset + 2];
-
-    if (data_length < 3 + datapoint_length)
-      // 3 fixed bytes plus value length
-      break;
-
-    const uint8_t *datapoint_data = &raw_data[data_offset + 3];
-
-    if (parse_xiaomi_data_byte(datapoint_type, datapoint_data, datapoint_length, result))
-      success = true;
-
-    data_length -= data_offset + 3 + datapoint_length;
-    data_offset += 3 + datapoint_length;
-  }
-
-  return success;
-}
-optional<XiaomiParseResult> parse_xiaomi(const esp32_ble_tracker::ESPBTDevice &device) {
-  XiaomiParseResult result;
-  bool success = false;
-  for (auto &service_data : device.get_service_datas()) {
-    if (parse_xiaomi_service_data(result, service_data))
-      success = true;
-  }
-  if (!success)
-    return {};
-  return result;
-}
-
-bool XiaomiListener::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
-  auto res = parse_xiaomi(device);
-  if (!res.has_value())
+  if ((data_length < 1) || (data_length > 4)) {
+    ESP_LOGVV(TAG, "parse_xiaomi_message(): payload has wrong size (%d)!", data_length);
     return false;
-
-  const char *name = "HHCCJCY01";
-  if (res->type == XiaomiParseResult::TYPE_LYWSDCGQ) {
-    name = "LYWSDCGQ";
-  } else if (res->type == XiaomiParseResult::TYPE_LYWSD02) {
-    name = "LYWSD02";
-  } else if (res->type == XiaomiParseResult::TYPE_CGG1) {
-    name = "CGG1";
   }
 
-  ESP_LOGD(TAG, "Got Xiaomi %s (%s):", name, device.address_str().c_str());
-
-  if (res->temperature.has_value()) {
-    ESP_LOGD(TAG, "  Temperature: %.1f°C", *res->temperature);
+  // motion detection, 1 byte, 8-bit unsigned integer
+  if ((raw[0] == 0x03) && (data_length == 1)) {
+    result.has_motion = (data[0]) ? true : false;
   }
-  if (res->humidity.has_value()) {
-    ESP_LOGD(TAG, "  Humidity: %.1f%%", *res->humidity);
+  // temperature, 2 bytes, 16-bit signed integer (LE), 0.1 °C
+  else if ((raw[0] == 0x04) && (data_length == 2)) {
+    const int16_t temperature = uint16_t(data[0]) | (uint16_t(data[1]) << 8);
+    result.temperature = temperature / 10.0f;
   }
-  if (res->battery_level.has_value()) {
-    ESP_LOGD(TAG, "  Battery Level: %.0f%%", *res->battery_level);
+  // humidity, 2 bytes, 16-bit signed integer (LE), 0.1 %
+  else if ((raw[0] == 0x06) && (data_length == 2)) {
+    const int16_t humidity = uint16_t(data[0]) | (uint16_t(data[1]) << 8);
+    result.humidity = humidity / 10.0f;
   }
-  if (res->conductivity.has_value()) {
-    ESP_LOGD(TAG, "  Conductivity: %.0fµS/cm", *res->conductivity);
+  // illuminance (+ motion), 3 bytes, 24-bit unsigned integer (LE), 1 lx
+  else if (((raw[0] == 0x07) || (raw[0] == 0x0F)) && (data_length == 3)) {
+    const uint32_t illuminance = uint32_t(data[0]) | (uint32_t(data[1]) << 8) | (uint32_t(data[2]) << 16);
+    result.illuminance = illuminance;
+    result.is_light = (illuminance == 100) ? true : false;
+    if (raw[0] == 0x0F)
+      result.has_motion = true;
   }
-  if (res->illuminance.has_value()) {
-    ESP_LOGD(TAG, "  Illuminance: %.0flx", *res->illuminance);
+  // soil moisture, 1 byte, 8-bit unsigned integer, 1 %
+  else if ((raw[0] == 0x08) && (data_length == 1)) {
+    result.moisture = data[0];
   }
-  if (res->moisture.has_value()) {
-    ESP_LOGD(TAG, "  Moisture: %.0f%%", *res->moisture);
+  // conductivity, 2 bytes, 16-bit unsigned integer (LE), 1 µS/cm
+  else if ((raw[0] == 0x09) && (data_length == 2)) {
+    const uint16_t conductivity = uint16_t(data[0]) | (uint16_t(data[1]) << 8);
+    result.conductivity = conductivity;
+  }
+  // battery, 1 byte, 8-bit unsigned integer, 1 %
+  else if ((raw[0] == 0x0A) && (data_length == 1)) {
+    result.battery_level = data[0];
+  }
+  // temperature + humidity, 4 bytes, 16-bit signed integer (LE) each, 0.1 °C, 0.1 %
+  else if ((raw[0] == 0x0D) && (data_length == 4)) {
+    const int16_t temperature = uint16_t(data[0]) | (uint16_t(data[1]) << 8);
+    const int16_t humidity = uint16_t(data[2]) | (uint16_t(data[3]) << 8);
+    result.temperature = temperature / 10.0f;
+    result.humidity = humidity / 10.0f;
+  }
+  // formaldehyde, 2 bytes, 16-bit unsigned integer (LE), 0.01 mg / m3
+  else if ((raw[0] == 0x10) && (data_length == 2)) {
+    const uint16_t formaldehyde = uint16_t(data[0]) | (uint16_t(data[1]) << 8);
+    result.formaldehyde = formaldehyde / 100.0f;
+  }
+  // on/off state, 1 byte, 8-bit unsigned integer
+  else if ((raw[0] == 0x12) && (data_length == 1)) {
+    result.is_active = (data[0]) ? true : false;
+  }
+  // mosquito tablet, 1 byte, 8-bit unsigned integer, 1 %
+  else if ((raw[0] == 0x13) && (data_length == 1)) {
+    result.tablet = data[0];
+  }
+  // idle time since last motion, 4 byte, 32-bit unsigned integer, 1 min
+  else if ((raw[0] == 0x17) && (data_length == 4)) {
+    const uint32_t idle_time =
+        uint32_t(data[0]) | (uint32_t(data[1]) << 8) | (uint32_t(data[2]) << 16) | (uint32_t(data[2]) << 24);
+    result.idle_time = idle_time / 60.0f;
+    result.has_motion = (idle_time) ? false : true;
+  } else {
+    return false;
   }
 
   return true;
 }
 
+optional<XiaomiParseResult> parse_xiaomi_header(const esp32_ble_tracker::ServiceData &service_data) {
+  XiaomiParseResult result;
+  if (!service_data.uuid.contains(0x95, 0xFE)) {
+    ESP_LOGVV(TAG, "parse_xiaomi_header(): no service data UUID magic bytes.");
+    return {};
+  }
+
+  auto raw = service_data.data;
+  result.has_data = (raw[0] & 0x40) ? true : false;
+  result.has_capability = (raw[0] & 0x20) ? true : false;
+  result.has_encryption = (raw[0] & 0x08) ? true : false;
+
+  if (!result.has_data) {
+    ESP_LOGVV(TAG, "parse_xiaomi_header(): service data has no DATA flag.");
+    return {};
+  }
+
+  static uint8_t last_frame_count = 0;
+  if (last_frame_count == raw[4]) {
+    ESP_LOGVV(TAG, "parse_xiaomi_header(): duplicate data packet received (%d).", static_cast<int>(last_frame_count));
+    result.is_duplicate = true;
+    return {};
+  }
+  last_frame_count = raw[4];
+  result.is_duplicate = false;
+  result.raw_offset = result.has_capability ? 12 : 11;
+
+  if ((raw[2] == 0x98) && (raw[3] == 0x00)) {  // MiFlora
+    result.type = XiaomiParseResult::TYPE_HHCCJCY01;
+    result.name = "HHCCJCY01";
+  } else if ((raw[2] == 0xaa) && (raw[3] == 0x01)) {  // round body, segment LCD
+    result.type = XiaomiParseResult::TYPE_LYWSDCGQ;
+    result.name = "LYWSDCGQ";
+  } else if ((raw[2] == 0x5d) && (raw[3] == 0x01)) {  // FlowerPot, RoPot
+    result.type = XiaomiParseResult::TYPE_HHCCPOT002;
+    result.name = "HHCCPOT002";
+  } else if ((raw[2] == 0xdf) && (raw[3] == 0x02)) {  // Xiaomi (Honeywell) formaldehyde sensor, OLED display
+    result.type = XiaomiParseResult::TYPE_JQJCY01YM;
+    result.name = "JQJCY01YM";
+  } else if ((raw[2] == 0xdd) && (raw[3] == 0x03)) {  // Philips/Xiaomi BLE nightlight
+    result.type = XiaomiParseResult::TYPE_MUE4094RT;
+    result.name = "MUE4094RT";
+    result.raw_offset -= 6;
+  } else if ((raw[2] == 0x47) && (raw[3] == 0x03)) {  // round body, e-ink display
+    result.type = XiaomiParseResult::TYPE_CGG1;
+    result.name = "CGG1";
+  } else if ((raw[2] == 0xbc) && (raw[3] == 0x03)) {  // VegTrug Grow Care Garden
+    result.type = XiaomiParseResult::TYPE_GCLS002;
+    result.name = "GCLS002";
+  } else if ((raw[2] == 0x5b) && (raw[3] == 0x04)) {  // rectangular body, e-ink display
+    result.type = XiaomiParseResult::TYPE_LYWSD02;
+    result.name = "LYWSD02";
+  } else if ((raw[2] == 0x0a) && (raw[3] == 0x04)) {  // Mosquito Repellent Smart Version
+    result.type = XiaomiParseResult::TYPE_WX08ZM;
+    result.name = "WX08ZM";
+  } else if ((raw[2] == 0x76) && (raw[3] == 0x05)) {  // Cleargrass (Qingping) alarm clock, segment LCD
+    result.type = XiaomiParseResult::TYPE_CGD1;
+    result.name = "CGD1";
+  } else if ((raw[2] == 0x5b) && (raw[3] == 0x05)) {  // small square body, segment LCD, encrypted
+    result.type = XiaomiParseResult::TYPE_LYWSD03MMC;
+    result.name = "LYWSD03MMC";
+  } else if ((raw[2] == 0xf6) && (raw[3] == 0x07)) {  // Xiaomi-Yeelight BLE nightlight
+    result.type = XiaomiParseResult::TYPE_MJYD02YLA;
+    result.name = "MJYD02YLA";
+    if (raw.size() == 19)
+      result.raw_offset -= 6;
+  } else {
+    ESP_LOGVV(TAG, "parse_xiaomi_header(): unknown device, no magic bytes.");
+    return {};
+  }
+
+  return result;
+}
+
+bool decrypt_xiaomi_payload(std::vector<uint8_t> &raw, const uint8_t *bindkey, const uint64_t &address) {
+  if (!((raw.size() == 19) || ((raw.size() >= 22) && (raw.size() <= 24)))) {
+    ESP_LOGVV(TAG, "decrypt_xiaomi_payload(): data packet has wrong size (%d)!", raw.size());
+    ESP_LOGVV(TAG, "  Packet : %s", hexencode(raw.data(), raw.size()).c_str());
+    return false;
+  }
+
+  uint8_t mac_reverse[6] = {0};
+  mac_reverse[5] = (uint8_t)(address >> 40);
+  mac_reverse[4] = (uint8_t)(address >> 32);
+  mac_reverse[3] = (uint8_t)(address >> 24);
+  mac_reverse[2] = (uint8_t)(address >> 16);
+  mac_reverse[1] = (uint8_t)(address >> 8);
+  mac_reverse[0] = (uint8_t)(address >> 0);
+
+  XiaomiAESVector vector{.key = {0},
+                         .plaintext = {0},
+                         .ciphertext = {0},
+                         .authdata = {0x11},
+                         .iv = {0},
+                         .tag = {0},
+                         .keysize = 16,
+                         .authsize = 1,
+                         .datasize = 0,
+                         .tagsize = 4,
+                         .ivsize = 12};
+
+  vector.datasize = (raw.size() == 19) ? raw.size() - 12 : raw.size() - 18;
+  int cipher_pos = (raw.size() == 19) ? 5 : 11;
+
+  const uint8_t *v = raw.data();
+
+  memcpy(vector.key, bindkey, vector.keysize);
+  memcpy(vector.ciphertext, v + cipher_pos, vector.datasize);
+  memcpy(vector.tag, v + raw.size() - vector.tagsize, vector.tagsize);
+  memcpy(vector.iv, mac_reverse, 6);             // MAC address reverse
+  memcpy(vector.iv + 6, v + 2, 3);               // sensor type (2) + packet id (1)
+  memcpy(vector.iv + 9, v + raw.size() - 7, 3);  // payload counter
+
+  mbedtls_ccm_context ctx;
+  mbedtls_ccm_init(&ctx);
+
+  int ret = mbedtls_ccm_setkey(&ctx, MBEDTLS_CIPHER_ID_AES, vector.key, vector.keysize * 8);
+  if (ret) {
+    ESP_LOGVV(TAG, "decrypt_xiaomi_payload(): mbedtls_ccm_setkey() failed.");
+    mbedtls_ccm_free(&ctx);
+    return false;
+  }
+
+  ret = mbedtls_ccm_auth_decrypt(&ctx, vector.datasize, vector.iv, vector.ivsize, vector.authdata, vector.authsize,
+                                 vector.ciphertext, vector.plaintext, vector.tag, vector.tagsize);
+  if (ret) {
+    uint8_t mac_address[6] = {0};
+    memcpy(mac_address, mac_reverse + 5, 1);
+    memcpy(mac_address + 1, mac_reverse + 4, 1);
+    memcpy(mac_address + 2, mac_reverse + 3, 1);
+    memcpy(mac_address + 3, mac_reverse + 2, 1);
+    memcpy(mac_address + 4, mac_reverse + 1, 1);
+    memcpy(mac_address + 5, mac_reverse, 1);
+    ESP_LOGVV(TAG, "decrypt_xiaomi_payload(): authenticated decryption failed.");
+    ESP_LOGVV(TAG, "  MAC address : %s", hexencode(mac_address, 6).c_str());
+    ESP_LOGVV(TAG, "       Packet : %s", hexencode(raw.data(), raw.size()).c_str());
+    ESP_LOGVV(TAG, "          Key : %s", hexencode(vector.key, vector.keysize).c_str());
+    ESP_LOGVV(TAG, "           Iv : %s", hexencode(vector.iv, vector.ivsize).c_str());
+    ESP_LOGVV(TAG, "       Cipher : %s", hexencode(vector.ciphertext, vector.datasize).c_str());
+    ESP_LOGVV(TAG, "          Tag : %s", hexencode(vector.tag, vector.tagsize).c_str());
+    mbedtls_ccm_free(&ctx);
+    return false;
+  }
+
+  // replace encrypted payload with plaintext
+  uint8_t *p = vector.plaintext;
+  for (std::vector<uint8_t>::iterator it = raw.begin() + cipher_pos; it != raw.begin() + cipher_pos + vector.datasize;
+       ++it) {
+    *it = *(p++);
+  }
+
+  // clear encrypted flag
+  raw[0] &= ~0x08;
+
+  ESP_LOGVV(TAG, "decrypt_xiaomi_payload(): authenticated decryption passed.");
+  ESP_LOGVV(TAG, "  Plaintext : %s, Packet : %d", hexencode(raw.data() + cipher_pos, vector.datasize).c_str(),
+            static_cast<int>(raw[4]));
+
+  mbedtls_ccm_free(&ctx);
+  return true;
+}
+
+bool report_xiaomi_results(const optional<XiaomiParseResult> &result, const std::string &address) {
+  if (!result.has_value()) {
+    ESP_LOGVV(TAG, "report_xiaomi_results(): no results available.");
+    return false;
+  }
+
+  ESP_LOGD(TAG, "Got Xiaomi %s (%s):", result->name.c_str(), address.c_str());
+
+  if (result->temperature.has_value()) {
+    ESP_LOGD(TAG, "  Temperature: %.1f°C", *result->temperature);
+  }
+  if (result->humidity.has_value()) {
+    ESP_LOGD(TAG, "  Humidity: %.1f%%", *result->humidity);
+  }
+  if (result->battery_level.has_value()) {
+    ESP_LOGD(TAG, "  Battery Level: %.0f%%", *result->battery_level);
+  }
+  if (result->conductivity.has_value()) {
+    ESP_LOGD(TAG, "  Conductivity: %.0fµS/cm", *result->conductivity);
+  }
+  if (result->illuminance.has_value()) {
+    ESP_LOGD(TAG, "  Illuminance: %.0flx", *result->illuminance);
+  }
+  if (result->moisture.has_value()) {
+    ESP_LOGD(TAG, "  Moisture: %.0f%%", *result->moisture);
+  }
+  if (result->tablet.has_value()) {
+    ESP_LOGD(TAG, "  Mosquito tablet: %.0f%%", *result->tablet);
+  }
+  if (result->is_active.has_value()) {
+    ESP_LOGD(TAG, "  Repellent: %s", (*result->is_active) ? "on" : "off");
+  }
+  if (result->has_motion.has_value()) {
+    ESP_LOGD(TAG, "  Motion: %s", (*result->has_motion) ? "yes" : "no");
+  }
+  if (result->is_light.has_value()) {
+    ESP_LOGD(TAG, "  Light: %s", (*result->is_light) ? "on" : "off");
+  }
+
+  return true;
+}
+
+bool XiaomiListener::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  // Previously the message was parsed twice per packet, once by XiaomiListener::parse_device()
+  // and then again by the respective device class's parse_device() function. Parsing the header
+  // here and then for each device seems to be unneccessary and complicates the duplicate packet filtering.
+  // Hence I disabled the call to parse_xiaomi_header() here and the message parsing is done entirely
+  // in the respecive device instance. The XiaomiListener class is defined in __init__.py and I was not
+  // able to remove it entirely.
+
+  return false;  // with true it's not showing device scans
+}
+
 }  // namespace xiaomi_ble
 }  // namespace esphome
 
diff --git a/esphome/components/xiaomi_ble/xiaomi_ble.h b/esphome/components/xiaomi_ble/xiaomi_ble.h
index 824ea80edf..daa71787a5 100644
--- a/esphome/components/xiaomi_ble/xiaomi_ble.h
+++ b/esphome/components/xiaomi_ble/xiaomi_ble.h
@@ -9,18 +9,58 @@ namespace esphome {
 namespace xiaomi_ble {
 
 struct XiaomiParseResult {
-  enum { TYPE_LYWSDCGQ, TYPE_HHCCJCY01, TYPE_LYWSD02, TYPE_CGG1 } type;
+  enum {
+    TYPE_HHCCJCY01,
+    TYPE_GCLS002,
+    TYPE_HHCCPOT002,
+    TYPE_LYWSDCGQ,
+    TYPE_LYWSD02,
+    TYPE_CGG1,
+    TYPE_LYWSD03MMC,
+    TYPE_CGD1,
+    TYPE_JQJCY01YM,
+    TYPE_MUE4094RT,
+    TYPE_WX08ZM,
+    TYPE_MJYD02YLA
+  } type;
+  std::string name;
   optional<float> temperature;
   optional<float> humidity;
-  optional<float> battery_level;
+  optional<float> moisture;
   optional<float> conductivity;
   optional<float> illuminance;
-  optional<float> moisture;
+  optional<float> formaldehyde;
+  optional<float> battery_level;
+  optional<float> tablet;
+  optional<float> idle_time;
+  optional<bool> is_active;
+  optional<bool> has_motion;
+  optional<bool> is_light;
+  bool has_data;        // 0x40
+  bool has_capability;  // 0x20
+  bool has_encryption;  // 0x08
+  bool is_duplicate;
+  int raw_offset;
 };
 
-bool parse_xiaomi_data_byte(uint8_t data_type, const uint8_t *data, uint8_t data_length, XiaomiParseResult &result);
+struct XiaomiAESVector {
+  uint8_t key[16];
+  uint8_t plaintext[16];
+  uint8_t ciphertext[16];
+  uint8_t authdata[16];
+  uint8_t iv[16];
+  uint8_t tag[16];
+  size_t keysize;
+  size_t authsize;
+  size_t datasize;
+  size_t tagsize;
+  size_t ivsize;
+};
 
-optional<XiaomiParseResult> parse_xiaomi(const esp32_ble_tracker::ESPBTDevice &device);
+bool parse_xiaomi_message(const std::vector<uint8_t> &message, XiaomiParseResult &result);
+optional<XiaomiParseResult> parse_xiaomi_header(const esp32_ble_tracker::ServiceData &service_data);
+bool decrypt_xiaomi_payload(std::vector<uint8_t> &raw, const uint8_t *bindkey, const uint64_t &address);
+bool report_xiaomi_results(const optional<XiaomiParseResult> &result, const std::string &address);
 
 class XiaomiListener : public esp32_ble_tracker::ESPBTDeviceListener {
  public:
diff --git a/esphome/components/xiaomi_cgd1/__init__.py b/esphome/components/xiaomi_cgd1/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/xiaomi_cgd1/sensor.py b/esphome/components/xiaomi_cgd1/sensor.py
new file mode 100644
index 0000000000..343279f8fe
--- /dev/null
+++ b/esphome/components/xiaomi_cgd1/sensor.py
@@ -0,0 +1,43 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
+from esphome.const import CONF_BATTERY_LEVEL, CONF_HUMIDITY, CONF_MAC_ADDRESS, CONF_TEMPERATURE, \
+    UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID, \
+    CONF_BINDKEY
+
+DEPENDENCIES = ['esp32_ble_tracker']
+AUTO_LOAD = ['xiaomi_ble']
+
+xiaomi_cgd1_ns = cg.esphome_ns.namespace('xiaomi_cgd1')
+XiaomiCGD1 = xiaomi_cgd1_ns.class_('XiaomiCGD1', esp32_ble_tracker.ESPBTDeviceListener,
+                                   cg.Component)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(XiaomiCGD1),
+    cv.Required(CONF_BINDKEY): cv.bind_key,
+    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
+    cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 1),
+    cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_PERCENT, ICON_BATTERY, 0),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+    cg.add(var.set_bindkey(config[CONF_BINDKEY]))
+
+    if CONF_TEMPERATURE in config:
+        sens = yield sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature(sens))
+    if CONF_HUMIDITY in config:
+        sens = yield sensor.new_sensor(config[CONF_HUMIDITY])
+        cg.add(var.set_humidity(sens))
+    if CONF_BATTERY_LEVEL in config:
+        sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
+        cg.add(var.set_battery_level(sens))
+
+    cg.add_library("mbedtls", "cdf462088d")
diff --git a/esphome/components/xiaomi_cgd1/xiaomi_cgd1.cpp b/esphome/components/xiaomi_cgd1/xiaomi_cgd1.cpp
new file mode 100644
index 0000000000..d701e8ee6d
--- /dev/null
+++ b/esphome/components/xiaomi_cgd1/xiaomi_cgd1.cpp
@@ -0,0 +1,77 @@
+#include "xiaomi_cgd1.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_cgd1 {
+
+static const char *TAG = "xiaomi_cgd1";
+
+void XiaomiCGD1::dump_config() {
+  ESP_LOGCONFIG(TAG, "Xiaomi CGD1");
+  ESP_LOGCONFIG(TAG, "  Bindkey: %s", hexencode(this->bindkey_, 16).c_str());
+  LOG_SENSOR("  ", "Temperature", this->temperature_);
+  LOG_SENSOR("  ", "Humidity", this->humidity_);
+  LOG_SENSOR("  ", "Battery Level", this->battery_level_);
+}
+
+bool XiaomiCGD1::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption &&
+        (!(xiaomi_ble::decrypt_xiaomi_payload(const_cast<std::vector<uint8_t> &>(service_data.data), this->bindkey_,
+                                              this->address_)))) {
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->temperature.has_value() && this->temperature_ != nullptr)
+      this->temperature_->publish_state(*res->temperature);
+    if (res->humidity.has_value() && this->humidity_ != nullptr)
+      this->humidity_->publish_state(*res->humidity);
+    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
+      this->battery_level_->publish_state(*res->battery_level);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
+void XiaomiCGD1::set_bindkey(const std::string &bindkey) {
+  memset(bindkey_, 0, 16);
+  if (bindkey.size() != 32) {
+    return;
+  }
+  char temp[3] = {0};
+  for (int i = 0; i < 16; i++) {
+    strncpy(temp, &(bindkey.c_str()[i * 2]), 2);
+    bindkey_[i] = std::strtoul(temp, NULL, 16);
+  }
+}
+
+}  // namespace xiaomi_cgd1
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_cgd1/xiaomi_cgd1.h b/esphome/components/xiaomi_cgd1/xiaomi_cgd1.h
new file mode 100644
index 0000000000..b9e05f857c
--- /dev/null
+++ b/esphome/components/xiaomi_cgd1/xiaomi_cgd1.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_cgd1 {
+
+class XiaomiCGD1 : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; };
+  void set_bindkey(const std::string &bindkey);
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }
+  void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; }
+  void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; }
+
+ protected:
+  uint64_t address_;
+  uint8_t bindkey_[16];
+  sensor::Sensor *temperature_{nullptr};
+  sensor::Sensor *humidity_{nullptr};
+  sensor::Sensor *battery_level_{nullptr};
+};
+
+}  // namespace xiaomi_cgd1
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_cgg1/xiaomi_cgg1.cpp b/esphome/components/xiaomi_cgg1/xiaomi_cgg1.cpp
index 6cc14f5a8e..a7c94fafad 100644
--- a/esphome/components/xiaomi_cgg1/xiaomi_cgg1.cpp
+++ b/esphome/components/xiaomi_cgg1/xiaomi_cgg1.cpp
@@ -15,6 +15,48 @@ void XiaomiCGG1::dump_config() {
   LOG_SENSOR("  ", "Battery Level", this->battery_level_);
 }
 
+bool XiaomiCGG1::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption) {
+      ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device.");
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->temperature.has_value() && this->temperature_ != nullptr)
+      this->temperature_->publish_state(*res->temperature);
+    if (res->humidity.has_value() && this->humidity_ != nullptr)
+      this->humidity_->publish_state(*res->humidity);
+    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
+      this->battery_level_->publish_state(*res->battery_level);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
 }  // namespace xiaomi_cgg1
 }  // namespace esphome
 
diff --git a/esphome/components/xiaomi_cgg1/xiaomi_cgg1.h b/esphome/components/xiaomi_cgg1/xiaomi_cgg1.h
index 7f73011275..57f883405c 100644
--- a/esphome/components/xiaomi_cgg1/xiaomi_cgg1.h
+++ b/esphome/components/xiaomi_cgg1/xiaomi_cgg1.h
@@ -14,22 +14,7 @@ class XiaomiCGG1 : public Component, public esp32_ble_tracker::ESPBTDeviceListen
  public:
   void set_address(uint64_t address) { address_ = address; }
 
-  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
-    if (device.address_uint64() != this->address_)
-      return false;
-
-    auto res = xiaomi_ble::parse_xiaomi(device);
-    if (!res.has_value())
-      return false;
-
-    if (res->temperature.has_value() && this->temperature_ != nullptr)
-      this->temperature_->publish_state(*res->temperature);
-    if (res->humidity.has_value() && this->humidity_ != nullptr)
-      this->humidity_->publish_state(*res->humidity);
-    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
-      this->battery_level_->publish_state(*res->battery_level);
-    return true;
-  }
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
 
   void dump_config() override;
   float get_setup_priority() const override { return setup_priority::DATA; }
diff --git a/esphome/components/xiaomi_gcls002/__init__.py b/esphome/components/xiaomi_gcls002/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/xiaomi_gcls002/sensor.py b/esphome/components/xiaomi_gcls002/sensor.py
new file mode 100644
index 0000000000..1822977c38
--- /dev/null
+++ b/esphome/components/xiaomi_gcls002/sensor.py
@@ -0,0 +1,45 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
+from esphome.const import CONF_MAC_ADDRESS, CONF_TEMPERATURE, \
+    UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, CONF_ID, \
+    CONF_MOISTURE, CONF_ILLUMINANCE, ICON_BRIGHTNESS_5, UNIT_LUX, CONF_CONDUCTIVITY, \
+    UNIT_MICROSIEMENS_PER_CENTIMETER, ICON_FLOWER
+
+DEPENDENCIES = ['esp32_ble_tracker']
+AUTO_LOAD = ['xiaomi_ble']
+
+xiaomi_gcls002_ns = cg.esphome_ns.namespace('xiaomi_gcls002')
+XiaomiGCLS002 = xiaomi_gcls002_ns.class_('XiaomiGCLS002',
+                                         esp32_ble_tracker.ESPBTDeviceListener, cg.Component)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(XiaomiGCLS002),
+    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
+    cv.Optional(CONF_MOISTURE): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 0),
+    cv.Optional(CONF_ILLUMINANCE): sensor.sensor_schema(UNIT_LUX, ICON_BRIGHTNESS_5, 0),
+    cv.Optional(CONF_CONDUCTIVITY):
+        sensor.sensor_schema(UNIT_MICROSIEMENS_PER_CENTIMETER, ICON_FLOWER, 0),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+
+    if CONF_TEMPERATURE in config:
+        sens = yield sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature(sens))
+    if CONF_MOISTURE in config:
+        sens = yield sensor.new_sensor(config[CONF_MOISTURE])
+        cg.add(var.set_moisture(sens))
+    if CONF_ILLUMINANCE in config:
+        sens = yield sensor.new_sensor(config[CONF_ILLUMINANCE])
+        cg.add(var.set_illuminance(sens))
+    if CONF_CONDUCTIVITY in config:
+        sens = yield sensor.new_sensor(config[CONF_CONDUCTIVITY])
+        cg.add(var.set_conductivity(sens))
diff --git a/esphome/components/xiaomi_gcls002/xiaomi_gcls002.cpp b/esphome/components/xiaomi_gcls002/xiaomi_gcls002.cpp
new file mode 100644
index 0000000000..24156f98ac
--- /dev/null
+++ b/esphome/components/xiaomi_gcls002/xiaomi_gcls002.cpp
@@ -0,0 +1,66 @@
+#include "xiaomi_gcls002.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_gcls002 {
+
+static const char *TAG = "xiaomi_gcls002";
+
+void XiaomiGCLS002::dump_config() {
+  ESP_LOGCONFIG(TAG, "Xiaomi GCLS002");
+  LOG_SENSOR("  ", "Temperature", this->temperature_);
+  LOG_SENSOR("  ", "Moisture", this->moisture_);
+  LOG_SENSOR("  ", "Conductivity", this->conductivity_);
+  LOG_SENSOR("  ", "Illuminance", this->illuminance_);
+}
+
+bool XiaomiGCLS002::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption) {
+      ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device.");
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->temperature.has_value() && this->temperature_ != nullptr)
+      this->temperature_->publish_state(*res->temperature);
+    if (res->moisture.has_value() && this->moisture_ != nullptr)
+      this->moisture_->publish_state(*res->moisture);
+    if (res->conductivity.has_value() && this->conductivity_ != nullptr)
+      this->conductivity_->publish_state(*res->conductivity);
+    if (res->illuminance.has_value() && this->illuminance_ != nullptr)
+      this->illuminance_->publish_state(*res->illuminance);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
+}  // namespace xiaomi_gcls002
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_gcls002/xiaomi_gcls002.h b/esphome/components/xiaomi_gcls002/xiaomi_gcls002.h
new file mode 100644
index 0000000000..d800e2837d
--- /dev/null
+++ b/esphome/components/xiaomi_gcls002/xiaomi_gcls002.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_gcls002 {
+
+class XiaomiGCLS002 : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; }
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }
+  void set_moisture(sensor::Sensor *moisture) { moisture_ = moisture; }
+  void set_conductivity(sensor::Sensor *conductivity) { conductivity_ = conductivity; }
+  void set_illuminance(sensor::Sensor *illuminance) { illuminance_ = illuminance; }
+
+ protected:
+  uint64_t address_;
+  sensor::Sensor *temperature_{nullptr};
+  sensor::Sensor *moisture_{nullptr};
+  sensor::Sensor *conductivity_{nullptr};
+  sensor::Sensor *illuminance_{nullptr};
+};
+
+}  // namespace xiaomi_gcls002
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_hhccjcy01/sensor.py b/esphome/components/xiaomi_hhccjcy01/sensor.py
index 495446ba11..0b0349d7e4 100644
--- a/esphome/components/xiaomi_hhccjcy01/sensor.py
+++ b/esphome/components/xiaomi_hhccjcy01/sensor.py
@@ -1,8 +1,8 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, esp32_ble_tracker
-from esphome.const import CONF_BATTERY_LEVEL, CONF_MAC_ADDRESS, CONF_TEMPERATURE, \
-    UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID, \
+from esphome.const import CONF_MAC_ADDRESS, CONF_TEMPERATURE, \
+    UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, CONF_ID, \
     CONF_MOISTURE, CONF_ILLUMINANCE, ICON_BRIGHTNESS_5, UNIT_LUX, CONF_CONDUCTIVITY, \
     UNIT_MICROSIEMENS_PER_CENTIMETER, ICON_FLOWER
 
@@ -21,7 +21,6 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_ILLUMINANCE): sensor.sensor_schema(UNIT_LUX, ICON_BRIGHTNESS_5, 0),
     cv.Optional(CONF_CONDUCTIVITY):
         sensor.sensor_schema(UNIT_MICROSIEMENS_PER_CENTIMETER, ICON_FLOWER, 0),
-    cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_PERCENT, ICON_BATTERY, 0),
 }).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)
 
 
@@ -44,6 +43,3 @@ def to_code(config):
     if CONF_CONDUCTIVITY in config:
         sens = yield sensor.new_sensor(config[CONF_CONDUCTIVITY])
         cg.add(var.set_conductivity(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))
diff --git a/esphome/components/xiaomi_hhccjcy01/xiaomi_hhccjcy01.cpp b/esphome/components/xiaomi_hhccjcy01/xiaomi_hhccjcy01.cpp
index 8c8152c54c..fd099f7aa5 100644
--- a/esphome/components/xiaomi_hhccjcy01/xiaomi_hhccjcy01.cpp
+++ b/esphome/components/xiaomi_hhccjcy01/xiaomi_hhccjcy01.cpp
@@ -14,7 +14,50 @@ void XiaomiHHCCJCY01::dump_config() {
   LOG_SENSOR("  ", "Moisture", this->moisture_);
   LOG_SENSOR("  ", "Conductivity", this->conductivity_);
   LOG_SENSOR("  ", "Illuminance", this->illuminance_);
-  LOG_SENSOR("  ", "Battery Level", this->battery_level_);
+}
+
+bool XiaomiHHCCJCY01::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption) {
+      ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device.");
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->temperature.has_value() && this->temperature_ != nullptr)
+      this->temperature_->publish_state(*res->temperature);
+    if (res->moisture.has_value() && this->moisture_ != nullptr)
+      this->moisture_->publish_state(*res->moisture);
+    if (res->conductivity.has_value() && this->conductivity_ != nullptr)
+      this->conductivity_->publish_state(*res->conductivity);
+    if (res->illuminance.has_value() && this->illuminance_ != nullptr)
+      this->illuminance_->publish_state(*res->illuminance);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
 }
 
 }  // namespace xiaomi_hhccjcy01
diff --git a/esphome/components/xiaomi_hhccjcy01/xiaomi_hhccjcy01.h b/esphome/components/xiaomi_hhccjcy01/xiaomi_hhccjcy01.h
index c1b8511bb8..e72bf98161 100644
--- a/esphome/components/xiaomi_hhccjcy01/xiaomi_hhccjcy01.h
+++ b/esphome/components/xiaomi_hhccjcy01/xiaomi_hhccjcy01.h
@@ -14,26 +14,7 @@ class XiaomiHHCCJCY01 : public Component, public esp32_ble_tracker::ESPBTDeviceL
  public:
   void set_address(uint64_t address) { address_ = address; }
 
-  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
-    if (device.address_uint64() != this->address_)
-      return false;
-
-    auto res = xiaomi_ble::parse_xiaomi(device);
-    if (!res.has_value())
-      return false;
-
-    if (res->temperature.has_value() && this->temperature_ != nullptr)
-      this->temperature_->publish_state(*res->temperature);
-    if (res->moisture.has_value() && this->moisture_ != nullptr)
-      this->moisture_->publish_state(*res->moisture);
-    if (res->conductivity.has_value() && this->conductivity_ != nullptr)
-      this->conductivity_->publish_state(*res->conductivity);
-    if (res->illuminance.has_value() && this->illuminance_ != nullptr)
-      this->illuminance_->publish_state(*res->illuminance);
-    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
-      this->battery_level_->publish_state(*res->battery_level);
-    return true;
-  }
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
 
   void dump_config() override;
   float get_setup_priority() const override { return setup_priority::DATA; }
@@ -41,7 +22,6 @@ class XiaomiHHCCJCY01 : public Component, public esp32_ble_tracker::ESPBTDeviceL
   void set_moisture(sensor::Sensor *moisture) { moisture_ = moisture; }
   void set_conductivity(sensor::Sensor *conductivity) { conductivity_ = conductivity; }
   void set_illuminance(sensor::Sensor *illuminance) { illuminance_ = illuminance; }
-  void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; }
 
  protected:
   uint64_t address_;
@@ -49,7 +29,6 @@ class XiaomiHHCCJCY01 : public Component, public esp32_ble_tracker::ESPBTDeviceL
   sensor::Sensor *moisture_{nullptr};
   sensor::Sensor *conductivity_{nullptr};
   sensor::Sensor *illuminance_{nullptr};
-  sensor::Sensor *battery_level_{nullptr};
 };
 
 }  // namespace xiaomi_hhccjcy01
diff --git a/esphome/components/xiaomi_hhccpot002/__init__.py b/esphome/components/xiaomi_hhccpot002/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/xiaomi_hhccpot002/sensor.py b/esphome/components/xiaomi_hhccpot002/sensor.py
new file mode 100644
index 0000000000..33cd96252e
--- /dev/null
+++ b/esphome/components/xiaomi_hhccpot002/sensor.py
@@ -0,0 +1,35 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
+from esphome.const import CONF_MAC_ADDRESS, UNIT_PERCENT, ICON_WATER_PERCENT, CONF_ID, \
+    CONF_MOISTURE, CONF_CONDUCTIVITY, UNIT_MICROSIEMENS_PER_CENTIMETER, ICON_FLOWER
+
+DEPENDENCIES = ['esp32_ble_tracker']
+AUTO_LOAD = ['xiaomi_ble']
+
+xiaomi_hhccpot002_ns = cg.esphome_ns.namespace('xiaomi_hhccpot002')
+XiaomiHHCCPOT002 = xiaomi_hhccpot002_ns.class_('XiaomiHHCCPOT002',
+                                               esp32_ble_tracker.ESPBTDeviceListener, cg.Component)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(XiaomiHHCCPOT002),
+    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_MOISTURE): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 0),
+    cv.Optional(CONF_CONDUCTIVITY):
+        sensor.sensor_schema(UNIT_MICROSIEMENS_PER_CENTIMETER, ICON_FLOWER, 0),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+
+    if CONF_MOISTURE in config:
+        sens = yield sensor.new_sensor(config[CONF_MOISTURE])
+        cg.add(var.set_moisture(sens))
+    if CONF_CONDUCTIVITY in config:
+        sens = yield sensor.new_sensor(config[CONF_CONDUCTIVITY])
+        cg.add(var.set_conductivity(sens))
diff --git a/esphome/components/xiaomi_hhccpot002/xiaomi_hhccpot002.cpp b/esphome/components/xiaomi_hhccpot002/xiaomi_hhccpot002.cpp
new file mode 100644
index 0000000000..2b5ad3a826
--- /dev/null
+++ b/esphome/components/xiaomi_hhccpot002/xiaomi_hhccpot002.cpp
@@ -0,0 +1,60 @@
+#include "xiaomi_hhccpot002.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_hhccpot002 {
+
+static const char *TAG = "xiaomi_hhccpot002";
+
+void XiaomiHHCCPOT002 ::dump_config() {
+  ESP_LOGCONFIG(TAG, "Xiaomi HHCCPOT002");
+  LOG_SENSOR("  ", "Moisture", this->moisture_);
+  LOG_SENSOR("  ", "Conductivity", this->conductivity_);
+}
+
+bool XiaomiHHCCPOT002::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption) {
+      ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device.");
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->moisture.has_value() && this->moisture_ != nullptr)
+      this->moisture_->publish_state(*res->moisture);
+    if (res->conductivity.has_value() && this->conductivity_ != nullptr)
+      this->conductivity_->publish_state(*res->conductivity);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
+}  // namespace xiaomi_hhccpot002
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_hhccpot002/xiaomi_hhccpot002.h b/esphome/components/xiaomi_hhccpot002/xiaomi_hhccpot002.h
new file mode 100644
index 0000000000..1add8e27b1
--- /dev/null
+++ b/esphome/components/xiaomi_hhccpot002/xiaomi_hhccpot002.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_hhccpot002 {
+
+class XiaomiHHCCPOT002 : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; }
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void set_moisture(sensor::Sensor *moisture) { moisture_ = moisture; }
+  void set_conductivity(sensor::Sensor *conductivity) { conductivity_ = conductivity; }
+
+ protected:
+  uint64_t address_;
+  sensor::Sensor *moisture_{nullptr};
+  sensor::Sensor *conductivity_{nullptr};
+};
+
+}  // namespace xiaomi_hhccpot002
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_jqjcy01ym/__init__.py b/esphome/components/xiaomi_jqjcy01ym/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/xiaomi_jqjcy01ym/sensor.py b/esphome/components/xiaomi_jqjcy01ym/sensor.py
new file mode 100644
index 0000000000..2bd397e829
--- /dev/null
+++ b/esphome/components/xiaomi_jqjcy01ym/sensor.py
@@ -0,0 +1,44 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
+from esphome.const import CONF_BATTERY_LEVEL, CONF_MAC_ADDRESS, CONF_TEMPERATURE, \
+    UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID, \
+    CONF_HUMIDITY, UNIT_MILLIGRAMS_PER_CUBIC_METER, ICON_FLASK_OUTLINE, CONF_FORMALDEHYDE
+
+DEPENDENCIES = ['esp32_ble_tracker']
+AUTO_LOAD = ['xiaomi_ble']
+
+xiaomi_jqjcy01ym_ns = cg.esphome_ns.namespace('xiaomi_jqjcy01ym')
+XiaomiJQJCY01YM = xiaomi_jqjcy01ym_ns.class_('XiaomiJQJCY01YM',
+                                             esp32_ble_tracker.ESPBTDeviceListener, cg.Component)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(XiaomiJQJCY01YM),
+    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
+    cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 0),
+    cv.Optional(CONF_FORMALDEHYDE):
+        sensor.sensor_schema(UNIT_MILLIGRAMS_PER_CUBIC_METER, ICON_FLASK_OUTLINE, 2),
+    cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_PERCENT, ICON_BATTERY, 0),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+
+    if CONF_TEMPERATURE in config:
+        sens = yield sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature(sens))
+    if CONF_HUMIDITY in config:
+        sens = yield sensor.new_sensor(config[CONF_HUMIDITY])
+        cg.add(var.set_humidity(sens))
+    if CONF_FORMALDEHYDE in config:
+        sens = yield sensor.new_sensor(config[CONF_FORMALDEHYDE])
+        cg.add(var.set_formaldehyde(sens))
+    if CONF_BATTERY_LEVEL in config:
+        sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
+        cg.add(var.set_battery_level(sens))
diff --git a/esphome/components/xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.cpp b/esphome/components/xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.cpp
new file mode 100644
index 0000000000..3e7090509b
--- /dev/null
+++ b/esphome/components/xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.cpp
@@ -0,0 +1,66 @@
+#include "xiaomi_jqjcy01ym.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_jqjcy01ym {
+
+static const char *TAG = "xiaomi_jqjcy01ym";
+
+void XiaomiJQJCY01YM::dump_config() {
+  ESP_LOGCONFIG(TAG, "Xiaomi JQJCY01YM");
+  LOG_SENSOR("  ", "Temperature", this->temperature_);
+  LOG_SENSOR("  ", "Humidity", this->humidity_);
+  LOG_SENSOR("  ", "Formaldehyde", this->formaldehyde_);
+  LOG_SENSOR("  ", "Battery Level", this->battery_level_);
+}
+
+bool XiaomiJQJCY01YM::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption) {
+      ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device.");
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->temperature.has_value() && this->temperature_ != nullptr)
+      this->temperature_->publish_state(*res->temperature);
+    if (res->humidity.has_value() && this->humidity_ != nullptr)
+      this->humidity_->publish_state(*res->humidity);
+    if (res->formaldehyde.has_value() && this->formaldehyde_ != nullptr)
+      this->formaldehyde_->publish_state(*res->formaldehyde);
+    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
+      this->battery_level_->publish_state(*res->battery_level);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
+}  // namespace xiaomi_jqjcy01ym
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.h b/esphome/components/xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.h
new file mode 100644
index 0000000000..d750e1e97f
--- /dev/null
+++ b/esphome/components/xiaomi_jqjcy01ym/xiaomi_jqjcy01ym.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_jqjcy01ym {
+
+class XiaomiJQJCY01YM : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; }
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }
+  void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; }
+  void set_formaldehyde(sensor::Sensor *formaldehyde) { formaldehyde_ = formaldehyde; }
+  void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; }
+
+ protected:
+  uint64_t address_;
+  sensor::Sensor *temperature_{nullptr};
+  sensor::Sensor *humidity_{nullptr};
+  sensor::Sensor *formaldehyde_{nullptr};
+  sensor::Sensor *battery_level_{nullptr};
+};
+
+}  // namespace xiaomi_jqjcy01ym
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_lywsd02/xiaomi_lywsd02.cpp b/esphome/components/xiaomi_lywsd02/xiaomi_lywsd02.cpp
index cd77c133a5..5ecd99047e 100644
--- a/esphome/components/xiaomi_lywsd02/xiaomi_lywsd02.cpp
+++ b/esphome/components/xiaomi_lywsd02/xiaomi_lywsd02.cpp
@@ -14,6 +14,46 @@ void XiaomiLYWSD02::dump_config() {
   LOG_SENSOR("  ", "Humidity", this->humidity_);
 }
 
+bool XiaomiLYWSD02::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption) {
+      ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device.");
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->temperature.has_value() && this->temperature_ != nullptr)
+      this->temperature_->publish_state(*res->temperature);
+    if (res->humidity.has_value() && this->humidity_ != nullptr)
+      this->humidity_->publish_state(*res->humidity);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
 }  // namespace xiaomi_lywsd02
 }  // namespace esphome
 
diff --git a/esphome/components/xiaomi_lywsd02/xiaomi_lywsd02.h b/esphome/components/xiaomi_lywsd02/xiaomi_lywsd02.h
index 9b8aba1bb0..f32506eb44 100644
--- a/esphome/components/xiaomi_lywsd02/xiaomi_lywsd02.h
+++ b/esphome/components/xiaomi_lywsd02/xiaomi_lywsd02.h
@@ -14,20 +14,7 @@ class XiaomiLYWSD02 : public Component, public esp32_ble_tracker::ESPBTDeviceLis
  public:
   void set_address(uint64_t address) { address_ = address; }
 
-  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
-    if (device.address_uint64() != this->address_)
-      return false;
-
-    auto res = xiaomi_ble::parse_xiaomi(device);
-    if (!res.has_value())
-      return false;
-
-    if (res->temperature.has_value() && this->temperature_ != nullptr)
-      this->temperature_->publish_state(*res->temperature);
-    if (res->humidity.has_value() && this->humidity_ != nullptr)
-      this->humidity_->publish_state(*res->humidity);
-    return true;
-  }
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
 
   void dump_config() override;
   float get_setup_priority() const override { return setup_priority::DATA; }
diff --git a/esphome/components/xiaomi_lywsd03mmc/__init__.py b/esphome/components/xiaomi_lywsd03mmc/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/xiaomi_lywsd03mmc/sensor.py b/esphome/components/xiaomi_lywsd03mmc/sensor.py
new file mode 100644
index 0000000000..71f7b20752
--- /dev/null
+++ b/esphome/components/xiaomi_lywsd03mmc/sensor.py
@@ -0,0 +1,44 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, esp32_ble_tracker
+from esphome.const import CONF_BATTERY_LEVEL, CONF_HUMIDITY, CONF_MAC_ADDRESS, CONF_TEMPERATURE, \
+    UNIT_CELSIUS, ICON_THERMOMETER, UNIT_PERCENT, ICON_WATER_PERCENT, ICON_BATTERY, CONF_ID, \
+    CONF_BINDKEY
+
+DEPENDENCIES = ['esp32_ble_tracker']
+AUTO_LOAD = ['xiaomi_ble']
+
+xiaomi_lywsd03mmc_ns = cg.esphome_ns.namespace('xiaomi_lywsd03mmc')
+XiaomiLYWSD03MMC = xiaomi_lywsd03mmc_ns.class_('XiaomiLYWSD03MMC',
+                                               esp32_ble_tracker.ESPBTDeviceListener,
+                                               cg.Component)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(XiaomiLYWSD03MMC),
+    cv.Required(CONF_BINDKEY): cv.bind_key,
+    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
+    cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 0),
+    cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_PERCENT, ICON_BATTERY, 0),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+    cg.add(var.set_bindkey(config[CONF_BINDKEY]))
+
+    if CONF_TEMPERATURE in config:
+        sens = yield sensor.new_sensor(config[CONF_TEMPERATURE])
+        cg.add(var.set_temperature(sens))
+    if CONF_HUMIDITY in config:
+        sens = yield sensor.new_sensor(config[CONF_HUMIDITY])
+        cg.add(var.set_humidity(sens))
+    if CONF_BATTERY_LEVEL in config:
+        sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
+        cg.add(var.set_battery_level(sens))
+
+    cg.add_library("mbedtls", "cdf462088d")
diff --git a/esphome/components/xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.cpp b/esphome/components/xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.cpp
new file mode 100644
index 0000000000..e9cc99358b
--- /dev/null
+++ b/esphome/components/xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.cpp
@@ -0,0 +1,81 @@
+#include "xiaomi_lywsd03mmc.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_lywsd03mmc {
+
+static const char *TAG = "xiaomi_lywsd03mmc";
+
+void XiaomiLYWSD03MMC::dump_config() {
+  ESP_LOGCONFIG(TAG, "Xiaomi LYWSD03MMC");
+  ESP_LOGCONFIG(TAG, "  Bindkey: %s", hexencode(this->bindkey_, 16).c_str());
+  LOG_SENSOR("  ", "Temperature", this->temperature_);
+  LOG_SENSOR("  ", "Humidity", this->humidity_);
+  LOG_SENSOR("  ", "Battery Level", this->battery_level_);
+}
+
+bool XiaomiLYWSD03MMC::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption &&
+        (!(xiaomi_ble::decrypt_xiaomi_payload(const_cast<std::vector<uint8_t> &>(service_data.data), this->bindkey_,
+                                              this->address_)))) {
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (res->humidity.has_value() && this->humidity_ != nullptr) {
+      // see https://github.com/custom-components/sensor.mitemp_bt/issues/7#issuecomment-595948254
+      *res->humidity = trunc(*res->humidity);
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->temperature.has_value() && this->temperature_ != nullptr)
+      this->temperature_->publish_state(*res->temperature);
+    if (res->humidity.has_value() && this->humidity_ != nullptr)
+      this->humidity_->publish_state(*res->humidity);
+    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
+      this->battery_level_->publish_state(*res->battery_level);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
+void XiaomiLYWSD03MMC::set_bindkey(const std::string &bindkey) {
+  memset(bindkey_, 0, 16);
+  if (bindkey.size() != 32) {
+    return;
+  }
+  char temp[3] = {0};
+  for (int i = 0; i < 16; i++) {
+    strncpy(temp, &(bindkey.c_str()[i * 2]), 2);
+    bindkey_[i] = std::strtoul(temp, NULL, 16);
+  }
+}
+
+}  // namespace xiaomi_lywsd03mmc
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.h b/esphome/components/xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.h
new file mode 100644
index 0000000000..c2828e3cd1
--- /dev/null
+++ b/esphome/components/xiaomi_lywsd03mmc/xiaomi_lywsd03mmc.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_lywsd03mmc {
+
+class XiaomiLYWSD03MMC : public Component, public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; };
+  void set_bindkey(const std::string &bindkey);
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; }
+  void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; }
+  void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; }
+
+ protected:
+  uint64_t address_;
+  uint8_t bindkey_[16];
+  sensor::Sensor *temperature_{nullptr};
+  sensor::Sensor *humidity_{nullptr};
+  sensor::Sensor *battery_level_{nullptr};
+};
+
+}  // namespace xiaomi_lywsd03mmc
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_lywsdcgq/xiaomi_lywsdcgq.cpp b/esphome/components/xiaomi_lywsdcgq/xiaomi_lywsdcgq.cpp
index 2dacff2876..035ac8c906 100644
--- a/esphome/components/xiaomi_lywsdcgq/xiaomi_lywsdcgq.cpp
+++ b/esphome/components/xiaomi_lywsdcgq/xiaomi_lywsdcgq.cpp
@@ -15,6 +15,48 @@ void XiaomiLYWSDCGQ::dump_config() {
   LOG_SENSOR("  ", "Battery Level", this->battery_level_);
 }
 
+bool XiaomiLYWSDCGQ::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption) {
+      ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device.");
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->temperature.has_value() && this->temperature_ != nullptr)
+      this->temperature_->publish_state(*res->temperature);
+    if (res->humidity.has_value() && this->humidity_ != nullptr)
+      this->humidity_->publish_state(*res->humidity);
+    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
+      this->battery_level_->publish_state(*res->battery_level);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
 }  // namespace xiaomi_lywsdcgq
 }  // namespace esphome
 
diff --git a/esphome/components/xiaomi_lywsdcgq/xiaomi_lywsdcgq.h b/esphome/components/xiaomi_lywsdcgq/xiaomi_lywsdcgq.h
index b6756eec61..553b5965fd 100644
--- a/esphome/components/xiaomi_lywsdcgq/xiaomi_lywsdcgq.h
+++ b/esphome/components/xiaomi_lywsdcgq/xiaomi_lywsdcgq.h
@@ -14,22 +14,7 @@ class XiaomiLYWSDCGQ : public Component, public esp32_ble_tracker::ESPBTDeviceLi
  public:
   void set_address(uint64_t address) { address_ = address; }
 
-  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override {
-    if (device.address_uint64() != this->address_)
-      return false;
-
-    auto res = xiaomi_ble::parse_xiaomi(device);
-    if (!res.has_value())
-      return false;
-
-    if (res->temperature.has_value() && this->temperature_ != nullptr)
-      this->temperature_->publish_state(*res->temperature);
-    if (res->humidity.has_value() && this->humidity_ != nullptr)
-      this->humidity_->publish_state(*res->humidity);
-    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
-      this->battery_level_->publish_state(*res->battery_level);
-    return true;
-  }
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
 
   void dump_config() override;
   float get_setup_priority() const override { return setup_priority::DATA; }
diff --git a/esphome/components/xiaomi_mjyd02yla/__init__.py b/esphome/components/xiaomi_mjyd02yla/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/xiaomi_mjyd02yla/binary_sensor.py b/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
new file mode 100644
index 0000000000..e34864c480
--- /dev/null
+++ b/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
@@ -0,0 +1,47 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, binary_sensor, esp32_ble_tracker
+from esphome.const import CONF_MAC_ADDRESS, CONF_ID, CONF_BINDKEY, \
+    CONF_DEVICE_CLASS, CONF_LIGHT, CONF_BATTERY_LEVEL, UNIT_PERCENT, ICON_BATTERY, \
+    CONF_IDLE_TIME, UNIT_MINUTE, ICON_TIMELAPSE
+
+DEPENDENCIES = ['esp32_ble_tracker']
+AUTO_LOAD = ['xiaomi_ble']
+
+xiaomi_mjyd02yla_ns = cg.esphome_ns.namespace('xiaomi_mjyd02yla')
+XiaomiMJYD02YLA = xiaomi_mjyd02yla_ns.class_('XiaomiMJYD02YLA', binary_sensor.BinarySensor,
+                                             cg.Component, esp32_ble_tracker.ESPBTDeviceListener)
+
+CONFIG_SCHEMA = cv.All(binary_sensor.BINARY_SENSOR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(XiaomiMJYD02YLA),
+    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Required(CONF_BINDKEY): cv.bind_key,
+    cv.Optional(CONF_DEVICE_CLASS, default='motion'): binary_sensor.device_class,
+    cv.Optional(CONF_IDLE_TIME): sensor.sensor_schema(UNIT_MINUTE, ICON_TIMELAPSE, 0),
+    cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_PERCENT, ICON_BATTERY, 0),
+    cv.Optional(CONF_LIGHT): binary_sensor.BINARY_SENSOR_SCHEMA.extend({
+        cv.Optional(CONF_DEVICE_CLASS, default='light'): binary_sensor.device_class,
+    }),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+    yield binary_sensor.register_binary_sensor(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+    cg.add(var.set_bindkey(config[CONF_BINDKEY]))
+
+    if CONF_IDLE_TIME in config:
+        sens = yield sensor.new_sensor(config[CONF_IDLE_TIME])
+        cg.add(var.set_idle_time(sens))
+    if CONF_BATTERY_LEVEL in config:
+        sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
+        cg.add(var.set_battery_level(sens))
+    if CONF_LIGHT in config:
+        sens = yield binary_sensor.new_binary_sensor(config[CONF_LIGHT])
+        cg.add(var.set_light(sens))
+
+    cg.add_library("mbedtls", "cdf462088d")
diff --git a/esphome/components/xiaomi_mjyd02yla/xiaomi_mjyd02yla.cpp b/esphome/components/xiaomi_mjyd02yla/xiaomi_mjyd02yla.cpp
new file mode 100644
index 0000000000..aaea3606ba
--- /dev/null
+++ b/esphome/components/xiaomi_mjyd02yla/xiaomi_mjyd02yla.cpp
@@ -0,0 +1,79 @@
+#include "xiaomi_mjyd02yla.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_mjyd02yla {
+
+static const char *TAG = "xiaomi_mjyd02yla";
+
+void XiaomiMJYD02YLA::dump_config() {
+  ESP_LOGCONFIG(TAG, "Xiaomi MJYD02YL-A");
+  LOG_BINARY_SENSOR("  ", "Motion", this);
+  LOG_BINARY_SENSOR("  ", "Light", this->is_light_);
+  LOG_SENSOR("  ", "Idle Time", this->idle_time_);
+  LOG_SENSOR("  ", "Battery Level", this->battery_level_);
+}
+
+bool XiaomiMJYD02YLA::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption &&
+        (!(xiaomi_ble::decrypt_xiaomi_payload(const_cast<std::vector<uint8_t> &>(service_data.data), this->bindkey_,
+                                              this->address_)))) {
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->idle_time.has_value() && this->idle_time_ != nullptr)
+      this->idle_time_->publish_state(*res->idle_time);
+    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
+      this->battery_level_->publish_state(*res->battery_level);
+    if (res->is_light.has_value() && this->is_light_ != nullptr)
+      this->is_light_->publish_state(*res->is_light);
+    if (res->has_motion.has_value())
+      this->publish_state(*res->has_motion);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
+void XiaomiMJYD02YLA::set_bindkey(const std::string &bindkey) {
+  memset(bindkey_, 0, 16);
+  if (bindkey.size() != 32) {
+    return;
+  }
+  char temp[3] = {0};
+  for (int i = 0; i < 16; i++) {
+    strncpy(temp, &(bindkey.c_str()[i * 2]), 2);
+    bindkey_[i] = std::strtoul(temp, NULL, 16);
+  }
+}
+
+}  // namespace xiaomi_mjyd02yla
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_mjyd02yla/xiaomi_mjyd02yla.h b/esphome/components/xiaomi_mjyd02yla/xiaomi_mjyd02yla.h
new file mode 100644
index 0000000000..d3fde4d6f8
--- /dev/null
+++ b/esphome/components/xiaomi_mjyd02yla/xiaomi_mjyd02yla.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_mjyd02yla {
+
+class XiaomiMJYD02YLA : public Component,
+                        public binary_sensor::BinarySensorInitiallyOff,
+                        public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; }
+  void set_bindkey(const std::string &bindkey);
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void set_idle_time(sensor::Sensor *idle_time) { idle_time_ = idle_time; }
+  void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; }
+  void set_light(binary_sensor::BinarySensor *light) { is_light_ = light; }
+
+ protected:
+  uint64_t address_;
+  uint8_t bindkey_[16];
+  sensor::Sensor *idle_time_{nullptr};
+  sensor::Sensor *battery_level_{nullptr};
+  binary_sensor::BinarySensor *is_light_{nullptr};
+};
+
+}  // namespace xiaomi_mjyd02yla
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_mue4094rt/__init__.py b/esphome/components/xiaomi_mue4094rt/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/xiaomi_mue4094rt/binary_sensor.py b/esphome/components/xiaomi_mue4094rt/binary_sensor.py
new file mode 100644
index 0000000000..946b1694c4
--- /dev/null
+++ b/esphome/components/xiaomi_mue4094rt/binary_sensor.py
@@ -0,0 +1,29 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import binary_sensor, esp32_ble_tracker
+from esphome.const import CONF_MAC_ADDRESS, CONF_DEVICE_CLASS, CONF_TIMEOUT, CONF_ID
+
+
+DEPENDENCIES = ['esp32_ble_tracker']
+AUTO_LOAD = ['xiaomi_ble']
+
+xiaomi_mue4094rt_ns = cg.esphome_ns.namespace('xiaomi_mue4094rt')
+XiaomiMUE4094RT = xiaomi_mue4094rt_ns.class_('XiaomiMUE4094RT', binary_sensor.BinarySensor,
+                                             cg.Component, esp32_ble_tracker.ESPBTDeviceListener)
+
+CONFIG_SCHEMA = cv.All(binary_sensor.BINARY_SENSOR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(XiaomiMUE4094RT),
+    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_DEVICE_CLASS, default='motion'): binary_sensor.device_class,
+    cv.Optional(CONF_TIMEOUT, default='5s'): cv.positive_time_period_milliseconds,
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+    yield binary_sensor.register_binary_sensor(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+    cg.add(var.set_time(config[CONF_TIMEOUT]))
diff --git a/esphome/components/xiaomi_mue4094rt/xiaomi_mue4094rt.cpp b/esphome/components/xiaomi_mue4094rt/xiaomi_mue4094rt.cpp
new file mode 100644
index 0000000000..45337f330e
--- /dev/null
+++ b/esphome/components/xiaomi_mue4094rt/xiaomi_mue4094rt.cpp
@@ -0,0 +1,59 @@
+#include "xiaomi_mue4094rt.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_mue4094rt {
+
+static const char *TAG = "xiaomi_mue4094rt";
+
+void XiaomiMUE4094RT::dump_config() {
+  ESP_LOGCONFIG(TAG, "Xiaomi MUE4094RT");
+  LOG_BINARY_SENSOR("  ", "Motion", this);
+}
+
+bool XiaomiMUE4094RT::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption) {
+      ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device.");
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->has_motion.has_value()) {
+      this->publish_state(*res->has_motion);
+      this->set_timeout("motion_timeout", timeout_, [this]() { this->publish_state(false); });
+    }
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
+}  // namespace xiaomi_mue4094rt
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_mue4094rt/xiaomi_mue4094rt.h b/esphome/components/xiaomi_mue4094rt/xiaomi_mue4094rt.h
new file mode 100644
index 0000000000..31f913ec94
--- /dev/null
+++ b/esphome/components/xiaomi_mue4094rt/xiaomi_mue4094rt.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_mue4094rt {
+
+class XiaomiMUE4094RT : public Component,
+                        public binary_sensor::BinarySensorInitiallyOff,
+                        public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; }
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void set_time(uint16_t timeout) { timeout_ = timeout; }
+
+ protected:
+  uint64_t address_;
+  uint16_t timeout_;
+};
+
+}  // namespace xiaomi_mue4094rt
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_wx08zm/__init__.py b/esphome/components/xiaomi_wx08zm/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/xiaomi_wx08zm/binary_sensor.py b/esphome/components/xiaomi_wx08zm/binary_sensor.py
new file mode 100644
index 0000000000..1d60dbf5e0
--- /dev/null
+++ b/esphome/components/xiaomi_wx08zm/binary_sensor.py
@@ -0,0 +1,36 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor, binary_sensor, esp32_ble_tracker
+from esphome.const import CONF_BATTERY_LEVEL, CONF_MAC_ADDRESS, CONF_TABLET, \
+    UNIT_PERCENT, ICON_BUG, ICON_BATTERY, CONF_ID
+
+
+DEPENDENCIES = ['esp32_ble_tracker']
+AUTO_LOAD = ['xiaomi_ble']
+
+xiaomi_wx08zm_ns = cg.esphome_ns.namespace('xiaomi_wx08zm')
+XiaomiWX08ZM = xiaomi_wx08zm_ns.class_('XiaomiWX08ZM', binary_sensor.BinarySensor,
+                                       esp32_ble_tracker.ESPBTDeviceListener, cg.Component)
+
+CONFIG_SCHEMA = cv.All(binary_sensor.BINARY_SENSOR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(XiaomiWX08ZM),
+    cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
+    cv.Optional(CONF_TABLET): sensor.sensor_schema(UNIT_PERCENT, ICON_BUG, 0),
+    cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(UNIT_PERCENT, ICON_BATTERY, 0),
+}).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA).extend(cv.COMPONENT_SCHEMA))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield esp32_ble_tracker.register_ble_device(var, config)
+    yield binary_sensor.register_binary_sensor(var, config)
+
+    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
+
+    if CONF_TABLET in config:
+        sens = yield sensor.new_sensor(config[CONF_TABLET])
+        cg.add(var.set_tablet(sens))
+    if CONF_BATTERY_LEVEL in config:
+        sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
+        cg.add(var.set_battery_level(sens))
diff --git a/esphome/components/xiaomi_wx08zm/xiaomi_wx08zm.cpp b/esphome/components/xiaomi_wx08zm/xiaomi_wx08zm.cpp
new file mode 100644
index 0000000000..6ecdf8f4f4
--- /dev/null
+++ b/esphome/components/xiaomi_wx08zm/xiaomi_wx08zm.cpp
@@ -0,0 +1,64 @@
+#include "xiaomi_wx08zm.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_wx08zm {
+
+static const char *TAG = "xiaomi_wx08zm";
+
+void XiaomiWX08ZM::dump_config() {
+  ESP_LOGCONFIG(TAG, "Xiaomi WX08ZM");
+  LOG_BINARY_SENSOR("  ", "Mosquito Repellent", this);
+  LOG_SENSOR("  ", "Tablet Resource", this->tablet_);
+  LOG_SENSOR("  ", "Battery Level", this->battery_level_);
+}
+
+bool XiaomiWX08ZM::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
+  if (device.address_uint64() != this->address_) {
+    ESP_LOGVV(TAG, "parse_device(): unknown MAC address.");
+    return false;
+  }
+  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
+
+  bool success = false;
+  for (auto &service_data : device.get_service_datas()) {
+    auto res = xiaomi_ble::parse_xiaomi_header(service_data);
+    if (!res.has_value()) {
+      continue;
+    }
+    if (res->is_duplicate) {
+      continue;
+    }
+    if (res->has_encryption) {
+      ESP_LOGVV(TAG, "parse_device(): payload decryption is currently not supported on this device.");
+      continue;
+    }
+    if (!(xiaomi_ble::parse_xiaomi_message(service_data.data, *res))) {
+      continue;
+    }
+    if (!(xiaomi_ble::report_xiaomi_results(res, device.address_str()))) {
+      continue;
+    }
+    if (res->is_active.has_value()) {
+      this->publish_state(*res->is_active);
+    }
+    if (res->tablet.has_value() && this->tablet_ != nullptr)
+      this->tablet_->publish_state(*res->tablet);
+    if (res->battery_level.has_value() && this->battery_level_ != nullptr)
+      this->battery_level_->publish_state(*res->battery_level);
+    success = true;
+  }
+
+  if (!success) {
+    return false;
+  }
+
+  return true;
+}
+
+}  // namespace xiaomi_wx08zm
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/xiaomi_wx08zm/xiaomi_wx08zm.h b/esphome/components/xiaomi_wx08zm/xiaomi_wx08zm.h
new file mode 100644
index 0000000000..f3eba0e159
--- /dev/null
+++ b/esphome/components/xiaomi_wx08zm/xiaomi_wx08zm.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/components/xiaomi_ble/xiaomi_ble.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace xiaomi_wx08zm {
+
+class XiaomiWX08ZM : public Component,
+                     public binary_sensor::BinarySensorInitiallyOff,
+                     public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  void set_address(uint64_t address) { address_ = address; }
+
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void set_tablet(sensor::Sensor *tablet) { tablet_ = tablet; }
+  void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; }
+
+ protected:
+  uint64_t address_;
+  sensor::Sensor *tablet_{nullptr};
+  sensor::Sensor *battery_level_{nullptr};
+};
+
+}  // namespace xiaomi_wx08zm
+}  // namespace esphome
+
+#endif
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 55199e6647..fa2a14dbd6 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -566,6 +566,23 @@ def mac_address(value):
     return core.MACAddress(*parts_int)
 
 
+def bind_key(value):
+    value = string_strict(value)
+    parts = [value[i:i+2] for i in range(0, len(value), 2)]
+    if len(parts) != 16:
+        raise Invalid("Bind key must consist of 16 hexadecimal numbers")
+    parts_int = []
+    if any(len(part) != 2 for part in parts):
+        raise Invalid("Bind key must be format XX")
+    for part in parts:
+        try:
+            parts_int.append(int(part, 16))
+        except ValueError:
+            raise Invalid("Bind key must be hex values from 00 to FF")
+
+    return ''.join(f'{part:02X}' for part in parts_int)
+
+
 def uuid(value):
     return Coerce(uuid_.UUID)(value)
 
diff --git a/esphome/const.py b/esphome/const.py
index 31359e610d..b244d5681a 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -55,6 +55,7 @@ CONF_BELOW = 'below'
 CONF_BINARY = 'binary'
 CONF_BINARY_SENSOR = 'binary_sensor'
 CONF_BINARY_SENSORS = 'binary_sensors'
+CONF_BINDKEY = 'bindkey'
 CONF_BIRTH_MESSAGE = 'birth_message'
 CONF_BIT_DEPTH = 'bit_depth'
 CONF_BLUE = 'blue'
@@ -194,6 +195,7 @@ CONF_ID = 'id'
 CONF_IDLE = 'idle'
 CONF_IDLE_ACTION = 'idle_action'
 CONF_IDLE_LEVEL = 'idle_level'
+CONF_IDLE_TIME = 'idle_time'
 CONF_IF = 'if'
 CONF_IIR_FILTER = 'iir_filter'
 CONF_ILLUMINANCE = 'illuminance'
@@ -265,6 +267,7 @@ CONF_MODEL = 'model'
 CONF_MOISTURE = 'moisture'
 CONF_MONTHS = 'months'
 CONF_MOSI_PIN = 'mosi_pin'
+CONF_MOTION = 'motion'
 CONF_MOVEMENT_COUNTER = 'movement_counter'
 CONF_MQTT = 'mqtt'
 CONF_MQTT_ID = 'mqtt_id'
@@ -445,6 +448,7 @@ CONF_SUPPORTS_HEAT = 'supports_heat'
 CONF_SWING_MODE = 'swing_mode'
 CONF_SWITCHES = 'switches'
 CONF_SYNC = 'sync'
+CONF_TABLET = 'tablet'
 CONF_TAG = 'tag'
 CONF_TARGET = 'target'
 CONF_TARGET_TEMPERATURE = 'target_temperature'
@@ -520,17 +524,20 @@ ICON_ARROW_EXPAND_VERTICAL = 'mdi:arrow-expand-vertical'
 ICON_BATTERY = 'mdi:battery'
 ICON_BRIEFCASE_DOWNLOAD = 'mdi:briefcase-download'
 ICON_BRIGHTNESS_5 = 'mdi:brightness-5'
+ICON_BUG = 'mdi:bug'
 ICON_CHECK_CIRCLE_OUTLINE = 'mdi:check-circle-outline'
 ICON_CHEMICAL_WEAPON = 'mdi:chemical-weapon'
 ICON_COUNTER = 'mdi:counter'
 ICON_CURRENT_AC = 'mdi:current-ac'
 ICON_EMPTY = ''
 ICON_FLASH = 'mdi:flash'
+ICON_FLASK_OUTLINE = 'mdi:flask-outline'
 ICON_FLOWER = 'mdi:flower'
 ICON_GAS_CYLINDER = 'mdi:gas-cylinder'
 ICON_GAUGE = 'mdi:gauge'
 ICON_LIGHTBULB = 'mdi:lightbulb'
 ICON_MAGNET = 'mdi:magnet'
+ICON_MOTION_SENSOR = 'mdi:motion-sensor'
 ICON_NEW_BOX = 'mdi:new-box'
 ICON_PERCENT = 'mdi:percent'
 ICON_PERIODIC_TABLE_CO2 = 'mdi:periodic-table-co2'
@@ -546,6 +553,7 @@ ICON_SIGN_DIRECTION = 'mdi:sign-direction'
 ICON_SIGNAL = 'mdi:signal-distance-variant'
 ICON_SIGNAL_DISTANCE_VARIANT = 'mdi:signal'
 ICON_THERMOMETER = 'mdi:thermometer'
+ICON_TIMELAPSE = 'mdi:timelapse'
 ICON_TIMER = 'mdi:timer'
 ICON_WATER_PERCENT = 'mdi:water-percent'
 ICON_WEATHER_SUNSET = 'mdi:weather-sunset'
@@ -575,6 +583,8 @@ UNIT_MICROGRAMS_PER_CUBIC_METER = 'µg/m³'
 UNIT_MICROMETER = 'µm'
 UNIT_MICROSIEMENS_PER_CENTIMETER = 'µS/cm'
 UNIT_MICROTESLA = 'µT'
+UNIT_MILLIGRAMS_PER_CUBIC_METER = 'mg/m³'
+UNIT_MINUTE = 'min'
 UNIT_OHM = 'Ω'
 UNIT_PARTS_PER_BILLION = 'ppb'
 UNIT_PARTS_PER_MILLION = 'ppm'
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 6bc0ac93c3..34b7ad6b07 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -44,16 +44,14 @@ ota:
 logger:
   level: DEBUG
 
-web_server:
-  auth:
-    username: admin
-    password: admin
-
 as3935_i2c:
   irq_pin: GPIO12
 
 
 sensor:
+  - platform: homeassistant
+    entity_id: sensor.hello_world
+    id: ha_hello_world
   - platform: ble_rssi
     mac_address: AC:37:43:77:5F:4C
     name: "BLE Google Home Mini RSSI value"
@@ -66,40 +64,6 @@ sensor:
   - platform: ble_rssi
     service_uuid: '11223344-5566-7788-99aa-bbccddeeff00'
     name: "BLE Test Service 128"
-  - platform: xiaomi_hhccjcy01
-    mac_address: 94:2B:FF:5C:91:61
-    temperature:
-      name: "Xiaomi HHCCJCY01 Temperature"
-    moisture:
-      name: "Xiaomi HHCCJCY01 Moisture"
-    illuminance:
-      name: "Xiaomi HHCCJCY01 Illuminance"
-    conductivity:
-      name: "Xiaomi HHCCJCY01 Soil Conductivity"
-    battery_level:
-      name: "Xiaomi HHCCJCY01 Battery Level"
-  - platform: xiaomi_lywsdcgq
-    mac_address: 7A:80:8E:19:36:BA
-    temperature:
-      name: "Xiaomi LYWSDCGQ Temperature"
-    humidity:
-      name: "Xiaomi LYWSDCGQ Humidity"
-    battery_level:
-      name: "Xiaomi LYWSDCGQ Battery Level"
-  - platform: xiaomi_lywsd02
-    mac_address: 3F:5B:7D:82:58:4E
-    temperature:
-      name: "Xiaomi LYWSD02 Temperature"
-    humidity:
-      name: "Xiaomi LYWSD02 Humidity"
-  - platform: xiaomi_cgg1
-    mac_address: 7A:80:8E:19:36:BA
-    temperature:
-      name: "Xiaomi CGG1 Temperature"
-    humidity:
-      name: "Xiaomi CGG1 Humidity"
-    battery_level:
-      name: "Xiaomi CGG1 Battery Level"
   - platform: ruuvitag
     mac_address: FF:56:D3:2F:7D:E8
     humidity:
@@ -122,14 +86,88 @@ sensor:
       name: "RuuviTag Movement Counter"
     measurement_sequence_number:
       name: "RuuviTag Measurement Sequence Number"
-  - platform: homeassistant
-    entity_id: sensor.hello_world
-    id: ha_hello_world
   - platform: as3935
     lightning_energy:
       name: "Lightning Energy"
     distance:
       name: "Distance Storm"
+  - platform: xiaomi_hhccjcy01
+    mac_address: 94:2B:FF:5C:91:61
+    temperature:
+      name: "Xiaomi HHCCJCY01 Temperature"
+    moisture:
+      name: "Xiaomi HHCCJCY01 Moisture"
+    illuminance:
+      name: "Xiaomi HHCCJCY01 Illuminance"
+    conductivity:
+      name: "Xiaomi HHCCJCY01 Soil Conductivity"
+  - platform: xiaomi_lywsdcgq
+    mac_address: 7A:80:8E:19:36:BA
+    temperature:
+      name: "Xiaomi LYWSDCGQ Temperature"
+    humidity:
+      name: "Xiaomi LYWSDCGQ Humidity"
+    battery_level:
+      name: "Xiaomi LYWSDCGQ Battery Level"
+  - platform: xiaomi_lywsd02
+    mac_address: 3F:5B:7D:82:58:4E
+    temperature:
+      name: "Xiaomi LYWSD02 Temperature"
+    humidity:
+      name: "Xiaomi LYWSD02 Humidity"
+  - platform: xiaomi_cgg1
+    mac_address: 7A:80:8E:19:36:BA
+    temperature:
+      name: "Xiaomi CGG1 Temperature"
+    humidity:
+      name: "Xiaomi CGG1 Humidity"
+    battery_level:
+      name: "Xiaomi CGG1 Battery Level"
+  - platform: xiaomi_gcls002
+    mac_address: "94:2B:FF:5C:91:61"
+    temperature:
+      name: "GCLS02 Temperature"
+    moisture:
+      name: "GCLS02 Moisture"
+    conductivity:
+      name: "GCLS02 Soil Conductivity"
+    illuminance:
+      name: "GCLS02 Illuminance"
+  - platform: xiaomi_hhccpot002
+    mac_address: "94:2B:FF:5C:91:61"
+    moisture:
+      name: "HHCCPOT002 Moisture"
+    conductivity:
+      name: "HHCCPOT002 Soil Conductivity"
+  - platform: xiaomi_lywsd03mmc
+    mac_address: "A4:C1:38:4E:16:78"
+    bindkey: "e9efaa6873f9f9c87a5e75a5f814801c"
+    temperature:
+      name: "Xiaomi LYWSD03MMC Temperature"
+    humidity:
+      name: "Xiaomi LYWSD03MMC Humidity"
+    battery_level:
+      name: "Xiaomi LYWSD03MMC Battery Level"
+  - platform: xiaomi_cgd1
+    mac_address: "A4:C1:38:D1:61:7D"
+    bindkey: "c99d2313182473b38001086febf781bd"
+    temperature:
+      name: "Xiaomi CGD1 Temperature"
+    humidity:
+      name: "Xiaomi CGD1 Humidity"
+    battery_level:
+      name: "Xiaomi CGD1 Battery Level"
+  - platform: xiaomi_jqjcy01ym
+    mac_address: "7A:80:8E:19:36:BA"
+    temperature:
+      name: "JQJCY01YM Temperature"
+    humidity:
+      name: "JQJCY01YM Humidity"
+    formaldehyde:
+      name: "JQJCY01YM Formaldehyde"
+    battery_level:
+      name: "JQJCY01YM Battery Level"
+
 
 time:
 - platform: homeassistant
@@ -142,6 +180,9 @@ esp32_touch:
   setup_mode: True
 
 binary_sensor:
+  - platform: homeassistant
+    entity_id: binary_sensor.hello_world
+    id: ha_hello_world_binary
   - platform: ble_presence
     mac_address: AC:37:43:77:5F:4C
     name: "ESP32 BLE Tracker Google Home Mini"
@@ -158,11 +199,30 @@ binary_sensor:
     name: "ESP32 Touch Pad GPIO27"
     pin: GPIO27
     threshold: 1000
-  - platform: homeassistant
-    entity_id: binary_sensor.hello_world
-    id: ha_hello_world_binary
   - platform: as3935
     name: "Storm Alert"
+  - platform: xiaomi_mue4094rt
+    name: "MUE4094RT Motion"
+    mac_address: "7A:80:8E:19:36:BA"
+    timeout: "5s"
+  - platform: xiaomi_mjyd02yla
+    name: "MJYD02YL-A Motion"
+    mac_address: "50:EC:50:CD:32:02"
+    bindkey: "48403ebe2d385db8d0c187f81e62cb64"
+    idle_time:
+      name: "MJYD02YL-A Idle Time"
+    light:
+      name: "MJYD02YL-A Light Status"
+    battery_level:
+      name: "MJYD02YL-A Battery Level"
+  - platform: xiaomi_wx08zm
+    name: "WX08ZM Activation State"
+    mac_address: "74:a3:4a:b5:07:34"
+    tablet:
+      name: "WX08ZM Tablet Resource"
+    battery_level:
+      name: "WX08ZM Battery Level"
+
 
 esp32_ble_tracker:
   on_ble_advertise:
@@ -257,3 +317,4 @@ interval:
 
 display:
 
+
diff --git a/tests/test4.yaml b/tests/test4.yaml
new file mode 100644
index 0000000000..c7aa016839
--- /dev/null
+++ b/tests/test4.yaml
@@ -0,0 +1,73 @@
+esphome:
+  name: $devicename
+  platform: ESP32
+  board: nodemcu-32s
+  build_path: build/test4
+
+substitutions:
+  devicename: test4
+
+ethernet:
+  type: LAN8720
+  mdc_pin: GPIO23
+  mdio_pin: GPIO25
+  clk_mode: GPIO0_IN
+  phy_addr: 0
+  power_pin: GPIO25
+  manual_ip:
+    static_ip: 192.168.178.56
+    gateway: 192.168.178.1
+    subnet: 255.255.255.0
+  domain: .local
+
+api:
+
+i2c:
+  sda: 21
+  scl: 22
+  scan: False
+
+spi:
+  clk_pin: GPIO21
+  mosi_pin: GPIO22
+  miso_pin: GPIO23
+
+uart:
+  tx_pin: GPIO22
+  rx_pin: GPIO23
+  baud_rate: 115200
+
+ota:
+  safe_mode: True
+  port: 3286
+
+logger:
+  level: DEBUG
+
+web_server:
+  auth:
+    username: admin
+    password: admin
+
+sensor:
+  - platform: homeassistant
+    entity_id: sensor.hello_world
+    id: ha_hello_world
+#
+# platform sensor.apds9960 requires component apds9960
+#
+#  - platform: apds9960
+#    type: proximity
+#    name: APDS9960 Proximity
+#  - platform: apds9960
+#    type: clear
+#    name: APDS9960 Clear
+#  - platform: apds9960
+#    type: red
+#    name: APDS9960 Red
+#  - platform: apds9960
+#    type: green
+#    name: APDS9960 Green
+#  - platform: apds9960
+#    type: blue
+#    name: APDS9960 Blue

From fed37b48a107dbf01b4cf53b3906b8a3a5e64c46 Mon Sep 17 00:00:00 2001
From: gitolicious <26963495+gitolicious@users.noreply.github.com>
Date: Wed, 27 May 2020 00:47:35 +0200
Subject: [PATCH 220/412] Explicitly set language to English (#1073)

---
 esphome/components/web_server/web_server.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 1f6cd10666..48a47080b2 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -139,7 +139,7 @@ float WebServer::get_setup_priority() const { return setup_priority::WIFI - 1.0f
 void WebServer::handle_index_request(AsyncWebServerRequest *request) {
   AsyncResponseStream *stream = request->beginResponseStream("text/html");
   std::string title = App.get_name() + " Web Server";
-  stream->print(F("<!DOCTYPE html><html><head><meta charset=UTF-8><title>"));
+  stream->print(F("<!DOCTYPE html><html lang=\"en\"><head><meta charset=UTF-8><title>"));
   stream->print(title.c_str());
   stream->print(F("</title>"));
 #ifdef WEBSERVER_CSS_INCLUDE

From ecd65003d436eb73d729a108846283051d1e5b8f Mon Sep 17 00:00:00 2001
From: igg <igg@users.noreply.github.com>
Date: Thu, 28 May 2020 15:11:25 -0700
Subject: [PATCH 221/412] Added support for ssd1327 (#985)

Co-authored-by: Ilya Goldberg <iggie@mac.com>
---
 esphome/components/ssd1325_base/__init__.py   |  1 +
 .../components/ssd1325_base/ssd1325_base.cpp  | 27 +++++++++++++++----
 .../components/ssd1325_base/ssd1325_base.h    |  1 +
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/esphome/components/ssd1325_base/__init__.py b/esphome/components/ssd1325_base/__init__.py
index 69e11ec0d1..011642c408 100644
--- a/esphome/components/ssd1325_base/__init__.py
+++ b/esphome/components/ssd1325_base/__init__.py
@@ -14,6 +14,7 @@ MODELS = {
     'SSD1325_128X64': SSD1325Model.SSD1325_MODEL_128_64,
     'SSD1325_96X16': SSD1325Model.SSD1325_MODEL_96_16,
     'SSD1325_64X48': SSD1325Model.SSD1325_MODEL_64_48,
+    'SSD1327_128X128': SSD1325Model.SSD1327_MODEL_128_128,
 }
 
 SSD1325_MODEL = cv.enum(MODELS, upper=True, space="_")
diff --git a/esphome/components/ssd1325_base/ssd1325_base.cpp b/esphome/components/ssd1325_base/ssd1325_base.cpp
index 3079e19cc8..22dc51e790 100644
--- a/esphome/components/ssd1325_base/ssd1325_base.cpp
+++ b/esphome/components/ssd1325_base/ssd1325_base.cpp
@@ -48,15 +48,24 @@ void SSD1325::setup() {
   this->command(SSD1325_SETCLOCK);     /* set osc division */
   this->command(0xF1);                 /* 145 */
   this->command(SSD1325_SETMULTIPLEX); /* multiplex ratio */
-  this->command(0x3f);                 /* duty = 1/64 */
-  this->command(SSD1325_SETOFFSET);    /* set display offset --- */
-  this->command(0x4C);                 /* 76 */
+  if (this->model_ == SSD1327_MODEL_128_128)
+    this->command(0x7f);  // duty = height - 1
+  else
+    this->command(0x3f);            // duty = 1/64
+  this->command(SSD1325_SETOFFSET); /* set display offset --- */
+  if (this->model_ == SSD1327_MODEL_128_128)
+    this->command(0x00);  // 0
+  else
+    this->command(0x4C);               // 76
   this->command(SSD1325_SETSTARTLINE); /*set start line */
   this->command(0x00);                 /* ------ */
   this->command(SSD1325_MASTERCONFIG); /*Set Master Config DC/DC Converter*/
   this->command(0x02);
   this->command(SSD1325_SETREMAP); /* set segment remap------ */
-  this->command(0x56);
+  if (this->model_ == SSD1327_MODEL_128_128)
+    this->command(0x55);  // 0x56 is flipped horizontally: enable column swap, disable nibble remap
+  else
+    this->command(0x56);
   this->command(SSD1325_SETCURRENT + 0x2); /* Set Full Current Range */
   this->command(SSD1325_SETGRAYTABLE);
   this->command(0x01);
@@ -90,7 +99,10 @@ void SSD1325::display() {
   this->command(0x3F);               /* set column end address */
   this->command(SSD1325_SETROWADDR); /* set row address */
   this->command(0x00);               /* set row start address */
-  this->command(0x3F);               /* set row end address */
+  if (this->model_ == SSD1327_MODEL_128_128)
+    this->command(0x7F);  // 127 is last row
+  else
+    this->command(0x3F);  // 63 is last row
 
   this->write_display_data();
 }
@@ -108,6 +120,8 @@ int SSD1325::get_height_internal() {
       return 16;
     case SSD1325_MODEL_64_48:
       return 48;
+    case SSD1327_MODEL_128_128:
+      return 128;
     default:
       return 0;
   }
@@ -116,6 +130,7 @@ int SSD1325::get_width_internal() {
   switch (this->model_) {
     case SSD1325_MODEL_128_32:
     case SSD1325_MODEL_128_64:
+    case SSD1327_MODEL_128_128:
       return 128;
     case SSD1325_MODEL_96_16:
       return 96;
@@ -168,6 +183,8 @@ const char *SSD1325::model_str_() {
       return "SSD1325 96x16";
     case SSD1325_MODEL_64_48:
       return "SSD1325 64x48";
+    case SSD1327_MODEL_128_128:
+      return "SSD1327 128x128";
     default:
       return "Unknown";
   }
diff --git a/esphome/components/ssd1325_base/ssd1325_base.h b/esphome/components/ssd1325_base/ssd1325_base.h
index e227f68f86..e796b85a33 100644
--- a/esphome/components/ssd1325_base/ssd1325_base.h
+++ b/esphome/components/ssd1325_base/ssd1325_base.h
@@ -12,6 +12,7 @@ enum SSD1325Model {
   SSD1325_MODEL_128_64,
   SSD1325_MODEL_96_16,
   SSD1325_MODEL_64_48,
+  SSD1327_MODEL_128_128,
 };
 
 class SSD1325 : public PollingComponent, public display::DisplayBuffer {

From 7e4d12f88011a5f7c44d00b33a95a1d750eea67c Mon Sep 17 00:00:00 2001
From: Adrian Cuzman <adriancuzman@users.noreply.github.com>
Date: Fri, 29 May 2020 01:54:00 +0300
Subject: [PATCH 222/412] added energy reading for pzem004 (#1022)

---
 esphome/components/pzem004t/pzem004t.cpp | 10 +++++++++-
 esphome/components/pzem004t/pzem004t.h   |  3 +++
 esphome/components/pzem004t/sensor.py    |  8 +++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/esphome/components/pzem004t/pzem004t.cpp b/esphome/components/pzem004t/pzem004t.cpp
index e2d832b019..b9deab1949 100644
--- a/esphome/components/pzem004t/pzem004t.cpp
+++ b/esphome/components/pzem004t/pzem004t.cpp
@@ -59,11 +59,19 @@ void PZEM004T::loop() {
         if (this->power_sensor_ != nullptr)
           this->power_sensor_->publish_state(power);
         ESP_LOGD(TAG, "Got Power %u W", power);
+        this->write_state_(READ_ENERGY);
+        break;
+      }
+
+      case 0xA3: {  // Energy Response
+        uint32_t energy = (uint32_t(resp[1]) << 16) | (uint32_t(resp[2]) << 8) | (uint32_t(resp[3]));
+        if (this->energy_sensor_ != nullptr)
+          this->energy_sensor_->publish_state(energy);
+        ESP_LOGD(TAG, "Got Energy %u Wh", energy);
         this->write_state_(DONE);
         break;
       }
 
-      case 0xA3:  // Energy Response
       case 0xA5:  // Set Power Alarm Response
       case 0xB0:  // Voltage Request
       case 0xB1:  // Current Request
diff --git a/esphome/components/pzem004t/pzem004t.h b/esphome/components/pzem004t/pzem004t.h
index f0208d415a..517b81eb21 100644
--- a/esphome/components/pzem004t/pzem004t.h
+++ b/esphome/components/pzem004t/pzem004t.h
@@ -12,6 +12,7 @@ class PZEM004T : public PollingComponent, public uart::UARTDevice {
   void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
   void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
   void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
+  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
 
   void loop() override;
 
@@ -23,12 +24,14 @@ class PZEM004T : public PollingComponent, public uart::UARTDevice {
   sensor::Sensor *voltage_sensor_;
   sensor::Sensor *current_sensor_;
   sensor::Sensor *power_sensor_;
+  sensor::Sensor *energy_sensor_;
 
   enum PZEM004TReadState {
     SET_ADDRESS = 0xB4,
     READ_VOLTAGE = 0xB0,
     READ_CURRENT = 0xB1,
     READ_POWER = 0xB2,
+    READ_ENERGY = 0xB3,
     DONE = 0x00,
   } read_state_{DONE};
 
diff --git a/esphome/components/pzem004t/sensor.py b/esphome/components/pzem004t/sensor.py
index 6e3628c5ec..b54ba4887c 100644
--- a/esphome/components/pzem004t/sensor.py
+++ b/esphome/components/pzem004t/sensor.py
@@ -2,7 +2,8 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, uart
 from esphome.const import CONF_CURRENT, CONF_ID, CONF_POWER, CONF_VOLTAGE, \
-    UNIT_VOLT, ICON_FLASH, UNIT_AMPERE, UNIT_WATT
+    CONF_ENERGY, UNIT_VOLT, ICON_FLASH, ICON_COUNTER, UNIT_AMPERE, UNIT_WATT, \
+    UNIT_WATT_HOURS
 
 DEPENDENCIES = ['uart']
 
@@ -15,6 +16,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(UNIT_VOLT, ICON_FLASH, 1),
     cv.Optional(CONF_CURRENT): sensor.sensor_schema(UNIT_AMPERE, ICON_FLASH, 2),
     cv.Optional(CONF_POWER): sensor.sensor_schema(UNIT_WATT, ICON_FLASH, 0),
+    cv.Optional(CONF_ENERGY): sensor.sensor_schema(UNIT_WATT_HOURS, ICON_COUNTER, 0)
 }).extend(cv.polling_component_schema('60s')).extend(uart.UART_DEVICE_SCHEMA)
 
 
@@ -35,3 +37,7 @@ def to_code(config):
         conf = config[CONF_POWER]
         sens = yield sensor.new_sensor(conf)
         cg.add(var.set_power_sensor(sens))
+    if CONF_ENERGY in config:
+        conf = config[CONF_ENERGY]
+        sens = yield sensor.new_sensor(conf)
+        cg.add(var.set_energy_sensor(sens))

From d1f4c2ab57e7fc4c982a091106c82fed0ec09822 Mon Sep 17 00:00:00 2001
From: rradar <34582688+rradar@users.noreply.github.com>
Date: Fri, 29 May 2020 03:10:34 +0100
Subject: [PATCH 223/412] BH1750 Measurement time (#997)

* BH1750 Measurement time

Fixes https://github.com/esphome/feature-requests/issues/148

* lint

* add test

Co-authored-by: Otto Winter <otto@otto-winter.com>
Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/bh1750/bh1750.cpp | 11 +++++++++++
 esphome/components/bh1750/bh1750.h   |  2 ++
 esphome/components/bh1750/sensor.py  |  3 +++
 tests/test1.yaml                     |  2 +-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/esphome/components/bh1750/bh1750.cpp b/esphome/components/bh1750/bh1750.cpp
index 9cd152e1ef..2ec297a6f4 100644
--- a/esphome/components/bh1750/bh1750.cpp
+++ b/esphome/components/bh1750/bh1750.cpp
@@ -7,6 +7,8 @@ namespace bh1750 {
 static const char *TAG = "bh1750.sensor";
 
 static const uint8_t BH1750_COMMAND_POWER_ON = 0b00000001;
+static const uint8_t BH1750_COMMAND_MT_REG_HI = 0b01000000;  // last 3 bits
+static const uint8_t BH1750_COMMAND_MT_REG_LO = 0b01100000;  // last 5 bits
 
 void BH1750Sensor::setup() {
   ESP_LOGCONFIG(TAG, "Setting up BH1750 '%s'...", this->name_.c_str());
@@ -14,7 +16,13 @@ void BH1750Sensor::setup() {
     this->mark_failed();
     return;
   }
+
+  uint8_t mtreg_hi = (this->measurement_time_ >> 5) & 0b111;
+  uint8_t mtreg_lo = (this->measurement_time_ >> 0) & 0b11111;
+  this->write_bytes(BH1750_COMMAND_MT_REG_HI | mtreg_hi, nullptr, 0);
+  this->write_bytes(BH1750_COMMAND_MT_REG_LO | mtreg_lo, nullptr, 0);
 }
+
 void BH1750Sensor::dump_config() {
   LOG_SENSOR("", "BH1750", this);
   LOG_I2C_DEVICE(this);
@@ -59,6 +67,7 @@ void BH1750Sensor::update() {
 
   this->set_timeout("illuminance", wait, [this]() { this->read_data_(); });
 }
+
 float BH1750Sensor::get_setup_priority() const { return setup_priority::DATA; }
 void BH1750Sensor::read_data_() {
   uint16_t raw_value;
@@ -68,10 +77,12 @@ void BH1750Sensor::read_data_() {
   }
 
   float lx = float(raw_value) / 1.2f;
+  lx *= 69.0f / this->measurement_time_;
   ESP_LOGD(TAG, "'%s': Got illuminance=%.1flx", this->get_name().c_str(), lx);
   this->publish_state(lx);
   this->status_clear_warning();
 }
+
 void BH1750Sensor::set_resolution(BH1750Resolution resolution) { this->resolution_ = resolution; }
 
 }  // namespace bh1750
diff --git a/esphome/components/bh1750/bh1750.h b/esphome/components/bh1750/bh1750.h
index 8df0bda02a..00abd53e92 100644
--- a/esphome/components/bh1750/bh1750.h
+++ b/esphome/components/bh1750/bh1750.h
@@ -28,6 +28,7 @@ class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c:
    * @param resolution The new resolution of the sensor.
    */
   void set_resolution(BH1750Resolution resolution);
+  void set_measurement_time(uint8_t measurement_time) { measurement_time_ = measurement_time; }
 
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
@@ -40,6 +41,7 @@ class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c:
   void read_data_();
 
   BH1750Resolution resolution_{BH1750_RESOLUTION_0P5_LX};
+  uint8_t measurement_time_;
 };
 
 }  // namespace bh1750
diff --git a/esphome/components/bh1750/sensor.py b/esphome/components/bh1750/sensor.py
index b3ce0eaf88..54735616d5 100644
--- a/esphome/components/bh1750/sensor.py
+++ b/esphome/components/bh1750/sensor.py
@@ -15,9 +15,11 @@ BH1750_RESOLUTIONS = {
 
 BH1750Sensor = bh1750_ns.class_('BH1750Sensor', sensor.Sensor, cg.PollingComponent, i2c.I2CDevice)
 
+CONF_MEASUREMENT_TIME = 'measurement_time'
 CONFIG_SCHEMA = sensor.sensor_schema(UNIT_LUX, ICON_BRIGHTNESS_5, 1).extend({
     cv.GenerateID(): cv.declare_id(BH1750Sensor),
     cv.Optional(CONF_RESOLUTION, default=0.5): cv.enum(BH1750_RESOLUTIONS, float=True),
+    cv.Optional(CONF_MEASUREMENT_TIME, default=69): cv.int_range(min=31, max=254),
 }).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x23))
 
 
@@ -28,3 +30,4 @@ def to_code(config):
     yield i2c.register_i2c_device(var, config)
 
     cg.add(var.set_resolution(config[CONF_RESOLUTION]))
+    cg.add(var.set_measurement_time(config[CONF_MEASUREMENT_TIME]))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b7d6fe7a9d..115dc73464 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -308,6 +308,7 @@ sensor:
     retain: False
     availability:
     state_topic: livingroom/custom_state_topic
+    measurement_time: 31
   - platform: bme280
     temperature:
       name: "Outside Temperature"
@@ -1169,7 +1170,6 @@ light:
             if (initial_run) {
               it[0] = current_color;
             }
-
     - automation:
         name: Custom Effect
         sequence:

From 64bd33a94eb723ea882d4afa36360780fea3cfb8 Mon Sep 17 00:00:00 2001
From: Ivan Shvedunov <ivan4th@users.noreply.github.com>
Date: Tue, 9 Jun 2020 06:10:49 +0300
Subject: [PATCH 224/412] Sort keys in dicts in output yaml for 'config'
 command (#1049)

Having different output each time due to random key order makes some
tasks harder (such as CI scripts).
---
 esphome/yaml_util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index 053fba6274..1758e739db 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -338,7 +338,7 @@ class ESPHomeDumper(yaml.SafeDumper):  # pylint: disable=too-many-ancestors
             self.represented_objects[self.alias_key] = node
         best_style = True
         if hasattr(mapping, 'items'):
-            mapping = list(mapping.items())
+            mapping = sorted(mapping.items(), key=lambda item: item[0])
         for item_key, item_value in mapping:
             node_key = self.represent_data(item_key)
             node_value = self.represent_data(item_value)

From cd7af19e7cf32bc9c40480caa6efa2ba306cf34e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Wed, 10 Jun 2020 02:22:06 +0200
Subject: [PATCH 225/412] Extend uart: with rx_buffer_size: (#1006)

* Extend `uart:` with `rx_buffer_size:`

This allows to configure `rx_buffer_size:`
to efficiently receive big payloads over UART

* lint

* remove old default value

* add test

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/uart/__init__.py      |  5 ++++-
 esphome/components/uart/uart.h           |  6 ++++--
 esphome/components/uart/uart_esp32.cpp   |  2 ++
 esphome/components/uart/uart_esp8266.cpp | 10 ++++++++--
 esphome/const.py                         |  1 +
 tests/test1.yaml                         |  1 +
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/esphome/components/uart/__init__.py b/esphome/components/uart/__init__.py
index 06208dc621..65a9a3eaf8 100644
--- a/esphome/components/uart/__init__.py
+++ b/esphome/components/uart/__init__.py
@@ -1,7 +1,8 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins, automation
-from esphome.const import CONF_BAUD_RATE, CONF_ID, CONF_RX_PIN, CONF_TX_PIN, CONF_UART_ID, CONF_DATA
+from esphome.const import CONF_BAUD_RATE, CONF_ID, CONF_RX_PIN, CONF_TX_PIN, CONF_UART_ID, \
+    CONF_DATA, CONF_RX_BUFFER_SIZE
 from esphome.core import CORE, coroutine
 
 uart_ns = cg.esphome_ns.namespace('uart')
@@ -44,6 +45,7 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.Required(CONF_BAUD_RATE): cv.int_range(min=1),
     cv.Optional(CONF_TX_PIN): pins.output_pin,
     cv.Optional(CONF_RX_PIN): validate_rx_pin,
+    cv.Optional(CONF_RX_BUFFER_SIZE, default=256): cv.validate_bytes,
     cv.Optional(CONF_STOP_BITS, default=1): cv.one_of(1, 2, int=True),
     cv.Optional(CONF_DATA_BITS, default=8): cv.int_range(min=5, max=8),
     cv.Optional(CONF_PARITY, default="NONE"): cv.enum(UART_PARITY_OPTIONS, upper=True)
@@ -61,6 +63,7 @@ def to_code(config):
         cg.add(var.set_tx_pin(config[CONF_TX_PIN]))
     if CONF_RX_PIN in config:
         cg.add(var.set_rx_pin(config[CONF_RX_PIN]))
+    cg.add(var.set_rx_buffer_size(config[CONF_RX_BUFFER_SIZE]))
     cg.add(var.set_stop_bits(config[CONF_STOP_BITS]))
     cg.add(var.set_data_bits(config[CONF_DATA_BITS]))
     cg.add(var.set_parity(config[CONF_PARITY]))
diff --git a/esphome/components/uart/uart.h b/esphome/components/uart/uart.h
index 5528da1d5f..dedfdd74af 100644
--- a/esphome/components/uart/uart.h
+++ b/esphome/components/uart/uart.h
@@ -19,7 +19,7 @@ const char *parity_to_str(UARTParityOptions parity);
 class ESP8266SoftwareSerial {
  public:
   void setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits, uint32_t nr_bits,
-             UARTParityOptions parity);
+             UARTParityOptions parity, size_t rx_buffer_size);
 
   uint8_t read_byte();
   uint8_t peek_byte();
@@ -44,7 +44,7 @@ class ESP8266SoftwareSerial {
 
   uint32_t bit_time_{0};
   uint8_t *rx_buffer_{nullptr};
-  size_t rx_buffer_size_{512};
+  size_t rx_buffer_size_;
   volatile size_t rx_in_pos_{0};
   size_t rx_out_pos_{0};
   uint8_t stop_bits_;
@@ -93,6 +93,7 @@ class UARTComponent : public Component, public Stream {
 
   void set_tx_pin(uint8_t tx_pin) { this->tx_pin_ = tx_pin; }
   void set_rx_pin(uint8_t rx_pin) { this->rx_pin_ = rx_pin; }
+  void set_rx_buffer_size(size_t rx_buffer_size) { this->rx_buffer_size_ = rx_buffer_size; }
   void set_stop_bits(uint8_t stop_bits) { this->stop_bits_ = stop_bits; }
   void set_data_bits(uint8_t nr_bits) { this->nr_bits_ = nr_bits; }
   void set_parity(UARTParityOptions parity) { this->parity_ = parity; }
@@ -108,6 +109,7 @@ class UARTComponent : public Component, public Stream {
 #endif
   optional<uint8_t> tx_pin_;
   optional<uint8_t> rx_pin_;
+  size_t rx_buffer_size_;
   uint32_t baud_rate_;
   uint8_t stop_bits_;
   uint8_t nr_bits_;
diff --git a/esphome/components/uart/uart_esp32.cpp b/esphome/components/uart/uart_esp32.cpp
index cb6ac843d1..e18f9c5b1f 100644
--- a/esphome/components/uart/uart_esp32.cpp
+++ b/esphome/components/uart/uart_esp32.cpp
@@ -81,6 +81,7 @@ void UARTComponent::setup() {
   int8_t tx = this->tx_pin_.has_value() ? *this->tx_pin_ : -1;
   int8_t rx = this->rx_pin_.has_value() ? *this->rx_pin_ : -1;
   this->hw_serial_->begin(this->baud_rate_, get_config(), rx, tx);
+  this->hw_serial_->setRxBufferSize(this->rx_buffer_size_);
 }
 
 void UARTComponent::dump_config() {
@@ -90,6 +91,7 @@ void UARTComponent::dump_config() {
   }
   if (this->rx_pin_.has_value()) {
     ESP_LOGCONFIG(TAG, "  RX Pin: GPIO%d", *this->rx_pin_);
+    ESP_LOGCONFIG(TAG, "  RX Buffer Size: %u", this->rx_buffer_size_);
   }
   ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
   ESP_LOGCONFIG(TAG, "  Bits: %u", this->nr_bits_);
diff --git a/esphome/components/uart/uart_esp8266.cpp b/esphome/components/uart/uart_esp8266.cpp
index 59a08677b5..40975b6e5e 100644
--- a/esphome/components/uart/uart_esp8266.cpp
+++ b/esphome/components/uart/uart_esp8266.cpp
@@ -52,18 +52,22 @@ void UARTComponent::setup() {
   if (this->tx_pin_.value_or(1) == 1 && this->rx_pin_.value_or(3) == 3) {
     this->hw_serial_ = &Serial;
     this->hw_serial_->begin(this->baud_rate_, config);
+    this->hw_serial_->setRxBufferSize(this->rx_buffer_size_);
   } else if (this->tx_pin_.value_or(15) == 15 && this->rx_pin_.value_or(13) == 13) {
     this->hw_serial_ = &Serial;
     this->hw_serial_->begin(this->baud_rate_, config);
+    this->hw_serial_->setRxBufferSize(this->rx_buffer_size_);
     this->hw_serial_->swap();
   } else if (this->tx_pin_.value_or(2) == 2 && this->rx_pin_.value_or(8) == 8) {
     this->hw_serial_ = &Serial1;
     this->hw_serial_->begin(this->baud_rate_, config);
+    this->hw_serial_->setRxBufferSize(this->rx_buffer_size_);
   } else {
     this->sw_serial_ = new ESP8266SoftwareSerial();
     int8_t tx = this->tx_pin_.has_value() ? *this->tx_pin_ : -1;
     int8_t rx = this->rx_pin_.has_value() ? *this->rx_pin_ : -1;
-    this->sw_serial_->setup(tx, rx, this->baud_rate_, this->stop_bits_, this->nr_bits_, this->parity_);
+    this->sw_serial_->setup(tx, rx, this->baud_rate_, this->stop_bits_, this->nr_bits_, this->parity_,
+                            this->rx_buffer_size_);
   }
 }
 
@@ -74,6 +78,7 @@ void UARTComponent::dump_config() {
   }
   if (this->rx_pin_.has_value()) {
     ESP_LOGCONFIG(TAG, "  RX Pin: GPIO%d", *this->rx_pin_);
+    ESP_LOGCONFIG(TAG, "  RX Buffer Size: %u", this->rx_buffer_size_);  // NOLINT
   }
   ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
   ESP_LOGCONFIG(TAG, "  Bits: %u", this->nr_bits_);
@@ -210,8 +215,9 @@ void ESP8266SoftwareSerial::begin() {
   // this->gpio_rx_pin_->attach_interrupt(ESP8266SoftwareSerial::gpio_intr, this, FALLING);
 }
 void ESP8266SoftwareSerial::setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits, uint32_t nr_bits,
-                                  UARTParityOptions parity) {
+                                  UARTParityOptions parity, size_t rx_buffer_size) {
   this->bit_time_ = F_CPU / baud_rate;
+  this->rx_buffer_size_ = rx_buffer_size;
   this->stop_bits_ = stop_bits;
   this->nr_bits_ = nr_bits;
   this->parity_ = parity;
diff --git a/esphome/const.py b/esphome/const.py
index b244d5681a..95b2da36d7 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -395,6 +395,7 @@ CONF_RTD_WIRES = 'rtd_wires'
 CONF_RUN_CYCLES = 'run_cycles'
 CONF_RUN_DURATION = 'run_duration'
 CONF_RW_PIN = 'rw_pin'
+CONF_RX_BUFFER_SIZE = 'rx_buffer_size'
 CONF_RX_ONLY = 'rx_only'
 CONF_RX_PIN = 'rx_pin'
 CONF_SAFE_MODE = 'safe_mode'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 115dc73464..dae8cfdb21 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -135,6 +135,7 @@ uart:
   parity: NONE
   data_bits: 8
   stop_bits: 1
+  rx_buffer_size: 512
 
 ota:
   safe_mode: True

From f63fd9696fe207c2c996e4a8f87b009a0b0174e3 Mon Sep 17 00:00:00 2001
From: Marvin Gaube <dev@marvingaube.de>
Date: Wed, 10 Jun 2020 03:00:12 +0200
Subject: [PATCH 226/412] Add Webserver Prometheus support for sensor, binary
 sensor, fan, light, cover and switch (#1032)

---
 esphome/components/web_server/__init__.py     |   5 +-
 esphome/components/web_server/web_server.cpp  |  12 +
 esphome/components/web_server/web_server.h    |   7 +
 .../web_server/web_server_prometheus.cpp      | 344 ++++++++++++++++++
 .../web_server/web_server_prometheus.h        |  61 ++++
 esphome/const.py                              |   1 +
 tests/test1.yaml                              |   1 +
 tests/test3.yaml                              |   1 +
 8 files changed, 431 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/web_server/web_server_prometheus.cpp
 create mode 100644 esphome/components/web_server/web_server_prometheus.h

diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py
index 2f0d179eba..be0a180a9d 100644
--- a/esphome/components/web_server/__init__.py
+++ b/esphome/components/web_server/__init__.py
@@ -4,7 +4,7 @@ from esphome.components import web_server_base
 from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
 from esphome.const import (
     CONF_CSS_INCLUDE, CONF_CSS_URL, CONF_ID, CONF_JS_INCLUDE, CONF_JS_URL, CONF_PORT,
-    CONF_AUTH, CONF_USERNAME, CONF_PASSWORD)
+    CONF_AUTH, CONF_USERNAME, CONF_PASSWORD, CONF_PROMETHEUS)
 from esphome.core import coroutine_with_priority
 
 AUTO_LOAD = ['json', 'web_server_base']
@@ -19,6 +19,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_CSS_INCLUDE): cv.file_,
     cv.Optional(CONF_JS_URL, default="https://esphome.io/_static/webserver-v1.min.js"): cv.string,
     cv.Optional(CONF_JS_INCLUDE): cv.file_,
+    cv.Optional(CONF_PROMETHEUS, default=False): cv.boolean,
     cv.Optional(CONF_AUTH): cv.Schema({
         cv.Required(CONF_USERNAME): cv.string_strict,
         cv.Required(CONF_PASSWORD): cv.string_strict,
@@ -49,3 +50,5 @@ def to_code(config):
         cg.add_define('WEBSERVER_JS_INCLUDE')
         with open(config[CONF_JS_INCLUDE], "r") as myfile:
             cg.add(var.set_js_include(myfile.read()))
+    if config[CONF_PROMETHEUS]:
+        cg.add_define('WEBSERVER_PROMETHEUS')
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 48a47080b2..7f0bb0f973 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -572,6 +572,11 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) {
   if (request->url() == "/")
     return true;
 
+#ifdef WEBSERVER_PROMETHEUS
+  if (request->url() == "/metrics")
+    return true;
+#endif
+
 #ifdef WEBSERVER_CSS_INCLUDE
   if (request->url() == "/0.css")
     return true;
@@ -632,6 +637,13 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
     return;
   }
 
+#ifdef WEBSERVER_PROMETHEUS
+  if (request->url() == "/metrics") {
+    this->prometheus.handle_request(request);
+    return;
+  }
+#endif
+
 #ifdef WEBSERVER_CSS_INCLUDE
   if (request->url() == "/0.css") {
     this->handle_css_request(request);
diff --git a/esphome/components/web_server/web_server.h b/esphome/components/web_server/web_server.h
index b3bf2ef7f7..77fcb1e88c 100644
--- a/esphome/components/web_server/web_server.h
+++ b/esphome/components/web_server/web_server.h
@@ -3,6 +3,9 @@
 #include "esphome/core/component.h"
 #include "esphome/core/controller.h"
 #include "esphome/components/web_server_base/web_server_base.h"
+#ifdef WEBSERVER_PROMETHEUS
+#include "esphome/components/web_server/web_server_prometheus.h"
+#endif
 
 #include <vector>
 
@@ -170,6 +173,10 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
   const char *css_include_{nullptr};
   const char *js_url_{nullptr};
   const char *js_include_{nullptr};
+
+#ifdef WEBSERVER_PROMETHEUS
+  WebServerPrometheus prometheus;
+#endif
 };
 
 }  // namespace web_server
diff --git a/esphome/components/web_server/web_server_prometheus.cpp b/esphome/components/web_server/web_server_prometheus.cpp
new file mode 100644
index 0000000000..4ba75c1673
--- /dev/null
+++ b/esphome/components/web_server/web_server_prometheus.cpp
@@ -0,0 +1,344 @@
+#include "web_server.h"
+#include "web_server_prometheus.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+#include "esphome/core/util.h"
+#include "esphome/components/json/json_util.h"
+
+#include "StreamString.h"
+
+#include <cstdlib>
+
+#ifdef USE_LOGGER
+#include <esphome/components/logger/logger.h>
+#endif
+
+namespace esphome {
+namespace web_server {
+
+void WebServerPrometheus::handle_request(AsyncWebServerRequest *request) {
+  AsyncResponseStream *stream = request->beginResponseStream("text/plain");
+
+#ifdef USE_SENSOR
+  this->sensor_type_(stream);
+  for (auto *obj : App.get_sensors())
+    this->sensor_row_(stream, obj);
+#endif
+
+#ifdef USE_BINARY_SENSOR
+  this->binary_sensor_type_(stream);
+  for (auto *obj : App.get_binary_sensors())
+    this->binary_sensor_row_(stream, obj);
+#endif
+
+#ifdef USE_FAN
+  this->fan_type_(stream);
+  for (auto *obj : App.get_fans())
+    this->fan_row_(stream, obj);
+#endif
+
+#ifdef USE_LIGHT
+  this->light_type_(stream);
+  for (auto *obj : App.get_lights())
+    this->light_row_(stream, obj);
+#endif
+
+#ifdef USE_COVER
+  this->cover_type_(stream);
+  for (auto *obj : App.get_covers())
+    this->cover_row_(stream, obj);
+#endif
+
+#ifdef USE_SWITCH
+  this->switch_type_(stream);
+  for (auto *obj : App.get_switches())
+    this->switch_row_(stream, obj);
+#endif
+
+  request->send(stream);
+}
+
+// Type-specific implementation
+#ifdef USE_SENSOR
+void WebServerPrometheus::sensor_type_(AsyncResponseStream *stream) {
+  stream->print(F("#TYPE esphome_sensor_value GAUGE\n"));
+  stream->print(F("#TYPE esphome_sensor_failed GAUGE\n"));
+}
+void WebServerPrometheus::sensor_row_(AsyncResponseStream *stream, sensor::Sensor *obj) {
+  if (obj->is_internal())
+    return;
+  if (!isnan(obj->state)) {
+    // We have a valid value, output this value
+    stream->print(F("esphome_sensor_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 0\n"));
+    // Data itself
+    stream->print(F("esphome_sensor_value{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\",unit=\""));
+    stream->print(obj->get_unit_of_measurement().c_str());
+    stream->print(F("\"} "));
+    stream->print(value_accuracy_to_string(obj->state, obj->get_accuracy_decimals()).c_str());
+    stream->print('\n');
+  } else {
+    // Invalid state
+    stream->print(F("esphome_sensor_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 1\n"));
+  }
+}
+#endif
+
+// Type-specific implementation
+#ifdef USE_BINARY_SENSOR
+void WebServerPrometheus::binary_sensor_type_(AsyncResponseStream *stream) {
+  stream->print(F("#TYPE esphome_binary_sensor_value GAUGE\n"));
+  stream->print(F("#TYPE esphome_binary_sensor_failed GAUGE\n"));
+}
+void WebServerPrometheus::binary_sensor_row_(AsyncResponseStream *stream, binary_sensor::BinarySensor *obj) {
+  if (obj->is_internal())
+    return;
+  if (!isnan(obj->state)) {
+    // We have a valid value, output this value
+    stream->print(F("esphome_binary_sensor_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 0\n"));
+    // Data itself
+    stream->print(F("esphome_binary_sensor_value{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} "));
+    stream->print(obj->state);
+    stream->print('\n');
+  } else {
+    // Invalid state
+    stream->print(F("esphome_binary_sensor_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 1\n"));
+  }
+}
+#endif
+
+#ifdef USE_FAN
+void WebServerPrometheus::fan_type_(AsyncResponseStream *stream) {
+  stream->print(F("#TYPE esphome_fan_value GAUGE\n"));
+  stream->print(F("#TYPE esphome_fan_failed GAUGE\n"));
+  stream->print(F("#TYPE esphome_fan_speed GAUGE\n"));
+  stream->print(F("#TYPE esphome_fan_oscillation GAUGE\n"));
+}
+void WebServerPrometheus::fan_row_(AsyncResponseStream *stream, fan::FanState *obj) {
+  if (obj->is_internal())
+    return;
+  if (!isnan(obj->state)) {
+    // We have a valid value, output this value
+    stream->print(F("esphome_fan_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 0\n"));
+    // Data itself
+    stream->print(F("esphome_fan_value{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} "));
+    stream->print(obj->state);
+    stream->print('\n');
+    // Speed if available
+    if (obj->get_traits().supports_speed()) {
+      stream->print(F("esphome_fan_speed{id=\""));
+      stream->print(obj->get_object_id().c_str());
+      stream->print(F("\",name=\""));
+      stream->print(obj->get_name().c_str());
+      stream->print(F("\"} "));
+      stream->print(obj->speed);
+      stream->print('\n');
+    }
+    // Oscillation if available
+    if (obj->get_traits().supports_oscillation()) {
+      stream->print(F("esphome_fan_oscillation{id=\""));
+      stream->print(obj->get_object_id().c_str());
+      stream->print(F("\",name=\""));
+      stream->print(obj->get_name().c_str());
+      stream->print(F("\"} "));
+      stream->print(obj->oscillating);
+      stream->print('\n');
+    }
+  } else {
+    // Invalid state
+    stream->print(F("esphome_fan_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 1\n"));
+  }
+}
+#endif
+
+#ifdef USE_LIGHT
+void WebServerPrometheus::light_type_(AsyncResponseStream *stream) {
+  stream->print(F("#TYPE esphome_light_state GAUGE\n"));
+  stream->print(F("#TYPE esphome_light_color GAUGE\n"));
+  stream->print(F("#TYPE esphome_light_effect_active GAUGE\n"));
+}
+void WebServerPrometheus::light_row_(AsyncResponseStream *stream, light::LightState *obj) {
+  if (obj->is_internal())
+    return;
+  // State
+  stream->print(F("esphome_light_state{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\"} "));
+  stream->print(obj->remote_values.is_on());
+  stream->print(F("\n"));
+  // Brightness and RGBW
+  light::LightColorValues color = obj->current_values;
+  float brightness, r, g, b, w;
+  color.as_brightness(&brightness);
+  color.as_rgbw(&r, &g, &b, &w);
+  stream->print(F("esphome_light_color{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\",channel=\"brightness\"} "));
+  stream->print(brightness);
+  stream->print(F("\n"));
+  stream->print(F("esphome_light_color{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\",channel=\"r\"} "));
+  stream->print(r);
+  stream->print(F("\n"));
+  stream->print(F("esphome_light_color{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\",channel=\"g\"} "));
+  stream->print(g);
+  stream->print(F("\n"));
+  stream->print(F("esphome_light_color{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\",channel=\"b\"} "));
+  stream->print(b);
+  stream->print(F("\n"));
+  stream->print(F("esphome_light_color{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\",channel=\"w\"} "));
+  stream->print(w);
+  stream->print(F("\n"));
+  // Effect
+  std::string effect = obj->get_effect_name();
+  if (effect == "None") {
+    stream->print(F("esphome_light_effect_active{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\",effect=\"None\"} 0\n"));
+  } else {
+    stream->print(F("esphome_light_effect_active{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\",effect=\""));
+    stream->print(effect.c_str());
+    stream->print(F("\"} 1\n"));
+  }
+}
+#endif
+
+#ifdef USE_COVER
+void WebServerPrometheus::cover_type_(AsyncResponseStream *stream) {
+  stream->print(F("#TYPE esphome_cover_value GAUGE\n"));
+  stream->print(F("#TYPE esphome_cover_failed GAUGE\n"));
+}
+void WebServerPrometheus::cover_row_(AsyncResponseStream *stream, cover::Cover *obj) {
+  if (obj->is_internal())
+    return;
+  if (!isnan(obj->position)) {
+    // We have a valid value, output this value
+    stream->print(F("esphome_cover_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 0\n"));
+    // Data itself
+    stream->print(F("esphome_cover_value{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} "));
+    stream->print(obj->position);
+    stream->print('\n');
+    if (obj->get_traits().get_supports_tilt()) {
+      stream->print(F("esphome_cover_tilt{id=\""));
+      stream->print(obj->get_object_id().c_str());
+      stream->print(F("\",name=\""));
+      stream->print(obj->get_name().c_str());
+      stream->print(F("\"} "));
+      stream->print(obj->tilt);
+      stream->print('\n');
+    }
+  } else {
+    // Invalid state
+    stream->print(F("esphome_cover_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 1\n"));
+  }
+}
+#endif
+
+#ifdef USE_SWITCH
+void WebServerPrometheus::switch_type_(AsyncResponseStream *stream) {
+  stream->print(F("#TYPE esphome_switch_value GAUGE\n"));
+  stream->print(F("#TYPE esphome_switch_failed GAUGE\n"));
+}
+void WebServerPrometheus::switch_row_(AsyncResponseStream *stream, switch_::Switch *obj) {
+  if (obj->is_internal())
+    return;
+  if (!isnan(obj->state)) {
+    // We have a valid value, output this value
+    stream->print(F("esphome_switch_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 0\n"));
+    // Data itself
+    stream->print(F("esphome_switch_value{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} "));
+    stream->print(obj->state);
+    stream->print('\n');
+  } else {
+    // Invalid state
+    stream->print(F("esphome_switch_failed{id=\""));
+    stream->print(obj->get_object_id().c_str());
+    stream->print(F("\",name=\""));
+    stream->print(obj->get_name().c_str());
+    stream->print(F("\"} 1\n"));
+  }
+}
+#endif
+
+}  // namespace web_server
+}  // namespace esphome
diff --git a/esphome/components/web_server/web_server_prometheus.h b/esphome/components/web_server/web_server_prometheus.h
new file mode 100644
index 0000000000..93682c1ed5
--- /dev/null
+++ b/esphome/components/web_server/web_server_prometheus.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/controller.h"
+#include "esphome/components/web_server_base/web_server_base.h"
+
+namespace esphome {
+namespace web_server {
+
+class WebServerPrometheus {
+ public:
+  WebServerPrometheus(){};
+  /// Handle an prometheus metrics request under '/metrics'.
+  void handle_request(AsyncWebServerRequest *request);
+
+ protected:
+#ifdef USE_SENSOR
+  /// Return the type for prometheus
+  void sensor_type_(AsyncResponseStream *stream);
+  /// Return the sensor state as prometheus data point
+  void sensor_row_(AsyncResponseStream *stream, sensor::Sensor *obj);
+#endif
+
+#ifdef USE_BINARY_SENSOR
+  /// Return the type for prometheus
+  void binary_sensor_type_(AsyncResponseStream *stream);
+  /// Return the sensor state as prometheus data point
+  void binary_sensor_row_(AsyncResponseStream *stream, binary_sensor::BinarySensor *obj);
+#endif
+
+#ifdef USE_FAN
+  /// Return the type for prometheus
+  void fan_type_(AsyncResponseStream *stream);
+  /// Return the sensor state as prometheus data point
+  void fan_row_(AsyncResponseStream *stream, fan::FanState *obj);
+#endif
+
+#ifdef USE_LIGHT
+  /// Return the type for prometheus
+  void light_type_(AsyncResponseStream *stream);
+  /// Return the Light Values state as prometheus data point
+  void light_row_(AsyncResponseStream *stream, light::LightState *obj);
+#endif
+
+#ifdef USE_COVER
+  /// Return the type for prometheus
+  void cover_type_(AsyncResponseStream *stream);
+  /// Return the switch Values state as prometheus data point
+  void cover_row_(AsyncResponseStream *stream, cover::Cover *obj);
+#endif
+
+#ifdef USE_SWITCH
+  /// Return the type for prometheus
+  void switch_type_(AsyncResponseStream *stream);
+  /// Return the switch Values state as prometheus data point
+  void switch_row_(AsyncResponseStream *stream, switch_::Switch *obj);
+#endif
+};
+
+}  // namespace web_server
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index 95b2da36d7..5ac2b3c9ca 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -358,6 +358,7 @@ CONF_POWER_SAVE_MODE = 'power_save_mode'
 CONF_POWER_SUPPLY = 'power_supply'
 CONF_PRESSURE = 'pressure'
 CONF_PRIORITY = 'priority'
+CONF_PROMETHEUS = 'prometheus'
 CONF_PROTOCOL = 'protocol'
 CONF_PULL_MODE = 'pull_mode'
 CONF_PULSE_LENGTH = 'pulse_length'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index dae8cfdb21..d9563a470a 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -153,6 +153,7 @@ web_server:
   port: 8080
   css_url: https://esphome.io/_static/webserver-v1.min.css
   js_url: https://esphome.io/_static/webserver-v1.min.js
+  prometheus: true
 
 power_supply:
   id: 'atx_power_supply'
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 0d8be590cf..62658c3c4b 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -197,6 +197,7 @@ logger:
   esp8266_store_log_strings_in_flash: false
 
 web_server:
+  prometheus: true
 
 deep_sleep:
   run_duration: 20s

From bab562dc3a511b2e357883bfee1b411bc3dac252 Mon Sep 17 00:00:00 2001
From: Adriaan Peeters <apeeters@lashout.net>
Date: Wed, 10 Jun 2020 04:23:25 +0200
Subject: [PATCH 227/412] Turn off PN532 RF field when not expecting a tag
 (#1046)

* Turn off PN532 RF field when not expecting a tag

Avoids interference with Wifi connectivity of nearby devices.

* Rename turn_off_rf_ method

* documented off command bytes

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/pn532/pn532.cpp | 18 +++++++++++++++++-
 esphome/components/pn532/pn532.h   |  2 ++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/esphome/components/pn532/pn532.cpp b/esphome/components/pn532/pn532.cpp
index 93000a7421..792d92a6ac 100644
--- a/esphome/components/pn532/pn532.cpp
+++ b/esphome/components/pn532/pn532.cpp
@@ -86,6 +86,8 @@ void PN532::setup() {
     this->mark_failed();
     return;
   }
+
+  this->turn_off_rf_();
 }
 
 void PN532::update() {
@@ -114,13 +116,16 @@ void PN532::loop() {
 
   if (read.size() <= 2 || read[0] != 0x4B) {
     // Something failed
+    this->turn_off_rf_();
     return;
   }
 
   uint8_t num_targets = read[1];
-  if (num_targets != 1)
+  if (num_targets != 1) {
     // no tags found or too many
+    this->turn_off_rf_();
     return;
+  }
 
   // const uint8_t target_number = read[2];
   // const uint16_t sens_res = uint16_t(read[3] << 8) | read[4];
@@ -150,6 +155,17 @@ void PN532::loop() {
     format_uid(buf, nfcid, nfcid_length);
     ESP_LOGD(TAG, "Found new tag '%s'", buf);
   }
+
+  this->turn_off_rf_();
+}
+
+void PN532::turn_off_rf_() {
+  ESP_LOGVV(TAG, "Turning RF field OFF");
+  this->pn532_write_command_check_ack_({
+      0x32,  // RFConfiguration
+      0x1,   // RF Field
+      0x0    // Off
+  });
 }
 
 float PN532::get_setup_priority() const { return setup_priority::DATA; }
diff --git a/esphome/components/pn532/pn532.h b/esphome/components/pn532/pn532.h
index 49d5878265..3a734b7ba2 100644
--- a/esphome/components/pn532/pn532.h
+++ b/esphome/components/pn532/pn532.h
@@ -55,6 +55,8 @@ class PN532 : public PollingComponent,
 
   bool read_ack_();
 
+  void turn_off_rf_();
+
   bool requested_read_{false};
   std::vector<PN532BinarySensor *> binary_sensors_;
   std::vector<PN532Trigger *> triggers_;

From 821c1a8bbdb6b2812a36b066b28bac856768ff4b Mon Sep 17 00:00:00 2001
From: igg <igg@users.noreply.github.com>
Date: Wed, 10 Jun 2020 13:03:11 -0700
Subject: [PATCH 228/412] making SPI CS optional (#988)

* making SPI CS optional

* CS pin should be declared as optional or required in CONFIG_SCHEMA

* changed SPI_DEVICE_SCHEMA to a function, like i2c

* added spi_device_schema() to pcd8544, lint fixes

* updated max31856 with new spi_device_schema()

* cleanup imports

Co-authored-by: Ilya Goldberg <iggie@mac.com>
---
 esphome/components/as3935_spi/__init__.py     |  4 +--
 esphome/components/atm90e32/sensor.py         |  2 +-
 esphome/components/max31855/sensor.py         |  2 +-
 esphome/components/max31856/sensor.py         |  2 +-
 esphome/components/max31865/sensor.py         |  2 +-
 esphome/components/max6675/sensor.py          |  2 +-
 esphome/components/max7219/display.py         |  2 +-
 esphome/components/pcd8544/display.py         |  2 +-
 esphome/components/pn532/__init__.py          |  2 +-
 esphome/components/pn532/pn532.cpp            |  3 +-
 esphome/components/spi/__init__.py            | 22 ++++++++++----
 esphome/components/spi/spi.cpp                |  8 +++--
 esphome/components/spi/spi.h                  | 30 +++++++++++--------
 esphome/components/ssd1306_spi/display.py     |  2 +-
 esphome/components/ssd1325_spi/display.py     |  2 +-
 .../components/ssd1325_spi/ssd1325_spi.cpp    | 21 ++++++++-----
 .../components/waveshare_epaper/display.py    |  2 +-
 17 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/esphome/components/as3935_spi/__init__.py b/esphome/components/as3935_spi/__init__.py
index fa27c2b0f5..da5582c531 100644
--- a/esphome/components/as3935_spi/__init__.py
+++ b/esphome/components/as3935_spi/__init__.py
@@ -10,8 +10,8 @@ as3935_spi_ns = cg.esphome_ns.namespace('as3935_spi')
 SPIAS3935 = as3935_spi_ns.class_('SPIAS3935Component', as3935.AS3935, spi.SPIDevice)
 
 CONFIG_SCHEMA = cv.All(as3935.AS3935_SCHEMA.extend({
-    cv.GenerateID(): cv.declare_id(SPIAS3935)
-}).extend(cv.COMPONENT_SCHEMA).extend(spi.SPI_DEVICE_SCHEMA))
+    cv.GenerateID(): cv.declare_id(SPIAS3935),
+}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema(CS_PIN_required=True)))
 
 
 def to_code(config):
diff --git a/esphome/components/atm90e32/sensor.py b/esphome/components/atm90e32/sensor.py
index fc526dfbc0..f27fd3126a 100644
--- a/esphome/components/atm90e32/sensor.py
+++ b/esphome/components/atm90e32/sensor.py
@@ -55,7 +55,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Required(CONF_LINE_FREQUENCY): cv.enum(LINE_FREQS, upper=True),
     cv.Optional(CONF_CURRENT_PHASES, default='3'): cv.enum(CURRENT_PHASES, upper=True),
     cv.Optional(CONF_GAIN_PGA, default='2X'): cv.enum(PGA_GAINS, upper=True),
-}).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
+}).extend(cv.polling_component_schema('60s')).extend(spi.spi_device_schema())
 
 
 def to_code(config):
diff --git a/esphome/components/max31855/sensor.py b/esphome/components/max31855/sensor.py
index dce28bd542..d1b5649b3e 100644
--- a/esphome/components/max31855/sensor.py
+++ b/esphome/components/max31855/sensor.py
@@ -11,7 +11,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1).extend({
     cv.GenerateID(): cv.declare_id(MAX31855Sensor),
     cv.Optional(CONF_REFERENCE_TEMPERATURE):
         sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 2),
-}).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
+}).extend(cv.polling_component_schema('60s')).extend(spi.spi_device_schema())
 
 
 def to_code(config):
diff --git a/esphome/components/max31856/sensor.py b/esphome/components/max31856/sensor.py
index 523b5301d4..4e1411a2a4 100644
--- a/esphome/components/max31856/sensor.py
+++ b/esphome/components/max31856/sensor.py
@@ -16,7 +16,7 @@ FILTER = {
 CONFIG_SCHEMA = sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1).extend({
     cv.GenerateID(): cv.declare_id(MAX31856Sensor),
     cv.Optional(CONF_MAINS_FILTER, default='60HZ'): cv.enum(FILTER, upper=True, space=''),
-}).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
+}).extend(cv.polling_component_schema('60s')).extend(spi.spi_device_schema())
 
 
 def to_code(config):
diff --git a/esphome/components/max31865/sensor.py b/esphome/components/max31865/sensor.py
index ff1df9c5c8..7df36dfde4 100644
--- a/esphome/components/max31865/sensor.py
+++ b/esphome/components/max31865/sensor.py
@@ -20,7 +20,7 @@ CONFIG_SCHEMA = sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 2).extend({
     cv.Required(CONF_RTD_NOMINAL_RESISTANCE): cv.All(cv.resistance, cv.Range(min=100, max=1000)),
     cv.Optional(CONF_MAINS_FILTER, default='60HZ'): cv.enum(FILTER, upper=True, space=''),
     cv.Optional(CONF_RTD_WIRES, default=4): cv.int_range(min=2, max=4),
-}).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
+}).extend(cv.polling_component_schema('60s')).extend(spi.spi_device_schema())
 
 
 def to_code(config):
diff --git a/esphome/components/max6675/sensor.py b/esphome/components/max6675/sensor.py
index 59d24a5283..7f0c943399 100644
--- a/esphome/components/max6675/sensor.py
+++ b/esphome/components/max6675/sensor.py
@@ -9,7 +9,7 @@ MAX6675Sensor = max6675_ns.class_('MAX6675Sensor', sensor.Sensor, cg.PollingComp
 
 CONFIG_SCHEMA = sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1).extend({
     cv.GenerateID(): cv.declare_id(MAX6675Sensor),
-}).extend(cv.polling_component_schema('60s')).extend(spi.SPI_DEVICE_SCHEMA)
+}).extend(cv.polling_component_schema('60s')).extend(spi.spi_device_schema())
 
 
 def to_code(config):
diff --git a/esphome/components/max7219/display.py b/esphome/components/max7219/display.py
index c96454ce8c..0657f3f042 100644
--- a/esphome/components/max7219/display.py
+++ b/esphome/components/max7219/display.py
@@ -14,7 +14,7 @@ CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend({
 
     cv.Optional(CONF_NUM_CHIPS, default=1): cv.int_range(min=1, max=255),
     cv.Optional(CONF_INTENSITY, default=15): cv.int_range(min=0, max=15),
-}).extend(cv.polling_component_schema('1s')).extend(spi.SPI_DEVICE_SCHEMA)
+}).extend(cv.polling_component_schema('1s')).extend(spi.spi_device_schema())
 
 
 def to_code(config):
diff --git a/esphome/components/pcd8544/display.py b/esphome/components/pcd8544/display.py
index e47937e46a..8cc92065ec 100644
--- a/esphome/components/pcd8544/display.py
+++ b/esphome/components/pcd8544/display.py
@@ -17,7 +17,7 @@ CONFIG_SCHEMA = cv.All(display.FULL_DISPLAY_SCHEMA.extend({
     cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
     cv.Required(CONF_RESET_PIN): pins.gpio_output_pin_schema,
     cv.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,  # CE
-}).extend(cv.polling_component_schema('1s')).extend(spi.SPI_DEVICE_SCHEMA),
+}).extend(cv.polling_component_schema('1s')).extend(spi.spi_device_schema()),
                        cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
 
 
diff --git a/esphome/components/pn532/__init__.py b/esphome/components/pn532/__init__.py
index c82d35b398..931b6ada6b 100644
--- a/esphome/components/pn532/__init__.py
+++ b/esphome/components/pn532/__init__.py
@@ -17,7 +17,7 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_ON_TAG): automation.validate_automation({
         cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(PN532Trigger),
     }),
-}).extend(cv.polling_component_schema('1s')).extend(spi.SPI_DEVICE_SCHEMA)
+}).extend(cv.polling_component_schema('1s')).extend(spi.spi_device_schema())
 
 
 def to_code(config):
diff --git a/esphome/components/pn532/pn532.cpp b/esphome/components/pn532/pn532.cpp
index 792d92a6ac..36677bc729 100644
--- a/esphome/components/pn532/pn532.cpp
+++ b/esphome/components/pn532/pn532.cpp
@@ -31,7 +31,8 @@ void PN532::setup() {
   //    (this may time out, but that's ok)
   // 3. Send SAM config command with normal mode without waiting for ready bit (IRQ not initialized yet)
   // 4. Probably optional, send SAM config again, this time checking ACK and return value
-  this->cs_->digital_write(false);
+  if (this->cs_)
+    this->cs_->digital_write(false);
   delay(10);
 
   // send dummy firmware version command to get synced up
diff --git a/esphome/components/spi/__init__.py b/esphome/components/spi/__init__.py
index 69899d1e84..6ced4bc80f 100644
--- a/esphome/components/spi/__init__.py
+++ b/esphome/components/spi/__init__.py
@@ -34,15 +34,25 @@ def to_code(config):
         cg.add(var.set_mosi(mosi))
 
 
-SPI_DEVICE_SCHEMA = cv.Schema({
-    cv.GenerateID(CONF_SPI_ID): cv.use_id(SPIComponent),
-    cv.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,
-})
+def spi_device_schema(CS_PIN_required=False):
+    """Create a schema for an SPI device.
+    :param CS_PIN_required: If true, make the CS_PIN required in the config.
+    :return: The SPI device schema, `extend` this in your config schema.
+    """
+    schema = {
+        cv.GenerateID(CONF_SPI_ID): cv.use_id(SPIComponent),
+    }
+    if CS_PIN_required:
+        schema[cv.Required(CONF_CS_PIN)] = pins.gpio_output_pin_schema
+    else:
+        schema[cv.Optional(CONF_CS_PIN)] = pins.gpio_output_pin_schema
+    return cv.Schema(schema)
 
 
 @coroutine
 def register_spi_device(var, config):
     parent = yield cg.get_variable(config[CONF_SPI_ID])
     cg.add(var.set_spi_parent(parent))
-    pin = yield cg.gpio_pin_expression(config[CONF_CS_PIN])
-    cg.add(var.set_cs_pin(pin))
+    if CONF_CS_PIN in config:
+        pin = yield cg.gpio_pin_expression(config[CONF_CS_PIN])
+        cg.add(var.set_cs_pin(pin))
diff --git a/esphome/components/spi/spi.cpp b/esphome/components/spi/spi.cpp
index bf2a18955a..ea6f8d68f6 100644
--- a/esphome/components/spi/spi.cpp
+++ b/esphome/components/spi/spi.cpp
@@ -12,9 +12,11 @@ void ICACHE_RAM_ATTR HOT SPIComponent::disable() {
   if (this->hw_spi_ != nullptr) {
     this->hw_spi_->endTransaction();
   }
-  ESP_LOGVV(TAG, "Disabling SPI Chip on pin %u...", this->active_cs_->get_pin());
-  this->active_cs_->digital_write(true);
-  this->active_cs_ = nullptr;
+  if (this->active_cs_) {
+    ESP_LOGVV(TAG, "Disabling SPI Chip on pin %u...", this->active_cs_->get_pin());
+    this->active_cs_->digital_write(true);
+    this->active_cs_ = nullptr;
+  }
 }
 void SPIComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up SPI bus...");
diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index ccef6192f3..ea0595c641 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -127,19 +127,21 @@ class SPIComponent : public Component {
 
   template<SPIBitOrder BIT_ORDER, SPIClockPolarity CLOCK_POLARITY, SPIClockPhase CLOCK_PHASE, uint32_t DATA_RATE>
   void enable(GPIOPin *cs) {
-    SPIComponent::debug_enable(cs->get_pin());
+    if (cs) {
+      SPIComponent::debug_enable(cs->get_pin());
 
-    if (this->hw_spi_ != nullptr) {
-      uint8_t data_mode = (uint8_t(CLOCK_POLARITY) << 1) | uint8_t(CLOCK_PHASE);
-      SPISettings settings(DATA_RATE, BIT_ORDER, data_mode);
-      this->hw_spi_->beginTransaction(settings);
-    } else {
-      this->clk_->digital_write(CLOCK_POLARITY);
-      this->wait_cycle_ = uint32_t(F_CPU) / DATA_RATE / 2ULL;
+      if (this->hw_spi_ != nullptr) {
+        uint8_t data_mode = (uint8_t(CLOCK_POLARITY) << 1) | uint8_t(CLOCK_PHASE);
+        SPISettings settings(DATA_RATE, BIT_ORDER, data_mode);
+        this->hw_spi_->beginTransaction(settings);
+      } else {
+        this->clk_->digital_write(CLOCK_POLARITY);
+        this->wait_cycle_ = uint32_t(F_CPU) / DATA_RATE / 2ULL;
+      }
+
+      this->active_cs_ = cs;
+      this->active_cs_->digital_write(false);
     }
-
-    this->active_cs_ = cs;
-    this->active_cs_->digital_write(false);
   }
 
   void disable();
@@ -174,8 +176,10 @@ class SPIDevice {
   void set_cs_pin(GPIOPin *cs) { cs_ = cs; }
 
   void spi_setup() {
-    this->cs_->setup();
-    this->cs_->digital_write(true);
+    if (this->cs_) {
+      this->cs_->setup();
+      this->cs_->digital_write(true);
+    }
   }
 
   void enable() { this->parent_->template enable<BIT_ORDER, CLOCK_POLARITY, CLOCK_PHASE, DATA_RATE>(this->cs_); }
diff --git a/esphome/components/ssd1306_spi/display.py b/esphome/components/ssd1306_spi/display.py
index 65f0df1c51..19882af6c4 100644
--- a/esphome/components/ssd1306_spi/display.py
+++ b/esphome/components/ssd1306_spi/display.py
@@ -13,7 +13,7 @@ SPISSD1306 = ssd1306_spi.class_('SPISSD1306', ssd1306_base.SSD1306, spi.SPIDevic
 CONFIG_SCHEMA = cv.All(ssd1306_base.SSD1306_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(SPISSD1306),
     cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
-}).extend(cv.COMPONENT_SCHEMA).extend(spi.SPI_DEVICE_SCHEMA),
+}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema()),
                        cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
 
 
diff --git a/esphome/components/ssd1325_spi/display.py b/esphome/components/ssd1325_spi/display.py
index 4615d45393..d7c7733afc 100644
--- a/esphome/components/ssd1325_spi/display.py
+++ b/esphome/components/ssd1325_spi/display.py
@@ -13,7 +13,7 @@ SPISSD1325 = ssd1325_spi.class_('SPISSD1325', ssd1325_base.SSD1325, spi.SPIDevic
 CONFIG_SCHEMA = cv.All(ssd1325_base.SSD1325_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(SPISSD1325),
     cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
-}).extend(cv.COMPONENT_SCHEMA).extend(spi.SPI_DEVICE_SCHEMA),
+}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema()),
                        cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
 
 
diff --git a/esphome/components/ssd1325_spi/ssd1325_spi.cpp b/esphome/components/ssd1325_spi/ssd1325_spi.cpp
index 399700f1dd..cd5f4a2794 100644
--- a/esphome/components/ssd1325_spi/ssd1325_spi.cpp
+++ b/esphome/components/ssd1325_spi/ssd1325_spi.cpp
@@ -11,7 +11,8 @@ void SPISSD1325::setup() {
   ESP_LOGCONFIG(TAG, "Setting up SPI SSD1325...");
   this->spi_setup();
   this->dc_pin_->setup();  // OUTPUT
-  this->cs_->setup();      // OUTPUT
+  if (this->cs_)
+    this->cs_->setup();  // OUTPUT
 
   this->init_reset_();
   delay(500);  // NOLINT
@@ -27,19 +28,24 @@ void SPISSD1325::dump_config() {
   LOG_UPDATE_INTERVAL(this);
 }
 void SPISSD1325::command(uint8_t value) {
-  this->cs_->digital_write(true);
+  if (this->cs_)
+    this->cs_->digital_write(true);
   this->dc_pin_->digital_write(false);
   delay(1);
   this->enable();
-  this->cs_->digital_write(false);
+  if (this->cs_)
+    this->cs_->digital_write(false);
   this->write_byte(value);
-  this->cs_->digital_write(true);
+  if (this->cs_)
+    this->cs_->digital_write(true);
   this->disable();
 }
 void HOT SPISSD1325::write_display_data() {
-  this->cs_->digital_write(true);
+  if (this->cs_)
+    this->cs_->digital_write(true);
   this->dc_pin_->digital_write(true);
-  this->cs_->digital_write(false);
+  if (this->cs_)
+    this->cs_->digital_write(false);
   delay(1);
   this->enable();
   for (uint16_t x = 0; x < this->get_width_internal(); x += 2) {
@@ -56,7 +62,8 @@ void HOT SPISSD1325::write_display_data() {
       }
     }
   }
-  this->cs_->digital_write(true);
+  if (this->cs_)
+    this->cs_->digital_write(true);
   this->disable();
 }
 
diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index a654e55981..3e6a972742 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -50,7 +50,7 @@ CONFIG_SCHEMA = cv.All(display.FULL_DISPLAY_SCHEMA.extend({
     cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
     cv.Optional(CONF_BUSY_PIN): pins.gpio_input_pin_schema,
     cv.Optional(CONF_FULL_UPDATE_EVERY): cv.uint32_t,
-}).extend(cv.polling_component_schema('1s')).extend(spi.SPI_DEVICE_SCHEMA),
+}).extend(cv.polling_component_schema('1s')).extend(spi.spi_device_schema()),
                        validate_full_update_every_only_type_a,
                        cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
 

From 42007d03d49f94d26591ee3ae7dab549abd8baff Mon Sep 17 00:00:00 2001
From: Evgeny <freekode@users.noreply.github.com>
Date: Fri, 12 Jun 2020 04:14:54 +0200
Subject: [PATCH 229/412] AQI calculator for HM3301 (#1011)

* HM3301 AQI calculator

* remove logs

* fixed after lint

* fixed after lint

* fixed after lint

* check NP for AQI sensor

* validation for AQI sensor
---
 .../hm3301/abstract_aqi_calculator.h          | 14 +++++
 esphome/components/hm3301/aqi_calculator.cpp  | 46 ++++++++++++++++
 .../hm3301/aqi_calculator_factory.h           | 30 +++++++++++
 esphome/components/hm3301/caqi_calculator.cpp | 52 +++++++++++++++++++
 esphome/components/hm3301/hm3301.cpp          | 36 ++++++++++---
 esphome/components/hm3301/hm3301.h            |  8 +++
 esphome/components/hm3301/sensor.py           | 31 ++++++++++-
 tests/test1.yaml                              |  3 ++
 tests/test3.yaml                              |  3 ++
 9 files changed, 214 insertions(+), 9 deletions(-)
 create mode 100644 esphome/components/hm3301/abstract_aqi_calculator.h
 create mode 100644 esphome/components/hm3301/aqi_calculator.cpp
 create mode 100644 esphome/components/hm3301/aqi_calculator_factory.h
 create mode 100644 esphome/components/hm3301/caqi_calculator.cpp

diff --git a/esphome/components/hm3301/abstract_aqi_calculator.h b/esphome/components/hm3301/abstract_aqi_calculator.h
new file mode 100644
index 0000000000..f160a91148
--- /dev/null
+++ b/esphome/components/hm3301/abstract_aqi_calculator.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "Arduino.h"
+
+namespace esphome {
+namespace hm3301 {
+
+class AbstractAQICalculator {
+ public:
+  virtual uint8_t get_aqi(uint16_t pm2_5_value, uint16_t pm10_0_value) = 0;
+};
+
+}  // namespace hm3301
+}  // namespace esphome
diff --git a/esphome/components/hm3301/aqi_calculator.cpp b/esphome/components/hm3301/aqi_calculator.cpp
new file mode 100644
index 0000000000..6b70c5d4fd
--- /dev/null
+++ b/esphome/components/hm3301/aqi_calculator.cpp
@@ -0,0 +1,46 @@
+#include "abstract_aqi_calculator.h"
+
+namespace esphome {
+namespace hm3301 {
+
+class AQICalculator : public AbstractAQICalculator {
+ public:
+  uint8_t get_aqi(uint16_t pm2_5_value, uint16_t pm10_0_value) override {
+    int pm2_5_index = calculate_index_(pm2_5_value, pm2_5_calculation_grid_);
+    int pm10_0_index = calculate_index_(pm10_0_value, pm10_0_calculation_grid_);
+
+    return (pm2_5_index < pm10_0_index) ? pm10_0_index : pm2_5_index;
+  }
+
+ protected:
+  static const int AMOUNT_OF_LEVELS = 6;
+
+  int index_grid_[AMOUNT_OF_LEVELS][2] = {{0, 51}, {51, 100}, {101, 150}, {151, 200}, {201, 300}, {301, 500}};
+
+  int pm2_5_calculation_grid_[AMOUNT_OF_LEVELS][2] = {{0, 12}, {13, 45}, {36, 55}, {56, 150}, {151, 250}, {251, 500}};
+
+  int pm10_0_calculation_grid_[AMOUNT_OF_LEVELS][2] = {{0, 54},    {55, 154},  {155, 254},
+                                                       {255, 354}, {355, 424}, {425, 604}};
+
+  int calculate_index_(uint16_t value, int array[AMOUNT_OF_LEVELS][2]) {
+    int grid_index = get_grid_index_(value, array);
+    int aqi_lo = index_grid_[grid_index][0];
+    int aqi_hi = index_grid_[grid_index][1];
+    int conc_lo = array[grid_index][0];
+    int conc_hi = array[grid_index][1];
+
+    return ((aqi_hi - aqi_lo) / (conc_hi - conc_lo)) * (value - conc_lo) + aqi_lo;
+  }
+
+  int get_grid_index_(uint16_t value, int array[AMOUNT_OF_LEVELS][2]) {
+    for (int i = 0; i < AMOUNT_OF_LEVELS - 1; i++) {
+      if (value >= array[i][0] && value <= array[i][1]) {
+        return i;
+      }
+    }
+    return -1;
+  }
+};
+
+}  // namespace hm3301
+}  // namespace esphome
diff --git a/esphome/components/hm3301/aqi_calculator_factory.h b/esphome/components/hm3301/aqi_calculator_factory.h
new file mode 100644
index 0000000000..483a158822
--- /dev/null
+++ b/esphome/components/hm3301/aqi_calculator_factory.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "Arduino.h"
+#include "caqi_calculator.cpp"
+#include "aqi_calculator.cpp"
+
+namespace esphome {
+namespace hm3301 {
+
+enum AQICalculatorType { CAQI_TYPE = 0, AQI_TYPE = 1 };
+
+class AQICalculatorFactory {
+ public:
+  AbstractAQICalculator *get_calculator(AQICalculatorType type) {
+    if (type == 0) {
+      return caqi_calculator_;
+    } else if (type == 1) {
+      return aqi_calculator_;
+    }
+
+    return nullptr;
+  }
+
+ protected:
+  CAQICalculator *caqi_calculator_ = new CAQICalculator();
+  AQICalculator *aqi_calculator_ = new AQICalculator();
+};
+
+}  // namespace hm3301
+}  // namespace esphome
diff --git a/esphome/components/hm3301/caqi_calculator.cpp b/esphome/components/hm3301/caqi_calculator.cpp
new file mode 100644
index 0000000000..511179cb71
--- /dev/null
+++ b/esphome/components/hm3301/caqi_calculator.cpp
@@ -0,0 +1,52 @@
+#include "esphome/core/log.h"
+#include "abstract_aqi_calculator.h"
+
+namespace esphome {
+namespace hm3301 {
+
+class CAQICalculator : public AbstractAQICalculator {
+ public:
+  uint8_t get_aqi(uint16_t pm2_5_value, uint16_t pm10_0_value) override {
+    int pm2_5_index = calculate_index_(pm2_5_value, pm2_5_calculation_grid_);
+    int pm10_0_index = calculate_index_(pm10_0_value, pm10_0_calculation_grid_);
+
+    return (pm2_5_index < pm10_0_index) ? pm10_0_index : pm2_5_index;
+  }
+
+ protected:
+  static const int AMOUNT_OF_LEVELS = 5;
+
+  int index_grid_[AMOUNT_OF_LEVELS][2] = {{0, 25}, {26, 50}, {51, 75}, {76, 100}, {101, 400}};
+
+  int pm2_5_calculation_grid_[AMOUNT_OF_LEVELS][2] = {{0, 15}, {16, 30}, {31, 55}, {56, 110}, {111, 400}};
+
+  int pm10_0_calculation_grid_[AMOUNT_OF_LEVELS][2] = {{0, 25}, {26, 50}, {51, 90}, {91, 180}, {181, 400}};
+
+  int calculate_index_(uint16_t value, int array[AMOUNT_OF_LEVELS][2]) {
+    int grid_index = get_grid_index_(value, array);
+    if (grid_index == -1) {
+      return -1;
+    }
+
+    int aqi_lo = index_grid_[grid_index][0];
+    int aqi_hi = index_grid_[grid_index][1];
+    int conc_lo = array[grid_index][0];
+    int conc_hi = array[grid_index][1];
+
+    int aqi = ((aqi_hi - aqi_lo) / (conc_hi - conc_lo)) * (value - conc_lo) + aqi_lo;
+
+    return aqi;
+  }
+
+  int get_grid_index_(uint16_t value, int array[AMOUNT_OF_LEVELS][2]) {
+    for (int i = 0; i < AMOUNT_OF_LEVELS; i++) {
+      if (value >= array[i][0] && value <= array[i][1]) {
+        return i;
+      }
+    }
+    return -1;
+  }
+};
+
+}  // namespace hm3301
+}  // namespace esphome
diff --git a/esphome/components/hm3301/hm3301.cpp b/esphome/components/hm3301/hm3301.cpp
index 6456ee354a..cbce714012 100644
--- a/esphome/components/hm3301/hm3301.cpp
+++ b/esphome/components/hm3301/hm3301.cpp
@@ -1,5 +1,5 @@
-#include "hm3301.h"
 #include "esphome/core/log.h"
+#include "hm3301.h"
 
 namespace esphome {
 namespace hm3301 {
@@ -30,6 +30,7 @@ void HM3301Component::dump_config() {
   LOG_SENSOR("  ", "PM1.0", this->pm_1_0_sensor_);
   LOG_SENSOR("  ", "PM2.5", this->pm_2_5_sensor_);
   LOG_SENSOR("  ", "PM10.0", this->pm_10_0_sensor_);
+  LOG_SENSOR("  ", "AQI", this->aqi_sensor_);
 }
 
 float HM3301Component::get_setup_priority() const { return setup_priority::DATA; }
@@ -47,17 +48,38 @@ void HM3301Component::update() {
     return;
   }
 
+  int16_t pm_1_0_value = -1;
   if (this->pm_1_0_sensor_ != nullptr) {
-    uint16_t value = get_sensor_value_(data_buffer_, PM_1_0_VALUE_INDEX);
-    this->pm_1_0_sensor_->publish_state(value);
+    pm_1_0_value = get_sensor_value_(data_buffer_, PM_1_0_VALUE_INDEX);
   }
+
+  int16_t pm_2_5_value = -1;
   if (this->pm_2_5_sensor_ != nullptr) {
-    uint16_t value = get_sensor_value_(data_buffer_, PM_2_5_VALUE_INDEX);
-    this->pm_2_5_sensor_->publish_state(value);
+    pm_2_5_value = get_sensor_value_(data_buffer_, PM_2_5_VALUE_INDEX);
   }
+
+  int16_t pm_10_0_value = -1;
   if (this->pm_10_0_sensor_ != nullptr) {
-    uint16_t value = get_sensor_value_(data_buffer_, PM_10_0_VALUE_INDEX);
-    this->pm_10_0_sensor_->publish_state(value);
+    pm_10_0_value = get_sensor_value_(data_buffer_, PM_10_0_VALUE_INDEX);
+  }
+
+  int8_t aqi_value = -1;
+  if (this->aqi_sensor_ != nullptr && pm_2_5_value != -1 && pm_10_0_value != -1) {
+    AbstractAQICalculator *calculator = this->aqi_calculator_factory_.get_calculator(this->aqi_calc_type_);
+    aqi_value = calculator->get_aqi(pm_2_5_value, pm_10_0_value);
+  }
+
+  if (pm_1_0_value != -1) {
+    this->pm_1_0_sensor_->publish_state(pm_1_0_value);
+  }
+  if (pm_2_5_value != -1) {
+    this->pm_2_5_sensor_->publish_state(pm_2_5_value);
+  }
+  if (pm_10_0_value != -1) {
+    this->pm_10_0_sensor_->publish_state(pm_10_0_value);
+  }
+  if (aqi_value != -1) {
+    this->aqi_sensor_->publish_state(aqi_value);
   }
 
   this->status_clear_warning();
diff --git a/esphome/components/hm3301/hm3301.h b/esphome/components/hm3301/hm3301.h
index 0fbb32612e..5594f1719c 100644
--- a/esphome/components/hm3301/hm3301.h
+++ b/esphome/components/hm3301/hm3301.h
@@ -3,6 +3,7 @@
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"
+#include "aqi_calculator_factory.h"
 
 #include <Seeed_HM330X.h>
 
@@ -16,6 +17,9 @@ class HM3301Component : public PollingComponent, public i2c::I2CDevice {
   void set_pm_1_0_sensor(sensor::Sensor *pm_1_0_sensor) { pm_1_0_sensor_ = pm_1_0_sensor; }
   void set_pm_2_5_sensor(sensor::Sensor *pm_2_5_sensor) { pm_2_5_sensor_ = pm_2_5_sensor; }
   void set_pm_10_0_sensor(sensor::Sensor *pm_10_0_sensor) { pm_10_0_sensor_ = pm_10_0_sensor; }
+  void set_aqi_sensor(sensor::Sensor *aqi_sensor) { aqi_sensor_ = aqi_sensor; }
+
+  void set_aqi_calculation_type(AQICalculatorType aqi_calc_type) { aqi_calc_type_ = aqi_calc_type; }
 
   void setup() override;
   void dump_config() override;
@@ -32,6 +36,10 @@ class HM3301Component : public PollingComponent, public i2c::I2CDevice {
   sensor::Sensor *pm_1_0_sensor_{nullptr};
   sensor::Sensor *pm_2_5_sensor_{nullptr};
   sensor::Sensor *pm_10_0_sensor_{nullptr};
+  sensor::Sensor *aqi_sensor_{nullptr};
+
+  AQICalculatorType aqi_calc_type_;
+  AQICalculatorFactory aqi_calculator_factory_ = AQICalculatorFactory();
 
   bool read_sensor_value_(uint8_t *);
   bool validate_checksum_(const uint8_t *);
diff --git a/esphome/components/hm3301/sensor.py b/esphome/components/hm3301/sensor.py
index 718d0a20bb..ef7669bc03 100644
--- a/esphome/components/hm3301/sensor.py
+++ b/esphome/components/hm3301/sensor.py
@@ -8,6 +8,25 @@ DEPENDENCIES = ['i2c']
 
 hm3301_ns = cg.esphome_ns.namespace('hm3301')
 HM3301Component = hm3301_ns.class_('HM3301Component', cg.PollingComponent, i2c.I2CDevice)
+AQICalculatorType = hm3301_ns.enum('AQICalculatorType')
+
+CONF_AQI = 'aqi'
+CONF_CALCULATION_TYPE = 'calculation_type'
+UNIT_INDEX = 'index'
+
+AQI_CALCULATION_TYPE = {
+    'CAQI': AQICalculatorType.CAQI_TYPE,
+    'AQI': AQICalculatorType.AQI_TYPE
+}
+
+
+def validate(config):
+    if CONF_AQI in config and CONF_PM_2_5 not in config:
+        raise cv.Invalid("AQI sensor requires PM 2.5")
+    if CONF_AQI in config and CONF_PM_10_0 not in config:
+        raise cv.Invalid("AQI sensor requires PM 10 sensors")
+    return config
+
 
 CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.GenerateID(): cv.declare_id(HM3301Component),
@@ -18,8 +37,11 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
         sensor.sensor_schema(UNIT_MICROGRAMS_PER_CUBIC_METER, ICON_CHEMICAL_WEAPON, 0),
     cv.Optional(CONF_PM_10_0):
         sensor.sensor_schema(UNIT_MICROGRAMS_PER_CUBIC_METER, ICON_CHEMICAL_WEAPON, 0),
-
-}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x40)))
+    cv.Optional(CONF_AQI):
+        sensor.sensor_schema(UNIT_INDEX, ICON_CHEMICAL_WEAPON, 0).extend({
+            cv.Required(CONF_CALCULATION_TYPE): cv.enum(AQI_CALCULATION_TYPE, upper=True),
+        })
+}).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x40)), validate)
 
 
 def to_code(config):
@@ -39,5 +61,10 @@ def to_code(config):
         sens = yield sensor.new_sensor(config[CONF_PM_10_0])
         cg.add(var.set_pm_10_0_sensor(sens))
 
+    if CONF_AQI in config:
+        sens = yield sensor.new_sensor(config[CONF_AQI])
+        cg.add(var.set_aqi_sensor(sens))
+        cg.add(var.set_aqi_calculation_type(config[CONF_AQI][CONF_CALCULATION_TYPE]))
+
     # https://platformio.org/lib/show/6306/Grove%20-%20Laser%20PM2.5%20Sensor%20HM3301
     cg.add_library('6306', '1.0.3')
diff --git a/tests/test1.yaml b/tests/test1.yaml
index d9563a470a..5f8bdd1111 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -738,6 +738,9 @@ sensor:
       name: "PM2.5"
     pm_10_0:
       name: "PM10.0"
+    aqi:
+      name: "AQI"
+      calculation_type: "CAQI"
 
 esp32_touch:
   setup_mode: False
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 62658c3c4b..06bfce97a2 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -361,6 +361,9 @@ sensor:
       name: "PM2.5"
     pm_10_0:
       name: "PM10.0"
+    aqi:
+      name: "AQI"
+      calculation_type: "AQI"
   - platform: pmsx003
     type: PMSX003
     pm_1_0:

From 8aedac81a5d2ac6f32e3a36be5c982cebd5b1f87 Mon Sep 17 00:00:00 2001
From: Niklas Wagner <Skaro@Skaronator.com>
Date: Fri, 12 Jun 2020 20:17:46 +0200
Subject: [PATCH 230/412] RGBWW/CCT Lights: Fix gamma_correct when using
 constant_brightness (#1043)

---
 esphome/components/light/light_color_values.h | 37 +++++++++++--------
 esphome/components/light/light_state.cpp      | 25 +++----------
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/esphome/components/light/light_color_values.h b/esphome/components/light/light_color_values.h
index 39a93cbbcd..90f5570b90 100644
--- a/esphome/components/light/light_color_values.h
+++ b/esphome/components/light/light_color_values.h
@@ -17,12 +17,13 @@ namespace light {
  * Not all values have to be populated though, for example a simple monochromatic light only needs
  * to access the state and brightness attributes.
  *
- * PLease note all float values are automatically clamped.
+ * Please note all float values are automatically clamped.
  *
  * state - Whether the light should be on/off. Represented as a float for transitions.
  * brightness - The brightness of the light.
  * red, green, blue - RGB values.
  * white - The white value for RGBW lights.
+ * color_temperature - Temperature of the white value, range from 0.0 (cold) to 1.0 (warm)
  */
 class LightColorValues {
  public:
@@ -173,30 +174,33 @@ class LightColorValues {
   void as_binary(bool *binary) const { *binary = this->state_ == 1.0f; }
 
   /// Convert these light color values to a brightness-only representation and write them to brightness.
-  void as_brightness(float *brightness) const { *brightness = this->state_ * this->brightness_; }
+  void as_brightness(float *brightness, float gamma = 0) const {
+    *brightness = gamma_correct(this->state_ * this->brightness_, gamma);
+  }
 
   /// Convert these light color values to an RGB representation and write them to red, green, blue.
-  void as_rgb(float *red, float *green, float *blue) const {
-    *red = this->state_ * this->brightness_ * this->red_;
-    *green = this->state_ * this->brightness_ * this->green_;
-    *blue = this->state_ * this->brightness_ * this->blue_;
+  void as_rgb(float *red, float *green, float *blue, float gamma = 0) const {
+    *red = gamma_correct(this->state_ * this->brightness_ * this->red_, gamma);
+    *green = gamma_correct(this->state_ * this->brightness_ * this->green_, gamma);
+    *blue = gamma_correct(this->state_ * this->brightness_ * this->blue_, gamma);
   }
 
   /// Convert these light color values to an RGBW representation and write them to red, green, blue, white.
-  void as_rgbw(float *red, float *green, float *blue, float *white) const {
-    this->as_rgb(red, green, blue);
-    *white = this->state_ * this->brightness_ * this->white_;
+  void as_rgbw(float *red, float *green, float *blue, float *white, float gamma = 0) const {
+    this->as_rgb(red, green, blue, gamma);
+    *white = gamma_correct(this->state_ * this->brightness_ * this->white_, gamma);
   }
 
   /// Convert these light color values to an RGBWW representation with the given parameters.
   void as_rgbww(float color_temperature_cw, float color_temperature_ww, float *red, float *green, float *blue,
-                float *cold_white, float *warm_white, bool constant_brightness = false) const {
-    this->as_rgb(red, green, blue);
+                float *cold_white, float *warm_white, float gamma = 0, bool constant_brightness = false) const {
+    this->as_rgb(red, green, blue, gamma);
     const float color_temp = clamp(this->color_temperature_, color_temperature_cw, color_temperature_ww);
     const float ww_fraction = (color_temp - color_temperature_cw) / (color_temperature_ww - color_temperature_cw);
     const float cw_fraction = 1.0f - ww_fraction;
-    *cold_white = this->state_ * this->brightness_ * this->white_ * cw_fraction;
-    *warm_white = this->state_ * this->brightness_ * this->white_ * ww_fraction;
+    const float white_level = gamma_correct(this->state_ * this->brightness_ * this->white_, gamma);
+    *cold_white = white_level * cw_fraction;
+    *warm_white = white_level * ww_fraction;
     if (!constant_brightness) {
       const float max_cw_ww = std::max(ww_fraction, cw_fraction);
       *cold_white /= max_cw_ww;
@@ -206,12 +210,13 @@ class LightColorValues {
 
   /// Convert these light color values to an CWWW representation with the given parameters.
   void as_cwww(float color_temperature_cw, float color_temperature_ww, float *cold_white, float *warm_white,
-               bool constant_brightness = false) const {
+               float gamma = 0, bool constant_brightness = false) const {
     const float color_temp = clamp(this->color_temperature_, color_temperature_cw, color_temperature_ww);
     const float ww_fraction = (color_temp - color_temperature_cw) / (color_temperature_ww - color_temperature_cw);
     const float cw_fraction = 1.0f - ww_fraction;
-    *cold_white = this->state_ * this->brightness_ * cw_fraction;
-    *warm_white = this->state_ * this->brightness_ * ww_fraction;
+    const float white_level = gamma_correct(this->state_ * this->brightness_ * this->white_, gamma);
+    *cold_white = white_level * cw_fraction;
+    *warm_white = white_level * ww_fraction;
     if (!constant_brightness) {
       const float max_cw_ww = std::max(ww_fraction, cw_fraction);
       *cold_white /= max_cw_ww;
diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index c6e7df0811..9aa32f6904 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -702,39 +702,24 @@ LightOutput *LightState::get_output() const { return this->output_; }
 void LightState::set_gamma_correct(float gamma_correct) { this->gamma_correct_ = gamma_correct; }
 void LightState::current_values_as_binary(bool *binary) { this->current_values.as_binary(binary); }
 void LightState::current_values_as_brightness(float *brightness) {
-  this->current_values.as_brightness(brightness);
-  *brightness = gamma_correct(*brightness, this->gamma_correct_);
+  this->current_values.as_brightness(brightness, this->gamma_correct_);
 }
 void LightState::current_values_as_rgb(float *red, float *green, float *blue) {
-  this->current_values.as_rgb(red, green, blue);
-  *red = gamma_correct(*red, this->gamma_correct_);
-  *green = gamma_correct(*green, this->gamma_correct_);
-  *blue = gamma_correct(*blue, this->gamma_correct_);
+  this->current_values.as_rgb(red, green, blue, this->gamma_correct_);
 }
 void LightState::current_values_as_rgbw(float *red, float *green, float *blue, float *white) {
-  this->current_values.as_rgbw(red, green, blue, white);
-  *red = gamma_correct(*red, this->gamma_correct_);
-  *green = gamma_correct(*green, this->gamma_correct_);
-  *blue = gamma_correct(*blue, this->gamma_correct_);
-  *white = gamma_correct(*white, this->gamma_correct_);
+  this->current_values.as_rgbw(red, green, blue, white, this->gamma_correct_);
 }
 void LightState::current_values_as_rgbww(float *red, float *green, float *blue, float *cold_white, float *warm_white,
                                          bool constant_brightness) {
   auto traits = this->get_traits();
   this->current_values.as_rgbww(traits.get_min_mireds(), traits.get_max_mireds(), red, green, blue, cold_white,
-                                warm_white, constant_brightness);
-  *red = gamma_correct(*red, this->gamma_correct_);
-  *green = gamma_correct(*green, this->gamma_correct_);
-  *blue = gamma_correct(*blue, this->gamma_correct_);
-  *cold_white = gamma_correct(*cold_white, this->gamma_correct_);
-  *warm_white = gamma_correct(*warm_white, this->gamma_correct_);
+                                warm_white, this->gamma_correct_, constant_brightness);
 }
 void LightState::current_values_as_cwww(float *cold_white, float *warm_white, bool constant_brightness) {
   auto traits = this->get_traits();
   this->current_values.as_cwww(traits.get_min_mireds(), traits.get_max_mireds(), cold_white, warm_white,
-                               constant_brightness);
-  *cold_white = gamma_correct(*cold_white, this->gamma_correct_);
-  *warm_white = gamma_correct(*warm_white, this->gamma_correct_);
+                               this->gamma_correct_, constant_brightness);
 }
 void LightState::add_new_remote_values_callback(std::function<void()> &&send_callback) {
   this->remote_values_callback_.add(std::move(send_callback));

From 27204aa53cd114a5b2c7a06f383ae5aa6ccb302a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Sat, 13 Jun 2020 01:17:13 +0200
Subject: [PATCH 231/412] Add E1.31 support (#950)

This adds a `e131` component that allows
to register `e131` addressable light effect.

This uses an internal implementation that
is thread-safe instead of using external libraries.
---
 esphome/components/e131/__init__.py           |  49 +++++++
 esphome/components/e131/e131.cpp              | 105 ++++++++++++++
 esphome/components/e131/e131.h                |  57 ++++++++
 .../e131/e131_addressable_light_effect.cpp    |  90 ++++++++++++
 .../e131/e131_addressable_light_effect.h      |  48 +++++++
 esphome/components/e131/e131_packet.cpp       | 136 ++++++++++++++++++
 tests/test1.yaml                              |   4 +
 tests/test3.yaml                              |   5 +
 8 files changed, 494 insertions(+)
 create mode 100644 esphome/components/e131/__init__.py
 create mode 100644 esphome/components/e131/e131.cpp
 create mode 100644 esphome/components/e131/e131.h
 create mode 100644 esphome/components/e131/e131_addressable_light_effect.cpp
 create mode 100644 esphome/components/e131/e131_addressable_light_effect.h
 create mode 100644 esphome/components/e131/e131_packet.cpp

diff --git a/esphome/components/e131/__init__.py b/esphome/components/e131/__init__.py
new file mode 100644
index 0000000000..0ba16bc928
--- /dev/null
+++ b/esphome/components/e131/__init__.py
@@ -0,0 +1,49 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components.light.types import AddressableLightEffect
+from esphome.components.light.effects import register_addressable_effect
+from esphome.const import CONF_ID, CONF_NAME, CONF_METHOD, CONF_CHANNELS
+
+e131_ns = cg.esphome_ns.namespace('e131')
+E131AddressableLightEffect = e131_ns.class_('E131AddressableLightEffect', AddressableLightEffect)
+E131Component = e131_ns.class_('E131Component', cg.Component)
+
+METHODS = {
+    'UNICAST': e131_ns.E131_UNICAST,
+    'MULTICAST': e131_ns.E131_MULTICAST
+}
+
+CHANNELS = {
+    'MONO': e131_ns.E131_MONO,
+    'RGB': e131_ns.E131_RGB,
+    'RGBW': e131_ns.E131_RGBW
+}
+
+CONF_UNIVERSE = 'universe'
+CONF_E131_ID = 'e131_id'
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(E131Component),
+    cv.Optional(CONF_METHOD, default='MULTICAST'): cv.one_of(*METHODS, upper=True),
+})
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    cg.add(var.set_method(METHODS[config[CONF_METHOD]]))
+
+
+@register_addressable_effect('e131', E131AddressableLightEffect, "E1.31", {
+    cv.GenerateID(CONF_E131_ID): cv.use_id(E131Component),
+    cv.Required(CONF_UNIVERSE): cv.int_range(min=1, max=512),
+    cv.Optional(CONF_CHANNELS, default='RGB'): cv.one_of(*CHANNELS, upper=True)
+})
+def e131_light_effect_to_code(config, effect_id):
+    parent = yield cg.get_variable(config[CONF_E131_ID])
+
+    effect = cg.new_Pvariable(effect_id, config[CONF_NAME])
+    cg.add(effect.set_first_universe(config[CONF_UNIVERSE]))
+    cg.add(effect.set_channels(CHANNELS[config[CONF_CHANNELS]]))
+    cg.add(effect.set_e131(parent))
+    yield effect
diff --git a/esphome/components/e131/e131.cpp b/esphome/components/e131/e131.cpp
new file mode 100644
index 0000000000..d107d9f9fc
--- /dev/null
+++ b/esphome/components/e131/e131.cpp
@@ -0,0 +1,105 @@
+#include "e131.h"
+#include "e131_addressable_light_effect.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+#include <WiFi.h>
+#endif
+
+#ifdef ARDUINO_ARCH_ESP8266
+#include <ESP8266WiFi.h>
+#include <WiFiUdp.h>
+#endif
+
+namespace esphome {
+namespace e131 {
+
+static const char *TAG = "e131";
+static const int PORT = 5568;
+
+E131Component::E131Component() {}
+
+E131Component::~E131Component() {
+  if (udp_) {
+    udp_->stop();
+  }
+}
+
+void E131Component::setup() {
+  udp_.reset(new WiFiUDP());
+
+  if (!udp_->begin(PORT)) {
+    ESP_LOGE(TAG, "Cannot bind E131 to %d.", PORT);
+    mark_failed();
+  }
+
+  join_igmp_groups_();
+}
+
+void E131Component::loop() {
+  std::vector<uint8_t> payload;
+  E131Packet packet;
+  int universe = 0;
+
+  while (uint16_t packet_size = udp_->parsePacket()) {
+    payload.resize(packet_size);
+
+    if (!udp_->read(&payload[0], payload.size())) {
+      continue;
+    }
+
+    if (!packet_(payload, universe, packet)) {
+      ESP_LOGV(TAG, "Invalid packet recevied of size %zu.", payload.size());
+      continue;
+    }
+
+    if (!process_(universe, packet)) {
+      ESP_LOGV(TAG, "Ignored packet for %d universe of size %d.", universe, packet.count);
+    }
+  }
+}
+
+void E131Component::add_effect(E131AddressableLightEffect *light_effect) {
+  if (light_effects_.count(light_effect)) {
+    return;
+  }
+
+  ESP_LOGD(TAG, "Registering '%s' for universes %d-%d.", light_effect->get_name().c_str(),
+           light_effect->get_first_universe(), light_effect->get_last_universe());
+
+  light_effects_.insert(light_effect);
+
+  for (auto universe = light_effect->get_first_universe(); universe <= light_effect->get_last_universe(); ++universe) {
+    join_(universe);
+  }
+}
+
+void E131Component::remove_effect(E131AddressableLightEffect *light_effect) {
+  if (!light_effects_.count(light_effect)) {
+    return;
+  }
+
+  ESP_LOGD(TAG, "Unregistering '%s' for universes %d-%d.", light_effect->get_name().c_str(),
+           light_effect->get_first_universe(), light_effect->get_last_universe());
+
+  light_effects_.erase(light_effect);
+
+  for (auto universe = light_effect->get_first_universe(); universe <= light_effect->get_last_universe(); ++universe) {
+    leave_(universe);
+  }
+}
+
+bool E131Component::process_(int universe, const E131Packet &packet) {
+  bool handled = false;
+
+  ESP_LOGV(TAG, "Received E1.31 packet for %d universe, with %d bytes", universe, packet.count);
+
+  for (auto light_effect : light_effects_) {
+    handled = light_effect->process_(universe, packet) || handled;
+  }
+
+  return handled;
+}
+
+}  // namespace e131
+}  // namespace esphome
diff --git a/esphome/components/e131/e131.h b/esphome/components/e131/e131.h
new file mode 100644
index 0000000000..3f647edbf1
--- /dev/null
+++ b/esphome/components/e131/e131.h
@@ -0,0 +1,57 @@
+#pragma once
+
+#include "esphome/core/component.h"
+
+#include <memory>
+#include <set>
+#include <map>
+
+class UDP;
+
+namespace esphome {
+namespace e131 {
+
+class E131AddressableLightEffect;
+
+enum E131ListenMethod { E131_MULTICAST, E131_UNICAST };
+
+const int E131_MAX_PROPERTY_VALUES_COUNT = 513;
+
+struct E131Packet {
+  uint16_t count;
+  uint8_t values[E131_MAX_PROPERTY_VALUES_COUNT];
+};
+
+class E131Component : public esphome::Component {
+ public:
+  E131Component();
+  ~E131Component();
+
+  void setup() override;
+  void loop() override;
+  float get_setup_priority() const override { return setup_priority::AFTER_WIFI; }
+
+ public:
+  void add_effect(E131AddressableLightEffect *light_effect);
+  void remove_effect(E131AddressableLightEffect *light_effect);
+
+ public:
+  void set_method(E131ListenMethod listen_method) { this->listen_method_ = listen_method; }
+
+ protected:
+  bool packet_(const std::vector<uint8_t> &data, int &universe, E131Packet &packet);
+  bool process_(int universe, const E131Packet &packet);
+  bool join_igmp_groups_();
+  void join_(int universe);
+  void leave_(int universe);
+
+ protected:
+  E131ListenMethod listen_method_{E131_MULTICAST};
+  std::unique_ptr<UDP> udp_;
+  std::set<E131AddressableLightEffect *> light_effects_;
+  std::map<int, int> universe_consumers_;
+  std::map<int, E131Packet> universe_packets_;
+};
+
+}  // namespace e131
+}  // namespace esphome
diff --git a/esphome/components/e131/e131_addressable_light_effect.cpp b/esphome/components/e131/e131_addressable_light_effect.cpp
new file mode 100644
index 0000000000..8657d828c5
--- /dev/null
+++ b/esphome/components/e131/e131_addressable_light_effect.cpp
@@ -0,0 +1,90 @@
+#include "e131.h"
+#include "e131_addressable_light_effect.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace e131 {
+
+static const char *TAG = "e131_addressable_light_effect";
+static const int MAX_DATA_SIZE = (sizeof(E131Packet::values) - 1);
+
+E131AddressableLightEffect::E131AddressableLightEffect(const std::string &name) : AddressableLightEffect(name) {}
+
+int E131AddressableLightEffect::get_data_per_universe() const { return get_lights_per_universe() * channels_; }
+
+int E131AddressableLightEffect::get_lights_per_universe() const { return MAX_DATA_SIZE / channels_; }
+
+int E131AddressableLightEffect::get_first_universe() const { return first_universe_; }
+
+int E131AddressableLightEffect::get_last_universe() const { return first_universe_ + get_universe_count() - 1; }
+
+int E131AddressableLightEffect::get_universe_count() const {
+  // Round up to lights_per_universe
+  auto lights = get_lights_per_universe();
+  return (get_addressable_()->size() + lights - 1) / lights;
+}
+
+void E131AddressableLightEffect::start() {
+  AddressableLightEffect::start();
+
+  if (this->e131_) {
+    this->e131_->add_effect(this);
+  }
+}
+
+void E131AddressableLightEffect::stop() {
+  if (this->e131_) {
+    this->e131_->remove_effect(this);
+  }
+
+  AddressableLightEffect::stop();
+}
+
+void E131AddressableLightEffect::apply(light::AddressableLight &it, const light::ESPColor &current_color) {
+  // ignore, it is run by `E131Component::update()`
+}
+
+bool E131AddressableLightEffect::process_(int universe, const E131Packet &packet) {
+  auto it = get_addressable_();
+
+  // check if this is our universe and data are valid
+  if (universe < first_universe_ || universe > get_last_universe())
+    return false;
+
+  int output_offset = (universe - first_universe_) * get_lights_per_universe();
+  // limit amount of lights per universe and received
+  int output_end = std::min(it->size(), std::min(output_offset + get_lights_per_universe(), packet.count - 1));
+  auto input_data = packet.values + 1;
+
+  ESP_LOGV(TAG, "Applying data for '%s' on %d universe, for %d-%d.", get_name().c_str(), universe, output_offset,
+           output_end);
+
+  switch (channels_) {
+    case E131_MONO:
+      for (; output_offset < output_end; output_offset++, input_data++) {
+        auto output = (*it)[output_offset];
+        output.set(light::ESPColor(input_data[0], input_data[0], input_data[0], input_data[0]));
+      }
+      break;
+
+    case E131_RGB:
+      for (; output_offset < output_end; output_offset++, input_data += 3) {
+        auto output = (*it)[output_offset];
+        output.set(light::ESPColor(input_data[0], input_data[1], input_data[2],
+                                   (input_data[0] + input_data[1] + input_data[2]) / 3));
+      }
+      break;
+
+    case E131_RGBW:
+      for (; output_offset < output_end; output_offset++, input_data += 4) {
+        auto output = (*it)[output_offset];
+        output.set(light::ESPColor(input_data[0], input_data[1], input_data[2], input_data[3]));
+      }
+      break;
+  }
+
+  return true;
+}
+
+}  // namespace e131
+}  // namespace esphome
diff --git a/esphome/components/e131/e131_addressable_light_effect.h b/esphome/components/e131/e131_addressable_light_effect.h
new file mode 100644
index 0000000000..85af4fe7a9
--- /dev/null
+++ b/esphome/components/e131/e131_addressable_light_effect.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/light/addressable_light_effect.h"
+
+namespace esphome {
+namespace e131 {
+
+class E131Component;
+struct E131Packet;
+
+enum E131LightChannels { E131_MONO = 1, E131_RGB = 3, E131_RGBW = 4 };
+
+class E131AddressableLightEffect : public light::AddressableLightEffect {
+ public:
+  E131AddressableLightEffect(const std::string &name);
+
+ public:
+  void start() override;
+  void stop() override;
+  void apply(light::AddressableLight &it, const light::ESPColor &current_color) override;
+
+ public:
+  int get_data_per_universe() const;
+  int get_lights_per_universe() const;
+  int get_first_universe() const;
+  int get_last_universe() const;
+  int get_universe_count() const;
+
+ public:
+  void set_first_universe(int universe) { this->first_universe_ = universe; }
+  void set_channels(E131LightChannels channels) { this->channels_ = channels; }
+  void set_e131(E131Component *e131) { this->e131_ = e131; }
+
+ protected:
+  bool process_(int universe, const E131Packet &packet);
+
+ protected:
+  int first_universe_{0};
+  int last_universe_{0};
+  E131LightChannels channels_{E131_RGB};
+  E131Component *e131_{nullptr};
+
+  friend class E131Component;
+};
+
+}  // namespace e131
+}  // namespace esphome
diff --git a/esphome/components/e131/e131_packet.cpp b/esphome/components/e131/e131_packet.cpp
new file mode 100644
index 0000000000..ca68f5126d
--- /dev/null
+++ b/esphome/components/e131/e131_packet.cpp
@@ -0,0 +1,136 @@
+#include "e131.h"
+#include "esphome/core/log.h"
+#include "esphome/core/util.h"
+
+#include <lwip/ip_addr.h>
+#include <lwip/igmp.h>
+
+namespace esphome {
+namespace e131 {
+
+static const char *TAG = "e131";
+
+static const uint8_t ACN_ID[12] = {0x41, 0x53, 0x43, 0x2d, 0x45, 0x31, 0x2e, 0x31, 0x37, 0x00, 0x00, 0x00};
+static const uint32_t VECTOR_ROOT = 4;
+static const uint32_t VECTOR_FRAME = 2;
+static const uint8_t VECTOR_DMP = 2;
+
+// E1.31 Packet Structure
+union E131RawPacket {
+  struct {
+    // Root Layer
+    uint16_t preamble_size;
+    uint16_t postamble_size;
+    uint8_t acn_id[12];
+    uint16_t root_flength;
+    uint32_t root_vector;
+    uint8_t cid[16];
+
+    // Frame Layer
+    uint16_t frame_flength;
+    uint32_t frame_vector;
+    uint8_t source_name[64];
+    uint8_t priority;
+    uint16_t reserved;
+    uint8_t sequence_number;
+    uint8_t options;
+    uint16_t universe;
+
+    // DMP Layer
+    uint16_t dmp_flength;
+    uint8_t dmp_vector;
+    uint8_t type;
+    uint16_t first_address;
+    uint16_t address_increment;
+    uint16_t property_value_count;
+    uint8_t property_values[E131_MAX_PROPERTY_VALUES_COUNT];
+  } __attribute__((packed));
+
+  uint8_t raw[638];
+};
+
+// We need to have at least one `1` value
+// Get the offset of `property_values[1]`
+const long E131_MIN_PACKET_SIZE = reinterpret_cast<long>(&((E131RawPacket *) nullptr)->property_values[1]);
+
+bool E131Component::join_igmp_groups_() {
+  if (listen_method_ != E131_MULTICAST)
+    return false;
+  if (!udp_)
+    return false;
+
+  for (auto universe : universe_consumers_) {
+    if (!universe.second)
+      continue;
+
+    ip4_addr_t multicast_addr = {
+        static_cast<uint32_t>(IPAddress(239, 255, ((universe.first >> 8) & 0xff), ((universe.first >> 0) & 0xff)))};
+
+    auto err = igmp_joingroup(IP4_ADDR_ANY4, &multicast_addr);
+
+    if (err) {
+      ESP_LOGW(TAG, "IGMP join for %d universe of E1.31 failed. Multicast might not work.", universe.first);
+    }
+  }
+
+  return true;
+}
+
+void E131Component::join_(int universe) {
+  // store only latest received packet for the given universe
+  auto consumers = ++universe_consumers_[universe];
+
+  if (consumers > 1) {
+    return;  // we already joined before
+  }
+
+  if (join_igmp_groups_()) {
+    ESP_LOGD(TAG, "Joined %d universe for E1.31.", universe);
+  }
+}
+
+void E131Component::leave_(int universe) {
+  auto consumers = --universe_consumers_[universe];
+
+  if (consumers > 0) {
+    return;  // we have other consumers of the given universe
+  }
+
+  if (listen_method_ == E131_MULTICAST) {
+    ip4_addr_t multicast_addr = {
+        static_cast<uint32_t>(IPAddress(239, 255, ((universe >> 8) & 0xff), ((universe >> 0) & 0xff)))};
+
+    igmp_leavegroup(IP4_ADDR_ANY4, &multicast_addr);
+  }
+
+  ESP_LOGD(TAG, "Left %d universe for E1.31.", universe);
+}
+
+bool E131Component::packet_(const std::vector<uint8_t> &data, int &universe, E131Packet &packet) {
+  if (data.size() < E131_MIN_PACKET_SIZE)
+    return false;
+
+  auto sbuff = reinterpret_cast<const E131RawPacket *>(&data[0]);
+
+  if (memcmp(sbuff->acn_id, ACN_ID, sizeof(sbuff->acn_id)) != 0)
+    return false;
+  if (htonl(sbuff->root_vector) != VECTOR_ROOT)
+    return false;
+  if (htonl(sbuff->frame_vector) != VECTOR_FRAME)
+    return false;
+  if (sbuff->dmp_vector != VECTOR_DMP)
+    return false;
+  if (sbuff->property_values[0] != 0)
+    return false;
+
+  universe = htons(sbuff->universe);
+  packet.count = htons(sbuff->property_value_count);
+  if (packet.count > E131_MAX_PROPERTY_VALUES_COUNT)
+    return false;
+
+  memcpy(packet.values, sbuff->property_values, packet.count);
+  return true;
+}
+
+}  // namespace e131
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 5f8bdd1111..b6290c0440 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1048,6 +1048,8 @@ output:
     pin: GPIO25
     id: dac_output
 
+e131:
+
 light:
   - platform: binary
     name: "Desk Lamp"
@@ -1189,6 +1191,8 @@ light:
               red: 0%
               green: 100%
               blue: 0%
+    - e131:
+        universe: 1
   - platform: fastled_spi
     id: addr2
     chipset: WS2801
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 06bfce97a2..fbfc486fe5 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -697,6 +697,8 @@ mcp23017:
 mcp23008:
   id: mcp23008_hub
 
+e131:
+
 light:
   - platform: neopixelbus
     name: Neopixelbus Light
@@ -705,6 +707,9 @@ light:
     variant: SK6812
     method: ESP8266_UART0
     num_leds: 100
+    effects:
+      - e131:
+          universe: 1
 
 servo:
   id: my_servo

From d1b051a6bdc3c3de5b9e1ea14e9c3e1aa1c46e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Sat, 13 Jun 2020 01:34:38 +0200
Subject: [PATCH 232/412] Add Adalight support (#956)

A component to support [Adalight](https://learn.adafruit.com/adalight-diy-ambient-tv-lighting).
This allows to control addressable LEDs over UART, by pushing data right into LEDs.

The most useful to use [Prismatik](https://github.com/psieg/Lightpack) to create
an immersive effect on PC.

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/adalight/__init__.py       |  24 +++
 .../adalight/adalight_light_effect.cpp        | 140 ++++++++++++++++++
 .../adalight/adalight_light_effect.h          |  41 +++++
 tests/test1.yaml                              |  26 +++-
 tests/test3.yaml                              |  14 +-
 5 files changed, 234 insertions(+), 11 deletions(-)
 create mode 100644 esphome/components/adalight/__init__.py
 create mode 100644 esphome/components/adalight/adalight_light_effect.cpp
 create mode 100644 esphome/components/adalight/adalight_light_effect.h

diff --git a/esphome/components/adalight/__init__.py b/esphome/components/adalight/__init__.py
new file mode 100644
index 0000000000..66fae17f1e
--- /dev/null
+++ b/esphome/components/adalight/__init__.py
@@ -0,0 +1,24 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.components.light.types import AddressableLightEffect
+from esphome.components.light.effects import register_addressable_effect
+from esphome.const import CONF_NAME, CONF_UART_ID
+
+DEPENDENCIES = ['uart']
+
+adalight_ns = cg.esphome_ns.namespace('adalight')
+AdalightLightEffect = adalight_ns.class_(
+    'AdalightLightEffect', uart.UARTDevice, AddressableLightEffect)
+
+CONFIG_SCHEMA = cv.Schema({})
+
+
+@register_addressable_effect('adalight', AdalightLightEffect, "Adalight", {
+    cv.GenerateID(CONF_UART_ID): cv.use_id(uart.UARTComponent)
+})
+def adalight_light_effect_to_code(config, effect_id):
+    effect = cg.new_Pvariable(effect_id, config[CONF_NAME])
+    yield uart.register_uart_device(effect, config)
+
+    yield effect
diff --git a/esphome/components/adalight/adalight_light_effect.cpp b/esphome/components/adalight/adalight_light_effect.cpp
new file mode 100644
index 0000000000..1bf357e308
--- /dev/null
+++ b/esphome/components/adalight/adalight_light_effect.cpp
@@ -0,0 +1,140 @@
+#include "adalight_light_effect.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace adalight {
+
+static const char *TAG = "adalight_light_effect";
+
+static const uint32_t ADALIGHT_ACK_INTERVAL = 1000;
+static const uint32_t ADALIGHT_RECEIVE_TIMEOUT = 1000;
+
+AdalightLightEffect::AdalightLightEffect(const std::string &name) : AddressableLightEffect(name) {}
+
+void AdalightLightEffect::start() {
+  AddressableLightEffect::start();
+
+  last_ack_ = 0;
+  last_byte_ = 0;
+  last_reset_ = 0;
+}
+
+void AdalightLightEffect::stop() {
+  frame_.resize(0);
+
+  AddressableLightEffect::stop();
+}
+
+int AdalightLightEffect::get_frame_size_(int led_count) const {
+  // 3 bytes: Ada
+  // 2 bytes: LED count
+  // 1 byte: checksum
+  // 3 bytes per LED
+  return 3 + 2 + 1 + led_count * 3;
+}
+
+void AdalightLightEffect::reset_frame_(light::AddressableLight &it) {
+  int buffer_capacity = get_frame_size_(it.size());
+
+  frame_.clear();
+  frame_.reserve(buffer_capacity);
+}
+
+void AdalightLightEffect::blank_all_leds_(light::AddressableLight &it) {
+  for (int led = it.size(); led-- > 0;) {
+    it[led].set(light::ESPColor::BLACK);
+  }
+}
+
+void AdalightLightEffect::apply(light::AddressableLight &it, const light::ESPColor &current_color) {
+  const uint32_t now = millis();
+
+  if (now - this->last_ack_ >= ADALIGHT_ACK_INTERVAL) {
+    ESP_LOGV(TAG, "Sending ACK");
+    this->write_str("Ada\n");
+    this->last_ack_ = now;
+  }
+
+  if (!this->last_reset_) {
+    ESP_LOGW(TAG, "Frame: Reset.");
+    reset_frame_(it);
+    blank_all_leds_(it);
+    this->last_reset_ = now;
+  }
+
+  if (!this->frame_.empty() && now - this->last_byte_ >= ADALIGHT_RECEIVE_TIMEOUT) {
+    ESP_LOGW(TAG, "Frame: Receive timeout (size=%zu).", this->frame_.size());
+    reset_frame_(it);
+    blank_all_leds_(it);
+  }
+
+  if (this->available() > 0) {
+    ESP_LOGV(TAG, "Frame: Available (size=%d).", this->available());
+  }
+
+  while (this->available() != 0) {
+    uint8_t data;
+    if (!this->read_byte(&data))
+      break;
+    this->frame_.push_back(data);
+    this->last_byte_ = now;
+
+    switch (this->parse_frame_(it)) {
+      case INVALID:
+        ESP_LOGD(TAG, "Frame: Invalid (size=%zu, first=%d).", this->frame_.size(), this->frame_[0]);
+        reset_frame_(it);
+        break;
+
+      case PARTIAL:
+        break;
+
+      case CONSUMED:
+        ESP_LOGV(TAG, "Frame: Consumed (size=%zu).", this->frame_.size());
+        reset_frame_(it);
+        break;
+    }
+  }
+}
+
+AdalightLightEffect::Frame AdalightLightEffect::parse_frame_(light::AddressableLight &it) {
+  if (frame_.empty())
+    return INVALID;
+
+  // Check header: `Ada`
+  if (frame_[0] != 'A')
+    return INVALID;
+  if (frame_.size() > 1 && frame_[1] != 'd')
+    return INVALID;
+  if (frame_.size() > 2 && frame_[2] != 'a')
+    return INVALID;
+
+  // 3 bytes: Count Hi, Count Lo, Checksum
+  if (frame_.size() < 6)
+    return PARTIAL;
+
+  // Check checksum
+  uint16_t checksum = frame_[3] ^ frame_[4] ^ 0x55;
+  if (checksum != frame_[5])
+    return INVALID;
+
+  // Check if we received the full frame
+  uint16_t led_count = (frame_[3] << 8) + frame_[4] + 1;
+  auto buffer_size = get_frame_size_(led_count);
+  if (frame_.size() < buffer_size)
+    return PARTIAL;
+
+  // Apply lights
+  auto accepted_led_count = std::min<int>(led_count, it.size());
+  uint8_t *led_data = &frame_[6];
+
+  for (int led = 0; led < accepted_led_count; led++, led_data += 3) {
+    auto white = std::min(std::min(led_data[0], led_data[1]), led_data[2]);
+
+    it[led].set(light::ESPColor(led_data[0], led_data[1], led_data[2], white));
+  }
+
+  return CONSUMED;
+}
+
+}  // namespace adalight
+}  // namespace esphome
diff --git a/esphome/components/adalight/adalight_light_effect.h b/esphome/components/adalight/adalight_light_effect.h
new file mode 100644
index 0000000000..4f77394ebc
--- /dev/null
+++ b/esphome/components/adalight/adalight_light_effect.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/light/addressable_light_effect.h"
+#include "esphome/components/uart/uart.h"
+
+#include <vector>
+
+namespace esphome {
+namespace adalight {
+
+class AdalightLightEffect : public light::AddressableLightEffect, public uart::UARTDevice {
+ public:
+  AdalightLightEffect(const std::string &name);
+
+ public:
+  void start() override;
+  void stop() override;
+  void apply(light::AddressableLight &it, const light::ESPColor &current_color) override;
+
+ protected:
+  enum Frame {
+    INVALID,
+    PARTIAL,
+    CONSUMED,
+  };
+
+  int get_frame_size_(int led_count) const;
+  void reset_frame_(light::AddressableLight &it);
+  void blank_all_leds_(light::AddressableLight &it);
+  Frame parse_frame_(light::AddressableLight &it);
+
+ protected:
+  uint32_t last_ack_{0};
+  uint32_t last_byte_{0};
+  uint32_t last_reset_{0};
+  std::vector<uint8_t> frame_;
+};
+
+}  // namespace adalight
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b6290c0440..a793d74b5c 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -128,14 +128,20 @@ spi:
   miso_pin: GPIO23
 
 uart:
-  tx_pin: GPIO22
-  rx_pin: GPIO23
-  baud_rate: 115200
-  id: uart0
-  parity: NONE
-  data_bits: 8
-  stop_bits: 1
-  rx_buffer_size: 512
+  - tx_pin: GPIO22
+    rx_pin: GPIO23
+    baud_rate: 115200
+    id: uart0
+    parity: NONE
+    data_bits: 8
+    stop_bits: 1
+    rx_buffer_size: 512
+
+  - id: adalight_uart
+    tx_pin: GPIO25
+    rx_pin: GPIO26
+    baud_rate: 115200
+    rx_buffer_size: 1024
 
 ota:
   safe_mode: True
@@ -179,6 +185,8 @@ as3935_spi:
   cs_pin: GPIO12
   irq_pin: GPIO13
 
+adalight:
+
 sensor:
   - platform: adc
     pin: A0
@@ -1177,6 +1185,8 @@ light:
             if (initial_run) {
               it[0] = current_color;
             }
+    - adalight:
+        uart_id: adalight_uart
     - automation:
         name: Custom Effect
         sequence:
diff --git a/tests/test3.yaml b/tests/test3.yaml
index fbfc486fe5..fc61c1ae85 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -183,9 +183,13 @@ spi:
   miso_pin: GPIO14
 
 uart:
-  tx_pin: GPIO1
-  rx_pin: GPIO3
-  baud_rate: 115200
+  - tx_pin: GPIO1
+    rx_pin: GPIO3
+    baud_rate: 115200
+
+  - id: adalight_uart
+    rx_pin: GPIO3
+    baud_rate: 115200
 
 ota:
   safe_mode: True
@@ -203,6 +207,8 @@ deep_sleep:
   run_duration: 20s
   sleep_duration: 50s
 
+adalight:
+
 sensor:
   - platform: apds9960
     type: proximity
@@ -708,6 +714,8 @@ light:
     method: ESP8266_UART0
     num_leds: 100
     effects:
+      - adalight:
+          uart_id: adalight_uart
       - e131:
           universe: 1
 

From 0c0dec2534282aba8b63204ebdf294579e1620de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Sat, 13 Jun 2020 01:50:09 +0200
Subject: [PATCH 233/412] Add WLED support (#1092)

A component to support [WLED](https://github.com/Aircoookie/WLED/wiki/UDP-Realtime-Control).
This allows to control addressable LEDs over WiFi/UDP, by pushing data right into LEDs.

The most useful to use [Prismatik](https://github.com/psieg/Lightpack) to create
an immersive effect on PC.

It supports all WLED protocols:
- WARLS
- DRGB
- DRGBW
- DNRGB
- WLED Notifier

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/wled/__init__.py           |  20 ++
 esphome/components/wled/wled_light_effect.cpp | 237 ++++++++++++++++++
 esphome/components/wled/wled_light_effect.h   |  41 +++
 tests/test1.yaml                              |   7 +
 tests/test3.yaml                              |   3 +
 5 files changed, 308 insertions(+)
 create mode 100644 esphome/components/wled/__init__.py
 create mode 100644 esphome/components/wled/wled_light_effect.cpp
 create mode 100644 esphome/components/wled/wled_light_effect.h

diff --git a/esphome/components/wled/__init__.py b/esphome/components/wled/__init__.py
new file mode 100644
index 0000000000..1a248e530f
--- /dev/null
+++ b/esphome/components/wled/__init__.py
@@ -0,0 +1,20 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components.light.types import AddressableLightEffect
+from esphome.components.light.effects import register_addressable_effect
+from esphome.const import CONF_NAME, CONF_PORT
+
+wled_ns = cg.esphome_ns.namespace('wled')
+WLEDLightEffect = wled_ns.class_('WLEDLightEffect', AddressableLightEffect)
+
+CONFIG_SCHEMA = cv.Schema({})
+
+
+@register_addressable_effect('wled', WLEDLightEffect, "WLED", {
+    cv.Optional(CONF_PORT, default=21324): cv.port,
+})
+def wled_light_effect_to_code(config, effect_id):
+    effect = cg.new_Pvariable(effect_id, config[CONF_NAME])
+    cg.add(effect.set_port(config[CONF_PORT]))
+
+    yield effect
diff --git a/esphome/components/wled/wled_light_effect.cpp b/esphome/components/wled/wled_light_effect.cpp
new file mode 100644
index 0000000000..f161ea15e8
--- /dev/null
+++ b/esphome/components/wled/wled_light_effect.cpp
@@ -0,0 +1,237 @@
+#include "wled_light_effect.h"
+#include "esphome/core/log.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+#include <WiFi.h>
+#endif
+
+#ifdef ARDUINO_ARCH_ESP8266
+#include <ESP8266WiFi.h>
+#include <WiFiUdp.h>
+#endif
+
+namespace esphome {
+namespace wled {
+
+// Description of protocols:
+// https://github.com/Aircoookie/WLED/wiki/UDP-Realtime-Control
+enum Protocol { WLED_NOTIFIER = 0, WARLS = 1, DRGB = 2, DRGBW = 3, DNRGB = 4 };
+
+const int DEFAULT_BLANK_TIME = 1000;
+
+static const char *TAG = "wled_light_effect";
+
+WLEDLightEffect::WLEDLightEffect(const std::string &name) : AddressableLightEffect(name) {}
+
+void WLEDLightEffect::start() {
+  AddressableLightEffect::start();
+
+  blank_at_ = 0;
+}
+
+void WLEDLightEffect::stop() {
+  AddressableLightEffect::stop();
+
+  if (udp_) {
+    udp_->stop();
+    udp_.reset();
+  }
+}
+
+void WLEDLightEffect::blank_all_leds_(light::AddressableLight &it) {
+  for (int led = it.size(); led-- > 0;) {
+    it[led].set(light::ESPColor::BLACK);
+  }
+}
+
+void WLEDLightEffect::apply(light::AddressableLight &it, const light::ESPColor &current_color) {
+  // Init UDP lazily
+  if (!udp_) {
+    udp_.reset(new WiFiUDP());
+
+    if (!udp_->begin(port_)) {
+      ESP_LOGE(TAG, "Cannot bind WLEDLightEffect to %d.", port_);
+    }
+  }
+
+  while (uint16_t packet_size = udp_->parsePacket()) {
+    std::vector<uint8_t> payload;
+    payload.resize(packet_size);
+
+    if (!udp_->read(&payload[0], payload.size())) {
+      continue;
+    }
+
+    if (!this->parse_frame_(it, &payload[0], payload.size())) {
+      ESP_LOGD(TAG, "Frame: Invalid (size=%zu, first=%c/%d).", payload.size(), payload[0], payload[0]);
+      continue;
+    }
+  }
+
+  if (blank_at_ < millis()) {
+    blank_all_leds_(it);
+    blank_at_ = millis() + DEFAULT_BLANK_TIME;
+  }
+}
+
+bool WLEDLightEffect::parse_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size) {
+  // At minimum frame needs to have:
+  // 1b - protocol
+  // 1b - timeout
+  if (size < 2) {
+    return false;
+  }
+
+  uint8_t protocol = payload[0];
+  uint8_t timeout = payload[1];
+
+  payload += 2;
+  size -= 2;
+
+  switch (protocol) {
+    case WLED_NOTIFIER:
+      if (!parse_notifier_frame_(it, payload, size))
+        return false;
+      break;
+
+    case WARLS:
+      if (!parse_warls_frame_(it, payload, size))
+        return false;
+      break;
+
+    case DRGB:
+      if (!parse_drgb_frame_(it, payload, size))
+        return false;
+      break;
+
+    case DRGBW:
+      if (!parse_drgbw_frame_(it, payload, size))
+        return false;
+      break;
+
+    case DNRGB:
+      if (!parse_dnrgb_frame_(it, payload, size))
+        return false;
+      break;
+
+    default:
+      return false;
+  }
+
+  if (timeout == UINT8_MAX) {
+    blank_at_ = UINT32_MAX;
+  } else if (timeout > 0) {
+    blank_at_ = millis() + timeout * 1000;
+  } else {
+    blank_at_ = millis() + DEFAULT_BLANK_TIME;
+  }
+
+  return true;
+}
+
+bool WLEDLightEffect::parse_notifier_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size) {
+  // Packet needs to be empty
+  return size == 0;
+}
+
+bool WLEDLightEffect::parse_warls_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size) {
+  // packet: index, r, g, b
+  if ((size % 4) != 0) {
+    return false;
+  }
+
+  auto count = size / 4;
+  auto max_leds = it.size();
+
+  for (; count > 0; count--, payload += 4) {
+    uint8_t led = payload[0];
+    uint8_t r = payload[1];
+    uint8_t g = payload[2];
+    uint8_t b = payload[3];
+
+    if (led < max_leds) {
+      it[led].set(light::ESPColor(r, g, b));
+    }
+  }
+
+  return true;
+}
+
+bool WLEDLightEffect::parse_drgb_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size) {
+  // packet: r, g, b
+  if ((size % 3) != 0) {
+    return false;
+  }
+
+  auto count = size / 3;
+  auto max_leds = it.size();
+
+  for (uint16_t led = 0; led < count; ++led, payload += 3) {
+    uint8_t r = payload[0];
+    uint8_t g = payload[1];
+    uint8_t b = payload[2];
+
+    if (led < max_leds) {
+      it[led].set(light::ESPColor(r, g, b));
+    }
+  }
+
+  return true;
+}
+
+bool WLEDLightEffect::parse_drgbw_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size) {
+  // packet: r, g, b, w
+  if ((size % 4) != 0) {
+    return false;
+  }
+
+  auto count = size / 4;
+  auto max_leds = it.size();
+
+  for (uint16_t led = 0; led < count; ++led, payload += 4) {
+    uint8_t r = payload[0];
+    uint8_t g = payload[1];
+    uint8_t b = payload[2];
+    uint8_t w = payload[3];
+
+    if (led < max_leds) {
+      it[led].set(light::ESPColor(r, g, b, w));
+    }
+  }
+
+  return true;
+}
+
+bool WLEDLightEffect::parse_dnrgb_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size) {
+  // offset: high, low
+  if (size < 2) {
+    return false;
+  }
+
+  uint16_t led = (uint16_t(payload[0]) << 8) + payload[1];
+  payload += 2;
+  size -= 2;
+
+  // packet: r, g, b
+  if ((size % 3) != 0) {
+    return false;
+  }
+
+  auto count = size / 3;
+  auto max_leds = it.size();
+
+  for (; count > 0; count--, payload += 3, led++) {
+    uint8_t r = payload[0];
+    uint8_t g = payload[1];
+    uint8_t b = payload[2];
+
+    if (led < max_leds) {
+      it[led].set(light::ESPColor(r, g, b));
+    }
+  }
+
+  return true;
+}
+
+}  // namespace wled
+}  // namespace esphome
diff --git a/esphome/components/wled/wled_light_effect.h b/esphome/components/wled/wled_light_effect.h
new file mode 100644
index 0000000000..f1d27b06c7
--- /dev/null
+++ b/esphome/components/wled/wled_light_effect.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/light/addressable_light_effect.h"
+
+#include <vector>
+#include <memory>
+
+class UDP;
+
+namespace esphome {
+namespace wled {
+
+class WLEDLightEffect : public light::AddressableLightEffect {
+ public:
+  WLEDLightEffect(const std::string &name);
+
+ public:
+  void start() override;
+  void stop() override;
+  void apply(light::AddressableLight &it, const light::ESPColor &current_color) override;
+  void set_port(uint16_t port) { this->port_ = port; }
+
+ protected:
+  void blank_all_leds_(light::AddressableLight &it);
+  bool parse_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size);
+  bool parse_notifier_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size);
+  bool parse_warls_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size);
+  bool parse_drgb_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size);
+  bool parse_drgbw_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size);
+  bool parse_dnrgb_frame_(light::AddressableLight &it, const uint8_t *payload, uint16_t size);
+
+ protected:
+  uint16_t port_{0};
+  std::unique_ptr<UDP> udp_;
+  uint32_t blank_at_{0};
+  uint32_t dropped_{0};
+};
+
+}  // namespace wled
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index a793d74b5c..a6c0152928 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -185,6 +185,8 @@ as3935_spi:
   cs_pin: GPIO12
   irq_pin: GPIO13
 
+wled:
+
 adalight:
 
 sensor:
@@ -1185,8 +1187,13 @@ light:
             if (initial_run) {
               it[0] = current_color;
             }
+            
+    - wled:
+        port: 11111
+        
     - adalight:
         uart_id: adalight_uart
+        
     - automation:
         name: Custom Effect
         sequence:
diff --git a/tests/test3.yaml b/tests/test3.yaml
index fc61c1ae85..0344aed6de 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -207,6 +207,8 @@ deep_sleep:
   run_duration: 20s
   sleep_duration: 50s
 
+wled:
+
 adalight:
 
 sensor:
@@ -714,6 +716,7 @@ light:
     method: ESP8266_UART0
     num_leds: 100
     effects:
+      - wled:
       - adalight:
           uart_id: adalight_uart
       - e131:

From b65070487735044b80373a4e1f800c41454e756e Mon Sep 17 00:00:00 2001
From: Niklas Wagner <Skaro@Skaronator.com>
Date: Sun, 14 Jun 2020 00:51:43 +0200
Subject: [PATCH 234/412] Update docker base image (#1093)

* Upgrade docker base image to 2.1.0

* Upgrade docker base image to 2.1.1

Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 .gitlab-ci.yml         | 4 ++--
 docker/Dockerfile      | 2 +-
 docker/Dockerfile.lint | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3db0b982ae..cdb2693f46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@
 variables:
   DOCKER_DRIVER: overlay2
   DOCKER_HOST: tcp://docker:2375/
-  BASE_VERSION: '2.0.1'
+  BASE_VERSION: '2.1.1'
   TZ: UTC
 
 stages:
@@ -33,7 +33,7 @@ stages:
     - docker info
     - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
   script:
-    - docker run --rm --privileged multiarch/qemu-user-static:4.1.0-1 --reset -p yes
+    - docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
     - TAG="${CI_COMMIT_TAG#v}"
     - TAG="${TAG:-${CI_COMMIT_SHA:0:7}}"
     - echo "Tag ${TAG}"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 11bbeeda2b..bcdc5feaf7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.0.1
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.1.1
 FROM ${BUILD_FROM}
 
 COPY . .
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 2d77502dc2..f04b448142 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.0.1
+FROM esphome/esphome-base-amd64:2.1.1
 
 RUN \
     apt-get update \

From 35a2258f123fa25cb80d70fddfbec873a3d02479 Mon Sep 17 00:00:00 2001
From: Christian Ferbar <5595808+ferbar@users.noreply.github.com>
Date: Sun, 14 Jun 2020 01:26:41 +0200
Subject: [PATCH 235/412] SenseAir: flush input buffer on read error (#1017)

* SenseAir: flush input buffer on read error

* SenseAir: flush input buffer on read error - fix typo

* SenseAir: flush input buffer on read error - fix formating

* SenseAir: flush input buffer on read error - fix formating2

* SenseAir: flush input buffer on read error - fix formating3

* SenseAir: flush input buffer on read error - fix formating4

* Update esphome/components/senseair/senseair.cpp

* Update esphome/components/senseair/senseair.cpp

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/senseair/senseair.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/esphome/components/senseair/senseair.cpp b/esphome/components/senseair/senseair.cpp
index 8b41a441ad..19831874d7 100644
--- a/esphome/components/senseair/senseair.cpp
+++ b/esphome/components/senseair/senseair.cpp
@@ -18,8 +18,19 @@ void SenseAirComponent::update() {
   }
 
   if (response[0] != 0xFE || response[1] != 0x04) {
-    ESP_LOGW(TAG, "Invalid preamble from SenseAir!");
+    ESP_LOGW(TAG, "Invalid preamble from SenseAir! %02x%02x%02x%02x %02x%02x%02x%02x %02x%02x%02x%02x %02x",
+             response[0], response[1], response[2], response[3], response[4], response[5], response[6], response[7],
+             response[8], response[9], response[10], response[11], response[12]);
+
     this->status_set_warning();
+    while (this->available()) {
+      unsigned char b;
+      if (this->read_byte(&b)) {
+        ESP_LOGD(TAG, "    ... %02x", b);
+      } else {
+        ESP_LOGD(TAG, "    ... nothing read");
+      }
+    }
     return;
   }
 

From 0bb81e5b2d1461ca08917d7d2cb30270ed24609f Mon Sep 17 00:00:00 2001
From: Jim Persson <jim@nurd.se>
Date: Sun, 14 Jun 2020 21:54:31 +0200
Subject: [PATCH 236/412] Add support for controlling fan direction (#1051)

* Fix fan oscillation trait not being used

* Add fan direction support to SpeedFan

* Add fan direction to API

* Add fan direction support to BinaryFan

* Fix CI errors

* Fix python format

* Change some ordering to trigger CI

* Add test for the configuration
---
 esphome/components/api/api.proto             |  8 ++++
 esphome/components/api/api_connection.cpp    |  5 +++
 esphome/components/api/api_pb2.cpp           | 46 ++++++++++++++++++++
 esphome/components/api/api_pb2.h             | 30 ++++++++-----
 esphome/components/binary/fan/__init__.py    |  8 +++-
 esphome/components/binary/fan/binary_fan.cpp | 15 ++++++-
 esphome/components/binary/fan/binary_fan.h   |  2 +
 esphome/components/fan/fan_state.cpp         |  6 +++
 esphome/components/fan/fan_state.h           | 14 ++++++
 esphome/components/fan/fan_traits.h          |  8 +++-
 esphome/components/speed/fan/__init__.py     |  7 ++-
 esphome/components/speed/fan/speed_fan.cpp   | 15 ++++++-
 esphome/components/speed/fan/speed_fan.h     |  2 +
 esphome/components/tuya/fan/tuya_fan.cpp     |  2 +-
 esphome/const.py                             |  1 +
 tests/test1.yaml                             |  4 ++
 16 files changed, 156 insertions(+), 17 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 4bb7d1b555..403242d236 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -301,12 +301,17 @@ message ListEntitiesFanResponse {
 
   bool supports_oscillation = 5;
   bool supports_speed = 6;
+  bool supports_direction = 7;
 }
 enum FanSpeed {
   FAN_SPEED_LOW = 0;
   FAN_SPEED_MEDIUM = 1;
   FAN_SPEED_HIGH = 2;
 }
+enum FanDirection {
+  FAN_DIRECTION_FORWARD = 0;
+  FAN_DIRECTION_REVERSE = 1;
+}
 message FanStateResponse {
   option (id) = 23;
   option (source) = SOURCE_SERVER;
@@ -317,6 +322,7 @@ message FanStateResponse {
   bool state = 2;
   bool oscillating = 3;
   FanSpeed speed = 4;
+  FanDirection direction = 5;
 }
 message FanCommandRequest {
   option (id) = 31;
@@ -331,6 +337,8 @@ message FanCommandRequest {
   FanSpeed speed = 5;
   bool has_oscillating = 6;
   bool oscillating = 7;
+  bool has_direction = 8;
+  FanDirection direction = 9;
 }
 
 // ==================== LIGHT ====================
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index beccf91d27..1956f3119d 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -248,6 +248,8 @@ bool APIConnection::send_fan_state(fan::FanState *fan) {
     resp.oscillating = fan->oscillating;
   if (traits.supports_speed())
     resp.speed = static_cast<enums::FanSpeed>(fan->speed);
+  if (traits.supports_direction())
+    resp.direction = static_cast<enums::FanDirection>(fan->direction);
   return this->send_fan_state_response(resp);
 }
 bool APIConnection::send_fan_info(fan::FanState *fan) {
@@ -259,6 +261,7 @@ bool APIConnection::send_fan_info(fan::FanState *fan) {
   msg.unique_id = get_default_unique_id("fan", fan);
   msg.supports_oscillation = traits.supports_oscillation();
   msg.supports_speed = traits.supports_speed();
+  msg.supports_direction = traits.supports_direction();
   return this->send_list_entities_fan_response(msg);
 }
 void APIConnection::fan_command(const FanCommandRequest &msg) {
@@ -273,6 +276,8 @@ void APIConnection::fan_command(const FanCommandRequest &msg) {
     call.set_oscillating(msg.oscillating);
   if (msg.has_speed)
     call.set_speed(static_cast<fan::FanSpeed>(msg.speed));
+  if (msg.has_direction)
+    call.set_direction(static_cast<fan::FanDirection>(msg.direction));
   call.perform();
 }
 #endif
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 6b98f95f53..c659561aa8 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -52,6 +52,16 @@ template<> const char *proto_enum_to_string<enums::FanSpeed>(enums::FanSpeed val
       return "UNKNOWN";
   }
 }
+template<> const char *proto_enum_to_string<enums::FanDirection>(enums::FanDirection value) {
+  switch (value) {
+    case enums::FAN_DIRECTION_FORWARD:
+      return "FAN_DIRECTION_FORWARD";
+    case enums::FAN_DIRECTION_REVERSE:
+      return "FAN_DIRECTION_REVERSE";
+    default:
+      return "UNKNOWN";
+  }
+}
 template<> const char *proto_enum_to_string<enums::LogLevel>(enums::LogLevel value) {
   switch (value) {
     case enums::LOG_LEVEL_NONE:
@@ -760,6 +770,10 @@ bool ListEntitiesFanResponse::decode_varint(uint32_t field_id, ProtoVarInt value
       this->supports_speed = value.as_bool();
       return true;
     }
+    case 7: {
+      this->supports_direction = value.as_bool();
+      return true;
+    }
     default:
       return false;
   }
@@ -799,6 +813,7 @@ void ListEntitiesFanResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(4, this->unique_id);
   buffer.encode_bool(5, this->supports_oscillation);
   buffer.encode_bool(6, this->supports_speed);
+  buffer.encode_bool(7, this->supports_direction);
 }
 void ListEntitiesFanResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -827,6 +842,10 @@ void ListEntitiesFanResponse::dump_to(std::string &out) const {
   out.append("  supports_speed: ");
   out.append(YESNO(this->supports_speed));
   out.append("\n");
+
+  out.append("  supports_direction: ");
+  out.append(YESNO(this->supports_direction));
+  out.append("\n");
   out.append("}");
 }
 bool FanStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
@@ -843,6 +862,10 @@ bool FanStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
       this->speed = value.as_enum<enums::FanSpeed>();
       return true;
     }
+    case 5: {
+      this->direction = value.as_enum<enums::FanDirection>();
+      return true;
+    }
     default:
       return false;
   }
@@ -862,6 +885,7 @@ void FanStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_bool(2, this->state);
   buffer.encode_bool(3, this->oscillating);
   buffer.encode_enum<enums::FanSpeed>(4, this->speed);
+  buffer.encode_enum<enums::FanDirection>(5, this->direction);
 }
 void FanStateResponse::dump_to(std::string &out) const {
   char buffer[64];
@@ -882,6 +906,10 @@ void FanStateResponse::dump_to(std::string &out) const {
   out.append("  speed: ");
   out.append(proto_enum_to_string<enums::FanSpeed>(this->speed));
   out.append("\n");
+
+  out.append("  direction: ");
+  out.append(proto_enum_to_string<enums::FanDirection>(this->direction));
+  out.append("\n");
   out.append("}");
 }
 bool FanCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
@@ -910,6 +938,14 @@ bool FanCommandRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
       this->oscillating = value.as_bool();
       return true;
     }
+    case 8: {
+      this->has_direction = value.as_bool();
+      return true;
+    }
+    case 9: {
+      this->direction = value.as_enum<enums::FanDirection>();
+      return true;
+    }
     default:
       return false;
   }
@@ -932,6 +968,8 @@ void FanCommandRequest::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_enum<enums::FanSpeed>(5, this->speed);
   buffer.encode_bool(6, this->has_oscillating);
   buffer.encode_bool(7, this->oscillating);
+  buffer.encode_bool(8, this->has_direction);
+  buffer.encode_enum<enums::FanDirection>(9, this->direction);
 }
 void FanCommandRequest::dump_to(std::string &out) const {
   char buffer[64];
@@ -964,6 +1002,14 @@ void FanCommandRequest::dump_to(std::string &out) const {
   out.append("  oscillating: ");
   out.append(YESNO(this->oscillating));
   out.append("\n");
+
+  out.append("  has_direction: ");
+  out.append(YESNO(this->has_direction));
+  out.append("\n");
+
+  out.append("  direction: ");
+  out.append(proto_enum_to_string<enums::FanDirection>(this->direction));
+  out.append("\n");
   out.append("}");
 }
 bool ListEntitiesLightResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 8be89f0365..306bdbf5a9 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -28,6 +28,10 @@ enum FanSpeed : uint32_t {
   FAN_SPEED_MEDIUM = 1,
   FAN_SPEED_HIGH = 2,
 };
+enum FanDirection : uint32_t {
+  FAN_DIRECTION_FORWARD = 0,
+  FAN_DIRECTION_REVERSE = 1,
+};
 enum LogLevel : uint32_t {
   LOG_LEVEL_NONE = 0,
   LOG_LEVEL_ERROR = 1,
@@ -279,6 +283,7 @@ class ListEntitiesFanResponse : public ProtoMessage {
   std::string unique_id{};           // NOLINT
   bool supports_oscillation{false};  // NOLINT
   bool supports_speed{false};        // NOLINT
+  bool supports_direction{false};    // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -289,10 +294,11 @@ class ListEntitiesFanResponse : public ProtoMessage {
 };
 class FanStateResponse : public ProtoMessage {
  public:
-  uint32_t key{0};          // NOLINT
-  bool state{false};        // NOLINT
-  bool oscillating{false};  // NOLINT
-  enums::FanSpeed speed{};  // NOLINT
+  uint32_t key{0};                  // NOLINT
+  bool state{false};                // NOLINT
+  bool oscillating{false};          // NOLINT
+  enums::FanSpeed speed{};          // NOLINT
+  enums::FanDirection direction{};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
@@ -302,13 +308,15 @@ class FanStateResponse : public ProtoMessage {
 };
 class FanCommandRequest : public ProtoMessage {
  public:
-  uint32_t key{0};              // NOLINT
-  bool has_state{false};        // NOLINT
-  bool state{false};            // NOLINT
-  bool has_speed{false};        // NOLINT
-  enums::FanSpeed speed{};      // NOLINT
-  bool has_oscillating{false};  // NOLINT
-  bool oscillating{false};      // NOLINT
+  uint32_t key{0};                  // NOLINT
+  bool has_state{false};            // NOLINT
+  bool state{false};                // NOLINT
+  bool has_speed{false};            // NOLINT
+  enums::FanSpeed speed{};          // NOLINT
+  bool has_oscillating{false};      // NOLINT
+  bool oscillating{false};          // NOLINT
+  bool has_direction{false};        // NOLINT
+  enums::FanDirection direction{};  // NOLINT
   void encode(ProtoWriteBuffer buffer) const override;
   void dump_to(std::string &out) const override;
 
diff --git a/esphome/components/binary/fan/__init__.py b/esphome/components/binary/fan/__init__.py
index dbfe1a8286..6969c1dbbf 100644
--- a/esphome/components/binary/fan/__init__.py
+++ b/esphome/components/binary/fan/__init__.py
@@ -1,7 +1,8 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import fan, output
-from esphome.const import CONF_OSCILLATION_OUTPUT, CONF_OUTPUT, CONF_OUTPUT_ID
+from esphome.const import CONF_DIRECTION_OUTPUT, CONF_OSCILLATION_OUTPUT, \
+    CONF_OUTPUT, CONF_OUTPUT_ID
 from .. import binary_ns
 
 BinaryFan = binary_ns.class_('BinaryFan', cg.Component)
@@ -9,6 +10,7 @@ BinaryFan = binary_ns.class_('BinaryFan', cg.Component)
 CONFIG_SCHEMA = fan.FAN_SCHEMA.extend({
     cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(BinaryFan),
     cv.Required(CONF_OUTPUT): cv.use_id(output.BinaryOutput),
+    cv.Optional(CONF_DIRECTION_OUTPUT): cv.use_id(output.BinaryOutput),
     cv.Optional(CONF_OSCILLATION_OUTPUT): cv.use_id(output.BinaryOutput),
 }).extend(cv.COMPONENT_SCHEMA)
 
@@ -25,3 +27,7 @@ def to_code(config):
     if CONF_OSCILLATION_OUTPUT in config:
         oscillation_output = yield cg.get_variable(config[CONF_OSCILLATION_OUTPUT])
         cg.add(var.set_oscillating(oscillation_output))
+
+    if CONF_DIRECTION_OUTPUT in config:
+        direction_output = yield cg.get_variable(config[CONF_DIRECTION_OUTPUT])
+        cg.add(var.set_direction(direction_output))
diff --git a/esphome/components/binary/fan/binary_fan.cpp b/esphome/components/binary/fan/binary_fan.cpp
index 986902efe5..5fd1867e7f 100644
--- a/esphome/components/binary/fan/binary_fan.cpp
+++ b/esphome/components/binary/fan/binary_fan.cpp
@@ -11,9 +11,12 @@ void binary::BinaryFan::dump_config() {
   if (this->fan_->get_traits().supports_oscillation()) {
     ESP_LOGCONFIG(TAG, "  Oscillation: YES");
   }
+  if (this->fan_->get_traits().supports_direction()) {
+    ESP_LOGCONFIG(TAG, "  Direction: YES");
+  }
 }
 void BinaryFan::setup() {
-  auto traits = fan::FanTraits(this->oscillating_ != nullptr, false);
+  auto traits = fan::FanTraits(this->oscillating_ != nullptr, false, this->direction_ != nullptr);
   this->fan_->set_traits(traits);
   this->fan_->add_on_state_callback([this]() { this->next_update_ = true; });
 }
@@ -41,6 +44,16 @@ void BinaryFan::loop() {
     }
     ESP_LOGD(TAG, "Setting oscillation: %s", ONOFF(enable));
   }
+
+  if (this->direction_ != nullptr) {
+    bool enable = this->fan_->direction == fan::FAN_DIRECTION_REVERSE;
+    if (enable) {
+      this->direction_->turn_on();
+    } else {
+      this->direction_->turn_off();
+    }
+    ESP_LOGD(TAG, "Setting reverse direction: %s", ONOFF(enable));
+  }
 }
 float BinaryFan::get_setup_priority() const { return setup_priority::DATA; }
 
diff --git a/esphome/components/binary/fan/binary_fan.h b/esphome/components/binary/fan/binary_fan.h
index 980d2629f6..93294b8dee 100644
--- a/esphome/components/binary/fan/binary_fan.h
+++ b/esphome/components/binary/fan/binary_fan.h
@@ -16,11 +16,13 @@ class BinaryFan : public Component {
   void dump_config() override;
   float get_setup_priority() const override;
   void set_oscillating(output::BinaryOutput *oscillating) { this->oscillating_ = oscillating; }
+  void set_direction(output::BinaryOutput *direction) { this->direction_ = direction; }
 
  protected:
   fan::FanState *fan_;
   output::BinaryOutput *output_;
   output::BinaryOutput *oscillating_{nullptr};
+  output::BinaryOutput *direction_{nullptr};
   bool next_update_{true};
 };
 
diff --git a/esphome/components/fan/fan_state.cpp b/esphome/components/fan/fan_state.cpp
index af170a755c..ae58b04150 100644
--- a/esphome/components/fan/fan_state.cpp
+++ b/esphome/components/fan/fan_state.cpp
@@ -22,6 +22,7 @@ struct FanStateRTCState {
   bool state;
   FanSpeed speed;
   bool oscillating;
+  FanDirection direction;
 };
 
 void FanState::setup() {
@@ -34,6 +35,7 @@ void FanState::setup() {
   call.set_state(recovered.state);
   call.set_speed(recovered.speed);
   call.set_oscillating(recovered.oscillating);
+  call.set_direction(recovered.direction);
   call.perform();
 }
 float FanState::get_setup_priority() const { return setup_priority::HARDWARE - 1.0f; }
@@ -46,6 +48,9 @@ void FanStateCall::perform() const {
   if (this->oscillating_.has_value()) {
     this->state_->oscillating = *this->oscillating_;
   }
+  if (this->direction_.has_value()) {
+    this->state_->direction = *this->direction_;
+  }
   if (this->speed_.has_value()) {
     switch (*this->speed_) {
       case FAN_SPEED_LOW:
@@ -63,6 +68,7 @@ void FanStateCall::perform() const {
   saved.state = this->state_->state;
   saved.speed = this->state_->speed;
   saved.oscillating = this->state_->oscillating;
+  saved.direction = this->state_->direction;
   this->state_->rtc_.save(&saved);
 
   this->state_->state_callback_.call();
diff --git a/esphome/components/fan/fan_state.h b/esphome/components/fan/fan_state.h
index 4e937c68bd..7ab8337e94 100644
--- a/esphome/components/fan/fan_state.h
+++ b/esphome/components/fan/fan_state.h
@@ -15,6 +15,9 @@ enum FanSpeed {
   FAN_SPEED_HIGH = 2     ///< The fan is running on high/full speed.
 };
 
+/// Simple enum to represent the direction of a fan
+enum FanDirection { FAN_DIRECTION_FORWARD = 0, FAN_DIRECTION_REVERSE = 1 };
+
 class FanState;
 
 class FanStateCall {
@@ -46,6 +49,14 @@ class FanStateCall {
     return *this;
   }
   FanStateCall &set_speed(const char *speed);
+  FanStateCall &set_direction(FanDirection direction) {
+    this->direction_ = direction;
+    return *this;
+  }
+  FanStateCall &set_direction(optional<FanDirection> direction) {
+    this->direction_ = direction;
+    return *this;
+  }
 
   void perform() const;
 
@@ -54,6 +65,7 @@ class FanStateCall {
   optional<bool> binary_state_;
   optional<bool> oscillating_{};
   optional<FanSpeed> speed_{};
+  optional<FanDirection> direction_{};
 };
 
 class FanState : public Nameable, public Component {
@@ -76,6 +88,8 @@ class FanState : public Nameable, public Component {
   bool oscillating{false};
   /// The current fan speed.
   FanSpeed speed{FAN_SPEED_HIGH};
+  /// The current direction of the fan
+  FanDirection direction{FAN_DIRECTION_FORWARD};
 
   FanStateCall turn_on();
   FanStateCall turn_off();
diff --git a/esphome/components/fan/fan_traits.h b/esphome/components/fan/fan_traits.h
index c46adbf013..75663484c5 100644
--- a/esphome/components/fan/fan_traits.h
+++ b/esphome/components/fan/fan_traits.h
@@ -6,7 +6,8 @@ namespace fan {
 class FanTraits {
  public:
   FanTraits() = default;
-  FanTraits(bool oscillation, bool speed) : oscillation_(oscillation), speed_(speed) {}
+  FanTraits(bool oscillation, bool speed, bool direction)
+      : oscillation_(oscillation), speed_(speed), direction_(direction) {}
 
   /// Return if this fan supports oscillation.
   bool supports_oscillation() const { return this->oscillation_; }
@@ -16,10 +17,15 @@ class FanTraits {
   bool supports_speed() const { return this->speed_; }
   /// Set whether this fan supports speed modes.
   void set_speed(bool speed) { this->speed_ = speed; }
+  /// Return if this fan supports changing direction
+  bool supports_direction() const { return this->direction_; }
+  /// Set whether this fan supports changing direction
+  void set_direction(bool direction) { this->direction_ = direction; }
 
  protected:
   bool oscillation_{false};
   bool speed_{false};
+  bool direction_{false};
 };
 
 }  // namespace fan
diff --git a/esphome/components/speed/fan/__init__.py b/esphome/components/speed/fan/__init__.py
index 65ee5960f0..420c957d87 100644
--- a/esphome/components/speed/fan/__init__.py
+++ b/esphome/components/speed/fan/__init__.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import fan, output
-from esphome.const import CONF_OSCILLATION_OUTPUT, CONF_OUTPUT, \
+from esphome.const import CONF_OSCILLATION_OUTPUT, CONF_OUTPUT, CONF_DIRECTION_OUTPUT, \
     CONF_OUTPUT_ID, CONF_SPEED, CONF_LOW, CONF_MEDIUM, CONF_HIGH
 from .. import speed_ns
 
@@ -11,6 +11,7 @@ CONFIG_SCHEMA = fan.FAN_SCHEMA.extend({
     cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(SpeedFan),
     cv.Required(CONF_OUTPUT): cv.use_id(output.FloatOutput),
     cv.Optional(CONF_OSCILLATION_OUTPUT): cv.use_id(output.BinaryOutput),
+    cv.Optional(CONF_DIRECTION_OUTPUT): cv.use_id(output.BinaryOutput),
     cv.Optional(CONF_SPEED, default={}): cv.Schema({
         cv.Optional(CONF_LOW, default=0.33): cv.percentage,
         cv.Optional(CONF_MEDIUM, default=0.66): cv.percentage,
@@ -30,3 +31,7 @@ def to_code(config):
     if CONF_OSCILLATION_OUTPUT in config:
         oscillation_output = yield cg.get_variable(config[CONF_OSCILLATION_OUTPUT])
         cg.add(var.set_oscillating(oscillation_output))
+
+    if CONF_DIRECTION_OUTPUT in config:
+        direction_output = yield cg.get_variable(config[CONF_DIRECTION_OUTPUT])
+        cg.add(var.set_direction(direction_output))
diff --git a/esphome/components/speed/fan/speed_fan.cpp b/esphome/components/speed/fan/speed_fan.cpp
index 3bfbc1fc3c..45117d64c3 100644
--- a/esphome/components/speed/fan/speed_fan.cpp
+++ b/esphome/components/speed/fan/speed_fan.cpp
@@ -11,9 +11,12 @@ void SpeedFan::dump_config() {
   if (this->fan_->get_traits().supports_oscillation()) {
     ESP_LOGCONFIG(TAG, "  Oscillation: YES");
   }
+  if (this->fan_->get_traits().supports_direction()) {
+    ESP_LOGCONFIG(TAG, "  Direction: YES");
+  }
 }
 void SpeedFan::setup() {
-  auto traits = fan::FanTraits(this->oscillating_ != nullptr, true);
+  auto traits = fan::FanTraits(this->oscillating_ != nullptr, true, this->direction_ != nullptr);
   this->fan_->set_traits(traits);
   this->fan_->add_on_state_callback([this]() { this->next_update_ = true; });
 }
@@ -46,6 +49,16 @@ void SpeedFan::loop() {
     }
     ESP_LOGD(TAG, "Setting oscillation: %s", ONOFF(enable));
   }
+
+  if (this->direction_ != nullptr) {
+    bool enable = this->fan_->direction == fan::FAN_DIRECTION_REVERSE;
+    if (enable) {
+      this->direction_->turn_on();
+    } else {
+      this->direction_->turn_off();
+    }
+    ESP_LOGD(TAG, "Setting reverse direction: %s", ONOFF(enable));
+  }
 }
 float SpeedFan::get_setup_priority() const { return setup_priority::DATA; }
 
diff --git a/esphome/components/speed/fan/speed_fan.h b/esphome/components/speed/fan/speed_fan.h
index 74910bda94..cce9d07544 100644
--- a/esphome/components/speed/fan/speed_fan.h
+++ b/esphome/components/speed/fan/speed_fan.h
@@ -16,6 +16,7 @@ class SpeedFan : public Component {
   void dump_config() override;
   float get_setup_priority() const override;
   void set_oscillating(output::BinaryOutput *oscillating) { this->oscillating_ = oscillating; }
+  void set_direction(output::BinaryOutput *direction) { this->direction_ = direction; }
   void set_speeds(float low, float medium, float high) {
     this->low_speed_ = low;
     this->medium_speed_ = medium;
@@ -26,6 +27,7 @@ class SpeedFan : public Component {
   fan::FanState *fan_;
   output::FloatOutput *output_;
   output::BinaryOutput *oscillating_{nullptr};
+  output::BinaryOutput *direction_{nullptr};
   float low_speed_{};
   float medium_speed_{};
   float high_speed_{};
diff --git a/esphome/components/tuya/fan/tuya_fan.cpp b/esphome/components/tuya/fan/tuya_fan.cpp
index b9fe2c0829..9850fa65ed 100644
--- a/esphome/components/tuya/fan/tuya_fan.cpp
+++ b/esphome/components/tuya/fan/tuya_fan.cpp
@@ -7,7 +7,7 @@ namespace tuya {
 static const char *TAG = "tuya.fan";
 
 void TuyaFan::setup() {
-  auto traits = fan::FanTraits(this->oscillation_id_.has_value(), this->speed_id_.has_value());
+  auto traits = fan::FanTraits(this->oscillation_id_.has_value(), this->speed_id_.has_value(), false);
   this->fan_->set_traits(traits);
 
   if (this->speed_id_.has_value()) {
diff --git a/esphome/const.py b/esphome/const.py
index 5ac2b3c9ca..4226e25afa 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -130,6 +130,7 @@ CONF_DIMENSIONS = 'dimensions'
 CONF_DIO_PIN = 'dio_pin'
 CONF_DIR_PIN = 'dir_pin'
 CONF_DIRECTION = 'direction'
+CONF_DIRECTION_OUTPUT = 'direction_output'
 CONF_DISCOVERY = 'discovery'
 CONF_DISCOVERY_PREFIX = 'discovery_prefix'
 CONF_DISCOVERY_RETAIN = 'discovery_retain'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index a6c0152928..bd44ff6e63 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1467,9 +1467,13 @@ fan:
   - platform: binary
     output: gpio_26
     name: "Living Room Fan 1"
+    oscillation_output: gpio_19
+    direction_output: gpio_26
   - platform: speed
     output: pca_6
     name: "Living Room Fan 2"
+    oscillation_output: gpio_19
+    direction_output: gpio_26
     speed:
       low: 0.45
       medium: 0.75

From 35078fd52f752db26cdffcb3c827c56564db7ede Mon Sep 17 00:00:00 2001
From: Jeff Rescignano <jeff@jeffresc.dev>
Date: Sun, 14 Jun 2020 21:41:02 -0400
Subject: [PATCH 237/412] Add API component to logging error message (#1062)

* Add API component to logging error message

* lint

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/__main__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 73723dfa00..4059024531 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -33,8 +33,8 @@ def get_serial_ports():
 def choose_prompt(options):
     if not options:
         raise EsphomeError("Found no valid options for upload/logging, please make sure relevant "
-                           "sections (ota, mqtt, ...) are in your configuration and/or the device "
-                           "is plugged in.")
+                           "sections (ota, api, mqtt, ...) are in your configuration and/or the "
+                           "device is plugged in.")
 
     if len(options) == 1:
         return options[0][1]

From 9632ac0e029d09399aca2eb425db3a155845ff08 Mon Sep 17 00:00:00 2001
From: SenexCrenshaw <35600301+SenexCrenshaw@users.noreply.github.com>
Date: Sun, 14 Jun 2020 21:42:46 -0400
Subject: [PATCH 238/412] Add MCP3008 I/O Expander (#1057)

* Add MCP3008

* Fixed Travis build issues

* Travis Build Fix

* Fix Travis foramt issues

* Travis fixes

* Code review changes

* Fix bit shift. off by one and selecting wrong pin

* general fixes

* lint

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/mcp3008/__init__.py | 23 ++++++++++++
 esphome/components/mcp3008/mcp3008.cpp | 52 ++++++++++++++++++++++++++
 esphome/components/mcp3008/mcp3008.h   | 42 +++++++++++++++++++++
 esphome/components/mcp3008/sensor.py   | 23 ++++++++++++
 4 files changed, 140 insertions(+)
 create mode 100644 esphome/components/mcp3008/__init__.py
 create mode 100644 esphome/components/mcp3008/mcp3008.cpp
 create mode 100644 esphome/components/mcp3008/mcp3008.h
 create mode 100644 esphome/components/mcp3008/sensor.py

diff --git a/esphome/components/mcp3008/__init__.py b/esphome/components/mcp3008/__init__.py
new file mode 100644
index 0000000000..2196b96a92
--- /dev/null
+++ b/esphome/components/mcp3008/__init__.py
@@ -0,0 +1,23 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import spi
+from esphome.const import CONF_ID
+
+DEPENDENCIES = ['spi']
+AUTO_LOAD = ['sensor']
+MULTI_CONF = True
+
+CONF_MCP3008 = 'mcp3008'
+
+mcp3008_ns = cg.esphome_ns.namespace('mcp3008')
+MCP3008 = mcp3008_ns.class_('MCP3008', cg.Component, spi.SPIDevice)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(MCP3008),
+}).extend(spi.spi_device_schema(CS_PIN_required=True))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield spi.register_spi_device(var, config)
diff --git a/esphome/components/mcp3008/mcp3008.cpp b/esphome/components/mcp3008/mcp3008.cpp
new file mode 100644
index 0000000000..70484e8818
--- /dev/null
+++ b/esphome/components/mcp3008/mcp3008.cpp
@@ -0,0 +1,52 @@
+#include "mcp3008.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace mcp3008 {
+
+static const char *TAG = "mcp3008";
+
+float MCP3008::get_setup_priority() const { return setup_priority::HARDWARE; }
+
+void MCP3008::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up mcp3008");
+  this->spi_setup();
+}
+
+void MCP3008::dump_config() {
+  ESP_LOGCONFIG(TAG, "MCP3008:");
+  LOG_PIN("  CS Pin: ", this->cs_);
+}
+
+float MCP3008::read_data_(uint8_t pin) {
+  byte data_msb = 0;
+  byte data_lsb = 0;
+
+  byte command = ((0x01 << 7) |          // start bit
+                  ((pin & 0x07) << 4));  // channel number
+
+  this->enable();
+
+  this->transfer_byte(0x01);
+  data_msb = this->transfer_byte(command) & 0x03;
+  data_lsb = this->transfer_byte(0x00);
+
+  this->disable();
+
+  int data = data_msb << 8 | data_lsb;
+
+  return data / 1024.0f;
+}
+
+MCP3008Sensor::MCP3008Sensor(MCP3008 *parent, std::string name, uint8_t pin)
+    : PollingComponent(1000), parent_(parent), pin_(pin) {
+  this->set_name(name);
+}
+void MCP3008Sensor::setup() { LOG_SENSOR("", "Setting up MCP3008 Sensor '%s'...", this); }
+void MCP3008Sensor::update() {
+  float value_v = this->parent_->read_data_(pin_);
+  this->publish_state(value_v);
+}
+
+}  // namespace mcp3008
+}  // namespace esphome
diff --git a/esphome/components/mcp3008/mcp3008.h b/esphome/components/mcp3008/mcp3008.h
new file mode 100644
index 0000000000..594bdc4204
--- /dev/null
+++ b/esphome/components/mcp3008/mcp3008.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/spi/spi.h"
+
+namespace esphome {
+namespace mcp3008 {
+
+class MCP3008Sensor;
+
+class MCP3008 : public Component,
+                public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,
+                                      spi::DATA_RATE_1MHZ> {  // At 3.3V 2MHz is too fast 1.35MHz is about right
+ public:
+  MCP3008() = default;
+
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+
+ protected:
+  float read_data_(uint8_t pin);
+
+  friend class MCP3008Sensor;
+};
+
+class MCP3008Sensor : public PollingComponent, public sensor::Sensor {
+ public:
+  MCP3008Sensor(MCP3008 *parent, std::string name, uint8_t pin);
+
+  void setup() override;
+  void update() override;
+
+ protected:
+  MCP3008 *parent_;
+  uint8_t pin_;
+};
+
+}  // namespace mcp3008
+}  // namespace esphome
diff --git a/esphome/components/mcp3008/sensor.py b/esphome/components/mcp3008/sensor.py
new file mode 100644
index 0000000000..ec7df0429a
--- /dev/null
+++ b/esphome/components/mcp3008/sensor.py
@@ -0,0 +1,23 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import CONF_ID, CONF_NUMBER, CONF_NAME
+from . import mcp3008_ns, MCP3008
+
+DEPENDENCIES = ['mcp3008']
+
+MCP3008Sensor = mcp3008_ns.class_('MCP3008Sensor', sensor.Sensor, cg.PollingComponent)
+
+CONF_MCP3008_ID = 'mcp3008_id'
+
+CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(MCP3008Sensor),
+    cv.GenerateID(CONF_MCP3008_ID): cv.use_id(MCP3008),
+    cv.Required(CONF_NUMBER): cv.int_,
+}).extend(cv.polling_component_schema('1s'))
+
+
+def to_code(config):
+    parent = yield cg.get_variable(config[CONF_MCP3008_ID])
+    var = cg.new_Pvariable(config[CONF_ID], parent, config[CONF_NAME], config[CONF_NUMBER])
+    yield cg.register_component(var, config)

From 4fb750de439f306907671c8f70de026b36d3a359 Mon Sep 17 00:00:00 2001
From: rnauber <7414650+rnauber@users.noreply.github.com>
Date: Mon, 15 Jun 2020 05:37:15 +0200
Subject: [PATCH 239/412] ADE7953: Fix dereferencing of a null pointer (#1086)

* ADE7953: Fix dereferencing of a null pointer

The ade7953 driver dereferences a null pointer, when not all of
its sensors are used. This gives an exception like:

Fatal exception:29 flag:2 (EXCEPTION) epc1:0x4020c241 epc2:0x00000000 epc3:0x00000000 excvaddr:0x00000018 depc:0x00000000

* Fix formatting

Co-authored-by: olg <x>
---
 esphome/components/ade7953/ade7953.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/ade7953/ade7953.cpp b/esphome/components/ade7953/ade7953.cpp
index 9316d9cad0..c4752abf39 100644
--- a/esphome/components/ade7953/ade7953.cpp
+++ b/esphome/components/ade7953/ade7953.cpp
@@ -18,7 +18,7 @@ void ADE7953::dump_config() {
 }
 
 #define ADE_PUBLISH_(name, factor) \
-  if (name) { \
+  if (name && this->name##_sensor_) { \
     float value = *name / factor; \
     this->name##_sensor_->publish_state(value); \
   }

From d0004409278cd7e63b5bc0a8e1b9abad0308327d Mon Sep 17 00:00:00 2001
From: korellas <korellas@gmail.com>
Date: Mon, 15 Jun 2020 12:41:17 +0900
Subject: [PATCH 240/412] sgp30 baseline write bug (#1157) (#1078)

---
 esphome/components/sgp30/sgp30.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esphome/components/sgp30/sgp30.cpp b/esphome/components/sgp30/sgp30.cpp
index 8c148b8e83..1ef43c1c73 100644
--- a/esphome/components/sgp30/sgp30.cpp
+++ b/esphome/components/sgp30/sgp30.cpp
@@ -162,11 +162,11 @@ void SGP30Component::send_env_data_() {
 void SGP30Component::write_iaq_baseline_(uint16_t eco2_baseline, uint16_t tvoc_baseline) {
   uint8_t data[7];
   data[0] = SGP30_CMD_SET_IAQ_BASELINE & 0xFF;
-  data[1] = eco2_baseline >> 8;
-  data[2] = eco2_baseline & 0xFF;
+  data[1] = tvoc_baseline >> 8;
+  data[2] = tvoc_baseline & 0xFF;
   data[3] = sht_crc_(data[1], data[2]);
-  data[4] = tvoc_baseline >> 8;
-  data[5] = tvoc_baseline & 0xFF;
+  data[4] = eco2_baseline >> 8;
+  data[5] = eco2_baseline & 0xFF;
   data[6] = sht_crc_(data[4], data[5]);
   if (!this->write_bytes(SGP30_CMD_SET_IAQ_BASELINE >> 8, data, 7)) {
     ESP_LOGE(TAG, "Error applying eCO2 baseline: 0x%04X, TVOC baseline: 0x%04X", eco2_baseline, tvoc_baseline);

From 3fd130869e81d962c4aebf3b91064d82727bffb5 Mon Sep 17 00:00:00 2001
From: MasterTim17 <52961929+MasterTim17@users.noreply.github.com>
Date: Tue, 16 Jun 2020 02:52:47 +0200
Subject: [PATCH 241/412] fix for ESP32 'Association Leave' (#1081)

---
 esphome/components/wifi/wifi_component.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 40f12a8adc..d56e75a070 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -98,6 +98,7 @@ void WiFiComponent::loop() {
       case WIFI_COMPONENT_STATE_STA_CONNECTED: {
         if (!this->is_connected()) {
           ESP_LOGW(TAG, "WiFi Connection lost... Reconnecting...");
+          this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTING;
           this->retry_connect();
         } else {
           this->status_clear_warning();

From 0082c5b4597dbbe75237a14f471beefc6ee86352 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 17 Jun 2020 18:16:42 -0500
Subject: [PATCH 242/412] Climate bang bang enhancements (#1061)

* Add fan support to bang bang controller

* Fix heat-only and cool-only modes

* Added support for all climate actions and modes

* Fix up some comments

* Fan_only mode behavior tweak

* Updated test

* Updated test, take 2

* Add accessor methods for easier use in lambadas

* Revert "Add accessor methods for easier use in lambadas"

This reverts commit f15713129cd5587242a08ad1e2ee37cbf075aa03.

Don't code late at night when sleepy.

* Fix single/dual setpoint support

* Linted

* Properly implement single-point, validation improvements

* Another quick fix...sigh

* Update tests

* Update tests, take 2

* Revert "Update tests, take 2"

This reverts commit 71bb7fccc53d95a7d221e80ea0a931fb3cfd9a0c.

Nope.

* Revert "Update tests"

This reverts commit 42044291efaaf09858f29ab27bbc3aa9e8b80ee9.

Nope 2.

* Updated/fixed tests

* Revert "Updated/fixed tests"

This reverts commit a1a5b1c7db9a240b9da668b6e48abe1dd7910777.

Taking a different approach.

* Revert "Another quick fix...sigh"

This reverts commit 6b1955724a2de3c2d1534ec206dd5794bbb5f568.

Taking a different approach.

* Revert "Properly implement single-point, validation improvements"

This reverts commit f5bfff099e1dc58edd3898da8655c147adde2301.

Taking a different approach.

* Single/dual set point fixes, full validation

* Fix test

* Fix restore-on-boot, clean up comments

* Decouple two-point/auto operation, more polish

* One last away mode tweak

* Added set point validation

* Clean up over-publishing, always call action after boot

* Add fan support to bang bang controller

* Fix heat-only and cool-only modes

* Added support for all climate actions and modes

* Fix up some comments

* Fan_only mode behavior tweak

* Updated test

* Updated test, take 2

* Add accessor methods for easier use in lambadas

* Revert "Add accessor methods for easier use in lambadas"

This reverts commit f15713129cd5587242a08ad1e2ee37cbf075aa03.

Don't code late at night when sleepy.

* Fix single/dual setpoint support

* Linted

* Properly implement single-point, validation improvements

* Another quick fix...sigh

* Update tests

* Update tests, take 2

* Revert "Update tests, take 2"

This reverts commit 71bb7fccc53d95a7d221e80ea0a931fb3cfd9a0c.

Nope.

* Revert "Update tests"

This reverts commit 42044291efaaf09858f29ab27bbc3aa9e8b80ee9.

Nope 2.

* Updated/fixed tests

* Revert "Updated/fixed tests"

This reverts commit a1a5b1c7db9a240b9da668b6e48abe1dd7910777.

Taking a different approach.

* Revert "Another quick fix...sigh"

This reverts commit 6b1955724a2de3c2d1534ec206dd5794bbb5f568.

Taking a different approach.

* Revert "Properly implement single-point, validation improvements"

This reverts commit f5bfff099e1dc58edd3898da8655c147adde2301.

Taking a different approach.

* Single/dual set point fixes, full validation

* Fix test

* Fix restore-on-boot, clean up comments

* Decouple two-point/auto operation, more polish

* One last away mode tweak

* Added set point validation

* Clean up over-publishing, always call action after boot

* Added refresh() function to allow easy on-device state refreshing
---
 .../bang_bang/bang_bang_climate.cpp           | 520 +++++++++++++++---
 .../components/bang_bang/bang_bang_climate.h  | 252 +++++++--
 esphome/components/bang_bang/climate.py       | 235 +++++++-
 esphome/const.py                              |  22 +
 tests/test3.yaml                              |  43 ++
 5 files changed, 947 insertions(+), 125 deletions(-)

diff --git a/esphome/components/bang_bang/bang_bang_climate.cpp b/esphome/components/bang_bang/bang_bang_climate.cpp
index cf527988fe..29f08fbd89 100644
--- a/esphome/components/bang_bang/bang_bang_climate.cpp
+++ b/esphome/components/bang_bang/bang_bang_climate.cpp
@@ -9,136 +9,393 @@ static const char *TAG = "bang_bang.climate";
 void BangBangClimate::setup() {
   this->sensor_->add_on_state_callback([this](float state) {
     this->current_temperature = state;
-    // control may have changed, recompute
-    this->compute_state_();
-    // current temperature changed, publish state
+    // required action may have changed, recompute, refresh
+    this->switch_to_action_(compute_action_());
+    // current temperature and possibly action changed, so publish the new state
     this->publish_state();
   });
   this->current_temperature = this->sensor_->state;
-  // restore set points
+  // restore all climate data, if possible
   auto restore = this->restore_state_();
   if (restore.has_value()) {
     restore->to_call(this).perform();
   } else {
-    // restore from defaults, change_away handles those for us
+    // restore from defaults, change_away handles temps for us
     this->mode = climate::CLIMATE_MODE_AUTO;
     this->change_away_(false);
   }
+  // refresh the climate action based on the restored settings
+  this->switch_to_action_(compute_action_());
+  this->setup_complete_ = true;
+  this->publish_state();
+}
+void BangBangClimate::refresh() {
+  this->switch_to_mode_(this->mode);
+  this->switch_to_action_(compute_action_());
+  this->switch_to_fan_mode_(this->fan_mode);
+  this->switch_to_swing_mode_(this->swing_mode);
+  this->publish_state();
 }
 void BangBangClimate::control(const climate::ClimateCall &call) {
   if (call.get_mode().has_value())
     this->mode = *call.get_mode();
+  if (call.get_fan_mode().has_value())
+    this->fan_mode = *call.get_fan_mode();
+  if (call.get_swing_mode().has_value())
+    this->swing_mode = *call.get_swing_mode();
+  if (call.get_target_temperature().has_value())
+    this->target_temperature = *call.get_target_temperature();
   if (call.get_target_temperature_low().has_value())
     this->target_temperature_low = *call.get_target_temperature_low();
   if (call.get_target_temperature_high().has_value())
     this->target_temperature_high = *call.get_target_temperature_high();
-  if (call.get_away().has_value())
-    this->change_away_(*call.get_away());
-
-  this->compute_state_();
-  this->publish_state();
+  if (call.get_away().has_value()) {
+    // setup_complete_ blocks modifying/resetting the temps immediately after boot
+    if (this->setup_complete_) {
+      this->change_away_(*call.get_away());
+    } else {
+      this->away = *call.get_away();
+    }
+  }
+  // set point validation
+  if (this->supports_two_points_) {
+    if (this->target_temperature_low < this->get_traits().get_visual_min_temperature())
+      this->target_temperature_low = this->get_traits().get_visual_min_temperature();
+    if (this->target_temperature_high > this->get_traits().get_visual_max_temperature())
+      this->target_temperature_high = this->get_traits().get_visual_max_temperature();
+    if (this->target_temperature_high < this->target_temperature_low)
+      this->target_temperature_high = this->target_temperature_low;
+  } else {
+    if (this->target_temperature < this->get_traits().get_visual_min_temperature())
+      this->target_temperature = this->get_traits().get_visual_min_temperature();
+    if (this->target_temperature > this->get_traits().get_visual_max_temperature())
+      this->target_temperature = this->get_traits().get_visual_max_temperature();
+  }
+  // make any changes happen
+  refresh();
 }
 climate::ClimateTraits BangBangClimate::traits() {
   auto traits = climate::ClimateTraits();
   traits.set_supports_current_temperature(true);
-  traits.set_supports_auto_mode(true);
+  traits.set_supports_auto_mode(this->supports_auto_);
   traits.set_supports_cool_mode(this->supports_cool_);
+  traits.set_supports_dry_mode(this->supports_dry_);
+  traits.set_supports_fan_only_mode(this->supports_fan_only_);
   traits.set_supports_heat_mode(this->supports_heat_);
-  traits.set_supports_two_point_target_temperature(true);
+  traits.set_supports_fan_mode_on(this->supports_fan_mode_on_);
+  traits.set_supports_fan_mode_off(this->supports_fan_mode_off_);
+  traits.set_supports_fan_mode_auto(this->supports_fan_mode_auto_);
+  traits.set_supports_fan_mode_low(this->supports_fan_mode_low_);
+  traits.set_supports_fan_mode_medium(this->supports_fan_mode_medium_);
+  traits.set_supports_fan_mode_high(this->supports_fan_mode_high_);
+  traits.set_supports_fan_mode_middle(this->supports_fan_mode_middle_);
+  traits.set_supports_fan_mode_focus(this->supports_fan_mode_focus_);
+  traits.set_supports_fan_mode_diffuse(this->supports_fan_mode_diffuse_);
+  traits.set_supports_swing_mode_both(this->supports_swing_mode_both_);
+  traits.set_supports_swing_mode_horizontal(this->supports_swing_mode_horizontal_);
+  traits.set_supports_swing_mode_off(this->supports_swing_mode_off_);
+  traits.set_supports_swing_mode_vertical(this->supports_swing_mode_vertical_);
+  traits.set_supports_two_point_target_temperature(this->supports_two_points_);
   traits.set_supports_away(this->supports_away_);
   traits.set_supports_action(true);
   return traits;
 }
-void BangBangClimate::compute_state_() {
-  if (this->mode != climate::CLIMATE_MODE_AUTO) {
-    // in non-auto mode, switch directly to appropriate action
-    //  - HEAT mode -> HEATING action
-    //  - COOL mode -> COOLING action
-    //  - OFF mode -> OFF action (not IDLE!)
-    this->switch_to_action_(static_cast<climate::ClimateAction>(this->mode));
-    return;
-  }
-  if (isnan(this->current_temperature) || isnan(this->target_temperature_low) || isnan(this->target_temperature_high)) {
-    // if any control parameters are nan, go to OFF action (not IDLE!)
-    this->switch_to_action_(climate::CLIMATE_ACTION_OFF);
-    return;
-  }
-  const bool too_cold = this->current_temperature < this->target_temperature_low;
-  const bool too_hot = this->current_temperature > this->target_temperature_high;
+climate::ClimateAction BangBangClimate::compute_action_() {
+  climate::ClimateAction target_action = this->action;
+  if (this->supports_two_points_) {
+    if (isnan(this->current_temperature) || isnan(this->target_temperature_low) ||
+        isnan(this->target_temperature_high) || isnan(this->hysteresis_))
+      // if any control parameters are nan, go to OFF action (not IDLE!)
+      return climate::CLIMATE_ACTION_OFF;
 
-  climate::ClimateAction target_action;
-  if (too_cold) {
-    // too cold -> enable heating if possible, else idle
-    if (this->supports_heat_)
-      target_action = climate::CLIMATE_ACTION_HEATING;
-    else
-      target_action = climate::CLIMATE_ACTION_IDLE;
-  } else if (too_hot) {
-    // too hot -> enable cooling if possible, else idle
-    if (this->supports_cool_)
-      target_action = climate::CLIMATE_ACTION_COOLING;
-    else
+    if (((this->action == climate::CLIMATE_ACTION_FAN) && (this->mode != climate::CLIMATE_MODE_FAN_ONLY)) ||
+        ((this->action == climate::CLIMATE_ACTION_DRYING) && (this->mode != climate::CLIMATE_MODE_DRY))) {
       target_action = climate::CLIMATE_ACTION_IDLE;
+    }
+
+    switch (this->mode) {
+      case climate::CLIMATE_MODE_FAN_ONLY:
+        if (this->supports_fan_only_) {
+          if (this->current_temperature > this->target_temperature_high + this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_FAN;
+          else if (this->current_temperature < this->target_temperature_high - this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_FAN)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        break;
+      case climate::CLIMATE_MODE_DRY:
+        target_action = climate::CLIMATE_ACTION_DRYING;
+        break;
+      case climate::CLIMATE_MODE_OFF:
+        target_action = climate::CLIMATE_ACTION_OFF;
+        break;
+      case climate::CLIMATE_MODE_AUTO:
+      case climate::CLIMATE_MODE_COOL:
+      case climate::CLIMATE_MODE_HEAT:
+        if (this->supports_cool_) {
+          if (this->current_temperature > this->target_temperature_high + this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_COOLING;
+          else if (this->current_temperature < this->target_temperature_high - this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_COOLING)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        if (this->supports_heat_) {
+          if (this->current_temperature < this->target_temperature_low - this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_HEATING;
+          else if (this->current_temperature > this->target_temperature_low + this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_HEATING)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        break;
+      default:
+        break;
+    }
   } else {
-    // neither too hot nor too cold -> in range
-    if (this->supports_cool_ && this->supports_heat_) {
-      // if supports both ends, go to idle action
+    if (isnan(this->current_temperature) || isnan(this->target_temperature) || isnan(this->hysteresis_))
+      // if any control parameters are nan, go to OFF action (not IDLE!)
+      return climate::CLIMATE_ACTION_OFF;
+
+    if (((this->action == climate::CLIMATE_ACTION_FAN) && (this->mode != climate::CLIMATE_MODE_FAN_ONLY)) ||
+        ((this->action == climate::CLIMATE_ACTION_DRYING) && (this->mode != climate::CLIMATE_MODE_DRY))) {
       target_action = climate::CLIMATE_ACTION_IDLE;
-    } else {
-      // else use current mode and don't change (hysteresis)
-      target_action = this->action;
+    }
+
+    switch (this->mode) {
+      case climate::CLIMATE_MODE_FAN_ONLY:
+        if (this->supports_fan_only_) {
+          if (this->current_temperature > this->target_temperature + this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_FAN;
+          else if (this->current_temperature < this->target_temperature - this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_FAN)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        break;
+      case climate::CLIMATE_MODE_DRY:
+        target_action = climate::CLIMATE_ACTION_DRYING;
+        break;
+      case climate::CLIMATE_MODE_OFF:
+        target_action = climate::CLIMATE_ACTION_OFF;
+        break;
+      case climate::CLIMATE_MODE_COOL:
+        if (this->supports_cool_) {
+          if (this->current_temperature > this->target_temperature + this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_COOLING;
+          else if (this->current_temperature < this->target_temperature - this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_COOLING)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+      case climate::CLIMATE_MODE_HEAT:
+        if (this->supports_heat_) {
+          if (this->current_temperature < this->target_temperature - this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_HEATING;
+          else if (this->current_temperature > this->target_temperature + this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_HEATING)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        break;
+      default:
+        break;
     }
   }
+  // do not switch to an action that isn't enabled per the active climate mode
+  if ((this->mode == climate::CLIMATE_MODE_COOL) && (target_action == climate::CLIMATE_ACTION_HEATING))
+    target_action = climate::CLIMATE_ACTION_IDLE;
+  if ((this->mode == climate::CLIMATE_MODE_HEAT) && (target_action == climate::CLIMATE_ACTION_COOLING))
+    target_action = climate::CLIMATE_ACTION_IDLE;
 
-  this->switch_to_action_(target_action);
+  return target_action;
 }
 void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
-  if (action == this->action)
+  // setup_complete_ helps us ensure an action is called immediately after boot
+  if ((action == this->action) && this->setup_complete_)
     // already in target mode
     return;
 
-  if ((action == climate::CLIMATE_ACTION_OFF && this->action == climate::CLIMATE_ACTION_IDLE) ||
-      (action == climate::CLIMATE_ACTION_IDLE && this->action == climate::CLIMATE_ACTION_OFF)) {
+  if (((action == climate::CLIMATE_ACTION_OFF && this->action == climate::CLIMATE_ACTION_IDLE) ||
+       (action == climate::CLIMATE_ACTION_IDLE && this->action == climate::CLIMATE_ACTION_OFF)) &&
+      this->setup_complete_) {
     // switching from OFF to IDLE or vice-versa
     // these only have visual difference. OFF means user manually disabled,
     // IDLE means it's in auto mode but value is in target range.
     this->action = action;
-    this->publish_state();
     return;
   }
 
-  if (this->prev_trigger_ != nullptr) {
-    this->prev_trigger_->stop();
-    this->prev_trigger_ = nullptr;
+  if (this->prev_action_trigger_ != nullptr) {
+    this->prev_action_trigger_->stop();
+    this->prev_action_trigger_ = nullptr;
   }
-  Trigger<> *trig;
+  Trigger<> *trig = this->idle_action_trigger_;
   switch (action) {
     case climate::CLIMATE_ACTION_OFF:
     case climate::CLIMATE_ACTION_IDLE:
-      trig = this->idle_trigger_;
+      // trig = this->idle_action_trigger_;
       break;
     case climate::CLIMATE_ACTION_COOLING:
-      trig = this->cool_trigger_;
+      trig = this->cool_action_trigger_;
       break;
     case climate::CLIMATE_ACTION_HEATING:
-      trig = this->heat_trigger_;
+      trig = this->heat_action_trigger_;
+      break;
+    case climate::CLIMATE_ACTION_FAN:
+      trig = this->fan_only_action_trigger_;
+      break;
+    case climate::CLIMATE_ACTION_DRYING:
+      trig = this->dry_action_trigger_;
       break;
     default:
-      trig = nullptr;
+      // we cannot report an invalid mode back to HA (even if it asked for one)
+      //  and must assume some valid value
+      action = climate::CLIMATE_ACTION_OFF;
+      // trig = this->idle_action_trigger_;
   }
   assert(trig != nullptr);
   trig->trigger();
   this->action = action;
-  this->prev_trigger_ = trig;
-  this->publish_state();
+  this->prev_action_trigger_ = trig;
+}
+void BangBangClimate::switch_to_fan_mode_(climate::ClimateFanMode fan_mode) {
+  // setup_complete_ helps us ensure an action is called immediately after boot
+  if ((fan_mode == this->prev_fan_mode_) && this->setup_complete_)
+    // already in target mode
+    return;
+
+  if (this->prev_fan_mode_trigger_ != nullptr) {
+    this->prev_fan_mode_trigger_->stop();
+    this->prev_fan_mode_trigger_ = nullptr;
+  }
+  Trigger<> *trig = this->fan_mode_auto_trigger_;
+  switch (fan_mode) {
+    case climate::CLIMATE_FAN_ON:
+      trig = this->fan_mode_on_trigger_;
+      break;
+    case climate::CLIMATE_FAN_OFF:
+      trig = this->fan_mode_off_trigger_;
+      break;
+    case climate::CLIMATE_FAN_AUTO:
+      // trig = this->fan_mode_auto_trigger_;
+      break;
+    case climate::CLIMATE_FAN_LOW:
+      trig = this->fan_mode_low_trigger_;
+      break;
+    case climate::CLIMATE_FAN_MEDIUM:
+      trig = this->fan_mode_medium_trigger_;
+      break;
+    case climate::CLIMATE_FAN_HIGH:
+      trig = this->fan_mode_high_trigger_;
+      break;
+    case climate::CLIMATE_FAN_MIDDLE:
+      trig = this->fan_mode_middle_trigger_;
+      break;
+    case climate::CLIMATE_FAN_FOCUS:
+      trig = this->fan_mode_focus_trigger_;
+      break;
+    case climate::CLIMATE_FAN_DIFFUSE:
+      trig = this->fan_mode_diffuse_trigger_;
+      break;
+    default:
+      // we cannot report an invalid mode back to HA (even if it asked for one)
+      //  and must assume some valid value
+      fan_mode = climate::CLIMATE_FAN_AUTO;
+      // trig = this->fan_mode_auto_trigger_;
+  }
+  assert(trig != nullptr);
+  trig->trigger();
+  this->fan_mode = fan_mode;
+  this->prev_fan_mode_ = fan_mode;
+  this->prev_fan_mode_trigger_ = trig;
+}
+void BangBangClimate::switch_to_mode_(climate::ClimateMode mode) {
+  // setup_complete_ helps us ensure an action is called immediately after boot
+  if ((mode == this->prev_mode_) && this->setup_complete_)
+    // already in target mode
+    return;
+
+  if (this->prev_mode_trigger_ != nullptr) {
+    this->prev_mode_trigger_->stop();
+    this->prev_mode_trigger_ = nullptr;
+  }
+  Trigger<> *trig = this->auto_mode_trigger_;
+  switch (mode) {
+    case climate::CLIMATE_MODE_OFF:
+      trig = this->off_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_AUTO:
+      // trig = this->auto_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_COOL:
+      trig = this->cool_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      trig = this->heat_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      trig = this->fan_only_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_DRY:
+      trig = this->dry_mode_trigger_;
+      break;
+    default:
+      // we cannot report an invalid mode back to HA (even if it asked for one)
+      //  and must assume some valid value
+      mode = climate::CLIMATE_MODE_AUTO;
+      // trig = this->auto_mode_trigger_;
+  }
+  assert(trig != nullptr);
+  trig->trigger();
+  this->mode = mode;
+  this->prev_mode_ = mode;
+  this->prev_mode_trigger_ = trig;
+}
+void BangBangClimate::switch_to_swing_mode_(climate::ClimateSwingMode swing_mode) {
+  // setup_complete_ helps us ensure an action is called immediately after boot
+  if ((swing_mode == this->prev_swing_mode_) && this->setup_complete_)
+    // already in target mode
+    return;
+
+  if (this->prev_swing_mode_trigger_ != nullptr) {
+    this->prev_swing_mode_trigger_->stop();
+    this->prev_swing_mode_trigger_ = nullptr;
+  }
+  Trigger<> *trig = this->swing_mode_off_trigger_;
+  switch (swing_mode) {
+    case climate::CLIMATE_SWING_BOTH:
+      trig = this->swing_mode_both_trigger_;
+      break;
+    case climate::CLIMATE_SWING_HORIZONTAL:
+      trig = this->swing_mode_horizontal_trigger_;
+      break;
+    case climate::CLIMATE_SWING_OFF:
+      // trig = this->swing_mode_off_trigger_;
+      break;
+    case climate::CLIMATE_SWING_VERTICAL:
+      trig = this->swing_mode_vertical_trigger_;
+      break;
+    default:
+      // we cannot report an invalid mode back to HA (even if it asked for one)
+      //  and must assume some valid value
+      swing_mode = climate::CLIMATE_SWING_OFF;
+      // trig = this->swing_mode_off_trigger_;
+  }
+  assert(trig != nullptr);
+  trig->trigger();
+  this->swing_mode = swing_mode;
+  this->prev_swing_mode_ = swing_mode;
+  this->prev_swing_mode_trigger_ = trig;
 }
 void BangBangClimate::change_away_(bool away) {
   if (!away) {
-    this->target_temperature_low = this->normal_config_.default_temperature_low;
-    this->target_temperature_high = this->normal_config_.default_temperature_high;
+    if (this->supports_two_points_) {
+      this->target_temperature_low = this->normal_config_.default_temperature_low;
+      this->target_temperature_high = this->normal_config_.default_temperature_high;
+    } else
+      this->target_temperature = this->normal_config_.default_temperature;
   } else {
-    this->target_temperature_low = this->away_config_.default_temperature_low;
-    this->target_temperature_high = this->away_config_.default_temperature_high;
+    if (this->supports_two_points_) {
+      this->target_temperature_low = this->away_config_.default_temperature_low;
+      this->target_temperature_high = this->away_config_.default_temperature_high;
+    } else
+      this->target_temperature = this->away_config_.default_temperature;
   }
   this->away = away;
 }
@@ -150,23 +407,142 @@ void BangBangClimate::set_away_config(const BangBangClimateTargetTempConfig &awa
   this->away_config_ = away_config;
 }
 BangBangClimate::BangBangClimate()
-    : idle_trigger_(new Trigger<>()), cool_trigger_(new Trigger<>()), heat_trigger_(new Trigger<>()) {}
+    : cool_action_trigger_(new Trigger<>()),
+      cool_mode_trigger_(new Trigger<>()),
+      dry_action_trigger_(new Trigger<>()),
+      dry_mode_trigger_(new Trigger<>()),
+      heat_action_trigger_(new Trigger<>()),
+      heat_mode_trigger_(new Trigger<>()),
+      auto_mode_trigger_(new Trigger<>()),
+      idle_action_trigger_(new Trigger<>()),
+      off_mode_trigger_(new Trigger<>()),
+      fan_only_action_trigger_(new Trigger<>()),
+      fan_only_mode_trigger_(new Trigger<>()),
+      fan_mode_on_trigger_(new Trigger<>()),
+      fan_mode_off_trigger_(new Trigger<>()),
+      fan_mode_auto_trigger_(new Trigger<>()),
+      fan_mode_low_trigger_(new Trigger<>()),
+      fan_mode_medium_trigger_(new Trigger<>()),
+      fan_mode_high_trigger_(new Trigger<>()),
+      fan_mode_middle_trigger_(new Trigger<>()),
+      fan_mode_focus_trigger_(new Trigger<>()),
+      fan_mode_diffuse_trigger_(new Trigger<>()),
+      swing_mode_both_trigger_(new Trigger<>()),
+      swing_mode_off_trigger_(new Trigger<>()),
+      swing_mode_horizontal_trigger_(new Trigger<>()),
+      swing_mode_vertical_trigger_(new Trigger<>()) {}
+void BangBangClimate::set_hysteresis(float hysteresis) { this->hysteresis_ = hysteresis; }
 void BangBangClimate::set_sensor(sensor::Sensor *sensor) { this->sensor_ = sensor; }
-Trigger<> *BangBangClimate::get_idle_trigger() const { return this->idle_trigger_; }
-Trigger<> *BangBangClimate::get_cool_trigger() const { return this->cool_trigger_; }
+void BangBangClimate::set_supports_auto(bool supports_auto) { this->supports_auto_ = supports_auto; }
 void BangBangClimate::set_supports_cool(bool supports_cool) { this->supports_cool_ = supports_cool; }
-Trigger<> *BangBangClimate::get_heat_trigger() const { return this->heat_trigger_; }
+void BangBangClimate::set_supports_dry(bool supports_dry) { this->supports_dry_ = supports_dry; }
+void BangBangClimate::set_supports_fan_only(bool supports_fan_only) { this->supports_fan_only_ = supports_fan_only; }
 void BangBangClimate::set_supports_heat(bool supports_heat) { this->supports_heat_ = supports_heat; }
+void BangBangClimate::set_supports_fan_mode_on(bool supports_fan_mode_on) {
+  this->supports_fan_mode_on_ = supports_fan_mode_on;
+}
+void BangBangClimate::set_supports_fan_mode_off(bool supports_fan_mode_off) {
+  this->supports_fan_mode_off_ = supports_fan_mode_off;
+}
+void BangBangClimate::set_supports_fan_mode_auto(bool supports_fan_mode_auto) {
+  this->supports_fan_mode_auto_ = supports_fan_mode_auto;
+}
+void BangBangClimate::set_supports_fan_mode_low(bool supports_fan_mode_low) {
+  this->supports_fan_mode_low_ = supports_fan_mode_low;
+}
+void BangBangClimate::set_supports_fan_mode_medium(bool supports_fan_mode_medium) {
+  this->supports_fan_mode_medium_ = supports_fan_mode_medium;
+}
+void BangBangClimate::set_supports_fan_mode_high(bool supports_fan_mode_high) {
+  this->supports_fan_mode_high_ = supports_fan_mode_high;
+}
+void BangBangClimate::set_supports_fan_mode_middle(bool supports_fan_mode_middle) {
+  this->supports_fan_mode_middle_ = supports_fan_mode_middle;
+}
+void BangBangClimate::set_supports_fan_mode_focus(bool supports_fan_mode_focus) {
+  this->supports_fan_mode_focus_ = supports_fan_mode_focus;
+}
+void BangBangClimate::set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse) {
+  this->supports_fan_mode_diffuse_ = supports_fan_mode_diffuse;
+}
+void BangBangClimate::set_supports_swing_mode_both(bool supports_swing_mode_both) {
+  this->supports_swing_mode_both_ = supports_swing_mode_both;
+}
+void BangBangClimate::set_supports_swing_mode_off(bool supports_swing_mode_off) {
+  this->supports_swing_mode_off_ = supports_swing_mode_off;
+}
+void BangBangClimate::set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal) {
+  this->supports_swing_mode_horizontal_ = supports_swing_mode_horizontal;
+}
+void BangBangClimate::set_supports_swing_mode_vertical(bool supports_swing_mode_vertical) {
+  this->supports_swing_mode_vertical_ = supports_swing_mode_vertical;
+}
+void BangBangClimate::set_supports_two_points(bool supports_two_points) {
+  this->supports_two_points_ = supports_two_points;
+}
+Trigger<> *BangBangClimate::get_cool_action_trigger() const { return this->cool_action_trigger_; }
+Trigger<> *BangBangClimate::get_dry_action_trigger() const { return this->dry_action_trigger_; }
+Trigger<> *BangBangClimate::get_fan_only_action_trigger() const { return this->fan_only_action_trigger_; }
+Trigger<> *BangBangClimate::get_heat_action_trigger() const { return this->heat_action_trigger_; }
+Trigger<> *BangBangClimate::get_idle_action_trigger() const { return this->idle_action_trigger_; }
+Trigger<> *BangBangClimate::get_auto_mode_trigger() const { return this->auto_mode_trigger_; }
+Trigger<> *BangBangClimate::get_cool_mode_trigger() const { return this->cool_mode_trigger_; }
+Trigger<> *BangBangClimate::get_dry_mode_trigger() const { return this->dry_mode_trigger_; }
+Trigger<> *BangBangClimate::get_fan_only_mode_trigger() const { return this->fan_only_mode_trigger_; }
+Trigger<> *BangBangClimate::get_heat_mode_trigger() const { return this->heat_mode_trigger_; }
+Trigger<> *BangBangClimate::get_off_mode_trigger() const { return this->off_mode_trigger_; }
+Trigger<> *BangBangClimate::get_fan_mode_on_trigger() const { return this->fan_mode_on_trigger_; }
+Trigger<> *BangBangClimate::get_fan_mode_off_trigger() const { return this->fan_mode_off_trigger_; }
+Trigger<> *BangBangClimate::get_fan_mode_auto_trigger() const { return this->fan_mode_auto_trigger_; }
+Trigger<> *BangBangClimate::get_fan_mode_low_trigger() const { return this->fan_mode_low_trigger_; }
+Trigger<> *BangBangClimate::get_fan_mode_medium_trigger() const { return this->fan_mode_medium_trigger_; }
+Trigger<> *BangBangClimate::get_fan_mode_high_trigger() const { return this->fan_mode_high_trigger_; }
+Trigger<> *BangBangClimate::get_fan_mode_middle_trigger() const { return this->fan_mode_middle_trigger_; }
+Trigger<> *BangBangClimate::get_fan_mode_focus_trigger() const { return this->fan_mode_focus_trigger_; }
+Trigger<> *BangBangClimate::get_fan_mode_diffuse_trigger() const { return this->fan_mode_diffuse_trigger_; }
+Trigger<> *BangBangClimate::get_swing_mode_both_trigger() const { return this->swing_mode_both_trigger_; }
+Trigger<> *BangBangClimate::get_swing_mode_off_trigger() const { return this->swing_mode_off_trigger_; }
+Trigger<> *BangBangClimate::get_swing_mode_horizontal_trigger() const { return this->swing_mode_horizontal_trigger_; }
+Trigger<> *BangBangClimate::get_swing_mode_vertical_trigger() const { return this->swing_mode_vertical_trigger_; }
 void BangBangClimate::dump_config() {
   LOG_CLIMATE("", "Bang Bang Climate", this);
-  ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
+  if (this->supports_heat_)
+    ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature_low);
+  if ((this->supports_cool_) || (this->supports_fan_only_))
+    ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature_high);
+  ESP_LOGCONFIG(TAG, "  Hysteresis: %.1f°C", this->hysteresis_);
+  ESP_LOGCONFIG(TAG, "  Supports AUTO: %s", YESNO(this->supports_auto_));
   ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
+  ESP_LOGCONFIG(TAG, "  Supports DRY: %s", YESNO(this->supports_dry_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN_ONLY: %s", YESNO(this->supports_fan_only_));
+  ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE ON: %s", YESNO(this->supports_fan_mode_on_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE OFF: %s", YESNO(this->supports_fan_mode_off_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE AUTO: %s", YESNO(this->supports_fan_mode_auto_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE LOW: %s", YESNO(this->supports_fan_mode_low_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE MEDIUM: %s", YESNO(this->supports_fan_mode_medium_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE HIGH: %s", YESNO(this->supports_fan_mode_high_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE MIDDLE: %s", YESNO(this->supports_fan_mode_middle_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE FOCUS: %s", YESNO(this->supports_fan_mode_focus_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE DIFFUSE: %s", YESNO(this->supports_fan_mode_diffuse_));
+  ESP_LOGCONFIG(TAG, "  Supports SWING MODE BOTH: %s", YESNO(this->supports_swing_mode_both_));
+  ESP_LOGCONFIG(TAG, "  Supports SWING MODE OFF: %s", YESNO(this->supports_swing_mode_off_));
+  ESP_LOGCONFIG(TAG, "  Supports SWING MODE HORIZONTAL: %s", YESNO(this->supports_swing_mode_horizontal_));
+  ESP_LOGCONFIG(TAG, "  Supports SWING MODE VERTICAL: %s", YESNO(this->supports_swing_mode_vertical_));
+  ESP_LOGCONFIG(TAG, "  Supports TWO SET POINTS: %s", YESNO(this->supports_two_points_));
   ESP_LOGCONFIG(TAG, "  Supports AWAY mode: %s", YESNO(this->supports_away_));
-  ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature_low);
-  ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature_high);
+  if (this->supports_away_) {
+    if (this->supports_heat_)
+      ESP_LOGCONFIG(TAG, "    Away Default Target Temperature Low: %.1f°C", this->away_config_.default_temperature_low);
+    if ((this->supports_cool_) || (this->supports_fan_only_))
+      ESP_LOGCONFIG(TAG, "    Away Default Target Temperature High: %.1f°C",
+                    this->away_config_.default_temperature_high);
+  }
 }
 
 BangBangClimateTargetTempConfig::BangBangClimateTargetTempConfig() = default;
+BangBangClimateTargetTempConfig::BangBangClimateTargetTempConfig(float default_temperature)
+    : default_temperature(default_temperature) {}
 BangBangClimateTargetTempConfig::BangBangClimateTargetTempConfig(float default_temperature_low,
                                                                  float default_temperature_high)
     : default_temperature_low(default_temperature_low), default_temperature_high(default_temperature_high) {}
diff --git a/esphome/components/bang_bang/bang_bang_climate.h b/esphome/components/bang_bang/bang_bang_climate.h
index 84bcd51f34..fd2b0ce43a 100644
--- a/esphome/components/bang_bang/bang_bang_climate.h
+++ b/esphome/components/bang_bang/bang_bang_climate.h
@@ -11,10 +11,13 @@ namespace bang_bang {
 struct BangBangClimateTargetTempConfig {
  public:
   BangBangClimateTargetTempConfig();
+  BangBangClimateTargetTempConfig(float default_temperature);
   BangBangClimateTargetTempConfig(float default_temperature_low, float default_temperature_high);
 
+  float default_temperature{NAN};
   float default_temperature_low{NAN};
   float default_temperature_high{NAN};
+  float hysteresis{NAN};
 };
 
 class BangBangClimate : public climate::Climate, public Component {
@@ -23,62 +26,243 @@ class BangBangClimate : public climate::Climate, public Component {
   void setup() override;
   void dump_config() override;
 
+  void set_hysteresis(float hysteresis);
   void set_sensor(sensor::Sensor *sensor);
-  Trigger<> *get_idle_trigger() const;
-  Trigger<> *get_cool_trigger() const;
+  void set_supports_auto(bool supports_auto);
   void set_supports_cool(bool supports_cool);
-  Trigger<> *get_heat_trigger() const;
+  void set_supports_dry(bool supports_dry);
+  void set_supports_fan_only(bool supports_fan_only);
   void set_supports_heat(bool supports_heat);
+  void set_supports_fan_mode_on(bool supports_fan_mode_on);
+  void set_supports_fan_mode_off(bool supports_fan_mode_off);
+  void set_supports_fan_mode_auto(bool supports_fan_mode_auto);
+  void set_supports_fan_mode_low(bool supports_fan_mode_low);
+  void set_supports_fan_mode_medium(bool supports_fan_mode_medium);
+  void set_supports_fan_mode_high(bool supports_fan_mode_high);
+  void set_supports_fan_mode_middle(bool supports_fan_mode_middle);
+  void set_supports_fan_mode_focus(bool supports_fan_mode_focus);
+  void set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse);
+  void set_supports_swing_mode_both(bool supports_swing_mode_both);
+  void set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal);
+  void set_supports_swing_mode_off(bool supports_swing_mode_off);
+  void set_supports_swing_mode_vertical(bool supports_swing_mode_vertical);
+  void set_supports_two_points(bool supports_two_points);
+
   void set_normal_config(const BangBangClimateTargetTempConfig &normal_config);
   void set_away_config(const BangBangClimateTargetTempConfig &away_config);
 
+  Trigger<> *get_cool_action_trigger() const;
+  Trigger<> *get_dry_action_trigger() const;
+  Trigger<> *get_fan_only_action_trigger() const;
+  Trigger<> *get_heat_action_trigger() const;
+  Trigger<> *get_idle_action_trigger() const;
+  Trigger<> *get_auto_mode_trigger() const;
+  Trigger<> *get_cool_mode_trigger() const;
+  Trigger<> *get_dry_mode_trigger() const;
+  Trigger<> *get_fan_only_mode_trigger() const;
+  Trigger<> *get_heat_mode_trigger() const;
+  Trigger<> *get_off_mode_trigger() const;
+  Trigger<> *get_fan_mode_on_trigger() const;
+  Trigger<> *get_fan_mode_off_trigger() const;
+  Trigger<> *get_fan_mode_auto_trigger() const;
+  Trigger<> *get_fan_mode_low_trigger() const;
+  Trigger<> *get_fan_mode_medium_trigger() const;
+  Trigger<> *get_fan_mode_high_trigger() const;
+  Trigger<> *get_fan_mode_middle_trigger() const;
+  Trigger<> *get_fan_mode_focus_trigger() const;
+  Trigger<> *get_fan_mode_diffuse_trigger() const;
+  Trigger<> *get_swing_mode_both_trigger() const;
+  Trigger<> *get_swing_mode_horizontal_trigger() const;
+  Trigger<> *get_swing_mode_off_trigger() const;
+  Trigger<> *get_swing_mode_vertical_trigger() const;
+  /// Call triggers based on updated climate states (modes/actions)
+  void refresh();
+
  protected:
   /// Override control to change settings of the climate device.
   void control(const climate::ClimateCall &call) override;
+
   /// Change the away setting, will reset target temperatures to defaults.
   void change_away_(bool away);
+
   /// Return the traits of this controller.
   climate::ClimateTraits traits() override;
 
-  /// Re-compute the state of this climate controller.
-  void compute_state_();
+  /// Re-compute the required action of this climate controller.
+  climate::ClimateAction compute_action_();
+
+  /// Switch the climate device to the given climate action.
+  void switch_to_action_(climate::ClimateAction action);
+
+  /// Switch the climate device to the given climate fan mode.
+  void switch_to_fan_mode_(climate::ClimateFanMode fan_mode);
 
   /// Switch the climate device to the given climate mode.
-  void switch_to_action_(climate::ClimateAction action);
+  void switch_to_mode_(climate::ClimateMode mode);
+
+  /// Switch the climate device to the given climate swing mode.
+  void switch_to_swing_mode_(climate::ClimateSwingMode swing_mode);
 
   /// The sensor used for getting the current temperature
   sensor::Sensor *sensor_{nullptr};
-  /** The trigger to call when the controller should switch to idle mode.
-   *
-   * In idle mode, the controller is assumed to have both heating and cooling disabled.
-   */
-  Trigger<> *idle_trigger_;
-  /** The trigger to call when the controller should switch to cooling mode.
-   */
-  Trigger<> *cool_trigger_;
-  /** Whether the controller supports cooling.
-   *
-   * A false value for this attribute means that the controller has no cooling action
-   * (for example a thermostat, where only heating and not-heating is possible).
-   */
-  bool supports_cool_{false};
-  /** The trigger to call when the controller should switch to heating mode.
-   *
-   * A null value for this attribute means that the controller has no heating action
-   * For example window blinds, where only cooling (blinds closed) and not-cooling
-   * (blinds open) is possible.
-   */
-  Trigger<> *heat_trigger_{nullptr};
-  bool supports_heat_{false};
-  /** A reference to the trigger that was previously active.
-   *
-   * This is so that the previous trigger can be stopped before enabling a new one.
-   */
-  Trigger<> *prev_trigger_{nullptr};
 
-  BangBangClimateTargetTempConfig normal_config_{};
+  /// Whether the controller supports auto/cooling/drying/fanning/heating.
+  ///
+  /// A false value for any given attribute means that the controller has no such action
+  /// (for example a thermostat, where only heating and not-heating is possible).
+  bool supports_auto_{false};
+  bool supports_cool_{false};
+  bool supports_dry_{false};
+  bool supports_fan_only_{false};
+  bool supports_heat_{false};
+
+  /// Whether the controller supports turning on or off just the fan.
+  ///
+  /// A false value for either attribute means that the controller has no fan on/off action
+  /// (for example a thermostat, where independent control of the fan is not possible).
+  bool supports_fan_mode_on_{false};
+  bool supports_fan_mode_off_{false};
+
+  /// Whether the controller supports fan auto mode.
+  ///
+  /// A false value for this attribute means that the controller has no fan-auto action
+  /// (for example a thermostat, where independent control of the fan is not possible).
+  bool supports_fan_mode_auto_{false};
+
+  /// Whether the controller supports various fan speeds and/or positions.
+  ///
+  /// A false value for any given attribute means that the controller has no such fan action.
+  bool supports_fan_mode_low_{false};
+  bool supports_fan_mode_medium_{false};
+  bool supports_fan_mode_high_{false};
+  bool supports_fan_mode_middle_{false};
+  bool supports_fan_mode_focus_{false};
+  bool supports_fan_mode_diffuse_{false};
+
+  /// Whether the controller supports various swing modes.
+  ///
+  /// A false value for any given attribute means that the controller has no such swing mode.
+  bool supports_swing_mode_both_{false};
+  bool supports_swing_mode_off_{false};
+  bool supports_swing_mode_horizontal_{false};
+  bool supports_swing_mode_vertical_{false};
+
+  /// Whether the controller supports two set points
+  ///
+  /// A false value means that the controller has no such support.
+  bool supports_two_points_{false};
+
+  /// Whether the controller supports an "away" mode
+  ///
+  /// A false value means that the controller has no such mode.
   bool supports_away_{false};
+
+  /// The trigger to call when the controller should switch to cooling action/mode.
+  ///
+  /// A null value for this attribute means that the controller has no cooling action
+  /// For example electric heat, where only heating (power on) and not-heating
+  /// (power off) is possible.
+  Trigger<> *cool_action_trigger_{nullptr};
+  Trigger<> *cool_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to dry (dehumidification) mode.
+  ///
+  /// In dry mode, the controller is assumed to have both heating and cooling disabled,
+  /// although the system may use its cooling mechanism to achieve drying.
+  Trigger<> *dry_action_trigger_{nullptr};
+  Trigger<> *dry_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to heating action/mode.
+  ///
+  /// A null value for this attribute means that the controller has no heating action
+  /// For example window blinds, where only cooling (blinds closed) and not-cooling
+  /// (blinds open) is possible.
+  Trigger<> *heat_action_trigger_{nullptr};
+  Trigger<> *heat_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to auto mode.
+  ///
+  /// In auto mode, the controller will enable heating/cooling as necessary and switch
+  /// to idle when the temperature is within the thresholds/set points.
+  Trigger<> *auto_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to idle action/off mode.
+  ///
+  /// In these actions/modes, the controller is assumed to have both heating and cooling disabled.
+  Trigger<> *idle_action_trigger_{nullptr};
+  Trigger<> *off_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to fan-only action/mode.
+  ///
+  /// In fan-only mode, the controller is assumed to have both heating and cooling disabled.
+  /// The system should activate the fan only.
+  Trigger<> *fan_only_action_trigger_{nullptr};
+  Trigger<> *fan_only_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch on the fan.
+  Trigger<> *fan_mode_on_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch off the fan.
+  Trigger<> *fan_mode_off_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "auto" mode.
+  Trigger<> *fan_mode_auto_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "low" speed.
+  Trigger<> *fan_mode_low_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "medium" speed.
+  Trigger<> *fan_mode_medium_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "high" speed.
+  Trigger<> *fan_mode_high_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "middle" position.
+  Trigger<> *fan_mode_middle_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "focus" position.
+  Trigger<> *fan_mode_focus_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "diffuse" position.
+  Trigger<> *fan_mode_diffuse_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the swing mode to "both".
+  Trigger<> *swing_mode_both_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the swing mode to "off".
+  Trigger<> *swing_mode_off_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the swing mode to "horizontal".
+  Trigger<> *swing_mode_horizontal_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the swing mode to "vertical".
+  Trigger<> *swing_mode_vertical_trigger_{nullptr};
+
+  /// A reference to the trigger that was previously active.
+  ///
+  /// This is so that the previous trigger can be stopped before enabling a new one
+  /// for each climate category (mode, action, fan_mode, swing_mode).
+  Trigger<> *prev_action_trigger_{nullptr};
+  Trigger<> *prev_fan_mode_trigger_{nullptr};
+  Trigger<> *prev_mode_trigger_{nullptr};
+  Trigger<> *prev_swing_mode_trigger_{nullptr};
+
+  /// Store previously-known states
+  ///
+  /// These are used to determine when a trigger/action needs to be called
+  climate::ClimateFanMode prev_fan_mode_{climate::CLIMATE_FAN_ON};
+  climate::ClimateMode prev_mode_{climate::CLIMATE_MODE_OFF};
+  climate::ClimateSwingMode prev_swing_mode_{climate::CLIMATE_SWING_OFF};
+
+  /// Temperature data for normal/home and away modes
+  BangBangClimateTargetTempConfig normal_config_{};
   BangBangClimateTargetTempConfig away_config_{};
+
+  /// Hysteresis value used for computing climate actions
+  float hysteresis_{0};
+
+  /// setup_complete_ blocks modifying/resetting the temps immediately after boot
+  bool setup_complete_{false};
 };
 
 }  // namespace bang_bang
diff --git a/esphome/components/bang_bang/climate.py b/esphome/components/bang_bang/climate.py
index 4ef811c55d..75ec58404b 100644
--- a/esphome/components/bang_bang/climate.py
+++ b/esphome/components/bang_bang/climate.py
@@ -2,27 +2,107 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.components import climate, sensor
-from esphome.const import CONF_AWAY_CONFIG, CONF_COOL_ACTION, \
-    CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION, \
-    CONF_ID, CONF_IDLE_ACTION, CONF_SENSOR
+from esphome.const import CONF_AUTO_MODE, CONF_AWAY_CONFIG, CONF_COOL_ACTION, CONF_COOL_MODE, \
+    CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_DRY_ACTION, \
+    CONF_DRY_MODE, CONF_FAN_MODE_ON_ACTION, CONF_FAN_MODE_OFF_ACTION, CONF_FAN_MODE_AUTO_ACTION, \
+    CONF_FAN_MODE_LOW_ACTION, CONF_FAN_MODE_MEDIUM_ACTION, CONF_FAN_MODE_HIGH_ACTION, \
+    CONF_FAN_MODE_MIDDLE_ACTION, CONF_FAN_MODE_FOCUS_ACTION, CONF_FAN_MODE_DIFFUSE_ACTION, \
+    CONF_FAN_ONLY_ACTION, CONF_FAN_ONLY_MODE, CONF_HEAT_ACTION, CONF_HEAT_MODE, CONF_HYSTERESIS, \
+    CONF_ID, CONF_IDLE_ACTION, CONF_OFF_MODE, CONF_SENSOR, CONF_SWING_BOTH_ACTION, \
+    CONF_SWING_HORIZONTAL_ACTION, CONF_SWING_OFF_ACTION, CONF_SWING_VERTICAL_ACTION
 
 bang_bang_ns = cg.esphome_ns.namespace('bang_bang')
 BangBangClimate = bang_bang_ns.class_('BangBangClimate', climate.Climate, cg.Component)
 BangBangClimateTargetTempConfig = bang_bang_ns.struct('BangBangClimateTargetTempConfig')
 
+
+def validate_bangbang(config):
+    # verify corresponding climate action action exists for any defined climate mode action
+    if CONF_COOL_MODE in config and CONF_COOL_ACTION not in config:
+        raise cv.Invalid("{} must be defined to use {}".format(CONF_COOL_ACTION, CONF_COOL_MODE))
+    if CONF_DRY_MODE in config and CONF_DRY_ACTION not in config:
+        raise cv.Invalid("{} must be defined to use {}".format(CONF_DRY_ACTION, CONF_DRY_MODE))
+    if CONF_FAN_ONLY_MODE in config and CONF_FAN_ONLY_ACTION not in config:
+        raise cv.Invalid("{} must be defined to use {}".format(CONF_FAN_ONLY_ACTION,
+                                                               CONF_FAN_ONLY_MODE))
+    if CONF_HEAT_MODE in config and CONF_HEAT_ACTION not in config:
+        raise cv.Invalid("{} must be defined to use {}".format(CONF_HEAT_ACTION, CONF_HEAT_MODE))
+    # verify corresponding default target temperature exists when a given climate action exists
+    if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH not in config and (CONF_COOL_ACTION in config
+                                                               or CONF_FAN_ONLY_ACTION in config):
+        raise cv.Invalid("{} must be defined when using {} or {}".format(
+            CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION, CONF_FAN_ONLY_ACTION))
+    if CONF_DEFAULT_TARGET_TEMPERATURE_LOW not in config and CONF_HEAT_ACTION in config:
+        raise cv.Invalid("{} must be defined when using {}".format(
+            CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
+    # if a given climate action is NOT defined, it should not have a default target temperature
+    if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in config and (CONF_COOL_ACTION not in config
+                                                           and CONF_FAN_ONLY_ACTION not in config):
+        raise cv.Invalid("{} is defined with no {}".format(
+            CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION))
+    if CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config and CONF_HEAT_ACTION not in config:
+        raise cv.Invalid("{} is defined with no {}".format(
+            CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
+
+    if CONF_AWAY_CONFIG in config:
+        away = config[CONF_AWAY_CONFIG]
+        # verify corresponding default target temperature exists when a given climate action exists
+        if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH not in away and (CONF_COOL_ACTION in config or
+                                                                 CONF_FAN_ONLY_ACTION in config):
+            raise cv.Invalid("{} must be defined in away configuration when using {} or {}".format(
+                CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION, CONF_FAN_ONLY_ACTION))
+        if CONF_DEFAULT_TARGET_TEMPERATURE_LOW not in away and CONF_HEAT_ACTION in config:
+            raise cv.Invalid("{} must be defined in away configuration when using {}".format(
+                CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
+        # if a given climate action is NOT defined, it should not have a default target temperature
+        if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in away and (CONF_COOL_ACTION not in config and
+                                                             CONF_FAN_ONLY_ACTION not in config):
+            raise cv.Invalid("{} is defined in away configuration with no {} or {}".format(
+                CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION, CONF_FAN_ONLY_ACTION))
+        if CONF_DEFAULT_TARGET_TEMPERATURE_LOW in away and CONF_HEAT_ACTION not in config:
+            raise cv.Invalid("{} is defined in away configuration with no {}".format(
+                CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
+
+    return config
+
+
 CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(BangBangClimate),
     cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
-    cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
-    cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
     cv.Required(CONF_IDLE_ACTION): automation.validate_automation(single=True),
     cv.Optional(CONF_COOL_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_DRY_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_ONLY_ACTION): automation.validate_automation(single=True),
     cv.Optional(CONF_HEAT_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_AUTO_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_COOL_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_DRY_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_ONLY_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_HEAT_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_OFF_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_ON_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_OFF_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_AUTO_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_LOW_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_MEDIUM_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_HIGH_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_MIDDLE_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_FOCUS_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_DIFFUSE_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_SWING_BOTH_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_SWING_HORIZONTAL_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_SWING_OFF_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_SWING_VERTICAL_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
+    cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
+    cv.Optional(CONF_HYSTERESIS, default=0.5): cv.temperature,
     cv.Optional(CONF_AWAY_CONFIG): cv.Schema({
-        cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
-        cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
+        cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
+        cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
     }),
-}).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(CONF_COOL_ACTION, CONF_HEAT_ACTION))
+}).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(CONF_COOL_ACTION, CONF_DRY_ACTION,
+                                                        CONF_FAN_ONLY_ACTION, CONF_HEAT_ACTION),
+                       validate_bangbang)
 
 
 def to_code(config):
@@ -30,28 +110,145 @@ def to_code(config):
     yield cg.register_component(var, config)
     yield climate.register_climate(var, config)
 
+    auto_mode_available = CONF_HEAT_ACTION in config and CONF_COOL_ACTION in config
+    two_points_available = CONF_HEAT_ACTION in config and (CONF_COOL_ACTION in config or
+                                                           CONF_FAN_ONLY_ACTION in config)
+
     sens = yield cg.get_variable(config[CONF_SENSOR])
     cg.add(var.set_sensor(sens))
+    cg.add(var.set_hysteresis(config[CONF_HYSTERESIS]))
 
-    normal_config = BangBangClimateTargetTempConfig(
-        config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
-        config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
-    )
+    if two_points_available is True:
+        cg.add(var.set_supports_two_points(True))
+        normal_config = BangBangClimateTargetTempConfig(
+            config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
+            config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+        )
+    elif CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in config:
+        cg.add(var.set_supports_two_points(False))
+        normal_config = BangBangClimateTargetTempConfig(
+            config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+        )
+    elif CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config:
+        cg.add(var.set_supports_two_points(False))
+        normal_config = BangBangClimateTargetTempConfig(
+            config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW]
+        )
     cg.add(var.set_normal_config(normal_config))
 
-    yield automation.build_automation(var.get_idle_trigger(), [], config[CONF_IDLE_ACTION])
+    yield automation.build_automation(var.get_idle_action_trigger(), [],
+                                      config[CONF_IDLE_ACTION])
+
+    if auto_mode_available is True:
+        cg.add(var.set_supports_auto(True))
+    else:
+        cg.add(var.set_supports_auto(False))
 
     if CONF_COOL_ACTION in config:
-        yield automation.build_automation(var.get_cool_trigger(), [], config[CONF_COOL_ACTION])
+        yield automation.build_automation(var.get_cool_action_trigger(), [],
+                                          config[CONF_COOL_ACTION])
         cg.add(var.set_supports_cool(True))
+    if CONF_DRY_ACTION in config:
+        yield automation.build_automation(var.get_dry_action_trigger(), [],
+                                          config[CONF_DRY_ACTION])
+        cg.add(var.set_supports_dry(True))
+    if CONF_FAN_ONLY_ACTION in config:
+        yield automation.build_automation(var.get_fan_only_action_trigger(), [],
+                                          config[CONF_FAN_ONLY_ACTION])
+        cg.add(var.set_supports_fan_only(True))
     if CONF_HEAT_ACTION in config:
-        yield automation.build_automation(var.get_heat_trigger(), [], config[CONF_HEAT_ACTION])
+        yield automation.build_automation(var.get_heat_action_trigger(), [],
+                                          config[CONF_HEAT_ACTION])
         cg.add(var.set_supports_heat(True))
+    if CONF_AUTO_MODE in config:
+        yield automation.build_automation(var.get_auto_mode_trigger(), [],
+                                          config[CONF_AUTO_MODE])
+    if CONF_COOL_MODE in config:
+        yield automation.build_automation(var.get_cool_mode_trigger(), [],
+                                          config[CONF_COOL_MODE])
+        cg.add(var.set_supports_cool(True))
+    if CONF_DRY_MODE in config:
+        yield automation.build_automation(var.get_dry_mode_trigger(), [],
+                                          config[CONF_DRY_MODE])
+        cg.add(var.set_supports_dry(True))
+    if CONF_FAN_ONLY_MODE in config:
+        yield automation.build_automation(var.get_fan_only_mode_trigger(), [],
+                                          config[CONF_FAN_ONLY_MODE])
+        cg.add(var.set_supports_fan_only(True))
+    if CONF_HEAT_MODE in config:
+        yield automation.build_automation(var.get_heat_mode_trigger(), [],
+                                          config[CONF_HEAT_MODE])
+        cg.add(var.set_supports_heat(True))
+    if CONF_OFF_MODE in config:
+        yield automation.build_automation(var.get_off_mode_trigger(), [],
+                                          config[CONF_OFF_MODE])
+    if CONF_FAN_MODE_ON_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_on_trigger(), [],
+                                          config[CONF_FAN_MODE_ON_ACTION])
+        cg.add(var.set_supports_fan_mode_on(True))
+    if CONF_FAN_MODE_OFF_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_off_trigger(), [],
+                                          config[CONF_FAN_MODE_OFF_ACTION])
+        cg.add(var.set_supports_fan_mode_off(True))
+    if CONF_FAN_MODE_AUTO_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_auto_trigger(), [],
+                                          config[CONF_FAN_MODE_AUTO_ACTION])
+        cg.add(var.set_supports_fan_mode_auto(True))
+    if CONF_FAN_MODE_LOW_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_low_trigger(), [],
+                                          config[CONF_FAN_MODE_LOW_ACTION])
+        cg.add(var.set_supports_fan_mode_low(True))
+    if CONF_FAN_MODE_MEDIUM_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_medium_trigger(), [],
+                                          config[CONF_FAN_MODE_MEDIUM_ACTION])
+        cg.add(var.set_supports_fan_mode_medium(True))
+    if CONF_FAN_MODE_HIGH_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_high_trigger(), [],
+                                          config[CONF_FAN_MODE_HIGH_ACTION])
+        cg.add(var.set_supports_fan_mode_high(True))
+    if CONF_FAN_MODE_MIDDLE_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_middle_trigger(), [],
+                                          config[CONF_FAN_MODE_MIDDLE_ACTION])
+        cg.add(var.set_supports_fan_mode_middle(True))
+    if CONF_FAN_MODE_FOCUS_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_focus_trigger(), [],
+                                          config[CONF_FAN_MODE_FOCUS_ACTION])
+        cg.add(var.set_supports_fan_mode_focus(True))
+    if CONF_FAN_MODE_DIFFUSE_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_diffuse_trigger(), [],
+                                          config[CONF_FAN_MODE_DIFFUSE_ACTION])
+        cg.add(var.set_supports_fan_mode_diffuse(True))
+    if CONF_SWING_BOTH_ACTION in config:
+        yield automation.build_automation(var.get_swing_mode_both_trigger(), [],
+                                          config[CONF_SWING_BOTH_ACTION])
+        cg.add(var.set_supports_swing_mode_both(True))
+    if CONF_SWING_HORIZONTAL_ACTION in config:
+        yield automation.build_automation(var.get_swing_mode_horizontal_trigger(), [],
+                                          config[CONF_SWING_HORIZONTAL_ACTION])
+        cg.add(var.set_supports_swing_mode_horizontal(True))
+    if CONF_SWING_OFF_ACTION in config:
+        yield automation.build_automation(var.get_swing_mode_off_trigger(), [],
+                                          config[CONF_SWING_OFF_ACTION])
+        cg.add(var.set_supports_swing_mode_off(True))
+    if CONF_SWING_VERTICAL_ACTION in config:
+        yield automation.build_automation(var.get_swing_mode_vertical_trigger(), [],
+                                          config[CONF_SWING_VERTICAL_ACTION])
+        cg.add(var.set_supports_swing_mode_vertical(True))
 
     if CONF_AWAY_CONFIG in config:
         away = config[CONF_AWAY_CONFIG]
-        away_config = BangBangClimateTargetTempConfig(
-            away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
-            away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
-        )
+
+        if two_points_available is True:
+            away_config = BangBangClimateTargetTempConfig(
+                away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
+                away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+            )
+        elif CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in away:
+            away_config = BangBangClimateTargetTempConfig(
+                away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+            )
+        elif CONF_DEFAULT_TARGET_TEMPERATURE_LOW in away:
+            away_config = BangBangClimateTargetTempConfig(
+                away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW]
+            )
         cg.add(var.set_away_config(away_config))
diff --git a/esphome/const.py b/esphome/const.py
index 4226e25afa..9626a2e00a 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -44,6 +44,7 @@ CONF_ASSUMED_STATE = 'assumed_state'
 CONF_AT = 'at'
 CONF_ATTENUATION = 'attenuation'
 CONF_AUTH = 'auth'
+CONF_AUTO_MODE = 'auto_mode'
 CONF_AUTOMATION_ID = 'automation_id'
 CONF_AVAILABILITY = 'availability'
 CONF_AWAY = 'away'
@@ -101,6 +102,7 @@ CONF_CONDITION = 'condition'
 CONF_CONDITION_ID = 'condition_id'
 CONF_CONDUCTIVITY = 'conductivity'
 CONF_COOL_ACTION = 'cool_action'
+CONF_COOL_MODE = 'cool_mode'
 CONF_COUNT_MODE = 'count_mode'
 CONF_CRON = 'cron'
 CONF_CS_PIN = 'cs_pin'
@@ -139,6 +141,8 @@ CONF_DIV_RATIO = 'div_ratio'
 CONF_DNS1 = 'dns1'
 CONF_DNS2 = 'dns2'
 CONF_DOMAIN = 'domain'
+CONF_DRY_ACTION = 'dry_action'
+CONF_DRY_MODE = 'dry_mode'
 CONF_DUMP = 'dump'
 CONF_DURATION = 'duration'
 CONF_ECHO_PIN = 'echo_pin'
@@ -158,6 +162,17 @@ CONF_EXTERNAL_VCC = 'external_vcc'
 CONF_FALLING_EDGE = 'falling_edge'
 CONF_FAMILY = 'family'
 CONF_FAN_MODE = 'fan_mode'
+CONF_FAN_MODE_AUTO_ACTION = 'fan_mode_auto_action'
+CONF_FAN_MODE_DIFFUSE_ACTION = 'fan_mode_diffuse_action'
+CONF_FAN_MODE_FOCUS_ACTION = 'fan_mode_focus_action'
+CONF_FAN_MODE_HIGH_ACTION = 'fan_mode_high_action'
+CONF_FAN_MODE_LOW_ACTION = 'fan_mode_low_action'
+CONF_FAN_MODE_MEDIUM_ACTION = 'fan_mode_medium_action'
+CONF_FAN_MODE_MIDDLE_ACTION = 'fan_mode_middle_action'
+CONF_FAN_MODE_OFF_ACTION = 'fan_mode_off_action'
+CONF_FAN_MODE_ON_ACTION = 'fan_mode_on_action'
+CONF_FAN_ONLY_ACTION = 'fan_only_action'
+CONF_FAN_ONLY_MODE = 'fan_only_mode'
 CONF_FAST_CONNECT = 'fast_connect'
 CONF_FILE = 'file'
 CONF_FILTER = 'filter'
@@ -182,6 +197,7 @@ CONF_GROUP = 'group'
 CONF_HARDWARE_UART = 'hardware_uart'
 CONF_HEARTBEAT = 'heartbeat'
 CONF_HEAT_ACTION = 'heat_action'
+CONF_HEAT_MODE = 'heat_mode'
 CONF_HEATER = 'heater'
 CONF_HIDDEN = 'hidden'
 CONF_HIGH = 'high'
@@ -189,6 +205,7 @@ CONF_HIGH_VOLTAGE_REFERENCE = 'high_voltage_reference'
 CONF_HOUR = 'hour'
 CONF_HOURS = 'hours'
 CONF_HUMIDITY = 'humidity'
+CONF_HYSTERESIS = "hysteresis"
 CONF_I2C = 'i2c'
 CONF_I2C_ID = 'i2c_id'
 CONF_ICON = 'icon'
@@ -284,6 +301,7 @@ CONF_NUM_CHANNELS = 'num_channels'
 CONF_NUM_CHIPS = 'num_chips'
 CONF_NUM_LEDS = 'num_leds'
 CONF_NUMBER = 'number'
+CONF_OFF_MODE = 'off_mode'
 CONF_OFFSET = 'offset'
 CONF_ON = 'on'
 CONF_ON_BLE_ADVERTISE = 'on_ble_advertise'
@@ -448,7 +466,11 @@ CONF_STOP_ACTION = 'stop_action'
 CONF_SUBNET = 'subnet'
 CONF_SUPPORTS_COOL = 'supports_cool'
 CONF_SUPPORTS_HEAT = 'supports_heat'
+CONF_SWING_BOTH_ACTION = 'swing_both_action'
+CONF_SWING_HORIZONTAL_ACTION = 'swing_horizontal_action'
 CONF_SWING_MODE = 'swing_mode'
+CONF_SWING_OFF_ACTION = 'swing_off_action'
+CONF_SWING_VERTICAL_ACTION = 'swing_vertical_action'
 CONF_SWITCHES = 'switches'
 CONF_SYNC = 'sync'
 CONF_TABLET = 'tablet'
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 0344aed6de..53bbdf023c 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -615,6 +615,49 @@ climate:
       - switch.turn_on: gpio_switch2
     heat_action:
       - switch.turn_on: gpio_switch1
+    dry_action:
+      - switch.turn_on: gpio_switch2
+    fan_only_action:
+      - switch.turn_on: gpio_switch1
+    auto_mode:
+      - switch.turn_on: gpio_switch2
+    off_mode:
+      - switch.turn_on: gpio_switch1
+    heat_mode:
+      - switch.turn_on: gpio_switch2
+    cool_mode:
+      - switch.turn_on: gpio_switch1
+    dry_mode:
+      - switch.turn_on: gpio_switch2
+    fan_only_mode:
+      - switch.turn_on: gpio_switch1
+    fan_mode_auto_action:
+      - switch.turn_on: gpio_switch2
+    fan_mode_on_action:
+      - switch.turn_on: gpio_switch1
+    fan_mode_off_action:
+      - switch.turn_on: gpio_switch2
+    fan_mode_low_action:
+      - switch.turn_on: gpio_switch1
+    fan_mode_medium_action:
+      - switch.turn_on: gpio_switch2
+    fan_mode_high_action:
+      - switch.turn_on: gpio_switch1
+    fan_mode_middle_action:
+      - switch.turn_on: gpio_switch2
+    fan_mode_focus_action:
+      - switch.turn_on: gpio_switch1
+    fan_mode_diffuse_action:
+      - switch.turn_on: gpio_switch2
+    swing_off_action:
+      - switch.turn_on: gpio_switch1
+    swing_horizontal_action:
+      - switch.turn_on: gpio_switch2
+    swing_vertical_action:
+      - switch.turn_on: gpio_switch1
+    swing_both_action:
+      - switch.turn_on: gpio_switch2
+    hysteresis: 0.2
     away_config:
       default_target_temperature_low: 16°C
       default_target_temperature_high: 20°C

From 04e6f475b4f0d0fd9923b0dc6a1ff60ad2eb2ecd Mon Sep 17 00:00:00 2001
From: Lukas Klass <spam.lukas.klass@gmail.com>
Date: Fri, 19 Jun 2020 00:50:58 +0200
Subject: [PATCH 243/412] Fix decode and encode for RC5-protocol (#1047)

* Fix receive and transmit for RC5-protocol

Receive did not work as a sequence of two high or low puleses are detected as one long pulse. Transmit was extended to respect the field bit in order to enable codes up to 127.

* Fix code formatting
---
 esphome/components/remote_base/__init__.py    |  2 +-
 .../components/remote_base/rc5_protocol.cpp   | 46 +++++++++++++++----
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index 05a3e7e1aa..770394faec 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -420,7 +420,7 @@ def raw_action(var, config, args):
 RC5Data, RC5BinarySensor, RC5Trigger, RC5Action, RC5Dumper = declare_protocol('RC5')
 RC5_SCHEMA = cv.Schema({
     cv.Required(CONF_ADDRESS): cv.All(cv.hex_int, cv.Range(min=0, max=0x1F)),
-    cv.Required(CONF_COMMAND): cv.All(cv.hex_int, cv.Range(min=0, max=0x3F)),
+    cv.Required(CONF_COMMAND): cv.All(cv.hex_int, cv.Range(min=0, max=0x7F)),
 })
 
 
diff --git a/esphome/components/remote_base/rc5_protocol.cpp b/esphome/components/remote_base/rc5_protocol.cpp
index 35bff588e9..a6165492ac 100644
--- a/esphome/components/remote_base/rc5_protocol.cpp
+++ b/esphome/components/remote_base/rc5_protocol.cpp
@@ -14,10 +14,16 @@ void RC5Protocol::encode(RemoteTransmitData *dst, const RC5Data &data) {
   dst->set_carrier_frequency(36000);
 
   uint64_t out_data = 0;
-  out_data |= 0b11 << 12;
+  uint8_t command = data.command;
+  if (data.command >= 64) {
+    out_data |= 0b10 << 12;
+    command = command - 64;
+  } else {
+    out_data |= 0b11 << 12;
+  }
   out_data |= TOGGLE << 11;
   out_data |= data.address << 6;
-  out_data |= data.command;
+  out_data |= command;
 
   for (uint64_t mask = 1UL << (NBITS - 1); mask != 0; mask >>= 1) {
     if (out_data & mask) {
@@ -35,22 +41,44 @@ optional<RC5Data> RC5Protocol::decode(RemoteReceiveData src) {
       .address = 0,
       .command = 0,
   };
-  src.expect_space(BIT_TIME_US);
-  if (!src.expect_mark(BIT_TIME_US) || !src.expect_space(BIT_TIME_US) || !src.expect_mark(BIT_TIME_US))
+  int field_bit = 0;
+
+  if (src.expect_space(BIT_TIME_US) && src.expect_mark(BIT_TIME_US)) {
+    field_bit = 1;
+  } else if (src.expect_space(2 * BIT_TIME_US)) {
+    field_bit = 0;
+  } else {
     return {};
+  }
+
+  if (!(((src.expect_space(BIT_TIME_US) || src.peek_space(2 * BIT_TIME_US)) ||
+         (src.expect_mark(BIT_TIME_US) || src.peek_mark(2 * BIT_TIME_US))) &&
+        (((src.expect_mark(BIT_TIME_US) || src.expect_mark(2 * BIT_TIME_US)) &&
+          (src.expect_space(BIT_TIME_US) || src.peek_space(2 * BIT_TIME_US))) ||
+         ((src.expect_space(BIT_TIME_US) || src.expect_space(2 * BIT_TIME_US)) &&
+          (src.expect_mark(BIT_TIME_US) || src.peek_mark(2 * BIT_TIME_US)))))) {
+    return {};
+  }
 
   uint64_t out_data = 0;
-  for (int bit = NBITS - 3; bit >= 0; bit--) {
-    if (src.expect_space(BIT_TIME_US) && src.expect_mark(BIT_TIME_US)) {
-      out_data |= 1 << bit;
-    } else if (src.expect_mark(BIT_TIME_US) && src.expect_space(BIT_TIME_US)) {
+  for (int bit = NBITS - 4; bit >= 1; bit--) {
+    if ((src.expect_space(BIT_TIME_US) || src.expect_space(2 * BIT_TIME_US)) &&
+        (src.expect_mark(BIT_TIME_US) || src.peek_mark(2 * BIT_TIME_US))) {
       out_data |= 0 << bit;
+    } else if ((src.expect_mark(BIT_TIME_US) || src.expect_mark(2 * BIT_TIME_US)) &&
+               (src.expect_space(BIT_TIME_US) || src.peek_space(2 * BIT_TIME_US))) {
+      out_data |= 1 << bit;
     } else {
       return {};
     }
   }
+  if (src.expect_space(BIT_TIME_US) || src.expect_space(2 * BIT_TIME_US)) {
+    out_data |= 0;
+  } else if (src.expect_mark(BIT_TIME_US) || src.expect_mark(2 * BIT_TIME_US)) {
+    out_data |= 1;
+  }
 
-  out.command = out_data & 0x3F;
+  out.command = (out_data & 0x3F) + (1 - field_bit) * 64;
   out.address = (out_data >> 6) & 0x1F;
   return out;
 }

From e2b655a6cceb831ada8d3c3ade5497b06221711d Mon Sep 17 00:00:00 2001
From: Gavin Mogan <github@gavinmogan.com>
Date: Fri, 19 Jun 2020 09:02:59 -0700
Subject: [PATCH 244/412] Add huzzah gpio pins (#1096)

---
 esphome/pins.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/pins.py b/esphome/pins.py
index 22192b599e..7f4c869895 100644
--- a/esphome/pins.py
+++ b/esphome/pins.py
@@ -33,7 +33,8 @@ ESP8266_BOARD_PINS = {
     'espresso_lite_v2': {'LED': 2},
     'gen4iod': {},
     'heltec_wifi_kit_8': 'd1_mini',
-    'huzzah': {'LED': 0},
+    'huzzah': {'LED': 0, 'LED_RED': 0, 'LED_BLUE': 2, 'D4': 4, 'D5': 5, 'D12': 12,
+               'D13': 13, 'D14': 14, 'D15': 15, 'D16': 16},
     'inventone': {},
     'modwifi': {},
     'nodemcu': {'D0': 16, 'D1': 5, 'D2': 4, 'D3': 0, 'D4': 2, 'D5': 14, 'D6': 12, 'D7': 13,

From f9a86291570b8a2bb8efc8da7d2fea5d4ca2dfed Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Fri, 19 Jun 2020 16:59:19 -0700
Subject: [PATCH 245/412] fix percentage handling (#1094)

* fix percentage handling

* add test

* fix lint errors

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/config_validation.py | 13 ++++++++++---
 tests/test3.yaml             |  4 ++++
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index fa2a14dbd6..1319786841 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -838,9 +838,16 @@ def percentage(value):
 
 
 def possibly_negative_percentage(value):
-    has_percent_sign = isinstance(value, str) and value.endswith('%')
-    if has_percent_sign:
-        value = float(value[:-1].rstrip()) / 100.0
+    has_percent_sign = False
+    if isinstance(value, str):
+        try:
+            if value.endswith('%'):
+                has_percent_sign = False
+                value = float(value[:-1].rstrip()) / 100.0
+            else:
+                value = float(value)
+        except ValueError:
+            raise Invalid("invalid number")
     if value > 1:
         msg = "Percentage must not be higher than 100%."
         if not has_percent_sign:
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 53bbdf023c..dded01fb67 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -14,6 +14,8 @@ esphome:
 substitutions:
   devicename: test3
   devicecomment: test3 device
+  min_sub: "0.03"
+  max_sub: "12.0%"
 
 api:
   port: 8000
@@ -769,6 +771,8 @@ servo:
   id: my_servo
   output: out
   restore: true
+  min_level: $min_sub
+  max_level: $max_sub
 
 ttp229_lsf:
 

From ecb1c77f8b4e1a8c47c78c984353f2e18c244574 Mon Sep 17 00:00:00 2001
From: Alex Mekkering <AlexMekkering@users.noreply.github.com>
Date: Sun, 21 Jun 2020 20:33:01 +0200
Subject: [PATCH 246/412] Add support for command-line substitutions (#1014)

* Add support for command-line substitutions

* Fix flake8

* pylint fixes
---
 esphome/__main__.py                          |  4 +++-
 esphome/components/substitutions/__init__.py |  8 ++++++--
 esphome/config.py                            | 18 +++++++++---------
 esphome/vscode.py                            |  2 +-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 4059024531..27262355d6 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -428,6 +428,8 @@ def parse_args(argv):
     parser.add_argument('-q', '--quiet', help="Disable all esphome logs.",
                         action='store_true')
     parser.add_argument('--dashboard', help=argparse.SUPPRESS, action='store_true')
+    parser.add_argument('-s', '--substitution', nargs=2, action='append',
+                        help='Add a substitution', metavar=('key', 'value'))
     parser.add_argument('configuration', help='Your YAML configuration file.', nargs='*')
 
     subparsers = parser.add_subparsers(help='Commands', dest='command')
@@ -532,7 +534,7 @@ def run_esphome(argv):
         CORE.config_path = conf_path
         CORE.dashboard = args.dashboard
 
-        config = read_config()
+        config = read_config(dict(args.substitution) if args.substitution else {})
         if config is None:
             return 1
         CORE.config = config
diff --git a/esphome/components/substitutions/__init__.py b/esphome/components/substitutions/__init__.py
index 292a7bf299..ab99e040d4 100644
--- a/esphome/components/substitutions/__init__.py
+++ b/esphome/components/substitutions/__init__.py
@@ -101,11 +101,15 @@ def _substitute_item(substitutions, item, path):
     return None
 
 
-def do_substitution_pass(config):
-    if CONF_SUBSTITUTIONS not in config:
+def do_substitution_pass(config, command_line_substitutions):
+    if CONF_SUBSTITUTIONS not in config and not command_line_substitutions:
         return
 
     substitutions = config[CONF_SUBSTITUTIONS]
+    if substitutions is None:
+        substitutions = command_line_substitutions
+    elif command_line_substitutions:
+        substitutions = {**substitutions, **command_line_substitutions}
     with cv.prepend_path('substitutions'):
         if not isinstance(substitutions, dict):
             raise cv.Invalid("Substitutions must be a key to value mapping, got {}"
diff --git a/esphome/config.py b/esphome/config.py
index 8d7c622a27..741b4fb04a 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -387,15 +387,15 @@ def recursive_check_replaceme(value):
     return value
 
 
-def validate_config(config):
+def validate_config(config, command_line_substitutions):
     result = Config()
 
     # 1. Load substitutions
     if CONF_SUBSTITUTIONS in config:
-        result[CONF_SUBSTITUTIONS] = config[CONF_SUBSTITUTIONS]
+        result[CONF_SUBSTITUTIONS] = {**config[CONF_SUBSTITUTIONS], **command_line_substitutions}
         result.add_output_path([CONF_SUBSTITUTIONS], CONF_SUBSTITUTIONS)
         try:
-            substitutions.do_substitution_pass(config)
+            substitutions.do_substitution_pass(config, command_line_substitutions)
         except vol.Invalid as err:
             result.add_error(err)
             return result
@@ -656,7 +656,7 @@ class InvalidYAMLError(EsphomeError):
         self.base_exc = base_exc
 
 
-def _load_config():
+def _load_config(command_line_substitutions):
     try:
         config = yaml_util.load_yaml(CORE.config_path)
     except EsphomeError as e:
@@ -664,7 +664,7 @@ def _load_config():
     CORE.raw_config = config
 
     try:
-        result = validate_config(config)
+        result = validate_config(config, command_line_substitutions)
     except EsphomeError:
         raise
     except Exception:
@@ -674,9 +674,9 @@ def _load_config():
     return result
 
 
-def load_config():
+def load_config(command_line_substitutions):
     try:
-        return _load_config()
+        return _load_config(command_line_substitutions)
     except vol.Invalid as err:
         raise EsphomeError(f"Error while parsing config: {err}")
 
@@ -813,10 +813,10 @@ def strip_default_ids(config):
     return config
 
 
-def read_config():
+def read_config(command_line_substitutions):
     _LOGGER.info("Reading configuration %s...", CORE.config_path)
     try:
-        res = load_config()
+        res = load_config(command_line_substitutions)
     except EsphomeError as err:
         _LOGGER.error("Error while reading config: %s", err)
         return None
diff --git a/esphome/vscode.py b/esphome/vscode.py
index e8c0b106f7..8782ed6e5c 100644
--- a/esphome/vscode.py
+++ b/esphome/vscode.py
@@ -66,7 +66,7 @@ def read_config(args):
             CORE.config_path = data['file']
         vs = VSCodeResult()
         try:
-            res = load_config()
+            res = load_config(dict(args.substitution) if args.substitution else {})
         except Exception as err:  # pylint: disable=broad-except
             vs.add_yaml_error(str(err))
         else:

From 82d5d50d616f6eed3c0a666caa9344e7694ff7e1 Mon Sep 17 00:00:00 2001
From: square99 <square999@gmail.com>
Date: Mon, 22 Jun 2020 10:29:43 +0900
Subject: [PATCH 247/412] Add LG Climate IR (#1097)

* Add LG Climate ir

* Add LG Climate IR

* Add LG Climate IR

* Add LG Climate IR

* Add LG Climate IR

* Add LG Climate IR

* Add LG Climate IR

Co-authored-by: Sangheon Heo <square99@SangHeonui-Macmini.local>
---
 esphome/components/climate_ir_lg/__init__.py  |   0
 esphome/components/climate_ir_lg/climate.py   |  18 ++
 .../climate_ir_lg/climate_ir_lg.cpp           | 204 ++++++++++++++++++
 .../components/climate_ir_lg/climate_ir_lg.h  |  44 ++++
 tests/test1.yaml                              |   2 +
 5 files changed, 268 insertions(+)
 create mode 100644 esphome/components/climate_ir_lg/__init__.py
 create mode 100644 esphome/components/climate_ir_lg/climate.py
 create mode 100644 esphome/components/climate_ir_lg/climate_ir_lg.cpp
 create mode 100644 esphome/components/climate_ir_lg/climate_ir_lg.h

diff --git a/esphome/components/climate_ir_lg/__init__.py b/esphome/components/climate_ir_lg/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/climate_ir_lg/climate.py b/esphome/components/climate_ir_lg/climate.py
new file mode 100644
index 0000000000..37bf9e2628
--- /dev/null
+++ b/esphome/components/climate_ir_lg/climate.py
@@ -0,0 +1,18 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
+
+AUTO_LOAD = ['climate_ir']
+
+climate_ir_lg_ns = cg.esphome_ns.namespace('climate_ir_lg')
+LgIrClimate = climate_ir_lg_ns.class_('LgIrClimate', climate_ir.ClimateIR)
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(LgIrClimate),
+})
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/climate_ir_lg/climate_ir_lg.cpp b/esphome/components/climate_ir_lg/climate_ir_lg.cpp
new file mode 100644
index 0000000000..80677e6de3
--- /dev/null
+++ b/esphome/components/climate_ir_lg/climate_ir_lg.cpp
@@ -0,0 +1,204 @@
+#include "climate_ir_lg.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace climate_ir_lg {
+
+static const char *TAG = "climate.climate_ir_lg";
+
+const uint32_t COMMAND_ON = 0x00000;
+const uint32_t COMMAND_ON_AI = 0x03000;
+const uint32_t COMMAND_COOL = 0x08000;
+const uint32_t COMMAND_OFF = 0xC0000;
+const uint32_t COMMAND_SWING = 0x10000;
+// On, 25C, Mode: Auto, Fan: Auto, Zone Follow: Off, Sensor Temp: Ignore.
+const uint32_t COMMAND_AUTO = 0x0B000;
+const uint32_t COMMAND_DRY_FAN = 0x09000;
+
+const uint32_t COMMAND_MASK = 0xFF000;
+
+const uint32_t FAN_MASK = 0xF0;
+const uint32_t FAN_AUTO = 0x50;
+const uint32_t FAN_MIN = 0x00;
+const uint32_t FAN_MED = 0x20;
+const uint32_t FAN_MAX = 0x40;
+
+// Temperature
+const uint8_t TEMP_RANGE = TEMP_MAX - TEMP_MIN + 1;
+const uint32_t TEMP_MASK = 0XF00;
+const uint32_t TEMP_SHIFT = 8;
+
+// Constants
+static const uint32_t HEADER_HIGH_US = 8000;
+static const uint32_t HEADER_LOW_US = 4000;
+static const uint32_t BIT_HIGH_US = 600;
+static const uint32_t BIT_ONE_LOW_US = 1600;
+static const uint32_t BIT_ZERO_LOW_US = 550;
+
+const uint16_t BITS = 28;
+
+void LgIrClimate::transmit_state() {
+  uint32_t remote_state = 0x8800000;
+
+  // ESP_LOGD(TAG, "climate_lg_ir mode_before_ code: 0x%02X", modeBefore_);
+  if (send_swing_cmd_) {
+    send_swing_cmd_ = false;
+    remote_state |= COMMAND_SWING;
+  } else {
+    if (mode_before_ == climate::CLIMATE_MODE_OFF && this->mode == climate::CLIMATE_MODE_AUTO) {
+      remote_state |= COMMAND_ON_AI;
+    } else if (mode_before_ == climate::CLIMATE_MODE_OFF && this->mode != climate::CLIMATE_MODE_OFF) {
+      remote_state |= COMMAND_ON;
+      this->mode = climate::CLIMATE_MODE_COOL;
+    } else {
+      switch (this->mode) {
+        case climate::CLIMATE_MODE_COOL:
+          remote_state |= COMMAND_COOL;
+          break;
+        case climate::CLIMATE_MODE_AUTO:
+          remote_state |= COMMAND_AUTO;
+          break;
+        case climate::CLIMATE_MODE_DRY:
+          remote_state |= COMMAND_DRY_FAN;
+          break;
+        case climate::CLIMATE_MODE_OFF:
+        default:
+          remote_state |= COMMAND_OFF;
+          break;
+      }
+    }
+    mode_before_ = this->mode;
+
+    ESP_LOGD(TAG, "climate_lg_ir mode code: 0x%02X", this->mode);
+
+    if (this->mode == climate::CLIMATE_MODE_OFF) {
+      remote_state |= FAN_AUTO;
+    } else if (this->mode == climate::CLIMATE_MODE_COOL || this->mode == climate::CLIMATE_MODE_DRY) {
+      switch (this->fan_mode) {
+        case climate::CLIMATE_FAN_HIGH:
+          remote_state |= FAN_MAX;
+          break;
+        case climate::CLIMATE_FAN_MEDIUM:
+          remote_state |= FAN_MED;
+          break;
+        case climate::CLIMATE_FAN_LOW:
+          remote_state |= FAN_MIN;
+          break;
+        case climate::CLIMATE_FAN_AUTO:
+        default:
+          remote_state |= FAN_AUTO;
+          break;
+      }
+    }
+
+    if (this->mode == climate::CLIMATE_MODE_AUTO) {
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+      // remote_state |= FAN_MODE_AUTO_DRY;
+    }
+    if (this->mode == climate::CLIMATE_MODE_COOL) {
+      auto temp = (uint8_t) roundf(clamp(this->target_temperature, TEMP_MIN, TEMP_MAX));
+      remote_state |= ((temp - 15) << TEMP_SHIFT);
+    }
+  }
+  transmit_(remote_state);
+  this->publish_state();
+}
+
+bool LgIrClimate::on_receive(remote_base::RemoteReceiveData data) {
+  uint8_t nbits = 0;
+  uint32_t remote_state = 0;
+
+  if (!data.expect_item(HEADER_HIGH_US, HEADER_LOW_US))
+    return false;
+
+  for (nbits = 0; nbits < 32; nbits++) {
+    if (data.expect_item(BIT_HIGH_US, BIT_ONE_LOW_US)) {
+      remote_state = (remote_state << 1) | 1;
+    } else if (data.expect_item(BIT_HIGH_US, BIT_ZERO_LOW_US)) {
+      remote_state = (remote_state << 1) | 0;
+    } else if (nbits == BITS) {
+      break;
+    } else {
+      return false;
+    }
+  }
+
+  ESP_LOGD(TAG, "Decoded 0x%02X", remote_state);
+  if ((remote_state & 0xFF00000) != 0x8800000)
+    return false;
+
+  if ((remote_state & COMMAND_MASK) == COMMAND_ON) {
+    this->mode = climate::CLIMATE_MODE_COOL;
+  } else if ((remote_state & COMMAND_MASK) == COMMAND_ON_AI) {
+    this->mode = climate::CLIMATE_MODE_AUTO;
+  }
+
+  if ((remote_state & COMMAND_MASK) == COMMAND_OFF) {
+    this->mode = climate::CLIMATE_MODE_OFF;
+  } else if ((remote_state & COMMAND_MASK) == COMMAND_SWING) {
+    this->swing_mode =
+        this->swing_mode == climate::CLIMATE_SWING_OFF ? climate::CLIMATE_SWING_VERTICAL : climate::CLIMATE_SWING_OFF;
+  } else {
+    if ((remote_state & COMMAND_MASK) == COMMAND_AUTO)
+      this->mode = climate::CLIMATE_MODE_AUTO;
+    else if ((remote_state & COMMAND_MASK) == COMMAND_DRY_FAN) {
+      this->mode = climate::CLIMATE_MODE_DRY;
+    } else {
+      this->mode = climate::CLIMATE_MODE_COOL;
+    }
+  }
+
+  // Temperature
+  if (this->mode == climate::CLIMATE_MODE_COOL)
+    this->target_temperature = ((remote_state & TEMP_MASK) >> TEMP_SHIFT) + 15;
+
+  // Fan Speed
+  if (this->mode == climate::CLIMATE_MODE_AUTO) {
+    this->fan_mode = climate::CLIMATE_FAN_AUTO;
+  } else if (this->mode == climate::CLIMATE_MODE_COOL || this->mode == climate::CLIMATE_MODE_DRY) {
+    if ((remote_state & FAN_MASK) == FAN_AUTO)
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+    else if ((remote_state & FAN_MASK) == FAN_MIN)
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+    else if ((remote_state & FAN_MASK) == FAN_MED)
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+    else if ((remote_state & FAN_MASK) == FAN_MAX)
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+  }
+  this->publish_state();
+
+  return true;
+}
+void LgIrClimate::transmit_(uint32_t value) {
+  calc_checksum_(value);
+  ESP_LOGD(TAG, "Sending climate_lg_ir code: 0x%02X", value);
+
+  auto transmit = this->transmitter_->transmit();
+  auto data = transmit.get_data();
+
+  data->set_carrier_frequency(38000);
+  data->reserve(2 + BITS * 2u);
+
+  data->item(HEADER_HIGH_US, HEADER_LOW_US);
+
+  for (uint32_t mask = 1UL << (BITS - 1); mask != 0; mask >>= 1) {
+    if (value & mask)
+      data->item(BIT_HIGH_US, BIT_ONE_LOW_US);
+    else
+      data->item(BIT_HIGH_US, BIT_ZERO_LOW_US);
+  }
+  data->mark(BIT_HIGH_US);
+  transmit.perform();
+}
+void LgIrClimate::calc_checksum_(uint32_t &value) {
+  uint32_t mask = 0xF;
+  uint32_t sum = 0;
+  for (uint8_t i = 1; i < 8; i++) {
+    sum += (value & (mask << (i * 4))) >> (i * 4);
+  }
+
+  value |= (sum & mask);
+}
+
+}  // namespace climate_ir_lg
+}  // namespace esphome
diff --git a/esphome/components/climate_ir_lg/climate_ir_lg.h b/esphome/components/climate_ir_lg/climate_ir_lg.h
new file mode 100644
index 0000000000..204482e7a8
--- /dev/null
+++ b/esphome/components/climate_ir_lg/climate_ir_lg.h
@@ -0,0 +1,44 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace climate_ir_lg {
+
+// Temperature
+const uint8_t TEMP_MIN = 18;  // Celsius
+const uint8_t TEMP_MAX = 30;  // Celsius
+
+class LgIrClimate : public climate_ir::ClimateIR {
+ public:
+  LgIrClimate()
+      : climate_ir::ClimateIR(TEMP_MIN, TEMP_MAX, 1.0f, true, false,
+                              {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
+                               climate::CLIMATE_FAN_HIGH},
+                              {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL}) {}
+
+  /// Override control to change settings of the climate device.
+  void control(const climate::ClimateCall &call) override {
+    send_swing_cmd_ = call.get_swing_mode().has_value();
+    // swing resets after unit powered off
+    if (call.get_mode().has_value() && *call.get_mode() == climate::CLIMATE_MODE_OFF)
+      this->swing_mode = climate::CLIMATE_SWING_OFF;
+    climate_ir::ClimateIR::control(call);
+  }
+
+ protected:
+  /// Transmit via IR the state of this climate controller.
+  void transmit_state() override;
+  /// Handle received IR Buffer
+  bool on_receive(remote_base::RemoteReceiveData data) override;
+
+  bool send_swing_cmd_{false};
+
+  void calc_checksum_(uint32_t &value);
+  void transmit_(uint32_t value);
+
+  climate::ClimateMode mode_before_{climate::CLIMATE_MODE_OFF};
+};
+
+}  // namespace climate_ir_lg
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index bd44ff6e63..5343d48970 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1277,6 +1277,8 @@ climate:
     name: Mitsubishi
   - platform: whirlpool
     name: Whirlpool Climate
+  - platform: climate_ir_lg
+    name: LG Climate
 
 switch:
   - platform: gpio

From 148f5d94180473df7e83937b63b46504d71d7db6 Mon Sep 17 00:00:00 2001
From: buxtronix <bbuxton@gmail.com>
Date: Sat, 27 Jun 2020 08:13:23 +1000
Subject: [PATCH 248/412] ESP32: Conditionally log on services to avoid OOM
 crashes (#1098)

Also removed new line formatting tidy as it requires a bit of memory which might not be available.


* Use suitably scoped char for log newline stripping

* fix formatting

* Better fix for OOM logging crash

* Limit to ESP32 only

* format changes
---
 esphome/components/logger/logger.cpp | 10 ++++++++++
 esphome/core/log.cpp                 | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/esphome/components/logger/logger.cpp b/esphome/components/logger/logger.cpp
index bc6951c9b9..140b8f26c1 100644
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -103,7 +103,17 @@ void HOT Logger::log_message_(int level, const char *tag, int offset) {
   const char *msg = this->tx_buffer_ + offset;
   if (this->baud_rate_ > 0)
     this->hw_serial_->println(msg);
+#ifdef ARDUINO_ARCH_ESP32
+  // Suppress network-logging if memory constrained, but still log to serial
+  // ports. In some configurations (eg BLE enabled) there may be some transient
+  // memory exhaustion, and trying to log when OOM can lead to a crash. Skipping
+  // here usually allows the stack to recover instead.
+  // See issue #1234 for analysis.
+  if (xPortGetFreeHeapSize() > 2048)
+    this->log_callback_.call(level, tag, msg);
+#else
   this->log_callback_.call(level, tag, msg);
+#endif
 }
 
 Logger::Logger(uint32_t baud_rate, size_t tx_buffer_size, UARTSelection uart)
diff --git a/esphome/core/log.cpp b/esphome/core/log.cpp
index 15d49c0038..9b49a4c6ba 100644
--- a/esphome/core/log.cpp
+++ b/esphome/core/log.cpp
@@ -53,16 +53,6 @@ int HOT esp_idf_log_vprintf_(const char *format, va_list args) {  // NOLINT
   if (log == nullptr)
     return 0;
 
-  size_t len = strlen(format);
-  if (format[len - 1] == '\n') {
-    // Remove trailing newline from format
-    // Use locally stored
-    static std::string FORMAT_COPY;
-    FORMAT_COPY.clear();
-    FORMAT_COPY.insert(0, format, len - 1);
-    format = FORMAT_COPY.c_str();
-  }
-
   log->log_vprintf_(ESPHOME_LOG_LEVEL, "esp-idf", 0, format, args);
 #endif
   return 0;

From ca4107d4504ac7dccf1a663733846798d0570274 Mon Sep 17 00:00:00 2001
From: buxtronix <bbuxton@gmail.com>
Date: Sun, 28 Jun 2020 07:06:13 +1000
Subject: [PATCH 249/412] Release BT controller unused memory in the right
 place (#1095)

---
 esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index 5109af21fa..a8185a8c67 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -99,14 +99,14 @@ bool ESP32BLETracker::ble_setup() {
     return false;
   }
 
+  esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
+
   // Initialize the bluetooth controller with the default configuration
   if (!btStart()) {
     ESP_LOGE(TAG, "btStart failed: %d", esp_bt_controller_get_status());
     return false;
   }
 
-  esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
-
   err = esp_bluedroid_init();
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "esp_bluedroid_init failed: %d", err);

From 3c9712d6838cc7376034a7a202f251ed32757177 Mon Sep 17 00:00:00 2001
From: phjr <peto@halicky.sk>
Date: Sun, 28 Jun 2020 00:08:15 +0200
Subject: [PATCH 250/412] add support for SN74HC595 shift register (#1083)

* add support for SN74HC595 shift register

* fix linter errors

* more linter reported issues fixed

* hopefully last linter error cleanup

* one more linter fix

* looks like the linter is always keeping stuff for later, is this the final fix?

* add test

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/sn74hc595/__init__.py   | 54 +++++++++++++++++
 esphome/components/sn74hc595/sn74hc595.cpp | 70 ++++++++++++++++++++++
 esphome/components/sn74hc595/sn74hc595.h   | 55 +++++++++++++++++
 tests/test1.yaml                           | 22 ++++++-
 4 files changed, 198 insertions(+), 3 deletions(-)
 create mode 100644 esphome/components/sn74hc595/__init__.py
 create mode 100644 esphome/components/sn74hc595/sn74hc595.cpp
 create mode 100644 esphome/components/sn74hc595/sn74hc595.h

diff --git a/esphome/components/sn74hc595/__init__.py b/esphome/components/sn74hc595/__init__.py
new file mode 100644
index 0000000000..de80c38214
--- /dev/null
+++ b/esphome/components/sn74hc595/__init__.py
@@ -0,0 +1,54 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.const import CONF_ID, CONF_NUMBER, CONF_INVERTED, CONF_DATA_PIN, CONF_CLOCK_PIN
+
+DEPENDENCIES = []
+MULTI_CONF = True
+
+sn74hc595_ns = cg.esphome_ns.namespace('sn74hc595')
+
+SN74HC595Component = sn74hc595_ns.class_('SN74HC595Component', cg.Component)
+SN74HC595GPIOPin = sn74hc595_ns.class_('SN74HC595GPIOPin', cg.GPIOPin)
+
+CONF_SN74HC595 = 'sn74hc595'
+CONF_LATCH_PIN = 'latch_pin'
+CONF_OE_PIN = 'oe_pin'
+CONF_SR_COUNT = 'sr_count'
+CONFIG_SCHEMA = cv.Schema({
+    cv.Required(CONF_ID): cv.declare_id(SN74HC595Component),
+    cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
+    cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
+    cv.Required(CONF_LATCH_PIN): pins.gpio_output_pin_schema,
+    cv.Optional(CONF_OE_PIN): pins.gpio_output_pin_schema,
+    cv.Optional(CONF_SR_COUNT, default=1): cv.int_range(1, 4)
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    data_pin = yield cg.gpio_pin_expression(config[CONF_DATA_PIN])
+    cg.add(var.set_data_pin(data_pin))
+    clock_pin = yield cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
+    cg.add(var.set_clock_pin(clock_pin))
+    latch_pin = yield cg.gpio_pin_expression(config[CONF_LATCH_PIN])
+    cg.add(var.set_latch_pin(latch_pin))
+    oe_pin = yield cg.gpio_pin_expression(config[CONF_OE_PIN])
+    cg.add(var.set_oe_pin(oe_pin))
+    cg.add(var.set_sr_count(config[CONF_SR_COUNT]))
+
+
+SN74HC595_OUTPUT_PIN_SCHEMA = cv.Schema({
+    cv.Required(CONF_SN74HC595): cv.use_id(SN74HC595Component),
+    cv.Required(CONF_NUMBER): cv.int_,
+    cv.Optional(CONF_INVERTED, default=False): cv.boolean,
+})
+SN74HC595_INPUT_PIN_SCHEMA = cv.Schema({})
+
+
+@pins.PIN_SCHEMA_REGISTRY.register(CONF_SN74HC595,
+                                   (SN74HC595_OUTPUT_PIN_SCHEMA, SN74HC595_INPUT_PIN_SCHEMA))
+def sn74hc595_pin_to_code(config):
+    parent = yield cg.get_variable(config[CONF_SN74HC595])
+    yield SN74HC595GPIOPin.new(parent, config[CONF_NUMBER], config[CONF_INVERTED])
diff --git a/esphome/components/sn74hc595/sn74hc595.cpp b/esphome/components/sn74hc595/sn74hc595.cpp
new file mode 100644
index 0000000000..edf8989149
--- /dev/null
+++ b/esphome/components/sn74hc595/sn74hc595.cpp
@@ -0,0 +1,70 @@
+#include "sn74hc595.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sn74hc595 {
+
+static const char *TAG = "sn74hc595";
+
+void SN74HC595Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up SN74HC595...");
+
+  if (this->have_oe_pin_) {  // disable output
+    pinMode(this->oe_pin_->get_pin(), OUTPUT);
+    digitalWrite(this->oe_pin_->get_pin(), HIGH);
+  }
+
+  // initialize output pins
+  pinMode(this->clock_pin_->get_pin(), OUTPUT);
+  pinMode(this->data_pin_->get_pin(), OUTPUT);
+  pinMode(this->latch_pin_->get_pin(), OUTPUT);
+  digitalWrite(this->clock_pin_->get_pin(), LOW);
+  digitalWrite(this->data_pin_->get_pin(), LOW);
+  digitalWrite(this->latch_pin_->get_pin(), LOW);
+
+  // send state to shift register
+  this->write_gpio_();
+}
+
+void SN74HC595Component::dump_config() { ESP_LOGCONFIG(TAG, "SN74HC595:"); }
+
+bool SN74HC595Component::digital_read_(uint8_t pin) { return bitRead(this->output_bits_, pin); }
+
+void SN74HC595Component::digital_write_(uint8_t pin, bool value) {
+  bitWrite(this->output_bits_, pin, value);
+  this->write_gpio_();
+}
+
+bool SN74HC595Component::write_gpio_() {
+  for (int i = this->sr_count_ - 1; i >= 0; i--) {
+    uint8_t data = (uint8_t)(this->output_bits_ >> (8 * i) & 0xff);
+    shiftOut(this->data_pin_->get_pin(), this->clock_pin_->get_pin(), MSBFIRST, data);
+  }
+
+  // pulse latch to activate new values
+  digitalWrite(this->latch_pin_->get_pin(), HIGH);
+  digitalWrite(this->latch_pin_->get_pin(), LOW);
+
+  // enable output if configured
+  if (this->have_oe_pin_) {
+    digitalWrite(this->oe_pin_->get_pin(), LOW);
+  }
+
+  return true;
+}
+
+float SN74HC595Component::get_setup_priority() const { return setup_priority::IO; }
+
+void SN74HC595GPIOPin::setup() {}
+
+bool SN74HC595GPIOPin::digital_read() { return this->parent_->digital_read_(this->pin_) != this->inverted_; }
+
+void SN74HC595GPIOPin::digital_write(bool value) {
+  this->parent_->digital_write_(this->pin_, value != this->inverted_);
+}
+
+SN74HC595GPIOPin::SN74HC595GPIOPin(SN74HC595Component *parent, uint8_t pin, bool inverted)
+    : GPIOPin(pin, OUTPUT, inverted), parent_(parent) {}
+
+}  // namespace sn74hc595
+}  // namespace esphome
diff --git a/esphome/components/sn74hc595/sn74hc595.h b/esphome/components/sn74hc595/sn74hc595.h
new file mode 100644
index 0000000000..d6f9a68bc8
--- /dev/null
+++ b/esphome/components/sn74hc595/sn74hc595.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
+
+namespace esphome {
+namespace sn74hc595 {
+
+class SN74HC595Component : public Component {
+ public:
+  SN74HC595Component() = default;
+
+  void setup() override;
+  float get_setup_priority() const override;
+  void dump_config() override;
+
+  void set_data_pin(GPIOPin *pin) { data_pin_ = pin; }
+  void set_clock_pin(GPIOPin *pin) { clock_pin_ = pin; }
+  void set_latch_pin(GPIOPin *pin) { latch_pin_ = pin; }
+  void set_oe_pin(GPIOPin *pin) {
+    oe_pin_ = pin;
+    have_oe_pin_ = true;
+  }
+  void set_sr_count(uint8_t count) { sr_count_ = count; }
+
+ protected:
+  friend class SN74HC595GPIOPin;
+  bool digital_read_(uint8_t pin);
+  void digital_write_(uint8_t pin, bool value);
+  bool write_gpio_();
+
+  GPIOPin *data_pin_;
+  GPIOPin *clock_pin_;
+  GPIOPin *latch_pin_;
+  GPIOPin *oe_pin_;
+  uint8_t sr_count_;
+  bool have_oe_pin_{false};
+  uint32_t output_bits_{0x00};
+};
+
+/// Helper class to expose a SC74HC595 pin as an internal output GPIO pin.
+class SN74HC595GPIOPin : public GPIOPin {
+ public:
+  SN74HC595GPIOPin(SN74HC595Component *parent, uint8_t pin, bool inverted = false);
+
+  void setup() override;
+  bool digital_read() override;
+  void digital_write(bool value) override;
+
+ protected:
+  SN74HC595Component *parent_;
+};
+
+}  // namespace sn74hc595
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 5343d48970..8f06de2e40 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1187,13 +1187,13 @@ light:
             if (initial_run) {
               it[0] = current_color;
             }
-            
+
     - wled:
         port: 11111
-        
+
     - adalight:
         uart_id: adalight_uart
-        
+
     - automation:
         name: Custom Effect
         sequence:
@@ -1465,6 +1465,14 @@ switch:
         id: my_stepper
         position: 0
 
+  - platform: gpio
+    name: "SN74HC595 Pin #0"
+    pin:
+      sn74hc595: sn74hc595_hub
+      # Use pin number 0
+      number: 0
+      inverted: False
+
 fan:
   - platform: binary
     output: gpio_26
@@ -1715,3 +1723,11 @@ text_sensor:
     name: "BSSID"
   mac_address:
     name: "Mac Address"
+
+sn74hc595:
+  - id: 'sn74hc595_hub'
+    data_pin: GPIO21
+    clock_pin: GPIO23
+    latch_pin: GPIO22
+    oe_pin: GPIO32
+    sr_count: 2

From bfb9cb6732ea3d909f8750d75b0bb5bdd722d48b Mon Sep 17 00:00:00 2001
From: rspaargaren <github@speijkers.nl>
Date: Sun, 28 Jun 2020 22:33:06 +0200
Subject: [PATCH 251/412] Max7219 in Dot Matrix configuration (#1053)

* push final files

* Update max7219digit.cpp

reenter small bug fix on uint8 declaration

* small debug

* set max offset to 100

* remove unwanted file

* Update font file to make travis happy

* travis update

* further progress in keeping Yarvis happy

* travis font

* travis will never be satisfied but one step ahead

* YARVIS TAKE 10000000

* never ending yarvis

* Almost there with Yarvis

* removed double declaration YARVIS

* added namespace to font file (TRAVIS)

* almost there last changes for YARVIS

* further travis updates

* removed files for travis

* fix display.py length of line travis remark

* further update on display.py

* file delete travis requirement

* final entry for travis?

* Some further debug on max offset

* Travis updates

* scroll_left_new

* 90degreesrotate

* added option to config rotate90

* four orientations for the chips

* new setup for scroll

* replaced small bug missing {}

* debug changed int8 to int16 on scroll function

* removed small merge failure

* travis updates round 1

* travis updates round 2

* travis details round 3

* added options to set scroll parameters in yaml conf

* removed ttf and png to satisfy travis

* travis update

* travis updates

* travis

* further updates after input from @glmnet

* remove deleted comments

* Added ENUM TYPE to config file

* change in test file

* removed test files

* updates for pull request

* Typing error removed

* travis update

* PR updates travis

* Update test3.yaml

* Update test3.yaml

* update device schema as per #988

* Delete partitions.csv

* repair on image display and invert routine

* further update and a bit of cleanup

* added writing 0 in draw pixel

* small deletion error

* travis updates

* Update max7219digit.cpp

adding intensity value to dynamically set value

* Update max7219digit.h

adding option for intensity

* remove some files from tests
---
 esphome/components/max7219digit/__init__.py   |   0
 esphome/components/max7219digit/display.py    |  63 ++++
 .../components/max7219digit/max7219digit.cpp  | 293 ++++++++++++++++++
 .../components/max7219digit/max7219digit.h    | 107 +++++++
 esphome/components/max7219digit/max7219font.h | 268 ++++++++++++++++
 tests/test3.yaml                              |  12 +
 6 files changed, 743 insertions(+)
 create mode 100644 esphome/components/max7219digit/__init__.py
 create mode 100644 esphome/components/max7219digit/display.py
 create mode 100644 esphome/components/max7219digit/max7219digit.cpp
 create mode 100644 esphome/components/max7219digit/max7219digit.h
 create mode 100644 esphome/components/max7219digit/max7219font.h

diff --git a/esphome/components/max7219digit/__init__.py b/esphome/components/max7219digit/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/max7219digit/display.py b/esphome/components/max7219digit/display.py
new file mode 100644
index 0000000000..5bba71148c
--- /dev/null
+++ b/esphome/components/max7219digit/display.py
@@ -0,0 +1,63 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import display, spi
+from esphome.const import CONF_ID, CONF_INTENSITY, CONF_LAMBDA, CONF_NUM_CHIPS
+
+DEPENDENCIES = ['spi']
+
+CONF_ROTATE_CHIP = 'rotate_chip'
+CONF_SCROLL_SPEED = 'scroll_speed'
+CONF_SCROLL_DWELL = 'scroll_dwell'
+CONF_SCROLL_DELAY = 'scroll_delay'
+CONF_SCROLL_ENABLE = 'scroll_enable'
+CONF_SCROLL_MODE = 'scroll_mode'
+
+SCROLL_MODES = {
+    'CONTINUOUS': 0,
+    'STOP': 1,
+}
+
+CHIP_MODES = {
+    '0': 0,
+    '90': 1,
+    '180': 2,
+    '270': 3,
+}
+
+max7219_ns = cg.esphome_ns.namespace('max7219digit')
+MAX7219Component = max7219_ns.class_('MAX7219Component', cg.PollingComponent, spi.SPIDevice,
+                                     display.DisplayBuffer)
+MAX7219ComponentRef = MAX7219Component.operator('ref')
+
+CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(MAX7219Component),
+    cv.Optional(CONF_NUM_CHIPS, default=4): cv.int_range(min=1, max=255),
+    cv.Optional(CONF_INTENSITY, default=15): cv.int_range(min=0, max=15),
+    cv.Optional(CONF_ROTATE_CHIP, default='0'): cv.enum(CHIP_MODES, upper=True),
+    cv.Optional(CONF_SCROLL_MODE, default='CONTINUOUS'): cv.enum(SCROLL_MODES, upper=True),
+    cv.Optional(CONF_SCROLL_ENABLE, default=True): cv.boolean,
+    cv.Optional(CONF_SCROLL_SPEED, default='250ms'): cv.positive_time_period_milliseconds,
+    cv.Optional(CONF_SCROLL_DELAY, default='1000ms'): cv.positive_time_period_milliseconds,
+    cv.Optional(CONF_SCROLL_DWELL, default='1000ms'): cv.positive_time_period_milliseconds,
+}).extend(cv.polling_component_schema('500ms')).extend(spi.spi_device_schema(CS_PIN_required=True))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield spi.register_spi_device(var, config)
+    yield display.register_display(var, config)
+
+    cg.add(var.set_num_chips(config[CONF_NUM_CHIPS]))
+    cg.add(var.set_intensity(config[CONF_INTENSITY]))
+    cg.add(var.set_chip_orientation(config[CONF_ROTATE_CHIP]))
+    cg.add(var.set_scroll_speed(config[CONF_SCROLL_SPEED]))
+    cg.add(var.set_scroll_dwell(config[CONF_SCROLL_DWELL]))
+    cg.add(var.set_scroll_delay(config[CONF_SCROLL_DELAY]))
+    cg.add(var.set_scroll(config[CONF_SCROLL_ENABLE]))
+    cg.add(var.set_scroll_mode(config[CONF_SCROLL_MODE]))
+
+    if CONF_LAMBDA in config:
+        lambda_ = yield cg.process_lambda(config[CONF_LAMBDA], [(MAX7219ComponentRef, 'it')],
+                                          return_type=cg.void)
+        cg.add(var.set_writer(lambda_))
diff --git a/esphome/components/max7219digit/max7219digit.cpp b/esphome/components/max7219digit/max7219digit.cpp
new file mode 100644
index 0000000000..b19f05143f
--- /dev/null
+++ b/esphome/components/max7219digit/max7219digit.cpp
@@ -0,0 +1,293 @@
+#include "max7219digit.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+#include "max7219font.h"
+
+namespace esphome {
+namespace max7219digit {
+
+static const char *TAG = "max7219DIGIT";
+
+static const uint8_t MAX7219_REGISTER_NOOP = 0x00;
+static const uint8_t MAX7219_REGISTER_DECODE_MODE = 0x09;
+static const uint8_t MAX7219_REGISTER_INTENSITY = 0x0A;
+static const uint8_t MAX7219_REGISTER_SCAN_LIMIT = 0x0B;
+static const uint8_t MAX7219_REGISTER_SHUTDOWN = 0x0C;
+static const uint8_t MAX7219_REGISTER_DISPLAY_TEST = 0x0F;
+constexpr uint8_t MAX7219_NO_SHUTDOWN = 0x00;
+constexpr uint8_t MAX7219_SHUTDOWN = 0x01;
+constexpr uint8_t MAX7219_NO_DISPLAY_TEST = 0x00;
+constexpr uint8_t MAX7219_DISPLAY_TEST = 0x01;
+
+float MAX7219Component::get_setup_priority() const { return setup_priority::PROCESSOR; }
+
+void MAX7219Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up MAX7219_DIGITS...");
+  this->spi_setup();
+  this->stepsleft_ = 0;
+  this->max_displaybuffer_.reserve(500);  // Create base space to write buffer
+  // Initialize buffer with 0 for display so all non written pixels are blank
+  this->max_displaybuffer_.resize(this->num_chips_ * 8, 0);
+  // let's assume the user has all 8 digits connected, only important in daisy chained setups anyway
+  this->send_to_all_(MAX7219_REGISTER_SCAN_LIMIT, 7);
+  // let's use our own ASCII -> led pattern encoding
+  this->send_to_all_(MAX7219_REGISTER_DECODE_MODE, 0);
+  // No display test with all the pixels on
+  this->send_to_all_(MAX7219_REGISTER_DISPLAY_TEST, MAX7219_NO_DISPLAY_TEST);
+  // SET Intsity of display
+  this->send_to_all_(MAX7219_REGISTER_INTENSITY, this->intensity_);
+  // this->send_to_all_(MAX7219_REGISTER_INTENSITY, 1);
+  this->display();
+  // power up
+  this->send_to_all_(MAX7219_REGISTER_SHUTDOWN, 1);
+}
+
+void MAX7219Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "MAX7219DIGIT:");
+  ESP_LOGCONFIG(TAG, "  Number of Chips: %u", this->num_chips_);
+  ESP_LOGCONFIG(TAG, "  Intensity: %u", this->intensity_);
+  ESP_LOGCONFIG(TAG, "  Scroll Mode: %u", this->scroll_mode_);
+  ESP_LOGCONFIG(TAG, "  Scroll Speed: %u", this->scroll_speed_);
+  ESP_LOGCONFIG(TAG, "  Scroll Dwell: %u", this->scroll_dwell_);
+  ESP_LOGCONFIG(TAG, "  Scroll Delay: %u", this->scroll_delay_);
+  LOG_PIN("  CS Pin: ", this->cs_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void MAX7219Component::loop() {
+  unsigned long now = millis();
+
+  // check if the buffer has shrunk past the current position since last update
+  if ((this->max_displaybuffer_.size() >= this->old_buffer_size_ + 3) ||
+      (this->max_displaybuffer_.size() <= this->old_buffer_size_ - 3)) {
+    this->stepsleft_ = 0;
+    this->display();
+    this->old_buffer_size_ = this->max_displaybuffer_.size();
+  }
+
+  // Reset the counter back to 0 when full string has been displayed.
+  if (this->stepsleft_ > this->max_displaybuffer_.size())
+    this->stepsleft_ = 0;
+
+  // Return if there is no need to scroll or scroll is off
+  if (!this->scroll_ || (this->max_displaybuffer_.size() <= this->num_chips_ * 8)) {
+    this->display();
+    return;
+  }
+
+  if ((this->stepsleft_ == 0) && (now - this->last_scroll_ < this->scroll_delay_)) {
+    this->display();
+    return;
+  }
+
+  // Dwell time at end of string in case of stop at end
+  if (this->scroll_mode_ == 1) {
+    if (this->stepsleft_ >= this->max_displaybuffer_.size() - this->num_chips_ * 8 + 1) {
+      if (now - this->last_scroll_ >= this->scroll_dwell_) {
+        this->stepsleft_ = 0;
+        this->last_scroll_ = now;
+        this->display();
+      }
+      return;
+    }
+  }
+
+  // Actual call to scroll left action
+  if (now - this->last_scroll_ >= this->scroll_speed_) {
+    this->last_scroll_ = now;
+    this->scroll_left();
+    this->display();
+  }
+}
+
+void MAX7219Component::display() {
+  byte pixels[8];
+  // Run this loop for every MAX CHIP (GRID OF 64 leds)
+  // Run this routine for the rows of every chip 8x row 0 top to 7 bottom
+  // Fill the pixel parameter with diplay data
+  // Send the data to the chip
+  for (uint8_t i = 0; i < this->num_chips_; i++) {
+    for (uint8_t j = 0; j < 8; j++) {
+      pixels[j] = this->max_displaybuffer_[i * 8 + j];
+    }
+    this->send64pixels(i, pixels);
+  }
+}
+
+int MAX7219Component::get_height_internal() {
+  return 8;  // TO BE DONE -> STACK TWO DISPLAYS ON TOP OF EACH OTHE
+             // TO BE DONE -> CREATE Virtual size of screen and scroll
+}
+
+int MAX7219Component::get_width_internal() { return this->num_chips_ * 8; }
+
+size_t MAX7219Component::get_buffer_length_() { return this->num_chips_ * 8; }
+
+void HOT MAX7219Component::draw_absolute_pixel_internal(int x, int y, int color) {
+  if (x + 1 > this->max_displaybuffer_.size()) {  // Extend the display buffer in case required
+    this->max_displaybuffer_.resize(x + 1, this->bckgrnd_);
+  }
+
+  if (y >= this->get_height_internal() || y < 0)  // If pixel is outside display then dont draw
+    return;
+
+  uint16_t pos = x;    // X is starting at 0 top left
+  uint8_t subpos = y;  // Y is starting at 0 top left
+
+  if (color == 1) {
+    this->max_displaybuffer_[pos] |= (1 << subpos);
+  } else {
+    this->max_displaybuffer_[pos] &= ~(1 << subpos);
+  }
+}
+
+void MAX7219Component::send_byte_(uint8_t a_register, uint8_t data) {
+  this->write_byte(a_register);  // Write register value to MAX
+  this->write_byte(data);        // Followed by actual data
+}
+void MAX7219Component::send_to_all_(uint8_t a_register, uint8_t data) {
+  this->enable();                                 // Enable SPI
+  for (uint8_t i = 0; i < this->num_chips_; i++)  // Run the loop for every MAX chip in the stack
+    this->send_byte_(a_register, data);           // Send the data to the chips
+  this->disable();                                // Disable SPI
+}
+void MAX7219Component::update() {
+  this->update_ = true;
+  this->max_displaybuffer_.clear();
+  this->max_displaybuffer_.resize(this->num_chips_ * 8, this->bckgrnd_);
+  if (this->writer_local_.has_value())  // insert Labda function if available
+    (*this->writer_local_)(*this);
+}
+
+void MAX7219Component::invert_on_off(bool on_off) { this->invert_ = on_off; };
+void MAX7219Component::invert_on_off() { this->invert_ = !this->invert_; };
+
+void MAX7219Component::turn_on_off(bool on_off) {
+  if (on_off) {
+    this->send_to_all_(MAX7219_REGISTER_SHUTDOWN, 1);
+  } else {
+    this->send_to_all_(MAX7219_REGISTER_SHUTDOWN, 0);
+  }
+}
+
+void MAX7219Component::scroll(bool on_off, uint8_t mode, uint16_t speed, uint16_t delay, uint16_t dwell) {
+  this->set_scroll(on_off);
+  this->set_scroll_mode(mode);
+  this->set_scroll_speed(speed);
+  this->set_scroll_dwell(dwell);
+  this->set_scroll_delay(delay);
+}
+
+void MAX7219Component::scroll(bool on_off, uint8_t mode) {
+  this->set_scroll(on_off);
+  this->set_scroll_mode(mode);
+}
+
+void MAX7219Component::intensity(uint8_t intensity) {
+  this->intensity_ = intensity;
+  this->send_to_all_(MAX7219_REGISTER_INTENSITY, this->intensity_);
+}
+
+void MAX7219Component::scroll(bool on_off) { this->set_scroll(on_off); }
+
+void MAX7219Component::scroll_left() {
+  if (this->update_) {
+    this->max_displaybuffer_.push_back(this->bckgrnd_);
+    for (uint16_t i = 0; i < this->stepsleft_; i++) {
+      this->max_displaybuffer_.push_back(this->max_displaybuffer_.front());
+      this->max_displaybuffer_.erase(this->max_displaybuffer_.begin());
+      this->update_ = false;
+    }
+  } else {
+    this->max_displaybuffer_.push_back(this->max_displaybuffer_.front());
+    this->max_displaybuffer_.erase(this->max_displaybuffer_.begin());
+  }
+  this->stepsleft_++;
+}
+
+void MAX7219Component::send_char(byte chip, byte data) {
+  // get this character from PROGMEM
+  for (byte i = 0; i < 8; i++)
+    this->max_displaybuffer_[chip * 8 + i] = pgm_read_byte(&MAX7219_DOT_MATRIX_FONT[data][i]);
+}  // end of send_char
+
+// send one character (data) to position (chip)
+
+void MAX7219Component::send64pixels(byte chip, const byte pixels[8]) {
+  for (byte col = 0; col < 8; col++) {  // RUN THIS LOOP 8 times until column is 7
+    this->enable();                     // start sending by enabling SPI
+    for (byte i = 0; i < chip; i++)     // send extra NOPs to push the pixels out to extra displays
+      this->send_byte_(MAX7219_REGISTER_NOOP,
+                       MAX7219_REGISTER_NOOP);  // run this loop unit the matching chip is reached
+    byte b = 0;                                 // rotate pixels 90 degrees -- set byte to 0
+    if (this->orientation_ == 0) {
+      for (byte i = 0; i < 8; i++)                // run this loop 8 times for all the pixels[8] received
+        b |= bitRead(pixels[i], col) << (7 - i);  // change the column bits into row bits
+    } else if (this->orientation_ == 1) {
+      b = pixels[col];
+    } else if (this->orientation_ == 2) {
+      for (byte i = 0; i < 8; i++)
+        b |= bitRead(pixels[i], 7 - col) << (7 - i);
+    } else {
+      b = pixels[7 - col];
+    }
+    // send this byte to dispay at selected chip
+    if (this->invert_) {
+      this->send_byte_(col + 1, ~b);
+    } else {
+      this->send_byte_(col + 1, b);
+    }
+    for (int i = 0; i < this->num_chips_ - chip - 1; i++)  // end with enough NOPs so later chips don't update
+      this->send_byte_(MAX7219_REGISTER_NOOP, MAX7219_REGISTER_NOOP);
+    this->disable();  // all done disable SPI
+  }                   // end of for each column
+}  // end of send64pixels
+
+uint8_t MAX7219Component::printdigit(const char *str) { return this->printdigit(0, str); }
+
+uint8_t MAX7219Component::printdigit(uint8_t start_pos, const char *s) {
+  byte chip;
+  for (chip = start_pos; chip < this->num_chips_ && *s; chip++)
+    send_char(chip, *s++);
+  // space out rest
+  while (chip < (this->num_chips_))
+    send_char(chip++, ' ');
+  return 0;
+}  // end of sendString
+
+uint8_t MAX7219Component::printdigitf(uint8_t pos, const char *format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char buffer[64];
+  int ret = vsnprintf(buffer, sizeof(buffer), format, arg);
+  va_end(arg);
+  if (ret > 0)
+    return this->printdigit(pos, buffer);
+  return 0;
+}
+uint8_t MAX7219Component::printdigitf(const char *format, ...) {
+  va_list arg;
+  va_start(arg, format);
+  char buffer[64];
+  int ret = vsnprintf(buffer, sizeof(buffer), format, arg);
+  va_end(arg);
+  if (ret > 0)
+    return this->printdigit(buffer);
+  return 0;
+}
+
+#ifdef USE_TIME
+uint8_t MAX7219Component::strftimedigit(uint8_t pos, const char *format, time::ESPTime time) {
+  char buffer[64];
+  size_t ret = time.strftime(buffer, sizeof(buffer), format);
+  if (ret > 0)
+    return this->printdigit(pos, buffer);
+  return 0;
+}
+uint8_t MAX7219Component::strftimedigit(const char *format, time::ESPTime time) {
+  return this->strftimedigit(0, format, time);
+}
+#endif
+
+}  // namespace max7219digit
+}  // namespace esphome
diff --git a/esphome/components/max7219digit/max7219digit.h b/esphome/components/max7219digit/max7219digit.h
new file mode 100644
index 0000000000..b032f33b58
--- /dev/null
+++ b/esphome/components/max7219digit/max7219digit.h
@@ -0,0 +1,107 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#include "esphome/components/display/display_buffer.h"
+#include "esphome/components/spi/spi.h"
+
+#ifdef USE_TIME
+#include "esphome/components/time/real_time_clock.h"
+#endif
+
+namespace esphome {
+namespace max7219digit {
+
+class MAX7219Component;
+
+using max7219_writer_t = std::function<void(MAX7219Component &)>;
+
+class MAX7219Component : public PollingComponent,
+                         public display::DisplayBuffer,
+                         public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                               spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_1MHZ> {
+ public:
+  void set_writer(max7219_writer_t &&writer) { this->writer_local_ = writer; };
+
+  void setup() override;
+
+  void loop() override;
+
+  void dump_config() override;
+
+  void update() override;
+
+  float get_setup_priority() const override;
+
+  void display();
+
+  void invert_on_off(bool on_off);
+  void invert_on_off();
+
+  void turn_on_off(bool on_off);
+
+  void draw_absolute_pixel_internal(int x, int y, int color) override;
+  int get_height_internal() override;
+  int get_width_internal() override;
+
+  void set_intensity(uint8_t intensity) { this->intensity_ = intensity; };
+  void set_num_chips(uint8_t num_chips) { this->num_chips_ = num_chips; };
+  void set_chip_orientation(uint8_t rotate) { this->orientation_ = rotate; };
+  void set_scroll_speed(uint16_t speed) { this->scroll_speed_ = speed; };
+  void set_scroll_dwell(uint16_t dwell) { this->scroll_dwell_ = dwell; };
+  void set_scroll_delay(uint16_t delay) { this->scroll_delay_ = delay; };
+  void set_scroll(bool on_off) { this->scroll_ = on_off; };
+  void set_scroll_mode(uint8_t mode) { this->scroll_mode_ = mode; };
+
+  void send_char(byte chip, byte data);
+  void send64pixels(byte chip, const byte pixels[8]);
+
+  void scroll_left();
+  void scroll(bool on_off, uint8_t mode, uint16_t speed, uint16_t delay, uint16_t dwell);
+  void scroll(bool on_off, uint8_t mode);
+  void scroll(bool on_off);
+  void intensity(uint8_t intensity);
+
+  /// Evaluate the printf-format and print the result at the given position.
+  uint8_t printdigitf(uint8_t pos, const char *format, ...) __attribute__((format(printf, 3, 4)));
+  /// Evaluate the printf-format and print the result at position 0.
+  uint8_t printdigitf(const char *format, ...) __attribute__((format(printf, 2, 3)));
+
+  /// Print `str` at the given position.
+  uint8_t printdigit(uint8_t pos, const char *str);
+  /// Print `str` at position 0.
+  uint8_t printdigit(const char *str);
+
+#ifdef USE_TIME
+  /// Evaluate the strftime-format and print the result at the given position.
+  uint8_t strftimedigit(uint8_t pos, const char *format, time::ESPTime time) __attribute__((format(strftime, 3, 0)));
+
+  /// Evaluate the strftime-format and print the result at position 0.
+  uint8_t strftimedigit(const char *format, time::ESPTime time) __attribute__((format(strftime, 2, 0)));
+#endif
+
+ protected:
+  void send_byte_(uint8_t a_register, uint8_t data);
+  void send_to_all_(uint8_t a_register, uint8_t data);
+
+  uint8_t intensity_;  /// Intensity of the display from 0 to 15 (most)
+  uint8_t num_chips_;
+  bool scroll_;
+  bool update_{false};
+  uint16_t scroll_speed_;
+  uint16_t scroll_delay_;
+  uint16_t scroll_dwell_;
+  uint16_t old_buffer_size_ = 0;
+  uint8_t scroll_mode_;
+  bool invert_ = false;
+  uint8_t orientation_;
+  uint8_t bckgrnd_ = 0x0;
+  std::vector<uint8_t> max_displaybuffer_;
+  unsigned long last_scroll_ = 0;
+  uint16_t stepsleft_;
+  size_t get_buffer_length_();
+  optional<max7219_writer_t> writer_local_{};
+};
+
+}  // namespace max7219digit
+}  // namespace esphome
diff --git a/esphome/components/max7219digit/max7219font.h b/esphome/components/max7219digit/max7219font.h
new file mode 100644
index 0000000000..3d42d1cc2d
--- /dev/null
+++ b/esphome/components/max7219digit/max7219font.h
@@ -0,0 +1,268 @@
+#pragma once
+
+namespace esphome {
+namespace max7219digit {
+
+// bit patterns for the CP437 font
+
+const byte MAX7219_DOT_MATRIX_FONT[256][8] PROGMEM = {
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},  // 0x00
+    {0x7E, 0x81, 0x95, 0xB1, 0xB1, 0x95, 0x81, 0x7E},  // 0x01
+    {0x7E, 0xFF, 0xEB, 0xCF, 0xCF, 0xEB, 0xFF, 0x7E},  // 0x02
+    {0x0E, 0x1F, 0x3F, 0x7E, 0x3F, 0x1F, 0x0E, 0x00},  // 0x03
+    {0x08, 0x1C, 0x3E, 0x7F, 0x3E, 0x1C, 0x08, 0x00},  // 0x04
+    {0x18, 0xBA, 0xFF, 0xFF, 0xFF, 0xBA, 0x18, 0x00},  // 0x05
+    {0x10, 0xB8, 0xFC, 0xFF, 0xFC, 0xB8, 0x10, 0x00},  // 0x06
+    {0x00, 0x00, 0x18, 0x3C, 0x3C, 0x18, 0x00, 0x00},  // 0x07
+    {0xFF, 0xFF, 0xE7, 0xC3, 0xC3, 0xE7, 0xFF, 0xFF},  // 0x08
+    {0x00, 0x3C, 0x66, 0x42, 0x42, 0x66, 0x3C, 0x00},  // 0x09
+    {0xFF, 0xC3, 0x99, 0xBD, 0xBD, 0x99, 0xC3, 0xFF},  // 0x0A
+    {0x70, 0xF8, 0x88, 0x88, 0xFD, 0x7F, 0x07, 0x0F},  // 0x0B
+    {0x00, 0x4E, 0x5F, 0xF1, 0xF1, 0x5F, 0x4E, 0x00},  // 0x0C
+    {0xC0, 0xE0, 0xFF, 0x7F, 0x05, 0x05, 0x07, 0x07},  // 0x0D
+    {0xC0, 0xFF, 0x7F, 0x05, 0x05, 0x65, 0x7F, 0x3F},  // 0x0E
+    {0x99, 0x5A, 0x3C, 0xE7, 0xE7, 0x3C, 0x5A, 0x99},  // 0x0F
+    {0x7F, 0x3E, 0x3E, 0x1C, 0x1C, 0x08, 0x08, 0x00},  // 0x10
+    {0x08, 0x08, 0x1C, 0x1C, 0x3E, 0x3E, 0x7F, 0x00},  // 0x11
+    {0x00, 0x24, 0x66, 0xFF, 0xFF, 0x66, 0x24, 0x00},  // 0x12
+    {0x00, 0x5F, 0x5F, 0x00, 0x00, 0x5F, 0x5F, 0x00},  // 0x13
+    {0x06, 0x0F, 0x09, 0x7F, 0x7F, 0x01, 0x7F, 0x7F},  // 0x14
+    {0x40, 0xDA, 0xBF, 0xA5, 0xFD, 0x59, 0x03, 0x02},  // 0x15
+    {0x00, 0x70, 0x70, 0x70, 0x70, 0x70, 0x70, 0x00},  // 0x16
+    {0x80, 0x94, 0xB6, 0xFF, 0xFF, 0xB6, 0x94, 0x80},  // 0x17
+    {0x00, 0x04, 0x06, 0x7F, 0x7F, 0x06, 0x04, 0x00},  // 0x18
+    {0x00, 0x10, 0x30, 0x7F, 0x7F, 0x30, 0x10, 0x00},  // 0x19
+    {0x08, 0x08, 0x08, 0x2A, 0x3E, 0x1C, 0x08, 0x00},  // 0x1A
+    {0x08, 0x1C, 0x3E, 0x2A, 0x08, 0x08, 0x08, 0x00},  // 0x1B
+    {0x3C, 0x3C, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00},  // 0x1C
+    {0x08, 0x1C, 0x3E, 0x08, 0x08, 0x3E, 0x1C, 0x08},  // 0x1D
+    {0x30, 0x38, 0x3C, 0x3E, 0x3E, 0x3C, 0x38, 0x30},  // 0x1E
+    {0x06, 0x0E, 0x1E, 0x3E, 0x3E, 0x1E, 0x0E, 0x06},  // 0x1F
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},  // ' '
+    {0x00, 0x06, 0x5F, 0x5F, 0x06, 0x00, 0x00, 0x00},  // '!'
+    {0x00, 0x07, 0x07, 0x00, 0x07, 0x07, 0x00, 0x00},  // '"'
+    {0x14, 0x7F, 0x7F, 0x14, 0x7F, 0x7F, 0x14, 0x00},  // '#'
+    {0x24, 0x2E, 0x6B, 0x6B, 0x3A, 0x12, 0x00, 0x00},  // '$'
+    {0x46, 0x66, 0x30, 0x18, 0x0C, 0x66, 0x62, 0x00},  // '%'
+    {0x30, 0x7A, 0x4F, 0x5D, 0x37, 0x7A, 0x48, 0x00},  // '&'
+    {0x04, 0x07, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00},  // '''
+    {0x00, 0x1C, 0x3E, 0x63, 0x41, 0x00, 0x00, 0x00},  // '('
+    {0x00, 0x41, 0x63, 0x3E, 0x1C, 0x00, 0x00, 0x00},  // ')'
+    {0x08, 0x2A, 0x3E, 0x1C, 0x1C, 0x3E, 0x2A, 0x08},  // '*'
+    {0x08, 0x08, 0x3E, 0x3E, 0x08, 0x08, 0x00, 0x00},  // '+'
+    {0x00, 0x80, 0xE0, 0x60, 0x00, 0x00, 0x00, 0x00},  // ','
+    {0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00},  // '-'
+    {0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00},  // '.'
+    {0x60, 0x30, 0x18, 0x0C, 0x06, 0x03, 0x01, 0x00},  // '/'
+    {0x3E, 0x7F, 0x71, 0x59, 0x4D, 0x7F, 0x3E, 0x00},  // '0'
+    {0x40, 0x42, 0x7F, 0x7F, 0x40, 0x40, 0x00, 0x00},  // '1'
+    {0x62, 0x73, 0x59, 0x49, 0x6F, 0x66, 0x00, 0x00},  // '2'
+    {0x22, 0x63, 0x49, 0x49, 0x7F, 0x36, 0x00, 0x00},  // '3'
+    {0x18, 0x1C, 0x16, 0x53, 0x7F, 0x7F, 0x50, 0x00},  // '4'
+    {0x27, 0x67, 0x45, 0x45, 0x7D, 0x39, 0x00, 0x00},  // '5'
+    {0x3C, 0x7E, 0x4B, 0x49, 0x79, 0x30, 0x00, 0x00},  // '6'
+    {0x03, 0x03, 0x71, 0x79, 0x0F, 0x07, 0x00, 0x00},  // '7'
+    {0x36, 0x7F, 0x49, 0x49, 0x7F, 0x36, 0x00, 0x00},  // '8'
+    {0x06, 0x4F, 0x49, 0x69, 0x3F, 0x1E, 0x00, 0x00},  // '9'
+    {0x00, 0x00, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00},  // ':'
+    {0x00, 0x80, 0xE6, 0x66, 0x00, 0x00, 0x00, 0x00},  // ';'
+    {0x08, 0x1C, 0x36, 0x63, 0x41, 0x00, 0x00, 0x00},  // '<'
+    {0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x00, 0x00},  // '='
+    {0x00, 0x41, 0x63, 0x36, 0x1C, 0x08, 0x00, 0x00},  // '>'
+    {0x02, 0x03, 0x51, 0x59, 0x0F, 0x06, 0x00, 0x00},  // '?'
+    {0x3E, 0x7F, 0x41, 0x5D, 0x5D, 0x1F, 0x1E, 0x00},  // '@'
+    {0x7C, 0x7E, 0x13, 0x13, 0x7E, 0x7C, 0x00, 0x00},  // 'A'
+    {0x41, 0x7F, 0x7F, 0x49, 0x49, 0x7F, 0x36, 0x00},  // 'B'
+    {0x1C, 0x3E, 0x63, 0x41, 0x41, 0x63, 0x22, 0x00},  // 'C'
+    {0x41, 0x7F, 0x7F, 0x41, 0x63, 0x3E, 0x1C, 0x00},  // 'D'
+    {0x41, 0x7F, 0x7F, 0x49, 0x5D, 0x41, 0x63, 0x00},  // 'E'
+    {0x41, 0x7F, 0x7F, 0x49, 0x1D, 0x01, 0x03, 0x00},  // 'F'
+    {0x1C, 0x3E, 0x63, 0x41, 0x51, 0x73, 0x72, 0x00},  // 'G'
+    {0x7F, 0x7F, 0x08, 0x08, 0x7F, 0x7F, 0x00, 0x00},  // 'H'
+    {0x00, 0x41, 0x7F, 0x7F, 0x41, 0x00, 0x00, 0x00},  // 'I'
+    {0x30, 0x70, 0x40, 0x41, 0x7F, 0x3F, 0x01, 0x00},  // 'J'
+    {0x41, 0x7F, 0x7F, 0x08, 0x1C, 0x77, 0x63, 0x00},  // 'K'
+    {0x41, 0x7F, 0x7F, 0x41, 0x40, 0x60, 0x70, 0x00},  // 'L'
+    {0x7F, 0x7F, 0x0E, 0x1C, 0x0E, 0x7F, 0x7F, 0x00},  // 'M'
+    {0x7F, 0x7F, 0x06, 0x0C, 0x18, 0x7F, 0x7F, 0x00},  // 'N'
+    {0x1C, 0x3E, 0x63, 0x41, 0x63, 0x3E, 0x1C, 0x00},  // 'O'
+    {0x41, 0x7F, 0x7F, 0x49, 0x09, 0x0F, 0x06, 0x00},  // 'P'
+    {0x1E, 0x3F, 0x21, 0x71, 0x7F, 0x5E, 0x00, 0x00},  // 'Q'
+    {0x41, 0x7F, 0x7F, 0x09, 0x19, 0x7F, 0x66, 0x00},  // 'R'
+    {0x26, 0x6F, 0x4D, 0x59, 0x73, 0x32, 0x00, 0x00},  // 'S'
+    {0x03, 0x41, 0x7F, 0x7F, 0x41, 0x03, 0x00, 0x00},  // 'T'
+    {0x7F, 0x7F, 0x40, 0x40, 0x7F, 0x7F, 0x00, 0x00},  // 'U'
+    {0x1F, 0x3F, 0x60, 0x60, 0x3F, 0x1F, 0x00, 0x00},  // 'V'
+    {0x7F, 0x7F, 0x30, 0x18, 0x30, 0x7F, 0x7F, 0x00},  // 'W'
+    {0x43, 0x67, 0x3C, 0x18, 0x3C, 0x67, 0x43, 0x00},  // 'X'
+    {0x07, 0x4F, 0x78, 0x78, 0x4F, 0x07, 0x00, 0x00},  // 'Y'
+    {0x47, 0x63, 0x71, 0x59, 0x4D, 0x67, 0x73, 0x00},  // 'Z'
+    {0x00, 0x7F, 0x7F, 0x41, 0x41, 0x00, 0x00, 0x00},  // '['
+    {0x01, 0x03, 0x06, 0x0C, 0x18, 0x30, 0x60, 0x00},  // backslash
+    {0x00, 0x41, 0x41, 0x7F, 0x7F, 0x00, 0x00, 0x00},  // ']'
+    {0x08, 0x0C, 0x06, 0x03, 0x06, 0x0C, 0x08, 0x00},  // '^'
+    {0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80},  // '_'
+    {0x00, 0x00, 0x03, 0x07, 0x04, 0x00, 0x00, 0x00},  // '`'
+    {0x20, 0x74, 0x54, 0x54, 0x3C, 0x78, 0x40, 0x00},  // 'a'
+    {0x41, 0x7F, 0x3F, 0x48, 0x48, 0x78, 0x30, 0x00},  // 'b'
+    {0x38, 0x7C, 0x44, 0x44, 0x6C, 0x28, 0x00, 0x00},  // 'c'
+    {0x30, 0x78, 0x48, 0x49, 0x3F, 0x7F, 0x40, 0x00},  // 'd'
+    {0x38, 0x7C, 0x54, 0x54, 0x5C, 0x18, 0x00, 0x00},  // 'e'
+    {0x48, 0x7E, 0x7F, 0x49, 0x03, 0x02, 0x00, 0x00},  // 'f'
+    {0x98, 0xBC, 0xA4, 0xA4, 0xF8, 0x7C, 0x04, 0x00},  // 'g'
+    {0x41, 0x7F, 0x7F, 0x08, 0x04, 0x7C, 0x78, 0x00},  // 'h'
+    {0x00, 0x44, 0x7D, 0x7D, 0x40, 0x00, 0x00, 0x00},  // 'i'
+    {0x60, 0xE0, 0x80, 0x80, 0xFD, 0x7D, 0x00, 0x00},  // 'j'
+    {0x41, 0x7F, 0x7F, 0x10, 0x38, 0x6C, 0x44, 0x00},  // 'k'
+    {0x00, 0x41, 0x7F, 0x7F, 0x40, 0x00, 0x00, 0x00},  // 'l'
+    {0x7C, 0x7C, 0x18, 0x38, 0x1C, 0x7C, 0x78, 0x00},  // 'm'
+    {0x7C, 0x7C, 0x04, 0x04, 0x7C, 0x78, 0x00, 0x00},  // 'n'
+    {0x38, 0x7C, 0x44, 0x44, 0x7C, 0x38, 0x00, 0x00},  // 'o'
+    {0x84, 0xFC, 0xF8, 0xA4, 0x24, 0x3C, 0x18, 0x00},  // 'p'
+    {0x18, 0x3C, 0x24, 0xA4, 0xF8, 0xFC, 0x84, 0x00},  // 'q'
+    {0x44, 0x7C, 0x78, 0x4C, 0x04, 0x1C, 0x18, 0x00},  // 'r'
+    {0x48, 0x5C, 0x54, 0x54, 0x74, 0x24, 0x00, 0x00},  // 's'
+    {0x00, 0x04, 0x3E, 0x7F, 0x44, 0x24, 0x00, 0x00},  // 't'
+    {0x3C, 0x7C, 0x40, 0x40, 0x3C, 0x7C, 0x40, 0x00},  // 'u'
+    {0x1C, 0x3C, 0x60, 0x60, 0x3C, 0x1C, 0x00, 0x00},  // 'v'
+    {0x3C, 0x7C, 0x70, 0x38, 0x70, 0x7C, 0x3C, 0x00},  // 'w'
+    {0x44, 0x6C, 0x38, 0x10, 0x38, 0x6C, 0x44, 0x00},  // 'x'
+    {0x9C, 0xBC, 0xA0, 0xA0, 0xFC, 0x7C, 0x00, 0x00},  // 'y'
+    {0x4C, 0x64, 0x74, 0x5C, 0x4C, 0x64, 0x00, 0x00},  // 'z'
+    {0x08, 0x08, 0x3E, 0x77, 0x41, 0x41, 0x00, 0x00},  // '{'
+    {0x00, 0x00, 0x00, 0x77, 0x77, 0x00, 0x00, 0x00},  // '|'
+    {0x41, 0x41, 0x77, 0x3E, 0x08, 0x08, 0x00, 0x00},  // '}'
+    {0x02, 0x03, 0x01, 0x03, 0x02, 0x03, 0x01, 0x00},  // '~'
+    {0x70, 0x78, 0x4C, 0x46, 0x4C, 0x78, 0x70, 0x00},  // 0x7F
+    {0x0E, 0x9F, 0x91, 0xB1, 0xFB, 0x4A, 0x00, 0x00},  // 0x80
+    {0x3A, 0x7A, 0x40, 0x40, 0x7A, 0x7A, 0x40, 0x00},  // 0x81
+    {0x38, 0x7C, 0x54, 0x55, 0x5D, 0x19, 0x00, 0x00},  // 0x82
+    {0x02, 0x23, 0x75, 0x55, 0x55, 0x7D, 0x7B, 0x42},  // 0x83
+    {0x21, 0x75, 0x54, 0x54, 0x7D, 0x79, 0x40, 0x00},  // 0x84
+    {0x21, 0x75, 0x55, 0x54, 0x7C, 0x78, 0x40, 0x00},  // 0x85
+    {0x20, 0x74, 0x57, 0x57, 0x7C, 0x78, 0x40, 0x00},  // 0x86
+    {0x18, 0x3C, 0xA4, 0xA4, 0xE4, 0x40, 0x00, 0x00},  // 0x87
+    {0x02, 0x3B, 0x7D, 0x55, 0x55, 0x5D, 0x1B, 0x02},  // 0x88
+    {0x39, 0x7D, 0x54, 0x54, 0x5D, 0x19, 0x00, 0x00},  // 0x89
+    {0x39, 0x7D, 0x55, 0x54, 0x5C, 0x18, 0x00, 0x00},  // 0x8A
+    {0x01, 0x45, 0x7C, 0x7C, 0x41, 0x01, 0x00, 0x00},  // 0x8B
+    {0x02, 0x03, 0x45, 0x7D, 0x7D, 0x43, 0x02, 0x00},  // 0x8C
+    {0x01, 0x45, 0x7D, 0x7C, 0x40, 0x00, 0x00, 0x00},  // 0x8D
+    {0x79, 0x7D, 0x16, 0x12, 0x16, 0x7D, 0x79, 0x00},  // 0x8E
+    {0x70, 0x78, 0x2B, 0x2B, 0x78, 0x70, 0x00, 0x00},  // 0x8F
+    {0x44, 0x7C, 0x7C, 0x55, 0x55, 0x45, 0x00, 0x00},  // 0x90
+    {0x20, 0x74, 0x54, 0x54, 0x7C, 0x7C, 0x54, 0x54},  // 0x91
+    {0x7C, 0x7E, 0x0B, 0x09, 0x7F, 0x7F, 0x49, 0x00},  // 0x92
+    {0x32, 0x7B, 0x49, 0x49, 0x7B, 0x32, 0x00, 0x00},  // 0x93
+    {0x32, 0x7A, 0x48, 0x48, 0x7A, 0x32, 0x00, 0x00},  // 0x94
+    {0x32, 0x7A, 0x4A, 0x48, 0x78, 0x30, 0x00, 0x00},  // 0x95
+    {0x3A, 0x7B, 0x41, 0x41, 0x7B, 0x7A, 0x40, 0x00},  // 0x96
+    {0x3A, 0x7A, 0x42, 0x40, 0x78, 0x78, 0x40, 0x00},  // 0x97
+    {0x9A, 0xBA, 0xA0, 0xA0, 0xFA, 0x7A, 0x00, 0x00},  // 0x98
+    {0x01, 0x19, 0x3C, 0x66, 0x66, 0x3C, 0x19, 0x01},  // 0x99
+    {0x3D, 0x7D, 0x40, 0x40, 0x7D, 0x3D, 0x00, 0x00},  // 0x9A
+    {0x18, 0x3C, 0x24, 0xE7, 0xE7, 0x24, 0x24, 0x00},  // 0x9B
+    {0x68, 0x7E, 0x7F, 0x49, 0x43, 0x66, 0x20, 0x00},  // 0x9C
+    {0x2B, 0x2F, 0xFC, 0xFC, 0x2F, 0x2B, 0x00, 0x00},  // 0x9D
+    {0xFF, 0xFF, 0x09, 0x09, 0x2F, 0xF6, 0xF8, 0xA0},  // 0x9E
+    {0x40, 0xC0, 0x88, 0xFE, 0x7F, 0x09, 0x03, 0x02},  // 0x9F
+    {0x20, 0x74, 0x54, 0x55, 0x7D, 0x79, 0x40, 0x00},  // 0xA0
+    {0x00, 0x44, 0x7D, 0x7D, 0x41, 0x00, 0x00, 0x00},  // 0xA1
+    {0x30, 0x78, 0x48, 0x4A, 0x7A, 0x32, 0x00, 0x00},  // 0xA2
+    {0x38, 0x78, 0x40, 0x42, 0x7A, 0x7A, 0x40, 0x00},  // 0xA3
+    {0x7A, 0x7A, 0x0A, 0x0A, 0x7A, 0x70, 0x00, 0x00},  // 0xA4
+    {0x7D, 0x7D, 0x19, 0x31, 0x7D, 0x7D, 0x00, 0x00},  // 0xA5
+    {0x00, 0x26, 0x2F, 0x29, 0x2F, 0x2F, 0x28, 0x00},  // 0xA6
+    {0x00, 0x26, 0x2F, 0x29, 0x2F, 0x26, 0x00, 0x00},  // 0xA7
+    {0x30, 0x78, 0x4D, 0x45, 0x60, 0x20, 0x00, 0x00},  // 0xA8
+    {0x38, 0x38, 0x08, 0x08, 0x08, 0x08, 0x00, 0x00},  // 0xA9
+    {0x08, 0x08, 0x08, 0x08, 0x38, 0x38, 0x00, 0x00},  // 0xAA
+    {0x4F, 0x6F, 0x30, 0x18, 0xCC, 0xEE, 0xBB, 0x91},  // 0xAB
+    {0x4F, 0x6F, 0x30, 0x18, 0x6C, 0x76, 0xFB, 0xF9},  // 0xAC
+    {0x00, 0x00, 0x00, 0x7B, 0x7B, 0x00, 0x00, 0x00},  // 0xAD
+    {0x08, 0x1C, 0x36, 0x22, 0x08, 0x1C, 0x36, 0x22},  // 0xAE
+    {0x22, 0x36, 0x1C, 0x08, 0x22, 0x36, 0x1C, 0x08},  // 0xAF
+    {0xAA, 0x00, 0x55, 0x00, 0xAA, 0x00, 0x55, 0x00},  // 0xB0
+    {0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55},  // 0xB1
+    {0xDD, 0xFF, 0xAA, 0x77, 0xDD, 0xAA, 0xFF, 0x77},  // 0xB2
+    {0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00},  // 0xB3
+    {0x10, 0x10, 0x10, 0xFF, 0xFF, 0x00, 0x00, 0x00},  // 0xB4
+    {0x14, 0x14, 0x14, 0xFF, 0xFF, 0x00, 0x00, 0x00},  // 0xB5
+    {0x10, 0x10, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00},  // 0xB6
+    {0x10, 0x10, 0xF0, 0xF0, 0x10, 0xF0, 0xF0, 0x00},  // 0xB7
+    {0x14, 0x14, 0x14, 0xFC, 0xFC, 0x00, 0x00, 0x00},  // 0xB8
+    {0x14, 0x14, 0xF7, 0xF7, 0x00, 0xFF, 0xFF, 0x00},  // 0xB9
+    {0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00},  // 0xBA
+    {0x14, 0x14, 0xF4, 0xF4, 0x04, 0xFC, 0xFC, 0x00},  // 0xBB
+    {0x14, 0x14, 0x17, 0x17, 0x10, 0x1F, 0x1F, 0x00},  // 0xBC
+    {0x10, 0x10, 0x1F, 0x1F, 0x10, 0x1F, 0x1F, 0x00},  // 0xBD
+    {0x14, 0x14, 0x14, 0x1F, 0x1F, 0x00, 0x00, 0x00},  // 0xBE
+    {0x10, 0x10, 0x10, 0xF0, 0xF0, 0x00, 0x00, 0x00},  // 0xBF
+    {0x00, 0x00, 0x00, 0x1F, 0x1F, 0x10, 0x10, 0x10},  // 0xC0
+    {0x10, 0x10, 0x10, 0x1F, 0x1F, 0x10, 0x10, 0x10},  // 0xC1
+    {0x10, 0x10, 0x10, 0xF0, 0xF0, 0x10, 0x10, 0x10},  // 0xC2
+    {0x00, 0x00, 0x00, 0xFF, 0xFF, 0x10, 0x10, 0x10},  // 0xC3
+    {0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10},  // 0xC4
+    {0x10, 0x10, 0x10, 0xFF, 0xFF, 0x10, 0x10, 0x10},  // 0xC5
+    {0x00, 0x00, 0x00, 0xFF, 0xFF, 0x14, 0x14, 0x14},  // 0xC6
+    {0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x10},  // 0xC7
+    {0x00, 0x00, 0x1F, 0x1F, 0x10, 0x17, 0x17, 0x14},  // 0xC8
+    {0x00, 0x00, 0xFC, 0xFC, 0x04, 0xF4, 0xF4, 0x14},  // 0xC9
+    {0x14, 0x14, 0x17, 0x17, 0x10, 0x17, 0x17, 0x14},  // 0xCA
+    {0x14, 0x14, 0xF4, 0xF4, 0x04, 0xF4, 0xF4, 0x14},  // 0xCB
+    {0x00, 0x00, 0xFF, 0xFF, 0x00, 0xF7, 0xF7, 0x14},  // 0xCC
+    {0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14},  // 0xCD
+    {0x14, 0x14, 0xF7, 0xF7, 0x00, 0xF7, 0xF7, 0x14},  // 0xCE
+    {0x14, 0x14, 0x14, 0x17, 0x17, 0x14, 0x14, 0x14},  // 0xCF
+    {0x10, 0x10, 0x1F, 0x1F, 0x10, 0x1F, 0x1F, 0x10},  // 0xD0
+    {0x14, 0x14, 0x14, 0xF4, 0xF4, 0x14, 0x14, 0x14},  // 0xD1
+    {0x10, 0x10, 0xF0, 0xF0, 0x10, 0xF0, 0xF0, 0x10},  // 0xD2
+    {0x00, 0x00, 0x1F, 0x1F, 0x10, 0x1F, 0x1F, 0x10},  // 0xD3
+    {0x00, 0x00, 0x00, 0x1F, 0x1F, 0x14, 0x14, 0x14},  // 0xD4
+    {0x00, 0x00, 0x00, 0xFC, 0xFC, 0x14, 0x14, 0x14},  // 0xD5
+    {0x00, 0x00, 0xF0, 0xF0, 0x10, 0xF0, 0xF0, 0x10},  // 0xD6
+    {0x10, 0x10, 0xFF, 0xFF, 0x10, 0xFF, 0xFF, 0x10},  // 0xD7
+    {0x14, 0x14, 0x14, 0xFF, 0xFF, 0x14, 0x14, 0x14},  // 0xD8
+    {0x10, 0x10, 0x10, 0x1F, 0x1F, 0x00, 0x00, 0x00},  // 0xD9
+    {0x00, 0x00, 0x00, 0xF0, 0xF0, 0x10, 0x10, 0x10},  // 0xDA
+    {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},  // 0xDB
+    {0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0, 0xF0},  // 0xDC
+    {0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00},  // 0xDD
+    {0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF},  // 0xDE
+    {0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F},  // 0xDF
+    {0x38, 0x7C, 0x44, 0x6C, 0x38, 0x6C, 0x44, 0x00},  // 0xE0
+    {0xFC, 0xFE, 0x2A, 0x2A, 0x3E, 0x14, 0x00, 0x00},  // 0xE1
+    {0x7E, 0x7E, 0x02, 0x02, 0x06, 0x06, 0x00, 0x00},  // 0xE2
+    {0x02, 0x7E, 0x7E, 0x02, 0x7E, 0x7E, 0x02, 0x00},  // 0xE3
+    {0x63, 0x77, 0x5D, 0x49, 0x63, 0x63, 0x00, 0x00},  // 0xE4
+    {0x38, 0x7C, 0x44, 0x7C, 0x3C, 0x04, 0x04, 0x00},  // 0xE5
+    {0x80, 0xFE, 0x7E, 0x20, 0x20, 0x3E, 0x1E, 0x00},  // 0xE6
+    {0x04, 0x06, 0x02, 0x7E, 0x7C, 0x06, 0x02, 0x00},  // 0xE7
+    {0x99, 0xBD, 0xE7, 0xE7, 0xBD, 0x99, 0x00, 0x00},  // 0xE8
+    {0x1C, 0x3E, 0x6B, 0x49, 0x6B, 0x3E, 0x1C, 0x00},  // 0xE9
+    {0x4C, 0x7E, 0x73, 0x01, 0x73, 0x7E, 0x4C, 0x00},  // 0xEA
+    {0x30, 0x78, 0x4A, 0x4F, 0x7D, 0x39, 0x00, 0x00},  // 0xEB
+    {0x18, 0x3C, 0x24, 0x3C, 0x3C, 0x24, 0x3C, 0x18},  // 0xEC
+    {0x98, 0xFC, 0x64, 0x3C, 0x3E, 0x27, 0x3D, 0x18},  // 0xED
+    {0x1C, 0x3E, 0x6B, 0x49, 0x49, 0x00, 0x00, 0x00},  // 0xEE
+    {0x7E, 0x7F, 0x01, 0x01, 0x7F, 0x7E, 0x00, 0x00},  // 0xEF
+    {0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x2A, 0x00, 0x00},  // 0xF0
+    {0x44, 0x44, 0x5F, 0x5F, 0x44, 0x44, 0x00, 0x00},  // 0xF1
+    {0x40, 0x51, 0x5B, 0x4E, 0x44, 0x40, 0x00, 0x00},  // 0xF2
+    {0x40, 0x44, 0x4E, 0x5B, 0x51, 0x40, 0x00, 0x00},  // 0xF3
+    {0x00, 0x00, 0x00, 0xFE, 0xFF, 0x01, 0x07, 0x06},  // 0xF4
+    {0x60, 0xE0, 0x80, 0xFF, 0x7F, 0x00, 0x00, 0x00},  // 0xF5
+    {0x08, 0x08, 0x6B, 0x6B, 0x08, 0x08, 0x00, 0x00},  // 0xF6
+    {0x24, 0x36, 0x12, 0x36, 0x24, 0x36, 0x12, 0x00},  // 0xF7
+    {0x00, 0x06, 0x0F, 0x09, 0x0F, 0x06, 0x00, 0x00},  // 0xF8
+    {0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00},  // 0xF9
+    {0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00},  // 0xFA
+    {0x10, 0x30, 0x70, 0xC0, 0xFF, 0xFF, 0x01, 0x01},  // 0xFB
+    {0x00, 0x1F, 0x1F, 0x01, 0x1F, 0x1E, 0x00, 0x00},  // 0xFC
+    {0x00, 0x19, 0x1D, 0x17, 0x12, 0x00, 0x00, 0x00},  // 0xFD
+    {0x00, 0x00, 0x3C, 0x3C, 0x3C, 0x3C, 0x00, 0x00},  // 0xFE
+    {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},  // 0xFF
+};                                                     // end of MAX7219_Dot_Matrix_font
+
+}  // namespace max7219digit
+}  // namespace esphome
diff --git a/tests/test3.yaml b/tests/test3.yaml
index dded01fb67..edbf472657 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -803,6 +803,7 @@ tm1651:
   id: tm1651_battery
   clk_pin: D6
   dio_pin: D5
+
 rf_bridge:
   on_code_received:
     - lambda: |-
@@ -817,3 +818,14 @@ rf_bridge:
         high: 0x1234
         code: 0x123456
     - rf_bridge.learn
+
+display:
+  - platform: max7219digit
+    cs_pin: GPIO15
+    num_chips: 4
+    rotate_chip: 0
+    intensity: 10
+    scroll_mode: 'STOP'
+    id: my_matrix
+    lambda: |-
+      it.printdigit("hello");

From 491f7e96f0b3ab26b84b4a6fd65cf4323a40bddb Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Sun, 28 Jun 2020 16:37:36 -0500
Subject: [PATCH 252/412] Add support for ST7789V display module (as on TTGO
 T-Display) (#1050)

* TFT-LCD ST7789V of ESP32 TTGO.

This patch allows you to use TFT-LCD ST7789V of ESP32 TTGO

* Lots of polish and a few tweaks

* Add test

* Add color to core, take 1

* Where did those tabs come from?

* Fix lines too long

* Added color component

* Linted

* Rebase, SPI fix, test

* Shuffle bits

* One more thing...oops

* Image type fix...oops

* Make display_buffer use Color

* Fix BGR/RGB, remove predefined colors

* Fix all the things

* renamed colors to color

* migrate max7219

Co-authored-by: musk95 <musk95@naver.com>
Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/color/__init__.py          |  23 ++
 esphome/components/display/display_buffer.cpp |  82 ++++--
 esphome/components/display/display_buffer.h   |  47 +--
 esphome/components/image/__init__.py          |  71 +++--
 .../components/max7219digit/max7219digit.cpp  |   4 +-
 .../components/max7219digit/max7219digit.h    |   2 +-
 esphome/components/pcd8544/pcd_8544.cpp       |   8 +-
 esphome/components/pcd8544/pcd_8544.h         |   4 +-
 .../components/ssd1306_base/ssd1306_base.cpp  |   8 +-
 .../components/ssd1306_base/ssd1306_base.h    |   4 +-
 .../components/ssd1325_base/ssd1325_base.cpp  |   8 +-
 .../components/ssd1325_base/ssd1325_base.h    |   4 +-
 esphome/components/st7789v/__init__.py        |   3 +
 esphome/components/st7789v/display.py         |  44 +++
 esphome/components/st7789v/st7789v.cpp        | 274 ++++++++++++++++++
 esphome/components/st7789v/st7789v.h          | 151 ++++++++++
 .../waveshare_epaper/waveshare_epaper.cpp     |   8 +-
 .../waveshare_epaper/waveshare_epaper.h       |   4 +-
 esphome/const.py                              |   1 +
 esphome/core/color.h                          | 161 ++++++++++
 tests/test1.yaml                              |  17 ++
 21 files changed, 843 insertions(+), 85 deletions(-)
 create mode 100644 esphome/components/color/__init__.py
 create mode 100644 esphome/components/st7789v/__init__.py
 create mode 100644 esphome/components/st7789v/display.py
 create mode 100644 esphome/components/st7789v/st7789v.cpp
 create mode 100644 esphome/components/st7789v/st7789v.h
 create mode 100644 esphome/core/color.h

diff --git a/esphome/components/color/__init__.py b/esphome/components/color/__init__.py
new file mode 100644
index 0000000000..3e2e7b2c07
--- /dev/null
+++ b/esphome/components/color/__init__.py
@@ -0,0 +1,23 @@
+from esphome import config_validation as cv
+from esphome import codegen as cg
+from esphome.const import CONF_BLUE, CONF_GREEN, CONF_ID, CONF_RED, CONF_WHITE
+
+ColorStruct = cg.esphome_ns.struct('Color')
+
+MULTI_CONF = True
+CONFIG_SCHEMA = cv.Schema({
+    cv.Required(CONF_ID): cv.declare_id(ColorStruct),
+    cv.Optional(CONF_RED, default=0.0): cv.percentage,
+    cv.Optional(CONF_GREEN, default=0.0): cv.percentage,
+    cv.Optional(CONF_BLUE, default=0.0): cv.percentage,
+    cv.Optional(CONF_WHITE, default=0.0): cv.percentage,
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    cg.variable(config[CONF_ID], cg.StructInitializer(
+        ColorStruct,
+        ('r', config[CONF_RED]),
+        ('g', config[CONF_GREEN]),
+        ('b', config[CONF_BLUE]),
+        ('w', config[CONF_WHITE])))
diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 453e114338..cd28e45071 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -7,8 +7,8 @@ namespace display {
 
 static const char *TAG = "display";
 
-const uint8_t COLOR_OFF = 0;
-const uint8_t COLOR_ON = 1;
+const Color COLOR_OFF = 0;
+const Color COLOR_ON = 1;
 
 void DisplayBuffer::init_internal_(uint32_t buffer_length) {
   this->buffer_ = new uint8_t[buffer_length];
@@ -18,7 +18,7 @@ void DisplayBuffer::init_internal_(uint32_t buffer_length) {
   }
   this->clear();
 }
-void DisplayBuffer::fill(int color) { this->filled_rectangle(0, 0, this->get_width(), this->get_height(), color); }
+void DisplayBuffer::fill(Color color) { this->filled_rectangle(0, 0, this->get_width(), this->get_height(), color); }
 void DisplayBuffer::clear() { this->fill(COLOR_OFF); }
 int DisplayBuffer::get_width() {
   switch (this->rotation_) {
@@ -43,7 +43,7 @@ int DisplayBuffer::get_height() {
   }
 }
 void DisplayBuffer::set_rotation(DisplayRotation rotation) { this->rotation_ = rotation; }
-void HOT DisplayBuffer::draw_pixel_at(int x, int y, int color) {
+void HOT DisplayBuffer::draw_pixel_at(int x, int y, Color color) {
   switch (this->rotation_) {
     case DISPLAY_ROTATION_0_DEGREES:
       break;
@@ -63,7 +63,7 @@ void HOT DisplayBuffer::draw_pixel_at(int x, int y, int color) {
   this->draw_absolute_pixel_internal(x, y, color);
   App.feed_wdt();
 }
-void HOT DisplayBuffer::line(int x1, int y1, int x2, int y2, int color) {
+void HOT DisplayBuffer::line(int x1, int y1, int x2, int y2, Color color) {
   const int32_t dx = abs(x2 - x1), sx = x1 < x2 ? 1 : -1;
   const int32_t dy = -abs(y2 - y1), sy = y1 < y2 ? 1 : -1;
   int32_t err = dx + dy;
@@ -83,29 +83,29 @@ void HOT DisplayBuffer::line(int x1, int y1, int x2, int y2, int color) {
     }
   }
 }
-void HOT DisplayBuffer::horizontal_line(int x, int y, int width, int color) {
+void HOT DisplayBuffer::horizontal_line(int x, int y, int width, Color color) {
   // Future: Could be made more efficient by manipulating buffer directly in certain rotations.
   for (int i = x; i < x + width; i++)
     this->draw_pixel_at(i, y, color);
 }
-void HOT DisplayBuffer::vertical_line(int x, int y, int height, int color) {
+void HOT DisplayBuffer::vertical_line(int x, int y, int height, Color color) {
   // Future: Could be made more efficient by manipulating buffer directly in certain rotations.
   for (int i = y; i < y + height; i++)
     this->draw_pixel_at(x, i, color);
 }
-void DisplayBuffer::rectangle(int x1, int y1, int width, int height, int color) {
+void DisplayBuffer::rectangle(int x1, int y1, int width, int height, Color color) {
   this->horizontal_line(x1, y1, width, color);
   this->horizontal_line(x1, y1 + height - 1, width, color);
   this->vertical_line(x1, y1, height, color);
   this->vertical_line(x1 + width - 1, y1, height, color);
 }
-void DisplayBuffer::filled_rectangle(int x1, int y1, int width, int height, int color) {
+void DisplayBuffer::filled_rectangle(int x1, int y1, int width, int height, Color color) {
   // Future: Use vertical_line and horizontal_line methods depending on rotation to reduce memory accesses.
   for (int i = y1; i < y1 + height; i++) {
     this->horizontal_line(x1, i, width, color);
   }
 }
-void HOT DisplayBuffer::circle(int center_x, int center_xy, int radius, int color) {
+void HOT DisplayBuffer::circle(int center_x, int center_xy, int radius, Color color) {
   int dx = -radius;
   int dy = 0;
   int err = 2 - 2 * radius;
@@ -128,7 +128,7 @@ void HOT DisplayBuffer::circle(int center_x, int center_xy, int radius, int colo
     }
   } while (dx <= 0);
 }
-void DisplayBuffer::filled_circle(int center_x, int center_y, int radius, int color) {
+void DisplayBuffer::filled_circle(int center_x, int center_y, int radius, Color color) {
   int dx = -int32_t(radius);
   int dy = 0;
   int err = 2 - 2 * radius;
@@ -155,7 +155,7 @@ void DisplayBuffer::filled_circle(int center_x, int center_y, int radius, int co
   } while (dx <= 0);
 }
 
-void DisplayBuffer::print(int x, int y, Font *font, int color, TextAlign align, const char *text) {
+void DisplayBuffer::print(int x, int y, Font *font, Color color, TextAlign align, const char *text) {
   int x_start, y_start;
   int width, height;
   this->get_text_bounds(x, y, text, font, align, &x_start, &y_start, &width, &height);
@@ -197,16 +197,34 @@ void DisplayBuffer::print(int x, int y, Font *font, int color, TextAlign align,
     i += match_length;
   }
 }
-void DisplayBuffer::vprintf_(int x, int y, Font *font, int color, TextAlign align, const char *format, va_list arg) {
+void DisplayBuffer::vprintf_(int x, int y, Font *font, Color color, TextAlign align, const char *format, va_list arg) {
   char buffer[256];
   int ret = vsnprintf(buffer, sizeof(buffer), format, arg);
   if (ret > 0)
     this->print(x, y, font, color, align, buffer);
 }
-void DisplayBuffer::image(int x, int y, Image *image) {
-  for (int img_x = 0; img_x < image->get_width(); img_x++) {
-    for (int img_y = 0; img_y < image->get_height(); img_y++) {
-      this->draw_pixel_at(x + img_x, y + img_y, image->get_pixel(img_x, img_y) ? COLOR_ON : COLOR_OFF);
+void DisplayBuffer::image(int x, int y, Image *image) { this->image(x, y, COLOR_ON, image); }
+void DisplayBuffer::image(int x, int y, Color color, Image *image, bool invert) {
+  if (image->get_type() == BINARY) {
+    for (int img_x = 0; img_x < image->get_width(); img_x++) {
+      for (int img_y = 0; img_y < image->get_height(); img_y++) {
+        if (invert)
+          this->draw_pixel_at(x + img_x, y + img_y, image->get_pixel(img_x, img_y) ? COLOR_OFF : color);
+        else
+          this->draw_pixel_at(x + img_x, y + img_y, image->get_pixel(img_x, img_y) ? color : COLOR_OFF);
+      }
+    }
+  } else if (image->get_type() == GRAYSCALE4) {
+    for (int img_x = 0; img_x < image->get_width(); img_x++) {
+      for (int img_y = 0; img_y < image->get_height(); img_y++) {
+        this->draw_pixel_at(x + img_x, y + img_y, image->get_grayscale4_pixel(img_x, img_y));
+      }
+    }
+  } else if (image->get_type() == RGB565) {
+    for (int img_x = 0; img_x < image->get_width(); img_x++) {
+      for (int img_y = 0; img_y < image->get_height(); img_y++) {
+        this->draw_pixel_at(x + img_x, y + img_y, image->get_color_pixel(img_x, img_y));
+      }
     }
   }
 }
@@ -248,7 +266,7 @@ void DisplayBuffer::get_text_bounds(int x, int y, const char *text, Font *font,
       break;
   }
 }
-void DisplayBuffer::print(int x, int y, Font *font, int color, const char *text) {
+void DisplayBuffer::print(int x, int y, Font *font, Color color, const char *text) {
   this->print(x, y, font, color, TextAlign::TOP_LEFT, text);
 }
 void DisplayBuffer::print(int x, int y, Font *font, TextAlign align, const char *text) {
@@ -257,13 +275,13 @@ void DisplayBuffer::print(int x, int y, Font *font, TextAlign align, const char
 void DisplayBuffer::print(int x, int y, Font *font, const char *text) {
   this->print(x, y, font, COLOR_ON, TextAlign::TOP_LEFT, text);
 }
-void DisplayBuffer::printf(int x, int y, Font *font, int color, TextAlign align, const char *format, ...) {
+void DisplayBuffer::printf(int x, int y, Font *font, Color color, TextAlign align, const char *format, ...) {
   va_list arg;
   va_start(arg, format);
   this->vprintf_(x, y, font, color, align, format, arg);
   va_end(arg);
 }
-void DisplayBuffer::printf(int x, int y, Font *font, int color, const char *format, ...) {
+void DisplayBuffer::printf(int x, int y, Font *font, Color color, const char *format, ...) {
   va_list arg;
   va_start(arg, format);
   this->vprintf_(x, y, font, color, TextAlign::TOP_LEFT, format, arg);
@@ -306,14 +324,14 @@ void DisplayBuffer::do_update_() {
   }
 }
 #ifdef USE_TIME
-void DisplayBuffer::strftime(int x, int y, Font *font, int color, TextAlign align, const char *format,
+void DisplayBuffer::strftime(int x, int y, Font *font, Color color, TextAlign align, const char *format,
                              time::ESPTime time) {
   char buffer[64];
   size_t ret = time.strftime(buffer, sizeof(buffer), format);
   if (ret > 0)
     this->print(x, y, font, color, align, buffer);
 }
-void DisplayBuffer::strftime(int x, int y, Font *font, int color, const char *format, time::ESPTime time) {
+void DisplayBuffer::strftime(int x, int y, Font *font, Color color, const char *format, time::ESPTime time) {
   this->strftime(x, y, font, color, TextAlign::TOP_LEFT, format, time);
 }
 void DisplayBuffer::strftime(int x, int y, Font *font, TextAlign align, const char *format, time::ESPTime time) {
@@ -431,10 +449,30 @@ bool Image::get_pixel(int x, int y) const {
   const uint32_t pos = x + y * width_8;
   return pgm_read_byte(this->data_start_ + (pos / 8u)) & (0x80 >> (pos % 8u));
 }
+int Image::get_color_pixel(int x, int y) const {
+  if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
+    return 0;
+
+  const uint32_t pos = (x + y * this->width_) * 2;
+  int color = (pgm_read_byte(this->data_start_ + pos) << 8) + (pgm_read_byte(this->data_start_ + pos + 1));
+  return color;
+}
+int Image::get_grayscale4_pixel(int x, int y) const {
+  if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
+    return 0;
+  const uint32_t pos = (x + y * this->width_) / 2;
+  // 2 = number of pixels per byte, 4 = pixel shift
+  uint8_t shift = (x % 2) * 4;
+  int color = (pgm_read_byte(this->data_start_ + pos) >> shift) & 0x0f;
+  return color;
+}
 int Image::get_width() const { return this->width_; }
 int Image::get_height() const { return this->height_; }
+ImageType Image::get_type() const { return this->type_; }
 Image::Image(const uint8_t *data_start, int width, int height)
     : width_(width), height_(height), data_start_(data_start) {}
+Image::Image(const uint8_t *data_start, int width, int height, int type)
+    : width_(width), height_(height), type_((ImageType) type), data_start_(data_start) {}
 
 DisplayPage::DisplayPage(const display_writer_t &writer) : writer_(writer) {}
 void DisplayPage::show() { this->parent_->show_page(this); }
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index b12fad8c8a..969a5d80cd 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -3,6 +3,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/automation.h"
+#include "esphome/core/color.h"
 
 #ifdef USE_TIME
 #include "esphome/components/time/real_time_clock.h"
@@ -63,9 +64,11 @@ enum class TextAlign {
 };
 
 /// Turn the pixel OFF.
-extern const uint8_t COLOR_OFF;
+extern const Color COLOR_OFF;
 /// Turn the pixel ON.
-extern const uint8_t COLOR_ON;
+extern const Color COLOR_ON;
+
+enum ImageType { BINARY = 0, GRAYSCALE4 = 1, RGB565 = 2 };
 
 enum DisplayRotation {
   DISPLAY_ROTATION_0_DEGREES = 0,
@@ -91,7 +94,7 @@ using display_writer_t = std::function<void(DisplayBuffer &)>;
 class DisplayBuffer {
  public:
   /// Fill the entire screen with the given color.
-  virtual void fill(int color);
+  virtual void fill(Color color);
   /// Clear the entire screen by filling it with OFF pixels.
   void clear();
 
@@ -100,29 +103,29 @@ class DisplayBuffer {
   /// Get the height of the image in pixels with rotation applied.
   int get_height();
   /// Set a single pixel at the specified coordinates to the given color.
-  void draw_pixel_at(int x, int y, int color = COLOR_ON);
+  void draw_pixel_at(int x, int y, Color color = COLOR_ON);
 
   /// Draw a straight line from the point [x1,y1] to [x2,y2] with the given color.
-  void line(int x1, int y1, int x2, int y2, int color = COLOR_ON);
+  void line(int x1, int y1, int x2, int y2, Color color = COLOR_ON);
 
   /// Draw a horizontal line from the point [x,y] to [x+width,y] with the given color.
-  void horizontal_line(int x, int y, int width, int color = COLOR_ON);
+  void horizontal_line(int x, int y, int width, Color color = COLOR_ON);
 
   /// Draw a vertical line from the point [x,y] to [x,y+width] with the given color.
-  void vertical_line(int x, int y, int height, int color = COLOR_ON);
+  void vertical_line(int x, int y, int height, Color color = COLOR_ON);
 
   /// Draw the outline of a rectangle with the top left point at [x1,y1] and the bottom right point at
   /// [x1+width,y1+height].
-  void rectangle(int x1, int y1, int width, int height, int color = COLOR_ON);
+  void rectangle(int x1, int y1, int width, int height, Color color = COLOR_ON);
 
   /// Fill a rectangle with the top left point at [x1,y1] and the bottom right point at [x1+width,y1+height].
-  void filled_rectangle(int x1, int y1, int width, int height, int color = COLOR_ON);
+  void filled_rectangle(int x1, int y1, int width, int height, Color color = COLOR_ON);
 
   /// Draw the outline of a circle centered around [center_x,center_y] with the radius radius with the given color.
-  void circle(int center_x, int center_xy, int radius, int color = COLOR_ON);
+  void circle(int center_x, int center_xy, int radius, Color color = COLOR_ON);
 
   /// Fill a circle centered around [center_x,center_y] with the radius radius with the given color.
-  void filled_circle(int center_x, int center_y, int radius, int color = COLOR_ON);
+  void filled_circle(int center_x, int center_y, int radius, Color color = COLOR_ON);
 
   /** Print `text` with the anchor point at [x,y] with `font`.
    *
@@ -133,7 +136,7 @@ class DisplayBuffer {
    * @param align The alignment of the text.
    * @param text The text to draw.
    */
-  void print(int x, int y, Font *font, int color, TextAlign align, const char *text);
+  void print(int x, int y, Font *font, Color color, TextAlign align, const char *text);
 
   /** Print `text` with the top left at [x,y] with `font`.
    *
@@ -143,7 +146,7 @@ class DisplayBuffer {
    * @param color The color to draw the text with.
    * @param text The text to draw.
    */
-  void print(int x, int y, Font *font, int color, const char *text);
+  void print(int x, int y, Font *font, Color color, const char *text);
 
   /** Print `text` with the anchor point at [x,y] with `font`.
    *
@@ -174,7 +177,7 @@ class DisplayBuffer {
    * @param format The format to use.
    * @param ... The arguments to use for the text formatting.
    */
-  void printf(int x, int y, Font *font, int color, TextAlign align, const char *format, ...)
+  void printf(int x, int y, Font *font, Color color, TextAlign align, const char *format, ...)
       __attribute__((format(printf, 7, 8)));
 
   /** Evaluate the printf-format `format` and print the result with the top left at [x,y] with `font`.
@@ -186,7 +189,7 @@ class DisplayBuffer {
    * @param format The format to use.
    * @param ... The arguments to use for the text formatting.
    */
-  void printf(int x, int y, Font *font, int color, const char *format, ...) __attribute__((format(printf, 6, 7)));
+  void printf(int x, int y, Font *font, Color color, const char *format, ...) __attribute__((format(printf, 6, 7)));
 
   /** Evaluate the printf-format `format` and print the result with the anchor point at [x,y] with `font`.
    *
@@ -220,7 +223,7 @@ class DisplayBuffer {
    * @param format The strftime format to use.
    * @param time The time to format.
    */
-  void strftime(int x, int y, Font *font, int color, TextAlign align, const char *format, time::ESPTime time)
+  void strftime(int x, int y, Font *font, Color color, TextAlign align, const char *format, time::ESPTime time)
       __attribute__((format(strftime, 7, 0)));
 
   /** Evaluate the strftime-format `format` and print the result with the top left at [x,y] with `font`.
@@ -232,7 +235,7 @@ class DisplayBuffer {
    * @param format The strftime format to use.
    * @param time The time to format.
    */
-  void strftime(int x, int y, Font *font, int color, const char *format, time::ESPTime time)
+  void strftime(int x, int y, Font *font, Color color, const char *format, time::ESPTime time)
       __attribute__((format(strftime, 6, 0)));
 
   /** Evaluate the strftime-format `format` and print the result with the anchor point at [x,y] with `font`.
@@ -261,6 +264,7 @@ class DisplayBuffer {
 
   /// Draw the `image` with the top-left corner at [x,y] to the screen.
   void image(int x, int y, Image *image);
+  void image(int x, int y, Color color, Image *image, bool invert = false);
 
   /** Get the text bounds of the given string.
    *
@@ -290,9 +294,9 @@ class DisplayBuffer {
   void set_rotation(DisplayRotation rotation);
 
  protected:
-  void vprintf_(int x, int y, Font *font, int color, TextAlign align, const char *format, va_list arg);
+  void vprintf_(int x, int y, Font *font, Color color, TextAlign align, const char *format, va_list arg);
 
-  virtual void draw_absolute_pixel_internal(int x, int y, int color) = 0;
+  virtual void draw_absolute_pixel_internal(int x, int y, Color color) = 0;
 
   virtual int get_height_internal() = 0;
 
@@ -378,13 +382,18 @@ class Font {
 class Image {
  public:
   Image(const uint8_t *data_start, int width, int height);
+  Image(const uint8_t *data_start, int width, int height, int type);
   bool get_pixel(int x, int y) const;
+  int get_color_pixel(int x, int y) const;
+  int get_grayscale4_pixel(int x, int y) const;
   int get_width() const;
   int get_height() const;
+  ImageType get_type() const;
 
  protected:
   int width_;
   int height_;
+  ImageType type_{BINARY};
   const uint8_t *data_start_;
 };
 
diff --git a/esphome/components/image/__init__.py b/esphome/components/image/__init__.py
index d0a41a7379..62379b11bb 100644
--- a/esphome/components/image/__init__.py
+++ b/esphome/components/image/__init__.py
@@ -4,13 +4,15 @@ from esphome import core
 from esphome.components import display, font
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_FILE, CONF_ID, CONF_RESIZE
+from esphome.const import CONF_FILE, CONF_ID, CONF_RESIZE, CONF_TYPE
 from esphome.core import CORE, HexInt
 _LOGGER = logging.getLogger(__name__)
 
 DEPENDENCIES = ['display']
 MULTI_CONF = True
 
+ImageType = {'binary': 0, 'grayscale4': 1, 'rgb565': 2}
+
 Image_ = display.display_ns.class_('Image')
 
 CONF_RAW_DATA_ID = 'raw_data_id'
@@ -19,6 +21,7 @@ IMAGE_SCHEMA = cv.Schema({
     cv.Required(CONF_ID): cv.declare_id(Image_),
     cv.Required(CONF_FILE): cv.file_,
     cv.Optional(CONF_RESIZE): cv.dimensions,
+    cv.Optional(CONF_TYPE): cv.string,
     cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
 })
 
@@ -37,20 +40,54 @@ def to_code(config):
     if CONF_RESIZE in config:
         image.thumbnail(config[CONF_RESIZE])
 
-    image = image.convert('1', dither=Image.NONE)
-    width, height = image.size
-    if width > 500 or height > 500:
-        _LOGGER.warning("The image you requested is very big. Please consider using the resize "
-                        "parameter")
-    width8 = ((width + 7) // 8) * 8
-    data = [0 for _ in range(height * width8 // 8)]
-    for y in range(height):
-        for x in range(width):
-            if image.getpixel((x, y)):
-                continue
-            pos = x + y * width8
-            data[pos // 8] |= 0x80 >> (pos % 8)
+    if CONF_TYPE in config:
+        if config[CONF_TYPE].startswith('GRAYSCALE4'):
+            width, height = image.size
+            image = image.convert('L', dither=Image.NONE)
+            pixels = list(image.getdata())
+            data = [0 for _ in range(height * width // 2)]
+            pos = 0
+            for pixnum, pix in enumerate(pixels):
+                pixshift = (pixnum % 2) * 4
+                data[pos] |= (pix >> 4) << pixshift
+                if pixshift != 0:
+                    pos += 1
+            rhs = [HexInt(x) for x in data]
+            prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
+            cg.new_Pvariable(config[CONF_ID], prog_arr, width, height, ImageType['grayscale4'])
+        elif config[CONF_TYPE].startswith('RGB565'):
+            width, height = image.size
+            image = image.convert('RGB')
+            pixels = list(image.getdata())
+            data = [0 for _ in range(height * width * 2)]
+            pos = 0
+            for pix in pixels:
+                r = (pix[0] >> 3) & 0x1F
+                g = (pix[1] >> 2) & 0x3F
+                b = (pix[2] >> 3) & 0x1F
+                p = (r << 11) + (g << 5) + b
+                data[pos] = (p >> 8) & 0xFF
+                pos += 1
+                data[pos] = p & 0xFF
+                pos += 1
+            rhs = [HexInt(x) for x in data]
+            prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
+            cg.new_Pvariable(config[CONF_ID], prog_arr, width, height, ImageType['rgb565'])
+    else:
+        image = image.convert('1', dither=Image.NONE)
+        width, height = image.size
+        if width > 500 or height > 500:
+            _LOGGER.warning("The image you requested is very big. Please consider using"
+                            " the resize parameter.")
+        width8 = ((width + 7) // 8) * 8
+        data = [0 for _ in range(height * width8 // 8)]
+        for y in range(height):
+            for x in range(width):
+                if image.getpixel((x, y)):
+                    continue
+                pos = x + y * width8
+                data[pos // 8] |= 0x80 >> (pos % 8)
 
-    rhs = [HexInt(x) for x in data]
-    prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
-    cg.new_Pvariable(config[CONF_ID], prog_arr, width, height)
+        rhs = [HexInt(x) for x in data]
+        prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
+        cg.new_Pvariable(config[CONF_ID], prog_arr, width, height)
diff --git a/esphome/components/max7219digit/max7219digit.cpp b/esphome/components/max7219digit/max7219digit.cpp
index b19f05143f..dff1d27370 100644
--- a/esphome/components/max7219digit/max7219digit.cpp
+++ b/esphome/components/max7219digit/max7219digit.cpp
@@ -123,7 +123,7 @@ int MAX7219Component::get_width_internal() { return this->num_chips_ * 8; }
 
 size_t MAX7219Component::get_buffer_length_() { return this->num_chips_ * 8; }
 
-void HOT MAX7219Component::draw_absolute_pixel_internal(int x, int y, int color) {
+void HOT MAX7219Component::draw_absolute_pixel_internal(int x, int y, Color color) {
   if (x + 1 > this->max_displaybuffer_.size()) {  // Extend the display buffer in case required
     this->max_displaybuffer_.resize(x + 1, this->bckgrnd_);
   }
@@ -134,7 +134,7 @@ void HOT MAX7219Component::draw_absolute_pixel_internal(int x, int y, int color)
   uint16_t pos = x;    // X is starting at 0 top left
   uint8_t subpos = y;  // Y is starting at 0 top left
 
-  if (color == 1) {
+  if (color.is_on()) {
     this->max_displaybuffer_[pos] |= (1 << subpos);
   } else {
     this->max_displaybuffer_[pos] &= ~(1 << subpos);
diff --git a/esphome/components/max7219digit/max7219digit.h b/esphome/components/max7219digit/max7219digit.h
index b032f33b58..dfd61e84e5 100644
--- a/esphome/components/max7219digit/max7219digit.h
+++ b/esphome/components/max7219digit/max7219digit.h
@@ -40,7 +40,7 @@ class MAX7219Component : public PollingComponent,
 
   void turn_on_off(bool on_off);
 
-  void draw_absolute_pixel_internal(int x, int y, int color) override;
+  void draw_absolute_pixel_internal(int x, int y, Color color) override;
   int get_height_internal() override;
   int get_width_internal() override;
 
diff --git a/esphome/components/pcd8544/pcd_8544.cpp b/esphome/components/pcd8544/pcd_8544.cpp
index ed9d1bbd43..e47d71e8af 100644
--- a/esphome/components/pcd8544/pcd_8544.cpp
+++ b/esphome/components/pcd8544/pcd_8544.cpp
@@ -85,14 +85,14 @@ void HOT PCD8544::display() {
   this->command(this->PCD8544_SETYADDR);
 }
 
-void HOT PCD8544::draw_absolute_pixel_internal(int x, int y, int color) {
+void HOT PCD8544::draw_absolute_pixel_internal(int x, int y, Color color) {
   if (x >= this->get_width_internal() || y >= this->get_height_internal() || x < 0 || y < 0) {
     return;
   }
 
   uint16_t pos = x + (y / 8) * this->get_width_internal();
   uint8_t subpos = y % 8;
-  if (color) {
+  if (color.is_on()) {
     this->buffer_[pos] |= (1 << subpos);
   } else {
     this->buffer_[pos] &= ~(1 << subpos);
@@ -117,8 +117,8 @@ void PCD8544::update() {
   this->display();
 }
 
-void PCD8544::fill(int color) {
-  uint8_t fill = color ? 0xFF : 0x00;
+void PCD8544::fill(Color color) {
+  uint8_t fill = color.is_on() ? 0xFF : 0x00;
   for (uint32_t i = 0; i < this->get_buffer_length_(); i++)
     this->buffer_[i] = fill;
 }
diff --git a/esphome/components/pcd8544/pcd_8544.h b/esphome/components/pcd8544/pcd_8544.h
index a1c247bf7b..4c590b402c 100644
--- a/esphome/components/pcd8544/pcd_8544.h
+++ b/esphome/components/pcd8544/pcd_8544.h
@@ -43,7 +43,7 @@ class PCD8544 : public PollingComponent,
 
   void update() override;
 
-  void fill(int color) override;
+  void fill(Color color) override;
 
   void setup() override {
     this->setup_pins_();
@@ -51,7 +51,7 @@ class PCD8544 : public PollingComponent,
   }
 
  protected:
-  void draw_absolute_pixel_internal(int x, int y, int color) override;
+  void draw_absolute_pixel_internal(int x, int y, Color color) override;
 
   void setup_pins_();
 
diff --git a/esphome/components/ssd1306_base/ssd1306_base.cpp b/esphome/components/ssd1306_base/ssd1306_base.cpp
index d60f7dc985..2c1e5c6de8 100644
--- a/esphome/components/ssd1306_base/ssd1306_base.cpp
+++ b/esphome/components/ssd1306_base/ssd1306_base.cpp
@@ -179,20 +179,20 @@ size_t SSD1306::get_buffer_length_() {
   return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) / 8u;
 }
 
-void HOT SSD1306::draw_absolute_pixel_internal(int x, int y, int color) {
+void HOT SSD1306::draw_absolute_pixel_internal(int x, int y, Color color) {
   if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
     return;
 
   uint16_t pos = x + (y / 8) * this->get_width_internal();
   uint8_t subpos = y & 0x07;
-  if (color) {
+  if (color.is_on()) {
     this->buffer_[pos] |= (1 << subpos);
   } else {
     this->buffer_[pos] &= ~(1 << subpos);
   }
 }
-void SSD1306::fill(int color) {
-  uint8_t fill = color ? 0xFF : 0x00;
+void SSD1306::fill(Color color) {
+  uint8_t fill = color.is_on() ? 0xFF : 0x00;
   for (uint32_t i = 0; i < this->get_buffer_length_(); i++)
     this->buffer_[i] = fill;
 }
diff --git a/esphome/components/ssd1306_base/ssd1306_base.h b/esphome/components/ssd1306_base/ssd1306_base.h
index 8adf3c1b87..3e46ef9cc7 100644
--- a/esphome/components/ssd1306_base/ssd1306_base.h
+++ b/esphome/components/ssd1306_base/ssd1306_base.h
@@ -32,7 +32,7 @@ class SSD1306 : public PollingComponent, public display::DisplayBuffer {
   void set_brightness(float brightness) { this->brightness_ = brightness; }
 
   float get_setup_priority() const override { return setup_priority::PROCESSOR; }
-  void fill(int color) override;
+  void fill(Color color) override;
 
  protected:
   virtual void command(uint8_t value) = 0;
@@ -41,7 +41,7 @@ class SSD1306 : public PollingComponent, public display::DisplayBuffer {
 
   bool is_sh1106_() const;
 
-  void draw_absolute_pixel_internal(int x, int y, int color) override;
+  void draw_absolute_pixel_internal(int x, int y, Color color) override;
 
   int get_height_internal() override;
   int get_width_internal() override;
diff --git a/esphome/components/ssd1325_base/ssd1325_base.cpp b/esphome/components/ssd1325_base/ssd1325_base.cpp
index 22dc51e790..044582804f 100644
--- a/esphome/components/ssd1325_base/ssd1325_base.cpp
+++ b/esphome/components/ssd1325_base/ssd1325_base.cpp
@@ -144,20 +144,20 @@ size_t SSD1325::get_buffer_length_() {
   return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) / 8u;
 }
 
-void HOT SSD1325::draw_absolute_pixel_internal(int x, int y, int color) {
+void HOT SSD1325::draw_absolute_pixel_internal(int x, int y, Color color) {
   if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
     return;
 
   uint16_t pos = x + (y / 8) * this->get_width_internal();
   uint8_t subpos = y % 8;
-  if (color) {
+  if (color.is_on()) {
     this->buffer_[pos] |= (1 << subpos);
   } else {
     this->buffer_[pos] &= ~(1 << subpos);
   }
 }
-void SSD1325::fill(int color) {
-  uint8_t fill = color ? 0xFF : 0x00;
+void SSD1325::fill(Color color) {
+  uint8_t fill = color.is_on() ? 0xFF : 0x00;
   for (uint32_t i = 0; i < this->get_buffer_length_(); i++)
     this->buffer_[i] = fill;
 }
diff --git a/esphome/components/ssd1325_base/ssd1325_base.h b/esphome/components/ssd1325_base/ssd1325_base.h
index e796b85a33..b5b28dfbae 100644
--- a/esphome/components/ssd1325_base/ssd1325_base.h
+++ b/esphome/components/ssd1325_base/ssd1325_base.h
@@ -28,14 +28,14 @@ class SSD1325 : public PollingComponent, public display::DisplayBuffer {
   void set_external_vcc(bool external_vcc) { this->external_vcc_ = external_vcc; }
 
   float get_setup_priority() const override { return setup_priority::PROCESSOR; }
-  void fill(int color) override;
+  void fill(Color color) override;
 
  protected:
   virtual void command(uint8_t value) = 0;
   virtual void write_display_data() = 0;
   void init_reset_();
 
-  void draw_absolute_pixel_internal(int x, int y, int color) override;
+  void draw_absolute_pixel_internal(int x, int y, Color color) override;
 
   int get_height_internal() override;
   int get_width_internal() override;
diff --git a/esphome/components/st7789v/__init__.py b/esphome/components/st7789v/__init__.py
new file mode 100644
index 0000000000..dc85fa6b76
--- /dev/null
+++ b/esphome/components/st7789v/__init__.py
@@ -0,0 +1,3 @@
+import esphome.codegen as cg
+
+st7789v_ns = cg.esphome_ns.namespace('st7789v')
diff --git a/esphome/components/st7789v/display.py b/esphome/components/st7789v/display.py
new file mode 100644
index 0000000000..4723daf0e4
--- /dev/null
+++ b/esphome/components/st7789v/display.py
@@ -0,0 +1,44 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import display, spi
+from esphome.const import CONF_BACKLIGHT_PIN, CONF_BRIGHTNESS, CONF_CS_PIN, CONF_DC_PIN, CONF_ID, \
+                          CONF_LAMBDA, CONF_RESET_PIN
+from . import st7789v_ns
+
+DEPENDENCIES = ['spi']
+
+ST7789V = st7789v_ns.class_('ST7789V', cg.PollingComponent, spi.SPIDevice,
+                            display.DisplayBuffer)
+ST7789VRef = ST7789V.operator('ref')
+
+CONFIG_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(ST7789V),
+    cv.Required(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+    cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
+    cv.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,
+    cv.Required(CONF_BACKLIGHT_PIN): pins.gpio_output_pin_schema,
+    cv.Optional(CONF_BRIGHTNESS, default=1.0): cv.percentage,
+}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema())
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield spi.register_spi_device(var, config)
+
+    dc = yield cg.gpio_pin_expression(config[CONF_DC_PIN])
+    cg.add(var.set_dc_pin(dc))
+
+    reset = yield cg.gpio_pin_expression(config[CONF_RESET_PIN])
+    cg.add(var.set_reset_pin(reset))
+
+    bl = yield cg.gpio_pin_expression(config[CONF_BACKLIGHT_PIN])
+    cg.add(var.set_backlight_pin(bl))
+
+    if CONF_LAMBDA in config:
+        lambda_ = yield cg.process_lambda(
+            config[CONF_LAMBDA], [(display.DisplayBufferRef, 'it')], return_type=cg.void)
+        cg.add(var.set_writer(lambda_))
+
+    yield display.register_display(var, config)
diff --git a/esphome/components/st7789v/st7789v.cpp b/esphome/components/st7789v/st7789v.cpp
new file mode 100644
index 0000000000..284f2342fc
--- /dev/null
+++ b/esphome/components/st7789v/st7789v.cpp
@@ -0,0 +1,274 @@
+#include "st7789v.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace st7789v {
+
+static const char *TAG = "st7789v";
+
+void ST7789V::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up SPI ST7789V...");
+  this->spi_setup();
+  this->dc_pin_->setup();  // OUTPUT
+
+  this->init_reset_();
+
+  this->write_command_(ST7789_SLPOUT);  // Sleep out
+  delay(120);                           // NOLINT
+
+  this->write_command_(ST7789_NORON);  // Normal display mode on
+
+  // *** display and color format setting ***
+  this->write_command_(ST7789_MADCTL);
+  this->write_data_(ST7789_MADCTL_COLOR_ORDER);
+
+  // JLX240 display datasheet
+  this->write_command_(0xB6);
+  this->write_data_(0x0A);
+  this->write_data_(0x82);
+
+  this->write_command_(ST7789_COLMOD);
+  this->write_data_(0x55);
+  delay(10);
+
+  // *** ST7789V Frame rate setting ***
+  this->write_command_(ST7789_PORCTRL);
+  this->write_data_(0x0c);
+  this->write_data_(0x0c);
+  this->write_data_(0x00);
+  this->write_data_(0x33);
+  this->write_data_(0x33);
+
+  this->write_command_(ST7789_GCTRL);  // Voltages: VGH / VGL
+  this->write_data_(0x35);
+
+  // *** ST7789V Power setting ***
+  this->write_command_(ST7789_VCOMS);
+  this->write_data_(0x28);  // JLX240 display datasheet
+
+  this->write_command_(ST7789_LCMCTRL);
+  this->write_data_(0x0C);
+
+  this->write_command_(ST7789_VDVVRHEN);
+  this->write_data_(0x01);
+  this->write_data_(0xFF);
+
+  this->write_command_(ST7789_VRHS);  // voltage VRHS
+  this->write_data_(0x10);
+
+  this->write_command_(ST7789_VDVS);
+  this->write_data_(0x20);
+
+  this->write_command_(ST7789_FRCTRL2);
+  this->write_data_(0x0f);
+
+  this->write_command_(ST7789_PWCTRL1);
+  this->write_data_(0xa4);
+  this->write_data_(0xa1);
+
+  // *** ST7789V gamma setting ***
+  this->write_command_(ST7789_PVGAMCTRL);
+  this->write_data_(0xd0);
+  this->write_data_(0x00);
+  this->write_data_(0x02);
+  this->write_data_(0x07);
+  this->write_data_(0x0a);
+  this->write_data_(0x28);
+  this->write_data_(0x32);
+  this->write_data_(0x44);
+  this->write_data_(0x42);
+  this->write_data_(0x06);
+  this->write_data_(0x0e);
+  this->write_data_(0x12);
+  this->write_data_(0x14);
+  this->write_data_(0x17);
+
+  this->write_command_(ST7789_NVGAMCTRL);
+  this->write_data_(0xd0);
+  this->write_data_(0x00);
+  this->write_data_(0x02);
+  this->write_data_(0x07);
+  this->write_data_(0x0a);
+  this->write_data_(0x28);
+  this->write_data_(0x31);
+  this->write_data_(0x54);
+  this->write_data_(0x47);
+  this->write_data_(0x0e);
+  this->write_data_(0x1c);
+  this->write_data_(0x17);
+  this->write_data_(0x1b);
+  this->write_data_(0x1e);
+
+  this->write_command_(ST7789_INVON);
+
+  // Clear display - ensures we do not see garbage at power-on
+  this->draw_filled_rect_(0, 0, 239, 319, 0x0000);
+
+  delay(120);  // NOLINT
+
+  this->write_command_(ST7789_DISPON);  // Display on
+  delay(120);                           // NOLINT
+
+  backlight_(true);
+
+  this->init_internal_(this->get_buffer_length_());
+  memset(this->buffer_, 0x00, this->get_buffer_length_());
+}
+
+void ST7789V::dump_config() {
+  LOG_DISPLAY("", "SPI ST7789V", this);
+  LOG_PIN("  CS Pin: ", this->cs_);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_PIN("  B/L Pin: ", this->backlight_pin_);
+  LOG_UPDATE_INTERVAL(this);
+}
+
+float ST7789V::get_setup_priority() const { return setup_priority::PROCESSOR; }
+
+void ST7789V::update() {
+  this->do_update_();
+  this->write_display_data();
+}
+
+void ST7789V::loop() {}
+
+void ST7789V::write_display_data() {
+  uint16_t x1 = 52;   // _offsetx
+  uint16_t x2 = 186;  // _offsetx
+  uint16_t y1 = 40;   // _offsety
+  uint16_t y2 = 279;  // _offsety
+
+  this->enable();
+
+  // set column(x) address
+  this->dc_pin_->digital_write(false);
+  this->write_byte(ST7789_CASET);
+  this->dc_pin_->digital_write(true);
+  this->write_addr_(x1, x2);
+  // set page(y) address
+  this->dc_pin_->digital_write(false);
+  this->write_byte(ST7789_RASET);
+  this->dc_pin_->digital_write(true);
+  this->write_addr_(y1, y2);
+  // write display memory
+  this->dc_pin_->digital_write(false);
+  this->write_byte(ST7789_RAMWR);
+  this->dc_pin_->digital_write(true);
+
+  this->write_array(this->buffer_, this->get_buffer_length_());
+
+  this->disable();
+}
+
+void ST7789V::init_reset_() {
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(true);
+    delay(1);
+    // Trigger Reset
+    this->reset_pin_->digital_write(false);
+    delay(10);
+    // Wake up
+    this->reset_pin_->digital_write(true);
+  }
+}
+
+void ST7789V::backlight_(bool onoff) {
+  if (this->backlight_pin_ != nullptr) {
+    this->backlight_pin_->setup();
+    this->backlight_pin_->digital_write(onoff);
+  }
+}
+
+void ST7789V::write_command_(uint8_t value) {
+  this->enable();
+  this->dc_pin_->digital_write(false);
+  this->write_byte(value);
+  this->dc_pin_->digital_write(true);
+  this->disable();
+}
+
+void ST7789V::write_data_(uint8_t value) {
+  this->dc_pin_->digital_write(true);
+  this->enable();
+  this->write_byte(value);
+  this->disable();
+}
+
+void ST7789V::write_addr_(uint16_t addr1, uint16_t addr2) {
+  static uint8_t BYTE[4];
+  BYTE[0] = (addr1 >> 8) & 0xFF;
+  BYTE[1] = addr1 & 0xFF;
+  BYTE[2] = (addr2 >> 8) & 0xFF;
+  BYTE[3] = addr2 & 0xFF;
+
+  this->dc_pin_->digital_write(true);
+  this->write_array(BYTE, 4);
+}
+
+void ST7789V::write_color_(uint16_t color, uint16_t size) {
+  static uint8_t BYTE[1024];
+  int index = 0;
+  for (int i = 0; i < size; i++) {
+    BYTE[index++] = (color >> 8) & 0xFF;
+    BYTE[index++] = color & 0xFF;
+  }
+
+  this->dc_pin_->digital_write(true);
+  return write_array(BYTE, size * 2);
+}
+
+int ST7789V::get_height_internal() {
+  return 240;  // 320;
+}
+
+int ST7789V::get_width_internal() {
+  return 135;  // 240;
+}
+
+size_t ST7789V::get_buffer_length_() {
+  return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) * 2;
+}
+
+// Draw a filled rectangle
+// x1: Start X coordinate
+// y1: Start Y coordinate
+// x2: End X coordinate
+// y2: End Y coordinate
+// color: color
+void ST7789V::draw_filled_rect_(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color) {
+  // ESP_LOGD(TAG,"offset(x)=%d offset(y)=%d",dev->_offsetx,dev->_offsety);
+  this->enable();
+  this->dc_pin_->digital_write(false);
+  this->write_byte(ST7789_CASET);  // set column(x) address
+  this->dc_pin_->digital_write(true);
+  this->write_addr_(x1, x2);
+
+  this->dc_pin_->digital_write(false);
+  this->write_byte(ST7789_RASET);  // set Page(y) address
+  this->dc_pin_->digital_write(true);
+  this->write_addr_(y1, y2);
+  this->dc_pin_->digital_write(false);
+  this->write_byte(ST7789_RAMWR);  // begin a write to memory
+  this->dc_pin_->digital_write(true);
+  for (int i = x1; i <= x2; i++) {
+    uint16_t size = y2 - y1 + 1;
+    this->write_color_(color, size);
+  }
+  this->disable();
+}
+
+void HOT ST7789V::draw_absolute_pixel_internal(int x, int y, Color color) {
+  if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
+    return;
+
+  auto color565 = color.to_rgb_565();
+
+  uint16_t pos = (x + y * this->get_width_internal()) * 2;
+  this->buffer_[pos++] = (color565 >> 8) & 0xff;
+  this->buffer_[pos] = color565 & 0xff;
+}
+
+}  // namespace st7789v
+}  // namespace esphome
diff --git a/esphome/components/st7789v/st7789v.h b/esphome/components/st7789v/st7789v.h
new file mode 100644
index 0000000000..0e17e65fd7
--- /dev/null
+++ b/esphome/components/st7789v/st7789v.h
@@ -0,0 +1,151 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/spi/spi.h"
+#include "esphome/components/display/display_buffer.h"
+
+namespace esphome {
+namespace st7789v {
+
+static const uint8_t BLACK = 0;
+static const uint8_t WHITE = 1;
+
+static const uint8_t ST7789_NOP = 0x00;        // No Operation
+static const uint8_t ST7789_SWRESET = 0x01;    // Software Reset
+static const uint8_t ST7789_RDDID = 0x04;      // Read Display ID
+static const uint8_t ST7789_RDDST = 0x09;      // Read Display Status
+static const uint8_t ST7789_RDDPM = 0x0A;      // Read Display Power Mode
+static const uint8_t ST7789_RDDMADCTL = 0x0B;  // Read Display MADCTL
+static const uint8_t ST7789_RDDCOLMOD = 0x0C;  // Read Display Pixel Format
+static const uint8_t ST7789_RDDIM = 0x0D;      // Read Display Image Mode
+static const uint8_t ST7789_RDDSM = 0x0E;      // Read Display Signal Mod
+static const uint8_t ST7789_RDDSDR = 0x0F;     // Read Display Self-Diagnostic Resul
+static const uint8_t ST7789_SLPIN = 0x10;      // Sleep in
+static const uint8_t ST7789_SLPOUT = 0x11;     // Sleep Out
+static const uint8_t ST7789_PTLON = 0x12;      // Partial Display Mode O
+static const uint8_t ST7789_NORON = 0x13;      // Normal Display Mode O
+static const uint8_t ST7789_INVOFF = 0x20;     // Display Inversion Off
+static const uint8_t ST7789_INVON = 0x21;      // Display Inversion O
+static const uint8_t ST7789_GAMSET = 0x26;     // Gamma Set
+static const uint8_t ST7789_DISPOFF = 0x28;    // Display Off
+static const uint8_t ST7789_DISPON = 0x29;     // Display On
+static const uint8_t ST7789_CASET = 0x2A;      // Column Address Set
+static const uint8_t ST7789_RASET = 0x2B;      // Row Address Set
+static const uint8_t ST7789_RAMWR = 0x2C;      // Memory Write
+static const uint8_t ST7789_RAMRD = 0x2E;      // Memory Read
+static const uint8_t ST7789_PTLAR = 0x30;      // Partial Area
+static const uint8_t ST7789_VSCRDEF = 0x33;    // Vertical Scrolling Definitio
+static const uint8_t ST7789_TEOFF = 0x34;      // Tearing Effect Line OFF
+static const uint8_t ST7789_TEON = 0x35;       // Tearing Effect Line On
+static const uint8_t ST7789_MADCTL = 0x36;     // Memory Data Access Control
+static const uint8_t ST7789_VSCSAD = 0x37;     // Vertical Scroll Start Address of RAM
+static const uint8_t ST7789_IDMOFF = 0x38;     // Idle Mode Off
+static const uint8_t ST7789_IDMON = 0x39;      // Idle mode on
+static const uint8_t ST7789_COLMOD = 0x3A;     // Interface Pixel Format
+static const uint8_t ST7789_WRMEMC = 0x3C;     // Write Memory Continue
+static const uint8_t ST7789_RDMEMC = 0x3E;     // Read Memory Continue
+static const uint8_t ST7789_STE = 0x44;        // Set Tear Scanline
+static const uint8_t ST7789_GSCAN = 0x45;      // Get Scanlin
+static const uint8_t ST7789_WRDISBV = 0x51;    // Write Display Brightness
+static const uint8_t ST7789_RDDISBV = 0x52;    // Read Display Brightness Value
+static const uint8_t ST7789_WRCTRLD = 0x53;    // Write CTRL Display
+static const uint8_t ST7789_RDCTRLD = 0x54;    // Read CTRL Value Display
+static const uint8_t ST7789_WRCACE = 0x55;     // Write Content Adaptive Brightness Control and Color Enhancement
+static const uint8_t ST7789_RDCABC = 0x56;     // Read Content Adaptive Brightness Control
+static const uint8_t ST7789_WRCABCMB = 0x5E;   // Write CABC Minimum Brightnes
+static const uint8_t ST7789_RDCABCMB = 0x5F;   // Read CABC Minimum Brightnes
+static const uint8_t ST7789_RDABCSDR = 0x68;   // Read Automatic Brightness Control Self-Diagnostic Result
+static const uint8_t ST7789_RDID1 = 0xDA;      // Read ID1
+static const uint8_t ST7789_RDID2 = 0xDB;      // Read ID2
+static const uint8_t ST7789_RDID3 = 0xDC;      // Read ID3
+static const uint8_t ST7789_RAMCTRL = 0xB0;    // RAM Control
+static const uint8_t ST7789_RGBCTRL = 0xB1;    // RGB Interface Contro
+static const uint8_t ST7789_PORCTRL = 0xB2;    // Porch Setting
+static const uint8_t ST7789_FRCTRL1 = 0xB3;    // Frame Rate Control 1 (In partial mode/ idle colors)
+static const uint8_t ST7789_PARCTRL = 0xB5;    // Partial mode Contro
+static const uint8_t ST7789_GCTRL = 0xB7;      // Gate Contro
+static const uint8_t ST7789_GTADJ = 0xB8;      // Gate On Timing Adjustmen
+static const uint8_t ST7789_DGMEN = 0xBA;      // Digital Gamma Enable
+static const uint8_t ST7789_VCOMS = 0xBB;      // VCOMS Setting
+static const uint8_t ST7789_LCMCTRL = 0xC0;    // LCM Control
+static const uint8_t ST7789_IDSET = 0xC1;      // ID Code Settin
+static const uint8_t ST7789_VDVVRHEN = 0xC2;   // VDV and VRH Command Enabl
+static const uint8_t ST7789_VRHS = 0xC3;       // VRH Set
+static const uint8_t ST7789_VDVS = 0xC4;       // VDV Set
+static const uint8_t ST7789_VCMOFSET = 0xC5;   // VCOMS Offset Set
+static const uint8_t ST7789_FRCTRL2 = 0xC6;    // Frame Rate Control in Normal Mode
+static const uint8_t ST7789_CABCCTRL = 0xC7;   // CABC Control
+static const uint8_t ST7789_REGSEL1 = 0xC8;    // Register Value Selection 1
+static const uint8_t ST7789_REGSEL2 = 0xCA;    // Register Value Selection
+static const uint8_t ST7789_PWMFRSEL = 0xCC;   // PWM Frequency Selection
+static const uint8_t ST7789_PWCTRL1 = 0xD0;    // Power Control 1
+static const uint8_t ST7789_VAPVANEN = 0xD2;   // Enable VAP/VAN signal output
+static const uint8_t ST7789_CMD2EN = 0xDF;     // Command 2 Enable
+static const uint8_t ST7789_PVGAMCTRL = 0xE0;  // Positive Voltage Gamma Control
+static const uint8_t ST7789_NVGAMCTRL = 0xE1;  // Negative Voltage Gamma Control
+static const uint8_t ST7789_DGMLUTR = 0xE2;    // Digital Gamma Look-up Table for Red
+static const uint8_t ST7789_DGMLUTB = 0xE3;    // Digital Gamma Look-up Table for Blue
+static const uint8_t ST7789_GATECTRL = 0xE4;   // Gate Control
+static const uint8_t ST7789_SPI2EN = 0xE7;     // SPI2 Enable
+static const uint8_t ST7789_PWCTRL2 = 0xE8;    // Power Control 2
+static const uint8_t ST7789_EQCTRL = 0xE9;     // Equalize time control
+static const uint8_t ST7789_PROMCTRL = 0xEC;   // Program Mode Contro
+static const uint8_t ST7789_PROMEN = 0xFA;     // Program Mode Enabl
+static const uint8_t ST7789_NVMSET = 0xFC;     // NVM Setting
+static const uint8_t ST7789_PROMACT = 0xFE;    // Program action
+
+// Flags for ST7789_MADCTL
+static const uint8_t ST7789_MADCTL_MY = 0x80;
+static const uint8_t ST7789_MADCTL_MX = 0x40;
+static const uint8_t ST7789_MADCTL_MV = 0x20;
+static const uint8_t ST7789_MADCTL_ML = 0x10;
+static const uint8_t ST7789_MADCTL_RGB = 0x00;
+static const uint8_t ST7789_MADCTL_BGR = 0x08;
+static const uint8_t ST7789_MADCTL_MH = 0x04;
+static const uint8_t ST7789_MADCTL_SS = 0x02;
+static const uint8_t ST7789_MADCTL_GS = 0x01;
+
+static const uint8_t ST7789_MADCTL_COLOR_ORDER = ST7789_MADCTL_BGR;
+
+class ST7789V : public PollingComponent,
+                public display::DisplayBuffer,
+                public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH, spi::CLOCK_PHASE_TRAILING,
+                                      spi::DATA_RATE_8MHZ> {
+ public:
+  void set_dc_pin(GPIOPin *dc_pin) { this->dc_pin_ = dc_pin; }
+  void set_reset_pin(GPIOPin *reset_pin) { this->reset_pin_ = reset_pin; }
+  void set_backlight_pin(GPIOPin *backlight_pin) { this->backlight_pin_ = backlight_pin; }
+
+  // ========== INTERNAL METHODS ==========
+  // (In most use cases you won't need these)
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void update() override;
+  void loop() override;
+
+  void write_display_data();
+
+ protected:
+  GPIOPin *dc_pin_;
+  GPIOPin *reset_pin_{nullptr};
+  GPIOPin *backlight_pin_{nullptr};
+
+  void init_reset_();
+  void backlight_(bool onoff);
+  void write_command_(uint8_t value);
+  void write_data_(uint8_t value);
+  void write_addr_(uint16_t addr1, uint16_t addr2);
+  void write_color_(uint16_t color, uint16_t size);
+
+  int get_height_internal() override;
+  int get_width_internal() override;
+  size_t get_buffer_length_();
+
+  void draw_filled_rect_(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color);
+
+  void draw_absolute_pixel_internal(int x, int y, Color color) override;
+};
+
+}  // namespace st7789v
+}  // namespace esphome
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index c145fb361c..331adffb5e 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -115,20 +115,20 @@ void WaveshareEPaper::update() {
   this->do_update_();
   this->display();
 }
-void WaveshareEPaper::fill(int color) {
+void WaveshareEPaper::fill(Color color) {
   // flip logic
-  const uint8_t fill = color ? 0x00 : 0xFF;
+  const uint8_t fill = color.is_on() ? 0x00 : 0xFF;
   for (uint32_t i = 0; i < this->get_buffer_length_(); i++)
     this->buffer_[i] = fill;
 }
-void HOT WaveshareEPaper::draw_absolute_pixel_internal(int x, int y, int color) {
+void HOT WaveshareEPaper::draw_absolute_pixel_internal(int x, int y, Color color) {
   if (x >= this->get_width_internal() || y >= this->get_height_internal() || x < 0 || y < 0)
     return;
 
   const uint32_t pos = (x + y * this->get_width_internal()) / 8u;
   const uint8_t subpos = x & 0x07;
   // flip logic
-  if (!color)
+  if (!color.is_on())
     this->buffer_[pos] |= 0x80 >> subpos;
   else
     this->buffer_[pos] &= ~(0x80 >> subpos);
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index 1ed7475350..18748e05ca 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -26,7 +26,7 @@ class WaveshareEPaper : public PollingComponent,
 
   void update() override;
 
-  void fill(int color) override;
+  void fill(Color color) override;
 
   void setup() override {
     this->setup_pins_();
@@ -36,7 +36,7 @@ class WaveshareEPaper : public PollingComponent,
   void on_safe_shutdown() override;
 
  protected:
-  void draw_absolute_pixel_internal(int x, int y, int color) override;
+  void draw_absolute_pixel_internal(int x, int y, Color color) override;
 
   bool wait_until_idle_();
 
diff --git a/esphome/const.py b/esphome/const.py
index 9626a2e00a..8b727b615c 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -49,6 +49,7 @@ CONF_AUTOMATION_ID = 'automation_id'
 CONF_AVAILABILITY = 'availability'
 CONF_AWAY = 'away'
 CONF_AWAY_CONFIG = 'away_config'
+CONF_BACKLIGHT_PIN = 'backlight_pin'
 CONF_BATTERY_LEVEL = 'battery_level'
 CONF_BATTERY_VOLTAGE = 'battery_voltage'
 CONF_BAUD_RATE = 'baud_rate'
diff --git a/esphome/core/color.h b/esphome/core/color.h
new file mode 100644
index 0000000000..b19340a1d3
--- /dev/null
+++ b/esphome/core/color.h
@@ -0,0 +1,161 @@
+#pragma once
+
+#include "component.h"
+#include "helpers.h"
+
+namespace esphome {
+
+inline static uint8_t esp_scale8(uint8_t i, uint8_t scale) { return (uint16_t(i) * (1 + uint16_t(scale))) / 256; }
+
+struct Color {
+  union {
+    struct {
+      union {
+        uint8_t r;
+        uint8_t red;
+      };
+      union {
+        uint8_t g;
+        uint8_t green;
+      };
+      union {
+        uint8_t b;
+        uint8_t blue;
+      };
+      union {
+        uint8_t w;
+        uint8_t white;
+      };
+    };
+    uint8_t raw[4];
+    uint32_t raw_32;
+  };
+  inline Color() ALWAYS_INLINE : r(0), g(0), b(0), w(0) {}  // NOLINT
+  inline Color(float red, float green, float blue) ALWAYS_INLINE : r(uint8_t(red * 255)),
+                                                                   g(uint8_t(green * 255)),
+                                                                   b(uint8_t(blue * 255)),
+                                                                   w(0) {}
+  inline Color(float red, float green, float blue, float white) ALWAYS_INLINE : r(uint8_t(red * 255)),
+                                                                                g(uint8_t(green * 255)),
+                                                                                b(uint8_t(blue * 255)),
+                                                                                w(uint8_t(white * 255)) {}
+  inline Color(uint32_t colorcode) ALWAYS_INLINE : r((colorcode >> 16) & 0xFF),
+                                                   g((colorcode >> 8) & 0xFF),
+                                                   b((colorcode >> 0) & 0xFF),
+                                                   w((colorcode >> 24) & 0xFF) {}
+  inline bool is_on() ALWAYS_INLINE { return this->raw_32 != 0; }
+  inline Color &operator=(const Color &rhs) ALWAYS_INLINE {
+    this->r = rhs.r;
+    this->g = rhs.g;
+    this->b = rhs.b;
+    this->w = rhs.w;
+    return *this;
+  }
+  inline Color &operator=(uint32_t colorcode) ALWAYS_INLINE {
+    this->w = (colorcode >> 24) & 0xFF;
+    this->r = (colorcode >> 16) & 0xFF;
+    this->g = (colorcode >> 8) & 0xFF;
+    this->b = (colorcode >> 0) & 0xFF;
+    return *this;
+  }
+  inline uint8_t &operator[](uint8_t x) ALWAYS_INLINE { return this->raw[x]; }
+  inline Color operator*(uint8_t scale) const ALWAYS_INLINE {
+    return Color(esp_scale8(this->red, scale), esp_scale8(this->green, scale), esp_scale8(this->blue, scale),
+                 esp_scale8(this->white, scale));
+  }
+  inline Color &operator*=(uint8_t scale) ALWAYS_INLINE {
+    this->red = esp_scale8(this->red, scale);
+    this->green = esp_scale8(this->green, scale);
+    this->blue = esp_scale8(this->blue, scale);
+    this->white = esp_scale8(this->white, scale);
+    return *this;
+  }
+  inline Color operator*(const Color &scale) const ALWAYS_INLINE {
+    return Color(esp_scale8(this->red, scale.red), esp_scale8(this->green, scale.green),
+                 esp_scale8(this->blue, scale.blue), esp_scale8(this->white, scale.white));
+  }
+  inline Color &operator*=(const Color &scale) ALWAYS_INLINE {
+    this->red = esp_scale8(this->red, scale.red);
+    this->green = esp_scale8(this->green, scale.green);
+    this->blue = esp_scale8(this->blue, scale.blue);
+    this->white = esp_scale8(this->white, scale.white);
+    return *this;
+  }
+  inline Color operator+(const Color &add) const ALWAYS_INLINE {
+    Color ret;
+    if (uint8_t(add.r + this->r) < this->r)
+      ret.r = 255;
+    else
+      ret.r = this->r + add.r;
+    if (uint8_t(add.g + this->g) < this->g)
+      ret.g = 255;
+    else
+      ret.g = this->g + add.g;
+    if (uint8_t(add.b + this->b) < this->b)
+      ret.b = 255;
+    else
+      ret.b = this->b + add.b;
+    if (uint8_t(add.w + this->w) < this->w)
+      ret.w = 255;
+    else
+      ret.w = this->w + add.w;
+    return ret;
+  }
+  inline Color &operator+=(const Color &add) ALWAYS_INLINE { return *this = (*this) + add; }
+  inline Color operator+(uint8_t add) const ALWAYS_INLINE { return (*this) + Color(add, add, add, add); }
+  inline Color &operator+=(uint8_t add) ALWAYS_INLINE { return *this = (*this) + add; }
+  inline Color operator-(const Color &subtract) const ALWAYS_INLINE {
+    Color ret;
+    if (subtract.r > this->r)
+      ret.r = 0;
+    else
+      ret.r = this->r - subtract.r;
+    if (subtract.g > this->g)
+      ret.g = 0;
+    else
+      ret.g = this->g - subtract.g;
+    if (subtract.b > this->b)
+      ret.b = 0;
+    else
+      ret.b = this->b - subtract.b;
+    if (subtract.w > this->w)
+      ret.w = 0;
+    else
+      ret.w = this->w - subtract.w;
+    return ret;
+  }
+  inline Color &operator-=(const Color &subtract) ALWAYS_INLINE { return *this = (*this) - subtract; }
+  inline Color operator-(uint8_t subtract) const ALWAYS_INLINE {
+    return (*this) - Color(subtract, subtract, subtract, subtract);
+  }
+  inline Color &operator-=(uint8_t subtract) ALWAYS_INLINE { return *this = (*this) - subtract; }
+  static Color random_color() {
+    float r = float(random_uint32()) / float(UINT32_MAX);
+    float g = float(random_uint32()) / float(UINT32_MAX);
+    float b = float(random_uint32()) / float(UINT32_MAX);
+    float w = float(random_uint32()) / float(UINT32_MAX);
+    return Color(r, g, b, w);
+  }
+  Color fade_to_white(uint8_t amnt) { return Color(1, 1, 1, 1) - (*this * amnt); }
+  Color fade_to_black(uint8_t amnt) { return *this * amnt; }
+  Color lighten(uint8_t delta) { return *this + delta; }
+  Color darken(uint8_t delta) { return *this - delta; }
+
+  uint32_t to_rgb_565() const {
+    uint32_t color565 =
+        (esp_scale8(this->red, 31) << 11) | (esp_scale8(this->green, 63) << 5) | (esp_scale8(this->blue, 31) << 0);
+    return color565;
+  }
+  uint32_t to_bgr_565() const {
+    uint32_t color565 =
+        (esp_scale8(this->blue, 31) << 11) | (esp_scale8(this->green, 63) << 5) | (esp_scale8(this->red, 31) << 0);
+    return color565;
+  }
+  uint32_t to_grayscale4() const {
+    uint32_t gs4 = esp_scale8(this->white, 15);
+    return gs4;
+  }
+};
+static const Color COLOR_BLACK(0, 0, 0);
+static const Color COLOR_WHITE(1, 1, 1);
+};  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 8f06de2e40..ec09a00208 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1507,6 +1507,16 @@ interval:
 
             id(btn_left)->set_threshold(btn_left_state * 0.9);
 
+color:
+  - id: kbx_red
+    red: 100%
+    green: 1%
+    blue: 2%
+  - id: kbx_blue
+    red: 0%
+    green: 1%
+    blue: 100%
+
 display:
 - platform: lcd_gpio
   dimensions: 18x4
@@ -1591,6 +1601,13 @@ display:
   full_update_every: 30
   lambda: |-
     it.rectangle(0, 0, it.get_width(), it.get_height());
+- platform: st7789v
+  cs_pin: GPIO5
+  dc_pin: GPIO16
+  reset_pin: GPIO23
+  backlight_pin: GPIO4
+  lambda: |-
+    it.rectangle(0, 0, it.get_width(), it.get_height());
 
 tm1651:
   id: tm1651_battery

From 83a12d980edafa4511baf963c79b6a05fea87a94 Mon Sep 17 00:00:00 2001
From: rspaargaren <github@speijkers.nl>
Date: Sun, 28 Jun 2020 23:47:43 +0200
Subject: [PATCH 253/412] Vl53 long range (#1055)

* Update vl53l0x_sensor.cpp

Changed values for long range support

* added true / false option for long range detection

* debug missing ,

* further debug option long_range

* Travis updates

* added travis tests

* Travis removed space should be good now

* update to trigger travis again

* added old test files for PR

* added vl5310x sensor for compile testing

* fix variable names

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/vl53l0x/sensor.py          |  7 ++++++-
 esphome/components/vl53l0x/vl53l0x_sensor.cpp | 21 +++++++++++++++----
 esphome/components/vl53l0x/vl53l0x_sensor.h   |  2 ++
 tests/test3.yaml                              |  4 ++++
 4 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/esphome/components/vl53l0x/sensor.py b/esphome/components/vl53l0x/sensor.py
index 6740d53e13..209016fe40 100644
--- a/esphome/components/vl53l0x/sensor.py
+++ b/esphome/components/vl53l0x/sensor.py
@@ -10,15 +10,20 @@ VL53L0XSensor = vl53l0x_ns.class_('VL53L0XSensor', sensor.Sensor, cg.PollingComp
                                   i2c.I2CDevice)
 
 CONF_SIGNAL_RATE_LIMIT = 'signal_rate_limit'
+CONF_LONG_RANGE = 'long_range'
+
 CONFIG_SCHEMA = sensor.sensor_schema(UNIT_METER, ICON_ARROW_EXPAND_VERTICAL, 2).extend({
     cv.GenerateID(): cv.declare_id(VL53L0XSensor),
     cv.Optional(CONF_SIGNAL_RATE_LIMIT, default=0.25): cv.float_range(
-        min=0.0, max=512.0, min_included=False, max_included=False)
+        min=0.0, max=512.0, min_included=False, max_included=False),
+    cv.Optional(CONF_LONG_RANGE, default=False): cv.boolean,
 }).extend(cv.polling_component_schema('60s')).extend(i2c.i2c_device_schema(0x29))
 
 
 def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     yield cg.register_component(var, config)
+    cg.add(var.set_signal_rate_limit(config[CONF_SIGNAL_RATE_LIMIT]))
+    cg.add(var.set_long_range(config[CONF_LONG_RANGE]))
     yield sensor.register_sensor(var, config)
     yield i2c.register_i2c_device(var, config)
diff --git a/esphome/components/vl53l0x/vl53l0x_sensor.cpp b/esphome/components/vl53l0x/vl53l0x_sensor.cpp
index 231bed99ac..8ce822352f 100644
--- a/esphome/components/vl53l0x/vl53l0x_sensor.cpp
+++ b/esphome/components/vl53l0x/vl53l0x_sensor.cpp
@@ -33,7 +33,8 @@ void VL53L0XSensor::setup() {
   reg(0xFF) = 0x00;
   reg(0x80) = 0x00;
   reg(0x60) |= 0x12;
-
+  if (this->long_range_)
+    this->signal_rate_limit_ = 0.1;
   auto rate_value = static_cast<uint16_t>(signal_rate_limit_ * 128);
   write_byte_16(0x44, rate_value);
 
@@ -104,7 +105,11 @@ void VL53L0XSensor::setup() {
   reg(0x48) = 0x00;
   reg(0x30) = 0x20;
   reg(0xFF) = 0x00;
-  reg(0x30) = 0x09;
+  if (this->long_range_) {
+    reg(0x30) = 0x07;  // WAS 0x09
+  } else {
+    reg(0x30) = 0x09;
+  }
   reg(0x54) = 0x00;
   reg(0x31) = 0x04;
   reg(0x32) = 0x03;
@@ -116,7 +121,11 @@ void VL53L0XSensor::setup() {
   reg(0x51) = 0x00;
   reg(0x52) = 0x96;
   reg(0x56) = 0x08;
-  reg(0x57) = 0x30;
+  if (this->long_range_) {
+    reg(0x57) = 0x50;  // was 0x30
+  } else {
+    reg(0x57) = 0x30;
+  }
   reg(0x61) = 0x00;
   reg(0x62) = 0x00;
   reg(0x64) = 0x00;
@@ -153,7 +162,11 @@ void VL53L0XSensor::setup() {
   reg(0x44) = 0x00;
   reg(0x45) = 0x20;
   reg(0x47) = 0x08;
-  reg(0x48) = 0x28;
+  if (this->long_range_) {
+    reg(0x48) = 0x48;  // was 0x28
+  } else {
+    reg(0x48) = 0x28;
+  }
   reg(0x67) = 0x00;
   reg(0x70) = 0x04;
   reg(0x71) = 0x01;
diff --git a/esphome/components/vl53l0x/vl53l0x_sensor.h b/esphome/components/vl53l0x/vl53l0x_sensor.h
index 1825383cee..4939a9806c 100644
--- a/esphome/components/vl53l0x/vl53l0x_sensor.h
+++ b/esphome/components/vl53l0x/vl53l0x_sensor.h
@@ -29,6 +29,7 @@ class VL53L0XSensor : public sensor::Sensor, public PollingComponent, public i2c
   void loop() override;
 
   void set_signal_rate_limit(float signal_rate_limit) { signal_rate_limit_ = signal_rate_limit; }
+  void set_long_range(bool long_range) { long_range_ = long_range; }
 
  protected:
   uint32_t get_measurement_timing_budget_() {
@@ -247,6 +248,7 @@ class VL53L0XSensor : public sensor::Sensor, public PollingComponent, public i2c
   }
 
   float signal_rate_limit_;
+  bool long_range_;
   uint32_t measurement_timing_budget_us_;
   bool initiated_read_{false};
   bool waiting_for_interrupt_{false};
diff --git a/tests/test3.yaml b/tests/test3.yaml
index edbf472657..9c51894e12 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -217,6 +217,10 @@ sensor:
   - platform: apds9960
     type: proximity
     name: APDS9960 Proximity
+  - platform: vl53l0x
+    name: "VL53L0x Distance"
+    address: 0x29
+    update_interval: 60s
   - platform: apds9960
     type: clear
     name: APDS9960 Clear

From c041cc483c9308011986c7a25e7e0ad593a0c09e Mon Sep 17 00:00:00 2001
From: vxider <lb@vxider.com>
Date: Mon, 29 Jun 2020 05:50:20 +0800
Subject: [PATCH 254/412] fix shunt voltage / current / power reading in
 INA3221 (#1101)

* fix shunt voltage / current / power reading in INA3221

* support nagetive shunt voltage reading

* fix loss of precision
---
 esphome/components/ina3221/ina3221.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/ina3221/ina3221.cpp b/esphome/components/ina3221/ina3221.cpp
index 3bd568f37d..a0334064ff 100644
--- a/esphome/components/ina3221/ina3221.cpp
+++ b/esphome/components/ina3221/ina3221.cpp
@@ -100,7 +100,7 @@ void INA3221Component::update() {
         this->status_set_warning();
         return;
       }
-      const float shunt_voltage_v = int16_t(raw) * 40.0f / 1000000.0f;
+      const float shunt_voltage_v = int16_t(raw) * 40.0f / 8.0f / 1000000.0f;
       if (channel.shunt_voltage_sensor_ != nullptr)
         channel.shunt_voltage_sensor_->publish_state(shunt_voltage_v);
       current_a = shunt_voltage_v / channel.shunt_resistance_;

From 78633c57682d5c062d3743b6b55208513e9cbf79 Mon Sep 17 00:00:00 2001
From: vxider <lb@vxider.com>
Date: Mon, 29 Jun 2020 05:59:22 +0800
Subject: [PATCH 255/412] fix calibration (#1103)

---
 esphome/components/ina219/ina219.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/ina219/ina219.cpp b/esphome/components/ina219/ina219.cpp
index 1150f7c661..44d6501e36 100644
--- a/esphome/components/ina219/ina219.cpp
+++ b/esphome/components/ina219/ina219.cpp
@@ -120,7 +120,7 @@ void INA219Component::setup() {
   }
 
   this->calibration_lsb_ = lsb;
-  auto calibration = uint32_t(0.04096f / (0.0001 * lsb * this->shunt_resistance_ohm_));
+  auto calibration = uint32_t(0.04096f / (0.000001 * lsb * this->shunt_resistance_ohm_));
   ESP_LOGV(TAG, "    Using LSB=%u calibration=%u", lsb, calibration);
   if (!this->write_byte_16(INA219_REGISTER_CALIBRATION, calibration)) {
     this->mark_failed();

From 2f0722598404f5f6935b294f3e4668660d15ef2e Mon Sep 17 00:00:00 2001
From: Andrew Zaborowski <balrogg@gmail.com>
Date: Mon, 29 Jun 2020 00:44:15 +0200
Subject: [PATCH 256/412] Fix: Component script not stopped in certain
 situations (#1004)

* Move stop/is_running implementation to Action base class

Try to fix issue #1105.  Until now if an UpdateComponentAction, a
LambdaAction, or any action that can contain those inside their
"else" or "then" action lists, resulted in a call to script.stop on
the script that contains them, the script would continue running,
because they didn't implement a stop() method.  Basically only
the asynchronous ones did: DelayAction, WaitUntilAction and
ScriptWaitAction.

With this change num_running_ in Action replaces
DelayAction::num_running_ and WaitUntilAction::triggered_ to provide
the same is_running logic to other actions.

* Make some Action methods protected

Apparently play()/stop() etc. are not meant to be called directly by
users of the class and if they're called directly that would not give
the expected result for the classes that have an empty play().

Make all methods except play_complex, stop_comples and is_running
protected.  While there also make RemoteTransmitterActionBase::encode
protected.

* lint

* format

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 .../components/api/homeassistant_service.h    |  1 +
 esphome/components/binary_sensor/automation.h |  1 +
 esphome/components/cover/automation.h         | 16 ++--
 esphome/components/dfplayer/dfplayer.h        |  6 +-
 esphome/components/display/display_buffer.h   |  5 +-
 esphome/components/esp8266_pwm/esp8266_pwm.h  |  1 -
 esphome/components/fan/automation.h           |  3 -
 esphome/components/mhz19/mhz19.h              |  3 +
 esphome/components/mqtt/mqtt_client.h         |  1 +
 esphome/components/output/automation.h        |  1 +
 esphome/components/pid/pid_climate.h          |  8 +-
 esphome/components/remote_base/jvc_protocol.h |  1 +
 esphome/components/remote_base/lg_protocol.h  |  1 +
 esphome/components/remote_base/nec_protocol.h |  1 +
 .../remote_base/panasonic_protocol.h          |  1 +
 .../components/remote_base/pioneer_protocol.h |  1 +
 esphome/components/remote_base/rc5_protocol.h |  1 +
 esphome/components/remote_base/remote_base.h  |  8 +-
 .../components/remote_base/samsung_protocol.h |  1 +
 .../components/remote_base/sony_protocol.h    |  1 +
 .../rotary_encoder/rotary_encoder.h           |  1 +
 esphome/components/script/script.h            | 19 ++--
 esphome/components/sensor/automation.h        |  1 +
 esphome/components/servo/servo.h              |  2 +
 esphome/components/switch/automation.h        |  1 +
 esphome/components/text_sensor/automation.h   |  1 +
 esphome/core/automation.h                     | 56 +++++++-----
 esphome/core/base_automation.h                | 87 ++++++++-----------
 28 files changed, 121 insertions(+), 109 deletions(-)

diff --git a/esphome/components/api/homeassistant_service.h b/esphome/components/api/homeassistant_service.h
index d68dac3b61..8a72765195 100644
--- a/esphome/components/api/homeassistant_service.h
+++ b/esphome/components/api/homeassistant_service.h
@@ -29,6 +29,7 @@ template<typename... Ts> class HomeAssistantServiceCallAction : public Action<Ts
   template<typename T> void add_variable(std::string key, T value) {
     this->variables_.push_back(TemplatableKeyValuePair<Ts...>(key, value));
   }
+
   void play(Ts... x) override {
     HomeassistantServiceResponse resp;
     resp.service = this->service_.value(x...);
diff --git a/esphome/components/binary_sensor/automation.h b/esphome/components/binary_sensor/automation.h
index e9ff37446d..6b0321628c 100644
--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -137,6 +137,7 @@ template<typename... Ts> class BinarySensorPublishAction : public Action<Ts...>
  public:
   explicit BinarySensorPublishAction(BinarySensor *sensor) : sensor_(sensor) {}
   TEMPLATABLE_VALUE(bool, state)
+
   void play(Ts... x) override {
     auto val = this->state_.value(x...);
     this->sensor_->publish_state(val);
diff --git a/esphome/components/cover/automation.h b/esphome/components/cover/automation.h
index a8eb0cdf99..0092f987f2 100644
--- a/esphome/components/cover/automation.h
+++ b/esphome/components/cover/automation.h
@@ -41,6 +41,10 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
  public:
   explicit ControlAction(Cover *cover) : cover_(cover) {}
 
+  TEMPLATABLE_VALUE(bool, stop)
+  TEMPLATABLE_VALUE(float, position)
+  TEMPLATABLE_VALUE(float, tilt)
+
   void play(Ts... x) override {
     auto call = this->cover_->make_call();
     if (this->stop_.has_value())
@@ -52,10 +56,6 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
     call.perform();
   }
 
-  TEMPLATABLE_VALUE(bool, stop)
-  TEMPLATABLE_VALUE(float, position)
-  TEMPLATABLE_VALUE(float, tilt)
-
  protected:
   Cover *cover_;
 };
@@ -63,6 +63,10 @@ template<typename... Ts> class ControlAction : public Action<Ts...> {
 template<typename... Ts> class CoverPublishAction : public Action<Ts...> {
  public:
   CoverPublishAction(Cover *cover) : cover_(cover) {}
+  TEMPLATABLE_VALUE(float, position)
+  TEMPLATABLE_VALUE(float, tilt)
+  TEMPLATABLE_VALUE(CoverOperation, current_operation)
+
   void play(Ts... x) override {
     if (this->position_.has_value())
       this->cover_->position = this->position_.value(x...);
@@ -73,10 +77,6 @@ template<typename... Ts> class CoverPublishAction : public Action<Ts...> {
     this->cover_->publish_state();
   }
 
-  TEMPLATABLE_VALUE(float, position)
-  TEMPLATABLE_VALUE(float, tilt)
-  TEMPLATABLE_VALUE(CoverOperation, current_operation)
-
  protected:
   Cover *cover_;
 };
diff --git a/esphome/components/dfplayer/dfplayer.h b/esphome/components/dfplayer/dfplayer.h
index 22ca11c3be..cb9686bb64 100644
--- a/esphome/components/dfplayer/dfplayer.h
+++ b/esphome/components/dfplayer/dfplayer.h
@@ -104,7 +104,6 @@ class DFPlayer : public uart::UARTDevice, public Component {
 
 #define DFPLAYER_SIMPLE_ACTION(ACTION_CLASS, ACTION_METHOD) \
   template<typename... Ts> class ACTION_CLASS : public Action<Ts...>, public Parented<DFPlayer> { \
-   public: \
     void play(Ts... x) override { this->parent_->ACTION_METHOD(); } \
   };
 
@@ -115,6 +114,7 @@ template<typename... Ts> class PlayFileAction : public Action<Ts...>, public Par
  public:
   TEMPLATABLE_VALUE(uint16_t, file)
   TEMPLATABLE_VALUE(boolean, loop)
+
   void play(Ts... x) override {
     auto file = this->file_.value(x...);
     auto loop = this->loop_.value(x...);
@@ -131,6 +131,7 @@ template<typename... Ts> class PlayFolderAction : public Action<Ts...>, public P
   TEMPLATABLE_VALUE(uint16_t, folder)
   TEMPLATABLE_VALUE(uint16_t, file)
   TEMPLATABLE_VALUE(boolean, loop)
+
   void play(Ts... x) override {
     auto folder = this->folder_.value(x...);
     auto file = this->file_.value(x...);
@@ -146,6 +147,7 @@ template<typename... Ts> class PlayFolderAction : public Action<Ts...>, public P
 template<typename... Ts> class SetDeviceAction : public Action<Ts...>, public Parented<DFPlayer> {
  public:
   TEMPLATABLE_VALUE(Device, device)
+
   void play(Ts... x) override {
     auto device = this->device_.value(x...);
     this->parent_->set_device(device);
@@ -155,6 +157,7 @@ template<typename... Ts> class SetDeviceAction : public Action<Ts...>, public Pa
 template<typename... Ts> class SetVolumeAction : public Action<Ts...>, public Parented<DFPlayer> {
  public:
   TEMPLATABLE_VALUE(uint8_t, volume)
+
   void play(Ts... x) override {
     auto volume = this->volume_.value(x...);
     this->parent_->set_volume(volume);
@@ -164,6 +167,7 @@ template<typename... Ts> class SetVolumeAction : public Action<Ts...>, public Pa
 template<typename... Ts> class SetEqAction : public Action<Ts...>, public Parented<DFPlayer> {
  public:
   TEMPLATABLE_VALUE(EqPreset, eq)
+
   void play(Ts... x) override {
     auto eq = this->eq_.value(x...);
     this->parent_->set_eq(eq);
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 969a5d80cd..4b84e90a08 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -400,6 +400,7 @@ class Image {
 template<typename... Ts> class DisplayPageShowAction : public Action<Ts...> {
  public:
   TEMPLATABLE_VALUE(DisplayPage *, page)
+
   void play(Ts... x) override {
     auto *page = this->page_.value(x...);
     if (page != nullptr) {
@@ -411,18 +412,18 @@ template<typename... Ts> class DisplayPageShowAction : public Action<Ts...> {
 template<typename... Ts> class DisplayPageShowNextAction : public Action<Ts...> {
  public:
   DisplayPageShowNextAction(DisplayBuffer *buffer) : buffer_(buffer) {}
+
   void play(Ts... x) override { this->buffer_->show_next_page(); }
 
- protected:
   DisplayBuffer *buffer_;
 };
 
 template<typename... Ts> class DisplayPageShowPrevAction : public Action<Ts...> {
  public:
   DisplayPageShowPrevAction(DisplayBuffer *buffer) : buffer_(buffer) {}
+
   void play(Ts... x) override { this->buffer_->show_prev_page(); }
 
- protected:
   DisplayBuffer *buffer_;
 };
 
diff --git a/esphome/components/esp8266_pwm/esp8266_pwm.h b/esphome/components/esp8266_pwm/esp8266_pwm.h
index b6839985b0..51b74f48ba 100644
--- a/esphome/components/esp8266_pwm/esp8266_pwm.h
+++ b/esphome/components/esp8266_pwm/esp8266_pwm.h
@@ -43,7 +43,6 @@ template<typename... Ts> class SetFrequencyAction : public Action<Ts...> {
     this->parent_->update_frequency(freq);
   }
 
- protected:
   ESP8266PWM *parent_;
 };
 
diff --git a/esphome/components/fan/automation.h b/esphome/components/fan/automation.h
index dfa72a3ea6..d96ed994e8 100644
--- a/esphome/components/fan/automation.h
+++ b/esphome/components/fan/automation.h
@@ -25,7 +25,6 @@ template<typename... Ts> class TurnOnAction : public Action<Ts...> {
     call.perform();
   }
 
- protected:
   FanState *state_;
 };
 
@@ -35,7 +34,6 @@ template<typename... Ts> class TurnOffAction : public Action<Ts...> {
 
   void play(Ts... x) override { this->state_->turn_off().perform(); }
 
- protected:
   FanState *state_;
 };
 
@@ -45,7 +43,6 @@ template<typename... Ts> class ToggleAction : public Action<Ts...> {
 
   void play(Ts... x) override { this->state_->toggle().perform(); }
 
- protected:
   FanState *state_;
 };
 
diff --git a/esphome/components/mhz19/mhz19.h b/esphome/components/mhz19/mhz19.h
index 2201fc87f0..151351be4c 100644
--- a/esphome/components/mhz19/mhz19.h
+++ b/esphome/components/mhz19/mhz19.h
@@ -37,6 +37,7 @@ class MHZ19Component : public PollingComponent, public uart::UARTDevice {
 template<typename... Ts> class MHZ19CalibrateZeroAction : public Action<Ts...> {
  public:
   MHZ19CalibrateZeroAction(MHZ19Component *mhz19) : mhz19_(mhz19) {}
+
   void play(Ts... x) override { this->mhz19_->calibrate_zero(); }
 
  protected:
@@ -46,6 +47,7 @@ template<typename... Ts> class MHZ19CalibrateZeroAction : public Action<Ts...> {
 template<typename... Ts> class MHZ19ABCEnableAction : public Action<Ts...> {
  public:
   MHZ19ABCEnableAction(MHZ19Component *mhz19) : mhz19_(mhz19) {}
+
   void play(Ts... x) override { this->mhz19_->abc_enable(); }
 
  protected:
@@ -55,6 +57,7 @@ template<typename... Ts> class MHZ19ABCEnableAction : public Action<Ts...> {
 template<typename... Ts> class MHZ19ABCDisableAction : public Action<Ts...> {
  public:
   MHZ19ABCDisableAction(MHZ19Component *mhz19) : mhz19_(mhz19) {}
+
   void play(Ts... x) override { this->mhz19_->abc_disable(); }
 
  protected:
diff --git a/esphome/components/mqtt/mqtt_client.h b/esphome/components/mqtt/mqtt_client.h
index 6f14b0c92c..2bbebff845 100644
--- a/esphome/components/mqtt/mqtt_client.h
+++ b/esphome/components/mqtt/mqtt_client.h
@@ -316,6 +316,7 @@ template<typename... Ts> class MQTTPublishJsonAction : public Action<Ts...> {
   TEMPLATABLE_VALUE(bool, retain)
 
   void set_payload(std::function<void(Ts..., JsonObject &)> payload) { this->payload_ = payload; }
+
   void play(Ts... x) override {
     auto f = std::bind(&MQTTPublishJsonAction<Ts...>::encode_, this, x..., std::placeholders::_1);
     auto topic = this->topic_.value(x...);
diff --git a/esphome/components/output/automation.h b/esphome/components/output/automation.h
index 8c8a5ab61b..51c2849702 100644
--- a/esphome/components/output/automation.h
+++ b/esphome/components/output/automation.h
@@ -33,6 +33,7 @@ template<typename... Ts> class SetLevelAction : public Action<Ts...> {
   SetLevelAction(FloatOutput *output) : output_(output) {}
 
   TEMPLATABLE_VALUE(float, level)
+
   void play(Ts... x) override { this->output_->set_level(this->level_.value(x...)); }
 
  protected:
diff --git a/esphome/components/pid/pid_climate.h b/esphome/components/pid/pid_climate.h
index 8f379c47b4..3dae92af5f 100644
--- a/esphome/components/pid/pid_climate.h
+++ b/esphome/components/pid/pid_climate.h
@@ -71,6 +71,10 @@ template<typename... Ts> class PIDAutotuneAction : public Action<Ts...> {
  public:
   PIDAutotuneAction(PIDClimate *parent) : parent_(parent) {}
 
+  void set_noiseband(float noiseband) { noiseband_ = noiseband; }
+  void set_positive_output(float positive_output) { positive_output_ = positive_output; }
+  void set_negative_output(float negative_output) { negative_output_ = negative_output; }
+
   void play(Ts... x) {
     auto tuner = make_unique<PIDAutotuner>();
     tuner->set_noiseband(this->noiseband_);
@@ -79,10 +83,6 @@ template<typename... Ts> class PIDAutotuneAction : public Action<Ts...> {
     this->parent_->start_autotune(std::move(tuner));
   }
 
-  void set_noiseband(float noiseband) { noiseband_ = noiseband; }
-  void set_positive_output(float positive_output) { positive_output_ = positive_output; }
-  void set_negative_output(float negative_output) { negative_output_ = negative_output; }
-
  protected:
   float noiseband_;
   float positive_output_;
diff --git a/esphome/components/remote_base/jvc_protocol.h b/esphome/components/remote_base/jvc_protocol.h
index 8a216f5348..fc40a6a874 100644
--- a/esphome/components/remote_base/jvc_protocol.h
+++ b/esphome/components/remote_base/jvc_protocol.h
@@ -23,6 +23,7 @@ DECLARE_REMOTE_PROTOCOL(JVC)
 template<typename... Ts> class JVCAction : public RemoteTransmitterActionBase<Ts...> {
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
+
   void encode(RemoteTransmitData *dst, Ts... x) override {
     JVCData data{};
     data.data = this->data_.value(x...);
diff --git a/esphome/components/remote_base/lg_protocol.h b/esphome/components/remote_base/lg_protocol.h
index b810115f58..6267560443 100644
--- a/esphome/components/remote_base/lg_protocol.h
+++ b/esphome/components/remote_base/lg_protocol.h
@@ -26,6 +26,7 @@ template<typename... Ts> class LGAction : public RemoteTransmitterActionBase<Ts.
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
   TEMPLATABLE_VALUE(uint8_t, nbits)
+
   void encode(RemoteTransmitData *dst, Ts... x) override {
     LGData data{};
     data.data = this->data_.value(x...);
diff --git a/esphome/components/remote_base/nec_protocol.h b/esphome/components/remote_base/nec_protocol.h
index c794991eab..593a3efe17 100644
--- a/esphome/components/remote_base/nec_protocol.h
+++ b/esphome/components/remote_base/nec_protocol.h
@@ -25,6 +25,7 @@ template<typename... Ts> class NECAction : public RemoteTransmitterActionBase<Ts
  public:
   TEMPLATABLE_VALUE(uint16_t, address)
   TEMPLATABLE_VALUE(uint16_t, command)
+
   void encode(RemoteTransmitData *dst, Ts... x) override {
     NECData data{};
     data.address = this->address_.value(x...);
diff --git a/esphome/components/remote_base/panasonic_protocol.h b/esphome/components/remote_base/panasonic_protocol.h
index b13bd3e92d..eae97a8a14 100644
--- a/esphome/components/remote_base/panasonic_protocol.h
+++ b/esphome/components/remote_base/panasonic_protocol.h
@@ -26,6 +26,7 @@ template<typename... Ts> class PanasonicAction : public RemoteTransmitterActionB
  public:
   TEMPLATABLE_VALUE(uint16_t, address)
   TEMPLATABLE_VALUE(uint32_t, command)
+
   void encode(RemoteTransmitData *dst, Ts... x) override {
     PanasonicData data{};
     data.address = this->address_.value(x...);
diff --git a/esphome/components/remote_base/pioneer_protocol.h b/esphome/components/remote_base/pioneer_protocol.h
index f93e51a033..4cac4f9f32 100644
--- a/esphome/components/remote_base/pioneer_protocol.h
+++ b/esphome/components/remote_base/pioneer_protocol.h
@@ -25,6 +25,7 @@ template<typename... Ts> class PioneerAction : public RemoteTransmitterActionBas
  public:
   TEMPLATABLE_VALUE(uint16_t, rc_code_1)
   TEMPLATABLE_VALUE(uint16_t, rc_code_2)
+
   void encode(RemoteTransmitData *dst, Ts... x) override {
     PioneerData data{};
     data.rc_code_1 = this->rc_code_1_.value(x...);
diff --git a/esphome/components/remote_base/rc5_protocol.h b/esphome/components/remote_base/rc5_protocol.h
index 2e1da74d9f..589c8d42de 100644
--- a/esphome/components/remote_base/rc5_protocol.h
+++ b/esphome/components/remote_base/rc5_protocol.h
@@ -26,6 +26,7 @@ template<typename... Ts> class RC5Action : public RemoteTransmitterActionBase<Ts
  public:
   TEMPLATABLE_VALUE(uint8_t, address)
   TEMPLATABLE_VALUE(uint8_t, command)
+
   void encode(RemoteTransmitData *dst, Ts... x) override {
     RC5Data data{};
     data.address = this->address_.value(x...);
diff --git a/esphome/components/remote_base/remote_base.h b/esphome/components/remote_base/remote_base.h
index 250b59e55e..916fe29c1f 100644
--- a/esphome/components/remote_base/remote_base.h
+++ b/esphome/components/remote_base/remote_base.h
@@ -323,6 +323,9 @@ template<typename... Ts> class RemoteTransmitterActionBase : public Action<Ts...
  public:
   void set_parent(RemoteTransmitterBase *parent) { this->parent_ = parent; }
 
+  TEMPLATABLE_VALUE(uint32_t, send_times);
+  TEMPLATABLE_VALUE(uint32_t, send_wait);
+
   void play(Ts... x) override {
     auto call = this->parent_->transmit();
     this->encode(call.get_data(), x...);
@@ -331,12 +334,9 @@ template<typename... Ts> class RemoteTransmitterActionBase : public Action<Ts...
     call.perform();
   }
 
+ protected:
   virtual void encode(RemoteTransmitData *dst, Ts... x) = 0;
 
-  TEMPLATABLE_VALUE(uint32_t, send_times);
-  TEMPLATABLE_VALUE(uint32_t, send_wait);
-
- protected:
   RemoteTransmitterBase *parent_{};
 };
 
diff --git a/esphome/components/remote_base/samsung_protocol.h b/esphome/components/remote_base/samsung_protocol.h
index 50ff02c1aa..f7a54788e5 100644
--- a/esphome/components/remote_base/samsung_protocol.h
+++ b/esphome/components/remote_base/samsung_protocol.h
@@ -24,6 +24,7 @@ DECLARE_REMOTE_PROTOCOL(Samsung)
 template<typename... Ts> class SamsungAction : public RemoteTransmitterActionBase<Ts...> {
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
+
   void encode(RemoteTransmitData *dst, Ts... x) override {
     SamsungData data{};
     data.data = this->data_.value(x...);
diff --git a/esphome/components/remote_base/sony_protocol.h b/esphome/components/remote_base/sony_protocol.h
index 9f0bcdf82f..aecc8ab91c 100644
--- a/esphome/components/remote_base/sony_protocol.h
+++ b/esphome/components/remote_base/sony_protocol.h
@@ -26,6 +26,7 @@ template<typename... Ts> class SonyAction : public RemoteTransmitterActionBase<T
  public:
   TEMPLATABLE_VALUE(uint32_t, data)
   TEMPLATABLE_VALUE(uint8_t, nbits)
+
   void encode(RemoteTransmitData *dst, Ts... x) override {
     SonyData data{};
     data.data = this->data_.value(x...);
diff --git a/esphome/components/rotary_encoder/rotary_encoder.h b/esphome/components/rotary_encoder/rotary_encoder.h
index 4220645478..f0e47dfe0a 100644
--- a/esphome/components/rotary_encoder/rotary_encoder.h
+++ b/esphome/components/rotary_encoder/rotary_encoder.h
@@ -74,6 +74,7 @@ template<typename... Ts> class RotaryEncoderSetValueAction : public Action<Ts...
  public:
   RotaryEncoderSetValueAction(RotaryEncoderSensor *encoder) : encoder_(encoder) {}
   TEMPLATABLE_VALUE(int, value)
+
   void play(Ts... x) override { this->encoder_->set_value(this->value_.value(x...)); }
 
  protected:
diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index 3b97327da8..8495014f00 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -53,41 +53,34 @@ template<typename... Ts> class ScriptWaitAction : public Action<Ts...>, public C
  public:
   ScriptWaitAction(Script *script) : script_(script) {}
 
-  void play(Ts... x) { /* ignore - see play_complex */
-  }
-
   void play_complex(Ts... x) override {
+    this->num_running_++;
     // Check if we can continue immediately.
     if (!this->script_->is_running()) {
-      this->triggered_ = false;
-      this->play_next(x...);
+      this->play_next_(x...);
       return;
     }
     this->var_ = std::make_tuple(x...);
-    this->triggered_ = true;
     this->loop();
   }
 
-  void stop() override { this->triggered_ = false; }
-
   void loop() override {
-    if (!this->triggered_)
+    if (this->num_running_ == 0)
       return;
 
     if (this->script_->is_running())
       return;
 
-    this->triggered_ = false;
-    this->play_next_tuple(this->var_);
+    this->play_next_tuple_(this->var_);
   }
 
   float get_setup_priority() const override { return setup_priority::DATA; }
 
-  bool is_running() override { return this->triggered_ || this->is_running_next(); }
+  void play(Ts... x) override { /* ignore - see play_complex */
+  }
 
  protected:
   Script *script_;
-  bool triggered_{false};
   std::tuple<Ts...> var_{};
 };
 
diff --git a/esphome/components/sensor/automation.h b/esphome/components/sensor/automation.h
index 079077dba0..c70fb93963 100644
--- a/esphome/components/sensor/automation.h
+++ b/esphome/components/sensor/automation.h
@@ -25,6 +25,7 @@ template<typename... Ts> class SensorPublishAction : public Action<Ts...> {
  public:
   SensorPublishAction(Sensor *sensor) : sensor_(sensor) {}
   TEMPLATABLE_VALUE(float, state)
+
   void play(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
 
  protected:
diff --git a/esphome/components/servo/servo.h b/esphome/components/servo/servo.h
index a37188740c..b864efc877 100644
--- a/esphome/components/servo/servo.h
+++ b/esphome/components/servo/servo.h
@@ -64,6 +64,7 @@ template<typename... Ts> class ServoWriteAction : public Action<Ts...> {
  public:
   ServoWriteAction(Servo *servo) : servo_(servo) {}
   TEMPLATABLE_VALUE(float, value)
+
   void play(Ts... x) override { this->servo_->write(this->value_.value(x...)); }
 
  protected:
@@ -73,6 +74,7 @@ template<typename... Ts> class ServoWriteAction : public Action<Ts...> {
 template<typename... Ts> class ServoDetachAction : public Action<Ts...> {
  public:
   ServoDetachAction(Servo *servo) : servo_(servo) {}
+
   void play(Ts... x) override { this->servo_->detach(); }
 
  protected:
diff --git a/esphome/components/switch/automation.h b/esphome/components/switch/automation.h
index 90bdabf0f4..579daf4d24 100644
--- a/esphome/components/switch/automation.h
+++ b/esphome/components/switch/automation.h
@@ -73,6 +73,7 @@ template<typename... Ts> class SwitchPublishAction : public Action<Ts...> {
  public:
   SwitchPublishAction(Switch *a_switch) : switch_(a_switch) {}
   TEMPLATABLE_VALUE(bool, state)
+
   void play(Ts... x) override { this->switch_->publish_state(this->state_.value(x...)); }
 
  protected:
diff --git a/esphome/components/text_sensor/automation.h b/esphome/components/text_sensor/automation.h
index 496efb1cc3..6810d10b13 100644
--- a/esphome/components/text_sensor/automation.h
+++ b/esphome/components/text_sensor/automation.h
@@ -30,6 +30,7 @@ template<typename... Ts> class TextSensorPublishAction : public Action<Ts...> {
  public:
   TextSensorPublishAction(TextSensor *sensor) : sensor_(sensor) {}
   TEMPLATABLE_VALUE(std::string, state)
+
   void play(Ts... x) override { this->sensor_->publish_state(this->state_.value(x...)); }
 
  protected:
diff --git a/esphome/core/automation.h b/esphome/core/automation.h
index cbe96a749e..02bd8bb299 100644
--- a/esphome/core/automation.h
+++ b/esphome/core/automation.h
@@ -75,45 +75,55 @@ template<typename... Ts> class ActionList;
 
 template<typename... Ts> class Action {
  public:
-  virtual void play(Ts... x) = 0;
   virtual void play_complex(Ts... x) {
+    this->num_running_++;
     this->play(x...);
-    this->play_next(x...);
+    this->play_next_(x...);
   }
-  void play_next(Ts... x) {
-    if (this->next_ != nullptr) {
-      this->next_->play_complex(x...);
+  virtual void stop_complex() {
+    if (num_running_) {
+      this->stop();
+      this->num_running_ = 0;
+    }
+    this->stop_next_();
+  }
+  virtual bool is_running() { return this->num_running_ > 0 || this->is_running_next_(); }
+
+ protected:
+  friend ActionList<Ts...>;
+
+  virtual void play(Ts... x) = 0;
+  void play_next_(Ts... x) {
+    if (this->num_running_ > 0) {
+      this->num_running_--;
+      if (this->next_ != nullptr) {
+        this->next_->play_complex(x...);
+      }
     }
   }
-  virtual void stop() {}
-  virtual void stop_complex() {
-    this->stop();
-    this->stop_next();
+  template<int... S> void play_next_tuple_(const std::tuple<Ts...> &tuple, seq<S...>) {
+    this->play_next_(std::get<S>(tuple)...);
   }
-  void stop_next() {
+  void play_next_tuple_(const std::tuple<Ts...> &tuple) {
+    this->play_next_tuple_(tuple, typename gens<sizeof...(Ts)>::type());
+  }
+
+  virtual void stop() {}
+  void stop_next_() {
     if (this->next_ != nullptr) {
       this->next_->stop_complex();
     }
   }
-  virtual bool is_running() { return this->is_running_next(); }
-  bool is_running_next() {
+
+  bool is_running_next_() {
     if (this->next_ == nullptr)
       return false;
     return this->next_->is_running();
   }
 
-  void play_next_tuple(const std::tuple<Ts...> &tuple) {
-    this->play_next_tuple_(tuple, typename gens<sizeof...(Ts)>::type());
-  }
-
- protected:
-  friend ActionList<Ts...>;
-
-  template<int... S> void play_next_tuple_(const std::tuple<Ts...> &tuple, seq<S...>) {
-    this->play_next(std::get<S>(tuple)...);
-  }
-
   Action<Ts...> *next_ = nullptr;
+
+  int num_running_{0};
 };
 
 template<typename... Ts> class ActionList {
diff --git a/esphome/core/base_automation.h b/esphome/core/base_automation.h
index add3df0bb5..d2656290bc 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -108,34 +108,23 @@ template<typename... Ts> class DelayAction : public Action<Ts...>, public Compon
 
   TEMPLATABLE_VALUE(uint32_t, delay)
 
-  void stop() override {
-    this->cancel_timeout("");
-    this->num_running_ = 0;
-  }
-
-  void play(Ts... x) override { /* ignore - see play_complex */
-  }
-
   void play_complex(Ts... x) override {
-    auto f = std::bind(&DelayAction<Ts...>::delay_end_, this, x...);
+    auto f = std::bind(&DelayAction<Ts...>::play_next_, this, x...);
     this->num_running_++;
     this->set_timeout(this->delay_.value(x...), f);
   }
   float get_setup_priority() const override { return setup_priority::HARDWARE; }
 
-  bool is_running() override { return this->num_running_ > 0 || this->is_running_next(); }
-
- protected:
-  void delay_end_(Ts... x) {
-    this->num_running_--;
-    this->play_next(x...);
+  void play(Ts... x) override { /* ignore - see play_complex */
   }
-  int num_running_{0};
+
+  void stop() override { this->cancel_timeout(""); }
 };
 
 template<typename... Ts> class LambdaAction : public Action<Ts...> {
  public:
   explicit LambdaAction(std::function<void(Ts...)> &&f) : f_(std::move(f)) {}
+
   void play(Ts... x) override { this->f_(x...); }
 
  protected:
@@ -148,41 +137,40 @@ template<typename... Ts> class IfAction : public Action<Ts...> {
 
   void add_then(const std::vector<Action<Ts...> *> &actions) {
     this->then_.add_actions(actions);
-    this->then_.add_action(new LambdaAction<Ts...>([this](Ts... x) { this->play_next(x...); }));
+    this->then_.add_action(new LambdaAction<Ts...>([this](Ts... x) { this->play_next_(x...); }));
   }
 
   void add_else(const std::vector<Action<Ts...> *> &actions) {
     this->else_.add_actions(actions);
-    this->else_.add_action(new LambdaAction<Ts...>([this](Ts... x) { this->play_next(x...); }));
-  }
-
-  void play(Ts... x) override { /* ignore - see play_complex */
+    this->else_.add_action(new LambdaAction<Ts...>([this](Ts... x) { this->play_next_(x...); }));
   }
 
   void play_complex(Ts... x) override {
+    this->num_running_++;
     bool res = this->condition_->check(x...);
     if (res) {
       if (this->then_.empty()) {
-        this->play_next(x...);
-      } else {
+        this->play_next_(x...);
+      } else if (this->num_running_ > 0) {
         this->then_.play(x...);
       }
     } else {
       if (this->else_.empty()) {
-        this->play_next(x...);
-      } else {
+        this->play_next_(x...);
+      } else if (this->num_running_ > 0) {
         this->else_.play(x...);
       }
     }
   }
 
+  void play(Ts... x) override { /* ignore - see play_complex */
+  }
+
   void stop() override {
     this->then_.stop();
     this->else_.stop();
   }
 
-  bool is_running() override { return this->then_.is_running() || this->else_.is_running() || this->is_running_next(); }
-
  protected:
   Condition<Ts...> *condition_;
   ActionList<Ts...> then_;
@@ -196,37 +184,40 @@ template<typename... Ts> class WhileAction : public Action<Ts...> {
   void add_then(const std::vector<Action<Ts...> *> &actions) {
     this->then_.add_actions(actions);
     this->then_.add_action(new LambdaAction<Ts...>([this](Ts... x) {
-      if (this->condition_->check_tuple(this->var_)) {
+      if (this->num_running_ > 0 && this->condition_->check_tuple(this->var_)) {
         // play again
-        this->then_.play_tuple(this->var_);
+        if (this->num_running_ > 0) {
+          this->then_.play_tuple(this->var_);
+        }
       } else {
         // condition false, play next
-        this->play_next_tuple(this->var_);
+        this->play_next_tuple_(this->var_);
       }
     }));
   }
 
-  void play(Ts... x) override { /* ignore - see play_complex */
-  }
-
   void play_complex(Ts... x) override {
+    this->num_running_++;
     // Store loop parameters
     this->var_ = std::make_tuple(x...);
     // Initial condition check
     if (!this->condition_->check_tuple(this->var_)) {
       // If new condition check failed, stop loop if running
       this->then_.stop();
-      this->play_next_tuple(this->var_);
+      this->play_next_tuple_(this->var_);
       return;
     }
 
-    this->then_.play_tuple(this->var_);
+    if (this->num_running_ > 0) {
+      this->then_.play_tuple(this->var_);
+    }
+  }
+
+  void play(Ts... x) override { /* ignore - see play_complex */
   }
 
   void stop() override { this->then_.stop(); }
 
-  bool is_running() override { return this->then_.is_running() || this->is_running_next(); }
-
  protected:
   Condition<Ts...> *condition_;
   ActionList<Ts...> then_;
@@ -237,48 +228,44 @@ template<typename... Ts> class WaitUntilAction : public Action<Ts...>, public Co
  public:
   WaitUntilAction(Condition<Ts...> *condition) : condition_(condition) {}
 
-  void play(Ts... x) { /* ignore - see play_complex */
-  }
-
   void play_complex(Ts... x) override {
+    this->num_running_++;
     // Check if we can continue immediately.
     if (this->condition_->check(x...)) {
-      this->triggered_ = false;
-      this->play_next(x...);
+      if (this->num_running_ > 0) {
+        this->play_next_(x...);
+      }
       return;
     }
     this->var_ = std::make_tuple(x...);
-    this->triggered_ = true;
     this->loop();
   }
 
-  void stop() override { this->triggered_ = false; }
-
   void loop() override {
-    if (!this->triggered_)
+    if (this->num_running_ == 0)
       return;
 
     if (!this->condition_->check_tuple(this->var_)) {
       return;
     }
 
-    this->triggered_ = false;
-    this->play_next_tuple(this->var_);
+    this->play_next_tuple_(this->var_);
   }
 
   float get_setup_priority() const override { return setup_priority::DATA; }
 
-  bool is_running() override { return this->triggered_ || this->is_running_next(); }
+  void play(Ts... x) override { /* ignore - see play_complex */
+  }
 
  protected:
   Condition<Ts...> *condition_;
-  bool triggered_{false};
   std::tuple<Ts...> var_{};
 };
 
 template<typename... Ts> class UpdateComponentAction : public Action<Ts...> {
  public:
   UpdateComponentAction(PollingComponent *component) : component_(component) {}
+
   void play(Ts... x) override { this->component_->update(); }
 
  protected:

From 7487ffcbcb61740b2b3c830f8080f7dc9c357e32 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 28 Jun 2020 21:17:10 -0300
Subject: [PATCH 257/412] add test4.yaml

---
 .gitlab-ci.yml | 5 +++++
 script/test    | 1 +
 2 files changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdb2693f46..0ed7094615 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,6 +131,11 @@ test3:
   script:
     - esphome tests/test3.yaml compile
 
+test4:
+  <<: *test
+  script:
+    - esphome tests/test3.yaml compile
+
 .deploy-pypi: &deploy-pypi
   <<: *lint
   stage: deploy
diff --git a/script/test b/script/test
index 5e91686aae..a6d99c8f62 100755
--- a/script/test
+++ b/script/test
@@ -9,3 +9,4 @@ set -x
 esphome tests/test1.yaml compile
 esphome tests/test2.yaml compile
 esphome tests/test3.yaml compile
+esphome tests/test4.yaml compile

From 6505c30c2b463b9f457ebc9dd32cddd399f6e485 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 30 Jun 2020 22:17:05 -0300
Subject: [PATCH 258/412] fix gitlab test4.yaml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ed7094615..1d349c4059 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,7 +134,7 @@ test3:
 test4:
   <<: *test
   script:
-    - esphome tests/test3.yaml compile
+    - esphome tests/test4.yaml compile
 
 .deploy-pypi: &deploy-pypi
   <<: *lint

From 31067530a5e393aeac7da3b9ad9f5a441ee35187 Mon Sep 17 00:00:00 2001
From: Jonathan Adams <jonathan@connockadams.uk>
Date: Wed, 1 Jul 2020 18:08:17 +0100
Subject: [PATCH 259/412] Fixes esphome/issues#1192 - Save on upload bug
 (#1107)

---
 esphome/dashboard/static/js/esphome.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/esphome/dashboard/static/js/esphome.js b/esphome/dashboard/static/js/esphome.js
index f6e9979eb2..d80e5e4ec9 100644
--- a/esphome/dashboard/static/js/esphome.js
+++ b/esphome/dashboard/static/js/esphome.js
@@ -735,6 +735,7 @@ document.querySelectorAll("[data-action='edit']").forEach((button) => {
     const closeButton = document.querySelector("#js-editor-modal [data-action='close']");
     saveButton.setAttribute('data-filename', editorActiveFilename);
     uploadButton.setAttribute('data-filename', editorActiveFilename);
+    uploadButton.setAttribute('onClick', `saveFile("${editorActiveFilename}")`);
     if (editorActiveFilename === "secrets.yaml") {
       uploadButton.classList.add("disabled");
       editorActiveSecrets = true;

From f479eae714f54e38eae943ea0ed355312600dabb Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 1 Jul 2020 14:08:55 -0300
Subject: [PATCH 260/412] Revert "Climate bang bang enhancements (#1061)"
 (#1106)

This reverts commit 0082c5b4597dbbe75237a14f471beefc6ee86352.
---
 .../bang_bang/bang_bang_climate.cpp           | 520 +++---------------
 .../components/bang_bang/bang_bang_climate.h  | 248 ++-------
 esphome/components/bang_bang/climate.py       | 235 +-------
 esphome/const.py                              |  22 -
 tests/test3.yaml                              |  43 --
 5 files changed, 123 insertions(+), 945 deletions(-)

diff --git a/esphome/components/bang_bang/bang_bang_climate.cpp b/esphome/components/bang_bang/bang_bang_climate.cpp
index 29f08fbd89..cf527988fe 100644
--- a/esphome/components/bang_bang/bang_bang_climate.cpp
+++ b/esphome/components/bang_bang/bang_bang_climate.cpp
@@ -9,393 +9,136 @@ static const char *TAG = "bang_bang.climate";
 void BangBangClimate::setup() {
   this->sensor_->add_on_state_callback([this](float state) {
     this->current_temperature = state;
-    // required action may have changed, recompute, refresh
-    this->switch_to_action_(compute_action_());
-    // current temperature and possibly action changed, so publish the new state
+    // control may have changed, recompute
+    this->compute_state_();
+    // current temperature changed, publish state
     this->publish_state();
   });
   this->current_temperature = this->sensor_->state;
-  // restore all climate data, if possible
+  // restore set points
   auto restore = this->restore_state_();
   if (restore.has_value()) {
     restore->to_call(this).perform();
   } else {
-    // restore from defaults, change_away handles temps for us
+    // restore from defaults, change_away handles those for us
     this->mode = climate::CLIMATE_MODE_AUTO;
     this->change_away_(false);
   }
-  // refresh the climate action based on the restored settings
-  this->switch_to_action_(compute_action_());
-  this->setup_complete_ = true;
-  this->publish_state();
-}
-void BangBangClimate::refresh() {
-  this->switch_to_mode_(this->mode);
-  this->switch_to_action_(compute_action_());
-  this->switch_to_fan_mode_(this->fan_mode);
-  this->switch_to_swing_mode_(this->swing_mode);
-  this->publish_state();
 }
 void BangBangClimate::control(const climate::ClimateCall &call) {
   if (call.get_mode().has_value())
     this->mode = *call.get_mode();
-  if (call.get_fan_mode().has_value())
-    this->fan_mode = *call.get_fan_mode();
-  if (call.get_swing_mode().has_value())
-    this->swing_mode = *call.get_swing_mode();
-  if (call.get_target_temperature().has_value())
-    this->target_temperature = *call.get_target_temperature();
   if (call.get_target_temperature_low().has_value())
     this->target_temperature_low = *call.get_target_temperature_low();
   if (call.get_target_temperature_high().has_value())
     this->target_temperature_high = *call.get_target_temperature_high();
-  if (call.get_away().has_value()) {
-    // setup_complete_ blocks modifying/resetting the temps immediately after boot
-    if (this->setup_complete_) {
-      this->change_away_(*call.get_away());
-    } else {
-      this->away = *call.get_away();
-    }
-  }
-  // set point validation
-  if (this->supports_two_points_) {
-    if (this->target_temperature_low < this->get_traits().get_visual_min_temperature())
-      this->target_temperature_low = this->get_traits().get_visual_min_temperature();
-    if (this->target_temperature_high > this->get_traits().get_visual_max_temperature())
-      this->target_temperature_high = this->get_traits().get_visual_max_temperature();
-    if (this->target_temperature_high < this->target_temperature_low)
-      this->target_temperature_high = this->target_temperature_low;
-  } else {
-    if (this->target_temperature < this->get_traits().get_visual_min_temperature())
-      this->target_temperature = this->get_traits().get_visual_min_temperature();
-    if (this->target_temperature > this->get_traits().get_visual_max_temperature())
-      this->target_temperature = this->get_traits().get_visual_max_temperature();
-  }
-  // make any changes happen
-  refresh();
+  if (call.get_away().has_value())
+    this->change_away_(*call.get_away());
+
+  this->compute_state_();
+  this->publish_state();
 }
 climate::ClimateTraits BangBangClimate::traits() {
   auto traits = climate::ClimateTraits();
   traits.set_supports_current_temperature(true);
-  traits.set_supports_auto_mode(this->supports_auto_);
+  traits.set_supports_auto_mode(true);
   traits.set_supports_cool_mode(this->supports_cool_);
-  traits.set_supports_dry_mode(this->supports_dry_);
-  traits.set_supports_fan_only_mode(this->supports_fan_only_);
   traits.set_supports_heat_mode(this->supports_heat_);
-  traits.set_supports_fan_mode_on(this->supports_fan_mode_on_);
-  traits.set_supports_fan_mode_off(this->supports_fan_mode_off_);
-  traits.set_supports_fan_mode_auto(this->supports_fan_mode_auto_);
-  traits.set_supports_fan_mode_low(this->supports_fan_mode_low_);
-  traits.set_supports_fan_mode_medium(this->supports_fan_mode_medium_);
-  traits.set_supports_fan_mode_high(this->supports_fan_mode_high_);
-  traits.set_supports_fan_mode_middle(this->supports_fan_mode_middle_);
-  traits.set_supports_fan_mode_focus(this->supports_fan_mode_focus_);
-  traits.set_supports_fan_mode_diffuse(this->supports_fan_mode_diffuse_);
-  traits.set_supports_swing_mode_both(this->supports_swing_mode_both_);
-  traits.set_supports_swing_mode_horizontal(this->supports_swing_mode_horizontal_);
-  traits.set_supports_swing_mode_off(this->supports_swing_mode_off_);
-  traits.set_supports_swing_mode_vertical(this->supports_swing_mode_vertical_);
-  traits.set_supports_two_point_target_temperature(this->supports_two_points_);
+  traits.set_supports_two_point_target_temperature(true);
   traits.set_supports_away(this->supports_away_);
   traits.set_supports_action(true);
   return traits;
 }
-climate::ClimateAction BangBangClimate::compute_action_() {
-  climate::ClimateAction target_action = this->action;
-  if (this->supports_two_points_) {
-    if (isnan(this->current_temperature) || isnan(this->target_temperature_low) ||
-        isnan(this->target_temperature_high) || isnan(this->hysteresis_))
-      // if any control parameters are nan, go to OFF action (not IDLE!)
-      return climate::CLIMATE_ACTION_OFF;
+void BangBangClimate::compute_state_() {
+  if (this->mode != climate::CLIMATE_MODE_AUTO) {
+    // in non-auto mode, switch directly to appropriate action
+    //  - HEAT mode -> HEATING action
+    //  - COOL mode -> COOLING action
+    //  - OFF mode -> OFF action (not IDLE!)
+    this->switch_to_action_(static_cast<climate::ClimateAction>(this->mode));
+    return;
+  }
+  if (isnan(this->current_temperature) || isnan(this->target_temperature_low) || isnan(this->target_temperature_high)) {
+    // if any control parameters are nan, go to OFF action (not IDLE!)
+    this->switch_to_action_(climate::CLIMATE_ACTION_OFF);
+    return;
+  }
+  const bool too_cold = this->current_temperature < this->target_temperature_low;
+  const bool too_hot = this->current_temperature > this->target_temperature_high;
 
-    if (((this->action == climate::CLIMATE_ACTION_FAN) && (this->mode != climate::CLIMATE_MODE_FAN_ONLY)) ||
-        ((this->action == climate::CLIMATE_ACTION_DRYING) && (this->mode != climate::CLIMATE_MODE_DRY))) {
+  climate::ClimateAction target_action;
+  if (too_cold) {
+    // too cold -> enable heating if possible, else idle
+    if (this->supports_heat_)
+      target_action = climate::CLIMATE_ACTION_HEATING;
+    else
+      target_action = climate::CLIMATE_ACTION_IDLE;
+  } else if (too_hot) {
+    // too hot -> enable cooling if possible, else idle
+    if (this->supports_cool_)
+      target_action = climate::CLIMATE_ACTION_COOLING;
+    else
       target_action = climate::CLIMATE_ACTION_IDLE;
-    }
-
-    switch (this->mode) {
-      case climate::CLIMATE_MODE_FAN_ONLY:
-        if (this->supports_fan_only_) {
-          if (this->current_temperature > this->target_temperature_high + this->hysteresis_)
-            target_action = climate::CLIMATE_ACTION_FAN;
-          else if (this->current_temperature < this->target_temperature_high - this->hysteresis_)
-            if (this->action == climate::CLIMATE_ACTION_FAN)
-              target_action = climate::CLIMATE_ACTION_IDLE;
-        }
-        break;
-      case climate::CLIMATE_MODE_DRY:
-        target_action = climate::CLIMATE_ACTION_DRYING;
-        break;
-      case climate::CLIMATE_MODE_OFF:
-        target_action = climate::CLIMATE_ACTION_OFF;
-        break;
-      case climate::CLIMATE_MODE_AUTO:
-      case climate::CLIMATE_MODE_COOL:
-      case climate::CLIMATE_MODE_HEAT:
-        if (this->supports_cool_) {
-          if (this->current_temperature > this->target_temperature_high + this->hysteresis_)
-            target_action = climate::CLIMATE_ACTION_COOLING;
-          else if (this->current_temperature < this->target_temperature_high - this->hysteresis_)
-            if (this->action == climate::CLIMATE_ACTION_COOLING)
-              target_action = climate::CLIMATE_ACTION_IDLE;
-        }
-        if (this->supports_heat_) {
-          if (this->current_temperature < this->target_temperature_low - this->hysteresis_)
-            target_action = climate::CLIMATE_ACTION_HEATING;
-          else if (this->current_temperature > this->target_temperature_low + this->hysteresis_)
-            if (this->action == climate::CLIMATE_ACTION_HEATING)
-              target_action = climate::CLIMATE_ACTION_IDLE;
-        }
-        break;
-      default:
-        break;
-    }
   } else {
-    if (isnan(this->current_temperature) || isnan(this->target_temperature) || isnan(this->hysteresis_))
-      // if any control parameters are nan, go to OFF action (not IDLE!)
-      return climate::CLIMATE_ACTION_OFF;
-
-    if (((this->action == climate::CLIMATE_ACTION_FAN) && (this->mode != climate::CLIMATE_MODE_FAN_ONLY)) ||
-        ((this->action == climate::CLIMATE_ACTION_DRYING) && (this->mode != climate::CLIMATE_MODE_DRY))) {
+    // neither too hot nor too cold -> in range
+    if (this->supports_cool_ && this->supports_heat_) {
+      // if supports both ends, go to idle action
       target_action = climate::CLIMATE_ACTION_IDLE;
-    }
-
-    switch (this->mode) {
-      case climate::CLIMATE_MODE_FAN_ONLY:
-        if (this->supports_fan_only_) {
-          if (this->current_temperature > this->target_temperature + this->hysteresis_)
-            target_action = climate::CLIMATE_ACTION_FAN;
-          else if (this->current_temperature < this->target_temperature - this->hysteresis_)
-            if (this->action == climate::CLIMATE_ACTION_FAN)
-              target_action = climate::CLIMATE_ACTION_IDLE;
-        }
-        break;
-      case climate::CLIMATE_MODE_DRY:
-        target_action = climate::CLIMATE_ACTION_DRYING;
-        break;
-      case climate::CLIMATE_MODE_OFF:
-        target_action = climate::CLIMATE_ACTION_OFF;
-        break;
-      case climate::CLIMATE_MODE_COOL:
-        if (this->supports_cool_) {
-          if (this->current_temperature > this->target_temperature + this->hysteresis_)
-            target_action = climate::CLIMATE_ACTION_COOLING;
-          else if (this->current_temperature < this->target_temperature - this->hysteresis_)
-            if (this->action == climate::CLIMATE_ACTION_COOLING)
-              target_action = climate::CLIMATE_ACTION_IDLE;
-        }
-      case climate::CLIMATE_MODE_HEAT:
-        if (this->supports_heat_) {
-          if (this->current_temperature < this->target_temperature - this->hysteresis_)
-            target_action = climate::CLIMATE_ACTION_HEATING;
-          else if (this->current_temperature > this->target_temperature + this->hysteresis_)
-            if (this->action == climate::CLIMATE_ACTION_HEATING)
-              target_action = climate::CLIMATE_ACTION_IDLE;
-        }
-        break;
-      default:
-        break;
+    } else {
+      // else use current mode and don't change (hysteresis)
+      target_action = this->action;
     }
   }
-  // do not switch to an action that isn't enabled per the active climate mode
-  if ((this->mode == climate::CLIMATE_MODE_COOL) && (target_action == climate::CLIMATE_ACTION_HEATING))
-    target_action = climate::CLIMATE_ACTION_IDLE;
-  if ((this->mode == climate::CLIMATE_MODE_HEAT) && (target_action == climate::CLIMATE_ACTION_COOLING))
-    target_action = climate::CLIMATE_ACTION_IDLE;
 
-  return target_action;
+  this->switch_to_action_(target_action);
 }
 void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
-  // setup_complete_ helps us ensure an action is called immediately after boot
-  if ((action == this->action) && this->setup_complete_)
+  if (action == this->action)
     // already in target mode
     return;
 
-  if (((action == climate::CLIMATE_ACTION_OFF && this->action == climate::CLIMATE_ACTION_IDLE) ||
-       (action == climate::CLIMATE_ACTION_IDLE && this->action == climate::CLIMATE_ACTION_OFF)) &&
-      this->setup_complete_) {
+  if ((action == climate::CLIMATE_ACTION_OFF && this->action == climate::CLIMATE_ACTION_IDLE) ||
+      (action == climate::CLIMATE_ACTION_IDLE && this->action == climate::CLIMATE_ACTION_OFF)) {
     // switching from OFF to IDLE or vice-versa
     // these only have visual difference. OFF means user manually disabled,
     // IDLE means it's in auto mode but value is in target range.
     this->action = action;
+    this->publish_state();
     return;
   }
 
-  if (this->prev_action_trigger_ != nullptr) {
-    this->prev_action_trigger_->stop();
-    this->prev_action_trigger_ = nullptr;
+  if (this->prev_trigger_ != nullptr) {
+    this->prev_trigger_->stop();
+    this->prev_trigger_ = nullptr;
   }
-  Trigger<> *trig = this->idle_action_trigger_;
+  Trigger<> *trig;
   switch (action) {
     case climate::CLIMATE_ACTION_OFF:
     case climate::CLIMATE_ACTION_IDLE:
-      // trig = this->idle_action_trigger_;
+      trig = this->idle_trigger_;
       break;
     case climate::CLIMATE_ACTION_COOLING:
-      trig = this->cool_action_trigger_;
+      trig = this->cool_trigger_;
       break;
     case climate::CLIMATE_ACTION_HEATING:
-      trig = this->heat_action_trigger_;
-      break;
-    case climate::CLIMATE_ACTION_FAN:
-      trig = this->fan_only_action_trigger_;
-      break;
-    case climate::CLIMATE_ACTION_DRYING:
-      trig = this->dry_action_trigger_;
+      trig = this->heat_trigger_;
       break;
     default:
-      // we cannot report an invalid mode back to HA (even if it asked for one)
-      //  and must assume some valid value
-      action = climate::CLIMATE_ACTION_OFF;
-      // trig = this->idle_action_trigger_;
+      trig = nullptr;
   }
   assert(trig != nullptr);
   trig->trigger();
   this->action = action;
-  this->prev_action_trigger_ = trig;
-}
-void BangBangClimate::switch_to_fan_mode_(climate::ClimateFanMode fan_mode) {
-  // setup_complete_ helps us ensure an action is called immediately after boot
-  if ((fan_mode == this->prev_fan_mode_) && this->setup_complete_)
-    // already in target mode
-    return;
-
-  if (this->prev_fan_mode_trigger_ != nullptr) {
-    this->prev_fan_mode_trigger_->stop();
-    this->prev_fan_mode_trigger_ = nullptr;
-  }
-  Trigger<> *trig = this->fan_mode_auto_trigger_;
-  switch (fan_mode) {
-    case climate::CLIMATE_FAN_ON:
-      trig = this->fan_mode_on_trigger_;
-      break;
-    case climate::CLIMATE_FAN_OFF:
-      trig = this->fan_mode_off_trigger_;
-      break;
-    case climate::CLIMATE_FAN_AUTO:
-      // trig = this->fan_mode_auto_trigger_;
-      break;
-    case climate::CLIMATE_FAN_LOW:
-      trig = this->fan_mode_low_trigger_;
-      break;
-    case climate::CLIMATE_FAN_MEDIUM:
-      trig = this->fan_mode_medium_trigger_;
-      break;
-    case climate::CLIMATE_FAN_HIGH:
-      trig = this->fan_mode_high_trigger_;
-      break;
-    case climate::CLIMATE_FAN_MIDDLE:
-      trig = this->fan_mode_middle_trigger_;
-      break;
-    case climate::CLIMATE_FAN_FOCUS:
-      trig = this->fan_mode_focus_trigger_;
-      break;
-    case climate::CLIMATE_FAN_DIFFUSE:
-      trig = this->fan_mode_diffuse_trigger_;
-      break;
-    default:
-      // we cannot report an invalid mode back to HA (even if it asked for one)
-      //  and must assume some valid value
-      fan_mode = climate::CLIMATE_FAN_AUTO;
-      // trig = this->fan_mode_auto_trigger_;
-  }
-  assert(trig != nullptr);
-  trig->trigger();
-  this->fan_mode = fan_mode;
-  this->prev_fan_mode_ = fan_mode;
-  this->prev_fan_mode_trigger_ = trig;
-}
-void BangBangClimate::switch_to_mode_(climate::ClimateMode mode) {
-  // setup_complete_ helps us ensure an action is called immediately after boot
-  if ((mode == this->prev_mode_) && this->setup_complete_)
-    // already in target mode
-    return;
-
-  if (this->prev_mode_trigger_ != nullptr) {
-    this->prev_mode_trigger_->stop();
-    this->prev_mode_trigger_ = nullptr;
-  }
-  Trigger<> *trig = this->auto_mode_trigger_;
-  switch (mode) {
-    case climate::CLIMATE_MODE_OFF:
-      trig = this->off_mode_trigger_;
-      break;
-    case climate::CLIMATE_MODE_AUTO:
-      // trig = this->auto_mode_trigger_;
-      break;
-    case climate::CLIMATE_MODE_COOL:
-      trig = this->cool_mode_trigger_;
-      break;
-    case climate::CLIMATE_MODE_HEAT:
-      trig = this->heat_mode_trigger_;
-      break;
-    case climate::CLIMATE_MODE_FAN_ONLY:
-      trig = this->fan_only_mode_trigger_;
-      break;
-    case climate::CLIMATE_MODE_DRY:
-      trig = this->dry_mode_trigger_;
-      break;
-    default:
-      // we cannot report an invalid mode back to HA (even if it asked for one)
-      //  and must assume some valid value
-      mode = climate::CLIMATE_MODE_AUTO;
-      // trig = this->auto_mode_trigger_;
-  }
-  assert(trig != nullptr);
-  trig->trigger();
-  this->mode = mode;
-  this->prev_mode_ = mode;
-  this->prev_mode_trigger_ = trig;
-}
-void BangBangClimate::switch_to_swing_mode_(climate::ClimateSwingMode swing_mode) {
-  // setup_complete_ helps us ensure an action is called immediately after boot
-  if ((swing_mode == this->prev_swing_mode_) && this->setup_complete_)
-    // already in target mode
-    return;
-
-  if (this->prev_swing_mode_trigger_ != nullptr) {
-    this->prev_swing_mode_trigger_->stop();
-    this->prev_swing_mode_trigger_ = nullptr;
-  }
-  Trigger<> *trig = this->swing_mode_off_trigger_;
-  switch (swing_mode) {
-    case climate::CLIMATE_SWING_BOTH:
-      trig = this->swing_mode_both_trigger_;
-      break;
-    case climate::CLIMATE_SWING_HORIZONTAL:
-      trig = this->swing_mode_horizontal_trigger_;
-      break;
-    case climate::CLIMATE_SWING_OFF:
-      // trig = this->swing_mode_off_trigger_;
-      break;
-    case climate::CLIMATE_SWING_VERTICAL:
-      trig = this->swing_mode_vertical_trigger_;
-      break;
-    default:
-      // we cannot report an invalid mode back to HA (even if it asked for one)
-      //  and must assume some valid value
-      swing_mode = climate::CLIMATE_SWING_OFF;
-      // trig = this->swing_mode_off_trigger_;
-  }
-  assert(trig != nullptr);
-  trig->trigger();
-  this->swing_mode = swing_mode;
-  this->prev_swing_mode_ = swing_mode;
-  this->prev_swing_mode_trigger_ = trig;
+  this->prev_trigger_ = trig;
+  this->publish_state();
 }
 void BangBangClimate::change_away_(bool away) {
   if (!away) {
-    if (this->supports_two_points_) {
-      this->target_temperature_low = this->normal_config_.default_temperature_low;
-      this->target_temperature_high = this->normal_config_.default_temperature_high;
-    } else
-      this->target_temperature = this->normal_config_.default_temperature;
+    this->target_temperature_low = this->normal_config_.default_temperature_low;
+    this->target_temperature_high = this->normal_config_.default_temperature_high;
   } else {
-    if (this->supports_two_points_) {
-      this->target_temperature_low = this->away_config_.default_temperature_low;
-      this->target_temperature_high = this->away_config_.default_temperature_high;
-    } else
-      this->target_temperature = this->away_config_.default_temperature;
+    this->target_temperature_low = this->away_config_.default_temperature_low;
+    this->target_temperature_high = this->away_config_.default_temperature_high;
   }
   this->away = away;
 }
@@ -407,142 +150,23 @@ void BangBangClimate::set_away_config(const BangBangClimateTargetTempConfig &awa
   this->away_config_ = away_config;
 }
 BangBangClimate::BangBangClimate()
-    : cool_action_trigger_(new Trigger<>()),
-      cool_mode_trigger_(new Trigger<>()),
-      dry_action_trigger_(new Trigger<>()),
-      dry_mode_trigger_(new Trigger<>()),
-      heat_action_trigger_(new Trigger<>()),
-      heat_mode_trigger_(new Trigger<>()),
-      auto_mode_trigger_(new Trigger<>()),
-      idle_action_trigger_(new Trigger<>()),
-      off_mode_trigger_(new Trigger<>()),
-      fan_only_action_trigger_(new Trigger<>()),
-      fan_only_mode_trigger_(new Trigger<>()),
-      fan_mode_on_trigger_(new Trigger<>()),
-      fan_mode_off_trigger_(new Trigger<>()),
-      fan_mode_auto_trigger_(new Trigger<>()),
-      fan_mode_low_trigger_(new Trigger<>()),
-      fan_mode_medium_trigger_(new Trigger<>()),
-      fan_mode_high_trigger_(new Trigger<>()),
-      fan_mode_middle_trigger_(new Trigger<>()),
-      fan_mode_focus_trigger_(new Trigger<>()),
-      fan_mode_diffuse_trigger_(new Trigger<>()),
-      swing_mode_both_trigger_(new Trigger<>()),
-      swing_mode_off_trigger_(new Trigger<>()),
-      swing_mode_horizontal_trigger_(new Trigger<>()),
-      swing_mode_vertical_trigger_(new Trigger<>()) {}
-void BangBangClimate::set_hysteresis(float hysteresis) { this->hysteresis_ = hysteresis; }
+    : idle_trigger_(new Trigger<>()), cool_trigger_(new Trigger<>()), heat_trigger_(new Trigger<>()) {}
 void BangBangClimate::set_sensor(sensor::Sensor *sensor) { this->sensor_ = sensor; }
-void BangBangClimate::set_supports_auto(bool supports_auto) { this->supports_auto_ = supports_auto; }
+Trigger<> *BangBangClimate::get_idle_trigger() const { return this->idle_trigger_; }
+Trigger<> *BangBangClimate::get_cool_trigger() const { return this->cool_trigger_; }
 void BangBangClimate::set_supports_cool(bool supports_cool) { this->supports_cool_ = supports_cool; }
-void BangBangClimate::set_supports_dry(bool supports_dry) { this->supports_dry_ = supports_dry; }
-void BangBangClimate::set_supports_fan_only(bool supports_fan_only) { this->supports_fan_only_ = supports_fan_only; }
+Trigger<> *BangBangClimate::get_heat_trigger() const { return this->heat_trigger_; }
 void BangBangClimate::set_supports_heat(bool supports_heat) { this->supports_heat_ = supports_heat; }
-void BangBangClimate::set_supports_fan_mode_on(bool supports_fan_mode_on) {
-  this->supports_fan_mode_on_ = supports_fan_mode_on;
-}
-void BangBangClimate::set_supports_fan_mode_off(bool supports_fan_mode_off) {
-  this->supports_fan_mode_off_ = supports_fan_mode_off;
-}
-void BangBangClimate::set_supports_fan_mode_auto(bool supports_fan_mode_auto) {
-  this->supports_fan_mode_auto_ = supports_fan_mode_auto;
-}
-void BangBangClimate::set_supports_fan_mode_low(bool supports_fan_mode_low) {
-  this->supports_fan_mode_low_ = supports_fan_mode_low;
-}
-void BangBangClimate::set_supports_fan_mode_medium(bool supports_fan_mode_medium) {
-  this->supports_fan_mode_medium_ = supports_fan_mode_medium;
-}
-void BangBangClimate::set_supports_fan_mode_high(bool supports_fan_mode_high) {
-  this->supports_fan_mode_high_ = supports_fan_mode_high;
-}
-void BangBangClimate::set_supports_fan_mode_middle(bool supports_fan_mode_middle) {
-  this->supports_fan_mode_middle_ = supports_fan_mode_middle;
-}
-void BangBangClimate::set_supports_fan_mode_focus(bool supports_fan_mode_focus) {
-  this->supports_fan_mode_focus_ = supports_fan_mode_focus;
-}
-void BangBangClimate::set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse) {
-  this->supports_fan_mode_diffuse_ = supports_fan_mode_diffuse;
-}
-void BangBangClimate::set_supports_swing_mode_both(bool supports_swing_mode_both) {
-  this->supports_swing_mode_both_ = supports_swing_mode_both;
-}
-void BangBangClimate::set_supports_swing_mode_off(bool supports_swing_mode_off) {
-  this->supports_swing_mode_off_ = supports_swing_mode_off;
-}
-void BangBangClimate::set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal) {
-  this->supports_swing_mode_horizontal_ = supports_swing_mode_horizontal;
-}
-void BangBangClimate::set_supports_swing_mode_vertical(bool supports_swing_mode_vertical) {
-  this->supports_swing_mode_vertical_ = supports_swing_mode_vertical;
-}
-void BangBangClimate::set_supports_two_points(bool supports_two_points) {
-  this->supports_two_points_ = supports_two_points;
-}
-Trigger<> *BangBangClimate::get_cool_action_trigger() const { return this->cool_action_trigger_; }
-Trigger<> *BangBangClimate::get_dry_action_trigger() const { return this->dry_action_trigger_; }
-Trigger<> *BangBangClimate::get_fan_only_action_trigger() const { return this->fan_only_action_trigger_; }
-Trigger<> *BangBangClimate::get_heat_action_trigger() const { return this->heat_action_trigger_; }
-Trigger<> *BangBangClimate::get_idle_action_trigger() const { return this->idle_action_trigger_; }
-Trigger<> *BangBangClimate::get_auto_mode_trigger() const { return this->auto_mode_trigger_; }
-Trigger<> *BangBangClimate::get_cool_mode_trigger() const { return this->cool_mode_trigger_; }
-Trigger<> *BangBangClimate::get_dry_mode_trigger() const { return this->dry_mode_trigger_; }
-Trigger<> *BangBangClimate::get_fan_only_mode_trigger() const { return this->fan_only_mode_trigger_; }
-Trigger<> *BangBangClimate::get_heat_mode_trigger() const { return this->heat_mode_trigger_; }
-Trigger<> *BangBangClimate::get_off_mode_trigger() const { return this->off_mode_trigger_; }
-Trigger<> *BangBangClimate::get_fan_mode_on_trigger() const { return this->fan_mode_on_trigger_; }
-Trigger<> *BangBangClimate::get_fan_mode_off_trigger() const { return this->fan_mode_off_trigger_; }
-Trigger<> *BangBangClimate::get_fan_mode_auto_trigger() const { return this->fan_mode_auto_trigger_; }
-Trigger<> *BangBangClimate::get_fan_mode_low_trigger() const { return this->fan_mode_low_trigger_; }
-Trigger<> *BangBangClimate::get_fan_mode_medium_trigger() const { return this->fan_mode_medium_trigger_; }
-Trigger<> *BangBangClimate::get_fan_mode_high_trigger() const { return this->fan_mode_high_trigger_; }
-Trigger<> *BangBangClimate::get_fan_mode_middle_trigger() const { return this->fan_mode_middle_trigger_; }
-Trigger<> *BangBangClimate::get_fan_mode_focus_trigger() const { return this->fan_mode_focus_trigger_; }
-Trigger<> *BangBangClimate::get_fan_mode_diffuse_trigger() const { return this->fan_mode_diffuse_trigger_; }
-Trigger<> *BangBangClimate::get_swing_mode_both_trigger() const { return this->swing_mode_both_trigger_; }
-Trigger<> *BangBangClimate::get_swing_mode_off_trigger() const { return this->swing_mode_off_trigger_; }
-Trigger<> *BangBangClimate::get_swing_mode_horizontal_trigger() const { return this->swing_mode_horizontal_trigger_; }
-Trigger<> *BangBangClimate::get_swing_mode_vertical_trigger() const { return this->swing_mode_vertical_trigger_; }
 void BangBangClimate::dump_config() {
   LOG_CLIMATE("", "Bang Bang Climate", this);
-  if (this->supports_heat_)
-    ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature_low);
-  if ((this->supports_cool_) || (this->supports_fan_only_))
-    ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature_high);
-  ESP_LOGCONFIG(TAG, "  Hysteresis: %.1f°C", this->hysteresis_);
-  ESP_LOGCONFIG(TAG, "  Supports AUTO: %s", YESNO(this->supports_auto_));
-  ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
-  ESP_LOGCONFIG(TAG, "  Supports DRY: %s", YESNO(this->supports_dry_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN_ONLY: %s", YESNO(this->supports_fan_only_));
   ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN MODE ON: %s", YESNO(this->supports_fan_mode_on_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN MODE OFF: %s", YESNO(this->supports_fan_mode_off_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN MODE AUTO: %s", YESNO(this->supports_fan_mode_auto_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN MODE LOW: %s", YESNO(this->supports_fan_mode_low_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN MODE MEDIUM: %s", YESNO(this->supports_fan_mode_medium_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN MODE HIGH: %s", YESNO(this->supports_fan_mode_high_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN MODE MIDDLE: %s", YESNO(this->supports_fan_mode_middle_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN MODE FOCUS: %s", YESNO(this->supports_fan_mode_focus_));
-  ESP_LOGCONFIG(TAG, "  Supports FAN MODE DIFFUSE: %s", YESNO(this->supports_fan_mode_diffuse_));
-  ESP_LOGCONFIG(TAG, "  Supports SWING MODE BOTH: %s", YESNO(this->supports_swing_mode_both_));
-  ESP_LOGCONFIG(TAG, "  Supports SWING MODE OFF: %s", YESNO(this->supports_swing_mode_off_));
-  ESP_LOGCONFIG(TAG, "  Supports SWING MODE HORIZONTAL: %s", YESNO(this->supports_swing_mode_horizontal_));
-  ESP_LOGCONFIG(TAG, "  Supports SWING MODE VERTICAL: %s", YESNO(this->supports_swing_mode_vertical_));
-  ESP_LOGCONFIG(TAG, "  Supports TWO SET POINTS: %s", YESNO(this->supports_two_points_));
+  ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
   ESP_LOGCONFIG(TAG, "  Supports AWAY mode: %s", YESNO(this->supports_away_));
-  if (this->supports_away_) {
-    if (this->supports_heat_)
-      ESP_LOGCONFIG(TAG, "    Away Default Target Temperature Low: %.1f°C", this->away_config_.default_temperature_low);
-    if ((this->supports_cool_) || (this->supports_fan_only_))
-      ESP_LOGCONFIG(TAG, "    Away Default Target Temperature High: %.1f°C",
-                    this->away_config_.default_temperature_high);
-  }
+  ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature_low);
+  ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature_high);
 }
 
 BangBangClimateTargetTempConfig::BangBangClimateTargetTempConfig() = default;
-BangBangClimateTargetTempConfig::BangBangClimateTargetTempConfig(float default_temperature)
-    : default_temperature(default_temperature) {}
 BangBangClimateTargetTempConfig::BangBangClimateTargetTempConfig(float default_temperature_low,
                                                                  float default_temperature_high)
     : default_temperature_low(default_temperature_low), default_temperature_high(default_temperature_high) {}
diff --git a/esphome/components/bang_bang/bang_bang_climate.h b/esphome/components/bang_bang/bang_bang_climate.h
index fd2b0ce43a..84bcd51f34 100644
--- a/esphome/components/bang_bang/bang_bang_climate.h
+++ b/esphome/components/bang_bang/bang_bang_climate.h
@@ -11,13 +11,10 @@ namespace bang_bang {
 struct BangBangClimateTargetTempConfig {
  public:
   BangBangClimateTargetTempConfig();
-  BangBangClimateTargetTempConfig(float default_temperature);
   BangBangClimateTargetTempConfig(float default_temperature_low, float default_temperature_high);
 
-  float default_temperature{NAN};
   float default_temperature_low{NAN};
   float default_temperature_high{NAN};
-  float hysteresis{NAN};
 };
 
 class BangBangClimate : public climate::Climate, public Component {
@@ -26,243 +23,62 @@ class BangBangClimate : public climate::Climate, public Component {
   void setup() override;
   void dump_config() override;
 
-  void set_hysteresis(float hysteresis);
   void set_sensor(sensor::Sensor *sensor);
-  void set_supports_auto(bool supports_auto);
+  Trigger<> *get_idle_trigger() const;
+  Trigger<> *get_cool_trigger() const;
   void set_supports_cool(bool supports_cool);
-  void set_supports_dry(bool supports_dry);
-  void set_supports_fan_only(bool supports_fan_only);
+  Trigger<> *get_heat_trigger() const;
   void set_supports_heat(bool supports_heat);
-  void set_supports_fan_mode_on(bool supports_fan_mode_on);
-  void set_supports_fan_mode_off(bool supports_fan_mode_off);
-  void set_supports_fan_mode_auto(bool supports_fan_mode_auto);
-  void set_supports_fan_mode_low(bool supports_fan_mode_low);
-  void set_supports_fan_mode_medium(bool supports_fan_mode_medium);
-  void set_supports_fan_mode_high(bool supports_fan_mode_high);
-  void set_supports_fan_mode_middle(bool supports_fan_mode_middle);
-  void set_supports_fan_mode_focus(bool supports_fan_mode_focus);
-  void set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse);
-  void set_supports_swing_mode_both(bool supports_swing_mode_both);
-  void set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal);
-  void set_supports_swing_mode_off(bool supports_swing_mode_off);
-  void set_supports_swing_mode_vertical(bool supports_swing_mode_vertical);
-  void set_supports_two_points(bool supports_two_points);
-
   void set_normal_config(const BangBangClimateTargetTempConfig &normal_config);
   void set_away_config(const BangBangClimateTargetTempConfig &away_config);
 
-  Trigger<> *get_cool_action_trigger() const;
-  Trigger<> *get_dry_action_trigger() const;
-  Trigger<> *get_fan_only_action_trigger() const;
-  Trigger<> *get_heat_action_trigger() const;
-  Trigger<> *get_idle_action_trigger() const;
-  Trigger<> *get_auto_mode_trigger() const;
-  Trigger<> *get_cool_mode_trigger() const;
-  Trigger<> *get_dry_mode_trigger() const;
-  Trigger<> *get_fan_only_mode_trigger() const;
-  Trigger<> *get_heat_mode_trigger() const;
-  Trigger<> *get_off_mode_trigger() const;
-  Trigger<> *get_fan_mode_on_trigger() const;
-  Trigger<> *get_fan_mode_off_trigger() const;
-  Trigger<> *get_fan_mode_auto_trigger() const;
-  Trigger<> *get_fan_mode_low_trigger() const;
-  Trigger<> *get_fan_mode_medium_trigger() const;
-  Trigger<> *get_fan_mode_high_trigger() const;
-  Trigger<> *get_fan_mode_middle_trigger() const;
-  Trigger<> *get_fan_mode_focus_trigger() const;
-  Trigger<> *get_fan_mode_diffuse_trigger() const;
-  Trigger<> *get_swing_mode_both_trigger() const;
-  Trigger<> *get_swing_mode_horizontal_trigger() const;
-  Trigger<> *get_swing_mode_off_trigger() const;
-  Trigger<> *get_swing_mode_vertical_trigger() const;
-  /// Call triggers based on updated climate states (modes/actions)
-  void refresh();
-
  protected:
   /// Override control to change settings of the climate device.
   void control(const climate::ClimateCall &call) override;
-
   /// Change the away setting, will reset target temperatures to defaults.
   void change_away_(bool away);
-
   /// Return the traits of this controller.
   climate::ClimateTraits traits() override;
 
-  /// Re-compute the required action of this climate controller.
-  climate::ClimateAction compute_action_();
-
-  /// Switch the climate device to the given climate action.
-  void switch_to_action_(climate::ClimateAction action);
-
-  /// Switch the climate device to the given climate fan mode.
-  void switch_to_fan_mode_(climate::ClimateFanMode fan_mode);
+  /// Re-compute the state of this climate controller.
+  void compute_state_();
 
   /// Switch the climate device to the given climate mode.
-  void switch_to_mode_(climate::ClimateMode mode);
-
-  /// Switch the climate device to the given climate swing mode.
-  void switch_to_swing_mode_(climate::ClimateSwingMode swing_mode);
+  void switch_to_action_(climate::ClimateAction action);
 
   /// The sensor used for getting the current temperature
   sensor::Sensor *sensor_{nullptr};
-
-  /// Whether the controller supports auto/cooling/drying/fanning/heating.
-  ///
-  /// A false value for any given attribute means that the controller has no such action
-  /// (for example a thermostat, where only heating and not-heating is possible).
-  bool supports_auto_{false};
+  /** The trigger to call when the controller should switch to idle mode.
+   *
+   * In idle mode, the controller is assumed to have both heating and cooling disabled.
+   */
+  Trigger<> *idle_trigger_;
+  /** The trigger to call when the controller should switch to cooling mode.
+   */
+  Trigger<> *cool_trigger_;
+  /** Whether the controller supports cooling.
+   *
+   * A false value for this attribute means that the controller has no cooling action
+   * (for example a thermostat, where only heating and not-heating is possible).
+   */
   bool supports_cool_{false};
-  bool supports_dry_{false};
-  bool supports_fan_only_{false};
+  /** The trigger to call when the controller should switch to heating mode.
+   *
+   * A null value for this attribute means that the controller has no heating action
+   * For example window blinds, where only cooling (blinds closed) and not-cooling
+   * (blinds open) is possible.
+   */
+  Trigger<> *heat_trigger_{nullptr};
   bool supports_heat_{false};
+  /** A reference to the trigger that was previously active.
+   *
+   * This is so that the previous trigger can be stopped before enabling a new one.
+   */
+  Trigger<> *prev_trigger_{nullptr};
 
-  /// Whether the controller supports turning on or off just the fan.
-  ///
-  /// A false value for either attribute means that the controller has no fan on/off action
-  /// (for example a thermostat, where independent control of the fan is not possible).
-  bool supports_fan_mode_on_{false};
-  bool supports_fan_mode_off_{false};
-
-  /// Whether the controller supports fan auto mode.
-  ///
-  /// A false value for this attribute means that the controller has no fan-auto action
-  /// (for example a thermostat, where independent control of the fan is not possible).
-  bool supports_fan_mode_auto_{false};
-
-  /// Whether the controller supports various fan speeds and/or positions.
-  ///
-  /// A false value for any given attribute means that the controller has no such fan action.
-  bool supports_fan_mode_low_{false};
-  bool supports_fan_mode_medium_{false};
-  bool supports_fan_mode_high_{false};
-  bool supports_fan_mode_middle_{false};
-  bool supports_fan_mode_focus_{false};
-  bool supports_fan_mode_diffuse_{false};
-
-  /// Whether the controller supports various swing modes.
-  ///
-  /// A false value for any given attribute means that the controller has no such swing mode.
-  bool supports_swing_mode_both_{false};
-  bool supports_swing_mode_off_{false};
-  bool supports_swing_mode_horizontal_{false};
-  bool supports_swing_mode_vertical_{false};
-
-  /// Whether the controller supports two set points
-  ///
-  /// A false value means that the controller has no such support.
-  bool supports_two_points_{false};
-
-  /// Whether the controller supports an "away" mode
-  ///
-  /// A false value means that the controller has no such mode.
-  bool supports_away_{false};
-
-  /// The trigger to call when the controller should switch to cooling action/mode.
-  ///
-  /// A null value for this attribute means that the controller has no cooling action
-  /// For example electric heat, where only heating (power on) and not-heating
-  /// (power off) is possible.
-  Trigger<> *cool_action_trigger_{nullptr};
-  Trigger<> *cool_mode_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch to dry (dehumidification) mode.
-  ///
-  /// In dry mode, the controller is assumed to have both heating and cooling disabled,
-  /// although the system may use its cooling mechanism to achieve drying.
-  Trigger<> *dry_action_trigger_{nullptr};
-  Trigger<> *dry_mode_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch to heating action/mode.
-  ///
-  /// A null value for this attribute means that the controller has no heating action
-  /// For example window blinds, where only cooling (blinds closed) and not-cooling
-  /// (blinds open) is possible.
-  Trigger<> *heat_action_trigger_{nullptr};
-  Trigger<> *heat_mode_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch to auto mode.
-  ///
-  /// In auto mode, the controller will enable heating/cooling as necessary and switch
-  /// to idle when the temperature is within the thresholds/set points.
-  Trigger<> *auto_mode_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch to idle action/off mode.
-  ///
-  /// In these actions/modes, the controller is assumed to have both heating and cooling disabled.
-  Trigger<> *idle_action_trigger_{nullptr};
-  Trigger<> *off_mode_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch to fan-only action/mode.
-  ///
-  /// In fan-only mode, the controller is assumed to have both heating and cooling disabled.
-  /// The system should activate the fan only.
-  Trigger<> *fan_only_action_trigger_{nullptr};
-  Trigger<> *fan_only_mode_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch on the fan.
-  Trigger<> *fan_mode_on_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch off the fan.
-  Trigger<> *fan_mode_off_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the fan to "auto" mode.
-  Trigger<> *fan_mode_auto_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the fan to "low" speed.
-  Trigger<> *fan_mode_low_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the fan to "medium" speed.
-  Trigger<> *fan_mode_medium_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the fan to "high" speed.
-  Trigger<> *fan_mode_high_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the fan to "middle" position.
-  Trigger<> *fan_mode_middle_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the fan to "focus" position.
-  Trigger<> *fan_mode_focus_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the fan to "diffuse" position.
-  Trigger<> *fan_mode_diffuse_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the swing mode to "both".
-  Trigger<> *swing_mode_both_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the swing mode to "off".
-  Trigger<> *swing_mode_off_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the swing mode to "horizontal".
-  Trigger<> *swing_mode_horizontal_trigger_{nullptr};
-
-  /// The trigger to call when the controller should switch the swing mode to "vertical".
-  Trigger<> *swing_mode_vertical_trigger_{nullptr};
-
-  /// A reference to the trigger that was previously active.
-  ///
-  /// This is so that the previous trigger can be stopped before enabling a new one
-  /// for each climate category (mode, action, fan_mode, swing_mode).
-  Trigger<> *prev_action_trigger_{nullptr};
-  Trigger<> *prev_fan_mode_trigger_{nullptr};
-  Trigger<> *prev_mode_trigger_{nullptr};
-  Trigger<> *prev_swing_mode_trigger_{nullptr};
-
-  /// Store previously-known states
-  ///
-  /// These are used to determine when a trigger/action needs to be called
-  climate::ClimateFanMode prev_fan_mode_{climate::CLIMATE_FAN_ON};
-  climate::ClimateMode prev_mode_{climate::CLIMATE_MODE_OFF};
-  climate::ClimateSwingMode prev_swing_mode_{climate::CLIMATE_SWING_OFF};
-
-  /// Temperature data for normal/home and away modes
   BangBangClimateTargetTempConfig normal_config_{};
+  bool supports_away_{false};
   BangBangClimateTargetTempConfig away_config_{};
-
-  /// Hysteresis value used for computing climate actions
-  float hysteresis_{0};
-
-  /// setup_complete_ blocks modifying/resetting the temps immediately after boot
-  bool setup_complete_{false};
 };
 
 }  // namespace bang_bang
diff --git a/esphome/components/bang_bang/climate.py b/esphome/components/bang_bang/climate.py
index 75ec58404b..4ef811c55d 100644
--- a/esphome/components/bang_bang/climate.py
+++ b/esphome/components/bang_bang/climate.py
@@ -2,107 +2,27 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.components import climate, sensor
-from esphome.const import CONF_AUTO_MODE, CONF_AWAY_CONFIG, CONF_COOL_ACTION, CONF_COOL_MODE, \
-    CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_DRY_ACTION, \
-    CONF_DRY_MODE, CONF_FAN_MODE_ON_ACTION, CONF_FAN_MODE_OFF_ACTION, CONF_FAN_MODE_AUTO_ACTION, \
-    CONF_FAN_MODE_LOW_ACTION, CONF_FAN_MODE_MEDIUM_ACTION, CONF_FAN_MODE_HIGH_ACTION, \
-    CONF_FAN_MODE_MIDDLE_ACTION, CONF_FAN_MODE_FOCUS_ACTION, CONF_FAN_MODE_DIFFUSE_ACTION, \
-    CONF_FAN_ONLY_ACTION, CONF_FAN_ONLY_MODE, CONF_HEAT_ACTION, CONF_HEAT_MODE, CONF_HYSTERESIS, \
-    CONF_ID, CONF_IDLE_ACTION, CONF_OFF_MODE, CONF_SENSOR, CONF_SWING_BOTH_ACTION, \
-    CONF_SWING_HORIZONTAL_ACTION, CONF_SWING_OFF_ACTION, CONF_SWING_VERTICAL_ACTION
+from esphome.const import CONF_AWAY_CONFIG, CONF_COOL_ACTION, \
+    CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION, \
+    CONF_ID, CONF_IDLE_ACTION, CONF_SENSOR
 
 bang_bang_ns = cg.esphome_ns.namespace('bang_bang')
 BangBangClimate = bang_bang_ns.class_('BangBangClimate', climate.Climate, cg.Component)
 BangBangClimateTargetTempConfig = bang_bang_ns.struct('BangBangClimateTargetTempConfig')
 
-
-def validate_bangbang(config):
-    # verify corresponding climate action action exists for any defined climate mode action
-    if CONF_COOL_MODE in config and CONF_COOL_ACTION not in config:
-        raise cv.Invalid("{} must be defined to use {}".format(CONF_COOL_ACTION, CONF_COOL_MODE))
-    if CONF_DRY_MODE in config and CONF_DRY_ACTION not in config:
-        raise cv.Invalid("{} must be defined to use {}".format(CONF_DRY_ACTION, CONF_DRY_MODE))
-    if CONF_FAN_ONLY_MODE in config and CONF_FAN_ONLY_ACTION not in config:
-        raise cv.Invalid("{} must be defined to use {}".format(CONF_FAN_ONLY_ACTION,
-                                                               CONF_FAN_ONLY_MODE))
-    if CONF_HEAT_MODE in config and CONF_HEAT_ACTION not in config:
-        raise cv.Invalid("{} must be defined to use {}".format(CONF_HEAT_ACTION, CONF_HEAT_MODE))
-    # verify corresponding default target temperature exists when a given climate action exists
-    if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH not in config and (CONF_COOL_ACTION in config
-                                                               or CONF_FAN_ONLY_ACTION in config):
-        raise cv.Invalid("{} must be defined when using {} or {}".format(
-            CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION, CONF_FAN_ONLY_ACTION))
-    if CONF_DEFAULT_TARGET_TEMPERATURE_LOW not in config and CONF_HEAT_ACTION in config:
-        raise cv.Invalid("{} must be defined when using {}".format(
-            CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
-    # if a given climate action is NOT defined, it should not have a default target temperature
-    if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in config and (CONF_COOL_ACTION not in config
-                                                           and CONF_FAN_ONLY_ACTION not in config):
-        raise cv.Invalid("{} is defined with no {}".format(
-            CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION))
-    if CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config and CONF_HEAT_ACTION not in config:
-        raise cv.Invalid("{} is defined with no {}".format(
-            CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
-
-    if CONF_AWAY_CONFIG in config:
-        away = config[CONF_AWAY_CONFIG]
-        # verify corresponding default target temperature exists when a given climate action exists
-        if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH not in away and (CONF_COOL_ACTION in config or
-                                                                 CONF_FAN_ONLY_ACTION in config):
-            raise cv.Invalid("{} must be defined in away configuration when using {} or {}".format(
-                CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION, CONF_FAN_ONLY_ACTION))
-        if CONF_DEFAULT_TARGET_TEMPERATURE_LOW not in away and CONF_HEAT_ACTION in config:
-            raise cv.Invalid("{} must be defined in away configuration when using {}".format(
-                CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
-        # if a given climate action is NOT defined, it should not have a default target temperature
-        if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in away and (CONF_COOL_ACTION not in config and
-                                                             CONF_FAN_ONLY_ACTION not in config):
-            raise cv.Invalid("{} is defined in away configuration with no {} or {}".format(
-                CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION, CONF_FAN_ONLY_ACTION))
-        if CONF_DEFAULT_TARGET_TEMPERATURE_LOW in away and CONF_HEAT_ACTION not in config:
-            raise cv.Invalid("{} is defined in away configuration with no {}".format(
-                CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
-
-    return config
-
-
 CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(BangBangClimate),
     cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
+    cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
+    cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
     cv.Required(CONF_IDLE_ACTION): automation.validate_automation(single=True),
     cv.Optional(CONF_COOL_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_DRY_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_ONLY_ACTION): automation.validate_automation(single=True),
     cv.Optional(CONF_HEAT_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_AUTO_MODE): automation.validate_automation(single=True),
-    cv.Optional(CONF_COOL_MODE): automation.validate_automation(single=True),
-    cv.Optional(CONF_DRY_MODE): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_ONLY_MODE): automation.validate_automation(single=True),
-    cv.Optional(CONF_HEAT_MODE): automation.validate_automation(single=True),
-    cv.Optional(CONF_OFF_MODE): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_MODE_ON_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_MODE_OFF_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_MODE_AUTO_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_MODE_LOW_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_MODE_MEDIUM_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_MODE_HIGH_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_MODE_MIDDLE_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_MODE_FOCUS_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_FAN_MODE_DIFFUSE_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_SWING_BOTH_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_SWING_HORIZONTAL_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_SWING_OFF_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_SWING_VERTICAL_ACTION): automation.validate_automation(single=True),
-    cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
-    cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
-    cv.Optional(CONF_HYSTERESIS, default=0.5): cv.temperature,
     cv.Optional(CONF_AWAY_CONFIG): cv.Schema({
-        cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
-        cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
+        cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
+        cv.Required(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
     }),
-}).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(CONF_COOL_ACTION, CONF_DRY_ACTION,
-                                                        CONF_FAN_ONLY_ACTION, CONF_HEAT_ACTION),
-                       validate_bangbang)
+}).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(CONF_COOL_ACTION, CONF_HEAT_ACTION))
 
 
 def to_code(config):
@@ -110,145 +30,28 @@ def to_code(config):
     yield cg.register_component(var, config)
     yield climate.register_climate(var, config)
 
-    auto_mode_available = CONF_HEAT_ACTION in config and CONF_COOL_ACTION in config
-    two_points_available = CONF_HEAT_ACTION in config and (CONF_COOL_ACTION in config or
-                                                           CONF_FAN_ONLY_ACTION in config)
-
     sens = yield cg.get_variable(config[CONF_SENSOR])
     cg.add(var.set_sensor(sens))
-    cg.add(var.set_hysteresis(config[CONF_HYSTERESIS]))
 
-    if two_points_available is True:
-        cg.add(var.set_supports_two_points(True))
-        normal_config = BangBangClimateTargetTempConfig(
-            config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
-            config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
-        )
-    elif CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in config:
-        cg.add(var.set_supports_two_points(False))
-        normal_config = BangBangClimateTargetTempConfig(
-            config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
-        )
-    elif CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config:
-        cg.add(var.set_supports_two_points(False))
-        normal_config = BangBangClimateTargetTempConfig(
-            config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW]
-        )
+    normal_config = BangBangClimateTargetTempConfig(
+        config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
+        config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+    )
     cg.add(var.set_normal_config(normal_config))
 
-    yield automation.build_automation(var.get_idle_action_trigger(), [],
-                                      config[CONF_IDLE_ACTION])
-
-    if auto_mode_available is True:
-        cg.add(var.set_supports_auto(True))
-    else:
-        cg.add(var.set_supports_auto(False))
+    yield automation.build_automation(var.get_idle_trigger(), [], config[CONF_IDLE_ACTION])
 
     if CONF_COOL_ACTION in config:
-        yield automation.build_automation(var.get_cool_action_trigger(), [],
-                                          config[CONF_COOL_ACTION])
+        yield automation.build_automation(var.get_cool_trigger(), [], config[CONF_COOL_ACTION])
         cg.add(var.set_supports_cool(True))
-    if CONF_DRY_ACTION in config:
-        yield automation.build_automation(var.get_dry_action_trigger(), [],
-                                          config[CONF_DRY_ACTION])
-        cg.add(var.set_supports_dry(True))
-    if CONF_FAN_ONLY_ACTION in config:
-        yield automation.build_automation(var.get_fan_only_action_trigger(), [],
-                                          config[CONF_FAN_ONLY_ACTION])
-        cg.add(var.set_supports_fan_only(True))
     if CONF_HEAT_ACTION in config:
-        yield automation.build_automation(var.get_heat_action_trigger(), [],
-                                          config[CONF_HEAT_ACTION])
+        yield automation.build_automation(var.get_heat_trigger(), [], config[CONF_HEAT_ACTION])
         cg.add(var.set_supports_heat(True))
-    if CONF_AUTO_MODE in config:
-        yield automation.build_automation(var.get_auto_mode_trigger(), [],
-                                          config[CONF_AUTO_MODE])
-    if CONF_COOL_MODE in config:
-        yield automation.build_automation(var.get_cool_mode_trigger(), [],
-                                          config[CONF_COOL_MODE])
-        cg.add(var.set_supports_cool(True))
-    if CONF_DRY_MODE in config:
-        yield automation.build_automation(var.get_dry_mode_trigger(), [],
-                                          config[CONF_DRY_MODE])
-        cg.add(var.set_supports_dry(True))
-    if CONF_FAN_ONLY_MODE in config:
-        yield automation.build_automation(var.get_fan_only_mode_trigger(), [],
-                                          config[CONF_FAN_ONLY_MODE])
-        cg.add(var.set_supports_fan_only(True))
-    if CONF_HEAT_MODE in config:
-        yield automation.build_automation(var.get_heat_mode_trigger(), [],
-                                          config[CONF_HEAT_MODE])
-        cg.add(var.set_supports_heat(True))
-    if CONF_OFF_MODE in config:
-        yield automation.build_automation(var.get_off_mode_trigger(), [],
-                                          config[CONF_OFF_MODE])
-    if CONF_FAN_MODE_ON_ACTION in config:
-        yield automation.build_automation(var.get_fan_mode_on_trigger(), [],
-                                          config[CONF_FAN_MODE_ON_ACTION])
-        cg.add(var.set_supports_fan_mode_on(True))
-    if CONF_FAN_MODE_OFF_ACTION in config:
-        yield automation.build_automation(var.get_fan_mode_off_trigger(), [],
-                                          config[CONF_FAN_MODE_OFF_ACTION])
-        cg.add(var.set_supports_fan_mode_off(True))
-    if CONF_FAN_MODE_AUTO_ACTION in config:
-        yield automation.build_automation(var.get_fan_mode_auto_trigger(), [],
-                                          config[CONF_FAN_MODE_AUTO_ACTION])
-        cg.add(var.set_supports_fan_mode_auto(True))
-    if CONF_FAN_MODE_LOW_ACTION in config:
-        yield automation.build_automation(var.get_fan_mode_low_trigger(), [],
-                                          config[CONF_FAN_MODE_LOW_ACTION])
-        cg.add(var.set_supports_fan_mode_low(True))
-    if CONF_FAN_MODE_MEDIUM_ACTION in config:
-        yield automation.build_automation(var.get_fan_mode_medium_trigger(), [],
-                                          config[CONF_FAN_MODE_MEDIUM_ACTION])
-        cg.add(var.set_supports_fan_mode_medium(True))
-    if CONF_FAN_MODE_HIGH_ACTION in config:
-        yield automation.build_automation(var.get_fan_mode_high_trigger(), [],
-                                          config[CONF_FAN_MODE_HIGH_ACTION])
-        cg.add(var.set_supports_fan_mode_high(True))
-    if CONF_FAN_MODE_MIDDLE_ACTION in config:
-        yield automation.build_automation(var.get_fan_mode_middle_trigger(), [],
-                                          config[CONF_FAN_MODE_MIDDLE_ACTION])
-        cg.add(var.set_supports_fan_mode_middle(True))
-    if CONF_FAN_MODE_FOCUS_ACTION in config:
-        yield automation.build_automation(var.get_fan_mode_focus_trigger(), [],
-                                          config[CONF_FAN_MODE_FOCUS_ACTION])
-        cg.add(var.set_supports_fan_mode_focus(True))
-    if CONF_FAN_MODE_DIFFUSE_ACTION in config:
-        yield automation.build_automation(var.get_fan_mode_diffuse_trigger(), [],
-                                          config[CONF_FAN_MODE_DIFFUSE_ACTION])
-        cg.add(var.set_supports_fan_mode_diffuse(True))
-    if CONF_SWING_BOTH_ACTION in config:
-        yield automation.build_automation(var.get_swing_mode_both_trigger(), [],
-                                          config[CONF_SWING_BOTH_ACTION])
-        cg.add(var.set_supports_swing_mode_both(True))
-    if CONF_SWING_HORIZONTAL_ACTION in config:
-        yield automation.build_automation(var.get_swing_mode_horizontal_trigger(), [],
-                                          config[CONF_SWING_HORIZONTAL_ACTION])
-        cg.add(var.set_supports_swing_mode_horizontal(True))
-    if CONF_SWING_OFF_ACTION in config:
-        yield automation.build_automation(var.get_swing_mode_off_trigger(), [],
-                                          config[CONF_SWING_OFF_ACTION])
-        cg.add(var.set_supports_swing_mode_off(True))
-    if CONF_SWING_VERTICAL_ACTION in config:
-        yield automation.build_automation(var.get_swing_mode_vertical_trigger(), [],
-                                          config[CONF_SWING_VERTICAL_ACTION])
-        cg.add(var.set_supports_swing_mode_vertical(True))
 
     if CONF_AWAY_CONFIG in config:
         away = config[CONF_AWAY_CONFIG]
-
-        if two_points_available is True:
-            away_config = BangBangClimateTargetTempConfig(
-                away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
-                away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
-            )
-        elif CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in away:
-            away_config = BangBangClimateTargetTempConfig(
-                away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
-            )
-        elif CONF_DEFAULT_TARGET_TEMPERATURE_LOW in away:
-            away_config = BangBangClimateTargetTempConfig(
-                away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW]
-            )
+        away_config = BangBangClimateTargetTempConfig(
+            away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
+            away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+        )
         cg.add(var.set_away_config(away_config))
diff --git a/esphome/const.py b/esphome/const.py
index 8b727b615c..4cdf48fc76 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -44,7 +44,6 @@ CONF_ASSUMED_STATE = 'assumed_state'
 CONF_AT = 'at'
 CONF_ATTENUATION = 'attenuation'
 CONF_AUTH = 'auth'
-CONF_AUTO_MODE = 'auto_mode'
 CONF_AUTOMATION_ID = 'automation_id'
 CONF_AVAILABILITY = 'availability'
 CONF_AWAY = 'away'
@@ -103,7 +102,6 @@ CONF_CONDITION = 'condition'
 CONF_CONDITION_ID = 'condition_id'
 CONF_CONDUCTIVITY = 'conductivity'
 CONF_COOL_ACTION = 'cool_action'
-CONF_COOL_MODE = 'cool_mode'
 CONF_COUNT_MODE = 'count_mode'
 CONF_CRON = 'cron'
 CONF_CS_PIN = 'cs_pin'
@@ -142,8 +140,6 @@ CONF_DIV_RATIO = 'div_ratio'
 CONF_DNS1 = 'dns1'
 CONF_DNS2 = 'dns2'
 CONF_DOMAIN = 'domain'
-CONF_DRY_ACTION = 'dry_action'
-CONF_DRY_MODE = 'dry_mode'
 CONF_DUMP = 'dump'
 CONF_DURATION = 'duration'
 CONF_ECHO_PIN = 'echo_pin'
@@ -163,17 +159,6 @@ CONF_EXTERNAL_VCC = 'external_vcc'
 CONF_FALLING_EDGE = 'falling_edge'
 CONF_FAMILY = 'family'
 CONF_FAN_MODE = 'fan_mode'
-CONF_FAN_MODE_AUTO_ACTION = 'fan_mode_auto_action'
-CONF_FAN_MODE_DIFFUSE_ACTION = 'fan_mode_diffuse_action'
-CONF_FAN_MODE_FOCUS_ACTION = 'fan_mode_focus_action'
-CONF_FAN_MODE_HIGH_ACTION = 'fan_mode_high_action'
-CONF_FAN_MODE_LOW_ACTION = 'fan_mode_low_action'
-CONF_FAN_MODE_MEDIUM_ACTION = 'fan_mode_medium_action'
-CONF_FAN_MODE_MIDDLE_ACTION = 'fan_mode_middle_action'
-CONF_FAN_MODE_OFF_ACTION = 'fan_mode_off_action'
-CONF_FAN_MODE_ON_ACTION = 'fan_mode_on_action'
-CONF_FAN_ONLY_ACTION = 'fan_only_action'
-CONF_FAN_ONLY_MODE = 'fan_only_mode'
 CONF_FAST_CONNECT = 'fast_connect'
 CONF_FILE = 'file'
 CONF_FILTER = 'filter'
@@ -198,7 +183,6 @@ CONF_GROUP = 'group'
 CONF_HARDWARE_UART = 'hardware_uart'
 CONF_HEARTBEAT = 'heartbeat'
 CONF_HEAT_ACTION = 'heat_action'
-CONF_HEAT_MODE = 'heat_mode'
 CONF_HEATER = 'heater'
 CONF_HIDDEN = 'hidden'
 CONF_HIGH = 'high'
@@ -206,7 +190,6 @@ CONF_HIGH_VOLTAGE_REFERENCE = 'high_voltage_reference'
 CONF_HOUR = 'hour'
 CONF_HOURS = 'hours'
 CONF_HUMIDITY = 'humidity'
-CONF_HYSTERESIS = "hysteresis"
 CONF_I2C = 'i2c'
 CONF_I2C_ID = 'i2c_id'
 CONF_ICON = 'icon'
@@ -302,7 +285,6 @@ CONF_NUM_CHANNELS = 'num_channels'
 CONF_NUM_CHIPS = 'num_chips'
 CONF_NUM_LEDS = 'num_leds'
 CONF_NUMBER = 'number'
-CONF_OFF_MODE = 'off_mode'
 CONF_OFFSET = 'offset'
 CONF_ON = 'on'
 CONF_ON_BLE_ADVERTISE = 'on_ble_advertise'
@@ -467,11 +449,7 @@ CONF_STOP_ACTION = 'stop_action'
 CONF_SUBNET = 'subnet'
 CONF_SUPPORTS_COOL = 'supports_cool'
 CONF_SUPPORTS_HEAT = 'supports_heat'
-CONF_SWING_BOTH_ACTION = 'swing_both_action'
-CONF_SWING_HORIZONTAL_ACTION = 'swing_horizontal_action'
 CONF_SWING_MODE = 'swing_mode'
-CONF_SWING_OFF_ACTION = 'swing_off_action'
-CONF_SWING_VERTICAL_ACTION = 'swing_vertical_action'
 CONF_SWITCHES = 'switches'
 CONF_SYNC = 'sync'
 CONF_TABLET = 'tablet'
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 9c51894e12..72dde13055 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -621,49 +621,6 @@ climate:
       - switch.turn_on: gpio_switch2
     heat_action:
       - switch.turn_on: gpio_switch1
-    dry_action:
-      - switch.turn_on: gpio_switch2
-    fan_only_action:
-      - switch.turn_on: gpio_switch1
-    auto_mode:
-      - switch.turn_on: gpio_switch2
-    off_mode:
-      - switch.turn_on: gpio_switch1
-    heat_mode:
-      - switch.turn_on: gpio_switch2
-    cool_mode:
-      - switch.turn_on: gpio_switch1
-    dry_mode:
-      - switch.turn_on: gpio_switch2
-    fan_only_mode:
-      - switch.turn_on: gpio_switch1
-    fan_mode_auto_action:
-      - switch.turn_on: gpio_switch2
-    fan_mode_on_action:
-      - switch.turn_on: gpio_switch1
-    fan_mode_off_action:
-      - switch.turn_on: gpio_switch2
-    fan_mode_low_action:
-      - switch.turn_on: gpio_switch1
-    fan_mode_medium_action:
-      - switch.turn_on: gpio_switch2
-    fan_mode_high_action:
-      - switch.turn_on: gpio_switch1
-    fan_mode_middle_action:
-      - switch.turn_on: gpio_switch2
-    fan_mode_focus_action:
-      - switch.turn_on: gpio_switch1
-    fan_mode_diffuse_action:
-      - switch.turn_on: gpio_switch2
-    swing_off_action:
-      - switch.turn_on: gpio_switch1
-    swing_horizontal_action:
-      - switch.turn_on: gpio_switch2
-    swing_vertical_action:
-      - switch.turn_on: gpio_switch1
-    swing_both_action:
-      - switch.turn_on: gpio_switch2
-    hysteresis: 0.2
     away_config:
       default_target_temperature_low: 16°C
       default_target_temperature_high: 20°C

From 8566dd9100e9c54752f0bf1d7e9d21d3f4de3629 Mon Sep 17 00:00:00 2001
From: vxider <lb@vxider.com>
Date: Thu, 2 Jul 2020 09:36:36 +0800
Subject: [PATCH 261/412] use default avg mode (#1102)

---
 esphome/components/ina3221/ina3221.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/ina3221/ina3221.cpp b/esphome/components/ina3221/ina3221.cpp
index a0334064ff..17492433e3 100644
--- a/esphome/components/ina3221/ina3221.cpp
+++ b/esphome/components/ina3221/ina3221.cpp
@@ -42,7 +42,7 @@ void INA3221Component::setup() {
     config |= 0b0001000000000000;
   }
   // 0b0000xxx000000000 << 9 Averaging Mode (0 -> 1 sample, 111 -> 1024 samples)
-  config |= 0b0000111000000000;
+  config |= 0b0000000000000000;
   // 0b0000000xxx000000 << 6 Bus Voltage Conversion time (100 -> 1.1ms, 111 -> 8.244 ms)
   config |= 0b0000000111000000;
   // 0b0000000000xxx000 << 3 Shunt Voltage Conversion time (same as above)

From d4e76185bdb34f31a1be8efcbf04226b7a06596b Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 1 Jul 2020 20:38:51 -0500
Subject: [PATCH 262/412] Thermostat component (#1105)

* Add thermostat component

* Add hysteresis accessor

* Linted

* Fixed up const.py and test

* Fix test...again...oops
---
 esphome/components/thermostat/__init__.py     |   0
 esphome/components/thermostat/climate.py      | 254 ++++++++
 .../thermostat/thermostat_climate.cpp         | 552 ++++++++++++++++++
 .../thermostat/thermostat_climate.h           | 271 +++++++++
 esphome/const.py                              |  22 +
 tests/test3.yaml                              |  57 ++
 6 files changed, 1156 insertions(+)
 create mode 100644 esphome/components/thermostat/__init__.py
 create mode 100644 esphome/components/thermostat/climate.py
 create mode 100644 esphome/components/thermostat/thermostat_climate.cpp
 create mode 100644 esphome/components/thermostat/thermostat_climate.h

diff --git a/esphome/components/thermostat/__init__.py b/esphome/components/thermostat/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/thermostat/climate.py b/esphome/components/thermostat/climate.py
new file mode 100644
index 0000000000..c9cb81194c
--- /dev/null
+++ b/esphome/components/thermostat/climate.py
@@ -0,0 +1,254 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.components import climate, sensor
+from esphome.const import CONF_AUTO_MODE, CONF_AWAY_CONFIG, CONF_COOL_ACTION, CONF_COOL_MODE, \
+    CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_DRY_ACTION, \
+    CONF_DRY_MODE, CONF_FAN_MODE_ON_ACTION, CONF_FAN_MODE_OFF_ACTION, CONF_FAN_MODE_AUTO_ACTION, \
+    CONF_FAN_MODE_LOW_ACTION, CONF_FAN_MODE_MEDIUM_ACTION, CONF_FAN_MODE_HIGH_ACTION, \
+    CONF_FAN_MODE_MIDDLE_ACTION, CONF_FAN_MODE_FOCUS_ACTION, CONF_FAN_MODE_DIFFUSE_ACTION, \
+    CONF_FAN_ONLY_ACTION, CONF_FAN_ONLY_MODE, CONF_HEAT_ACTION, CONF_HEAT_MODE, CONF_HYSTERESIS, \
+    CONF_ID, CONF_IDLE_ACTION, CONF_OFF_MODE, CONF_SENSOR, CONF_SWING_BOTH_ACTION, \
+    CONF_SWING_HORIZONTAL_ACTION, CONF_SWING_OFF_ACTION, CONF_SWING_VERTICAL_ACTION
+
+thermostat_ns = cg.esphome_ns.namespace('thermostat')
+ThermostatClimate = thermostat_ns.class_('ThermostatClimate', climate.Climate, cg.Component)
+ThermostatClimateTargetTempConfig = thermostat_ns.struct('ThermostatClimateTargetTempConfig')
+
+
+def validate_thermostat(config):
+    # verify corresponding climate action action exists for any defined climate mode action
+    if CONF_COOL_MODE in config and CONF_COOL_ACTION not in config:
+        raise cv.Invalid("{} must be defined to use {}".format(CONF_COOL_ACTION, CONF_COOL_MODE))
+    if CONF_DRY_MODE in config and CONF_DRY_ACTION not in config:
+        raise cv.Invalid("{} must be defined to use {}".format(CONF_DRY_ACTION, CONF_DRY_MODE))
+    if CONF_FAN_ONLY_MODE in config and CONF_FAN_ONLY_ACTION not in config:
+        raise cv.Invalid("{} must be defined to use {}".format(CONF_FAN_ONLY_ACTION,
+                                                               CONF_FAN_ONLY_MODE))
+    if CONF_HEAT_MODE in config and CONF_HEAT_ACTION not in config:
+        raise cv.Invalid("{} must be defined to use {}".format(CONF_HEAT_ACTION, CONF_HEAT_MODE))
+    # verify corresponding default target temperature exists when a given climate action exists
+    if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH not in config and (CONF_COOL_ACTION in config
+                                                               or CONF_FAN_ONLY_ACTION in config):
+        raise cv.Invalid("{} must be defined when using {} or {}".format(
+            CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION, CONF_FAN_ONLY_ACTION))
+    if CONF_DEFAULT_TARGET_TEMPERATURE_LOW not in config and CONF_HEAT_ACTION in config:
+        raise cv.Invalid("{} must be defined when using {}".format(
+            CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
+    # if a given climate action is NOT defined, it should not have a default target temperature
+    if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in config and (CONF_COOL_ACTION not in config
+                                                           and CONF_FAN_ONLY_ACTION not in config):
+        raise cv.Invalid("{} is defined with no {}".format(
+            CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION))
+    if CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config and CONF_HEAT_ACTION not in config:
+        raise cv.Invalid("{} is defined with no {}".format(
+            CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
+
+    if CONF_AWAY_CONFIG in config:
+        away = config[CONF_AWAY_CONFIG]
+        # verify corresponding default target temperature exists when a given climate action exists
+        if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH not in away and (CONF_COOL_ACTION in config or
+                                                                 CONF_FAN_ONLY_ACTION in config):
+            raise cv.Invalid("{} must be defined in away configuration when using {} or {}".format(
+                CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION, CONF_FAN_ONLY_ACTION))
+        if CONF_DEFAULT_TARGET_TEMPERATURE_LOW not in away and CONF_HEAT_ACTION in config:
+            raise cv.Invalid("{} must be defined in away configuration when using {}".format(
+                CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
+        # if a given climate action is NOT defined, it should not have a default target temperature
+        if CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in away and (CONF_COOL_ACTION not in config and
+                                                             CONF_FAN_ONLY_ACTION not in config):
+            raise cv.Invalid("{} is defined in away configuration with no {} or {}".format(
+                CONF_DEFAULT_TARGET_TEMPERATURE_HIGH, CONF_COOL_ACTION, CONF_FAN_ONLY_ACTION))
+        if CONF_DEFAULT_TARGET_TEMPERATURE_LOW in away and CONF_HEAT_ACTION not in config:
+            raise cv.Invalid("{} is defined in away configuration with no {}".format(
+                CONF_DEFAULT_TARGET_TEMPERATURE_LOW, CONF_HEAT_ACTION))
+
+    return config
+
+
+CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(ThermostatClimate),
+    cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
+    cv.Required(CONF_IDLE_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_COOL_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_DRY_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_ONLY_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_HEAT_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_AUTO_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_COOL_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_DRY_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_ONLY_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_HEAT_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_OFF_MODE): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_ON_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_OFF_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_AUTO_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_LOW_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_MEDIUM_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_HIGH_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_MIDDLE_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_FOCUS_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_FAN_MODE_DIFFUSE_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_SWING_BOTH_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_SWING_HORIZONTAL_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_SWING_OFF_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_SWING_VERTICAL_ACTION): automation.validate_automation(single=True),
+    cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
+    cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
+    cv.Optional(CONF_HYSTERESIS, default=0.5): cv.temperature,
+    cv.Optional(CONF_AWAY_CONFIG): cv.Schema({
+        cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_HIGH): cv.temperature,
+        cv.Optional(CONF_DEFAULT_TARGET_TEMPERATURE_LOW): cv.temperature,
+    }),
+}).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(CONF_COOL_ACTION, CONF_DRY_ACTION,
+                                                        CONF_FAN_ONLY_ACTION, CONF_HEAT_ACTION),
+                       validate_thermostat)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield climate.register_climate(var, config)
+
+    auto_mode_available = CONF_HEAT_ACTION in config and CONF_COOL_ACTION in config
+    two_points_available = CONF_HEAT_ACTION in config and (CONF_COOL_ACTION in config or
+                                                           CONF_FAN_ONLY_ACTION in config)
+
+    sens = yield cg.get_variable(config[CONF_SENSOR])
+    cg.add(var.set_sensor(sens))
+    cg.add(var.set_hysteresis(config[CONF_HYSTERESIS]))
+
+    if two_points_available is True:
+        cg.add(var.set_supports_two_points(True))
+        normal_config = ThermostatClimateTargetTempConfig(
+            config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
+            config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+        )
+    elif CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in config:
+        cg.add(var.set_supports_two_points(False))
+        normal_config = ThermostatClimateTargetTempConfig(
+            config[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+        )
+    elif CONF_DEFAULT_TARGET_TEMPERATURE_LOW in config:
+        cg.add(var.set_supports_two_points(False))
+        normal_config = ThermostatClimateTargetTempConfig(
+            config[CONF_DEFAULT_TARGET_TEMPERATURE_LOW]
+        )
+    cg.add(var.set_normal_config(normal_config))
+
+    yield automation.build_automation(var.get_idle_action_trigger(), [],
+                                      config[CONF_IDLE_ACTION])
+
+    if auto_mode_available is True:
+        cg.add(var.set_supports_auto(True))
+    else:
+        cg.add(var.set_supports_auto(False))
+
+    if CONF_COOL_ACTION in config:
+        yield automation.build_automation(var.get_cool_action_trigger(), [],
+                                          config[CONF_COOL_ACTION])
+        cg.add(var.set_supports_cool(True))
+    if CONF_DRY_ACTION in config:
+        yield automation.build_automation(var.get_dry_action_trigger(), [],
+                                          config[CONF_DRY_ACTION])
+        cg.add(var.set_supports_dry(True))
+    if CONF_FAN_ONLY_ACTION in config:
+        yield automation.build_automation(var.get_fan_only_action_trigger(), [],
+                                          config[CONF_FAN_ONLY_ACTION])
+        cg.add(var.set_supports_fan_only(True))
+    if CONF_HEAT_ACTION in config:
+        yield automation.build_automation(var.get_heat_action_trigger(), [],
+                                          config[CONF_HEAT_ACTION])
+        cg.add(var.set_supports_heat(True))
+    if CONF_AUTO_MODE in config:
+        yield automation.build_automation(var.get_auto_mode_trigger(), [],
+                                          config[CONF_AUTO_MODE])
+    if CONF_COOL_MODE in config:
+        yield automation.build_automation(var.get_cool_mode_trigger(), [],
+                                          config[CONF_COOL_MODE])
+        cg.add(var.set_supports_cool(True))
+    if CONF_DRY_MODE in config:
+        yield automation.build_automation(var.get_dry_mode_trigger(), [],
+                                          config[CONF_DRY_MODE])
+        cg.add(var.set_supports_dry(True))
+    if CONF_FAN_ONLY_MODE in config:
+        yield automation.build_automation(var.get_fan_only_mode_trigger(), [],
+                                          config[CONF_FAN_ONLY_MODE])
+        cg.add(var.set_supports_fan_only(True))
+    if CONF_HEAT_MODE in config:
+        yield automation.build_automation(var.get_heat_mode_trigger(), [],
+                                          config[CONF_HEAT_MODE])
+        cg.add(var.set_supports_heat(True))
+    if CONF_OFF_MODE in config:
+        yield automation.build_automation(var.get_off_mode_trigger(), [],
+                                          config[CONF_OFF_MODE])
+    if CONF_FAN_MODE_ON_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_on_trigger(), [],
+                                          config[CONF_FAN_MODE_ON_ACTION])
+        cg.add(var.set_supports_fan_mode_on(True))
+    if CONF_FAN_MODE_OFF_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_off_trigger(), [],
+                                          config[CONF_FAN_MODE_OFF_ACTION])
+        cg.add(var.set_supports_fan_mode_off(True))
+    if CONF_FAN_MODE_AUTO_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_auto_trigger(), [],
+                                          config[CONF_FAN_MODE_AUTO_ACTION])
+        cg.add(var.set_supports_fan_mode_auto(True))
+    if CONF_FAN_MODE_LOW_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_low_trigger(), [],
+                                          config[CONF_FAN_MODE_LOW_ACTION])
+        cg.add(var.set_supports_fan_mode_low(True))
+    if CONF_FAN_MODE_MEDIUM_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_medium_trigger(), [],
+                                          config[CONF_FAN_MODE_MEDIUM_ACTION])
+        cg.add(var.set_supports_fan_mode_medium(True))
+    if CONF_FAN_MODE_HIGH_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_high_trigger(), [],
+                                          config[CONF_FAN_MODE_HIGH_ACTION])
+        cg.add(var.set_supports_fan_mode_high(True))
+    if CONF_FAN_MODE_MIDDLE_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_middle_trigger(), [],
+                                          config[CONF_FAN_MODE_MIDDLE_ACTION])
+        cg.add(var.set_supports_fan_mode_middle(True))
+    if CONF_FAN_MODE_FOCUS_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_focus_trigger(), [],
+                                          config[CONF_FAN_MODE_FOCUS_ACTION])
+        cg.add(var.set_supports_fan_mode_focus(True))
+    if CONF_FAN_MODE_DIFFUSE_ACTION in config:
+        yield automation.build_automation(var.get_fan_mode_diffuse_trigger(), [],
+                                          config[CONF_FAN_MODE_DIFFUSE_ACTION])
+        cg.add(var.set_supports_fan_mode_diffuse(True))
+    if CONF_SWING_BOTH_ACTION in config:
+        yield automation.build_automation(var.get_swing_mode_both_trigger(), [],
+                                          config[CONF_SWING_BOTH_ACTION])
+        cg.add(var.set_supports_swing_mode_both(True))
+    if CONF_SWING_HORIZONTAL_ACTION in config:
+        yield automation.build_automation(var.get_swing_mode_horizontal_trigger(), [],
+                                          config[CONF_SWING_HORIZONTAL_ACTION])
+        cg.add(var.set_supports_swing_mode_horizontal(True))
+    if CONF_SWING_OFF_ACTION in config:
+        yield automation.build_automation(var.get_swing_mode_off_trigger(), [],
+                                          config[CONF_SWING_OFF_ACTION])
+        cg.add(var.set_supports_swing_mode_off(True))
+    if CONF_SWING_VERTICAL_ACTION in config:
+        yield automation.build_automation(var.get_swing_mode_vertical_trigger(), [],
+                                          config[CONF_SWING_VERTICAL_ACTION])
+        cg.add(var.set_supports_swing_mode_vertical(True))
+
+    if CONF_AWAY_CONFIG in config:
+        away = config[CONF_AWAY_CONFIG]
+
+        if two_points_available is True:
+            away_config = ThermostatClimateTargetTempConfig(
+                away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW],
+                away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+            )
+        elif CONF_DEFAULT_TARGET_TEMPERATURE_HIGH in away:
+            away_config = ThermostatClimateTargetTempConfig(
+                away[CONF_DEFAULT_TARGET_TEMPERATURE_HIGH]
+            )
+        elif CONF_DEFAULT_TARGET_TEMPERATURE_LOW in away:
+            away_config = ThermostatClimateTargetTempConfig(
+                away[CONF_DEFAULT_TARGET_TEMPERATURE_LOW]
+            )
+        cg.add(var.set_away_config(away_config))
diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
new file mode 100644
index 0000000000..5d97156e2f
--- /dev/null
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -0,0 +1,552 @@
+#include "thermostat_climate.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace thermostat {
+
+static const char *TAG = "thermostat.climate";
+
+void ThermostatClimate::setup() {
+  this->sensor_->add_on_state_callback([this](float state) {
+    this->current_temperature = state;
+    // required action may have changed, recompute, refresh
+    this->switch_to_action_(compute_action_());
+    // current temperature and possibly action changed, so publish the new state
+    this->publish_state();
+  });
+  this->current_temperature = this->sensor_->state;
+  // restore all climate data, if possible
+  auto restore = this->restore_state_();
+  if (restore.has_value()) {
+    restore->to_call(this).perform();
+  } else {
+    // restore from defaults, change_away handles temps for us
+    this->mode = climate::CLIMATE_MODE_AUTO;
+    this->change_away_(false);
+  }
+  // refresh the climate action based on the restored settings
+  this->switch_to_action_(compute_action_());
+  this->setup_complete_ = true;
+  this->publish_state();
+}
+float ThermostatClimate::hysteresis() { return this->hysteresis_; }
+void ThermostatClimate::refresh() {
+  this->switch_to_mode_(this->mode);
+  this->switch_to_action_(compute_action_());
+  this->switch_to_fan_mode_(this->fan_mode);
+  this->switch_to_swing_mode_(this->swing_mode);
+  this->publish_state();
+}
+void ThermostatClimate::control(const climate::ClimateCall &call) {
+  if (call.get_mode().has_value())
+    this->mode = *call.get_mode();
+  if (call.get_fan_mode().has_value())
+    this->fan_mode = *call.get_fan_mode();
+  if (call.get_swing_mode().has_value())
+    this->swing_mode = *call.get_swing_mode();
+  if (call.get_target_temperature().has_value())
+    this->target_temperature = *call.get_target_temperature();
+  if (call.get_target_temperature_low().has_value())
+    this->target_temperature_low = *call.get_target_temperature_low();
+  if (call.get_target_temperature_high().has_value())
+    this->target_temperature_high = *call.get_target_temperature_high();
+  if (call.get_away().has_value()) {
+    // setup_complete_ blocks modifying/resetting the temps immediately after boot
+    if (this->setup_complete_) {
+      this->change_away_(*call.get_away());
+    } else {
+      this->away = *call.get_away();
+    }
+  }
+  // set point validation
+  if (this->supports_two_points_) {
+    if (this->target_temperature_low < this->get_traits().get_visual_min_temperature())
+      this->target_temperature_low = this->get_traits().get_visual_min_temperature();
+    if (this->target_temperature_high > this->get_traits().get_visual_max_temperature())
+      this->target_temperature_high = this->get_traits().get_visual_max_temperature();
+    if (this->target_temperature_high < this->target_temperature_low)
+      this->target_temperature_high = this->target_temperature_low;
+  } else {
+    if (this->target_temperature < this->get_traits().get_visual_min_temperature())
+      this->target_temperature = this->get_traits().get_visual_min_temperature();
+    if (this->target_temperature > this->get_traits().get_visual_max_temperature())
+      this->target_temperature = this->get_traits().get_visual_max_temperature();
+  }
+  // make any changes happen
+  refresh();
+}
+climate::ClimateTraits ThermostatClimate::traits() {
+  auto traits = climate::ClimateTraits();
+  traits.set_supports_current_temperature(true);
+  traits.set_supports_auto_mode(this->supports_auto_);
+  traits.set_supports_cool_mode(this->supports_cool_);
+  traits.set_supports_dry_mode(this->supports_dry_);
+  traits.set_supports_fan_only_mode(this->supports_fan_only_);
+  traits.set_supports_heat_mode(this->supports_heat_);
+  traits.set_supports_fan_mode_on(this->supports_fan_mode_on_);
+  traits.set_supports_fan_mode_off(this->supports_fan_mode_off_);
+  traits.set_supports_fan_mode_auto(this->supports_fan_mode_auto_);
+  traits.set_supports_fan_mode_low(this->supports_fan_mode_low_);
+  traits.set_supports_fan_mode_medium(this->supports_fan_mode_medium_);
+  traits.set_supports_fan_mode_high(this->supports_fan_mode_high_);
+  traits.set_supports_fan_mode_middle(this->supports_fan_mode_middle_);
+  traits.set_supports_fan_mode_focus(this->supports_fan_mode_focus_);
+  traits.set_supports_fan_mode_diffuse(this->supports_fan_mode_diffuse_);
+  traits.set_supports_swing_mode_both(this->supports_swing_mode_both_);
+  traits.set_supports_swing_mode_horizontal(this->supports_swing_mode_horizontal_);
+  traits.set_supports_swing_mode_off(this->supports_swing_mode_off_);
+  traits.set_supports_swing_mode_vertical(this->supports_swing_mode_vertical_);
+  traits.set_supports_two_point_target_temperature(this->supports_two_points_);
+  traits.set_supports_away(this->supports_away_);
+  traits.set_supports_action(true);
+  return traits;
+}
+climate::ClimateAction ThermostatClimate::compute_action_() {
+  climate::ClimateAction target_action = this->action;
+  if (this->supports_two_points_) {
+    if (isnan(this->current_temperature) || isnan(this->target_temperature_low) ||
+        isnan(this->target_temperature_high) || isnan(this->hysteresis_))
+      // if any control parameters are nan, go to OFF action (not IDLE!)
+      return climate::CLIMATE_ACTION_OFF;
+
+    if (((this->action == climate::CLIMATE_ACTION_FAN) && (this->mode != climate::CLIMATE_MODE_FAN_ONLY)) ||
+        ((this->action == climate::CLIMATE_ACTION_DRYING) && (this->mode != climate::CLIMATE_MODE_DRY))) {
+      target_action = climate::CLIMATE_ACTION_IDLE;
+    }
+
+    switch (this->mode) {
+      case climate::CLIMATE_MODE_FAN_ONLY:
+        if (this->supports_fan_only_) {
+          if (this->current_temperature > this->target_temperature_high + this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_FAN;
+          else if (this->current_temperature < this->target_temperature_high - this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_FAN)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        break;
+      case climate::CLIMATE_MODE_DRY:
+        target_action = climate::CLIMATE_ACTION_DRYING;
+        break;
+      case climate::CLIMATE_MODE_OFF:
+        target_action = climate::CLIMATE_ACTION_OFF;
+        break;
+      case climate::CLIMATE_MODE_AUTO:
+      case climate::CLIMATE_MODE_COOL:
+      case climate::CLIMATE_MODE_HEAT:
+        if (this->supports_cool_) {
+          if (this->current_temperature > this->target_temperature_high + this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_COOLING;
+          else if (this->current_temperature < this->target_temperature_high - this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_COOLING)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        if (this->supports_heat_) {
+          if (this->current_temperature < this->target_temperature_low - this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_HEATING;
+          else if (this->current_temperature > this->target_temperature_low + this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_HEATING)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        break;
+      default:
+        break;
+    }
+  } else {
+    if (isnan(this->current_temperature) || isnan(this->target_temperature) || isnan(this->hysteresis_))
+      // if any control parameters are nan, go to OFF action (not IDLE!)
+      return climate::CLIMATE_ACTION_OFF;
+
+    if (((this->action == climate::CLIMATE_ACTION_FAN) && (this->mode != climate::CLIMATE_MODE_FAN_ONLY)) ||
+        ((this->action == climate::CLIMATE_ACTION_DRYING) && (this->mode != climate::CLIMATE_MODE_DRY))) {
+      target_action = climate::CLIMATE_ACTION_IDLE;
+    }
+
+    switch (this->mode) {
+      case climate::CLIMATE_MODE_FAN_ONLY:
+        if (this->supports_fan_only_) {
+          if (this->current_temperature > this->target_temperature + this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_FAN;
+          else if (this->current_temperature < this->target_temperature - this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_FAN)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        break;
+      case climate::CLIMATE_MODE_DRY:
+        target_action = climate::CLIMATE_ACTION_DRYING;
+        break;
+      case climate::CLIMATE_MODE_OFF:
+        target_action = climate::CLIMATE_ACTION_OFF;
+        break;
+      case climate::CLIMATE_MODE_COOL:
+        if (this->supports_cool_) {
+          if (this->current_temperature > this->target_temperature + this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_COOLING;
+          else if (this->current_temperature < this->target_temperature - this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_COOLING)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+      case climate::CLIMATE_MODE_HEAT:
+        if (this->supports_heat_) {
+          if (this->current_temperature < this->target_temperature - this->hysteresis_)
+            target_action = climate::CLIMATE_ACTION_HEATING;
+          else if (this->current_temperature > this->target_temperature + this->hysteresis_)
+            if (this->action == climate::CLIMATE_ACTION_HEATING)
+              target_action = climate::CLIMATE_ACTION_IDLE;
+        }
+        break;
+      default:
+        break;
+    }
+  }
+  // do not switch to an action that isn't enabled per the active climate mode
+  if ((this->mode == climate::CLIMATE_MODE_COOL) && (target_action == climate::CLIMATE_ACTION_HEATING))
+    target_action = climate::CLIMATE_ACTION_IDLE;
+  if ((this->mode == climate::CLIMATE_MODE_HEAT) && (target_action == climate::CLIMATE_ACTION_COOLING))
+    target_action = climate::CLIMATE_ACTION_IDLE;
+
+  return target_action;
+}
+void ThermostatClimate::switch_to_action_(climate::ClimateAction action) {
+  // setup_complete_ helps us ensure an action is called immediately after boot
+  if ((action == this->action) && this->setup_complete_)
+    // already in target mode
+    return;
+
+  if (((action == climate::CLIMATE_ACTION_OFF && this->action == climate::CLIMATE_ACTION_IDLE) ||
+       (action == climate::CLIMATE_ACTION_IDLE && this->action == climate::CLIMATE_ACTION_OFF)) &&
+      this->setup_complete_) {
+    // switching from OFF to IDLE or vice-versa
+    // these only have visual difference. OFF means user manually disabled,
+    // IDLE means it's in auto mode but value is in target range.
+    this->action = action;
+    return;
+  }
+
+  if (this->prev_action_trigger_ != nullptr) {
+    this->prev_action_trigger_->stop();
+    this->prev_action_trigger_ = nullptr;
+  }
+  Trigger<> *trig = this->idle_action_trigger_;
+  switch (action) {
+    case climate::CLIMATE_ACTION_OFF:
+    case climate::CLIMATE_ACTION_IDLE:
+      // trig = this->idle_action_trigger_;
+      break;
+    case climate::CLIMATE_ACTION_COOLING:
+      trig = this->cool_action_trigger_;
+      break;
+    case climate::CLIMATE_ACTION_HEATING:
+      trig = this->heat_action_trigger_;
+      break;
+    case climate::CLIMATE_ACTION_FAN:
+      trig = this->fan_only_action_trigger_;
+      break;
+    case climate::CLIMATE_ACTION_DRYING:
+      trig = this->dry_action_trigger_;
+      break;
+    default:
+      // we cannot report an invalid mode back to HA (even if it asked for one)
+      //  and must assume some valid value
+      action = climate::CLIMATE_ACTION_OFF;
+      // trig = this->idle_action_trigger_;
+  }
+  assert(trig != nullptr);
+  trig->trigger();
+  this->action = action;
+  this->prev_action_trigger_ = trig;
+}
+void ThermostatClimate::switch_to_fan_mode_(climate::ClimateFanMode fan_mode) {
+  // setup_complete_ helps us ensure an action is called immediately after boot
+  if ((fan_mode == this->prev_fan_mode_) && this->setup_complete_)
+    // already in target mode
+    return;
+
+  if (this->prev_fan_mode_trigger_ != nullptr) {
+    this->prev_fan_mode_trigger_->stop();
+    this->prev_fan_mode_trigger_ = nullptr;
+  }
+  Trigger<> *trig = this->fan_mode_auto_trigger_;
+  switch (fan_mode) {
+    case climate::CLIMATE_FAN_ON:
+      trig = this->fan_mode_on_trigger_;
+      break;
+    case climate::CLIMATE_FAN_OFF:
+      trig = this->fan_mode_off_trigger_;
+      break;
+    case climate::CLIMATE_FAN_AUTO:
+      // trig = this->fan_mode_auto_trigger_;
+      break;
+    case climate::CLIMATE_FAN_LOW:
+      trig = this->fan_mode_low_trigger_;
+      break;
+    case climate::CLIMATE_FAN_MEDIUM:
+      trig = this->fan_mode_medium_trigger_;
+      break;
+    case climate::CLIMATE_FAN_HIGH:
+      trig = this->fan_mode_high_trigger_;
+      break;
+    case climate::CLIMATE_FAN_MIDDLE:
+      trig = this->fan_mode_middle_trigger_;
+      break;
+    case climate::CLIMATE_FAN_FOCUS:
+      trig = this->fan_mode_focus_trigger_;
+      break;
+    case climate::CLIMATE_FAN_DIFFUSE:
+      trig = this->fan_mode_diffuse_trigger_;
+      break;
+    default:
+      // we cannot report an invalid mode back to HA (even if it asked for one)
+      //  and must assume some valid value
+      fan_mode = climate::CLIMATE_FAN_AUTO;
+      // trig = this->fan_mode_auto_trigger_;
+  }
+  assert(trig != nullptr);
+  trig->trigger();
+  this->fan_mode = fan_mode;
+  this->prev_fan_mode_ = fan_mode;
+  this->prev_fan_mode_trigger_ = trig;
+}
+void ThermostatClimate::switch_to_mode_(climate::ClimateMode mode) {
+  // setup_complete_ helps us ensure an action is called immediately after boot
+  if ((mode == this->prev_mode_) && this->setup_complete_)
+    // already in target mode
+    return;
+
+  if (this->prev_mode_trigger_ != nullptr) {
+    this->prev_mode_trigger_->stop();
+    this->prev_mode_trigger_ = nullptr;
+  }
+  Trigger<> *trig = this->auto_mode_trigger_;
+  switch (mode) {
+    case climate::CLIMATE_MODE_OFF:
+      trig = this->off_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_AUTO:
+      // trig = this->auto_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_COOL:
+      trig = this->cool_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      trig = this->heat_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      trig = this->fan_only_mode_trigger_;
+      break;
+    case climate::CLIMATE_MODE_DRY:
+      trig = this->dry_mode_trigger_;
+      break;
+    default:
+      // we cannot report an invalid mode back to HA (even if it asked for one)
+      //  and must assume some valid value
+      mode = climate::CLIMATE_MODE_AUTO;
+      // trig = this->auto_mode_trigger_;
+  }
+  assert(trig != nullptr);
+  trig->trigger();
+  this->mode = mode;
+  this->prev_mode_ = mode;
+  this->prev_mode_trigger_ = trig;
+}
+void ThermostatClimate::switch_to_swing_mode_(climate::ClimateSwingMode swing_mode) {
+  // setup_complete_ helps us ensure an action is called immediately after boot
+  if ((swing_mode == this->prev_swing_mode_) && this->setup_complete_)
+    // already in target mode
+    return;
+
+  if (this->prev_swing_mode_trigger_ != nullptr) {
+    this->prev_swing_mode_trigger_->stop();
+    this->prev_swing_mode_trigger_ = nullptr;
+  }
+  Trigger<> *trig = this->swing_mode_off_trigger_;
+  switch (swing_mode) {
+    case climate::CLIMATE_SWING_BOTH:
+      trig = this->swing_mode_both_trigger_;
+      break;
+    case climate::CLIMATE_SWING_HORIZONTAL:
+      trig = this->swing_mode_horizontal_trigger_;
+      break;
+    case climate::CLIMATE_SWING_OFF:
+      // trig = this->swing_mode_off_trigger_;
+      break;
+    case climate::CLIMATE_SWING_VERTICAL:
+      trig = this->swing_mode_vertical_trigger_;
+      break;
+    default:
+      // we cannot report an invalid mode back to HA (even if it asked for one)
+      //  and must assume some valid value
+      swing_mode = climate::CLIMATE_SWING_OFF;
+      // trig = this->swing_mode_off_trigger_;
+  }
+  assert(trig != nullptr);
+  trig->trigger();
+  this->swing_mode = swing_mode;
+  this->prev_swing_mode_ = swing_mode;
+  this->prev_swing_mode_trigger_ = trig;
+}
+void ThermostatClimate::change_away_(bool away) {
+  if (!away) {
+    if (this->supports_two_points_) {
+      this->target_temperature_low = this->normal_config_.default_temperature_low;
+      this->target_temperature_high = this->normal_config_.default_temperature_high;
+    } else
+      this->target_temperature = this->normal_config_.default_temperature;
+  } else {
+    if (this->supports_two_points_) {
+      this->target_temperature_low = this->away_config_.default_temperature_low;
+      this->target_temperature_high = this->away_config_.default_temperature_high;
+    } else
+      this->target_temperature = this->away_config_.default_temperature;
+  }
+  this->away = away;
+}
+void ThermostatClimate::set_normal_config(const ThermostatClimateTargetTempConfig &normal_config) {
+  this->normal_config_ = normal_config;
+}
+void ThermostatClimate::set_away_config(const ThermostatClimateTargetTempConfig &away_config) {
+  this->supports_away_ = true;
+  this->away_config_ = away_config;
+}
+ThermostatClimate::ThermostatClimate()
+    : cool_action_trigger_(new Trigger<>()),
+      cool_mode_trigger_(new Trigger<>()),
+      dry_action_trigger_(new Trigger<>()),
+      dry_mode_trigger_(new Trigger<>()),
+      heat_action_trigger_(new Trigger<>()),
+      heat_mode_trigger_(new Trigger<>()),
+      auto_mode_trigger_(new Trigger<>()),
+      idle_action_trigger_(new Trigger<>()),
+      off_mode_trigger_(new Trigger<>()),
+      fan_only_action_trigger_(new Trigger<>()),
+      fan_only_mode_trigger_(new Trigger<>()),
+      fan_mode_on_trigger_(new Trigger<>()),
+      fan_mode_off_trigger_(new Trigger<>()),
+      fan_mode_auto_trigger_(new Trigger<>()),
+      fan_mode_low_trigger_(new Trigger<>()),
+      fan_mode_medium_trigger_(new Trigger<>()),
+      fan_mode_high_trigger_(new Trigger<>()),
+      fan_mode_middle_trigger_(new Trigger<>()),
+      fan_mode_focus_trigger_(new Trigger<>()),
+      fan_mode_diffuse_trigger_(new Trigger<>()),
+      swing_mode_both_trigger_(new Trigger<>()),
+      swing_mode_off_trigger_(new Trigger<>()),
+      swing_mode_horizontal_trigger_(new Trigger<>()),
+      swing_mode_vertical_trigger_(new Trigger<>()) {}
+void ThermostatClimate::set_hysteresis(float hysteresis) { this->hysteresis_ = hysteresis; }
+void ThermostatClimate::set_sensor(sensor::Sensor *sensor) { this->sensor_ = sensor; }
+void ThermostatClimate::set_supports_auto(bool supports_auto) { this->supports_auto_ = supports_auto; }
+void ThermostatClimate::set_supports_cool(bool supports_cool) { this->supports_cool_ = supports_cool; }
+void ThermostatClimate::set_supports_dry(bool supports_dry) { this->supports_dry_ = supports_dry; }
+void ThermostatClimate::set_supports_fan_only(bool supports_fan_only) { this->supports_fan_only_ = supports_fan_only; }
+void ThermostatClimate::set_supports_heat(bool supports_heat) { this->supports_heat_ = supports_heat; }
+void ThermostatClimate::set_supports_fan_mode_on(bool supports_fan_mode_on) {
+  this->supports_fan_mode_on_ = supports_fan_mode_on;
+}
+void ThermostatClimate::set_supports_fan_mode_off(bool supports_fan_mode_off) {
+  this->supports_fan_mode_off_ = supports_fan_mode_off;
+}
+void ThermostatClimate::set_supports_fan_mode_auto(bool supports_fan_mode_auto) {
+  this->supports_fan_mode_auto_ = supports_fan_mode_auto;
+}
+void ThermostatClimate::set_supports_fan_mode_low(bool supports_fan_mode_low) {
+  this->supports_fan_mode_low_ = supports_fan_mode_low;
+}
+void ThermostatClimate::set_supports_fan_mode_medium(bool supports_fan_mode_medium) {
+  this->supports_fan_mode_medium_ = supports_fan_mode_medium;
+}
+void ThermostatClimate::set_supports_fan_mode_high(bool supports_fan_mode_high) {
+  this->supports_fan_mode_high_ = supports_fan_mode_high;
+}
+void ThermostatClimate::set_supports_fan_mode_middle(bool supports_fan_mode_middle) {
+  this->supports_fan_mode_middle_ = supports_fan_mode_middle;
+}
+void ThermostatClimate::set_supports_fan_mode_focus(bool supports_fan_mode_focus) {
+  this->supports_fan_mode_focus_ = supports_fan_mode_focus;
+}
+void ThermostatClimate::set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse) {
+  this->supports_fan_mode_diffuse_ = supports_fan_mode_diffuse;
+}
+void ThermostatClimate::set_supports_swing_mode_both(bool supports_swing_mode_both) {
+  this->supports_swing_mode_both_ = supports_swing_mode_both;
+}
+void ThermostatClimate::set_supports_swing_mode_off(bool supports_swing_mode_off) {
+  this->supports_swing_mode_off_ = supports_swing_mode_off;
+}
+void ThermostatClimate::set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal) {
+  this->supports_swing_mode_horizontal_ = supports_swing_mode_horizontal;
+}
+void ThermostatClimate::set_supports_swing_mode_vertical(bool supports_swing_mode_vertical) {
+  this->supports_swing_mode_vertical_ = supports_swing_mode_vertical;
+}
+void ThermostatClimate::set_supports_two_points(bool supports_two_points) {
+  this->supports_two_points_ = supports_two_points;
+}
+Trigger<> *ThermostatClimate::get_cool_action_trigger() const { return this->cool_action_trigger_; }
+Trigger<> *ThermostatClimate::get_dry_action_trigger() const { return this->dry_action_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_only_action_trigger() const { return this->fan_only_action_trigger_; }
+Trigger<> *ThermostatClimate::get_heat_action_trigger() const { return this->heat_action_trigger_; }
+Trigger<> *ThermostatClimate::get_idle_action_trigger() const { return this->idle_action_trigger_; }
+Trigger<> *ThermostatClimate::get_auto_mode_trigger() const { return this->auto_mode_trigger_; }
+Trigger<> *ThermostatClimate::get_cool_mode_trigger() const { return this->cool_mode_trigger_; }
+Trigger<> *ThermostatClimate::get_dry_mode_trigger() const { return this->dry_mode_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_only_mode_trigger() const { return this->fan_only_mode_trigger_; }
+Trigger<> *ThermostatClimate::get_heat_mode_trigger() const { return this->heat_mode_trigger_; }
+Trigger<> *ThermostatClimate::get_off_mode_trigger() const { return this->off_mode_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_on_trigger() const { return this->fan_mode_on_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_off_trigger() const { return this->fan_mode_off_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_auto_trigger() const { return this->fan_mode_auto_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_low_trigger() const { return this->fan_mode_low_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_medium_trigger() const { return this->fan_mode_medium_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_high_trigger() const { return this->fan_mode_high_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_middle_trigger() const { return this->fan_mode_middle_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_focus_trigger() const { return this->fan_mode_focus_trigger_; }
+Trigger<> *ThermostatClimate::get_fan_mode_diffuse_trigger() const { return this->fan_mode_diffuse_trigger_; }
+Trigger<> *ThermostatClimate::get_swing_mode_both_trigger() const { return this->swing_mode_both_trigger_; }
+Trigger<> *ThermostatClimate::get_swing_mode_off_trigger() const { return this->swing_mode_off_trigger_; }
+Trigger<> *ThermostatClimate::get_swing_mode_horizontal_trigger() const { return this->swing_mode_horizontal_trigger_; }
+Trigger<> *ThermostatClimate::get_swing_mode_vertical_trigger() const { return this->swing_mode_vertical_trigger_; }
+void ThermostatClimate::dump_config() {
+  LOG_CLIMATE("", "Thermostat", this);
+  if (this->supports_heat_)
+    ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature_low);
+  if ((this->supports_cool_) || (this->supports_fan_only_))
+    ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature_high);
+  ESP_LOGCONFIG(TAG, "  Hysteresis: %.1f°C", this->hysteresis_);
+  ESP_LOGCONFIG(TAG, "  Supports AUTO: %s", YESNO(this->supports_auto_));
+  ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
+  ESP_LOGCONFIG(TAG, "  Supports DRY: %s", YESNO(this->supports_dry_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN_ONLY: %s", YESNO(this->supports_fan_only_));
+  ESP_LOGCONFIG(TAG, "  Supports HEAT: %s", YESNO(this->supports_heat_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE ON: %s", YESNO(this->supports_fan_mode_on_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE OFF: %s", YESNO(this->supports_fan_mode_off_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE AUTO: %s", YESNO(this->supports_fan_mode_auto_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE LOW: %s", YESNO(this->supports_fan_mode_low_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE MEDIUM: %s", YESNO(this->supports_fan_mode_medium_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE HIGH: %s", YESNO(this->supports_fan_mode_high_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE MIDDLE: %s", YESNO(this->supports_fan_mode_middle_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE FOCUS: %s", YESNO(this->supports_fan_mode_focus_));
+  ESP_LOGCONFIG(TAG, "  Supports FAN MODE DIFFUSE: %s", YESNO(this->supports_fan_mode_diffuse_));
+  ESP_LOGCONFIG(TAG, "  Supports SWING MODE BOTH: %s", YESNO(this->supports_swing_mode_both_));
+  ESP_LOGCONFIG(TAG, "  Supports SWING MODE OFF: %s", YESNO(this->supports_swing_mode_off_));
+  ESP_LOGCONFIG(TAG, "  Supports SWING MODE HORIZONTAL: %s", YESNO(this->supports_swing_mode_horizontal_));
+  ESP_LOGCONFIG(TAG, "  Supports SWING MODE VERTICAL: %s", YESNO(this->supports_swing_mode_vertical_));
+  ESP_LOGCONFIG(TAG, "  Supports TWO SET POINTS: %s", YESNO(this->supports_two_points_));
+  ESP_LOGCONFIG(TAG, "  Supports AWAY mode: %s", YESNO(this->supports_away_));
+  if (this->supports_away_) {
+    if (this->supports_heat_)
+      ESP_LOGCONFIG(TAG, "    Away Default Target Temperature Low: %.1f°C", this->away_config_.default_temperature_low);
+    if ((this->supports_cool_) || (this->supports_fan_only_))
+      ESP_LOGCONFIG(TAG, "    Away Default Target Temperature High: %.1f°C",
+                    this->away_config_.default_temperature_high);
+  }
+}
+
+ThermostatClimateTargetTempConfig::ThermostatClimateTargetTempConfig() = default;
+ThermostatClimateTargetTempConfig::ThermostatClimateTargetTempConfig(float default_temperature)
+    : default_temperature(default_temperature) {}
+ThermostatClimateTargetTempConfig::ThermostatClimateTargetTempConfig(float default_temperature_low,
+                                                                     float default_temperature_high)
+    : default_temperature_low(default_temperature_low), default_temperature_high(default_temperature_high) {}
+
+}  // namespace thermostat
+}  // namespace esphome
diff --git a/esphome/components/thermostat/thermostat_climate.h b/esphome/components/thermostat/thermostat_climate.h
new file mode 100644
index 0000000000..86a1007efa
--- /dev/null
+++ b/esphome/components/thermostat/thermostat_climate.h
@@ -0,0 +1,271 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/climate/climate.h"
+#include "esphome/components/sensor/sensor.h"
+
+namespace esphome {
+namespace thermostat {
+
+struct ThermostatClimateTargetTempConfig {
+ public:
+  ThermostatClimateTargetTempConfig();
+  ThermostatClimateTargetTempConfig(float default_temperature);
+  ThermostatClimateTargetTempConfig(float default_temperature_low, float default_temperature_high);
+
+  float default_temperature{NAN};
+  float default_temperature_low{NAN};
+  float default_temperature_high{NAN};
+  float hysteresis{NAN};
+};
+
+class ThermostatClimate : public climate::Climate, public Component {
+ public:
+  ThermostatClimate();
+  void setup() override;
+  void dump_config() override;
+
+  void set_hysteresis(float hysteresis);
+  void set_sensor(sensor::Sensor *sensor);
+  void set_supports_auto(bool supports_auto);
+  void set_supports_cool(bool supports_cool);
+  void set_supports_dry(bool supports_dry);
+  void set_supports_fan_only(bool supports_fan_only);
+  void set_supports_heat(bool supports_heat);
+  void set_supports_fan_mode_on(bool supports_fan_mode_on);
+  void set_supports_fan_mode_off(bool supports_fan_mode_off);
+  void set_supports_fan_mode_auto(bool supports_fan_mode_auto);
+  void set_supports_fan_mode_low(bool supports_fan_mode_low);
+  void set_supports_fan_mode_medium(bool supports_fan_mode_medium);
+  void set_supports_fan_mode_high(bool supports_fan_mode_high);
+  void set_supports_fan_mode_middle(bool supports_fan_mode_middle);
+  void set_supports_fan_mode_focus(bool supports_fan_mode_focus);
+  void set_supports_fan_mode_diffuse(bool supports_fan_mode_diffuse);
+  void set_supports_swing_mode_both(bool supports_swing_mode_both);
+  void set_supports_swing_mode_horizontal(bool supports_swing_mode_horizontal);
+  void set_supports_swing_mode_off(bool supports_swing_mode_off);
+  void set_supports_swing_mode_vertical(bool supports_swing_mode_vertical);
+  void set_supports_two_points(bool supports_two_points);
+
+  void set_normal_config(const ThermostatClimateTargetTempConfig &normal_config);
+  void set_away_config(const ThermostatClimateTargetTempConfig &away_config);
+
+  Trigger<> *get_cool_action_trigger() const;
+  Trigger<> *get_dry_action_trigger() const;
+  Trigger<> *get_fan_only_action_trigger() const;
+  Trigger<> *get_heat_action_trigger() const;
+  Trigger<> *get_idle_action_trigger() const;
+  Trigger<> *get_auto_mode_trigger() const;
+  Trigger<> *get_cool_mode_trigger() const;
+  Trigger<> *get_dry_mode_trigger() const;
+  Trigger<> *get_fan_only_mode_trigger() const;
+  Trigger<> *get_heat_mode_trigger() const;
+  Trigger<> *get_off_mode_trigger() const;
+  Trigger<> *get_fan_mode_on_trigger() const;
+  Trigger<> *get_fan_mode_off_trigger() const;
+  Trigger<> *get_fan_mode_auto_trigger() const;
+  Trigger<> *get_fan_mode_low_trigger() const;
+  Trigger<> *get_fan_mode_medium_trigger() const;
+  Trigger<> *get_fan_mode_high_trigger() const;
+  Trigger<> *get_fan_mode_middle_trigger() const;
+  Trigger<> *get_fan_mode_focus_trigger() const;
+  Trigger<> *get_fan_mode_diffuse_trigger() const;
+  Trigger<> *get_swing_mode_both_trigger() const;
+  Trigger<> *get_swing_mode_horizontal_trigger() const;
+  Trigger<> *get_swing_mode_off_trigger() const;
+  Trigger<> *get_swing_mode_vertical_trigger() const;
+  /// Get current hysteresis value
+  float hysteresis();
+  /// Call triggers based on updated climate states (modes/actions)
+  void refresh();
+
+ protected:
+  /// Override control to change settings of the climate device.
+  void control(const climate::ClimateCall &call) override;
+
+  /// Change the away setting, will reset target temperatures to defaults.
+  void change_away_(bool away);
+
+  /// Return the traits of this controller.
+  climate::ClimateTraits traits() override;
+
+  /// Re-compute the required action of this climate controller.
+  climate::ClimateAction compute_action_();
+
+  /// Switch the climate device to the given climate action.
+  void switch_to_action_(climate::ClimateAction action);
+
+  /// Switch the climate device to the given climate fan mode.
+  void switch_to_fan_mode_(climate::ClimateFanMode fan_mode);
+
+  /// Switch the climate device to the given climate mode.
+  void switch_to_mode_(climate::ClimateMode mode);
+
+  /// Switch the climate device to the given climate swing mode.
+  void switch_to_swing_mode_(climate::ClimateSwingMode swing_mode);
+
+  /// The sensor used for getting the current temperature
+  sensor::Sensor *sensor_{nullptr};
+
+  /// Whether the controller supports auto/cooling/drying/fanning/heating.
+  ///
+  /// A false value for any given attribute means that the controller has no such action
+  /// (for example a thermostat, where only heating and not-heating is possible).
+  bool supports_auto_{false};
+  bool supports_cool_{false};
+  bool supports_dry_{false};
+  bool supports_fan_only_{false};
+  bool supports_heat_{false};
+
+  /// Whether the controller supports turning on or off just the fan.
+  ///
+  /// A false value for either attribute means that the controller has no fan on/off action
+  /// (for example a thermostat, where independent control of the fan is not possible).
+  bool supports_fan_mode_on_{false};
+  bool supports_fan_mode_off_{false};
+
+  /// Whether the controller supports fan auto mode.
+  ///
+  /// A false value for this attribute means that the controller has no fan-auto action
+  /// (for example a thermostat, where independent control of the fan is not possible).
+  bool supports_fan_mode_auto_{false};
+
+  /// Whether the controller supports various fan speeds and/or positions.
+  ///
+  /// A false value for any given attribute means that the controller has no such fan action.
+  bool supports_fan_mode_low_{false};
+  bool supports_fan_mode_medium_{false};
+  bool supports_fan_mode_high_{false};
+  bool supports_fan_mode_middle_{false};
+  bool supports_fan_mode_focus_{false};
+  bool supports_fan_mode_diffuse_{false};
+
+  /// Whether the controller supports various swing modes.
+  ///
+  /// A false value for any given attribute means that the controller has no such swing mode.
+  bool supports_swing_mode_both_{false};
+  bool supports_swing_mode_off_{false};
+  bool supports_swing_mode_horizontal_{false};
+  bool supports_swing_mode_vertical_{false};
+
+  /// Whether the controller supports two set points
+  ///
+  /// A false value means that the controller has no such support.
+  bool supports_two_points_{false};
+
+  /// Whether the controller supports an "away" mode
+  ///
+  /// A false value means that the controller has no such mode.
+  bool supports_away_{false};
+
+  /// The trigger to call when the controller should switch to cooling action/mode.
+  ///
+  /// A null value for this attribute means that the controller has no cooling action
+  /// For example electric heat, where only heating (power on) and not-heating
+  /// (power off) is possible.
+  Trigger<> *cool_action_trigger_{nullptr};
+  Trigger<> *cool_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to dry (dehumidification) mode.
+  ///
+  /// In dry mode, the controller is assumed to have both heating and cooling disabled,
+  /// although the system may use its cooling mechanism to achieve drying.
+  Trigger<> *dry_action_trigger_{nullptr};
+  Trigger<> *dry_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to heating action/mode.
+  ///
+  /// A null value for this attribute means that the controller has no heating action
+  /// For example window blinds, where only cooling (blinds closed) and not-cooling
+  /// (blinds open) is possible.
+  Trigger<> *heat_action_trigger_{nullptr};
+  Trigger<> *heat_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to auto mode.
+  ///
+  /// In auto mode, the controller will enable heating/cooling as necessary and switch
+  /// to idle when the temperature is within the thresholds/set points.
+  Trigger<> *auto_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to idle action/off mode.
+  ///
+  /// In these actions/modes, the controller is assumed to have both heating and cooling disabled.
+  Trigger<> *idle_action_trigger_{nullptr};
+  Trigger<> *off_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch to fan-only action/mode.
+  ///
+  /// In fan-only mode, the controller is assumed to have both heating and cooling disabled.
+  /// The system should activate the fan only.
+  Trigger<> *fan_only_action_trigger_{nullptr};
+  Trigger<> *fan_only_mode_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch on the fan.
+  Trigger<> *fan_mode_on_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch off the fan.
+  Trigger<> *fan_mode_off_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "auto" mode.
+  Trigger<> *fan_mode_auto_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "low" speed.
+  Trigger<> *fan_mode_low_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "medium" speed.
+  Trigger<> *fan_mode_medium_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "high" speed.
+  Trigger<> *fan_mode_high_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "middle" position.
+  Trigger<> *fan_mode_middle_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "focus" position.
+  Trigger<> *fan_mode_focus_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the fan to "diffuse" position.
+  Trigger<> *fan_mode_diffuse_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the swing mode to "both".
+  Trigger<> *swing_mode_both_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the swing mode to "off".
+  Trigger<> *swing_mode_off_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the swing mode to "horizontal".
+  Trigger<> *swing_mode_horizontal_trigger_{nullptr};
+
+  /// The trigger to call when the controller should switch the swing mode to "vertical".
+  Trigger<> *swing_mode_vertical_trigger_{nullptr};
+
+  /// A reference to the trigger that was previously active.
+  ///
+  /// This is so that the previous trigger can be stopped before enabling a new one
+  /// for each climate category (mode, action, fan_mode, swing_mode).
+  Trigger<> *prev_action_trigger_{nullptr};
+  Trigger<> *prev_fan_mode_trigger_{nullptr};
+  Trigger<> *prev_mode_trigger_{nullptr};
+  Trigger<> *prev_swing_mode_trigger_{nullptr};
+
+  /// Store previously-known states
+  ///
+  /// These are used to determine when a trigger/action needs to be called
+  climate::ClimateFanMode prev_fan_mode_{climate::CLIMATE_FAN_ON};
+  climate::ClimateMode prev_mode_{climate::CLIMATE_MODE_OFF};
+  climate::ClimateSwingMode prev_swing_mode_{climate::CLIMATE_SWING_OFF};
+
+  /// Temperature data for normal/home and away modes
+  ThermostatClimateTargetTempConfig normal_config_{};
+  ThermostatClimateTargetTempConfig away_config_{};
+
+  /// Hysteresis value used for computing climate actions
+  float hysteresis_{0};
+
+  /// setup_complete_ blocks modifying/resetting the temps immediately after boot
+  bool setup_complete_{false};
+};
+
+}  // namespace thermostat
+}  // namespace esphome
diff --git a/esphome/const.py b/esphome/const.py
index 4cdf48fc76..8b727b615c 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -44,6 +44,7 @@ CONF_ASSUMED_STATE = 'assumed_state'
 CONF_AT = 'at'
 CONF_ATTENUATION = 'attenuation'
 CONF_AUTH = 'auth'
+CONF_AUTO_MODE = 'auto_mode'
 CONF_AUTOMATION_ID = 'automation_id'
 CONF_AVAILABILITY = 'availability'
 CONF_AWAY = 'away'
@@ -102,6 +103,7 @@ CONF_CONDITION = 'condition'
 CONF_CONDITION_ID = 'condition_id'
 CONF_CONDUCTIVITY = 'conductivity'
 CONF_COOL_ACTION = 'cool_action'
+CONF_COOL_MODE = 'cool_mode'
 CONF_COUNT_MODE = 'count_mode'
 CONF_CRON = 'cron'
 CONF_CS_PIN = 'cs_pin'
@@ -140,6 +142,8 @@ CONF_DIV_RATIO = 'div_ratio'
 CONF_DNS1 = 'dns1'
 CONF_DNS2 = 'dns2'
 CONF_DOMAIN = 'domain'
+CONF_DRY_ACTION = 'dry_action'
+CONF_DRY_MODE = 'dry_mode'
 CONF_DUMP = 'dump'
 CONF_DURATION = 'duration'
 CONF_ECHO_PIN = 'echo_pin'
@@ -159,6 +163,17 @@ CONF_EXTERNAL_VCC = 'external_vcc'
 CONF_FALLING_EDGE = 'falling_edge'
 CONF_FAMILY = 'family'
 CONF_FAN_MODE = 'fan_mode'
+CONF_FAN_MODE_AUTO_ACTION = 'fan_mode_auto_action'
+CONF_FAN_MODE_DIFFUSE_ACTION = 'fan_mode_diffuse_action'
+CONF_FAN_MODE_FOCUS_ACTION = 'fan_mode_focus_action'
+CONF_FAN_MODE_HIGH_ACTION = 'fan_mode_high_action'
+CONF_FAN_MODE_LOW_ACTION = 'fan_mode_low_action'
+CONF_FAN_MODE_MEDIUM_ACTION = 'fan_mode_medium_action'
+CONF_FAN_MODE_MIDDLE_ACTION = 'fan_mode_middle_action'
+CONF_FAN_MODE_OFF_ACTION = 'fan_mode_off_action'
+CONF_FAN_MODE_ON_ACTION = 'fan_mode_on_action'
+CONF_FAN_ONLY_ACTION = 'fan_only_action'
+CONF_FAN_ONLY_MODE = 'fan_only_mode'
 CONF_FAST_CONNECT = 'fast_connect'
 CONF_FILE = 'file'
 CONF_FILTER = 'filter'
@@ -183,6 +198,7 @@ CONF_GROUP = 'group'
 CONF_HARDWARE_UART = 'hardware_uart'
 CONF_HEARTBEAT = 'heartbeat'
 CONF_HEAT_ACTION = 'heat_action'
+CONF_HEAT_MODE = 'heat_mode'
 CONF_HEATER = 'heater'
 CONF_HIDDEN = 'hidden'
 CONF_HIGH = 'high'
@@ -190,6 +206,7 @@ CONF_HIGH_VOLTAGE_REFERENCE = 'high_voltage_reference'
 CONF_HOUR = 'hour'
 CONF_HOURS = 'hours'
 CONF_HUMIDITY = 'humidity'
+CONF_HYSTERESIS = "hysteresis"
 CONF_I2C = 'i2c'
 CONF_I2C_ID = 'i2c_id'
 CONF_ICON = 'icon'
@@ -285,6 +302,7 @@ CONF_NUM_CHANNELS = 'num_channels'
 CONF_NUM_CHIPS = 'num_chips'
 CONF_NUM_LEDS = 'num_leds'
 CONF_NUMBER = 'number'
+CONF_OFF_MODE = 'off_mode'
 CONF_OFFSET = 'offset'
 CONF_ON = 'on'
 CONF_ON_BLE_ADVERTISE = 'on_ble_advertise'
@@ -449,7 +467,11 @@ CONF_STOP_ACTION = 'stop_action'
 CONF_SUBNET = 'subnet'
 CONF_SUPPORTS_COOL = 'supports_cool'
 CONF_SUPPORTS_HEAT = 'supports_heat'
+CONF_SWING_BOTH_ACTION = 'swing_both_action'
+CONF_SWING_HORIZONTAL_ACTION = 'swing_horizontal_action'
 CONF_SWING_MODE = 'swing_mode'
+CONF_SWING_OFF_ACTION = 'swing_off_action'
+CONF_SWING_VERTICAL_ACTION = 'swing_vertical_action'
 CONF_SWITCHES = 'switches'
 CONF_SYNC = 'sync'
 CONF_TABLET = 'tablet'
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 72dde13055..ef464fd5b7 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -624,6 +624,63 @@ climate:
     away_config:
       default_target_temperature_low: 16°C
       default_target_temperature_high: 20°C
+  - platform: thermostat
+    name: Thermostat Climate
+    sensor: ha_hello_world
+    default_target_temperature_low: 18°C
+    default_target_temperature_high: 24°C
+    idle_action:
+      - switch.turn_on: gpio_switch1
+    cool_action:
+      - switch.turn_on: gpio_switch2
+    heat_action:
+      - switch.turn_on: gpio_switch1
+    dry_action:
+      - switch.turn_on: gpio_switch2
+    fan_only_action:
+      - switch.turn_on: gpio_switch1
+    auto_mode:
+      - switch.turn_on: gpio_switch2
+    off_mode:
+      - switch.turn_on: gpio_switch1
+    heat_mode:
+      - switch.turn_on: gpio_switch2
+    cool_mode:
+      - switch.turn_on: gpio_switch1
+    dry_mode:
+      - switch.turn_on: gpio_switch2
+    fan_only_mode:
+      - switch.turn_on: gpio_switch1
+    fan_mode_auto_action:
+      - switch.turn_on: gpio_switch2
+    fan_mode_on_action:
+      - switch.turn_on: gpio_switch1
+    fan_mode_off_action:
+      - switch.turn_on: gpio_switch2
+    fan_mode_low_action:
+      - switch.turn_on: gpio_switch1
+    fan_mode_medium_action:
+      - switch.turn_on: gpio_switch2
+    fan_mode_high_action:
+      - switch.turn_on: gpio_switch1
+    fan_mode_middle_action:
+      - switch.turn_on: gpio_switch2
+    fan_mode_focus_action:
+      - switch.turn_on: gpio_switch1
+    fan_mode_diffuse_action:
+      - switch.turn_on: gpio_switch2
+    swing_off_action:
+      - switch.turn_on: gpio_switch1
+    swing_horizontal_action:
+      - switch.turn_on: gpio_switch2
+    swing_vertical_action:
+      - switch.turn_on: gpio_switch1
+    swing_both_action:
+      - switch.turn_on: gpio_switch2
+    hysteresis: 0.2
+    away_config:
+      default_target_temperature_low: 16°C
+      default_target_temperature_high: 20°C
 
 cover:
   - platform: endstop

From 382793de9a56d6fb2cc4bc8e18af61e7ea865c06 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 8 Jul 2020 12:29:16 -0300
Subject: [PATCH 263/412] unpin mbedtls version (#1114)

---
 esphome/components/xiaomi_cgd1/sensor.py             | 2 +-
 esphome/components/xiaomi_lywsd03mmc/sensor.py       | 2 +-
 esphome/components/xiaomi_mjyd02yla/binary_sensor.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/xiaomi_cgd1/sensor.py b/esphome/components/xiaomi_cgd1/sensor.py
index 343279f8fe..b7891c8a56 100644
--- a/esphome/components/xiaomi_cgd1/sensor.py
+++ b/esphome/components/xiaomi_cgd1/sensor.py
@@ -40,4 +40,4 @@ def to_code(config):
         sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
         cg.add(var.set_battery_level(sens))
 
-    cg.add_library("mbedtls", "cdf462088d")
+    cg.add_library("mbedtls", None)
diff --git a/esphome/components/xiaomi_lywsd03mmc/sensor.py b/esphome/components/xiaomi_lywsd03mmc/sensor.py
index 71f7b20752..1ab59b01c5 100644
--- a/esphome/components/xiaomi_lywsd03mmc/sensor.py
+++ b/esphome/components/xiaomi_lywsd03mmc/sensor.py
@@ -41,4 +41,4 @@ def to_code(config):
         sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
         cg.add(var.set_battery_level(sens))
 
-    cg.add_library("mbedtls", "cdf462088d")
+    cg.add_library("mbedtls", None)
diff --git a/esphome/components/xiaomi_mjyd02yla/binary_sensor.py b/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
index e34864c480..6d2a674969 100644
--- a/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
+++ b/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
@@ -44,4 +44,4 @@ def to_code(config):
         sens = yield binary_sensor.new_binary_sensor(config[CONF_LIGHT])
         cg.add(var.set_light(sens))
 
-    cg.add_library("mbedtls", "cdf462088d")
+    cg.add_library("mbedtls", None)

From 6873f09f5722ff800f4e52dac3689e17dffe7927 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 8 Jul 2020 15:25:32 -0300
Subject: [PATCH 264/412] Fix ethernet logging too many warn messages (#1112)

---
 esphome/components/ethernet/ethernet_component.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index d5548fc377..0553d66273 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -37,7 +37,7 @@ void EthernetComponent::setup() {
 }
 void EthernetComponent::loop() {
   const uint32_t now = millis();
-  if (!this->connected_ && !this->last_connected_ && now - this->last_connected_ > 15000) {
+  if (!this->connected_ && !this->last_connected_ && now - this->connect_begin_ > 15000) {
     ESP_LOGW(TAG, "Connecting via ethernet failed! Re-connecting...");
     this->start_connect_();
     return;

From 7a16f846eb65ece249562f18e2a71bb2ffab3253 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 8 Jul 2020 15:52:51 -0300
Subject: [PATCH 265/412] add click dependency (#1111)

* add click dependency

* Update requirements.txt
---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index f999c4d98b..0c99eaccbe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,3 +10,4 @@ pyserial==3.4
 ifaddr==0.1.6
 platformio==4.3.3
 esptool==2.8
+click==7.1.2

From 33212d1abf45084c70d0da058684283129c698aa Mon Sep 17 00:00:00 2001
From: Carlos Gustavo Sarmiento <carlos5678@gmail.com>
Date: Thu, 9 Jul 2020 18:25:46 -0500
Subject: [PATCH 266/412] Add Integral Reset Action to PIDClimate (#1104)

---
 esphome/components/pid/climate.py       | 13 +++++++++++++
 esphome/components/pid/pid_climate.cpp  |  2 ++
 esphome/components/pid/pid_climate.h    | 11 +++++++++++
 esphome/components/pid/pid_controller.h |  2 ++
 4 files changed, 28 insertions(+)

diff --git a/esphome/components/pid/climate.py b/esphome/components/pid/climate.py
index a3e2299296..97a98efc20 100644
--- a/esphome/components/pid/climate.py
+++ b/esphome/components/pid/climate.py
@@ -7,6 +7,7 @@ from esphome.const import CONF_ID, CONF_SENSOR
 pid_ns = cg.esphome_ns.namespace('pid')
 PIDClimate = pid_ns.class_('PIDClimate', climate.Climate, cg.Component)
 PIDAutotuneAction = pid_ns.class_('PIDAutotuneAction', automation.Action)
+PIDResetIntegralTermAction = pid_ns.class_('PIDResetIntegralTermAction', automation.Action)
 
 CONF_DEFAULT_TARGET_TEMPERATURE = 'default_target_temperature'
 
@@ -64,6 +65,18 @@ def to_code(config):
     cg.add(var.set_default_target_temperature(config[CONF_DEFAULT_TARGET_TEMPERATURE]))
 
 
+@automation.register_action(
+    'climate.pid.reset_integral_term',
+    PIDResetIntegralTermAction,
+    automation.maybe_simple_id({
+        cv.Required(CONF_ID): cv.use_id(PIDClimate),
+    })
+)
+def pid_reset_integral_term(config, action_id, template_arg, args):
+    paren = yield cg.get_variable(config[CONF_ID])
+    yield cg.new_Pvariable(action_id, template_arg, paren)
+
+
 @automation.register_action('climate.pid.autotune', PIDAutotuneAction, automation.maybe_simple_id({
     cv.Required(CONF_ID): cv.use_id(PIDClimate),
     cv.Optional(CONF_NOISEBAND, default=0.25): cv.float_,
diff --git a/esphome/components/pid/pid_climate.cpp b/esphome/components/pid/pid_climate.cpp
index 0c777ffd8b..24fb0ec905 100644
--- a/esphome/components/pid/pid_climate.cpp
+++ b/esphome/components/pid/pid_climate.cpp
@@ -148,5 +148,7 @@ void PIDClimate::start_autotune(std::unique_ptr<PIDAutotuner> &&autotune) {
   });
 }
 
+void PIDClimate::reset_integral_term() { this->controller_.reset_accumulated_integral(); }
+
 }  // namespace pid
 }  // namespace esphome
diff --git a/esphome/components/pid/pid_climate.h b/esphome/components/pid/pid_climate.h
index 3dae92af5f..12436e225c 100644
--- a/esphome/components/pid/pid_climate.h
+++ b/esphome/components/pid/pid_climate.h
@@ -39,6 +39,7 @@ class PIDClimate : public climate::Climate, public Component {
     default_target_temperature_ = default_target_temperature;
   }
   void start_autotune(std::unique_ptr<PIDAutotuner> &&autotune);
+  void reset_integral_term();
 
  protected:
   /// Override control to change settings of the climate device.
@@ -90,5 +91,15 @@ template<typename... Ts> class PIDAutotuneAction : public Action<Ts...> {
   PIDClimate *parent_;
 };
 
+template<typename... Ts> class PIDResetIntegralTermAction : public Action<Ts...> {
+ public:
+  PIDResetIntegralTermAction(PIDClimate *parent) : parent_(parent) {}
+
+  void play(Ts... x) { this->parent_->reset_integral_term(); }
+
+ protected:
+  PIDClimate *parent_;
+};
+
 }  // namespace pid
 }  // namespace esphome
diff --git a/esphome/components/pid/pid_controller.h b/esphome/components/pid/pid_controller.h
index 7ec7724e15..4caad8dd8b 100644
--- a/esphome/components/pid/pid_controller.h
+++ b/esphome/components/pid/pid_controller.h
@@ -40,6 +40,8 @@ struct PIDController {
     return proportional_term + integral_term + derivative_term;
   }
 
+  void reset_accumulated_integral() { accumulated_integral_ = 0; }
+
   /// Proportional gain K_p.
   float kp = 0;
   /// Integral gain K_i.

From e5d4e12457555d20fd8bcd32b1c009da493e3252 Mon Sep 17 00:00:00 2001
From: peq123 <peq@peq.me.uk>
Date: Fri, 10 Jul 2020 00:29:44 +0100
Subject: [PATCH 267/412] RGBWW - added channel interlock for RGB vs white
 (#1042)

* Update light_color_values.h

* Update light_color_values.h

* Update light_color_values.h

* Update light_color_values.h

* colour relative to white value

* Update light_state.cpp

* Update light_state.cpp

* Update light_state.cpp

* Update light_state.cpp

* Update light_color_values.h

* Update light_state.cpp

* linting

* Update light_state.cpp

* Update light_color_values.h

* more lint

* more lint

* Update light_state.cpp

* Update light_state.cpp

* Update light_state.cpp

* add optional interlock

* Update test1.yaml

* Update light_state.cpp

* Update light_state.h

* interlock

* optional interlock.

* interlock as trait

* color interlock as trait

* optional color interlock....

* optional color interlock

* Update light_color_values.h

* Lint checks....

* making travis happy

* making sure gamma_correct fix is included

* Update light_color_values.h

* making travis happy

* clang-format

* Code tidy

* Update light_color_values.h

* Update light_color_values.h
---
 esphome/components/light/light_color_values.h | 22 +++++---
 esphome/components/light/light_state.cpp      | 56 ++++++++++++++-----
 esphome/components/light/light_state.h        |  6 +-
 esphome/components/light/light_traits.h       |  5 ++
 esphome/components/rgb/rgb_light_output.h     |  3 +-
 esphome/components/rgbw/light.py              |  3 +
 esphome/components/rgbw/rgbw_light_output.h   |  5 +-
 esphome/components/rgbww/light.py             |  3 +
 esphome/components/rgbww/rgbww_light_output.h |  6 +-
 tests/test1.yaml                              |  2 +
 10 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/esphome/components/light/light_color_values.h b/esphome/components/light/light_color_values.h
index 90f5570b90..cdd05ae7b7 100644
--- a/esphome/components/light/light_color_values.h
+++ b/esphome/components/light/light_color_values.h
@@ -179,22 +179,28 @@ class LightColorValues {
   }
 
   /// Convert these light color values to an RGB representation and write them to red, green, blue.
-  void as_rgb(float *red, float *green, float *blue, float gamma = 0) const {
-    *red = gamma_correct(this->state_ * this->brightness_ * this->red_, gamma);
-    *green = gamma_correct(this->state_ * this->brightness_ * this->green_, gamma);
-    *blue = gamma_correct(this->state_ * this->brightness_ * this->blue_, gamma);
+  void as_rgb(float *red, float *green, float *blue, float gamma = 0, bool color_interlock = false) const {
+    float brightness = this->state_ * this->brightness_;
+    if (color_interlock) {
+      brightness = brightness * (1.0f - this->white_);
+    }
+    *red = gamma_correct(brightness * this->red_, gamma);
+    *green = gamma_correct(brightness * this->green_, gamma);
+    *blue = gamma_correct(brightness * this->blue_, gamma);
   }
 
   /// Convert these light color values to an RGBW representation and write them to red, green, blue, white.
-  void as_rgbw(float *red, float *green, float *blue, float *white, float gamma = 0) const {
-    this->as_rgb(red, green, blue, gamma);
+  void as_rgbw(float *red, float *green, float *blue, float *white, float gamma = 0,
+               bool color_interlock = false) const {
+    this->as_rgb(red, green, blue, gamma, color_interlock);
     *white = gamma_correct(this->state_ * this->brightness_ * this->white_, gamma);
   }
 
   /// Convert these light color values to an RGBWW representation with the given parameters.
   void as_rgbww(float color_temperature_cw, float color_temperature_ww, float *red, float *green, float *blue,
-                float *cold_white, float *warm_white, float gamma = 0, bool constant_brightness = false) const {
-    this->as_rgb(red, green, blue, gamma);
+                float *cold_white, float *warm_white, float gamma = 0, bool constant_brightness = false,
+                bool color_interlock = false) const {
+    this->as_rgb(red, green, blue, gamma, color_interlock);
     const float color_temp = clamp(this->color_temperature_, color_temperature_cw, color_temperature_ww);
     const float ww_fraction = (color_temp - color_temperature_cw) / (color_temperature_ww - color_temperature_cw);
     const float cw_fraction = 1.0f - ww_fraction;
diff --git a/esphome/components/light/light_state.cpp b/esphome/components/light/light_state.cpp
index 9aa32f6904..d34bc88f53 100644
--- a/esphome/components/light/light_state.cpp
+++ b/esphome/components/light/light_state.cpp
@@ -400,26 +400,51 @@ LightColorValues LightCall::validate_() {
       this->green_ = optional<float>(1.0f);
       this->blue_ = optional<float>(1.0f);
     }
+    // make white values binary aka 0.0f or 1.0f...this allows brightness to do its job
+    if (traits.get_supports_color_interlock()) {
+      if (*this->white_ > 0.0f) {
+        this->white_ = optional<float>(1.0f);
+      } else {
+        this->white_ = optional<float>(0.0f);
+      }
+    }
   }
-  // White to 0% if (exclusively) setting any RGB value
+  // White to 0% if (exclusively) setting any RGB value that isn't 255,255,255
   else if (this->red_.has_value() || this->green_.has_value() || this->blue_.has_value()) {
-    if (!this->white_.has_value()) {
+    if (*this->red_ == 1.0f && *this->green_ == 1.0f && *this->blue_ == 1.0f && traits.get_supports_rgb_white_value() &&
+        traits.get_supports_color_interlock()) {
+      this->white_ = optional<float>(1.0f);
+    } else if (!this->white_.has_value() || !traits.get_supports_rgb_white_value()) {
       this->white_ = optional<float>(0.0f);
     }
   }
   // if changing Kelvin alone, change to white light
   else if (this->color_temperature_.has_value()) {
-    if (!this->red_.has_value() && !this->green_.has_value() && !this->blue_.has_value()) {
-      this->red_ = optional<float>(1.0f);
-      this->green_ = optional<float>(1.0f);
-      this->blue_ = optional<float>(1.0f);
+    if (!traits.get_supports_color_interlock()) {
+      if (!this->red_.has_value() && !this->green_.has_value() && !this->blue_.has_value()) {
+        this->red_ = optional<float>(1.0f);
+        this->green_ = optional<float>(1.0f);
+        this->blue_ = optional<float>(1.0f);
+      }
     }
     // if setting Kelvin from color (i.e. switching to white light), set White to 100%
     auto cv = this->parent_->remote_values;
     bool was_color = cv.get_red() != 1.0f || cv.get_blue() != 1.0f || cv.get_green() != 1.0f;
     bool now_white = *this->red_ == 1.0f && *this->blue_ == 1.0f && *this->green_ == 1.0f;
-    if (!this->white_.has_value() && was_color && now_white) {
-      this->white_ = optional<float>(1.0f);
+    if (traits.get_supports_color_interlock()) {
+      if (cv.get_white() < 1.0f) {
+        this->white_ = optional<float>(1.0f);
+      }
+
+      if (was_color && !this->red_.has_value() && !this->green_.has_value() && !this->blue_.has_value()) {
+        this->red_ = optional<float>(1.0f);
+        this->green_ = optional<float>(1.0f);
+        this->blue_ = optional<float>(1.0f);
+      }
+    } else {
+      if (!this->white_.has_value() && was_color && now_white) {
+        this->white_ = optional<float>(1.0f);
+      }
     }
   }
 
@@ -704,17 +729,20 @@ void LightState::current_values_as_binary(bool *binary) { this->current_values.a
 void LightState::current_values_as_brightness(float *brightness) {
   this->current_values.as_brightness(brightness, this->gamma_correct_);
 }
-void LightState::current_values_as_rgb(float *red, float *green, float *blue) {
-  this->current_values.as_rgb(red, green, blue, this->gamma_correct_);
+void LightState::current_values_as_rgb(float *red, float *green, float *blue, bool color_interlock) {
+  auto traits = this->get_traits();
+  this->current_values.as_rgb(red, green, blue, this->gamma_correct_, traits.get_supports_color_interlock());
 }
-void LightState::current_values_as_rgbw(float *red, float *green, float *blue, float *white) {
-  this->current_values.as_rgbw(red, green, blue, white, this->gamma_correct_);
+void LightState::current_values_as_rgbw(float *red, float *green, float *blue, float *white, bool color_interlock) {
+  auto traits = this->get_traits();
+  this->current_values.as_rgbw(red, green, blue, white, this->gamma_correct_, traits.get_supports_color_interlock());
 }
 void LightState::current_values_as_rgbww(float *red, float *green, float *blue, float *cold_white, float *warm_white,
-                                         bool constant_brightness) {
+                                         bool constant_brightness, bool color_interlock) {
   auto traits = this->get_traits();
   this->current_values.as_rgbww(traits.get_min_mireds(), traits.get_max_mireds(), red, green, blue, cold_white,
-                                warm_white, this->gamma_correct_, constant_brightness);
+                                warm_white, this->gamma_correct_, constant_brightness,
+                                traits.get_supports_color_interlock());
 }
 void LightState::current_values_as_cwww(float *cold_white, float *warm_white, bool constant_brightness) {
   auto traits = this->get_traits();
diff --git a/esphome/components/light/light_state.h b/esphome/components/light/light_state.h
index f399cc2be4..e48cf9f864 100644
--- a/esphome/components/light/light_state.h
+++ b/esphome/components/light/light_state.h
@@ -266,12 +266,12 @@ class LightState : public Nameable, public Component {
 
   void current_values_as_brightness(float *brightness);
 
-  void current_values_as_rgb(float *red, float *green, float *blue);
+  void current_values_as_rgb(float *red, float *green, float *blue, bool color_interlock = false);
 
-  void current_values_as_rgbw(float *red, float *green, float *blue, float *white);
+  void current_values_as_rgbw(float *red, float *green, float *blue, float *white, bool color_interlock = false);
 
   void current_values_as_rgbww(float *red, float *green, float *blue, float *cold_white, float *warm_white,
-                               bool constant_brightness = false);
+                               bool constant_brightness = false, bool color_interlock = false);
 
   void current_values_as_cwww(float *cold_white, float *warm_white, bool constant_brightness = false);
 
diff --git a/esphome/components/light/light_traits.h b/esphome/components/light/light_traits.h
index 2052b55c8e..ed9c0d44ea 100644
--- a/esphome/components/light/light_traits.h
+++ b/esphome/components/light/light_traits.h
@@ -20,6 +20,10 @@ class LightTraits {
   void set_supports_color_temperature(bool supports_color_temperature) {
     this->supports_color_temperature_ = supports_color_temperature;
   }
+  bool get_supports_color_interlock() const { return this->supports_color_interlock_; }
+  void set_supports_color_interlock(bool supports_color_interlock) {
+    this->supports_color_interlock_ = supports_color_interlock;
+  }
   float get_min_mireds() const { return this->min_mireds_; }
   void set_min_mireds(float min_mireds) { this->min_mireds_ = min_mireds; }
   float get_max_mireds() const { return this->max_mireds_; }
@@ -32,6 +36,7 @@ class LightTraits {
   bool supports_color_temperature_{false};
   float min_mireds_{0};
   float max_mireds_{0};
+  bool supports_color_interlock_{false};
 };
 
 }  // namespace light
diff --git a/esphome/components/rgb/rgb_light_output.h b/esphome/components/rgb/rgb_light_output.h
index e612c80f73..1a3bf9f614 100644
--- a/esphome/components/rgb/rgb_light_output.h
+++ b/esphome/components/rgb/rgb_light_output.h
@@ -12,6 +12,7 @@ class RGBLightOutput : public light::LightOutput {
   void set_red(output::FloatOutput *red) { red_ = red; }
   void set_green(output::FloatOutput *green) { green_ = green; }
   void set_blue(output::FloatOutput *blue) { blue_ = blue; }
+
   light::LightTraits get_traits() override {
     auto traits = light::LightTraits();
     traits.set_supports_brightness(true);
@@ -20,7 +21,7 @@ class RGBLightOutput : public light::LightOutput {
   }
   void write_state(light::LightState *state) override {
     float red, green, blue;
-    state->current_values_as_rgb(&red, &green, &blue);
+    state->current_values_as_rgb(&red, &green, &blue, false);
     this->red_->set_level(red);
     this->green_->set_level(green);
     this->blue_->set_level(blue);
diff --git a/esphome/components/rgbw/light.py b/esphome/components/rgbw/light.py
index 75d6082e5a..ca31a8229d 100644
--- a/esphome/components/rgbw/light.py
+++ b/esphome/components/rgbw/light.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_BLUE, CONF_GREEN, CONF_RED, CONF_OUTPUT_ID, CONF_
 
 rgbw_ns = cg.esphome_ns.namespace('rgbw')
 RGBWLightOutput = rgbw_ns.class_('RGBWLightOutput', light.LightOutput)
+CONF_COLOR_INTERLOCK = 'color_interlock'
 
 CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend({
     cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(RGBWLightOutput),
@@ -12,6 +13,7 @@ CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend({
     cv.Required(CONF_GREEN): cv.use_id(output.FloatOutput),
     cv.Required(CONF_BLUE): cv.use_id(output.FloatOutput),
     cv.Required(CONF_WHITE): cv.use_id(output.FloatOutput),
+    cv.Optional(CONF_COLOR_INTERLOCK, default=False): cv.boolean,
 })
 
 
@@ -27,3 +29,4 @@ def to_code(config):
     cg.add(var.set_blue(blue))
     white = yield cg.get_variable(config[CONF_WHITE])
     cg.add(var.set_white(white))
+    cg.add(var.set_color_interlock(config[CONF_COLOR_INTERLOCK]))
diff --git a/esphome/components/rgbw/rgbw_light_output.h b/esphome/components/rgbw/rgbw_light_output.h
index b58c7f9d54..90a650851b 100644
--- a/esphome/components/rgbw/rgbw_light_output.h
+++ b/esphome/components/rgbw/rgbw_light_output.h
@@ -13,16 +13,18 @@ class RGBWLightOutput : public light::LightOutput {
   void set_green(output::FloatOutput *green) { green_ = green; }
   void set_blue(output::FloatOutput *blue) { blue_ = blue; }
   void set_white(output::FloatOutput *white) { white_ = white; }
+  void set_color_interlock(bool color_interlock) { color_interlock_ = color_interlock; }
   light::LightTraits get_traits() override {
     auto traits = light::LightTraits();
     traits.set_supports_brightness(true);
+    traits.set_supports_color_interlock(this->color_interlock_);
     traits.set_supports_rgb(true);
     traits.set_supports_rgb_white_value(true);
     return traits;
   }
   void write_state(light::LightState *state) override {
     float red, green, blue, white;
-    state->current_values_as_rgbw(&red, &green, &blue, &white);
+    state->current_values_as_rgbw(&red, &green, &blue, &white, this->color_interlock_);
     this->red_->set_level(red);
     this->green_->set_level(green);
     this->blue_->set_level(blue);
@@ -34,6 +36,7 @@ class RGBWLightOutput : public light::LightOutput {
   output::FloatOutput *green_;
   output::FloatOutput *blue_;
   output::FloatOutput *white_;
+  bool color_interlock_{false};
 };
 
 }  // namespace rgbw
diff --git a/esphome/components/rgbww/light.py b/esphome/components/rgbww/light.py
index 78f4bee630..1513a684ea 100644
--- a/esphome/components/rgbww/light.py
+++ b/esphome/components/rgbww/light.py
@@ -9,6 +9,7 @@ rgbww_ns = cg.esphome_ns.namespace('rgbww')
 RGBWWLightOutput = rgbww_ns.class_('RGBWWLightOutput', light.LightOutput)
 
 CONF_CONSTANT_BRIGHTNESS = 'constant_brightness'
+CONF_COLOR_INTERLOCK = 'color_interlock'
 
 CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend({
     cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(RGBWWLightOutput),
@@ -20,6 +21,7 @@ CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend({
     cv.Required(CONF_COLD_WHITE_COLOR_TEMPERATURE): cv.color_temperature,
     cv.Required(CONF_WARM_WHITE_COLOR_TEMPERATURE): cv.color_temperature,
     cv.Optional(CONF_CONSTANT_BRIGHTNESS, default=False): cv.boolean,
+    cv.Optional(CONF_COLOR_INTERLOCK, default=False): cv.boolean,
 })
 
 
@@ -42,3 +44,4 @@ def to_code(config):
     cg.add(var.set_warm_white(wwhite))
     cg.add(var.set_warm_white_temperature(config[CONF_WARM_WHITE_COLOR_TEMPERATURE]))
     cg.add(var.set_constant_brightness(config[CONF_CONSTANT_BRIGHTNESS]))
+    cg.add(var.set_color_interlock(config[CONF_COLOR_INTERLOCK]))
diff --git a/esphome/components/rgbww/rgbww_light_output.h b/esphome/components/rgbww/rgbww_light_output.h
index a975331a37..152766970e 100644
--- a/esphome/components/rgbww/rgbww_light_output.h
+++ b/esphome/components/rgbww/rgbww_light_output.h
@@ -17,19 +17,22 @@ class RGBWWLightOutput : public light::LightOutput {
   void set_cold_white_temperature(float cold_white_temperature) { cold_white_temperature_ = cold_white_temperature; }
   void set_warm_white_temperature(float warm_white_temperature) { warm_white_temperature_ = warm_white_temperature; }
   void set_constant_brightness(bool constant_brightness) { constant_brightness_ = constant_brightness; }
+  void set_color_interlock(bool color_interlock) { color_interlock_ = color_interlock; }
   light::LightTraits get_traits() override {
     auto traits = light::LightTraits();
     traits.set_supports_brightness(true);
     traits.set_supports_rgb(true);
     traits.set_supports_rgb_white_value(true);
     traits.set_supports_color_temperature(true);
+    traits.set_supports_color_interlock(this->color_interlock_);
     traits.set_min_mireds(this->cold_white_temperature_);
     traits.set_max_mireds(this->warm_white_temperature_);
     return traits;
   }
   void write_state(light::LightState *state) override {
     float red, green, blue, cwhite, wwhite;
-    state->current_values_as_rgbww(&red, &green, &blue, &cwhite, &wwhite, this->constant_brightness_);
+    state->current_values_as_rgbww(&red, &green, &blue, &cwhite, &wwhite, this->constant_brightness_,
+                                   this->color_interlock_);
     this->red_->set_level(red);
     this->green_->set_level(green);
     this->blue_->set_level(blue);
@@ -46,6 +49,7 @@ class RGBWWLightOutput : public light::LightOutput {
   float cold_white_temperature_;
   float warm_white_temperature_;
   bool constant_brightness_;
+  bool color_interlock_{false};
 };
 
 }  // namespace rgbww
diff --git a/tests/test1.yaml b/tests/test1.yaml
index ec09a00208..83da6da9e3 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1114,6 +1114,7 @@ light:
     green: pca_4
     blue: pca_5
     white: pca_6
+    color_interlock: true
   - platform: rgbww
     name: "Living Room Lights 2"
     red: pca_3
@@ -1123,6 +1124,7 @@ light:
     warm_white: pca_6
     cold_white_color_temperature: 153 mireds
     warm_white_color_temperature: 500 mireds
+    color_interlock: true
   - platform: cwww
     name: "Living Room Lights 2"
     cold_white: pca_6

From c693c219f46c345dd64ea8c670d876615ba2077d Mon Sep 17 00:00:00 2001
From: Tom Price <tom@codedinternet.com>
Date: Fri, 10 Jul 2020 01:35:35 +0100
Subject: [PATCH 268/412] Add ESP32 support for WPA2-EAP Enterprise WiFi
 authentication (#1080)

* Add config generation and validation to support various WPA2-EAP authentication methods.

Config generate validates that all the required parameters are set in valid combinations.
In the event of EAP-TLS, the private key is matched to the certificate to check for pasting errors.

Add EAPAuth struct to header.
Add eap_auth property to WiFiAP with getters/setters.

* Add C++ code for setting WPA2-EAP authentication.

* Fix config for x509 EAP-TLS authentication.

* Fix a few linting issues.

* Fix a couple more linting issues that only showed up in CI

* Remove stray character.

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/wifi/__init__.py           | 88 ++++++++++++++++++-
 esphome/components/wifi/wifi_component.cpp    |  2 +
 esphome/components/wifi/wifi_component.h      | 13 +++
 .../components/wifi/wifi_component_esp32.cpp  | 46 ++++++++++
 esphome/config_validation.py                  | 23 +++++
 esphome/const.py                              |  5 ++
 requirements.txt                              |  1 +
 requirements_test.txt                         |  1 +
 8 files changed, 178 insertions(+), 1 deletion(-)

diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index d3c7e51603..8b68264b8e 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -1,3 +1,6 @@
+import logging
+from cryptography.hazmat.primitives.asymmetric import rsa, ec, ed448, ed25519
+
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
@@ -5,12 +8,15 @@ from esphome.automation import Condition
 from esphome.const import CONF_AP, CONF_BSSID, CONF_CHANNEL, CONF_DNS1, CONF_DNS2, CONF_DOMAIN, \
     CONF_FAST_CONNECT, CONF_GATEWAY, CONF_HIDDEN, CONF_ID, CONF_MANUAL_IP, CONF_NETWORKS, \
     CONF_PASSWORD, CONF_POWER_SAVE_MODE, CONF_REBOOT_TIMEOUT, CONF_SSID, CONF_STATIC_IP, \
-    CONF_SUBNET, CONF_USE_ADDRESS, CONF_PRIORITY
+    CONF_SUBNET, CONF_USE_ADDRESS, CONF_PRIORITY, CONF_IDENTITY, CONF_CERTIFICATE_AUTHORITY, \
+    CONF_CERTIFICATE, CONF_KEY, CONF_USERNAME, CONF_EAP
 from esphome.core import CORE, HexInt, coroutine_with_priority
+_LOGGER = logging.getLogger(__name__)
 
 AUTO_LOAD = ['network']
 
 wifi_ns = cg.esphome_ns.namespace('wifi')
+EAPAuth = wifi_ns.struct('EAPAuth')
 IPAddress = cg.global_ns.class_('IPAddress')
 ManualIP = wifi_ns.struct('ManualIP')
 WiFiComponent = wifi_ns.class_('WiFiComponent', cg.Component)
@@ -36,6 +42,55 @@ def validate_password(value):
     return value
 
 
+def validate_eap(value):
+    if CONF_USERNAME in value:
+        if CONF_IDENTITY not in value:
+            _LOGGER.info("EAP 'identity:' is not set, assuming username.")
+            value[CONF_IDENTITY] = value[CONF_USERNAME]
+        if CONF_PASSWORD not in value:
+            raise cv.Invalid("You cannot use the EAP 'username:' option without a 'password:'. "
+                             "Please provide the 'password:' key")
+    if CONF_CERTIFICATE in value or CONF_KEY in value:
+        if CONF_CERTIFICATE not in value and CONF_KEY not in value:
+            raise cv.Invalid("You have provided an EAP 'certificate:' or 'key:' without providing "
+                             "the other. Please check you have provided both.")
+        # Check the key is valid and for this certificate, just to check the user hasn't pasted
+        # the wrong thing. I write this after I spent a while debugging that exact issue.
+        # This may require a password to decrypt to key, so we should verify that at the same time.
+        certPw = None
+        if CONF_PASSWORD in value:
+            certPw = value[CONF_PASSWORD]
+
+        cert = cv.load_certificate(value[CONF_CERTIFICATE])
+        try:
+            key = cv.load_key(value[CONF_KEY], certPw)
+        except ValueError as e:
+            raise cv.Invalid(
+                "There was an error with the EAP 'password:' provided for 'key:' :%s" % e
+            )
+        except TypeError as e:
+            raise cv.Invalid("There was an error with the EAP 'key:' provided :%s" % e)
+
+        if isinstance(key, rsa.RSAPrivateKey):
+            if key.public_key().public_numbers() != cert.public_key().public_numbers():
+                raise cv.Invalid("The provided EAP 'key:' does not match the 'certificate:'")
+        elif isinstance(key, ec.EllipticCurvePrivateKey):
+            if key.public_key().public_numbers() != cert.public_key().public_numbers():
+                raise cv.Invalid("The provided EAP 'key:' does not match the 'certificate:'")
+        elif isinstance(key, ed448.Ed448PrivateKey):
+            if key.public_key() != cert:
+                raise cv.Invalid("The provided EAP 'key:' does not match the 'certificate:'")
+        elif isinstance(key, ed25519.Ed25519PrivateKey):
+            if key.public_key() != cert:
+                raise cv.Invalid("The provided EAP 'key:' does not match the 'certificate:'")
+        else:
+            _LOGGER.warning(
+                "Unrecognised EAP 'certificate:' 'key:' pair format: %s. Proceed with caution!",
+                type(key)
+            )
+    return value
+
+
 def validate_channel(value):
     value = cv.positive_int(value)
     if value < 1:
@@ -56,6 +111,15 @@ STA_MANUAL_IP_SCHEMA = AP_MANUAL_IP_SCHEMA.extend({
     cv.Optional(CONF_DNS2, default="0.0.0.0"): cv.ipv4,
 })
 
+EAP_AUTH_SCHEMA = cv.Schema({
+    cv.Optional(CONF_IDENTITY): cv.string_strict,
+    cv.Optional(CONF_USERNAME): cv.string_strict,
+    cv.Optional(CONF_PASSWORD): cv.string_strict,
+    cv.Optional(CONF_CERTIFICATE_AUTHORITY): cv.certificate,
+    cv.Optional(CONF_CERTIFICATE): cv.certificate,
+    cv.Optional(CONF_KEY): cv.string_strict,
+})
+
 WIFI_NETWORK_BASE = cv.Schema({
     cv.GenerateID(): cv.declare_id(WiFiAP),
     cv.Optional(CONF_SSID): cv.ssid,
@@ -73,6 +137,7 @@ WIFI_NETWORK_STA = WIFI_NETWORK_BASE.extend({
     cv.Optional(CONF_BSSID): cv.mac_address,
     cv.Optional(CONF_HIDDEN): cv.boolean,
     cv.Optional(CONF_PRIORITY, default=0.0): cv.float_,
+    cv.Optional(CONF_EAP): EAP_AUTH_SCHEMA,
 })
 
 
@@ -93,6 +158,10 @@ def validate(config):
         raise cv.Invalid("Please specify at least an SSID or an Access Point "
                          "to create.")
 
+    for network in config[CONF_NETWORKS]:
+        if CONF_EAP in network:
+            network[CONF_EAP] = validate_eap(network[CONF_EAP])
+
     if config.get(CONF_FAST_CONNECT, False):
         networks = config.get(CONF_NETWORKS, [])
         if not networks:
@@ -118,6 +187,7 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.Optional(CONF_SSID): cv.ssid,
     cv.Optional(CONF_PASSWORD): validate_password,
     cv.Optional(CONF_MANUAL_IP): STA_MANUAL_IP_SCHEMA,
+    cv.Optional(CONF_EAP): EAP_AUTH_SCHEMA,
 
     cv.Optional(CONF_AP): WIFI_NETWORK_AP,
     cv.Optional(CONF_DOMAIN, default='.local'): cv.domain_name,
@@ -133,6 +203,20 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
 }), validate)
 
 
+def eap_auth(config):
+    if config is None:
+        return None
+    return cg.StructInitializer(
+        EAPAuth,
+        ('identity', config.get(CONF_IDENTITY, "")),
+        ('username', config.get(CONF_USERNAME, "")),
+        ('password', config.get(CONF_PASSWORD, "")),
+        ('ca_cert', config.get(CONF_CERTIFICATE_AUTHORITY, "")),
+        ('client_cert', config.get(CONF_CERTIFICATE, "")),
+        ('client_key', config.get(CONF_KEY, "")),
+    )
+
+
 def safe_ip(ip):
     if ip is None:
         return IPAddress(0, 0, 0, 0)
@@ -158,6 +242,8 @@ def wifi_network(config, static_ip):
         cg.add(ap.set_ssid(config[CONF_SSID]))
     if CONF_PASSWORD in config:
         cg.add(ap.set_password(config[CONF_PASSWORD]))
+    if CONF_EAP in config:
+        cg.add(ap.set_eap(eap_auth(config[CONF_EAP])))
     if CONF_BSSID in config:
         cg.add(ap.set_bssid([HexInt(i) for i in config[CONF_BSSID].parts]))
     if CONF_HIDDEN in config:
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index d56e75a070..dc955add25 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -541,12 +541,14 @@ void WiFiAP::set_ssid(const std::string &ssid) { this->ssid_ = ssid; }
 void WiFiAP::set_bssid(bssid_t bssid) { this->bssid_ = bssid; }
 void WiFiAP::set_bssid(optional<bssid_t> bssid) { this->bssid_ = bssid; }
 void WiFiAP::set_password(const std::string &password) { this->password_ = password; }
+void WiFiAP::set_eap(optional<EAPAuth> eap_auth) { this->eap_ = eap_auth; }
 void WiFiAP::set_channel(optional<uint8_t> channel) { this->channel_ = channel; }
 void WiFiAP::set_manual_ip(optional<ManualIP> manual_ip) { this->manual_ip_ = manual_ip; }
 void WiFiAP::set_hidden(bool hidden) { this->hidden_ = hidden; }
 const std::string &WiFiAP::get_ssid() const { return this->ssid_; }
 const optional<bssid_t> &WiFiAP::get_bssid() const { return this->bssid_; }
 const std::string &WiFiAP::get_password() const { return this->password_; }
+const optional<EAPAuth> &WiFiAP::get_eap() const { return this->eap_; }
 const optional<uint8_t> &WiFiAP::get_channel() const { return this->channel_; }
 const optional<ManualIP> &WiFiAP::get_manual_ip() const { return this->manual_ip_; }
 bool WiFiAP::get_hidden() const { return this->hidden_; }
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index d04e1c2ce0..d58ea6c0fa 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -57,6 +57,16 @@ struct ManualIP {
   IPAddress dns2;  ///< The second DNS server. 0.0.0.0 for default.
 };
 
+struct EAPAuth {
+  std::string identity;  // required for all auth types
+  std::string username;
+  std::string password;
+  char *ca_cert;  // optionally verify authentication server
+  // used for EAP-TLS
+  char *client_cert;
+  char *client_key;
+};
+
 using bssid_t = std::array<uint8_t, 6>;
 
 class WiFiAP {
@@ -65,6 +75,7 @@ class WiFiAP {
   void set_bssid(bssid_t bssid);
   void set_bssid(optional<bssid_t> bssid);
   void set_password(const std::string &password);
+  void set_eap(optional<EAPAuth> eap_auth);
   void set_channel(optional<uint8_t> channel);
   void set_priority(float priority) { priority_ = priority; }
   void set_manual_ip(optional<ManualIP> manual_ip);
@@ -72,6 +83,7 @@ class WiFiAP {
   const std::string &get_ssid() const;
   const optional<bssid_t> &get_bssid() const;
   const std::string &get_password() const;
+  const optional<EAPAuth> &get_eap() const;
   const optional<uint8_t> &get_channel() const;
   float get_priority() const { return priority_; }
   const optional<ManualIP> &get_manual_ip() const;
@@ -81,6 +93,7 @@ class WiFiAP {
   std::string ssid_;
   optional<bssid_t> bssid_;
   std::string password_;
+  optional<EAPAuth> eap_;
   optional<uint8_t> channel_;
   float priority_{0};
   optional<ManualIP> manual_ip_;
diff --git a/esphome/components/wifi/wifi_component_esp32.cpp b/esphome/components/wifi/wifi_component_esp32.cpp
index e345ab1671..86c8078171 100644
--- a/esphome/components/wifi/wifi_component_esp32.cpp
+++ b/esphome/components/wifi/wifi_component_esp32.cpp
@@ -6,6 +6,7 @@
 
 #include <utility>
 #include <algorithm>
+#include <esp_wpa2.h>
 #include "lwip/err.h"
 #include "lwip/dns.h"
 
@@ -187,6 +188,51 @@ bool WiFiComponent::wifi_sta_connect_(WiFiAP ap) {
     return false;
   }
 
+  // setup enterprise authentication if required
+  if (ap.get_eap().has_value()) {
+    // note: all certificates and keys have to be null terminated. Lengths are appended by +1 to include \0.
+    EAPAuth eap = ap.get_eap().value();
+    err = esp_wifi_sta_wpa2_ent_set_identity((uint8_t *) eap.identity.c_str(), eap.identity.length());
+    if (err != ESP_OK) {
+      ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_identity failed! %d", err);
+    }
+    int ca_cert_len = strlen(eap.ca_cert);
+    int client_cert_len = strlen(eap.client_cert);
+    int client_key_len = strlen(eap.client_key);
+    if (ca_cert_len) {
+      err = esp_wifi_sta_wpa2_ent_set_ca_cert((uint8_t *) eap.ca_cert, ca_cert_len + 1);
+      if (err != ESP_OK) {
+        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_ca_cert failed! %d", err);
+      }
+    }
+    // workout what type of EAP this is
+    // validation is not required as the config tool has already validated it
+    if (client_cert_len && client_key_len) {
+      // if we have certs, this must be EAP-TLS
+      err = esp_wifi_sta_wpa2_ent_set_cert_key((uint8_t *) eap.client_cert, client_cert_len + 1,
+                                               (uint8_t *) eap.client_key, client_key_len + 1,
+                                               (uint8_t *) eap.password.c_str(), strlen(eap.password.c_str()));
+      if (err != ESP_OK) {
+        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_cert_key failed! %d", err);
+      }
+    } else {
+      // in the absence of certs, assume this is username/password based
+      err = esp_wifi_sta_wpa2_ent_set_username((uint8_t *) eap.username.c_str(), eap.username.length());
+      if (err != ESP_OK) {
+        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_username failed! %d", err);
+      }
+      err = esp_wifi_sta_wpa2_ent_set_password((uint8_t *) eap.password.c_str(), eap.password.length());
+      if (err != ESP_OK) {
+        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_password failed! %d", err);
+      }
+    }
+    esp_wpa2_config_t wpa2Config = WPA2_CONFIG_INIT_DEFAULT();
+    err = esp_wifi_sta_wpa2_ent_enable(&wpa2Config);
+    if (err != ESP_OK) {
+      ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_enable failed! %d", err);
+    }
+  }
+
   this->wifi_apply_hostname_();
 
   err = esp_wifi_connect();
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 1319786841..9f7bdddaf0 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -10,6 +10,10 @@ from string import ascii_letters, digits
 
 import voluptuous as vol
 
+from cryptography import x509
+from cryptography.hazmat.backends import default_backend
+from cryptography.hazmat.primitives.serialization import load_pem_private_key
+
 from esphome import core
 from esphome.const import CONF_AVAILABILITY, CONF_COMMAND_TOPIC, CONF_DISCOVERY, CONF_ID, \
     CONF_INTERNAL, CONF_NAME, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, \
@@ -717,6 +721,25 @@ def domain_name(value):
     return value
 
 
+def load_certificate(value):
+    return x509.load_pem_x509_certificate(value.encode('UTF-8'), default_backend())
+
+
+def load_key(value, password):
+    if password:
+        password = password.encode("UTF-8")
+    return load_pem_private_key(value.encode('UTF-8'), password, default_backend())
+
+
+def certificate(value):
+    value = string_strict(value)
+    try:
+        load_certificate(value)  # raises ValueError
+        return value
+    except ValueError:
+        return Invalid("Invalid certificate")
+
+
 def ssid(value):
     value = string_strict(value)
     if not value:
diff --git a/esphome/const.py b/esphome/const.py
index 8b727b615c..cf2155b83d 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -76,6 +76,8 @@ CONF_CALIBRATION = 'calibration'
 CONF_CAPACITANCE = 'capacitance'
 CONF_CARRIER_DUTY_PERCENT = 'carrier_duty_percent'
 CONF_CARRIER_FREQUENCY = 'carrier_frequency'
+CONF_CERTIFICATE = "certificate"
+CONF_CERTIFICATE_AUTHORITY = "certificate_authority"
 CONF_CHANGE_MODE_EVERY = 'change_mode_every'
 CONF_CHANNEL = 'channel'
 CONF_CHANNELS = 'channels'
@@ -146,6 +148,7 @@ CONF_DRY_ACTION = 'dry_action'
 CONF_DRY_MODE = 'dry_mode'
 CONF_DUMP = 'dump'
 CONF_DURATION = 'duration'
+CONF_EAP = 'eap'
 CONF_ECHO_PIN = 'echo_pin'
 CONF_EFFECT = 'effect'
 CONF_EFFECTS = 'effects'
@@ -211,6 +214,7 @@ CONF_I2C = 'i2c'
 CONF_I2C_ID = 'i2c_id'
 CONF_ICON = 'icon'
 CONF_ID = 'id'
+CONF_IDENTITY = 'identity'
 CONF_IDLE = 'idle'
 CONF_IDLE_ACTION = 'idle_action'
 CONF_IDLE_LEVEL = 'idle_level'
@@ -238,6 +242,7 @@ CONF_JS_URL = 'js_url'
 CONF_JVC = 'jvc'
 CONF_KEEP_ON_TIME = 'keep_on_time'
 CONF_KEEPALIVE = 'keepalive'
+CONF_KEY = 'key'
 CONF_LAMBDA = 'lambda'
 CONF_LEVEL = 'level'
 CONF_LG = 'lg'
diff --git a/requirements.txt b/requirements.txt
index 0c99eaccbe..3efe16cc45 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,4 +10,5 @@ pyserial==3.4
 ifaddr==0.1.6
 platformio==4.3.3
 esptool==2.8
+cryptography==2.9.2
 click==7.1.2
diff --git a/requirements_test.txt b/requirements_test.txt
index b90c4ea969..72078ad6e4 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -10,6 +10,7 @@ pyserial==3.4
 ifaddr==0.1.6
 platformio==4.3.3
 esptool==2.8
+cryptography==2.9.2
 
 pylint==2.5.0
 flake8==3.7.9

From 7fa98e288f648318bdfca93c6e4493679a291a42 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Thu, 9 Jul 2020 19:53:49 -0500
Subject: [PATCH 269/412] SSD1325 grayscale support (#1064)

* SSD1325 grayscale support implemented

* Linted

* Fix garbage on display at power-up

* Rebase

* Linted

* Add brightness control, CS fixes

* Fix up SSD1327 init

* Add turn_on() and turn_off() methods

* Set brightness later in setup(), logging tweak

* Added is_on() method

* Added  grayscale image support

* Updated to use Color, 1327 GS fix
---
 esphome/components/display/display_buffer.cpp |  17 +--
 esphome/components/display/display_buffer.h   |   4 +-
 esphome/components/image/__init__.py          |  16 +-
 esphome/components/ssd1325_base/__init__.py   |   8 +-
 .../components/ssd1325_base/ssd1325_base.cpp  | 142 ++++++++++++------
 .../components/ssd1325_base/ssd1325_base.h    |   7 +
 esphome/components/ssd1325_spi/display.py     |   2 +-
 .../components/ssd1325_spi/ssd1325_spi.cpp    |  19 +--
 8 files changed, 129 insertions(+), 86 deletions(-)

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index cd28e45071..30c22f72ff 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -7,8 +7,8 @@ namespace display {
 
 static const char *TAG = "display";
 
-const Color COLOR_OFF = 0;
-const Color COLOR_ON = 1;
+const Color COLOR_OFF(0, 0, 0, 0);
+const Color COLOR_ON(1, 1, 1, 1);
 
 void DisplayBuffer::init_internal_(uint32_t buffer_length) {
   this->buffer_ = new uint8_t[buffer_length];
@@ -214,10 +214,10 @@ void DisplayBuffer::image(int x, int y, Color color, Image *image, bool invert)
           this->draw_pixel_at(x + img_x, y + img_y, image->get_pixel(img_x, img_y) ? color : COLOR_OFF);
       }
     }
-  } else if (image->get_type() == GRAYSCALE4) {
+  } else if (image->get_type() == GRAYSCALE) {
     for (int img_x = 0; img_x < image->get_width(); img_x++) {
       for (int img_y = 0; img_y < image->get_height(); img_y++) {
-        this->draw_pixel_at(x + img_x, y + img_y, image->get_grayscale4_pixel(img_x, img_y));
+        this->draw_pixel_at(x + img_x, y + img_y, image->get_grayscale_pixel(img_x, img_y));
       }
     }
   } else if (image->get_type() == RGB565) {
@@ -457,14 +457,11 @@ int Image::get_color_pixel(int x, int y) const {
   int color = (pgm_read_byte(this->data_start_ + pos) << 8) + (pgm_read_byte(this->data_start_ + pos + 1));
   return color;
 }
-int Image::get_grayscale4_pixel(int x, int y) const {
+Color Image::get_grayscale_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return 0;
-  const uint32_t pos = (x + y * this->width_) / 2;
-  // 2 = number of pixels per byte, 4 = pixel shift
-  uint8_t shift = (x % 2) * 4;
-  int color = (pgm_read_byte(this->data_start_ + pos) >> shift) & 0x0f;
-  return color;
+  const uint32_t pos = (x + y * this->width_);
+  return Color(pgm_read_byte(this->data_start_ + pos) << 24);
 }
 int Image::get_width() const { return this->width_; }
 int Image::get_height() const { return this->height_; }
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 4b84e90a08..88f77a0362 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -68,7 +68,7 @@ extern const Color COLOR_OFF;
 /// Turn the pixel ON.
 extern const Color COLOR_ON;
 
-enum ImageType { BINARY = 0, GRAYSCALE4 = 1, RGB565 = 2 };
+enum ImageType { BINARY = 0, GRAYSCALE = 1, RGB565 = 2 };
 
 enum DisplayRotation {
   DISPLAY_ROTATION_0_DEGREES = 0,
@@ -385,7 +385,7 @@ class Image {
   Image(const uint8_t *data_start, int width, int height, int type);
   bool get_pixel(int x, int y) const;
   int get_color_pixel(int x, int y) const;
-  int get_grayscale4_pixel(int x, int y) const;
+  Color get_grayscale_pixel(int x, int y) const;
   int get_width() const;
   int get_height() const;
   ImageType get_type() const;
diff --git a/esphome/components/image/__init__.py b/esphome/components/image/__init__.py
index 62379b11bb..3649f8a869 100644
--- a/esphome/components/image/__init__.py
+++ b/esphome/components/image/__init__.py
@@ -11,7 +11,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['display']
 MULTI_CONF = True
 
-ImageType = {'binary': 0, 'grayscale4': 1, 'rgb565': 2}
+ImageType = {'binary': 0, 'grayscale': 1, 'rgb565': 2}
 
 Image_ = display.display_ns.class_('Image')
 
@@ -41,20 +41,18 @@ def to_code(config):
         image.thumbnail(config[CONF_RESIZE])
 
     if CONF_TYPE in config:
-        if config[CONF_TYPE].startswith('GRAYSCALE4'):
+        if config[CONF_TYPE].startswith('GRAYSCALE'):
             width, height = image.size
             image = image.convert('L', dither=Image.NONE)
             pixels = list(image.getdata())
-            data = [0 for _ in range(height * width // 2)]
+            data = [0 for _ in range(height * width)]
             pos = 0
-            for pixnum, pix in enumerate(pixels):
-                pixshift = (pixnum % 2) * 4
-                data[pos] |= (pix >> 4) << pixshift
-                if pixshift != 0:
-                    pos += 1
+            for pix in pixels:
+                data[pos] = pix
+                pos += 1
             rhs = [HexInt(x) for x in data]
             prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
-            cg.new_Pvariable(config[CONF_ID], prog_arr, width, height, ImageType['grayscale4'])
+            cg.new_Pvariable(config[CONF_ID], prog_arr, width, height, ImageType['grayscale'])
         elif config[CONF_TYPE].startswith('RGB565'):
             width, height = image.size
             image = image.convert('RGB')
diff --git a/esphome/components/ssd1325_base/__init__.py b/esphome/components/ssd1325_base/__init__.py
index 011642c408..6cb0dafe54 100644
--- a/esphome/components/ssd1325_base/__init__.py
+++ b/esphome/components/ssd1325_base/__init__.py
@@ -2,7 +2,8 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
 from esphome.components import display
-from esphome.const import CONF_EXTERNAL_VCC, CONF_LAMBDA, CONF_MODEL, CONF_RESET_PIN
+from esphome.const import CONF_BRIGHTNESS, CONF_EXTERNAL_VCC, CONF_LAMBDA, CONF_MODEL, \
+                          CONF_RESET_PIN
 from esphome.core import coroutine
 
 ssd1325_base_ns = cg.esphome_ns.namespace('ssd1325_base')
@@ -22,12 +23,13 @@ SSD1325_MODEL = cv.enum(MODELS, upper=True, space="_")
 SSD1325_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend({
     cv.Required(CONF_MODEL): SSD1325_MODEL,
     cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+    cv.Optional(CONF_BRIGHTNESS, default=1.0): cv.percentage,
     cv.Optional(CONF_EXTERNAL_VCC): cv.boolean,
 }).extend(cv.polling_component_schema('1s'))
 
 
 @coroutine
-def setup_ssd1036(var, config):
+def setup_ssd1325(var, config):
     yield cg.register_component(var, config)
     yield display.register_display(var, config)
 
@@ -35,6 +37,8 @@ def setup_ssd1036(var, config):
     if CONF_RESET_PIN in config:
         reset = yield cg.gpio_pin_expression(config[CONF_RESET_PIN])
         cg.add(var.set_reset_pin(reset))
+    if CONF_BRIGHTNESS in config:
+        cg.add(var.init_brightness(config[CONF_BRIGHTNESS]))
     if CONF_EXTERNAL_VCC in config:
         cg.add(var.set_external_vcc(config[CONF_EXTERNAL_VCC]))
     if CONF_LAMBDA in config:
diff --git a/esphome/components/ssd1325_base/ssd1325_base.cpp b/esphome/components/ssd1325_base/ssd1325_base.cpp
index 044582804f..dfb1ef00ee 100644
--- a/esphome/components/ssd1325_base/ssd1325_base.cpp
+++ b/esphome/components/ssd1325_base/ssd1325_base.cpp
@@ -8,7 +8,11 @@ namespace ssd1325_base {
 static const char *TAG = "ssd1325";
 
 static const uint8_t BLACK = 0;
-static const uint8_t WHITE = 1;
+static const uint8_t WHITE = 15;
+static const uint8_t SSD1325_MAX_CONTRAST = 127;
+static const uint8_t SSD1325_COLORMASK = 0x0f;
+static const uint8_t SSD1325_COLORSHIFT = 4;
+static const uint8_t SSD1325_PIXELSPERBYTE = 2;
 
 static const uint8_t SSD1325_SETCOLADDR = 0x15;
 static const uint8_t SSD1325_SETROWADDR = 0x75;
@@ -33,6 +37,7 @@ static const uint8_t SSD1325_SETROWPERIOD = 0xB2;
 static const uint8_t SSD1325_SETCLOCK = 0xB3;
 static const uint8_t SSD1325_SETPRECHARGECOMP = 0xB4;
 static const uint8_t SSD1325_SETGRAYTABLE = 0xB8;
+static const uint8_t SSD1325_SETDEFAULTGRAYTABLE = 0xB9;
 static const uint8_t SSD1325_SETPRECHARGEVOLTAGE = 0xBC;
 static const uint8_t SSD1325_SETVCOMLEVEL = 0xBE;
 static const uint8_t SSD1325_SETVSL = 0xBF;
@@ -44,40 +49,57 @@ static const uint8_t SSD1325_COPY = 0x25;
 void SSD1325::setup() {
   this->init_internal_(this->get_buffer_length_());
 
-  this->command(SSD1325_DISPLAYOFF);   /* display off */
-  this->command(SSD1325_SETCLOCK);     /* set osc division */
-  this->command(0xF1);                 /* 145 */
-  this->command(SSD1325_SETMULTIPLEX); /* multiplex ratio */
+  this->command(SSD1325_DISPLAYOFF);    // display off
+  this->command(SSD1325_SETCLOCK);      // set osc division
+  this->command(0xF1);                  // 145
+  this->command(SSD1325_SETMULTIPLEX);  // multiplex ratio
   if (this->model_ == SSD1327_MODEL_128_128)
     this->command(0x7f);  // duty = height - 1
   else
-    this->command(0x3f);            // duty = 1/64
-  this->command(SSD1325_SETOFFSET); /* set display offset --- */
+    this->command(0x3f);             // duty = 1/64
+  this->command(SSD1325_SETOFFSET);  // set display offset
   if (this->model_ == SSD1327_MODEL_128_128)
     this->command(0x00);  // 0
   else
-    this->command(0x4C);               // 76
-  this->command(SSD1325_SETSTARTLINE); /*set start line */
-  this->command(0x00);                 /* ------ */
-  this->command(SSD1325_MASTERCONFIG); /*Set Master Config DC/DC Converter*/
+    this->command(0x4C);                // 76
+  this->command(SSD1325_SETSTARTLINE);  // set start line
+  this->command(0x00);                  // ...
+  this->command(SSD1325_MASTERCONFIG);  // Set Master Config DC/DC Converter
   this->command(0x02);
-  this->command(SSD1325_SETREMAP); /* set segment remap------ */
+  this->command(SSD1325_SETREMAP);  // set segment remapping
   if (this->model_ == SSD1327_MODEL_128_128)
-    this->command(0x55);  // 0x56 is flipped horizontally: enable column swap, disable nibble remap
+    this->command(0x53);  //  COM bottom-up, split odd/even, enable column and nibble remapping
   else
-    this->command(0x56);
-  this->command(SSD1325_SETCURRENT + 0x2); /* Set Full Current Range */
+    this->command(0x50);                    // COM bottom-up, split odd/even
+  this->command(SSD1325_SETCURRENT + 0x2);  // Set Full Current Range
   this->command(SSD1325_SETGRAYTABLE);
-  this->command(0x01);
-  this->command(0x11);
-  this->command(0x22);
-  this->command(0x32);
-  this->command(0x43);
-  this->command(0x54);
-  this->command(0x65);
-  this->command(0x76);
-  this->command(SSD1325_SETCONTRAST); /* set contrast current */
-  this->command(0x7F);                // max!
+  // gamma ~2.2
+  if (this->model_ == SSD1327_MODEL_128_128) {
+    this->command(0);
+    this->command(1);
+    this->command(2);
+    this->command(3);
+    this->command(6);
+    this->command(8);
+    this->command(12);
+    this->command(16);
+    this->command(20);
+    this->command(26);
+    this->command(32);
+    this->command(39);
+    this->command(46);
+    this->command(54);
+    this->command(63);
+  } else {
+    this->command(0x01);
+    this->command(0x11);
+    this->command(0x22);
+    this->command(0x32);
+    this->command(0x43);
+    this->command(0x54);
+    this->command(0x65);
+    this->command(0x76);
+  }
   this->command(SSD1325_SETROWPERIOD);
   this->command(0x51);
   this->command(SSD1325_SETPHASELEN);
@@ -87,22 +109,25 @@ void SSD1325::setup() {
   this->command(SSD1325_SETPRECHARGECOMPENABLE);
   this->command(0x28);
   this->command(SSD1325_SETVCOMLEVEL);  // Set High Voltage Level of COM Pin
-  this->command(0x1C);                  //?
-  this->command(SSD1325_SETVSL);        // set Low Voltage Level of SEG Pin
+  this->command(0x1C);
+  this->command(SSD1325_SETVSL);  // set Low Voltage Level of SEG Pin
   this->command(0x0D | 0x02);
-  this->command(SSD1325_NORMALDISPLAY); /* set display mode */
-  this->command(SSD1325_DISPLAYON);     /* display ON */
+  this->command(SSD1325_NORMALDISPLAY);  // set display mode
+  set_brightness(this->brightness_);
+  this->fill(BLACK);  // clear display - ensures we do not see garbage at power-on
+  this->display();    // ...write buffer, which actually clears the display's memory
+  this->turn_on();    // display ON
 }
 void SSD1325::display() {
-  this->command(SSD1325_SETCOLADDR); /* set column address */
-  this->command(0x00);               /* set column start address */
-  this->command(0x3F);               /* set column end address */
-  this->command(SSD1325_SETROWADDR); /* set row address */
-  this->command(0x00);               /* set row start address */
+  this->command(SSD1325_SETCOLADDR);  // set column address
+  this->command(0x00);                // set column start address
+  this->command(0x3F);                // set column end address
+  this->command(SSD1325_SETROWADDR);  // set row address
+  this->command(0x00);                // set row start address
   if (this->model_ == SSD1327_MODEL_128_128)
-    this->command(0x7F);  // 127 is last row
+    this->command(127);  // set last row
   else
-    this->command(0x3F);  // 63 is last row
+    this->command(63);  // set last row
 
   this->write_display_data();
 }
@@ -110,6 +135,27 @@ void SSD1325::update() {
   this->do_update_();
   this->display();
 }
+void SSD1325::set_brightness(float brightness) {
+  // validation
+  if (brightness > 1)
+    this->brightness_ = 1.0;
+  else if (brightness < 0)
+    this->brightness_ = 0;
+  else
+    this->brightness_ = brightness;
+  // now write the new brightness level to the display
+  this->command(SSD1325_SETCONTRAST);
+  this->command(int(SSD1325_MAX_CONTRAST * (this->brightness_)));
+}
+bool SSD1325::is_on() { return this->is_on_; }
+void SSD1325::turn_on() {
+  this->command(SSD1325_DISPLAYON);
+  this->is_on_ = true;
+}
+void SSD1325::turn_off() {
+  this->command(SSD1325_DISPLAYOFF);
+  this->is_on_ = false;
+}
 int SSD1325::get_height_internal() {
   switch (this->model_) {
     case SSD1325_MODEL_128_32:
@@ -141,23 +187,25 @@ int SSD1325::get_width_internal() {
   }
 }
 size_t SSD1325::get_buffer_length_() {
-  return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) / 8u;
+  return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) / SSD1325_PIXELSPERBYTE;
 }
-
 void HOT SSD1325::draw_absolute_pixel_internal(int x, int y, Color color) {
   if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
     return;
-
-  uint16_t pos = x + (y / 8) * this->get_width_internal();
-  uint8_t subpos = y % 8;
-  if (color.is_on()) {
-    this->buffer_[pos] |= (1 << subpos);
-  } else {
-    this->buffer_[pos] &= ~(1 << subpos);
-  }
+  uint32_t color4 = color.to_grayscale4();
+  // where should the bits go in the big buffer array? math...
+  uint16_t pos = (x / SSD1325_PIXELSPERBYTE) + (y * this->get_width_internal() / SSD1325_PIXELSPERBYTE);
+  uint8_t shift = (x % SSD1325_PIXELSPERBYTE) * SSD1325_COLORSHIFT;
+  // ensure 'color4' is valid (only 4 bits aka 1 nibble) and shift the bits left when necessary
+  color4 = (color4 & SSD1325_COLORMASK) << shift;
+  // first mask off the nibble we must change...
+  this->buffer_[pos] &= (~SSD1325_COLORMASK >> shift);
+  // ...then lay the new nibble back on top. done!
+  this->buffer_[pos] |= color4;
 }
 void SSD1325::fill(Color color) {
-  uint8_t fill = color.is_on() ? 0xFF : 0x00;
+  const uint32_t color4 = color.to_grayscale4();
+  uint8_t fill = (color4 & SSD1325_COLORMASK) | ((color4 & SSD1325_COLORMASK) << SSD1325_COLORSHIFT);
   for (uint32_t i = 0; i < this->get_buffer_length_(); i++)
     this->buffer_[i] = fill;
 }
diff --git a/esphome/components/ssd1325_base/ssd1325_base.h b/esphome/components/ssd1325_base/ssd1325_base.h
index b5b28dfbae..a06ba69a59 100644
--- a/esphome/components/ssd1325_base/ssd1325_base.h
+++ b/esphome/components/ssd1325_base/ssd1325_base.h
@@ -26,6 +26,11 @@ class SSD1325 : public PollingComponent, public display::DisplayBuffer {
   void set_model(SSD1325Model model) { this->model_ = model; }
   void set_reset_pin(GPIOPin *reset_pin) { this->reset_pin_ = reset_pin; }
   void set_external_vcc(bool external_vcc) { this->external_vcc_ = external_vcc; }
+  void init_brightness(float brightness) { this->brightness_ = brightness; }
+  void set_brightness(float brightness);
+  bool is_on();
+  void turn_on();
+  void turn_off();
 
   float get_setup_priority() const override { return setup_priority::PROCESSOR; }
   void fill(Color color) override;
@@ -45,6 +50,8 @@ class SSD1325 : public PollingComponent, public display::DisplayBuffer {
   SSD1325Model model_{SSD1325_MODEL_128_64};
   GPIOPin *reset_pin_{nullptr};
   bool external_vcc_{false};
+  bool is_on_{false};
+  float brightness_{1.0};
 };
 
 }  // namespace ssd1325_base
diff --git a/esphome/components/ssd1325_spi/display.py b/esphome/components/ssd1325_spi/display.py
index d7c7733afc..ed61d3dec3 100644
--- a/esphome/components/ssd1325_spi/display.py
+++ b/esphome/components/ssd1325_spi/display.py
@@ -19,7 +19,7 @@ CONFIG_SCHEMA = cv.All(ssd1325_base.SSD1325_SCHEMA.extend({
 
 def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    yield ssd1325_base.setup_ssd1036(var, config)
+    yield ssd1325_base.setup_ssd1325(var, config)
     yield spi.register_spi_device(var, config)
 
     dc = yield cg.gpio_pin_expression(config[CONF_DC_PIN])
diff --git a/esphome/components/ssd1325_spi/ssd1325_spi.cpp b/esphome/components/ssd1325_spi/ssd1325_spi.cpp
index cd5f4a2794..9df05439ca 100644
--- a/esphome/components/ssd1325_spi/ssd1325_spi.cpp
+++ b/esphome/components/ssd1325_spi/ssd1325_spi.cpp
@@ -21,9 +21,11 @@ void SPISSD1325::setup() {
 void SPISSD1325::dump_config() {
   LOG_DISPLAY("", "SPI SSD1325", this);
   ESP_LOGCONFIG(TAG, "  Model: %s", this->model_str_());
-  LOG_PIN("  CS Pin: ", this->cs_);
+  if (this->cs_)
+    LOG_PIN("  CS Pin: ", this->cs_);
   LOG_PIN("  DC Pin: ", this->dc_pin_);
   LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  ESP_LOGCONFIG(TAG, "  Initial Brightness: %.2f", this->brightness_);
   ESP_LOGCONFIG(TAG, "  External VCC: %s", YESNO(this->external_vcc_));
   LOG_UPDATE_INTERVAL(this);
 }
@@ -48,20 +50,7 @@ void HOT SPISSD1325::write_display_data() {
     this->cs_->digital_write(false);
   delay(1);
   this->enable();
-  for (uint16_t x = 0; x < this->get_width_internal(); x += 2) {
-    for (uint16_t y = 0; y < this->get_height_internal(); y += 8) {  // we write 8 pixels at once
-      uint8_t left8 = this->buffer_[y * 16 + x];
-      uint8_t right8 = this->buffer_[y * 16 + x + 1];
-      for (uint8_t p = 0; p < 8; p++) {
-        uint8_t d = 0;
-        if (left8 & (1 << p))
-          d |= 0xF0;
-        if (right8 & (1 << p))
-          d |= 0x0F;
-        this->write_byte(d);
-      }
-    }
-  }
+  this->write_array(this->buffer_, this->get_buffer_length_());
   if (this->cs_)
     this->cs_->digital_write(true);
   this->disable();

From 417a3cdf51d3fef5628bf0d0ef2f14effa4c9551 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Thu, 9 Jul 2020 21:49:26 -0500
Subject: [PATCH 270/412] Add SSD1351 OLED display support (#1100)

* Add SSD1351 display support

* Linting round 2

* Updated/rebased for proper Color support

* Fix color image processing
---
 esphome/components/display/display_buffer.cpp |  14 +-
 esphome/components/display/display_buffer.h   |   4 +-
 esphome/components/image/__init__.py          |  18 +-
 esphome/components/ssd1351_base/__init__.py   |  40 ++++
 .../components/ssd1351_base/ssd1351_base.cpp  | 193 ++++++++++++++++++
 .../components/ssd1351_base/ssd1351_base.h    |  54 +++++
 esphome/components/ssd1351_spi/__init__.py    |   0
 esphome/components/ssd1351_spi/display.py     |  26 +++
 .../components/ssd1351_spi/ssd1351_spi.cpp    |  72 +++++++
 esphome/components/ssd1351_spi/ssd1351_spi.h  |  30 +++
 tests/test1.yaml                              |   7 +
 11 files changed, 440 insertions(+), 18 deletions(-)
 create mode 100644 esphome/components/ssd1351_base/__init__.py
 create mode 100644 esphome/components/ssd1351_base/ssd1351_base.cpp
 create mode 100644 esphome/components/ssd1351_base/ssd1351_base.h
 create mode 100644 esphome/components/ssd1351_spi/__init__.py
 create mode 100644 esphome/components/ssd1351_spi/display.py
 create mode 100644 esphome/components/ssd1351_spi/ssd1351_spi.cpp
 create mode 100644 esphome/components/ssd1351_spi/ssd1351_spi.h

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 30c22f72ff..4f62a62c6d 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -1,4 +1,5 @@
 #include "display_buffer.h"
+#include "esphome/core/color.h"
 #include "esphome/core/log.h"
 #include "esphome/core/application.h"
 
@@ -220,7 +221,7 @@ void DisplayBuffer::image(int x, int y, Color color, Image *image, bool invert)
         this->draw_pixel_at(x + img_x, y + img_y, image->get_grayscale_pixel(img_x, img_y));
       }
     }
-  } else if (image->get_type() == RGB565) {
+  } else if (image->get_type() == RGB) {
     for (int img_x = 0; img_x < image->get_width(); img_x++) {
       for (int img_y = 0; img_y < image->get_height(); img_y++) {
         this->draw_pixel_at(x + img_x, y + img_y, image->get_color_pixel(img_x, img_y));
@@ -449,13 +450,14 @@ bool Image::get_pixel(int x, int y) const {
   const uint32_t pos = x + y * width_8;
   return pgm_read_byte(this->data_start_ + (pos / 8u)) & (0x80 >> (pos % 8u));
 }
-int Image::get_color_pixel(int x, int y) const {
+Color Image::get_color_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return 0;
-
-  const uint32_t pos = (x + y * this->width_) * 2;
-  int color = (pgm_read_byte(this->data_start_ + pos) << 8) + (pgm_read_byte(this->data_start_ + pos + 1));
-  return color;
+  const uint32_t pos = (x + y * this->width_) * 3;
+  const uint32_t color32 = (pgm_read_byte(this->data_start_ + pos + 2) << 0) |
+                           (pgm_read_byte(this->data_start_ + pos + 1) << 8) |
+                           (pgm_read_byte(this->data_start_ + pos + 0) << 16);
+  return Color(color32);
 }
 Color Image::get_grayscale_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index 88f77a0362..a8a308538e 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -68,7 +68,7 @@ extern const Color COLOR_OFF;
 /// Turn the pixel ON.
 extern const Color COLOR_ON;
 
-enum ImageType { BINARY = 0, GRAYSCALE = 1, RGB565 = 2 };
+enum ImageType { BINARY = 0, GRAYSCALE = 1, RGB = 2 };
 
 enum DisplayRotation {
   DISPLAY_ROTATION_0_DEGREES = 0,
@@ -384,7 +384,7 @@ class Image {
   Image(const uint8_t *data_start, int width, int height);
   Image(const uint8_t *data_start, int width, int height, int type);
   bool get_pixel(int x, int y) const;
-  int get_color_pixel(int x, int y) const;
+  Color get_color_pixel(int x, int y) const;
   Color get_grayscale_pixel(int x, int y) const;
   int get_width() const;
   int get_height() const;
diff --git a/esphome/components/image/__init__.py b/esphome/components/image/__init__.py
index 3649f8a869..b5c9e29f97 100644
--- a/esphome/components/image/__init__.py
+++ b/esphome/components/image/__init__.py
@@ -11,7 +11,7 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['display']
 MULTI_CONF = True
 
-ImageType = {'binary': 0, 'grayscale': 1, 'rgb565': 2}
+ImageType = {'binary': 0, 'grayscale': 1, 'rgb': 2}
 
 Image_ = display.display_ns.class_('Image')
 
@@ -53,24 +53,22 @@ def to_code(config):
             rhs = [HexInt(x) for x in data]
             prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
             cg.new_Pvariable(config[CONF_ID], prog_arr, width, height, ImageType['grayscale'])
-        elif config[CONF_TYPE].startswith('RGB565'):
+        elif config[CONF_TYPE].startswith('RGB'):
             width, height = image.size
             image = image.convert('RGB')
             pixels = list(image.getdata())
-            data = [0 for _ in range(height * width * 2)]
+            data = [0 for _ in range(height * width * 3)]
             pos = 0
             for pix in pixels:
-                r = (pix[0] >> 3) & 0x1F
-                g = (pix[1] >> 2) & 0x3F
-                b = (pix[2] >> 3) & 0x1F
-                p = (r << 11) + (g << 5) + b
-                data[pos] = (p >> 8) & 0xFF
+                data[pos] = pix[0]
                 pos += 1
-                data[pos] = p & 0xFF
+                data[pos] = pix[1]
+                pos += 1
+                data[pos] = pix[2]
                 pos += 1
             rhs = [HexInt(x) for x in data]
             prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
-            cg.new_Pvariable(config[CONF_ID], prog_arr, width, height, ImageType['rgb565'])
+            cg.new_Pvariable(config[CONF_ID], prog_arr, width, height, ImageType['rgb'])
     else:
         image = image.convert('1', dither=Image.NONE)
         width, height = image.size
diff --git a/esphome/components/ssd1351_base/__init__.py b/esphome/components/ssd1351_base/__init__.py
new file mode 100644
index 0000000000..198f81668e
--- /dev/null
+++ b/esphome/components/ssd1351_base/__init__.py
@@ -0,0 +1,40 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import display
+from esphome.const import CONF_BRIGHTNESS, CONF_LAMBDA, CONF_MODEL, CONF_RESET_PIN
+from esphome.core import coroutine
+
+ssd1351_base_ns = cg.esphome_ns.namespace('ssd1351_base')
+SSD1351 = ssd1351_base_ns.class_('SSD1351', cg.PollingComponent, display.DisplayBuffer)
+SSD1351Model = ssd1351_base_ns.enum('SSD1351Model')
+
+MODELS = {
+    'SSD1351_128X96': SSD1351Model.SSD1351_MODEL_128_96,
+    'SSD1351_128X128': SSD1351Model.SSD1351_MODEL_128_128,
+}
+
+SSD1351_MODEL = cv.enum(MODELS, upper=True, space="_")
+
+SSD1351_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend({
+    cv.Required(CONF_MODEL): SSD1351_MODEL,
+    cv.Optional(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+    cv.Optional(CONF_BRIGHTNESS, default=1.0): cv.percentage,
+}).extend(cv.polling_component_schema('1s'))
+
+
+@coroutine
+def setup_ssd1351(var, config):
+    yield cg.register_component(var, config)
+    yield display.register_display(var, config)
+
+    cg.add(var.set_model(config[CONF_MODEL]))
+    if CONF_RESET_PIN in config:
+        reset = yield cg.gpio_pin_expression(config[CONF_RESET_PIN])
+        cg.add(var.set_reset_pin(reset))
+    if CONF_BRIGHTNESS in config:
+        cg.add(var.init_brightness(config[CONF_BRIGHTNESS]))
+    if CONF_LAMBDA in config:
+        lambda_ = yield cg.process_lambda(
+            config[CONF_LAMBDA], [(display.DisplayBufferRef, 'it')], return_type=cg.void)
+        cg.add(var.set_writer(lambda_))
diff --git a/esphome/components/ssd1351_base/ssd1351_base.cpp b/esphome/components/ssd1351_base/ssd1351_base.cpp
new file mode 100644
index 0000000000..fded8e3482
--- /dev/null
+++ b/esphome/components/ssd1351_base/ssd1351_base.cpp
@@ -0,0 +1,193 @@
+#include "ssd1351_base.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace ssd1351_base {
+
+static const char *TAG = "ssd1351";
+
+static const uint16_t BLACK = 0;
+static const uint16_t WHITE = 0xffff;
+static const uint16_t SSD1351_COLORMASK = 0xffff;
+static const uint8_t SSD1351_MAX_CONTRAST = 15;
+static const uint8_t SSD1351_BYTESPERPIXEL = 2;
+// SSD1351 commands
+static const uint8_t SSD1351_SETCOLUMN = 0x15;
+static const uint8_t SSD1351_SETROW = 0x75;
+static const uint8_t SSD1351_SETREMAP = 0xA0;
+static const uint8_t SSD1351_STARTLINE = 0xA1;
+static const uint8_t SSD1351_DISPLAYOFFSET = 0xA2;
+static const uint8_t SSD1351_DISPLAYOFF = 0xAE;
+static const uint8_t SSD1351_DISPLAYON = 0xAF;
+static const uint8_t SSD1351_PRECHARGE = 0xB1;
+static const uint8_t SSD1351_CLOCKDIV = 0xB3;
+static const uint8_t SSD1351_PRECHARGELEVEL = 0xBB;
+static const uint8_t SSD1351_VCOMH = 0xBE;
+// display controls
+static const uint8_t SSD1351_DISPLAYALLOFF = 0xA4;
+static const uint8_t SSD1351_DISPLAYALLON = 0xA5;
+static const uint8_t SSD1351_NORMALDISPLAY = 0xA6;
+static const uint8_t SSD1351_INVERTDISPLAY = 0xA7;
+// contrast controls
+static const uint8_t SSD1351_CONTRASTABC = 0xC1;
+static const uint8_t SSD1351_CONTRASTMASTER = 0xC7;
+// memory functions
+static const uint8_t SSD1351_WRITERAM = 0x5C;
+static const uint8_t SSD1351_READRAM = 0x5D;
+// other functions
+static const uint8_t SSD1351_FUNCTIONSELECT = 0xAB;
+static const uint8_t SSD1351_DISPLAYENHANCE = 0xB2;
+static const uint8_t SSD1351_SETVSL = 0xB4;
+static const uint8_t SSD1351_SETGPIO = 0xB5;
+static const uint8_t SSD1351_PRECHARGE2 = 0xB6;
+static const uint8_t SSD1351_SETGRAY = 0xB8;
+static const uint8_t SSD1351_USELUT = 0xB9;
+static const uint8_t SSD1351_MUXRATIO = 0xCA;
+static const uint8_t SSD1351_COMMANDLOCK = 0xFD;
+static const uint8_t SSD1351_HORIZSCROLL = 0x96;
+static const uint8_t SSD1351_STOPSCROLL = 0x9E;
+static const uint8_t SSD1351_STARTSCROLL = 0x9F;
+
+void SSD1351::setup() {
+  this->init_internal_(this->get_buffer_length_());
+
+  this->command(SSD1351_COMMANDLOCK);
+  this->data(0x12);
+  this->command(SSD1351_COMMANDLOCK);
+  this->data(0xB1);
+  this->command(SSD1351_DISPLAYOFF);
+  this->command(SSD1351_CLOCKDIV);
+  this->data(0xF1);  // 7:4 = Oscillator Freq, 3:0 = CLK Div Ratio (A[3:0]+1 = 1..16)
+  this->command(SSD1351_MUXRATIO);
+  this->data(127);
+  this->command(SSD1351_DISPLAYOFFSET);
+  this->data(0x00);
+  this->command(SSD1351_SETGPIO);
+  this->data(0x00);
+  this->command(SSD1351_FUNCTIONSELECT);
+  this->data(0x01);  // internal (diode drop)
+  this->command(SSD1351_PRECHARGE);
+  this->data(0x32);
+  this->command(SSD1351_VCOMH);
+  this->data(0x05);
+  this->command(SSD1351_NORMALDISPLAY);
+  this->command(SSD1351_SETVSL);
+  this->data(0xA0);
+  this->data(0xB5);
+  this->data(0x55);
+  this->command(SSD1351_PRECHARGE2);
+  this->data(0x01);
+  this->command(SSD1351_SETREMAP);
+  this->data(0x34);
+  this->command(SSD1351_STARTLINE);
+  this->data(0x00);
+  this->command(SSD1351_CONTRASTABC);
+  this->data(0xC8);
+  this->data(0x80);
+  this->data(0xC8);
+  set_brightness(this->brightness_);
+  this->fill(BLACK);  // clear display - ensures we do not see garbage at power-on
+  this->display();    // ...write buffer, which actually clears the display's memory
+  this->turn_on();    // display ON
+}
+void SSD1351::display() {
+  this->command(SSD1351_SETCOLUMN);  // set column address
+  this->data(0x00);                  // set column start address
+  this->data(0x7F);                  // set column end address
+  this->command(SSD1351_SETROW);     // set row address
+  this->data(0x00);                  // set row start address
+  this->data(0x7F);                  // set last row
+  this->command(SSD1351_WRITERAM);
+  this->write_display_data();
+}
+void SSD1351::update() {
+  this->do_update_();
+  this->display();
+}
+void SSD1351::set_brightness(float brightness) {
+  // validation
+  if (brightness > 1)
+    this->brightness_ = 1.0;
+  else if (brightness < 0)
+    this->brightness_ = 0;
+  else
+    this->brightness_ = brightness;
+  // now write the new brightness level to the display
+  this->command(SSD1351_CONTRASTMASTER);
+  this->data(int(SSD1351_MAX_CONTRAST * (this->brightness_)));
+}
+bool SSD1351::is_on() { return this->is_on_; }
+void SSD1351::turn_on() {
+  this->command(SSD1351_DISPLAYON);
+  this->is_on_ = true;
+}
+void SSD1351::turn_off() {
+  this->command(SSD1351_DISPLAYOFF);
+  this->is_on_ = false;
+}
+int SSD1351::get_height_internal() {
+  switch (this->model_) {
+    case SSD1351_MODEL_128_96:
+      return 96;
+    case SSD1351_MODEL_128_128:
+      return 128;
+    default:
+      return 0;
+  }
+}
+int SSD1351::get_width_internal() {
+  switch (this->model_) {
+    case SSD1351_MODEL_128_96:
+    case SSD1351_MODEL_128_128:
+      return 128;
+    default:
+      return 0;
+  }
+}
+size_t SSD1351::get_buffer_length_() {
+  return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) * size_t(SSD1351_BYTESPERPIXEL);
+}
+void HOT SSD1351::draw_absolute_pixel_internal(int x, int y, Color color) {
+  if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
+    return;
+  const uint32_t color565 = color.to_rgb_565();
+  // where should the bits go in the big buffer array? math...
+  uint16_t pos = (x + y * this->get_width_internal()) * SSD1351_BYTESPERPIXEL;
+  this->buffer_[pos++] = (color565 >> 8) & 0xff;
+  this->buffer_[pos] = color565 & 0xff;
+}
+void SSD1351::fill(Color color) {
+  const uint32_t color565 = color.to_rgb_565();
+  for (uint32_t i = 0; i < this->get_buffer_length_(); i++)
+    if (i & 1) {
+      this->buffer_[i] = color565 & 0xff;
+    } else {
+      this->buffer_[i] = (color565 >> 8) & 0xff;
+    }
+}
+void SSD1351::init_reset_() {
+  if (this->reset_pin_ != nullptr) {
+    this->reset_pin_->setup();
+    this->reset_pin_->digital_write(true);
+    delay(1);
+    // Trigger Reset
+    this->reset_pin_->digital_write(false);
+    delay(10);
+    // Wake up
+    this->reset_pin_->digital_write(true);
+  }
+}
+const char *SSD1351::model_str_() {
+  switch (this->model_) {
+    case SSD1351_MODEL_128_96:
+      return "SSD1351 128x96";
+    case SSD1351_MODEL_128_128:
+      return "SSD1351 128x128";
+    default:
+      return "Unknown";
+  }
+}
+
+}  // namespace ssd1351_base
+}  // namespace esphome
diff --git a/esphome/components/ssd1351_base/ssd1351_base.h b/esphome/components/ssd1351_base/ssd1351_base.h
new file mode 100644
index 0000000000..2730f798b5
--- /dev/null
+++ b/esphome/components/ssd1351_base/ssd1351_base.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/esphal.h"
+#include "esphome/components/display/display_buffer.h"
+
+namespace esphome {
+namespace ssd1351_base {
+
+enum SSD1351Model {
+  SSD1351_MODEL_128_96 = 0,
+  SSD1351_MODEL_128_128,
+};
+
+class SSD1351 : public PollingComponent, public display::DisplayBuffer {
+ public:
+  void setup() override;
+
+  void display();
+
+  void update() override;
+
+  void set_model(SSD1351Model model) { this->model_ = model; }
+  void set_reset_pin(GPIOPin *reset_pin) { this->reset_pin_ = reset_pin; }
+  void init_brightness(float brightness) { this->brightness_ = brightness; }
+  void set_brightness(float brightness);
+  bool is_on();
+  void turn_on();
+  void turn_off();
+
+  float get_setup_priority() const override { return setup_priority::PROCESSOR; }
+  void fill(Color color) override;
+
+ protected:
+  virtual void command(uint8_t value) = 0;
+  virtual void data(uint8_t value) = 0;
+  virtual void write_display_data() = 0;
+  void init_reset_();
+
+  void draw_absolute_pixel_internal(int x, int y, Color color) override;
+
+  int get_height_internal() override;
+  int get_width_internal() override;
+  size_t get_buffer_length_();
+  const char *model_str_();
+
+  SSD1351Model model_{SSD1351_MODEL_128_96};
+  GPIOPin *reset_pin_{nullptr};
+  bool is_on_{false};
+  float brightness_{1.0};
+};
+
+}  // namespace ssd1351_base
+}  // namespace esphome
diff --git a/esphome/components/ssd1351_spi/__init__.py b/esphome/components/ssd1351_spi/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/ssd1351_spi/display.py b/esphome/components/ssd1351_spi/display.py
new file mode 100644
index 0000000000..16b0d4387a
--- /dev/null
+++ b/esphome/components/ssd1351_spi/display.py
@@ -0,0 +1,26 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import spi, ssd1351_base
+from esphome.const import CONF_DC_PIN, CONF_ID, CONF_LAMBDA, CONF_PAGES
+
+AUTO_LOAD = ['ssd1351_base']
+DEPENDENCIES = ['spi']
+
+ssd1351_spi = cg.esphome_ns.namespace('ssd1351_spi')
+SPISSD1351 = ssd1351_spi.class_('SPISSD1351', ssd1351_base.SSD1351, spi.SPIDevice)
+
+CONFIG_SCHEMA = cv.All(ssd1351_base.SSD1351_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(SPISSD1351),
+    cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
+}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema()),
+                       cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield ssd1351_base.setup_ssd1351(var, config)
+    yield spi.register_spi_device(var, config)
+
+    dc = yield cg.gpio_pin_expression(config[CONF_DC_PIN])
+    cg.add(var.set_dc_pin(dc))
diff --git a/esphome/components/ssd1351_spi/ssd1351_spi.cpp b/esphome/components/ssd1351_spi/ssd1351_spi.cpp
new file mode 100644
index 0000000000..2839ef7a8e
--- /dev/null
+++ b/esphome/components/ssd1351_spi/ssd1351_spi.cpp
@@ -0,0 +1,72 @@
+#include "ssd1351_spi.h"
+#include "esphome/core/log.h"
+#include "esphome/core/application.h"
+
+namespace esphome {
+namespace ssd1351_spi {
+
+static const char *TAG = "ssd1351_spi";
+
+void SPISSD1351::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up SPI SSD1351...");
+  this->spi_setup();
+  this->dc_pin_->setup();  // OUTPUT
+  if (this->cs_)
+    this->cs_->setup();  // OUTPUT
+
+  this->init_reset_();
+  delay(500);  // NOLINT
+  SSD1351::setup();
+}
+void SPISSD1351::dump_config() {
+  LOG_DISPLAY("", "SPI SSD1351", this);
+  ESP_LOGCONFIG(TAG, "  Model: %s", this->model_str_());
+  if (this->cs_)
+    LOG_PIN("  CS Pin: ", this->cs_);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  ESP_LOGCONFIG(TAG, "  Initial Brightness: %.2f", this->brightness_);
+  LOG_UPDATE_INTERVAL(this);
+}
+void SPISSD1351::command(uint8_t value) {
+  if (this->cs_)
+    this->cs_->digital_write(true);
+  this->dc_pin_->digital_write(false);
+  delay(1);
+  this->enable();
+  if (this->cs_)
+    this->cs_->digital_write(false);
+  this->write_byte(value);
+  if (this->cs_)
+    this->cs_->digital_write(true);
+  this->disable();
+}
+void SPISSD1351::data(uint8_t value) {
+  if (this->cs_)
+    this->cs_->digital_write(true);
+  this->dc_pin_->digital_write(true);
+  delay(1);
+  this->enable();
+  if (this->cs_)
+    this->cs_->digital_write(false);
+  this->write_byte(value);
+  if (this->cs_)
+    this->cs_->digital_write(true);
+  this->disable();
+}
+void HOT SPISSD1351::write_display_data() {
+  if (this->cs_)
+    this->cs_->digital_write(true);
+  this->dc_pin_->digital_write(true);
+  if (this->cs_)
+    this->cs_->digital_write(false);
+  delay(1);
+  this->enable();
+  this->write_array(this->buffer_, this->get_buffer_length_());
+  if (this->cs_)
+    this->cs_->digital_write(true);
+  this->disable();
+}
+
+}  // namespace ssd1351_spi
+}  // namespace esphome
diff --git a/esphome/components/ssd1351_spi/ssd1351_spi.h b/esphome/components/ssd1351_spi/ssd1351_spi.h
new file mode 100644
index 0000000000..b8f3310f5c
--- /dev/null
+++ b/esphome/components/ssd1351_spi/ssd1351_spi.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/ssd1351_base/ssd1351_base.h"
+#include "esphome/components/spi/spi.h"
+
+namespace esphome {
+namespace ssd1351_spi {
+
+class SPISSD1351 : public ssd1351_base::SSD1351,
+                   public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH, spi::CLOCK_PHASE_TRAILING,
+                                         spi::DATA_RATE_8MHZ> {
+ public:
+  void set_dc_pin(GPIOPin *dc_pin) { dc_pin_ = dc_pin; }
+
+  void setup() override;
+
+  void dump_config() override;
+
+ protected:
+  void command(uint8_t value) override;
+  void data(uint8_t value) override;
+
+  void write_display_data() override;
+
+  GPIOPin *dc_pin_;
+};
+
+}  // namespace ssd1351_spi
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 83da6da9e3..5d8108c4be 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1594,6 +1594,13 @@ display:
   reset_pin: GPIO23
   lambda: |-
     it.rectangle(0, 0, it.get_width(), it.get_height());
+- platform: ssd1351_spi
+  model: "SSD1351 128x128"
+  cs_pin: GPIO23
+  dc_pin: GPIO23
+  reset_pin: GPIO23
+  lambda: |-
+    it.rectangle(0, 0, it.get_width(), it.get_height());
 - platform: waveshare_epaper
   cs_pin: GPIO23
   dc_pin: GPIO23

From 0e5e5592830b41dd71ddf6e27b7f8fa16b5bd3b1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 10 Jul 2020 14:50:19 +1200
Subject: [PATCH 271/412] Add cryptography requirement to the setup.py file
 (#1116)

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 0a19dccf95..409c5a872e 100755
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,7 @@ REQUIRES = [
     'pytz==2020.1',
     'pyserial==3.4',
     'ifaddr==0.1.6',
+    'cryptography==2.9.2',
 ]
 
 # If you have problems importing platformio and esptool as modules you can set

From ec026ab3a8bffaaae89e998466bcc06120c06827 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Fri, 10 Jul 2020 17:36:29 -0300
Subject: [PATCH 272/412] Revert "Add ESP32 support for WPA2-EAP Enterprise
 WiFi authentication (#1080)" (#1117)

This reverts commit c693c219f46c345dd64ea8c670d876615ba2077d.
---
 esphome/components/wifi/__init__.py           | 88 +------------------
 esphome/components/wifi/wifi_component.cpp    |  2 -
 esphome/components/wifi/wifi_component.h      | 13 ---
 .../components/wifi/wifi_component_esp32.cpp  | 46 ----------
 esphome/config_validation.py                  | 23 -----
 esphome/const.py                              |  5 --
 requirements.txt                              |  1 -
 requirements_test.txt                         |  1 -
 8 files changed, 1 insertion(+), 178 deletions(-)

diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index 8b68264b8e..d3c7e51603 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -1,6 +1,3 @@
-import logging
-from cryptography.hazmat.primitives.asymmetric import rsa, ec, ed448, ed25519
-
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
@@ -8,15 +5,12 @@ from esphome.automation import Condition
 from esphome.const import CONF_AP, CONF_BSSID, CONF_CHANNEL, CONF_DNS1, CONF_DNS2, CONF_DOMAIN, \
     CONF_FAST_CONNECT, CONF_GATEWAY, CONF_HIDDEN, CONF_ID, CONF_MANUAL_IP, CONF_NETWORKS, \
     CONF_PASSWORD, CONF_POWER_SAVE_MODE, CONF_REBOOT_TIMEOUT, CONF_SSID, CONF_STATIC_IP, \
-    CONF_SUBNET, CONF_USE_ADDRESS, CONF_PRIORITY, CONF_IDENTITY, CONF_CERTIFICATE_AUTHORITY, \
-    CONF_CERTIFICATE, CONF_KEY, CONF_USERNAME, CONF_EAP
+    CONF_SUBNET, CONF_USE_ADDRESS, CONF_PRIORITY
 from esphome.core import CORE, HexInt, coroutine_with_priority
-_LOGGER = logging.getLogger(__name__)
 
 AUTO_LOAD = ['network']
 
 wifi_ns = cg.esphome_ns.namespace('wifi')
-EAPAuth = wifi_ns.struct('EAPAuth')
 IPAddress = cg.global_ns.class_('IPAddress')
 ManualIP = wifi_ns.struct('ManualIP')
 WiFiComponent = wifi_ns.class_('WiFiComponent', cg.Component)
@@ -42,55 +36,6 @@ def validate_password(value):
     return value
 
 
-def validate_eap(value):
-    if CONF_USERNAME in value:
-        if CONF_IDENTITY not in value:
-            _LOGGER.info("EAP 'identity:' is not set, assuming username.")
-            value[CONF_IDENTITY] = value[CONF_USERNAME]
-        if CONF_PASSWORD not in value:
-            raise cv.Invalid("You cannot use the EAP 'username:' option without a 'password:'. "
-                             "Please provide the 'password:' key")
-    if CONF_CERTIFICATE in value or CONF_KEY in value:
-        if CONF_CERTIFICATE not in value and CONF_KEY not in value:
-            raise cv.Invalid("You have provided an EAP 'certificate:' or 'key:' without providing "
-                             "the other. Please check you have provided both.")
-        # Check the key is valid and for this certificate, just to check the user hasn't pasted
-        # the wrong thing. I write this after I spent a while debugging that exact issue.
-        # This may require a password to decrypt to key, so we should verify that at the same time.
-        certPw = None
-        if CONF_PASSWORD in value:
-            certPw = value[CONF_PASSWORD]
-
-        cert = cv.load_certificate(value[CONF_CERTIFICATE])
-        try:
-            key = cv.load_key(value[CONF_KEY], certPw)
-        except ValueError as e:
-            raise cv.Invalid(
-                "There was an error with the EAP 'password:' provided for 'key:' :%s" % e
-            )
-        except TypeError as e:
-            raise cv.Invalid("There was an error with the EAP 'key:' provided :%s" % e)
-
-        if isinstance(key, rsa.RSAPrivateKey):
-            if key.public_key().public_numbers() != cert.public_key().public_numbers():
-                raise cv.Invalid("The provided EAP 'key:' does not match the 'certificate:'")
-        elif isinstance(key, ec.EllipticCurvePrivateKey):
-            if key.public_key().public_numbers() != cert.public_key().public_numbers():
-                raise cv.Invalid("The provided EAP 'key:' does not match the 'certificate:'")
-        elif isinstance(key, ed448.Ed448PrivateKey):
-            if key.public_key() != cert:
-                raise cv.Invalid("The provided EAP 'key:' does not match the 'certificate:'")
-        elif isinstance(key, ed25519.Ed25519PrivateKey):
-            if key.public_key() != cert:
-                raise cv.Invalid("The provided EAP 'key:' does not match the 'certificate:'")
-        else:
-            _LOGGER.warning(
-                "Unrecognised EAP 'certificate:' 'key:' pair format: %s. Proceed with caution!",
-                type(key)
-            )
-    return value
-
-
 def validate_channel(value):
     value = cv.positive_int(value)
     if value < 1:
@@ -111,15 +56,6 @@ STA_MANUAL_IP_SCHEMA = AP_MANUAL_IP_SCHEMA.extend({
     cv.Optional(CONF_DNS2, default="0.0.0.0"): cv.ipv4,
 })
 
-EAP_AUTH_SCHEMA = cv.Schema({
-    cv.Optional(CONF_IDENTITY): cv.string_strict,
-    cv.Optional(CONF_USERNAME): cv.string_strict,
-    cv.Optional(CONF_PASSWORD): cv.string_strict,
-    cv.Optional(CONF_CERTIFICATE_AUTHORITY): cv.certificate,
-    cv.Optional(CONF_CERTIFICATE): cv.certificate,
-    cv.Optional(CONF_KEY): cv.string_strict,
-})
-
 WIFI_NETWORK_BASE = cv.Schema({
     cv.GenerateID(): cv.declare_id(WiFiAP),
     cv.Optional(CONF_SSID): cv.ssid,
@@ -137,7 +73,6 @@ WIFI_NETWORK_STA = WIFI_NETWORK_BASE.extend({
     cv.Optional(CONF_BSSID): cv.mac_address,
     cv.Optional(CONF_HIDDEN): cv.boolean,
     cv.Optional(CONF_PRIORITY, default=0.0): cv.float_,
-    cv.Optional(CONF_EAP): EAP_AUTH_SCHEMA,
 })
 
 
@@ -158,10 +93,6 @@ def validate(config):
         raise cv.Invalid("Please specify at least an SSID or an Access Point "
                          "to create.")
 
-    for network in config[CONF_NETWORKS]:
-        if CONF_EAP in network:
-            network[CONF_EAP] = validate_eap(network[CONF_EAP])
-
     if config.get(CONF_FAST_CONNECT, False):
         networks = config.get(CONF_NETWORKS, [])
         if not networks:
@@ -187,7 +118,6 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.Optional(CONF_SSID): cv.ssid,
     cv.Optional(CONF_PASSWORD): validate_password,
     cv.Optional(CONF_MANUAL_IP): STA_MANUAL_IP_SCHEMA,
-    cv.Optional(CONF_EAP): EAP_AUTH_SCHEMA,
 
     cv.Optional(CONF_AP): WIFI_NETWORK_AP,
     cv.Optional(CONF_DOMAIN, default='.local'): cv.domain_name,
@@ -203,20 +133,6 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
 }), validate)
 
 
-def eap_auth(config):
-    if config is None:
-        return None
-    return cg.StructInitializer(
-        EAPAuth,
-        ('identity', config.get(CONF_IDENTITY, "")),
-        ('username', config.get(CONF_USERNAME, "")),
-        ('password', config.get(CONF_PASSWORD, "")),
-        ('ca_cert', config.get(CONF_CERTIFICATE_AUTHORITY, "")),
-        ('client_cert', config.get(CONF_CERTIFICATE, "")),
-        ('client_key', config.get(CONF_KEY, "")),
-    )
-
-
 def safe_ip(ip):
     if ip is None:
         return IPAddress(0, 0, 0, 0)
@@ -242,8 +158,6 @@ def wifi_network(config, static_ip):
         cg.add(ap.set_ssid(config[CONF_SSID]))
     if CONF_PASSWORD in config:
         cg.add(ap.set_password(config[CONF_PASSWORD]))
-    if CONF_EAP in config:
-        cg.add(ap.set_eap(eap_auth(config[CONF_EAP])))
     if CONF_BSSID in config:
         cg.add(ap.set_bssid([HexInt(i) for i in config[CONF_BSSID].parts]))
     if CONF_HIDDEN in config:
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index dc955add25..d56e75a070 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -541,14 +541,12 @@ void WiFiAP::set_ssid(const std::string &ssid) { this->ssid_ = ssid; }
 void WiFiAP::set_bssid(bssid_t bssid) { this->bssid_ = bssid; }
 void WiFiAP::set_bssid(optional<bssid_t> bssid) { this->bssid_ = bssid; }
 void WiFiAP::set_password(const std::string &password) { this->password_ = password; }
-void WiFiAP::set_eap(optional<EAPAuth> eap_auth) { this->eap_ = eap_auth; }
 void WiFiAP::set_channel(optional<uint8_t> channel) { this->channel_ = channel; }
 void WiFiAP::set_manual_ip(optional<ManualIP> manual_ip) { this->manual_ip_ = manual_ip; }
 void WiFiAP::set_hidden(bool hidden) { this->hidden_ = hidden; }
 const std::string &WiFiAP::get_ssid() const { return this->ssid_; }
 const optional<bssid_t> &WiFiAP::get_bssid() const { return this->bssid_; }
 const std::string &WiFiAP::get_password() const { return this->password_; }
-const optional<EAPAuth> &WiFiAP::get_eap() const { return this->eap_; }
 const optional<uint8_t> &WiFiAP::get_channel() const { return this->channel_; }
 const optional<ManualIP> &WiFiAP::get_manual_ip() const { return this->manual_ip_; }
 bool WiFiAP::get_hidden() const { return this->hidden_; }
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index d58ea6c0fa..d04e1c2ce0 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -57,16 +57,6 @@ struct ManualIP {
   IPAddress dns2;  ///< The second DNS server. 0.0.0.0 for default.
 };
 
-struct EAPAuth {
-  std::string identity;  // required for all auth types
-  std::string username;
-  std::string password;
-  char *ca_cert;  // optionally verify authentication server
-  // used for EAP-TLS
-  char *client_cert;
-  char *client_key;
-};
-
 using bssid_t = std::array<uint8_t, 6>;
 
 class WiFiAP {
@@ -75,7 +65,6 @@ class WiFiAP {
   void set_bssid(bssid_t bssid);
   void set_bssid(optional<bssid_t> bssid);
   void set_password(const std::string &password);
-  void set_eap(optional<EAPAuth> eap_auth);
   void set_channel(optional<uint8_t> channel);
   void set_priority(float priority) { priority_ = priority; }
   void set_manual_ip(optional<ManualIP> manual_ip);
@@ -83,7 +72,6 @@ class WiFiAP {
   const std::string &get_ssid() const;
   const optional<bssid_t> &get_bssid() const;
   const std::string &get_password() const;
-  const optional<EAPAuth> &get_eap() const;
   const optional<uint8_t> &get_channel() const;
   float get_priority() const { return priority_; }
   const optional<ManualIP> &get_manual_ip() const;
@@ -93,7 +81,6 @@ class WiFiAP {
   std::string ssid_;
   optional<bssid_t> bssid_;
   std::string password_;
-  optional<EAPAuth> eap_;
   optional<uint8_t> channel_;
   float priority_{0};
   optional<ManualIP> manual_ip_;
diff --git a/esphome/components/wifi/wifi_component_esp32.cpp b/esphome/components/wifi/wifi_component_esp32.cpp
index 86c8078171..e345ab1671 100644
--- a/esphome/components/wifi/wifi_component_esp32.cpp
+++ b/esphome/components/wifi/wifi_component_esp32.cpp
@@ -6,7 +6,6 @@
 
 #include <utility>
 #include <algorithm>
-#include <esp_wpa2.h>
 #include "lwip/err.h"
 #include "lwip/dns.h"
 
@@ -188,51 +187,6 @@ bool WiFiComponent::wifi_sta_connect_(WiFiAP ap) {
     return false;
   }
 
-  // setup enterprise authentication if required
-  if (ap.get_eap().has_value()) {
-    // note: all certificates and keys have to be null terminated. Lengths are appended by +1 to include \0.
-    EAPAuth eap = ap.get_eap().value();
-    err = esp_wifi_sta_wpa2_ent_set_identity((uint8_t *) eap.identity.c_str(), eap.identity.length());
-    if (err != ESP_OK) {
-      ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_identity failed! %d", err);
-    }
-    int ca_cert_len = strlen(eap.ca_cert);
-    int client_cert_len = strlen(eap.client_cert);
-    int client_key_len = strlen(eap.client_key);
-    if (ca_cert_len) {
-      err = esp_wifi_sta_wpa2_ent_set_ca_cert((uint8_t *) eap.ca_cert, ca_cert_len + 1);
-      if (err != ESP_OK) {
-        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_ca_cert failed! %d", err);
-      }
-    }
-    // workout what type of EAP this is
-    // validation is not required as the config tool has already validated it
-    if (client_cert_len && client_key_len) {
-      // if we have certs, this must be EAP-TLS
-      err = esp_wifi_sta_wpa2_ent_set_cert_key((uint8_t *) eap.client_cert, client_cert_len + 1,
-                                               (uint8_t *) eap.client_key, client_key_len + 1,
-                                               (uint8_t *) eap.password.c_str(), strlen(eap.password.c_str()));
-      if (err != ESP_OK) {
-        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_cert_key failed! %d", err);
-      }
-    } else {
-      // in the absence of certs, assume this is username/password based
-      err = esp_wifi_sta_wpa2_ent_set_username((uint8_t *) eap.username.c_str(), eap.username.length());
-      if (err != ESP_OK) {
-        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_username failed! %d", err);
-      }
-      err = esp_wifi_sta_wpa2_ent_set_password((uint8_t *) eap.password.c_str(), eap.password.length());
-      if (err != ESP_OK) {
-        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_password failed! %d", err);
-      }
-    }
-    esp_wpa2_config_t wpa2Config = WPA2_CONFIG_INIT_DEFAULT();
-    err = esp_wifi_sta_wpa2_ent_enable(&wpa2Config);
-    if (err != ESP_OK) {
-      ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_enable failed! %d", err);
-    }
-  }
-
   this->wifi_apply_hostname_();
 
   err = esp_wifi_connect();
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 9f7bdddaf0..1319786841 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -10,10 +10,6 @@ from string import ascii_letters, digits
 
 import voluptuous as vol
 
-from cryptography import x509
-from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives.serialization import load_pem_private_key
-
 from esphome import core
 from esphome.const import CONF_AVAILABILITY, CONF_COMMAND_TOPIC, CONF_DISCOVERY, CONF_ID, \
     CONF_INTERNAL, CONF_NAME, CONF_PAYLOAD_AVAILABLE, CONF_PAYLOAD_NOT_AVAILABLE, \
@@ -721,25 +717,6 @@ def domain_name(value):
     return value
 
 
-def load_certificate(value):
-    return x509.load_pem_x509_certificate(value.encode('UTF-8'), default_backend())
-
-
-def load_key(value, password):
-    if password:
-        password = password.encode("UTF-8")
-    return load_pem_private_key(value.encode('UTF-8'), password, default_backend())
-
-
-def certificate(value):
-    value = string_strict(value)
-    try:
-        load_certificate(value)  # raises ValueError
-        return value
-    except ValueError:
-        return Invalid("Invalid certificate")
-
-
 def ssid(value):
     value = string_strict(value)
     if not value:
diff --git a/esphome/const.py b/esphome/const.py
index cf2155b83d..8b727b615c 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -76,8 +76,6 @@ CONF_CALIBRATION = 'calibration'
 CONF_CAPACITANCE = 'capacitance'
 CONF_CARRIER_DUTY_PERCENT = 'carrier_duty_percent'
 CONF_CARRIER_FREQUENCY = 'carrier_frequency'
-CONF_CERTIFICATE = "certificate"
-CONF_CERTIFICATE_AUTHORITY = "certificate_authority"
 CONF_CHANGE_MODE_EVERY = 'change_mode_every'
 CONF_CHANNEL = 'channel'
 CONF_CHANNELS = 'channels'
@@ -148,7 +146,6 @@ CONF_DRY_ACTION = 'dry_action'
 CONF_DRY_MODE = 'dry_mode'
 CONF_DUMP = 'dump'
 CONF_DURATION = 'duration'
-CONF_EAP = 'eap'
 CONF_ECHO_PIN = 'echo_pin'
 CONF_EFFECT = 'effect'
 CONF_EFFECTS = 'effects'
@@ -214,7 +211,6 @@ CONF_I2C = 'i2c'
 CONF_I2C_ID = 'i2c_id'
 CONF_ICON = 'icon'
 CONF_ID = 'id'
-CONF_IDENTITY = 'identity'
 CONF_IDLE = 'idle'
 CONF_IDLE_ACTION = 'idle_action'
 CONF_IDLE_LEVEL = 'idle_level'
@@ -242,7 +238,6 @@ CONF_JS_URL = 'js_url'
 CONF_JVC = 'jvc'
 CONF_KEEP_ON_TIME = 'keep_on_time'
 CONF_KEEPALIVE = 'keepalive'
-CONF_KEY = 'key'
 CONF_LAMBDA = 'lambda'
 CONF_LEVEL = 'level'
 CONF_LG = 'lg'
diff --git a/requirements.txt b/requirements.txt
index 3efe16cc45..0c99eaccbe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,5 +10,4 @@ pyserial==3.4
 ifaddr==0.1.6
 platformio==4.3.3
 esptool==2.8
-cryptography==2.9.2
 click==7.1.2
diff --git a/requirements_test.txt b/requirements_test.txt
index 72078ad6e4..b90c4ea969 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -10,7 +10,6 @@ pyserial==3.4
 ifaddr==0.1.6
 platformio==4.3.3
 esptool==2.8
-cryptography==2.9.2
 
 pylint==2.5.0
 flake8==3.7.9

From 5ca4bac10a7cf797313a4288a73c8071be1628d1 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Fri, 10 Jul 2020 17:37:26 -0300
Subject: [PATCH 273/412] Revert "Add cryptography requirement to the setup.py
 file (#1116)" (#1118)

This reverts commit 0e5e5592830b41dd71ddf6e27b7f8fa16b5bd3b1.
---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 409c5a872e..0a19dccf95 100755
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,6 @@ REQUIRES = [
     'pytz==2020.1',
     'pyserial==3.4',
     'ifaddr==0.1.6',
-    'cryptography==2.9.2',
 ]
 
 # If you have problems importing platformio and esptool as modules you can set

From 45f6926a5ad4fdf41c99df5938d61fa53140b693 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Fri, 10 Jul 2020 18:55:16 -0300
Subject: [PATCH 274/412] point dev docs to next url

---
 esphome/dashboard/dashboard.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 4f2d63d545..c4eb0eb266 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -100,9 +100,15 @@ cookie_authenticated_yes = b'yes'
 
 def template_args():
     version = const.__version__
+    if 'b' in version:
+        docs_link = 'https://beta.esphome.io/'
+    elif 'dev' in version:
+        docs_link = 'https://next.esphome.io/'
+    else:
+        docs_link = 'https://www.esphome.io/'
     return {
         'version': version,
-        'docs_link': 'https://beta.esphome.io/' if 'b' in version else 'https://esphome.io/',
+        'docs_link': docs_link,
         'get_static_file_url': get_static_file_url,
         'relative_url': settings.relative_url,
         'streamer_mode': get_bool_env('ESPHOME_STREAMER_MODE'),

From ac4a17970389ea471ded1134ba533e84a2f46cb1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sun, 12 Jul 2020 08:22:03 +1200
Subject: [PATCH 275/412] Install updated git version in lint image (#1122)

---
 docker/Dockerfile.lint | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index f04b448142..cdd715ef5a 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -6,6 +6,10 @@ RUN \
         clang-format-7 \
         clang-tidy-7 \
         patch \
+        software-properties-common \
+    && apt-add-repository ppa:git-core/ppa \
+    && apt-get install -y --no-install-recommends \
+        git \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \

From f3158c8b24d44836a092c10771125a0546d62fa6 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sat, 11 Jul 2020 17:33:25 -0300
Subject: [PATCH 276/412] fixes script wait not waiting (#1123)

---
 esphome/components/script/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/esphome/components/script/__init__.py b/esphome/components/script/__init__.py
index 9590679f83..4437fa8d9e 100644
--- a/esphome/components/script/__init__.py
+++ b/esphome/components/script/__init__.py
@@ -8,7 +8,7 @@ script_ns = cg.esphome_ns.namespace('script')
 Script = script_ns.class_('Script', automation.Trigger.template())
 ScriptExecuteAction = script_ns.class_('ScriptExecuteAction', automation.Action)
 ScriptStopAction = script_ns.class_('ScriptStopAction', automation.Action)
-ScriptWaitAction = script_ns.class_('ScriptWaitAction', automation.Action)
+ScriptWaitAction = script_ns.class_('ScriptWaitAction', automation.Action, cg.Component)
 IsRunningCondition = script_ns.class_('IsRunningCondition', automation.Condition)
 
 CONFIG_SCHEMA = automation.validate_automation({
@@ -48,7 +48,9 @@ def script_stop_action_to_code(config, action_id, template_arg, args):
 }))
 def script_wait_action_to_code(config, action_id, template_arg, args):
     paren = yield cg.get_variable(config[CONF_ID])
-    yield cg.new_Pvariable(action_id, template_arg, paren)
+    var = cg.new_Pvariable(action_id, template_arg, paren)
+    yield cg.register_component(var, {})
+    yield var
 
 
 @automation.register_condition('script.is_running', IsRunningCondition, automation.maybe_simple_id({

From ef9e6e4d6e37583b4b12a3a3f6fa9739b4f30909 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sun, 12 Jul 2020 08:52:29 +1200
Subject: [PATCH 277/412] Add support for Tuya Switches (#1074)

* Add tuya component to test4.yaml

* Add support for tuya switches

* Better config dump
---
 esphome/components/tuya/switch/__init__.py    | 28 ++++++++++++++++
 .../components/tuya/switch/tuya_switch.cpp    | 33 +++++++++++++++++++
 esphome/components/tuya/switch/tuya_switch.h  | 26 +++++++++++++++
 tests/test4.yaml                              |  8 +++++
 4 files changed, 95 insertions(+)
 create mode 100644 esphome/components/tuya/switch/__init__.py
 create mode 100644 esphome/components/tuya/switch/tuya_switch.cpp
 create mode 100644 esphome/components/tuya/switch/tuya_switch.h

diff --git a/esphome/components/tuya/switch/__init__.py b/esphome/components/tuya/switch/__init__.py
new file mode 100644
index 0000000000..bbc8122801
--- /dev/null
+++ b/esphome/components/tuya/switch/__init__.py
@@ -0,0 +1,28 @@
+from esphome.components import switch
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_ID
+from .. import tuya_ns, CONF_TUYA_ID, Tuya
+
+DEPENDENCIES = ['tuya']
+
+CONF_SWITCH_DATAPOINT = "switch_datapoint"
+
+TuyaSwitch = tuya_ns.class_('TuyaSwitch', switch.Switch, cg.Component)
+
+CONFIG_SCHEMA = switch.SWITCH_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(TuyaSwitch),
+    cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
+    cv.Required(CONF_SWITCH_DATAPOINT): cv.uint8_t,
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield switch.register_switch(var, config)
+
+    paren = yield cg.get_variable(config[CONF_TUYA_ID])
+    cg.add(var.set_tuya_parent(paren))
+
+    cg.add(var.set_switch_id(config[CONF_SWITCH_DATAPOINT]))
diff --git a/esphome/components/tuya/switch/tuya_switch.cpp b/esphome/components/tuya/switch/tuya_switch.cpp
new file mode 100644
index 0000000000..8f7c7f170d
--- /dev/null
+++ b/esphome/components/tuya/switch/tuya_switch.cpp
@@ -0,0 +1,33 @@
+#include "esphome/core/log.h"
+#include "tuya_switch.h"
+
+namespace esphome {
+namespace tuya {
+
+static const char *TAG = "tuya.switch";
+
+void TuyaSwitch::setup() {
+  this->parent_->register_listener(this->switch_id_, [this](TuyaDatapoint datapoint) {
+    this->publish_state(datapoint.value_bool);
+    ESP_LOGD(TAG, "MCU reported switch is: %s", ONOFF(datapoint.value_bool));
+  });
+}
+
+void TuyaSwitch::write_state(bool state) {
+  TuyaDatapoint datapoint{};
+  datapoint.id = this->switch_id_;
+  datapoint.type = TuyaDatapointType::BOOLEAN;
+  datapoint.value_bool = state;
+  this->parent_->set_datapoint_value(datapoint);
+  ESP_LOGD(TAG, "Setting switch: %s", ONOFF(state));
+
+  this->publish_state(state);
+}
+
+void TuyaSwitch::dump_config() {
+  LOG_SWITCH("", "Tuya Switch", this);
+  ESP_LOGCONFIG(TAG, "  Switch has datapoint ID %u", this->switch_id_);
+}
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/switch/tuya_switch.h b/esphome/components/tuya/switch/tuya_switch.h
new file mode 100644
index 0000000000..89e6264e5c
--- /dev/null
+++ b/esphome/components/tuya/switch/tuya_switch.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/tuya/tuya.h"
+#include "esphome/components/switch/switch.h"
+
+namespace esphome {
+namespace tuya {
+
+class TuyaSwitch : public switch_::Switch, public Component {
+ public:
+  void setup() override;
+  void dump_config() override;
+  void set_switch_id(uint8_t switch_id) { this->switch_id_ = switch_id; }
+
+  void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
+
+ protected:
+  void write_state(bool state) override;
+
+  Tuya *parent_;
+  uint8_t switch_id_{0};
+};
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/tests/test4.yaml b/tests/test4.yaml
index c7aa016839..852179f9b5 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -49,6 +49,9 @@ web_server:
     username: admin
     password: admin
 
+
+tuya:
+
 sensor:
   - platform: homeassistant
     entity_id: sensor.hello_world
@@ -71,3 +74,8 @@ sensor:
 #  - platform: apds9960
 #    type: blue
 #    name: APDS9960 Blue
+
+switch:
+  - platform: tuya
+    id: tuya_switch
+    switch_datapoint: 1

From c3acf08c024c6d042a0c14731805c0c73364dc19 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Sat, 11 Jul 2020 14:32:10 -0700
Subject: [PATCH 278/412] fix script.wait action (#1120)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/script/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/script/__init__.py b/esphome/components/script/__init__.py
index 4437fa8d9e..5075bb1f56 100644
--- a/esphome/components/script/__init__.py
+++ b/esphome/components/script/__init__.py
@@ -48,7 +48,7 @@ def script_stop_action_to_code(config, action_id, template_arg, args):
 }))
 def script_wait_action_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)
+    var = yield cg.new_Pvariable(action_id, template_arg, paren)
     yield cg.register_component(var, {})
     yield var
 

From 68d29c5af59fd2de209e062bb420d21265d2a49b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sun, 12 Jul 2020 10:04:34 +1200
Subject: [PATCH 279/412] Add support for Tuya Climate devices (#1076)

* Start support for tuya climate devices

* Add tuya climate to test4

* Fix lint and cast

* Remove blank line

* Try to display accurate action based on observed behaviour.

* Fix action when in off mode

* Improve config dump

* merge use of CONF_SWITCH_DATAPOINT

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/tuya/climate/__init__.py   |  41 +++++
 .../components/tuya/climate/tuya_climate.cpp  | 154 ++++++++++++++++++
 .../components/tuya/climate/tuya_climate.h    |  45 +++++
 esphome/components/tuya/fan/__init__.py       |   3 +-
 esphome/components/tuya/light/__init__.py     |   3 +-
 esphome/components/tuya/switch/__init__.py    |   4 +-
 esphome/const.py                              |   1 +
 tests/test4.yaml                              |   7 +
 8 files changed, 251 insertions(+), 7 deletions(-)
 create mode 100644 esphome/components/tuya/climate/__init__.py
 create mode 100644 esphome/components/tuya/climate/tuya_climate.cpp
 create mode 100644 esphome/components/tuya/climate/tuya_climate.h

diff --git a/esphome/components/tuya/climate/__init__.py b/esphome/components/tuya/climate/__init__.py
new file mode 100644
index 0000000000..b938be7b8c
--- /dev/null
+++ b/esphome/components/tuya/climate/__init__.py
@@ -0,0 +1,41 @@
+from esphome.components import climate
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_ID, CONF_SWITCH_DATAPOINT
+from .. import tuya_ns, CONF_TUYA_ID, Tuya
+
+DEPENDENCIES = ['tuya']
+
+CONF_TARGET_TEMPERATURE_DATAPOINT = "target_temperature_datapoint"
+CONF_CURRENT_TEMPERATURE_DATAPOINT = "current_temperature_datapoint"
+# CONF_ECO_MODE_DATAPOINT = "eco_mode_datapoint"
+
+TuyaClimate = tuya_ns.class_('TuyaClimate', climate.Climate, cg.Component)
+
+CONFIG_SCHEMA = cv.All(climate.CLIMATE_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(TuyaClimate),
+    cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
+    cv.Optional(CONF_SWITCH_DATAPOINT): cv.uint8_t,
+    cv.Optional(CONF_TARGET_TEMPERATURE_DATAPOINT): cv.uint8_t,
+    cv.Optional(CONF_CURRENT_TEMPERATURE_DATAPOINT): cv.uint8_t,
+    # cv.Optional(CONF_ECO_MODE_DATAPOINT): cv.uint8_t,
+}).extend(cv.COMPONENT_SCHEMA), cv.has_at_least_one_key(
+    CONF_TARGET_TEMPERATURE_DATAPOINT, CONF_SWITCH_DATAPOINT))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield climate.register_climate(var, config)
+
+    paren = yield cg.get_variable(config[CONF_TUYA_ID])
+    cg.add(var.set_tuya_parent(paren))
+
+    if CONF_SWITCH_DATAPOINT in config:
+        cg.add(var.set_switch_id(config[CONF_SWITCH_DATAPOINT]))
+    if CONF_TARGET_TEMPERATURE_DATAPOINT in config:
+        cg.add(var.set_target_temperature_id(config[CONF_TARGET_TEMPERATURE_DATAPOINT]))
+    if CONF_CURRENT_TEMPERATURE_DATAPOINT in config:
+        cg.add(var.set_current_temperature_id(config[CONF_CURRENT_TEMPERATURE_DATAPOINT]))
+    # if CONF_ECO_MODE_DATAPOINT in config:
+    #     cg.add(var.set_eco_mode_id(config[CONF_ECO_MODE_DATAPOINT]))
diff --git a/esphome/components/tuya/climate/tuya_climate.cpp b/esphome/components/tuya/climate/tuya_climate.cpp
new file mode 100644
index 0000000000..cfd5acccbd
--- /dev/null
+++ b/esphome/components/tuya/climate/tuya_climate.cpp
@@ -0,0 +1,154 @@
+#include "esphome/core/log.h"
+#include "tuya_climate.h"
+
+namespace esphome {
+namespace tuya {
+
+static const char *TAG = "tuya.climate";
+
+void TuyaClimate::setup() {
+  if (this->switch_id_.has_value()) {
+    this->parent_->register_listener(*this->switch_id_, [this](TuyaDatapoint datapoint) {
+      if (datapoint.value_bool) {
+        this->mode = climate::CLIMATE_MODE_HEAT;
+      } else {
+        this->mode = climate::CLIMATE_MODE_OFF;
+      }
+      this->compute_state_();
+      this->publish_state();
+      ESP_LOGD(TAG, "MCU reported switch is: %s", ONOFF(datapoint.value_bool));
+    });
+  }
+  if (this->target_temperature_id_.has_value()) {
+    this->parent_->register_listener(*this->target_temperature_id_, [this](TuyaDatapoint datapoint) {
+      this->target_temperature = datapoint.value_int;
+      this->compute_state_();
+      this->publish_state();
+      ESP_LOGD(TAG, "MCU reported target temperature is: %d", datapoint.value_int);
+    });
+  }
+  if (this->current_temperature_id_.has_value()) {
+    this->parent_->register_listener(*this->current_temperature_id_, [this](TuyaDatapoint datapoint) {
+      this->current_temperature = datapoint.value_int;
+      this->compute_state_();
+      this->publish_state();
+      ESP_LOGD(TAG, "MCU reported current temperature is: %d", datapoint.value_int);
+    });
+  }
+  // if (this->eco_mode_id_.has_value()) {
+  //   this->parent_->register_listener(*this->eco_mode_id_, [this](TuyaDatapoint datapoint) {
+  //     this->eco_mode = datapoint.value_bool;
+  //     this->compute_state_();
+  //     this->publish_state();
+  //     ESP_LOGD(TAG, "MCU reported eco mode of: %s", ONOFF(datapoint.value_bool));
+  //   });
+  // }
+}
+
+void TuyaClimate::control(const climate::ClimateCall &call) {
+  if (call.get_mode().has_value()) {
+    this->mode = *call.get_mode();
+
+    TuyaDatapoint datapoint{};
+    datapoint.id = *this->switch_id_;
+    datapoint.type = TuyaDatapointType::BOOLEAN;
+    datapoint.value_bool = this->mode != climate::CLIMATE_MODE_OFF;
+    this->parent_->set_datapoint_value(datapoint);
+    ESP_LOGD(TAG, "Setting switch: %s", ONOFF(datapoint.value_bool));
+  }
+  if (call.get_target_temperature_low().has_value())
+    this->target_temperature_low = *call.get_target_temperature_low();
+  if (call.get_target_temperature_high().has_value())
+    this->target_temperature_high = *call.get_target_temperature_high();
+  if (call.get_target_temperature().has_value()) {
+    this->target_temperature = *call.get_target_temperature();
+
+    TuyaDatapoint datapoint{};
+    datapoint.id = *this->target_temperature_id_;
+    datapoint.type = TuyaDatapointType::INTEGER;
+    datapoint.value_int = (int) this->target_temperature;
+    this->parent_->set_datapoint_value(datapoint);
+    ESP_LOGD(TAG, "Setting target temperature: %d", datapoint.value_int);
+  }
+  // if (call.get_eco_mode().has_value()) {
+  //   this->eco_mode = *call.get_eco_mode();
+
+  //   TuyaDatapoint datapoint{};
+  //   datapoint.id = *this->eco_mode_id_;
+  //   datapoint.type = TuyaDatapointType::BOOLEAN;
+  //   datapoint.value_bool = this->eco_mode;
+  //   this->parent_->set_datapoint_value(datapoint);
+  //   ESP_LOGD(TAG, "Setting eco mode: %s", ONOFF(datapoint.value_bool));
+  // }
+
+  this->compute_state_();
+  this->publish_state();
+}
+
+climate::ClimateTraits TuyaClimate::traits() {
+  auto traits = climate::ClimateTraits();
+  traits.set_supports_current_temperature(this->current_temperature_id_.has_value());
+  traits.set_supports_heat_mode(true);
+  // traits.set_supports_eco_mode(this->eco_mode_id_.has_value());
+  traits.set_supports_action(true);
+  return traits;
+}
+
+void TuyaClimate::dump_config() {
+  LOG_CLIMATE("", "Tuya Climate", this);
+  if (this->switch_id_.has_value())
+    ESP_LOGCONFIG(TAG, "  Switch has datapoint ID %u", *this->switch_id_);
+  if (this->target_temperature_id_.has_value())
+    ESP_LOGCONFIG(TAG, "  Target Temperature has datapoint ID %u", *this->target_temperature_id_);
+  if (this->current_temperature_id_.has_value())
+    ESP_LOGCONFIG(TAG, "  Current Temperature has datapoint ID %u", *this->current_temperature_id_);
+  // if (this->eco_mode_id_.has_value())
+  //   ESP_LOGCONFIG(TAG, "  Eco Mode has datapoint ID %u", *this->mode_id_);
+}
+
+void TuyaClimate::compute_state_() {
+  if (isnan(this->current_temperature) || isnan(this->target_temperature)) {
+    // if any control parameters are nan, go to OFF action (not IDLE!)
+    this->switch_to_action_(climate::CLIMATE_ACTION_OFF);
+    return;
+  }
+
+  if (this->mode == climate::CLIMATE_MODE_OFF) {
+    this->switch_to_action_(climate::CLIMATE_ACTION_OFF);
+    return;
+  }
+
+  const bool too_cold = this->current_temperature < this->target_temperature - 1;
+  const bool too_hot = this->current_temperature > this->target_temperature + 1;
+  const bool on_target = this->current_temperature == this->target_temperature;
+
+  climate::ClimateAction target_action;
+  if (too_cold) {
+    // too cold -> show as heating if possible, else idle
+    if (this->traits().supports_mode(climate::CLIMATE_MODE_HEAT)) {
+      target_action = climate::CLIMATE_ACTION_HEATING;
+    } else {
+      target_action = climate::CLIMATE_ACTION_IDLE;
+    }
+  } else if (too_hot) {
+    // too hot -> show as cooling if possible, else idle
+    if (this->traits().supports_mode(climate::CLIMATE_MODE_COOL)) {
+      target_action = climate::CLIMATE_ACTION_COOLING;
+    } else {
+      target_action = climate::CLIMATE_ACTION_IDLE;
+    }
+  } else if (on_target) {
+    target_action = climate::CLIMATE_ACTION_IDLE;
+  } else {
+    target_action = this->action;
+  }
+  this->switch_to_action_(target_action);
+}
+
+void TuyaClimate::switch_to_action_(climate::ClimateAction action) {
+  // For now this just sets the current action but could include triggers later
+  this->action = action;
+}
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/climate/tuya_climate.h b/esphome/components/tuya/climate/tuya_climate.h
new file mode 100644
index 0000000000..a073b0996c
--- /dev/null
+++ b/esphome/components/tuya/climate/tuya_climate.h
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/tuya/tuya.h"
+#include "esphome/components/climate/climate.h"
+
+namespace esphome {
+namespace tuya {
+
+class TuyaClimate : public climate::Climate, public Component {
+ public:
+  void setup() override;
+  void dump_config() override;
+  void set_switch_id(uint8_t switch_id) { this->switch_id_ = switch_id; }
+  void set_target_temperature_id(uint8_t target_temperature_id) {
+    this->target_temperature_id_ = target_temperature_id;
+  }
+  void set_current_temperature_id(uint8_t current_temperature_id) {
+    this->current_temperature_id_ = current_temperature_id;
+  }
+  // void set_eco_mode_id(uint8_t eco_mode_id) { this->eco_mode_id_ = eco_mode_id; }
+
+  void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
+
+ protected:
+  /// Override control to change settings of the climate device.
+  void control(const climate::ClimateCall &call) override;
+  /// Return the traits of this controller.
+  climate::ClimateTraits traits() override;
+
+  /// Re-compute the state of this climate controller.
+  void compute_state_();
+
+  /// Switch the climate device to the given climate mode.
+  void switch_to_action_(climate::ClimateAction action);
+
+  Tuya *parent_;
+  optional<uint8_t> switch_id_{};
+  optional<uint8_t> target_temperature_id_{};
+  optional<uint8_t> current_temperature_id_{};
+  // optional<uint8_t> eco_mode_id_{};
+};
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/fan/__init__.py b/esphome/components/tuya/fan/__init__.py
index 8b4a0fa25f..e8492fd71b 100644
--- a/esphome/components/tuya/fan/__init__.py
+++ b/esphome/components/tuya/fan/__init__.py
@@ -1,13 +1,12 @@
 from esphome.components import fan
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_OUTPUT_ID
+from esphome.const import CONF_OUTPUT_ID, CONF_SWITCH_DATAPOINT
 from .. import tuya_ns, CONF_TUYA_ID, Tuya
 
 DEPENDENCIES = ['tuya']
 
 CONF_SPEED_DATAPOINT = "speed_datapoint"
-CONF_SWITCH_DATAPOINT = "switch_datapoint"
 CONF_OSCILLATION_DATAPOINT = "oscillation_datapoint"
 
 TuyaFan = tuya_ns.class_('TuyaFan', cg.Component)
diff --git a/esphome/components/tuya/light/__init__.py b/esphome/components/tuya/light/__init__.py
index adaeb52531..d014f8a763 100644
--- a/esphome/components/tuya/light/__init__.py
+++ b/esphome/components/tuya/light/__init__.py
@@ -2,13 +2,12 @@ from esphome.components import light
 import esphome.config_validation as cv
 import esphome.codegen as cg
 from esphome.const import CONF_OUTPUT_ID, CONF_MIN_VALUE, CONF_MAX_VALUE, CONF_GAMMA_CORRECT, \
-    CONF_DEFAULT_TRANSITION_LENGTH
+    CONF_DEFAULT_TRANSITION_LENGTH, CONF_SWITCH_DATAPOINT
 from .. import tuya_ns, CONF_TUYA_ID, Tuya
 
 DEPENDENCIES = ['tuya']
 
 CONF_DIMMER_DATAPOINT = "dimmer_datapoint"
-CONF_SWITCH_DATAPOINT = "switch_datapoint"
 
 TuyaLight = tuya_ns.class_('TuyaLight', light.LightOutput, cg.Component)
 
diff --git a/esphome/components/tuya/switch/__init__.py b/esphome/components/tuya/switch/__init__.py
index bbc8122801..0eadcf0a22 100644
--- a/esphome/components/tuya/switch/__init__.py
+++ b/esphome/components/tuya/switch/__init__.py
@@ -1,13 +1,11 @@
 from esphome.components import switch
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_ID
+from esphome.const import CONF_ID, CONF_SWITCH_DATAPOINT
 from .. import tuya_ns, CONF_TUYA_ID, Tuya
 
 DEPENDENCIES = ['tuya']
 
-CONF_SWITCH_DATAPOINT = "switch_datapoint"
-
 TuyaSwitch = tuya_ns.class_('TuyaSwitch', switch.Switch, cg.Component)
 
 CONFIG_SCHEMA = switch.SWITCH_SCHEMA.extend({
diff --git a/esphome/const.py b/esphome/const.py
index 8b727b615c..61ac2563ed 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -472,6 +472,7 @@ CONF_SWING_HORIZONTAL_ACTION = 'swing_horizontal_action'
 CONF_SWING_MODE = 'swing_mode'
 CONF_SWING_OFF_ACTION = 'swing_off_action'
 CONF_SWING_VERTICAL_ACTION = 'swing_vertical_action'
+CONF_SWITCH_DATAPOINT = "switch_datapoint"
 CONF_SWITCHES = 'switches'
 CONF_SYNC = 'sync'
 CONF_TABLET = 'tablet'
diff --git a/tests/test4.yaml b/tests/test4.yaml
index 852179f9b5..a7fbacc99d 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -75,7 +75,14 @@ sensor:
 #    type: blue
 #    name: APDS9960 Blue
 
+climate:
+  - platform: tuya
+    id: tuya_climate
+    switch_datapoint: 1
+    target_temperature_datapoint: 3
+
 switch:
   - platform: tuya
     id: tuya_switch
     switch_datapoint: 1
+

From a76b8e745b3bc572c6696da56b6fe2b1a5ccda7f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sun, 12 Jul 2020 10:46:10 +1200
Subject: [PATCH 280/412] Add support for Tuya Sensors (#1088)

* Add Tuya sensor

* Add tuya sensor to test4

* Forgot id
---
 esphome/components/tuya/sensor/__init__.py    | 28 ++++++++++++
 .../components/tuya/sensor/tuya_sensor.cpp    | 44 +++++++++++++++++++
 esphome/components/tuya/sensor/tuya_sensor.h  | 24 ++++++++++
 tests/test4.yaml                              |  4 +-
 4 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/tuya/sensor/__init__.py
 create mode 100644 esphome/components/tuya/sensor/tuya_sensor.cpp
 create mode 100644 esphome/components/tuya/sensor/tuya_sensor.h

diff --git a/esphome/components/tuya/sensor/__init__.py b/esphome/components/tuya/sensor/__init__.py
new file mode 100644
index 0000000000..5f2ff2d674
--- /dev/null
+++ b/esphome/components/tuya/sensor/__init__.py
@@ -0,0 +1,28 @@
+from esphome.components import sensor
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_ID
+from .. import tuya_ns, CONF_TUYA_ID, Tuya
+
+DEPENDENCIES = ['tuya']
+
+CONF_SENSOR_DATAPOINT = "sensor_datapoint"
+
+TuyaSensor = tuya_ns.class_('TuyaSensor', sensor.Sensor, cg.Component)
+
+CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(TuyaSensor),
+    cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
+    cv.Required(CONF_SENSOR_DATAPOINT): cv.uint8_t,
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield sensor.register_sensor(var, config)
+
+    paren = yield cg.get_variable(config[CONF_TUYA_ID])
+    cg.add(var.set_tuya_parent(paren))
+
+    cg.add(var.set_sensor_id(config[CONF_SENSOR_DATAPOINT]))
diff --git a/esphome/components/tuya/sensor/tuya_sensor.cpp b/esphome/components/tuya/sensor/tuya_sensor.cpp
new file mode 100644
index 0000000000..49a1af2efe
--- /dev/null
+++ b/esphome/components/tuya/sensor/tuya_sensor.cpp
@@ -0,0 +1,44 @@
+#include "esphome/core/log.h"
+#include "tuya_sensor.h"
+
+namespace esphome {
+namespace tuya {
+
+static const char *TAG = "tuya.sensor";
+
+void TuyaSensor::setup() {
+  this->parent_->register_listener(this->sensor_id_, [this](TuyaDatapoint datapoint) {
+    if (datapoint.type == TuyaDatapointType::BOOLEAN) {
+      this->publish_state(datapoint.value_bool);
+      ESP_LOGD(TAG, "MCU reported sensor is: %s", ONOFF(datapoint.value_bool));
+    } else if (datapoint.type == TuyaDatapointType::INTEGER) {
+      this->publish_state(datapoint.value_int);
+      ESP_LOGD(TAG, "MCU reported sensor is: %d", datapoint.value_int);
+    } else if (datapoint.type == TuyaDatapointType::ENUM) {
+      this->publish_state(datapoint.value_enum);
+      ESP_LOGD(TAG, "MCU reported sensor is: %d", datapoint.value_enum);
+    } else if (datapoint.type == TuyaDatapointType::BITMASK) {
+      this->publish_state(datapoint.value_bitmask);
+      ESP_LOGD(TAG, "MCU reported sensor is: %x", datapoint.value_bitmask);
+    }
+  });
+}
+
+// void TuyaSensor::write_state(bool state) {
+//   TuyaDatapoint datapoint{};
+//   datapoint.id = this->sensor_id_;
+//   datapoint.type = TuyaDatapointType::BOOLEAN;
+//   datapoint.value_bool = state;
+//   this->parent_->set_datapoint_value(datapoint);
+//   ESP_LOGD(TAG, "Setting sensor: %s", ONOFF(state));
+
+//   this->publish_state(state);
+// }
+
+void TuyaSensor::dump_config() {
+  LOG_SENSOR("", "Tuya Sensor", this);
+  ESP_LOGCONFIG(TAG, "  Sensor has datapoint ID %u", this->sensor_id_);
+}
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/sensor/tuya_sensor.h b/esphome/components/tuya/sensor/tuya_sensor.h
new file mode 100644
index 0000000000..8fd7cd1770
--- /dev/null
+++ b/esphome/components/tuya/sensor/tuya_sensor.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/tuya/tuya.h"
+#include "esphome/components/sensor/sensor.h"
+
+namespace esphome {
+namespace tuya {
+
+class TuyaSensor : public sensor::Sensor, public Component {
+ public:
+  void setup() override;
+  void dump_config() override;
+  void set_sensor_id(uint8_t sensor_id) { this->sensor_id_ = sensor_id; }
+
+  void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
+
+ protected:
+  Tuya *parent_;
+  uint8_t sensor_id_{0};
+};
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/tests/test4.yaml b/tests/test4.yaml
index a7fbacc99d..2709941b0f 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -49,13 +49,15 @@ web_server:
     username: admin
     password: admin
 
-
 tuya:
 
 sensor:
   - platform: homeassistant
     entity_id: sensor.hello_world
     id: ha_hello_world
+  - platform: tuya
+    id: tuya_sensor
+    sensor_datapoint: 1
 #
 # platform sensor.apds9960 requires component apds9960
 #

From ed5f207ebaf704914f0d648b465b26ddbf2a0f84 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sun, 12 Jul 2020 10:50:41 +1200
Subject: [PATCH 281/412] Add support for Tuya Binary Sensors (#1089)

* Add Tuya binary sensor

* Add tuya binary sensor to test4

* Fix copy/paste

* Forgot id
---
 .../components/tuya/binary_sensor/__init__.py | 28 +++++++++++++++++++
 .../tuya/binary_sensor/tuya_binary_sensor.cpp | 22 +++++++++++++++
 .../tuya/binary_sensor/tuya_binary_sensor.h   | 24 ++++++++++++++++
 tests/test4.yaml                              |  6 +++-
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/tuya/binary_sensor/__init__.py
 create mode 100644 esphome/components/tuya/binary_sensor/tuya_binary_sensor.cpp
 create mode 100644 esphome/components/tuya/binary_sensor/tuya_binary_sensor.h

diff --git a/esphome/components/tuya/binary_sensor/__init__.py b/esphome/components/tuya/binary_sensor/__init__.py
new file mode 100644
index 0000000000..3ba479bf19
--- /dev/null
+++ b/esphome/components/tuya/binary_sensor/__init__.py
@@ -0,0 +1,28 @@
+from esphome.components import binary_sensor
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_ID
+from .. import tuya_ns, CONF_TUYA_ID, Tuya
+
+DEPENDENCIES = ['tuya']
+
+CONF_SENSOR_DATAPOINT = "sensor_datapoint"
+
+TuyaBinarySensor = tuya_ns.class_('TuyaBinarySensor', binary_sensor.BinarySensor, cg.Component)
+
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(TuyaBinarySensor),
+    cv.GenerateID(CONF_TUYA_ID): cv.use_id(Tuya),
+    cv.Required(CONF_SENSOR_DATAPOINT): cv.uint8_t,
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+    yield binary_sensor.register_binary_sensor(var, config)
+
+    paren = yield cg.get_variable(config[CONF_TUYA_ID])
+    cg.add(var.set_tuya_parent(paren))
+
+    cg.add(var.set_sensor_id(config[CONF_SENSOR_DATAPOINT]))
diff --git a/esphome/components/tuya/binary_sensor/tuya_binary_sensor.cpp b/esphome/components/tuya/binary_sensor/tuya_binary_sensor.cpp
new file mode 100644
index 0000000000..ad3d18efae
--- /dev/null
+++ b/esphome/components/tuya/binary_sensor/tuya_binary_sensor.cpp
@@ -0,0 +1,22 @@
+#include "esphome/core/log.h"
+#include "tuya_binary_sensor.h"
+
+namespace esphome {
+namespace tuya {
+
+static const char *TAG = "tuya.binary_sensor";
+
+void TuyaBinarySensor::setup() {
+  this->parent_->register_listener(this->sensor_id_, [this](TuyaDatapoint datapoint) {
+    this->publish_state(datapoint.value_bool);
+    ESP_LOGD(TAG, "MCU reported binary sensor is: %s", ONOFF(datapoint.value_bool));
+  });
+}
+
+void TuyaBinarySensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Tuya Binary Sensor:");
+  ESP_LOGCONFIG(TAG, "  Binary Sensor has datapoint ID %u", this->sensor_id_);
+}
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/esphome/components/tuya/binary_sensor/tuya_binary_sensor.h b/esphome/components/tuya/binary_sensor/tuya_binary_sensor.h
new file mode 100644
index 0000000000..1eeeb40477
--- /dev/null
+++ b/esphome/components/tuya/binary_sensor/tuya_binary_sensor.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/tuya/tuya.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
+
+namespace esphome {
+namespace tuya {
+
+class TuyaBinarySensor : public binary_sensor::BinarySensor, public Component {
+ public:
+  void setup() override;
+  void dump_config() override;
+  void set_sensor_id(uint8_t sensor_id) { this->sensor_id_ = sensor_id; }
+
+  void set_tuya_parent(Tuya *parent) { this->parent_ = parent; }
+
+ protected:
+  Tuya *parent_;
+  uint8_t sensor_id_{0};
+};
+
+}  // namespace tuya
+}  // namespace esphome
diff --git a/tests/test4.yaml b/tests/test4.yaml
index 2709941b0f..61c1e278c4 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -77,6 +77,11 @@ sensor:
 #    type: blue
 #    name: APDS9960 Blue
 
+binary_sensor:
+  - platform: tuya
+    id: tuya_binary_sensor
+    sensor_datapoint: 1
+
 climate:
   - platform: tuya
     id: tuya_climate
@@ -87,4 +92,3 @@ switch:
   - platform: tuya
     id: tuya_switch
     switch_datapoint: 1
-

From e41ea4207412276eb99c2685b65b7076cfd74bc5 Mon Sep 17 00:00:00 2001
From: Wauter <Wauter@users.noreply.github.com>
Date: Sun, 12 Jul 2020 00:55:30 +0200
Subject: [PATCH 282/412] feature request 398 add 'hide timestamp' option for
 version text sensor (#1085)

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 esphome/components/version/text_sensor.py          |  6 ++++--
 esphome/components/version/version_text_sensor.cpp | 10 ++++++++--
 esphome/components/version/version_text_sensor.h   |  4 ++++
 esphome/const.py                                   |  1 +
 tests/test1.yaml                                   |  3 +++
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/esphome/components/version/text_sensor.py b/esphome/components/version/text_sensor.py
index 21044bb89f..01cf8ba30b 100644
--- a/esphome/components/version/text_sensor.py
+++ b/esphome/components/version/text_sensor.py
@@ -1,14 +1,15 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import text_sensor
-from esphome.const import CONF_ID, CONF_ICON, ICON_NEW_BOX
+from esphome.const import CONF_ID, CONF_ICON, ICON_NEW_BOX, CONF_HIDE_TIMESTAMP
 
 version_ns = cg.esphome_ns.namespace('version')
 VersionTextSensor = version_ns.class_('VersionTextSensor', text_sensor.TextSensor, cg.Component)
 
 CONFIG_SCHEMA = text_sensor.TEXT_SENSOR_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(VersionTextSensor),
-    cv.Optional(CONF_ICON, default=ICON_NEW_BOX): text_sensor.icon
+    cv.Optional(CONF_ICON, default=ICON_NEW_BOX): text_sensor.icon,
+    cv.Optional(CONF_HIDE_TIMESTAMP, default=False): cv.boolean
 }).extend(cv.COMPONENT_SCHEMA)
 
 
@@ -16,3 +17,4 @@ def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     yield text_sensor.register_text_sensor(var, config)
     yield cg.register_component(var, config)
+    cg.add(var.set_hide_timestamp(config[CONF_HIDE_TIMESTAMP]))
diff --git a/esphome/components/version/version_text_sensor.cpp b/esphome/components/version/version_text_sensor.cpp
index 6aedfdedcd..fa8e6a9d01 100644
--- a/esphome/components/version/version_text_sensor.cpp
+++ b/esphome/components/version/version_text_sensor.cpp
@@ -8,9 +8,15 @@ namespace version {
 
 static const char *TAG = "version.text_sensor";
 
-void VersionTextSensor::setup() { this->publish_state(ESPHOME_VERSION " " + App.get_compilation_time()); }
+void VersionTextSensor::setup() {
+  if (this->hide_timestamp_) {
+    this->publish_state(ESPHOME_VERSION);
+  } else {
+    this->publish_state(ESPHOME_VERSION " " + App.get_compilation_time());
+  }
+}
 float VersionTextSensor::get_setup_priority() const { return setup_priority::DATA; }
-
+void VersionTextSensor::set_hide_timestamp(bool hide_timestamp) { this->hide_timestamp_ = hide_timestamp; }
 std::string VersionTextSensor::unique_id() { return get_mac_address() + "-version"; }
 void VersionTextSensor::dump_config() { LOG_TEXT_SENSOR("", "Version Text Sensor", this); }
 
diff --git a/esphome/components/version/version_text_sensor.h b/esphome/components/version/version_text_sensor.h
index cc798939ef..9355e78442 100644
--- a/esphome/components/version/version_text_sensor.h
+++ b/esphome/components/version/version_text_sensor.h
@@ -8,10 +8,14 @@ namespace version {
 
 class VersionTextSensor : public text_sensor::TextSensor, public Component {
  public:
+  void set_hide_timestamp(bool hide_timestamp);
   void setup() override;
   void dump_config() override;
   float get_setup_priority() const override;
   std::string unique_id() override;
+
+ protected:
+  bool hide_timestamp_{false};
 };
 
 }  // namespace version
diff --git a/esphome/const.py b/esphome/const.py
index 61ac2563ed..1760db0dab 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -201,6 +201,7 @@ CONF_HEAT_ACTION = 'heat_action'
 CONF_HEAT_MODE = 'heat_mode'
 CONF_HEATER = 'heater'
 CONF_HIDDEN = 'hidden'
+CONF_HIDE_TIMESTAMP = 'hide_timestamp'
 CONF_HIGH = 'high'
 CONF_HIGH_VOLTAGE_REFERENCE = 'high_voltage_reference'
 CONF_HOUR = 'hour'
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 5d8108c4be..63320dfe29 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1749,6 +1749,9 @@ text_sensor:
     name: "BSSID"
   mac_address:
     name: "Mac Address"
+- platform: version
+  name: "ESPHome Version No Timestamp"
+  hide_timestamp: True
 
 sn74hc595:
   - id: 'sn74hc595_hub'

From c8998941a5fe83ce04072e9251662d4efd5a0bc3 Mon Sep 17 00:00:00 2001
From: Paul Deen <paulext@gmail.com>
Date: Sun, 12 Jul 2020 01:03:13 +0200
Subject: [PATCH 283/412] Add 7.5inch v2 waveshare (#1077)

* Added 7.5inchV2

* Added 7.5inV2

* Added 7.5inch_V2

* fixed Display function

* Inverted bytecode

Added ~() to invert the bytecode and make the screen look black text on white background

* Hoping to keep Travis happy with blank lines

* more travis hacking

* travis happy?

* wow

* gfhj
---
 .../components/waveshare_epaper/display.py    |  2 +
 .../waveshare_epaper/waveshare_epaper.cpp     | 71 +++++++++++++++----
 .../waveshare_epaper/waveshare_epaper.h       | 24 +++++++
 3 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index 3e6a972742..577d832785 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -16,6 +16,7 @@ WaveshareEPaper2P9InB = waveshare_epaper_ns.class_('WaveshareEPaper2P9InB', Wave
 WaveshareEPaper4P2In = waveshare_epaper_ns.class_('WaveshareEPaper4P2In', WaveshareEPaper)
 WaveshareEPaper5P8In = waveshare_epaper_ns.class_('WaveshareEPaper5P8In', WaveshareEPaper)
 WaveshareEPaper7P5In = waveshare_epaper_ns.class_('WaveshareEPaper7P5In', WaveshareEPaper)
+WaveshareEPaper7P5InV2 = waveshare_epaper_ns.class_('WaveshareEPaper7P5InV2', WaveshareEPaper)
 
 WaveshareEPaperTypeAModel = waveshare_epaper_ns.enum('WaveshareEPaperTypeAModel')
 WaveshareEPaperTypeBModel = waveshare_epaper_ns.enum('WaveshareEPaperTypeBModel')
@@ -31,6 +32,7 @@ MODELS = {
     '4.20in': ('b', WaveshareEPaper4P2In),
     '5.83in': ('b', WaveshareEPaper5P8In),
     '7.50in': ('b', WaveshareEPaper7P5In),
+    '7.50inV2': ('b', WaveshareEPaper7P5InV2),
 }
 
 
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.cpp b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
index 331adffb5e..d57b814bb2 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.cpp
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.cpp
@@ -751,63 +751,51 @@ void WaveshareEPaper5P8In::dump_config() {
   LOG_PIN("  Busy Pin: ", this->busy_pin_);
   LOG_UPDATE_INTERVAL(this);
 }
-
 void WaveshareEPaper7P5In::initialize() {
   // COMMAND POWER SETTING
   this->command(0x01);
   this->data(0x37);
   this->data(0x00);
-
   // COMMAND PANEL SETTING
   this->command(0x00);
   this->data(0xCF);
   this->data(0x0B);
-
   // COMMAND BOOSTER SOFT START
   this->command(0x06);
   this->data(0xC7);
   this->data(0xCC);
   this->data(0x28);
-
   // COMMAND POWER ON
   this->command(0x04);
   this->wait_until_idle_();
   delay(10);
-
   // COMMAND PLL CONTROL
   this->command(0x30);
   this->data(0x3C);
-
   // COMMAND TEMPERATURE SENSOR CALIBRATION
   this->command(0x41);
   this->data(0x00);
-
   // COMMAND VCOM AND DATA INTERVAL SETTING
   this->command(0x50);
   this->data(0x77);
-
   // COMMAND TCON SETTING
   this->command(0x60);
   this->data(0x22);
-
   // COMMAND RESOLUTION SETTING
   this->command(0x61);
   this->data(0x02);
   this->data(0x80);
   this->data(0x01);
   this->data(0x80);
-
   // COMMAND VCM DC SETTING REGISTER
   this->command(0x82);
   this->data(0x1E);
-
   this->command(0xE5);
   this->data(0x03);
 }
 void HOT WaveshareEPaper7P5In::display() {
   // COMMAND DATA START TRANSMISSION 1
   this->command(0x10);
-
   this->start_data_();
   for (size_t i = 0; i < this->get_buffer_length_(); i++) {
     uint8_t temp1 = this->buffer_[i];
@@ -817,7 +805,6 @@ void HOT WaveshareEPaper7P5In::display() {
         temp2 = 0x03;
       else
         temp2 = 0x00;
-
       temp2 <<= 4;
       temp1 <<= 1;
       j++;
@@ -828,11 +815,9 @@ void HOT WaveshareEPaper7P5In::display() {
       temp1 <<= 1;
       this->write_byte(temp2);
     }
-
     App.feed_wdt();
   }
   this->end_data_();
-
   // COMMAND DISPLAY REFRESH
   this->command(0x12);
 }
@@ -846,6 +831,62 @@ void WaveshareEPaper7P5In::dump_config() {
   LOG_PIN("  Busy Pin: ", this->busy_pin_);
   LOG_UPDATE_INTERVAL(this);
 }
+void WaveshareEPaper7P5InV2::initialize() {
+  // COMMAND POWER SETTING
+  this->command(0x01);
+  this->data(0x07);
+  this->data(0x07);
+  this->data(0x3f);
+  this->data(0x3f);
+  this->command(0x04);
 
+  delay(100);  // NOLINT
+  this->wait_until_idle_();
+  // COMMAND PANEL SETTING
+  this->command(0x00);
+  this->data(0x1F);
+
+  // COMMAND RESOLUTION SETTING
+  this->command(0x61);
+  this->data(0x03);
+  this->data(0x20);
+  this->data(0x01);
+  this->data(0xE0);
+  // COMMAND ...?
+  this->command(0x15);
+  this->data(0x00);
+  // COMMAND VCOM AND DATA INTERVAL SETTING
+  this->command(0x50);
+  this->data(0x10);
+  this->data(0x07);
+  // COMMAND TCON SETTING
+  this->command(0x60);
+  this->data(0x22);
+}
+void HOT WaveshareEPaper7P5InV2::display() {
+  uint32_t buf_len = this->get_buffer_length_();
+  // COMMAND DATA START TRANSMISSION NEW DATA
+  this->command(0x13);
+  delay(2);
+  for (uint32_t i = 0; i < buf_len; i++) {
+    this->data(~(this->buffer_[i]));
+  }
+
+  // COMMAND DISPLAY REFRESH
+  this->command(0x12);
+  delay(100);  // NOLINT
+  this->wait_until_idle_();
+}
+
+int WaveshareEPaper7P5InV2::get_width_internal() { return 800; }
+int WaveshareEPaper7P5InV2::get_height_internal() { return 480; }
+void WaveshareEPaper7P5InV2::dump_config() {
+  LOG_DISPLAY("", "Waveshare E-Paper", this);
+  ESP_LOGCONFIG(TAG, "  Model: 7.5inV2");
+  LOG_PIN("  Reset Pin: ", this->reset_pin_);
+  LOG_PIN("  DC Pin: ", this->dc_pin_);
+  LOG_PIN("  Busy Pin: ", this->busy_pin_);
+  LOG_UPDATE_INTERVAL(this);
+}
 }  // namespace waveshare_epaper
 }  // namespace esphome
diff --git a/esphome/components/waveshare_epaper/waveshare_epaper.h b/esphome/components/waveshare_epaper/waveshare_epaper.h
index 18748e05ca..01b162fd35 100644
--- a/esphome/components/waveshare_epaper/waveshare_epaper.h
+++ b/esphome/components/waveshare_epaper/waveshare_epaper.h
@@ -105,6 +105,7 @@ enum WaveshareEPaperTypeBModel {
   WAVESHARE_EPAPER_2_7_IN = 0,
   WAVESHARE_EPAPER_4_2_IN,
   WAVESHARE_EPAPER_7_5_IN,
+  WAVESHARE_EPAPER_7_5_INV2,
 };
 
 class WaveshareEPaper2P7In : public WaveshareEPaper {
@@ -236,5 +237,28 @@ class WaveshareEPaper7P5In : public WaveshareEPaper {
   int get_height_internal() override;
 };
 
+class WaveshareEPaper7P5InV2 : public WaveshareEPaper {
+ public:
+  void initialize() override;
+
+  void display() override;
+
+  void dump_config() override;
+
+  void deep_sleep() override {
+    // COMMAND POWER OFF
+    this->command(0x02);
+    this->wait_until_idle_();
+    // COMMAND DEEP SLEEP
+    this->command(0x07);
+    this->data(0xA5);  // check byte
+  }
+
+ protected:
+  int get_width_internal() override;
+
+  int get_height_internal() override;
+};
+
 }  // namespace waveshare_epaper
 }  // namespace esphome

From 1923e0312b248f761324a55b9a07f9a92bd5c626 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sun, 12 Jul 2020 14:38:29 +1200
Subject: [PATCH 284/412] Add github actions (#1125)

---
 .github/workflows/pull.yaml            |  59 ++++++++
 .github/workflows/release-dev.yaml     | 124 +++++++++++++++++
 .github/workflows/release-version.yaml | 180 +++++++++++++++++++++++++
 script/setup                           |   4 +-
 4 files changed, 365 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/pull.yaml
 create mode 100644 .github/workflows/release-dev.yaml
 create mode 100644 .github/workflows/release-version.yaml

diff --git a/.github/workflows/pull.yaml b/.github/workflows/pull.yaml
new file mode 100644
index 0000000000..6b66192150
--- /dev/null
+++ b/.github/workflows/pull.yaml
@@ -0,0 +1,59 @@
+name: PR testing
+
+on: [pull_request]
+
+jobs:
+  lint-custom:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Custom
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: script/ci-custom.py
+  lint-python:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Python
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: script/lint-python
+  lint-tidy:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Tidy
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - run: script/setup
+    - run: pio init --ide atom
+    - run: script/clang-tidy --all-headers --fix
+    - run: script/ci-suggest-changes
+  lint-format:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Format
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - run: script/setup
+    - run: script/clang-format -i
+    - run: script/ci-suggest-changes
+
+  test:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    strategy:
+      matrix:
+        test:
+        - test1
+        - test2
+        - test3
+        - test4
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: esphome tests/${{ matrix.test }}.yaml compile
diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml
new file mode 100644
index 0000000000..7f71d79610
--- /dev/null
+++ b/.github/workflows/release-dev.yaml
@@ -0,0 +1,124 @@
+name: Release dev
+
+on:
+  push:
+    branches:
+    - dev
+
+jobs:
+  lint-custom:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Custom
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: script/ci-custom.py
+  lint-python:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Python
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: script/lint-python
+  lint-tidy:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Tidy
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: pio init --ide atom
+    - run: script/clang-tidy --all-headers --fix
+    - run: script/ci-suggest-changes
+  lint-format:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Format
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: script/clang-format -i
+    - run: script/ci-suggest-changes
+
+  test:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    strategy:
+      matrix:
+        test:
+        - test1
+        - test2
+        - test3
+        - test4
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: esphome tests/${{ matrix.test }}.yaml compile
+
+  deploy-docker:
+    runs-on: ubuntu-latest
+    needs: [lint-custom, lint-python, lint-tidy, lint-format, test]
+    strategy:
+      matrix:
+        arch: [aarch64, amd64, armv7, i386]
+        build-type: [hassio, docker]
+    steps:
+    - uses: actions/checkout@v2
+    - run: docker info
+    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    - run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
+    - env:
+        BASE_VERSION: 2.1.1
+      run: |
+        if [[ "${{ matrix.build-type }}" == "hassio" ]]; then
+          BUILD_FROM=esphome/esphome-hassio-base-${{ matrix.arch }}:${BASE_VERSION}
+          BUILD_TO=${{ github.repository }}-hassio-${{ matrix.arch }}
+          DOCKERFILE=docker/Dockerfile.hassio
+        else
+          BUILD_FROM=esphome/esphome-base-${{ matrix.arch }}:${BASE_VERSION}
+          BUILD_TO=${{ github.repository }}-${{ matrix.arch }}
+          DOCKERFILE=docker/Dockerfile
+        fi
+
+        TAG=${{ github.sha }}
+        TAG=${TAG:0:7}
+
+        echo "Building tag: ${TAG}"
+
+        docker build \
+          --build-arg BUILD_FROM=${BUILD_FROM} \
+          --build-arg BUILD_VERSION=${TAG} \
+          --tag ${BUILD_TO}:dev \
+          --file ${DOCKERFILE} \
+          .
+
+        echo "Pushing to ${BUILD_TO}:dev"
+        docker push ${BUILD_TO}:dev
+
+  deploy-docker-manifest-version:
+    runs-on: ubuntu-latest
+    needs: [deploy-docker]
+    steps:
+    - run: mkdir -p ~/.docker
+    - run: |
+        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    - run: |
+        REPO=${{ github.repository }}
+
+        docker manifest create ${REPO}:dev \
+          ${REPO}-aarch64:dev \
+          ${REPO}-amd64:dev \
+          ${REPO}-armv7:dev \
+          ${REPO}-i386:dev
+
+        echo "Pushing to ${REPO}:dev"
+        docker manifest push ${REPO}:dev
diff --git a/.github/workflows/release-version.yaml b/.github/workflows/release-version.yaml
new file mode 100644
index 0000000000..cb72aae761
--- /dev/null
+++ b/.github/workflows/release-version.yaml
@@ -0,0 +1,180 @@
+name: Release a version
+
+on:
+  push:
+    tags:
+    - "*"
+
+jobs:
+  lint-custom:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Custom
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: script/ci-custom.py
+  lint-python:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Python
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: script/lint-python
+  lint-tidy:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Tidy
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: pio init --ide atom
+    - run: script/clang-tidy --all-headers --fix
+    - run: script/ci-suggest-changes
+  lint-format:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    name: Lint Format
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: script/clang-format -i
+    - run: script/ci-suggest-changes
+
+  test:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    strategy:
+      matrix:
+        test:
+        - test1
+        - test2
+        - test3
+        - test4
+    steps:
+    - uses: actions/checkout@v2
+    - run: script/setup
+    - run: esphome tests/${{ matrix.test }}.yaml compile
+
+  deploy-pypi:
+    runs-on: ubuntu-latest
+    container: jesserockz/esphome-lint
+    needs: [lint-custom, lint-python, lint-tidy, lint-format, test]
+    steps:
+    - run: pip install twine wheel
+    - run: python setup.py sdist bdist_wheel
+    - run: twine upload dist/*
+      env:
+        TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+
+  deploy-docker:
+    runs-on: ubuntu-latest
+    needs: [lint-custom, lint-python, lint-tidy, lint-format, test]
+    strategy:
+      matrix:
+        arch: [aarch64, amd64, armv7, i386]
+        build-type: [hassio, docker]
+    steps:
+    - uses: actions/checkout@v2
+    - run: docker info
+    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    - run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
+    - env:
+        BASE_VERSION: 2.1.1
+      run: |
+        if [[ "${{ matrix.build-type }}" == "hassio" ]]; then
+          BUILD_FROM=esphome/esphome-hassio-base-${{ matrix.arch }}:${BASE_VERSION}
+          BUILD_TO=${{ github.repository }}-hassio-${{ matrix.arch }}
+          DOCKERFILE=docker/Dockerfile.hassio
+        else
+          BUILD_FROM=esphome/esphome-base-${{ matrix.arch }}:${BASE_VERSION}
+          BUILD_TO=${{ github.repository }}-${{ matrix.arch }}
+          DOCKERFILE=docker/Dockerfile
+        fi
+
+        TAG=${{ github.ref }}
+        TAG=${TAG#refs/tags/v}
+
+        echo "Building tag: ${TAG}"
+
+        docker build \
+          --build-arg BUILD_FROM=${BUILD_FROM} \
+          --build-arg BUILD_VERSION=${TAG} \
+          --tag ${BUILD_TO}:${TAG} \
+          --file ${DOCKERFILE} \
+          .
+
+        echo "Pushing to ${BUILD_TO}:${TAG}"
+        docker push ${BUILD_TO}:${TAG}
+
+        beta_tag="^v\d+\.\d+\.\d+b\d+$"
+        if [[ "${TAG}" ~= "${beta_tag}" ]]; then
+          echo "Pushing to ${BUILD_TO}:beta"
+          docker tag ${BUILD_TO}:${TAG} ${BUILD_TO}:beta
+          docker push ${BUILD_TO}:beta
+        else
+          echo "Pushing to ${BUILD_TO}:latest"
+          docker tag ${BUILD_TO}:${TAG} ${BUILD_TO}:latest
+          docker push ${BUILD_TO}:latest
+        fi
+
+  deploy-docker-manifest-version:
+    runs-on: ubuntu-latest
+    steps:
+    - run: mkdir -p ~/.docker
+    - run: |
+        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    - run: |
+        REPO=${{ github.repository }}
+
+        TAG=${{ github.ref }}
+        TAG=${TAG#refs/tags/v}
+
+        docker manifest create ${REPO}:${TAG} \
+          ${REPO}-aarch64:${TAG} \
+          ${REPO}-amd64:${TAG} \
+          ${REPO}-armv7:${TAG} \
+          ${REPO}-i386:${TAG}
+
+        echo "Pushing to ${REPO}:${TAG}"
+        docker push ${REPO}:${TAG}
+
+  deploy-docker-manifest:
+    runs-on: ubuntu-latest
+    steps:
+    - run: mkdir -p ~/.docker
+    - run: |
+        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    - run: |
+        REPO=${{ github.repository }}
+
+        TAG=${{ github.ref }}
+        TAG=${TAG#refs/tags/v}
+
+        beta_tag="^v\d+\.\d+\.\d+b\d+$"
+        if [[ "${TAG}" ~= "${beta_tag}" ]]; then
+          TAG=beta
+        else
+          TAG=latest
+        fi
+        docker manifest create ${REPO}:${TAG} \
+          ${REPO}-aarch64:${TAG} \
+          ${REPO}-amd64:${TAG} \
+          ${REPO}-armv7:${TAG} \
+          ${REPO}-i386:${TAG}
+
+        echo "Pushing to ${REPO}:${TAG}"
+        docker push ${REPO}:${TAG}
diff --git a/script/setup b/script/setup
index b6cff39f0c..810fb2a2bf 100755
--- a/script/setup
+++ b/script/setup
@@ -4,5 +4,5 @@
 set -e
 
 cd "$(dirname "$0")/.."
-pip install -r requirements_test.txt
-pip install -e .
+pip3 install -r requirements_test.txt
+pip3 install -e .

From c52cb7bbad9137239653207fb51c81454861bdcb Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 12 Jul 2020 12:57:22 -0300
Subject: [PATCH 285/412] Temporary change docker build repository

Should be reverted to esphome's
---
 .github/workflows/release-dev.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml
index 7f71d79610..42e9723f4f 100644
--- a/.github/workflows/release-dev.yaml
+++ b/.github/workflows/release-dev.yaml
@@ -77,11 +77,11 @@ jobs:
       run: |
         if [[ "${{ matrix.build-type }}" == "hassio" ]]; then
           BUILD_FROM=esphome/esphome-hassio-base-${{ matrix.arch }}:${BASE_VERSION}
-          BUILD_TO=${{ github.repository }}-hassio-${{ matrix.arch }}
+          BUILD_TO=glmnet/esphome-hassio-${{ matrix.arch }}
           DOCKERFILE=docker/Dockerfile.hassio
         else
           BUILD_FROM=esphome/esphome-base-${{ matrix.arch }}:${BASE_VERSION}
-          BUILD_TO=${{ github.repository }}-${{ matrix.arch }}
+          BUILD_TO=glmnet/esphome-${{ matrix.arch }}
           DOCKERFILE=docker/Dockerfile
         fi
 
@@ -112,7 +112,7 @@ jobs:
         DOCKER_USER: ${{ secrets.DOCKER_USER }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
     - run: |
-        REPO=${{ github.repository }}
+        REPO=glmnet/esphome
 
         docker manifest create ${REPO}:dev \
           ${REPO}-aarch64:dev \

From c296b4c34840e2e9f4d959707c69dafddbf7d78d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 13 Jul 2020 05:08:44 +1200
Subject: [PATCH 286/412] Add PR labels based on files changed (#1127)

* Add PR labels based on files changed

* Remove platform code
---
 .github/workflows/pr-labels.yaml | 24 ++++++++++++++++++++++++
 script/pr-labels                 | 29 +++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 .github/workflows/pr-labels.yaml
 create mode 100755 script/pr-labels

diff --git a/.github/workflows/pr-labels.yaml b/.github/workflows/pr-labels.yaml
new file mode 100644
index 0000000000..268536eeeb
--- /dev/null
+++ b/.github/workflows/pr-labels.yaml
@@ -0,0 +1,24 @@
+name: PR labels
+
+on: [pull_request]
+
+
+jobs:
+  pr-label:
+    runs-on: ubuntu-latest
+    name: PR label
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - id: pr_labels
+      run: script/pr-labels ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}
+    - uses: octokit/request-action@v2.0.7
+      if: ${{ steps.pr_labels.outputs.labels != '[""]' }}
+      with:
+        route: POST /repos/:repository/issues/:number/labels
+        number: ${{ github.event.number }}
+        repository: ${{ github.repository }}
+        labels: ${{ steps.pr_labels.outputs.labels }}
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/script/pr-labels b/script/pr-labels
new file mode 100755
index 0000000000..ef5eb8e57f
--- /dev/null
+++ b/script/pr-labels
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+components=()
+for c_diff in $(git diff ${1}..${2} --name-only esphome/components); do
+  base=${c_diff#esphome/components/}
+  component=`dirname ${base}`
+
+  if [[ "${component}" == "." ]]; then
+    component=${platform}
+  fi
+
+  if [[ ! "${components[@]}" =~ "${component}" ]]; then
+    components+=($component)
+  fi
+done
+
+labels=()
+
+echo "Components:"
+for component in ${components[@]}; do
+  echo "  ${component}"
+  labels+=("component: $component")
+done
+
+echo "Labels: ${labels[@]}"
+
+output=$(printf '%s\n' "${labels[@]}" | jq -R . | jq -c -s .)
+
+echo "::set-output name=labels::${output}"

From 1a47e4b5243bc9405589149d7c7d6844589c0270 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 12 Jul 2020 14:36:07 -0300
Subject: [PATCH 287/412] update test readme

---
 tests/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/tests/README.md b/tests/README.md
index af650a2565..c8962dedc1 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -9,3 +9,17 @@ Of course this is all just very high-level and things like
 unit tests would be much better. So if you have time and know
 how to set up a unit testing framework for python, please do
 give it a try.
+
+When adding entries in test_.yaml files we usually need only
+one file updated, unless conflicting code is generated for
+different configurations, e.g. `wifi` and `ethernet` cannot
+be tested on the same device.
+
+Current test_.yaml file contents.
+
+| Test name | Platform | Network |
+|-|-|-|
+| test1.yaml | ESP32 | wifi |
+| test2.yaml | ESP32 | ethernet |
+| test3.yaml | ESP8266 | wifi |
+| test4.yaml | ESP32 | ethernet |

From 5d136a18afb9382a1ef3e3d7ee17c3c7e91591d0 Mon Sep 17 00:00:00 2001
From: vxider <lb@vxider.com>
Date: Mon, 13 Jul 2020 02:12:28 +0800
Subject: [PATCH 288/412] brightness support for nextion (#1109)

---
 esphome/components/nextion/display.py  | 5 ++++-
 esphome/components/nextion/nextion.cpp | 1 +
 esphome/components/nextion/nextion.h   | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/esphome/components/nextion/display.py b/esphome/components/nextion/display.py
index 30d7519380..394de69585 100644
--- a/esphome/components/nextion/display.py
+++ b/esphome/components/nextion/display.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import display, uart
-from esphome.const import CONF_ID, CONF_LAMBDA
+from esphome.const import CONF_ID, CONF_LAMBDA, CONF_BRIGHTNESS
 from . import nextion_ns
 
 DEPENDENCIES = ['uart']
@@ -12,6 +12,7 @@ NextionRef = Nextion.operator('ref')
 
 CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(Nextion),
+    cv.Optional(CONF_BRIGHTNESS, default=1.0): cv.percentage,
 }).extend(cv.polling_component_schema('5s')).extend(uart.UART_DEVICE_SCHEMA)
 
 
@@ -20,6 +21,8 @@ def to_code(config):
     yield cg.register_component(var, config)
     yield uart.register_uart_device(var, config)
 
+    if CONF_BRIGHTNESS in config:
+        cg.add(var.set_brightness(config[CONF_BRIGHTNESS]))
     if CONF_LAMBDA in config:
         lambda_ = yield cg.process_lambda(config[CONF_LAMBDA], [(NextionRef, 'it')],
                                           return_type=cg.void)
diff --git a/esphome/components/nextion/nextion.cpp b/esphome/components/nextion/nextion.cpp
index e594e147f4..d18d9f33d8 100644
--- a/esphome/components/nextion/nextion.cpp
+++ b/esphome/components/nextion/nextion.cpp
@@ -9,6 +9,7 @@ static const char *TAG = "nextion";
 void Nextion::setup() {
   this->send_command_no_ack("");
   this->send_command_printf("bkcmd=3");
+  this->set_backlight_brightness(static_cast<uint8_t>(brightness_ * 100));
   this->goto_page("0");
 }
 float Nextion::get_setup_priority() const { return setup_priority::PROCESSOR; }
diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index bd37e241e9..a55ff747ee 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -365,6 +365,7 @@ class Nextion : public PollingComponent, public uart::UARTDevice {
   // (In most use cases you won't need these)
   void register_touch_component(NextionTouchComponent *obj) { this->touch_.push_back(obj); }
   void setup() override;
+  void set_brightness(float brightness) { this->brightness_ = brightness; }
   float get_setup_priority() const override;
   void update() override;
   void loop() override;
@@ -392,6 +393,7 @@ class Nextion : public PollingComponent, public uart::UARTDevice {
   std::vector<NextionTouchComponent *> touch_;
   optional<nextion_writer_t> writer_;
   bool wait_for_ack_{true};
+  float brightness_{1.0};
 };
 
 class NextionTouchComponent : public binary_sensor::BinarySensorInitiallyOff {

From 6e30bacae3eb891bd4a9dabb26f3aafcddaf11c1 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 13 Jul 2020 09:19:02 +1200
Subject: [PATCH 289/412] Revert "Add PR labels based on files changed (#1127)"
 (#1128)

This reverts commit c296b4c34840e2e9f4d959707c69dafddbf7d78d.
---
 .github/workflows/pr-labels.yaml | 24 ------------------------
 script/pr-labels                 | 29 -----------------------------
 2 files changed, 53 deletions(-)
 delete mode 100644 .github/workflows/pr-labels.yaml
 delete mode 100755 script/pr-labels

diff --git a/.github/workflows/pr-labels.yaml b/.github/workflows/pr-labels.yaml
deleted file mode 100644
index 268536eeeb..0000000000
--- a/.github/workflows/pr-labels.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: PR labels
-
-on: [pull_request]
-
-
-jobs:
-  pr-label:
-    runs-on: ubuntu-latest
-    name: PR label
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - id: pr_labels
-      run: script/pr-labels ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}
-    - uses: octokit/request-action@v2.0.7
-      if: ${{ steps.pr_labels.outputs.labels != '[""]' }}
-      with:
-        route: POST /repos/:repository/issues/:number/labels
-        number: ${{ github.event.number }}
-        repository: ${{ github.repository }}
-        labels: ${{ steps.pr_labels.outputs.labels }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/script/pr-labels b/script/pr-labels
deleted file mode 100755
index ef5eb8e57f..0000000000
--- a/script/pr-labels
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-components=()
-for c_diff in $(git diff ${1}..${2} --name-only esphome/components); do
-  base=${c_diff#esphome/components/}
-  component=`dirname ${base}`
-
-  if [[ "${component}" == "." ]]; then
-    component=${platform}
-  fi
-
-  if [[ ! "${components[@]}" =~ "${component}" ]]; then
-    components+=($component)
-  fi
-done
-
-labels=()
-
-echo "Components:"
-for component in ${components[@]}; do
-  echo "  ${component}"
-  labels+=("component: $component")
-done
-
-echo "Labels: ${labels[@]}"
-
-output=$(printf '%s\n' "${labels[@]}" | jq -R . | jq -c -s .)
-
-echo "::set-output name=labels::${output}"

From 582ac4ac81bc6cd819a93bc200ab25f59b82d069 Mon Sep 17 00:00:00 2001
From: Joppy <joppyfurr@gmail.com>
Date: Tue, 14 Jul 2020 00:23:53 +1200
Subject: [PATCH 290/412] Add support for Toshiba heat pumps (#1121)

The IR signals are based on captures from the WH-H01EE remote
controller.

Both transmit and receive are supported.
---
 esphome/components/toshiba/__init__.py |   0
 esphome/components/toshiba/climate.py  |  18 +++
 esphome/components/toshiba/toshiba.cpp | 204 +++++++++++++++++++++++++
 esphome/components/toshiba/toshiba.h   |  21 +++
 tests/test1.yaml                       |   2 +
 5 files changed, 245 insertions(+)
 create mode 100644 esphome/components/toshiba/__init__.py
 create mode 100644 esphome/components/toshiba/climate.py
 create mode 100644 esphome/components/toshiba/toshiba.cpp
 create mode 100644 esphome/components/toshiba/toshiba.h

diff --git a/esphome/components/toshiba/__init__.py b/esphome/components/toshiba/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/toshiba/climate.py b/esphome/components/toshiba/climate.py
new file mode 100644
index 0000000000..ea7efbf2f5
--- /dev/null
+++ b/esphome/components/toshiba/climate.py
@@ -0,0 +1,18 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
+
+AUTO_LOAD = ['climate_ir']
+
+toshiba_ns = cg.esphome_ns.namespace('toshiba')
+ToshibaClimate = toshiba_ns.class_('ToshibaClimate', climate_ir.ClimateIR)
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(ToshibaClimate),
+})
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/toshiba/toshiba.cpp b/esphome/components/toshiba/toshiba.cpp
new file mode 100644
index 0000000000..33e2831dd3
--- /dev/null
+++ b/esphome/components/toshiba/toshiba.cpp
@@ -0,0 +1,204 @@
+#include "toshiba.h"
+
+namespace esphome {
+namespace toshiba {
+
+const uint16_t TOSHIBA_HEADER_MARK = 4380;
+const uint16_t TOSHIBA_HEADER_SPACE = 4370;
+const uint16_t TOSHIBA_GAP_SPACE = 5480;
+const uint16_t TOSHIBA_BIT_MARK = 540;
+const uint16_t TOSHIBA_ZERO_SPACE = 540;
+const uint16_t TOSHIBA_ONE_SPACE = 1620;
+
+const uint8_t TOSHIBA_COMMAND_DEFAULT = 0x01;
+const uint8_t TOSHIBA_COMMAND_TIMER = 0x02;
+const uint8_t TOSHIBA_COMMAND_POWER = 0x08;
+const uint8_t TOSHIBA_COMMAND_MOTION = 0x02;
+
+const uint8_t TOSHIBA_MODE_AUTO = 0x00;
+const uint8_t TOSHIBA_MODE_COOL = 0x01;
+const uint8_t TOSHIBA_MODE_DRY = 0x02;
+const uint8_t TOSHIBA_MODE_HEAT = 0x03;
+const uint8_t TOSHIBA_MODE_FAN_ONLY = 0x04;
+const uint8_t TOSHIBA_MODE_OFF = 0x07;
+
+const uint8_t TOSHIBA_FAN_SPEED_AUTO = 0x00;
+const uint8_t TOSHIBA_FAN_SPEED_QUIET = 0x20;
+const uint8_t TOSHIBA_FAN_SPEED_1 = 0x40;
+const uint8_t TOSHIBA_FAN_SPEED_2 = 0x60;
+const uint8_t TOSHIBA_FAN_SPEED_3 = 0x80;
+const uint8_t TOSHIBA_FAN_SPEED_4 = 0xa0;
+const uint8_t TOSHIBA_FAN_SPEED_5 = 0xc0;
+
+const uint8_t TOSHIBA_POWER_HIGH = 0x01;
+const uint8_t TOSHIBA_POWER_ECO = 0x03;
+
+const uint8_t TOSHIBA_MOTION_SWING = 0x04;
+const uint8_t TOSHIBA_MOTION_FIX = 0x00;
+
+static const char *TAG = "toshiba.climate";
+
+void ToshibaClimate::transmit_state() {
+  uint8_t message[16] = {0};
+  uint8_t message_length = 9;
+
+  /* Header */
+  message[0] = 0xf2;
+  message[1] = 0x0d;
+
+  /* Message length */
+  message[2] = message_length - 6;
+
+  /* First checksum */
+  message[3] = message[0] ^ message[1] ^ message[2];
+
+  /* Command */
+  message[4] = TOSHIBA_COMMAND_DEFAULT;
+
+  /* Temperature */
+  uint8_t temperature = static_cast<uint8_t>(this->target_temperature);
+  if (temperature < 17) {
+    temperature = 17;
+  }
+  if (temperature > 30) {
+    temperature = 30;
+  }
+  message[5] = (temperature - 17) << 4;
+
+  /* Mode and fan */
+  uint8_t mode;
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_OFF:
+      mode = TOSHIBA_MODE_OFF;
+      break;
+
+    case climate::CLIMATE_MODE_HEAT:
+      mode = TOSHIBA_MODE_HEAT;
+      break;
+
+    case climate::CLIMATE_MODE_COOL:
+      mode = TOSHIBA_MODE_COOL;
+      break;
+
+    case climate::CLIMATE_MODE_AUTO:
+    default:
+      mode = TOSHIBA_MODE_AUTO;
+  }
+
+  message[6] |= mode | TOSHIBA_FAN_SPEED_AUTO;
+
+  /* Zero */
+  message[7] = 0x00;
+
+  /* If timers bit in the command is set, two extra bytes are added here */
+
+  /* If power bit is set in the command, one extra byte is added here */
+
+  /* The last byte is the xor of all bytes from [4] */
+  for (uint8_t i = 4; i < 8; i++) {
+    message[8] ^= message[i];
+  }
+
+  /* Transmit */
+  auto transmit = this->transmitter_->transmit();
+  auto data = transmit.get_data();
+  data->set_carrier_frequency(38000);
+
+  for (uint8_t copy = 0; copy < 2; copy++) {
+    data->mark(TOSHIBA_HEADER_MARK);
+    data->space(TOSHIBA_HEADER_SPACE);
+
+    for (uint8_t byte = 0; byte < message_length; byte++) {
+      for (uint8_t bit = 0; bit < 8; bit++) {
+        data->mark(TOSHIBA_BIT_MARK);
+        if (message[byte] & (1 << (7 - bit))) {
+          data->space(TOSHIBA_ONE_SPACE);
+        } else {
+          data->space(TOSHIBA_ZERO_SPACE);
+        }
+      }
+    }
+
+    data->mark(TOSHIBA_BIT_MARK);
+    data->space(TOSHIBA_GAP_SPACE);
+  }
+
+  transmit.perform();
+}
+
+bool ToshibaClimate::on_receive(remote_base::RemoteReceiveData data) {
+  uint8_t message[16] = {0};
+  uint8_t message_length = 4;
+
+  /* Validate header */
+  if (!data.expect_item(TOSHIBA_HEADER_MARK, TOSHIBA_HEADER_SPACE)) {
+    return false;
+  }
+
+  /* Decode bytes */
+  for (uint8_t byte = 0; byte < message_length; byte++) {
+    for (uint8_t bit = 0; bit < 8; bit++) {
+      if (data.expect_item(TOSHIBA_BIT_MARK, TOSHIBA_ONE_SPACE)) {
+        message[byte] |= 1 << (7 - bit);
+      } else if (data.expect_item(TOSHIBA_BIT_MARK, TOSHIBA_ZERO_SPACE)) {
+        /* Bit is already clear */
+      } else {
+        return false;
+      }
+    }
+
+    /* Update length */
+    if (byte == 3) {
+      /* Validate the first checksum before trusting the length field */
+      if ((message[0] ^ message[1] ^ message[2]) != message[3]) {
+        return false;
+      }
+      message_length = message[2] + 6;
+    }
+  }
+
+  /* Validate the second checksum before trusting any more of the message */
+  uint8_t checksum = 0;
+  for (uint8_t i = 4; i < message_length - 1; i++) {
+    checksum ^= message[i];
+  }
+
+  if (checksum != message[message_length - 1]) {
+    return false;
+  }
+
+  /* Check if this is a short swing/fix message */
+  if (message[4] & TOSHIBA_COMMAND_MOTION) {
+    /* Not supported yet */
+    return false;
+  }
+
+  /* Get the mode. */
+  switch (message[6] & 0x0f) {
+    case TOSHIBA_MODE_OFF:
+      this->mode = climate::CLIMATE_MODE_OFF;
+      break;
+
+    case TOSHIBA_MODE_HEAT:
+      this->mode = climate::CLIMATE_MODE_HEAT;
+      break;
+
+    case TOSHIBA_MODE_COOL:
+      this->mode = climate::CLIMATE_MODE_COOL;
+      break;
+
+    case TOSHIBA_MODE_AUTO:
+    default:
+      /* Note: Dry and Fan-only modes are reported as Auto, as they are not supported yet */
+      this->mode = climate::CLIMATE_MODE_AUTO;
+  }
+
+  /* Get the target temperature */
+  this->target_temperature = (message[5] >> 4) + 17;
+
+  this->publish_state();
+  return true;
+}
+
+} /* namespace toshiba */
+} /* namespace esphome */
diff --git a/esphome/components/toshiba/toshiba.h b/esphome/components/toshiba/toshiba.h
new file mode 100644
index 0000000000..3ab0dcdcdb
--- /dev/null
+++ b/esphome/components/toshiba/toshiba.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace toshiba {
+
+const float TOSHIBA_TEMP_MIN = 17.0;
+const float TOSHIBA_TEMP_MAX = 30.0;
+
+class ToshibaClimate : public climate_ir::ClimateIR {
+ public:
+  ToshibaClimate() : climate_ir::ClimateIR(TOSHIBA_TEMP_MIN, TOSHIBA_TEMP_MAX, 1.0f) {}
+
+ protected:
+  void transmit_state() override;
+  bool on_receive(remote_base::RemoteReceiveData data) override;
+};
+
+} /* namespace toshiba */
+} /* namespace esphome */
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 63320dfe29..4a47ffd7b9 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1281,6 +1281,8 @@ climate:
     name: Whirlpool Climate
   - platform: climate_ir_lg
     name: LG Climate
+  - platform: toshiba
+    name: Toshiba Climate
 
 switch:
   - platform: gpio

From e6f42fa6f0934a4fae64b110d1c91e0c950d09a2 Mon Sep 17 00:00:00 2001
From: Dmitry Berezovsky <corvis@users.noreply.github.com>
Date: Mon, 13 Jul 2020 17:45:06 +0300
Subject: [PATCH 291/412] Packages feature (#1052)

* Started to work on packages feature

* Added some more validation to packages config

* Fixed some linter warnings

* Updated tests

* Reordered consts to avoid linter error

* Reordered consts to avoid linter error

* Refactored test yaml files to integrate into existing test pipeline

Co-authored-by: Dmitry Berezovsky <dmitry.berezovsky@logicify.com>
---
 esphome/components/packages/__init__.py       | 51 +++++++++++++++++++
 esphome/config.py                             | 13 ++++-
 esphome/const.py                              |  1 +
 requirements.txt                              |  1 +
 requirements_test.txt                         |  1 +
 setup.py                                      |  1 +
 tests/test1.yaml                              |  7 +++
 .../test_packages/test_packages_package1.yaml |  2 +
 .../test_packages_package_wifi.yaml           |  4 ++
 tests/test_packages/test_uptime_sensor.yaml   |  5 ++
 10 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/packages/__init__.py
 create mode 100644 tests/test_packages/test_packages_package1.yaml
 create mode 100644 tests/test_packages/test_packages_package_wifi.yaml
 create mode 100644 tests/test_packages/test_uptime_sensor.yaml

diff --git a/esphome/components/packages/__init__.py b/esphome/components/packages/__init__.py
new file mode 100644
index 0000000000..729af4a9a0
--- /dev/null
+++ b/esphome/components/packages/__init__.py
@@ -0,0 +1,51 @@
+from deepmerge import conservative_merger as package_merger
+
+import esphome.config_validation as cv
+
+from esphome.const import CONF_PACKAGES
+
+VALID_PACKAGE_NAME_CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'
+
+
+def _merge_package(config, package_name, package_config):
+    config = config.copy()
+    package_merger.merge(config, package_config)
+    return config
+
+
+def _is_valid_package_name(value: str) -> bool:
+    if not value:
+        return False
+    if value[0].isdigit():
+        return False
+    try:
+        cv.valid_name(value)
+    except cv.Invalid:
+        return False
+    return True
+
+
+def do_packages_pass(config: dict):
+    if CONF_PACKAGES not in config:
+        return
+    packages = config[CONF_PACKAGES]
+    temp_config = config.copy()
+    with cv.prepend_path(CONF_PACKAGES):
+        if packages is not None and not isinstance(packages, dict):
+            raise cv.Invalid("Packages must be a key to value mapping, got {} instead"
+                             "".format(type(packages)))
+        for package_name, package_config in packages.items():
+            with cv.prepend_path(package_name):
+                if not isinstance(package_config, dict):
+                    raise cv.Invalid("Package definition must be a dictionary containing valid "
+                                     "esphome configuration to be merged with the main "
+                                     "config, got {} instead"
+                                     .format(type(package_config)))
+                if not _is_valid_package_name(package_name):
+                    raise cv.Invalid("Package name is invalid. Valid name should consist of "
+                                     "letters, numbers and underscores. It shouldn't also "
+                                     "start with number")
+                temp_config = _merge_package(temp_config, package_name, package_config)
+        del temp_config[CONF_PACKAGES]
+        config.clear()
+        config.update(temp_config)
diff --git a/esphome/config.py b/esphome/config.py
index 741b4fb04a..6f3a498444 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -12,8 +12,9 @@ import voluptuous as vol
 
 from esphome import core, core_config, yaml_util
 from esphome.components import substitutions
+from esphome.components.packages import do_packages_pass
 from esphome.components.substitutions import CONF_SUBSTITUTIONS
-from esphome.const import CONF_ESPHOME, CONF_PLATFORM, ESP_PLATFORMS
+from esphome.const import CONF_ESPHOME, CONF_PLATFORM, ESP_PLATFORMS, CONF_PACKAGES
 from esphome.core import CORE, EsphomeError  # noqa
 from esphome.helpers import color, indent
 from esphome.util import safe_print, OrderedDict
@@ -390,6 +391,16 @@ def recursive_check_replaceme(value):
 def validate_config(config, command_line_substitutions):
     result = Config()
 
+    # 0. Load packages
+    if CONF_PACKAGES in config:
+        result.add_output_path([CONF_PACKAGES], CONF_PACKAGES)
+        try:
+            do_packages_pass(config)
+        except vol.Invalid as err:
+            result.update(config)
+            result.add_error(err)
+            return result
+
     # 1. Load substitutions
     if CONF_SUBSTITUTIONS in config:
         result[CONF_SUBSTITUTIONS] = {**config[CONF_SUBSTITUTIONS], **command_line_substitutions}
diff --git a/esphome/const.py b/esphome/const.py
index 1760db0dab..45b5e5e209 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -342,6 +342,7 @@ CONF_OUTPUT = 'output'
 CONF_OUTPUT_ID = 'output_id'
 CONF_OUTPUTS = 'outputs'
 CONF_OVERSAMPLING = 'oversampling'
+CONF_PACKAGES = 'packages'
 CONF_PAGE_ID = 'page_id'
 CONF_PAGES = 'pages'
 CONF_PANASONIC = 'panasonic'
diff --git a/requirements.txt b/requirements.txt
index 0c99eaccbe..0a3573f7b0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,3 +11,4 @@ ifaddr==0.1.6
 platformio==4.3.3
 esptool==2.8
 click==7.1.2
+deepmerge==0.1.0
diff --git a/requirements_test.txt b/requirements_test.txt
index b90c4ea969..da4656b085 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -10,6 +10,7 @@ pyserial==3.4
 ifaddr==0.1.6
 platformio==4.3.3
 esptool==2.8
+deepmerge==0.1.0
 
 pylint==2.5.0
 flake8==3.7.9
diff --git a/setup.py b/setup.py
index 0a19dccf95..ede80b34e1 100755
--- a/setup.py
+++ b/setup.py
@@ -33,6 +33,7 @@ REQUIRES = [
     'pytz==2020.1',
     'pyserial==3.4',
     'ifaddr==0.1.6',
+    'deepmerge==0.1.0'
 ]
 
 # If you have problems importing platformio and esptool as modules you can set
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 4a47ffd7b9..b131b1a6ab 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1,3 +1,6 @@
+substitutions:
+  devicename: test1
+
 esphome:
   name: test1
   platform: ESP32
@@ -25,6 +28,10 @@ esphome:
           white: 100%
   build_path: build/test1
 
+packages:
+  wifi: !include test_packages/test_packages_package_wifi.yaml
+  pkg_test: !include test_packages/test_packages_package1.yaml
+
 wifi:
   networks:
   - ssid: 'MySSID'
diff --git a/tests/test_packages/test_packages_package1.yaml b/tests/test_packages/test_packages_package1.yaml
new file mode 100644
index 0000000000..0495984d42
--- /dev/null
+++ b/tests/test_packages/test_packages_package1.yaml
@@ -0,0 +1,2 @@
+sensor:
+  - <<: !include ./test_uptime_sensor.yaml
diff --git a/tests/test_packages/test_packages_package_wifi.yaml b/tests/test_packages/test_packages_package_wifi.yaml
new file mode 100644
index 0000000000..7d5d41ddab
--- /dev/null
+++ b/tests/test_packages/test_packages_package_wifi.yaml
@@ -0,0 +1,4 @@
+wifi:
+  networks:
+  - ssid: 'WiFiFromPackage'
+    password: 'password1'
diff --git a/tests/test_packages/test_uptime_sensor.yaml b/tests/test_packages/test_uptime_sensor.yaml
new file mode 100644
index 0000000000..1bf52a6d0b
--- /dev/null
+++ b/tests/test_packages/test_uptime_sensor.yaml
@@ -0,0 +1,5 @@
+# Uptime sensor.
+platform: uptime
+id: ${devicename}_uptime_pcg
+name: Uptime From Package
+update_interval: 5min

From 351ecf9bd4f3322c110347fabb80cea672fbd1a3 Mon Sep 17 00:00:00 2001
From: Carlos Gustavo Sarmiento <carlos@sarmiento.io>
Date: Mon, 13 Jul 2020 15:30:17 -0500
Subject: [PATCH 292/412] Allow updating pid control params (#1115)

---
 esphome/components/pid/climate.py             | 26 +++++++++++++++++++
 esphome/components/pid/pid_climate.h          | 25 ++++++++++++++++++
 esphome/components/pid/sensor/__init__.py     |  3 +++
 .../pid/sensor/pid_climate_sensor.cpp         | 12 +++++++++
 .../pid/sensor/pid_climate_sensor.h           |  3 +++
 tests/test3.yaml                              | 23 ++++++++++++++++
 6 files changed, 92 insertions(+)

diff --git a/esphome/components/pid/climate.py b/esphome/components/pid/climate.py
index 97a98efc20..446c614f14 100644
--- a/esphome/components/pid/climate.py
+++ b/esphome/components/pid/climate.py
@@ -8,6 +8,7 @@ pid_ns = cg.esphome_ns.namespace('pid')
 PIDClimate = pid_ns.class_('PIDClimate', climate.Climate, cg.Component)
 PIDAutotuneAction = pid_ns.class_('PIDAutotuneAction', automation.Action)
 PIDResetIntegralTermAction = pid_ns.class_('PIDResetIntegralTermAction', automation.Action)
+PIDSetControlParametersAction = pid_ns.class_('PIDSetControlParametersAction', automation.Action)
 
 CONF_DEFAULT_TARGET_TEMPERATURE = 'default_target_temperature'
 
@@ -90,3 +91,28 @@ def esp8266_set_frequency_to_code(config, action_id, template_arg, args):
     cg.add(var.set_positive_output(config[CONF_POSITIVE_OUTPUT]))
     cg.add(var.set_negative_output(config[CONF_NEGATIVE_OUTPUT]))
     yield var
+
+
+@automation.register_action(
+    'climate.pid.set_control_parameters',
+    PIDSetControlParametersAction,
+    automation.maybe_simple_id({
+        cv.Required(CONF_ID): cv.use_id(PIDClimate),
+        cv.Required(CONF_KP): cv.templatable(cv.float_),
+        cv.Optional(CONF_KI, default=0.0): cv.templatable(cv.float_),
+        cv.Optional(CONF_KD, default=0.0): cv.templatable(cv.float_),
+    })
+)
+def set_control_parameters(config, action_id, template_arg, args):
+    paren = yield cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_arg, paren)
+
+    kp_template_ = yield cg.templatable(config[CONF_KP], args, float)
+    cg.add(var.set_kp(kp_template_))
+
+    ki_template_ = yield cg.templatable(config[CONF_KI], args, float)
+    cg.add(var.set_ki(ki_template_))
+
+    kd_template_ = yield cg.templatable(config[CONF_KD], args, float)
+    cg.add(var.set_kd(kd_template_))
+    yield var
diff --git a/esphome/components/pid/pid_climate.h b/esphome/components/pid/pid_climate.h
index 12436e225c..f11d768867 100644
--- a/esphome/components/pid/pid_climate.h
+++ b/esphome/components/pid/pid_climate.h
@@ -29,6 +29,9 @@ class PIDClimate : public climate::Climate, public Component {
 
   float get_output_value() const { return output_value_; }
   float get_error_value() const { return controller_.error; }
+  float get_kp() { return controller_.kp; }
+  float get_ki() { return controller_.ki; }
+  float get_kd() { return controller_.kd; }
   float get_proportional_term() const { return controller_.proportional_term; }
   float get_integral_term() const { return controller_.integral_term; }
   float get_derivative_term() const { return controller_.derivative_term; }
@@ -101,5 +104,27 @@ template<typename... Ts> class PIDResetIntegralTermAction : public Action<Ts...>
   PIDClimate *parent_;
 };
 
+template<typename... Ts> class PIDSetControlParametersAction : public Action<Ts...> {
+ public:
+  PIDSetControlParametersAction(PIDClimate *parent) : parent_(parent) {}
+
+  void play(Ts... x) {
+    auto kp = this->kp_.value(x...);
+    auto ki = this->ki_.value(x...);
+    auto kd = this->kd_.value(x...);
+
+    this->parent_->set_kp(kp);
+    this->parent_->set_ki(ki);
+    this->parent_->set_kd(kd);
+  }
+
+ protected:
+  TEMPLATABLE_VALUE(float, kp)
+  TEMPLATABLE_VALUE(float, ki)
+  TEMPLATABLE_VALUE(float, kd)
+
+  PIDClimate *parent_;
+};
+
 }  // namespace pid
 }  // namespace esphome
diff --git a/esphome/components/pid/sensor/__init__.py b/esphome/components/pid/sensor/__init__.py
index cfab23d204..ff8cf15eb5 100644
--- a/esphome/components/pid/sensor/__init__.py
+++ b/esphome/components/pid/sensor/__init__.py
@@ -15,6 +15,9 @@ PID_CLIMATE_SENSOR_TYPES = {
     'DERIVATIVE': PIDClimateSensorType.PID_SENSOR_TYPE_DERIVATIVE,
     'HEAT': PIDClimateSensorType.PID_SENSOR_TYPE_HEAT,
     'COOL': PIDClimateSensorType.PID_SENSOR_TYPE_COOL,
+    'KP': PIDClimateSensorType.PID_SENSOR_TYPE_KP,
+    'KI': PIDClimateSensorType.PID_SENSOR_TYPE_KI,
+    'KD': PIDClimateSensorType.PID_SENSOR_TYPE_KD,
 }
 
 CONF_CLIMATE_ID = 'climate_id'
diff --git a/esphome/components/pid/sensor/pid_climate_sensor.cpp b/esphome/components/pid/sensor/pid_climate_sensor.cpp
index 6241a139f6..f60627b6ac 100644
--- a/esphome/components/pid/sensor/pid_climate_sensor.cpp
+++ b/esphome/components/pid/sensor/pid_climate_sensor.cpp
@@ -35,6 +35,18 @@ void PIDClimateSensor::update_from_parent_() {
     case PID_SENSOR_TYPE_COOL:
       value = clamp(-this->parent_->get_output_value(), 0.0f, 1.0f);
       break;
+    case PID_SENSOR_TYPE_KP:
+      value = this->parent_->get_kp();
+      this->publish_state(value);
+      return;
+    case PID_SENSOR_TYPE_KI:
+      value = this->parent_->get_ki();
+      this->publish_state(value);
+      return;
+    case PID_SENSOR_TYPE_KD:
+      value = this->parent_->get_kd();
+      this->publish_state(value);
+      return;
     default:
       value = NAN;
       break;
diff --git a/esphome/components/pid/sensor/pid_climate_sensor.h b/esphome/components/pid/sensor/pid_climate_sensor.h
index 85759f1eaf..f3774610f8 100644
--- a/esphome/components/pid/sensor/pid_climate_sensor.h
+++ b/esphome/components/pid/sensor/pid_climate_sensor.h
@@ -14,6 +14,9 @@ enum PIDClimateSensorType {
   PID_SENSOR_TYPE_DERIVATIVE,
   PID_SENSOR_TYPE_HEAT,
   PID_SENSOR_TYPE_COOL,
+  PID_SENSOR_TYPE_KP,
+  PID_SENSOR_TYPE_KI,
+  PID_SENSOR_TYPE_KD,
 };
 
 class PIDClimateSensor : public sensor::Sensor, public Component {
diff --git a/tests/test3.yaml b/tests/test3.yaml
index ef464fd5b7..3854a528f4 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -169,6 +169,13 @@ api:
       then:
         - tm1651.turn_off:
             id: tm1651_battery
+    - service: pid_set_control_parameters
+      then:
+        - climate.pid.set_control_parameters:
+            id: pid_climate
+            kp: 1.0
+            kd: 1.0
+            ki: 1.0
 
 wifi:
   ssid: 'MySSID'
@@ -681,6 +688,17 @@ climate:
     away_config:
       default_target_temperature_low: 16°C
       default_target_temperature_high: 20°C
+  - platform: pid
+    id: pid_climate
+    name: "PID Climate Controller"
+    sensor: ha_hello_world
+    default_target_temperature: 21°C
+    heat_output: my_slow_pwm
+    control_parameters:
+      kp: 0.0
+      ki: 0.0
+      kd: 0.0
+    
 
 cover:
   - platform: endstop
@@ -761,6 +779,11 @@ output:
     id: dimmer1
     gate_pin: GPIO5
     zero_cross_pin: GPIO12
+  - platform: slow_pwm
+    pin: GPIO5
+    id: my_slow_pwm
+    period: 15s
+
 
 mcp23017:
   id: mcp23017_hub

From c8a4eb426c289d835e87ef0bcaf12c64ee7982f3 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 14 Jul 2020 10:55:15 +1200
Subject: [PATCH 293/412] Github actions repo (#1130)

* Revert dev release to esphome repo

* Delete gitlab ci

* Delete travis file
---
 .github/workflows/release-dev.yaml |   6 +-
 .gitlab-ci.yml                     | 347 -----------------------------
 .travis.yml                        |  44 ----
 3 files changed, 3 insertions(+), 394 deletions(-)
 delete mode 100644 .gitlab-ci.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml
index 42e9723f4f..7f71d79610 100644
--- a/.github/workflows/release-dev.yaml
+++ b/.github/workflows/release-dev.yaml
@@ -77,11 +77,11 @@ jobs:
       run: |
         if [[ "${{ matrix.build-type }}" == "hassio" ]]; then
           BUILD_FROM=esphome/esphome-hassio-base-${{ matrix.arch }}:${BASE_VERSION}
-          BUILD_TO=glmnet/esphome-hassio-${{ matrix.arch }}
+          BUILD_TO=${{ github.repository }}-hassio-${{ matrix.arch }}
           DOCKERFILE=docker/Dockerfile.hassio
         else
           BUILD_FROM=esphome/esphome-base-${{ matrix.arch }}:${BASE_VERSION}
-          BUILD_TO=glmnet/esphome-${{ matrix.arch }}
+          BUILD_TO=${{ github.repository }}-${{ matrix.arch }}
           DOCKERFILE=docker/Dockerfile
         fi
 
@@ -112,7 +112,7 @@ jobs:
         DOCKER_USER: ${{ secrets.DOCKER_USER }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
     - run: |
-        REPO=glmnet/esphome
+        REPO=${{ github.repository }}
 
         docker manifest create ${REPO}:dev \
           ${REPO}-aarch64:dev \
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 1d349c4059..0000000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,347 +0,0 @@
----
-# Based on https://gitlab.com/hassio-addons/addon-node-red/blob/master/.gitlab-ci.yml
-variables:
-  DOCKER_DRIVER: overlay2
-  DOCKER_HOST: tcp://docker:2375/
-  BASE_VERSION: '2.1.1'
-  TZ: UTC
-
-stages:
-  - lint
-  - test
-  - deploy
-
-.lint: &lint
-  image: esphome/esphome-lint:latest
-  stage: lint
-  before_script:
-    - script/setup
-  tags:
-    - docker
-
-.test: &test
-  image: esphome/esphome-lint:latest
-  stage: test
-  before_script:
-    - script/setup
-  tags:
-    - docker
-
-.docker-base: &docker-base
-  image: esphome/esphome-base-builder
-  before_script:
-    - docker info
-    - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
-  script:
-    - docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
-    - TAG="${CI_COMMIT_TAG#v}"
-    - TAG="${TAG:-${CI_COMMIT_SHA:0:7}}"
-    - echo "Tag ${TAG}"
-
-    - |
-      if [[ "${IS_HASSIO}" == "YES" ]]; then
-        BUILD_FROM=esphome/esphome-hassio-base-${BUILD_ARCH}:${BASE_VERSION}
-        BUILD_TO=esphome/esphome-hassio-${BUILD_ARCH}
-        DOCKERFILE=docker/Dockerfile.hassio
-      else
-        BUILD_FROM=esphome/esphome-base-${BUILD_ARCH}:${BASE_VERSION}
-        if [[ "${BUILD_ARCH}" == "amd64" ]]; then
-          BUILD_TO=esphome/esphome
-        else
-          BUILD_TO=esphome/esphome-${BUILD_ARCH}
-        fi
-        DOCKERFILE=docker/Dockerfile
-      fi
-
-    - |
-      docker build \
-        --build-arg "BUILD_FROM=${BUILD_FROM}" \
-        --build-arg "BUILD_VERSION=${TAG}" \
-        --tag "${BUILD_TO}:${TAG}" \
-        --file "${DOCKERFILE}" \
-        .
-    - |
-      if [[ "${RELEASE}" = "YES" ]]; then
-        echo "Pushing to ${BUILD_TO}:${TAG}"
-        docker push "${BUILD_TO}:${TAG}"
-      fi
-    - |
-      if [[ "${LATEST}" = "YES" ]]; then
-        echo "Pushing to :latest"
-        docker tag ${BUILD_TO}:${TAG} ${BUILD_TO}:latest
-        docker push ${BUILD_TO}:latest
-      fi
-    - |
-      if [[ "${BETA}" = "YES" ]]; then
-        echo "Pushing to :beta"
-        docker tag \
-          ${BUILD_TO}:${TAG} \
-          ${BUILD_TO}:beta
-        docker push ${BUILD_TO}:beta
-      fi
-    - |
-      if [[ "${DEV}" = "YES" ]]; then
-        echo "Pushing to :dev"
-        docker tag \
-          ${BUILD_TO}:${TAG} \
-          ${BUILD_TO}:dev
-        docker push ${BUILD_TO}:dev
-      fi
-  services:
-    - docker:dind
-  tags:
-    - docker
-  stage: deploy
-
-lint-custom:
-  <<: *lint
-  script:
-    - script/ci-custom.py
-
-lint-python:
-  <<: *lint
-  script:
-    - script/lint-python
-
-lint-tidy:
-  <<: *lint
-  script:
-    - pio init --ide atom
-    - script/clang-tidy --all-headers --fix
-    - script/ci-suggest-changes
-
-lint-format:
-  <<: *lint
-  script:
-    - script/clang-format -i
-    - script/ci-suggest-changes
-
-test1:
-  <<: *test
-  script:
-    - esphome tests/test1.yaml compile
-
-test2:
-  <<: *test
-  script:
-    - esphome tests/test2.yaml compile
-
-test3:
-  <<: *test
-  script:
-    - esphome tests/test3.yaml compile
-
-test4:
-  <<: *test
-  script:
-    - esphome tests/test4.yaml compile
-
-.deploy-pypi: &deploy-pypi
-  <<: *lint
-  stage: deploy
-  script:
-    - pip install twine wheel
-    - python setup.py sdist bdist_wheel
-    - twine upload dist/*
-
-deploy-release:pypi:
-  <<: *deploy-pypi
-  only:
-    - /^v\d+\.\d+\.\d+$/
-  except:
-    - /^(?!master).+@/
-
-deploy-beta:pypi:
-  <<: *deploy-pypi
-  only:
-    - /^v\d+\.\d+\.\d+b\d+$/
-  except:
-    - /^(?!rc).+@/
-
-.latest: &latest
-  <<: *docker-base
-  only:
-    - /^v([0-9\.]+)$/
-  except:
-    - branches
-
-.beta: &beta
-  <<: *docker-base
-  only:
-    - /^v([0-9\.]+b\d+)$/
-  except:
-    - branches
-
-.dev: &dev
-  <<: *docker-base
-  only:
-    - dev
-
-aarch64-beta-docker:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: aarch64
-    IS_HASSIO: "NO"
-    RELEASE: "YES"
-aarch64-beta-hassio:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: aarch64
-    IS_HASSIO: "YES"
-    RELEASE: "YES"
-aarch64-dev-docker:
-  <<: *dev
-  variables:
-    BUILD_ARCH: aarch64
-    DEV: "YES"
-    IS_HASSIO: "NO"
-aarch64-dev-hassio:
-  <<: *dev
-  variables:
-    BUILD_ARCH: aarch64
-    DEV: "YES"
-    IS_HASSIO: "YES"
-aarch64-latest-docker:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: aarch64
-    IS_HASSIO: "NO"
-    LATEST: "YES"
-    RELEASE: "YES"
-aarch64-latest-hassio:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: aarch64
-    IS_HASSIO: "YES"
-    LATEST: "YES"
-    RELEASE: "YES"
-amd64-beta-docker:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: amd64
-    IS_HASSIO: "NO"
-    RELEASE: "YES"
-amd64-beta-hassio:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: amd64
-    IS_HASSIO: "YES"
-    RELEASE: "YES"
-amd64-dev-docker:
-  <<: *dev
-  variables:
-    BUILD_ARCH: amd64
-    DEV: "YES"
-    IS_HASSIO: "NO"
-amd64-dev-hassio:
-  <<: *dev
-  variables:
-    BUILD_ARCH: amd64
-    DEV: "YES"
-    IS_HASSIO: "YES"
-amd64-latest-docker:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: amd64
-    IS_HASSIO: "NO"
-    LATEST: "YES"
-    RELEASE: "YES"
-amd64-latest-hassio:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: amd64
-    IS_HASSIO: "YES"
-    LATEST: "YES"
-    RELEASE: "YES"
-armv7-beta-docker:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: armv7
-    IS_HASSIO: "NO"
-    RELEASE: "YES"
-armv7-beta-hassio:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: armv7
-    IS_HASSIO: "YES"
-    RELEASE: "YES"
-armv7-dev-docker:
-  <<: *dev
-  variables:
-    BUILD_ARCH: armv7
-    DEV: "YES"
-    IS_HASSIO: "NO"
-armv7-dev-hassio:
-  <<: *dev
-  variables:
-    BUILD_ARCH: armv7
-    DEV: "YES"
-    IS_HASSIO: "YES"
-armv7-latest-docker:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: armv7
-    IS_HASSIO: "NO"
-    LATEST: "YES"
-    RELEASE: "YES"
-armv7-latest-hassio:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: armv7
-    IS_HASSIO: "YES"
-    LATEST: "YES"
-    RELEASE: "YES"
-i386-beta-docker:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: i386
-    IS_HASSIO: "NO"
-    RELEASE: "YES"
-i386-beta-hassio:
-  <<: *beta
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: i386
-    IS_HASSIO: "YES"
-    RELEASE: "YES"
-i386-dev-docker:
-  <<: *dev
-  variables:
-    BUILD_ARCH: i386
-    DEV: "YES"
-    IS_HASSIO: "NO"
-i386-dev-hassio:
-  <<: *dev
-  variables:
-    BUILD_ARCH: i386
-    DEV: "YES"
-    IS_HASSIO: "YES"
-i386-latest-docker:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: i386
-    IS_HASSIO: "NO"
-    LATEST: "YES"
-    RELEASE: "YES"
-i386-latest-hassio:
-  <<: *latest
-  variables:
-    BETA: "YES"
-    BUILD_ARCH: i386
-    IS_HASSIO: "YES"
-    LATEST: "YES"
-    RELEASE: "YES"
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3e6c7adccb..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-sudo: false
-language: python
-python: '3.6'
-install: script/setup
-cache:
-  directories:
-    - "~/.platformio"
-
-matrix:
-  fast_finish: true
-  include:
-    - python: "3.7"
-      env: TARGET=Lint3.7
-      script:
-        - script/ci-custom.py
-        - flake8 esphome
-        - pylint esphome
-    - python: "3.6"
-      env: TARGET=Test3.6
-      script:
-        - esphome tests/test1.yaml compile
-        - esphome tests/test2.yaml compile
-        - esphome tests/test3.yaml compile
-        - esphome tests/test4.yaml compile
-    - env: TARGET=Cpp-Lint
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-            - llvm-toolchain-trusty-7
-          packages:
-            - clang-tidy-7
-            - clang-format-7
-      before_script:
-        - pio init --ide atom
-        - clang-tidy-7 -version
-        - clang-format-7 -version
-        - clang-apply-replacements-7 -version
-      script:
-        - script/clang-tidy --all-headers -j 2 --fix
-        - script/clang-format -i -j 2
-        - script/ci-suggest-changes

From 2012c769f6b6d6969c756a6d457f9ec3e4340ab7 Mon Sep 17 00:00:00 2001
From: Peter Kuehne <pkuehne@users.noreply.github.com>
Date: Tue, 14 Jul 2020 12:11:58 +0100
Subject: [PATCH 294/412] Feature/fix unit tests (#1129)

---
 esphome/config_validation.py               |  2 +-
 esphome/core.py                            | 11 +--
 tests/unit_tests/test_config_validation.py | 15 ++--
 tests/unit_tests/test_helpers.py           | 80 +++++++++++-----------
 4 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 1319786841..0649e15f5f 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -104,7 +104,7 @@ def alphanumeric(value):
         raise Invalid("string value is None")
     value = str(value)
     if not value.isalnum():
-        raise Invalid("string value is not alphanumeric")
+        raise Invalid(f"{value} is not alphanumeric")
     return value
 
 
diff --git a/esphome/core.py b/esphome/core.py
index 7bbaf9c54c..dfb37555e1 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -24,15 +24,18 @@ class EsphomeError(Exception):
 
 class HexInt(int):
     def __str__(self):
-        if 0 <= self <= 255:
-            return f"0x{self:02X}"
-        return f"0x{self:X}"
+        value = self
+        sign = "-" if value < 0 else ""
+        value = abs(value)
+        if 0 <= value <= 255:
+            return f"{sign}0x{value:02X}"
+        return f"{sign}0x{value:X}"
 
 
 class IPAddress:
     def __init__(self, *args):
         if len(args) != 4:
-            raise ValueError("IPAddress must consist up 4 items")
+            raise ValueError("IPAddress must consist of 4 items")
         self.args = args
 
     def __str__(self):
diff --git a/tests/unit_tests/test_config_validation.py b/tests/unit_tests/test_config_validation.py
index a19330062e..ced75af105 100644
--- a/tests/unit_tests/test_config_validation.py
+++ b/tests/unit_tests/test_config_validation.py
@@ -9,22 +9,24 @@ from esphome.config_validation import Invalid
 from esphome.core import Lambda, HexInt
 
 
-def test_check_not_tamplatable__invalid():
+def test_check_not_templatable__invalid():
     with pytest.raises(Invalid, match="This option is not templatable!"):
         config_validation.check_not_templatable(Lambda(""))
 
 
-@given(one_of(
-    booleans(),
-    integers(),
-    text(alphabet=string.ascii_letters + string.digits)),
-)
+@pytest.mark.parametrize("value", ("foo", 1, "D12", False))
 def test_alphanumeric__valid(value):
     actual = config_validation.alphanumeric(value)
 
     assert actual == str(value)
 
 
+@pytest.mark.parametrize("value", ("£23", "Foo!"))
+def test_alphanumeric__invalid(value):
+    with pytest.raises(Invalid):
+        actual = config_validation.alphanumeric(value)
+
+
 @given(value=text(alphabet=string.ascii_lowercase + string.digits + "_"))
 def test_valid_name__valid(value):
     actual = config_validation.valid_name(value)
@@ -110,4 +112,3 @@ def hex_int__valid(value):
 
     assert isinstance(actual, HexInt)
     assert actual == value
-    
diff --git a/tests/unit_tests/test_helpers.py b/tests/unit_tests/test_helpers.py
index e48286ae51..3c0a96149d 100644
--- a/tests/unit_tests/test_helpers.py
+++ b/tests/unit_tests/test_helpers.py
@@ -7,12 +7,12 @@ from esphome import helpers
 
 
 @pytest.mark.parametrize("preferred_string, current_strings, expected", (
-        ("foo", [], "foo"),
-        # TODO: Should this actually start at 1?
-        ("foo", ["foo"], "foo_2"),
-        ("foo", ("foo",), "foo_2"),
-        ("foo", ("foo", "foo_2"), "foo_3"),
-        ("foo", ("foo", "foo_2", "foo_2"), "foo_3"),
+    ("foo", [], "foo"),
+    # TODO: Should this actually start at 1?
+    ("foo", ["foo"], "foo_2"),
+    ("foo", ("foo",), "foo_2"),
+    ("foo", ("foo", "foo_2"), "foo_3"),
+    ("foo", ("foo", "foo_2", "foo_2"), "foo_3"),
 ))
 def test_ensure_unique_string(preferred_string, current_strings, expected):
     actual = helpers.ensure_unique_string(preferred_string, current_strings)
@@ -21,9 +21,9 @@ def test_ensure_unique_string(preferred_string, current_strings, expected):
 
 
 @pytest.mark.parametrize("text, expected", (
-        ("foo", "foo"),
-        ("foo\nbar", "foo\nbar"),
-        ("foo\nbar\neek", "foo\n  bar\neek"),
+    ("foo", "foo"),
+    ("foo\nbar", "foo\nbar"),
+    ("foo\nbar\neek", "foo\n  bar\neek"),
 ))
 def test_indent_all_but_first_and_last(text, expected):
     actual = helpers.indent_all_but_first_and_last(text)
@@ -32,9 +32,9 @@ def test_indent_all_but_first_and_last(text, expected):
 
 
 @pytest.mark.parametrize("text, expected", (
-        ("foo", ["  foo"]),
-        ("foo\nbar", ["  foo", "  bar"]),
-        ("foo\nbar\neek", ["  foo", "  bar", "  eek"]),
+    ("foo", ["  foo"]),
+    ("foo\nbar", ["  foo", "  bar"]),
+    ("foo\nbar\neek", ["  foo", "  bar", "  eek"]),
 ))
 def test_indent_list(text, expected):
     actual = helpers.indent_list(text)
@@ -43,9 +43,9 @@ def test_indent_list(text, expected):
 
 
 @pytest.mark.parametrize("text, expected", (
-        ("foo", "  foo"),
-        ("foo\nbar", "  foo\n  bar"),
-        ("foo\nbar\neek", "  foo\n  bar\n  eek"),
+    ("foo", "  foo"),
+    ("foo\nbar", "  foo\n  bar"),
+    ("foo\nbar\neek", "  foo\n  bar\n  eek"),
 ))
 def test_indent(text, expected):
     actual = helpers.indent(text)
@@ -54,11 +54,11 @@ def test_indent(text, expected):
 
 
 @pytest.mark.parametrize("string, expected", (
-        ("foo", '"foo"'),
-        ("foo\nbar", '"foo\\012bar"'),
-        ("foo\\bar", '"foo\\134bar"'),
-        ('foo "bar"', '"foo \\042bar\\042"'),
-        ('foo 🐍', '"foo \\360\\237\\220\\215"'),
+    ("foo", '"foo"'),
+    ("foo\nbar", '"foo\\012bar"'),
+    ("foo\\bar", '"foo\\134bar"'),
+    ('foo "bar"', '"foo \\042bar\\042"'),
+    ('foo 🐍', '"foo \\360\\237\\220\\215"'),
 ))
 def test_cpp_string_escape(string, expected):
     actual = helpers.cpp_string_escape(string)
@@ -83,11 +83,11 @@ def test_is_ip_address__valid(value):
 
 
 @pytest.mark.parametrize("var, value, default, expected", (
-        ("FOO", None, False, False),
-        ("FOO", None, True, True),
-        ("FOO", "", False, False),
-        ("FOO", "Yes", False, True),
-        ("FOO", "123", False, True),
+    ("FOO", None, False, False),
+    ("FOO", None, True, True),
+    ("FOO", "", False, False),
+    ("FOO", "Yes", False, True),
+    ("FOO", "123", False, True),
 ))
 def test_get_bool_env(monkeypatch, var, value, default, expected):
     if value is None:
@@ -101,8 +101,8 @@ def test_get_bool_env(monkeypatch, var, value, default, expected):
 
 
 @pytest.mark.parametrize("value, expected", (
-        (None, False),
-        ("Yes", True)
+    (None, False),
+    ("Yes", True)
 ))
 def test_is_hassio(monkeypatch, value, expected):
     if value is None:
@@ -121,7 +121,7 @@ def test_walk_files(fixture_path):
     actual = list(helpers.walk_files(path))
 
     # Ensure paths start with the root
-    assert all(p.startswith(path.as_posix()) for p in actual)
+    assert all(p.startswith(str(path)) for p in actual)
 
 
 class Test_write_file_if_changed:
@@ -186,18 +186,18 @@ class Test_copy_file_if_changed:
 
 
 @pytest.mark.parametrize("file1, file2, expected", (
-        # Same file
-        ("file-a.txt", "file-a.txt", True),
-        # Different files, different size
-        ("file-a.txt", "file-b_1.txt", False),
-        # Different files, same size
-        ("file-a.txt", "file-c.txt", False),
-        # Same files
-        ("file-b_1.txt", "file-b_2.txt", True),
-        # Not a file
-        ("file-a.txt", "", False),
-        # File doesn't exist
-        ("file-a.txt", "file-d.txt", False),
+    # Same file
+    ("file-a.txt", "file-a.txt", True),
+    # Different files, different size
+    ("file-a.txt", "file-b_1.txt", False),
+    # Different files, same size
+    ("file-a.txt", "file-c.txt", False),
+    # Same files
+    ("file-b_1.txt", "file-b_2.txt", True),
+    # Not a file
+    ("file-a.txt", "", False),
+    # File doesn't exist
+    ("file-a.txt", "file-d.txt", False),
 ))
 def test_file_compare(fixture_path, file1, file2, expected):
     path1 = fixture_path / "helpers" / file1

From cf703f6ac4b1f6b49e16aaacaa51debd97808969 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 14 Jul 2020 14:34:44 +0200
Subject: [PATCH 295/412] GH Actions Update (#1134)

---
 .github/workflows/ci.yml                    | 196 ++++++++++++++
 .github/workflows/matchers/ci-custom.json   |  16 ++
 .github/workflows/matchers/clang-tidy.json  |  17 ++
 .github/workflows/matchers/gcc.json         |  18 ++
 .github/workflows/matchers/lint-python.json |  28 ++
 .github/workflows/matchers/python.json      |  18 ++
 .github/workflows/pull.yaml                 |  59 -----
 .github/workflows/release-dev.yaml          | 124 ---------
 .github/workflows/release-dev.yml           | 226 ++++++++++++++++
 .github/workflows/release-version.yaml      | 180 -------------
 .github/workflows/release.yml               | 276 ++++++++++++++++++++
 docker/Dockerfile.lint                      |   6 +-
 script/ci-custom.py                         |  35 ++-
 script/clang-tidy                           |  29 +-
 script/helpers.py                           |   6 +-
 15 files changed, 846 insertions(+), 388 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 create mode 100644 .github/workflows/matchers/ci-custom.json
 create mode 100644 .github/workflows/matchers/clang-tidy.json
 create mode 100644 .github/workflows/matchers/gcc.json
 create mode 100644 .github/workflows/matchers/lint-python.json
 create mode 100644 .github/workflows/matchers/python.json
 delete mode 100644 .github/workflows/pull.yaml
 delete mode 100644 .github/workflows/release-dev.yaml
 create mode 100644 .github/workflows/release-dev.yml
 delete mode 100644 .github/workflows/release-version.yaml
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000000..9d03705e84
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,196 @@
+# THESE JOBS ARE COPIED IN release.yml and release-dev.yml
+# PLEASE ALSO UPDATE THOSE FILES WHEN CHANGING LINES HERE
+name: CI
+
+on:
+  push:
+    # On dev branch release-dev already performs CI checks
+    # On other branches the `pull_request` trigger will be used
+    branches: [beta, master]
+
+  pull_request:
+    # Only trigger on certain events (not when comments are added)
+    types: [opened, reopened, synchronize]
+    # Only run when PR is against dev branch (all PRs should be against dev branch)
+    # Helps prevent accidentally merging PRs against master branch
+    branches: [dev]
+
+jobs:
+  # A fast overview job that checks only changed files
+  overview:
+    runs-on: ubuntu-latest
+    container: esphome/esphome-lint:dev
+    steps:
+      # Also fetch history and dev branch so that we can check which files changed
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Fetch dev branch
+        run: git fetch origin dev
+      
+      # Cache the .pio directory with (primarily) library dependencies
+      - name: Cache .pio lib_deps
+        uses: actions/cache@v1
+        with:
+          path: .pio
+          key: lint-cpp-pio-${{ hashFiles('platformio.ini') }}
+          restore-keys: |
+            lint-cpp-pio-
+      - name: Set up python environment
+        run: script/setup
+      # Set up the pio project so that the cpp checks know how files are compiled
+      # (build flags, libraries etc)
+      - name: Set up platformio environment
+        run: pio init --ide atom
+
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
+          echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
+          echo "::add-matcher::.github/workflows/matchers/gcc.json"
+          echo "::add-matcher::.github/workflows/matchers/lint-python.json"
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - name: Run a quick lint over all changed files
+        run: script/quicklint
+      - name: Suggest changes
+        run: script/ci-suggest-changes
+
+  lint-clang-format:
+    runs-on: ubuntu-latest
+    # cpp lint job runs with esphome-lint docker image so that clang-format-*
+    # doesn't have to be installed
+    container: esphome/esphome-lint:dev
+    steps:
+      - uses: actions/checkout@v2
+      # Cache platformio intermediary files (like libraries etc)
+      # Note: platformio platform versions should be cached via the esphome-lint image
+      - name: Cache Platformio
+        uses: actions/cache@v1
+        with:
+          path: .pio
+          key: lint-cpp-pio-${{ hashFiles('platformio.ini') }}
+          restore-keys: |
+            lint-cpp-pio-
+      # Set up the pio project so that the cpp checks know how files are compiled
+      # (build flags, libraries etc)
+      - name: Set up platformio environment
+        run: pio init --ide atom
+
+      - name: Run clang-format
+        run: script/clang-format -i
+      - name: Suggest changes
+        run: script/ci-suggest-changes
+
+  lint-clang-tidy:
+    runs-on: ubuntu-latest
+    # cpp lint job runs with esphome-lint docker image so that clang-format-*
+    # doesn't have to be installed
+    container: esphome/esphome-lint:dev
+    # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
+    strategy:
+      matrix:
+        split: [1, 2, 3, 4]
+    steps:
+      - uses: actions/checkout@v2
+      # Cache platformio intermediary files (like libraries etc)
+      # Note: platformio platform versions should be cached via the esphome-lint image
+      - name: Cache Platformio
+        uses: actions/cache@v1
+        with:
+          path: .pio
+          key: lint-cpp-pio-${{ hashFiles('platformio.ini') }}
+          restore-keys: |
+            lint-cpp-pio-
+      # Set up the pio project so that the cpp checks know how files are compiled
+      # (build flags, libraries etc)
+      - name: Set up platformio environment
+        run: pio init --ide atom
+
+      
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
+          echo "::add-matcher::.github/workflows/matchers/gcc.json"
+      - name: Run clang-tidy
+        run: script/clang-tidy --all-headers --fix --split-num 4 --split-at ${{ matrix.split }}
+      - name: Suggest changes
+        run: script/ci-suggest-changes
+
+  lint-python:
+    # Don't use the esphome-lint docker image because it may contain outdated requirements.
+    # This way, all dependencies are cached via the cache action.
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.7-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.7-
+      - name: Set up python environment
+        run: script/setup
+
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
+          echo "::add-matcher::.github/workflows/matchers/lint-python.json"
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - name: Lint Custom
+        run: script/ci-custom.py
+      - name: Lint Python
+        run: script/lint-python
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+          test:
+          - test1
+          - test2
+          - test3
+          - test4
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.7-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.7-
+      # Use per test platformio cache because tests have different platform versions
+      - name: Cache ~/.platformio
+        uses: actions/cache@v1
+        with:
+          path: ~/.platformio
+          key: test-home-platformio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}
+          restore-keys: |
+            test-home-platformio-${{ matrix.test }}-
+      # Cache the intermediary build files
+      - name: Cache Test Build
+        uses: actions/cache@v1
+        with:
+          path: tests/build/${{ matrix.test }}
+          key: test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-${{ hashFiles('esphome/**') }}
+          restore-keys: |
+            test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-
+            test-pio-${{ matrix.test }}-
+      - name: Set up environment
+        run: script/setup
+
+      
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/gcc.json"
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - run: esphome tests/${{ matrix.test }}.yaml compile
diff --git a/.github/workflows/matchers/ci-custom.json b/.github/workflows/matchers/ci-custom.json
new file mode 100644
index 0000000000..4e1eafff5e
--- /dev/null
+++ b/.github/workflows/matchers/ci-custom.json
@@ -0,0 +1,16 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "ci-custom",
+            "pattern": [
+                {
+                    "regexp": "^ERROR (.*):(\\d+):(\\d+) - (.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "message": 4
+                }
+            ]
+        }
+    ]
+}
diff --git a/.github/workflows/matchers/clang-tidy.json b/.github/workflows/matchers/clang-tidy.json
new file mode 100644
index 0000000000..03e77341a5
--- /dev/null
+++ b/.github/workflows/matchers/clang-tidy.json
@@ -0,0 +1,17 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "clang-tidy",
+            "pattern": [
+                {
+                    "regexp": "^(.*):(\\d+):(\\d+):\\s+(error):\\s+(.*) \\[([a-z0-9,\\-]+)\\]\\s*$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            ]
+        }
+    ]
+}
diff --git a/.github/workflows/matchers/gcc.json b/.github/workflows/matchers/gcc.json
new file mode 100644
index 0000000000..899239f816
--- /dev/null
+++ b/.github/workflows/matchers/gcc.json
@@ -0,0 +1,18 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "gcc",
+      "severity": "error",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "severity": 4,
+          "message": 5
+        }
+      ]
+    }
+  ]
+}
diff --git a/.github/workflows/matchers/lint-python.json b/.github/workflows/matchers/lint-python.json
new file mode 100644
index 0000000000..decbe36c4a
--- /dev/null
+++ b/.github/workflows/matchers/lint-python.json
@@ -0,0 +1,28 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "flake8",
+      "severity": "error",
+      "pattern": [
+          {
+          "regexp": "^(.*):(\\d+) - ([EFCDNW]\\d{3}.*)$",
+          "file": 1,
+          "line": 2,
+          "message": 3
+          }
+      ]
+    },
+    {
+      "owner": "pylint",
+      "severity": "error",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+) - (\\[[EFCRW]\\d{4}\\(.*\\),.*\\].*)$",
+          "file": 1,
+          "line": 2,
+          "message": 3
+        }
+      ]
+    }
+  ]
+}
diff --git a/.github/workflows/matchers/python.json b/.github/workflows/matchers/python.json
new file mode 100644
index 0000000000..9c3095c0c9
--- /dev/null
+++ b/.github/workflows/matchers/python.json
@@ -0,0 +1,18 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "python",
+            "pattern": [
+                {
+                    "regexp": "^\\s*File\\s\\\"(.*)\\\",\\sline\\s(\\d+),\\sin\\s(.*)$",
+                    "file": 1,
+                    "line": 2
+                },
+                {
+                    "regexp": "^\\s*raise\\s(.*)\\(\\'(.*)\\'\\)$",
+                    "message": 2
+                }
+            ]
+        }
+    ]
+}
diff --git a/.github/workflows/pull.yaml b/.github/workflows/pull.yaml
deleted file mode 100644
index 6b66192150..0000000000
--- a/.github/workflows/pull.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-name: PR testing
-
-on: [pull_request]
-
-jobs:
-  lint-custom:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Custom
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: script/ci-custom.py
-  lint-python:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Python
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: script/lint-python
-  lint-tidy:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Tidy
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - run: script/setup
-    - run: pio init --ide atom
-    - run: script/clang-tidy --all-headers --fix
-    - run: script/ci-suggest-changes
-  lint-format:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Format
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - run: script/setup
-    - run: script/clang-format -i
-    - run: script/ci-suggest-changes
-
-  test:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    strategy:
-      matrix:
-        test:
-        - test1
-        - test2
-        - test3
-        - test4
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: esphome tests/${{ matrix.test }}.yaml compile
diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml
deleted file mode 100644
index 7f71d79610..0000000000
--- a/.github/workflows/release-dev.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-name: Release dev
-
-on:
-  push:
-    branches:
-    - dev
-
-jobs:
-  lint-custom:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Custom
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: script/ci-custom.py
-  lint-python:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Python
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: script/lint-python
-  lint-tidy:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Tidy
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: pio init --ide atom
-    - run: script/clang-tidy --all-headers --fix
-    - run: script/ci-suggest-changes
-  lint-format:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Format
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: script/clang-format -i
-    - run: script/ci-suggest-changes
-
-  test:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    strategy:
-      matrix:
-        test:
-        - test1
-        - test2
-        - test3
-        - test4
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: esphome tests/${{ matrix.test }}.yaml compile
-
-  deploy-docker:
-    runs-on: ubuntu-latest
-    needs: [lint-custom, lint-python, lint-tidy, lint-format, test]
-    strategy:
-      matrix:
-        arch: [aarch64, amd64, armv7, i386]
-        build-type: [hassio, docker]
-    steps:
-    - uses: actions/checkout@v2
-    - run: docker info
-    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-      env:
-        DOCKER_USER: ${{ secrets.DOCKER_USER }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-    - run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
-    - env:
-        BASE_VERSION: 2.1.1
-      run: |
-        if [[ "${{ matrix.build-type }}" == "hassio" ]]; then
-          BUILD_FROM=esphome/esphome-hassio-base-${{ matrix.arch }}:${BASE_VERSION}
-          BUILD_TO=${{ github.repository }}-hassio-${{ matrix.arch }}
-          DOCKERFILE=docker/Dockerfile.hassio
-        else
-          BUILD_FROM=esphome/esphome-base-${{ matrix.arch }}:${BASE_VERSION}
-          BUILD_TO=${{ github.repository }}-${{ matrix.arch }}
-          DOCKERFILE=docker/Dockerfile
-        fi
-
-        TAG=${{ github.sha }}
-        TAG=${TAG:0:7}
-
-        echo "Building tag: ${TAG}"
-
-        docker build \
-          --build-arg BUILD_FROM=${BUILD_FROM} \
-          --build-arg BUILD_VERSION=${TAG} \
-          --tag ${BUILD_TO}:dev \
-          --file ${DOCKERFILE} \
-          .
-
-        echo "Pushing to ${BUILD_TO}:dev"
-        docker push ${BUILD_TO}:dev
-
-  deploy-docker-manifest-version:
-    runs-on: ubuntu-latest
-    needs: [deploy-docker]
-    steps:
-    - run: mkdir -p ~/.docker
-    - run: |
-        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
-    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-      env:
-        DOCKER_USER: ${{ secrets.DOCKER_USER }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-    - run: |
-        REPO=${{ github.repository }}
-
-        docker manifest create ${REPO}:dev \
-          ${REPO}-aarch64:dev \
-          ${REPO}-amd64:dev \
-          ${REPO}-armv7:dev \
-          ${REPO}-i386:dev
-
-        echo "Pushing to ${REPO}:dev"
-        docker manifest push ${REPO}:dev
diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
new file mode 100644
index 0000000000..564d12be88
--- /dev/null
+++ b/.github/workflows/release-dev.yml
@@ -0,0 +1,226 @@
+name: Publish dev releases to docker hub
+
+on:
+  push:
+    branches:
+    - dev
+
+jobs:
+  # THE LINT/TEST JOBS ARE COPIED FROM ci.yaml
+ 
+  lint-clang-format:
+    runs-on: ubuntu-latest
+    # cpp lint job runs with esphome-lint docker image so that clang-format-*
+    # doesn't have to be installed
+    container: esphome/esphome-lint:dev
+    steps:
+      - uses: actions/checkout@v2
+      # Cache platformio intermediary files (like libraries etc)
+      # Note: platformio platform versions should be cached via the esphome-lint image
+      - name: Cache Platformio
+        uses: actions/cache@v1
+        with:
+          path: .pio
+          key: lint-cpp-pio-${{ hashFiles('platformio.ini') }}
+          restore-keys: |
+            lint-cpp-pio-
+      # Set up the pio project so that the cpp checks know how files are compiled
+      # (build flags, libraries etc)
+      - name: Set up platformio environment
+        run: pio init --ide atom
+
+      - name: Run clang-format
+        run: script/clang-format -i
+      - name: Suggest changes
+        run: script/ci-suggest-changes
+
+  lint-clang-tidy:
+    runs-on: ubuntu-latest
+    # cpp lint job runs with esphome-lint docker image so that clang-format-*
+    # doesn't have to be installed
+    container: esphome/esphome-lint:dev
+    # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
+    strategy:
+      matrix:
+        split: [1, 2, 3, 4]
+    steps:
+      - uses: actions/checkout@v2
+      # Cache platformio intermediary files (like libraries etc)
+      # Note: platformio platform versions should be cached via the esphome-lint image
+      - name: Cache Platformio
+        uses: actions/cache@v1
+        with:
+          path: .pio
+          key: lint-cpp-pio-${{ hashFiles('platformio.ini') }}
+          restore-keys: |
+            lint-cpp-pio-
+      # Set up the pio project so that the cpp checks know how files are compiled
+      # (build flags, libraries etc)
+      - name: Set up platformio environment
+        run: pio init --ide atom
+
+      
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
+          echo "::add-matcher::.github/workflows/matchers/gcc.json"
+      - name: Run clang-tidy
+        run: script/clang-tidy --all-headers --fix --split-num 4 --split-at ${{ matrix.split }}
+      - name: Suggest changes
+        run: script/ci-suggest-changes
+
+  lint-python:
+    # Don't use the esphome-lint docker image because it may contain outdated requirements.
+    # This way, all dependencies are cached via the cache action.
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.7-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.7-
+      - name: Set up python environment
+        run: script/setup
+
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
+          echo "::add-matcher::.github/workflows/matchers/lint-python.json"
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - name: Lint Custom
+        run: script/ci-custom.py
+      - name: Lint Python
+        run: script/lint-python
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+          test:
+          - test1
+          - test2
+          - test3
+          - test4
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.7-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.7-
+      # Use per test platformio cache because tests have different platform versions
+      - name: Cache ~/.platformio
+        uses: actions/cache@v1
+        with:
+          path: ~/.platformio
+          key: test-home-platformio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}
+          restore-keys: |
+            test-home-platformio-${{ matrix.test }}-
+      # Cache the intermediary build files
+      - name: Cache Test Build
+        uses: actions/cache@v1
+        with:
+          path: tests/build/${{ matrix.test }}
+          key: test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-${{ hashFiles('esphome/**') }}
+          restore-keys: |
+            test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-
+            test-pio-${{ matrix.test }}-
+      - name: Set up environment
+        run: script/setup
+
+      
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/gcc.json"
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - run: esphome tests/${{ matrix.test }}.yaml compile
+
+  deploy-docker:
+    name: Build and publish docker containers
+    runs-on: ubuntu-latest
+    needs: [lint-clang-format, lint-clang-tidy, lint-python, test]
+    strategy:
+      matrix:
+        arch: [amd64, i386, armv7, aarch64]
+        build_type: ["hassio", "docker"]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up env variables
+        run: |
+          tag="dev"
+          base_version="2.1.2"
+
+          if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
+            build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
+            build_to="esphome/esphome-hassio-${{ matrix.arch }}"
+            dockerfile="docker/Dockerfile.hassio"
+          else
+            build_from="esphome/esphome-base-${{ matrix.arch }}:${base_version}"
+            build_to="esphome/esphome-${{ matrix.arch }}"
+            dockerfile="docker/Dockerfile"
+            if [[ "${{ matrix.arch }}" == "amd64" ]]; then
+              build_to="esphome/esphome"
+            fi
+          fi
+
+          # Set env variables so these values don't need to be calculated again
+          echo "::set-env name=TAG::${tag}"
+          echo "::set-env name=BUILD_FROM::${build_from}"
+          echo "::set-env name=BUILD_TO::${build_to}"
+          echo "::set-env name=IMAGE::${build_to}:${tag}"
+          echo "::set-env name=DOCKERFILE::${dockerfile}"
+      - name: Register QEMU binfmt
+        run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
+      - run: |
+          docker build \
+            --build-arg "BUILD_FROM=${BUILD_FROM}" \
+            --build-arg "BUILD_VERSION=${TAG}" \
+            --tag "${IMAGE}" \
+            --file "${DOCKERFILE}" \
+            .
+      - name: Log in to docker hub
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
+      - run: docker push "${IMAGE}"
+
+  deploy-docker-manifest:
+    runs-on: ubuntu-latest
+    needs: [deploy-docker]
+    steps:
+    - name: Enable experimental manifest support
+      run: |
+        mkdir -p ~/.docker
+        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - name: Log in to docker hub
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
+    - name: "Create the manifest"
+      run: |
+        REPO=esphome/esphome
+        TAG="dev"
+
+        docker manifest create ${REPO}:${TAG} \
+          ${REPO}-aarch64:${TAG} \
+          ${REPO}-amd64:${TAG} \
+          ${REPO}-armv7:${TAG} \
+          ${REPO}-i386:${TAG}
+        echo "::set-env name=TAG::${TAG}"
+        echo "::set-env name=REPO::${REPO}"
+    - run: docker push ${REPO}:${TAG}
diff --git a/.github/workflows/release-version.yaml b/.github/workflows/release-version.yaml
deleted file mode 100644
index cb72aae761..0000000000
--- a/.github/workflows/release-version.yaml
+++ /dev/null
@@ -1,180 +0,0 @@
-name: Release a version
-
-on:
-  push:
-    tags:
-    - "*"
-
-jobs:
-  lint-custom:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Custom
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: script/ci-custom.py
-  lint-python:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Python
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: script/lint-python
-  lint-tidy:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Tidy
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: pio init --ide atom
-    - run: script/clang-tidy --all-headers --fix
-    - run: script/ci-suggest-changes
-  lint-format:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    name: Lint Format
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: script/clang-format -i
-    - run: script/ci-suggest-changes
-
-  test:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    strategy:
-      matrix:
-        test:
-        - test1
-        - test2
-        - test3
-        - test4
-    steps:
-    - uses: actions/checkout@v2
-    - run: script/setup
-    - run: esphome tests/${{ matrix.test }}.yaml compile
-
-  deploy-pypi:
-    runs-on: ubuntu-latest
-    container: jesserockz/esphome-lint
-    needs: [lint-custom, lint-python, lint-tidy, lint-format, test]
-    steps:
-    - run: pip install twine wheel
-    - run: python setup.py sdist bdist_wheel
-    - run: twine upload dist/*
-      env:
-        TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
-
-  deploy-docker:
-    runs-on: ubuntu-latest
-    needs: [lint-custom, lint-python, lint-tidy, lint-format, test]
-    strategy:
-      matrix:
-        arch: [aarch64, amd64, armv7, i386]
-        build-type: [hassio, docker]
-    steps:
-    - uses: actions/checkout@v2
-    - run: docker info
-    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-      env:
-        DOCKER_USER: ${{ secrets.DOCKER_USER }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-    - run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
-    - env:
-        BASE_VERSION: 2.1.1
-      run: |
-        if [[ "${{ matrix.build-type }}" == "hassio" ]]; then
-          BUILD_FROM=esphome/esphome-hassio-base-${{ matrix.arch }}:${BASE_VERSION}
-          BUILD_TO=${{ github.repository }}-hassio-${{ matrix.arch }}
-          DOCKERFILE=docker/Dockerfile.hassio
-        else
-          BUILD_FROM=esphome/esphome-base-${{ matrix.arch }}:${BASE_VERSION}
-          BUILD_TO=${{ github.repository }}-${{ matrix.arch }}
-          DOCKERFILE=docker/Dockerfile
-        fi
-
-        TAG=${{ github.ref }}
-        TAG=${TAG#refs/tags/v}
-
-        echo "Building tag: ${TAG}"
-
-        docker build \
-          --build-arg BUILD_FROM=${BUILD_FROM} \
-          --build-arg BUILD_VERSION=${TAG} \
-          --tag ${BUILD_TO}:${TAG} \
-          --file ${DOCKERFILE} \
-          .
-
-        echo "Pushing to ${BUILD_TO}:${TAG}"
-        docker push ${BUILD_TO}:${TAG}
-
-        beta_tag="^v\d+\.\d+\.\d+b\d+$"
-        if [[ "${TAG}" ~= "${beta_tag}" ]]; then
-          echo "Pushing to ${BUILD_TO}:beta"
-          docker tag ${BUILD_TO}:${TAG} ${BUILD_TO}:beta
-          docker push ${BUILD_TO}:beta
-        else
-          echo "Pushing to ${BUILD_TO}:latest"
-          docker tag ${BUILD_TO}:${TAG} ${BUILD_TO}:latest
-          docker push ${BUILD_TO}:latest
-        fi
-
-  deploy-docker-manifest-version:
-    runs-on: ubuntu-latest
-    steps:
-    - run: mkdir -p ~/.docker
-    - run: |
-        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
-    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-      env:
-        DOCKER_USER: ${{ secrets.DOCKER_USER }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-    - run: |
-        REPO=${{ github.repository }}
-
-        TAG=${{ github.ref }}
-        TAG=${TAG#refs/tags/v}
-
-        docker manifest create ${REPO}:${TAG} \
-          ${REPO}-aarch64:${TAG} \
-          ${REPO}-amd64:${TAG} \
-          ${REPO}-armv7:${TAG} \
-          ${REPO}-i386:${TAG}
-
-        echo "Pushing to ${REPO}:${TAG}"
-        docker push ${REPO}:${TAG}
-
-  deploy-docker-manifest:
-    runs-on: ubuntu-latest
-    steps:
-    - run: mkdir -p ~/.docker
-    - run: |
-        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
-    - run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-      env:
-        DOCKER_USER: ${{ secrets.DOCKER_USER }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-    - run: |
-        REPO=${{ github.repository }}
-
-        TAG=${{ github.ref }}
-        TAG=${TAG#refs/tags/v}
-
-        beta_tag="^v\d+\.\d+\.\d+b\d+$"
-        if [[ "${TAG}" ~= "${beta_tag}" ]]; then
-          TAG=beta
-        else
-          TAG=latest
-        fi
-        docker manifest create ${REPO}:${TAG} \
-          ${REPO}-aarch64:${TAG} \
-          ${REPO}-amd64:${TAG} \
-          ${REPO}-armv7:${TAG} \
-          ${REPO}-i386:${TAG}
-
-        echo "Pushing to ${REPO}:${TAG}"
-        docker push ${REPO}:${TAG}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..6425cd8990
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,276 @@
+name: Publish Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  # THE LINT/TEST JOBS ARE COPIED FROM ci.yaml
+ 
+  lint-clang-format:
+    runs-on: ubuntu-latest
+    # cpp lint job runs with esphome-lint docker image so that clang-format-*
+    # doesn't have to be installed
+    container: esphome/esphome-lint:dev
+    steps:
+      - uses: actions/checkout@v2
+      # Cache platformio intermediary files (like libraries etc)
+      # Note: platformio platform versions should be cached via the esphome-lint image
+      - name: Cache Platformio
+        uses: actions/cache@v1
+        with:
+          path: .pio
+          key: lint-cpp-pio-${{ hashFiles('platformio.ini') }}
+          restore-keys: |
+            lint-cpp-pio-
+      # Set up the pio project so that the cpp checks know how files are compiled
+      # (build flags, libraries etc)
+      - name: Set up platformio environment
+        run: pio init --ide atom
+
+      - name: Run clang-format
+        run: script/clang-format -i
+      - name: Suggest changes
+        run: script/ci-suggest-changes
+
+  lint-clang-tidy:
+    runs-on: ubuntu-latest
+    # cpp lint job runs with esphome-lint docker image so that clang-format-*
+    # doesn't have to be installed
+    container: esphome/esphome-lint:dev
+    # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
+    strategy:
+      matrix:
+        split: [1, 2, 3, 4]
+    steps:
+      - uses: actions/checkout@v2
+      # Cache platformio intermediary files (like libraries etc)
+      # Note: platformio platform versions should be cached via the esphome-lint image
+      - name: Cache Platformio
+        uses: actions/cache@v1
+        with:
+          path: .pio
+          key: lint-cpp-pio-${{ hashFiles('platformio.ini') }}
+          restore-keys: |
+            lint-cpp-pio-
+      # Set up the pio project so that the cpp checks know how files are compiled
+      # (build flags, libraries etc)
+      - name: Set up platformio environment
+        run: pio init --ide atom
+
+      
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
+          echo "::add-matcher::.github/workflows/matchers/gcc.json"
+      - name: Run clang-tidy
+        run: script/clang-tidy --all-headers --fix --split-num 4 --split-at ${{ matrix.split }}
+      - name: Suggest changes
+        run: script/ci-suggest-changes
+
+  lint-python:
+    # Don't use the esphome-lint docker image because it may contain outdated requirements.
+    # This way, all dependencies are cached via the cache action.
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.7-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.7-
+      - name: Set up python environment
+        run: script/setup
+
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
+          echo "::add-matcher::.github/workflows/matchers/lint-python.json"
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - name: Lint Custom
+        run: script/ci-custom.py
+      - name: Lint Python
+        run: script/lint-python
+
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+          test:
+          - test1
+          - test2
+          - test3
+          - test4
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.7-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.7-
+      # Use per test platformio cache because tests have different platform versions
+      - name: Cache ~/.platformio
+        uses: actions/cache@v1
+        with:
+          path: ~/.platformio
+          key: test-home-platformio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}
+          restore-keys: |
+            test-home-platformio-${{ matrix.test }}-
+      # Cache the intermediary build files
+      - name: Cache Test Build
+        uses: actions/cache@v1
+        with:
+          path: tests/build/${{ matrix.test }}
+          key: test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-${{ hashFiles('esphome/**') }}
+          restore-keys: |
+            test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-
+            test-pio-${{ matrix.test }}-
+      - name: Set up environment
+        run: script/setup
+
+      
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/gcc.json"
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - run: esphome tests/${{ matrix.test }}.yaml compile
+
+  deploy-pypi:
+    name: Build and publish to PyPi
+    needs: [lint-clang-format, lint-clang-tidy, lint-python, test]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: '3.x'
+      - name: Set up python environment
+        run: |
+          script/setup
+          pip install setuptools wheel twine
+      - name: Build
+        run: python setup.py sdist bdist_wheel
+      - name: Upload
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: twine upload dist/*
+
+  deploy-docker:
+    name: Build and publish docker containers
+    runs-on: ubuntu-latest
+    needs: [lint-clang-format, lint-clang-tidy, lint-python, test]
+    strategy:
+      matrix:
+        arch: [amd64, i386, armv7, aarch64]
+        build_type: ["hassio", "docker"]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up env variables
+        run: |
+          tag="${GITHUB_REF#v}"
+          base_version="2.1.2"
+
+          if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
+            build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
+            build_to="esphome/esphome-hassio-${{ matrix.arch }}"
+            dockerfile="docker/Dockerfile.hassio"
+          else
+            build_from="esphome/esphome-base-${{ matrix.arch }}:${base_version}"
+            build_to="esphome/esphome-${{ matrix.arch }}"
+            dockerfile="docker/Dockerfile"
+            if [[ "${{ matrix.arch }}" == "amd64" ]]; then
+              build_to="esphome/esphome"
+            fi
+          fi
+
+          # Set env variables so these values don't need to be calculated again
+          echo "::set-env name=TAG::${tag}"
+          echo "::set-env name=BUILD_FROM::${build_from}"
+          echo "::set-env name=BUILD_TO::${build_to}"
+          echo "::set-env name=IMAGE::${build_to}:${tag}"
+          echo "::set-env name=DOCKERFILE::${dockerfile}"
+      - name: Register QEMU binfmt
+        run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
+      - run: |
+          docker build \
+            --build-arg "BUILD_FROM=${BUILD_FROM}" \
+            --build-arg "BUILD_VERSION=${TAG}" \
+            --tag "${IMAGE}" \
+            --file "${DOCKERFILE}" \
+            .
+      - name: Log in to docker hub
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
+      - run: docker push "${IMAGE}"
+      - if: ${{ github.event.release.prerelease) }}
+        name: Publish docker beta tag
+        run: |
+          docker tag "${IMAGE}" ${BUILD_TO}:beta
+          docker push "${BUILD_TO}:beta"
+      - if: ${{ !github.event.release.prerelease) }}
+        name: Publish docker latest tag
+        run: |
+          docker tag "${IMAGE}" ${BUILD_TO}:latest
+          docker push "${BUILD_TO}:latest"
+
+  deploy-docker-manifest:
+    runs-on: ubuntu-latest
+    needs: [deploy-docker]
+    steps:
+    - name: Enable experimental manifest support
+      run: |
+        mkdir -p ~/.docker
+        echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - name: Log in to docker hub
+      env:
+        DOCKER_USER: ${{ secrets.DOCKER_USER }}
+        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
+    - name: "Create the manifest"
+      run: |
+        REPO=esphome/esphome
+        TAG="${GITHUB_REF#v}"
+
+        docker manifest create ${REPO}:${TAG} \
+          ${REPO}-aarch64:${TAG} \
+          ${REPO}-amd64:${TAG} \
+          ${REPO}-armv7:${TAG} \
+          ${REPO}-i386:${TAG}
+        echo "::set-env name=TAG::${TAG}"
+        echo "::set-env name=REPO::${REPO}"
+    - run: docker push ${REPO}:${TAG}
+
+    - name: Publish docker beta tag
+      if: ${{ github.event.release.prerelease) }}
+      run: |
+        docker manifest create ${REPO}:beta \
+          ${REPO}-aarch64:beta \
+          ${REPO}-amd64:beta \
+          ${REPO}-armv7:beta \
+          ${REPO}-i386:beta
+        docker push ${REPO}:beta
+    - name: Publish docker latest tag
+      if: ${{ !github.event.release.prerelease) }}
+      run: |
+        docker manifest create ${REPO}:latest \
+          ${REPO}-aarch64:latest \
+          ${REPO}-amd64:latest \
+          ${REPO}-armv7:latest \
+          ${REPO}-i386:latest
+        docker push ${REPO}:latest
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index cdd715ef5a..32b316075f 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.1.1
+FROM esphome/esphome-base-amd64:2.1.2
 
 RUN \
     apt-get update \
@@ -7,6 +7,8 @@ RUN \
         clang-tidy-7 \
         patch \
         software-properties-common \
+    # Update to latest git version because of github actions
+    # https://github.com/actions/checkout/issues/126
     && apt-add-repository ppa:git-core/ppa \
     && apt-get install -y --no-install-recommends \
         git \
@@ -16,7 +18,7 @@ RUN \
         /var/lib/apt/lists/*
 
 COPY requirements_test.txt /requirements_test.txt
-RUN pip3 install --no-cache-dir wheel && pip3 install --no-cache-dir -r /requirements_test.txt
+RUN pip3 install --no-cache-dir -r /requirements_test.txt
 
 VOLUME ["/esphome"]
 WORKDIR /esphome
diff --git a/script/ci-custom.py b/script/ci-custom.py
index b2b838cb5b..67010d77f9 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -101,10 +101,12 @@ def lint_re_check(regex, **kwargs):
                 if 'NOLINT' in match.group(0):
                     continue
                 lineno = content.count("\n", 0, match.start()) + 1
+                substr = content[:match.start()]
+                col = len(substr) - substr.rfind('\n')
                 err = func(fname, match)
                 if err is None:
                     continue
-                errors.append(f"{err} See line {lineno}.")
+                errors.append((lineno, col+1, err))
             return errors
         return decor(new_func)
     return decorator
@@ -121,8 +123,7 @@ def lint_content_find_check(find, **kwargs):
             errors = []
             for line, col in find_all(content, find_):
                 err = func(fname)
-                errors.append("{err} See line {line}:{col}."
-                              "".format(err=err, line=line+1, col=col+1))
+                errors.append((line+1, col+1, err))
             return errors
         return decor(new_func)
     return decorator
@@ -215,9 +216,10 @@ def lint_const_ordered(fname, content):
                 continue
             target = next(i for i, l in ordered if l == ml)
             target_text = next(l for i, l in matching if target == i)
-            errors.append("Constant {} is not ordered, please make sure all constants are ordered. "
-                          "See line {} (should go to line {}, {})"
-                          "".format(highlight(ml), mi, target, target_text))
+            errors.append((ml, None,
+                           "Constant {} is not ordered, please make sure all constants are ordered. "
+                           "See line {} (should go to line {}, {})"
+                           "".format(highlight(ml), mi, target, target_text)))
     return errors
 
 
@@ -354,13 +356,22 @@ errors = collections.defaultdict(list)
 def add_errors(fname, errs):
     if not isinstance(errs, list):
         errs = [errs]
-    errs = [x for x in errs if x is not None]
     for err in errs:
+        if err is None:
+            continue
+        try:
+            lineno, col, msg = err
+        except ValueError:
+            lineno = 1
+            col = 1
+            msg = err
         if not isinstance(err, str):
             raise ValueError("Error is not instance of string!")
-    if not errs:
-        return
-    errors[fname].extend(errs)
+        if not isinstance(lineno, int):
+            raise ValueError("Line number is not an int!")
+        if not isinstance(col, int):
+            raise ValueError("Column number is not an int!")
+        errors[fname].append((lineno, col, msg))
 
 
 for fname in files:
@@ -380,8 +391,8 @@ run_checks(LINT_POST_CHECKS, 'POST')
 
 for f, errs in sorted(errors.items()):
     print(f"\033[0;32m************* File \033[1;32m{f}\033[0m")
-    for err in errs:
-        print(err)
+    for lineno, col, msg in errs:
+        print(f"ERROR {f}:{lineno}:{col} - {msg}")
     print()
 
 sys.exit(len(errors))
diff --git a/script/clang-tidy b/script/clang-tidy
index 1005d15580..490e63e0d2 100755
--- a/script/clang-tidy
+++ b/script/clang-tidy
@@ -2,20 +2,19 @@
 
 from __future__ import print_function
 
+import argparse
 import multiprocessing
 import os
 import re
-
-import pexpect
 import shutil
 import subprocess
 import sys
 import tempfile
-
-import argparse
-import click
 import threading
 
+import click
+import pexpect
+
 sys.path.append(os.path.dirname(__file__))
 from helpers import basepath, shlex_quote, get_output, build_compile_commands, \
     build_all_include, temp_header_file, git_ls_files, filter_changed
@@ -49,7 +48,7 @@ def run_tidy(args, tmpdir, queue, lock, failed_files):
 
         # Use pexpect for a pseudy-TTY with colored output
         output, rc = pexpect.run(invocation_s, withexitstatus=True, encoding='utf-8',
-                                 timeout=15*60)
+                                 timeout=15 * 60)
         with lock:
             if rc != 0:
                 print()
@@ -65,6 +64,11 @@ def progress_bar_show(value):
         return ''
 
 
+def split_list(a, n):
+    k, m = divmod(len(a), n)
+    return [a[i * k + min(i, m):(i + 1) * k + min(i + 1, m)] for i in range(n)]
+
+
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('-j', '--jobs', type=int,
@@ -77,6 +81,10 @@ def main():
                         help='Run clang-tidy in quiet mode')
     parser.add_argument('-c', '--changed', action='store_true',
                         help='Only run on changed files')
+    parser.add_argument('--split-num', type=int, help='Split the files into X jobs.',
+                        default=None)
+    parser.add_argument('--split-at', type=int, help='Which split is this? Starts at 1',
+                        default=None)
     parser.add_argument('--all-headers', action='store_true',
                         help='Create a dummy file that checks all headers')
     args = parser.parse_args()
@@ -114,7 +122,10 @@ def main():
 
     files.sort()
 
-    if args.all_headers:
+    if args.split_num:
+        files = split_list(files, args.split_num)[args.split_at - 1]
+
+    if args.all_headers and args.split_at in (None, 1):
         files.insert(0, temp_header_file)
 
     tmpdir = None
@@ -157,8 +168,8 @@ def main():
             print('Error applying fixes.\n', file=sys.stderr)
             raise
 
-    sys.exit(return_code)
+    return return_code
 
 
 if __name__ == '__main__':
-    main()
+    sys.exit(main())
diff --git a/script/helpers.py b/script/helpers.py
index c9bf5224b1..e0aaee8711 100644
--- a/script/helpers.py
+++ b/script/helpers.py
@@ -101,8 +101,10 @@ def splitlines_no_ends(string):
 
 
 def changed_files():
-    for remote in ('upstream', 'origin'):
-        command = ['git', 'merge-base', f'{remote}/dev', 'HEAD']
+    check_remotes = ['upstream', 'origin']
+    check_remotes.extend(splitlines_no_ends(get_output('git', 'remote')))
+    for remote in check_remotes:
+        command = ['git', 'merge-base', f'refs/remotes/{remote}/dev', 'HEAD']
         try:
             merge_base = splitlines_no_ends(get_output(*command))[0]
             break

From 3d78248aaf5a170c6c412a964183354badcda8e4 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 14 Jul 2020 14:47:03 +0200
Subject: [PATCH 296/412] Fix wrong variable name for docker login

---
 .github/workflows/release-dev.yml | 4 ++--
 .github/workflows/release.yml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 564d12be88..895fe6319d 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -193,9 +193,9 @@ jobs:
             .
       - name: Log in to docker hub
         env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
+        run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
       - run: docker push "${IMAGE}"
 
   deploy-docker-manifest:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6425cd8990..6809189f5c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -214,9 +214,9 @@ jobs:
             .
       - name: Log in to docker hub
         env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
-        run: docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD"
+        run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
       - run: docker push "${IMAGE}"
       - if: ${{ github.event.release.prerelease) }}
         name: Publish docker beta tag

From 01b1b688b1a61adfe357dabbc49f9945fe359f02 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 14 Jul 2020 15:10:26 +0200
Subject: [PATCH 297/412] Simplify and enable caching

---
 .github/workflows/release-dev.yml | 16 +++++++---------
 .github/workflows/release.yml     | 15 +++++++--------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 895fe6319d..c1e1dc6fa0 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -165,15 +165,12 @@ jobs:
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
-            build_to="esphome/esphome-hassio-${{ matrix.arch }}"
+            build_to="${{ github.repository }}-hassio-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile.hassio"
           else
             build_from="esphome/esphome-base-${{ matrix.arch }}:${base_version}"
-            build_to="esphome/esphome-${{ matrix.arch }}"
+            build_to="${{ github.repository }}-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile"
-            if [[ "${{ matrix.arch }}" == "amd64" ]]; then
-              build_to="esphome/esphome"
-            fi
           fi
 
           # Set env variables so these values don't need to be calculated again
@@ -190,6 +187,9 @@ jobs:
             --build-arg "BUILD_VERSION=${TAG}" \
             --tag "${IMAGE}" \
             --file "${DOCKERFILE}" \
+            --cache-from "${{ github.repository }}:latest"
+            --cache-from "${{ github.repository }}:beta"
+            --cache-from "${{ github.repository }}:dev"
             .
       - name: Log in to docker hub
         env:
@@ -213,7 +213,7 @@ jobs:
       run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
     - name: "Create the manifest"
       run: |
-        REPO=esphome/esphome
+        REPO=${{ github.repository }}
         TAG="dev"
 
         docker manifest create ${REPO}:${TAG} \
@@ -221,6 +221,4 @@ jobs:
           ${REPO}-amd64:${TAG} \
           ${REPO}-armv7:${TAG} \
           ${REPO}-i386:${TAG}
-        echo "::set-env name=TAG::${TAG}"
-        echo "::set-env name=REPO::${REPO}"
-    - run: docker push ${REPO}:${TAG}
+        docker push ${REPO}:${TAG}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6809189f5c..24be029442 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -186,15 +186,12 @@ jobs:
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
-            build_to="esphome/esphome-hassio-${{ matrix.arch }}"
+            build_to="${{ github.repository }}-hassio-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile.hassio"
           else
             build_from="esphome/esphome-base-${{ matrix.arch }}:${base_version}"
-            build_to="esphome/esphome-${{ matrix.arch }}"
+            build_to="${{ github.repository }}-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile"
-            if [[ "${{ matrix.arch }}" == "amd64" ]]; then
-              build_to="esphome/esphome"
-            fi
           fi
 
           # Set env variables so these values don't need to be calculated again
@@ -211,6 +208,9 @@ jobs:
             --build-arg "BUILD_VERSION=${TAG}" \
             --tag "${IMAGE}" \
             --file "${DOCKERFILE}" \
+            --cache-from "${{ github.repository }}:latest"
+            --cache-from "${{ github.repository }}:beta"
+            --cache-from "${{ github.repository }}:dev"
             .
       - name: Log in to docker hub
         env:
@@ -244,7 +244,7 @@ jobs:
       run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
     - name: "Create the manifest"
       run: |
-        REPO=esphome/esphome
+        REPO=${{ github.repository }}
         TAG="${GITHUB_REF#v}"
 
         docker manifest create ${REPO}:${TAG} \
@@ -252,9 +252,8 @@ jobs:
           ${REPO}-amd64:${TAG} \
           ${REPO}-armv7:${TAG} \
           ${REPO}-i386:${TAG}
-        echo "::set-env name=TAG::${TAG}"
         echo "::set-env name=REPO::${REPO}"
-    - run: docker push ${REPO}:${TAG}
+        docker push ${REPO}:${TAG}
 
     - name: Publish docker beta tag
       if: ${{ github.event.release.prerelease) }}

From a53481e2dae26239966804b1129c4872f79fdad7 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 14 Jul 2020 15:42:29 +0200
Subject: [PATCH 298/412] Fix GH Actions release-dev.yml

---
 .github/workflows/release-dev.yml |  9 +++++----
 .github/workflows/release.yml     | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index c1e1dc6fa0..9a12754fbf 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
     - dev
+    - gh-actions-test
 
 jobs:
   # THE LINT/TEST JOBS ARE COPIED FROM ci.yaml
@@ -187,9 +188,9 @@ jobs:
             --build-arg "BUILD_VERSION=${TAG}" \
             --tag "${IMAGE}" \
             --file "${DOCKERFILE}" \
-            --cache-from "${{ github.repository }}:latest"
-            --cache-from "${{ github.repository }}:beta"
-            --cache-from "${{ github.repository }}:dev"
+            --cache-from "${{ github.repository }}:latest" \
+            --cache-from "${{ github.repository }}:beta" \
+            --cache-from "${{ github.repository }}:dev" \
             .
       - name: Log in to docker hub
         env:
@@ -221,4 +222,4 @@ jobs:
           ${REPO}-amd64:${TAG} \
           ${REPO}-armv7:${TAG} \
           ${REPO}-i386:${TAG}
-        docker push ${REPO}:${TAG}
+        docker manifest push ${REPO}:${TAG}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 24be029442..a8af0ba8a1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -208,9 +208,9 @@ jobs:
             --build-arg "BUILD_VERSION=${TAG}" \
             --tag "${IMAGE}" \
             --file "${DOCKERFILE}" \
-            --cache-from "${{ github.repository }}:latest"
-            --cache-from "${{ github.repository }}:beta"
-            --cache-from "${{ github.repository }}:dev"
+            --cache-from "${{ github.repository }}:latest" \
+            --cache-from "${{ github.repository }}:beta" \
+            --cache-from "${{ github.repository }}:dev" \
             .
       - name: Log in to docker hub
         env:
@@ -253,7 +253,7 @@ jobs:
           ${REPO}-armv7:${TAG} \
           ${REPO}-i386:${TAG}
         echo "::set-env name=REPO::${REPO}"
-        docker push ${REPO}:${TAG}
+        docker manifest push ${REPO}:${TAG}
 
     - name: Publish docker beta tag
       if: ${{ github.event.release.prerelease) }}
@@ -263,7 +263,7 @@ jobs:
           ${REPO}-amd64:beta \
           ${REPO}-armv7:beta \
           ${REPO}-i386:beta
-        docker push ${REPO}:beta
+        docker manifest push ${REPO}:beta
     - name: Publish docker latest tag
       if: ${{ !github.event.release.prerelease) }}
       run: |
@@ -272,4 +272,4 @@ jobs:
           ${REPO}-amd64:latest \
           ${REPO}-armv7:latest \
           ${REPO}-i386:latest
-        docker push ${REPO}:latest
+        docker manifest push ${REPO}:latest

From 1ccc6e342c0e2fd9b11b941dc3b078beee8dd2b9 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 14 Jul 2020 15:42:56 +0200
Subject: [PATCH 299/412] Remove debug line

---
 .github/workflows/release-dev.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 9a12754fbf..217d943704 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
     - dev
-    - gh-actions-test
 
 jobs:
   # THE LINT/TEST JOBS ARE COPIED FROM ci.yaml

From 5776e70d7c464f271db51cd41823f7833b8dcfc9 Mon Sep 17 00:00:00 2001
From: Peter Kuehne <pkuehne@users.noreply.github.com>
Date: Tue, 14 Jul 2020 16:59:03 +0100
Subject: [PATCH 300/412] Bug/fix internal flag in binary sensor (#1136)

---
 esphome/__main__.py                           |  7 ++++++
 esphome/components/binary_sensor/__init__.py  |  2 +-
 .../binary_sensor/test_binary_sensor.py       | 24 +++++++++++++++++++
 .../binary_sensor/test_binary_sensor.yaml     | 18 ++++++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 tests/component_tests/binary_sensor/test_binary_sensor.py
 create mode 100644 tests/component_tests/binary_sensor/test_binary_sensor.yaml

diff --git a/esphome/__main__.py b/esphome/__main__.py
index 27262355d6..a961df8ada 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -131,6 +131,11 @@ def wrap_to_code(name, comp):
 
 
 def write_cpp(config):
+    generate_cpp_contents(config)
+    return write_cpp_file()
+
+
+def generate_cpp_contents(config):
     _LOGGER.info("Generating C++ source...")
 
     for name, component, conf in iter_components(CORE.config):
@@ -140,6 +145,8 @@ def write_cpp(config):
 
     CORE.flush_tasks()
 
+
+def write_cpp_file():
     writer.write_platformio_project()
 
     code_s = indent(CORE.cpp_main_section)
diff --git a/esphome/components/binary_sensor/__init__.py b/esphome/components/binary_sensor/__init__.py
index 7c78c3a369..2b5dd302c4 100644
--- a/esphome/components/binary_sensor/__init__.py
+++ b/esphome/components/binary_sensor/__init__.py
@@ -224,7 +224,7 @@ BINARY_SENSOR_SCHEMA = cv.MQTT_COMPONENT_SCHEMA.extend({
 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))
+        cg.add(var.set_internal(config[CONF_INTERNAL]))
     if CONF_DEVICE_CLASS in config:
         cg.add(var.set_device_class(config[CONF_DEVICE_CLASS]))
     if CONF_INVERTED in config:
diff --git a/tests/component_tests/binary_sensor/test_binary_sensor.py b/tests/component_tests/binary_sensor/test_binary_sensor.py
new file mode 100644
index 0000000000..8f3cd3aeda
--- /dev/null
+++ b/tests/component_tests/binary_sensor/test_binary_sensor.py
@@ -0,0 +1,24 @@
+""" Tests for the binary sensor component """
+
+from esphome.core import CORE
+from esphome.config import read_config
+from esphome.__main__ import generate_cpp_contents
+
+
+def test_binary_sensor_config_value_internal_set():
+    """
+    Test that the "internal" config value is correctly set
+    """
+    # Given
+    CORE.config_path = "tests/component_tests/binary_sensor/test_binary_sensor.yaml"
+    CORE.config = read_config({})
+
+    # When
+    generate_cpp_contents(CORE.config)
+    # print(CORE.cpp_main_section)
+
+    # Then
+    assert "bs_1->set_internal(true);" in CORE.cpp_main_section
+    assert "bs_2->set_internal(false);" in CORE.cpp_main_section
+
+    CORE.reset()
diff --git a/tests/component_tests/binary_sensor/test_binary_sensor.yaml b/tests/component_tests/binary_sensor/test_binary_sensor.yaml
new file mode 100644
index 0000000000..912ae115eb
--- /dev/null
+++ b/tests/component_tests/binary_sensor/test_binary_sensor.yaml
@@ -0,0 +1,18 @@
+esphome:
+  name: test
+  platform: ESP8266
+  board: d1_mini_lite
+
+binary_sensor:
+  - platform: gpio
+    id: bs_1
+    name: "test bs1"
+    internal: true
+    pin:
+      number: D0
+  - platform: gpio
+    id: bs_2
+    name: "test bs2"
+    internal: false
+    pin:
+      number: D1

From 412351fd1e8dd001f8d84f29315b1d02165962bb Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 14 Jul 2020 18:45:42 +0200
Subject: [PATCH 301/412] Use inclusive terminology (#1137)

---
 esphome/components/dallas/esp_one_wire.cpp |  2 +-
 esphome/components/mqtt/__init__.py        |  4 ++--
 esphome/components/mqtt/mqtt_component.cpp |  4 ++--
 esphome/core/component.cpp                 |  2 +-
 esphome/core/helpers.cpp                   |  8 ++++----
 esphome/core/helpers.h                     |  8 ++++----
 script/ci-custom.py                        | 23 ++++++++++++++++++++--
 7 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/esphome/components/dallas/esp_one_wire.cpp b/esphome/components/dallas/esp_one_wire.cpp
index d90b10894d..92b7317f7c 100644
--- a/esphome/components/dallas/esp_one_wire.cpp
+++ b/esphome/components/dallas/esp_one_wire.cpp
@@ -30,7 +30,7 @@ bool HOT ICACHE_RAM_ATTR ESPOneWire::reset() {
 
   // Switch into RX mode, letting the pin float
   this->pin_->pin_mode(INPUT_PULLUP);
-  // after 15µs-60µs wait time, slave pulls low for 60µs-240µs
+  // after 15µs-60µs wait time, responder pulls low for 60µs-240µs
   // let's have 70µs just in case
   delayMicroseconds(70);
 
diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 2f0ed0f8e2..db99334d0b 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -280,8 +280,8 @@ def mqtt_publish_json_action_to_code(config, action_id, template_arg, args):
 
 
 def get_default_topic_for(data, component_type, name, suffix):
-    whitelist = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_'
-    sanitized_name = ''.join(x for x in name.lower().replace(' ', '_') if x in whitelist)
+    allowlist = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_'
+    sanitized_name = ''.join(x for x in name.lower().replace(' ', '_') if x in allowlist)
     return '{}/{}/{}/{}'.format(data.topic_prefix, component_type,
                                 sanitized_name, suffix)
 
diff --git a/esphome/components/mqtt/mqtt_component.cpp b/esphome/components/mqtt/mqtt_component.cpp
index 4201d41c44..9b4255060f 100644
--- a/esphome/components/mqtt/mqtt_component.cpp
+++ b/esphome/components/mqtt/mqtt_component.cpp
@@ -12,7 +12,7 @@ static const char *TAG = "mqtt.component";
 void MQTTComponent::set_retain(bool retain) { this->retain_ = retain; }
 
 std::string MQTTComponent::get_discovery_topic_(const MQTTDiscoveryInfo &discovery_info) const {
-  std::string sanitized_name = sanitize_string_whitelist(App.get_name(), HOSTNAME_CHARACTER_WHITELIST);
+  std::string sanitized_name = sanitize_string_allowlist(App.get_name(), HOSTNAME_CHARACTER_ALLOWLIST);
   return discovery_info.prefix + "/" + this->component_type() + "/" + sanitized_name + "/" +
          this->get_default_object_id_() + "/config";
 }
@@ -117,7 +117,7 @@ bool MQTTComponent::is_discovery_enabled() const {
 }
 
 std::string MQTTComponent::get_default_object_id_() const {
-  return sanitize_string_whitelist(to_lowercase_underscore(this->friendly_name()), HOSTNAME_CHARACTER_WHITELIST);
+  return sanitize_string_allowlist(to_lowercase_underscore(this->friendly_name()), HOSTNAME_CHARACTER_ALLOWLIST);
 }
 
 void MQTTComponent::subscribe(const std::string &topic, mqtt_callback_t callback, uint8_t qos) {
diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index f4151a14fc..d2e9607e28 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -177,7 +177,7 @@ const std::string &Nameable::get_object_id() { return this->object_id_; }
 bool Nameable::is_internal() const { return this->internal_; }
 void Nameable::set_internal(bool internal) { this->internal_ = internal; }
 void Nameable::calc_object_id_() {
-  this->object_id_ = sanitize_string_whitelist(to_lowercase_underscore(this->name_), HOSTNAME_CHARACTER_WHITELIST);
+  this->object_id_ = sanitize_string_allowlist(to_lowercase_underscore(this->name_), HOSTNAME_CHARACTER_ALLOWLIST);
   // FNV-1 hash
   this->object_id_hash_ = fnv1_hash(this->object_id_);
 }
diff --git a/esphome/core/helpers.cpp b/esphome/core/helpers.cpp
index 2222a1a664..78a62a5e86 100644
--- a/esphome/core/helpers.cpp
+++ b/esphome/core/helpers.cpp
@@ -85,16 +85,16 @@ std::string to_lowercase_underscore(std::string s) {
   return s;
 }
 
-std::string sanitize_string_whitelist(const std::string &s, const std::string &whitelist) {
+std::string sanitize_string_allowlist(const std::string &s, const std::string &allowlist) {
   std::string out(s);
   out.erase(std::remove_if(out.begin(), out.end(),
-                           [&whitelist](const char &c) { return whitelist.find(c) == std::string::npos; }),
+                           [&allowlist](const char &c) { return allowlist.find(c) == std::string::npos; }),
             out.end());
   return out;
 }
 
 std::string sanitize_hostname(const std::string &hostname) {
-  std::string s = sanitize_string_whitelist(hostname, HOSTNAME_CHARACTER_WHITELIST);
+  std::string s = sanitize_string_allowlist(hostname, HOSTNAME_CHARACTER_ALLOWLIST);
   return truncate_string(s, 63);
 }
 
@@ -154,7 +154,7 @@ ParseOnOffState parse_on_off(const char *str, const char *on, const char *off) {
   return PARSE_NONE;
 }
 
-const char *HOSTNAME_CHARACTER_WHITELIST = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
+const char *HOSTNAME_CHARACTER_ALLOWLIST = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_";
 
 uint8_t crc8(uint8_t *data, uint8_t len) {
   uint8_t crc = 0;
diff --git a/esphome/core/helpers.h b/esphome/core/helpers.h
index ab3d883e05..0c660bdc8e 100644
--- a/esphome/core/helpers.h
+++ b/esphome/core/helpers.h
@@ -24,7 +24,7 @@
 namespace esphome {
 
 /// The characters that are allowed in a hostname.
-extern const char *HOSTNAME_CHARACTER_WHITELIST;
+extern const char *HOSTNAME_CHARACTER_ALLOWLIST;
 
 /// Gets the MAC address as a string, this can be used as way to identify this ESP.
 std::string get_mac_address();
@@ -43,7 +43,7 @@ std::string to_string(double val);
 std::string to_string(long double val);
 optional<float> parse_float(const std::string &str);
 
-/// Sanitize the hostname by removing characters that are not in the whitelist and truncating it to 63 chars.
+/// Sanitize the hostname by removing characters that are not in the allowlist and truncating it to 63 chars.
 std::string sanitize_hostname(const std::string &hostname);
 
 /// Truncate a string to a specific length
@@ -121,8 +121,8 @@ std::string uint64_to_string(uint64_t num);
 /// Convert a uint32_t to a hex string
 std::string uint32_to_string(uint32_t num);
 
-/// Sanitizes the input string with the whitelist.
-std::string sanitize_string_whitelist(const std::string &s, const std::string &whitelist);
+/// Sanitizes the input string with the allowlist.
+std::string sanitize_string_allowlist(const std::string &s, const std::string &allowlist);
 
 uint8_t reverse_bits_8(uint8_t x);
 uint16_t reverse_bits_16(uint16_t x);
diff --git a/script/ci-custom.py b/script/ci-custom.py
index 67010d77f9..cde026b5d4 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -91,7 +91,8 @@ def lint_post_check(func):
 
 
 def lint_re_check(regex, **kwargs):
-    prog = re.compile(regex, re.MULTILINE)
+    flags = kwargs.pop('flags', re.MULTILINE)
+    prog = re.compile(regex, flags)
     decor = lint_content_check(**kwargs)
 
     def decorator(func):
@@ -327,6 +328,24 @@ def lint_pragma_once(fname, content):
     return None
 
 
+@lint_re_check(r'(whitelist|blacklist|slave)', exclude=['script/ci-custom.py'], 
+               flags=re.IGNORECASE | re.MULTILINE)
+def lint_inclusive_language(fname, match):
+    # From https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49decddd39e5f6132ccd7d9fdc3d7c470b0061bb
+    return ("Avoid the use of whitelist/blacklist/slave.\n"
+            "Recommended replacements for 'master / slave' are:\n"
+            "    '{primary,main} / {secondary,replica,subordinate}\n"
+            "    '{initiator,requester} / {target,responder}'\n"
+            "    '{controller,host} / {device,worker,proxy}'\n"
+            "    'leader / follower'\n"
+            "    'director / performer'\n"
+            "\n"
+            "Recommended replacements for 'blacklist/whitelist' are:\n"
+            "    'denylist / allowlist'\n"
+            "    'blocklist / passlist'")
+
+
+
 @lint_content_find_check('ESP_LOG', include=['*.h', '*.tcc'], exclude=[
     'esphome/components/binary_sensor/binary_sensor.h',
     'esphome/components/cover/cover.h',
@@ -365,7 +384,7 @@ def add_errors(fname, errs):
             lineno = 1
             col = 1
             msg = err
-        if not isinstance(err, str):
+        if not isinstance(msg, str):
             raise ValueError("Error is not instance of string!")
         if not isinstance(lineno, int):
             raise ValueError("Line number is not an int!")

From 465cd3d1f94ee6bd77a28c1a34be69178de7cdcc Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 14 Jul 2020 18:47:17 +0200
Subject: [PATCH 302/412] Add exposure notifications (#1135)

---
 .../esp32_ble_tracker/esp32_ble_tracker.h     |  3 ++
 .../exposure_notifications/__init__.py        | 28 +++++++++++
 .../exposure_notifications.cpp                | 49 +++++++++++++++++++
 .../exposure_notifications.h                  | 29 +++++++++++
 4 files changed, 109 insertions(+)
 create mode 100644 esphome/components/exposure_notifications/__init__.py
 create mode 100644 esphome/components/exposure_notifications/exposure_notifications.cpp
 create mode 100644 esphome/components/exposure_notifications/exposure_notifications.h

diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 8d011abfe3..eef7930b78 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -28,6 +28,7 @@ class ESPBTUUID {
   bool contains(uint8_t data1, uint8_t data2) const;
 
   bool operator==(const ESPBTUUID &uuid) const;
+  bool operator!=(const ESPBTUUID &uuid) const { return !(*this == uuid); }
 
   esp_bt_uuid_t get_uuid();
 
@@ -74,6 +75,8 @@ class ESPBTDevice {
 
   uint64_t address_uint64() const;
 
+  const uint8_t *address() const { return address_; }
+
   esp_ble_addr_type_t get_address_type() const { return this->address_type_; }
   int get_rssi() const { return rssi_; }
   const std::string &get_name() const { return this->name_; }
diff --git a/esphome/components/exposure_notifications/__init__.py b/esphome/components/exposure_notifications/__init__.py
new file mode 100644
index 0000000000..de9c3a58df
--- /dev/null
+++ b/esphome/components/exposure_notifications/__init__.py
@@ -0,0 +1,28 @@
+import esphome.codegen as cg
+from esphome import automation
+import esphome.config_validation as cv
+from esphome.components import esp32_ble_tracker
+from esphome.const import CONF_TRIGGER_ID
+
+DEPENDENCIES = ['esp32_ble_tracker']
+
+exposure_notifications_ns = cg.esphome_ns.namespace('exposure_notifications')
+ExposureNotification = exposure_notifications_ns.struct('ExposureNotification')
+ExposureNotificationTrigger = exposure_notifications_ns.class_(
+    'ExposureNotificationTrigger', esp32_ble_tracker.ESPBTDeviceListener,
+    automation.Trigger.template(ExposureNotification))
+
+CONF_ON_EXPOSURE_NOTIFICATION = 'on_exposure_notification'
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.Required(CONF_ON_EXPOSURE_NOTIFICATION): automation.validate_automation(cv.Schema({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ExposureNotificationTrigger),
+    }).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)),
+})
+
+
+def to_code(config):
+    for conf in config.get(CONF_ON_EXPOSURE_NOTIFICATION, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
+        yield automation.build_automation(trigger, [(ExposureNotification, 'x')], conf)
+        yield esp32_ble_tracker.register_ble_device(trigger, conf)
diff --git a/esphome/components/exposure_notifications/exposure_notifications.cpp b/esphome/components/exposure_notifications/exposure_notifications.cpp
new file mode 100644
index 0000000000..1d8cf83a0e
--- /dev/null
+++ b/esphome/components/exposure_notifications/exposure_notifications.cpp
@@ -0,0 +1,49 @@
+#include "exposure_notifications.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace exposure_notifications {
+
+using namespace esp32_ble_tracker;
+
+static const char *TAG = "exposure_notifications";
+
+bool ExposureNotificationTrigger::parse_device(const ESPBTDevice &device) {
+  // See also https://blog.google/documents/70/Exposure_Notification_-_Bluetooth_Specification_v1.2.2.pdf
+  if (device.get_service_uuids().size() != 1)
+    return false;
+
+  // Exposure notifications have Service UUID FD 6F
+  ESPBTUUID uuid = device.get_service_uuids()[0];
+  // constant service identifier
+  const ESPBTUUID expected_uuid = ESPBTUUID::from_uint16(0xFD6F);
+  if (uuid != expected_uuid)
+    return false;
+  if (device.get_service_datas().size() != 1)
+    return false;
+
+  // The service data should be 20 bytes
+  // First 16 bytes are the rolling proximity identifier (RPI)
+  // Then 4 bytes of encrypted metadata follow which can be used to get the transmit power level.
+  ServiceData service_data = device.get_service_datas()[0];
+  if (service_data.uuid != expected_uuid)
+    return false;
+  auto data = service_data.data;
+  if (data.size() != 20)
+    return false;
+  ExposureNotification notification{};
+  memcpy(&notification.address[0], device.address(), 6);
+  memcpy(&notification.rolling_proximity_identifier[0], &data[0], 16);
+  memcpy(&notification.associated_encrypted_metadata[0], &data[16], 4);
+  notification.rssi = device.get_rssi();
+  this->trigger(notification);
+  return true;
+}
+
+}  // namespace exposure_notifications
+}  // namespace esphome
+
+#endif
diff --git a/esphome/components/exposure_notifications/exposure_notifications.h b/esphome/components/exposure_notifications/exposure_notifications.h
new file mode 100644
index 0000000000..6b9f61b2a0
--- /dev/null
+++ b/esphome/components/exposure_notifications/exposure_notifications.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include <array>
+
+#ifdef ARDUINO_ARCH_ESP32
+
+namespace esphome {
+namespace exposure_notifications {
+
+struct ExposureNotification {
+  std::array<uint8_t, 6> address;
+  int rssi;
+  std::array<uint8_t, 16> rolling_proximity_identifier;
+  std::array<uint8_t, 4> associated_encrypted_metadata;
+};
+
+class ExposureNotificationTrigger : public Trigger<ExposureNotification>,
+                                    public esp32_ble_tracker::ESPBTDeviceListener {
+ public:
+  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
+};
+
+}  // namespace exposure_notifications
+}  // namespace esphome
+
+#endif

From e20c994b82996912194020092730265e4412654c Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 14 Jul 2020 18:59:48 +0200
Subject: [PATCH 303/412] Fix adding another mbedtls (#1131)

---
 esphome/components/xiaomi_cgd1/sensor.py             | 2 --
 esphome/components/xiaomi_lywsd03mmc/sensor.py       | 2 --
 esphome/components/xiaomi_mjyd02yla/binary_sensor.py | 2 --
 3 files changed, 6 deletions(-)

diff --git a/esphome/components/xiaomi_cgd1/sensor.py b/esphome/components/xiaomi_cgd1/sensor.py
index b7891c8a56..401f6de7d2 100644
--- a/esphome/components/xiaomi_cgd1/sensor.py
+++ b/esphome/components/xiaomi_cgd1/sensor.py
@@ -39,5 +39,3 @@ def to_code(config):
     if CONF_BATTERY_LEVEL in config:
         sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
         cg.add(var.set_battery_level(sens))
-
-    cg.add_library("mbedtls", None)
diff --git a/esphome/components/xiaomi_lywsd03mmc/sensor.py b/esphome/components/xiaomi_lywsd03mmc/sensor.py
index 1ab59b01c5..9ecf3f64a9 100644
--- a/esphome/components/xiaomi_lywsd03mmc/sensor.py
+++ b/esphome/components/xiaomi_lywsd03mmc/sensor.py
@@ -40,5 +40,3 @@ def to_code(config):
     if CONF_BATTERY_LEVEL in config:
         sens = yield sensor.new_sensor(config[CONF_BATTERY_LEVEL])
         cg.add(var.set_battery_level(sens))
-
-    cg.add_library("mbedtls", None)
diff --git a/esphome/components/xiaomi_mjyd02yla/binary_sensor.py b/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
index 6d2a674969..72cf57d22c 100644
--- a/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
+++ b/esphome/components/xiaomi_mjyd02yla/binary_sensor.py
@@ -43,5 +43,3 @@ def to_code(config):
     if CONF_LIGHT in config:
         sens = yield binary_sensor.new_binary_sensor(config[CONF_LIGHT])
         cg.add(var.set_light(sens))
-
-    cg.add_library("mbedtls", None)

From 17b55fc23de187fd3eb5b717a65f60bf04fe44ee Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 14 Jul 2020 19:00:01 +0200
Subject: [PATCH 304/412] Tuya Sensor remove commented out code (style guide)
 (#1132)

---
 esphome/components/tuya/sensor/tuya_sensor.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/esphome/components/tuya/sensor/tuya_sensor.cpp b/esphome/components/tuya/sensor/tuya_sensor.cpp
index 49a1af2efe..b8e2aa97b7 100644
--- a/esphome/components/tuya/sensor/tuya_sensor.cpp
+++ b/esphome/components/tuya/sensor/tuya_sensor.cpp
@@ -24,17 +24,6 @@ void TuyaSensor::setup() {
   });
 }
 
-// void TuyaSensor::write_state(bool state) {
-//   TuyaDatapoint datapoint{};
-//   datapoint.id = this->sensor_id_;
-//   datapoint.type = TuyaDatapointType::BOOLEAN;
-//   datapoint.value_bool = state;
-//   this->parent_->set_datapoint_value(datapoint);
-//   ESP_LOGD(TAG, "Setting sensor: %s", ONOFF(state));
-
-//   this->publish_state(state);
-// }
-
 void TuyaSensor::dump_config() {
   LOG_SENSOR("", "Tuya Sensor", this);
   ESP_LOGCONFIG(TAG, "  Sensor has datapoint ID %u", this->sensor_id_);

From 764eb960c6a9ea819684105842284c67b3d4e3a4 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 01:37:30 +0200
Subject: [PATCH 305/412] Update build scripts

---
 .github/workflows/ci.yml          | 12 ++--
 .github/workflows/release-dev.yml | 67 +++++++++++++---------
 .github/workflows/release.yml     | 93 +++++++++++++++++--------------
 docker/Dockerfile                 |  2 +-
 docker/Dockerfile.dev             |  2 +-
 docker/Dockerfile.lint            | 23 +-------
 esphome/core_config.py            |  5 +-
 requirements.txt                  |  2 +-
 requirements_test.txt             | 14 -----
 script/setup                      |  2 +-
 setup.py                          |  2 +-
 11 files changed, 110 insertions(+), 114 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9d03705e84..6ade0655a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
   # A fast overview job that checks only changed files
   overview:
     runs-on: ubuntu-latest
-    container: esphome/esphome-lint:dev
+    container: esphome/esphome-lint:latest
     steps:
       # Also fetch history and dev branch so that we can check which files changed
       - uses: actions/checkout@v2
@@ -27,7 +27,7 @@ jobs:
           fetch-depth: 0
       - name: Fetch dev branch
         run: git fetch origin dev
-      
+
       # Cache the .pio directory with (primarily) library dependencies
       - name: Cache .pio lib_deps
         uses: actions/cache@v1
@@ -59,7 +59,7 @@ jobs:
     runs-on: ubuntu-latest
     # cpp lint job runs with esphome-lint docker image so that clang-format-*
     # doesn't have to be installed
-    container: esphome/esphome-lint:dev
+    container: esphome/esphome-lint:latest
     steps:
       - uses: actions/checkout@v2
       # Cache platformio intermediary files (like libraries etc)
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     # cpp lint job runs with esphome-lint docker image so that clang-format-*
     # doesn't have to be installed
-    container: esphome/esphome-lint:dev
+    container: esphome/esphome-lint:latest
     # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
     strategy:
       matrix:
@@ -106,7 +106,7 @@ jobs:
       - name: Set up platformio environment
         run: pio init --ide atom
 
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
@@ -188,7 +188,7 @@ jobs:
       - name: Set up environment
         run: script/setup
 
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 217d943704..962238807e 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -7,12 +7,12 @@ on:
 
 jobs:
   # THE LINT/TEST JOBS ARE COPIED FROM ci.yaml
- 
+
   lint-clang-format:
     runs-on: ubuntu-latest
     # cpp lint job runs with esphome-lint docker image so that clang-format-*
     # doesn't have to be installed
-    container: esphome/esphome-lint:dev
+    container: esphome/esphome-lint:latest
     steps:
       - uses: actions/checkout@v2
       # Cache platformio intermediary files (like libraries etc)
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     # cpp lint job runs with esphome-lint docker image so that clang-format-*
     # doesn't have to be installed
-    container: esphome/esphome-lint:dev
+    container: esphome/esphome-lint:latest
     # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
     strategy:
       matrix:
@@ -59,7 +59,7 @@ jobs:
       - name: Set up platformio environment
         run: pio init --ide atom
 
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
@@ -141,7 +141,7 @@ jobs:
       - name: Set up environment
         run: script/setup
 
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
@@ -158,45 +158,54 @@ jobs:
         build_type: ["hassio", "docker"]
     steps:
       - uses: actions/checkout@v2
+      - name: Set TAG
+        run: |
+          TAG="${GITHUB_SHA:0:7}"
+          echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          tag="dev"
-          base_version="2.1.2"
+          base_version="2.3.1"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
-            build_to="${{ github.repository }}-hassio-${{ matrix.arch }}"
+            build_to="esphome/esphome-hassio-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile.hassio"
           else
             build_from="esphome/esphome-base-${{ matrix.arch }}:${base_version}"
-            build_to="${{ github.repository }}-${{ matrix.arch }}"
+            build_to="esphome/esphome-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile"
           fi
 
-          # Set env variables so these values don't need to be calculated again
-          echo "::set-env name=TAG::${tag}"
           echo "::set-env name=BUILD_FROM::${build_from}"
           echo "::set-env name=BUILD_TO::${build_to}"
-          echo "::set-env name=IMAGE::${build_to}:${tag}"
           echo "::set-env name=DOCKERFILE::${dockerfile}"
+      - name: Pull for cache
+        run: |
+          docker pull "${BUILD_TO}:latest" || true
+          docker pull "${BUILD_TO}:beta" || true
+          docker pull "${BUILD_TO}:dev" || true
       - name: Register QEMU binfmt
         run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
       - run: |
           docker build \
             --build-arg "BUILD_FROM=${BUILD_FROM}" \
             --build-arg "BUILD_VERSION=${TAG}" \
-            --tag "${IMAGE}" \
+            --tag "${BUILD_TO}:${TAG}" \
+            --tag "${BUILD_TO}:dev" \
+            --cache-from "${BUILD_TO}:latest" \
+            --cache-from "${BUILD_TO}:beta" \
+            --cache-from "${BUILD_TO}:dev" \
             --file "${DOCKERFILE}" \
-            --cache-from "${{ github.repository }}:latest" \
-            --cache-from "${{ github.repository }}:beta" \
-            --cache-from "${{ github.repository }}:dev" \
             .
       - name: Log in to docker hub
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-      - run: docker push "${IMAGE}"
+      - run: |
+          docker push "${BUILD_TO}:${TAG}"
+          docker push "${BUILD_TO}:dev"
+
 
   deploy-docker-manifest:
     runs-on: ubuntu-latest
@@ -206,6 +215,10 @@ jobs:
       run: |
         mkdir -p ~/.docker
         echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - name: Set TAG
+      run: |
+        TAG="${GITHUB_SHA:0:7}"
+        echo "::set-env name=TAG::${TAG}"
     - name: Log in to docker hub
       env:
         DOCKER_USER: ${{ secrets.DOCKER_USER }}
@@ -213,12 +226,16 @@ jobs:
       run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
     - name: "Create the manifest"
       run: |
-        REPO=${{ github.repository }}
-        TAG="dev"
+        docker manifest create esphome/esphome:${TAG} \
+          esphome/esphome-aarch64:${TAG} \
+          esphome/esphome-amd64:${TAG} \
+          esphome/esphome-armv7:${TAG} \
+          esphome/esphome-i386:${TAG}
+        docker manifest push esphome/esphome:${TAG}
 
-        docker manifest create ${REPO}:${TAG} \
-          ${REPO}-aarch64:${TAG} \
-          ${REPO}-amd64:${TAG} \
-          ${REPO}-armv7:${TAG} \
-          ${REPO}-i386:${TAG}
-        docker manifest push ${REPO}:${TAG}
+        docker manifest create esphome/esphome:dev \
+          esphome/esphome-aarch64:${TAG} \
+          esphome/esphome-amd64:${TAG} \
+          esphome/esphome-armv7:${TAG} \
+          esphome/esphome-i386:${TAG}
+        docker manifest push esphome/esphome:dev
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a8af0ba8a1..47811cc53c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,12 +6,12 @@ on:
 
 jobs:
   # THE LINT/TEST JOBS ARE COPIED FROM ci.yaml
- 
+
   lint-clang-format:
     runs-on: ubuntu-latest
     # cpp lint job runs with esphome-lint docker image so that clang-format-*
     # doesn't have to be installed
-    container: esphome/esphome-lint:dev
+    container: esphome/esphome-lint:latest
     steps:
       - uses: actions/checkout@v2
       # Cache platformio intermediary files (like libraries etc)
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     # cpp lint job runs with esphome-lint docker image so that clang-format-*
     # doesn't have to be installed
-    container: esphome/esphome-lint:dev
+    container: esphome/esphome-lint:latest
     # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
     strategy:
       matrix:
@@ -58,7 +58,7 @@ jobs:
       - name: Set up platformio environment
         run: pio init --ide atom
 
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
@@ -140,7 +140,6 @@ jobs:
       - name: Set up environment
         run: script/setup
 
-      
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
@@ -179,54 +178,62 @@ jobs:
         build_type: ["hassio", "docker"]
     steps:
       - uses: actions/checkout@v2
+      - name: Set TAG
+        run: |
+          TAG="${GITHUB_REF#refs/tags/v}"
+          echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          tag="${GITHUB_REF#v}"
-          base_version="2.1.2"
+          base_version="2.3.1"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
-            build_to="${{ github.repository }}-hassio-${{ matrix.arch }}"
+            build_to="esphome/esphome-hassio-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile.hassio"
           else
             build_from="esphome/esphome-base-${{ matrix.arch }}:${base_version}"
-            build_to="${{ github.repository }}-${{ matrix.arch }}"
+            build_to="esphome/esphome-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile"
           fi
 
           # Set env variables so these values don't need to be calculated again
-          echo "::set-env name=TAG::${tag}"
           echo "::set-env name=BUILD_FROM::${build_from}"
           echo "::set-env name=BUILD_TO::${build_to}"
-          echo "::set-env name=IMAGE::${build_to}:${tag}"
           echo "::set-env name=DOCKERFILE::${dockerfile}"
+      - name: Pull for cache
+        run: |
+          docker pull "${BUILD_TO}:latest" || true
+          docker pull "${BUILD_TO}:beta" || true
+          docker pull "${BUILD_TO}:dev" || true
       - name: Register QEMU binfmt
         run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
       - run: |
           docker build \
             --build-arg "BUILD_FROM=${BUILD_FROM}" \
             --build-arg "BUILD_VERSION=${TAG}" \
-            --tag "${IMAGE}" \
+            --tag "${BUILD_TO}:${TAG}" \
+            --cache-from "${BUILD_TO}:latest" \
+            --cache-from "${BUILD_TO}:beta" \
+            --cache-from "${BUILD_TO}:dev" \
             --file "${DOCKERFILE}" \
-            --cache-from "${{ github.repository }}:latest" \
-            --cache-from "${{ github.repository }}:beta" \
-            --cache-from "${{ github.repository }}:dev" \
             .
       - name: Log in to docker hub
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-      - run: docker push "${IMAGE}"
-      - if: ${{ github.event.release.prerelease) }}
-        name: Publish docker beta tag
+      - run: docker push "${BUILD_TO}:${TAG}"
+
+      # Always publish to beta tag (also full releases)
+      - name: Publish docker beta tag
         run: |
-          docker tag "${IMAGE}" ${BUILD_TO}:beta
+          docker tag "${BUILD_TO}:${TAG}" "${BUILD_TO}:beta"
           docker push "${BUILD_TO}:beta"
+
       - if: ${{ !github.event.release.prerelease) }}
         name: Publish docker latest tag
         run: |
-          docker tag "${IMAGE}" ${BUILD_TO}:latest
+          docker tag "${BUILD_TO}:${TAG}" "${BUILD_TO}:latest"
           docker push "${BUILD_TO}:latest"
 
   deploy-docker-manifest:
@@ -237,6 +244,10 @@ jobs:
       run: |
         mkdir -p ~/.docker
         echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - name: Set TAG
+      run: |
+        TAG="${GITHUB_REF#refs/tags/v}"
+        echo "::set-env name=TAG::${TAG}"
     - name: Log in to docker hub
       env:
         DOCKER_USER: ${{ secrets.DOCKER_USER }}
@@ -244,32 +255,28 @@ jobs:
       run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
     - name: "Create the manifest"
       run: |
-        REPO=${{ github.repository }}
-        TAG="${GITHUB_REF#v}"
-
-        docker manifest create ${REPO}:${TAG} \
-          ${REPO}-aarch64:${TAG} \
-          ${REPO}-amd64:${TAG} \
-          ${REPO}-armv7:${TAG} \
-          ${REPO}-i386:${TAG}
-        echo "::set-env name=REPO::${REPO}"
-        docker manifest push ${REPO}:${TAG}
+        docker manifest create esphome/esphome:${TAG} \
+          esphome/esphome-aarch64:${TAG} \
+          esphome/esphome-amd64:${TAG} \
+          esphome/esphome-armv7:${TAG} \
+          esphome/esphome-i386:${TAG}
+        docker manifest push esphome/esphome:${TAG}
 
     - name: Publish docker beta tag
-      if: ${{ github.event.release.prerelease) }}
       run: |
-        docker manifest create ${REPO}:beta \
-          ${REPO}-aarch64:beta \
-          ${REPO}-amd64:beta \
-          ${REPO}-armv7:beta \
-          ${REPO}-i386:beta
-        docker manifest push ${REPO}:beta
+        docker manifest create esphome/esphome:beta \
+          esphome/esphome-aarch64:${TAG} \
+          esphome/esphome-amd64:${TAG} \
+          esphome/esphome-armv7:${TAG} \
+          esphome/esphome-i386:${TAG}
+        docker manifest push esphome/esphome:beta
+
     - name: Publish docker latest tag
       if: ${{ !github.event.release.prerelease) }}
       run: |
-        docker manifest create ${REPO}:latest \
-          ${REPO}-aarch64:latest \
-          ${REPO}-amd64:latest \
-          ${REPO}-armv7:latest \
-          ${REPO}-i386:latest
-        docker manifest push ${REPO}:latest
+        docker manifest create esphome/esphome:latest \
+          esphome/esphome-aarch64:${TAG} \
+          esphome/esphome-amd64:${TAG} \
+          esphome/esphome-armv7:${TAG} \
+          esphome/esphome-i386:${TAG}
+        docker manifest push esphome/esphome:latest
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bcdc5feaf7..16b546d0dd 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.1.1
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.1
 FROM ${BUILD_FROM}
 
 COPY . .
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index a3871e2513..0a72361a28 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.0.1
+FROM esphome/esphome-base-amd64:2.3.1
 
 COPY . .
 
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 32b316075f..a1839a82c0 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,24 +1,7 @@
-FROM esphome/esphome-base-amd64:2.1.2
+FROM esphome/esphome-lint-base:2.3.1
 
-RUN \
-    apt-get update \
-    && apt-get install -y --no-install-recommends \
-        clang-format-7 \
-        clang-tidy-7 \
-        patch \
-        software-properties-common \
-    # Update to latest git version because of github actions
-    # https://github.com/actions/checkout/issues/126
-    && apt-add-repository ppa:git-core/ppa \
-    && apt-get install -y --no-install-recommends \
-        git \
-    && rm -rf \
-        /tmp/* \
-        /var/{cache,log}/* \
-        /var/lib/apt/lists/*
-
-COPY requirements_test.txt /requirements_test.txt
-RUN pip3 install --no-cache-dir -r /requirements_test.txt
+COPY requirements.txt requirements_test.txt /
+RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt
 
 VOLUME ["/esphome"]
 WORKDIR /esphome
diff --git a/esphome/core_config.py b/esphome/core_config.py
index d447eaaffb..9b4ea3a2e1 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -46,6 +46,9 @@ def validate_board(value):
 validate_platform = cv.one_of(*ESP_PLATFORMS, upper=True)
 
 PLATFORMIO_ESP8266_LUT = {
+    '2.7.2': 'espressif8266@2.6.0',
+    '2.7.1': 'espressif8266@2.5.1',
+    '2.7.0': 'espressif8266@2.5.0',
     '2.6.3': 'espressif8266@2.4.0',
     '2.6.2': 'espressif8266@2.3.1',
     '2.6.1': 'espressif8266@2.3.0',
@@ -66,7 +69,7 @@ PLATFORMIO_ESP32_LUT = {
     '1.0.1': 'espressif32@1.6.0',
     '1.0.2': 'espressif32@1.9.0',
     '1.0.3': 'espressif32@1.10.0',
-    '1.0.4': 'espressif32@1.12.1',
+    '1.0.4': 'espressif32@1.12.4',
     'RECOMMENDED': 'espressif32@1.12.1',
     'LATEST': 'espressif32',
     'DEV': ARDUINO_VERSION_ESP32_DEV,
diff --git a/requirements.txt b/requirements.txt
index 0a3573f7b0..731bd73f39 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ tzlocal==2.0.0
 pytz==2020.1
 pyserial==3.4
 ifaddr==0.1.6
-platformio==4.3.3
+platformio==4.3.4
 esptool==2.8
 click==7.1.2
 deepmerge==0.1.0
diff --git a/requirements_test.txt b/requirements_test.txt
index da4656b085..ae78feab21 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,17 +1,3 @@
-voluptuous==0.11.7
-PyYAML==5.3.1
-paho-mqtt==1.5.0
-colorlog==4.1.0
-tornado==6.0.4
-protobuf==3.11.3
-tzlocal==2.0.0
-pytz==2020.1
-pyserial==3.4
-ifaddr==0.1.6
-platformio==4.3.3
-esptool==2.8
-deepmerge==0.1.0
-
 pylint==2.5.0
 flake8==3.7.9
 pillow
diff --git a/script/setup b/script/setup
index 810fb2a2bf..d70a44ee49 100755
--- a/script/setup
+++ b/script/setup
@@ -4,5 +4,5 @@
 set -e
 
 cd "$(dirname "$0")/.."
-pip3 install -r requirements_test.txt
+pip3 install -r requirements.txt -r requirements_test.txt
 pip3 install -e .
diff --git a/setup.py b/setup.py
index ede80b34e1..2e08cb40b8 100755
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ REQUIRES = [
 # This means they have to be in your $PATH.
 if os.environ.get('ESPHOME_USE_SUBPROCESS') is None:
     REQUIRES.extend([
-        'platformio==4.3.3',
+        'platformio==4.3.4',
         'esptool==2.8',
     ])
 

From 13696b1ec45846afda4d15deb1c204846a32b814 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Wed, 15 Jul 2020 02:45:54 -0700
Subject: [PATCH 306/412] add mqtt speed topics for fan (#1140)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/fan/__init__.py | 4 ++++
 tests/test1.yaml                   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/esphome/components/fan/__init__.py b/esphome/components/fan/__init__.py
index 50fdb1c2c9..7b0a79a0d3 100644
--- a/esphome/components/fan/__init__.py
+++ b/esphome/components/fan/__init__.py
@@ -34,6 +34,10 @@ FAN_SCHEMA = cv.MQTT_COMMAND_COMPONENT_SCHEMA.extend({
                                                       cv.publish_topic),
     cv.Optional(CONF_OSCILLATION_COMMAND_TOPIC): cv.All(cv.requires_component('mqtt'),
                                                         cv.subscribe_topic),
+    cv.Optional(CONF_SPEED_STATE_TOPIC): cv.All(cv.requires_component('mqtt'),
+                                                cv.publish_topic),
+    cv.Optional(CONF_SPEED_COMMAND_TOPIC): cv.All(cv.requires_component('mqtt'),
+                                                  cv.subscribe_topic),
 })
 
 
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b131b1a6ab..84af00e90a 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1499,6 +1499,10 @@ fan:
       low: 0.45
       medium: 0.75
       high: 1.0
+    oscillation_state_topic: oscillation/state/topic
+    oscillation_command_topic: oscillation/command/topic
+    speed_state_topic: speed/state/topic
+    speed_command_topic: speed/command/topic
 
 interval:
   - interval: 10s

From 9880a425f4be40fb684eb4713cab11a0bd095cc2 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 12:04:22 +0200
Subject: [PATCH 307/412] Only compile docker builds for dev releases

---
 .github/workflows/release-dev.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 962238807e..e807666de4 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -155,7 +155,8 @@ jobs:
     strategy:
       matrix:
         arch: [amd64, i386, armv7, aarch64]
-        build_type: ["hassio", "docker"]
+        # Hassio dev image doesn't use esphome/esphome-hassio-$arch and uses base directly
+        build_type: ["docker"]
     steps:
       - uses: actions/checkout@v2
       - name: Set TAG

From 2a14473e8cb27f1f1be89ac9d42e3c31c632523d Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 12:58:15 +0200
Subject: [PATCH 308/412] Create dependabot.yml

---
 .github/dependabot.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..b38df29f46
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/"
+    schedule:
+      interval: "daily"

From eca36cb868468eeb34fefc9ebcc6f46fcd6d94e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2020 13:26:13 +0200
Subject: [PATCH 309/412] Bump pytest from 5.4.1 to 5.4.3 (#1144)

Bumps [pytest](https://github.com/pytest-dev/pytest) from 5.4.1 to 5.4.3.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/5.4.1...5.4.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index ae78feab21..eba4c87557 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -4,7 +4,7 @@ pillow
 pexpect
 
 # Unit tests
-pytest==5.4.1
+pytest==5.4.3
 pytest-cov==2.8.1
 pytest-mock==1.13.0
 asyncmock==0.4.2

From ba73cb1b753b81f1e35f172b85829cd2a98eea16 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2020 13:27:47 +0200
Subject: [PATCH 310/412] Bump hypothesis from 5.10.4 to 5.19.3 (#1146)

Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 5.10.4 to 5.19.3.
- [Release notes](https://github.com/HypothesisWorks/hypothesis/releases)
- [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-5.10.4...hypothesis-python-5.19.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index eba4c87557..da28ebe0cc 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -8,4 +8,4 @@ pytest==5.4.3
 pytest-cov==2.8.1
 pytest-mock==1.13.0
 asyncmock==0.4.2
-hypothesis==5.10.4
+hypothesis==5.19.3

From 7bbdfc555358840db990d75baec17cc934e2ad7d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2020 13:28:06 +0200
Subject: [PATCH 311/412] Bump protobuf from 3.11.3 to 3.12.2 (#1147)

Bumps [protobuf](https://github.com/protocolbuffers/protobuf) from 3.11.3 to 3.12.2.
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Changelog](https://github.com/protocolbuffers/protobuf/blob/master/generate_changelog.py)
- [Commits](https://github.com/protocolbuffers/protobuf/compare/v3.11.3...v3.12.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 731bd73f39..93d55a062b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ PyYAML==5.3.1
 paho-mqtt==1.5.0
 colorlog==4.1.0
 tornado==6.0.4
-protobuf==3.11.3
+protobuf==3.12.2
 tzlocal==2.0.0
 pytz==2020.1
 pyserial==3.4

From 850368b5292073a8c54e6c08f94f366403d7f82e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2020 13:28:37 +0200
Subject: [PATCH 312/412] Bump ifaddr from 0.1.6 to 0.1.7 (#1148)

Bumps [ifaddr](https://github.com/pydron/ifaddr) from 0.1.6 to 0.1.7.
- [Release notes](https://github.com/pydron/ifaddr/releases)
- [Commits](https://github.com/pydron/ifaddr/compare/0.1.6...0.1.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 93d55a062b..059a07fc83 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ protobuf==3.12.2
 tzlocal==2.0.0
 pytz==2020.1
 pyserial==3.4
-ifaddr==0.1.6
+ifaddr==0.1.7
 platformio==4.3.4
 esptool==2.8
 click==7.1.2

From ca144bae906525f0c9f1c230c4a358c83a96c38e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 Jul 2020 13:44:43 +0200
Subject: [PATCH 313/412] Bump pytest-cov from 2.8.1 to 2.10.0 (#1145)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index da28ebe0cc..81f4953975 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,7 +5,7 @@ pexpect
 
 # Unit tests
 pytest==5.4.3
-pytest-cov==2.8.1
+pytest-cov==2.10.0
 pytest-mock==1.13.0
 asyncmock==0.4.2
 hypothesis==5.19.3

From 1254ec284916d2c063ab51a373f555972bd5aae6 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 13:50:35 +0200
Subject: [PATCH 314/412] Fix Waveshare 7.50inV2 (#1143)

See also https://github.com/esphome/esphome/pull/1077
---
 esphome/components/waveshare_epaper/display.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/waveshare_epaper/display.py b/esphome/components/waveshare_epaper/display.py
index 577d832785..da2e30de00 100644
--- a/esphome/components/waveshare_epaper/display.py
+++ b/esphome/components/waveshare_epaper/display.py
@@ -32,7 +32,7 @@ MODELS = {
     '4.20in': ('b', WaveshareEPaper4P2In),
     '5.83in': ('b', WaveshareEPaper5P8In),
     '7.50in': ('b', WaveshareEPaper7P5In),
-    '7.50inV2': ('b', WaveshareEPaper7P5InV2),
+    '7.50inv2': ('b', WaveshareEPaper7P5InV2),
 }
 
 

From a20e71b32abf37026afaf17e993542878248695c Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 13:51:48 +0200
Subject: [PATCH 315/412] Load setup.py requirements from requirements.txt
 (#1149)

---
 setup.py | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/setup.py b/setup.py
index 2e08cb40b8..06151bf1e5 100755
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,9 @@
 #!/usr/bin/env python3
 """esphome setup script."""
-from setuptools import setup, find_packages
 import os
 
+from setuptools import setup, find_packages
+
 from esphome import const
 
 PROJECT_NAME = 'esphome'
@@ -22,28 +23,20 @@ GITHUB_URL = 'https://github.com/{}'.format(GITHUB_PATH)
 
 DOWNLOAD_URL = '{}/archive/v{}.zip'.format(GITHUB_URL, const.__version__)
 
-REQUIRES = [
-    'voluptuous==0.11.7',
-    'PyYAML==5.3.1',
-    'paho-mqtt==1.5.0',
-    'colorlog==4.1.0',
-    'tornado==6.0.4',
-    'protobuf==3.11.3',
-    'tzlocal==2.0.0',
-    'pytz==2020.1',
-    'pyserial==3.4',
-    'ifaddr==0.1.6',
-    'deepmerge==0.1.0'
-]
+here = os.path.abspath(os.path.dirname(__file__))
+
+with open(os.path.join(here, 'requirements.txt')) as requirements_txt:
+    REQUIRES = requirements_txt.read().splitlines()
 
 # If you have problems importing platformio and esptool as modules you can set
 # $ESPHOME_USE_SUBPROCESS to make ESPHome call their executables instead.
 # This means they have to be in your $PATH.
-if os.environ.get('ESPHOME_USE_SUBPROCESS') is None:
-    REQUIRES.extend([
-        'platformio==4.3.4',
-        'esptool==2.8',
-    ])
+if 'ESPHOME_USE_SUBPROCESS' in os.environ:
+    # Remove platformio and esptool from requirements
+    REQUIRES = [
+        req for req in REQUIRES
+        if not any(req.startswith(prefix) for prefix in ['platformio', 'esptool'])
+    ]
 
 CLASSIFIERS = [
     'Environment :: Console',

From d5c59292c86366bf709840cb4d22942c325e83b0 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 14:00:02 +0200
Subject: [PATCH 316/412] Add pytest to CI (#1138)

---
 .github/workflows/ci.yml          | 42 +++++++++++++++++++++--------
 .github/workflows/release-dev.yml | 42 ++++++++++++++++++++++-------
 .github/workflows/release.yml     | 44 +++++++++++++++++++++++--------
 esphome/core.py                   | 16 +++++++++--
 esphome/pins.py                   | 10 ++++---
 tests/unit_tests/test_core.py     |  4 ++-
 tests/unit_tests/test_pins.py     |  1 -
 7 files changed, 120 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ade0655a2..6d6798314f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,8 +9,6 @@ on:
     branches: [beta, master]
 
   pull_request:
-    # Only trigger on certain events (not when comments are added)
-    types: [opened, reopened, synchronize]
     # Only run when PR is against dev branch (all PRs should be against dev branch)
     # Helps prevent accidentally merging PRs against master branch
     branches: [dev]
@@ -176,15 +174,6 @@ jobs:
           key: test-home-platformio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}
           restore-keys: |
             test-home-platformio-${{ matrix.test }}-
-      # Cache the intermediary build files
-      - name: Cache Test Build
-        uses: actions/cache@v1
-        with:
-          path: tests/build/${{ matrix.test }}
-          key: test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-${{ hashFiles('esphome/**') }}
-          restore-keys: |
-            test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-
-            test-pio-${{ matrix.test }}-
       - name: Set up environment
         run: script/setup
 
@@ -194,3 +183,34 @@ jobs:
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
           echo "::add-matcher::.github/workflows/matchers/python.json"
       - run: esphome tests/${{ matrix.test }}.yaml compile
+
+  pytest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.7-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.7-
+      - name: Set up environment
+        run: script/setup
+      - name: Install Github Actions annotator
+        run: pip install pytest-github-actions-annotate-failures
+
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - name: Run pytest
+        run: |
+          pytest \
+            -qq \
+            --durations=10 \
+            -o console_output_style=count \
+            tests
diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index e807666de4..3eb6884ee0 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -129,15 +129,6 @@ jobs:
           key: test-home-platformio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}
           restore-keys: |
             test-home-platformio-${{ matrix.test }}-
-      # Cache the intermediary build files
-      - name: Cache Test Build
-        uses: actions/cache@v1
-        with:
-          path: tests/build/${{ matrix.test }}
-          key: test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-${{ hashFiles('esphome/**') }}
-          restore-keys: |
-            test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-
-            test-pio-${{ matrix.test }}-
       - name: Set up environment
         run: script/setup
 
@@ -148,10 +139,41 @@ jobs:
           echo "::add-matcher::.github/workflows/matchers/python.json"
       - run: esphome tests/${{ matrix.test }}.yaml compile
 
+  pytest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.7-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.7-
+      - name: Set up environment
+        run: script/setup
+      - name: Install Github Actions annotator
+        run: pip install pytest-github-actions-annotate-failures
+      
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - name: Run pytest
+        run: |
+          pytest \
+            -qq \
+            --durations=10 \
+            -o console_output_style=count \
+            tests
+
   deploy-docker:
     name: Build and publish docker containers
     runs-on: ubuntu-latest
-    needs: [lint-clang-format, lint-clang-tidy, lint-python, test]
+    needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     strategy:
       matrix:
         arch: [amd64, i386, armv7, aarch64]
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 47811cc53c..43e0d86365 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -128,15 +128,6 @@ jobs:
           key: test-home-platformio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}
           restore-keys: |
             test-home-platformio-${{ matrix.test }}-
-      # Cache the intermediary build files
-      - name: Cache Test Build
-        uses: actions/cache@v1
-        with:
-          path: tests/build/${{ matrix.test }}
-          key: test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-${{ hashFiles('esphome/**') }}
-          restore-keys: |
-            test-pio-${{ matrix.test }}-${{ hashFiles('esphome/core_config.py') }}-
-            test-pio-${{ matrix.test }}-
       - name: Set up environment
         run: script/setup
 
@@ -145,10 +136,41 @@ jobs:
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
           echo "::add-matcher::.github/workflows/matchers/python.json"
       - run: esphome tests/${{ matrix.test }}.yaml compile
+  
+  pytest:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+      - name: Cache pip modules
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/pip
+          key: esphome-pip-3.7-${{ hashFiles('setup.py') }}
+          restore-keys: |
+            esphome-pip-3.7-
+      - name: Set up environment
+        run: script/setup
+      - name: Install Github Actions annotator
+        run: pip install pytest-github-actions-annotate-failures
+      
+      - name: Register problem matchers
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - name: Run pytest
+        run: |
+          pytest \
+            -qq \
+            --durations=10 \
+            -o console_output_style=count \
+            tests
 
   deploy-pypi:
     name: Build and publish to PyPi
-    needs: [lint-clang-format, lint-clang-tidy, lint-python, test]
+    needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -171,7 +193,7 @@ jobs:
   deploy-docker:
     name: Build and publish docker containers
     runs-on: ubuntu-latest
-    needs: [lint-clang-format, lint-clang-tidy, lint-python, test]
+    needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     strategy:
       matrix:
         arch: [amd64, i386, armv7, aarch64]
diff --git a/esphome/core.py b/esphome/core.py
index dfb37555e1..52904f0d0b 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -493,9 +493,9 @@ class EsphomeCore:
         # The board that's used (for example nodemcuv2)
         self.board: Optional[str] = None
         # The full raw configuration
-        self.raw_config: ConfigType = {}
+        self.raw_config: Optional[ConfigType] = None
         # The validated configuration, this is None until the config has been validated
-        self.config: ConfigType = {}
+        self.config: Optional[ConfigType] = None
         # The pending tasks in the task queue (mostly for C++ generation)
         # This is a priority queue (with heapq)
         # Each item is a tuple of form: (-priority, unique number, task)
@@ -547,6 +547,10 @@ class EsphomeCore:
 
     @property
     def address(self) -> Optional[str]:
+        if self.config is None:
+            raise ValueError("Config has not been loaded yet")
+
+        # pylint: disable=unsupported-membership-test,unsubscriptable-object
         if 'wifi' in self.config:
             return self.config[CONF_WIFI][CONF_USE_ADDRESS]
 
@@ -557,6 +561,10 @@ class EsphomeCore:
 
     @property
     def comment(self) -> Optional[str]:
+        if self.config is None:
+            raise ValueError("Config has not been loaded yet")
+
+        # pylint: disable=unsubscriptable-object
         if CONF_COMMENT in self.config[CONF_ESPHOME]:
             return self.config[CONF_ESPHOME][CONF_COMMENT]
 
@@ -570,6 +578,10 @@ class EsphomeCore:
 
     @property
     def arduino_version(self) -> str:
+        if self.config is None:
+            raise ValueError("Config has not been loaded yet")
+
+        # pylint: disable=unsubscriptable-object
         return self.config[CONF_ESPHOME][CONF_ARDUINO_VERSION]
 
     @property
diff --git a/esphome/pins.py b/esphome/pins.py
index 7f4c869895..b6fde85250 100644
--- a/esphome/pins.py
+++ b/esphome/pins.py
@@ -256,16 +256,20 @@ ESP32_BOARD_PINS = {
 
 def _lookup_pin(value):
     if CORE.is_esp8266:
-        board_pins = ESP8266_BOARD_PINS.get(CORE.board, {})
+        board_pins_dict = ESP8266_BOARD_PINS
         base_pins = ESP8266_BASE_PINS
     elif CORE.is_esp32:
-        board_pins = ESP32_BOARD_PINS.get(CORE.board, {})
+        board_pins_dict = ESP32_BOARD_PINS
         base_pins = ESP32_BASE_PINS
     else:
         raise NotImplementedError
 
+    board_pins = board_pins_dict.get(CORE.board, {})
+
+    # Resolved aliased board pins (shorthand when two boards have the same pin configuration)
     while isinstance(board_pins, str):
-        board_pins = ESP8266_BOARD_PINS.get(board_pins, {})
+        board_pins = board_pins_dict[board_pins]
+
     if value in board_pins:
         return board_pins[value]
     if value in base_pins:
diff --git a/tests/unit_tests/test_core.py b/tests/unit_tests/test_core.py
index cd0b0947f3..166a12c40e 100644
--- a/tests/unit_tests/test_core.py
+++ b/tests/unit_tests/test_core.py
@@ -459,7 +459,6 @@ class TestEsphomeCore:
         target.config_path = "foo/config"
         return target
 
-    @pytest.mark.xfail(reason="raw_config and config differ, should they?")
     def test_reset(self, target):
         """Call reset on target and compare to new instance"""
         other = core.EsphomeCore()
@@ -469,15 +468,18 @@ class TestEsphomeCore:
         assert target.__dict__ == other.__dict__
 
     def test_address__none(self, target):
+        target.config = {}
         assert target.address is None
 
     def test_address__wifi(self, target):
+        target.config = {}
         target.config[const.CONF_WIFI] = {const.CONF_USE_ADDRESS: "1.2.3.4"}
         target.config["ethernet"] = {const.CONF_USE_ADDRESS: "4.3.2.1"}
 
         assert target.address == "1.2.3.4"
 
     def test_address__ethernet(self, target):
+        target.config = {}
         target.config["ethernet"] = {const.CONF_USE_ADDRESS: "4.3.2.1"}
 
         assert target.address == "4.3.2.1"
diff --git a/tests/unit_tests/test_pins.py b/tests/unit_tests/test_pins.py
index 606c20eea2..7d68181add 100644
--- a/tests/unit_tests/test_pins.py
+++ b/tests/unit_tests/test_pins.py
@@ -94,7 +94,6 @@ class Test_lookup_pin:
 
         assert actual == expected
 
-    @pytest.mark.xfail(reason="This may be expected")
     def test_valid_32_pin_alias(self, core_esp32):
         core_esp32.board = MOCK_ESP32_BOARD_ALIAS_ID
 

From 3ec9bcaed6f2d96b2c8d93609e55187be695364d Mon Sep 17 00:00:00 2001
From: Peter Kuehne <pkuehne@users.noreply.github.com>
Date: Wed, 15 Jul 2020 13:04:00 +0100
Subject: [PATCH 317/412] Feature/component test fixture (#1142)

---
 .../binary_sensor/test_binary_sensor.py       | 43 +++++++++++++------
 tests/component_tests/conftest.py             | 23 ++++++++++
 2 files changed, 54 insertions(+), 12 deletions(-)
 create mode 100644 tests/component_tests/conftest.py

diff --git a/tests/component_tests/binary_sensor/test_binary_sensor.py b/tests/component_tests/binary_sensor/test_binary_sensor.py
index 8f3cd3aeda..72c0dc1cde 100644
--- a/tests/component_tests/binary_sensor/test_binary_sensor.py
+++ b/tests/component_tests/binary_sensor/test_binary_sensor.py
@@ -1,24 +1,43 @@
 """ Tests for the binary sensor component """
 
-from esphome.core import CORE
-from esphome.config import read_config
-from esphome.__main__ import generate_cpp_contents
+
+def test_binary_sensor_is_setup(generate_main):
+    """
+    When the binary sensor is set in the yaml file, it should be registered in main
+    """
+    # Given
+
+    # When
+    main_cpp = generate_main("tests/component_tests/binary_sensor/test_binary_sensor.yaml")
+
+    # Then
+    assert "new gpio::GPIOBinarySensor();" in main_cpp
+    assert "App.register_binary_sensor" in main_cpp
 
 
-def test_binary_sensor_config_value_internal_set():
+def test_binary_sensor_sets_mandatory_fields(generate_main):
+    """
+    When the mandatory fields are set in the yaml, they should be set in main
+    """
+    # Given
+
+    # When
+    main_cpp = generate_main("tests/component_tests/binary_sensor/test_binary_sensor.yaml")
+
+    # Then
+    assert "bs_1->set_name(\"test bs1\");" in main_cpp
+    assert "bs_1->set_pin(new GPIOPin" in main_cpp
+
+
+def test_binary_sensor_config_value_internal_set(generate_main):
     """
     Test that the "internal" config value is correctly set
     """
     # Given
-    CORE.config_path = "tests/component_tests/binary_sensor/test_binary_sensor.yaml"
-    CORE.config = read_config({})
 
     # When
-    generate_cpp_contents(CORE.config)
-    # print(CORE.cpp_main_section)
+    main_cpp = generate_main("tests/component_tests/binary_sensor/test_binary_sensor.yaml")
 
     # Then
-    assert "bs_1->set_internal(true);" in CORE.cpp_main_section
-    assert "bs_2->set_internal(false);" in CORE.cpp_main_section
-
-    CORE.reset()
+    assert "bs_1->set_internal(true);" in main_cpp
+    assert "bs_2->set_internal(false);" in main_cpp
diff --git a/tests/component_tests/conftest.py b/tests/component_tests/conftest.py
new file mode 100644
index 0000000000..207a6dead9
--- /dev/null
+++ b/tests/component_tests/conftest.py
@@ -0,0 +1,23 @@
+""" Fixtures for component tests """
+
+import pytest
+
+from esphome.core import CORE
+from esphome.config import read_config
+from esphome.__main__ import generate_cpp_contents
+
+
+@pytest.fixture
+def generate_main():
+    """ Generates the C++ main.cpp file and returns it in string form """
+
+    def generator(path: str) -> str:
+        CORE.config_path = path
+        CORE.config = read_config({})
+        generate_cpp_contents(CORE.config)
+        print(CORE.cpp_main_section)
+        return CORE.cpp_main_section
+
+    yield generator
+
+    CORE.reset()

From b6394b7c6d6c210fd1f28ce01bd06f8777465ae9 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 14:42:43 +0200
Subject: [PATCH 318/412] Remove unused bots

---
 .github/ci-reporter.yml |  8 --------
 .github/config.yml      | 11 -----------
 2 files changed, 19 deletions(-)
 delete mode 100644 .github/ci-reporter.yml
 delete mode 100644 .github/config.yml

diff --git a/.github/ci-reporter.yml b/.github/ci-reporter.yml
deleted file mode 100644
index 243e671532..0000000000
--- a/.github/ci-reporter.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Set to false to create a new comment instead of updating the app's first one
-updateComment: true
-
-# Use a custom string, or set to false to disable
-before: "✨ Good work on this PR so far! ✨ Unfortunately, the [ build]() is failing as of . Here's the output:"
-
-# Use a custom string, or set to false to disable
-after: "Thanks for contributing to this project!"
diff --git a/.github/config.yml b/.github/config.yml
deleted file mode 100644
index f2b357cc95..0000000000
--- a/.github/config.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Configuration for sentiment-bot - https://github.com/behaviorbot/sentiment-bot
-
-# *Required* toxicity threshold between 0 and .99 with the higher numbers being the most toxic
-# Anything higher than this threshold will be marked as toxic and commented on
-sentimentBotToxicityThreshold: .8
-
-# *Required* Comment to reply with
-sentimentBotReplyComment: >
-  Please be sure to review the code of conduct and be respectful of other users.
-
-# Note: the bot will only work if your repository has a Code of Conduct

From dcadcdf0567991d8b8ee08f2acd6a393eafc1593 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 15:03:15 +0200
Subject: [PATCH 319/412] Use more layer caching for esphome/esphome Dockerfile
 (#1150)

---
 .github/workflows/release-dev.yml |  2 +-
 .github/workflows/release.yml     |  2 +-
 docker/Dockerfile                 | 15 ++++++++++++---
 docker/Dockerfile.dev             |  2 +-
 docker/Dockerfile.lint            |  2 +-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 3eb6884ee0..59beeea212 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -187,7 +187,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.3.1"
+          base_version="2.3.3"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 43e0d86365..84610156a1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -206,7 +206,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.3.1"
+          base_version="2.3.3"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 16b546d0dd..d0b4f2ffa1 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,12 +1,21 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.1
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.3
 FROM ${BUILD_FROM}
 
+# First install requirements to leverage caching when requirements don't change
+COPY requirements.txt /
+RUN pip3 install --no-cache-dir -r /requirements.txt
+
+# Then copy esphome and install
 COPY . .
 RUN pip3 install --no-cache-dir -e .
 
-ENV USERNAME=""
-ENV PASSWORD=""
+# Settings for dashboard
+ENV USERNAME="" PASSWORD=""
 
+# The directory the user should mount their configuration files to
 WORKDIR /config
+# Set entrypoint to esphome so that the user doesn't have to type 'esphome'
+# in every docker command twice
 ENTRYPOINT ["esphome"]
+# When no arguments given, start the dashboard in the workdir
 CMD ["/config", "dashboard"]
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 0a72361a28..b6a0f8f90b 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.3.1
+FROM esphome/esphome-base-amd64:2.3.3
 
 COPY . .
 
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index a1839a82c0..bc7caa7e97 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-lint-base:2.3.1
+FROM esphome/esphome-lint-base:2.3.3
 
 COPY requirements.txt requirements_test.txt /
 RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt

From 47520965208a6731b3fb224f8b88c7409f497667 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 15:27:24 +0200
Subject: [PATCH 320/412] Don't remove location information for packages
 (#1133)

---
 esphome/components/packages/__init__.py      | 59 +++++++++-----------
 esphome/components/substitutions/__init__.py |  3 +-
 esphome/config.py                            | 10 ++--
 esphome/const.py                             |  1 +
 requirements.txt                             |  1 -
 5 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/esphome/components/packages/__init__.py b/esphome/components/packages/__init__.py
index 729af4a9a0..afbeae7f8d 100644
--- a/esphome/components/packages/__init__.py
+++ b/esphome/components/packages/__init__.py
@@ -1,51 +1,44 @@
-from deepmerge import conservative_merger as package_merger
-
 import esphome.config_validation as cv
 
 from esphome.const import CONF_PACKAGES
 
-VALID_PACKAGE_NAME_CHARS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_'
 
+def _merge_package(full_old, full_new):
 
-def _merge_package(config, package_name, package_config):
-    config = config.copy()
-    package_merger.merge(config, package_config)
-    return config
+    def merge(old, new):
+        # pylint: disable=no-else-return
+        if isinstance(new, dict):
+            if not isinstance(old, dict):
+                return new
+            res = old.copy()
+            for k, v in new.items():
+                res[k] = merge(old[k], v) if k in old else v
+            return res
+        elif isinstance(new, list):
+            if not isinstance(old, list):
+                return new
+            return old + new
 
+        return new
 
-def _is_valid_package_name(value: str) -> bool:
-    if not value:
-        return False
-    if value[0].isdigit():
-        return False
-    try:
-        cv.valid_name(value)
-    except cv.Invalid:
-        return False
-    return True
+    return merge(full_old, full_new)
 
 
 def do_packages_pass(config: dict):
     if CONF_PACKAGES not in config:
-        return
+        return config
     packages = config[CONF_PACKAGES]
-    temp_config = config.copy()
     with cv.prepend_path(CONF_PACKAGES):
-        if packages is not None and not isinstance(packages, dict):
+        if not isinstance(packages, dict):
             raise cv.Invalid("Packages must be a key to value mapping, got {} instead"
                              "".format(type(packages)))
+
         for package_name, package_config in packages.items():
             with cv.prepend_path(package_name):
-                if not isinstance(package_config, dict):
-                    raise cv.Invalid("Package definition must be a dictionary containing valid "
-                                     "esphome configuration to be merged with the main "
-                                     "config, got {} instead"
-                                     .format(type(package_config)))
-                if not _is_valid_package_name(package_name):
-                    raise cv.Invalid("Package name is invalid. Valid name should consist of "
-                                     "letters, numbers and underscores. It shouldn't also "
-                                     "start with number")
-                temp_config = _merge_package(temp_config, package_name, package_config)
-        del temp_config[CONF_PACKAGES]
-        config.clear()
-        config.update(temp_config)
+                recursive_package = package_config
+                if isinstance(package_config, dict):
+                    recursive_package = do_packages_pass(package_config)
+                config = _merge_package(config, recursive_package)
+
+        del config[CONF_PACKAGES]
+    return config
diff --git a/esphome/components/substitutions/__init__.py b/esphome/components/substitutions/__init__.py
index ab99e040d4..a6f70fe928 100644
--- a/esphome/components/substitutions/__init__.py
+++ b/esphome/components/substitutions/__init__.py
@@ -3,11 +3,10 @@ import re
 
 import esphome.config_validation as cv
 from esphome import core
+from esphome.const import CONF_SUBSTITUTIONS
 
 _LOGGER = logging.getLogger(__name__)
 
-CONF_SUBSTITUTIONS = 'substitutions'
-
 VALID_SUBSTITUTIONS_CHARACTERS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' \
                                  '0123456789_'
 
diff --git a/esphome/config.py b/esphome/config.py
index 6f3a498444..84d3ca3803 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -11,10 +11,8 @@ from contextlib import contextmanager
 import voluptuous as vol
 
 from esphome import core, core_config, yaml_util
-from esphome.components import substitutions
-from esphome.components.packages import do_packages_pass
-from esphome.components.substitutions import CONF_SUBSTITUTIONS
-from esphome.const import CONF_ESPHOME, CONF_PLATFORM, ESP_PLATFORMS, CONF_PACKAGES
+from esphome.const import CONF_ESPHOME, CONF_PLATFORM, ESP_PLATFORMS, CONF_PACKAGES, \
+    CONF_SUBSTITUTIONS
 from esphome.core import CORE, EsphomeError  # noqa
 from esphome.helpers import color, indent
 from esphome.util import safe_print, OrderedDict
@@ -393,9 +391,10 @@ def validate_config(config, command_line_substitutions):
 
     # 0. Load packages
     if CONF_PACKAGES in config:
+        from esphome.components.packages import do_packages_pass
         result.add_output_path([CONF_PACKAGES], CONF_PACKAGES)
         try:
-            do_packages_pass(config)
+            config = do_packages_pass(config)
         except vol.Invalid as err:
             result.update(config)
             result.add_error(err)
@@ -403,6 +402,7 @@ def validate_config(config, command_line_substitutions):
 
     # 1. Load substitutions
     if CONF_SUBSTITUTIONS in config:
+        from esphome.components import substitutions
         result[CONF_SUBSTITUTIONS] = {**config[CONF_SUBSTITUTIONS], **command_line_substitutions}
         result.add_output_path([CONF_SUBSTITUTIONS], CONF_SUBSTITUTIONS)
         try:
diff --git a/esphome/const.py b/esphome/const.py
index 45b5e5e209..202d2991b5 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -467,6 +467,7 @@ CONF_STEP_PIN = 'step_pin'
 CONF_STOP = 'stop'
 CONF_STOP_ACTION = 'stop_action'
 CONF_SUBNET = 'subnet'
+CONF_SUBSTITUTIONS = 'substitutions'
 CONF_SUPPORTS_COOL = 'supports_cool'
 CONF_SUPPORTS_HEAT = 'supports_heat'
 CONF_SWING_BOTH_ACTION = 'swing_both_action'
diff --git a/requirements.txt b/requirements.txt
index 059a07fc83..2d03924cec 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,4 +11,3 @@ ifaddr==0.1.7
 platformio==4.3.4
 esptool==2.8
 click==7.1.2
-deepmerge==0.1.0

From 0cc3902ffc438c40c01a99caed29f311b0e03b8e Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 15:29:41 +0200
Subject: [PATCH 321/412] Add tasmota magic bits, Tasmota compat check (#1152)

---
 esphome/core/application.cpp |  4 ++++
 esphome/core/esphal.cpp      | 16 ++++++++++++++++
 esphome/core/esphal.h        |  8 ++++++++
 3 files changed, 28 insertions(+)

diff --git a/esphome/core/application.cpp b/esphome/core/application.cpp
index 4ecb247ec3..5e23c6250b 100644
--- a/esphome/core/application.cpp
+++ b/esphome/core/application.cpp
@@ -1,6 +1,7 @@
 #include "esphome/core/application.h"
 #include "esphome/core/log.h"
 #include "esphome/core/version.h"
+#include "esphome/core/esphal.h"
 
 #ifdef USE_STATUS_LED
 #include "esphome/components/status_led/status_led.h"
@@ -58,6 +59,9 @@ void Application::setup() {
   ESP_LOGI(TAG, "setup() finished successfully!");
   this->schedule_dump_config();
   this->calculate_looping_components_();
+
+  // Dummy function to link some symbols into the binary.
+  force_link_symbols();
 }
 void Application::loop() {
   uint32_t new_app_state = 0;
diff --git a/esphome/core/esphal.cpp b/esphome/core/esphal.cpp
index 2389a2a7f6..90707016c3 100644
--- a/esphome/core/esphal.cpp
+++ b/esphome/core/esphal.cpp
@@ -271,6 +271,22 @@ ISRInternalGPIOPin *GPIOPin::to_isr() const {
                                 this->gpio_read_, this->gpio_mask_, this->inverted_);
 }
 
+void force_link_symbols() {
+#ifdef ARDUINO_ARCH_ESP8266
+  // Tasmota uses magic bytes in the binary to check if an OTA firmware is compatible
+  // with their settings - ESPHome uses a different settings system (that can also survive
+  // erases). So set magic bytes indicating all tasmota versions are supported.
+  // This only adds 12 bytes of binary size, which is an acceptable price to pay for easier support
+  // for Tasmota.
+  // https://github.com/arendst/Tasmota/blob/b05301b1497942167a015a6113b7f424e42942cd/tasmota/settings.ino#L346-L380
+  // https://github.com/arendst/Tasmota/blob/b05301b1497942167a015a6113b7f424e42942cd/tasmota/i18n.h#L652-L654
+  const static uint32_t TASMOTA_MAGIC_BYTES[] PROGMEM = {0x5AA55AA5, 0xFFFFFFFF, 0xA55AA55A};
+  // Force link symbol by using a volatile integer (GCC attribute used does not work because of LTO)
+  volatile int x = 0;
+  x = TASMOTA_MAGIC_BYTES[x];
+#endif
+}
+
 }  // namespace esphome
 
 #ifdef ARDUINO_ESP8266_RELEASE_2_3_0
diff --git a/esphome/core/esphal.h b/esphome/core/esphal.h
index 453e094acc..809c7d91b5 100644
--- a/esphome/core/esphal.h
+++ b/esphome/core/esphal.h
@@ -116,4 +116,12 @@ class GPIOPin {
 template<typename T> void GPIOPin::attach_interrupt(void (*func)(T *), T *arg, int mode) const {
   this->attach_interrupt_(reinterpret_cast<void (*)(void *)>(func), arg, mode);
 }
+/** This function can be used by the HAL to force-link specific symbols
+ * into the generated binary without modifying the linker script.
+ *
+ * It is called by the application very early on startup and should not be used for anything
+ * other than forcing symbols to be linked.
+ */
+void force_link_symbols();
+
 }  // namespace esphome

From d9c33f19e2c66c2205bded238bb98180d266c4f5 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 15:30:32 +0200
Subject: [PATCH 322/412] Fix executable bits on some hassio files (#1151)

---
 docker/rootfs/etc/cont-init.d/30-esphome.sh | 0
 docker/rootfs/etc/cont-init.d/40-migrate.sh | 0
 docker/rootfs/etc/nginx/nginx.conf          | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 docker/rootfs/etc/cont-init.d/30-esphome.sh
 mode change 100644 => 100755 docker/rootfs/etc/cont-init.d/40-migrate.sh
 mode change 100755 => 100644 docker/rootfs/etc/nginx/nginx.conf

diff --git a/docker/rootfs/etc/cont-init.d/30-esphome.sh b/docker/rootfs/etc/cont-init.d/30-esphome.sh
old mode 100644
new mode 100755
diff --git a/docker/rootfs/etc/cont-init.d/40-migrate.sh b/docker/rootfs/etc/cont-init.d/40-migrate.sh
old mode 100644
new mode 100755
diff --git a/docker/rootfs/etc/nginx/nginx.conf b/docker/rootfs/etc/nginx/nginx.conf
old mode 100755
new mode 100644

From 8166d0de79e89d06190b2f30553696dc875c8f39 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 21:42:12 +0200
Subject: [PATCH 323/412] Remove i386 arch

See also https://github.com/esphome/esphome-docker-base/issues/5
---
 .github/workflows/release-dev.yml | 10 ++++------
 .github/workflows/release.yml     | 13 +++++--------
 docker/Dockerfile                 |  2 +-
 docker/Dockerfile.dev             |  2 +-
 docker/Dockerfile.lint            |  2 +-
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 59beeea212..57ec71845b 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -176,7 +176,7 @@ jobs:
     needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     strategy:
       matrix:
-        arch: [amd64, i386, armv7, aarch64]
+        arch: [amd64, armv7, aarch64]
         # Hassio dev image doesn't use esphome/esphome-hassio-$arch and uses base directly
         build_type: ["docker"]
     steps:
@@ -187,7 +187,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.3.3"
+          base_version="2.3.4"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
@@ -252,13 +252,11 @@ jobs:
         docker manifest create esphome/esphome:${TAG} \
           esphome/esphome-aarch64:${TAG} \
           esphome/esphome-amd64:${TAG} \
-          esphome/esphome-armv7:${TAG} \
-          esphome/esphome-i386:${TAG}
+          esphome/esphome-armv7:${TAG}
         docker manifest push esphome/esphome:${TAG}
 
         docker manifest create esphome/esphome:dev \
           esphome/esphome-aarch64:${TAG} \
           esphome/esphome-amd64:${TAG} \
-          esphome/esphome-armv7:${TAG} \
-          esphome/esphome-i386:${TAG}
+          esphome/esphome-armv7:${TAG}
         docker manifest push esphome/esphome:dev
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 84610156a1..8196d39fbc 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -196,7 +196,7 @@ jobs:
     needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     strategy:
       matrix:
-        arch: [amd64, i386, armv7, aarch64]
+        arch: [amd64, armv7, aarch64]
         build_type: ["hassio", "docker"]
     steps:
       - uses: actions/checkout@v2
@@ -206,7 +206,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.3.3"
+          base_version="2.3.4"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
@@ -280,8 +280,7 @@ jobs:
         docker manifest create esphome/esphome:${TAG} \
           esphome/esphome-aarch64:${TAG} \
           esphome/esphome-amd64:${TAG} \
-          esphome/esphome-armv7:${TAG} \
-          esphome/esphome-i386:${TAG}
+          esphome/esphome-armv7:${TAG}
         docker manifest push esphome/esphome:${TAG}
 
     - name: Publish docker beta tag
@@ -289,8 +288,7 @@ jobs:
         docker manifest create esphome/esphome:beta \
           esphome/esphome-aarch64:${TAG} \
           esphome/esphome-amd64:${TAG} \
-          esphome/esphome-armv7:${TAG} \
-          esphome/esphome-i386:${TAG}
+          esphome/esphome-armv7:${TAG}
         docker manifest push esphome/esphome:beta
 
     - name: Publish docker latest tag
@@ -299,6 +297,5 @@ jobs:
         docker manifest create esphome/esphome:latest \
           esphome/esphome-aarch64:${TAG} \
           esphome/esphome-amd64:${TAG} \
-          esphome/esphome-armv7:${TAG} \
-          esphome/esphome-i386:${TAG}
+          esphome/esphome-armv7:${TAG}
         docker manifest push esphome/esphome:latest
diff --git a/docker/Dockerfile b/docker/Dockerfile
index d0b4f2ffa1..1a8382aa65 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.3
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.4
 FROM ${BUILD_FROM}
 
 # First install requirements to leverage caching when requirements don't change
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index b6a0f8f90b..9e7ddc4b53 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.3.3
+FROM esphome/esphome-base-amd64:2.3.4
 
 COPY . .
 
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index bc7caa7e97..fd1a3c5330 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-lint-base:2.3.3
+FROM esphome/esphome-lint-base:2.3.4
 
 COPY requirements.txt requirements_test.txt /
 RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt

From e962762046ec4021546ed6eb14ad641626bb06e3 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 21:42:34 +0200
Subject: [PATCH 324/412] Docker --cache-from only uses first image

See also https://stackoverflow.com/a/56024061/8924614
---
 .github/workflows/release-dev.yml | 6 +-----
 .github/workflows/release.yml     | 8 ++------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 57ec71845b..9544b24a5c 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -158,7 +158,7 @@ jobs:
         run: script/setup
       - name: Install Github Actions annotator
         run: pip install pytest-github-actions-annotate-failures
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/python.json"
@@ -204,8 +204,6 @@ jobs:
           echo "::set-env name=DOCKERFILE::${dockerfile}"
       - name: Pull for cache
         run: |
-          docker pull "${BUILD_TO}:latest" || true
-          docker pull "${BUILD_TO}:beta" || true
           docker pull "${BUILD_TO}:dev" || true
       - name: Register QEMU binfmt
         run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
@@ -215,8 +213,6 @@ jobs:
             --build-arg "BUILD_VERSION=${TAG}" \
             --tag "${BUILD_TO}:${TAG}" \
             --tag "${BUILD_TO}:dev" \
-            --cache-from "${BUILD_TO}:latest" \
-            --cache-from "${BUILD_TO}:beta" \
             --cache-from "${BUILD_TO}:dev" \
             --file "${DOCKERFILE}" \
             .
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8196d39fbc..569a3adf57 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -136,7 +136,7 @@ jobs:
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
           echo "::add-matcher::.github/workflows/matchers/python.json"
       - run: esphome tests/${{ matrix.test }}.yaml compile
-  
+
   pytest:
     runs-on: ubuntu-latest
     steps:
@@ -156,7 +156,7 @@ jobs:
         run: script/setup
       - name: Install Github Actions annotator
         run: pip install pytest-github-actions-annotate-failures
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/python.json"
@@ -225,8 +225,6 @@ jobs:
       - name: Pull for cache
         run: |
           docker pull "${BUILD_TO}:latest" || true
-          docker pull "${BUILD_TO}:beta" || true
-          docker pull "${BUILD_TO}:dev" || true
       - name: Register QEMU binfmt
         run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
       - run: |
@@ -235,8 +233,6 @@ jobs:
             --build-arg "BUILD_VERSION=${TAG}" \
             --tag "${BUILD_TO}:${TAG}" \
             --cache-from "${BUILD_TO}:latest" \
-            --cache-from "${BUILD_TO}:beta" \
-            --cache-from "${BUILD_TO}:dev" \
             --file "${DOCKERFILE}" \
             .
       - name: Log in to docker hub

From dfbf225403dcf08a44a2f45a901c1e0191c981ee Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 16 Jul 2020 07:59:11 +1200
Subject: [PATCH 325/412] Don't run deploy job when repository is not
 esphome/esphome (#1157)

---
 .github/workflows/release-dev.yml | 2 ++
 .github/workflows/release.yml     | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 9544b24a5c..7187848217 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -172,6 +172,7 @@ jobs:
 
   deploy-docker:
     name: Build and publish docker containers
+    if: github.repository == "esphome/esphome"
     runs-on: ubuntu-latest
     needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     strategy:
@@ -227,6 +228,7 @@ jobs:
 
 
   deploy-docker-manifest:
+    if: github.repository == "esphome/esphome"
     runs-on: ubuntu-latest
     needs: [deploy-docker]
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 569a3adf57..955af16b14 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -170,6 +170,7 @@ jobs:
 
   deploy-pypi:
     name: Build and publish to PyPi
+    if: github.repository == "esphome/esphome"
     needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     runs-on: ubuntu-latest
     steps:
@@ -192,6 +193,7 @@ jobs:
 
   deploy-docker:
     name: Build and publish docker containers
+    if: github.repository == "esphome/esphome"
     runs-on: ubuntu-latest
     needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     strategy:
@@ -255,6 +257,7 @@ jobs:
           docker push "${BUILD_TO}:latest"
 
   deploy-docker-manifest:
+    if: github.repository == "esphome/esphome"
     runs-on: ubuntu-latest
     needs: [deploy-docker]
     steps:

From d58d0e89c78d44c8445da518d14b16e0d37dd628 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 22:00:53 +0200
Subject: [PATCH 326/412] Add Docker CI workflow that runs when docker files
 change

---
 .github/workflows/ci-docker.yml | 54 +++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/workflows/ci-docker.yml

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
new file mode 100644
index 0000000000..df8185281e
--- /dev/null
+++ b/.github/workflows/ci-docker.yml
@@ -0,0 +1,54 @@
+name: CI for docker images
+
+# Only run when docker paths change
+on:
+  push:
+    branches: [dev, beta, master]
+    paths:
+      - 'docker/**'
+      - '.github/workflows/**'
+
+  pull_request:
+    paths:
+      - 'docker/**'
+      - '.github/workflows/**'
+
+jobs:
+  check-docker:
+    name: Build docker containers
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: [amd64, armv7, aarch64]
+        build_type: ["hassio", "docker"]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up env variables
+        run: |
+          base_version="2.3.4"
+
+          if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
+            build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
+            build_to="esphome/esphome-hassio-${{ matrix.arch }}"
+            dockerfile="docker/Dockerfile.hassio"
+          else
+            build_from="esphome/esphome-base-${{ matrix.arch }}:${base_version}"
+            build_to="esphome/esphome-${{ matrix.arch }}"
+            dockerfile="docker/Dockerfile"
+          fi
+
+          echo "::set-env name=BUILD_FROM::${build_from}"
+          echo "::set-env name=BUILD_TO::${build_to}"
+          echo "::set-env name=DOCKERFILE::${dockerfile}"
+      - name: Pull for cache
+        run: |
+          docker pull "${BUILD_TO}:dev" || true
+      - name: Register QEMU binfmt
+        run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
+      - run: |
+          docker build \
+            --build-arg "BUILD_FROM=${BUILD_FROM}" \
+            --build-arg "BUILD_VERSION=ci" \
+            --cache-from "${BUILD_TO}:dev" \
+            --file "${DOCKERFILE}" \
+            .

From ef0e611e52a75981ffb493ce9a513c3aa63b1f6f Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 22:05:00 +0200
Subject: [PATCH 327/412] GitHub Actions Expression Syntax Needs Single Quotes

See also https://docs.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions\#literals
---
 .github/workflows/release-dev.yml | 4 ++--
 .github/workflows/release.yml     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 7187848217..896b6cddb4 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -172,7 +172,7 @@ jobs:
 
   deploy-docker:
     name: Build and publish docker containers
-    if: github.repository == "esphome/esphome"
+    if: github.repository == 'esphome/esphome'
     runs-on: ubuntu-latest
     needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     strategy:
@@ -228,7 +228,7 @@ jobs:
 
 
   deploy-docker-manifest:
-    if: github.repository == "esphome/esphome"
+    if: github.repository == 'esphome/esphome'
     runs-on: ubuntu-latest
     needs: [deploy-docker]
     steps:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 955af16b14..651064047a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -170,7 +170,7 @@ jobs:
 
   deploy-pypi:
     name: Build and publish to PyPi
-    if: github.repository == "esphome/esphome"
+    if: github.repository == 'esphome/esphome'
     needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     runs-on: ubuntu-latest
     steps:
@@ -193,7 +193,7 @@ jobs:
 
   deploy-docker:
     name: Build and publish docker containers
-    if: github.repository == "esphome/esphome"
+    if: github.repository == 'esphome/esphome'
     runs-on: ubuntu-latest
     needs: [lint-clang-format, lint-clang-tidy, lint-python, test, pytest]
     strategy:
@@ -257,7 +257,7 @@ jobs:
           docker push "${BUILD_TO}:latest"
 
   deploy-docker-manifest:
-    if: github.repository == "esphome/esphome"
+    if: github.repository == 'esphome/esphome'
     runs-on: ubuntu-latest
     needs: [deploy-docker]
     steps:

From e069687477b370137d7e7cb8ef00121a475e2605 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 15 Jul 2020 22:13:14 +0200
Subject: [PATCH 328/412] Fix Dockerfile.hassio and improve caching

Previous one was broken, see also https://github.com/esphome/esphome/runs/874896962
---
 docker/Dockerfile.hassio | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfile.hassio b/docker/Dockerfile.hassio
index e5c9625680..eb7ef23001 100644
--- a/docker/Dockerfile.hassio
+++ b/docker/Dockerfile.hassio
@@ -1,11 +1,15 @@
 ARG BUILD_FROM
 FROM ${BUILD_FROM}
 
+# First install requirements to leverage caching when requirements don't change
+COPY requirements.txt /
+RUN pip3 install --no-cache-dir -r /requirements.txt
+
 # Copy root filesystem
 COPY docker/rootfs/ /
-COPY setup.py setup.cfg MANIFEST.in /opt/esphome/
-COPY esphome /opt/esphome/esphome
 
+# Then copy esphome and install
+COPY . /opt/esphome/
 RUN pip3 install --no-cache-dir -e /opt/esphome
 
 # Build arguments

From 27e08d37eae4a0e433e208919db67139cc93c92c Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Wed, 15 Jul 2020 20:49:23 -0300
Subject: [PATCH 329/412] Add links for the issues

---
 .github/ISSUE_TEMPLATE/config.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..4add58dfbe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,12 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Issue Tracker
+    url: https://github.com/esphome/issues
+    about: Please create bug reports in the dedicated issue tracker.
+  - name: Feature Request Tracker
+    url: https://github.com/esphome/feature-requests
+    about: Please create feature requests in the dedicated feature request tracker.
+  - name: Frequently Asked Question
+    url: https://esphome.io/guides/faq.html
+    about: Please view the FAQ for common questions and what to include in a bug report.
+    

From e88418a01b04719dc59ec1f55205c55ee861dd6c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2020 08:28:41 +0200
Subject: [PATCH 330/412] Bump pytest-mock from 1.13.0 to 3.2.0 (#1159)

Bumps [pytest-mock](https://github.com/pytest-dev/pytest-mock) from 1.13.0 to 3.2.0.
- [Release notes](https://github.com/pytest-dev/pytest-mock/releases)
- [Changelog](https://github.com/pytest-dev/pytest-mock/blob/master/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest-mock/compare/v1.13.0...v3.2.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index 81f4953975..2f4dd6f97b 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -6,6 +6,6 @@ pexpect
 # Unit tests
 pytest==5.4.3
 pytest-cov==2.10.0
-pytest-mock==1.13.0
+pytest-mock==3.2.0
 asyncmock==0.4.2
 hypothesis==5.19.3

From 76a3e75bc7f06de40ae48a4ac8ae90cde24a1933 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2020 08:28:56 +0200
Subject: [PATCH 331/412] Bump pylint from 2.5.0 to 2.5.3 (#1160)

Bumps [pylint](https://github.com/PyCQA/pylint) from 2.5.0 to 2.5.3.
- [Release notes](https://github.com/PyCQA/pylint/releases)
- [Changelog](https://github.com/PyCQA/pylint/blob/master/ChangeLog)
- [Commits](https://github.com/PyCQA/pylint/compare/pylint-2.5.0...pylint-2.5.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index 2f4dd6f97b..1e1b886923 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,4 +1,4 @@
-pylint==2.5.0
+pylint==2.5.3
 flake8==3.7.9
 pillow
 pexpect

From ad913625716f80a1ab5025d04ead93cd50897021 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2020 08:29:11 +0200
Subject: [PATCH 332/412] Bump tzlocal from 2.0.0 to 2.1 (#1162)

Bumps [tzlocal](https://github.com/regebro/tzlocal) from 2.0.0 to 2.1.
- [Release notes](https://github.com/regebro/tzlocal/releases)
- [Changelog](https://github.com/regebro/tzlocal/blob/master/CHANGES.txt)
- [Commits](https://github.com/regebro/tzlocal/compare/2.0.0...2.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 2d03924cec..a05da7cd01 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ paho-mqtt==1.5.0
 colorlog==4.1.0
 tornado==6.0.4
 protobuf==3.12.2
-tzlocal==2.0.0
+tzlocal==2.1
 pytz==2020.1
 pyserial==3.4
 ifaddr==0.1.7

From 67b4dcf8ae58553030d06eb10ea36f91870b4bfe Mon Sep 17 00:00:00 2001
From: Peter Kuehne <pkuehne@users.noreply.github.com>
Date: Thu, 16 Jul 2020 08:50:06 +0100
Subject: [PATCH 333/412] Fix unit test warning for hypothesis deprecation
 (#1163)

---
 tests/unit_tests/test_core.py    | 6 +++---
 tests/unit_tests/test_helpers.py | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/unit_tests/test_core.py b/tests/unit_tests/test_core.py
index 166a12c40e..27b64ec3d5 100644
--- a/tests/unit_tests/test_core.py
+++ b/tests/unit_tests/test_core.py
@@ -1,7 +1,7 @@
 import pytest
 
 from hypothesis import given
-from hypothesis.provisional import ip4_addr_strings
+from hypothesis.provisional import ip_addresses
 from strategies import mac_addr_strings
 
 from esphome import core, const
@@ -24,7 +24,7 @@ class TestHexInt:
 
 
 class TestIPAddress:
-    @given(value=ip4_addr_strings())
+    @given(value=ip_addresses(v=4).map(str))
     def test_init__valid(self, value):
         core.IPAddress(*value.split("."))
 
@@ -33,7 +33,7 @@ class TestIPAddress:
         with pytest.raises(ValueError, match="IPAddress must consist of 4 items"):
             core.IPAddress(*value.split("."))
 
-    @given(value=ip4_addr_strings())
+    @given(value=ip_addresses(v=4).map(str))
     def test_str(self, value):
         target = core.IPAddress(*value.split("."))
 
diff --git a/tests/unit_tests/test_helpers.py b/tests/unit_tests/test_helpers.py
index 3c0a96149d..6e89a05bc2 100644
--- a/tests/unit_tests/test_helpers.py
+++ b/tests/unit_tests/test_helpers.py
@@ -1,7 +1,7 @@
 import pytest
 
 from hypothesis import given
-from hypothesis.provisional import ip4_addr_strings
+from hypothesis.provisional import ip_addresses
 
 from esphome import helpers
 
@@ -75,7 +75,7 @@ def test_is_ip_address__invalid(host):
     assert actual is False
 
 
-@given(value=ip4_addr_strings())
+@given(value=ip_addresses(v=4).map(str))
 def test_is_ip_address__valid(value):
     actual = helpers.is_ip_address(value)
 

From 2e54d3f98d5efe25bb31c2846c3495f6ff5b540e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Jul 2020 10:03:11 +0200
Subject: [PATCH 334/412] Bump flake8 from 3.7.9 to 3.8.3 (#1161)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/core.py       | 5 ++++-
 requirements_test.txt | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/esphome/core.py b/esphome/core.py
index 52904f0d0b..9b0b8cefa3 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -8,13 +8,16 @@ import os
 import re
 
 # pylint: disable=unused-import, wrong-import-order
-from typing import Any, Dict, List, Optional, Set  # noqa
+from typing import Any, Dict, List, Optional, Set, TYPE_CHECKING  # noqa
 
 from esphome.const import CONF_ARDUINO_VERSION, SOURCE_FILE_EXTENSIONS, \
     CONF_COMMENT, CONF_ESPHOME, CONF_USE_ADDRESS, CONF_WIFI
 from esphome.helpers import ensure_unique_string, is_hassio
 from esphome.util import OrderedDict
 
+if TYPE_CHECKING:
+    from .cpp_generator import MockObj, MockObjClass, Statement
+
 _LOGGER = logging.getLogger(__name__)
 
 
diff --git a/requirements_test.txt b/requirements_test.txt
index 1e1b886923..e8a4f6f1a0 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,5 +1,5 @@
 pylint==2.5.3
-flake8==3.7.9
+flake8==3.8.3
 pillow
 pexpect
 

From 6f0bfb286a17129397f8a77203d361d61c72e7c0 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 17 Jul 2020 14:25:43 +0200
Subject: [PATCH 335/412] Bump FastLED from 3.2.9 to 3.3.3 (#1164)

Already updated in fastled_base in #1020, now also update it in platformio.ini
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index b3aec4c276..22fa74f18e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,7 +14,7 @@ lib_deps =
     AsyncMqttClient-esphome@0.8.4
     ArduinoJson-esphomelib@5.13.3
     ESPAsyncWebServer-esphome@1.2.6
-    FastLED@3.2.9
+    FastLED@3.3.3
     NeoPixelBus-esphome@2.5.2
     ESPAsyncTCP-esphome@1.2.2
     1655@1.0.2  ; TinyGPSPlus (has name conflict)

From 48f3dfe455ebbf10be3ea701a5461150b4dbbabe Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Fri, 17 Jul 2020 09:31:05 -0300
Subject: [PATCH 336/412] Arduino dev branch changed (#1139)

---
 esphome/const.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/esphome/const.py b/esphome/const.py
index 202d2991b5..3a3e8128c6 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -11,14 +11,13 @@ ESP_PLATFORM_ESP8266 = 'ESP8266'
 ESP_PLATFORMS = [ESP_PLATFORM_ESP32, ESP_PLATFORM_ESP8266]
 
 ALLOWED_NAME_CHARS = 'abcdefghijklmnopqrstuvwxyz0123456789_'
-ARDUINO_VERSION_ESP32_DEV = 'https://github.com/platformio/platform-espressif32.git#feature/stage'
+ARDUINO_VERSION_ESP32_DEV = 'https://github.com/platformio/platform-espressif32.git'
 ARDUINO_VERSION_ESP32_1_0_0 = 'espressif32@1.5.0'
 ARDUINO_VERSION_ESP32_1_0_1 = 'espressif32@1.6.0'
 ARDUINO_VERSION_ESP32_1_0_2 = 'espressif32@1.9.0'
 ARDUINO_VERSION_ESP32_1_0_3 = 'espressif32@1.10.0'
 ARDUINO_VERSION_ESP32_1_0_4 = 'espressif32@1.11.0'
-ARDUINO_VERSION_ESP8266_DEV = 'https://github.com/platformio/platform-espressif8266.git#feature' \
-                              '/stage'
+ARDUINO_VERSION_ESP8266_DEV = 'https://github.com/platformio/platform-espressif8266.git'
 ARDUINO_VERSION_ESP8266_2_5_0 = 'espressif8266@2.0.1'
 ARDUINO_VERSION_ESP8266_2_5_1 = 'espressif8266@2.1.0'
 ARDUINO_VERSION_ESP8266_2_5_2 = 'espressif8266@2.2.3'

From 0afa41d08aaf20991bdf66bca0d6d6945ac81e30 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 17 Jul 2020 14:32:23 +0200
Subject: [PATCH 337/412] Add bump version script (#1153)

---
 script/bump-version.py | 93 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100755 script/bump-version.py

diff --git a/script/bump-version.py b/script/bump-version.py
new file mode 100755
index 0000000000..7895735844
--- /dev/null
+++ b/script/bump-version.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python3
+
+import argparse
+import re
+import subprocess
+from dataclasses import dataclass
+import sys
+
+
+@dataclass
+class Version:
+    major: int
+    minor: int
+    patch: int
+    beta: int = 0
+    dev: bool = False
+
+    def __str__(self):
+        return f'{self.major}.{self.minor}.{self.full_patch}'
+
+    @property
+    def full_patch(self):
+        res = f'{self.patch}'
+        if self.beta > 0:
+            res += f'b{self.beta}'
+        if self.dev:
+            res += '-dev'
+        return res
+
+    @classmethod
+    def parse(cls, value):
+        match = re.match(r'(\d+).(\d+).(\d+)(b\d+)?(-dev)?', value)
+        assert match is not None
+        major = int(match[1])
+        minor = int(match[2])
+        patch = int(match[3])
+        beta = int(match[4][1:]) if match[4] else 0
+        dev = bool(match[5])
+        return Version(
+            major=major, minor=minor, patch=patch,
+            beta=beta, dev=dev
+        )
+
+
+def sub(path, pattern, repl, expected_count=1):
+    with open(path) as fh:
+        content = fh.read()
+    content, count = re.subn(pattern, repl, content, re.MULTILINE)
+    if expected_count is not None:
+        assert count == expected_count
+    with open(path, "wt") as fh:
+        fh.write(content)
+
+
+def write_version(version: Version):
+    sub(
+        'esphome/const.py',
+        r"^MAJOR_VERSION = \d+$",
+        f"MAJOR_VERSION = {version.major}"
+    )
+    sub(
+        'esphome/const.py',
+        r"^MINOR_VERSION = \d+$",
+        f"MINOR_VERSION = {version.minor}"
+    )
+    sub(
+        'esphome/const.py',
+        r"^PATCH_VERSION = .*$",
+        f"PATCH_VERSION = {version.full_patch}"
+    )
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('new_version', type=str)
+    parser.add_argument('--commit', action='store_true')
+    args = parser.parse_args()
+
+    if args.commit and subprocess.call(["git", "diff", "--quiet"]) == 1:
+        print("Cannot use --commit because git is dirty.")
+        return 1
+
+    version = Version.parse(args.new_version)
+    print(f"Bumping to {version}")
+    write_version(version)
+
+    if args.commit:
+        subprocess.check_call(["git", "commit", "-nam", f"Bump version to v{version}"])
+    return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main() or 0)

From 6405799cc2135b658da159b161ee4a50792b775a Mon Sep 17 00:00:00 2001
From: Wilhelm Erasmus <github@wilhelm.co.za>
Date: Mon, 20 Jul 2020 23:09:04 +0200
Subject: [PATCH 338/412] fix(cover yaml validation): adds gate to coincide
 with Home Assistant (#1175)

Co-authored-by: Wilhelm Erasmus <iam@erasmuswill.dev>
---
 esphome/components/cover/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/cover/__init__.py b/esphome/components/cover/__init__.py
index ed6ebe98fa..85f7f746ba 100644
--- a/esphome/components/cover/__init__.py
+++ b/esphome/components/cover/__init__.py
@@ -11,7 +11,7 @@ IS_PLATFORM_COMPONENT = True
 
 DEVICE_CLASSES = [
     '', 'awning', 'blind', 'curtain', 'damper', 'door', 'garage',
-    'shade', 'shutter', 'window'
+    'gate', 'shade', 'shutter', 'window'
 ]
 
 cover_ns = cg.esphome_ns.namespace('cover')

From 10e411f8c1ae989dadc69a30626d9fdbb5ffaa46 Mon Sep 17 00:00:00 2001
From: Nikolay Vasilchuk <Anonym.tsk@gmail.com>
Date: Tue, 21 Jul 2020 23:26:21 +0300
Subject: [PATCH 339/412] http_request fix urls caching (#1174)

* Fix cache

* CI Fix

Co-authored-by: Nikolay Vasilchuk <nikolay.vasilchuk@corp.mail.ru>
---
 esphome/components/http_request/http_request.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/http_request/http_request.cpp b/esphome/components/http_request/http_request.cpp
index 390867c948..46b0910b5e 100644
--- a/esphome/components/http_request/http_request.cpp
+++ b/esphome/components/http_request/http_request.cpp
@@ -15,15 +15,15 @@ void HttpRequestComponent::dump_config() {
 void HttpRequestComponent::send() {
   bool begin_status = false;
   this->client_.setReuse(true);
-  static const String URL = this->url_.c_str();
+  const String url = this->url_.c_str();
 #ifdef ARDUINO_ARCH_ESP32
-  begin_status = this->client_.begin(URL);
+  begin_status = this->client_.begin(url);
 #endif
 #ifdef ARDUINO_ARCH_ESP8266
 #ifndef CLANG_TIDY
   this->client_.setFollowRedirects(true);
   this->client_.setRedirectLimit(3);
-  begin_status = this->client_.begin(*this->get_wifi_client_(), URL);
+  begin_status = this->client_.begin(*this->get_wifi_client_(), url);
 #endif
 #endif
 

From f29622abe1318a33c987060a0e14f6a8e2594369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Ferrer=20Garc=C3=ADa?=
 <victorfergar@gmail.com>
Date: Thu, 23 Jul 2020 15:27:22 +0200
Subject: [PATCH 340/412] Fix rf_bridge send and receive (#1180)

* Fix rf_bridge send and receive

* rf_bridge clang-format changes

* rf_bridge pased data bug fix

* rf_bridge logvv included for parsed data
---
 esphome/components/rf_bridge/rf_bridge.cpp | 88 ++++++++++++++--------
 esphome/components/rf_bridge/rf_bridge.h   |  6 +-
 2 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/esphome/components/rf_bridge/rf_bridge.cpp b/esphome/components/rf_bridge/rf_bridge.cpp
index f1537cdc87..42689ecf82 100644
--- a/esphome/components/rf_bridge/rf_bridge.cpp
+++ b/esphome/components/rf_bridge/rf_bridge.cpp
@@ -15,59 +15,74 @@ void RFBridgeComponent::ack_() {
   this->flush();
 }
 
-void RFBridgeComponent::decode_() {
-  uint8_t action = uartbuf_[0];
-  RFBridgeData data{};
+bool RFBridgeComponent::parse_bridge_byte_(uint8_t byte) {
+  size_t at = this->rx_buffer_.size();
+  this->rx_buffer_.push_back(byte);
+  const uint8_t *raw = &this->rx_buffer_[0];
+
+  // Byte 0: Start
+  if (at == 0)
+    return byte == RF_CODE_START;
+
+  // Byte 1: Action
+  if (at == 1)
+    return byte >= RF_CODE_ACK && byte <= RF_CODE_RFOUT;
+  uint8_t action = raw[1];
 
   switch (action) {
     case RF_CODE_ACK:
       ESP_LOGD(TAG, "Action OK");
       break;
     case RF_CODE_LEARN_KO:
-      this->ack_();
-      ESP_LOGD(TAG, "Learn timeout");
+      ESP_LOGD(TAG, "Learning timeout");
       break;
     case RF_CODE_LEARN_OK:
-      ESP_LOGD(TAG, "Learn started");
     case RF_CODE_RFIN:
-      this->ack_();
+      if (at < RF_MESSAGE_SIZE + 2)
+        return true;
 
-      data.sync = (uartbuf_[1] << 8) | uartbuf_[2];
-      data.low = (uartbuf_[3] << 8) | uartbuf_[4];
-      data.high = (uartbuf_[5] << 8) | uartbuf_[6];
-      data.code = (uartbuf_[7] << 16) | (uartbuf_[8] << 8) | uartbuf_[9];
+      RFBridgeData data;
+      data.sync = (raw[2] << 8) | raw[3];
+      data.low = (raw[4] << 8) | raw[5];
+      data.high = (raw[6] << 8) | raw[7];
+      data.code = (raw[8] << 16) | (raw[9] << 8) | raw[10];
+
+      if (action == RF_CODE_LEARN_OK)
+        ESP_LOGD(TAG, "Learning success");
 
       ESP_LOGD(TAG, "Received RFBridge Code: sync=0x%04X low=0x%04X high=0x%04X code=0x%06X", data.sync, data.low,
                data.high, data.code);
       this->callback_.call(data);
       break;
     default:
-      ESP_LOGD(TAG, "Unknown action: 0x%02X", action);
+      ESP_LOGW(TAG, "Unknown action: 0x%02X", action);
       break;
   }
-  this->last_ = millis();
+
+  ESP_LOGVV(TAG, "Parsed: 0x%02X", byte);
+
+  if (byte == RF_CODE_STOP && action != RF_CODE_ACK)
+    this->ack_();
+
+  // return false to reset buffer
+  return false;
 }
 
 void RFBridgeComponent::loop() {
-  bool receiving = false;
-  if (this->last_ != 0 && millis() - this->last_ > RF_DEBOUNCE) {
-    this->last_ = 0;
+  const uint32_t now = millis();
+  if (now - this->last_bridge_byte_ > 50) {
+    this->rx_buffer_.clear();
+    this->last_bridge_byte_ = now;
   }
 
   while (this->available()) {
-    uint8_t c = this->read();
-    if (receiving) {
-      if (c == RF_CODE_STOP && (this->uartpos_ == 1 || this->uartpos_ == RF_MESSAGE_SIZE + 1)) {
-        this->decode_();
-        receiving = false;
-      } else if (this->uartpos_ <= RF_MESSAGE_SIZE) {
-        this->uartbuf_[uartpos_++] = c;
-      } else {
-        receiving = false;
-      }
-    } else if (c == RF_CODE_START) {
-      this->uartpos_ = 0;
-      receiving = true;
+    uint8_t byte;
+    this->read_byte(&byte);
+    if (this->parse_bridge_byte_(byte)) {
+      ESP_LOGVV(TAG, "Parsed: 0x%02X", byte);
+      this->last_bridge_byte_ = now;
+    } else {
+      this->rx_buffer_.clear();
     }
   }
 }
@@ -77,11 +92,17 @@ void RFBridgeComponent::send_code(RFBridgeData data) {
            data.code);
   this->write(RF_CODE_START);
   this->write(RF_CODE_RFOUT);
-  this->write(data.sync);
-  this->write(data.low);
-  this->write(data.high);
-  this->write(data.code);
+  this->write((data.sync >> 8) & 0xFF);
+  this->write(data.sync & 0xFF);
+  this->write((data.low >> 8) & 0xFF);
+  this->write(data.low & 0xFF);
+  this->write((data.high >> 8) & 0xFF);
+  this->write(data.high & 0xFF);
+  this->write((data.code >> 16) & 0xFF);
+  this->write((data.code >> 8) & 0xFF);
+  this->write(data.code & 0xFF);
   this->write(RF_CODE_STOP);
+  this->flush();
 }
 
 void RFBridgeComponent::learn() {
@@ -89,6 +110,7 @@ void RFBridgeComponent::learn() {
   this->write(RF_CODE_START);
   this->write(RF_CODE_LEARN);
   this->write(RF_CODE_STOP);
+  this->flush();
 }
 
 void RFBridgeComponent::dump_config() {
diff --git a/esphome/components/rf_bridge/rf_bridge.h b/esphome/components/rf_bridge/rf_bridge.h
index 86713b8a5c..7ae84a032f 100644
--- a/esphome/components/rf_bridge/rf_bridge.h
+++ b/esphome/components/rf_bridge/rf_bridge.h
@@ -45,10 +45,10 @@ class RFBridgeComponent : public uart::UARTDevice, public Component {
  protected:
   void ack_();
   void decode_();
+  bool parse_bridge_byte_(uint8_t byte);
 
-  unsigned long last_ = 0;
-  unsigned char uartbuf_[RF_MESSAGE_SIZE + 3] = {0};
-  unsigned char uartpos_ = 0;
+  std::vector<uint8_t> rx_buffer_;
+  uint32_t last_bridge_byte_{0};
 
   CallbackManager<void(RFBridgeData)> callback_;
 };

From 11c1fe88278cc54ee01f8df7f0acab809c565a26 Mon Sep 17 00:00:00 2001
From: Troon <mark@tranchant.co.uk>
Date: Thu, 23 Jul 2020 14:27:44 +0100
Subject: [PATCH 341/412] mdi:timer icon replaced with mdi:timer-outline
 (#1181)

Aligned to the MDI changelog here: https://dev.materialdesignicons.com/upgrade#4.9.95-to-5.0.45
---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 3a3e8128c6..b37d816256 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -583,7 +583,7 @@ ICON_SIGNAL = 'mdi:signal-distance-variant'
 ICON_SIGNAL_DISTANCE_VARIANT = 'mdi:signal'
 ICON_THERMOMETER = 'mdi:thermometer'
 ICON_TIMELAPSE = 'mdi:timelapse'
-ICON_TIMER = 'mdi:timer'
+ICON_TIMER = 'mdi:timer-outline'
 ICON_WATER_PERCENT = 'mdi:water-percent'
 ICON_WEATHER_SUNSET = 'mdi:weather-sunset'
 ICON_WEATHER_SUNSET_DOWN = 'mdi:weather-sunset-down'

From df5d03b0bc73798e05aa3f95e57205180c29fd12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jul 2020 23:25:23 +0200
Subject: [PATCH 342/412] Bump hypothesis from 5.19.3 to 5.20.3 (#1176)

Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 5.19.3 to 5.20.3.
- [Release notes](https://github.com/HypothesisWorks/hypothesis/releases)
- [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-5.19.3...hypothesis-python-5.20.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index e8a4f6f1a0..2b7c6c5b1d 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -8,4 +8,4 @@ pytest==5.4.3
 pytest-cov==2.10.0
 pytest-mock==3.2.0
 asyncmock==0.4.2
-hypothesis==5.19.3
+hypothesis==5.20.3

From 1b2de953d0d21785f2ea6393635214fdbea4433c Mon Sep 17 00:00:00 2001
From: dr-oblivium <52540467+dr-oblivium@users.noreply.github.com>
Date: Thu, 23 Jul 2020 23:40:30 +0200
Subject: [PATCH 343/412] Fix Home Assistant API disconnects when using st7789v
 display. (#1179)

---
 esphome/components/st7789v/display.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/st7789v/display.py b/esphome/components/st7789v/display.py
index 4723daf0e4..36e5acaa72 100644
--- a/esphome/components/st7789v/display.py
+++ b/esphome/components/st7789v/display.py
@@ -19,7 +19,7 @@ CONFIG_SCHEMA = display.FULL_DISPLAY_SCHEMA.extend({
     cv.Required(CONF_CS_PIN): pins.gpio_output_pin_schema,
     cv.Required(CONF_BACKLIGHT_PIN): pins.gpio_output_pin_schema,
     cv.Optional(CONF_BRIGHTNESS, default=1.0): cv.percentage,
-}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema())
+}).extend(cv.polling_component_schema('5s')).extend(spi.spi_device_schema())
 
 
 def to_code(config):

From a5e1f8fe19cf3befca4cd719295d63f95adc556a Mon Sep 17 00:00:00 2001
From: Frank Bakker <FrankBakkerNl@users.noreply.github.com>
Date: Thu, 23 Jul 2020 23:40:40 +0200
Subject: [PATCH 344/412] Fixed type mismatch between result_ field and
 preference of integration sensor (#1178)

---
 esphome/components/integration/integration_sensor.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/components/integration/integration_sensor.cpp b/esphome/components/integration/integration_sensor.cpp
index f9b5a43870..806c0ce567 100644
--- a/esphome/components/integration/integration_sensor.cpp
+++ b/esphome/components/integration/integration_sensor.cpp
@@ -10,7 +10,9 @@ static const char *TAG = "integration";
 void IntegrationSensor::setup() {
   if (this->restore_) {
     this->rtc_ = global_preferences.make_preference<float>(this->get_object_id_hash());
-    this->rtc_.load(&this->result_);
+    float preference_value = 0;
+    this->rtc_.load(&preference_value);
+    this->result_ = preference_value;
   }
 
   this->last_update_ = millis();

From ebbfab608c3f21feea0f9eb7f6b6a6c84d4357ae Mon Sep 17 00:00:00 2001
From: Peter Kuehne <pkuehne@users.noreply.github.com>
Date: Thu, 23 Jul 2020 22:51:14 +0100
Subject: [PATCH 345/412] Feature/wizard tests (#1167)

---
 .gitignore                      |   1 +
 esphome/wizard.py               |   7 +-
 tests/unit_tests/test_wizard.py | 389 ++++++++++++++++++++++++++++++++
 3 files changed, 394 insertions(+), 3 deletions(-)
 create mode 100644 tests/unit_tests/test_wizard.py

diff --git a/.gitignore b/.gitignore
index 2de9dd40e5..11a80a647c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@ htmlcov/
 .esphome
 nosetests.xml
 coverage.xml
+cov.xml
 *.cover
 .hypothesis/
 .pytest_cache/
diff --git a/esphome/wizard.py b/esphome/wizard.py
index b00f6d2b01..b1a0b17072 100644
--- a/esphome/wizard.py
+++ b/esphome/wizard.py
@@ -142,7 +142,7 @@ def wizard(path):
     if os.path.exists(path):
         safe_print("Uh oh, it seems like {} already exists, please delete that file first "
                    "or chose another configuration file.".format(color('cyan', path)))
-        return 1
+        return 2
     safe_print("Hi there!")
     sleep(1.5)
     safe_print("I'm the wizard of ESPHome :)")
@@ -162,14 +162,15 @@ def wizard(path):
     safe_print()
     sleep(1)
     name = input(color("bold_white", "(name): "))
+
     while True:
         try:
             name = cv.valid_name(name)
             break
         except vol.Invalid:
             safe_print(color("red", "Oh noes, \"{}\" isn't a valid name. Names can only include "
-                                    "numbers, letters and underscores.".format(name)))
-            name = strip_accents(name).replace(' ', '_')
+                                    "numbers, lower-case letters and underscores.".format(name)))
+            name = strip_accents(name).lower().replace(' ', '_')
             name = ''.join(c for c in name if c in cv.ALLOWED_NAME_CHARS)
             safe_print("Shall I use \"{}\" as the name instead?".format(color('cyan', name)))
             sleep(0.5)
diff --git a/tests/unit_tests/test_wizard.py b/tests/unit_tests/test_wizard.py
new file mode 100644
index 0000000000..2baff80edd
--- /dev/null
+++ b/tests/unit_tests/test_wizard.py
@@ -0,0 +1,389 @@
+""" Tests for the wizard.py file """
+
+import esphome.wizard as wz
+import pytest
+from esphome.pins import ESP8266_BOARD_PINS
+from mock import MagicMock
+
+
+@pytest.fixture
+def default_config():
+    return {
+        "name": "test_name",
+        "platform": "test_platform",
+        "board": "test_board",
+        "ssid": "test_ssid",
+        "psk": "test_psk",
+        "password": ""
+    }
+
+
+@pytest.fixture
+def wizard_answers():
+    return [
+        "test_node",  # Name of the node
+        "ESP8266",  # platform
+        "nodemcuv2",  # board
+        "SSID",  # ssid
+        "psk",  # wifi password
+        "ota_pass",  # ota password
+    ]
+
+
+def test_sanitize_quotes_replaces_with_escaped_char():
+    """
+    The sanitize_quotes function should replace double quotes with their escaped equivalents
+    """
+    # Given
+    input_str = "\"key\": \"value\""
+
+    # When
+    output_str = wz.sanitize_double_quotes(input_str)
+
+    # Then
+    assert output_str == "\\\"key\\\": \\\"value\\\""
+
+
+def test_config_file_fallback_ap_includes_descriptive_name(default_config):
+    """
+    The fallback AP should include the node and a descriptive name
+    """
+    # Given
+    default_config["name"] = "test_node"
+
+    # When
+    config = wz.wizard_file(**default_config)
+
+    # Then
+    assert f"ssid: \"Test Node Fallback Hotspot\"" in config
+
+
+def test_config_file_fallback_ap_name_less_than_32_chars(default_config):
+    """
+    The fallback AP name must be less than 32 chars.
+    Since it is composed of the node name and "Fallback Hotspot" this can be too long and needs truncating
+    """
+    # Given
+    default_config["name"] = "a_very_long_name_for_this_node"
+
+    # When
+    config = wz.wizard_file(**default_config)
+
+    # Then
+    assert f"ssid: \"A Very Long Name For This Node\"" in config
+
+
+def test_config_file_should_include_ota(default_config):
+    """
+    The Over-The-Air update should be enabled by default
+    """
+    # Given
+
+    # When
+    config = wz.wizard_file(**default_config)
+
+    # Then
+    assert "ota:" in config
+
+
+def test_config_file_should_include_ota_when_password_set(default_config):
+    """
+    The Over-The-Air update should be enabled when a password is set
+    """
+    # Given
+    default_config["password"] = "foo"
+
+    # When
+    config = wz.wizard_file(**default_config)
+
+    # Then
+    assert "ota:" in config
+
+
+def test_wizard_write_sets_platform(default_config, tmp_path, monkeypatch):
+    """
+    If the platform is not explicitly set, use "ESP8266" if the board is one of the ESP8266 boards
+    """
+    # Given
+    monkeypatch.setattr(wz, "write_file", MagicMock())
+
+    # When
+    wz.wizard_write(tmp_path, **default_config)
+
+    # Then
+    generated_config = wz.write_file.call_args.args[1]
+    assert f"platform: {default_config['platform']}" in generated_config
+
+
+def test_wizard_write_defaults_platform_from_board_esp8266(default_config, tmp_path, monkeypatch):
+    """
+    If the platform is not explicitly set, use "ESP8266" if the board is one of the ESP8266 boards
+    """
+    # Given
+    del default_config["platform"]
+    default_config["board"] = [*ESP8266_BOARD_PINS][0]
+
+    monkeypatch.setattr(wz, "write_file", MagicMock())
+
+    # When
+    wz.wizard_write(tmp_path, **default_config)
+
+    # Then
+    generated_config = wz.write_file.call_args.args[1]
+    assert "platform: ESP8266" in generated_config
+
+
+def test_wizard_write_defaults_platform_from_board_esp32(default_config, tmp_path, monkeypatch):
+    """
+    If the platform is not explicitly set, use "ESP32" if the board is not one of the ESP8266 boards
+    """
+    # Given
+    del default_config["platform"]
+    default_config["board"] = "foo"
+
+    monkeypatch.setattr(wz, "write_file", MagicMock())
+
+    # When
+    wz.wizard_write(tmp_path, **default_config)
+
+    # Then
+    generated_config = wz.write_file.call_args.args[1]
+    assert "platform: ESP32" in generated_config
+
+
+def test_safe_print_step_prints_step_number_and_description(monkeypatch):
+    """
+    The safe_print_step function prints the step number and the passed description
+    """
+    # Given
+    monkeypatch.setattr(wz, "safe_print", MagicMock())
+    monkeypatch.setattr(wz, "sleep", lambda time: 0)
+
+    step_num = 22
+    step_desc = "foobartest"
+
+    # When
+    wz.safe_print_step(step_num, step_desc)
+
+    # Then
+    # Collect arguments to all safe_print() calls (substituting "" for any empty ones)
+    all_args = [call.args[0] if len(call.args) else "" for call in wz.safe_print.call_args_list]
+
+    assert any(step_desc == arg for arg in all_args)
+    assert any(f"STEP {step_num}" in arg for arg in all_args)
+
+
+def test_default_input_uses_default_if_no_input_supplied(monkeypatch):
+    """
+    The default_input() function should return the supplied default value if the user doesn't enter anything
+    """
+
+    # Given
+    monkeypatch.setattr("builtins.input", lambda _: "")
+    default_string = "foobar"
+
+    # When
+    retval = wz.default_input("", default_string)
+
+    # Then
+    assert retval == default_string
+
+
+def test_default_input_uses_user_supplied_value(monkeypatch):
+    """
+    The default_input() function should return the value that the user enters
+    """
+
+    # Given
+    user_input = "A value"
+    monkeypatch.setattr("builtins.input", lambda _: user_input)
+    default_string = "foobar"
+
+    # When
+    retval = wz.default_input("", default_string)
+
+    # Then
+    assert retval == user_input
+
+
+def test_strip_accents_removes_diacritics():
+    """
+    The strip_accents() function should remove diacritics (umlauts)
+    """
+
+    # Given
+    input_str = u"Kühne"
+    expected_str = "Kuhne"
+
+    # When
+    output_str = wz.strip_accents(input_str)
+
+    # Then
+    assert output_str == expected_str
+
+
+def test_wizard_rejects_path_with_invalid_extension():
+    """
+    The wizard should reject config files that are not yaml
+    """
+
+    # Given
+    config_file = "test.json"
+
+    # When
+    retval = wz.wizard(config_file)
+
+    # Then
+    assert retval == 1
+
+
+def test_wizard_rejects_existing_files(tmpdir):
+    """
+    The wizard should reject any configuration file that already exists
+    """
+
+    # Given
+    config_file = tmpdir.join("test.yaml")
+    config_file.write("")
+
+    # When
+    retval = wz.wizard(str(config_file))
+
+    # Then
+    assert retval == 2
+
+
+def test_wizard_accepts_default_answers_esp8266(tmpdir, monkeypatch, wizard_answers):
+    """
+    The wizard should accept the given default answers for esp8266
+    """
+
+    # Given
+    config_file = tmpdir.join("test.yaml")
+    input_mock = MagicMock(side_effect=wizard_answers)
+    monkeypatch.setattr("builtins.input", input_mock)
+    monkeypatch.setattr(wz, "safe_print", lambda t=None: 0)
+    monkeypatch.setattr(wz, "sleep", lambda _: 0)
+    monkeypatch.setattr(wz, "wizard_write",  MagicMock())
+
+    # When
+    retval = wz.wizard(str(config_file))
+
+    # Then
+    assert retval == 0
+
+
+def test_wizard_accepts_default_answers_esp32(tmpdir, monkeypatch, wizard_answers):
+    """
+    The wizard should accept the given default answers for esp32
+    """
+
+    # Given
+    wizard_answers[1] = "ESP32"
+    wizard_answers[2] = "nodemcu-32s"
+    config_file = tmpdir.join("test.yaml")
+    input_mock = MagicMock(side_effect=wizard_answers)
+    monkeypatch.setattr("builtins.input", input_mock)
+    monkeypatch.setattr(wz, "safe_print", lambda t=None: 0)
+    monkeypatch.setattr(wz, "sleep", lambda _: 0)
+    monkeypatch.setattr(wz, "wizard_write",  MagicMock())
+
+    # When
+    retval = wz.wizard(str(config_file))
+
+    # Then
+    assert retval == 0
+
+
+def test_wizard_offers_better_node_name(tmpdir, monkeypatch, wizard_answers):
+    """
+    When the node name does not conform, a better alternative is offered
+    * Removes special chars
+    * Replaces spaces with underscores
+    * Converts all uppercase letters to lowercase
+    """
+
+    # Given
+    wizard_answers[0] = "Küche #2"
+    expected_name = "kuche_2"
+    monkeypatch.setattr(wz, "default_input", MagicMock(side_effect=lambda _, default: default))
+
+    config_file = tmpdir.join("test.yaml")
+    input_mock = MagicMock(side_effect=wizard_answers)
+    monkeypatch.setattr("builtins.input", input_mock)
+    monkeypatch.setattr(wz, "safe_print", lambda t=None: 0)
+    monkeypatch.setattr(wz, "sleep", lambda _: 0)
+    monkeypatch.setattr(wz, "wizard_write",  MagicMock())
+
+    # When
+    retval = wz.wizard(str(config_file))
+
+    # Then
+    assert retval == 0
+    assert wz.default_input.call_args.args[1] == expected_name
+
+
+def test_wizard_requires_correct_platform(tmpdir, monkeypatch, wizard_answers):
+    """
+    When the platform is not either esp32 or esp8266, the wizard should reject it
+    """
+
+    # Given
+    wizard_answers.insert(1, "foobar")  # add invalid entry for platform
+
+    config_file = tmpdir.join("test.yaml")
+    input_mock = MagicMock(side_effect=wizard_answers)
+    monkeypatch.setattr("builtins.input", input_mock)
+    monkeypatch.setattr(wz, "safe_print", lambda t=None: 0)
+    monkeypatch.setattr(wz, "sleep", lambda _: 0)
+    monkeypatch.setattr(wz, "wizard_write",  MagicMock())
+
+    # When
+    retval = wz.wizard(str(config_file))
+
+    # Then
+    assert retval == 0
+
+
+def test_wizard_requires_correct_board(tmpdir, monkeypatch, wizard_answers):
+    """
+    When the board is not a valid esp8266 board, the wizard should reject it
+    """
+
+    # Given
+    wizard_answers.insert(2, "foobar")  # add an invalid entry for board
+
+    config_file = tmpdir.join("test.yaml")
+    input_mock = MagicMock(side_effect=wizard_answers)
+    monkeypatch.setattr("builtins.input", input_mock)
+    monkeypatch.setattr(wz, "safe_print", lambda t=None: 0)
+    monkeypatch.setattr(wz, "sleep", lambda _: 0)
+    monkeypatch.setattr(wz, "wizard_write",  MagicMock())
+
+    # When
+    retval = wz.wizard(str(config_file))
+
+    # Then
+    assert retval == 0
+
+
+def test_wizard_requires_valid_ssid(tmpdir, monkeypatch, wizard_answers):
+    """
+    When the board is not a valid esp8266 board, the wizard should reject it
+    """
+
+    # Given
+    wizard_answers.insert(3, "")  # add an invalid entry for ssid
+
+    config_file = tmpdir.join("test.yaml")
+    input_mock = MagicMock(side_effect=wizard_answers)
+    monkeypatch.setattr("builtins.input", input_mock)
+    monkeypatch.setattr(wz, "safe_print", lambda t=None: 0)
+    monkeypatch.setattr(wz, "sleep", lambda _: 0)
+    monkeypatch.setattr(wz, "wizard_write",  MagicMock())
+
+    # When
+    retval = wz.wizard(str(config_file))
+
+    # Then
+    assert retval == 0

From e8272759be5f0ff54529a38421093c52d849867b Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 10:09:43 +0200
Subject: [PATCH 346/412] Try to fix serial ports listing (#1155)

---
 esphome/__main__.py            | 20 ++++----------------
 esphome/dashboard/dashboard.py | 10 +++++-----
 esphome/util.py                | 34 +++++++++++++++++++++++++++++++++-
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index a961df8ada..79488e9b55 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -12,24 +12,12 @@ from esphome.const import CONF_BAUD_RATE, CONF_BROKER, CONF_LOGGER, CONF_OTA, \
     CONF_PASSWORD, CONF_PORT, CONF_ESPHOME, CONF_PLATFORMIO_OPTIONS
 from esphome.core import CORE, EsphomeError, coroutine, coroutine_with_priority
 from esphome.helpers import color, indent
-from esphome.util import run_external_command, run_external_process, safe_print, list_yaml_files
+from esphome.util import run_external_command, run_external_process, safe_print, list_yaml_files, \
+    get_serial_ports
 
 _LOGGER = logging.getLogger(__name__)
 
 
-def get_serial_ports():
-    # from https://github.com/pyserial/pyserial/blob/master/serial/tools/list_ports.py
-    from serial.tools.list_ports import comports
-    result = []
-    for port, desc, info in comports(include_links=True):
-        if not port:
-            continue
-        if "VID:PID" in info:
-            result.append((port, desc))
-    result.sort(key=lambda x: x[0])
-    return result
-
-
 def choose_prompt(options):
     if not options:
         raise EsphomeError("Found no valid options for upload/logging, please make sure relevant "
@@ -60,8 +48,8 @@ def choose_prompt(options):
 
 def choose_upload_log_host(default, check_default, show_ota, show_mqtt, show_api):
     options = []
-    for res, desc in get_serial_ports():
-        options.append((f"{res} ({desc})", res))
+    for port in get_serial_ports():
+        options.append((f"{port.path} ({port.description})", port.path))
     if (show_ota and 'ota' in CORE.config) or (show_api and 'api' in CORE.config):
         options.append((f"Over The Air ({CORE.address})", CORE.address))
         if default == 'OTA':
diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index c4eb0eb266..1b150e008d 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -26,11 +26,10 @@ import tornado.web
 import tornado.websocket
 
 from esphome import const, util
-from esphome.__main__ import get_serial_ports
 from esphome.helpers import mkdir_p, get_bool_env, run_system_command
 from esphome.storage_json import EsphomeStorageJSON, StorageJSON, \
     esphome_storage_path, ext_storage_path, trash_storage_path
-from esphome.util import shlex_quote
+from esphome.util import shlex_quote, get_serial_ports
 
 # pylint: disable=unused-import, wrong-import-order
 from typing import Optional  # noqa
@@ -313,14 +312,15 @@ class SerialPortRequestHandler(BaseHandler):
     def get(self):
         ports = get_serial_ports()
         data = []
-        for port, desc in ports:
-            if port == '/dev/ttyAMA0':
+        for port in ports:
+            desc = port.description
+            if port.path == '/dev/ttyAMA0':
                 desc = 'UART pins on GPIO header'
             split_desc = desc.split(' - ')
             if len(split_desc) == 2 and split_desc[0] == split_desc[1]:
                 # Some serial ports repeat their values
                 desc = split_desc[0]
-            data.append({'port': port, 'desc': desc})
+            data.append({'port': port.path, 'desc': desc})
         data.append({'port': 'OTA', 'desc': 'Over-The-Air'})
         data.sort(key=lambda x: x['port'], reverse=True)
         self.write(json.dumps(data))
diff --git a/esphome/util.py b/esphome/util.py
index de6736096c..3fe7ba8eb8 100644
--- a/esphome/util.py
+++ b/esphome/util.py
@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Union, List
 
 import collections
 import io
@@ -7,6 +7,7 @@ import os
 import re
 import subprocess
 import sys
+from pathlib import Path
 
 from esphome import const
 
@@ -256,3 +257,34 @@ def filter_yaml_files(files):
     files = [f for f in files if os.path.basename(f) != 'secrets.yaml']
     files = [f for f in files if not os.path.basename(f).startswith('.')]
     return files
+
+
+class SerialPort:
+    def __init__(self, path: str, description: str):
+        self.path = path
+        self.description = description
+
+
+# from https://github.com/pyserial/pyserial/blob/master/serial/tools/list_ports.py
+def get_serial_ports() -> List[SerialPort]:
+    from serial.tools.list_ports import comports
+    result = []
+    for port, desc, info in comports(include_links=True):
+        if not port:
+            continue
+        if "VID:PID" in info:
+            result.append(SerialPort(path=port, description=desc))
+    # Also add objects in /dev/serial/by-id/
+    # ref: https://github.com/esphome/issues/issues/1346
+
+    by_id_path = Path('/dev/serial/by-id')
+    if sys.platform.lower().startswith('linux') and by_id_path.exists():
+        from serial.tools.list_ports_linux import SysFS
+
+        for path in by_id_path.glob('*'):
+            device = SysFS(path)
+            if device.subsystem == 'platform':
+                result.append(SerialPort(path=str(path), description=info[1]))
+
+    result.sort(key=lambda x: x.path)
+    return result

From 2e1d14b8b140dc44f82eb42ede2a217a795ade72 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 10:10:40 +0200
Subject: [PATCH 347/412] Bump NeoPixelBus from 2.5.2 to 2.5.7 (#1165)

---
 esphome/components/neopixelbus/light.py | 2 +-
 platformio.ini                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/neopixelbus/light.py b/esphome/components/neopixelbus/light.py
index 2b84882e59..32bfd951e9 100644
--- a/esphome/components/neopixelbus/light.py
+++ b/esphome/components/neopixelbus/light.py
@@ -181,4 +181,4 @@ def to_code(config):
     cg.add(var.set_pixel_order(getattr(ESPNeoPixelOrder, config[CONF_TYPE])))
 
     # https://github.com/Makuna/NeoPixelBus/blob/master/library.json
-    cg.add_library('NeoPixelBus-esphome', '2.5.2')
+    cg.add_library('NeoPixelBus-esphome', '2.5.7')
diff --git a/platformio.ini b/platformio.ini
index 22fa74f18e..0d078b7b35 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -15,7 +15,7 @@ lib_deps =
     ArduinoJson-esphomelib@5.13.3
     ESPAsyncWebServer-esphome@1.2.6
     FastLED@3.3.3
-    NeoPixelBus-esphome@2.5.2
+    NeoPixelBus-esphome@2.5.7
     ESPAsyncTCP-esphome@1.2.2
     1655@1.0.2  ; TinyGPSPlus (has name conflict)
     6865@1.0.0  ; TM1651 Battery Display

From facd4f63eca03406461b8015683277c89f3a2c45 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 10:13:08 +0200
Subject: [PATCH 348/412] Ignore hpyothesis updates

---
 .github/dependabot.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b38df29f46..ec4bf087cf 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+    ignored_updates:
+      # Hypotehsis is only used for testing and is updated quite often
+      - match:
+          dependency_name: hypothesis

From 725e8c69f51aab2aac0d4439bd65d852410bf1dc Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 10:16:34 +0200
Subject: [PATCH 349/412] Add long description to setup.py

---
 setup.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setup.py b/setup.py
index 06151bf1e5..8de5bf6381 100755
--- a/setup.py
+++ b/setup.py
@@ -28,6 +28,9 @@ here = os.path.abspath(os.path.dirname(__file__))
 with open(os.path.join(here, 'requirements.txt')) as requirements_txt:
     REQUIRES = requirements_txt.read().splitlines()
 
+with open(os.path.join(here, 'README.md')) as readme:
+    LONG_DESCRIPTION = readme.read()
+
 # If you have problems importing platformio and esptool as modules you can set
 # $ESPHOME_USE_SUBPROCESS to make ESPHome call their executables instead.
 # This means they have to be in your $PATH.
@@ -57,6 +60,8 @@ setup(
     author=PROJECT_AUTHOR,
     author_email=PROJECT_EMAIL,
     description="Make creating custom firmwares for ESP32/ESP8266 super easy.",
+    long_description=LONG_DESCRIPTION,
+    long_description_content_type='text/markdown',
     include_package_data=True,
     zip_safe=False,
     platforms='any',

From 9208227d92e5ad6a0ec51f49e2dd4fb359d95073 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 10:35:07 +0200
Subject: [PATCH 350/412] Improve setup.py

---
 setup.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 8de5bf6381..20435b86b5 100755
--- a/setup.py
+++ b/setup.py
@@ -56,6 +56,13 @@ setup(
     version=const.__version__,
     license=PROJECT_LICENSE,
     url=GITHUB_URL,
+    project_urls={
+        "Bug Tracker": "https://github.com/esphome/issues/issues",
+        "Feature Request Tracker": "https://github.com/esphome/feature-requests/issues",
+        "Source Code": "https://github.com/esphome/esphome",
+        "Documentation": "https://esphome.io",
+        "Twitter": "https://twitter.com/esphome_",
+    },
     download_url=DOWNLOAD_URL,
     author=PROJECT_AUTHOR,
     author_email=PROJECT_EMAIL,
@@ -74,5 +81,5 @@ setup(
             'esphome = esphome.__main__:main'
         ]
     },
-    packages=find_packages()
+    packages=find_packages(include="esphome.*")
 )

From c73f0eee4cabe4c4d4101699f45e89e286565ac1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Jul 2020 10:37:08 +0200
Subject: [PATCH 351/412] Bump colorlog from 4.1.0 to 4.2.1 (#1183)

Bumps [colorlog](https://github.com/borntyping/python-colorlog) from 4.1.0 to 4.2.1.
- [Release notes](https://github.com/borntyping/python-colorlog/releases)
- [Commits](https://github.com/borntyping/python-colorlog/compare/v4.1.0...v4.2.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index a05da7cd01..5f15ec5aa0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 voluptuous==0.11.7
 PyYAML==5.3.1
 paho-mqtt==1.5.0
-colorlog==4.1.0
+colorlog==4.2.1
 tornado==6.0.4
 protobuf==3.12.2
 tzlocal==2.1

From 27abb1280ae11a9083edab5ceecd44c64b87fd24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Jul 2020 10:37:22 +0200
Subject: [PATCH 352/412] Bump hypothesis from 5.20.3 to 5.21.0 (#1184)

Bumps [hypothesis](https://github.com/HypothesisWorks/hypothesis) from 5.20.3 to 5.21.0.
- [Release notes](https://github.com/HypothesisWorks/hypothesis/releases)
- [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-5.20.3...hypothesis-python-5.21.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index 2b7c6c5b1d..296488fc35 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -8,4 +8,4 @@ pytest==5.4.3
 pytest-cov==2.10.0
 pytest-mock==3.2.0
 asyncmock==0.4.2
-hypothesis==5.20.3
+hypothesis==5.21.0

From 25c62319a3e1fa1809e4e8d1a693e474e1eaa1cb Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 10:41:06 +0200
Subject: [PATCH 353/412] Fix dependabot version 2

---
 .github/dependabot.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ec4bf087cf..d73adbfa30 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,7 +4,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
-    ignored_updates:
+    ignore:
       # Hypotehsis is only used for testing and is updated quite often
-      - match:
-          dependency_name: hypothesis
+      - dependency-name: hypothesis

From 50cf57affbe75ff603a3cf2d87146f669b10cd9d Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 10:41:34 +0200
Subject: [PATCH 354/412] ESP8266 Disable Pin Initialization on Boot to fix pin
 toggling (#1185)

---
 esphome/core/esphal.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/esphome/core/esphal.cpp b/esphome/core/esphal.cpp
index 90707016c3..30a1e9c49f 100644
--- a/esphome/core/esphal.cpp
+++ b/esphome/core/esphal.cpp
@@ -304,3 +304,14 @@ void *memchr(const void *s, int c, size_t n) {
 }
 };
 #endif
+
+#ifdef ARDUINO_ARCH_ESP8266
+extern "C" {
+extern void resetPins() {  // NOLINT
+  // Added in framework 2.7.0
+  // usually this sets up all pins to be in INPUT mode
+  // however, not strictly needed as we set up the pins properly
+  // ourselves and this causes pins to toggle during reboot.
+}
+}
+#endif

From c030be4d3f2ace3493fe98819eb85ada2c413c20 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 11:10:09 +0200
Subject: [PATCH 355/412] Fix dashboard logout button and py3.8 removed
 hmac.new digestmod (#1156)

* Fix dashboard logout button and py3.8 removed hmac.new digestmod

* Just use SHA256

No reason to use HMAC here, as authenticity is not an issue

* Wrong branch

* Clenaup
---
 esphome/dashboard/dashboard.py         | 14 +++++++++-----
 esphome/dashboard/templates/index.html |  4 +++-
 esphome/dashboard/util.py              |  9 +++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 esphome/dashboard/util.py

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index 1b150e008d..c53c68b3a3 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -30,6 +30,7 @@ from esphome.helpers import mkdir_p, get_bool_env, run_system_command
 from esphome.storage_json import EsphomeStorageJSON, StorageJSON, \
     esphome_storage_path, ext_storage_path, trash_storage_path
 from esphome.util import shlex_quote, get_serial_ports
+from .util import password_hash
 
 # pylint: disable=unused-import, wrong-import-order
 from typing import Optional  # noqa
@@ -42,7 +43,7 @@ _LOGGER = logging.getLogger(__name__)
 class DashboardSettings:
     def __init__(self):
         self.config_dir = ''
-        self.password_digest = ''
+        self.password_hash = ''
         self.username = ''
         self.using_password = False
         self.on_hassio = False
@@ -55,7 +56,7 @@ class DashboardSettings:
             self.username = args.username or os.getenv('USERNAME', '')
             self.using_password = bool(password)
         if self.using_password:
-            self.password_digest = hmac.new(password.encode()).digest()
+            self.password_hash = password_hash(password)
         self.config_dir = args.configuration[0]
 
     @property
@@ -82,8 +83,11 @@ class DashboardSettings:
         if username != self.username:
             return False
 
-        password = hmac.new(password.encode()).digest()
-        return username == self.username and hmac.compare_digest(self.password_digest, password)
+        # Compare password in constant running time (to prevent timing attacks)
+        return hmac.compare_digest(
+            self.password_hash,
+            password_hash(password)
+        )
 
     def rel_path(self, *args):
         return os.path.join(self.config_dir, *args)
@@ -446,7 +450,7 @@ class MainRequestHandler(BaseHandler):
         entries = _list_dashboard_entries()
 
         self.render("templates/index.html", entries=entries, begin=begin,
-                    **template_args())
+                    **template_args(), login_enabled=settings.using_auth)
 
 
 def _ping_func(filename, address):
diff --git a/esphome/dashboard/templates/index.html b/esphome/dashboard/templates/index.html
index 1e546b037f..fa742fd2c6 100644
--- a/esphome/dashboard/templates/index.html
+++ b/esphome/dashboard/templates/index.html
@@ -52,7 +52,9 @@
         <li><a data-action="update-all" data-filename="{{ escape(config_dir) }}">Update All</a></li>
         <li><a data-action="edit" data-filename="secrets.yaml">Secrets Editor</a></li>
         <li class="divider"></li>
-        <li><a href="{{ relative_url }}logout">Logout</a></li>
+        {% if login_enabled %}
+          <li><a href="{{ relative_url }}logout">Logout</a></li>
+        {% end %}
       </ul>
     </nav>
   </div>
diff --git a/esphome/dashboard/util.py b/esphome/dashboard/util.py
new file mode 100644
index 0000000000..3e3864aa17
--- /dev/null
+++ b/esphome/dashboard/util.py
@@ -0,0 +1,9 @@
+import hashlib
+
+
+def password_hash(password: str) -> bytes:
+    """Create a hash of a password to transform it to a fixed-length digest.
+
+    Note this is not meant for secure storage, but for securely comparing passwords.
+    """
+    return hashlib.sha256(password.encode()).digest()

From f3d5d27c8f4bb115447c43072f408761a8825d03 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 15:40:05 +0200
Subject: [PATCH 356/412] WPA2 Enterprise Attempt 2 (#1158)

---
 esphome/components/wifi/__init__.py           |  49 ++++++-
 esphome/components/wifi/wifi_component.cpp    |   6 +
 esphome/components/wifi/wifi_component.h      |  21 +++
 .../components/wifi/wifi_component_esp32.cpp  |  50 +++++++
 esphome/components/wifi/wpa2_eap.py           | 138 ++++++++++++++++++
 esphome/const.py                              |   5 +
 requirements_test.txt                         |   5 +-
 7 files changed, 271 insertions(+), 3 deletions(-)
 create mode 100644 esphome/components/wifi/wpa2_eap.py

diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index d3c7e51603..7e7ab468ff 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -5,12 +5,16 @@ from esphome.automation import Condition
 from esphome.const import CONF_AP, CONF_BSSID, CONF_CHANNEL, CONF_DNS1, CONF_DNS2, CONF_DOMAIN, \
     CONF_FAST_CONNECT, CONF_GATEWAY, CONF_HIDDEN, CONF_ID, CONF_MANUAL_IP, CONF_NETWORKS, \
     CONF_PASSWORD, CONF_POWER_SAVE_MODE, CONF_REBOOT_TIMEOUT, CONF_SSID, CONF_STATIC_IP, \
-    CONF_SUBNET, CONF_USE_ADDRESS, CONF_PRIORITY
+    CONF_SUBNET, CONF_USE_ADDRESS, CONF_PRIORITY, CONF_IDENTITY, CONF_CERTIFICATE_AUTHORITY, \
+    CONF_CERTIFICATE, CONF_KEY, CONF_USERNAME, CONF_EAP
 from esphome.core import CORE, HexInt, coroutine_with_priority
+from . import wpa2_eap
+
 
 AUTO_LOAD = ['network']
 
 wifi_ns = cg.esphome_ns.namespace('wifi')
+EAPAuth = wifi_ns.struct('EAPAuth')
 IPAddress = cg.global_ns.class_('IPAddress')
 ManualIP = wifi_ns.struct('ManualIP')
 WiFiComponent = wifi_ns.class_('WiFiComponent', cg.Component)
@@ -56,6 +60,17 @@ STA_MANUAL_IP_SCHEMA = AP_MANUAL_IP_SCHEMA.extend({
     cv.Optional(CONF_DNS2, default="0.0.0.0"): cv.ipv4,
 })
 
+EAP_AUTH_SCHEMA = cv.All(cv.only_on_esp32, cv.Schema({
+    cv.Optional(CONF_IDENTITY): cv.string_strict,
+    cv.Optional(CONF_USERNAME): cv.string_strict,
+    cv.Optional(CONF_PASSWORD): cv.string_strict,
+    cv.Optional(CONF_CERTIFICATE_AUTHORITY): wpa2_eap.validate_certificate,
+    cv.Inclusive(CONF_CERTIFICATE, 'certificate_and_key'): wpa2_eap.validate_certificate,
+    # Only validate as file first because we need the password to load it
+    # Actual validation happens in validate_eap.
+    cv.Inclusive(CONF_KEY, 'certificate_and_key'): cv.file_,
+}), wpa2_eap.validate_eap, cv.has_at_least_one_key(CONF_IDENTITY, CONF_CERTIFICATE))
+
 WIFI_NETWORK_BASE = cv.Schema({
     cv.GenerateID(): cv.declare_id(WiFiAP),
     cv.Optional(CONF_SSID): cv.ssid,
@@ -73,6 +88,7 @@ WIFI_NETWORK_STA = WIFI_NETWORK_BASE.extend({
     cv.Optional(CONF_BSSID): cv.mac_address,
     cv.Optional(CONF_HIDDEN): cv.boolean,
     cv.Optional(CONF_PRIORITY, default=0.0): cv.float_,
+    cv.Optional(CONF_EAP): EAP_AUTH_SCHEMA,
 })
 
 
@@ -81,9 +97,13 @@ def validate(config):
         raise cv.Invalid("Cannot have WiFi password without SSID!")
 
     if CONF_SSID in config:
+        # Automatically move single network to 'networks' section
+        config = config.copy()
         network = {CONF_SSID: config.pop(CONF_SSID)}
         if CONF_PASSWORD in config:
             network[CONF_PASSWORD] = config.pop(CONF_PASSWORD)
+        if CONF_EAP in config:
+            network[CONF_EAP] = config.pop(CONF_EAP)
         if CONF_NETWORKS in config:
             raise cv.Invalid("You cannot use the 'ssid:' option together with 'networks:'. Please "
                              "copy your network into the 'networks:' key")
@@ -118,6 +138,7 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
     cv.Optional(CONF_SSID): cv.ssid,
     cv.Optional(CONF_PASSWORD): validate_password,
     cv.Optional(CONF_MANUAL_IP): STA_MANUAL_IP_SCHEMA,
+    cv.Optional(CONF_EAP): EAP_AUTH_SCHEMA,
 
     cv.Optional(CONF_AP): WIFI_NETWORK_AP,
     cv.Optional(CONF_DOMAIN, default='.local'): cv.domain_name,
@@ -133,6 +154,29 @@ CONFIG_SCHEMA = cv.All(cv.Schema({
 }), validate)
 
 
+def eap_auth(config):
+    if config is None:
+        return None
+    ca_cert = ""
+    if CONF_CERTIFICATE_AUTHORITY in config:
+        ca_cert = wpa2_eap.read_relative_config_path(config[CONF_CERTIFICATE_AUTHORITY])
+    client_cert = ""
+    if CONF_CERTIFICATE in config:
+        client_cert = wpa2_eap.read_relative_config_path(config[CONF_CERTIFICATE])
+    key = ""
+    if CONF_KEY in config:
+        key = wpa2_eap.read_relative_config_path(config[CONF_KEY])
+    return cg.StructInitializer(
+        EAPAuth,
+        ('identity', config.get(CONF_IDENTITY, "")),
+        ('username', config.get(CONF_USERNAME, "")),
+        ('password', config.get(CONF_PASSWORD, "")),
+        ('ca_cert', ca_cert),
+        ('client_cert', client_cert),
+        ('client_key', key),
+    )
+
+
 def safe_ip(ip):
     if ip is None:
         return IPAddress(0, 0, 0, 0)
@@ -158,6 +202,9 @@ def wifi_network(config, static_ip):
         cg.add(ap.set_ssid(config[CONF_SSID]))
     if CONF_PASSWORD in config:
         cg.add(ap.set_password(config[CONF_PASSWORD]))
+    if CONF_EAP in config:
+        cg.add(ap.set_eap(eap_auth(config[CONF_EAP])))
+        cg.add_define('ESPHOME_WIFI_WPA2_EAP')
     if CONF_BSSID in config:
         cg.add(ap.set_bssid([HexInt(i) for i in config[CONF_BSSID].parts]))
     if CONF_HIDDEN in config:
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index d56e75a070..5c1c533c5d 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -541,12 +541,18 @@ void WiFiAP::set_ssid(const std::string &ssid) { this->ssid_ = ssid; }
 void WiFiAP::set_bssid(bssid_t bssid) { this->bssid_ = bssid; }
 void WiFiAP::set_bssid(optional<bssid_t> bssid) { this->bssid_ = bssid; }
 void WiFiAP::set_password(const std::string &password) { this->password_ = password; }
+#ifdef ESPHOME_WIFI_WPA2_EAP
+void WiFiAP::set_eap(optional<EAPAuth> eap_auth) { this->eap_ = eap_auth; }
+#endif
 void WiFiAP::set_channel(optional<uint8_t> channel) { this->channel_ = channel; }
 void WiFiAP::set_manual_ip(optional<ManualIP> manual_ip) { this->manual_ip_ = manual_ip; }
 void WiFiAP::set_hidden(bool hidden) { this->hidden_ = hidden; }
 const std::string &WiFiAP::get_ssid() const { return this->ssid_; }
 const optional<bssid_t> &WiFiAP::get_bssid() const { return this->bssid_; }
 const std::string &WiFiAP::get_password() const { return this->password_; }
+#ifdef ESPHOME_WIFI_WPA2_EAP
+const optional<EAPAuth> &WiFiAP::get_eap() const { return this->eap_; }
+#endif
 const optional<uint8_t> &WiFiAP::get_channel() const { return this->channel_; }
 const optional<ManualIP> &WiFiAP::get_manual_ip() const { return this->manual_ip_; }
 bool WiFiAP::get_hidden() const { return this->hidden_; }
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index d04e1c2ce0..536d914a36 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -57,6 +57,18 @@ struct ManualIP {
   IPAddress dns2;  ///< The second DNS server. 0.0.0.0 for default.
 };
 
+#ifdef ESPHOME_WIFI_WPA2_EAP
+struct EAPAuth {
+  std::string identity;  // required for all auth types
+  std::string username;
+  std::string password;
+  const char *ca_cert;  // optionally verify authentication server
+  // used for EAP-TLS
+  const char *client_cert;
+  const char *client_key;
+};
+#endif  // ESPHOME_WIFI_WPA2_EAP
+
 using bssid_t = std::array<uint8_t, 6>;
 
 class WiFiAP {
@@ -65,6 +77,9 @@ class WiFiAP {
   void set_bssid(bssid_t bssid);
   void set_bssid(optional<bssid_t> bssid);
   void set_password(const std::string &password);
+#ifdef ESPHOME_WIFI_WPA2_EAP
+  void set_eap(optional<EAPAuth> eap_auth);
+#endif  // ESPHOME_WIFI_WPA2_EAP
   void set_channel(optional<uint8_t> channel);
   void set_priority(float priority) { priority_ = priority; }
   void set_manual_ip(optional<ManualIP> manual_ip);
@@ -72,6 +87,9 @@ class WiFiAP {
   const std::string &get_ssid() const;
   const optional<bssid_t> &get_bssid() const;
   const std::string &get_password() const;
+#ifdef ESPHOME_WIFI_WPA2_EAP
+  const optional<EAPAuth> &get_eap() const;
+#endif  // ESPHOME_WIFI_WPA2_EAP
   const optional<uint8_t> &get_channel() const;
   float get_priority() const { return priority_; }
   const optional<ManualIP> &get_manual_ip() const;
@@ -81,6 +99,9 @@ class WiFiAP {
   std::string ssid_;
   optional<bssid_t> bssid_;
   std::string password_;
+#ifdef ESPHOME_WIFI_WPA2_EAP
+  optional<EAPAuth> eap_;
+#endif  // ESPHOME_WIFI_WPA2_EAP
   optional<uint8_t> channel_;
   float priority_{0};
   optional<ManualIP> manual_ip_;
diff --git a/esphome/components/wifi/wifi_component_esp32.cpp b/esphome/components/wifi/wifi_component_esp32.cpp
index e345ab1671..a387be78ce 100644
--- a/esphome/components/wifi/wifi_component_esp32.cpp
+++ b/esphome/components/wifi/wifi_component_esp32.cpp
@@ -6,6 +6,9 @@
 
 #include <utility>
 #include <algorithm>
+#ifdef ESPHOME_WIFI_WPA2_EAP
+#include <esp_wpa2.h>
+#endif
 #include "lwip/err.h"
 #include "lwip/dns.h"
 
@@ -187,6 +190,53 @@ bool WiFiComponent::wifi_sta_connect_(WiFiAP ap) {
     return false;
   }
 
+  // setup enterprise authentication if required
+#ifdef ESPHOME_WIFI_WPA2_EAP
+  if (ap.get_eap().has_value()) {
+    // note: all certificates and keys have to be null terminated. Lengths are appended by +1 to include \0.
+    EAPAuth eap = ap.get_eap().value();
+    err = esp_wifi_sta_wpa2_ent_set_identity((uint8_t *) eap.identity.c_str(), eap.identity.length());
+    if (err != ESP_OK) {
+      ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_identity failed! %d", err);
+    }
+    int ca_cert_len = strlen(eap.ca_cert);
+    int client_cert_len = strlen(eap.client_cert);
+    int client_key_len = strlen(eap.client_key);
+    if (ca_cert_len) {
+      err = esp_wifi_sta_wpa2_ent_set_ca_cert((uint8_t *) eap.ca_cert, ca_cert_len + 1);
+      if (err != ESP_OK) {
+        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_ca_cert failed! %d", err);
+      }
+    }
+    // workout what type of EAP this is
+    // validation is not required as the config tool has already validated it
+    if (client_cert_len && client_key_len) {
+      // if we have certs, this must be EAP-TLS
+      err = esp_wifi_sta_wpa2_ent_set_cert_key((uint8_t *) eap.client_cert, client_cert_len + 1,
+                                               (uint8_t *) eap.client_key, client_key_len + 1,
+                                               (uint8_t *) eap.password.c_str(), strlen(eap.password.c_str()));
+      if (err != ESP_OK) {
+        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_cert_key failed! %d", err);
+      }
+    } else {
+      // in the absence of certs, assume this is username/password based
+      err = esp_wifi_sta_wpa2_ent_set_username((uint8_t *) eap.username.c_str(), eap.username.length());
+      if (err != ESP_OK) {
+        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_username failed! %d", err);
+      }
+      err = esp_wifi_sta_wpa2_ent_set_password((uint8_t *) eap.password.c_str(), eap.password.length());
+      if (err != ESP_OK) {
+        ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_set_password failed! %d", err);
+      }
+    }
+    esp_wpa2_config_t wpa2_config = WPA2_CONFIG_INIT_DEFAULT();
+    err = esp_wifi_sta_wpa2_ent_enable(&wpa2_config);
+    if (err != ESP_OK) {
+      ESP_LOGV(TAG, "esp_wifi_sta_wpa2_ent_enable failed! %d", err);
+    }
+  }
+#endif  // ESPHOME_WIFI_WPA2_EAP
+
   this->wifi_apply_hostname_();
 
   err = esp_wifi_connect();
diff --git a/esphome/components/wifi/wpa2_eap.py b/esphome/components/wifi/wpa2_eap.py
new file mode 100644
index 0000000000..5b83c59866
--- /dev/null
+++ b/esphome/components/wifi/wpa2_eap.py
@@ -0,0 +1,138 @@
+"""Module for all WPA2 Utilities.
+
+The cryptography package is loaded lazily in the functions
+so that it doesn't crash if it's not installed.
+"""
+import logging
+from pathlib import Path
+
+from esphome.core import CORE
+import esphome.config_validation as cv
+from esphome.const import CONF_USERNAME, CONF_IDENTITY, CONF_PASSWORD, CONF_CERTIFICATE, \
+    CONF_KEY
+
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def validate_cryptography_installed():
+    try:
+        import cryptography
+    except ImportError:
+        raise cv.Invalid("This settings requires the cryptography python package. "
+                         "Please install it with `pip install cryptography`")
+
+    if cryptography.__version__[0] < '2':
+        raise cv.Invalid("Please update your python cryptography installation to least 2.x "
+                         "(pip install -U cryptography)")
+
+
+def wrapped_load_pem_x509_certificate(value):
+    validate_cryptography_installed()
+
+    from cryptography import x509
+    from cryptography.hazmat.backends import default_backend
+
+    return x509.load_pem_x509_certificate(value.encode('UTF-8'), default_backend())
+
+
+def wrapped_load_pem_private_key(value, password):
+    validate_cryptography_installed()
+
+    from cryptography.hazmat.primitives.serialization import load_pem_private_key
+    from cryptography.hazmat.backends import default_backend
+
+    if password:
+        password = password.encode("UTF-8")
+    return load_pem_private_key(value.encode('UTF-8'), password, default_backend())
+
+
+def read_relative_config_path(value):
+    return Path(CORE.relative_config_path(value)).read_text()
+
+
+def _validate_load_certificate(value):
+    value = cv.file_(value)
+    try:
+        contents = read_relative_config_path(value)
+        return wrapped_load_pem_x509_certificate(contents)
+    except ValueError as err:
+        raise cv.Invalid(f"Invalid certificate: {err}")
+
+
+def validate_certificate(value):
+    _validate_load_certificate(value)
+    # Validation result should be the path, not the loaded certificate
+    return value
+
+
+def _validate_load_private_key(key, cert_pw):
+    key = cv.file_(key)
+    try:
+        contents = read_relative_config_path(key)
+        return wrapped_load_pem_private_key(contents, cert_pw)
+    except ValueError as e:
+        raise cv.Invalid(f"There was an error with the EAP 'password:' provided for 'key' {e}")
+    except TypeError as e:
+        raise cv.Invalid(f"There was an error with the EAP 'key:' provided: {e}")
+
+
+def _check_private_key_cert_match(key, cert):
+    from cryptography.hazmat.primitives.asymmetric import rsa, ec
+
+    def check_match_a():
+        return key.public_key().public_numbers() == cert.public_key().public_numbers()
+
+    def check_match_b():
+        return key.public_key() == cert
+
+    private_key_types = {
+        rsa.RSAPrivateKey: check_match_a,
+        ec.EllipticCurvePrivateKey: check_match_a,
+    }
+
+    try:
+        # pylint: disable=no-name-in-module
+        from cryptography.hazmat.primitives.asymmetric import ed448, ed25519
+
+        private_key_types.update({
+            ed448.Ed448PrivateKey: check_match_b,
+            ed25519.Ed25519PrivateKey: check_match_b,
+        })
+    except ImportError:
+        # ed448, ed25519 not supported
+        pass
+
+    key_type = next((kt for kt in private_key_types if isinstance(key, kt)), None)
+    if key_type is None:
+        _LOGGER.warning(
+            "Unrecognised EAP 'certificate:' 'key:' pair format: %s. Proceed with caution!",
+            type(key)
+        )
+    elif not private_key_types[key_type]():
+        raise cv.Invalid("The provided EAP 'key' is not valid for the 'certificate'.")
+
+
+def validate_eap(value):
+    validate_cryptography_installed()
+
+    if CONF_USERNAME in value:
+        if CONF_IDENTITY not in value:
+            _LOGGER.info("EAP 'identity:' is not set, assuming username.")
+            value = value.copy()
+            value[CONF_IDENTITY] = value[CONF_USERNAME]
+        if CONF_PASSWORD not in value:
+            raise cv.Invalid("You cannot use the EAP 'username:' option without a 'password:'. "
+                             "Please provide the 'password:' key")
+
+    if CONF_CERTIFICATE in value or CONF_KEY in value:
+        # Check the key is valid and for this certificate, just to check the user hasn't pasted
+        # the wrong thing. I write this after I spent a while debugging that exact issue.
+        # This may require a password to decrypt to key, so we should verify that at the same time.
+        cert_pw = value.get(CONF_PASSWORD)
+        key = _validate_load_private_key(value[CONF_KEY], cert_pw)
+
+        cert = _validate_load_certificate(value[CONF_CERTIFICATE])
+        _check_private_key_cert_match(key, cert)
+
+    return value
diff --git a/esphome/const.py b/esphome/const.py
index b37d816256..57694c4088 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -75,6 +75,8 @@ CONF_CALIBRATION = 'calibration'
 CONF_CAPACITANCE = 'capacitance'
 CONF_CARRIER_DUTY_PERCENT = 'carrier_duty_percent'
 CONF_CARRIER_FREQUENCY = 'carrier_frequency'
+CONF_CERTIFICATE = "certificate"
+CONF_CERTIFICATE_AUTHORITY = "certificate_authority"
 CONF_CHANGE_MODE_EVERY = 'change_mode_every'
 CONF_CHANNEL = 'channel'
 CONF_CHANNELS = 'channels'
@@ -145,6 +147,7 @@ CONF_DRY_ACTION = 'dry_action'
 CONF_DRY_MODE = 'dry_mode'
 CONF_DUMP = 'dump'
 CONF_DURATION = 'duration'
+CONF_EAP = 'eap'
 CONF_ECHO_PIN = 'echo_pin'
 CONF_EFFECT = 'effect'
 CONF_EFFECTS = 'effects'
@@ -211,6 +214,7 @@ CONF_I2C = 'i2c'
 CONF_I2C_ID = 'i2c_id'
 CONF_ICON = 'icon'
 CONF_ID = 'id'
+CONF_IDENTITY = 'identity'
 CONF_IDLE = 'idle'
 CONF_IDLE_ACTION = 'idle_action'
 CONF_IDLE_LEVEL = 'idle_level'
@@ -238,6 +242,7 @@ CONF_JS_URL = 'js_url'
 CONF_JVC = 'jvc'
 CONF_KEEP_ON_TIME = 'keep_on_time'
 CONF_KEEPALIVE = 'keepalive'
+CONF_KEY = 'key'
 CONF_LAMBDA = 'lambda'
 CONF_LEVEL = 'level'
 CONF_LG = 'lg'
diff --git a/requirements_test.txt b/requirements_test.txt
index 296488fc35..179f683b32 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,7 +1,8 @@
 pylint==2.5.3
 flake8==3.8.3
-pillow
-pexpect
+pillow>4.0.0
+cryptography>=2.0.0,<3
+pexpect==4.8.0
 
 # Unit tests
 pytest==5.4.3

From 5759de079b56a8ed1fa31092e537f7f0103cc939 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 22:36:25 +0200
Subject: [PATCH 357/412] Remove symlink_ops.py (#1196)

We no longer use symlinks anywhere
---
 esphome/symlink_ops.py | 164 -----------------------------------------
 1 file changed, 164 deletions(-)
 delete mode 100644 esphome/symlink_ops.py

diff --git a/esphome/symlink_ops.py b/esphome/symlink_ops.py
deleted file mode 100644
index accfbe5ff7..0000000000
--- a/esphome/symlink_ops.py
+++ /dev/null
@@ -1,164 +0,0 @@
-import os
-
-if hasattr(os, 'symlink'):
-    def symlink(src, dst):
-        return os.symlink(src, dst)
-
-    def islink(path):
-        return os.path.islink(path)
-
-    def readlink(path):
-        return os.readlink(path)
-
-    def unlink(path):
-        return os.unlink(path)
-else:
-    import ctypes
-    from ctypes import wintypes
-    # Code taken from
-    # https://stackoverflow.com/questions/27972776/having-trouble-implementing-a-readlink-function
-
-    kernel32 = ctypes.WinDLL('kernel32', use_last_error=True)
-
-    FILE_READ_ATTRIBUTES = 0x0080
-    OPEN_EXISTING = 3
-    FILE_FLAG_OPEN_REPARSE_POINT = 0x00200000
-    FILE_FLAG_BACKUP_SEMANTICS = 0x02000000
-    FILE_ATTRIBUTE_REPARSE_POINT = 0x0400
-
-    IO_REPARSE_TAG_MOUNT_POINT = 0xA0000003
-    IO_REPARSE_TAG_SYMLINK = 0xA000000C
-    FSCTL_GET_REPARSE_POINT = 0x000900A8
-    MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 0x4000
-
-    LPDWORD = ctypes.POINTER(wintypes.DWORD)
-    LPWIN32_FIND_DATA = ctypes.POINTER(wintypes.WIN32_FIND_DATAW)
-    INVALID_HANDLE_VALUE = wintypes.HANDLE(-1).value
-
-    def IsReparseTagNameSurrogate(tag):
-        return bool(tag & 0x20000000)
-
-    def _check_invalid_handle(result, func, args):
-        if result == INVALID_HANDLE_VALUE:
-            raise ctypes.WinError(ctypes.get_last_error())
-        return args
-
-    def _check_bool(result, func, args):
-        if not result:
-            raise ctypes.WinError(ctypes.get_last_error())
-        return args
-
-    kernel32.FindFirstFileW.errcheck = _check_invalid_handle
-    kernel32.FindFirstFileW.restype = wintypes.HANDLE
-    kernel32.FindFirstFileW.argtypes = (
-        wintypes.LPCWSTR,  # _In_  lpFileName
-        LPWIN32_FIND_DATA)  # _Out_ lpFindFileData
-
-    kernel32.FindClose.argtypes = (
-        wintypes.HANDLE,)  # _Inout_ hFindFile
-
-    kernel32.CreateFileW.errcheck = _check_invalid_handle
-    kernel32.CreateFileW.restype = wintypes.HANDLE
-    kernel32.CreateFileW.argtypes = (
-        wintypes.LPCWSTR,  # _In_     lpFileName
-        wintypes.DWORD,   # _In_     dwDesiredAccess
-        wintypes.DWORD,   # _In_     dwShareMode
-        wintypes.LPVOID,  # _In_opt_ lpSecurityAttributes
-        wintypes.DWORD,  # _In_     dwCreationDisposition
-        wintypes.DWORD,  # _In_     dwFlagsAndAttributes
-        wintypes.HANDLE)  # _In_opt_ hTemplateFile
-
-    kernel32.CloseHandle.argtypes = (
-        wintypes.HANDLE,)  # _In_ hObject
-
-    kernel32.DeviceIoControl.errcheck = _check_bool
-    kernel32.DeviceIoControl.argtypes = (
-        wintypes.HANDLE,  # _In_        hDevice
-        wintypes.DWORD,   # _In_        dwIoControlCode
-        wintypes.LPVOID,  # _In_opt_    lpInBuffer
-        wintypes.DWORD,   # _In_        nInBufferSize
-        wintypes.LPVOID,  # _Out_opt_   lpOutBuffer
-        wintypes.DWORD,   # _In_        nOutBufferSize
-        LPDWORD,          # _Out_opt_   lpBytesReturned
-        wintypes.LPVOID)  # _Inout_opt_ lpOverlapped
-
-    class REPARSE_DATA_BUFFER(ctypes.Structure):
-        class ReparseData(ctypes.Union):
-            class LinkData(ctypes.Structure):
-                _fields_ = (('SubstituteNameOffset', wintypes.USHORT),
-                            ('SubstituteNameLength', wintypes.USHORT),
-                            ('PrintNameOffset', wintypes.USHORT),
-                            ('PrintNameLength', wintypes.USHORT))
-
-                @property
-                def PrintName(self):
-                    dt = wintypes.WCHAR * (self.PrintNameLength // ctypes.sizeof(wintypes.WCHAR))
-                    name = dt.from_address(ctypes.addressof(self.PathBuffer) +
-                                           self.PrintNameOffset).value
-                    if name.startswith(r'\??'):
-                        name = r'\\?' + name[3:]  # NT => Windows
-                    return name
-
-            class SymbolicLinkData(LinkData):
-                _fields_ = (('Flags', wintypes.ULONG), ('PathBuffer', wintypes.BYTE * 0))
-
-            class MountPointData(LinkData):
-                _fields_ = (('PathBuffer', wintypes.BYTE * 0),)
-
-            class GenericData(ctypes.Structure):
-                _fields_ = (('DataBuffer', wintypes.BYTE * 0),)
-            _fields_ = (('SymbolicLinkReparseBuffer', SymbolicLinkData),
-                        ('MountPointReparseBuffer', MountPointData),
-                        ('GenericReparseBuffer', GenericData))
-        _fields_ = (('ReparseTag', wintypes.ULONG),
-                    ('ReparseDataLength', wintypes.USHORT),
-                    ('Reserved', wintypes.USHORT),
-                    ('ReparseData', ReparseData))
-        _anonymous_ = ('ReparseData',)
-
-    def symlink(src, dst):
-        csl = ctypes.windll.kernel32.CreateSymbolicLinkW
-        csl.argtypes = (ctypes.c_wchar_p, ctypes.c_wchar_p, ctypes.c_uint32)
-        csl.restype = ctypes.c_ubyte
-        flags = 1 if os.path.isdir(src) else 0
-        if csl(dst, src, flags) == 0:
-            error = ctypes.WinError()
-            # pylint: disable=no-member
-            if error.winerror == 1314 and error.errno == 22:
-                from esphome.core import EsphomeError
-                raise EsphomeError("Cannot create symlink from '%s' to '%s'. Try running tool \
-with elevated privileges" % (src, dst))
-            raise error
-
-    def islink(path):
-        if not os.path.isdir(path):
-            return False
-        data = wintypes.WIN32_FIND_DATAW()
-        kernel32.FindClose(kernel32.FindFirstFileW(path, ctypes.byref(data)))
-        if not data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT:
-            return False
-        return IsReparseTagNameSurrogate(data.dwReserved0)
-
-    def readlink(path):
-        n = wintypes.DWORD()
-        buf = (wintypes.BYTE * MAXIMUM_REPARSE_DATA_BUFFER_SIZE)()
-        flags = FILE_FLAG_OPEN_REPARSE_POINT | FILE_FLAG_BACKUP_SEMANTICS
-        handle = kernel32.CreateFileW(path, FILE_READ_ATTRIBUTES, 0, None,
-                                      OPEN_EXISTING, flags, None)
-        try:
-            kernel32.DeviceIoControl(handle, FSCTL_GET_REPARSE_POINT, None, 0,
-                                     buf, ctypes.sizeof(buf), ctypes.byref(n), None)
-        finally:
-            kernel32.CloseHandle(handle)
-        rb = REPARSE_DATA_BUFFER.from_buffer(buf)
-        tag = rb.ReparseTag
-        if tag == IO_REPARSE_TAG_SYMLINK:
-            return rb.SymbolicLinkReparseBuffer.PrintName
-        if tag == IO_REPARSE_TAG_MOUNT_POINT:
-            return rb.MountPointReparseBuffer.PrintName
-        if not IsReparseTagNameSurrogate(tag):
-            raise ValueError("not a link")
-        raise ValueError("unsupported reparse tag: %d" % tag)
-
-    def unlink(path):
-        return os.rmdir(path)

From 7524493c3ceefd80745bd65735b5e46f1ee5ca9f Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 22:36:59 +0200
Subject: [PATCH 358/412] Fix senseair flush input buffer wrong log level
 (#1194)

See also https://github.com/esphome/esphome/pull/1017/files
---
 esphome/components/senseair/senseair.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/senseair/senseair.cpp b/esphome/components/senseair/senseair.cpp
index 19831874d7..812a4aa42d 100644
--- a/esphome/components/senseair/senseair.cpp
+++ b/esphome/components/senseair/senseair.cpp
@@ -24,11 +24,11 @@ void SenseAirComponent::update() {
 
     this->status_set_warning();
     while (this->available()) {
-      unsigned char b;
+      uint8_t b;
       if (this->read_byte(&b)) {
-        ESP_LOGD(TAG, "    ... %02x", b);
+        ESP_LOGV(TAG, "    ... %02x", b);
       } else {
-        ESP_LOGD(TAG, "    ... nothing read");
+        ESP_LOGV(TAG, "    ... nothing read");
       }
     }
     return;

From 43d5e7a8ccdba47edfa65f64c34bfd889c918e31 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Fri, 24 Jul 2020 22:37:19 +0200
Subject: [PATCH 359/412] Fix WLED minor issues (#1193)

---
 esphome/components/e131/e131.cpp              | 1 +
 esphome/components/wled/wled_light_effect.cpp | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/esphome/components/e131/e131.cpp b/esphome/components/e131/e131.cpp
index d107d9f9fc..8a293e9067 100644
--- a/esphome/components/e131/e131.cpp
+++ b/esphome/components/e131/e131.cpp
@@ -31,6 +31,7 @@ void E131Component::setup() {
   if (!udp_->begin(PORT)) {
     ESP_LOGE(TAG, "Cannot bind E131 to %d.", PORT);
     mark_failed();
+    return;
   }
 
   join_igmp_groups_();
diff --git a/esphome/components/wled/wled_light_effect.cpp b/esphome/components/wled/wled_light_effect.cpp
index f161ea15e8..e06a23aacf 100644
--- a/esphome/components/wled/wled_light_effect.cpp
+++ b/esphome/components/wled/wled_light_effect.cpp
@@ -50,12 +50,13 @@ void WLEDLightEffect::apply(light::AddressableLight &it, const light::ESPColor &
     udp_.reset(new WiFiUDP());
 
     if (!udp_->begin(port_)) {
-      ESP_LOGE(TAG, "Cannot bind WLEDLightEffect to %d.", port_);
+      ESP_LOGW(TAG, "Cannot bind WLEDLightEffect to %d.", port_);
+      return;
     }
   }
 
+  std::vector<uint8_t> payload;
   while (uint16_t packet_size = udp_->parsePacket()) {
-    std::vector<uint8_t> payload;
     payload.resize(packet_size);
 
     if (!udp_->read(&payload[0], payload.size())) {
@@ -63,11 +64,12 @@ void WLEDLightEffect::apply(light::AddressableLight &it, const light::ESPColor &
     }
 
     if (!this->parse_frame_(it, &payload[0], payload.size())) {
-      ESP_LOGD(TAG, "Frame: Invalid (size=%zu, first=%c/%d).", payload.size(), payload[0], payload[0]);
+      ESP_LOGD(TAG, "Frame: Invalid (size=%zu, first=0x%02X).", payload.size(), payload[0]);
       continue;
     }
   }
 
+  // FIXME: Use roll-over safe arithmetic
   if (blank_at_ < millis()) {
     blank_all_leds_(it);
     blank_at_ = millis() + DEFAULT_BLANK_TIME;

From 62468198d617c1e16713617d96edcc45514888ae Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 25 Jul 2020 13:56:08 +0200
Subject: [PATCH 360/412] Clean up UART Improvements code (#1190)

---
 esphome/components/uart/uart.cpp         |  9 ++---
 esphome/components/uart/uart.h           | 16 +++------
 esphome/components/uart/uart_esp32.cpp   |  8 ++---
 esphome/components/uart/uart_esp8266.cpp | 46 +++++-------------------
 4 files changed, 22 insertions(+), 57 deletions(-)

diff --git a/esphome/components/uart/uart.cpp b/esphome/components/uart/uart.cpp
index cf2d00c929..1cfdb38a90 100644
--- a/esphome/components/uart/uart.cpp
+++ b/esphome/components/uart/uart.cpp
@@ -43,7 +43,8 @@ void UARTComponent::check_logger_conflict_() {
 #endif
 }
 
-void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits, UARTParityOptions parity, uint8_t nr_bits) {
+void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits, UARTParityOptions parity,
+                                     uint8_t data_bits) {
   if (this->parent_->baud_rate_ != baud_rate) {
     ESP_LOGE(TAG, "  Invalid baud_rate: Integration requested baud_rate %u but you have %u!", baud_rate,
              this->parent_->baud_rate_);
@@ -52,9 +53,9 @@ void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits, UART
     ESP_LOGE(TAG, "  Invalid stop bits: Integration requested stop_bits %u but you have %u!", stop_bits,
              this->parent_->stop_bits_);
   }
-  if (this->parent_->nr_bits_ != nr_bits) {
-    ESP_LOGE(TAG, "  Invalid number of data bits: Integration requested %u data bits but you have %u!", nr_bits,
-             this->parent_->nr_bits_);
+  if (this->parent_->data_bits_ != data_bits) {
+    ESP_LOGE(TAG, "  Invalid number of data bits: Integration requested %u data bits but you have %u!", data_bits,
+             this->parent_->data_bits_);
   }
   if (this->parent_->parity_ != parity) {
     ESP_LOGE(TAG, "  Invalid parity: Integration requested parity %s but you have %s!", parity_to_str(parity),
diff --git a/esphome/components/uart/uart.h b/esphome/components/uart/uart.h
index dedfdd74af..7430a4ee05 100644
--- a/esphome/components/uart/uart.h
+++ b/esphome/components/uart/uart.h
@@ -18,7 +18,7 @@ const char *parity_to_str(UARTParityOptions parity);
 #ifdef ARDUINO_ARCH_ESP8266
 class ESP8266SoftwareSerial {
  public:
-  void setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits, uint32_t nr_bits,
+  void setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits, uint32_t data_bits,
              UARTParityOptions parity, size_t rx_buffer_size);
 
   uint8_t read_byte();
@@ -30,8 +30,6 @@ class ESP8266SoftwareSerial {
 
   int available();
 
-  void begin();
-  void end();
   GPIOPin *gpio_tx_pin_{nullptr};
   GPIOPin *gpio_rx_pin_{nullptr};
 
@@ -48,7 +46,7 @@ class ESP8266SoftwareSerial {
   volatile size_t rx_in_pos_{0};
   size_t rx_out_pos_{0};
   uint8_t stop_bits_;
-  uint8_t nr_bits_;
+  uint8_t data_bits_;
   UARTParityOptions parity_;
   ISRInternalGPIOPin *tx_pin_{nullptr};
   ISRInternalGPIOPin *rx_pin_{nullptr};
@@ -71,8 +69,6 @@ class UARTComponent : public Component, public Stream {
   void write_array(const std::vector<uint8_t> &data) { this->write_array(&data[0], data.size()); }
 
   void write_str(const char *str);
-  void end();
-  void begin();
 
   bool peek_byte(uint8_t *data);
 
@@ -95,7 +91,7 @@ class UARTComponent : public Component, public Stream {
   void set_rx_pin(uint8_t rx_pin) { this->rx_pin_ = rx_pin; }
   void set_rx_buffer_size(size_t rx_buffer_size) { this->rx_buffer_size_ = rx_buffer_size; }
   void set_stop_bits(uint8_t stop_bits) { this->stop_bits_ = stop_bits; }
-  void set_data_bits(uint8_t nr_bits) { this->nr_bits_ = nr_bits; }
+  void set_data_bits(uint8_t data_bits) { this->data_bits_ = data_bits; }
   void set_parity(UARTParityOptions parity) { this->parity_ = parity; }
 
  protected:
@@ -112,7 +108,7 @@ class UARTComponent : public Component, public Stream {
   size_t rx_buffer_size_;
   uint32_t baud_rate_;
   uint8_t stop_bits_;
-  uint8_t nr_bits_;
+  uint8_t data_bits_;
   UARTParityOptions parity_;
 };
 
@@ -156,12 +152,10 @@ class UARTDevice : public Stream {
   size_t write(uint8_t data) override { return this->parent_->write(data); }
   int read() override { return this->parent_->read(); }
   int peek() override { return this->parent_->peek(); }
-  void end() { this->parent_->end(); }
-  void begin() { this->parent_->begin(); }
 
   /// Check that the configuration of the UART bus matches the provided values and otherwise print a warning
   void check_uart_settings(uint32_t baud_rate, uint8_t stop_bits = 1,
-                           UARTParityOptions parity = UART_CONFIG_PARITY_NONE, uint8_t nr_bits = 8);
+                           UARTParityOptions parity = UART_CONFIG_PARITY_NONE, uint8_t data_bits = 8);
 
  protected:
   UARTComponent *parent_{nullptr};
diff --git a/esphome/components/uart/uart_esp32.cpp b/esphome/components/uart/uart_esp32.cpp
index e18f9c5b1f..f7af85cf7b 100644
--- a/esphome/components/uart/uart_esp32.cpp
+++ b/esphome/components/uart/uart_esp32.cpp
@@ -43,7 +43,7 @@ uint32_t UARTComponent::get_config() {
   else if (this->parity_ == UART_CONFIG_PARITY_ODD)
     config |= UART_PARITY_ODD | UART_PARITY_EN;
 
-  switch (this->nr_bits_) {
+  switch (this->data_bits_) {
     case 5:
       config |= UART_NB_BIT_5;
       break;
@@ -94,7 +94,7 @@ void UARTComponent::dump_config() {
     ESP_LOGCONFIG(TAG, "  RX Buffer Size: %u", this->rx_buffer_size_);
   }
   ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
-  ESP_LOGCONFIG(TAG, "  Bits: %u", this->nr_bits_);
+  ESP_LOGCONFIG(TAG, "  Data Bits: %u", this->data_bits_);
   ESP_LOGCONFIG(TAG, "  Parity: %s", parity_to_str(this->parity_));
   ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
   this->check_logger_conflict_();
@@ -114,8 +114,6 @@ void UARTComponent::write_str(const char *str) {
   this->hw_serial_->write(str);
   ESP_LOGVV(TAG, "    Wrote \"%s\"", str);
 }
-void UARTComponent::end() { this->hw_serial_->end(); }
-void UARTComponent::begin() { this->hw_serial_->begin(this->baud_rate_, get_config()); }
 bool UARTComponent::read_byte(uint8_t *data) {
   if (!this->check_read_timeout_())
     return false;
@@ -161,4 +159,4 @@ void UARTComponent::flush() {
 
 }  // namespace uart
 }  // namespace esphome
-#endif  // ESP32
+#endif  // ARDUINO_ARCH_ESP32
diff --git a/esphome/components/uart/uart_esp8266.cpp b/esphome/components/uart/uart_esp8266.cpp
index 40975b6e5e..edb530f537 100644
--- a/esphome/components/uart/uart_esp8266.cpp
+++ b/esphome/components/uart/uart_esp8266.cpp
@@ -19,7 +19,7 @@ uint32_t UARTComponent::get_config() {
   else if (this->parity_ == UART_CONFIG_PARITY_ODD)
     config |= UART_PARITY_ODD;
 
-  switch (this->nr_bits_) {
+  switch (this->data_bits_) {
     case 5:
       config |= UART_NB_BIT_5;
       break;
@@ -66,7 +66,7 @@ void UARTComponent::setup() {
     this->sw_serial_ = new ESP8266SoftwareSerial();
     int8_t tx = this->tx_pin_.has_value() ? *this->tx_pin_ : -1;
     int8_t rx = this->rx_pin_.has_value() ? *this->rx_pin_ : -1;
-    this->sw_serial_->setup(tx, rx, this->baud_rate_, this->stop_bits_, this->nr_bits_, this->parity_,
+    this->sw_serial_->setup(tx, rx, this->baud_rate_, this->stop_bits_, this->data_bits_, this->parity_,
                             this->rx_buffer_size_);
   }
 }
@@ -81,7 +81,7 @@ void UARTComponent::dump_config() {
     ESP_LOGCONFIG(TAG, "  RX Buffer Size: %u", this->rx_buffer_size_);  // NOLINT
   }
   ESP_LOGCONFIG(TAG, "  Baud Rate: %u baud", this->baud_rate_);
-  ESP_LOGCONFIG(TAG, "  Bits: %u", this->nr_bits_);
+  ESP_LOGCONFIG(TAG, "  Data Bits: %u", this->data_bits_);
   ESP_LOGCONFIG(TAG, "  Parity: %s", parity_to_str(this->parity_));
   ESP_LOGCONFIG(TAG, "  Stop bits: %u", this->stop_bits_);
   if (this->hw_serial_ != nullptr) {
@@ -121,18 +121,6 @@ void UARTComponent::write_str(const char *str) {
   }
   ESP_LOGVV(TAG, "    Wrote \"%s\"", str);
 }
-void UARTComponent::end() {
-  if (this->hw_serial_ != nullptr)
-    this->hw_serial_->end();
-  else if (this->sw_serial_ != nullptr)
-    this->sw_serial_->end();
-}
-void UARTComponent::begin() {
-  if (this->hw_serial_ != nullptr)
-    this->hw_serial_->begin(this->baud_rate_, static_cast<SerialConfig>(get_config()));
-  else if (this->sw_serial_ != nullptr)
-    this->sw_serial_->begin();
-}
 bool UARTComponent::read_byte(uint8_t *data) {
   if (!this->check_read_timeout_())
     return false;
@@ -198,28 +186,12 @@ void UARTComponent::flush() {
     this->sw_serial_->flush();
   }
 }
-void ESP8266SoftwareSerial::end() {
-  /* Because of this bug: https://github.com/esp8266/Arduino/issues/6049
-   * detach_interrupt can't called.
-   * So simply reset rx_in_pos and rx_out_pos even if it's totally racy with
-   * the interrupt.
-   */
-  // this->gpio_rx_pin_->detach_interrupt();
-  this->rx_in_pos_ = 0;
-  this->rx_out_pos_ = 0;
-}
-void ESP8266SoftwareSerial::begin() {
-  /* attach_interrupt() is also not safe because gpio_intr() may
-   * endup with arg == nullptr.
-   */
-  // this->gpio_rx_pin_->attach_interrupt(ESP8266SoftwareSerial::gpio_intr, this, FALLING);
-}
-void ESP8266SoftwareSerial::setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits, uint32_t nr_bits,
-                                  UARTParityOptions parity, size_t rx_buffer_size) {
+void ESP8266SoftwareSerial::setup(int8_t tx_pin, int8_t rx_pin, uint32_t baud_rate, uint8_t stop_bits,
+                                  uint32_t data_bits, UARTParityOptions parity, size_t rx_buffer_size) {
   this->bit_time_ = F_CPU / baud_rate;
   this->rx_buffer_size_ = rx_buffer_size;
   this->stop_bits_ = stop_bits;
-  this->nr_bits_ = nr_bits;
+  this->data_bits_ = data_bits;
   this->parity_ = parity;
   if (tx_pin != -1) {
     auto pin = GPIOPin(tx_pin, OUTPUT);
@@ -242,7 +214,7 @@ void ICACHE_RAM_ATTR ESP8266SoftwareSerial::gpio_intr(ESP8266SoftwareSerial *arg
   const uint32_t start = ESP.getCycleCount();
   uint8_t rec = 0;
   // Manually unroll the loop
-  for (int i = 0; i < arg->nr_bits_; i++)
+  for (int i = 0; i < arg->data_bits_; i++)
     rec |= arg->read_bit_(&wait, start) << i;
 
   /* If parity is enabled, just read it and ignore it. */
@@ -282,7 +254,7 @@ void ICACHE_RAM_ATTR HOT ESP8266SoftwareSerial::write_byte(uint8_t data) {
     const uint32_t start = ESP.getCycleCount();
     // Start bit
     this->write_bit_(false, &wait, start);
-    for (int i = 0; i < this->nr_bits_; i++) {
+    for (int i = 0; i < this->data_bits_; i++) {
       bool bit = data & (1 << i);
       this->write_bit_(bit, &wait, start);
       if (need_parity_bit)
@@ -333,4 +305,4 @@ int ESP8266SoftwareSerial::available() {
 
 }  // namespace uart
 }  // namespace esphome
-#endif  // ESP8266
+#endif  // ARDUINO_ARCH_ESP8266

From 275c12150e980d267670354251b46b71963ce4c3 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 25 Jul 2020 14:05:31 +0200
Subject: [PATCH 361/412] Partially revert make SPI CS pin optional (#1187)

---
 esphome/components/as3935_spi/__init__.py  |  2 +-
 esphome/components/max7219digit/display.py |  2 +-
 esphome/components/mcp3008/__init__.py     |  2 +-
 esphome/components/pn532/pn532.cpp         |  3 +--
 esphome/components/spi/__init__.py         |  6 +++---
 esphome/components/spi/spi.h               | 20 +++++++++++---------
 esphome/components/ssd1325_spi/display.py  |  2 +-
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/esphome/components/as3935_spi/__init__.py b/esphome/components/as3935_spi/__init__.py
index da5582c531..30c2240c27 100644
--- a/esphome/components/as3935_spi/__init__.py
+++ b/esphome/components/as3935_spi/__init__.py
@@ -11,7 +11,7 @@ SPIAS3935 = as3935_spi_ns.class_('SPIAS3935Component', as3935.AS3935, spi.SPIDev
 
 CONFIG_SCHEMA = cv.All(as3935.AS3935_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(SPIAS3935),
-}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema(CS_PIN_required=True)))
+}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema(cs_pin_required=True)))
 
 
 def to_code(config):
diff --git a/esphome/components/max7219digit/display.py b/esphome/components/max7219digit/display.py
index 5bba71148c..eb6d112a64 100644
--- a/esphome/components/max7219digit/display.py
+++ b/esphome/components/max7219digit/display.py
@@ -39,7 +39,7 @@ CONFIG_SCHEMA = display.BASIC_DISPLAY_SCHEMA.extend({
     cv.Optional(CONF_SCROLL_SPEED, default='250ms'): cv.positive_time_period_milliseconds,
     cv.Optional(CONF_SCROLL_DELAY, default='1000ms'): cv.positive_time_period_milliseconds,
     cv.Optional(CONF_SCROLL_DWELL, default='1000ms'): cv.positive_time_period_milliseconds,
-}).extend(cv.polling_component_schema('500ms')).extend(spi.spi_device_schema(CS_PIN_required=True))
+}).extend(cv.polling_component_schema('500ms')).extend(spi.spi_device_schema(cs_pin_required=True))
 
 
 def to_code(config):
diff --git a/esphome/components/mcp3008/__init__.py b/esphome/components/mcp3008/__init__.py
index 2196b96a92..acacc96159 100644
--- a/esphome/components/mcp3008/__init__.py
+++ b/esphome/components/mcp3008/__init__.py
@@ -14,7 +14,7 @@ MCP3008 = mcp3008_ns.class_('MCP3008', cg.Component, spi.SPIDevice)
 
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(MCP3008),
-}).extend(spi.spi_device_schema(CS_PIN_required=True))
+}).extend(spi.spi_device_schema(cs_pin_required=True))
 
 
 def to_code(config):
diff --git a/esphome/components/pn532/pn532.cpp b/esphome/components/pn532/pn532.cpp
index 36677bc729..792d92a6ac 100644
--- a/esphome/components/pn532/pn532.cpp
+++ b/esphome/components/pn532/pn532.cpp
@@ -31,8 +31,7 @@ void PN532::setup() {
   //    (this may time out, but that's ok)
   // 3. Send SAM config command with normal mode without waiting for ready bit (IRQ not initialized yet)
   // 4. Probably optional, send SAM config again, this time checking ACK and return value
-  if (this->cs_)
-    this->cs_->digital_write(false);
+  this->cs_->digital_write(false);
   delay(10);
 
   // send dummy firmware version command to get synced up
diff --git a/esphome/components/spi/__init__.py b/esphome/components/spi/__init__.py
index 6ced4bc80f..71dac0f8c9 100644
--- a/esphome/components/spi/__init__.py
+++ b/esphome/components/spi/__init__.py
@@ -34,15 +34,15 @@ def to_code(config):
         cg.add(var.set_mosi(mosi))
 
 
-def spi_device_schema(CS_PIN_required=False):
+def spi_device_schema(cs_pin_required=True):
     """Create a schema for an SPI device.
-    :param CS_PIN_required: If true, make the CS_PIN required in the config.
+    :param cs_pin_required: If true, make the CS_PIN required in the config.
     :return: The SPI device schema, `extend` this in your config schema.
     """
     schema = {
         cv.GenerateID(CONF_SPI_ID): cv.use_id(SPIComponent),
     }
-    if CS_PIN_required:
+    if cs_pin_required:
         schema[cv.Required(CONF_CS_PIN)] = pins.gpio_output_pin_schema
     else:
         schema[cv.Optional(CONF_CS_PIN)] = pins.gpio_output_pin_schema
diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index ea0595c641..ba726f8052 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -127,18 +127,20 @@ class SPIComponent : public Component {
 
   template<SPIBitOrder BIT_ORDER, SPIClockPolarity CLOCK_POLARITY, SPIClockPhase CLOCK_PHASE, uint32_t DATA_RATE>
   void enable(GPIOPin *cs) {
-    if (cs) {
+    if (cs != nullptr) {
       SPIComponent::debug_enable(cs->get_pin());
+    }
 
-      if (this->hw_spi_ != nullptr) {
-        uint8_t data_mode = (uint8_t(CLOCK_POLARITY) << 1) | uint8_t(CLOCK_PHASE);
-        SPISettings settings(DATA_RATE, BIT_ORDER, data_mode);
-        this->hw_spi_->beginTransaction(settings);
-      } else {
-        this->clk_->digital_write(CLOCK_POLARITY);
-        this->wait_cycle_ = uint32_t(F_CPU) / DATA_RATE / 2ULL;
-      }
+    if (this->hw_spi_ != nullptr) {
+      uint8_t data_mode = (uint8_t(CLOCK_POLARITY) << 1) | uint8_t(CLOCK_PHASE);
+      SPISettings settings(DATA_RATE, BIT_ORDER, data_mode);
+      this->hw_spi_->beginTransaction(settings);
+    } else {
+      this->clk_->digital_write(CLOCK_POLARITY);
+      this->wait_cycle_ = uint32_t(F_CPU) / DATA_RATE / 2ULL;
+    }
 
+    if (cs != nullptr) {
       this->active_cs_ = cs;
       this->active_cs_->digital_write(false);
     }
diff --git a/esphome/components/ssd1325_spi/display.py b/esphome/components/ssd1325_spi/display.py
index ed61d3dec3..2d8e91c3df 100644
--- a/esphome/components/ssd1325_spi/display.py
+++ b/esphome/components/ssd1325_spi/display.py
@@ -13,7 +13,7 @@ SPISSD1325 = ssd1325_spi.class_('SPISSD1325', ssd1325_base.SSD1325, spi.SPIDevic
 CONFIG_SCHEMA = cv.All(ssd1325_base.SSD1325_SCHEMA.extend({
     cv.GenerateID(): cv.declare_id(SPISSD1325),
     cv.Required(CONF_DC_PIN): pins.gpio_output_pin_schema,
-}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema()),
+}).extend(cv.COMPONENT_SCHEMA).extend(spi.spi_device_schema(cs_pin_required=False)),
                        cv.has_at_most_one_key(CONF_PAGES, CONF_LAMBDA))
 
 

From 32efa5d83ee03b1c2bad7fee7267f1253007c31f Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 25 Jul 2020 14:20:51 +0200
Subject: [PATCH 362/412] New script modes POC (#1168)

Co-authored-by: Guillermo Ruffino <glm.net@gmail.com>
---
 .../bang_bang/bang_bang_climate.cpp           |  2 +-
 esphome/components/endstop/endstop_cover.cpp  |  2 +-
 esphome/components/light/base_light_effects.h |  4 +-
 esphome/components/script/__init__.py         | 52 ++++++++++++-
 esphome/components/script/script.cpp          | 67 ++++++++++++++++
 esphome/components/script/script.h            | 77 ++++++++++++++++---
 .../template/cover/template_cover.cpp         |  2 +-
 .../template/switch/template_switch.cpp       |  2 +-
 .../thermostat/thermostat_climate.cpp         |  8 +-
 .../time_based/time_based_cover.cpp           |  2 +-
 esphome/config_validation.py                  |  4 +-
 esphome/core/automation.h                     | 31 +++++++-
 12 files changed, 226 insertions(+), 27 deletions(-)
 create mode 100644 esphome/components/script/script.cpp

diff --git a/esphome/components/bang_bang/bang_bang_climate.cpp b/esphome/components/bang_bang/bang_bang_climate.cpp
index cf527988fe..45d5174390 100644
--- a/esphome/components/bang_bang/bang_bang_climate.cpp
+++ b/esphome/components/bang_bang/bang_bang_climate.cpp
@@ -108,7 +108,7 @@ void BangBangClimate::switch_to_action_(climate::ClimateAction action) {
   }
 
   if (this->prev_trigger_ != nullptr) {
-    this->prev_trigger_->stop();
+    this->prev_trigger_->stop_action();
     this->prev_trigger_ = nullptr;
   }
   Trigger<> *trig;
diff --git a/esphome/components/endstop/endstop_cover.cpp b/esphome/components/endstop/endstop_cover.cpp
index 1c239226c1..8e20cb6a29 100644
--- a/esphome/components/endstop/endstop_cover.cpp
+++ b/esphome/components/endstop/endstop_cover.cpp
@@ -94,7 +94,7 @@ void EndstopCover::dump_config() {
 float EndstopCover::get_setup_priority() const { return setup_priority::DATA; }
 void EndstopCover::stop_prev_trigger_() {
   if (this->prev_command_trigger_ != nullptr) {
-    this->prev_command_trigger_->stop();
+    this->prev_command_trigger_->stop_action();
     this->prev_command_trigger_ = nullptr;
   }
 }
diff --git a/esphome/components/light/base_light_effects.h b/esphome/components/light/base_light_effects.h
index dcef60397d..d6d930e9d4 100644
--- a/esphome/components/light/base_light_effects.h
+++ b/esphome/components/light/base_light_effects.h
@@ -67,9 +67,9 @@ class LambdaLightEffect : public LightEffect {
 class AutomationLightEffect : public LightEffect {
  public:
   AutomationLightEffect(const std::string &name) : LightEffect(name) {}
-  void stop() override { this->trig_->stop(); }
+  void stop() override { this->trig_->stop_action(); }
   void apply() override {
-    if (!this->trig_->is_running()) {
+    if (!this->trig_->is_action_running()) {
       this->trig_->trigger();
     }
   }
diff --git a/esphome/components/script/__init__.py b/esphome/components/script/__init__.py
index 5075bb1f56..eb337d7681 100644
--- a/esphome/components/script/__init__.py
+++ b/esphome/components/script/__init__.py
@@ -2,7 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.automation import maybe_simple_id
-from esphome.const import CONF_ID
+from esphome.const import CONF_ID, CONF_MODE
 
 script_ns = cg.esphome_ns.namespace('script')
 Script = script_ns.class_('Script', automation.Trigger.template())
@@ -10,10 +10,47 @@ ScriptExecuteAction = script_ns.class_('ScriptExecuteAction', automation.Action)
 ScriptStopAction = script_ns.class_('ScriptStopAction', automation.Action)
 ScriptWaitAction = script_ns.class_('ScriptWaitAction', automation.Action, cg.Component)
 IsRunningCondition = script_ns.class_('IsRunningCondition', automation.Condition)
+SingleScript = script_ns.class_('SingleScript', Script)
+RestartScript = script_ns.class_('RestartScript', Script)
+QueueingScript = script_ns.class_('QueueingScript', Script, cg.Component)
+ParallelScript = script_ns.class_('ParallelScript', Script)
+
+CONF_SINGLE = 'single'
+CONF_RESTART = 'restart'
+CONF_QUEUE = 'queue'
+CONF_PARALLEL = 'parallel'
+CONF_MAX_RUNS = 'max_runs'
+
+SCRIPT_MODES = {
+    CONF_SINGLE: SingleScript,
+    CONF_RESTART: RestartScript,
+    CONF_QUEUE: QueueingScript,
+    CONF_PARALLEL: ParallelScript,
+}
+
+
+def check_max_runs(value):
+    if CONF_MAX_RUNS not in value:
+        return value
+    if value[CONF_MODE] not in [CONF_QUEUE, CONF_PARALLEL]:
+        raise cv.Invalid("The option 'max_runs' is only valid in 'queue' and 'parallel' mode.",
+                         path=[CONF_MAX_RUNS])
+    return value
+
+
+def assign_declare_id(value):
+    value = value.copy()
+    value[CONF_ID] = cv.declare_id(SCRIPT_MODES[value[CONF_MODE]])(value[CONF_ID])
+    return value
+
 
 CONFIG_SCHEMA = automation.validate_automation({
-    cv.Required(CONF_ID): cv.declare_id(Script),
-})
+    # Don't declare id as cv.declare_id yet, because the ID type
+    # dpeends on the mode. Will be checked later with assign_declare_id
+    cv.Required(CONF_ID): cv.string_strict,
+    cv.Optional(CONF_MODE, default=CONF_SINGLE): cv.one_of(*SCRIPT_MODES, lower=True),
+    cv.Optional(CONF_MAX_RUNS): cv.positive_int,
+}, extra_validators=cv.All(check_max_runs, assign_declare_id))
 
 
 def to_code(config):
@@ -21,6 +58,15 @@ def to_code(config):
     triggers = []
     for conf in config:
         trigger = cg.new_Pvariable(conf[CONF_ID])
+        # Add a human-readable name to the script
+        cg.add(trigger.set_name(conf[CONF_ID].id))
+
+        if CONF_MAX_RUNS in conf:
+            cg.add(trigger.set_max_runs(conf[CONF_MAX_RUNS]))
+
+        if conf[CONF_MODE] == CONF_QUEUE:
+            yield cg.register_component(trigger, conf)
+
         triggers.append((trigger, conf))
 
     for trigger, conf in triggers:
diff --git a/esphome/components/script/script.cpp b/esphome/components/script/script.cpp
new file mode 100644
index 0000000000..f4441b7dcd
--- /dev/null
+++ b/esphome/components/script/script.cpp
@@ -0,0 +1,67 @@
+#include "script.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace script {
+
+static const char *TAG = "script";
+
+void SingleScript::execute() {
+  if (this->is_action_running()) {
+    ESP_LOGW(TAG, "Script '%s' is already running! (mode: single)", this->name_.c_str());
+    return;
+  }
+
+  this->trigger();
+}
+
+void RestartScript::execute() {
+  if (this->is_action_running()) {
+    ESP_LOGD(TAG, "Script '%s' restarting (mode: restart)", this->name_.c_str());
+    this->stop_action();
+  }
+
+  this->trigger();
+}
+
+void QueueingScript::execute() {
+  if (this->is_action_running()) {
+    // num_runs_ is the number of *queued* instances, so total number of instances is
+    // num_runs_ + 1
+    if (this->max_runs_ != 0 && this->num_runs_ + 1 >= this->max_runs_) {
+      ESP_LOGW(TAG, "Script '%s' maximum number of queued runs exceeded!", this->name_.c_str());
+      return;
+    }
+
+    ESP_LOGD(TAG, "Script '%s' queueing new instance (mode: queue)", this->name_.c_str());
+    this->num_runs_++;
+    return;
+  }
+
+  this->trigger();
+  // Check if the trigger was immediate and we can continue right away.
+  this->loop();
+}
+
+void QueueingScript::stop() {
+  this->num_runs_ = 0;
+  Script::stop();
+}
+
+void QueueingScript::loop() {
+  if (this->num_runs_ != 0 && !this->is_action_running()) {
+    this->num_runs_--;
+    this->trigger();
+  }
+}
+
+void ParallelScript::execute() {
+  if (this->max_runs_ != 0 && this->automation_parent_->num_running() >= this->max_runs_) {
+    ESP_LOGW(TAG, "Script '%s' maximum number of parallel runs exceeded!", this->name_.c_str());
+    return;
+  }
+  this->trigger();
+}
+
+}  // namespace script
+}  // namespace esphome
diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index 8495014f00..64db6b80e7 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -1,29 +1,86 @@
 #pragma once
 
 #include "esphome/core/automation.h"
+#include "esphome/core/component.h"
 
 namespace esphome {
 namespace script {
 
+/// The abstract base class for all script types.
 class Script : public Trigger<> {
  public:
-  void execute() {
-    bool prev = this->in_stack_;
-    this->in_stack_ = true;
-    this->trigger();
-    this->in_stack_ = prev;
-  }
-  bool script_is_running() { return this->in_stack_ || this->is_running(); }
+  /** Execute a new instance of this script.
+   *
+   * The behavior of this function when a script is already running is defined by the subtypes
+   */
+  virtual void execute() = 0;
+  /// Check if any instance of this script is currently running.
+  virtual bool is_running() { return this->is_action_running(); }
+  /// Stop all instances of this script.
+  virtual void stop() { this->stop_action(); }
+
+  // Internal function to give scripts readable names.
+  void set_name(const std::string &name) { name_ = name; }
 
  protected:
-  bool in_stack_{false};
+  std::string name_;
+};
+
+/** A script type for which only a single instance at a time is allowed.
+ *
+ * If a new instance is executed while the previous one hasn't finished yet,
+ * a warning is printed and the new instance is discarded.
+ */
+class SingleScript : public Script {
+ public:
+  void execute() override;
+};
+
+/** A script type that restarts scripts from the beginning when a new instance is started.
+ *
+ * If a new instance is started but another one is already running, the existing
+ * script is stopped and the new instance starts from the beginning.
+ */
+class RestartScript : public Script {
+ public:
+  void execute() override;
+};
+
+/** A script type that queues new instances that are created.
+ *
+ * Only one instance of the script can be active at a time.
+ */
+class QueueingScript : public Script, public Component {
+ public:
+  void execute() override;
+  void stop() override;
+  void loop() override;
+  void set_max_runs(int max_runs) { max_runs_ = max_runs; }
+
+ protected:
+  int num_runs_ = 0;
+  int max_runs_ = 0;
+};
+
+/** A script type that executes new instances in parallel.
+ *
+ * If a new instance is started while previous ones haven't finished yet,
+ * the new one is exeucted in parallel to the other instances.
+ */
+class ParallelScript : public Script {
+ public:
+  void execute() override;
+  void set_max_runs(int max_runs) { max_runs_ = max_runs; }
+
+ protected:
+  int max_runs_ = 0;
 };
 
 template<typename... Ts> class ScriptExecuteAction : public Action<Ts...> {
  public:
   ScriptExecuteAction(Script *script) : script_(script) {}
 
-  void play(Ts... x) override { this->script_->trigger(); }
+  void play(Ts... x) override { this->script_->execute(); }
 
  protected:
   Script *script_;
@@ -43,7 +100,7 @@ template<typename... Ts> class IsRunningCondition : public Condition<Ts...> {
  public:
   explicit IsRunningCondition(Script *parent) : parent_(parent) {}
 
-  bool check(Ts... x) override { return this->parent_->script_is_running(); }
+  bool check(Ts... x) override { return this->parent_->is_running(); }
 
  protected:
   Script *parent_;
diff --git a/esphome/components/template/cover/template_cover.cpp b/esphome/components/template/cover/template_cover.cpp
index 887f282007..147f76af7d 100644
--- a/esphome/components/template/cover/template_cover.cpp
+++ b/esphome/components/template/cover/template_cover.cpp
@@ -120,7 +120,7 @@ void TemplateCover::set_has_position(bool has_position) { this->has_position_ =
 void TemplateCover::set_has_tilt(bool has_tilt) { this->has_tilt_ = has_tilt; }
 void TemplateCover::stop_prev_trigger_() {
   if (this->prev_command_trigger_ != nullptr) {
-    this->prev_command_trigger_->stop();
+    this->prev_command_trigger_->stop_action();
     this->prev_command_trigger_ = nullptr;
   }
 }
diff --git a/esphome/components/template/switch/template_switch.cpp b/esphome/components/template/switch/template_switch.cpp
index 5868b30996..d9f95e203c 100644
--- a/esphome/components/template/switch/template_switch.cpp
+++ b/esphome/components/template/switch/template_switch.cpp
@@ -19,7 +19,7 @@ void TemplateSwitch::loop() {
 }
 void TemplateSwitch::write_state(bool state) {
   if (this->prev_trigger_ != nullptr) {
-    this->prev_trigger_->stop();
+    this->prev_trigger_->stop_action();
   }
 
   if (state) {
diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index 5d97156e2f..1ffbd3c169 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -223,7 +223,7 @@ void ThermostatClimate::switch_to_action_(climate::ClimateAction action) {
   }
 
   if (this->prev_action_trigger_ != nullptr) {
-    this->prev_action_trigger_->stop();
+    this->prev_action_trigger_->stop_action();
     this->prev_action_trigger_ = nullptr;
   }
   Trigger<> *trig = this->idle_action_trigger_;
@@ -262,7 +262,7 @@ void ThermostatClimate::switch_to_fan_mode_(climate::ClimateFanMode fan_mode) {
     return;
 
   if (this->prev_fan_mode_trigger_ != nullptr) {
-    this->prev_fan_mode_trigger_->stop();
+    this->prev_fan_mode_trigger_->stop_action();
     this->prev_fan_mode_trigger_ = nullptr;
   }
   Trigger<> *trig = this->fan_mode_auto_trigger_;
@@ -313,7 +313,7 @@ void ThermostatClimate::switch_to_mode_(climate::ClimateMode mode) {
     return;
 
   if (this->prev_mode_trigger_ != nullptr) {
-    this->prev_mode_trigger_->stop();
+    this->prev_mode_trigger_->stop_action();
     this->prev_mode_trigger_ = nullptr;
   }
   Trigger<> *trig = this->auto_mode_trigger_;
@@ -355,7 +355,7 @@ void ThermostatClimate::switch_to_swing_mode_(climate::ClimateSwingMode swing_mo
     return;
 
   if (this->prev_swing_mode_trigger_ != nullptr) {
-    this->prev_swing_mode_trigger_->stop();
+    this->prev_swing_mode_trigger_->stop_action();
     this->prev_swing_mode_trigger_ = nullptr;
   }
   Trigger<> *trig = this->swing_mode_off_trigger_;
diff --git a/esphome/components/time_based/time_based_cover.cpp b/esphome/components/time_based/time_based_cover.cpp
index 6d1de144f5..1aa3c2471a 100644
--- a/esphome/components/time_based/time_based_cover.cpp
+++ b/esphome/components/time_based/time_based_cover.cpp
@@ -78,7 +78,7 @@ void TimeBasedCover::control(const CoverCall &call) {
 }
 void TimeBasedCover::stop_prev_trigger_() {
   if (this->prev_command_trigger_ != nullptr) {
-    this->prev_command_trigger_->stop();
+    this->prev_command_trigger_->stop_action();
     this->prev_command_trigger_ = nullptr;
   }
 }
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 0649e15f5f..c6ce33dd23 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -812,6 +812,7 @@ def mqtt_qos(value):
 def requires_component(comp):
     """Validate that this option can only be specified when the component `comp` is loaded."""
     def validator(value):
+        # pylint: disable=unsupported-membership-test
         if comp not in CORE.raw_config:
             raise Invalid(f"This option requires component {comp}")
         return value
@@ -1125,7 +1126,7 @@ def typed_schema(schemas, **kwargs):
     def validator(value):
         if not isinstance(value, dict):
             raise Invalid("Value must be dict")
-        if CONF_TYPE not in value:
+        if key not in value:
             raise Invalid("type not specified!")
         value = value.copy()
         key_v = key_validator(value.pop(key))
@@ -1175,6 +1176,7 @@ class OnlyWith(Optional):
 
     @property
     def default(self):
+        # pylint: disable=unsupported-membership-test
         if self._component not in CORE.raw_config:
             return vol.UNDEFINED
         return self._default
diff --git a/esphome/core/automation.h b/esphome/core/automation.h
index 02bd8bb299..6d79480f0f 100644
--- a/esphome/core/automation.h
+++ b/esphome/core/automation.h
@@ -50,18 +50,22 @@ template<typename... Ts> class Automation;
 
 template<typename... Ts> class Trigger {
  public:
+  /// Inform the parent automation that the event has triggered.
   void trigger(Ts... x) {
     if (this->automation_parent_ == nullptr)
       return;
     this->automation_parent_->trigger(x...);
   }
   void set_automation_parent(Automation<Ts...> *automation_parent) { this->automation_parent_ = automation_parent; }
-  void stop() {
+
+  /// Stop any action connected to this trigger.
+  void stop_action() {
     if (this->automation_parent_ == nullptr)
       return;
     this->automation_parent_->stop();
   }
-  bool is_running() {
+  /// Returns true if any action connected to this trigger is running.
+  bool is_action_running() {
     if (this->automation_parent_ == nullptr)
       return false;
     return this->automation_parent_->is_running();
@@ -87,8 +91,18 @@ template<typename... Ts> class Action {
     }
     this->stop_next_();
   }
+  /// Check if this or any of the following actions are currently running.
   virtual bool is_running() { return this->num_running_ > 0 || this->is_running_next_(); }
 
+  /// The total number of actions that are currently running in this plus any of
+  /// the following actions in the chain.
+  int num_running_total() {
+    int total = this->num_running_;
+    if (this->next_ != nullptr)
+      total += this->next_->num_running_total();
+    return total;
+  }
+
  protected:
   friend ActionList<Ts...>;
 
@@ -123,6 +137,8 @@ template<typename... Ts> class Action {
 
   Action<Ts...> *next_ = nullptr;
 
+  /// The number of instances of this sequence in the list of actions
+  /// that is currently being executed.
   int num_running_{0};
 };
 
@@ -151,11 +167,19 @@ template<typename... Ts> class ActionList {
       this->actions_begin_->stop_complex();
   }
   bool empty() const { return this->actions_begin_ == nullptr; }
+
+  /// Check if any action in this action list is currently running.
   bool is_running() {
     if (this->actions_begin_ == nullptr)
       return false;
     return this->actions_begin_->is_running();
   }
+  /// Return the number of actions in this action list that are currently running.
+  int num_running() {
+    if (this->actions_begin_ == nullptr)
+      return false;
+    return this->actions_begin_->num_running_total();
+  }
 
  protected:
   template<int... S> void play_tuple_(const std::tuple<Ts...> &tuple, seq<S...>) { this->play(std::get<S>(tuple)...); }
@@ -177,6 +201,9 @@ template<typename... Ts> class Automation {
 
   bool is_running() { return this->actions_.is_running(); }
 
+  /// Return the number of actions in the action part of this automation that are currently running.
+  int num_running() { return this->actions_.num_running(); }
+
  protected:
   Trigger<Ts...> *trigger_;
   ActionList<Ts...> actions_;

From 55388724af7dfc71ebafb49472673e91fe606cd5 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 25 Jul 2020 14:21:56 +0200
Subject: [PATCH 363/412] Revert "Sort keys in dicts in output yaml for
 'config' command (#1049)" (#1191)

---
 esphome/config_validation.py | 16 +++-------------
 esphome/core.py              |  3 ---
 esphome/voluptuous_schema.py |  3 ++-
 esphome/yaml_util.py         |  2 +-
 pylintrc                     |  3 +++
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index c6ce33dd23..1e54c04fe5 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -186,6 +186,7 @@ def ensure_list(*validators):
     None and empty dictionaries are converted to empty lists.
     """
     user = All(*validators)
+    list_schema = Schema([user])
 
     def validator(value):
         check_not_templatable(value)
@@ -193,19 +194,7 @@ def ensure_list(*validators):
             return []
         if not isinstance(value, list):
             return [user(value)]
-        ret = []
-        errs = []
-        for i, val in enumerate(value):
-            try:
-                with prepend_path([i]):
-                    ret.append(user(val))
-            except MultipleInvalid as err:
-                errs.extend(err.errors)
-            except Invalid as err:
-                errs.append(err)
-        if errs:
-            raise MultipleInvalid(errs)
-        return ret
+        return list_schema(value)
 
     return validator
 
@@ -811,6 +800,7 @@ def mqtt_qos(value):
 
 def requires_component(comp):
     """Validate that this option can only be specified when the component `comp` is loaded."""
+    # pylint: disable=unsupported-membership-test
     def validator(value):
         # pylint: disable=unsupported-membership-test
         if comp not in CORE.raw_config:
diff --git a/esphome/core.py b/esphome/core.py
index 9b0b8cefa3..0065b750c4 100644
--- a/esphome/core.py
+++ b/esphome/core.py
@@ -553,7 +553,6 @@ class EsphomeCore:
         if self.config is None:
             raise ValueError("Config has not been loaded yet")
 
-        # pylint: disable=unsupported-membership-test,unsubscriptable-object
         if 'wifi' in self.config:
             return self.config[CONF_WIFI][CONF_USE_ADDRESS]
 
@@ -567,7 +566,6 @@ class EsphomeCore:
         if self.config is None:
             raise ValueError("Config has not been loaded yet")
 
-        # pylint: disable=unsubscriptable-object
         if CONF_COMMENT in self.config[CONF_ESPHOME]:
             return self.config[CONF_ESPHOME][CONF_COMMENT]
 
@@ -584,7 +582,6 @@ class EsphomeCore:
         if self.config is None:
             raise ValueError("Config has not been loaded yet")
 
-        # pylint: disable=unsubscriptable-object
         return self.config[CONF_ESPHOME][CONF_ARDUINO_VERSION]
 
     @property
diff --git a/esphome/voluptuous_schema.py b/esphome/voluptuous_schema.py
index c30447a427..ce13f0ceb0 100644
--- a/esphome/voluptuous_schema.py
+++ b/esphome/voluptuous_schema.py
@@ -52,7 +52,8 @@ class _Schema(vol.Schema):
         all_required_keys = {key for key in schema if isinstance(key, vol.Required)}
 
         # Keys that may have defaults
-        all_default_keys = {key for key in schema if isinstance(key, vol.Optional)}
+        # This is a list because sets do not guarantee insertion order
+        all_default_keys = [key for key in schema if isinstance(key, vol.Optional)]
 
         # Recursively compile schema
         _compiled_schema = {}
diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index 1758e739db..053fba6274 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -338,7 +338,7 @@ class ESPHomeDumper(yaml.SafeDumper):  # pylint: disable=too-many-ancestors
             self.represented_objects[self.alias_key] = node
         best_style = True
         if hasattr(mapping, 'items'):
-            mapping = sorted(mapping.items(), key=lambda item: item[0])
+            mapping = list(mapping.items())
         for item_key, item_value in mapping:
             node_key = self.represent_data(item_key)
             node_value = self.represent_data(item_value)
diff --git a/pylintrc b/pylintrc
index c65a9a7cd9..00ffdc9f9a 100644
--- a/pylintrc
+++ b/pylintrc
@@ -25,3 +25,6 @@ disable=
   stop-iteration-return,
   no-self-use,
   import-outside-toplevel,
+  # Broken
+  unsupported-membership-test,
+  unsubscriptable-object,

From 0fc8e8d483bb4df1c0e1ca3b77d318476b5a6b99 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 25 Jul 2020 14:22:56 +0200
Subject: [PATCH 364/412] Fix SN74HC595 doesn't use ESPHome HAL and add lint
 checks for it (#1188)

---
 esphome/components/adc/adc_sensor.cpp         |  4 +-
 .../components/max7219digit/max7219digit.cpp  | 31 +++++-----
 esphome/components/mcp3008/mcp3008.cpp        |  8 +--
 esphome/components/sn74hc595/sn74hc595.cpp    | 35 ++++++-----
 esphome/components/sx1509/sx1509.cpp          |  2 +-
 .../ultrasonic/ultrasonic_sensor.cpp          |  3 +-
 script/ci-custom.py                           | 59 ++++++++++++++++++-
 7 files changed, 105 insertions(+), 37 deletions(-)

diff --git a/esphome/components/adc/adc_sensor.cpp b/esphome/components/adc/adc_sensor.cpp
index 2c448d0392..9b1f452131 100644
--- a/esphome/components/adc/adc_sensor.cpp
+++ b/esphome/components/adc/adc_sensor.cpp
@@ -58,7 +58,7 @@ void ADCSensor::update() {
 }
 float ADCSensor::sample() {
 #ifdef ARDUINO_ARCH_ESP32
-  float value_v = analogRead(this->pin_) / 4095.0f;
+  float value_v = analogRead(this->pin_) / 4095.0f;  // NOLINT
   switch (this->attenuation_) {
     case ADC_0db:
       value_v *= 1.1;
@@ -80,7 +80,7 @@ float ADCSensor::sample() {
 #ifdef USE_ADC_SENSOR_VCC
   return ESP.getVcc() / 1024.0f;
 #else
-  return analogRead(this->pin_) / 1024.0f;
+  return analogRead(this->pin_) / 1024.0f;  // NOLINT
 #endif
 #endif
 }
diff --git a/esphome/components/max7219digit/max7219digit.cpp b/esphome/components/max7219digit/max7219digit.cpp
index dff1d27370..ab9be4ad36 100644
--- a/esphome/components/max7219digit/max7219digit.cpp
+++ b/esphome/components/max7219digit/max7219digit.cpp
@@ -101,7 +101,7 @@ void MAX7219Component::loop() {
 }
 
 void MAX7219Component::display() {
-  byte pixels[8];
+  uint8_t pixels[8];
   // Run this loop for every MAX CHIP (GRID OF 64 leds)
   // Run this routine for the rows of every chip 8x row 0 top to 7 bottom
   // Fill the pixel parameter with diplay data
@@ -205,29 +205,32 @@ void MAX7219Component::scroll_left() {
   this->stepsleft_++;
 }
 
-void MAX7219Component::send_char(byte chip, byte data) {
+void MAX7219Component::send_char(uint8_t chip, uint8_t data) {
   // get this character from PROGMEM
-  for (byte i = 0; i < 8; i++)
+  for (uint8_t i = 0; i < 8; i++)
     this->max_displaybuffer_[chip * 8 + i] = pgm_read_byte(&MAX7219_DOT_MATRIX_FONT[data][i]);
 }  // end of send_char
 
 // send one character (data) to position (chip)
 
-void MAX7219Component::send64pixels(byte chip, const byte pixels[8]) {
-  for (byte col = 0; col < 8; col++) {  // RUN THIS LOOP 8 times until column is 7
-    this->enable();                     // start sending by enabling SPI
-    for (byte i = 0; i < chip; i++)     // send extra NOPs to push the pixels out to extra displays
+void MAX7219Component::send64pixels(uint8_t chip, const uint8_t pixels[8]) {
+  for (uint8_t col = 0; col < 8; col++) {  // RUN THIS LOOP 8 times until column is 7
+    this->enable();                        // start sending by enabling SPI
+    for (uint8_t i = 0; i < chip; i++)     // send extra NOPs to push the pixels out to extra displays
       this->send_byte_(MAX7219_REGISTER_NOOP,
                        MAX7219_REGISTER_NOOP);  // run this loop unit the matching chip is reached
-    byte b = 0;                                 // rotate pixels 90 degrees -- set byte to 0
+    uint8_t b = 0;                              // rotate pixels 90 degrees -- set byte to 0
     if (this->orientation_ == 0) {
-      for (byte i = 0; i < 8; i++)                // run this loop 8 times for all the pixels[8] received
-        b |= bitRead(pixels[i], col) << (7 - i);  // change the column bits into row bits
+      for (uint8_t i = 0; i < 8; i++) {
+        // run this loop 8 times for all the pixels[8] received
+        b |= ((pixels[i] >> col) & 1) << (7 - i);  // change the column bits into row bits
+      }
     } else if (this->orientation_ == 1) {
       b = pixels[col];
     } else if (this->orientation_ == 2) {
-      for (byte i = 0; i < 8; i++)
-        b |= bitRead(pixels[i], 7 - col) << (7 - i);
+      for (uint8_t i = 0; i < 8; i++) {
+        b |= ((pixels[i] >> (7 - col)) << (7 - i));
+      }
     } else {
       b = pixels[7 - col];
     }
@@ -246,8 +249,8 @@ void MAX7219Component::send64pixels(byte chip, const byte pixels[8]) {
 uint8_t MAX7219Component::printdigit(const char *str) { return this->printdigit(0, str); }
 
 uint8_t MAX7219Component::printdigit(uint8_t start_pos, const char *s) {
-  byte chip;
-  for (chip = start_pos; chip < this->num_chips_ && *s; chip++)
+  uint8_t chip = start_pos;
+  for (; chip < this->num_chips_ && *s; chip++)
     send_char(chip, *s++);
   // space out rest
   while (chip < (this->num_chips_))
diff --git a/esphome/components/mcp3008/mcp3008.cpp b/esphome/components/mcp3008/mcp3008.cpp
index 70484e8818..a4d019ab8f 100644
--- a/esphome/components/mcp3008/mcp3008.cpp
+++ b/esphome/components/mcp3008/mcp3008.cpp
@@ -19,11 +19,11 @@ void MCP3008::dump_config() {
 }
 
 float MCP3008::read_data_(uint8_t pin) {
-  byte data_msb = 0;
-  byte data_lsb = 0;
+  uint8_t data_msb = 0;
+  uint8_t data_lsb = 0;
 
-  byte command = ((0x01 << 7) |          // start bit
-                  ((pin & 0x07) << 4));  // channel number
+  uint8_t command = ((0x01 << 7) |          // start bit
+                     ((pin & 0x07) << 4));  // channel number
 
   this->enable();
 
diff --git a/esphome/components/sn74hc595/sn74hc595.cpp b/esphome/components/sn74hc595/sn74hc595.cpp
index edf8989149..d82c5d5036 100644
--- a/esphome/components/sn74hc595/sn74hc595.cpp
+++ b/esphome/components/sn74hc595/sn74hc595.cpp
@@ -10,17 +10,17 @@ void SN74HC595Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up SN74HC595...");
 
   if (this->have_oe_pin_) {  // disable output
-    pinMode(this->oe_pin_->get_pin(), OUTPUT);
-    digitalWrite(this->oe_pin_->get_pin(), HIGH);
+    this->oe_pin_->pin_mode(OUTPUT);
+    this->oe_pin_->digital_write(true);
   }
 
   // initialize output pins
-  pinMode(this->clock_pin_->get_pin(), OUTPUT);
-  pinMode(this->data_pin_->get_pin(), OUTPUT);
-  pinMode(this->latch_pin_->get_pin(), OUTPUT);
-  digitalWrite(this->clock_pin_->get_pin(), LOW);
-  digitalWrite(this->data_pin_->get_pin(), LOW);
-  digitalWrite(this->latch_pin_->get_pin(), LOW);
+  this->clock_pin_->pin_mode(OUTPUT);
+  this->data_pin_->pin_mode(OUTPUT);
+  this->latch_pin_->pin_mode(OUTPUT);
+  this->clock_pin_->digital_write(LOW);
+  this->data_pin_->digital_write(LOW);
+  this->latch_pin_->digital_write(LOW);
 
   // send state to shift register
   this->write_gpio_();
@@ -28,26 +28,33 @@ void SN74HC595Component::setup() {
 
 void SN74HC595Component::dump_config() { ESP_LOGCONFIG(TAG, "SN74HC595:"); }
 
-bool SN74HC595Component::digital_read_(uint8_t pin) { return bitRead(this->output_bits_, pin); }
+bool SN74HC595Component::digital_read_(uint8_t pin) { return this->output_bits_ >> pin; }
 
 void SN74HC595Component::digital_write_(uint8_t pin, bool value) {
-  bitWrite(this->output_bits_, pin, value);
+  uint32_t mask = 1UL << pin;
+  this->output_bits_ &= ~mask;
+  if (value)
+    this->output_bits_ |= mask;
   this->write_gpio_();
 }
 
 bool SN74HC595Component::write_gpio_() {
   for (int i = this->sr_count_ - 1; i >= 0; i--) {
     uint8_t data = (uint8_t)(this->output_bits_ >> (8 * i) & 0xff);
-    shiftOut(this->data_pin_->get_pin(), this->clock_pin_->get_pin(), MSBFIRST, data);
+    for (int j = 0; j < 8; j++) {
+      this->data_pin_->digital_write(data & (1 << (7 - j)));
+      this->clock_pin_->digital_write(true);
+      this->clock_pin_->digital_write(false);
+    }
   }
 
   // pulse latch to activate new values
-  digitalWrite(this->latch_pin_->get_pin(), HIGH);
-  digitalWrite(this->latch_pin_->get_pin(), LOW);
+  this->latch_pin_->digital_write(true);
+  this->latch_pin_->digital_write(false);
 
   // enable output if configured
   if (this->have_oe_pin_) {
-    digitalWrite(this->oe_pin_->get_pin(), LOW);
+    this->oe_pin_->digital_write(false);
   }
 
   return true;
diff --git a/esphome/components/sx1509/sx1509.cpp b/esphome/components/sx1509/sx1509.cpp
index 2806a1cac2..0d6ffbb9b8 100644
--- a/esphome/components/sx1509/sx1509.cpp
+++ b/esphome/components/sx1509/sx1509.cpp
@@ -144,7 +144,7 @@ void SX1509Component::clock_(byte osc_source, byte osc_pin_function, byte osc_fr
   osc_source = (osc_source & 0b11) << 5;           // 2-bit value, bits 6:5
   osc_pin_function = (osc_pin_function & 1) << 4;  // 1-bit value bit 4
   osc_freq_out = (osc_freq_out & 0b1111);          // 4-bit value, bits 3:0
-  byte reg_clock = osc_source | osc_pin_function | osc_freq_out;
+  uint8_t reg_clock = osc_source | osc_pin_function | osc_freq_out;
   this->write_byte(REG_CLOCK, reg_clock);
 
   osc_divider = constrain(osc_divider, 1, 7);
diff --git a/esphome/components/ultrasonic/ultrasonic_sensor.cpp b/esphome/components/ultrasonic/ultrasonic_sensor.cpp
index f8130f7d1f..c573c21863 100644
--- a/esphome/components/ultrasonic/ultrasonic_sensor.cpp
+++ b/esphome/components/ultrasonic/ultrasonic_sensor.cpp
@@ -17,7 +17,8 @@ void UltrasonicSensorComponent::update() {
   delayMicroseconds(this->pulse_time_us_);
   this->trigger_pin_->digital_write(false);
 
-  uint32_t time = pulseIn(this->echo_pin_->get_pin(), uint8_t(!this->echo_pin_->is_inverted()), this->timeout_us_);
+  uint32_t time = pulseIn(  // NOLINT
+      this->echo_pin_->get_pin(), uint8_t(!this->echo_pin_->is_inverted()), this->timeout_us_);
 
   ESP_LOGV(TAG, "Echo took %uµs", time);
 
diff --git a/script/ci-custom.py b/script/ci-custom.py
index cde026b5d4..3954eea0de 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -255,6 +255,63 @@ def lint_conf_from_const_py(fname, match):
             "const.py directly.".format(highlight(name)))
 
 
+RAW_PIN_ACCESS_RE = r'^\s(pinMode|digitalWrite|digitalRead)\((.*)->get_pin\(\),\s*([^)]+).*\)'
+
+
+@lint_re_check(RAW_PIN_ACCESS_RE, include=cpp_include)
+def lint_no_raw_pin_access(fname, match):
+    func = match.group(1)
+    pin = match.group(2)
+    mode = match.group(3)
+    new_func = {
+        'pinMode': 'pin_mode',
+        'digitalWrite': 'digital_write',
+        'digitalRead': 'digital_read',
+    }[func]
+    new_code = highlight(f'{pin}->{new_func}({mode})')
+    return (f"Don't use raw {func} calls. Instead, use the `->{new_func}` function: {new_code}")
+
+
+# Functions from Arduino framework that are forbidden to use directly
+ARDUINO_FORBIDDEN = [
+    'digitalWrite', 'digitalRead', 'pinMode',
+    'shiftOut', 'shiftIn',
+    'radians', 'degrees',
+    'interrupts', 'noInterrupts',
+    'lowByte', 'highByte',
+    'bitRead', 'bitSet', 'bitClear', 'bitWrite',
+    'bit', 'analogRead', 'analogWrite',
+    'pulseIn', 'pulseInLong',
+    'tone',
+]
+ARDUINO_FORBIDDEN_RE = r'[^\w\d](' + r'|'.join(ARDUINO_FORBIDDEN) + r')\(.*'
+
+
+@lint_re_check(ARDUINO_FORBIDDEN_RE, include=cpp_include, exclude=[
+    'esphome/components/mqtt/custom_mqtt_device.h',
+    'esphome/core/esphal.*',
+])
+def lint_no_arduino_framework_functions(fname, match):
+    nolint = highlight("// NOLINT")
+    return (
+        f"The function {highlight(match.group(1))} from the Arduino framework is forbidden to be "
+        f"used directly in the ESPHome codebase. Please use ESPHome's abstractions and equivalent "
+        f"C++ instead.\n"
+        f"\n"
+        f"(If the function is strictly necessary, please add `{nolint}` to the end of the line)"
+    )
+
+
+@lint_re_check(r'[^\w\d]byte\s+[\w\d]+\s*=.*', include=cpp_include, exclude={
+    'esphome/components/tuya/tuya.h',
+})
+def lint_no_byte_datatype(fname, match):
+    return (
+        f"The datatype {highlight('byte')} is not allowed to be used in ESPHome. "
+        f"Please use {highlight('uint8_t')} instead."
+    )
+
+
 @lint_post_check
 def lint_constants_usage():
     errors = []
@@ -328,7 +385,7 @@ def lint_pragma_once(fname, content):
     return None
 
 
-@lint_re_check(r'(whitelist|blacklist|slave)', exclude=['script/ci-custom.py'], 
+@lint_re_check(r'(whitelist|blacklist|slave)', exclude=['script/ci-custom.py'],
                flags=re.IGNORECASE | re.MULTILINE)
 def lint_inclusive_language(fname, match):
     # From https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49decddd39e5f6132ccd7d9fdc3d7c470b0061bb

From 5887fe8302bbd160f18b081be8a6dfa378f65190 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 25 Jul 2020 14:40:47 +0200
Subject: [PATCH 365/412] Enlarge ESP32 app partitions (#1197)

---
 esphome/writer.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/esphome/writer.py b/esphome/writer.py
index 67b1332e8f..041d1c1127 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -180,6 +180,16 @@ def gather_build_flags():
     return list(sorted(list(build_flags)))
 
 
+ESP32_LARGE_PARTITIONS_CSV = """\
+nvs,      data, nvs,     0x009000, 0x005000,
+otadata,  data, ota,     0x00e000, 0x002000,
+app0,     app,  ota_0,   0x010000, 0x1C0000,
+app1,     app,  ota_1,   0x1D0000, 0x1C0000,
+eeprom,   data, 0x99,    0x390000, 0x001000,
+spiffs,   data, spiffs,  0x391000, 0x00F000
+"""
+
+
 def get_ini_content():
     lib_deps = gather_lib_deps()
     build_flags = gather_build_flags()
@@ -196,15 +206,9 @@ def get_ini_content():
     if CORE.is_esp32:
         data['board_build.partitions'] = "partitions.csv"
         partitions_csv = CORE.relative_build_path('partitions.csv')
-        if not os.path.isfile(partitions_csv):
-            with open(partitions_csv, "w") as f:
-                f.write("nvs,      data, nvs,     0x009000, 0x005000,\n")
-                f.write("otadata,  data, ota,     0x00e000, 0x002000,\n")
-                f.write("app0,     app,  ota_0,   0x010000, 0x190000,\n")
-                f.write("app1,     app,  ota_1,   0x200000, 0x190000,\n")
-                f.write("eeprom,   data, 0x99,    0x390000, 0x001000,\n")
-                f.write("spiffs,   data, spiffs,  0x391000, 0x00F000\n")
+        write_file_if_changed(partitions_csv, ESP32_LARGE_PARTITIONS_CSV)
 
+    # pylint: disable=unsubscriptable-object
     if CONF_BOARD_FLASH_MODE in CORE.config[CONF_ESPHOME]:
         flash_mode = CORE.config[CONF_ESPHOME][CONF_BOARD_FLASH_MODE]
         data['board_build.flash_mode'] = flash_mode

From 4996967c79ad20778184c7869d35174110095ca0 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 25 Jul 2020 15:57:18 +0200
Subject: [PATCH 366/412] Add CODEOWNERS mechanism (#1199)

---
 .github/workflows/ci.yml                      |  2 +
 .github/workflows/release-dev.yml             |  2 +
 .github/workflows/release.yml                 |  2 +
 CODEOWNERS                                    | 54 +++++++++++++++
 esphome/components/adc/__init__.py            |  1 +
 esphome/components/api/__init__.py            |  1 +
 esphome/components/async_tcp/__init__.py      |  2 +
 esphome/components/bang_bang/__init__.py      |  1 +
 esphome/components/binary_sensor/__init__.py  |  1 +
 esphome/components/captive_portal/__init__.py |  1 +
 esphome/components/climate/__init__.py        |  1 +
 esphome/components/cover/__init__.py          |  1 +
 esphome/components/debug/__init__.py          |  1 +
 esphome/components/dht/__init__.py            |  1 +
 .../exposure_notifications/__init__.py        |  1 +
 esphome/components/fastled_base/__init__.py   |  1 +
 esphome/components/globals/__init__.py        |  1 +
 esphome/components/gpio/__init__.py           |  1 +
 esphome/components/homeassistant/__init__.py  |  1 +
 esphome/components/i2c/__init__.py            |  1 +
 esphome/components/integration/__init__.py    |  1 +
 esphome/components/interval/__init__.py       |  1 +
 esphome/components/json/__init__.py           |  1 +
 esphome/components/ledc/__init__.py           |  1 +
 esphome/components/light/__init__.py          |  1 +
 esphome/components/logger/__init__.py         |  1 +
 esphome/components/network/__init__.py        |  1 +
 esphome/components/ota/__init__.py            |  1 +
 esphome/components/output/__init__.py         |  2 +
 esphome/components/pid/__init__.py            |  1 +
 esphome/components/pn532/__init__.py          |  1 +
 esphome/components/power_supply/__init__.py   |  1 +
 esphome/components/restart/__init__.py        |  1 +
 esphome/components/script/__init__.py         |  1 +
 esphome/components/sensor/__init__.py         |  1 +
 esphome/components/shutdown/__init__.py       |  1 +
 esphome/components/spi/__init__.py            |  1 +
 esphome/components/substitutions/__init__.py  |  1 +
 esphome/components/sun/__init__.py            |  1 +
 esphome/components/switch/__init__.py         |  1 +
 esphome/components/time/__init__.py           |  1 +
 esphome/components/uart/__init__.py           |  1 +
 esphome/components/ultrasonic/__init__.py     |  1 +
 esphome/components/version/__init__.py        |  1 +
 .../components/web_server_base/__init__.py    |  1 +
 esphome/config.py                             |  4 ++
 esphome/helpers.py                            | 28 +++++---
 script/build_codeowners.py                    | 68 +++++++++++++++++++
 48 files changed, 195 insertions(+), 8 deletions(-)
 create mode 100644 CODEOWNERS
 create mode 100755 script/build_codeowners.py

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d6798314f..ce6a120f7a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -143,6 +143,8 @@ jobs:
         run: script/ci-custom.py
       - name: Lint Python
         run: script/lint-python
+      - name: Lint CODEOWNERS
+        run: script/build_codeowners.py --check
 
   test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 896b6cddb4..c289c44afc 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -98,6 +98,8 @@ jobs:
         run: script/ci-custom.py
       - name: Lint Python
         run: script/lint-python
+      - name: Lint CODEOWNERS
+        run: script/build_codeowners.py --check
 
   test:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 651064047a..d13a6fd55d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -97,6 +97,8 @@ jobs:
         run: script/ci-custom.py
       - name: Lint Python
         run: script/lint-python
+      - name: Lint CODEOWNERS
+        run: script/build_codeowners.py --check
 
   test:
     runs-on: ubuntu-latest
diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000..79b2d0503c
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,54 @@
+# This file is generated by script/build_codeowners.py
+# People marked here will be automatically requested for a review
+# when the code that they own is touched.
+#
+# Every time an issue is created with a label corresponding to an integration,
+# the integration's code owner is automatically notified.
+
+# Core Code
+setup.py @esphome/core
+esphome/*.py @esphome/core
+esphome/core/* @esphome/core
+
+# Integrations
+esphome/components/adc/* @esphome/core
+esphome/components/api/* @OttoWinter
+esphome/components/async_tcp/* @OttoWinter
+esphome/components/bang_bang/* @OttoWinter
+esphome/components/binary_sensor/* @esphome/core
+esphome/components/captive_portal/* @OttoWinter
+esphome/components/climate/* @esphome/core
+esphome/components/cover/* @esphome/core
+esphome/components/debug/* @OttoWinter
+esphome/components/dht/* @OttoWinter
+esphome/components/exposure_notifications/* @OttoWinter
+esphome/components/fastled_base/* @OttoWinter
+esphome/components/globals/* @esphome/core
+esphome/components/gpio/* @esphome/core
+esphome/components/homeassistant/* @OttoWinter
+esphome/components/i2c/* @esphome/core
+esphome/components/integration/* @OttoWinter
+esphome/components/interval/* @esphome/core
+esphome/components/json/* @OttoWinter
+esphome/components/ledc/* @OttoWinter
+esphome/components/light/* @esphome/core
+esphome/components/logger/* @esphome/core
+esphome/components/network/* @esphome/core
+esphome/components/ota/* @esphome/core
+esphome/components/output/* @esphome/core
+esphome/components/pid/* @OttoWinter
+esphome/components/pn532/* @OttoWinter
+esphome/components/power_supply/* @esphome/core
+esphome/components/restart/* @esphome/core
+esphome/components/script/* @esphome/core
+esphome/components/sensor/* @esphome/core
+esphome/components/shutdown/* @esphome/core
+esphome/components/spi/* @esphome/core
+esphome/components/substitutions/* @esphome/core
+esphome/components/sun/* @OttoWinter
+esphome/components/switch/* @esphome/core
+esphome/components/time/* @OttoWinter
+esphome/components/uart/* @esphome/core
+esphome/components/ultrasonic/* @OttoWinter
+esphome/components/version/* @esphome/core
+esphome/components/web_server_base/* @OttoWinter
diff --git a/esphome/components/adc/__init__.py b/esphome/components/adc/__init__.py
index e69de29bb2..63db7aee2e 100644
--- a/esphome/components/adc/__init__.py
+++ b/esphome/components/adc/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@esphome/core']
diff --git a/esphome/components/api/__init__.py b/esphome/components/api/__init__.py
index eef60602ba..23cfa51d2b 100644
--- a/esphome/components/api/__init__.py
+++ b/esphome/components/api/__init__.py
@@ -8,6 +8,7 @@ from esphome.core import coroutine_with_priority
 
 DEPENDENCIES = ['network']
 AUTO_LOAD = ['async_tcp']
+CODEOWNERS = ['@OttoWinter']
 
 api_ns = cg.esphome_ns.namespace('api')
 APIServer = api_ns.class_('APIServer', cg.Component, cg.Controller)
diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py
index cf9d2f1585..8af33bc4ef 100644
--- a/esphome/components/async_tcp/__init__.py
+++ b/esphome/components/async_tcp/__init__.py
@@ -2,6 +2,8 @@
 import esphome.codegen as cg
 from esphome.core import CORE, coroutine_with_priority
 
+CODEOWNERS = ['@OttoWinter']
+
 
 @coroutine_with_priority(200.0)
 def to_code(config):
diff --git a/esphome/components/bang_bang/__init__.py b/esphome/components/bang_bang/__init__.py
index e69de29bb2..6f14e10033 100644
--- a/esphome/components/bang_bang/__init__.py
+++ b/esphome/components/bang_bang/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@OttoWinter']
diff --git a/esphome/components/binary_sensor/__init__.py b/esphome/components/binary_sensor/__init__.py
index 2b5dd302c4..8361ee8004 100644
--- a/esphome/components/binary_sensor/__init__.py
+++ b/esphome/components/binary_sensor/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import CONF_DEVICE_CLASS, CONF_FILTERS, \
 from esphome.core import CORE, coroutine, coroutine_with_priority
 from esphome.util import Registry
 
+CODEOWNERS = ['@esphome/core']
 DEVICE_CLASSES = [
     '', 'battery', 'cold', 'connectivity', 'door', 'garage_door', 'gas',
     'heat', 'light', 'lock', 'moisture', 'motion', 'moving', 'occupancy',
diff --git a/esphome/components/captive_portal/__init__.py b/esphome/components/captive_portal/__init__.py
index 52885ae449..bb8b2198a1 100644
--- a/esphome/components/captive_portal/__init__.py
+++ b/esphome/components/captive_portal/__init__.py
@@ -7,6 +7,7 @@ from esphome.core import coroutine_with_priority
 
 AUTO_LOAD = ['web_server_base']
 DEPENDENCIES = ['wifi']
+CODEOWNERS = ['@OttoWinter']
 
 captive_portal_ns = cg.esphome_ns.namespace('captive_portal')
 CaptivePortal = captive_portal_ns.class_('CaptivePortal', cg.Component)
diff --git a/esphome/components/climate/__init__.py b/esphome/components/climate/__init__.py
index 843b888218..38e254bb9d 100644
--- a/esphome/components/climate/__init__.py
+++ b/esphome/components/climate/__init__.py
@@ -10,6 +10,7 @@ from esphome.core import CORE, coroutine, coroutine_with_priority
 
 IS_PLATFORM_COMPONENT = True
 
+CODEOWNERS = ['@esphome/core']
 climate_ns = cg.esphome_ns.namespace('climate')
 
 Climate = climate_ns.class_('Climate', cg.Nameable)
diff --git a/esphome/components/cover/__init__.py b/esphome/components/cover/__init__.py
index 85f7f746ba..f39e7ba540 100644
--- a/esphome/components/cover/__init__.py
+++ b/esphome/components/cover/__init__.py
@@ -9,6 +9,7 @@ from esphome.core import CORE, coroutine, coroutine_with_priority
 
 IS_PLATFORM_COMPONENT = True
 
+CODEOWNERS = ['@esphome/core']
 DEVICE_CLASSES = [
     '', 'awning', 'blind', 'curtain', 'damper', 'door', 'garage',
     'gate', 'shade', 'shutter', 'window'
diff --git a/esphome/components/debug/__init__.py b/esphome/components/debug/__init__.py
index a40dadb5c2..d43b0de06a 100644
--- a/esphome/components/debug/__init__.py
+++ b/esphome/components/debug/__init__.py
@@ -2,6 +2,7 @@ import esphome.config_validation as cv
 import esphome.codegen as cg
 from esphome.const import CONF_ID
 
+CODEOWNERS = ['@OttoWinter']
 DEPENDENCIES = ['logger']
 
 debug_ns = cg.esphome_ns.namespace('debug')
diff --git a/esphome/components/dht/__init__.py b/esphome/components/dht/__init__.py
index e69de29bb2..6f14e10033 100644
--- a/esphome/components/dht/__init__.py
+++ b/esphome/components/dht/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@OttoWinter']
diff --git a/esphome/components/exposure_notifications/__init__.py b/esphome/components/exposure_notifications/__init__.py
index de9c3a58df..8175a2d3aa 100644
--- a/esphome/components/exposure_notifications/__init__.py
+++ b/esphome/components/exposure_notifications/__init__.py
@@ -4,6 +4,7 @@ import esphome.config_validation as cv
 from esphome.components import esp32_ble_tracker
 from esphome.const import CONF_TRIGGER_ID
 
+CODEOWNERS = ['@OttoWinter']
 DEPENDENCIES = ['esp32_ble_tracker']
 
 exposure_notifications_ns = cg.esphome_ns.namespace('exposure_notifications')
diff --git a/esphome/components/fastled_base/__init__.py b/esphome/components/fastled_base/__init__.py
index ffa49f43c2..e438876d33 100644
--- a/esphome/components/fastled_base/__init__.py
+++ b/esphome/components/fastled_base/__init__.py
@@ -4,6 +4,7 @@ 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
 
+CODEOWNERS = ['@OttoWinter']
 fastled_base_ns = cg.esphome_ns.namespace('fastled_base')
 FastLEDLightOutput = fastled_base_ns.class_('FastLEDLightOutput', light.AddressableLight)
 
diff --git a/esphome/components/globals/__init__.py b/esphome/components/globals/__init__.py
index e59a7e6acb..f1c4f4faf2 100644
--- a/esphome/components/globals/__init__.py
+++ b/esphome/components/globals/__init__.py
@@ -5,6 +5,7 @@ from esphome import codegen as cg
 from esphome.const import CONF_ID, CONF_INITIAL_VALUE, CONF_RESTORE_VALUE, CONF_TYPE, CONF_VALUE
 from esphome.core import coroutine_with_priority
 
+CODEOWNERS = ['@esphome/core']
 globals_ns = cg.esphome_ns.namespace('globals')
 GlobalsComponent = globals_ns.class_('GlobalsComponent', cg.Component)
 GlobalVarSetAction = globals_ns.class_('GlobalVarSetAction', automation.Action)
diff --git a/esphome/components/gpio/__init__.py b/esphome/components/gpio/__init__.py
index ccb920e654..c36ba8f433 100644
--- a/esphome/components/gpio/__init__.py
+++ b/esphome/components/gpio/__init__.py
@@ -1,3 +1,4 @@
 import esphome.codegen as cg
 
+CODEOWNERS = ['@esphome/core']
 gpio_ns = cg.esphome_ns.namespace('gpio')
diff --git a/esphome/components/homeassistant/__init__.py b/esphome/components/homeassistant/__init__.py
index 9fb3836d49..69d759b977 100644
--- a/esphome/components/homeassistant/__init__.py
+++ b/esphome/components/homeassistant/__init__.py
@@ -1,3 +1,4 @@
 import esphome.codegen as cg
 
+CODEOWNERS = ['@OttoWinter']
 homeassistant_ns = cg.esphome_ns.namespace('homeassistant')
diff --git a/esphome/components/i2c/__init__.py b/esphome/components/i2c/__init__.py
index 0c71f18019..91c6a97190 100644
--- a/esphome/components/i2c/__init__.py
+++ b/esphome/components/i2c/__init__.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_FREQUENCY, CONF_ID, CONF_SCAN, CONF_SCL, CONF_SDA
     CONF_I2C_ID
 from esphome.core import coroutine, coroutine_with_priority
 
+CODEOWNERS = ['@esphome/core']
 i2c_ns = cg.esphome_ns.namespace('i2c')
 I2CComponent = i2c_ns.class_('I2CComponent', cg.Component)
 I2CDevice = i2c_ns.class_('I2CDevice')
diff --git a/esphome/components/integration/__init__.py b/esphome/components/integration/__init__.py
index e69de29bb2..6f14e10033 100644
--- a/esphome/components/integration/__init__.py
+++ b/esphome/components/integration/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@OttoWinter']
diff --git a/esphome/components/interval/__init__.py b/esphome/components/interval/__init__.py
index e0816b7407..be37526ad1 100644
--- a/esphome/components/interval/__init__.py
+++ b/esphome/components/interval/__init__.py
@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome import automation
 from esphome.const import CONF_ID, CONF_INTERVAL
 
+CODEOWNERS = ['@esphome/core']
 interval_ns = cg.esphome_ns.namespace('interval')
 IntervalTrigger = interval_ns.class_('IntervalTrigger', automation.Trigger.template(),
                                      cg.PollingComponent)
diff --git a/esphome/components/json/__init__.py b/esphome/components/json/__init__.py
index f719b05340..63bc16dfa2 100644
--- a/esphome/components/json/__init__.py
+++ b/esphome/components/json/__init__.py
@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 from esphome.core import coroutine_with_priority
 
+CODEOWNERS = ['@OttoWinter']
 json_ns = cg.esphome_ns.namespace('json')
 
 
diff --git a/esphome/components/ledc/__init__.py b/esphome/components/ledc/__init__.py
index e69de29bb2..6f14e10033 100644
--- a/esphome/components/ledc/__init__.py
+++ b/esphome/components/ledc/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@OttoWinter']
diff --git a/esphome/components/light/__init__.py b/esphome/components/light/__init__.py
index 2a44b044b9..9d58fa47bf 100644
--- a/esphome/components/light/__init__.py
+++ b/esphome/components/light/__init__.py
@@ -14,6 +14,7 @@ from .types import (  # noqa
     LightState, AddressableLightState, light_ns, LightOutput, AddressableLight, \
     LightTurnOnTrigger, LightTurnOffTrigger)
 
+CODEOWNERS = ['@esphome/core']
 IS_PLATFORM_COMPONENT = True
 
 LightRestoreMode = light_ns.enum('LightRestoreMode')
diff --git a/esphome/components/logger/__init__.py b/esphome/components/logger/__init__.py
index 329c515aee..c447b0eee1 100644
--- a/esphome/components/logger/__init__.py
+++ b/esphome/components/logger/__init__.py
@@ -8,6 +8,7 @@ from esphome.const import CONF_ARGS, CONF_BAUD_RATE, CONF_FORMAT, CONF_HARDWARE_
     CONF_LEVEL, CONF_LOGS, CONF_ON_MESSAGE, CONF_TAG, CONF_TRIGGER_ID, CONF_TX_BUFFER_SIZE
 from esphome.core import CORE, EsphomeError, Lambda, coroutine_with_priority
 
+CODEOWNERS = ['@esphome/core']
 logger_ns = cg.esphome_ns.namespace('logger')
 LOG_LEVELS = {
     'NONE': cg.global_ns.ESPHOME_LOG_LEVEL_NONE,
diff --git a/esphome/components/network/__init__.py b/esphome/components/network/__init__.py
index 4486d62e1d..a380e32bfe 100644
--- a/esphome/components/network/__init__.py
+++ b/esphome/components/network/__init__.py
@@ -1 +1,2 @@
 # Dummy package to allow components to depend on network
+CODEOWNERS = ['@esphome/core']
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index 869de777d6..e6bcff045f 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome.const import CONF_ID, CONF_PASSWORD, CONF_PORT, CONF_SAFE_MODE
 from esphome.core import CORE, coroutine_with_priority
 
+CODEOWNERS = ['@esphome/core']
 DEPENDENCIES = ['network']
 
 ota_ns = cg.esphome_ns.namespace('ota')
diff --git a/esphome/components/output/__init__.py b/esphome/components/output/__init__.py
index b406f62ee1..34cb7c3f7a 100644
--- a/esphome/components/output/__init__.py
+++ b/esphome/components/output/__init__.py
@@ -7,6 +7,8 @@ from esphome.const import CONF_ID, CONF_INVERTED, CONF_LEVEL, CONF_MAX_POWER, \
     CONF_MIN_POWER, CONF_POWER_SUPPLY
 from esphome.core import CORE, coroutine
 
+
+CODEOWNERS = ['@esphome/core']
 IS_PLATFORM_COMPONENT = True
 
 BINARY_OUTPUT_SCHEMA = cv.Schema({
diff --git a/esphome/components/pid/__init__.py b/esphome/components/pid/__init__.py
index e69de29bb2..6f14e10033 100644
--- a/esphome/components/pid/__init__.py
+++ b/esphome/components/pid/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@OttoWinter']
diff --git a/esphome/components/pn532/__init__.py b/esphome/components/pn532/__init__.py
index 931b6ada6b..cbd41d11cc 100644
--- a/esphome/components/pn532/__init__.py
+++ b/esphome/components/pn532/__init__.py
@@ -4,6 +4,7 @@ from esphome import automation
 from esphome.components import spi
 from esphome.const import CONF_ID, CONF_ON_TAG, CONF_TRIGGER_ID
 
+CODEOWNERS = ['@OttoWinter']
 DEPENDENCIES = ['spi']
 AUTO_LOAD = ['binary_sensor']
 MULTI_CONF = True
diff --git a/esphome/components/power_supply/__init__.py b/esphome/components/power_supply/__init__.py
index 5646ffdc0b..d502788637 100644
--- a/esphome/components/power_supply/__init__.py
+++ b/esphome/components/power_supply/__init__.py
@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome import pins
 from esphome.const import CONF_ENABLE_TIME, CONF_ID, CONF_KEEP_ON_TIME, CONF_PIN
 
+CODEOWNERS = ['@esphome/core']
 power_supply_ns = cg.esphome_ns.namespace('power_supply')
 PowerSupply = power_supply_ns.class_('PowerSupply', cg.Component)
 MULTI_CONF = True
diff --git a/esphome/components/restart/__init__.py b/esphome/components/restart/__init__.py
index e69de29bb2..63db7aee2e 100644
--- a/esphome/components/restart/__init__.py
+++ b/esphome/components/restart/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@esphome/core']
diff --git a/esphome/components/script/__init__.py b/esphome/components/script/__init__.py
index eb337d7681..d33f64a23b 100644
--- a/esphome/components/script/__init__.py
+++ b/esphome/components/script/__init__.py
@@ -4,6 +4,7 @@ from esphome import automation
 from esphome.automation import maybe_simple_id
 from esphome.const import CONF_ID, CONF_MODE
 
+CODEOWNERS = ['@esphome/core']
 script_ns = cg.esphome_ns.namespace('script')
 Script = script_ns.class_('Script', automation.Trigger.template())
 ScriptExecuteAction = script_ns.class_('ScriptExecuteAction', automation.Action)
diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index 605f72a103..671bbe2b09 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -12,6 +12,7 @@ from esphome.const import CONF_ABOVE, CONF_ACCURACY_DECIMALS, CONF_ALPHA, CONF_B
 from esphome.core import CORE, coroutine, coroutine_with_priority
 from esphome.util import Registry
 
+CODEOWNERS = ['@esphome/core']
 IS_PLATFORM_COMPONENT = True
 
 
diff --git a/esphome/components/shutdown/__init__.py b/esphome/components/shutdown/__init__.py
index e69de29bb2..63db7aee2e 100644
--- a/esphome/components/shutdown/__init__.py
+++ b/esphome/components/shutdown/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@esphome/core']
diff --git a/esphome/components/spi/__init__.py b/esphome/components/spi/__init__.py
index 71dac0f8c9..e7f8bc378d 100644
--- a/esphome/components/spi/__init__.py
+++ b/esphome/components/spi/__init__.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_CLK_PIN, CONF_ID, CONF_MISO_PIN, CONF_MOSI_PIN, C
     CONF_CS_PIN
 from esphome.core import coroutine, coroutine_with_priority
 
+CODEOWNERS = ['@esphome/core']
 spi_ns = cg.esphome_ns.namespace('spi')
 SPIComponent = spi_ns.class_('SPIComponent', cg.Component)
 SPIDevice = spi_ns.class_('SPIDevice')
diff --git a/esphome/components/substitutions/__init__.py b/esphome/components/substitutions/__init__.py
index a6f70fe928..9c5d444b2c 100644
--- a/esphome/components/substitutions/__init__.py
+++ b/esphome/components/substitutions/__init__.py
@@ -5,6 +5,7 @@ import esphome.config_validation as cv
 from esphome import core
 from esphome.const import CONF_SUBSTITUTIONS
 
+CODEOWNERS = ['@esphome/core']
 _LOGGER = logging.getLogger(__name__)
 
 VALID_SUBSTITUTIONS_CHARACTERS = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' \
diff --git a/esphome/components/sun/__init__.py b/esphome/components/sun/__init__.py
index e4d2023a8e..a92442ea56 100644
--- a/esphome/components/sun/__init__.py
+++ b/esphome/components/sun/__init__.py
@@ -4,6 +4,7 @@ from esphome import automation
 from esphome.components import time
 from esphome.const import CONF_TIME_ID, CONF_ID, CONF_TRIGGER_ID
 
+CODEOWNERS = ['@OttoWinter']
 sun_ns = cg.esphome_ns.namespace('sun')
 
 Sun = sun_ns.class_('Sun')
diff --git a/esphome/components/switch/__init__.py b/esphome/components/switch/__init__.py
index 3870631e13..7378b2a140 100644
--- a/esphome/components/switch/__init__.py
+++ b/esphome/components/switch/__init__.py
@@ -7,6 +7,7 @@ from esphome.const import CONF_ICON, CONF_ID, CONF_INTERNAL, CONF_INVERTED, CONF
     CONF_ON_TURN_ON, CONF_TRIGGER_ID, CONF_MQTT_ID, CONF_NAME
 from esphome.core import CORE, coroutine, coroutine_with_priority
 
+CODEOWNERS = ['@esphome/core']
 IS_PLATFORM_COMPONENT = True
 
 switch_ns = cg.esphome_ns.namespace('switch_')
diff --git a/esphome/components/time/__init__.py b/esphome/components/time/__init__.py
index 6283392103..49ed53c47e 100644
--- a/esphome/components/time/__init__.py
+++ b/esphome/components/time/__init__.py
@@ -17,6 +17,7 @@ from esphome.core import coroutine, coroutine_with_priority
 
 _LOGGER = logging.getLogger(__name__)
 
+CODEOWNERS = ['@OttoWinter']
 IS_PLATFORM_COMPONENT = True
 
 time_ns = cg.esphome_ns.namespace('time')
diff --git a/esphome/components/uart/__init__.py b/esphome/components/uart/__init__.py
index 65a9a3eaf8..b83aedad9f 100644
--- a/esphome/components/uart/__init__.py
+++ b/esphome/components/uart/__init__.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_BAUD_RATE, CONF_ID, CONF_RX_PIN, CONF_TX_PIN, CON
     CONF_DATA, CONF_RX_BUFFER_SIZE
 from esphome.core import CORE, coroutine
 
+CODEOWNERS = ['@esphome/core']
 uart_ns = cg.esphome_ns.namespace('uart')
 UARTComponent = uart_ns.class_('UARTComponent', cg.Component)
 UARTDevice = uart_ns.class_('UARTDevice')
diff --git a/esphome/components/ultrasonic/__init__.py b/esphome/components/ultrasonic/__init__.py
index e69de29bb2..6f14e10033 100644
--- a/esphome/components/ultrasonic/__init__.py
+++ b/esphome/components/ultrasonic/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@OttoWinter']
diff --git a/esphome/components/version/__init__.py b/esphome/components/version/__init__.py
index e69de29bb2..63db7aee2e 100644
--- a/esphome/components/version/__init__.py
+++ b/esphome/components/version/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ['@esphome/core']
diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index d2faaf7162..f7b2238552 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -3,6 +3,7 @@ import esphome.codegen as cg
 from esphome.const import CONF_ID
 from esphome.core import coroutine_with_priority, CORE
 
+CODEOWNERS = ['@OttoWinter']
 DEPENDENCIES = ['network']
 AUTO_LOAD = ['async_tcp']
 
diff --git a/esphome/config.py b/esphome/config.py
index 84d3ca3803..85f48c64b7 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -66,6 +66,10 @@ class ComponentManifest:
     def auto_load(self):
         return getattr(self.module, 'AUTO_LOAD', [])
 
+    @property
+    def codeowners(self) -> List[str]:
+        return getattr(self.module, 'CODEOWNERS', [])
+
     def _get_flags_set(self, name, config):
         if not hasattr(self.module, name):
             return set()
diff --git a/esphome/helpers.py b/esphome/helpers.py
index 6413a25e01..b30ace89d2 100644
--- a/esphome/helpers.py
+++ b/esphome/helpers.py
@@ -2,6 +2,9 @@ import codecs
 
 import logging
 import os
+from pathlib import Path
+from typing import Union
+import tempfile
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -168,15 +171,21 @@ def read_file(path):
         raise EsphomeError(f"Error reading file {path}: {err}")
 
 
-def _write_file(path, text):
-    import tempfile
-    directory = os.path.dirname(path)
-    mkdir_p(directory)
+def _write_file(path: Union[Path, str], text: Union[str, bytes]):
+    """Atomically writes `text` to the given path.
 
-    tmp_path = None
+    Automatically creates all parent directories.
+    """
+    if not isinstance(path, Path):
+        path = Path(path)
     data = text
     if isinstance(text, str):
         data = text.encode()
+
+    directory = path.parent
+    directory.mkdir(exist_ok=True, parents=True)
+
+    tmp_path = None
     try:
         with tempfile.NamedTemporaryFile(mode="wb", dir=directory, delete=False) as f_handle:
             tmp_path = f_handle.name
@@ -193,7 +202,7 @@ def _write_file(path, text):
                 _LOGGER.error("Write file cleanup failed: %s", err)
 
 
-def write_file(path, text):
+def write_file(path: Union[Path, str], text: str):
     try:
         _write_file(path, text)
     except OSError:
@@ -201,9 +210,12 @@ def write_file(path, text):
         raise EsphomeError(f"Could not write file at {path}")
 
 
-def write_file_if_changed(path, text):
+def write_file_if_changed(path: Union[Path, str], text: str):
+    if not isinstance(path, Path):
+        path = Path(path)
+
     src_content = None
-    if os.path.isfile(path):
+    if path.is_file():
         src_content = read_file(path)
     if src_content != text:
         write_file(path, text)
diff --git a/script/build_codeowners.py b/script/build_codeowners.py
new file mode 100755
index 0000000000..3f2bf5d8c3
--- /dev/null
+++ b/script/build_codeowners.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+from pathlib import Path
+import sys
+import argparse
+
+from esphome.helpers import write_file_if_changed
+from esphome.config import get_component
+from esphome.core import CORE
+
+parser = argparse.ArgumentParser()
+parser.add_argument('--check', help="Check if the CODEOWNERS file is up to date.",
+                    action='store_true')
+args = parser.parse_args()
+
+# The root directory of the repo
+root = Path(__file__).parent.parent
+components_dir = root / 'esphome' / 'components'
+
+BASE = """
+# This file is generated by script/build_codeowners.py
+# People marked here will be automatically requested for a review
+# when the code that they own is touched.
+#
+# Every time an issue is created with a label corresponding to an integration,
+# the integration's code owner is automatically notified.
+
+# Core Code
+setup.py @esphome/core
+esphome/*.py @esphome/core
+esphome/core/* @esphome/core
+
+# Integrations
+""".strip()
+
+parts = [BASE]
+
+# Fake some diretory so that get_component works
+CORE.config_path = str(root)
+
+for path in sorted(components_dir.iterdir()):
+    if not path.is_dir():
+        continue
+    if not (path / '__init__.py').is_file():
+        continue
+    name = path.name
+    comp = get_component(name)
+    if comp.codeowners:
+        for owner in comp.codeowners:
+            if not owner.startswith('@'):
+                print(f"Codeowner {owner} for integration {name} must start with an '@' symbol!")
+                sys.exit(1)
+
+        parts.append(f"esphome/components/{name}/* {' '.join(comp.codeowners)}")
+
+# End newline
+parts.append('')
+content = '\n'.join(parts)
+codeowners_file = root / 'CODEOWNERS'
+
+if args.check:
+    if codeowners_file.read_text() != content:
+        print("CODEOWNERS file is not up to date.")
+        print("Please run `script/build_codeowners.py`")
+        sys.exit(1)
+    print("CODEOWNERS file is up to date")
+else:
+    write_file_if_changed(codeowners_file, content)
+    print("Wrote CODEOWNERS")

From f6e3070dd8bb92636db7b30593874f078bc79940 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sat, 25 Jul 2020 12:57:11 -0300
Subject: [PATCH 367/412]  rtttl player (#1171)

* rtttl player

* fixes

* Cleanup, add action, condition, etc.

* add test

* updates

* fixes

* Add better error messages

* lint
---
 esphome/components/esp8266_pwm/esp8266_pwm.h |   2 +-
 esphome/components/ledc/ledc_output.cpp      |   4 +-
 esphome/components/ledc/ledc_output.h        |   4 +-
 esphome/components/output/float_output.h     |  13 +-
 esphome/components/rtttl/__init__.py         |  69 +++++++
 esphome/components/rtttl/rtttl.cpp           | 186 +++++++++++++++++++
 esphome/components/rtttl/rtttl.h             |  81 ++++++++
 tests/test1.yaml                             |   3 +
 8 files changed, 356 insertions(+), 6 deletions(-)
 create mode 100644 esphome/components/rtttl/__init__.py
 create mode 100644 esphome/components/rtttl/rtttl.cpp
 create mode 100644 esphome/components/rtttl/rtttl.h

diff --git a/esphome/components/esp8266_pwm/esp8266_pwm.h b/esphome/components/esp8266_pwm/esp8266_pwm.h
index 51b74f48ba..661db6611f 100644
--- a/esphome/components/esp8266_pwm/esp8266_pwm.h
+++ b/esphome/components/esp8266_pwm/esp8266_pwm.h
@@ -13,7 +13,7 @@ class ESP8266PWM : public output::FloatOutput, public Component {
   void set_pin(GPIOPin *pin) { pin_ = pin; }
   void set_frequency(float frequency) { this->frequency_ = frequency; }
   /// Dynamically update frequency
-  void update_frequency(float frequency) {
+  void update_frequency(float frequency) override {
     this->set_frequency(frequency);
     this->write_state(this->last_output_);
   }
diff --git a/esphome/components/ledc/ledc_output.cpp b/esphome/components/ledc/ledc_output.cpp
index 2b1c181a62..d4e3327bb1 100644
--- a/esphome/components/ledc/ledc_output.cpp
+++ b/esphome/components/ledc/ledc_output.cpp
@@ -22,7 +22,7 @@ void LEDCOutput::write_state(float state) {
 }
 
 void LEDCOutput::setup() {
-  this->apply_frequency(this->frequency_);
+  this->update_frequency(this->frequency_);
   this->turn_off();
   // Attach pin after setting default value
   ledcAttachPin(this->pin_->get_pin(), this->channel_);
@@ -50,7 +50,7 @@ optional<uint8_t> ledc_bit_depth_for_frequency(float frequency) {
   return {};
 }
 
-void LEDCOutput::apply_frequency(float frequency) {
+void LEDCOutput::update_frequency(float frequency) {
   auto bit_depth_opt = ledc_bit_depth_for_frequency(frequency);
   if (!bit_depth_opt.has_value()) {
     ESP_LOGW(TAG, "Frequency %f can't be achieved with any bit depth", frequency);
diff --git a/esphome/components/ledc/ledc_output.h b/esphome/components/ledc/ledc_output.h
index 3f56f502b0..b3b14fe855 100644
--- a/esphome/components/ledc/ledc_output.h
+++ b/esphome/components/ledc/ledc_output.h
@@ -19,7 +19,7 @@ class LEDCOutput : public output::FloatOutput, public Component {
   void set_channel(uint8_t channel) { this->channel_ = channel; }
   void set_frequency(float frequency) { this->frequency_ = frequency; }
   /// Dynamically change frequency at runtime
-  void apply_frequency(float frequency);
+  void update_frequency(float frequency) override;
 
   /// Setup LEDC.
   void setup() override;
@@ -45,7 +45,7 @@ template<typename... Ts> class SetFrequencyAction : public Action<Ts...> {
 
   void play(Ts... x) {
     float freq = this->frequency_.value(x...);
-    this->parent_->apply_frequency(freq);
+    this->parent_->update_frequency(freq);
   }
 
  protected:
diff --git a/esphome/components/output/float_output.h b/esphome/components/output/float_output.h
index e3f852b3f6..1b969c9225 100644
--- a/esphome/components/output/float_output.h
+++ b/esphome/components/output/float_output.h
@@ -46,9 +46,20 @@ class FloatOutput : public BinaryOutput {
    */
   void set_min_power(float min_power);
 
-  /// Set the level of this float output, this is called from the front-end.
+  /** Set the level of this float output, this is called from the front-end.
+   *
+   * @param state The new state.
+   */
   void set_level(float state);
 
+  /** Set the frequency of the output for PWM outputs.
+   *
+   * Implemented only by components which can set the output PWM frequency.
+   *
+   * @param frequence The new frequency.
+   */
+  virtual void update_frequency(float frequency) {}
+
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
 
diff --git a/esphome/components/rtttl/__init__.py b/esphome/components/rtttl/__init__.py
new file mode 100644
index 0000000000..df227ab20f
--- /dev/null
+++ b/esphome/components/rtttl/__init__.py
@@ -0,0 +1,69 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.components.output import FloatOutput
+from esphome.const import CONF_ID, CONF_OUTPUT, CONF_TRIGGER_ID
+
+CONF_RTTTL = 'rtttl'
+CONF_ON_FINISHED_PLAYBACK = 'on_finished_playback'
+
+rtttl_ns = cg.esphome_ns.namespace('rtttl')
+
+Rtttl = rtttl_ns .class_('Rtttl', cg.Component)
+PlayAction = rtttl_ns.class_('PlayAction', automation.Action)
+StopAction = rtttl_ns.class_('StopAction', automation.Action)
+FinishedPlaybackTrigger = rtttl_ns.class_('FinishedPlaybackTrigger',
+                                          automation.Trigger.template())
+IsPlayingCondition = rtttl_ns.class_('IsPlayingCondition', automation.Condition)
+
+MULTI_CONF = True
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(CONF_ID): cv.declare_id(Rtttl),
+    cv.Required(CONF_OUTPUT): cv.use_id(FloatOutput),
+    cv.Optional(CONF_ON_FINISHED_PLAYBACK): automation.validate_automation({
+        cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(FinishedPlaybackTrigger),
+    }),
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield cg.register_component(var, config)
+
+    out = yield cg.get_variable(config[CONF_OUTPUT])
+    cg.add(var.set_output(out))
+
+    for conf in config.get(CONF_ON_FINISHED_PLAYBACK, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        yield automation.build_automation(trigger, [], conf)
+
+
+@automation.register_action('rtttl.play', PlayAction, cv.maybe_simple_value({
+    cv.GenerateID(CONF_ID): cv.use_id(Rtttl),
+    cv.Required(CONF_RTTTL): cv.templatable(cv.string)
+}, key=CONF_RTTTL))
+def rtttl_play_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)
+    template_ = yield cg.templatable(config[CONF_RTTTL], args, cg.std_string)
+    cg.add(var.set_value(template_))
+    yield var
+
+
+@automation.register_action('rtttl.stop', StopAction, cv.Schema({
+    cv.GenerateID(): cv.use_id(Rtttl),
+}))
+def rtttl_stop_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
+
+
+@automation.register_condition('rtttl.is_playing', IsPlayingCondition, cv.Schema({
+    cv.GenerateID(): cv.use_id(Rtttl),
+}))
+def rtttl_is_playing_to_code(config, condition_id, template_arg, args):
+    var = cg.new_Pvariable(condition_id, template_arg)
+    yield cg.register_parented(var, config[CONF_ID])
+    yield var
diff --git a/esphome/components/rtttl/rtttl.cpp b/esphome/components/rtttl/rtttl.cpp
new file mode 100644
index 0000000000..da50e1cbe9
--- /dev/null
+++ b/esphome/components/rtttl/rtttl.cpp
@@ -0,0 +1,186 @@
+#include "rtttl.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace rtttl {
+
+static const char* TAG = "rtttl";
+
+static const uint32_t DOUBLE_NOTE_GAP_MS = 10;
+
+// These values can also be found as constants in the Tone library (Tone.h)
+static const uint16_t NOTES[] = {0,    262,  277,  294,  311,  330,  349,  370,  392,  415,  440,  466,  494,
+                                 523,  554,  587,  622,  659,  698,  740,  784,  831,  880,  932,  988,  1047,
+                                 1109, 1175, 1245, 1319, 1397, 1480, 1568, 1661, 1760, 1865, 1976, 2093, 2217,
+                                 2349, 2489, 2637, 2794, 2960, 3136, 3322, 3520, 3729, 3951};
+
+void Rtttl::dump_config() { ESP_LOGCONFIG(TAG, "Rtttl"); }
+
+void Rtttl::play(std::string rtttl) {
+  rtttl_ = std::move(rtttl);
+
+  default_duration_ = 4;
+  default_octave_ = 6;
+  int bpm = 63;
+  uint8_t num;
+
+  // Get name
+  position_ = rtttl_.find(':');
+
+  // it's somewhat documented to be up to 10 characters but let's be a bit flexible here
+  if (position_ == std::string::npos || position_ > 15) {
+    ESP_LOGE(TAG, "Missing ':' when looking for name.");
+    return;
+  }
+
+  auto name = this->rtttl_.substr(0, position_);
+  ESP_LOGD(TAG, "Playing song %s", name.c_str());
+
+  // get default duration
+  position_ = this->rtttl_.find("d=", position_);
+  if (position_ == std::string::npos) {
+    ESP_LOGE(TAG, "Missing 'd='");
+    return;
+  }
+  position_ += 2;
+  num = this->get_integer_();
+  if (num > 0)
+    default_duration_ = num;
+
+  // get default octave
+  position_ = rtttl_.find("o=", position_);
+  if (position_ == std::string::npos) {
+    ESP_LOGE(TAG, "Missing 'o=");
+    return;
+  }
+  position_ += 2;
+  num = get_integer_();
+  if (num >= 3 && num <= 7)
+    default_octave_ = num;
+
+  // get BPM
+  position_ = rtttl_.find("b=", position_);
+  if (position_ == std::string::npos) {
+    ESP_LOGE(TAG, "Missing b=");
+    return;
+  }
+  position_ += 2;
+  num = get_integer_();
+  if (num != 0)
+    bpm = num;
+
+  position_ = rtttl_.find(':', position_);
+  if (position_ == std::string::npos) {
+    ESP_LOGE(TAG, "Missing second ':'");
+    return;
+  }
+  position_++;
+
+  // BPM usually expresses the number of quarter notes per minute
+  wholenote_ = 60 * 1000L * 4 / bpm;  // this is the time for whole note (in milliseconds)
+
+  output_freq_ = 0;
+  last_note_ = millis();
+  note_duration_ = 1;
+}
+
+void Rtttl::loop() {
+  if (note_duration_ == 0 || millis() - last_note_ < note_duration_)
+    return;
+
+  if (!rtttl_[position_]) {
+    output_->set_level(0.0);
+    ESP_LOGD(TAG, "Playback finished");
+    this->on_finished_playback_callback_.call();
+    note_duration_ = 0;
+    return;
+  }
+
+  // align to note: most rtttl's out there does not add and space after the ',' separator but just in case...
+  while (rtttl_[position_] == ',' || rtttl_[position_] == ' ')
+    position_++;
+
+  // first, get note duration, if available
+  uint8_t num = this->get_integer_();
+
+  if (num)
+    note_duration_ = wholenote_ / num;
+  else
+    note_duration_ = wholenote_ / default_duration_;  // we will need to check if we are a dotted note after
+
+  uint8_t note;
+
+  switch (rtttl_[position_]) {
+    case 'c':
+      note = 1;
+      break;
+    case 'd':
+      note = 3;
+      break;
+    case 'e':
+      note = 5;
+      break;
+    case 'f':
+      note = 6;
+      break;
+    case 'g':
+      note = 8;
+      break;
+    case 'a':
+      note = 10;
+      break;
+    case 'b':
+      note = 12;
+      break;
+    case 'p':
+    default:
+      note = 0;
+  }
+  position_++;
+
+  // now, get optional '#' sharp
+  if (rtttl_[position_] == '#') {
+    note++;
+    position_++;
+  }
+
+  // now, get optional '.' dotted note
+  if (rtttl_[position_] == '.') {
+    note_duration_ += note_duration_ / 2;
+    position_++;
+  }
+
+  // now, get scale
+  uint8_t scale = get_integer_();
+  if (scale == 0)
+    scale = default_octave_;
+
+  // Now play the note
+  if (note) {
+    auto note_index = (scale - 4) * 12 + note;
+    if (note_index < 0 || note_index >= sizeof(NOTES)) {
+      ESP_LOGE(TAG, "Note out of valid range");
+      return;
+    }
+    auto freq = NOTES[note_index];
+
+    if (freq == output_freq_) {
+      // Add small silence gap between same note
+      output_->set_level(0.0);
+      delay(DOUBLE_NOTE_GAP_MS);
+      note_duration_ -= DOUBLE_NOTE_GAP_MS;
+    }
+    output_freq_ = freq;
+
+    ESP_LOGVV(TAG, "playing note: %d for %dms", note, note_duration_);
+    output_->update_frequency(freq);
+    output_->set_level(0.5);
+  } else {
+    ESP_LOGVV(TAG, "waiting: %dms", note_duration_);
+    output_->set_level(0.0);
+  }
+
+  last_note_ = millis();
+}
+}  // namespace rtttl
+}  // namespace esphome
diff --git a/esphome/components/rtttl/rtttl.h b/esphome/components/rtttl/rtttl.h
new file mode 100644
index 0000000000..76d8241ddf
--- /dev/null
+++ b/esphome/components/rtttl/rtttl.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/automation.h"
+#include "esphome/components/output/float_output.h"
+
+namespace esphome {
+namespace rtttl {
+
+extern uint32_t global_rtttl_id;
+
+class Rtttl : public Component {
+ public:
+  void set_output(output::FloatOutput *output) { output_ = output; }
+  void play(std::string rtttl);
+  void stop() {
+    note_duration_ = 0;
+    output_->set_level(0.0);
+  }
+  void dump_config() override;
+
+  bool is_playing() { return note_duration_ != 0; }
+  void loop() override;
+
+  void add_on_finished_playback_callback(std::function<void()> callback) {
+    this->on_finished_playback_callback_.add(std::move(callback));
+  }
+
+ protected:
+  inline uint8_t get_integer_() {
+    uint8_t ret = 0;
+    while (isdigit(rtttl_[position_])) {
+      ret = (ret * 10) + (rtttl_[position_++] - '0');
+    }
+    return ret;
+  }
+
+  std::string rtttl_;
+  size_t position_;
+  uint16_t wholenote_;
+  uint16_t default_duration_;
+  uint16_t default_octave_;
+  uint32_t last_note_;
+  uint16_t note_duration_;
+
+  uint32_t output_freq_;
+  output::FloatOutput *output_;
+
+  CallbackManager<void()> on_finished_playback_callback_;
+};
+
+template<typename... Ts> class PlayAction : public Action<Ts...> {
+ public:
+  PlayAction(Rtttl *rtttl) : rtttl_(rtttl) {}
+  TEMPLATABLE_VALUE(std::string, value)
+
+  void play(Ts... x) override { this->rtttl_->play(this->value_.value(x...)); }
+
+ protected:
+  Rtttl *rtttl_;
+};
+
+template<typename... Ts> class StopAction : public Action<Ts...>, public Parented<Rtttl> {
+ public:
+  void play(Ts... x) override { this->parent_->stop(); }
+};
+
+template<typename... Ts> class IsPlayingCondition : public Condition<Ts...>, public Parented<Rtttl> {
+ public:
+  bool check(Ts... x) override { return this->parent_->is_playing(); }
+};
+
+class FinishedPlaybackTrigger : public Trigger<> {
+ public:
+  explicit FinishedPlaybackTrigger(Rtttl *parent) {
+    parent->add_on_finished_playback_callback([this]() { this->trigger(); });
+  }
+};
+
+}  // namespace rtttl
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 84af00e90a..3738edd1de 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1773,3 +1773,6 @@ sn74hc595:
     latch_pin: GPIO22
     oe_pin: GPIO32
     sr_count: 2
+
+rtttl:
+  output: gpio_19

From bf3b6787275d76ec62bd7aed0d8a63a36fe18914 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 25 Jul 2020 19:26:30 +0200
Subject: [PATCH 368/412] Update bump-version script

---
 script/bump-version.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/script/bump-version.py b/script/bump-version.py
index 7895735844..b59f066db4 100755
--- a/script/bump-version.py
+++ b/script/bump-version.py
@@ -73,20 +73,12 @@ def write_version(version: Version):
 def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('new_version', type=str)
-    parser.add_argument('--commit', action='store_true')
     args = parser.parse_args()
 
-    if args.commit and subprocess.call(["git", "diff", "--quiet"]) == 1:
-        print("Cannot use --commit because git is dirty.")
-        return 1
-
     version = Version.parse(args.new_version)
     print(f"Bumping to {version}")
     write_version(version)
-
-    if args.commit:
-        subprocess.check_call(["git", "commit", "-nam", f"Bump version to v{version}"])
-    return 1
+    return 0
 
 
 if __name__ == "__main__":

From 8215a018e97c8506ffe08c913580514b8faf89a8 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sat, 25 Jul 2020 17:19:13 -0300
Subject: [PATCH 369/412] Add @glmnet components (#1200)

---
 CODEOWNERS                                | 4 ++++
 esphome/components/ac_dimmer/output.py    | 2 ++
 esphome/components/climate_ir/__init__.py | 1 +
 esphome/components/coolix/climate.py      | 1 +
 esphome/components/dfplayer/__init__.py   | 1 +
 esphome/components/rtttl/__init__.py      | 1 +
 esphome/components/sim800l/__init__.py    | 4 ++--
 esphome/components/tcl112/climate.py      | 1 +
 esphome/components/tm1637/display.py      | 2 ++
 esphome/components/whirlpool/climate.py   | 1 +
 10 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 79b2d0503c..2254ff2caa 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -18,8 +18,10 @@ esphome/components/bang_bang/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
 esphome/components/captive_portal/* @OttoWinter
 esphome/components/climate/* @esphome/core
+esphome/components/climate_ir/* @glmnet
 esphome/components/cover/* @esphome/core
 esphome/components/debug/* @OttoWinter
+esphome/components/dfplayer/* @glmnet
 esphome/components/dht/* @OttoWinter
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/fastled_base/* @OttoWinter
@@ -40,9 +42,11 @@ esphome/components/pid/* @OttoWinter
 esphome/components/pn532/* @OttoWinter
 esphome/components/power_supply/* @esphome/core
 esphome/components/restart/* @esphome/core
+esphome/components/rtttl/* @glmnet
 esphome/components/script/* @esphome/core
 esphome/components/sensor/* @esphome/core
 esphome/components/shutdown/* @esphome/core
+esphome/components/sim800l/* @glmnet
 esphome/components/spi/* @esphome/core
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
diff --git a/esphome/components/ac_dimmer/output.py b/esphome/components/ac_dimmer/output.py
index 16f04ac984..17dcd8ac26 100644
--- a/esphome/components/ac_dimmer/output.py
+++ b/esphome/components/ac_dimmer/output.py
@@ -4,6 +4,8 @@ from esphome import pins
 from esphome.components import output
 from esphome.const import CONF_ID, CONF_MIN_POWER, CONF_METHOD
 
+CODEOWNERS = ['@glmnet']
+
 ac_dimmer_ns = cg.esphome_ns.namespace('ac_dimmer')
 AcDimmer = ac_dimmer_ns.class_('AcDimmer', output.FloatOutput, cg.Component)
 
diff --git a/esphome/components/climate_ir/__init__.py b/esphome/components/climate_ir/__init__.py
index 1163705faa..40ab3f22e8 100644
--- a/esphome/components/climate_ir/__init__.py
+++ b/esphome/components/climate_ir/__init__.py
@@ -6,6 +6,7 @@ from esphome.const import CONF_SUPPORTS_COOL, CONF_SUPPORTS_HEAT, CONF_SENSOR
 from esphome.core import coroutine
 
 AUTO_LOAD = ['sensor', 'remote_base']
+CODEOWNERS = ['@glmnet']
 
 climate_ir_ns = cg.esphome_ns.namespace('climate_ir')
 ClimateIR = climate_ir_ns.class_('ClimateIR', climate.Climate, cg.Component,
diff --git a/esphome/components/coolix/climate.py b/esphome/components/coolix/climate.py
index 81412bb586..075fad5a4b 100644
--- a/esphome/components/coolix/climate.py
+++ b/esphome/components/coolix/climate.py
@@ -4,6 +4,7 @@ from esphome.components import climate_ir
 from esphome.const import CONF_ID
 
 AUTO_LOAD = ['climate_ir']
+CODEOWNERS = ['@glmnet']
 
 coolix_ns = cg.esphome_ns.namespace('coolix')
 CoolixClimate = coolix_ns.class_('CoolixClimate', climate_ir.ClimateIR)
diff --git a/esphome/components/dfplayer/__init__.py b/esphome/components/dfplayer/__init__.py
index 890c2bede4..680a6b89ec 100644
--- a/esphome/components/dfplayer/__init__.py
+++ b/esphome/components/dfplayer/__init__.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_ID, CONF_TRIGGER_ID, CONF_FILE, CONF_DEVICE
 from esphome.components import uart
 
 DEPENDENCIES = ['uart']
+CODEOWNERS = ['@glmnet']
 
 dfplayer_ns = cg.esphome_ns.namespace('dfplayer')
 DFPlayer = dfplayer_ns.class_('DFPlayer', cg.Component)
diff --git a/esphome/components/rtttl/__init__.py b/esphome/components/rtttl/__init__.py
index df227ab20f..a276f7cb86 100644
--- a/esphome/components/rtttl/__init__.py
+++ b/esphome/components/rtttl/__init__.py
@@ -4,6 +4,7 @@ from esphome import automation
 from esphome.components.output import FloatOutput
 from esphome.const import CONF_ID, CONF_OUTPUT, CONF_TRIGGER_ID
 
+CODEOWNERS = ['@glmnet']
 CONF_RTTTL = 'rtttl'
 CONF_ON_FINISHED_PLAYBACK = 'on_finished_playback'
 
diff --git a/esphome/components/sim800l/__init__.py b/esphome/components/sim800l/__init__.py
index c64112570a..762e045598 100644
--- a/esphome/components/sim800l/__init__.py
+++ b/esphome/components/sim800l/__init__.py
@@ -5,6 +5,8 @@ from esphome.const import CONF_ID, CONF_TRIGGER_ID
 from esphome.components import uart
 
 DEPENDENCIES = ['uart']
+CODEOWNERS = ['@glmnet']
+MULTI_CONF = True
 
 sim800l_ns = cg.esphome_ns.namespace('sim800l')
 Sim800LComponent = sim800l_ns.class_('Sim800LComponent', cg.Component)
@@ -16,8 +18,6 @@ Sim800LReceivedMessageTrigger = sim800l_ns.class_('Sim800LReceivedMessageTrigger
 # Actions
 Sim800LSendSmsAction = sim800l_ns.class_('Sim800LSendSmsAction', automation.Action)
 
-MULTI_CONF = True
-
 CONF_ON_SMS_RECEIVED = 'on_sms_received'
 CONF_RECIPIENT = 'recipient'
 CONF_MESSAGE = 'message'
diff --git a/esphome/components/tcl112/climate.py b/esphome/components/tcl112/climate.py
index 3c94f4a243..11ebdc7be8 100644
--- a/esphome/components/tcl112/climate.py
+++ b/esphome/components/tcl112/climate.py
@@ -4,6 +4,7 @@ from esphome.components import climate_ir
 from esphome.const import CONF_ID
 
 AUTO_LOAD = ['climate_ir']
+CODEOWNERS = ['@glmnet']
 
 tcl112_ns = cg.esphome_ns.namespace('tcl112')
 Tcl112Climate = tcl112_ns.class_('Tcl112Climate', climate_ir.ClimateIR)
diff --git a/esphome/components/tm1637/display.py b/esphome/components/tm1637/display.py
index dcc4b82719..c2692e30de 100644
--- a/esphome/components/tm1637/display.py
+++ b/esphome/components/tm1637/display.py
@@ -4,6 +4,8 @@ from esphome import pins
 from esphome.components import display
 from esphome.const import CONF_CLK_PIN, CONF_DIO_PIN, CONF_ID, CONF_LAMBDA, CONF_INTENSITY
 
+CODEOWNERS = ['@glmnet']
+
 tm1637_ns = cg.esphome_ns.namespace('tm1637')
 TM1637Display = tm1637_ns.class_('TM1637Display', cg.PollingComponent)
 TM1637DisplayRef = TM1637Display.operator('ref')
diff --git a/esphome/components/whirlpool/climate.py b/esphome/components/whirlpool/climate.py
index 1083b86618..1fd62b411a 100644
--- a/esphome/components/whirlpool/climate.py
+++ b/esphome/components/whirlpool/climate.py
@@ -4,6 +4,7 @@ from esphome.components import climate_ir
 from esphome.const import CONF_ID, CONF_MODEL
 
 AUTO_LOAD = ['climate_ir']
+CODEOWNERS = ['@glmnet']
 
 whirlpool_ns = cg.esphome_ns.namespace('whirlpool')
 WhirlpoolClimate = whirlpool_ns.class_('WhirlpoolClimate', climate_ir.ClimateIR)

From 1c3ed71d3625d909eb664ed1551e1a7efe716eb3 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 25 Jul 2020 23:19:10 +0200
Subject: [PATCH 370/412] Fix bump-version script

---
 script/bump-version.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/bump-version.py b/script/bump-version.py
index b59f066db4..ebc73c5700 100755
--- a/script/bump-version.py
+++ b/script/bump-version.py
@@ -45,9 +45,9 @@ class Version:
 def sub(path, pattern, repl, expected_count=1):
     with open(path) as fh:
         content = fh.read()
-    content, count = re.subn(pattern, repl, content, re.MULTILINE)
+    content, count = re.subn(pattern, repl, content, flags=re.MULTILINE)
     if expected_count is not None:
-        assert count == expected_count
+        assert count == expected_count, f"Pattern {pattern} replacement failed!"
     with open(path, "wt") as fh:
         fh.write(content)
 

From f61a82a568ccb0a8129e34fdcfead4215631ae88 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 26 Jul 2020 10:16:54 +0200
Subject: [PATCH 371/412] Fix bump-version string format

---
 script/bump-version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/bump-version.py b/script/bump-version.py
index ebc73c5700..2e03ef6f62 100755
--- a/script/bump-version.py
+++ b/script/bump-version.py
@@ -66,7 +66,7 @@ def write_version(version: Version):
     sub(
         'esphome/const.py',
         r"^PATCH_VERSION = .*$",
-        f"PATCH_VERSION = {version.full_patch}"
+        f"PATCH_VERSION = '{version.full_patch}''"
     )
 
 

From abc83f6cb0de99b649fde39a110463bfde1e39fe Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 26 Jul 2020 13:50:45 +0200
Subject: [PATCH 372/412] Fix typo in bump-version script once again

---
 script/bump-version.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/bump-version.py b/script/bump-version.py
index 2e03ef6f62..56062ac5cf 100755
--- a/script/bump-version.py
+++ b/script/bump-version.py
@@ -66,7 +66,7 @@ def write_version(version: Version):
     sub(
         'esphome/const.py',
         r"^PATCH_VERSION = .*$",
-        f"PATCH_VERSION = '{version.full_patch}''"
+        f"PATCH_VERSION = '{version.full_patch}'"
     )
 
 

From 25ad33a3775080b8bb7a672c64afc3ea29a5cd28 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 27 Jul 2020 00:33:16 +1200
Subject: [PATCH 373/412] Add @jesserockz to codeowners (#1202)

Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 CODEOWNERS                                    | 11 +++++
 esphome/components/ct_clamp/sensor.py         |  1 +
 esphome/components/rf_bridge/__init__.py      |  1 +
 .../components/tuya/binary_sensor/__init__.py |  1 +
 esphome/components/tuya/climate/__init__.py   |  1 +
 esphome/components/tuya/sensor/__init__.py    |  1 +
 esphome/components/tuya/switch/__init__.py    |  1 +
 script/build_codeowners.py                    | 44 +++++++++++++++----
 8 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 2254ff2caa..1722f482ac 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -11,6 +11,7 @@ esphome/*.py @esphome/core
 esphome/core/* @esphome/core
 
 # Integrations
+esphome/components/ac_dimmer/* @glmnet
 esphome/components/adc/* @esphome/core
 esphome/components/api/* @OttoWinter
 esphome/components/async_tcp/* @OttoWinter
@@ -19,7 +20,9 @@ esphome/components/binary_sensor/* @esphome/core
 esphome/components/captive_portal/* @OttoWinter
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
+esphome/components/coolix/* @glmnet
 esphome/components/cover/* @esphome/core
+esphome/components/ct_clamp/* @jesserockz
 esphome/components/debug/* @OttoWinter
 esphome/components/dfplayer/* @glmnet
 esphome/components/dht/* @OttoWinter
@@ -42,6 +45,7 @@ esphome/components/pid/* @OttoWinter
 esphome/components/pn532/* @OttoWinter
 esphome/components/power_supply/* @esphome/core
 esphome/components/restart/* @esphome/core
+esphome/components/rf_bridge/* @jesserockz
 esphome/components/rtttl/* @glmnet
 esphome/components/script/* @esphome/core
 esphome/components/sensor/* @esphome/core
@@ -51,8 +55,15 @@ esphome/components/spi/* @esphome/core
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
 esphome/components/switch/* @esphome/core
+esphome/components/tcl112/* @glmnet
 esphome/components/time/* @OttoWinter
+esphome/components/tm1637/* @glmnet
+esphome/components/tuya/binary_sensor/* @jesserockz
+esphome/components/tuya/climate/* @jesserockz
+esphome/components/tuya/sensor/* @jesserockz
+esphome/components/tuya/switch/* @jesserockz
 esphome/components/uart/* @esphome/core
 esphome/components/ultrasonic/* @OttoWinter
 esphome/components/version/* @esphome/core
 esphome/components/web_server_base/* @OttoWinter
+esphome/components/whirlpool/* @glmnet
diff --git a/esphome/components/ct_clamp/sensor.py b/esphome/components/ct_clamp/sensor.py
index 9f41f8c614..42a3b66497 100644
--- a/esphome/components/ct_clamp/sensor.py
+++ b/esphome/components/ct_clamp/sensor.py
@@ -4,6 +4,7 @@ from esphome.components import sensor, voltage_sampler
 from esphome.const import CONF_SENSOR, CONF_ID, ICON_FLASH, UNIT_AMPERE
 
 AUTO_LOAD = ['voltage_sampler']
+CODEOWNERS = ['@jesserockz']
 
 CONF_SAMPLE_DURATION = 'sample_duration'
 
diff --git a/esphome/components/rf_bridge/__init__.py b/esphome/components/rf_bridge/__init__.py
index 1fd4fbc7bd..885e5765dd 100644
--- a/esphome/components/rf_bridge/__init__.py
+++ b/esphome/components/rf_bridge/__init__.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_ID, CONF_TRIGGER_ID, CONF_CODE, CONF_LOW, CONF_SY
 from esphome.components import uart
 
 DEPENDENCIES = ['uart']
+CODEOWNERS = ['@jesserockz']
 
 rf_bridge_ns = cg.esphome_ns.namespace('rf_bridge')
 RFBridgeComponent = rf_bridge_ns.class_('RFBridgeComponent', cg.Component, uart.UARTDevice)
diff --git a/esphome/components/tuya/binary_sensor/__init__.py b/esphome/components/tuya/binary_sensor/__init__.py
index 3ba479bf19..b63638b4cc 100644
--- a/esphome/components/tuya/binary_sensor/__init__.py
+++ b/esphome/components/tuya/binary_sensor/__init__.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_ID
 from .. import tuya_ns, CONF_TUYA_ID, Tuya
 
 DEPENDENCIES = ['tuya']
+CODEOWNERS = ['@jesserockz']
 
 CONF_SENSOR_DATAPOINT = "sensor_datapoint"
 
diff --git a/esphome/components/tuya/climate/__init__.py b/esphome/components/tuya/climate/__init__.py
index b938be7b8c..878c5aefe8 100644
--- a/esphome/components/tuya/climate/__init__.py
+++ b/esphome/components/tuya/climate/__init__.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_ID, CONF_SWITCH_DATAPOINT
 from .. import tuya_ns, CONF_TUYA_ID, Tuya
 
 DEPENDENCIES = ['tuya']
+CODEOWNERS = ['@jesserockz']
 
 CONF_TARGET_TEMPERATURE_DATAPOINT = "target_temperature_datapoint"
 CONF_CURRENT_TEMPERATURE_DATAPOINT = "current_temperature_datapoint"
diff --git a/esphome/components/tuya/sensor/__init__.py b/esphome/components/tuya/sensor/__init__.py
index 5f2ff2d674..b3260bfe0b 100644
--- a/esphome/components/tuya/sensor/__init__.py
+++ b/esphome/components/tuya/sensor/__init__.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_ID
 from .. import tuya_ns, CONF_TUYA_ID, Tuya
 
 DEPENDENCIES = ['tuya']
+CODEOWNERS = ['@jesserockz']
 
 CONF_SENSOR_DATAPOINT = "sensor_datapoint"
 
diff --git a/esphome/components/tuya/switch/__init__.py b/esphome/components/tuya/switch/__init__.py
index 0eadcf0a22..f68bbbcdb6 100644
--- a/esphome/components/tuya/switch/__init__.py
+++ b/esphome/components/tuya/switch/__init__.py
@@ -5,6 +5,7 @@ from esphome.const import CONF_ID, CONF_SWITCH_DATAPOINT
 from .. import tuya_ns, CONF_TUYA_ID, Tuya
 
 DEPENDENCIES = ['tuya']
+CODEOWNERS = ['@jesserockz']
 
 TuyaSwitch = tuya_ns.class_('TuyaSwitch', switch.Switch, cg.Component)
 
diff --git a/script/build_codeowners.py b/script/build_codeowners.py
index 3f2bf5d8c3..fce59b3b95 100755
--- a/script/build_codeowners.py
+++ b/script/build_codeowners.py
@@ -2,9 +2,10 @@
 from pathlib import Path
 import sys
 import argparse
+from collections import defaultdict
 
 from esphome.helpers import write_file_if_changed
-from esphome.config import get_component
+from esphome.config import get_component, get_platform
 from esphome.core import CORE
 
 parser = argparse.ArgumentParser()
@@ -37,20 +38,47 @@ parts = [BASE]
 # Fake some diretory so that get_component works
 CORE.config_path = str(root)
 
-for path in sorted(components_dir.iterdir()):
+codeowners = defaultdict(list)
+
+for path in components_dir.iterdir():
     if not path.is_dir():
         continue
     if not (path / '__init__.py').is_file():
         continue
+
     name = path.name
     comp = get_component(name)
-    if comp.codeowners:
-        for owner in comp.codeowners:
-            if not owner.startswith('@'):
-                print(f"Codeowner {owner} for integration {name} must start with an '@' symbol!")
-                sys.exit(1)
+    codeowners[f'esphome/components/{name}/*'].extend(comp.codeowners)
+
+    for platform_path in path.iterdir():
+        platform_name = platform_path.stem
+        platform = get_platform(platform_name, name)
+        if platform is None:
+            continue
+
+        if platform_path.is_dir():
+            # Sub foldered platforms get their own line
+            if not (platform_path / '__init__.py').is_file():
+                continue
+            codeowners[f'esphome/components/{name}/{platform_name}/*'].extend(platform.codeowners)
+            continue
+
+        # Non-subfoldered platforms add to codeowners at component level
+        if not platform_path.is_file() or platform_path.name == '__init__.py':
+            continue
+        codeowners[f'esphome/components/{name}/*'].extend(platform.codeowners)
+
+
+for path, owners in sorted(codeowners.items()):
+    owners = sorted(set(owners))
+    if not owners:
+        continue
+    for owner in owners:
+        if not owner.startswith('@'):
+            print(f"Codeowner {owner} for integration {path} must start with an '@' symbol!")
+            sys.exit(1)
+    parts.append(f"{path} {' '.join(owners)}")
 
-        parts.append(f"esphome/components/{name}/* {' '.join(comp.codeowners)}")
 
 # End newline
 parts.append('')

From bd392e2efc2ea0c4df12ac91071ba3840a77c239 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Sun, 26 Jul 2020 07:34:11 -0500
Subject: [PATCH 374/412] Fix set point logging issue (#1201)

---
 .../thermostat/thermostat_climate.cpp         | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index 1ffbd3c169..64a7c1b05d 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -507,10 +507,18 @@ Trigger<> *ThermostatClimate::get_swing_mode_horizontal_trigger() const { return
 Trigger<> *ThermostatClimate::get_swing_mode_vertical_trigger() const { return this->swing_mode_vertical_trigger_; }
 void ThermostatClimate::dump_config() {
   LOG_CLIMATE("", "Thermostat", this);
-  if (this->supports_heat_)
-    ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature_low);
-  if ((this->supports_cool_) || (this->supports_fan_only_))
-    ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature_high);
+  if (this->supports_heat_) {
+    if (this->supports_two_points_)
+      ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature_low);
+    else
+      ESP_LOGCONFIG(TAG, "  Default Target Temperature Low: %.1f°C", this->normal_config_.default_temperature);
+  }
+  if ((this->supports_cool_) || (this->supports_fan_only_)) {
+    if (this->supports_two_points_)
+      ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature_high);
+    else
+      ESP_LOGCONFIG(TAG, "  Default Target Temperature High: %.1f°C", this->normal_config_.default_temperature);
+  }
   ESP_LOGCONFIG(TAG, "  Hysteresis: %.1f°C", this->hysteresis_);
   ESP_LOGCONFIG(TAG, "  Supports AUTO: %s", YESNO(this->supports_auto_));
   ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
@@ -533,11 +541,20 @@ void ThermostatClimate::dump_config() {
   ESP_LOGCONFIG(TAG, "  Supports TWO SET POINTS: %s", YESNO(this->supports_two_points_));
   ESP_LOGCONFIG(TAG, "  Supports AWAY mode: %s", YESNO(this->supports_away_));
   if (this->supports_away_) {
-    if (this->supports_heat_)
-      ESP_LOGCONFIG(TAG, "    Away Default Target Temperature Low: %.1f°C", this->away_config_.default_temperature_low);
-    if ((this->supports_cool_) || (this->supports_fan_only_))
-      ESP_LOGCONFIG(TAG, "    Away Default Target Temperature High: %.1f°C",
-                    this->away_config_.default_temperature_high);
+    if (this->supports_heat_) {
+      if (this->supports_two_points_)
+        ESP_LOGCONFIG(TAG, "    Away Default Target Temperature Low: %.1f°C",
+                      this->away_config_.default_temperature_low);
+      else
+        ESP_LOGCONFIG(TAG, "    Away Default Target Temperature Low: %.1f°C", this->away_config_.default_temperature);
+    }
+    if ((this->supports_cool_) || (this->supports_fan_only_)) {
+      if (this->supports_two_points_)
+        ESP_LOGCONFIG(TAG, "    Away Default Target Temperature High: %.1f°C",
+                      this->away_config_.default_temperature_high);
+      else
+        ESP_LOGCONFIG(TAG, "    Away Default Target Temperature High: %.1f°C", this->away_config_.default_temperature);
+    }
   }
 }
 

From 65a489ebddb963c903a193f54ccba5db7807f701 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 26 Jul 2020 15:43:10 +0200
Subject: [PATCH 375/412] Revert "Added auto discovery and setup to Dallas
 Platform (#1028)" (#1189)

This reverts commit 021055f0b8c8f450fdfed5a57d34f796cae68b46.
---
 esphome/components/dallas/__init__.py         | 26 +------------
 .../components/dallas/dallas_component.cpp    | 37 -------------------
 esphome/components/dallas/dallas_component.h  | 20 ----------
 3 files changed, 1 insertion(+), 82 deletions(-)

diff --git a/esphome/components/dallas/__init__.py b/esphome/components/dallas/__init__.py
index 28fc9785ad..85ab4300ee 100644
--- a/esphome/components/dallas/__init__.py
+++ b/esphome/components/dallas/__init__.py
@@ -1,18 +1,12 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
-from esphome.const import CONF_ID, CONF_PIN, \
-    CONF_RESOLUTION, CONF_UNIT_OF_MEASUREMENT, UNIT_CELSIUS, \
-    CONF_ICON, ICON_THERMOMETER, CONF_ACCURACY_DECIMALS
+from esphome.const import CONF_ID, CONF_PIN
 
 MULTI_CONF = True
 AUTO_LOAD = ['sensor']
 
 CONF_ONE_WIRE_ID = 'one_wire_id'
-CONF_AUTO_SETUP_SENSORS = 'auto_setup_sensors'
-CONF_SENSOR_NAME_TEMPLATE = 'sensor_name_template'
-SENSOR_NAME_TEMPLATE_DEFAULT = '%s.%s'
-
 dallas_ns = cg.esphome_ns.namespace('dallas')
 DallasComponent = dallas_ns.class_('DallasComponent', cg.PollingComponent)
 ESPOneWire = dallas_ns.class_('ESPOneWire')
@@ -21,12 +15,6 @@ CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(DallasComponent),
     cv.GenerateID(CONF_ONE_WIRE_ID): cv.declare_id(ESPOneWire),
     cv.Required(CONF_PIN): pins.gpio_input_pin_schema,
-    cv.Optional(CONF_AUTO_SETUP_SENSORS, default=False): cv.boolean,
-    cv.Optional(CONF_SENSOR_NAME_TEMPLATE, default=SENSOR_NAME_TEMPLATE_DEFAULT): cv.string_strict,
-    cv.Optional(CONF_RESOLUTION, default=12): cv.int_range(min=9, max=12),
-    cv.Optional(CONF_UNIT_OF_MEASUREMENT, default=UNIT_CELSIUS): cv.string_strict,
-    cv.Optional(CONF_ICON, default=ICON_THERMOMETER): cv.icon,
-    cv.Optional(CONF_ACCURACY_DECIMALS, default=1): cv.int_,
 }).extend(cv.polling_component_schema('60s'))
 
 
@@ -34,16 +22,4 @@ def to_code(config):
     pin = yield cg.gpio_pin_expression(config[CONF_PIN])
     one_wire = cg.new_Pvariable(config[CONF_ONE_WIRE_ID], pin)
     var = cg.new_Pvariable(config[CONF_ID], one_wire)
-    if CONF_AUTO_SETUP_SENSORS in config:
-        cg.add(var.set_auto_setup_sensors(config[CONF_AUTO_SETUP_SENSORS]))
-    if CONF_SENSOR_NAME_TEMPLATE in config:
-        cg.add(var.set_sensor_name_template(config[CONF_SENSOR_NAME_TEMPLATE]))
-    if CONF_RESOLUTION in config:
-        cg.add(var.set_resolution(config[CONF_RESOLUTION]))
-    if CONF_UNIT_OF_MEASUREMENT in config:
-        cg.add(var.set_unit_of_measurement(config[CONF_UNIT_OF_MEASUREMENT]))
-    if CONF_ICON in config:
-        cg.add(var.set_icon(config[CONF_ICON]))
-    if CONF_ACCURACY_DECIMALS in config:
-        cg.add(var.set_accuracy_decimals(config[CONF_ACCURACY_DECIMALS]))
     yield cg.register_component(var, config)
diff --git a/esphome/components/dallas/dallas_component.cpp b/esphome/components/dallas/dallas_component.cpp
index d657f6c498..aa839e7331 100644
--- a/esphome/components/dallas/dallas_component.cpp
+++ b/esphome/components/dallas/dallas_component.cpp
@@ -1,6 +1,5 @@
 #include "dallas_component.h"
 #include "esphome/core/log.h"
-#include "esphome/core/application.h"
 
 namespace esphome {
 namespace dallas {
@@ -53,29 +52,6 @@ void DallasComponent::setup() {
       continue;
     }
     this->found_sensors_.push_back(address);
-
-    if (this->auto_setup_sensors_) {
-      // avoid re-generating  pre-configured sensors
-      bool skip = false;
-      for (auto sensor : this->sensors_) {
-        if (sensor->get_address() == address) {
-          skip = true;
-          break;
-        }
-      }
-      if (!skip) {
-        auto dallastemperaturesensor = this->get_sensor_by_address(address, this->resolution_);
-        char sensor_name[64];
-        snprintf(sensor_name, sizeof(sensor_name), this->sensor_name_template_.c_str(), App.get_name().c_str(),
-                 s.c_str());
-        dallastemperaturesensor->set_name(sensor_name);
-        dallastemperaturesensor->set_unit_of_measurement(this->unit_of_measurement_);
-        dallastemperaturesensor->set_icon(this->icon_);
-        dallastemperaturesensor->set_accuracy_decimals(this->accuracy_decimals_);
-        dallastemperaturesensor->set_force_update(false);
-        App.register_sensor(dallastemperaturesensor);
-      }
-    }
   }
 
   for (auto sensor : this->sensors_) {
@@ -180,25 +156,12 @@ void DallasComponent::update() {
   }
 }
 DallasComponent::DallasComponent(ESPOneWire *one_wire) : one_wire_(one_wire) {}
-void DallasComponent::set_auto_setup_sensors(bool auto_setup_sensors) {
-  this->auto_setup_sensors_ = auto_setup_sensors;
-}
-void DallasComponent::set_sensor_name_template(const std::string &sensor_name_template) {
-  this->sensor_name_template_ = sensor_name_template;
-}
-void DallasComponent::set_resolution(uint8_t resolution) { this->resolution_ = resolution; }
-void DallasComponent::set_unit_of_measurement(const std::string &unit_of_measurement) {
-  this->unit_of_measurement_ = unit_of_measurement;
-}
-void DallasComponent::set_icon(const std::string &icon) { this->icon_ = icon; }
-void DallasComponent::set_accuracy_decimals(int8_t accuracy_decimals) { this->accuracy_decimals_ = accuracy_decimals; }
 
 DallasTemperatureSensor::DallasTemperatureSensor(uint64_t address, uint8_t resolution, DallasComponent *parent)
     : parent_(parent) {
   this->set_address(address);
   this->set_resolution(resolution);
 }
-const uint64_t &DallasTemperatureSensor::get_address() const { return this->address_; }
 void DallasTemperatureSensor::set_address(uint64_t address) { this->address_ = address; }
 uint8_t DallasTemperatureSensor::get_resolution() const { return this->resolution_; }
 void DallasTemperatureSensor::set_resolution(uint8_t resolution) { this->resolution_ = resolution; }
diff --git a/esphome/components/dallas/dallas_component.h b/esphome/components/dallas/dallas_component.h
index f2acf09d75..d32aec1758 100644
--- a/esphome/components/dallas/dallas_component.h
+++ b/esphome/components/dallas/dallas_component.h
@@ -22,30 +22,12 @@ class DallasComponent : public PollingComponent {
 
   void update() override;
 
-  /// Automatic sensors instantiation
-  bool get_auto_setup_sensors() const;
-  void set_auto_setup_sensors(bool auto_setup_sensors);
-
-  /// Get/Set properties for automatically generated sensors.
-  void set_sensor_name_template(const std::string &sensor_name_template);
-  void set_resolution(uint8_t resolution);
-  void set_unit_of_measurement(const std::string &unit_of_measurement);
-  void set_icon(const std::string &icon);
-  void set_accuracy_decimals(int8_t accuracy_decimals);
-
  protected:
   friend DallasTemperatureSensor;
 
   ESPOneWire *one_wire_;
   std::vector<DallasTemperatureSensor *> sensors_;
   std::vector<uint64_t> found_sensors_;
-
-  bool auto_setup_sensors_;
-  std::string sensor_name_template_;
-  uint8_t resolution_;
-  std::string unit_of_measurement_;
-  std::string icon_;
-  int8_t accuracy_decimals_;
 };
 
 /// Internal class that helps us create multiple sensors for one Dallas hub.
@@ -58,8 +40,6 @@ class DallasTemperatureSensor : public sensor::Sensor {
   /// Helper to create (and cache) the name for this sensor. For example "0xfe0000031f1eaf29".
   const std::string &get_address_name();
 
-  /// Get the 64-bit unsigned address of this sensor.
-  const uint64_t &get_address() const;
   /// Set the 64-bit unsigned address for this sensor.
   void set_address(uint64_t address);
   /// Get the index of this sensor. (0 if using address.)

From c1748d586ece984ec98b01a9a77a0ea2908571b9 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 26 Jul 2020 22:12:58 +0200
Subject: [PATCH 376/412] Bump version to v1.15.0b1

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 57694c4088..02c10c664b 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION = 1
 MINOR_VERSION = 15
-PATCH_VERSION = '0-dev'
+PATCH_VERSION = '0b1'
 __short_version__ = f'{MAJOR_VERSION}.{MINOR_VERSION}'
 __version__ = f'{__short_version__}.{PATCH_VERSION}'
 

From 20929393532c8e17d1dc647ef47b0f36936bf80a Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 26 Jul 2020 22:42:59 +0200
Subject: [PATCH 377/412] Also run CI checks when merging against beta/master

---
 .github/workflows/ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ce6a120f7a..b26f7e2f43 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,9 +9,6 @@ on:
     branches: [beta, master]
 
   pull_request:
-    # Only run when PR is against dev branch (all PRs should be against dev branch)
-    # Helps prevent accidentally merging PRs against master branch
-    branches: [dev]
 
 jobs:
   # A fast overview job that checks only changed files

From 9c0e4636985763273e76109490c616ed4a47d9c7 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 26 Jul 2020 22:48:50 +0200
Subject: [PATCH 378/412] Fix bad merge for UART

---
 esphome/components/uart/uart.cpp | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/esphome/components/uart/uart.cpp b/esphome/components/uart/uart.cpp
index 9bc2086519..1cfdb38a90 100644
--- a/esphome/components/uart/uart.cpp
+++ b/esphome/components/uart/uart.cpp
@@ -61,7 +61,6 @@ void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits, UART
     ESP_LOGE(TAG, "  Invalid parity: Integration requested parity %s but you have %s!", parity_to_str(parity),
              parity_to_str(this->parent_->parity_));
   }
-  this->stop_bits_ = stop_bits;
 }
 
 const char *parity_to_str(UARTParityOptions parity) {
@@ -77,16 +76,5 @@ const char *parity_to_str(UARTParityOptions parity) {
   }
 }
 
-void UARTDevice::check_uart_settings(uint32_t baud_rate, uint8_t stop_bits) {
-  if (this->parent_->baud_rate_ != baud_rate) {
-    ESP_LOGE(TAG, "  Invalid baud_rate: Integration requested baud_rate %u but you have %u!", baud_rate,
-             this->parent_->baud_rate_);
-  }
-  if (this->parent_->stop_bits_ != stop_bits) {
-    ESP_LOGE(TAG, "  Invalid stop bits: Integration requested stop_bits %u but you have %u!", stop_bits,
-             this->parent_->stop_bits_);
-  }
-}
-
 }  // namespace uart
 }  // namespace esphome

From 4b8e910e3f8a7bc3efc6a433ed6d8d5a8e0a9dad Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 26 Jul 2020 22:59:46 +0200
Subject: [PATCH 379/412] Fix bad merge lint

---
 esphome/mqtt.py      | 1 -
 esphome/py_compat.py | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 esphome/py_compat.py

diff --git a/esphome/mqtt.py b/esphome/mqtt.py
index f46278018f..cbcf067c44 100644
--- a/esphome/mqtt.py
+++ b/esphome/mqtt.py
@@ -12,7 +12,6 @@ from esphome.const import CONF_BROKER, CONF_DISCOVERY_PREFIX, CONF_ESPHOME, \
     CONF_TOPIC, CONF_TOPIC_PREFIX, CONF_USERNAME
 from esphome.core import CORE, EsphomeError
 from esphome.helpers import color
-from esphome.py_compat import decode_text
 from esphome.util import safe_print
 
 _LOGGER = logging.getLogger(__name__)
diff --git a/esphome/py_compat.py b/esphome/py_compat.py
deleted file mode 100644
index e69de29bb2..0000000000

From 6438bd84fb057951cea308e99facd9949292efda Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 26 Jul 2020 23:18:09 +0200
Subject: [PATCH 380/412] Fix differences between dev and beta

---
 docker/Dockerfile.lint | 2 --
 script/ci-custom.py    | 1 -
 2 files changed, 3 deletions(-)

diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index d387cf19ed..fd1a3c5330 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -3,7 +3,5 @@ FROM esphome/esphome-lint-base:2.3.4
 COPY requirements.txt requirements_test.txt /
 RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt
 
-RUN ln -s /usr/bin/pip3 /usr/bin/pip && ln -f -s /usr/bin/python3 /usr/bin/python
-
 VOLUME ["/esphome"]
 WORKDIR /esphome
diff --git a/script/ci-custom.py b/script/ci-custom.py
index d0b7b6bb70..3954eea0de 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -7,7 +7,6 @@ import os.path
 import re
 import subprocess
 import sys
-import re
 
 
 def find_all(a_str, sub):

From 9483a9c8c443003d92b8bfe13d66b63f568f7463 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jul 2020 11:43:10 +0200
Subject: [PATCH 381/412] Update cryptography requirement from <3,>=2.0.0 to
 >=2.0.0,<4 (#1206)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/wifi/wpa2_eap.py | 2 --
 requirements_test.txt               | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/esphome/components/wifi/wpa2_eap.py b/esphome/components/wifi/wpa2_eap.py
index 5b83c59866..8bf50598b0 100644
--- a/esphome/components/wifi/wpa2_eap.py
+++ b/esphome/components/wifi/wpa2_eap.py
@@ -114,8 +114,6 @@ def _check_private_key_cert_match(key, cert):
 
 
 def validate_eap(value):
-    validate_cryptography_installed()
-
     if CONF_USERNAME in value:
         if CONF_IDENTITY not in value:
             _LOGGER.info("EAP 'identity:' is not set, assuming username.")
diff --git a/requirements_test.txt b/requirements_test.txt
index 179f683b32..e9846fb29c 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,7 +1,7 @@
 pylint==2.5.3
 flake8==3.8.3
 pillow>4.0.0
-cryptography>=2.0.0,<3
+cryptography>=2.0.0,<4
 pexpect==4.8.0
 
 # Unit tests

From f39bf9c1e59c648a30cb204033805a6807f3b6f9 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Mon, 27 Jul 2020 06:43:51 -0300
Subject: [PATCH 382/412] fix dashboard select drop down (#1205)

---
 esphome/dashboard/static/css/esphome.css |  5 +++++
 esphome/dashboard/static/js/esphome.js   | 13 ++++++++++++-
 esphome/dashboard/templates/index.html   |  6 +++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/esphome/dashboard/static/css/esphome.css b/esphome/dashboard/static/css/esphome.css
index db0ac55985..116170f95d 100644
--- a/esphome/dashboard/static/css/esphome.css
+++ b/esphome/dashboard/static/css/esphome.css
@@ -163,6 +163,11 @@ main {
   color: black;
 }
 
+nav {
+  height: auto;
+  line-height: normal;
+}
+
 .select-port-container {
   margin-top: 8px;
   margin-right: 10px;
diff --git a/esphome/dashboard/static/js/esphome.js b/esphome/dashboard/static/js/esphome.js
index d80e5e4ec9..52dda446ce 100644
--- a/esphome/dashboard/static/js/esphome.js
+++ b/esphome/dashboard/static/js/esphome.js
@@ -5,6 +5,7 @@ $(document).ready(function () {
   M.AutoInit(document.body);
   nodeGrid();
   startAceWebsocket();
+  fixNavbarHeight();
 });
 
 // WebSocket URL Helper
@@ -16,6 +17,17 @@ if (loc.protocol === "https:") {
 }
 const wsUrl = wsLoc.href;
 
+/**
+ * Fix NavBar height
+ */
+const fixNavbarHeight = () => {
+  const fixFunc = () => {
+    const sel = $(".select-wrapper");
+    $(".navbar-fixed").css("height", (sel.position().top + sel.outerHeight()) + "px");
+  }
+  $(window).resize(fixFunc);
+  fixFunc();
+}
 
 /**
  *  Dashboard Dynamic Grid
@@ -1003,4 +1015,3 @@ jQuery.validator.addMethod("nospaces", (value, element) => {
 jQuery.validator.addMethod("lowercase", (value, element) => {
   return value === value.toLowerCase();
 }, "Name must be all lower case!");
-
diff --git a/esphome/dashboard/templates/index.html b/esphome/dashboard/templates/index.html
index fa742fd2c6..d7ba9373be 100644
--- a/esphome/dashboard/templates/index.html
+++ b/esphome/dashboard/templates/index.html
@@ -31,8 +31,8 @@
 <body>
 
   <div class="navbar-fixed">
-    <nav>
-      <div class="nav-wrapper grey lighten-2">
+    <nav class="grey lighten-2">
+      <div class="nav-wrapper">
         <a href="#" class="black-text logo-wrapper">
           <img src="https://esphome.io/_static/logo-text.svg" alt="ESPHome Logo" class="logo">
         </a>
@@ -53,7 +53,7 @@
         <li><a data-action="edit" data-filename="secrets.yaml">Secrets Editor</a></li>
         <li class="divider"></li>
         {% if login_enabled %}
-          <li><a href="{{ relative_url }}logout">Logout</a></li>
+        <li><a href="{{ relative_url }}logout">Logout</a></li>
         {% end %}
       </ul>
     </nav>

From e898345ff108366be84e986d39e66550aafbf015 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 27 Jul 2020 12:07:05 +0200
Subject: [PATCH 383/412] Cleanup web server prometheus integration (#1192)

---
 esphome/components/prometheus/__init__.py     |  22 +++
 .../prometheus_handler.cpp}                   | 144 +++++++-----------
 .../prometheus_handler.h}                     |  32 +++-
 esphome/components/web_server/__init__.py     |   5 +-
 esphome/components/web_server/web_server.cpp  |  12 --
 esphome/components/web_server/web_server.h    |   7 -
 esphome/const.py                              |   1 -
 script/clang-tidy                             |   6 +-
 tests/test1.yaml                              |   1 -
 tests/test3.yaml                              |   1 -
 10 files changed, 106 insertions(+), 125 deletions(-)
 create mode 100644 esphome/components/prometheus/__init__.py
 rename esphome/components/{web_server/web_server_prometheus.cpp => prometheus/prometheus_handler.cpp} (69%)
 rename esphome/components/{web_server/web_server_prometheus.h => prometheus/prometheus_handler.h} (74%)

diff --git a/esphome/components/prometheus/__init__.py b/esphome/components/prometheus/__init__.py
new file mode 100644
index 0000000000..d015af9f78
--- /dev/null
+++ b/esphome/components/prometheus/__init__.py
@@ -0,0 +1,22 @@
+import esphome.config_validation as cv
+import esphome.codegen as cg
+from esphome.const import CONF_ID
+from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
+from esphome.components import web_server_base
+
+AUTO_LOAD = ['web_server_base']
+
+prometheus_ns = cg.esphome_ns.namespace('prometheus')
+PrometheusHandler = prometheus_ns.class_('PrometheusHandler', cg.Component)
+
+CONFIG_SCHEMA = cv.Schema({
+    cv.GenerateID(): cv.declare_id(PrometheusHandler),
+    cv.GenerateID(CONF_WEB_SERVER_BASE_ID): cv.use_id(web_server_base.WebServerBase),
+}).extend(cv.COMPONENT_SCHEMA)
+
+
+def to_code(config):
+    paren = yield cg.get_variable(config[CONF_WEB_SERVER_BASE_ID])
+
+    var = cg.new_Pvariable(config[CONF_ID], paren)
+    yield cg.register_component(var, config)
diff --git a/esphome/components/web_server/web_server_prometheus.cpp b/esphome/components/prometheus/prometheus_handler.cpp
similarity index 69%
rename from esphome/components/web_server/web_server_prometheus.cpp
rename to esphome/components/prometheus/prometheus_handler.cpp
index 4ba75c1673..06a0e39e2c 100644
--- a/esphome/components/web_server/web_server_prometheus.cpp
+++ b/esphome/components/prometheus/prometheus_handler.cpp
@@ -1,23 +1,11 @@
-#include "web_server.h"
-#include "web_server_prometheus.h"
-#include "esphome/core/log.h"
+#include "prometheus_handler.h"
 #include "esphome/core/application.h"
-#include "esphome/core/util.h"
-#include "esphome/components/json/json_util.h"
-
-#include "StreamString.h"
-
-#include <cstdlib>
-
-#ifdef USE_LOGGER
-#include <esphome/components/logger/logger.h>
-#endif
 
 namespace esphome {
-namespace web_server {
+namespace prometheus {
 
-void WebServerPrometheus::handle_request(AsyncWebServerRequest *request) {
-  AsyncResponseStream *stream = request->beginResponseStream("text/plain");
+void PrometheusHandler::handleRequest(AsyncWebServerRequest *req) {
+  AsyncResponseStream *stream = req->beginResponseStream("text/plain");
 
 #ifdef USE_SENSOR
   this->sensor_type_(stream);
@@ -55,16 +43,16 @@ void WebServerPrometheus::handle_request(AsyncWebServerRequest *request) {
     this->switch_row_(stream, obj);
 #endif
 
-  request->send(stream);
+  req->send(stream);
 }
 
 // Type-specific implementation
 #ifdef USE_SENSOR
-void WebServerPrometheus::sensor_type_(AsyncResponseStream *stream) {
+void PrometheusHandler::sensor_type_(AsyncResponseStream *stream) {
   stream->print(F("#TYPE esphome_sensor_value GAUGE\n"));
   stream->print(F("#TYPE esphome_sensor_failed GAUGE\n"));
 }
-void WebServerPrometheus::sensor_row_(AsyncResponseStream *stream, sensor::Sensor *obj) {
+void PrometheusHandler::sensor_row_(AsyncResponseStream *stream, sensor::Sensor *obj) {
   if (obj->is_internal())
     return;
   if (!isnan(obj->state)) {
@@ -97,14 +85,14 @@ void WebServerPrometheus::sensor_row_(AsyncResponseStream *stream, sensor::Senso
 
 // Type-specific implementation
 #ifdef USE_BINARY_SENSOR
-void WebServerPrometheus::binary_sensor_type_(AsyncResponseStream *stream) {
+void PrometheusHandler::binary_sensor_type_(AsyncResponseStream *stream) {
   stream->print(F("#TYPE esphome_binary_sensor_value GAUGE\n"));
   stream->print(F("#TYPE esphome_binary_sensor_failed GAUGE\n"));
 }
-void WebServerPrometheus::binary_sensor_row_(AsyncResponseStream *stream, binary_sensor::BinarySensor *obj) {
+void PrometheusHandler::binary_sensor_row_(AsyncResponseStream *stream, binary_sensor::BinarySensor *obj) {
   if (obj->is_internal())
     return;
-  if (!isnan(obj->state)) {
+  if (obj->has_state()) {
     // We have a valid value, output this value
     stream->print(F("esphome_binary_sensor_failed{id=\""));
     stream->print(obj->get_object_id().c_str());
@@ -131,68 +119,58 @@ void WebServerPrometheus::binary_sensor_row_(AsyncResponseStream *stream, binary
 #endif
 
 #ifdef USE_FAN
-void WebServerPrometheus::fan_type_(AsyncResponseStream *stream) {
+void PrometheusHandler::fan_type_(AsyncResponseStream *stream) {
   stream->print(F("#TYPE esphome_fan_value GAUGE\n"));
   stream->print(F("#TYPE esphome_fan_failed GAUGE\n"));
   stream->print(F("#TYPE esphome_fan_speed GAUGE\n"));
   stream->print(F("#TYPE esphome_fan_oscillation GAUGE\n"));
 }
-void WebServerPrometheus::fan_row_(AsyncResponseStream *stream, fan::FanState *obj) {
+void PrometheusHandler::fan_row_(AsyncResponseStream *stream, fan::FanState *obj) {
   if (obj->is_internal())
     return;
-  if (!isnan(obj->state)) {
-    // We have a valid value, output this value
-    stream->print(F("esphome_fan_failed{id=\""));
-    stream->print(obj->get_object_id().c_str());
-    stream->print(F("\",name=\""));
-    stream->print(obj->get_name().c_str());
-    stream->print(F("\"} 0\n"));
-    // Data itself
-    stream->print(F("esphome_fan_value{id=\""));
+  stream->print(F("esphome_fan_failed{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\"} 0\n"));
+  // Data itself
+  stream->print(F("esphome_fan_value{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\"} "));
+  stream->print(obj->state);
+  stream->print('\n');
+  // Speed if available
+  if (obj->get_traits().supports_speed()) {
+    stream->print(F("esphome_fan_speed{id=\""));
     stream->print(obj->get_object_id().c_str());
     stream->print(F("\",name=\""));
     stream->print(obj->get_name().c_str());
     stream->print(F("\"} "));
-    stream->print(obj->state);
+    stream->print(obj->speed);
     stream->print('\n');
-    // Speed if available
-    if (obj->get_traits().supports_speed()) {
-      stream->print(F("esphome_fan_speed{id=\""));
-      stream->print(obj->get_object_id().c_str());
-      stream->print(F("\",name=\""));
-      stream->print(obj->get_name().c_str());
-      stream->print(F("\"} "));
-      stream->print(obj->speed);
-      stream->print('\n');
-    }
-    // Oscillation if available
-    if (obj->get_traits().supports_oscillation()) {
-      stream->print(F("esphome_fan_oscillation{id=\""));
-      stream->print(obj->get_object_id().c_str());
-      stream->print(F("\",name=\""));
-      stream->print(obj->get_name().c_str());
-      stream->print(F("\"} "));
-      stream->print(obj->oscillating);
-      stream->print('\n');
-    }
-  } else {
-    // Invalid state
-    stream->print(F("esphome_fan_failed{id=\""));
+  }
+  // Oscillation if available
+  if (obj->get_traits().supports_oscillation()) {
+    stream->print(F("esphome_fan_oscillation{id=\""));
     stream->print(obj->get_object_id().c_str());
     stream->print(F("\",name=\""));
     stream->print(obj->get_name().c_str());
-    stream->print(F("\"} 1\n"));
+    stream->print(F("\"} "));
+    stream->print(obj->oscillating);
+    stream->print('\n');
   }
 }
 #endif
 
 #ifdef USE_LIGHT
-void WebServerPrometheus::light_type_(AsyncResponseStream *stream) {
+void PrometheusHandler::light_type_(AsyncResponseStream *stream) {
   stream->print(F("#TYPE esphome_light_state GAUGE\n"));
   stream->print(F("#TYPE esphome_light_color GAUGE\n"));
   stream->print(F("#TYPE esphome_light_effect_active GAUGE\n"));
 }
-void WebServerPrometheus::light_row_(AsyncResponseStream *stream, light::LightState *obj) {
+void PrometheusHandler::light_row_(AsyncResponseStream *stream, light::LightState *obj) {
   if (obj->is_internal())
     return;
   // State
@@ -264,11 +242,11 @@ void WebServerPrometheus::light_row_(AsyncResponseStream *stream, light::LightSt
 #endif
 
 #ifdef USE_COVER
-void WebServerPrometheus::cover_type_(AsyncResponseStream *stream) {
+void PrometheusHandler::cover_type_(AsyncResponseStream *stream) {
   stream->print(F("#TYPE esphome_cover_value GAUGE\n"));
   stream->print(F("#TYPE esphome_cover_failed GAUGE\n"));
 }
-void WebServerPrometheus::cover_row_(AsyncResponseStream *stream, cover::Cover *obj) {
+void PrometheusHandler::cover_row_(AsyncResponseStream *stream, cover::Cover *obj) {
   if (obj->is_internal())
     return;
   if (!isnan(obj->position)) {
@@ -307,38 +285,28 @@ void WebServerPrometheus::cover_row_(AsyncResponseStream *stream, cover::Cover *
 #endif
 
 #ifdef USE_SWITCH
-void WebServerPrometheus::switch_type_(AsyncResponseStream *stream) {
+void PrometheusHandler::switch_type_(AsyncResponseStream *stream) {
   stream->print(F("#TYPE esphome_switch_value GAUGE\n"));
   stream->print(F("#TYPE esphome_switch_failed GAUGE\n"));
 }
-void WebServerPrometheus::switch_row_(AsyncResponseStream *stream, switch_::Switch *obj) {
+void PrometheusHandler::switch_row_(AsyncResponseStream *stream, switch_::Switch *obj) {
   if (obj->is_internal())
     return;
-  if (!isnan(obj->state)) {
-    // We have a valid value, output this value
-    stream->print(F("esphome_switch_failed{id=\""));
-    stream->print(obj->get_object_id().c_str());
-    stream->print(F("\",name=\""));
-    stream->print(obj->get_name().c_str());
-    stream->print(F("\"} 0\n"));
-    // Data itself
-    stream->print(F("esphome_switch_value{id=\""));
-    stream->print(obj->get_object_id().c_str());
-    stream->print(F("\",name=\""));
-    stream->print(obj->get_name().c_str());
-    stream->print(F("\"} "));
-    stream->print(obj->state);
-    stream->print('\n');
-  } else {
-    // Invalid state
-    stream->print(F("esphome_switch_failed{id=\""));
-    stream->print(obj->get_object_id().c_str());
-    stream->print(F("\",name=\""));
-    stream->print(obj->get_name().c_str());
-    stream->print(F("\"} 1\n"));
-  }
+  stream->print(F("esphome_switch_failed{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\"} 0\n"));
+  // Data itself
+  stream->print(F("esphome_switch_value{id=\""));
+  stream->print(obj->get_object_id().c_str());
+  stream->print(F("\",name=\""));
+  stream->print(obj->get_name().c_str());
+  stream->print(F("\"} "));
+  stream->print(obj->state);
+  stream->print('\n');
 }
 #endif
 
-}  // namespace web_server
+}  // namespace prometheus
 }  // namespace esphome
diff --git a/esphome/components/web_server/web_server_prometheus.h b/esphome/components/prometheus/prometheus_handler.h
similarity index 74%
rename from esphome/components/web_server/web_server_prometheus.h
rename to esphome/components/prometheus/prometheus_handler.h
index 93682c1ed5..46ebc400f8 100644
--- a/esphome/components/web_server/web_server_prometheus.h
+++ b/esphome/components/prometheus/prometheus_handler.h
@@ -1,17 +1,31 @@
 #pragma once
 
-#include "esphome/core/component.h"
-#include "esphome/core/controller.h"
 #include "esphome/components/web_server_base/web_server_base.h"
+#include "esphome/core/controller.h"
+#include "esphome/core/component.h"
 
 namespace esphome {
-namespace web_server {
+namespace prometheus {
 
-class WebServerPrometheus {
+class PrometheusHandler : public AsyncWebHandler, public Component {
  public:
-  WebServerPrometheus(){};
-  /// Handle an prometheus metrics request under '/metrics'.
-  void handle_request(AsyncWebServerRequest *request);
+  PrometheusHandler(web_server_base::WebServerBase *base) : base_(base) {}
+
+  bool canHandle(AsyncWebServerRequest *request) override {
+    if (request->method() == HTTP_GET) {
+      if (request->url() == "/metrics")
+        return true;
+    }
+
+    return false;
+  }
+
+  void handleRequest(AsyncWebServerRequest *req) override;
+
+  void setup() override {
+    this->base_->init();
+    this->base_->add_handler(this);
+  }
 
  protected:
 #ifdef USE_SENSOR
@@ -55,7 +69,9 @@ class WebServerPrometheus {
   /// Return the switch Values state as prometheus data point
   void switch_row_(AsyncResponseStream *stream, switch_::Switch *obj);
 #endif
+
+  web_server_base::WebServerBase *base_;
 };
 
-}  // namespace web_server
+}  // namespace prometheus
 }  // namespace esphome
diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py
index be0a180a9d..2f0d179eba 100644
--- a/esphome/components/web_server/__init__.py
+++ b/esphome/components/web_server/__init__.py
@@ -4,7 +4,7 @@ from esphome.components import web_server_base
 from esphome.components.web_server_base import CONF_WEB_SERVER_BASE_ID
 from esphome.const import (
     CONF_CSS_INCLUDE, CONF_CSS_URL, CONF_ID, CONF_JS_INCLUDE, CONF_JS_URL, CONF_PORT,
-    CONF_AUTH, CONF_USERNAME, CONF_PASSWORD, CONF_PROMETHEUS)
+    CONF_AUTH, CONF_USERNAME, CONF_PASSWORD)
 from esphome.core import coroutine_with_priority
 
 AUTO_LOAD = ['json', 'web_server_base']
@@ -19,7 +19,6 @@ CONFIG_SCHEMA = cv.Schema({
     cv.Optional(CONF_CSS_INCLUDE): cv.file_,
     cv.Optional(CONF_JS_URL, default="https://esphome.io/_static/webserver-v1.min.js"): cv.string,
     cv.Optional(CONF_JS_INCLUDE): cv.file_,
-    cv.Optional(CONF_PROMETHEUS, default=False): cv.boolean,
     cv.Optional(CONF_AUTH): cv.Schema({
         cv.Required(CONF_USERNAME): cv.string_strict,
         cv.Required(CONF_PASSWORD): cv.string_strict,
@@ -50,5 +49,3 @@ def to_code(config):
         cg.add_define('WEBSERVER_JS_INCLUDE')
         with open(config[CONF_JS_INCLUDE], "r") as myfile:
             cg.add(var.set_js_include(myfile.read()))
-    if config[CONF_PROMETHEUS]:
-        cg.add_define('WEBSERVER_PROMETHEUS')
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index 7f0bb0f973..48a47080b2 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -572,11 +572,6 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) {
   if (request->url() == "/")
     return true;
 
-#ifdef WEBSERVER_PROMETHEUS
-  if (request->url() == "/metrics")
-    return true;
-#endif
-
 #ifdef WEBSERVER_CSS_INCLUDE
   if (request->url() == "/0.css")
     return true;
@@ -637,13 +632,6 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
     return;
   }
 
-#ifdef WEBSERVER_PROMETHEUS
-  if (request->url() == "/metrics") {
-    this->prometheus.handle_request(request);
-    return;
-  }
-#endif
-
 #ifdef WEBSERVER_CSS_INCLUDE
   if (request->url() == "/0.css") {
     this->handle_css_request(request);
diff --git a/esphome/components/web_server/web_server.h b/esphome/components/web_server/web_server.h
index 77fcb1e88c..b3bf2ef7f7 100644
--- a/esphome/components/web_server/web_server.h
+++ b/esphome/components/web_server/web_server.h
@@ -3,9 +3,6 @@
 #include "esphome/core/component.h"
 #include "esphome/core/controller.h"
 #include "esphome/components/web_server_base/web_server_base.h"
-#ifdef WEBSERVER_PROMETHEUS
-#include "esphome/components/web_server/web_server_prometheus.h"
-#endif
 
 #include <vector>
 
@@ -173,10 +170,6 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
   const char *css_include_{nullptr};
   const char *js_url_{nullptr};
   const char *js_include_{nullptr};
-
-#ifdef WEBSERVER_PROMETHEUS
-  WebServerPrometheus prometheus;
-#endif
 };
 
 }  // namespace web_server
diff --git a/esphome/const.py b/esphome/const.py
index 02c10c664b..d05f459b15 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -384,7 +384,6 @@ CONF_POWER_SAVE_MODE = 'power_save_mode'
 CONF_POWER_SUPPLY = 'power_supply'
 CONF_PRESSURE = 'pressure'
 CONF_PRIORITY = 'priority'
-CONF_PROMETHEUS = 'prometheus'
 CONF_PROTOCOL = 'protocol'
 CONF_PULL_MODE = 'pull_mode'
 CONF_PULSE_LENGTH = 'pulse_length'
diff --git a/script/clang-tidy b/script/clang-tidy
index 490e63e0d2..0bd1ef51fa 100755
--- a/script/clang-tidy
+++ b/script/clang-tidy
@@ -93,11 +93,11 @@ def main():
         get_output('clang-tidy-7', '-version')
     except:
         print("""
-        Oops. It looks like clang-tidy is not installed. 
-        
+        Oops. It looks like clang-tidy is not installed.
+
         Please check you can run "clang-tidy-7 -version" in your terminal and install
         clang-tidy (v7) if necessary.
-        
+
         Note you can also upload your code as a pull request on GitHub and see the CI check
         output to apply clang-tidy.
         """)
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 3738edd1de..d53d113d01 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -166,7 +166,6 @@ web_server:
   port: 8080
   css_url: https://esphome.io/_static/webserver-v1.min.css
   js_url: https://esphome.io/_static/webserver-v1.min.js
-  prometheus: true
 
 power_supply:
   id: 'atx_power_supply'
diff --git a/tests/test3.yaml b/tests/test3.yaml
index 3854a528f4..14cb4a4e47 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -210,7 +210,6 @@ logger:
   esp8266_store_log_strings_in_flash: false
 
 web_server:
-  prometheus: true
 
 deep_sleep:
   run_duration: 20s

From 0af73c7903e4f27e2c231ee0f409e7df9c525559 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 27 Jul 2020 12:28:11 +0200
Subject: [PATCH 384/412] Fix publish release script

---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d13a6fd55d..1e3c89ff71 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -252,7 +252,7 @@ jobs:
           docker tag "${BUILD_TO}:${TAG}" "${BUILD_TO}:beta"
           docker push "${BUILD_TO}:beta"
 
-      - if: ${{ !github.event.release.prerelease) }}
+      - if: ${{ !github.event.release.prerelease }}
         name: Publish docker latest tag
         run: |
           docker tag "${BUILD_TO}:${TAG}" "${BUILD_TO}:latest"
@@ -293,7 +293,7 @@ jobs:
         docker manifest push esphome/esphome:beta
 
     - name: Publish docker latest tag
-      if: ${{ !github.event.release.prerelease) }}
+      if: ${{ !github.event.release.prerelease }}
       run: |
         docker manifest create esphome/esphome:latest \
           esphome/esphome-aarch64:${TAG} \

From 08c8fa2c90fb599d928ee686abf04224c2e48276 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 27 Jul 2020 18:22:38 +0200
Subject: [PATCH 385/412] Mitigate CVE-2020-12638 WiFi WPA Downgrade (#1207)

Co-authored-by: Lukas Bachschwell <lukas@lbsfilm.at>
---
 esphome/components/wifi/wifi_component_esp32.cpp   | 12 ++++++++++++
 esphome/components/wifi/wifi_component_esp8266.cpp | 10 ++++++++++
 2 files changed, 22 insertions(+)

diff --git a/esphome/components/wifi/wifi_component_esp32.cpp b/esphome/components/wifi/wifi_component_esp32.cpp
index a387be78ce..09b8433a0e 100644
--- a/esphome/components/wifi/wifi_component_esp32.cpp
+++ b/esphome/components/wifi/wifi_component_esp32.cpp
@@ -391,6 +391,18 @@ void WiFiComponent::wifi_event_callback_(system_event_id_t event, system_event_i
       auto it = info.auth_change;
       ESP_LOGV(TAG, "Event: Authmode Change old=%s new=%s", get_auth_mode_str(it.old_mode),
                get_auth_mode_str(it.new_mode));
+      // Mitigate CVE-2020-12638
+      // https://lbsfilm.at/blog/wpa2-authenticationmode-downgrade-in-espressif-microprocessors
+      if (it.old_mode != WIFI_AUTH_OPEN && it.new_mode == WIFI_AUTH_OPEN) {
+        ESP_LOGW(TAG, "Potential Authmode downgrade detected, disconnecting...");
+        // we can't call retry_connect() from this context, so disconnect immediately
+        // and notify main thread with error_from_callback_
+        err_t err = esp_wifi_disconnect();
+        if (err != ESP_OK) {
+          ESP_LOGW(TAG, "Disconnect failed: %s", esp_err_to_name(err));
+        }
+        this->error_from_callback_ = true;
+      }
       break;
     }
     case SYSTEM_EVENT_STA_GOT_IP: {
diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index deee578b4c..efffff0abc 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -220,6 +220,7 @@ bool WiFiComponent::wifi_sta_connect_(WiFiAP ap) {
   if (ap.get_password().empty()) {
     conf.threshold.authmode = AUTH_OPEN;
   } else {
+    // Only allow auth modes with at least WPA
     conf.threshold.authmode = AUTH_WPA_PSK;
   }
   conf.threshold.rssi = -127;
@@ -399,6 +400,15 @@ void WiFiComponent::wifi_event_callback(System_Event_t *event) {
       auto it = event->event_info.auth_change;
       ESP_LOGV(TAG, "Event: Changed AuthMode old=%s new=%s", get_auth_mode_str(it.old_mode),
                get_auth_mode_str(it.new_mode));
+      // Mitigate CVE-2020-12638
+      // https://lbsfilm.at/blog/wpa2-authenticationmode-downgrade-in-espressif-microprocessors
+      if (it.old_mode != AUTH_OPEN && it.new_mode == AUTH_OPEN) {
+        ESP_LOGW(TAG, "Potential Authmode downgrade detected, disconnecting...");
+        // we can't call retry_connect() from this context, so disconnect immediately
+        // and notify main thread with error_from_callback_
+        wifi_station_disconnect();
+        global_wifi_component->error_from_callback_ = true;
+      }
       break;
     }
     case EVENT_STAMODE_GOT_IP: {

From e36dc2d05ec704a00d040f2d5b71cfaa50239c0b Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 27 Jul 2020 18:22:47 +0200
Subject: [PATCH 386/412] ESP8266 change recommended framework version to 2.7.2
 (#1208)

---
 .github/workflows/ci-docker.yml             |  2 +-
 .github/workflows/release-dev.yml           |  2 +-
 .github/workflows/release.yml               |  2 +-
 docker/Dockerfile                           |  2 +-
 docker/Dockerfile.dev                       |  2 +-
 docker/Dockerfile.lint                      |  2 +-
 esphome/components/http_request/__init__.py |  4 +-
 esphome/components/sntp/time.py             |  5 ++
 esphome/const.py                            | 39 ++++++++---
 esphome/core_config.py                      | 78 +++++++++------------
 esphome/writer.py                           | 25 ++++++-
 platformio.ini                              |  2 +-
 12 files changed, 99 insertions(+), 66 deletions(-)

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index df8185281e..eedda109ca 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Set up env variables
         run: |
-          base_version="2.3.4"
+          base_version="2.4.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index c289c44afc..fc9afc06ec 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -190,7 +190,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.3.4"
+          base_version="2.4.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 1e3c89ff71..c657655926 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -210,7 +210,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.3.4"
+          base_version="2.4.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1a8382aa65..e4097d59d8 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.3.4
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.4.0
 FROM ${BUILD_FROM}
 
 # First install requirements to leverage caching when requirements don't change
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 9e7ddc4b53..bb051b49ea 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.3.4
+FROM esphome/esphome-base-amd64:2.4.0
 
 COPY . .
 
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index fd1a3c5330..4e0b281130 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-lint-base:2.3.4
+FROM esphome/esphome-lint-base:2.4.0
 
 COPY requirements.txt requirements_test.txt /
 RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt
diff --git a/esphome/components/http_request/__init__.py b/esphome/components/http_request/__init__.py
index e79df12a6c..b003736d89 100644
--- a/esphome/components/http_request/__init__.py
+++ b/esphome/components/http_request/__init__.py
@@ -4,7 +4,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.const import CONF_ID, CONF_TIMEOUT, CONF_ESPHOME, CONF_METHOD, \
-    CONF_ARDUINO_VERSION, ARDUINO_VERSION_ESP8266_2_5_1, CONF_URL
+    CONF_ARDUINO_VERSION, ARDUINO_VERSION_ESP8266, CONF_URL
 from esphome.core import CORE, Lambda
 from esphome.core_config import PLATFORMIO_ESP8266_LUT
 
@@ -34,7 +34,7 @@ def validate_framework(config):
         return config
 
     framework = PLATFORMIO_ESP8266_LUT[version] if version in PLATFORMIO_ESP8266_LUT else version
-    if framework < ARDUINO_VERSION_ESP8266_2_5_1:
+    if framework < ARDUINO_VERSION_ESP8266['2.5.1']:
         raise cv.Invalid('This component is not supported on arduino framework version below 2.5.1')
     return config
 
diff --git a/esphome/components/sntp/time.py b/esphome/components/sntp/time.py
index 798600075e..f6afcced0c 100644
--- a/esphome/components/sntp/time.py
+++ b/esphome/components/sntp/time.py
@@ -1,6 +1,7 @@
 from esphome.components import time as time_
 import esphome.config_validation as cv
 import esphome.codegen as cg
+from esphome.core import CORE
 from esphome.const import CONF_ID, CONF_SERVERS
 
 
@@ -27,3 +28,7 @@ def to_code(config):
 
     yield cg.register_component(var, config)
     yield time_.register_time(var, config)
+
+    if CORE.is_esp8266 and len(servers) > 1:
+        # We need LwIP features enabled to get 3 SNTP servers (not just one)
+        cg.add_build_flag('-DPIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY')
diff --git a/esphome/const.py b/esphome/const.py
index d05f459b15..659587fa16 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -11,17 +11,34 @@ ESP_PLATFORM_ESP8266 = 'ESP8266'
 ESP_PLATFORMS = [ESP_PLATFORM_ESP32, ESP_PLATFORM_ESP8266]
 
 ALLOWED_NAME_CHARS = 'abcdefghijklmnopqrstuvwxyz0123456789_'
-ARDUINO_VERSION_ESP32_DEV = 'https://github.com/platformio/platform-espressif32.git'
-ARDUINO_VERSION_ESP32_1_0_0 = 'espressif32@1.5.0'
-ARDUINO_VERSION_ESP32_1_0_1 = 'espressif32@1.6.0'
-ARDUINO_VERSION_ESP32_1_0_2 = 'espressif32@1.9.0'
-ARDUINO_VERSION_ESP32_1_0_3 = 'espressif32@1.10.0'
-ARDUINO_VERSION_ESP32_1_0_4 = 'espressif32@1.11.0'
-ARDUINO_VERSION_ESP8266_DEV = 'https://github.com/platformio/platform-espressif8266.git'
-ARDUINO_VERSION_ESP8266_2_5_0 = 'espressif8266@2.0.1'
-ARDUINO_VERSION_ESP8266_2_5_1 = 'espressif8266@2.1.0'
-ARDUINO_VERSION_ESP8266_2_5_2 = 'espressif8266@2.2.3'
-ARDUINO_VERSION_ESP8266_2_3_0 = 'espressif8266@1.5.0'
+# Lookup table from ESP32 arduino framework version to latest platformio
+# package with that version
+# See also https://github.com/platformio/platform-espressif32/releases
+ARDUINO_VERSION_ESP32 = {
+    'dev': 'https://github.com/platformio/platform-espressif32.git',
+    '1.0.4': 'espressif32@1.12.4',
+    '1.0.3': 'espressif32@1.10.0',
+    '1.0.2': 'espressif32@1.9.0',
+    '1.0.1': 'espressif32@1.7.0',
+    '1.0.0': 'espressif32@1.5.0',
+}
+# See also https://github.com/platformio/platform-espressif8266/releases
+ARDUINO_VERSION_ESP8266 = {
+    'dev': 'https://github.com/platformio/platform-espressif8266.git',
+    '2.7.2': 'espressif8266@2.6.0',
+    '2.7.1': 'espressif8266@2.5.3',
+    '2.7.0': 'espressif8266@2.5.0',
+    '2.6.3': 'espressif8266@2.4.0',
+    '2.6.2': 'espressif8266@2.3.1',
+    '2.6.1': 'espressif8266@2.3.0',
+    '2.5.2': 'espressif8266@2.2.3',
+    '2.5.1': 'espressif8266@2.1.1',
+    '2.5.0': 'espressif8266@2.0.4',
+    '2.4.2': 'espressif8266@1.8.0',
+    '2.4.1': 'espressif8266@1.7.3',
+    '2.4.0': 'espressif8266@1.6.0',
+    '2.3.0': 'espressif8266@1.5.0',
+}
 SOURCE_FILE_EXTENSIONS = {'.cpp', '.hpp', '.h', '.c', '.tcc', '.ino'}
 HEADER_FILE_EXTENSIONS = {'.h', '.hpp', '.tcc'}
 
diff --git a/esphome/core_config.py b/esphome/core_config.py
index 9b4ea3a2e1..ff959fae27 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -5,17 +5,14 @@ import re
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation, pins
-from esphome.const import ARDUINO_VERSION_ESP32_DEV, ARDUINO_VERSION_ESP8266_DEV, \
-    CONF_ARDUINO_VERSION, CONF_BOARD, CONF_BOARD_FLASH_MODE, CONF_BUILD_PATH, \
-    CONF_COMMENT, CONF_ESPHOME, CONF_INCLUDES, CONF_LIBRARIES, \
+from esphome.const import CONF_ARDUINO_VERSION, CONF_BOARD, CONF_BOARD_FLASH_MODE, \
+    CONF_BUILD_PATH, CONF_COMMENT, CONF_ESPHOME, CONF_INCLUDES, CONF_LIBRARIES, \
     CONF_NAME, CONF_ON_BOOT, CONF_ON_LOOP, CONF_ON_SHUTDOWN, CONF_PLATFORM, \
     CONF_PLATFORMIO_OPTIONS, CONF_PRIORITY, CONF_TRIGGER_ID, \
-    CONF_ESP8266_RESTORE_FROM_FLASH, ARDUINO_VERSION_ESP8266_2_3_0, \
-    ARDUINO_VERSION_ESP8266_2_5_0, ARDUINO_VERSION_ESP8266_2_5_1, ARDUINO_VERSION_ESP8266_2_5_2, \
-    ESP_PLATFORMS
+    CONF_ESP8266_RESTORE_FROM_FLASH, ARDUINO_VERSION_ESP8266, \
+    ARDUINO_VERSION_ESP32, ESP_PLATFORMS
 from esphome.core import CORE, coroutine_with_priority
 from esphome.helpers import copy_file_if_changed, walk_files
-from esphome.pins import ESP8266_FLASH_SIZES, ESP8266_LD_SCRIPTS
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -46,33 +43,17 @@ def validate_board(value):
 validate_platform = cv.one_of(*ESP_PLATFORMS, upper=True)
 
 PLATFORMIO_ESP8266_LUT = {
-    '2.7.2': 'espressif8266@2.6.0',
-    '2.7.1': 'espressif8266@2.5.1',
-    '2.7.0': 'espressif8266@2.5.0',
-    '2.6.3': 'espressif8266@2.4.0',
-    '2.6.2': 'espressif8266@2.3.1',
-    '2.6.1': 'espressif8266@2.3.0',
-    '2.5.2': 'espressif8266@2.2.3',
-    '2.5.1': 'espressif8266@2.1.0',
-    '2.5.0': 'espressif8266@2.0.1',
-    '2.4.2': 'espressif8266@1.8.0',
-    '2.4.1': 'espressif8266@1.7.3',
-    '2.4.0': 'espressif8266@1.6.0',
-    '2.3.0': 'espressif8266@1.5.0',
-    'RECOMMENDED': 'espressif8266@2.2.3',
+    **ARDUINO_VERSION_ESP8266,
+    'RECOMMENDED': ARDUINO_VERSION_ESP8266['2.7.2'],
     'LATEST': 'espressif8266',
-    'DEV': ARDUINO_VERSION_ESP8266_DEV,
+    'DEV': ARDUINO_VERSION_ESP8266['dev'],
 }
 
 PLATFORMIO_ESP32_LUT = {
-    '1.0.0': 'espressif32@1.4.0',
-    '1.0.1': 'espressif32@1.6.0',
-    '1.0.2': 'espressif32@1.9.0',
-    '1.0.3': 'espressif32@1.10.0',
-    '1.0.4': 'espressif32@1.12.4',
-    'RECOMMENDED': 'espressif32@1.12.1',
+    **ARDUINO_VERSION_ESP32,
+    'RECOMMENDED': ARDUINO_VERSION_ESP32['1.0.4'],
     'LATEST': 'espressif32',
-    'DEV': ARDUINO_VERSION_ESP32_DEV,
+    'DEV': ARDUINO_VERSION_ESP32['dev'],
 }
 
 
@@ -208,6 +189,26 @@ def add_includes(includes):
             include_file(path, basename)
 
 
+@coroutine_with_priority(-1000.0)
+def _esp8266_add_lwip_type():
+    # If any component has already set this, do not change it
+    if any(flag.startswith('-DPIO_FRAMEWORK_ARDUINO_LWIP2_') for flag in CORE.build_flags):
+        return
+
+    # Default for platformio is LWIP2_LOW_MEMORY with:
+    #  - MSS=536
+    #  - LWIP_FEATURES enabled
+    #     - this only adds some optional features like IP incoming packet reassembly and NAPT
+    #       see also:
+    #  https://github.com/esp8266/Arduino/blob/master/tools/sdk/lwip2/include/lwipopts.h
+
+    # Instead we use LWIP2_HIGHER_BANDWIDTH_LOW_FLASH with:
+    #  - MSS=1460
+    #  - LWIP_FEATURES disabled (because we don't need them)
+    # Other projects like Tasmota & ESPEasy also use this
+    cg.add_build_flag('-DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH')
+
+
 @coroutine_with_priority(100.0)
 def to_code(config):
     cg.add_global(cg.global_ns.namespace('esphome').using)
@@ -228,22 +229,9 @@ def to_code(config):
         yield cg.register_component(trigger, conf)
         yield automation.build_automation(trigger, [], conf)
 
-    # Build flags
-    if CORE.is_esp8266 and CORE.board in ESP8266_FLASH_SIZES and \
-            CORE.arduino_version != ARDUINO_VERSION_ESP8266_2_3_0:
-        flash_size = ESP8266_FLASH_SIZES[CORE.board]
-        ld_scripts = ESP8266_LD_SCRIPTS[flash_size]
-        ld_script = None
-
-        if CORE.arduino_version in ('espressif8266@1.8.0', 'espressif8266@1.7.3',
-                                    'espressif8266@1.6.0'):
-            ld_script = ld_scripts[0]
-        elif CORE.arduino_version in (ARDUINO_VERSION_ESP8266_DEV, ARDUINO_VERSION_ESP8266_2_5_0,
-                                      ARDUINO_VERSION_ESP8266_2_5_1, ARDUINO_VERSION_ESP8266_2_5_2):
-            ld_script = ld_scripts[1]
-
-        if ld_script is not None:
-            cg.add_build_flag(f'-Wl,-T{ld_script}')
+    # Set LWIP build constants for ESP8266
+    if CORE.is_esp8266:
+        CORE.add_job(_esp8266_add_lwip_type)
 
     cg.add_build_flag('-fno-exceptions')
 
diff --git a/esphome/writer.py b/esphome/writer.py
index 041d1c1127..faf086519b 100644
--- a/esphome/writer.py
+++ b/esphome/writer.py
@@ -4,11 +4,12 @@ import re
 
 from esphome.config import iter_components
 from esphome.const import CONF_BOARD_FLASH_MODE, CONF_ESPHOME, CONF_PLATFORMIO_OPTIONS, \
-    HEADER_FILE_EXTENSIONS, SOURCE_FILE_EXTENSIONS, __version__
+    HEADER_FILE_EXTENSIONS, SOURCE_FILE_EXTENSIONS, __version__, ARDUINO_VERSION_ESP8266
 from esphome.core import CORE, EsphomeError
 from esphome.helpers import mkdir_p, read_file, write_file_if_changed, walk_files, \
     copy_file_if_changed
 from esphome.storage_json import StorageJSON, storage_path
+from esphome.pins import ESP8266_FLASH_SIZES, ESP8266_LD_SCRIPTS
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -213,6 +214,28 @@ def get_ini_content():
         flash_mode = CORE.config[CONF_ESPHOME][CONF_BOARD_FLASH_MODE]
         data['board_build.flash_mode'] = flash_mode
 
+    # Build flags
+    if CORE.is_esp8266 and CORE.board in ESP8266_FLASH_SIZES:
+        flash_size = ESP8266_FLASH_SIZES[CORE.board]
+        ld_scripts = ESP8266_LD_SCRIPTS[flash_size]
+
+        versions_with_old_ldscripts = [
+            ARDUINO_VERSION_ESP8266['2.4.0'],
+            ARDUINO_VERSION_ESP8266['2.4.1'],
+            ARDUINO_VERSION_ESP8266['2.4.2'],
+        ]
+        if CORE.arduino_version == ARDUINO_VERSION_ESP8266['2.3.0']:
+            # No ld script support
+            ld_script = None
+        if CORE.arduino_version in versions_with_old_ldscripts:
+            # Old ld script path
+            ld_script = ld_scripts[0]
+        else:
+            ld_script = ld_scripts[1]
+
+        if ld_script is not None:
+            data['board_build.ldscript'] = ld_script
+
     # Ignore libraries that are not explicitly used, but may
     # be added by LDF
     # data['lib_ldf_mode'] = 'chain'
diff --git a/platformio.ini b/platformio.ini
index 0d078b7b35..010a031b4c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -44,7 +44,7 @@ build_flags = ${common.build_flags}
 src_filter = ${common.src_filter} +<tests/livingroom8266.cpp>
 
 [env:livingroom32]
-platform = espressif32@1.12.1
+platform = espressif32@1.12.4
 board = nodemcu-32s
 framework = arduino
 lib_deps = ${common.lib_deps}

From f0dfde9fa103b7a0e53dc2a7b3b5e2ac1ff9b3cd Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Mon, 27 Jul 2020 18:23:00 +0200
Subject: [PATCH 387/412] Fix base config should override packages config
 (#1209)

---
 esphome/components/packages/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/packages/__init__.py b/esphome/components/packages/__init__.py
index afbeae7f8d..55dfe35e34 100644
--- a/esphome/components/packages/__init__.py
+++ b/esphome/components/packages/__init__.py
@@ -38,7 +38,7 @@ def do_packages_pass(config: dict):
                 recursive_package = package_config
                 if isinstance(package_config, dict):
                     recursive_package = do_packages_pass(package_config)
-                config = _merge_package(config, recursive_package)
+                config = _merge_package(recursive_package, config)
 
         del config[CONF_PACKAGES]
     return config

From 87f1ffec05b7504fa228d20addbce03a7b0c45cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gediminas=20=C5=A0altenis?= <gediminas@saltenis.lt>
Date: Tue, 28 Jul 2020 11:34:42 +0300
Subject: [PATCH 388/412] Fix AS3935 sensor configuration issues (#1210)

* Fix AS3935 coniguration

* Increase verbosity
---
 esphome/components/as3935/__init__.py | 2 +-
 esphome/components/as3935/as3935.cpp  | 3 +++
 esphome/components/as3935/sensor.py   | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/esphome/components/as3935/__init__.py b/esphome/components/as3935/__init__.py
index de25060623..51958048ca 100644
--- a/esphome/components/as3935/__init__.py
+++ b/esphome/components/as3935/__init__.py
@@ -25,7 +25,7 @@ AS3935_SCHEMA = cv.Schema({
     cv.Optional(CONF_SPIKE_REJECTION, default=2): cv.int_range(min=1, max=11),
     cv.Optional(CONF_LIGHTNING_THRESHOLD, default=1): cv.one_of(1, 5, 9, 16, int=True),
     cv.Optional(CONF_MASK_DISTURBER, default=False): cv.boolean,
-    cv.Optional(CONF_DIV_RATIO, default=0): cv.one_of(0, 16, 22, 64, 128, int=True),
+    cv.Optional(CONF_DIV_RATIO, default=0): cv.one_of(0, 16, 32, 64, 128, int=True),
     cv.Optional(CONF_CAPACITANCE, default=0): cv.int_range(min=0, max=15),
 })
 
diff --git a/esphome/components/as3935/as3935.cpp b/esphome/components/as3935/as3935.cpp
index f8272e6036..9446a2fdd6 100644
--- a/esphome/components/as3935/as3935.cpp
+++ b/esphome/components/as3935/as3935.cpp
@@ -26,6 +26,9 @@ void AS3935Component::setup() {
 void AS3935Component::dump_config() {
   ESP_LOGCONFIG(TAG, "AS3935:");
   LOG_PIN("  Interrupt Pin: ", this->irq_pin_);
+  LOG_BINARY_SENSOR("  ", "Thunder alert", this->thunder_alert_binary_sensor_);
+  LOG_SENSOR("  ", "Distance", this->distance_sensor_);
+  LOG_SENSOR("  ", "Lightning energy", this->energy_sensor_);
 }
 
 float AS3935Component::get_setup_priority() const { return setup_priority::DATA; }
diff --git a/esphome/components/as3935/sensor.py b/esphome/components/as3935/sensor.py
index 3374ada6a8..016df8f2a1 100644
--- a/esphome/components/as3935/sensor.py
+++ b/esphome/components/as3935/sensor.py
@@ -27,4 +27,4 @@ def to_code(config):
     if CONF_LIGHTNING_ENERGY in config:
         conf = config[CONF_LIGHTNING_ENERGY]
         lightning_energy_sensor = yield sensor.new_sensor(conf)
-        cg.add(hub.set_distance_sensor(lightning_energy_sensor))
+        cg.add(hub.set_energy_sensor(lightning_energy_sensor))

From 2d50ecbecf2b4cbbe9fa40ba6dae1036bbc727c7 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 28 Jul 2020 12:01:38 +0200
Subject: [PATCH 389/412] Fix prometheus has wrong setup priority (#1211)

Fixes https://github.com/esphome/issues/issues/1377
---
 esphome/components/prometheus/prometheus_handler.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/prometheus/prometheus_handler.h b/esphome/components/prometheus/prometheus_handler.h
index 46ebc400f8..6abd406556 100644
--- a/esphome/components/prometheus/prometheus_handler.h
+++ b/esphome/components/prometheus/prometheus_handler.h
@@ -26,6 +26,10 @@ class PrometheusHandler : public AsyncWebHandler, public Component {
     this->base_->init();
     this->base_->add_handler(this);
   }
+  float get_setup_priority() const override {
+    // After WiFi
+    return setup_priority::WIFI - 1.0f;
+  }
 
  protected:
 #ifdef USE_SENSOR

From a32b58fdf1be9e6078f904ded88421cb8c67c13e Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 28 Jul 2020 12:10:55 +0200
Subject: [PATCH 390/412] Downgrade FastLED to 3.3.2 (#1212)

Fixes https://github.com/esphome/issues/issues/1375
---
 esphome/components/fastled_base/__init__.py | 4 +++-
 platformio.ini                              | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/esphome/components/fastled_base/__init__.py b/esphome/components/fastled_base/__init__.py
index e438876d33..ab78f7537f 100644
--- a/esphome/components/fastled_base/__init__.py
+++ b/esphome/components/fastled_base/__init__.py
@@ -36,5 +36,7 @@ def new_fastled_light(config):
 
     yield light.register_light(var, config)
     # https://github.com/FastLED/FastLED/blob/master/library.json
-    cg.add_library('FastLED', '3.3.3')
+    # 3.3.3 has an issue on ESP32 with RMT and fastled_clockless:
+    # https://github.com/esphome/issues/issues/1375
+    cg.add_library('FastLED', '3.3.2')
     yield var
diff --git a/platformio.ini b/platformio.ini
index 010a031b4c..c43a25d29b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,7 +14,7 @@ lib_deps =
     AsyncMqttClient-esphome@0.8.4
     ArduinoJson-esphomelib@5.13.3
     ESPAsyncWebServer-esphome@1.2.6
-    FastLED@3.3.3
+    FastLED@3.3.2
     NeoPixelBus-esphome@2.5.7
     ESPAsyncTCP-esphome@1.2.2
     1655@1.0.2  ; TinyGPSPlus (has name conflict)

From fc6a3e31c2b5bda146fada06c8c5f4e4dfcbe016 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 28 Jul 2020 12:15:41 +0200
Subject: [PATCH 391/412] Bump version to v1.15.0b2

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 659587fa16..87d67f38bc 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION = 1
 MINOR_VERSION = 15
-PATCH_VERSION = '0b1'
+PATCH_VERSION = '0b2'
 __short_version__ = f'{MAJOR_VERSION}.{MINOR_VERSION}'
 __version__ = f'{__short_version__}.{PATCH_VERSION}'
 

From 18560f943012d16d5515d77de5eb8ba9062741f5 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 28 Jul 2020 14:29:01 +0200
Subject: [PATCH 392/412] Fix sdist missing requirements.txt (#1214)

Fixes https://github.com/esphome/issues/issues/1378
---
 MANIFEST.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MANIFEST.in b/MANIFEST.in
index cdea2df2a6..0fe80762b3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,6 @@
 include LICENSE
 include README.md
+include requirements.txt
 include esphome/dashboard/templates/*.html
 recursive-include esphome/dashboard/static *.ico *.js *.css *.woff* LICENSE
 recursive-include esphome *.cpp *.h *.tcc

From f6fe6e6bffec3c87fc9be58afb4e2f62b2065a2b Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 28 Jul 2020 15:17:24 -0300
Subject: [PATCH 393/412] renamed icon molecule co2 (#1217)

* renamed icon molecule co2

* sort of course
---
 esphome/components/ccs811/sensor.py   | 4 ++--
 esphome/components/mhz19/sensor.py    | 4 ++--
 esphome/components/scd30/sensor.py    | 4 ++--
 esphome/components/senseair/sensor.py | 4 ++--
 esphome/components/sgp30/sensor.py    | 4 ++--
 esphome/components/zyaura/sensor.py   | 4 ++--
 esphome/const.py                      | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/esphome/components/ccs811/sensor.py b/esphome/components/ccs811/sensor.py
index a8020c77f7..0f755d5c11 100644
--- a/esphome/components/ccs811/sensor.py
+++ b/esphome/components/ccs811/sensor.py
@@ -2,7 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import CONF_ID, ICON_RADIATOR, UNIT_PARTS_PER_MILLION, \
-    UNIT_PARTS_PER_BILLION, CONF_TEMPERATURE, CONF_HUMIDITY, ICON_PERIODIC_TABLE_CO2
+    UNIT_PARTS_PER_BILLION, CONF_TEMPERATURE, CONF_HUMIDITY, ICON_MOLECULE_CO2
 
 DEPENDENCIES = ['i2c']
 
@@ -15,7 +15,7 @@ CONF_BASELINE = 'baseline'
 
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(CCS811Component),
-    cv.Required(CONF_ECO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION, ICON_PERIODIC_TABLE_CO2,
+    cv.Required(CONF_ECO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION, ICON_MOLECULE_CO2,
                                                  0),
     cv.Required(CONF_TVOC): sensor.sensor_schema(UNIT_PARTS_PER_BILLION, ICON_RADIATOR, 0),
 
diff --git a/esphome/components/mhz19/sensor.py b/esphome/components/mhz19/sensor.py
index bdcecf12cb..d0a7caee84 100644
--- a/esphome/components/mhz19/sensor.py
+++ b/esphome/components/mhz19/sensor.py
@@ -3,7 +3,7 @@ import esphome.config_validation as cv
 from esphome import automation
 from esphome.automation import maybe_simple_id
 from esphome.components import sensor, uart
-from esphome.const import CONF_CO2, CONF_ID, CONF_TEMPERATURE, ICON_PERIODIC_TABLE_CO2, \
+from esphome.const import CONF_CO2, CONF_ID, CONF_TEMPERATURE, ICON_MOLECULE_CO2, \
     UNIT_PARTS_PER_MILLION, UNIT_CELSIUS, ICON_THERMOMETER
 
 DEPENDENCIES = ['uart']
@@ -18,7 +18,7 @@ MHZ19ABCDisableAction = mhz19_ns.class_('MHZ19ABCDisableAction', automation.Acti
 
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(MHZ19Component),
-    cv.Required(CONF_CO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION, ICON_PERIODIC_TABLE_CO2, 0),
+    cv.Required(CONF_CO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION, ICON_MOLECULE_CO2, 0),
     cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 0),
     cv.Optional(CONF_AUTOMATIC_BASELINE_CALIBRATION): cv.boolean,
 }).extend(cv.polling_component_schema('60s')).extend(uart.UART_DEVICE_SCHEMA)
diff --git a/esphome/components/scd30/sensor.py b/esphome/components/scd30/sensor.py
index b3de1b214a..ca1a254e05 100644
--- a/esphome/components/scd30/sensor.py
+++ b/esphome/components/scd30/sensor.py
@@ -3,7 +3,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import CONF_ID, UNIT_PARTS_PER_MILLION, \
-    CONF_HUMIDITY, CONF_TEMPERATURE, ICON_PERIODIC_TABLE_CO2, \
+    CONF_HUMIDITY, CONF_TEMPERATURE, ICON_MOLECULE_CO2, \
     UNIT_CELSIUS, ICON_THERMOMETER, ICON_WATER_PERCENT, UNIT_PERCENT, CONF_CO2
 
 DEPENDENCIES = ['i2c']
@@ -22,7 +22,7 @@ def remove_altitude_suffix(value):
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(SCD30Component),
     cv.Required(CONF_CO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION,
-                                                ICON_PERIODIC_TABLE_CO2, 0),
+                                                ICON_MOLECULE_CO2, 0),
     cv.Required(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
     cv.Required(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 1),
     cv.Optional(CONF_AUTOMATIC_SELF_CALIBRATION, default=True): cv.boolean,
diff --git a/esphome/components/senseair/sensor.py b/esphome/components/senseair/sensor.py
index 393bfd5182..c015871156 100644
--- a/esphome/components/senseair/sensor.py
+++ b/esphome/components/senseair/sensor.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, uart
-from esphome.const import CONF_CO2, CONF_ID, ICON_PERIODIC_TABLE_CO2, UNIT_PARTS_PER_MILLION
+from esphome.const import CONF_CO2, CONF_ID, ICON_MOLECULE_CO2, UNIT_PARTS_PER_MILLION
 
 DEPENDENCIES = ['uart']
 
@@ -10,7 +10,7 @@ SenseAirComponent = senseair_ns.class_('SenseAirComponent', cg.PollingComponent,
 
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(SenseAirComponent),
-    cv.Required(CONF_CO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION, ICON_PERIODIC_TABLE_CO2, 0),
+    cv.Required(CONF_CO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION, ICON_MOLECULE_CO2, 0),
 }).extend(cv.polling_component_schema('60s')).extend(uart.UART_DEVICE_SCHEMA)
 
 
diff --git a/esphome/components/sgp30/sensor.py b/esphome/components/sgp30/sensor.py
index a52811eb34..a8963fef7b 100644
--- a/esphome/components/sgp30/sensor.py
+++ b/esphome/components/sgp30/sensor.py
@@ -2,7 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import CONF_ID, ICON_RADIATOR, UNIT_PARTS_PER_MILLION, \
-    UNIT_PARTS_PER_BILLION, ICON_PERIODIC_TABLE_CO2
+    UNIT_PARTS_PER_BILLION, ICON_MOLECULE_CO2
 
 DEPENDENCIES = ['i2c']
 
@@ -22,7 +22,7 @@ CONF_TEMPERATURE_SOURCE = 'temperature_source'
 CONFIG_SCHEMA = cv.Schema({
     cv.GenerateID(): cv.declare_id(SGP30Component),
     cv.Required(CONF_ECO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION,
-                                                 ICON_PERIODIC_TABLE_CO2, 0),
+                                                 ICON_MOLECULE_CO2, 0),
     cv.Required(CONF_TVOC): sensor.sensor_schema(UNIT_PARTS_PER_BILLION, ICON_RADIATOR, 0),
     cv.Optional(CONF_BASELINE): cv.Schema({
         cv.Required(CONF_ECO2_BASELINE): cv.hex_uint16_t,
diff --git a/esphome/components/zyaura/sensor.py b/esphome/components/zyaura/sensor.py
index 649b80b444..df263974e8 100644
--- a/esphome/components/zyaura/sensor.py
+++ b/esphome/components/zyaura/sensor.py
@@ -5,7 +5,7 @@ from esphome.components import sensor
 from esphome.const import CONF_ID, CONF_CLOCK_PIN, CONF_DATA_PIN, \
     CONF_CO2, CONF_TEMPERATURE, CONF_HUMIDITY, \
     UNIT_PARTS_PER_MILLION, UNIT_CELSIUS, UNIT_PERCENT, \
-    ICON_PERIODIC_TABLE_CO2, ICON_THERMOMETER, ICON_WATER_PERCENT
+    ICON_MOLECULE_CO2, ICON_THERMOMETER, ICON_WATER_PERCENT
 from esphome.cpp_helpers import gpio_pin_expression
 
 zyaura_ns = cg.esphome_ns.namespace('zyaura')
@@ -17,7 +17,7 @@ CONFIG_SCHEMA = cv.Schema({
                                         pins.validate_has_interrupt),
     cv.Required(CONF_DATA_PIN): cv.All(pins.internal_gpio_input_pin_schema,
                                        pins.validate_has_interrupt),
-    cv.Optional(CONF_CO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION, ICON_PERIODIC_TABLE_CO2, 0),
+    cv.Optional(CONF_CO2): sensor.sensor_schema(UNIT_PARTS_PER_MILLION, ICON_MOLECULE_CO2, 0),
     cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(UNIT_CELSIUS, ICON_THERMOMETER, 1),
     cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(UNIT_PERCENT, ICON_WATER_PERCENT, 1),
 }).extend(cv.polling_component_schema('60s'))
diff --git a/esphome/const.py b/esphome/const.py
index 87d67f38bc..5dfba44c08 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -587,10 +587,10 @@ ICON_GAS_CYLINDER = 'mdi:gas-cylinder'
 ICON_GAUGE = 'mdi:gauge'
 ICON_LIGHTBULB = 'mdi:lightbulb'
 ICON_MAGNET = 'mdi:magnet'
+ICON_MOLECULE_CO2 = 'mdi:molecule-co2'
 ICON_MOTION_SENSOR = 'mdi:motion-sensor'
 ICON_NEW_BOX = 'mdi:new-box'
 ICON_PERCENT = 'mdi:percent'
-ICON_PERIODIC_TABLE_CO2 = 'mdi:periodic-table-co2'
 ICON_POWER = 'mdi:power'
 ICON_PULSE = 'mdi:pulse'
 ICON_RADIATOR = 'mdi:radiator'

From 57eb05c0e380a19f8b77d86671801adddab4e09d Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Tue, 28 Jul 2020 23:25:55 +0200
Subject: [PATCH 394/412] Add job to update HassIO addon repo (#1218)

---
 .github/workflows/release.yml | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c657655926..9f4efb590f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -222,13 +222,20 @@ jobs:
             dockerfile="docker/Dockerfile"
           fi
 
+          if [[ "${{ github.event.release.prerelease }}" == "true" ]]; then
+            cache_tag="beta"
+          else
+            cache_tag="latest"
+          end
+
           # Set env variables so these values don't need to be calculated again
           echo "::set-env name=BUILD_FROM::${build_from}"
           echo "::set-env name=BUILD_TO::${build_to}"
           echo "::set-env name=DOCKERFILE::${dockerfile}"
+          echo "::set-env name=CACHE_TAG::${cache_tag}"
       - name: Pull for cache
         run: |
-          docker pull "${BUILD_TO}:latest" || true
+          docker pull "${BUILD_TO}:${CACHE_TAG}" || true
       - name: Register QEMU binfmt
         run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
       - run: |
@@ -236,7 +243,7 @@ jobs:
             --build-arg "BUILD_FROM=${BUILD_FROM}" \
             --build-arg "BUILD_VERSION=${TAG}" \
             --tag "${BUILD_TO}:${TAG}" \
-            --cache-from "${BUILD_TO}:latest" \
+            --cache-from "${BUILD_TO}:${CACHE_TAG}" \
             --file "${DOCKERFILE}" \
             .
       - name: Log in to docker hub
@@ -300,3 +307,19 @@ jobs:
           esphome/esphome-amd64:${TAG} \
           esphome/esphome-armv7:${TAG}
         docker manifest push esphome/esphome:latest
+
+  deploy-hassio-repo:
+    if: github.repository == 'esphome/esphome'
+    runs-on: ubuntu-latest
+    needs: [deploy-docker]
+    steps:
+      - env:
+          TOKEN: ${{ secrets.DEPLOY_HASSIO_TOKEN }}
+        run: |
+          TAG="${GITHUB_REF#refs/tags/v}"
+          curl \
+            -u ":$TOKEN" \
+            -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            https://api.github.com/repos/esphome/hassio/actions/workflows/bump-version.yml/dispatches \
+            -d "{\"ref\":\"master\",\"inputs\":{\"version\":\"$TAG\"}}"

From 86736aa48029bdc1a6d2840530e30e16a50733c2 Mon Sep 17 00:00:00 2001
From: Emil Hesslow <hesslow@gmail.com>
Date: Wed, 29 Jul 2020 00:13:51 -0700
Subject: [PATCH 395/412] Stop infinite loop in light on_turn_on (#1219)

Co-authored-by: Otto Winter <otto@otto-winter.com>
---
 esphome/components/light/automation.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/esphome/components/light/automation.h b/esphome/components/light/automation.h
index dfab780658..b240f84e8f 100644
--- a/esphome/components/light/automation.h
+++ b/esphome/components/light/automation.h
@@ -103,10 +103,14 @@ class LightTurnOnTrigger : public Trigger<> {
   LightTurnOnTrigger(LightState *a_light) {
     a_light->add_new_remote_values_callback([this, a_light]() {
       auto is_on = a_light->current_values.is_on();
-      if (is_on && !last_on_) {
+      // only trigger when going from off to on
+      auto should_trigger = is_on && !last_on_;
+      // Set new state immediately so that trigger() doesn't devolve
+      // into infinite loop
+      last_on_ = is_on;
+      if (should_trigger) {
         this->trigger();
       }
-      last_on_ = is_on;
     });
     last_on_ = a_light->current_values.is_on();
   }
@@ -120,10 +124,14 @@ class LightTurnOffTrigger : public Trigger<> {
   LightTurnOffTrigger(LightState *a_light) {
     a_light->add_new_remote_values_callback([this, a_light]() {
       auto is_on = a_light->current_values.is_on();
-      if (!is_on && last_on_) {
+      // only trigger when going from on to off
+      auto should_trigger = !is_on && last_on_;
+      // Set new state immediately so that trigger() doesn't devolve
+      // into infinite loop
+      last_on_ = is_on;
+      if (should_trigger) {
         this->trigger();
       }
-      last_on_ = is_on;
     });
     last_on_ = a_light->current_values.is_on();
   }

From dbc0d500d859aaa83e4f7b7cc653d765a69231f9 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 29 Jul 2020 12:57:43 +0200
Subject: [PATCH 396/412] Bump ESPAsyncWebServer-esphome to v1.2.7 (#1221)

---
 esphome/components/web_server_base/__init__.py | 2 +-
 platformio.ini                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/web_server_base/__init__.py b/esphome/components/web_server_base/__init__.py
index f7b2238552..05f4a4a4c6 100644
--- a/esphome/components/web_server_base/__init__.py
+++ b/esphome/components/web_server_base/__init__.py
@@ -24,4 +24,4 @@ def to_code(config):
     if CORE.is_esp32:
         cg.add_library('FS', None)
     # https://github.com/OttoWinter/ESPAsyncWebServer/blob/master/library.json
-    cg.add_library('ESPAsyncWebServer-esphome', '1.2.6')
+    cg.add_library('ESPAsyncWebServer-esphome', '1.2.7')
diff --git a/platformio.ini b/platformio.ini
index c43a25d29b..e3f3de808c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,7 +13,7 @@ lib_deps =
     AsyncTCP-esphome@1.1.1
     AsyncMqttClient-esphome@0.8.4
     ArduinoJson-esphomelib@5.13.3
-    ESPAsyncWebServer-esphome@1.2.6
+    ESPAsyncWebServer-esphome@1.2.7
     FastLED@3.3.2
     NeoPixelBus-esphome@2.5.7
     ESPAsyncTCP-esphome@1.2.2

From 44af5e439cac71c31cd3cb4278893a7409c59f40 Mon Sep 17 00:00:00 2001
From: dr-oblivium <52540467+dr-oblivium@users.noreply.github.com>
Date: Wed, 29 Jul 2020 18:18:53 +0200
Subject: [PATCH 397/412] wpa2 enterprise fixes: also copy eap parameters,
 don't require psk password to be set (#1215)

---
 esphome/components/wifi/wifi_component.cpp | 45 ++++++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 5c1c533c5d..df80c5b109 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -201,7 +201,26 @@ void WiFiComponent::start_connecting(const WiFiAP &ap, bool two) {
   } else {
     ESP_LOGV(TAG, "  BSSID: Not Set");
   }
-  ESP_LOGV(TAG, "  Password: " LOG_SECRET("'%s'"), ap.get_password().c_str());
+
+#ifdef ESPHOME_WIFI_WPA2_EAP
+  if (ap.get_eap().has_value()) {
+    ESP_LOGV(TAG, "  WPA2 Enterprise authentication configured:");
+    EAPAuth eap_config = ap.get_eap().value();
+    ESP_LOGV(TAG, "    Identity: " LOG_SECRET("'%s'"), eap_config.identity.c_str());
+    ESP_LOGV(TAG, "    Username: " LOG_SECRET("'%s'"), eap_config.username.c_str());
+    ESP_LOGV(TAG, "    Password: " LOG_SECRET("'%s'"), eap_config.password.c_str());
+    bool ca_cert_present = eap_config.ca_cert != nullptr && strlen(eap_config.ca_cert);
+    bool client_cert_present = eap_config.client_cert != nullptr && strlen(eap_config.client_cert);
+    bool client_key_present = eap_config.client_key != nullptr && strlen(eap_config.client_key);
+    ESP_LOGV(TAG, "    CA Cert:     %s", ca_cert_present ? "present" : "not present");
+    ESP_LOGV(TAG, "    Client Cert: %s", client_cert_present ? "present" : "not present");
+    ESP_LOGV(TAG, "    Client Key:  %s", client_key_present ? "present" : "not present");
+  } else {
+#endif
+    ESP_LOGV(TAG, "  Password: " LOG_SECRET("'%s'"), ap.get_password().c_str());
+#ifdef ESPHOME_WIFI_WPA2_EAP
+  }
+#endif
   if (ap.get_channel().has_value()) {
     ESP_LOGV(TAG, "  Channel: %u", *ap.get_channel());
   } else {
@@ -400,9 +419,17 @@ void WiFiComponent::check_scanning_finished() {
       connect_params.set_channel(scan_res.get_channel());
       connect_params.set_bssid(scan_res.get_bssid());
     }
-    // set manual IP+password (if any)
+    // copy manual IP (if set)
     connect_params.set_manual_ip(config.get_manual_ip());
+
+#ifdef ESPHOME_WIFI_WPA2_EAP
+    // copy EAP parameters (if set)
+    connect_params.set_eap(config.get_eap());
+#endif
+
+    // copy password (if set)
     connect_params.set_password(config.get_password());
+
     break;
   }
 
@@ -576,9 +603,21 @@ bool WiFiScanResult::matches(const WiFiAP &config) {
   // If BSSID configured, only match for correct BSSIDs
   if (config.get_bssid().has_value() && *config.get_bssid() != this->bssid_)
     return false;
-  // If PW given, only match for networks with auth (and vice versa)
+
+#ifdef ESPHOME_WIFI_WPA2_EAP
+  // BSSID requires auth but no PSK or EAP credentials given
+  if (this->with_auth_ && (config.get_password().empty() && !config.get_eap().has_value()))
+    return false;
+
+  // BSSID does not require auth, but PSK or EAP credentials given
+  if (!this->with_auth_ && (!config.get_password().empty() || config.get_eap().has_value()))
+    return false;
+#else
+  // If PSK given, only match for networks with auth (and vice versa)
   if (config.get_password().empty() == this->with_auth_)
     return false;
+#endif
+
   // If channel configured, only match networks on that channel.
   if (config.get_channel().has_value() && *config.get_channel() != this->channel_) {
     return false;

From 351ce67eae58bbb62c4a2f561ae0092a5ed692ea Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 29 Jul 2020 20:04:14 +0200
Subject: [PATCH 398/412] Bump base image to 2.4.1 (#1224)

---
 .github/workflows/ci-docker.yml   | 2 +-
 .github/workflows/release-dev.yml | 2 +-
 .github/workflows/release.yml     | 2 +-
 docker/Dockerfile                 | 2 +-
 docker/Dockerfile.dev             | 2 +-
 docker/Dockerfile.lint            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index eedda109ca..b7aeeda471 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Set up env variables
         run: |
-          base_version="2.4.0"
+          base_version="2.4.1"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index fc9afc06ec..2a427d6c95 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -190,7 +190,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.4.0"
+          base_version="2.4.1"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9f4efb590f..ad1749de92 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -210,7 +210,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.4.0"
+          base_version="2.4.1"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e4097d59d8..8845c9f58c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.4.0
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.4.1
 FROM ${BUILD_FROM}
 
 # First install requirements to leverage caching when requirements don't change
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index bb051b49ea..032e29ae30 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.4.0
+FROM esphome/esphome-base-amd64:2.4.1
 
 COPY . .
 
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 4e0b281130..2d34f300e3 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-lint-base:2.4.0
+FROM esphome/esphome-lint-base:2.4.1
 
 COPY requirements.txt requirements_test.txt /
 RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt

From e2b5ecb78b8a6ee8fada4f53b09a5e5158890944 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 29 Jul 2020 20:05:22 +0200
Subject: [PATCH 399/412] Bump version to v1.15.0b3

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 5dfba44c08..e1862d893b 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION = 1
 MINOR_VERSION = 15
-PATCH_VERSION = '0b2'
+PATCH_VERSION = '0b3'
 __short_version__ = f'{MAJOR_VERSION}.{MINOR_VERSION}'
 __version__ = f'{__short_version__}.{PATCH_VERSION}'
 

From 8a45dfac5ce7f411a09fcc8919e6432b71c58d3f Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 29 Jul 2020 20:45:47 +0200
Subject: [PATCH 400/412] Fix release.yml invalid bash syntax (#1226)

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ad1749de92..901dece924 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -226,7 +226,7 @@ jobs:
             cache_tag="beta"
           else
             cache_tag="latest"
-          end
+          fi
 
           # Set env variables so these values don't need to be calculated again
           echo "::set-env name=BUILD_FROM::${build_from}"

From b7436c0b2212a7b5a2876cd0e78d87a2ecc6a515 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Wed, 29 Jul 2020 23:29:38 +0200
Subject: [PATCH 401/412] Bump ESP8266 Arduino framework from 2.7.2 to 2.7.3
 (#1229)

---
 .github/workflows/ci-docker.yml   | 2 +-
 .github/workflows/release-dev.yml | 2 +-
 .github/workflows/release.yml     | 2 +-
 docker/Dockerfile                 | 2 +-
 docker/Dockerfile.dev             | 2 +-
 docker/Dockerfile.lint            | 2 +-
 esphome/const.py                  | 1 +
 esphome/core_config.py            | 2 +-
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index b7aeeda471..22109138fe 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Set up env variables
         run: |
-          base_version="2.4.1"
+          base_version="2.5.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 2a427d6c95..81b3cef124 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -190,7 +190,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.4.1"
+          base_version="2.5.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 901dece924..41ffbfa87d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -210,7 +210,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.4.1"
+          base_version="2.5.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8845c9f58c..c843f2f098 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.4.1
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.5.0
 FROM ${BUILD_FROM}
 
 # First install requirements to leverage caching when requirements don't change
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index 032e29ae30..b3578e16b6 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.4.1
+FROM esphome/esphome-base-amd64:2.5.0
 
 COPY . .
 
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 2d34f300e3..9a29c5066f 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-lint-base:2.4.1
+FROM esphome/esphome-lint-base:2.5.0
 
 COPY requirements.txt requirements_test.txt /
 RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt
diff --git a/esphome/const.py b/esphome/const.py
index e1862d893b..c91244e186 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -25,6 +25,7 @@ ARDUINO_VERSION_ESP32 = {
 # See also https://github.com/platformio/platform-espressif8266/releases
 ARDUINO_VERSION_ESP8266 = {
     'dev': 'https://github.com/platformio/platform-espressif8266.git',
+    '2.7.3': 'espressif8266@2.6.1',
     '2.7.2': 'espressif8266@2.6.0',
     '2.7.1': 'espressif8266@2.5.3',
     '2.7.0': 'espressif8266@2.5.0',
diff --git a/esphome/core_config.py b/esphome/core_config.py
index ff959fae27..b0d0c55399 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -44,7 +44,7 @@ validate_platform = cv.one_of(*ESP_PLATFORMS, upper=True)
 
 PLATFORMIO_ESP8266_LUT = {
     **ARDUINO_VERSION_ESP8266,
-    'RECOMMENDED': ARDUINO_VERSION_ESP8266['2.7.2'],
+    'RECOMMENDED': ARDUINO_VERSION_ESP8266['2.7.3'],
     'LATEST': 'espressif8266',
     'DEV': ARDUINO_VERSION_ESP8266['dev'],
 }

From 61bfd347ea3bc7aa1bdbdc8b0cdbd7b5340f3a45 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 30 Jul 2020 11:38:57 +0200
Subject: [PATCH 402/412] Bump ESPAsyncTCP from 1.2.2 to 1.2.3 (#1227)

---
 esphome/components/async_tcp/__init__.py | 2 +-
 platformio.ini                           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/async_tcp/__init__.py b/esphome/components/async_tcp/__init__.py
index 8af33bc4ef..b2307d5a7b 100644
--- a/esphome/components/async_tcp/__init__.py
+++ b/esphome/components/async_tcp/__init__.py
@@ -12,4 +12,4 @@ def to_code(config):
         cg.add_library('AsyncTCP-esphome', '1.1.1')
     elif CORE.is_esp8266:
         # https://github.com/OttoWinter/ESPAsyncTCP
-        cg.add_library('ESPAsyncTCP-esphome', '1.2.2')
+        cg.add_library('ESPAsyncTCP-esphome', '1.2.3')
diff --git a/platformio.ini b/platformio.ini
index e3f3de808c..557803bb29 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,7 +16,7 @@ lib_deps =
     ESPAsyncWebServer-esphome@1.2.7
     FastLED@3.3.2
     NeoPixelBus-esphome@2.5.7
-    ESPAsyncTCP-esphome@1.2.2
+    ESPAsyncTCP-esphome@1.2.3
     1655@1.0.2  ; TinyGPSPlus (has name conflict)
     6865@1.0.0  ; TM1651 Battery Display
     6306@1.0.3  ; HM3301

From 29cfcfaf0f563ae5a84398a0ca6b871ff976f13c Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 30 Jul 2020 11:41:06 +0200
Subject: [PATCH 403/412] Fix ESP8266 core has a broken settimeofday
 implementation (#1231)

---
 esphome/components/time/real_time_clock.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/esphome/components/time/real_time_clock.cpp b/esphome/components/time/real_time_clock.cpp
index cb66dc3ce6..cdcfcb14ad 100644
--- a/esphome/components/time/real_time_clock.cpp
+++ b/esphome/components/time/real_time_clock.cpp
@@ -4,6 +4,7 @@
 #ifdef ARDUINO_ARCH_ESP8266
 #include "sys/time.h"
 #endif
+#include "errno.h"
 
 namespace esphome {
 namespace time {
@@ -20,8 +21,18 @@ void RealTimeClock::synchronize_epoch_(uint32_t epoch) {
   struct timeval timev {
     .tv_sec = static_cast<time_t>(epoch), .tv_usec = 0,
   };
+  ESP_LOGVV(TAG, "Got epoch %u", epoch);
   timezone tz = {0, 0};
-  settimeofday(&timev, &tz);
+  int ret = settimeofday(&timev, &tz);
+  if (ret == EINVAL) {
+    // Some ESP8266 frameworks abort when timezone parameter is not NULL
+    // while ESP32 expects it not to be NULL
+    ret = settimeofday(&timev, nullptr);
+  }
+
+  if (ret != 0) {
+    ESP_LOGW(TAG, "setimeofday() failed with code %d", ret);
+  }
 
   auto time = this->now();
   char buf[128];

From 5da9b2ede705b65e0cc81d08b0f333527da41755 Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Thu, 30 Jul 2020 17:26:40 +0200
Subject: [PATCH 404/412] Fix tuya.cpp compile warning (#1232)

---
 esphome/components/tuya/tuya.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index b21df81d1e..644babbdec 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -22,8 +22,8 @@ void Tuya::loop() {
 void Tuya::dump_config() {
   ESP_LOGCONFIG(TAG, "Tuya:");
   if (this->init_state_ != TuyaInitState::INIT_DONE) {
-    ESP_LOGCONFIG(TAG, "  Configuration will be reported when setup is complete. Current init_state: %u",  // NOLINT
-                  this->init_state_);
+    ESP_LOGCONFIG(TAG, "  Configuration will be reported when setup is complete. Current init_state: %u",
+                  static_cast<uint8_t>(this->init_state_));
     ESP_LOGCONFIG(TAG, "  If no further output is received, confirm that this is a supported Tuya device.");
     return;
   }

From dc4a88029c87707bcd4ace30877b7b63df6d8e5f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 7 Aug 2020 03:08:48 +1200
Subject: [PATCH 405/412] Script mode fix (#1238)

---
 esphome/components/script/__init__.py |  8 ++++----
 esphome/components/script/script.cpp  |  2 +-
 tests/test2.yaml                      | 17 +++++++++++++++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/esphome/components/script/__init__.py b/esphome/components/script/__init__.py
index d33f64a23b..cdb334446a 100644
--- a/esphome/components/script/__init__.py
+++ b/esphome/components/script/__init__.py
@@ -18,14 +18,14 @@ ParallelScript = script_ns.class_('ParallelScript', Script)
 
 CONF_SINGLE = 'single'
 CONF_RESTART = 'restart'
-CONF_QUEUE = 'queue'
+CONF_QUEUED = 'queued'
 CONF_PARALLEL = 'parallel'
 CONF_MAX_RUNS = 'max_runs'
 
 SCRIPT_MODES = {
     CONF_SINGLE: SingleScript,
     CONF_RESTART: RestartScript,
-    CONF_QUEUE: QueueingScript,
+    CONF_QUEUED: QueueingScript,
     CONF_PARALLEL: ParallelScript,
 }
 
@@ -33,7 +33,7 @@ SCRIPT_MODES = {
 def check_max_runs(value):
     if CONF_MAX_RUNS not in value:
         return value
-    if value[CONF_MODE] not in [CONF_QUEUE, CONF_PARALLEL]:
+    if value[CONF_MODE] not in [CONF_QUEUED, CONF_PARALLEL]:
         raise cv.Invalid("The option 'max_runs' is only valid in 'queue' and 'parallel' mode.",
                          path=[CONF_MAX_RUNS])
     return value
@@ -65,7 +65,7 @@ def to_code(config):
         if CONF_MAX_RUNS in conf:
             cg.add(trigger.set_max_runs(conf[CONF_MAX_RUNS]))
 
-        if conf[CONF_MODE] == CONF_QUEUE:
+        if conf[CONF_MODE] == CONF_QUEUED:
             yield cg.register_component(trigger, conf)
 
         triggers.append((trigger, conf))
diff --git a/esphome/components/script/script.cpp b/esphome/components/script/script.cpp
index f4441b7dcd..e99931ced6 100644
--- a/esphome/components/script/script.cpp
+++ b/esphome/components/script/script.cpp
@@ -33,7 +33,7 @@ void QueueingScript::execute() {
       return;
     }
 
-    ESP_LOGD(TAG, "Script '%s' queueing new instance (mode: queue)", this->name_.c_str());
+    ESP_LOGD(TAG, "Script '%s' queueing new instance (mode: queued)", this->name_.c_str());
     this->num_runs_++;
     return;
   }
diff --git a/tests/test2.yaml b/tests/test2.yaml
index 34b7ad6b07..077ceab886 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -292,6 +292,21 @@ text_sensor:
 
 script:
   - id: my_script
+    mode: single
+    then:
+      - lambda: 'ESP_LOGD("main", "Hello World!");'
+  - id: my_script_queued
+    mode: queued
+    max_runs: 2
+    then:
+      - lambda: 'ESP_LOGD("main", "Hello World!");'
+  - id: my_script_parallel
+    mode: parallel
+    max_runs: 2
+    then:
+      - lambda: 'ESP_LOGD("main", "Hello World!");'
+  - id: my_script_restart
+    mode: restart
     then:
       - lambda: 'ESP_LOGD("main", "Hello World!");'
 
@@ -316,5 +331,3 @@ interval:
     - logger.log: "Interval Run"
 
 display:
-
-

From 86df4c1d8d3668233d6d4cd09cbdfb2efe9b623f Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Thu, 6 Aug 2020 12:13:19 -0300
Subject: [PATCH 406/412] make powered on assume public (#1240)

---
 esphome/components/whirlpool/whirlpool.cpp | 10 +++++-----
 esphome/components/whirlpool/whirlpool.h   |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/esphome/components/whirlpool/whirlpool.cpp b/esphome/components/whirlpool/whirlpool.cpp
index 0956f816ce..d8db3b7353 100644
--- a/esphome/components/whirlpool/whirlpool.cpp
+++ b/esphome/components/whirlpool/whirlpool.cpp
@@ -41,11 +41,11 @@ void WhirlpoolClimate::transmit_state() {
   remote_state[18] = 0x08;
 
   auto powered_on = this->mode != climate::CLIMATE_MODE_OFF;
-  if (powered_on != this->powered_on_assumed_) {
+  if (powered_on != this->powered_on_assumed) {
     // Set power toggle command
     remote_state[2] = 4;
     remote_state[15] = 1;
-    this->powered_on_assumed_ = powered_on;
+    this->powered_on_assumed = powered_on;
   }
   switch (this->mode) {
     case climate::CLIMATE_MODE_AUTO:
@@ -215,14 +215,14 @@ bool WhirlpoolClimate::on_receive(remote_base::RemoteReceiveData data) {
 
     if (powered_on) {
       this->mode = climate::CLIMATE_MODE_OFF;
-      this->powered_on_assumed_ = false;
+      this->powered_on_assumed = false;
     } else {
-      this->powered_on_assumed_ = true;
+      this->powered_on_assumed = true;
     }
   }
 
   // Set received mode
-  if (powered_on_assumed_) {
+  if (powered_on_assumed) {
     auto mode = remote_state[3] & 0x7;
     ESP_LOGV(TAG, "Mode: %02X", mode);
     switch (mode) {
diff --git a/esphome/components/whirlpool/whirlpool.h b/esphome/components/whirlpool/whirlpool.h
index 44116b340c..7f31894df9 100644
--- a/esphome/components/whirlpool/whirlpool.h
+++ b/esphome/components/whirlpool/whirlpool.h
@@ -28,7 +28,7 @@ class WhirlpoolClimate : public climate_ir::ClimateIR {
   void setup() override {
     climate_ir::ClimateIR::setup();
 
-    this->powered_on_assumed_ = this->mode != climate::CLIMATE_MODE_OFF;
+    this->powered_on_assumed = this->mode != climate::CLIMATE_MODE_OFF;
   }
 
   /// Override control to change settings of the climate device.
@@ -39,15 +39,15 @@ class WhirlpoolClimate : public climate_ir::ClimateIR {
 
   void set_model(Model model) { this->model_ = model; }
 
+  // used to track when to send the power toggle command
+  bool powered_on_assumed;
+
  protected:
   /// Transmit via IR the state of this climate controller.
   void transmit_state() override;
   /// Handle received IR Buffer
   bool on_receive(remote_base::RemoteReceiveData data) override;
 
-  // used to track when to send the power toggle command
-  bool powered_on_assumed_;
-
   bool send_swing_cmd_{false};
   Model model_;
 

From 32ae8fc2d08cffeb9bec8f7b4f8a492faa47048e Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sat, 8 Aug 2020 18:42:21 +0200
Subject: [PATCH 407/412] Bump docker base image to 2.6.0 (#1245)

---
 .github/workflows/ci-docker.yml    |  2 +-
 .github/workflows/release-dev.yml  |  2 +-
 .github/workflows/release.yml      |  2 +-
 docker/Dockerfile                  |  2 +-
 docker/Dockerfile.dev              |  2 +-
 docker/Dockerfile.lint             |  2 +-
 esphome/const.py                   |  1 +
 esphome/core_config.py             |  2 +-
 script/bump-docker-base-version.py | 59 ++++++++++++++++++++++++++++++
 9 files changed, 67 insertions(+), 7 deletions(-)
 create mode 100755 script/bump-docker-base-version.py

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 22109138fe..8036470f52 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Set up env variables
         run: |
-          base_version="2.5.0"
+          base_version="2.6.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release-dev.yml b/.github/workflows/release-dev.yml
index 81b3cef124..81c3a80b05 100644
--- a/.github/workflows/release-dev.yml
+++ b/.github/workflows/release-dev.yml
@@ -190,7 +190,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.5.0"
+          base_version="2.6.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 41ffbfa87d..7ac80355f2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -210,7 +210,7 @@ jobs:
           echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          base_version="2.5.0"
+          base_version="2.6.0"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index c843f2f098..865741a39f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=esphome/esphome-base-amd64:2.5.0
+ARG BUILD_FROM=esphome/esphome-base-amd64:2.6.0
 FROM ${BUILD_FROM}
 
 # First install requirements to leverage caching when requirements don't change
diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev
index b3578e16b6..989802ab1e 100644
--- a/docker/Dockerfile.dev
+++ b/docker/Dockerfile.dev
@@ -1,4 +1,4 @@
-FROM esphome/esphome-base-amd64:2.5.0
+FROM esphome/esphome-base-amd64:2.6.0
 
 COPY . .
 
diff --git a/docker/Dockerfile.lint b/docker/Dockerfile.lint
index 9a29c5066f..27f04dd33d 100644
--- a/docker/Dockerfile.lint
+++ b/docker/Dockerfile.lint
@@ -1,4 +1,4 @@
-FROM esphome/esphome-lint-base:2.5.0
+FROM esphome/esphome-lint-base:2.6.0
 
 COPY requirements.txt requirements_test.txt /
 RUN pip3 install --no-cache-dir -r /requirements.txt -r /requirements_test.txt
diff --git a/esphome/const.py b/esphome/const.py
index c91244e186..c3eccd6311 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -25,6 +25,7 @@ ARDUINO_VERSION_ESP32 = {
 # See also https://github.com/platformio/platform-espressif8266/releases
 ARDUINO_VERSION_ESP8266 = {
     'dev': 'https://github.com/platformio/platform-espressif8266.git',
+    '2.7.4': 'espressif8266@2.6.2',
     '2.7.3': 'espressif8266@2.6.1',
     '2.7.2': 'espressif8266@2.6.0',
     '2.7.1': 'espressif8266@2.5.3',
diff --git a/esphome/core_config.py b/esphome/core_config.py
index b0d0c55399..f167eb8d8b 100644
--- a/esphome/core_config.py
+++ b/esphome/core_config.py
@@ -44,7 +44,7 @@ validate_platform = cv.one_of(*ESP_PLATFORMS, upper=True)
 
 PLATFORMIO_ESP8266_LUT = {
     **ARDUINO_VERSION_ESP8266,
-    'RECOMMENDED': ARDUINO_VERSION_ESP8266['2.7.3'],
+    'RECOMMENDED': ARDUINO_VERSION_ESP8266['2.7.4'],
     'LATEST': 'espressif8266',
     'DEV': ARDUINO_VERSION_ESP8266['dev'],
 }
diff --git a/script/bump-docker-base-version.py b/script/bump-docker-base-version.py
new file mode 100755
index 0000000000..178643cea6
--- /dev/null
+++ b/script/bump-docker-base-version.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+
+import argparse
+import re
+import sys
+
+
+def sub(path, pattern, repl, expected_count=1):
+    with open(path) as fh:
+        content = fh.read()
+    content, count = re.subn(pattern, repl, content, flags=re.MULTILINE)
+    if expected_count is not None:
+        assert count == expected_count, f"Pattern {pattern} replacement failed!"
+    with open(path, "wt") as fh:
+        fh.write(content)
+
+
+def write_version(version: str):
+    for p in [
+            ".github/workflows/ci-docker.yml",
+            ".github/workflows/release-dev.yml",
+            ".github/workflows/release.yml"
+    ]:
+        sub(
+            p,
+            r'base_version=".*"',
+            f'base_version="{version}"'
+        )
+
+    sub(
+        "docker/Dockerfile",
+        r"ARG BUILD_FROM=esphome/esphome-base-amd64:.*",
+        f"ARG BUILD_FROM=esphome/esphome-base-amd64:{version}"
+    )
+    sub(
+        "docker/Dockerfile.dev",
+        r"FROM esphome/esphome-base-amd64:.*",
+        f"FROM esphome/esphome-base-amd64:{version}"
+    )
+    sub(
+        "docker/Dockerfile.lint",
+        r"FROM esphome/esphome-lint-base:.*",
+        f"FROM esphome/esphome-lint-base:{version}"
+    )
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('new_version', type=str)
+    args = parser.parse_args()
+
+    version = args.new_version
+    print(f"Bumping to {version}")
+    write_version(version)
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main() or 0)

From b7352b13454bfb52f38367818dcb4dec69bd1056 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Tue, 11 Aug 2020 10:28:30 -0300
Subject: [PATCH 408/412] Image bit dephts (#1241)

---
 esphome/components/display/display_buffer.cpp | 51 ++++++------
 esphome/components/display/display_buffer.h   | 19 +++--
 esphome/components/image/__init__.py          | 79 ++++++++++---------
 3 files changed, 79 insertions(+), 70 deletions(-)

diff --git a/esphome/components/display/display_buffer.cpp b/esphome/components/display/display_buffer.cpp
index 4f62a62c6d..bd468dcbc3 100644
--- a/esphome/components/display/display_buffer.cpp
+++ b/esphome/components/display/display_buffer.cpp
@@ -204,31 +204,33 @@ void DisplayBuffer::vprintf_(int x, int y, Font *font, Color color, TextAlign al
   if (ret > 0)
     this->print(x, y, font, color, align, buffer);
 }
-void DisplayBuffer::image(int x, int y, Image *image) { this->image(x, y, COLOR_ON, image); }
-void DisplayBuffer::image(int x, int y, Color color, Image *image, bool invert) {
-  if (image->get_type() == BINARY) {
-    for (int img_x = 0; img_x < image->get_width(); img_x++) {
-      for (int img_y = 0; img_y < image->get_height(); img_y++) {
-        if (invert)
-          this->draw_pixel_at(x + img_x, y + img_y, image->get_pixel(img_x, img_y) ? COLOR_OFF : color);
-        else
-          this->draw_pixel_at(x + img_x, y + img_y, image->get_pixel(img_x, img_y) ? color : COLOR_OFF);
+
+void DisplayBuffer::image(int x, int y, Image *image, Color color_on, Color color_off) {
+  switch (image->get_type()) {
+    case IMAGE_TYPE_BINARY:
+      for (int img_x = 0; img_x < image->get_width(); img_x++) {
+        for (int img_y = 0; img_y < image->get_height(); img_y++) {
+          this->draw_pixel_at(x + img_x, y + img_y, image->get_pixel(img_x, img_y) ? color_on : color_off);
+        }
       }
-    }
-  } else if (image->get_type() == GRAYSCALE) {
-    for (int img_x = 0; img_x < image->get_width(); img_x++) {
-      for (int img_y = 0; img_y < image->get_height(); img_y++) {
-        this->draw_pixel_at(x + img_x, y + img_y, image->get_grayscale_pixel(img_x, img_y));
+      break;
+    case IMAGE_TYPE_GRAYSCALE:
+      for (int img_x = 0; img_x < image->get_width(); img_x++) {
+        for (int img_y = 0; img_y < image->get_height(); img_y++) {
+          this->draw_pixel_at(x + img_x, y + img_y, image->get_grayscale_pixel(img_x, img_y));
+        }
       }
-    }
-  } else if (image->get_type() == RGB) {
-    for (int img_x = 0; img_x < image->get_width(); img_x++) {
-      for (int img_y = 0; img_y < image->get_height(); img_y++) {
-        this->draw_pixel_at(x + img_x, y + img_y, image->get_color_pixel(img_x, img_y));
+      break;
+    case IMAGE_TYPE_RGB24:
+      for (int img_x = 0; img_x < image->get_width(); img_x++) {
+        for (int img_y = 0; img_y < image->get_height(); img_y++) {
+          this->draw_pixel_at(x + img_x, y + img_y, image->get_color_pixel(img_x, img_y));
+        }
       }
-    }
+      break;
   }
 }
+
 void DisplayBuffer::get_text_bounds(int x, int y, const char *text, Font *font, TextAlign align, int *x1, int *y1,
                                     int *width, int *height) {
   int x_offset, baseline;
@@ -463,15 +465,14 @@ Color Image::get_grayscale_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return 0;
   const uint32_t pos = (x + y * this->width_);
-  return Color(pgm_read_byte(this->data_start_ + pos) << 24);
+  const uint8_t gray = pgm_read_byte(this->data_start_ + pos);
+  return Color(gray | gray << 8 | gray << 16 | gray << 24);
 }
 int Image::get_width() const { return this->width_; }
 int Image::get_height() const { return this->height_; }
 ImageType Image::get_type() const { return this->type_; }
-Image::Image(const uint8_t *data_start, int width, int height)
-    : width_(width), height_(height), data_start_(data_start) {}
-Image::Image(const uint8_t *data_start, int width, int height, int type)
-    : width_(width), height_(height), type_((ImageType) type), data_start_(data_start) {}
+Image::Image(const uint8_t *data_start, int width, int height, ImageType type)
+    : width_(width), height_(height), type_(type), data_start_(data_start) {}
 
 DisplayPage::DisplayPage(const display_writer_t &writer) : writer_(writer) {}
 void DisplayPage::show() { this->parent_->show_page(this); }
diff --git a/esphome/components/display/display_buffer.h b/esphome/components/display/display_buffer.h
index a8a308538e..e402b4b021 100644
--- a/esphome/components/display/display_buffer.h
+++ b/esphome/components/display/display_buffer.h
@@ -68,7 +68,7 @@ extern const Color COLOR_OFF;
 /// Turn the pixel ON.
 extern const Color COLOR_ON;
 
-enum ImageType { BINARY = 0, GRAYSCALE = 1, RGB = 2 };
+enum ImageType { IMAGE_TYPE_BINARY = 0, IMAGE_TYPE_GRAYSCALE = 1, IMAGE_TYPE_RGB24 = 2 };
 
 enum DisplayRotation {
   DISPLAY_ROTATION_0_DEGREES = 0,
@@ -262,9 +262,15 @@ class DisplayBuffer {
       __attribute__((format(strftime, 5, 0)));
 #endif
 
-  /// Draw the `image` with the top-left corner at [x,y] to the screen.
-  void image(int x, int y, Image *image);
-  void image(int x, int y, Color color, Image *image, bool invert = false);
+  /** Draw the `image` with the top-left corner at [x,y] to the screen.
+   *
+   * @param x The x coordinate of the upper left corner.
+   * @param y The y coordinate of the upper left corner.
+   * @param image The image to draw
+   * @param color_on The color to replace in binary images for the on bits.
+   * @param color_off The color to replace in binary images for the off bits.
+   */
+  void image(int x, int y, Image *image, Color color_on = COLOR_ON, Color color_off = COLOR_OFF);
 
   /** Get the text bounds of the given string.
    *
@@ -381,8 +387,7 @@ class Font {
 
 class Image {
  public:
-  Image(const uint8_t *data_start, int width, int height);
-  Image(const uint8_t *data_start, int width, int height, int type);
+  Image(const uint8_t *data_start, int width, int height, ImageType type);
   bool get_pixel(int x, int y) const;
   Color get_color_pixel(int x, int y) const;
   Color get_grayscale_pixel(int x, int y) const;
@@ -393,7 +398,7 @@ class Image {
  protected:
   int width_;
   int height_;
-  ImageType type_{BINARY};
+  ImageType type_;
   const uint8_t *data_start_;
 };
 
diff --git a/esphome/components/image/__init__.py b/esphome/components/image/__init__.py
index b5c9e29f97..dfe387afd1 100644
--- a/esphome/components/image/__init__.py
+++ b/esphome/components/image/__init__.py
@@ -4,14 +4,20 @@ from esphome import core
 from esphome.components import display, font
 import esphome.config_validation as cv
 import esphome.codegen as cg
-from esphome.const import CONF_FILE, CONF_ID, CONF_RESIZE, CONF_TYPE
+from esphome.const import CONF_FILE, CONF_ID, CONF_TYPE, CONF_RESIZE
 from esphome.core import CORE, HexInt
 _LOGGER = logging.getLogger(__name__)
 
 DEPENDENCIES = ['display']
 MULTI_CONF = True
 
-ImageType = {'binary': 0, 'grayscale': 1, 'rgb': 2}
+
+ImageType = display.display_ns.enum('ImageType')
+IMAGE_TYPE = {
+    'BINARY': ImageType.IMAGE_TYPE_BINARY,
+    'GRAYSCALE': ImageType.IMAGE_TYPE_GRAYSCALE,
+    'RGB24': ImageType.IMAGE_TYPE_RGB24,
+}
 
 Image_ = display.display_ns.class_('Image')
 
@@ -21,7 +27,7 @@ IMAGE_SCHEMA = cv.Schema({
     cv.Required(CONF_ID): cv.declare_id(Image_),
     cv.Required(CONF_FILE): cv.file_,
     cv.Optional(CONF_RESIZE): cv.dimensions,
-    cv.Optional(CONF_TYPE): cv.string,
+    cv.Optional(CONF_TYPE, default='BINARY'): cv.enum(IMAGE_TYPE, upper=True),
     cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
 })
 
@@ -37,44 +43,40 @@ def to_code(config):
     except Exception as e:
         raise core.EsphomeError(f"Could not load image file {path}: {e}")
 
+    width, height = image.size
+
     if CONF_RESIZE in config:
         image.thumbnail(config[CONF_RESIZE])
-
-    if CONF_TYPE in config:
-        if config[CONF_TYPE].startswith('GRAYSCALE'):
-            width, height = image.size
-            image = image.convert('L', dither=Image.NONE)
-            pixels = list(image.getdata())
-            data = [0 for _ in range(height * width)]
-            pos = 0
-            for pix in pixels:
-                data[pos] = pix
-                pos += 1
-            rhs = [HexInt(x) for x in data]
-            prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
-            cg.new_Pvariable(config[CONF_ID], prog_arr, width, height, ImageType['grayscale'])
-        elif config[CONF_TYPE].startswith('RGB'):
-            width, height = image.size
-            image = image.convert('RGB')
-            pixels = list(image.getdata())
-            data = [0 for _ in range(height * width * 3)]
-            pos = 0
-            for pix in pixels:
-                data[pos] = pix[0]
-                pos += 1
-                data[pos] = pix[1]
-                pos += 1
-                data[pos] = pix[2]
-                pos += 1
-            rhs = [HexInt(x) for x in data]
-            prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
-            cg.new_Pvariable(config[CONF_ID], prog_arr, width, height, ImageType['rgb'])
-    else:
-        image = image.convert('1', dither=Image.NONE)
         width, height = image.size
+    else:
         if width > 500 or height > 500:
             _LOGGER.warning("The image you requested is very big. Please consider using"
                             " the resize parameter.")
+
+    if config[CONF_TYPE] == 'GRAYSCALE':
+        image = image.convert('L', dither=Image.NONE)
+        pixels = list(image.getdata())
+        data = [0 for _ in range(height * width)]
+        pos = 0
+        for pix in pixels:
+            data[pos] = pix
+            pos += 1
+
+    elif config[CONF_TYPE] == 'RGB24':
+        image = image.convert('RGB')
+        pixels = list(image.getdata())
+        data = [0 for _ in range(height * width * 3)]
+        pos = 0
+        for pix in pixels:
+            data[pos] = pix[0]
+            pos += 1
+            data[pos] = pix[1]
+            pos += 1
+            data[pos] = pix[2]
+            pos += 1
+
+    elif config[CONF_TYPE] == 'BINARY':
+        image = image.convert('1', dither=Image.NONE)
         width8 = ((width + 7) // 8) * 8
         data = [0 for _ in range(height * width8 // 8)]
         for y in range(height):
@@ -84,6 +86,7 @@ def to_code(config):
                 pos = x + y * width8
                 data[pos // 8] |= 0x80 >> (pos % 8)
 
-        rhs = [HexInt(x) for x in data]
-        prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
-        cg.new_Pvariable(config[CONF_ID], prog_arr, width, height)
+    rhs = [HexInt(x) for x in data]
+    prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
+    cg.new_Pvariable(config[CONF_ID], prog_arr, width, height,
+                     IMAGE_TYPE[config[CONF_TYPE]])

From cfe4638665de6646bc69abe44b53a481431e23ad Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Thu, 13 Aug 2020 23:21:19 -0300
Subject: [PATCH 409/412] fixes deg symbol not shown (#1248)

---
 esphome/components/tm1637/tm1637.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/tm1637/tm1637.cpp b/esphome/components/tm1637/tm1637.cpp
index d9b9a870ff..833e3caecd 100644
--- a/esphome/components/tm1637/tm1637.cpp
+++ b/esphome/components/tm1637/tm1637.cpp
@@ -232,7 +232,7 @@ uint8_t TM1637Display::print(uint8_t start_pos, const char* str) {
   uint8_t pos = start_pos;
   for (; *str != '\0'; str++) {
     uint8_t data = TM1637_UNKNOWN_CHAR;
-    if (*str >= ' ' && *str <= '}')
+    if (*str >= ' ' && *str <= '~')
       data = pgm_read_byte(&TM1637_ASCII_TO_RAW[*str - ' ']);
 
     if (data == TM1637_UNKNOWN_CHAR) {

From 228670df78023b9ec233749407f1a12e53747321 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Sun, 23 Aug 2020 18:36:11 -0500
Subject: [PATCH 410/412] Fix SSD1306 post-setup brightness control (#1090)

* Fix post-setup brightness control

* Add turn_on() and turn_off() methods

* Added is_on() method

* Set brightness later in setup()

* Use clamp() for brightness validation
---
 esphome/components/ssd1306_base/__init__.py   |  2 +-
 .../components/ssd1306_base/ssd1306_base.cpp  | 51 ++++++++++---------
 .../components/ssd1306_base/ssd1306_base.h    |  8 ++-
 3 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/esphome/components/ssd1306_base/__init__.py b/esphome/components/ssd1306_base/__init__.py
index 047ddddcac..a8b2a2a7bb 100644
--- a/esphome/components/ssd1306_base/__init__.py
+++ b/esphome/components/ssd1306_base/__init__.py
@@ -41,7 +41,7 @@ def setup_ssd1036(var, config):
         reset = yield cg.gpio_pin_expression(config[CONF_RESET_PIN])
         cg.add(var.set_reset_pin(reset))
     if CONF_BRIGHTNESS in config:
-        cg.add(var.set_brightness(config[CONF_BRIGHTNESS]))
+        cg.add(var.init_brightness(config[CONF_BRIGHTNESS]))
     if CONF_EXTERNAL_VCC in config:
         cg.add(var.set_external_vcc(config[CONF_EXTERNAL_VCC]))
     if CONF_LAMBDA in config:
diff --git a/esphome/components/ssd1306_base/ssd1306_base.cpp b/esphome/components/ssd1306_base/ssd1306_base.cpp
index 2c1e5c6de8..1537d3b526 100644
--- a/esphome/components/ssd1306_base/ssd1306_base.cpp
+++ b/esphome/components/ssd1306_base/ssd1306_base.cpp
@@ -5,7 +5,11 @@
 namespace esphome {
 namespace ssd1306_base {
 
-static const char *TAG = "sd1306";
+static const char *TAG = "ssd1306";
+
+static const uint8_t BLACK = 0;
+static const uint8_t WHITE = 1;
+static const uint8_t SSD1306_MAX_CONTRAST = 255;
 
 static const uint8_t SSD1306_COMMAND_DISPLAY_OFF = 0xAE;
 static const uint8_t SSD1306_COMMAND_DISPLAY_ON = 0xAF;
@@ -69,27 +73,6 @@ void SSD1306::setup() {
       break;
   }
 
-  this->command(SSD1306_COMMAND_SET_CONTRAST);
-  switch (this->model_) {
-    case SSD1306_MODEL_128_32:
-    case SH1106_MODEL_128_32:
-      this->command(0x8F);
-      break;
-    case SSD1306_MODEL_128_64:
-    case SH1106_MODEL_128_64:
-    case SSD1306_MODEL_64_48:
-    case SH1106_MODEL_64_48:
-      this->command(int(255 * (this->brightness_)));
-      break;
-    case SSD1306_MODEL_96_16:
-    case SH1106_MODEL_96_16:
-      if (this->external_vcc_)
-        this->command(0x10);
-      else
-        this->command(0xAF);
-      break;
-  }
-
   this->command(SSD1306_COMMAND_SET_PRE_CHARGE);
   if (this->external_vcc_)
     this->command(0x22);
@@ -104,7 +87,12 @@ void SSD1306::setup() {
 
   this->command(SSD1306_COMMAND_DEACTIVATE_SCROLL);
 
-  this->command(SSD1306_COMMAND_DISPLAY_ON);
+  set_brightness(this->brightness_);
+
+  this->fill(BLACK);  // clear display - ensures we do not see garbage at power-on
+  this->display();    // ...write buffer, which actually clears the display's memory
+
+  this->turn_on();
 }
 void SSD1306::display() {
   if (this->is_sh1106_()) {
@@ -140,6 +128,22 @@ void SSD1306::update() {
   this->do_update_();
   this->display();
 }
+void SSD1306::set_brightness(float brightness) {
+  // validation
+  this->brightness_ = clamp(brightness, 0, 1);
+  // now write the new brightness level to the display
+  this->command(SSD1306_COMMAND_SET_CONTRAST);
+  this->command(int(SSD1306_MAX_CONTRAST * (this->brightness_)));
+}
+bool SSD1306::is_on() { return this->is_on_; }
+void SSD1306::turn_on() {
+  this->command(SSD1306_COMMAND_DISPLAY_ON);
+  this->is_on_ = true;
+}
+void SSD1306::turn_off() {
+  this->command(SSD1306_COMMAND_DISPLAY_OFF);
+  this->is_on_ = false;
+}
 int SSD1306::get_height_internal() {
   switch (this->model_) {
     case SSD1306_MODEL_128_32:
@@ -178,7 +182,6 @@ int SSD1306::get_width_internal() {
 size_t SSD1306::get_buffer_length_() {
   return size_t(this->get_width_internal()) * size_t(this->get_height_internal()) / 8u;
 }
-
 void HOT SSD1306::draw_absolute_pixel_internal(int x, int y, Color color) {
   if (x >= this->get_width_internal() || x < 0 || y >= this->get_height_internal() || y < 0)
     return;
diff --git a/esphome/components/ssd1306_base/ssd1306_base.h b/esphome/components/ssd1306_base/ssd1306_base.h
index 3e46ef9cc7..0fe09709e7 100644
--- a/esphome/components/ssd1306_base/ssd1306_base.h
+++ b/esphome/components/ssd1306_base/ssd1306_base.h
@@ -29,8 +29,11 @@ class SSD1306 : public PollingComponent, public display::DisplayBuffer {
   void set_model(SSD1306Model model) { this->model_ = model; }
   void set_reset_pin(GPIOPin *reset_pin) { this->reset_pin_ = reset_pin; }
   void set_external_vcc(bool external_vcc) { this->external_vcc_ = external_vcc; }
-  void set_brightness(float brightness) { this->brightness_ = brightness; }
-
+  void init_brightness(float brightness) { this->brightness_ = brightness; }
+  void set_brightness(float brightness);
+  bool is_on();
+  void turn_on();
+  void turn_off();
   float get_setup_priority() const override { return setup_priority::PROCESSOR; }
   void fill(Color color) override;
 
@@ -51,6 +54,7 @@ class SSD1306 : public PollingComponent, public display::DisplayBuffer {
   SSD1306Model model_{SSD1306_MODEL_128_64};
   GPIOPin *reset_pin_{nullptr};
   bool external_vcc_{false};
+  bool is_on_{false};
   float brightness_{1.0};
 };
 

From ff050d634ad8929a441a0b5eb88ceb6db40ea1e4 Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 23 Aug 2020 21:53:50 -0300
Subject: [PATCH 411/412] Bump version to v1.15.0b4

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index c3eccd6311..153e2902d4 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION = 1
 MINOR_VERSION = 15
-PATCH_VERSION = '0b3'
+PATCH_VERSION = '0b4'
 __short_version__ = f'{MAJOR_VERSION}.{MINOR_VERSION}'
 __version__ = f'{__short_version__}.{PATCH_VERSION}'
 

From 52c4dd0e356bf4ffc090874b28b96c6315d59ffa Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Sun, 13 Sep 2020 14:18:32 -0300
Subject: [PATCH 412/412] Bump version to v1.15.0

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 153e2902d4..61c3044fe6 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION = 1
 MINOR_VERSION = 15
-PATCH_VERSION = '0b4'
+PATCH_VERSION = '0'
 __short_version__ = f'{MAJOR_VERSION}.{MINOR_VERSION}'
 __version__ = f'{__short_version__}.{PATCH_VERSION}'