Merge pull request #3252 from esphome/bump-2022.2.5

2022.2.5

.github/ISSUE_TEMPLATE/config.yml

@@ -9,3 +9,4 @@ contact_links:
   - 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.
+    

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-# What does this implement/fix?
+# What does this implement/fix? 
 
 Quick description and explanation of changes
 
@@ -35,6 +35,6 @@ Quick description and explanation of changes
 ## Checklist:
   - [ ] The code change is tested and works locally.
   - [ ] Tests have been added to verify that the new code works (under `tests/` folder).
-
+  
 If user exposed functionality or configuration variables are added/changed:
   - [ ] Documentation added/updated in [esphome-docs](https://github.com/esphome/esphome-docs).

.github/workflows/ci.yml

@@ -80,7 +80,7 @@ jobs:
         uses: actions/setup-python@v2
         id: python
         with:
-          python-version: '3.8'
+          python-version: '3.7'
 
       - name: Cache virtualenv
         uses: actions/cache@v2

.gitignore

@@ -77,7 +77,6 @@ venv/
 ENV/
 env.bak/
 venv.bak/
-venv-*/
 
 # mypy
 .mypy_cache/

.pre-commit-config.yaml

@@ -25,8 +25,3 @@ repos:
           - --branch=dev
           - --branch=release
           - --branch=beta
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.0
-    hooks:
-      - id: pyupgrade
-        args: [--py38-plus]

CODEOWNERS

@@ -19,7 +19,6 @@ esphome/components/airthings_wave_mini/* @ncareau
 esphome/components/airthings_wave_plus/* @jeromelaban
 esphome/components/am43/* @buxtronix
 esphome/components/am43/cover/* @buxtronix
-esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
 esphome/components/api/* @OttoWinter
@@ -28,7 +27,6 @@ esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
-esphome/components/bh1750/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
 esphome/components/bl0940/* @tobias-
 esphome/components/ble_client/* @buxtronix
@@ -44,7 +42,6 @@ esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
 esphome/components/coolix/* @glmnet
-esphome/components/copy/* @OttoWinter
 esphome/components/cover/* @esphome/core
 esphome/components/cs5460a/* @balrog-kun
 esphome/components/cse7761/* @berfenger
@@ -80,7 +77,6 @@ esphome/components/hbridge/light/* @DotNetDann
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/homeassistant/* @OttoWinter
-esphome/components/honeywellabp/* @RubyBailey
 esphome/components/hrxl_maxsonar_wr/* @netmikey
 esphome/components/i2c/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
@@ -97,7 +93,6 @@ esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
 esphome/components/ltr390/* @sjtrny
-esphome/components/max44009/* @berfenger
 esphome/components/max7219digit/* @rspaargaren
 esphome/components/max9611/* @mckaymatthew
 esphome/components/mcp23008/* @jesserockz
@@ -109,7 +104,6 @@ esphome/components/mcp23x17_base/* @jesserockz
 esphome/components/mcp23xxx_base/* @jesserockz
 esphome/components/mcp2515/* @danielschramm @mvturnho
 esphome/components/mcp3204/* @rsumner
-esphome/components/mcp4728/* @berfenger
 esphome/components/mcp47a1/* @jesserockz
 esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
@@ -126,9 +120,6 @@ esphome/components/modbus_controller/select/* @martgras @stegm
 esphome/components/modbus_controller/sensor/* @martgras
 esphome/components/modbus_controller/switch/* @martgras
 esphome/components/modbus_controller/text_sensor/* @martgras
-esphome/components/mopeka_ble/* @spbrogan
-esphome/components/mopeka_pro_check/* @spbrogan
-esphome/components/mpu6886/* @fabaff
 esphome/components/network/* @esphome/core
 esphome/components/nextion/* @senexcrenshaw
 esphome/components/nextion/binary_sensor/* @senexcrenshaw
@@ -149,7 +140,7 @@ esphome/components/pn532_spi/* @OttoWinter @jesserockz
 esphome/components/power_supply/* @esphome/core
 esphome/components/preferences/* @esphome/core
 esphome/components/psram/* @esphome/core
-esphome/components/pulse_meter/* @cstaahl @stevebaxter
+esphome/components/pulse_meter/* @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
 esphome/components/qr_code/* @wjtje
 esphome/components/radon_eye_ble/* @jeffeb3

CONTRIBUTING.md

@@ -5,7 +5,7 @@ For a detailed guide, please see https://esphome.io/guides/contributing.html#con
 Things to note when contributing:
 
  - Please test your changes :)
- - If a new feature is added or an existing user-facing feature is changed, you should also
+ - If a new feature is added or an existing user-facing feature is changed, you should also 
    update the [docs](https://github.com/esphome/esphome-docs). See [contributing to esphome-docs](https://esphome.io/guides/contributing.html#contributing-to-esphomedocs)
    for more information.
  - Please also update the tests in the `tests/` folder. You can do so by just adding a line in one of the YAML files

docker/Dockerfile

@@ -5,11 +5,9 @@
 # One of "docker", "hassio"
 ARG BASEIMGTYPE=docker
 
-# https://github.com/hassio-addons/addon-debian-base/releases
 FROM ghcr.io/hassio-addons/debian-base/amd64:5.2.3 AS base-hassio-amd64
 FROM ghcr.io/hassio-addons/debian-base/aarch64:5.2.3 AS base-hassio-arm64
 FROM ghcr.io/hassio-addons/debian-base/armv7:5.2.3 AS base-hassio-armv7
-# https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
 FROM debian:bullseye-20220125-slim AS base-docker-amd64
 FROM debian:bullseye-20220125-slim AS base-docker-arm64
 FROM debian:bullseye-20220125-slim AS base-docker-armv7
@@ -54,16 +52,16 @@ RUN \
     && mkdir -p /piolibs
 
 
+
+# ======================= docker-type image =======================
+FROM base AS docker
+
 # First install requirements to leverage caching when requirements don't change
 COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini /
 RUN \
     pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
     && /platformio_install_deps.py /platformio.ini
 
-
-# ======================= docker-type image =======================
-FROM base AS docker
-
 # Copy esphome and install
 COPY . /esphome
 RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
@@ -95,7 +93,7 @@ RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        nginx-light=1.18.0-6.1 \
+        nginx=1.18.0-6.1 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
@@ -106,6 +104,12 @@ ARG BUILD_VERSION=dev
 # Copy root filesystem
 COPY docker/ha-addon-rootfs/ /
 
+# First install requirements to leverage caching when requirements don't change
+COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini /
+RUN \
+    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
+    && /platformio_install_deps.py /platformio.ini
+
 # Copy esphome and install
 COPY . /esphome
 RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
@@ -143,8 +147,10 @@ RUN \
         /var/{cache,log}/* \
         /var/lib/apt/lists/*
 
-COPY requirements_test.txt /
-RUN pip3 install --no-cache-dir -r /requirements_test.txt
+COPY requirements.txt requirements_optional.txt requirements_test.txt docker/platformio_install_deps.py platformio.ini /
+RUN \
+    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt -r /requirements_test.txt \
+    && /platformio_install_deps.py /platformio.ini
 
 VOLUME ["/esphome"]
 WORKDIR /esphome

esphome/__main__.py

@@ -778,10 +778,10 @@ def run_esphome(argv):
         _LOGGER.warning("Please instead use:")
         _LOGGER.warning("   esphome %s", " ".join(args.deprecated_argv_suggestion))
 
-    if sys.version_info < (3, 8, 0):
+    if sys.version_info < (3, 7, 0):
         _LOGGER.error(
-            "You're running ESPHome with Python <3.8. ESPHome is no longer compatible "
-            "with this Python version. Please reinstall ESPHome with Python 3.8+"
+            "You're running ESPHome with Python <3.7. ESPHome is no longer compatible "
+            "with this Python version. Please reinstall ESPHome with Python 3.7+"
         )
         return 1
 

esphome/components/adc/sensor.py

@@ -133,7 +133,6 @@ ADCSensor = adc_ns.class_(
 
 CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
-        ADCSensor,
         unit_of_measurement=UNIT_VOLT,
         accuracy_decimals=2,
         device_class=DEVICE_CLASS_VOLTAGE,
@@ -141,6 +140,7 @@ CONFIG_SCHEMA = cv.All(
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(ADCSensor),
             cv.Required(CONF_PIN): validate_adc_pin,
             cv.Optional(CONF_RAW, default=False): cv.boolean,
             cv.SplitDefault(CONF_ATTENUATION, esp32="0db"): cv.All(

esphome/components/ads1115/sensor.py

@@ -52,7 +52,6 @@ ADS1115Sensor = ads1115_ns.class_(
 CONF_ADS1115_ID = "ads1115_id"
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        ADS1115Sensor,
         unit_of_measurement=UNIT_VOLT,
         accuracy_decimals=3,
         device_class=DEVICE_CLASS_VOLTAGE,
@@ -60,6 +59,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(ADS1115Sensor),
             cv.GenerateID(CONF_ADS1115_ID): cv.use_id(ADS1115Component),
             cv.Required(CONF_MULTIPLEXER): cv.enum(MUX, upper=True, space="_"),
             cv.Required(CONF_GAIN): validate_gain,

esphome/components/analog_threshold/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@ianchi"]

esphome/components/analog_threshold/analog_threshold_binary_sensor.cpp

@@ -1,40 +0,0 @@
-#include "analog_threshold_binary_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace analog_threshold {
-
-static const char *const TAG = "analog_threshold.binary_sensor";
-
-void AnalogThresholdBinarySensor::setup() {
-  float sensor_value = this->sensor_->get_state();
-
-  // TRUE state is defined to be when sensor is >= threshold
-  // so when undefined sensor value initialize to FALSE
-  if (std::isnan(sensor_value)) {
-    this->publish_initial_state(false);
-  } else {
-    this->publish_initial_state(sensor_value >= (this->lower_threshold_ + this->upper_threshold_) / 2.0f);
-  }
-}
-
-void AnalogThresholdBinarySensor::set_sensor(sensor::Sensor *analog_sensor) {
-  this->sensor_ = analog_sensor;
-
-  this->sensor_->add_on_state_callback([this](float sensor_value) {
-    // if there is an invalid sensor reading, ignore the change and keep the current state
-    if (!std::isnan(sensor_value)) {
-      this->publish_state(sensor_value >= (this->state ? this->lower_threshold_ : this->upper_threshold_));
-    }
-  });
-}
-
-void AnalogThresholdBinarySensor::dump_config() {
-  LOG_BINARY_SENSOR("", "Analog Threshold Binary Sensor", this);
-  LOG_SENSOR("  ", "Sensor", this->sensor_);
-  ESP_LOGCONFIG(TAG, "  Upper threshold: %.11f", this->upper_threshold_);
-  ESP_LOGCONFIG(TAG, "  Lower threshold: %.11f", this->lower_threshold_);
-}
-
-}  // namespace analog_threshold
-}  // namespace esphome

esphome/components/analog_threshold/analog_threshold_binary_sensor.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/binary_sensor/binary_sensor.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace analog_threshold {
-
-class AnalogThresholdBinarySensor : public Component, public binary_sensor::BinarySensor {
- public:
-  void dump_config() override;
-  void setup() override;
-
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
-  void set_sensor(sensor::Sensor *analog_sensor);
-  void set_upper_threshold(float threshold) { this->upper_threshold_ = threshold; }
-  void set_lower_threshold(float threshold) { this->lower_threshold_ = threshold; }
-
- protected:
-  sensor::Sensor *sensor_{nullptr};
-
-  float upper_threshold_;
-  float lower_threshold_;
-};
-
-}  // namespace analog_threshold
-}  // namespace esphome

esphome/components/analog_threshold/binary_sensor.py

@@ -1,44 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import binary_sensor, sensor
-from esphome.const import (
-    CONF_SENSOR_ID,
-    CONF_THRESHOLD,
-)
-
-analog_threshold_ns = cg.esphome_ns.namespace("analog_threshold")
-
-AnalogThresholdBinarySensor = analog_threshold_ns.class_(
-    "AnalogThresholdBinarySensor", binary_sensor.BinarySensor, cg.Component
-)
-
-CONF_UPPER = "upper"
-CONF_LOWER = "lower"
-
-CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(AnalogThresholdBinarySensor),
-        cv.Required(CONF_SENSOR_ID): cv.use_id(sensor.Sensor),
-        cv.Required(CONF_THRESHOLD): cv.Any(
-            cv.float_,
-            cv.Schema(
-                {cv.Required(CONF_UPPER): cv.float_, cv.Required(CONF_LOWER): cv.float_}
-            ),
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
-    await cg.register_component(var, config)
-
-    sens = await cg.get_variable(config[CONF_SENSOR_ID])
-    cg.add(var.set_sensor(sens))
-
-    if isinstance(config[CONF_THRESHOLD], float):
-        cg.add(var.set_upper_threshold(config[CONF_THRESHOLD]))
-        cg.add(var.set_lower_threshold(config[CONF_THRESHOLD]))
-    else:
-        cg.add(var.set_upper_threshold(config[CONF_THRESHOLD][CONF_UPPER]))
-        cg.add(var.set_lower_threshold(config[CONF_THRESHOLD][CONF_LOWER]))

esphome/components/animation/__init__.py

@@ -76,6 +76,8 @@ async def to_code(config):
         pos = 0
         for frameIndex in range(frames):
             image.seek(frameIndex)
+            if CONF_RESIZE in config:
+                image.thumbnail(config[CONF_RESIZE])
             frame = image.convert("RGB")
             if CONF_RESIZE in config:
                 frame = frame.resize([width, height])

esphome/components/apds9960/binary_sensor.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-from esphome.const import CONF_DIRECTION, DEVICE_CLASS_MOVING
+from esphome.const import CONF_DIRECTION, CONF_DEVICE_CLASS, DEVICE_CLASS_MOVING
 from . import APDS9960, CONF_APDS9960_ID
 
 DEPENDENCIES = ["apds9960"]
@@ -13,12 +13,13 @@ DIRECTIONS = {
     "RIGHT": "set_right_direction",
 }
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(
-    device_class=DEVICE_CLASS_MOVING
-).extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
-        cv.GenerateID(CONF_APDS9960_ID): cv.use_id(APDS9960),
         cv.Required(CONF_DIRECTION): cv.one_of(*DIRECTIONS, upper=True),
+        cv.GenerateID(CONF_APDS9960_ID): cv.use_id(APDS9960),
+        cv.Optional(
+            CONF_DEVICE_CLASS, default=DEVICE_CLASS_MOVING
+        ): binary_sensor.device_class,
     }
 )
 

esphome/components/api/api_connection.cpp

@@ -105,7 +105,6 @@ void APIConnection::loop() {
       ESP_LOGW(TAG, "%s didn't respond to ping request in time. Disconnecting...", this->client_info_.c_str());
     }
   } else if (now - this->last_traffic_ > keepalive) {
-    ESP_LOGVV(TAG, "Sending keepalive PING...");
     this->sent_ping_ = true;
     this->send_ping_request(PingRequest());
   }
@@ -909,7 +908,7 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
     }
     return false;
   }
-  // Do not set last_traffic_ on send
+  this->last_traffic_ = millis();
   return true;
 }
 void APIConnection::on_unauthenticated_access() {

esphome/components/api/client.py

@@ -21,6 +21,7 @@ async def async_run_logs(config, address):
     if CONF_ENCRYPTION in conf:
         noise_psk = conf[CONF_ENCRYPTION][CONF_KEY]
     _LOGGER.info("Starting log output from %s using esphome API", address)
+    zc = zeroconf.Zeroconf()
     cli = APIClient(
         address,
         port,

esphome/components/as3935/binary_sensor.py

@@ -5,7 +5,7 @@ from . import AS3935, CONF_AS3935_ID
 
 DEPENDENCIES = ["as3935"]
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema().extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
         cv.GenerateID(CONF_AS3935_ID): cv.use_id(AS3935),
     }

esphome/components/as3935/sensor.py

@@ -4,6 +4,7 @@ from esphome.components import sensor
 from esphome.const import (
     CONF_DISTANCE,
     CONF_LIGHTNING_ENERGY,
+    STATE_CLASS_NONE,
     UNIT_KILOMETER,
     ICON_SIGNAL_DISTANCE_VARIANT,
     ICON_FLASH,
@@ -19,10 +20,12 @@ CONFIG_SCHEMA = cv.Schema(
             unit_of_measurement=UNIT_KILOMETER,
             icon=ICON_SIGNAL_DISTANCE_VARIANT,
             accuracy_decimals=1,
+            state_class=STATE_CLASS_NONE,
         ),
         cv.Optional(CONF_LIGHTNING_ENERGY): sensor.sensor_schema(
             icon=ICON_FLASH,
             accuracy_decimals=1,
+            state_class=STATE_CLASS_NONE,
         ),
     }
 ).extend(cv.COMPONENT_SCHEMA)

esphome/components/bh1750/bh1750.cpp

@@ -9,109 +9,18 @@ static const char *const 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
-static const uint8_t BH1750_COMMAND_ONE_TIME_L = 0b00100011;
-static const uint8_t BH1750_COMMAND_ONE_TIME_H = 0b00100000;
-static const uint8_t BH1750_COMMAND_ONE_TIME_H2 = 0b00100001;
-
-/*
-bh1750 properties:
-
-L-resolution mode:
-- resolution 4lx (@ mtreg=69)
-- measurement time: typ=16ms, max=24ms, scaled by MTreg value divided by 69
-- formula: counts / 1.2 * (69 / MTreg) lx
-H-resolution mode:
-- resolution 1lx (@ mtreg=69)
-- measurement time: typ=120ms, max=180ms, scaled by MTreg value divided by 69
-- formula: counts / 1.2 * (69 / MTreg) lx
-H-resolution mode2:
-- resolution 0.5lx (@ mtreg=69)
-- measurement time: typ=120ms, max=180ms, scaled by MTreg value divided by 69
-- formula: counts / 1.2 * (69 / MTreg) / 2 lx
-
-MTreg:
-- min=31, default=69, max=254
-
--> only reason to use l-resolution is faster, but offers no higher range
--> below ~7000lx, makes sense to use H-resolution2 @ MTreg=254
--> try to maximize MTreg to get lowest noise level
-*/
 
 void BH1750Sensor::setup() {
   ESP_LOGCONFIG(TAG, "Setting up BH1750 '%s'...", this->name_.c_str());
-  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
-  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
+  if (!this->write_bytes(BH1750_COMMAND_POWER_ON, nullptr, 0)) {
     this->mark_failed();
     return;
   }
-}
 
-void BH1750Sensor::read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<void(float)> &f) {
-  // turn on (after one-shot sensor automatically powers down)
-  uint8_t turn_on = BH1750_COMMAND_POWER_ON;
-  if (this->write(&turn_on, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Turning on BH1750 failed");
-    f(NAN);
-    return;
-  }
-
-  if (active_mtreg_ != mtreg) {
-    // set mtreg
-    uint8_t mtreg_hi = BH1750_COMMAND_MT_REG_HI | ((mtreg >> 5) & 0b111);
-    uint8_t mtreg_lo = BH1750_COMMAND_MT_REG_LO | ((mtreg >> 0) & 0b11111);
-    if (this->write(&mtreg_hi, 1) != i2c::ERROR_OK || this->write(&mtreg_lo, 1) != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Setting measurement time for BH1750 failed");
-      active_mtreg_ = 0;
-      f(NAN);
-      return;
-    }
-    active_mtreg_ = mtreg;
-  }
-
-  uint8_t cmd;
-  uint16_t meas_time;
-  switch (mode) {
-    case BH1750_MODE_L:
-      cmd = BH1750_COMMAND_ONE_TIME_L;
-      meas_time = 24 * mtreg / 69;
-      break;
-    case BH1750_MODE_H:
-      cmd = BH1750_COMMAND_ONE_TIME_H;
-      meas_time = 180 * mtreg / 69;
-      break;
-    case BH1750_MODE_H2:
-      cmd = BH1750_COMMAND_ONE_TIME_H2;
-      meas_time = 180 * mtreg / 69;
-      break;
-    default:
-      f(NAN);
-      return;
-  }
-  if (this->write(&cmd, 1) != i2c::ERROR_OK) {
-    ESP_LOGW(TAG, "Starting measurement for BH1750 failed");
-    f(NAN);
-    return;
-  }
-
-  // probably not needed, but adjust for rounding
-  meas_time++;
-
-  this->set_timeout("read", meas_time, [this, mode, mtreg, f]() {
-    uint16_t raw_value;
-    if (this->read(reinterpret_cast<uint8_t *>(&raw_value), 2) != i2c::ERROR_OK) {
-      ESP_LOGW(TAG, "Reading BH1750 data failed");
-      f(NAN);
-      return;
-    }
-    raw_value = i2c::i2ctohs(raw_value);
-
-    float lx = float(raw_value) / 1.2f;
-    lx *= 69.0f / mtreg;
-    if (mode == BH1750_MODE_H2)
-      lx /= 2.0f;
-
-    f(lx);
-  });
+  uint8_t mtreg_hi = (this->measurement_duration_ >> 5) & 0b111;
+  uint8_t mtreg_lo = (this->measurement_duration_ >> 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() {
@@ -121,49 +30,64 @@ void BH1750Sensor::dump_config() {
     ESP_LOGE(TAG, "Communication with BH1750 failed!");
   }
 
+  const char *resolution_s;
+  switch (this->resolution_) {
+    case BH1750_RESOLUTION_0P5_LX:
+      resolution_s = "0.5";
+      break;
+    case BH1750_RESOLUTION_1P0_LX:
+      resolution_s = "1";
+      break;
+    case BH1750_RESOLUTION_4P0_LX:
+      resolution_s = "4";
+      break;
+    default:
+      resolution_s = "Unknown";
+      break;
+  }
+  ESP_LOGCONFIG(TAG, "  Resolution: %s", resolution_s);
   LOG_UPDATE_INTERVAL(this);
 }
 
 void BH1750Sensor::update() {
-  // first do a quick measurement in L-mode with full range
-  // to find right range
-  this->read_lx_(BH1750_MODE_L, 31, [this](float val) {
-    if (std::isnan(val)) {
-      this->status_set_warning();
-      this->publish_state(NAN);
-      return;
-    }
+  if (!this->write_bytes(this->resolution_, nullptr, 0))
+    return;
 
-    BH1750Mode use_mode;
-    uint8_t use_mtreg;
-    if (val <= 7000) {
-      use_mode = BH1750_MODE_H2;
-      use_mtreg = 254;
-    } else {
-      use_mode = BH1750_MODE_H;
-      // lx = counts / 1.2 * (69 / mtreg)
-      // -> mtreg = counts / 1.2 * (69 / lx)
-      // calculate for counts=50000 (allow some range to not saturate, but maximize mtreg)
-      // -> mtreg = 50000*(10/12)*(69/lx)
-      int ideal_mtreg = 50000 * 10 * 69 / (12 * (int) val);
-      use_mtreg = std::min(254, std::max(31, ideal_mtreg));
-    }
-    ESP_LOGV(TAG, "L result: %f -> Calculated mode=%d, mtreg=%d", val, (int) use_mode, use_mtreg);
+  uint32_t wait = 0;
+  // use max conversion times
+  switch (this->resolution_) {
+    case BH1750_RESOLUTION_0P5_LX:
+    case BH1750_RESOLUTION_1P0_LX:
+      wait = 180;
+      break;
+    case BH1750_RESOLUTION_4P0_LX:
+      wait = 24;
+      break;
+  }
 
-    this->read_lx_(use_mode, use_mtreg, [this](float val) {
-      if (std::isnan(val)) {
-        this->status_set_warning();
-        this->publish_state(NAN);
-        return;
-      }
-      ESP_LOGD(TAG, "'%s': Got illuminance=%.1flx", this->get_name().c_str(), val);
-      this->status_clear_warning();
-      this->publish_state(val);
-    });
-  });
+  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;
+  if (this->read(reinterpret_cast<uint8_t *>(&raw_value), 2) != i2c::ERROR_OK) {
+    this->status_set_warning();
+    return;
+  }
+  raw_value = i2c::i2ctohs(raw_value);
+
+  float lx = float(raw_value) / 1.2f;
+  lx *= 69.0f / this->measurement_duration_;
+  if (this->resolution_ == BH1750_RESOLUTION_0P5_LX) {
+    lx /= 2.0f;
+  }
+  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
 }  // namespace esphome

esphome/components/bh1750/bh1750.h

@@ -7,15 +7,29 @@
 namespace esphome {
 namespace bh1750 {
 
-enum BH1750Mode {
-  BH1750_MODE_L,
-  BH1750_MODE_H,
-  BH1750_MODE_H2,
+/// Enum listing all resolutions that can be used with the BH1750
+enum BH1750Resolution {
+  BH1750_RESOLUTION_4P0_LX = 0b00100011,  // one-time low resolution mode
+  BH1750_RESOLUTION_1P0_LX = 0b00100000,  // one-time high resolution mode 1
+  BH1750_RESOLUTION_0P5_LX = 0b00100001,  // one-time high resolution mode 2
 };
 
 /// This class implements support for the i2c-based BH1750 ambient light sensor.
 class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
  public:
+  /** Set the resolution of this sensor.
+   *
+   * Possible values are:
+   *
+   *  - `BH1750_RESOLUTION_4P0_LX`
+   *  - `BH1750_RESOLUTION_1P0_LX`
+   *  - `BH1750_RESOLUTION_0P5_LX` (default)
+   *
+   * @param resolution The new resolution of the sensor.
+   */
+  void set_resolution(BH1750Resolution resolution);
+  void set_measurement_duration(uint8_t measurement_duration) { measurement_duration_ = measurement_duration; }
+
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
   void setup() override;
@@ -24,9 +38,10 @@ class BH1750Sensor : public sensor::Sensor, public PollingComponent, public i2c:
   float get_setup_priority() const override;
 
  protected:
-  void read_lx_(BH1750Mode mode, uint8_t mtreg, const std::function<void(float)> &f);
+  void read_data_();
 
-  uint8_t active_mtreg_{0};
+  BH1750Resolution resolution_{BH1750_RESOLUTION_0P5_LX};
+  uint8_t measurement_duration_;
 };
 
 }  // namespace bh1750

esphome/components/bh1750/sensor.py

@@ -2,23 +2,31 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, sensor
 from esphome.const import (
+    CONF_ID,
+    CONF_RESOLUTION,
     DEVICE_CLASS_ILLUMINANCE,
     STATE_CLASS_MEASUREMENT,
     UNIT_LUX,
+    CONF_MEASUREMENT_DURATION,
 )
 
 DEPENDENCIES = ["i2c"]
-CODEOWNERS = ["@OttoWinter"]
 
 bh1750_ns = cg.esphome_ns.namespace("bh1750")
+BH1750Resolution = bh1750_ns.enum("BH1750Resolution")
+BH1750_RESOLUTIONS = {
+    4.0: BH1750Resolution.BH1750_RESOLUTION_4P0_LX,
+    1.0: BH1750Resolution.BH1750_RESOLUTION_1P0_LX,
+    0.5: BH1750Resolution.BH1750_RESOLUTION_0P5_LX,
+}
 
 BH1750Sensor = bh1750_ns.class_(
     "BH1750Sensor", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
 )
 
+CONF_MEASUREMENT_TIME = "measurement_time"
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        BH1750Sensor,
         unit_of_measurement=UNIT_LUX,
         accuracy_decimals=1,
         device_class=DEVICE_CLASS_ILLUMINANCE,
@@ -26,11 +34,15 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
-            cv.Optional("resolution"): cv.invalid(
-                "The 'resolution' option has been removed. The optimal value is now dynamically calculated."
+            cv.GenerateID(): cv.declare_id(BH1750Sensor),
+            cv.Optional(CONF_RESOLUTION, default=0.5): cv.enum(
+                BH1750_RESOLUTIONS, float=True
             ),
-            cv.Optional("measurement_duration"): cv.invalid(
-                "The 'measurement_duration' option has been removed. The optimal value is now dynamically calculated."
+            cv.Optional(CONF_MEASUREMENT_DURATION, default=69): cv.int_range(
+                min=31, max=254
+            ),
+            cv.Optional(CONF_MEASUREMENT_TIME): cv.invalid(
+                "The 'measurement_time' option has been replaced with 'measurement_duration' in 1.18.0"
             ),
         }
     )
@@ -40,6 +52,10 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
     await i2c.register_i2c_device(var, config)
+
+    cg.add(var.set_resolution(config[CONF_RESOLUTION]))
+    cg.add(var.set_measurement_duration(config[CONF_MEASUREMENT_DURATION]))

esphome/components/binary_sensor/__init__.py

@@ -1,6 +1,5 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.cpp_generator import MockObjClass
 from esphome.cpp_helpers import setup_entity
 from esphome import automation, core
 from esphome.automation import Condition, maybe_simple_id
@@ -8,9 +7,7 @@ from esphome.components import mqtt
 from esphome.const import (
     CONF_DELAY,
     CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
     CONF_FILTERS,
-    CONF_ICON,
     CONF_ID,
     CONF_INVALID_COOLDOWN,
     CONF_INVERTED,
@@ -25,6 +22,7 @@ from esphome.const import (
     CONF_STATE,
     CONF_TIMING,
     CONF_TRIGGER_ID,
+    CONF_NAME,
     CONF_MQTT_ID,
     DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_BATTERY,
@@ -317,7 +315,7 @@ def validate_multi_click_timing(value):
     return timings
 
 
-validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
+device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
 
 
 BINARY_SENSOR_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).extend(
@@ -326,7 +324,7 @@ BINARY_SENSOR_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).ex
         cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(
             mqtt.MQTTBinarySensorComponent
         ),
-        cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
+        cv.Optional(CONF_DEVICE_CLASS): device_class,
         cv.Optional(CONF_FILTERS): validate_filters,
         cv.Optional(CONF_ON_PRESS): automation.validate_automation(
             {
@@ -379,39 +377,6 @@ BINARY_SENSOR_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).ex
     }
 )
 
-_UNDEF = object()
-
-
-def binary_sensor_schema(
-    class_: MockObjClass = _UNDEF,
-    *,
-    icon: str = _UNDEF,
-    entity_category: str = _UNDEF,
-    device_class: str = _UNDEF,
-) -> cv.Schema:
-    schema = BINARY_SENSOR_SCHEMA
-    if class_ is not _UNDEF:
-        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
-    if icon is not _UNDEF:
-        schema = schema.extend({cv.Optional(CONF_ICON, default=icon): cv.icon})
-    if entity_category is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_ENTITY_CATEGORY, default=entity_category
-                ): cv.entity_category
-            }
-        )
-    if device_class is not _UNDEF:
-        schema = schema.extend(
-            {
-                cv.Optional(
-                    CONF_DEVICE_CLASS, default=device_class
-                ): validate_device_class
-            }
-        )
-    return schema
-
 
 async def setup_binary_sensor_core_(var, config):
     await setup_entity(var, config)
@@ -478,7 +443,7 @@ async def register_binary_sensor(var, config):
 
 
 async def new_binary_sensor(config):
-    var = cg.new_Pvariable(config[CONF_ID])
+    var = cg.new_Pvariable(config[CONF_ID], config[CONF_NAME])
     await register_binary_sensor(var, config)
     return var
 

esphome/components/binary_sensor/binary_sensor.cpp

@@ -42,7 +42,8 @@ void BinarySensor::send_state_internal(bool state, bool is_initial) {
   }
 }
 std::string BinarySensor::device_class() { return ""; }
-BinarySensor::BinarySensor() : state(false) {}
+BinarySensor::BinarySensor(const std::string &name) : EntityBase(name), state(false) {}
+BinarySensor::BinarySensor() : BinarySensor("") {}
 void BinarySensor::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
 std::string BinarySensor::get_device_class() {
   if (this->device_class_.has_value())

esphome/components/binary_sensor/binary_sensor.h

@@ -26,6 +26,11 @@ namespace binary_sensor {
 class BinarySensor : public EntityBase {
  public:
   explicit BinarySensor();
+  /** Construct a binary sensor with the specified name
+   *
+   * @param name Name of this binary sensor.
+   */
+  explicit BinarySensor(const std::string &name);
 
   /** Add a callback to be notified of state changes.
    *

esphome/components/binary_sensor_map/sensor.py

@@ -3,12 +3,14 @@ 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,
     ICON_CHECK_CIRCLE_OUTLINE,
     CONF_BINARY_SENSOR,
     CONF_GROUP,
+    STATE_CLASS_NONE,
 )
 
 DEPENDENCIES = ["binary_sensor"]
@@ -31,11 +33,12 @@ entry = {
 CONFIG_SCHEMA = cv.typed_schema(
     {
         CONF_GROUP: sensor.sensor_schema(
-            BinarySensorMap,
             icon=ICON_CHECK_CIRCLE_OUTLINE,
             accuracy_decimals=0,
+            state_class=STATE_CLASS_NONE,
         ).extend(
             {
+                cv.GenerateID(): cv.declare_id(BinarySensorMap),
                 cv.Required(CONF_CHANNELS): cv.All(
                     cv.ensure_list(entry), cv.Length(min=1)
                 ),
@@ -47,8 +50,9 @@ CONFIG_SCHEMA = cv.typed_schema(
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     constant = SENSOR_MAP_TYPES[config[CONF_TYPE]]
     cg.add(var.set_sensor_type(constant))

esphome/components/bl0940/sensor.py

@@ -12,7 +12,9 @@ from esphome.const import (
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
     DEVICE_CLASS_TEMPERATURE,
+    ICON_EMPTY,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_NONE,
     UNIT_AMPERE,
     UNIT_CELSIUS,
     UNIT_KILOWATT_HOURS,
@@ -33,39 +35,38 @@ CONFIG_SCHEMA = (
         {
             cv.GenerateID(): cv.declare_id(BL0940),
             cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE, STATE_CLASS_MEASUREMENT
             ),
             cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_AMPERE,
+                ICON_EMPTY,
+                2,
+                DEVICE_CLASS_CURRENT,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_WATT, ICON_EMPTY, 0, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
             ),
             cv.Optional(CONF_ENERGY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_ENERGY,
+                UNIT_KILOWATT_HOURS,
+                ICON_EMPTY,
+                0,
+                DEVICE_CLASS_ENERGY,
+                STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_INTERNAL_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_CELSIUS,
+                ICON_EMPTY,
+                0,
+                DEVICE_CLASS_TEMPERATURE,
+                STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_EXTERNAL_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_CELSIUS,
+                ICON_EMPTY,
+                0,
+                DEVICE_CLASS_TEMPERATURE,
+                STATE_CLASS_NONE,
             ),
         }
     )

esphome/components/ble_client/sensor/__init__.py

@@ -2,7 +2,9 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, ble_client, esp32_ble_tracker
 from esphome.const import (
+    CONF_ID,
     CONF_LAMBDA,
+    STATE_CLASS_NONE,
     CONF_TRIGGER_ID,
     CONF_SERVICE_UUID,
 )
@@ -29,11 +31,12 @@ BLESensorNotifyTrigger = ble_client_ns.class_(
 
 CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
-        BLESensor,
         accuracy_decimals=0,
+        state_class=STATE_CLASS_NONE,
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(BLESensor),
             cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
             cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
             cv.Optional(CONF_DESCRIPTOR_UUID): esp32_ble_tracker.bt_uuid,
@@ -54,7 +57,7 @@ CONFIG_SCHEMA = cv.All(
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     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]))
@@ -121,6 +124,7 @@ async def to_code(config):
     await cg.register_component(var, config)
     await ble_client.register_ble_node(var, config)
     cg.add(var.set_enable_notify(config[CONF_NOTIFY]))
+    await sensor.register_sensor(var, config)
     for conf in config.get(CONF_ON_NOTIFY, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await ble_client.register_ble_node(trigger, config)

esphome/components/ble_client/text_sensor/__init__.py

@@ -1,121 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import text_sensor, ble_client, esp32_ble_tracker
-from esphome.const import (
-    CONF_ID,
-    CONF_TRIGGER_ID,
-    CONF_SERVICE_UUID,
-)
-from esphome import automation
-from .. import ble_client_ns
-
-DEPENDENCIES = ["ble_client"]
-
-CONF_CHARACTERISTIC_UUID = "characteristic_uuid"
-CONF_DESCRIPTOR_UUID = "descriptor_uuid"
-
-CONF_NOTIFY = "notify"
-CONF_ON_NOTIFY = "on_notify"
-
-adv_data_t = cg.std_vector.template(cg.uint8)
-adv_data_t_const_ref = adv_data_t.operator("ref").operator("const")
-
-BLETextSensor = ble_client_ns.class_(
-    "BLETextSensor",
-    text_sensor.TextSensor,
-    cg.PollingComponent,
-    ble_client.BLEClientNode,
-)
-BLETextSensorNotifyTrigger = ble_client_ns.class_(
-    "BLETextSensorNotifyTrigger", automation.Trigger.template(cg.std_string)
-)
-
-CONFIG_SCHEMA = cv.All(
-    text_sensor.TEXT_SENSOR_SCHEMA.extend(
-        {
-            cv.GenerateID(): cv.declare_id(BLETextSensor),
-            cv.Required(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Required(CONF_CHARACTERISTIC_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_DESCRIPTOR_UUID): esp32_ble_tracker.bt_uuid,
-            cv.Optional(CONF_NOTIFY, default=False): cv.boolean,
-            cv.Optional(CONF_ON_NOTIFY): automation.validate_automation(
-                {
-                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
-                        BLETextSensorNotifyTrigger
-                    ),
-                }
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(ble_client.BLE_CLIENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    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_reversed_hex_array(config[CONF_SERVICE_UUID])
-        cg.add(var.set_service_uuid128(uuid128))
-
-    if len(config[CONF_CHARACTERISTIC_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-        cg.add(
-            var.set_char_uuid16(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid32_format
-    ):
-        cg.add(
-            var.set_char_uuid32(
-                esp32_ble_tracker.as_hex(config[CONF_CHARACTERISTIC_UUID])
-            )
-        )
-    elif len(config[CONF_CHARACTERISTIC_UUID]) == len(
-        esp32_ble_tracker.bt_uuid128_format
-    ):
-        uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-            config[CONF_CHARACTERISTIC_UUID]
-        )
-        cg.add(var.set_char_uuid128(uuid128))
-
-    if CONF_DESCRIPTOR_UUID in config:
-        if len(config[CONF_DESCRIPTOR_UUID]) == len(esp32_ble_tracker.bt_uuid16_format):
-            cg.add(
-                var.set_descr_uuid16(
-                    esp32_ble_tracker.as_hex(config[CONF_DESCRIPTOR_UUID])
-                )
-            )
-        elif len(config[CONF_DESCRIPTOR_UUID]) == len(
-            esp32_ble_tracker.bt_uuid32_format
-        ):
-            cg.add(
-                var.set_descr_uuid32(
-                    esp32_ble_tracker.as_hex(config[CONF_DESCRIPTOR_UUID])
-                )
-            )
-        elif len(config[CONF_DESCRIPTOR_UUID]) == len(
-            esp32_ble_tracker.bt_uuid128_format
-        ):
-            uuid128 = esp32_ble_tracker.as_reversed_hex_array(
-                config[CONF_DESCRIPTOR_UUID]
-            )
-            cg.add(var.set_descr_uuid128(uuid128))
-
-    await cg.register_component(var, config)
-    await ble_client.register_ble_node(var, config)
-    cg.add(var.set_enable_notify(config[CONF_NOTIFY]))
-    await text_sensor.register_text_sensor(var, config)
-    for conf in config.get(CONF_ON_NOTIFY, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await ble_client.register_ble_node(trigger, config)
-        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)

esphome/components/ble_client/text_sensor/automation.h

@@ -1,38 +0,0 @@
-#pragma once
-
-#include "esphome/core/automation.h"
-#include "esphome/components/ble_client/text_sensor/ble_text_sensor.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace ble_client {
-
-class BLETextSensorNotifyTrigger : public Trigger<std::string>, public BLETextSensor {
- public:
-  explicit BLETextSensorNotifyTrigger(BLETextSensor *sensor) { sensor_ = sensor; }
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override {
-    switch (event) {
-      case ESP_GATTC_SEARCH_CMPL_EVT: {
-        this->sensor_->node_state = espbt::ClientState::ESTABLISHED;
-        break;
-      }
-      case ESP_GATTC_NOTIFY_EVT: {
-        if (param->notify.conn_id != this->sensor_->parent()->conn_id || param->notify.handle != this->sensor_->handle)
-          break;
-        this->trigger(this->sensor_->parse_data(param->notify.value, param->notify.value_len));
-      }
-      default:
-        break;
-    }
-  }
-
- protected:
-  BLETextSensor *sensor_;
-};
-
-}  // namespace ble_client
-}  // namespace esphome
-
-#endif

esphome/components/ble_client/text_sensor/ble_text_sensor.cpp

@@ -1,137 +0,0 @@
-#include "ble_text_sensor.h"
-
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/core/application.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace ble_client {
-
-static const char *const TAG = "ble_text_sensor";
-
-static const std::string EMPTY = "";
-
-uint32_t BLETextSensor::hash_base() { return 193967603UL; }
-
-void BLETextSensor::loop() {}
-
-void BLETextSensor::dump_config() {
-  LOG_TEXT_SENSOR("", "BLE Text Sensor", this);
-  ESP_LOGCONFIG(TAG, "  MAC address        : %s", this->parent()->address_str().c_str());
-  ESP_LOGCONFIG(TAG, "  Service UUID       : %s", this->service_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Characteristic UUID: %s", this->char_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Descriptor UUID    : %s", this->descr_uuid_.to_string().c_str());
-  ESP_LOGCONFIG(TAG, "  Notifications      : %s", YESNO(this->notify_));
-  LOG_UPDATE_INTERVAL(this);
-}
-
-void BLETextSensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                                        esp_ble_gattc_cb_param_t *param) {
-  switch (event) {
-    case ESP_GATTC_OPEN_EVT: {
-      if (param->open.status == ESP_GATT_OK) {
-        ESP_LOGI(TAG, "[%s] Connected successfully!", this->get_name().c_str());
-        break;
-      }
-      break;
-    }
-    case ESP_GATTC_DISCONNECT_EVT: {
-      ESP_LOGW(TAG, "[%s] Disconnected!", this->get_name().c_str());
-      this->status_set_warning();
-      this->publish_state(EMPTY);
-      break;
-    }
-    case ESP_GATTC_SEARCH_CMPL_EVT: {
-      this->handle = 0;
-      auto *chr = this->parent()->get_characteristic(this->service_uuid_, this->char_uuid_);
-      if (chr == nullptr) {
-        this->status_set_warning();
-        this->publish_state(EMPTY);
-        ESP_LOGW(TAG, "No sensor characteristic found at service %s char %s", this->service_uuid_.to_string().c_str(),
-                 this->char_uuid_.to_string().c_str());
-        break;
-      }
-      this->handle = chr->handle;
-      if (this->descr_uuid_.get_uuid().len > 0) {
-        auto *descr = chr->get_descriptor(this->descr_uuid_);
-        if (descr == nullptr) {
-          this->status_set_warning();
-          this->publish_state(EMPTY);
-          ESP_LOGW(TAG, "No sensor descriptor found at service %s char %s descr %s",
-                   this->service_uuid_.to_string().c_str(), this->char_uuid_.to_string().c_str(),
-                   this->descr_uuid_.to_string().c_str());
-          break;
-        }
-        this->handle = descr->handle;
-      }
-      if (this->notify_) {
-        auto status =
-            esp_ble_gattc_register_for_notify(this->parent()->gattc_if, this->parent()->remote_bda, chr->handle);
-        if (status) {
-          ESP_LOGW(TAG, "esp_ble_gattc_register_for_notify failed, status=%d", status);
-        }
-      } else {
-        this->node_state = espbt::ClientState::ESTABLISHED;
-      }
-      break;
-    }
-    case ESP_GATTC_READ_CHAR_EVT: {
-      if (param->read.conn_id != this->parent()->conn_id)
-        break;
-      if (param->read.status != ESP_GATT_OK) {
-        ESP_LOGW(TAG, "Error reading char at handle %d, status=%d", param->read.handle, param->read.status);
-        break;
-      }
-      if (param->read.handle == this->handle) {
-        this->status_clear_warning();
-        this->publish_state(this->parse_data(param->read.value, param->read.value_len));
-      }
-      break;
-    }
-    case ESP_GATTC_NOTIFY_EVT: {
-      if (param->notify.conn_id != this->parent()->conn_id || param->notify.handle != this->handle)
-        break;
-      ESP_LOGV(TAG, "[%s] ESP_GATTC_NOTIFY_EVT: handle=0x%x, value=0x%x", this->get_name().c_str(),
-               param->notify.handle, param->notify.value[0]);
-      this->publish_state(this->parse_data(param->notify.value, param->notify.value_len));
-      break;
-    }
-    case ESP_GATTC_REG_FOR_NOTIFY_EVT: {
-      this->node_state = espbt::ClientState::ESTABLISHED;
-      break;
-    }
-    default:
-      break;
-  }
-}
-
-std::string BLETextSensor::parse_data(uint8_t *value, uint16_t value_len) {
-  std::string text(value, value + value_len);
-  return text;
-}
-
-void BLETextSensor::update() {
-  if (this->node_state != espbt::ClientState::ESTABLISHED) {
-    ESP_LOGW(TAG, "[%s] Cannot poll, not connected", this->get_name().c_str());
-    return;
-  }
-  if (this->handle == 0) {
-    ESP_LOGW(TAG, "[%s] Cannot poll, no service or characteristic found", this->get_name().c_str());
-    return;
-  }
-
-  auto status =
-      esp_ble_gattc_read_char(this->parent()->gattc_if, this->parent()->conn_id, this->handle, ESP_GATT_AUTH_REQ_NONE);
-  if (status) {
-    this->status_set_warning();
-    this->publish_state(EMPTY);
-    ESP_LOGW(TAG, "[%s] Error sending read request for sensor, status=%d", this->get_name().c_str(), status);
-  }
-}
-
-}  // namespace ble_client
-}  // namespace esphome
-#endif

esphome/components/ble_client/text_sensor/ble_text_sensor.h

@@ -1,47 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/ble_client/ble_client.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-#include "esphome/components/text_sensor/text_sensor.h"
-
-#ifdef USE_ESP32
-#include <esp_gattc_api.h>
-
-namespace esphome {
-namespace ble_client {
-
-namespace espbt = esphome::esp32_ble_tracker;
-
-class BLETextSensor : public text_sensor::TextSensor, public PollingComponent, public BLEClientNode {
- public:
-  void loop() override;
-  void update() override;
-  void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
-                           esp_ble_gattc_cb_param_t *param) override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-  void set_service_uuid16(uint16_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_service_uuid32(uint32_t uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_service_uuid128(uint8_t *uuid) { this->service_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_char_uuid16(uint16_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_char_uuid32(uint32_t uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_char_uuid128(uint8_t *uuid) { this->char_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_descr_uuid16(uint16_t uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_uint16(uuid); }
-  void set_descr_uuid32(uint32_t uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_uint32(uuid); }
-  void set_descr_uuid128(uint8_t *uuid) { this->descr_uuid_ = espbt::ESPBTUUID::from_raw(uuid); }
-  void set_enable_notify(bool notify) { this->notify_ = notify; }
-  std::string parse_data(uint8_t *value, uint16_t value_len);
-  uint16_t handle;
-
- protected:
-  uint32_t hash_base() override;
-  bool notify_;
-  espbt::ESPBTUUID service_uuid_;
-  espbt::ESPBTUUID char_uuid_;
-  espbt::ESPBTUUID descr_uuid_;
-};
-
-}  // namespace ble_client
-}  // namespace esphome
-#endif

esphome/components/ble_presence/binary_sensor.py

@@ -7,6 +7,7 @@ from esphome.const import (
     CONF_IBEACON_MAJOR,
     CONF_IBEACON_MINOR,
     CONF_IBEACON_UUID,
+    CONF_ID,
 )
 
 DEPENDENCIES = ["esp32_ble_tracker"]
@@ -29,9 +30,9 @@ def _validate(config):
 
 
 CONFIG_SCHEMA = cv.All(
-    binary_sensor.binary_sensor_schema(BLEPresenceDevice)
-    .extend(
+    binary_sensor.BINARY_SENSOR_SCHEMA.extend(
         {
+            cv.GenerateID(): cv.declare_id(BLEPresenceDevice),
             cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
             cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
             cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
@@ -47,9 +48,10 @@ CONFIG_SCHEMA = cv.All(
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await esp32_ble_tracker.register_ble_device(var, config)
+    await binary_sensor.register_binary_sensor(var, config)
 
     if CONF_MAC_ADDRESS in config:
         cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))

esphome/components/ble_rssi/sensor.py

@@ -4,6 +4,7 @@ from esphome.components import sensor, esp32_ble_tracker
 from esphome.const import (
     CONF_SERVICE_UUID,
     CONF_MAC_ADDRESS,
+    CONF_ID,
     DEVICE_CLASS_SIGNAL_STRENGTH,
     STATE_CLASS_MEASUREMENT,
     UNIT_DECIBEL,
@@ -18,7 +19,6 @@ BLERSSISensor = ble_rssi_ns.class_(
 
 CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
-        BLERSSISensor,
         unit_of_measurement=UNIT_DECIBEL,
         accuracy_decimals=0,
         device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
@@ -26,6 +26,7 @@ CONFIG_SCHEMA = cv.All(
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(BLERSSISensor),
             cv.Optional(CONF_MAC_ADDRESS): cv.mac_address,
             cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
         }
@@ -37,9 +38,10 @@ CONFIG_SCHEMA = cv.All(
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await esp32_ble_tracker.register_ble_device(var, config)
+    await sensor.register_sensor(var, config)
 
     if CONF_MAC_ADDRESS in config:
         cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))

esphome/components/ble_scanner/text_sensor.py

@@ -13,7 +13,7 @@ BLEScanner = ble_scanner_ns.class_(
 )
 
 CONFIG_SCHEMA = cv.All(
-    text_sensor.text_sensor_schema(BLEScanner)
+    text_sensor.text_sensor_schema(klass=BLEScanner)
     .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
     .extend(cv.COMPONENT_SCHEMA)
 )

esphome/components/button/button.cpp

@@ -18,7 +18,11 @@ void Button::add_on_press_callback(std::function<void()> &&callback) { this->pre
 uint32_t Button::hash_base() { return 1495763804UL; }
 
 void Button::set_device_class(const std::string &device_class) { this->device_class_ = device_class; }
-std::string Button::get_device_class() { return this->device_class_; }
+std::string Button::get_device_class() {
+  if (this->device_class_.has_value())
+    return *this->device_class_;
+  return "";
+}
 
 }  // namespace button
 }  // namespace esphome

esphome/components/button/button.h

@@ -45,12 +45,12 @@ class Button : public EntityBase {
  protected:
   /** You should implement this virtual method if you want to create your own button.
    */
-  virtual void press_action() = 0;
+  virtual void press_action(){};
 
   uint32_t hash_base() override;
 
   CallbackManager<void()> press_callback_{};
-  std::string device_class_{};
+  optional<std::string> device_class_{};
 };
 
 }  // namespace button

esphome/components/canbus/__init__.py

@@ -8,7 +8,6 @@ CODEOWNERS = ["@mvturnho", "@danielschramm"]
 IS_PLATFORM_COMPONENT = True
 
 CONF_CAN_ID = "can_id"
-CONF_CAN_ID_MASK = "can_id_mask"
 CONF_USE_EXTENDED_ID = "use_extended_id"
 CONF_CANBUS_ID = "canbus_id"
 CONF_BIT_RATE = "bit_rate"
@@ -39,7 +38,7 @@ canbus_ns = cg.esphome_ns.namespace("canbus")
 CanbusComponent = canbus_ns.class_("CanbusComponent", cg.Component)
 CanbusTrigger = canbus_ns.class_(
     "CanbusTrigger",
-    automation.Trigger.template(cg.std_vector.template(cg.uint8), cg.uint32),
+    automation.Trigger.template(cg.std_vector.template(cg.uint8)),
     cg.Component,
 )
 CanSpeed = canbus_ns.enum("CAN_SPEED")
@@ -73,9 +72,6 @@ CANBUS_SCHEMA = cv.Schema(
             {
                 cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(CanbusTrigger),
                 cv.Required(CONF_CAN_ID): cv.int_range(min=0, max=0x1FFFFFFF),
-                cv.Optional(CONF_CAN_ID_MASK, default=0x1FFFFFFF): cv.int_range(
-                    min=0, max=0x1FFFFFFF
-                ),
                 cv.Optional(CONF_USE_EXTENDED_ID, default=False): cv.boolean,
             },
             validate_id,
@@ -94,16 +90,11 @@ async def setup_canbus_core_(var, config):
 
     for conf in config.get(CONF_ON_FRAME, []):
         can_id = conf[CONF_CAN_ID]
-        can_id_mask = conf[CONF_CAN_ID_MASK]
         ext_id = conf[CONF_USE_EXTENDED_ID]
-        trigger = cg.new_Pvariable(
-            conf[CONF_TRIGGER_ID], var, can_id, can_id_mask, ext_id
-        )
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var, can_id, ext_id)
         await cg.register_component(trigger, conf)
         await automation.build_automation(
-            trigger,
-            [(cg.std_vector.template(cg.uint8), "x"), (cg.uint32, "can_id")],
-            conf,
+            trigger, [(cg.std_vector.template(cg.uint8), "x")], conf
         )
 
 
@@ -135,6 +126,7 @@ async def canbus_action_to_code(config, action_id, template_arg, args):
     if CONF_CAN_ID in config:
         can_id = await cg.templatable(config[CONF_CAN_ID], args, cg.uint32)
         cg.add(var.set_can_id(can_id))
+
     use_extended_id = await cg.templatable(
         config[CONF_USE_EXTENDED_ID], args, cg.uint32
     )

esphome/components/canbus/canbus.cpp

@@ -56,15 +56,13 @@ void Canbus::add_trigger(CanbusTrigger *trigger) {
 
 void Canbus::loop() {
   struct CanFrame can_message;
-  // read all messages until queue is empty
-  int message_counter = 0;
-  while (this->read_message(&can_message) == canbus::ERROR_OK) {
-    message_counter++;
+  // readmessage
+  if (this->read_message(&can_message) == canbus::ERROR_OK) {
     if (can_message.use_extended_id) {
-      ESP_LOGD(TAG, "received can message (#%d) extended can_id=0x%x size=%d", message_counter, can_message.can_id,
+      ESP_LOGD(TAG, "received can message extended can_id=0x%x size=%d", can_message.can_id,
                can_message.can_data_length_code);
     } else {
-      ESP_LOGD(TAG, "received can message (#%d) std can_id=0x%x size=%d", message_counter, can_message.can_id,
+      ESP_LOGD(TAG, "received can message std can_id=0x%x size=%d", can_message.can_id,
                can_message.can_data_length_code);
     }
 
@@ -78,9 +76,8 @@ void Canbus::loop() {
 
     // fire all triggers
     for (auto *trigger : this->triggers_) {
-      if ((trigger->can_id_ == (can_message.can_id & trigger->can_id_mask_)) &&
-          (trigger->use_extended_id_ == can_message.use_extended_id)) {
-        trigger->trigger(data, can_message.can_id);
+      if ((trigger->can_id_ == can_message.can_id) && (trigger->use_extended_id_ == can_message.use_extended_id)) {
+        trigger->trigger(data);
       }
     }
   }

esphome/components/canbus/canbus.h

@@ -116,19 +116,17 @@ template<typename... Ts> class CanbusSendAction : public Action<Ts...>, public P
   std::vector<uint8_t> data_static_{};
 };
 
-class CanbusTrigger : public Trigger<std::vector<uint8_t>, uint32_t>, public Component {
+class CanbusTrigger : public Trigger<std::vector<uint8_t>>, public Component {
   friend class Canbus;
 
  public:
-  explicit CanbusTrigger(Canbus *parent, const std::uint32_t can_id, const std::uint32_t can_id_mask,
-                         const bool use_extended_id)
-      : parent_(parent), can_id_(can_id), can_id_mask_(can_id_mask), use_extended_id_(use_extended_id){};
+  explicit CanbusTrigger(Canbus *parent, const std::uint32_t can_id, const bool use_extended_id)
+      : parent_(parent), can_id_(can_id), use_extended_id_(use_extended_id){};
   void setup() override { this->parent_->add_trigger(this); }
 
  protected:
   Canbus *parent_;
   uint32_t can_id_;
-  uint32_t can_id_mask_;
   bool use_extended_id_;
 };
 

esphome/components/cap1188/binary_sensor.py

@@ -1,14 +1,15 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-from esphome.const import CONF_CHANNEL
+from esphome.const import CONF_CHANNEL, CONF_ID
 from . import cap1188_ns, CAP1188Component, CONF_CAP1188_ID
 
 DEPENDENCIES = ["cap1188"]
 CAP1188Channel = cap1188_ns.class_("CAP1188Channel", binary_sensor.BinarySensor)
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(CAP1188Channel).extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
+        cv.GenerateID(): cv.declare_id(CAP1188Channel),
         cv.GenerateID(CONF_CAP1188_ID): cv.use_id(CAP1188Component),
         cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
     }
@@ -16,7 +17,8 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(CAP1188Channel).extend(
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
+    await binary_sensor.register_binary_sensor(var, config)
     hub = await cg.get_variable(config[CONF_CAP1188_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
 

esphome/components/captive_portal/captive_index.h

@@ -1,107 +0,0 @@
-#pragma once
-// Generated from https://github.com/esphome/esphome-webserver
-#include "esphome/core/hal.h"
-namespace esphome {
-
-namespace captive_portal {
-
-const uint8_t INDEX_GZ[] PROGMEM = {
-    0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0a, 0xdd, 0x58, 0x09, 0x6f, 0xdc, 0x36, 0x16, 0xfe, 0x2b,
-    0xac, 0x92, 0x74, 0x34, 0x8d, 0xc5, 0xd1, 0x31, 0x97, 0x35, 0xd2, 0x14, 0x89, 0x37, 0x45, 0x0b, 0x24, 0x69, 0x00,
-    0xbb, 0x5d, 0x14, 0x69, 0x00, 0x73, 0x24, 0x6a, 0xc4, 0x58, 0xa2, 0x54, 0x91, 0x9a, 0x23, 0x83, 0xd9, 0xdf, 0xde,
-    0x47, 0x52, 0x73, 0x38, 0x6b, 0x2f, 0x90, 0x62, 0x8b, 0xa2, 0x4d, 0x6c, 0x9a, 0xc7, 0x3b, 0x3f, 0xf2, 0xf1, 0x3d,
-    0x2a, 0xfa, 0x2a, 0xad, 0x12, 0xb9, 0xad, 0x29, 0xca, 0x65, 0x59, 0xcc, 0x23, 0xd5, 0xa2, 0x82, 0xf0, 0x65, 0x4c,
-    0x39, 0x8c, 0x28, 0x49, 0xe7, 0x51, 0x49, 0x25, 0x41, 0x49, 0x4e, 0x1a, 0x41, 0x65, 0xfc, 0xd3, 0xcd, 0x77, 0xce,
-    0x14, 0x0d, 0xe6, 0x51, 0xc1, 0xf8, 0x1d, 0x6a, 0x68, 0x11, 0xb3, 0xa4, 0xe2, 0x28, 0x6f, 0x68, 0x16, 0xa7, 0x44,
-    0x92, 0x90, 0x95, 0x64, 0x49, 0x15, 0x81, 0x66, 0xe3, 0xa4, 0xa4, 0xf1, 0x8a, 0xd1, 0x75, 0x5d, 0x35, 0x12, 0x01,
-    0xa5, 0xa4, 0x5c, 0xc6, 0xd6, 0x9a, 0xa5, 0x32, 0x8f, 0x53, 0xba, 0x62, 0x09, 0x75, 0xf4, 0xe0, 0x82, 0x71, 0x26,
-    0x19, 0x29, 0x1c, 0x91, 0x90, 0x82, 0xc6, 0xde, 0x45, 0x2b, 0x68, 0xa3, 0x07, 0x64, 0x01, 0x63, 0x5e, 0x59, 0x20,
-    0x52, 0x24, 0x0d, 0xab, 0x25, 0x52, 0xf6, 0xc6, 0x65, 0x95, 0xb6, 0x05, 0x9d, 0x67, 0x2d, 0x4f, 0x24, 0x03, 0x0b,
-    0x84, 0xcd, 0xfb, 0xbb, 0x82, 0x4a, 0x44, 0xe3, 0x37, 0x44, 0xe6, 0xb8, 0x24, 0x1b, 0xdb, 0x74, 0x18, 0xb7, 0xfd,
-    0x6f, 0x6c, 0xfe, 0xdc, 0x73, 0xdd, 0xfe, 0x85, 0x6e, 0xdc, 0xfe, 0x00, 0xfe, 0xce, 0x1a, 0x2a, 0xdb, 0x86, 0x23,
-    0x62, 0xdf, 0x46, 0x35, 0x50, 0xa2, 0x34, 0xb6, 0x4a, 0xcf, 0xc7, 0xae, 0x3b, 0x45, 0xde, 0x25, 0xf6, 0x47, 0x8e,
-    0xe7, 0xe1, 0xc0, 0xf1, 0x46, 0xc9, 0xc4, 0x19, 0x21, 0x6f, 0x08, 0x8d, 0xef, 0xe3, 0x11, 0x72, 0x3f, 0x59, 0x28,
-    0x63, 0x45, 0x11, 0x5b, 0xbc, 0xe2, 0xd4, 0x42, 0x42, 0x36, 0xd5, 0x1d, 0x8d, 0xad, 0xa4, 0x6d, 0x1a, 0xf0, 0xee,
-    0xaa, 0x2a, 0xaa, 0x06, 0xac, 0xfd, 0x95, 0xa3, 0x7b, 0xff, 0xbe, 0x58, 0x87, 0x6c, 0x08, 0x17, 0x59, 0xd5, 0x94,
-    0xb1, 0xa5, 0x41, 0xb1, 0x9f, 0xee, 0xe8, 0x1e, 0xa9, 0xa6, 0x7f, 0xb6, 0xe8, 0x54, 0x0d, 0x5b, 0x32, 0x1e, 0x5b,
-    0x9e, 0x8f, 0xbc, 0x29, 0xe8, 0xbd, 0xed, 0xef, 0x8f, 0xa0, 0x10, 0x05, 0x4a, 0xe7, 0x66, 0x65, 0xbf, 0xbf, 0x8d,
-    0xc4, 0x6a, 0x89, 0x36, 0x65, 0xc1, 0x45, 0x6c, 0xe5, 0x52, 0xd6, 0xe1, 0x60, 0xb0, 0x5e, 0xaf, 0xf1, 0x3a, 0xc0,
-    0x55, 0xb3, 0x1c, 0xf8, 0xae, 0xeb, 0x0e, 0x80, 0xc2, 0x42, 0x66, 0x7f, 0x2c, 0x7f, 0x68, 0xa1, 0x9c, 0xb2, 0x65,
-    0x2e, 0x75, 0x7f, 0xfe, 0x74, 0xc7, 0xf7, 0x91, 0xa2, 0x98, 0xdf, 0x7e, 0x38, 0xd3, 0xd2, 0x9c, 0x69, 0xe1, 0xdf,
-    0x12, 0xdb, 0x3a, 0xb8, 0xda, 0x7b, 0xa3, 0x8c, 0x9a, 0x10, 0x1f, 0xf9, 0xc8, 0xd5, 0xff, 0x7d, 0x47, 0xf5, 0xbb,
-    0x91, 0xf3, 0xd9, 0x08, 0x9d, 0x8d, 0xe0, 0xaf, 0x02, 0xd0, 0x2f, 0xc7, 0xce, 0xe5, 0x91, 0xdf, 0x53, 0xeb, 0x2b,
-    0xcf, 0x3d, 0x4d, 0x28, 0xa6, 0xef, 0xc7, 0xe7, 0x63, 0xc7, 0xff, 0x59, 0x11, 0x68, 0xf4, 0x8f, 0x5c, 0x8e, 0x9f,
-    0x7b, 0x3f, 0x8f, 0xc9, 0x08, 0x8d, 0xba, 0x99, 0x91, 0xa3, 0xfa, 0xc7, 0x91, 0xd6, 0x85, 0x46, 0x2b, 0x20, 0x2b,
-    0x9d, 0xb1, 0x33, 0x22, 0x01, 0x0a, 0x3a, 0xab, 0xa0, 0x07, 0xd3, 0x63, 0xe0, 0x3e, 0x9b, 0x73, 0x82, 0x4f, 0xbd,
-    0xc1, 0xdc, 0xea, 0x87, 0x96, 0x75, 0x82, 0xa1, 0x3a, 0x87, 0x01, 0x7f, 0xac, 0xe0, 0xdc, 0x59, 0x56, 0x7f, 0x6f,
-    0x7d, 0x2b, 0xc8, 0x8a, 0x5a, 0x71, 0x1c, 0x43, 0xa8, 0xb5, 0x25, 0x9c, 0x10, 0x5c, 0x54, 0x09, 0x51, 0x2c, 0x58,
-    0x50, 0xd2, 0x24, 0xf9, 0xd7, 0x5f, 0xdb, 0xc7, 0xa5, 0x25, 0x95, 0xaf, 0x0a, 0xaa, 0xba, 0xe2, 0xe5, 0xf6, 0x86,
-    0x2c, 0xdf, 0x42, 0x00, 0xd9, 0x16, 0x11, 0x2c, 0xa5, 0x56, 0xff, 0xbd, 0xfb, 0x01, 0x0b, 0xb9, 0x2d, 0x28, 0x4e,
-    0x99, 0xa8, 0x0b, 0xb2, 0x8d, 0xad, 0x05, 0xc8, 0xba, 0xb3, 0xfa, 0x17, 0x19, 0x95, 0x49, 0x6e, 0x5b, 0x03, 0x08,
-    0xb1, 0x8c, 0x2d, 0xf1, 0x47, 0x51, 0x71, 0xab, 0x8f, 0x65, 0x4e, 0xb9, 0x6d, 0x1f, 0x2c, 0x54, 0xf6, 0x71, 0xbd,
-    0x64, 0x3f, 0xb4, 0x74, 0xb4, 0x41, 0x32, 0xa9, 0x42, 0x0e, 0xab, 0xe0, 0xbd, 0x38, 0xce, 0x2e, 0xaa, 0x74, 0xfb,
-    0x88, 0x79, 0xb9, 0x67, 0x6c, 0x63, 0x9c, 0xd3, 0xe6, 0x86, 0x6e, 0xe0, 0xb8, 0xfc, 0x9b, 0x7d, 0xc7, 0xd0, 0x5b,
-    0x2a, 0xd7, 0x55, 0x73, 0x27, 0x42, 0x64, 0x3d, 0x37, 0xe2, 0x66, 0x26, 0x42, 0x39, 0x26, 0xb5, 0xc0, 0xa2, 0x80,
-    0xf0, 0xb7, 0xbd, 0x3e, 0xc4, 0x6a, 0x7d, 0xdf, 0x14, 0x83, 0xe2, 0x6d, 0x94, 0xb2, 0x15, 0x4a, 0x0a, 0x22, 0xe0,
-    0xb8, 0x72, 0x23, 0xcb, 0x42, 0x87, 0xb8, 0xaa, 0x78, 0x02, 0xfc, 0x77, 0xb1, 0xf5, 0x00, 0x76, 0x2f, 0xb7, 0x3f,
-    0xa4, 0x76, 0x4f, 0x00, 0x6a, 0xbd, 0x3e, 0x5e, 0x91, 0xa2, 0xa5, 0x28, 0x46, 0x32, 0x67, 0xe2, 0x64, 0xe2, 0xec,
-    0x51, 0xb6, 0x5a, 0xdc, 0x01, 0x57, 0x06, 0xcb, 0xc2, 0xee, 0x5b, 0xc7, 0x38, 0x8e, 0x88, 0xb9, 0xe5, 0xac, 0x27,
-    0xd6, 0x67, 0x36, 0x39, 0x05, 0xcd, 0xa4, 0x75, 0x16, 0xf0, 0x4f, 0x77, 0x70, 0x1b, 0xe1, 0x06, 0xf4, 0xf7, 0xf7,
-    0xa7, 0xd9, 0x48, 0xd4, 0x84, 0x7f, 0xce, 0xaa, 0x6c, 0xd4, 0x81, 0x85, 0x55, 0x4f, 0x45, 0x17, 0x10, 0x9d, 0x74,
-    0x0e, 0xc8, 0xb1, 0xff, 0x74, 0x07, 0x71, 0xa6, 0x8e, 0xce, 0xdd, 0x49, 0x68, 0x34, 0x00, 0x84, 0xe6, 0xb7, 0xfb,
-    0x7e, 0xff, 0xe4, 0xce, 0x6f, 0x2d, 0x6d, 0xb6, 0xd7, 0xb4, 0xa0, 0x89, 0xac, 0x1a, 0xdb, 0x7a, 0x02, 0x9a, 0xe0,
-    0x24, 0x68, 0xbf, 0xbf, 0xbf, 0x79, 0xf3, 0x3a, 0xae, 0x6c, 0xda, 0xbf, 0x78, 0x8c, 0x5a, 0xdd, 0xea, 0xef, 0xe1,
-    0x56, 0xff, 0x4f, 0xdc, 0x53, 0xf7, 0x7a, 0xef, 0x03, 0xb0, 0x1a, 0xaf, 0x4f, 0x97, 0xbb, 0xba, 0x00, 0x9e, 0xc3,
-    0x25, 0x72, 0x61, 0x3d, 0x17, 0xb6, 0x33, 0x1e, 0xf5, 0x41, 0x3d, 0xfc, 0x80, 0xe9, 0xfa, 0x7a, 0x86, 0x6b, 0x5a,
-    0x1d, 0xd1, 0xf9, 0x37, 0xbb, 0x45, 0xb5, 0x71, 0x04, 0xfb, 0xc4, 0xf8, 0x32, 0x64, 0x3c, 0xa7, 0x0d, 0x93, 0x7b,
-    0x30, 0x17, 0x6e, 0xfa, 0xba, 0x95, 0xbb, 0x9a, 0xa4, 0xa9, 0x5a, 0x19, 0xd5, 0x9b, 0x59, 0x06, 0x79, 0x41, 0x51,
-    0xd2, 0xd0, 0xa3, 0xe5, 0xde, 0xac, 0xeb, 0x2b, 0x28, 0xbc, 0x1c, 0x3d, 0xdb, 0xab, 0x83, 0xb7, 0x93, 0xb0, 0x65,
-    0x0e, 0x29, 0xd8, 0x92, 0x87, 0x09, 0xd8, 0x4d, 0x1b, 0xc3, 0x94, 0x91, 0x92, 0x15, 0xdb, 0x50, 0xc0, 0x65, 0xe8,
-    0x40, 0xc2, 0x60, 0xd9, 0x7e, 0xd1, 0x4a, 0x59, 0x71, 0xd0, 0xdd, 0xa4, 0xb4, 0x09, 0xdd, 0x99, 0xe9, 0x38, 0x0d,
-    0x49, 0x59, 0x2b, 0x42, 0x1c, 0x34, 0xb4, 0x9c, 0x2d, 0x48, 0x72, 0xb7, 0x6c, 0xaa, 0x96, 0xa7, 0x4e, 0xa2, 0x6e,
-    0xeb, 0xf0, 0x89, 0x97, 0x91, 0x80, 0x26, 0xb3, 0x6e, 0x94, 0x65, 0xd9, 0x0c, 0x90, 0xa0, 0x8e, 0xb9, 0xfc, 0x42,
-    0x1f, 0x0f, 0x15, 0xdb, 0x99, 0x99, 0xd8, 0x57, 0x13, 0xc6, 0x46, 0x48, 0x25, 0xcf, 0x66, 0x07, 0x77, 0xdc, 0x19,
-    0xa4, 0x01, 0x01, 0x42, 0x6a, 0x88, 0x7f, 0x30, 0x73, 0x5f, 0x12, 0xc6, 0xcf, 0xad, 0x57, 0x67, 0x65, 0xd6, 0x85,
-    0x2f, 0xc0, 0xa2, 0xd5, 0xe8, 0x20, 0x9e, 0x41, 0xa2, 0x32, 0xb9, 0x30, 0xf4, 0xc7, 0x6e, 0xbd, 0xd9, 0xe3, 0xee,
-    0x8c, 0xec, 0x0e, 0xd4, 0x59, 0x41, 0x37, 0xb3, 0x8f, 0xad, 0x90, 0x2c, 0xdb, 0x3a, 0x5d, 0x2e, 0x0d, 0xe1, 0xbc,
-    0x40, 0x0e, 0x5d, 0x00, 0x29, 0xa5, 0x7c, 0xa6, 0x75, 0x38, 0x4c, 0xd2, 0x52, 0x74, 0x38, 0x1d, 0xc5, 0xe8, 0x53,
-    0x7a, 0x5f, 0xd6, 0xff, 0xa2, 0x56, 0xc7, 0x71, 0x57, 0x92, 0x06, 0x72, 0x8b, 0xb3, 0xa8, 0x00, 0xd3, 0x32, 0x74,
-    0x26, 0xb0, 0x57, 0xdd, 0x94, 0x12, 0x06, 0x9e, 0x83, 0x99, 0xfa, 0x6e, 0x3a, 0xe0, 0xed, 0xd5, 0x1b, 0x24, 0xaa,
-    0x82, 0xa5, 0x1d, 0x9d, 0x26, 0x41, 0xee, 0x11, 0x1e, 0x0f, 0xb6, 0x1b, 0xa9, 0xb9, 0x03, 0xd4, 0xc3, 0x6c, 0x4a,
-    0x3c, 0xf7, 0x81, 0x1d, 0x49, 0xb3, 0xcc, 0x5f, 0x64, 0x47, 0xa4, 0x54, 0xaa, 0xdd, 0xb3, 0xee, 0x54, 0xf8, 0x43,
-    0x10, 0x70, 0xd8, 0x1b, 0xe8, 0xef, 0x99, 0x8e, 0x8b, 0xdd, 0x99, 0x14, 0x7d, 0x52, 0xc3, 0xb6, 0x29, 0xec, 0x87,
-    0x4e, 0xee, 0xb3, 0xe0, 0xea, 0x94, 0x09, 0x7b, 0x8f, 0x67, 0xc2, 0x1e, 0x52, 0xb5, 0xcb, 0xcb, 0x6a, 0x13, 0xf7,
-    0x74, 0x4e, 0x1a, 0xc2, 0x4f, 0xef, 0x59, 0xf0, 0x0a, 0xf8, 0xff, 0x2f, 0x29, 0xee, 0x0f, 0xa7, 0xb7, 0x2f, 0x48,
-    0x6d, 0x5f, 0x98, 0xd5, 0x8c, 0x77, 0xca, 0x79, 0xe8, 0x41, 0xfa, 0x62, 0x58, 0xb0, 0xa5, 0xf7, 0x67, 0x40, 0xfb,
-    0xdf, 0x38, 0x06, 0x2f, 0xbc, 0x29, 0xbe, 0x44, 0xba, 0x31, 0x10, 0xe1, 0x60, 0x8a, 0x26, 0x57, 0x43, 0x3c, 0xf4,
-    0x90, 0xaa, 0x9a, 0xc6, 0x68, 0x82, 0xa7, 0x40, 0x30, 0xc6, 0xc1, 0x04, 0x26, 0x90, 0xef, 0xe1, 0xd1, 0x6b, 0x3f,
-    0xc0, 0xe3, 0x11, 0x50, 0xf9, 0x2e, 0x0e, 0x7c, 0x64, 0x68, 0xc7, 0xd8, 0x07, 0x71, 0x8a, 0x24, 0x28, 0x01, 0xe8,
-    0x24, 0xc0, 0xee, 0x04, 0xc4, 0x8d, 0xb1, 0x7b, 0x89, 0xa7, 0x63, 0x34, 0xc5, 0x13, 0x80, 0x0e, 0x0f, 0x47, 0x85,
-    0x33, 0xc2, 0x1e, 0x4c, 0x07, 0x63, 0x32, 0xc5, 0xc3, 0x00, 0xe9, 0xc6, 0xc0, 0x31, 0x01, 0x11, 0x0e, 0x76, 0xbd,
-    0xd7, 0x01, 0xf6, 0x27, 0xa0, 0x77, 0x38, 0x7c, 0x01, 0x62, 0x2f, 0x87, 0xc8, 0xb4, 0x06, 0x5e, 0x50, 0x30, 0x7a,
-    0x0c, 0x34, 0xff, 0x9f, 0x0b, 0x1a, 0x40, 0xe2, 0xa1, 0x00, 0x5f, 0x42, 0xec, 0x7a, 0x8a, 0xdf, 0xb4, 0x06, 0x37,
-    0xcf, 0x43, 0xee, 0x1f, 0xc6, 0x2c, 0xf8, 0xe7, 0x62, 0xe6, 0x29, 0x04, 0xa0, 0x0b, 0xba, 0x41, 0x0e, 0xd2, 0x8d,
-    0xd1, 0x0d, 0xcc, 0xd3, 0xab, 0x4b, 0x34, 0x05, 0xae, 0xf1, 0x14, 0x5d, 0xa2, 0x91, 0x42, 0x17, 0xd8, 0x87, 0x86,
-    0xc9, 0x01, 0xa6, 0x2f, 0x84, 0x71, 0xf8, 0x37, 0x86, 0xf1, 0x31, 0x9f, 0xfe, 0xc6, 0x2e, 0xfd, 0x15, 0x57, 0x10,
-    0x94, 0x63, 0xba, 0x0c, 0x8b, 0x06, 0xe6, 0x15, 0xaf, 0xaa, 0x28, 0x78, 0x94, 0x43, 0x35, 0x02, 0xef, 0x7a, 0x0f,
-    0xb1, 0x34, 0xce, 0xbd, 0xf9, 0xbd, 0x2a, 0x1d, 0x28, 0xbd, 0x79, 0xa4, 0xd3, 0xf9, 0xfc, 0x26, 0xa7, 0xe8, 0xd5,
-    0xf5, 0x3b, 0x78, 0x08, 0x16, 0x05, 0xe2, 0xd5, 0x1a, 0xde, 0x9b, 0x5b, 0x24, 0x2b, 0xf5, 0x82, 0xe7, 0x50, 0x2a,
-    0xaa, 0x2e, 0x3c, 0x20, 0x50, 0x57, 0x2c, 0x60, 0x8c, 0xa3, 0x45, 0x33, 0x7f, 0x57, 0x50, 0x22, 0x28, 0x5a, 0xb2,
-    0x15, 0x45, 0x4c, 0x42, 0x1d, 0x50, 0x52, 0x24, 0x99, 0x6a, 0x8e, 0x8c, 0x9a, 0xee, 0x6d, 0x25, 0x69, 0x88, 0xae,
-    0xaa, 0x7a, 0xab, 0x85, 0x24, 0x39, 0xe1, 0x4b, 0x9a, 0x1e, 0x84, 0x29, 0xea, 0x6d, 0xd5, 0x36, 0xe8, 0x97, 0x17,
-    0x6f, 0x5e, 0xab, 0x87, 0x36, 0x45, 0x4e, 0xa7, 0x6c, 0x23, 0xd1, 0x8f, 0x37, 0x2f, 0x50, 0x5b, 0xc3, 0xa6, 0x53,
-    0x63, 0x5b, 0xb5, 0xa2, 0xcd, 0x1a, 0x2a, 0x4b, 0xaa, 0x48, 0x40, 0xb9, 0xa0, 0x52, 0x42, 0xa1, 0x21, 0x30, 0x94,
-    0xce, 0xda, 0x13, 0x53, 0x75, 0x83, 0xbb, 0x20, 0x7e, 0xde, 0x95, 0xd7, 0x51, 0x1e, 0x18, 0xd7, 0xaf, 0x3b, 0x6a,
-    0x70, 0x3d, 0x98, 0x47, 0xea, 0x39, 0x8d, 0x88, 0x7e, 0x84, 0xc4, 0x83, 0x35, 0xcb, 0x98, 0x7a, 0xb8, 0xcd, 0x23,
-    0x5d, 0x8f, 0x2a, 0x09, 0xaa, 0x24, 0x32, 0x5f, 0x34, 0x74, 0xaf, 0xa0, 0x7c, 0x09, 0xaf, 0x64, 0xd8, 0x70, 0xa8,
-    0x50, 0x12, 0x9a, 0x57, 0x05, 0x54, 0x40, 0xf1, 0xf5, 0xf5, 0x0f, 0xff, 0x52, 0x9f, 0x3f, 0xc0, 0xcf, 0x13, 0x27,
-    0x3c, 0x29, 0x0c, 0xa3, 0xea, 0x74, 0x7c, 0xe3, 0xa1, 0xf9, 0x90, 0x51, 0xc3, 0x7b, 0x00, 0xfc, 0x4e, 0xef, 0x49,
-    0x79, 0x77, 0x98, 0xec, 0x24, 0xe9, 0x5f, 0x5d, 0xd9, 0x1a, 0x26, 0xd1, 0x2e, 0x4a, 0x26, 0xe7, 0xd7, 0x60, 0x60,
-    0x34, 0x30, 0x0b, 0xe0, 0x9c, 0x72, 0xc0, 0xd0, 0xe6, 0x1d, 0x0f, 0xec, 0xa8, 0x42, 0xec, 0x27, 0x8d, 0x98, 0xd9,
-    0x60, 0xed, 0x65, 0x49, 0x65, 0x5e, 0xa5, 0xf1, 0xbb, 0x1f, 0xaf, 0x6f, 0x8e, 0x1e, 0x77, 0xb0, 0x52, 0x9e, 0x98,
-    0x0f, 0x2c, 0x6d, 0x21, 0x59, 0x4d, 0x1a, 0xa9, 0xc5, 0x3a, 0x2a, 0xce, 0x0e, 0x1e, 0xe9, 0x75, 0xbd, 0x33, 0xda,
-    0xa9, 0x8e, 0x71, 0x30, 0x47, 0x0f, 0xd9, 0x78, 0xd0, 0xfd, 0x99, 0x95, 0x03, 0x73, 0x14, 0x07, 0xe6, 0x5c, 0x0e,
-    0xf4, 0xe7, 0xa7, 0xdf, 0x01, 0xf1, 0x69, 0xfc, 0xac, 0x8e, 0x12, 0x00, 0x00};
-
-}  // namespace captive_portal
-}  // namespace esphome

esphome/components/captive_portal/captive_portal.cpp

@@ -4,27 +4,60 @@
 #include "esphome/core/log.h"
 #include "esphome/core/application.h"
 #include "esphome/components/wifi/wifi_component.h"
-#include "captive_index.h"
 
 namespace esphome {
 namespace captive_portal {
 
 static const char *const TAG = "captive_portal";
 
-void CaptivePortal::handle_config(AsyncWebServerRequest *request) {
-  AsyncResponseStream *stream = request->beginResponseStream("application/json");
-  stream->addHeader("cache-control", "public, max-age=0, must-revalidate");
-  stream->printf(R"({"name":"%s","aps":[{})", App.get_name().c_str());
+void CaptivePortal::handle_index(AsyncWebServerRequest *request) {
+  AsyncResponseStream *stream = request->beginResponseStream("text/html");
+  stream->print(F("<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"UTF-8\"><meta name=\"viewport\" "
+                  "content=\"width=device-width,initial-scale=1,user-scalable=no\"/><title>"));
+  stream->print(App.get_name().c_str());
+  stream->print(F("</title><link rel=\"stylesheet\" href=\"/stylesheet.css\">"));
+  stream->print(F("<script>function c(l){document.getElementById('ssid').value=l.innerText||l.textContent; "
+                  "document.getElementById('psk').focus();}</script>"));
+  stream->print(F("</head>"));
+  stream->print(F("<body><div class=\"main\"><h1>WiFi Networks</h1>"));
+
+  if (request->hasArg("save")) {
+    stream->print(F("<div class=\"info\">The ESP will now try to connect to the network...<br/>Please give it some "
+                    "time to connect.<br/>Note: Copy the changed network to your YAML file - the next OTA update will "
+                    "overwrite these settings.</div>"));
+  }
 
   for (auto &scan : wifi::global_wifi_component->get_scan_result()) {
     if (scan.get_is_hidden())
       continue;
 
-    // Assumes no " in ssid, possible unicode isses?
-    stream->printf(R"(,{"ssid":"%s","rssi":%d,"lock":%d})", scan.get_ssid().c_str(), scan.get_rssi(),
-                   scan.get_with_auth());
+    stream->print(F("<div class=\"network\" onclick=\"c(this)\"><a href=\"#\" class=\"network-left\">"));
+
+    if (scan.get_rssi() >= -50) {
+      stream->print(F("<img src=\"/wifi-strength-4.svg\">"));
+    } else if (scan.get_rssi() >= -65) {
+      stream->print(F("<img src=\"/wifi-strength-3.svg\">"));
+    } else if (scan.get_rssi() >= -85) {
+      stream->print(F("<img src=\"/wifi-strength-2.svg\">"));
+    } else {
+      stream->print(F("<img src=\"/wifi-strength-1.svg\">"));
+    }
+
+    stream->print(F("<span class=\"network-ssid\">"));
+    stream->print(scan.get_ssid().c_str());
+    stream->print(F("</span></a>"));
+    if (scan.get_with_auth()) {
+      stream->print(F("<img src=\"/lock.svg\">"));
+    }
+    stream->print(F("</div>"));
   }
-  stream->print(F("]}"));
+
+  stream->print(F("<h3>WiFi Settings</h3><form method=\"GET\" action=\"/wifisave\"><input id=\"ssid\" name=\"ssid\" "
+                  "length=32 placeholder=\"SSID\"><br/><input id=\"psk\" name=\"psk\" length=64 type=\"password\" "
+                  "placeholder=\"Password\"><br/><br/><button type=\"submit\">Save</button></form><br><hr><br>"));
+  stream->print(F("<h1>OTA Update</h1><form method=\"POST\" action=\"/update\" enctype=\"multipart/form-data\"><input "
+                  "type=\"file\" name=\"update\"><button type=\"submit\">Update</button></form>"));
+  stream->print(F("</div></body></html>"));
   request->send(stream);
 }
 void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
@@ -35,7 +68,7 @@ void CaptivePortal::handle_wifisave(AsyncWebServerRequest *request) {
   ESP_LOGI(TAG, "  Password=" LOG_SECRET("'%s'"), psk.c_str());
   wifi::global_wifi_component->save_wifi_sta(ssid, psk);
   wifi::global_wifi_component->start_scanning();
-  request->redirect("/?save");
+  request->redirect("/?save=true");
 }
 
 void CaptivePortal::setup() {}
@@ -65,21 +98,44 @@ void CaptivePortal::start() {
   this->active_ = true;
 }
 
+const char STYLESHEET_CSS[] PROGMEM =
+    R"(*{box-sizing:inherit}div,input{padding:5px;font-size:1em}input{width:95%}body{text-align:center;font-family:sans-serif}button{border:0;border-radius:.3rem;background-color:#1fa3ec;color:#fff;line-height:2.4rem;font-size:1.2rem;width:100%;padding:0}.main{text-align:left;display:inline-block;min-width:260px}.network{display:flex;justify-content:space-between;align-items:center}.network-left{display:flex;align-items:center}.network-ssid{margin-bottom:-7px;margin-left:10px}.info{border:1px solid;margin:10px 0;padding:15px 10px;color:#4f8a10;background-color:#dff2bf})";
+const char LOCK_SVG[] PROGMEM =
+    R"(<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M12 17a2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-2 2 2 2 0 0 0 2 2m6-9a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V10a2 2 0 0 1 2-2h1V6a5 5 0 0 1 5-5 5 5 0 0 1 5 5v2h1m-6-5a3 3 0 0 0-3 3v2h6V6a3 3 0 0 0-3-3z"/></svg>)";
+
 void CaptivePortal::handleRequest(AsyncWebServerRequest *req) {
   if (req->url() == "/") {
-    AsyncWebServerResponse *response = req->beginResponse_P(200, "text/html", INDEX_GZ, sizeof(INDEX_GZ));
-    response->addHeader("Content-Encoding", "gzip");
-    req->send(response);
-    return;
-  } else if (req->url() == "/config.json") {
-    this->handle_config(req);
+    this->handle_index(req);
     return;
   } else if (req->url() == "/wifisave") {
     this->handle_wifisave(req);
     return;
+  } else if (req->url() == "/stylesheet.css") {
+    req->send_P(200, "text/css", STYLESHEET_CSS);
+    return;
+  } else if (req->url() == "/lock.svg") {
+    req->send_P(200, "image/svg+xml", LOCK_SVG);
+    return;
   }
-}
 
+  AsyncResponseStream *stream = req->beginResponseStream("image/svg+xml");
+  stream->print(F("<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"24\" height=\"24\"><path d=\"M12 3A18.9 18.9 0 0 "
+                  "0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 "));
+  if (req->url() == "/wifi-strength-4.svg") {
+    stream->print(F("3z"));
+  } else {
+    if (req->url() == "/wifi-strength-1.svg") {
+      stream->print(F("3m0 2c3.07 0 6.09.86 8.71 2.45l-5.1 6.36a8.43 8.43 0 0 0-7.22-.01L3.27 7.4"));
+    } else if (req->url() == "/wifi-strength-2.svg") {
+      stream->print(F("3m0 2c3.07 0 6.09.86 8.71 2.45l-3.21 3.98a11.32 11.32 0 0 0-11 0L3.27 7.4"));
+    } else if (req->url() == "/wifi-strength-3.svg") {
+      stream->print(F("3m0 2c3.07 0 6.09.86 8.71 2.45l-1.94 2.43A13.6 13.6 0 0 0 12 8C9 8 6.68 9 5.21 9.84l-1.94-2."));
+    }
+    stream->print(F("4A16.94 16.94 0 0 1 12 5z"));
+  }
+  stream->print(F("\"/></svg>"));
+  req->send(stream);
+}
 CaptivePortal::CaptivePortal(web_server_base::WebServerBase *base) : base_(base) { global_captive_portal = this; }
 float CaptivePortal::get_setup_priority() const {
   // Before WiFi

esphome/components/captive_portal/captive_portal.h

@@ -58,7 +58,7 @@ class CaptivePortal : public AsyncWebHandler, public Component {
     return false;
   }
 
-  void handle_config(AsyncWebServerRequest *request);
+  void handle_index(AsyncWebServerRequest *request);
 
   void handle_wifisave(AsyncWebServerRequest *request);
 

esphome/components/captive_portal/index.html

@@ -0,0 +1,55 @@
+<!-- HTTP_HEAD -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
+    <title>{{ App.get_name() }}</title>
+    <link rel="stylesheet" href="./stylesheet.css">
+    <script>
+        function c(l) {
+            document.getElementById('ssid').value = l.innerText || l.textContent;
+            document.getElementById('psk').focus();
+        }
+    </script>
+</head>
+<body>
+<div class="main">
+    <h1>WiFi Networks</h1>
+    <div class="info">
+        The ESP will now try to connect to the network...<br/>
+        Please give it some time to connect.<br/>
+        Note: Copy the changed network to your YAML file - the next OTA update will overwrite these settings.
+    </div>
+    <div class="network" onclick="c(this)">
+        <a href="#" class="network-left">
+            <img src="./wifi-strength-4.svg">
+            <span class="network-ssid">AP1</span>
+        </a>
+        <img src="./lock.svg">
+    </div>
+    <div class="network" onclick="c(this)">
+        <a href="#" class="network-left">
+            <img src="./wifi-strength-2.svg">
+            <span class="network-ssid">AP2</span>
+        </a>
+    </div>
+
+    <h3>WiFi Settings</h3>
+    <form method="GET" action="/wifisave">
+        <input id="ssid" name="ssid" length=32 placeholder="SSID"><br/>
+        <input id="psk" name="psk" length=64 type="password" placeholder="Password"><br/>
+        <br/>
+        <button type="submit">Save</button>
+    </form>
+    <br><hr>
+    <br>
+
+    <h1>OTA Update</h1>
+    <form method="POST" action="/update" enctype="multipart/form-data">
+        <input type="file" name="update">
+        <button type="submit">Update</button>
+    </form>
+</div>
+</body>
+</html>

esphome/components/captive_portal/lock.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24"><path d="M12 17a2 2 0 0 0 2-2 2 2 0 0 0-2-2 2 2 0 0 0-2 2 2 2 0 0 0 2 2m6-9a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V10a2 2 0 0 1 2-2h1V6a5 5 0 0 1 5-5 5 5 0 0 1 5 5v2h1m-6-5a3 3 0 0 0-3 3v2h6V6a3 3 0 0 0-3-3z"/></svg>

esphome/components/captive_portal/stylesheet.css

@@ -0,0 +1,58 @@
+* {
+    box-sizing: inherit;
+}
+
+div, input {
+    padding: 5px;
+    font-size: 1em;
+}
+
+input {
+    width: 95%;
+}
+
+body {
+    text-align: center;
+    font-family: sans-serif;
+}
+
+button {
+    border: 0;
+    border-radius: 0.3rem;
+    background-color: #1fa3ec;
+    color: #fff;
+    line-height: 2.4rem;
+    font-size: 1.2rem;
+    width: 100%;
+    padding: 0;
+}
+
+.main {
+    text-align: left;
+    display: inline-block;
+    min-width: 260px;
+}
+
+.network {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.network-left {
+    display: flex;
+    align-items: center;
+}
+
+.network-ssid {
+    margin-bottom: -7px;
+    margin-left: 10px;
+}
+
+.info {
+    border: 1px solid;
+    margin: 10px 0px;
+    padding: 15px 10px;
+    color: #4f8a10;
+    background-color: #dff2bf;
+}

esphome/components/captive_portal/wifi-strength-1.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3m0 2c3.07 0 6.09.86 8.71 2.45l-5.1 6.36a8.43 8.43 0 0 0-7.22-.01L3.27 7.44A16.94 16.94 0 0 1 12 5z"/></svg>

esphome/components/captive_portal/wifi-strength-2.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3m0 2c3.07 0 6.09.86 8.71 2.45l-3.21 3.98a11.32 11.32 0 0 0-11 0L3.27 7.44A16.94 16.94 0 0 1 12 5z"/></svg>

esphome/components/captive_portal/wifi-strength-3.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3m0 2c3.07 0 6.09.86 8.71 2.45l-1.94 2.43A13.6 13.6 0 0 0 12 8C9 8 6.68 9 5.21 9.84l-1.94-2.4A16.94 16.94 0 0 1 12 5z"/></svg>

esphome/components/captive_portal/wifi-strength-4.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24"><path d="M12 3A18.9 18.9 0 0 0 .38 7C4.41 12.06 7.89 16.37 12 21.5L23.65 7C20.32 4.41 16.22 3 12 3z"/></svg>

esphome/components/cd74hc4067/sensor.py

@@ -25,7 +25,6 @@ CONF_CD74HC4067_ID = "cd74hc4067_id"
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        CD74HC4067Sensor,
         unit_of_measurement=UNIT_VOLT,
         accuracy_decimals=3,
         device_class=DEVICE_CLASS_VOLTAGE,
@@ -34,6 +33,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(CD74HC4067Sensor),
             cv.GenerateID(CONF_CD74HC4067_ID): cv.use_id(CD74HC4067Component),
             cv.Required(CONF_NUMBER): cv.int_range(0, 15),
             cv.Required(CONF_SENSOR): cv.use_id(voltage_sampler.VoltageSampler),
@@ -47,8 +47,8 @@ async def to_code(config):
     parent = await cg.get_variable(config[CONF_CD74HC4067_ID])
 
     var = cg.new_Pvariable(config[CONF_ID], parent)
-    await sensor.register_sensor(var, config)
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
     cg.add(var.set_pin(config[CONF_NUMBER]))
 
     sens = await cg.get_variable(config[CONF_SENSOR])

esphome/components/copy/__init__.py

@@ -1,5 +0,0 @@
-import esphome.codegen as cg
-
-CODEOWNERS = ["@OttoWinter"]
-
-copy_ns = cg.esphome_ns.namespace("copy")

esphome/components/copy/binary_sensor/__init__.py

@@ -1,41 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import binary_sensor
-from esphome.const import (
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_SOURCE_ID,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopyBinarySensor = copy_ns.class_(
-    "CopyBinarySensor", binary_sensor.BinarySensor, cg.Component
-)
-
-
-CONFIG_SCHEMA = (
-    binary_sensor.binary_sensor_schema(CopyBinarySensor)
-    .extend(
-        {
-            cv.Required(CONF_SOURCE_ID): cv.use_id(binary_sensor.BinarySensor),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-    inherit_property_from(CONF_DEVICE_CLASS, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/binary_sensor/copy_binary_sensor.cpp

@@ -1,18 +0,0 @@
-#include "copy_binary_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.binary_sensor";
-
-void CopyBinarySensor::setup() {
-  source_->add_on_state_callback([this](bool value) { this->publish_state(value); });
-  if (source_->has_state())
-    this->publish_state(source_->state);
-}
-
-void CopyBinarySensor::dump_config() { LOG_BINARY_SENSOR("", "Copy Binary Sensor", this); }
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/binary_sensor/copy_binary_sensor.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/binary_sensor/binary_sensor.h"
-
-namespace esphome {
-namespace copy {
-
-class CopyBinarySensor : public binary_sensor::BinarySensor, public Component {
- public:
-  void set_source(binary_sensor::BinarySensor *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  binary_sensor::BinarySensor *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/button/__init__.py

@@ -1,42 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import button
-from esphome.const import (
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_ID,
-    CONF_SOURCE_ID,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopyButton = copy_ns.class_("CopyButton", button.Button, cg.Component)
-
-
-CONFIG_SCHEMA = (
-    button.button_schema()
-    .extend(
-        {
-            cv.GenerateID(): cv.declare_id(CopyButton),
-            cv.Required(CONF_SOURCE_ID): cv.use_id(button.Button),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-    inherit_property_from(CONF_DEVICE_CLASS, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await button.register_button(var, config)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/button/copy_button.cpp

@@ -1,14 +0,0 @@
-#include "copy_button.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.button";
-
-void CopyButton::dump_config() { LOG_BUTTON("", "Copy Button", this); }
-
-void CopyButton::press_action() { source_->press(); }
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/button/copy_button.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/button/button.h"
-
-namespace esphome {
-namespace copy {
-
-class CopyButton : public button::Button, public Component {
- public:
-  void set_source(button::Button *source) { source_ = source; }
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  void press_action() override;
-
-  button::Button *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/cover/__init__.py

@@ -1,38 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import cover
-from esphome.const import (
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_ID,
-    CONF_SOURCE_ID,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopyCover = copy_ns.class_("CopyCover", cover.Cover, cg.Component)
-
-
-CONFIG_SCHEMA = cover.COVER_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CopyCover),
-        cv.Required(CONF_SOURCE_ID): cv.use_id(cover.Cover),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-    inherit_property_from(CONF_DEVICE_CLASS, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cover.register_cover(var, config)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/cover/copy_cover.cpp

@@ -1,50 +0,0 @@
-#include "copy_cover.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.cover";
-
-void CopyCover::setup() {
-  source_->add_on_state_callback([this]() {
-    this->current_operation = this->source_->current_operation;
-    this->position = this->source_->position;
-    this->tilt = this->source_->tilt;
-    this->publish_state();
-  });
-
-  this->current_operation = this->source_->current_operation;
-  this->position = this->source_->position;
-  this->tilt = this->source_->tilt;
-  this->publish_state();
-}
-
-void CopyCover::dump_config() { LOG_COVER("", "Copy Cover", this); }
-
-cover::CoverTraits CopyCover::get_traits() {
-  auto base = source_->get_traits();
-  cover::CoverTraits traits{};
-  // copy traits manually so it doesn't break when new options are added
-  // but the control() method hasn't implemented them yet.
-  traits.set_is_assumed_state(base.get_is_assumed_state());
-  traits.set_supports_position(base.get_supports_position());
-  traits.set_supports_tilt(base.get_supports_tilt());
-  traits.set_supports_toggle(base.get_supports_toggle());
-  return traits;
-}
-
-void CopyCover::control(const cover::CoverCall &call) {
-  auto call2 = source_->make_call();
-  call2.set_stop(call.get_stop());
-  if (call.get_tilt().has_value())
-    call2.set_tilt(*call.get_tilt());
-  if (call.get_position().has_value())
-    call2.set_position(*call.get_position());
-  if (call.get_tilt().has_value())
-    call2.set_tilt(*call.get_tilt());
-  call2.perform();
-}
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/cover/copy_cover.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/cover/cover.h"
-
-namespace esphome {
-namespace copy {
-
-class CopyCover : public cover::Cover, public Component {
- public:
-  void set_source(cover::Cover *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
-  cover::CoverTraits get_traits() override;
-
- protected:
-  void control(const cover::CoverCall &call) override;
-
-  cover::Cover *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/fan/__init__.py

@@ -1,36 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import fan
-from esphome.const import (
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_ID,
-    CONF_SOURCE_ID,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopyFan = copy_ns.class_("CopyFan", fan.Fan, cg.Component)
-
-
-CONFIG_SCHEMA = fan.FAN_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CopyFan),
-        cv.Required(CONF_SOURCE_ID): cv.use_id(fan.Fan),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await fan.register_fan(var, config)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/fan/copy_fan.cpp

@@ -1,53 +0,0 @@
-#include "copy_fan.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.fan";
-
-void CopyFan::setup() {
-  source_->add_on_state_callback([this]() {
-    this->state = source_->state;
-    this->oscillating = source_->oscillating;
-    this->speed = source_->speed;
-    this->direction = source_->direction;
-    this->publish_state();
-  });
-
-  this->state = source_->state;
-  this->oscillating = source_->oscillating;
-  this->speed = source_->speed;
-  this->direction = source_->direction;
-  this->publish_state();
-}
-
-void CopyFan::dump_config() { LOG_FAN("", "Copy Fan", this); }
-
-fan::FanTraits CopyFan::get_traits() {
-  fan::FanTraits traits;
-  auto base = source_->get_traits();
-  // copy traits manually so it doesn't break when new options are added
-  // but the control() method hasn't implemented them yet.
-  traits.set_oscillation(base.supports_oscillation());
-  traits.set_speed(base.supports_speed());
-  traits.set_supported_speed_count(base.supported_speed_count());
-  traits.set_direction(base.supports_direction());
-  return traits;
-}
-
-void CopyFan::control(const fan::FanCall &call) {
-  auto call2 = source_->make_call();
-  if (call.get_state().has_value())
-    call2.set_state(*call.get_state());
-  if (call.get_oscillating().has_value())
-    call2.set_oscillating(*call.get_oscillating());
-  if (call.get_speed().has_value())
-    call2.set_speed(*call.get_speed());
-  if (call.get_direction().has_value())
-    call2.set_direction(*call.get_direction());
-  call2.perform();
-}
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/fan/copy_fan.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/fan/fan.h"
-
-namespace esphome {
-namespace copy {
-
-class CopyFan : public fan::Fan, public Component {
- public:
-  void set_source(fan::Fan *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
-  fan::FanTraits get_traits() override;
-
- protected:
-  void control(const fan::FanCall &call) override;
-  ;
-
-  fan::Fan *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/lock/__init__.py

@@ -1,36 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import lock
-from esphome.const import (
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_ID,
-    CONF_SOURCE_ID,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopyLock = copy_ns.class_("CopyLock", lock.Lock, cg.Component)
-
-
-CONFIG_SCHEMA = lock.LOCK_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CopyLock),
-        cv.Required(CONF_SOURCE_ID): cv.use_id(lock.Lock),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await lock.register_lock(var, config)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/lock/copy_lock.cpp

@@ -1,29 +0,0 @@
-#include "copy_lock.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.lock";
-
-void CopyLock::setup() {
-  source_->add_on_state_callback([this]() { this->publish_state(source_->state); });
-
-  traits.set_assumed_state(source_->traits.get_assumed_state());
-  traits.set_requires_code(source_->traits.get_requires_code());
-  traits.set_supported_states(source_->traits.get_supported_states());
-  traits.set_supports_open(source_->traits.get_supports_open());
-
-  this->publish_state(source_->state);
-}
-
-void CopyLock::dump_config() { LOG_LOCK("", "Copy Lock", this); }
-
-void CopyLock::control(const lock::LockCall &call) {
-  auto call2 = source_->make_call();
-  call2.set_state(call.get_state());
-  call2.perform();
-}
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/lock/copy_lock.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/lock/lock.h"
-
-namespace esphome {
-namespace copy {
-
-class CopyLock : public lock::Lock, public Component {
- public:
-  void set_source(lock::Lock *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  void control(const lock::LockCall &call) override;
-
-  lock::Lock *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/number/__init__.py

@@ -1,38 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import number
-from esphome.const import (
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_MODE,
-    CONF_SOURCE_ID,
-    CONF_UNIT_OF_MEASUREMENT,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopyNumber = copy_ns.class_("CopyNumber", number.Number, cg.Component)
-
-
-CONFIG_SCHEMA = number.NUMBER_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CopyNumber),
-        cv.Required(CONF_SOURCE_ID): cv.use_id(number.Number),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-    inherit_property_from(CONF_UNIT_OF_MEASUREMENT, CONF_SOURCE_ID),
-    inherit_property_from(CONF_MODE, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = await number.new_number(config, min_value=0, max_value=0, step=0)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/number/copy_number.cpp

@@ -1,29 +0,0 @@
-#include "copy_number.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.number";
-
-void CopyNumber::setup() {
-  source_->add_on_state_callback([this](float value) { this->publish_state(value); });
-
-  traits.set_min_value(source_->traits.get_min_value());
-  traits.set_max_value(source_->traits.get_max_value());
-  traits.set_step(source_->traits.get_step());
-
-  if (source_->has_state())
-    this->publish_state(source_->state);
-}
-
-void CopyNumber::dump_config() { LOG_NUMBER("", "Copy Number", this); }
-
-void CopyNumber::control(float value) {
-  auto call2 = source_->make_call();
-  call2.set_value(value);
-  call2.perform();
-}
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/number/copy_number.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/number/number.h"
-
-namespace esphome {
-namespace copy {
-
-class CopyNumber : public number::Number, public Component {
- public:
-  void set_source(number::Number *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  void control(float value) override;
-
-  number::Number *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/select/__init__.py

@@ -1,36 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import select
-from esphome.const import (
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_ID,
-    CONF_SOURCE_ID,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopySelect = copy_ns.class_("CopySelect", select.Select, cg.Component)
-
-
-CONFIG_SCHEMA = select.SELECT_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CopySelect),
-        cv.Required(CONF_SOURCE_ID): cv.use_id(select.Select),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await select.register_select(var, config, options=[])
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/select/copy_select.cpp

@@ -1,27 +0,0 @@
-#include "copy_select.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.select";
-
-void CopySelect::setup() {
-  source_->add_on_state_callback([this](const std::string &value) { this->publish_state(value); });
-
-  traits.set_options(source_->traits.get_options());
-
-  if (source_->has_state())
-    this->publish_state(source_->state);
-}
-
-void CopySelect::dump_config() { LOG_SELECT("", "Copy Select", this); }
-
-void CopySelect::control(const std::string &value) {
-  auto call = source_->make_call();
-  call.set_option(value);
-  call.perform();
-}
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/select/copy_select.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/select/select.h"
-
-namespace esphome {
-namespace copy {
-
-class CopySelect : public select::Select, public Component {
- public:
-  void set_source(select::Select *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  void control(const std::string &value) override;
-
-  select::Select *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/sensor/__init__.py

@@ -1,45 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor
-from esphome.const import (
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_SOURCE_ID,
-    CONF_STATE_CLASS,
-    CONF_UNIT_OF_MEASUREMENT,
-    CONF_ACCURACY_DECIMALS,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopySensor = copy_ns.class_("CopySensor", sensor.Sensor, cg.Component)
-
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(CopySensor)
-    .extend(
-        {
-            cv.Required(CONF_SOURCE_ID): cv.use_id(sensor.Sensor),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_UNIT_OF_MEASUREMENT, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ACCURACY_DECIMALS, CONF_SOURCE_ID),
-    inherit_property_from(CONF_DEVICE_CLASS, CONF_SOURCE_ID),
-    inherit_property_from(CONF_STATE_CLASS, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/sensor/copy_sensor.cpp

@@ -1,18 +0,0 @@
-#include "copy_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.sensor";
-
-void CopySensor::setup() {
-  source_->add_on_state_callback([this](float value) { this->publish_state(value); });
-  if (source_->has_state())
-    this->publish_state(source_->state);
-}
-
-void CopySensor::dump_config() { LOG_SENSOR("", "Copy Sensor", this); }
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/sensor/copy_sensor.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace copy {
-
-class CopySensor : public sensor::Sensor, public Component {
- public:
-  void set_source(sensor::Sensor *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  sensor::Sensor *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/switch/__init__.py

@@ -1,38 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import switch
-from esphome.const import (
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_ID,
-    CONF_SOURCE_ID,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopySwitch = copy_ns.class_("CopySwitch", switch.Switch, cg.Component)
-
-
-CONFIG_SCHEMA = switch.SWITCH_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(CopySwitch),
-        cv.Required(CONF_SOURCE_ID): cv.use_id(switch.Switch),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-    inherit_property_from(CONF_DEVICE_CLASS, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await switch.register_switch(var, config)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/switch/copy_switch.cpp

@@ -1,26 +0,0 @@
-#include "copy_switch.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.switch";
-
-void CopySwitch::setup() {
-  source_->add_on_state_callback([this](float value) { this->publish_state(value); });
-
-  this->publish_state(source_->state);
-}
-
-void CopySwitch::dump_config() { LOG_SWITCH("", "Copy Switch", this); }
-
-void CopySwitch::write_state(bool state) {
-  if (state) {
-    source_->turn_on();
-  } else {
-    source_->turn_off();
-  }
-}
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/switch/copy_switch.h

@@ -1,23 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/switch/switch.h"
-
-namespace esphome {
-namespace copy {
-
-class CopySwitch : public switch_::Switch, public Component {
- public:
-  void set_source(switch_::Switch *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  void write_state(bool state) override;
-
-  switch_::Switch *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/text_sensor/__init__.py

@@ -1,37 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import text_sensor
-from esphome.const import (
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_SOURCE_ID,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-from .. import copy_ns
-
-CopyTextSensor = copy_ns.class_("CopyTextSensor", text_sensor.TextSensor, cg.Component)
-
-
-CONFIG_SCHEMA = (
-    text_sensor.text_sensor_schema(CopyTextSensor)
-    .extend(
-        {
-            cv.Required(CONF_SOURCE_ID): cv.use_id(text_sensor.TextSensor),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
-    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
-)
-
-
-async def to_code(config):
-    var = await text_sensor.new_text_sensor(config)
-    await cg.register_component(var, config)
-
-    source = await cg.get_variable(config[CONF_SOURCE_ID])
-    cg.add(var.set_source(source))

esphome/components/copy/text_sensor/copy_text_sensor.cpp

@@ -1,18 +0,0 @@
-#include "copy_text_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace copy {
-
-static const char *const TAG = "copy.text_sensor";
-
-void CopyTextSensor::setup() {
-  source_->add_on_state_callback([this](const std::string &value) { this->publish_state(value); });
-  if (source_->has_state())
-    this->publish_state(source_->state);
-}
-
-void CopyTextSensor::dump_config() { LOG_TEXT_SENSOR("", "Copy Sensor", this); }
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/copy/text_sensor/copy_text_sensor.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/text_sensor/text_sensor.h"
-
-namespace esphome {
-namespace copy {
-
-class CopyTextSensor : public text_sensor::TextSensor, public Component {
- public:
-  void set_source(text_sensor::TextSensor *source) { source_ = source; }
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
- protected:
-  text_sensor::TextSensor *source_;
-};
-
-}  // namespace copy
-}  // namespace esphome

esphome/components/ct_clamp/sensor.py

@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome.components import sensor, voltage_sampler
 from esphome.const import (
     CONF_SENSOR,
+    CONF_ID,
     DEVICE_CLASS_CURRENT,
     STATE_CLASS_MEASUREMENT,
     UNIT_AMPERE,
@@ -18,7 +19,6 @@ CTClampSensor = ct_clamp_ns.class_("CTClampSensor", sensor.Sensor, cg.PollingCom
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        CTClampSensor,
         unit_of_measurement=UNIT_AMPERE,
         accuracy_decimals=2,
         device_class=DEVICE_CLASS_CURRENT,
@@ -26,6 +26,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(CTClampSensor),
             cv.Required(CONF_SENSOR): cv.use_id(voltage_sampler.VoltageSampler),
             cv.Optional(
                 CONF_SAMPLE_DURATION, default="200ms"
@@ -37,8 +38,9 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     sens = await cg.get_variable(config[CONF_SENSOR])
     cg.add(var.set_source(sens))

esphome/components/custom/binary_sensor/__init__.py

@@ -11,7 +11,7 @@ CONFIG_SCHEMA = cv.Schema(
         cv.GenerateID(): cv.declare_id(CustomBinarySensorConstructor),
         cv.Required(CONF_LAMBDA): cv.returning_lambda,
         cv.Required(CONF_BINARY_SENSORS): cv.ensure_list(
-            binary_sensor.binary_sensor_schema()
+            binary_sensor.BINARY_SENSOR_SCHEMA
         ),
     }
 )

esphome/components/dallas/dallas_component.cpp

@@ -32,11 +32,6 @@ void DallasComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up DallasComponent...");
 
   pin_->setup();
-
-  // clear bus with 480µs high, otherwise initial reset in search_vec() fails
-  pin_->pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
-  delayMicroseconds(480);
-
   one_wire_ = new ESPOneWire(pin_);  // NOLINT(cppcoreguidelines-owning-memory)
 
   std::vector<uint64_t> raw_sensors;
@@ -104,10 +99,14 @@ void DallasComponent::update() {
   this->status_clear_warning();
 
   bool result;
-  {
-    InterruptLock lock;
-    result = this->one_wire_->reset();
+  if (!this->one_wire_->reset()) {
+    result = false;
+  } else {
+    result = true;
+    this->one_wire_->skip();
+    this->one_wire_->write8(DALLAS_COMMAND_START_CONVERSION);
   }
+
   if (!result) {
     ESP_LOGE(TAG, "Requesting conversion failed");
     this->status_set_warning();
@@ -117,12 +116,6 @@ void DallasComponent::update() {
     return;
   }
 
-  {
-    InterruptLock lock;
-    this->one_wire_->skip();
-    this->one_wire_->write8(DALLAS_COMMAND_START_CONVERSION);
-  }
-
   for (auto *sensor : this->sensors_) {
     this->set_timeout(sensor->get_address_name(), sensor->millis_to_wait_for_conversion(), [this, sensor] {
       bool res = sensor->read_scratch_pad();
@@ -162,26 +155,16 @@ const std::string &DallasTemperatureSensor::get_address_name() {
 }
 bool IRAM_ATTR DallasTemperatureSensor::read_scratch_pad() {
   auto *wire = this->parent_->one_wire_;
-
-  {
-    InterruptLock lock;
-
-    if (!wire->reset()) {
-      return false;
-    }
+  if (!wire->reset()) {
+    return false;
   }
 
-  {
-    InterruptLock lock;
+  wire->select(this->address_);
+  wire->write8(DALLAS_COMMAND_READ_SCRATCH_PAD);
 
-    wire->select(this->address_);
-    wire->write8(DALLAS_COMMAND_READ_SCRATCH_PAD);
-
-    for (unsigned char &i : this->scratch_pad_) {
-      i = wire->read8();
-    }
+  for (unsigned char &i : this->scratch_pad_) {
+    i = wire->read8();
   }
-
   return true;
 }
 bool DallasTemperatureSensor::setup_sensor() {
@@ -220,20 +203,17 @@ bool DallasTemperatureSensor::setup_sensor() {
   }
 
   auto *wire = this->parent_->one_wire_;
-  {
-    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();
+  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);
   }
 
   delay(20);  // allow it to finish operation

esphome/components/dallas/esp_one_wire.cpp

@@ -15,6 +15,8 @@ ESPOneWire::ESPOneWire(InternalGPIOPin *pin) { pin_ = pin->to_isr(); }
 bool HOT IRAM_ATTR ESPOneWire::reset() {
   // See reset here:
   // https://www.maximintegrated.com/en/design/technical-documents/app-notes/1/126.html
+  InterruptLock lock;
+
   // Wait for communication to clear (delay G)
   pin_.pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
   uint8_t retries = 125;
@@ -41,18 +43,16 @@ bool HOT IRAM_ATTR ESPOneWire::reset() {
 }
 
 void HOT IRAM_ATTR ESPOneWire::write_bit(bool bit) {
+  // See write 1/0 bit here:
+  // https://www.maximintegrated.com/en/design/technical-documents/app-notes/1/126.html
+  InterruptLock lock;
+
   // drive bus low
   pin_.pin_mode(gpio::FLAG_OUTPUT);
   pin_.digital_write(false);
 
-  // from datasheet:
-  // write 0 low time: t_low0: min=60µs, max=120µs
-  // write 1 low time: t_low1: min=1µs, max=15µs
-  // time slot: t_slot: min=60µs, max=120µs
-  // recovery time: t_rec: min=1µs
-  // ds18b20 appears to read the bus after roughly 14µs
-  uint32_t delay0 = bit ? 6 : 60;
-  uint32_t delay1 = bit ? 54 : 5;
+  uint32_t delay0 = bit ? 10 : 65;
+  uint32_t delay1 = bit ? 55 : 5;
 
   // delay A/C
   delayMicroseconds(delay0);
@@ -63,100 +63,72 @@ void HOT IRAM_ATTR ESPOneWire::write_bit(bool bit) {
 }
 
 bool HOT IRAM_ATTR ESPOneWire::read_bit() {
-  // drive bus low
+  // See read bit here:
+  // https://www.maximintegrated.com/en/design/technical-documents/app-notes/1/126.html
+  InterruptLock lock;
+
+  // drive bus low, delay A
   pin_.pin_mode(gpio::FLAG_OUTPUT);
   pin_.digital_write(false);
-
-  // note: for reading we'll need very accurate timing, as the
-  // timing for the digital_read() is tight; according to the datasheet,
-  // we should read at the end of 16µs starting from the bus low
-  // typically, the ds18b20 pulls the line high after 11µs for a logical 1
-  // and 29µs for a logical 0
-
-  uint32_t start = micros();
-  // datasheet says >1µs
   delayMicroseconds(3);
 
   // release bus, delay E
   pin_.pin_mode(gpio::FLAG_INPUT | gpio::FLAG_PULLUP);
-
-  // Unfortunately some frameworks have different characteristics than others
-  // esp32 arduino appears to pull the bus low only after the digital_write(false),
-  // whereas on esp-idf it already happens during the pin_mode(OUTPUT)
-  // manually correct for this with these constants.
-
-#ifdef USE_ESP32_FRAMEWORK_ARDUINO
-  uint32_t timing_constant = 14;
-#elif defined(USE_ESP32_FRAMEWORK_ESP_IDF)
-  uint32_t timing_constant = 12;
-#else
-  uint32_t timing_constant = 14;
-#endif
-
-  // measure from start value directly, to get best accurate timing no matter
-  // how long pin_mode/delayMicroseconds took
-  while (micros() - start < timing_constant)
-    ;
+  delayMicroseconds(10);
 
   // sample bus to read bit from peer
   bool r = pin_.digital_read();
 
-  // read slot is at least 60µs; get as close to 60µs to spend less time with interrupts locked
-  uint32_t now = micros();
-  if (now - start < 60)
-    delayMicroseconds(60 - (now - start));
-
+  // delay F
+  delayMicroseconds(53);
   return r;
 }
 
-void IRAM_ATTR ESPOneWire::write8(uint8_t val) {
+void ESPOneWire::write8(uint8_t val) {
   for (uint8_t i = 0; i < 8; i++) {
     this->write_bit(bool((1u << i) & val));
   }
 }
 
-void IRAM_ATTR ESPOneWire::write64(uint64_t val) {
+void ESPOneWire::write64(uint64_t val) {
   for (uint8_t i = 0; i < 64; i++) {
     this->write_bit(bool((1ULL << i) & val));
   }
 }
 
-uint8_t IRAM_ATTR ESPOneWire::read8() {
+uint8_t 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 IRAM_ATTR ESPOneWire::read64() {
+uint64_t ESPOneWire::read64() {
   uint64_t ret = 0;
   for (uint8_t i = 0; i < 8; i++) {
     ret |= (uint64_t(this->read_bit()) << i);
   }
   return ret;
 }
-void IRAM_ATTR ESPOneWire::select(uint64_t address) {
+void ESPOneWire::select(uint64_t address) {
   this->write8(ONE_WIRE_ROM_SELECT);
   this->write64(address);
 }
-void IRAM_ATTR ESPOneWire::reset_search() {
+void ESPOneWire::reset_search() {
   this->last_discrepancy_ = 0;
   this->last_device_flag_ = false;
   this->last_family_discrepancy_ = 0;
   this->rom_number_ = 0;
 }
-uint64_t IRAM_ATTR ESPOneWire::search() {
+uint64_t ESPOneWire::search() {
   if (this->last_device_flag_) {
     return 0u;
   }
 
-  {
-    InterruptLock lock;
-    if (!this->reset()) {
-      // Reset failed or no devices present
-      this->reset_search();
-      return 0u;
-    }
+  if (!this->reset()) {
+    // Reset failed or no devices present
+    this->reset_search();
+    return 0u;
   }
 
   uint8_t id_bit_number = 1;
@@ -165,61 +137,58 @@ uint64_t IRAM_ATTR ESPOneWire::search() {
   bool search_result = false;
   uint8_t rom_byte_mask = 1;
 
-  {
-    InterruptLock lock;
-    // Initiate search
-    this->write8(ONE_WIRE_ROM_SEARCH);
-    do {
-      // read bit
-      bool id_bit = this->read_bit();
-      // read its complement
-      bool cmp_id_bit = this->read_bit();
+  // Initiate search
+  this->write8(ONE_WIRE_ROM_SEARCH);
+  do {
+    // read bit
+    bool id_bit = this->read_bit();
+    // read its complement
+    bool cmp_id_bit = this->read_bit();
 
-      if (id_bit && cmp_id_bit) {
-        // No devices participating in search
-        break;
+    if (id_bit && cmp_id_bit) {
+      // No devices participating in search
+      break;
+    }
+
+    bool branch;
+
+    if (id_bit != cmp_id_bit) {
+      // only chose one branch, the other one doesn't have any devices.
+      branch = id_bit;
+    } else {
+      // there are devices with both 0s and 1s at this bit
+      if (id_bit_number < this->last_discrepancy_) {
+        branch = (this->rom_number8_()[rom_byte_number] & rom_byte_mask) > 0;
+      } else {
+        branch = id_bit_number == this->last_discrepancy_;
       }
 
-      bool branch;
-
-      if (id_bit != cmp_id_bit) {
-        // only chose one branch, the other one doesn't have any devices.
-        branch = id_bit;
-      } else {
-        // there are devices with both 0s and 1s at this bit
-        if (id_bit_number < this->last_discrepancy_) {
-          branch = (this->rom_number8_()[rom_byte_number] & rom_byte_mask) > 0;
-        } else {
-          branch = id_bit_number == this->last_discrepancy_;
-        }
-
-        if (!branch) {
-          last_zero = id_bit_number;
-          if (last_zero < 9) {
-            this->last_discrepancy_ = last_zero;
-          }
+      if (!branch) {
+        last_zero = id_bit_number;
+        if (last_zero < 9) {
+          this->last_discrepancy_ = last_zero;
         }
       }
+    }
 
-      if (branch) {
-        // set bit
-        this->rom_number8_()[rom_byte_number] |= rom_byte_mask;
-      } else {
-        // clear bit
-        this->rom_number8_()[rom_byte_number] &= ~rom_byte_mask;
-      }
+    if (branch) {
+      // set bit
+      this->rom_number8_()[rom_byte_number] |= rom_byte_mask;
+    } else {
+      // clear bit
+      this->rom_number8_()[rom_byte_number] &= ~rom_byte_mask;
+    }
 
-      // choose/announce branch
-      this->write_bit(branch);
-      id_bit_number++;
-      rom_byte_mask <<= 1;
-      if (rom_byte_mask == 0u) {
-        // go to next byte
-        rom_byte_number++;
-        rom_byte_mask = 1;
-      }
-    } while (rom_byte_number < 8);  // loop through all bytes
-  }
+    // choose/announce branch
+    this->write_bit(branch);
+    id_bit_number++;
+    rom_byte_mask <<= 1;
+    if (rom_byte_mask == 0u) {
+      // go to next byte
+      rom_byte_number++;
+      rom_byte_mask = 1;
+    }
+  } while (rom_byte_number < 8);  // loop through all bytes
 
   if (id_bit_number >= 65) {
     this->last_discrepancy_ = last_zero;
@@ -248,7 +217,7 @@ std::vector<uint64_t> ESPOneWire::search_vec() {
 
   return res;
 }
-void IRAM_ATTR ESPOneWire::skip() {
+void ESPOneWire::skip() {
   this->write8(0xCC);  // skip ROM
 }
 

esphome/components/dallas/sensor.py

@@ -9,6 +9,7 @@ from esphome.const import (
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
+    CONF_ID,
 )
 from . import DallasComponent, dallas_ns
 
@@ -16,13 +17,13 @@ DallasTemperatureSensor = dallas_ns.class_("DallasTemperatureSensor", sensor.Sen
 
 CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
-        DallasTemperatureSensor,
         unit_of_measurement=UNIT_CELSIUS,
         accuracy_decimals=1,
         device_class=DEVICE_CLASS_TEMPERATURE,
         state_class=STATE_CLASS_MEASUREMENT,
     ).extend(
         {
+            cv.GenerateID(): cv.declare_id(DallasTemperatureSensor),
             cv.GenerateID(CONF_DALLAS_ID): cv.use_id(DallasComponent),
             cv.Optional(CONF_ADDRESS): cv.hex_int,
             cv.Optional(CONF_INDEX): cv.positive_int,
@@ -35,7 +36,7 @@ CONFIG_SCHEMA = cv.All(
 
 async def to_code(config):
     hub = await cg.get_variable(config[CONF_DALLAS_ID])
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
 
     if CONF_ADDRESS in config:
         cg.add(var.set_address(config[CONF_ADDRESS]))
@@ -48,3 +49,4 @@ async def to_code(config):
     cg.add(var.set_parent(hub))
 
     cg.add(hub.register_sensor(var))
+    await sensor.register_sensor(var, config)

esphome/components/daly_bms/binary_sensor.py

@@ -1,6 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
+from esphome.const import CONF_ID
 from . import DalyBmsComponent, CONF_BMS_DALY_ID
 
 CONF_CHARGING_MOS_ENABLED = "charging_mos_enabled"
@@ -17,10 +18,18 @@ CONFIG_SCHEMA = cv.All(
             cv.GenerateID(CONF_BMS_DALY_ID): cv.use_id(DalyBmsComponent),
             cv.Optional(
                 CONF_CHARGING_MOS_ENABLED
-            ): binary_sensor.binary_sensor_schema(),
+            ): binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+                {
+                    cv.GenerateID(): cv.declare_id(binary_sensor.BinarySensor),
+                }
+            ),
             cv.Optional(
                 CONF_DISCHARGING_MOS_ENABLED
-            ): binary_sensor.binary_sensor_schema(),
+            ): binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+                {
+                    cv.GenerateID(): cv.declare_id(binary_sensor.BinarySensor),
+                }
+            ),
         }
     ).extend(cv.COMPONENT_SCHEMA)
 )
@@ -29,8 +38,9 @@ CONFIG_SCHEMA = cv.All(
 async def setup_conf(config, key, hub):
     if key in config:
         conf = config[key]
-        var = await binary_sensor.new_binary_sensor(conf)
-        cg.add(getattr(hub, f"set_{key}_binary_sensor")(var))
+        sens = cg.new_Pvariable(conf[CONF_ID])
+        await binary_sensor.register_binary_sensor(sens, conf)
+        cg.add(getattr(hub, f"set_{key}_binary_sensor")(sens))
 
 
 async def to_code(config):

esphome/components/daly_bms/daly_bms.cpp

@@ -16,7 +16,6 @@ static const uint8_t DALY_REQUEST_MIN_MAX_VOLTAGE = 0x91;
 static const uint8_t DALY_REQUEST_MIN_MAX_TEMPERATURE = 0x92;
 static const uint8_t DALY_REQUEST_MOS = 0x93;
 static const uint8_t DALY_REQUEST_STATUS = 0x94;
-static const uint8_t DALY_REQUEST_CELL_VOLTAGE = 0x95;
 static const uint8_t DALY_REQUEST_TEMPERATURE = 0x96;
 
 void DalyBmsComponent::setup() {}
@@ -32,7 +31,6 @@ void DalyBmsComponent::update() {
   this->request_data_(DALY_REQUEST_MIN_MAX_TEMPERATURE);
   this->request_data_(DALY_REQUEST_MOS);
   this->request_data_(DALY_REQUEST_STATUS);
-  this->request_data_(DALY_REQUEST_CELL_VOLTAGE);
   this->request_data_(DALY_REQUEST_TEMPERATURE);
 
   std::vector<uint8_t> get_battery_level_data;
@@ -168,71 +166,6 @@ void DalyBmsComponent::decode_data_(std::vector<uint8_t> data) {
             }
             break;
 
-          case DALY_REQUEST_CELL_VOLTAGE:
-            switch (it[4]) {
-              case 1:
-                if (this->cell_1_voltage_) {
-                  this->cell_1_voltage_->publish_state((float) encode_uint16(it[5], it[6]) / 1000);
-                }
-                if (this->cell_2_voltage_) {
-                  this->cell_2_voltage_->publish_state((float) encode_uint16(it[7], it[8]) / 1000);
-                }
-                if (this->cell_3_voltage_) {
-                  this->cell_3_voltage_->publish_state((float) encode_uint16(it[9], it[10]) / 1000);
-                }
-                break;
-              case 2:
-                if (this->cell_4_voltage_) {
-                  this->cell_4_voltage_->publish_state((float) encode_uint16(it[5], it[6]) / 1000);
-                }
-                if (this->cell_5_voltage_) {
-                  this->cell_5_voltage_->publish_state((float) encode_uint16(it[7], it[8]) / 1000);
-                }
-                if (this->cell_6_voltage_) {
-                  this->cell_6_voltage_->publish_state((float) encode_uint16(it[9], it[10]) / 1000);
-                }
-                break;
-              case 3:
-                if (this->cell_7_voltage_) {
-                  this->cell_7_voltage_->publish_state((float) encode_uint16(it[5], it[6]) / 1000);
-                }
-                if (this->cell_8_voltage_) {
-                  this->cell_8_voltage_->publish_state((float) encode_uint16(it[7], it[8]) / 1000);
-                }
-                if (this->cell_9_voltage_) {
-                  this->cell_9_voltage_->publish_state((float) encode_uint16(it[9], it[10]) / 1000);
-                }
-                break;
-              case 4:
-                if (this->cell_10_voltage_) {
-                  this->cell_10_voltage_->publish_state((float) encode_uint16(it[5], it[6]) / 1000);
-                }
-                if (this->cell_11_voltage_) {
-                  this->cell_11_voltage_->publish_state((float) encode_uint16(it[7], it[8]) / 1000);
-                }
-                if (this->cell_12_voltage_) {
-                  this->cell_12_voltage_->publish_state((float) encode_uint16(it[9], it[10]) / 1000);
-                }
-                break;
-              case 5:
-                if (this->cell_13_voltage_) {
-                  this->cell_13_voltage_->publish_state((float) encode_uint16(it[5], it[6]) / 1000);
-                }
-                if (this->cell_14_voltage_) {
-                  this->cell_14_voltage_->publish_state((float) encode_uint16(it[7], it[8]) / 1000);
-                }
-                if (this->cell_15_voltage_) {
-                  this->cell_15_voltage_->publish_state((float) encode_uint16(it[9], it[10]) / 1000);
-                }
-                break;
-              case 6:
-                if (this->cell_16_voltage_) {
-                  this->cell_16_voltage_->publish_state((float) encode_uint16(it[5], it[6]) / 1000);
-                }
-                break;
-            }
-            break;
-
           default:
             break;
         }

esphome/components/daly_bms/daly_bms.h

@@ -37,23 +37,6 @@ class DalyBmsComponent : public PollingComponent, public uart::UARTDevice {
   void set_cells_number_sensor(sensor::Sensor *cells_number) { cells_number_ = cells_number; }
   void set_temperature_1_sensor(sensor::Sensor *temperature_1_sensor) { temperature_1_sensor_ = temperature_1_sensor; }
   void set_temperature_2_sensor(sensor::Sensor *temperature_2_sensor) { temperature_2_sensor_ = temperature_2_sensor; }
-  void set_cell_1_voltage_sensor(sensor::Sensor *cell_1_voltage) { cell_1_voltage_ = cell_1_voltage; }
-  void set_cell_2_voltage_sensor(sensor::Sensor *cell_2_voltage) { cell_2_voltage_ = cell_2_voltage; }
-  void set_cell_3_voltage_sensor(sensor::Sensor *cell_3_voltage) { cell_3_voltage_ = cell_3_voltage; }
-  void set_cell_4_voltage_sensor(sensor::Sensor *cell_4_voltage) { cell_4_voltage_ = cell_4_voltage; }
-  void set_cell_5_voltage_sensor(sensor::Sensor *cell_5_voltage) { cell_5_voltage_ = cell_5_voltage; }
-  void set_cell_6_voltage_sensor(sensor::Sensor *cell_6_voltage) { cell_6_voltage_ = cell_6_voltage; }
-  void set_cell_7_voltage_sensor(sensor::Sensor *cell_7_voltage) { cell_7_voltage_ = cell_7_voltage; }
-  void set_cell_8_voltage_sensor(sensor::Sensor *cell_8_voltage) { cell_8_voltage_ = cell_8_voltage; }
-  void set_cell_9_voltage_sensor(sensor::Sensor *cell_9_voltage) { cell_9_voltage_ = cell_9_voltage; }
-  void set_cell_10_voltage_sensor(sensor::Sensor *cell_10_voltage) { cell_10_voltage_ = cell_10_voltage; }
-  void set_cell_11_voltage_sensor(sensor::Sensor *cell_11_voltage) { cell_11_voltage_ = cell_11_voltage; }
-  void set_cell_12_voltage_sensor(sensor::Sensor *cell_12_voltage) { cell_12_voltage_ = cell_12_voltage; }
-  void set_cell_13_voltage_sensor(sensor::Sensor *cell_13_voltage) { cell_13_voltage_ = cell_13_voltage; }
-  void set_cell_14_voltage_sensor(sensor::Sensor *cell_14_voltage) { cell_14_voltage_ = cell_14_voltage; }
-  void set_cell_15_voltage_sensor(sensor::Sensor *cell_15_voltage) { cell_15_voltage_ = cell_15_voltage; }
-  void set_cell_16_voltage_sensor(sensor::Sensor *cell_16_voltage) { cell_16_voltage_ = cell_16_voltage; }
-
   // TEXT_SENSORS
   void set_status_text_sensor(text_sensor::TextSensor *status_text_sensor) { status_text_sensor_ = status_text_sensor; }
   // BINARY_SENSORS
@@ -89,22 +72,6 @@ class DalyBmsComponent : public PollingComponent, public uart::UARTDevice {
   sensor::Sensor *cells_number_{nullptr};
   sensor::Sensor *temperature_1_sensor_{nullptr};
   sensor::Sensor *temperature_2_sensor_{nullptr};
-  sensor::Sensor *cell_1_voltage_{nullptr};
-  sensor::Sensor *cell_2_voltage_{nullptr};
-  sensor::Sensor *cell_3_voltage_{nullptr};
-  sensor::Sensor *cell_4_voltage_{nullptr};
-  sensor::Sensor *cell_5_voltage_{nullptr};
-  sensor::Sensor *cell_6_voltage_{nullptr};
-  sensor::Sensor *cell_7_voltage_{nullptr};
-  sensor::Sensor *cell_8_voltage_{nullptr};
-  sensor::Sensor *cell_9_voltage_{nullptr};
-  sensor::Sensor *cell_10_voltage_{nullptr};
-  sensor::Sensor *cell_11_voltage_{nullptr};
-  sensor::Sensor *cell_12_voltage_{nullptr};
-  sensor::Sensor *cell_13_voltage_{nullptr};
-  sensor::Sensor *cell_14_voltage_{nullptr};
-  sensor::Sensor *cell_15_voltage_{nullptr};
-  sensor::Sensor *cell_16_voltage_{nullptr};
 
   text_sensor::TextSensor *status_text_sensor_{nullptr};
 

esphome/components/daly_bms/sensor.py

@@ -11,11 +11,14 @@ from esphome.const import (
     DEVICE_CLASS_CURRENT,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_EMPTY,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_NONE,
     UNIT_VOLT,
     UNIT_AMPERE,
     UNIT_PERCENT,
     UNIT_CELSIUS,
+    UNIT_EMPTY,
     ICON_FLASH,
     ICON_PERCENT,
     ICON_COUNTER,
@@ -36,22 +39,6 @@ CONF_REMAINING_CAPACITY = "remaining_capacity"
 CONF_TEMPERATURE_1 = "temperature_1"
 CONF_TEMPERATURE_2 = "temperature_2"
 
-CONF_CELL_1_VOLTAGE = "cell_1_voltage"
-CONF_CELL_2_VOLTAGE = "cell_2_voltage"
-CONF_CELL_3_VOLTAGE = "cell_3_voltage"
-CONF_CELL_4_VOLTAGE = "cell_4_voltage"
-CONF_CELL_5_VOLTAGE = "cell_5_voltage"
-CONF_CELL_6_VOLTAGE = "cell_6_voltage"
-CONF_CELL_7_VOLTAGE = "cell_7_voltage"
-CONF_CELL_8_VOLTAGE = "cell_8_voltage"
-CONF_CELL_9_VOLTAGE = "cell_9_voltage"
-CONF_CELL_10_VOLTAGE = "cell_10_voltage"
-CONF_CELL_11_VOLTAGE = "cell_11_voltage"
-CONF_CELL_12_VOLTAGE = "cell_12_voltage"
-CONF_CELL_13_VOLTAGE = "cell_13_voltage"
-CONF_CELL_14_VOLTAGE = "cell_14_voltage"
-CONF_CELL_15_VOLTAGE = "cell_15_voltage"
-CONF_CELL_16_VOLTAGE = "cell_16_voltage"
 ICON_CURRENT_DC = "mdi:current-dc"
 ICON_BATTERY_OUTLINE = "mdi:battery-outline"
 ICON_THERMOMETER_CHEVRON_UP = "mdi:thermometer-chevron-up"
@@ -76,140 +63,117 @@ TYPES = [
     CONF_REMAINING_CAPACITY,
     CONF_TEMPERATURE_1,
     CONF_TEMPERATURE_2,
-    CONF_CELL_1_VOLTAGE,
-    CONF_CELL_2_VOLTAGE,
-    CONF_CELL_3_VOLTAGE,
-    CONF_CELL_4_VOLTAGE,
-    CONF_CELL_5_VOLTAGE,
-    CONF_CELL_6_VOLTAGE,
-    CONF_CELL_7_VOLTAGE,
-    CONF_CELL_8_VOLTAGE,
-    CONF_CELL_9_VOLTAGE,
-    CONF_CELL_10_VOLTAGE,
-    CONF_CELL_11_VOLTAGE,
-    CONF_CELL_12_VOLTAGE,
-    CONF_CELL_13_VOLTAGE,
-    CONF_CELL_14_VOLTAGE,
-    CONF_CELL_15_VOLTAGE,
-    CONF_CELL_16_VOLTAGE,
 ]
 
-CELL_VOLTAGE_SCHEMA = sensor.sensor_schema(
-    unit_of_measurement=UNIT_VOLT,
-    device_class=DEVICE_CLASS_VOLTAGE,
-    state_class=STATE_CLASS_MEASUREMENT,
-)
-
 CONFIG_SCHEMA = cv.All(
     cv.Schema(
         {
             cv.GenerateID(CONF_BMS_DALY_ID): cv.use_id(DalyBmsComponent),
             cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                icon=ICON_FLASH,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_VOLT,
+                ICON_FLASH,
+                1,
+                DEVICE_CLASS_VOLTAGE,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                icon=ICON_CURRENT_DC,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_AMPERE,
+                ICON_CURRENT_DC,
+                1,
+                DEVICE_CLASS_CURRENT,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(
-                unit_of_measurement=UNIT_PERCENT,
-                icon=ICON_PERCENT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_BATTERY,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_PERCENT,
+                ICON_PERCENT,
+                1,
+                DEVICE_CLASS_BATTERY,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_MAX_CELL_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                icon=ICON_FLASH,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_VOLT,
+                ICON_FLASH,
+                2,
+                DEVICE_CLASS_VOLTAGE,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_MAX_CELL_VOLTAGE_NUMBER): sensor.sensor_schema(
-                icon=ICON_COUNTER,
-                accuracy_decimals=0,
+                UNIT_EMPTY,
+                ICON_COUNTER,
+                0,
+                DEVICE_CLASS_EMPTY,
+                STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_MIN_CELL_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                icon=ICON_FLASH,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_VOLT,
+                ICON_FLASH,
+                2,
+                DEVICE_CLASS_VOLTAGE,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_MIN_CELL_VOLTAGE_NUMBER): sensor.sensor_schema(
-                icon=ICON_COUNTER,
-                accuracy_decimals=0,
+                UNIT_EMPTY,
+                ICON_COUNTER,
+                0,
+                DEVICE_CLASS_EMPTY,
+                STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_MAX_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                icon=ICON_THERMOMETER_CHEVRON_UP,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_CELSIUS,
+                ICON_THERMOMETER_CHEVRON_UP,
+                0,
+                DEVICE_CLASS_TEMPERATURE,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_MAX_TEMPERATURE_PROBE_NUMBER): sensor.sensor_schema(
-                icon=ICON_COUNTER,
-                accuracy_decimals=0,
+                UNIT_EMPTY,
+                ICON_COUNTER,
+                0,
+                DEVICE_CLASS_EMPTY,
+                STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_MIN_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                icon=ICON_THERMOMETER_CHEVRON_DOWN,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_CELSIUS,
+                ICON_THERMOMETER_CHEVRON_DOWN,
+                0,
+                DEVICE_CLASS_TEMPERATURE,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_MIN_TEMPERATURE_PROBE_NUMBER): sensor.sensor_schema(
-                icon=ICON_COUNTER,
-                accuracy_decimals=0,
+                UNIT_EMPTY,
+                ICON_COUNTER,
+                0,
+                DEVICE_CLASS_EMPTY,
+                STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_REMAINING_CAPACITY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE_HOUR,
-                icon=ICON_GAUGE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_AMPERE_HOUR,
+                ICON_GAUGE,
+                2,
+                DEVICE_CLASS_VOLTAGE,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_CELLS_NUMBER): sensor.sensor_schema(
-                icon=ICON_COUNTER,
-                accuracy_decimals=0,
+                UNIT_EMPTY,
+                ICON_COUNTER,
+                0,
+                DEVICE_CLASS_EMPTY,
+                STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_TEMPERATURE_1): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                icon=ICON_THERMOMETER,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_CELSIUS,
+                ICON_THERMOMETER,
+                0,
+                DEVICE_CLASS_TEMPERATURE,
+                STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_TEMPERATURE_2): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                icon=ICON_THERMOMETER,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
+                UNIT_CELSIUS,
+                ICON_THERMOMETER,
+                0,
+                DEVICE_CLASS_TEMPERATURE,
+                STATE_CLASS_MEASUREMENT,
             ),
-            cv.Optional(CONF_CELL_1_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_2_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_3_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_4_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_5_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_6_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_7_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_8_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_9_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_10_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_11_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_12_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_13_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_14_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_15_VOLTAGE): CELL_VOLTAGE_SCHEMA,
-            cv.Optional(CONF_CELL_16_VOLTAGE): CELL_VOLTAGE_SCHEMA,
         }
     ).extend(cv.COMPONENT_SCHEMA)
 )

esphome/components/demo/__init__.py

@@ -132,8 +132,12 @@ CONFIG_SCHEMA = cv.Schema(
                 },
             ],
         ): [
-            binary_sensor.binary_sensor_schema(DemoBinarySensor).extend(
+            binary_sensor.BINARY_SENSOR_SCHEMA.extend(
                 cv.polling_component_schema("60s")
+            ).extend(
+                {
+                    cv.GenerateID(): cv.declare_id(DemoBinarySensor),
+                }
             )
         ],
         cv.Optional(
@@ -333,8 +337,12 @@ CONFIG_SCHEMA = cv.Schema(
                 },
             ],
         ): [
-            sensor.sensor_schema(DemoSensor, accuracy_decimals=0).extend(
-                cv.polling_component_schema("60s")
+            sensor.sensor_schema(accuracy_decimals=0)
+            .extend(cv.polling_component_schema("60s"))
+            .extend(
+                {
+                    cv.GenerateID(): cv.declare_id(DemoSensor),
+                }
             )
         ],
         cv.Optional(
@@ -368,7 +376,7 @@ CONFIG_SCHEMA = cv.Schema(
                 },
             ],
         ): [
-            text_sensor.text_sensor_schema(DemoTextSensor).extend(
+            text_sensor.text_sensor_schema(klass=DemoTextSensor).extend(
                 cv.polling_component_schema("60s")
             )
         ],
@@ -378,8 +386,9 @@ CONFIG_SCHEMA = cv.Schema(
 
 async def to_code(config):
     for conf in config[CONF_BINARY_SENSORS]:
-        var = await binary_sensor.new_binary_sensor(conf)
+        var = cg.new_Pvariable(conf[CONF_ID])
         await cg.register_component(var, conf)
+        await binary_sensor.register_binary_sensor(var, conf)
 
     for conf in config[CONF_CLIMATES]:
         var = cg.new_Pvariable(conf[CONF_ID])
@@ -418,8 +427,9 @@ async def to_code(config):
         cg.add(var.set_type(conf[CONF_TYPE]))
 
     for conf in config[CONF_SENSORS]:
-        var = await sensor.new_sensor(conf)
+        var = cg.new_Pvariable(conf[CONF_ID])
         await cg.register_component(var, conf)
+        await sensor.register_sensor(var, conf)
 
     for conf in config[CONF_SWITCHES]:
         var = cg.new_Pvariable(conf[CONF_ID])

esphome/components/dsmr/sensor.py

@@ -2,16 +2,19 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor
 from esphome.const import (
-    CONF_ID,
     DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_GAS,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
+    ICON_EMPTY,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_NONE,
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_AMPERE,
     UNIT_CUBIC_METER,
+    UNIT_EMPTY,
     UNIT_KILOWATT,
     UNIT_KILOWATT_HOURS,
     UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
@@ -27,214 +30,202 @@ CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(CONF_DSMR_ID): cv.use_id(Dsmr),
         cv.Optional("energy_delivered_lux"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT_HOURS,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_ENERGY,
-            state_class=STATE_CLASS_TOTAL_INCREASING,
+            UNIT_KILOWATT_HOURS,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_ENERGY,
+            STATE_CLASS_TOTAL_INCREASING,
         ),
         cv.Optional("energy_delivered_tariff1"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT_HOURS,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_ENERGY,
-            state_class=STATE_CLASS_TOTAL_INCREASING,
+            UNIT_KILOWATT_HOURS,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_ENERGY,
+            STATE_CLASS_TOTAL_INCREASING,
         ),
         cv.Optional("energy_delivered_tariff2"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT_HOURS,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_ENERGY,
-            state_class=STATE_CLASS_TOTAL_INCREASING,
+            UNIT_KILOWATT_HOURS,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_ENERGY,
+            STATE_CLASS_TOTAL_INCREASING,
         ),
         cv.Optional("energy_returned_lux"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT_HOURS,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_ENERGY,
-            state_class=STATE_CLASS_TOTAL_INCREASING,
+            UNIT_KILOWATT_HOURS,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_ENERGY,
+            STATE_CLASS_TOTAL_INCREASING,
         ),
         cv.Optional("energy_returned_tariff1"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT_HOURS,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_ENERGY,
-            state_class=STATE_CLASS_TOTAL_INCREASING,
+            UNIT_KILOWATT_HOURS,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_ENERGY,
+            STATE_CLASS_TOTAL_INCREASING,
         ),
         cv.Optional("energy_returned_tariff2"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT_HOURS,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_ENERGY,
-            state_class=STATE_CLASS_TOTAL_INCREASING,
+            UNIT_KILOWATT_HOURS,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_ENERGY,
+            STATE_CLASS_TOTAL_INCREASING,
         ),
         cv.Optional("total_imported_energy"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
-            accuracy_decimals=3,
+            UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_EMPTY,
+            STATE_CLASS_NONE,
         ),
         cv.Optional("total_exported_energy"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
-            accuracy_decimals=3,
+            UNIT_KILOVOLT_AMPS_REACTIVE_HOURS,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_EMPTY,
+            STATE_CLASS_NONE,
         ),
         cv.Optional("power_delivered"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOWATT, ICON_EMPTY, 3, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("power_returned"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOWATT, ICON_EMPTY, 3, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("reactive_power_delivered"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE,
-            accuracy_decimals=3,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOVOLT_AMPS_REACTIVE,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_POWER,
+            STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_returned"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE,
-            accuracy_decimals=3,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOVOLT_AMPS_REACTIVE,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_POWER,
+            STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("electricity_threshold"): sensor.sensor_schema(
-            accuracy_decimals=3,
+            UNIT_EMPTY, ICON_EMPTY, 3, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("electricity_switch_position"): sensor.sensor_schema(
-            accuracy_decimals=3,
+            UNIT_EMPTY, ICON_EMPTY, 3, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("electricity_failures"): sensor.sensor_schema(
-            accuracy_decimals=0,
+            UNIT_EMPTY, ICON_EMPTY, 0, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("electricity_long_failures"): sensor.sensor_schema(
-            accuracy_decimals=0,
+            UNIT_EMPTY, ICON_EMPTY, 0, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("electricity_sags_l1"): sensor.sensor_schema(
-            accuracy_decimals=0,
+            UNIT_EMPTY, ICON_EMPTY, 0, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("electricity_sags_l2"): sensor.sensor_schema(
-            accuracy_decimals=0,
+            UNIT_EMPTY, ICON_EMPTY, 0, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("electricity_sags_l3"): sensor.sensor_schema(
-            accuracy_decimals=0,
+            UNIT_EMPTY, ICON_EMPTY, 0, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("electricity_swells_l1"): sensor.sensor_schema(
-            accuracy_decimals=0,
+            UNIT_EMPTY, ICON_EMPTY, 0, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("electricity_swells_l2"): sensor.sensor_schema(
-            accuracy_decimals=0,
+            UNIT_EMPTY, ICON_EMPTY, 0, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("electricity_swells_l3"): sensor.sensor_schema(
-            accuracy_decimals=0,
+            UNIT_EMPTY, ICON_EMPTY, 0, DEVICE_CLASS_EMPTY, STATE_CLASS_NONE
         ),
         cv.Optional("current_l1"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_AMPERE,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("current_l2"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_AMPERE,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("current_l3"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_AMPERE,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("power_delivered_l1"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOWATT, ICON_EMPTY, 3, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("power_delivered_l2"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOWATT, ICON_EMPTY, 3, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("power_delivered_l3"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOWATT, ICON_EMPTY, 3, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("power_returned_l1"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOWATT, ICON_EMPTY, 3, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("power_returned_l2"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOWATT, ICON_EMPTY, 3, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("power_returned_l3"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOWATT,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOWATT, ICON_EMPTY, 3, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
         ),
         cv.Optional("reactive_power_delivered_l1"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE,
-            accuracy_decimals=3,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOVOLT_AMPS_REACTIVE,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_EMPTY,
+            STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_delivered_l2"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE,
-            accuracy_decimals=3,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOVOLT_AMPS_REACTIVE,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_EMPTY,
+            STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_delivered_l3"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE,
-            accuracy_decimals=3,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOVOLT_AMPS_REACTIVE,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_EMPTY,
+            STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_returned_l1"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE,
-            accuracy_decimals=3,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOVOLT_AMPS_REACTIVE,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_EMPTY,
+            STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_returned_l2"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE,
-            accuracy_decimals=3,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOVOLT_AMPS_REACTIVE,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_EMPTY,
+            STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("reactive_power_returned_l3"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_KILOVOLT_AMPS_REACTIVE,
-            accuracy_decimals=3,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_KILOVOLT_AMPS_REACTIVE,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_EMPTY,
+            STATE_CLASS_MEASUREMENT,
         ),
         cv.Optional("voltage_l1"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_VOLTAGE,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE, STATE_CLASS_NONE
         ),
         cv.Optional("voltage_l2"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_VOLTAGE,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE, STATE_CLASS_NONE
         ),
         cv.Optional("voltage_l3"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_VOLTAGE,
-            state_class=STATE_CLASS_MEASUREMENT,
+            UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE, STATE_CLASS_NONE
         ),
         cv.Optional("gas_delivered"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_CUBIC_METER,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_GAS,
-            state_class=STATE_CLASS_TOTAL_INCREASING,
+            UNIT_CUBIC_METER,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_GAS,
+            STATE_CLASS_TOTAL_INCREASING,
         ),
         cv.Optional("gas_delivered_be"): sensor.sensor_schema(
-            unit_of_measurement=UNIT_CUBIC_METER,
-            accuracy_decimals=3,
-            device_class=DEVICE_CLASS_GAS,
-            state_class=STATE_CLASS_TOTAL_INCREASING,
+            UNIT_CUBIC_METER,
+            ICON_EMPTY,
+            3,
+            DEVICE_CLASS_GAS,
+            STATE_CLASS_TOTAL_INCREASING,
         ),
     }
 ).extend(cv.COMPONENT_SCHEMA)
@@ -247,10 +238,10 @@ async def to_code(config):
     for key, conf in config.items():
         if not isinstance(conf, dict):
             continue
-        id = conf[CONF_ID]
+        id = conf.get("id")
         if id and id.type == sensor.Sensor:
-            sens = await sensor.new_sensor(conf)
-            cg.add(getattr(hub, f"set_{key}")(sens))
+            s = await sensor.new_sensor(conf)
+            cg.add(getattr(hub, f"set_{key}")(s))
             sensors.append(f"F({key})")
 
     if sensors:

esphome/components/duty_cycle/sensor.py

@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome import pins
 from esphome.components import sensor
 from esphome.const import (
+    CONF_ID,
     CONF_PIN,
     STATE_CLASS_MEASUREMENT,
     UNIT_PERCENT,
@@ -16,20 +17,25 @@ DutyCycleSensor = duty_cycle_ns.class_(
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        DutyCycleSensor,
         unit_of_measurement=UNIT_PERCENT,
         icon=ICON_PERCENT,
         accuracy_decimals=1,
         state_class=STATE_CLASS_MEASUREMENT,
     )
-    .extend({cv.Required(CONF_PIN): cv.All(pins.internal_gpio_input_pin_schema)})
+    .extend(
+        {
+            cv.GenerateID(): cv.declare_id(DutyCycleSensor),
+            cv.Required(CONF_PIN): cv.All(pins.internal_gpio_input_pin_schema),
+        }
+    )
     .extend(cv.polling_component_schema("60s"))
 )
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))

esphome/components/esp32/__init__.py

@@ -61,30 +61,12 @@ def set_core_data(config):
     return config
 
 
-def get_esp32_variant(core_obj=None):
-    return (core_obj or CORE).data[KEY_ESP32][KEY_VARIANT]
+def get_esp32_variant():
+    return CORE.data[KEY_ESP32][KEY_VARIANT]
 
 
-def only_on_variant(*, supported=None, unsupported=None):
-    """Config validator for features only available on some ESP32 variants."""
-    if supported is not None and not isinstance(supported, list):
-        supported = [supported]
-    if unsupported is not None and not isinstance(unsupported, list):
-        unsupported = [unsupported]
-
-    def validator_(obj):
-        variant = get_esp32_variant()
-        if supported is not None and variant not in supported:
-            raise cv.Invalid(
-                f"This feature is only available on {', '.join(supported)}"
-            )
-        if unsupported is not None and variant in unsupported:
-            raise cv.Invalid(
-                f"This feature is not available on {', '.join(unsupported)}"
-            )
-        return obj
-
-    return validator_
+def is_esp32c3():
+    return get_esp32_variant() == VARIANT_ESP32C3
 
 
 @dataclass

esphome/components/esp32_hall/sensor.py

@@ -2,6 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor
 from esphome.const import (
+    CONF_ID,
     STATE_CLASS_MEASUREMENT,
     UNIT_MICROTESLA,
     ICON_MAGNET,
@@ -14,15 +15,23 @@ ESP32HallSensor = esp32_hall_ns.class_(
     "ESP32HallSensor", sensor.Sensor, cg.PollingComponent
 )
 
-CONFIG_SCHEMA = sensor.sensor_schema(
-    ESP32HallSensor,
-    unit_of_measurement=UNIT_MICROTESLA,
-    icon=ICON_MAGNET,
-    accuracy_decimals=1,
-    state_class=STATE_CLASS_MEASUREMENT,
-).extend(cv.polling_component_schema("60s"))
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(
+        unit_of_measurement=UNIT_MICROTESLA,
+        icon=ICON_MAGNET,
+        accuracy_decimals=1,
+        state_class=STATE_CLASS_MEASUREMENT,
+    )
+    .extend(
+        {
+            cv.GenerateID(): cv.declare_id(ESP32HallSensor),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+)
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)

esphome/components/esp32_touch/binary_sensor.py

@@ -39,8 +39,9 @@ ESP32TouchBinarySensor = esp32_touch_ns.class_(
     "ESP32TouchBinarySensor", binary_sensor.BinarySensor
 )
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(ESP32TouchBinarySensor).extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
+        cv.GenerateID(): cv.declare_id(ESP32TouchBinarySensor),
         cv.GenerateID(CONF_ESP32_TOUCH_ID): cv.use_id(ESP32TouchComponent),
         cv.Required(CONF_PIN): validate_touch_pad,
         cv.Required(CONF_THRESHOLD): cv.uint16_t,

esphome/components/esp8266/__init__.py

@@ -17,16 +17,11 @@ import esphome.config_validation as cv
 import esphome.codegen as cg
 from esphome.helpers import copy_file_if_changed
 
-from .const import (
-    CONF_RESTORE_FROM_FLASH,
-    KEY_BOARD,
-    KEY_ESP8266,
-    KEY_PIN_INITIAL_STATES,
-    esp8266_ns,
-)
+from .const import CONF_RESTORE_FROM_FLASH, KEY_BOARD, KEY_ESP8266, esp8266_ns
 from .boards import ESP8266_FLASH_SIZES, ESP8266_LD_SCRIPTS
 
-from .gpio import PinInitialState, add_pin_initial_states_array
+# force import gpio to register pin schema
+from .gpio import esp8266_pin_to_code  # noqa
 
 
 CODEOWNERS = ["@esphome/core"]
@@ -42,9 +37,6 @@ def set_core_data(config):
         config[CONF_FRAMEWORK][CONF_VERSION]
     )
     CORE.data[KEY_ESP8266][KEY_BOARD] = config[CONF_BOARD]
-    CORE.data[KEY_ESP8266][KEY_PIN_INITIAL_STATES] = [
-        PinInitialState() for _ in range(16)
-    ]
     return config
 
 
@@ -229,8 +221,6 @@ async def to_code(config):
         if ld_script is not None:
             cg.add_platformio_option("board_build.ldscript", ld_script)
 
-    CORE.add_job(add_pin_initial_states_array)
-
 
 # Called by writer.py
 def copy_files():

esphome/components/esp8266/const.py

@@ -2,7 +2,6 @@ import esphome.codegen as cg
 
 KEY_ESP8266 = "esp8266"
 KEY_BOARD = "board"
-KEY_PIN_INITIAL_STATES = "pin_initial_states"
 CONF_RESTORE_FROM_FLASH = "restore_from_flash"
 
 # esp8266 namespace is already defined by arduino, manually prefix esphome

esphome/components/esp8266/core.cpp

@@ -1,6 +1,5 @@
 #ifdef USE_ESP8266
 
-#include "core.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "preferences.h"
@@ -54,15 +53,6 @@ extern "C" void resetPins() {  // NOLINT
   // however, not strictly needed as we set up the pins properly
   // ourselves and this causes pins to toggle during reboot.
   force_link_symbols();
-
-  for (int i = 0; i < 16; i++) {
-    uint8_t mode = ESPHOME_ESP8266_GPIO_INITIAL_MODE[i];
-    uint8_t level = ESPHOME_ESP8266_GPIO_INITIAL_LEVEL[i];
-    if (mode != 255)
-      pinMode(i, mode);  // NOLINT
-    if (level != 255)
-      digitalWrite(i, level);  // NOLINT
-  }
 }
 
 }  // namespace esphome

esphome/components/esp8266/core.h

@@ -1,14 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP8266
-
-#include <cstdint>
-
-extern const uint8_t ESPHOME_ESP8266_GPIO_INITIAL_MODE[16];
-extern const uint8_t ESPHOME_ESP8266_GPIO_INITIAL_LEVEL[16];
-
-namespace esphome {
-namespace esp8266 {}  // namespace esp8266
-}  // namespace esphome
-
-#endif  // USE_ESP8266

esphome/components/esp8266/gpio.py

@@ -1,6 +1,4 @@
 import logging
-from dataclasses import dataclass
-from typing import List
 
 from esphome.const import (
     CONF_ID,
@@ -14,12 +12,12 @@ from esphome.const import (
     CONF_PULLUP,
 )
 from esphome import pins
-from esphome.core import CORE, coroutine_with_priority
+from esphome.core import CORE
 import esphome.config_validation as cv
 import esphome.codegen as cg
 
 from . import boards
-from .const import KEY_BOARD, KEY_ESP8266, KEY_PIN_INITIAL_STATES, esp8266_ns
+from .const import KEY_BOARD, KEY_ESP8266, esp8266_ns
 
 
 _LOGGER = logging.getLogger(__name__)
@@ -162,57 +160,11 @@ ESP8266_PIN_SCHEMA = cv.All(
 )
 
 
-@dataclass
-class PinInitialState:
-    mode = 255
-    level: int = 255
-
-
 @pins.PIN_SCHEMA_REGISTRY.register("esp8266", ESP8266_PIN_SCHEMA)
 async def esp8266_pin_to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     num = config[CONF_NUMBER]
-    mode = config[CONF_MODE]
     cg.add(var.set_pin(num))
     cg.add(var.set_inverted(config[CONF_INVERTED]))
-    cg.add(var.set_flags(pins.gpio_flags_expr(mode)))
-    if num < 16:
-        initial_state: PinInitialState = CORE.data[KEY_ESP8266][KEY_PIN_INITIAL_STATES][
-            num
-        ]
-        if mode[CONF_INPUT]:
-            if mode[CONF_PULLDOWN]:
-                initial_state.mode = cg.global_ns.INPUT_PULLDOWN_16
-            elif mode[CONF_PULLUP]:
-                initial_state.mode = cg.global_ns.INPUT_PULLUP
-            else:
-                initial_state.mode = cg.global_ns.INPUT
-        elif mode[CONF_OUTPUT]:
-            if mode[CONF_OPEN_DRAIN]:
-                initial_state.mode = cg.global_ns.OUTPUT_OPEN_DRAIN
-            else:
-                initial_state.mode = cg.global_ns.OUTPUT
-            initial_state.level = int(config[CONF_INVERTED])
-
+    cg.add(var.set_flags(pins.gpio_flags_expr(config[CONF_MODE])))
     return var
-
-
-@coroutine_with_priority(-999.0)
-async def add_pin_initial_states_array():
-    # Add includes at the very end, so that they override everything
-    initial_states: List[PinInitialState] = CORE.data[KEY_ESP8266][
-        KEY_PIN_INITIAL_STATES
-    ]
-    initial_modes_s = ", ".join(str(x.mode) for x in initial_states)
-    initial_levels_s = ", ".join(str(x.level) for x in initial_states)
-
-    cg.add_global(
-        cg.RawExpression(
-            f"const uint8_t ESPHOME_ESP8266_GPIO_INITIAL_MODE[16] = {{{initial_modes_s}}}"
-        )
-    )
-    cg.add_global(
-        cg.RawExpression(
-            f"const uint8_t ESPHOME_ESP8266_GPIO_INITIAL_LEVEL[16] = {{{initial_levels_s}}}"
-        )
-    )

esphome/components/fingerprint_grow/binary_sensor.py

@@ -6,7 +6,7 @@ from . import CONF_FINGERPRINT_GROW_ID, FingerprintGrowComponent
 
 DEPENDENCIES = ["fingerprint_grow"]
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema().extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
         cv.GenerateID(CONF_FINGERPRINT_GROW_ID): cv.use_id(FingerprintGrowComponent),
         cv.Optional(CONF_ICON, default=ICON_KEY_PLUS): cv.icon,

esphome/components/fingerprint_grow/sensor.py

@@ -14,6 +14,7 @@ from esphome.const import (
     ICON_DATABASE,
     ICON_FINGERPRINT,
     ICON_SECURITY,
+    STATE_CLASS_NONE,
 )
 from . import CONF_FINGERPRINT_GROW_ID, FingerprintGrowComponent
 
@@ -25,30 +26,36 @@ CONFIG_SCHEMA = cv.Schema(
         cv.Optional(CONF_FINGERPRINT_COUNT): sensor.sensor_schema(
             icon=ICON_FINGERPRINT,
             accuracy_decimals=0,
+            state_class=STATE_CLASS_NONE,
             entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         ),
         cv.Optional(CONF_STATUS): sensor.sensor_schema(
             accuracy_decimals=0,
+            state_class=STATE_CLASS_NONE,
             entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         ),
         cv.Optional(CONF_CAPACITY): sensor.sensor_schema(
             icon=ICON_DATABASE,
             accuracy_decimals=0,
+            state_class=STATE_CLASS_NONE,
             entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         ),
         cv.Optional(CONF_SECURITY_LEVEL): sensor.sensor_schema(
             icon=ICON_SECURITY,
             accuracy_decimals=0,
+            state_class=STATE_CLASS_NONE,
             entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         ),
         cv.Optional(CONF_LAST_FINGER_ID): sensor.sensor_schema(
             icon=ICON_ACCOUNT,
             accuracy_decimals=0,
+            state_class=STATE_CLASS_NONE,
             entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         ),
         cv.Optional(CONF_LAST_CONFIDENCE): sensor.sensor_schema(
             icon=ICON_ACCOUNT_CHECK,
             accuracy_decimals=0,
+            state_class=STATE_CLASS_NONE,
             entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
         ),
     }

esphome/components/fujitsu_general/fujitsu_general.h

@@ -17,29 +17,29 @@ const uint8_t FUJITSU_GENERAL_TEMP_MAX = 30;  // Celsius
  *                                                                                               turn
  *                                                                                               on  temp mode     fan swing
  *                                                                                               *   |  | | |      | | *
- *
+ * 
  * temperatures                                                                                  1   1248 124      124 1
  * auto auto 18        00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10000100 00000000 00000000 00000000  00000000 00000000 00000100 11110001
  * auto auto 19        00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10001100 00000000 00000000 00000000  00000000 00000000 00000100 11111110
  * auto auto 30        00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10000111 00000000 00000000 00000000  00000000 00000000 00000100 11110011
- *
+ * 
  * on flag:
  * on at 16            00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10000000 00100000 00000000 00000000  00000000 00000000 00000100 11010101
  * down to 16          00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  00000000 00100000 00000000 00000000  00000000 00000000 00000100 00110101
- *
+ * 
  * mode options:
  * auto auto 30        00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10000111 00000000 00000000 00000000  00000000 00000000 00000100 11110011
  * cool auto 30        00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10000111 10000000 00000000 00000000  00000000 00000000 00000100 01110011
  * dry auto 30         00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10000111 01000000 00000000 00000000  00000000 00000000 00000100 10110011
  * fan (auto) (30)     00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10000111 11000000 00000000 00000000  00000000 00000000 00000100 00110011
  * heat auto 30        00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10000111 00100000 00000000 00000000  00000000 00000000 00000100 11010011
- *
+ * 
  * fan options:
  * heat 30 high        00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  10000111 00100000 10000000 00000000  00000000 00000000 00000100 01010011
  * heat 30 med         00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  00000111 00100000 01000000 00000000  00000000 00000000 00000100 01010011
  * heat 30 low         00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  00000111 00100000 11000000 00000000  00000000 00000000 00000100 10010011
  * heat 30 quiet       00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  00000111 00100000 00100000 00000000  00000000 00000000 00000100 00010011
- *
+ * 
  * swing options:
  * heat 30 swing vert  00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  00000111 00100000 00101000 00000000  00000000 00000000 00000100 00011101
  * heat 30 noswing     00101000 11000110 00000000 00001000  00001000 01111111 10010000 00001100  00000111 00100000 00100000 00000000  00000000 00000000 00000100 00010011

esphome/components/gpio/binary_sensor/__init__.py

@@ -2,27 +2,25 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
 from esphome.components import binary_sensor
-from esphome.const import CONF_PIN
+from esphome.const import CONF_ID, CONF_PIN
 from .. import gpio_ns
 
 GPIOBinarySensor = gpio_ns.class_(
     "GPIOBinarySensor", binary_sensor.BinarySensor, cg.Component
 )
 
-CONFIG_SCHEMA = (
-    binary_sensor.binary_sensor_schema(GPIOBinarySensor)
-    .extend(
-        {
-            cv.Required(CONF_PIN): pins.gpio_input_pin_schema,
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(GPIOBinarySensor),
+        cv.Required(CONF_PIN): pins.gpio_input_pin_schema,
+    }
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await binary_sensor.register_binary_sensor(var, config)
 
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))

esphome/components/gps/__init__.py

@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_ALTITUDE,
     CONF_SATELLITES,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_NONE,
     UNIT_DEGREES,
     UNIT_KILOMETER_PER_HOUR,
     UNIT_METER,
@@ -34,22 +35,27 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_LATITUDE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_DEGREES,
                 accuracy_decimals=6,
+                state_class=STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_LONGITUDE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_DEGREES,
                 accuracy_decimals=6,
+                state_class=STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_SPEED): sensor.sensor_schema(
                 unit_of_measurement=UNIT_KILOMETER_PER_HOUR,
                 accuracy_decimals=6,
+                state_class=STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_COURSE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_DEGREES,
                 accuracy_decimals=2,
+                state_class=STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_ALTITUDE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_METER,
                 accuracy_decimals=1,
+                state_class=STATE_CLASS_NONE,
             ),
             cv.Optional(CONF_SATELLITES): sensor.sensor_schema(
                 accuracy_decimals=0,

esphome/components/hmc5883l/sensor.py

@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_RANGE,
     ICON_MAGNET,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_NONE,
     UNIT_MICROTESLA,
     UNIT_DEGREES,
     ICON_SCREEN_ROTATION,
@@ -87,6 +88,7 @@ heading_schema = sensor.sensor_schema(
     unit_of_measurement=UNIT_DEGREES,
     icon=ICON_SCREEN_ROTATION,
     accuracy_decimals=1,
+    state_class=STATE_CLASS_NONE,
 )
 
 CONFIG_SCHEMA = (

esphome/components/homeassistant/binary_sensor/__init__.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-from esphome.const import CONF_ATTRIBUTE, CONF_ENTITY_ID
+from esphome.const import CONF_ATTRIBUTE, CONF_ENTITY_ID, CONF_ID
 from .. import homeassistant_ns
 
 DEPENDENCIES = ["api"]
@@ -9,21 +9,19 @@ HomeassistantBinarySensor = homeassistant_ns.class_(
     "HomeassistantBinarySensor", binary_sensor.BinarySensor, cg.Component
 )
 
-CONFIG_SCHEMA = (
-    binary_sensor.binary_sensor_schema(HomeassistantBinarySensor)
-    .extend(
-        {
-            cv.Required(CONF_ENTITY_ID): cv.entity_id,
-            cv.Optional(CONF_ATTRIBUTE): cv.string,
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(HomeassistantBinarySensor),
+        cv.Required(CONF_ENTITY_ID): cv.entity_id,
+        cv.Optional(CONF_ATTRIBUTE): cv.string,
+    }
+).extend(cv.COMPONENT_SCHEMA)
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await binary_sensor.register_binary_sensor(var, config)
 
     cg.add(var.set_entity_id(config[CONF_ENTITY_ID]))
     if CONF_ATTRIBUTE in config:

esphome/components/homeassistant/sensor/__init__.py

@@ -5,6 +5,7 @@ from esphome.const import (
     CONF_ATTRIBUTE,
     CONF_ENTITY_ID,
     CONF_ID,
+    STATE_CLASS_NONE,
 )
 from .. import homeassistant_ns
 
@@ -14,8 +15,12 @@ HomeassistantSensor = homeassistant_ns.class_(
     "HomeassistantSensor", sensor.Sensor, cg.Component
 )
 
-CONFIG_SCHEMA = sensor.sensor_schema(HomeassistantSensor, accuracy_decimals=1,).extend(
+CONFIG_SCHEMA = sensor.sensor_schema(
+    accuracy_decimals=1,
+    state_class=STATE_CLASS_NONE,
+).extend(
     {
+        cv.GenerateID(): cv.declare_id(HomeassistantSensor),
         cv.Required(CONF_ENTITY_ID): cv.entity_id,
         cv.Optional(CONF_ATTRIBUTE): cv.string,
     }

esphome/components/honeywellabp/__init__.py

@@ -1 +0,0 @@
-"""Support for Honeywell ABP"""

esphome/components/honeywellabp/honeywellabp.cpp

@@ -1,102 +0,0 @@
-#include "honeywellabp.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace honeywellabp {
-
-static const char *const TAG = "honeywellabp";
-
-const float MIN_COUNT = 1638.4;   // 1638 counts (10% of 2^14 counts or 0x0666)
-const float MAX_COUNT = 14745.6;  // 14745 counts (90% of 2^14 counts or 0x3999)
-
-void HONEYWELLABPSensor::setup() {
-  ESP_LOGD(TAG, "Setting up Honeywell ABP Sensor ");
-  this->spi_setup();
-}
-
-uint8_t HONEYWELLABPSensor::readsensor_() {
-  // Polls the sensor for new data.
-  // transfer 4 bytes (the last two are temperature only used by some sensors)
-  this->enable();
-  buf_[0] = this->read_byte();
-  buf_[1] = this->read_byte();
-  buf_[2] = this->read_byte();
-  buf_[3] = this->read_byte();
-  this->disable();
-
-  // Check the status codes:
-  // status = 0 : normal operation
-  // status = 1 : device in command mode
-  // status = 2 : stale data
-  // status = 3 : diagnostic condition
-  status_ = buf_[0] >> 6 & 0x3;
-  ESP_LOGV(TAG, "Sensor status %d", status_);
-
-  // if device is normal and there is new data, bitmask and save the raw data
-  if (status_ == 0) {
-    // 14 - bit pressure is the last 6 bits of byte 0 (high bits) & all of byte 1 (lowest 8 bits)
-    pressure_count_ = ((uint16_t)(buf_[0]) << 8 & 0x3F00) | ((uint16_t)(buf_[1]) & 0xFF);
-    // 11 - bit temperature is all of byte 2 (lowest 8 bits) and the first three bits of byte 3
-    temperature_count_ = (((uint16_t)(buf_[2]) << 3) & 0x7F8) | (((uint16_t)(buf_[3]) >> 5) & 0x7);
-    ESP_LOGV(TAG, "Sensor pressure_count_ %d", pressure_count_);
-    ESP_LOGV(TAG, "Sensor temperature_count_ %d", temperature_count_);
-  }
-  return status_;
-}
-
-// returns status
-uint8_t HONEYWELLABPSensor::readstatus_() { return status_; }
-
-// The pressure value from the most recent reading in raw counts
-int HONEYWELLABPSensor::rawpressure_() { return pressure_count_; }
-
-// The temperature value from the most recent reading in raw counts
-int HONEYWELLABPSensor::rawtemperature_() { return temperature_count_; }
-
-// Converts a digital pressure measurement in counts to pressure measured
-float HONEYWELLABPSensor::countstopressure_(const int counts, const float min_pressure, const float max_pressure) {
-  return ((((float) counts - MIN_COUNT) * (max_pressure - min_pressure)) / (MAX_COUNT - MIN_COUNT)) + min_pressure;
-}
-
-// Converts a digital temperature measurement in counts to temperature in C
-// This will be invalid if sensore daoes not have temperature measurement capability
-float HONEYWELLABPSensor::countstotemperatures_(const int counts) { return (((float) counts / 2047.0) * 200.0) - 50.0; }
-
-// Pressure value from the most recent reading in units
-float HONEYWELLABPSensor::read_pressure_() {
-  return countstopressure_(pressure_count_, honeywellabp_min_pressure_, honeywellabp_max_pressure_);
-}
-
-// Temperature value from the most recent reading in degrees C
-float HONEYWELLABPSensor::read_temperature_() { return countstotemperatures_(temperature_count_); }
-
-void HONEYWELLABPSensor::update() {
-  ESP_LOGV(TAG, "Update Honeywell ABP Sensor");
-  if (readsensor_() == 0) {
-    if (this->pressure_sensor_ != nullptr)
-      this->pressure_sensor_->publish_state(read_pressure_() * 1.0);
-    if (this->temperature_sensor_ != nullptr)
-      this->temperature_sensor_->publish_state(read_temperature_() * 1.0);
-  }
-}
-
-float HONEYWELLABPSensor::get_setup_priority() const { return setup_priority::LATE; }
-
-void HONEYWELLABPSensor::dump_config() {
-  //  LOG_SENSOR("", "HONEYWELLABP", this);
-  LOG_PIN("  CS Pin: ", this->cs_);
-  ESP_LOGCONFIG(TAG, "  Min Pressure Range: %0.1f", honeywellabp_min_pressure_);
-  ESP_LOGCONFIG(TAG, "  Max Pressure Range: %0.1f", honeywellabp_max_pressure_);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-void HONEYWELLABPSensor::set_honeywellabp_min_pressure(float min_pressure) {
-  this->honeywellabp_min_pressure_ = min_pressure;
-}
-
-void HONEYWELLABPSensor::set_honeywellabp_max_pressure(float max_pressure) {
-  this->honeywellabp_max_pressure_ = max_pressure;
-}
-
-}  // namespace honeywellabp
-}  // namespace esphome

esphome/components/honeywellabp/honeywellabp.h

@@ -1,45 +0,0 @@
-// for Honeywell ABP sensor
-// adapting code from https://github.com/vwls/Honeywell_pressure_sensors
-#pragma once
-
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/spi/spi.h"
-#include "esphome/core/component.h"
-
-namespace esphome {
-namespace honeywellabp {
-
-class HONEYWELLABPSensor : public PollingComponent,
-                           public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
-                                                 spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_200KHZ> {
- public:
-  void set_pressure_sensor(sensor::Sensor *pressure_sensor) { pressure_sensor_ = pressure_sensor; }
-  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
-  void setup() override;
-  void update() override;
-  float get_setup_priority() const override;
-  void dump_config() override;
-  void set_honeywellabp_min_pressure(float min_pressure);
-  void set_honeywellabp_max_pressure(float max_pressure);
-
- protected:
-  float honeywellabp_min_pressure_ = 0.0;
-  float honeywellabp_max_pressure_ = 0.0;
-  uint8_t buf_[4];             // buffer to hold sensor data
-  uint8_t status_ = 0;         // byte to hold status information.
-  int pressure_count_ = 0;     // hold raw pressure data (14 - bit, 0 - 16384)
-  int temperature_count_ = 0;  // hold raw temperature data (11 - bit, 0 - 2048)
-  sensor::Sensor *pressure_sensor_;
-  sensor::Sensor *temperature_sensor_;
-  uint8_t readsensor_();
-  uint8_t readstatus_();
-  int rawpressure_();
-  int rawtemperature_();
-  float countstopressure_(int counts, float min_pressure, float max_pressure);
-  float countstotemperatures_(int counts);
-  float read_pressure_();
-  float read_temperature_();
-};
-
-}  // namespace honeywellabp
-}  // namespace esphome

esphome/components/honeywellabp/sensor.py

@@ -1,70 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor
-from esphome.components import spi
-from esphome.const import (
-    CONF_ID,
-    CONF_PRESSURE,
-    CONF_TEMPERATURE,
-    DEVICE_CLASS_PRESSURE,
-    DEVICE_CLASS_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-)
-
-DEPENDENCIES = ["spi"]
-CODEOWNERS = ["@RubyBailey"]
-
-CONF_MIN_PRESSURE = "min_pressure"
-CONF_MAX_PRESSURE = "max_pressure"
-
-honeywellabp_ns = cg.esphome_ns.namespace("honeywellabp")
-HONEYWELLABPSensor = honeywellabp_ns.class_(
-    "HONEYWELLABPSensor", sensor.Sensor, cg.PollingComponent, spi.SPIDevice
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(HONEYWELLABPSensor),
-            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
-                unit_of_measurement="psi",
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_PRESSURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ).extend(
-                {
-                    cv.Required(CONF_MIN_PRESSURE): cv.float_,
-                    cv.Required(CONF_MAX_PRESSURE): cv.float_,
-                }
-            ),
-            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(spi.spi_device_schema(cs_pin_required=True))
-)
-
-
-async def to_code(config):
-
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await spi.register_spi_device(var, config)
-
-    if CONF_PRESSURE in config:
-        conf = config[CONF_PRESSURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_pressure_sensor(sens))
-        cg.add(var.set_honeywellabp_min_pressure(conf[CONF_MIN_PRESSURE]))
-        cg.add(var.set_honeywellabp_max_pressure(conf[CONF_MAX_PRESSURE]))
-
-    if CONF_TEMPERATURE in config:
-        conf = config[CONF_TEMPERATURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_temperature_sensor(sens))

esphome/components/host/__init__.py

@@ -1,38 +0,0 @@
-from esphome.const import (
-    KEY_CORE,
-    KEY_FRAMEWORK_VERSION,
-    KEY_TARGET_FRAMEWORK,
-    KEY_TARGET_PLATFORM,
-)
-from esphome.core import CORE
-import esphome.config_validation as cv
-import esphome.codegen as cg
-
-from .const import KEY_HOST
-
-# force import gpio to register pin schema
-from .gpio import host_pin_to_code  # noqa
-
-
-CODEOWNERS = ["@esphome/core"]
-AUTO_LOAD = ["network"]
-
-
-def set_core_data(config):
-    CORE.data[KEY_HOST] = {}
-    CORE.data[KEY_CORE][KEY_TARGET_PLATFORM] = "host"
-    CORE.data[KEY_CORE][KEY_TARGET_FRAMEWORK] = "host"
-    CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION] = cv.Version(1, 0, 0)
-    return config
-
-
-CONFIG_SCHEMA = cv.All(
-    cv.Schema({}),
-    set_core_data,
-)
-
-
-async def to_code(config):
-    cg.add_build_flag("-DUSE_HOST")
-    cg.add_define("ESPHOME_BOARD", "host")
-    cg.add_platformio_option("platform", "platformio/native")

esphome/components/host/const.py

@@ -1,5 +0,0 @@
-import esphome.codegen as cg
-
-KEY_HOST = "host"
-
-host_ns = cg.esphome_ns.namespace("host")

esphome/components/host/core.cpp

@@ -1,74 +0,0 @@
-#ifdef USE_HOST
-
-#include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
-#include "preferences.h"
-
-#include <sched.h>
-#include <time.h>
-#include <cmath>
-#include <cstdlib>
-
-namespace esphome {
-
-void IRAM_ATTR HOT yield() { ::sched_yield(); }
-uint32_t IRAM_ATTR HOT millis() {
-  struct timespec spec;
-  clock_gettime(CLOCK_MONOTONIC, &spec);
-  time_t seconds = spec.tv_sec;
-  uint32_t ms = round(spec.tv_nsec / 1e6);
-  return ((uint32_t) seconds) * 1000U + ms;
-}
-void IRAM_ATTR HOT delay(uint32_t ms) {
-  struct timespec ts;
-  ts.tv_sec = ms / 1000;
-  ts.tv_nsec = (ms % 1000) * 1000000;
-  int res;
-  do {
-    res = nanosleep(&ts, &ts);
-  } while (res != 0 && errno == EINTR);
-}
-uint32_t IRAM_ATTR HOT micros() {
-  struct timespec spec;
-  clock_gettime(CLOCK_MONOTONIC, &spec);
-  time_t seconds = spec.tv_sec;
-  uint32_t us = round(spec.tv_nsec / 1e3);
-  return ((uint32_t) seconds) * 1000000U + us;
-}
-void IRAM_ATTR HOT delayMicroseconds(uint32_t us) {
-  struct timespec ts;
-  ts.tv_sec = us / 1000000U;
-  ts.tv_nsec = (us % 1000000U) * 1000U;
-  int res;
-  do {
-    res = nanosleep(&ts, &ts);
-  } while (res != 0 && errno == EINTR);
-}
-void arch_restart() { exit(0); }
-void IRAM_ATTR HOT arch_feed_wdt() {
-  // pass
-}
-
-uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; }
-uint32_t arch_get_cpu_cycle_count() {
-  struct timespec spec;
-  clock_gettime(CLOCK_MONOTONIC, &spec);
-  time_t seconds = spec.tv_sec;
-  uint32_t us = spec.tv_nsec;
-  return ((uint32_t) seconds) * 1000000000U + us;
-}
-uint32_t arch_get_cpu_freq_hz() { return 1000000000U; }
-
-}  // namespace esphome
-
-void setup();
-void loop();
-int main() {
-  esphome::host::setup_preferences();
-  setup();
-  while (true) {
-    loop();
-  }
-}
-
-#endif  // USE_HOST

esphome/components/host/gpio.cpp

@@ -1,59 +0,0 @@
-#ifdef USE_HOST
-
-#include "gpio.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace host {
-
-static const char *const TAG = "host";
-
-struct ISRPinArg {
-  uint8_t pin;
-  bool inverted;
-};
-
-ISRInternalGPIOPin HostGPIOPin::to_isr() const {
-  auto *arg = new ISRPinArg{};  // NOLINT(cppcoreguidelines-owning-memory)
-  arg->pin = pin_;
-  arg->inverted = inverted_;
-  return ISRInternalGPIOPin((void *) arg);
-}
-
-void HostGPIOPin::attach_interrupt_(void (*func)(void *), void *arg, gpio::InterruptType type) const {
-  ESP_LOGD(TAG, "Attaching interrupt %p to pin %d and mode %d", func, pin_, (uint32_t) type);
-}
-void HostGPIOPin::pin_mode(gpio::Flags flags) { ESP_LOGD(TAG, "Setting pin %d mode to %02X", pin_, (uint32_t) flags); }
-
-std::string HostGPIOPin::dump_summary() const {
-  char buffer[32];
-  snprintf(buffer, sizeof(buffer), "GPIO%u", pin_);
-  return buffer;
-}
-
-bool HostGPIOPin::digital_read() { return inverted_; }
-void HostGPIOPin::digital_write(bool value) {
-  // pass
-  ESP_LOGD(TAG, "Setting pin %d to %s", pin_, value != inverted_ ? "HIGH" : "LOW");
-}
-void HostGPIOPin::detach_interrupt() const {}
-
-}  // namespace host
-
-using namespace host;
-
-bool IRAM_ATTR ISRInternalGPIOPin::digital_read() {
-  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
-  return arg->inverted;
-}
-void IRAM_ATTR ISRInternalGPIOPin::digital_write(bool value) {
-  // pass
-}
-void IRAM_ATTR ISRInternalGPIOPin::clear_interrupt() {
-  auto *arg = reinterpret_cast<ISRPinArg *>(arg_);
-  ESP_LOGD(TAG, "Clearing interrupt for pin %d", arg->pin);
-}
-
-}  // namespace esphome
-
-#endif  // USE_HOST

esphome/components/host/gpio.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#ifdef USE_HOST
-
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace host {
-
-class HostGPIOPin : public InternalGPIOPin {
- public:
-  void set_pin(uint8_t pin) { pin_ = pin; }
-  void set_inverted(bool inverted) { inverted_ = inverted; }
-  void set_flags(gpio::Flags flags) { flags_ = flags; }
-
-  void setup() override { pin_mode(flags_); }
-  void pin_mode(gpio::Flags flags) override;
-  bool digital_read() override;
-  void digital_write(bool value) override;
-  std::string dump_summary() const override;
-  void detach_interrupt() const override;
-  ISRInternalGPIOPin to_isr() const override;
-  uint8_t get_pin() const override { return pin_; }
-  bool is_inverted() const override { return inverted_; }
-
- protected:
-  void attach_interrupt_(void (*func)(void *), void *arg, gpio::InterruptType type) const override;
-
-  uint8_t pin_;
-  bool inverted_;
-  gpio::Flags flags_;
-};
-
-}  // namespace host
-}  // namespace esphome
-
-#endif  // USE_HOST

esphome/components/host/gpio.py

@@ -1,73 +0,0 @@
-import logging
-
-from esphome.const import (
-    CONF_ID,
-    CONF_INPUT,
-    CONF_INVERTED,
-    CONF_MODE,
-    CONF_NUMBER,
-    CONF_OPEN_DRAIN,
-    CONF_OUTPUT,
-    CONF_PULLDOWN,
-    CONF_PULLUP,
-)
-from esphome import pins
-import esphome.config_validation as cv
-import esphome.codegen as cg
-
-from .const import host_ns
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-HostGPIOPin = host_ns.class_("HostGPIOPin", cg.InternalGPIOPin)
-
-
-def _translate_pin(value):
-    if isinstance(value, dict) or value is None:
-        raise cv.Invalid(
-            "This variable only supports pin numbers, not full pin schemas "
-            "(with inverted and mode)."
-        )
-    if isinstance(value, int):
-        return value
-    try:
-        return int(value)
-    except ValueError:
-        pass
-    if value.startswith("GPIO"):
-        return cv.int_(value[len("GPIO") :].strip())
-    return value
-
-
-def validate_gpio_pin(value):
-    return _translate_pin(value)
-
-
-HOST_PIN_SCHEMA = cv.All(
-    {
-        cv.GenerateID(): cv.declare_id(HostGPIOPin),
-        cv.Required(CONF_NUMBER): validate_gpio_pin,
-        cv.Optional(CONF_MODE, default={}): cv.Schema(
-            {
-                cv.Optional(CONF_INPUT, default=False): cv.boolean,
-                cv.Optional(CONF_OUTPUT, default=False): cv.boolean,
-                cv.Optional(CONF_OPEN_DRAIN, default=False): cv.boolean,
-                cv.Optional(CONF_PULLUP, default=False): cv.boolean,
-                cv.Optional(CONF_PULLDOWN, default=False): cv.boolean,
-            }
-        ),
-        cv.Optional(CONF_INVERTED, default=False): cv.boolean,
-    },
-)
-
-
-@pins.PIN_SCHEMA_REGISTRY.register("host", HOST_PIN_SCHEMA)
-async def host_pin_to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    num = config[CONF_NUMBER]
-    cg.add(var.set_pin(num))
-    cg.add(var.set_inverted(config[CONF_INVERTED]))
-    cg.add(var.set_flags(pins.gpio_flags_expr(config[CONF_MODE])))
-    return var

esphome/components/host/preferences.cpp

@@ -1,33 +0,0 @@
-#ifdef USE_HOST
-
-#include "preferences.h"
-#include <cstring>
-#include "esphome/core/preferences.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-#include "esphome/core/defines.h"
-
-namespace esphome {
-namespace host {
-
-static const char *const TAG = "host.preferences";
-
-class HostPreferences : public ESPPreferences {
- public:
-  ESPPreferenceObject make_preference(size_t length, uint32_t type, bool in_flash) override { return {}; }
-
-  ESPPreferenceObject make_preference(size_t length, uint32_t type) override { return {}; }
-};
-
-void setup_preferences() {
-  auto *pref = new HostPreferences();  // NOLINT(cppcoreguidelines-owning-memory)
-  global_preferences = pref;
-}
-
-}  // namespace host
-
-ESPPreferences *global_preferences;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
-
-}  // namespace esphome
-
-#endif  // USE_HOST

esphome/components/host/preferences.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#ifdef USE_HOST
-
-namespace esphome {
-namespace host {
-
-void setup_preferences();
-
-}  // namespace host
-}  // namespace esphome
-
-#endif  // USE_HOST

esphome/components/hrxl_maxsonar_wr/sensor.py

@@ -1,6 +1,8 @@
 import esphome.codegen as cg
+import esphome.config_validation as cv
 from esphome.components import sensor, uart
 from esphome.const import (
+    CONF_ID,
     STATE_CLASS_MEASUREMENT,
     UNIT_METER,
     ICON_ARROW_EXPAND_VERTICAL,
@@ -14,16 +16,24 @@ HrxlMaxsonarWrComponent = hrxlmaxsonarwr_ns.class_(
     "HrxlMaxsonarWrComponent", sensor.Sensor, cg.Component, uart.UARTDevice
 )
 
-CONFIG_SCHEMA = sensor.sensor_schema(
-    HrxlMaxsonarWrComponent,
-    unit_of_measurement=UNIT_METER,
-    icon=ICON_ARROW_EXPAND_VERTICAL,
-    accuracy_decimals=3,
-    state_class=STATE_CLASS_MEASUREMENT,
-).extend(uart.UART_DEVICE_SCHEMA)
+CONFIG_SCHEMA = (
+    sensor.sensor_schema(
+        unit_of_measurement=UNIT_METER,
+        icon=ICON_ARROW_EXPAND_VERTICAL,
+        accuracy_decimals=3,
+        state_class=STATE_CLASS_MEASUREMENT,
+    )
+    .extend(
+        {
+            cv.GenerateID(): cv.declare_id(HrxlMaxsonarWrComponent),
+        }
+    )
+    .extend(uart.UART_DEVICE_SCHEMA)
+)
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
     await uart.register_uart_device(var, config)

esphome/components/http_request/http_request.cpp

@@ -120,16 +120,10 @@ void HttpRequestComponent::close() {
 }
 
 const char *HttpRequestComponent::get_string() {
-#if defined(ESP32)
-  // The static variable is here because HTTPClient::getString() returns a String on ESP32,
-  // and we need something to keep a buffer alive.
-  static String str;
-#else
-  // However on ESP8266, HTTPClient::getString() returns a String& to a member variable.
-  // Leaving this the default so that any new platform either doesn't copy, or encounters a compilation error.
-  auto &
-#endif
-  str = this->client_.getString();
+  // The static variable is here because HTTPClient::getString() returns a String on ESP32, and we need something to
+  // to keep a buffer alive.
+  static std::string str;
+  str = this->client_.getString().c_str();
   return str.c_str();
 }
 

esphome/components/hx711/sensor.py

@@ -5,6 +5,7 @@ from esphome.components import sensor
 from esphome.const import (
     CONF_CLK_PIN,
     CONF_GAIN,
+    CONF_ID,
     ICON_SCALE,
     STATE_CLASS_MEASUREMENT,
 )
@@ -23,13 +24,13 @@ GAINS = {
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        HX711Sensor,
         icon=ICON_SCALE,
         accuracy_decimals=0,
         state_class=STATE_CLASS_MEASUREMENT,
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(HX711Sensor),
             cv.Required(CONF_DOUT_PIN): pins.gpio_input_pin_schema,
             cv.Required(CONF_CLK_PIN): pins.gpio_output_pin_schema,
             cv.Optional(CONF_GAIN, default=128): cv.enum(GAINS, int=True),
@@ -40,8 +41,9 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     dout_pin = await cg.gpio_pin_expression(config[CONF_DOUT_PIN])
     cg.add(var.set_dout_pin(dout_pin))

esphome/components/ili9341/ili9341_init.h

@@ -25,10 +25,10 @@ static const uint8_t PROGMEM INITCMD_M5STACK[] = {
   0xF2, 1, 0x00,                         // 3Gamma Function Disable
   ILI9341_GAMMASET , 1, 0x01,             // Gamma curve selected
   ILI9341_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
-                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
+                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 
                         0x0E, 0x09, 0x00,
   ILI9341_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
-                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
+                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 
                         0x31, 0x36, 0x0F,
   ILI9341_SLPOUT  , 0x80,                // Exit Sleep
   ILI9341_DISPON  , 0x80,                // Display on
@@ -55,10 +55,10 @@ static const uint8_t PROGMEM INITCMD_TFT[] = {
   0xF2, 1, 0x00,                         // 3Gamma Function Disable
   ILI9341_GAMMASET , 1, 0x01,             // Gamma curve selected
   ILI9341_GMCTRP1 , 15, 0x0F, 0x31, 0x2B, 0x0C, 0x0E, 0x08, // Set Gamma
-                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03,
+                        0x4E, 0xF1, 0x37, 0x07, 0x10, 0x03, 
                         0x0E, 0x09, 0x00,
   ILI9341_GMCTRN1 , 15, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, // Set Gamma
-                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C,
+                        0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 
                         0x31, 0x36, 0x0F,
   ILI9341_SLPOUT  , 0x80,                // Exit Sleep
   ILI9341_DISPON  , 0x80,                // Display on

esphome/components/json/json_util.cpp

@@ -22,7 +22,7 @@ std::string build_json(const json_build_t &f) {
 #ifdef USE_ESP8266
   const size_t free_heap = ESP.getMaxFreeBlockSize() - 2048;  // NOLINT(readability-static-accessed-through-instance)
 #elif defined(USE_ESP32)
-  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL) - 2048;
+  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT) - 2048;
 #endif
 
   DynamicJsonDocument json_document(free_heap);
@@ -42,7 +42,7 @@ void parse_json(const std::string &data, const json_parse_t &f) {
 #ifdef USE_ESP8266
   const size_t free_heap = ESP.getMaxFreeBlockSize() - 2048;  // NOLINT(readability-static-accessed-through-instance)
 #elif defined(USE_ESP32)
-  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL) - 2048;
+  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT) - 2048;
 #endif
 
   DynamicJsonDocument json_document(free_heap);

esphome/components/lcd_gpio/display.py

@@ -43,7 +43,7 @@ async def to_code(config):
     await lcd_base.setup_lcd_display(var, config)
     pins_ = []
     for conf in config[CONF_DATA_PINS]:
-        pins_.append(await cg.gpio_pin_expression(conf))
+        pins_.append((await cg.gpio_pin_expression(conf)))
     cg.add(var.set_data_pins(*pins_))
     enable = await cg.gpio_pin_expression(config[CONF_ENABLE_PIN])
     cg.add(var.set_enable_pin(enable))

esphome/components/light/__init__.py

@@ -52,8 +52,6 @@ RESTORE_MODES = {
     "ALWAYS_ON": LightRestoreMode.LIGHT_ALWAYS_ON,
     "RESTORE_INVERTED_DEFAULT_OFF": LightRestoreMode.LIGHT_RESTORE_INVERTED_DEFAULT_OFF,
     "RESTORE_INVERTED_DEFAULT_ON": LightRestoreMode.LIGHT_RESTORE_INVERTED_DEFAULT_ON,
-    "RESTORE_AND_OFF": LightRestoreMode.LIGHT_RESTORE_AND_OFF,
-    "RESTORE_AND_ON": LightRestoreMode.LIGHT_RESTORE_AND_ON,
 }
 
 LIGHT_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(

esphome/components/light/light_state.cpp

@@ -68,12 +68,6 @@ void LightState::setup() {
         recovered.state = !recovered.state;
       }
       break;
-    case LIGHT_RESTORE_AND_OFF:
-    case LIGHT_RESTORE_AND_ON:
-      this->rtc_ = global_preferences->make_preference<LightStateRTCState>(this->get_object_id_hash());
-      this->rtc_.load(&recovered);
-      recovered.state = (this->restore_mode_ == LIGHT_RESTORE_AND_ON);
-      break;
     case LIGHT_ALWAYS_OFF:
       recovered.state = false;
       break;

esphome/components/light/light_state.h

@@ -22,8 +22,6 @@ enum LightRestoreMode {
   LIGHT_ALWAYS_ON,
   LIGHT_RESTORE_INVERTED_DEFAULT_OFF,
   LIGHT_RESTORE_INVERTED_DEFAULT_ON,
-  LIGHT_RESTORE_AND_OFF,
-  LIGHT_RESTORE_AND_ON,
 };
 
 /** This class represents the communication layer between the front-end MQTT layer and the

esphome/components/logger/__init__.py

@@ -113,9 +113,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_BAUD_RATE, default=115200): cv.positive_int,
             cv.Optional(CONF_TX_BUFFER_SIZE, default=512): cv.validate_bytes,
             cv.Optional(CONF_DEASSERT_RTS_DTR, default=False): cv.boolean,
-            cv.SplitDefault(CONF_HARDWARE_UART, esp32="UART0", esp8266="UART0"): cv.All(
-                cv.only_on(["esp32", "esp8266"]), uart_selection
-            ),
+            cv.Optional(CONF_HARDWARE_UART, default="UART0"): uart_selection,
             cv.Optional(CONF_LEVEL, default="DEBUG"): is_log_level,
             cv.Optional(CONF_LOGS, default={}): cv.Schema(
                 {
@@ -140,9 +138,12 @@ CONFIG_SCHEMA = cv.All(
 @coroutine_with_priority(90.0)
 async def to_code(config):
     baud_rate = config[CONF_BAUD_RATE]
-    log = cg.new_Pvariable(config[CONF_ID], baud_rate, config[CONF_TX_BUFFER_SIZE])
-    if CONF_HARDWARE_UART in config:
-        cg.add(log.set_uart_selection(config[CONF_HARDWARE_UART]))
+    rhs = Logger.new(
+        baud_rate,
+        config[CONF_TX_BUFFER_SIZE],
+        HARDWARE_UART_TO_UART_SELECTION[config[CONF_HARDWARE_UART]],
+    )
+    log = cg.Pvariable(config[CONF_ID], rhs)
     cg.add(log.pre_setup())
 
     for tag, level in config[CONF_LOGS].items():

esphome/components/logger/logger.cpp

@@ -130,14 +130,12 @@ void HOT Logger::log_message_(int level, const char *tag, int offset) {
   if (xPortGetFreeHeapSize() < 2048)
     return;
 #endif
-#ifdef USE_HOST
-  puts(msg);
-#endif
 
   this->log_callback_.call(level, tag, msg);
 }
 
-Logger::Logger(uint32_t baud_rate, size_t tx_buffer_size) : baud_rate_(baud_rate), tx_buffer_size_(tx_buffer_size) {
+Logger::Logger(uint32_t baud_rate, size_t tx_buffer_size, UARTSelection uart)
+    : baud_rate_(baud_rate), tx_buffer_size_(tx_buffer_size), uart_(uart) {
   // add 1 to buffer size for null terminator
   this->tx_buffer_ = new char[this->tx_buffer_size_ + 1];  // NOLINT
 }
@@ -219,11 +217,7 @@ void Logger::set_baud_rate(uint32_t baud_rate) { this->baud_rate_ = baud_rate; }
 void Logger::set_log_level(const std::string &tag, int log_level) {
   this->log_levels_.push_back(LogLevelOverride{tag, log_level});
 }
-
-#if defined(USE_ESP32) || defined(USE_ESP8266)
 UARTSelection Logger::get_uart() const { return this->uart_; }
-#endif
-
 void Logger::add_on_log_callback(std::function<void(int, const char *, const char *)> &&callback) {
   this->log_callback_.add(std::move(callback));
 }
@@ -239,10 +233,7 @@ void Logger::dump_config() {
   ESP_LOGCONFIG(TAG, "Logger:");
   ESP_LOGCONFIG(TAG, "  Level: %s", LOG_LEVELS[ESPHOME_LOG_LEVEL]);
   ESP_LOGCONFIG(TAG, "  Log Baud Rate: %u", this->baud_rate_);
-#if defined(USE_ESP32) || defined(USE_ESP8266)
   ESP_LOGCONFIG(TAG, "  Hardware UART: %s", UART_SELECTIONS[this->uart_]);
-#endif
-
   for (auto &it : this->log_levels_) {
     ESP_LOGCONFIG(TAG, "  Level for '%s': %s", it.tag.c_str(), LOG_LEVELS[it.level]);
   }

esphome/components/logger/logger.h

@@ -17,7 +17,6 @@ namespace esphome {
 
 namespace logger {
 
-#if defined(USE_ESP32) || defined(USE_ESP8266)
 /** Enum for logging UART selection
  *
  * Advanced configuration (pin selection, etc) is not supported.
@@ -32,11 +31,10 @@ enum UARTSelection {
   UART_SELECTION_UART0_SWAP,
 #endif
 };
-#endif  // USE_ESP32 || USE_ESP8266
 
 class Logger : public Component {
  public:
-  explicit Logger(uint32_t baud_rate, size_t tx_buffer_size);
+  explicit Logger(uint32_t baud_rate, size_t tx_buffer_size, UARTSelection uart);
 
   /// Manually set the baud rate for serial, set to 0 to disable.
   void set_baud_rate(uint32_t baud_rate);
@@ -48,11 +46,8 @@ class Logger : public Component {
   uart_port_t get_uart_num() const { return uart_num_; }
 #endif
 
-#if defined(USE_ESP32) || defined(USE_ESP8266)
-  void set_uart_selection(UARTSelection uart_selection) { uart_ = uart_selection; }
   /// Get the UART used by the logger.
   UARTSelection get_uart() const;
-#endif
 
   /// Set the log level of the specified tag.
   void set_log_level(const std::string &tag, int log_level);
@@ -122,9 +117,7 @@ class Logger : public Component {
   char *tx_buffer_{nullptr};
   int tx_buffer_at_{0};
   int tx_buffer_size_{0};
-#if defined(USE_ESP32) || defined(USE_ESP8266)
   UARTSelection uart_{UART_SELECTION_UART0};
-#endif
 #ifdef USE_ARDUINO
   HardwareSerial *hw_serial_{nullptr};
 #endif

esphome/components/ltr390/sensor.py

@@ -52,28 +52,16 @@ CONFIG_SCHEMA = cv.All(
         {
             cv.GenerateID(): cv.declare_id(LTR390Component),
             cv.Optional(CONF_LIGHT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_LUX,
-                icon=ICON_BRIGHTNESS_5,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_ILLUMINANCE,
+                UNIT_LUX, ICON_BRIGHTNESS_5, 1, DEVICE_CLASS_ILLUMINANCE
             ),
             cv.Optional(CONF_AMBIENT_LIGHT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_COUNTS,
-                icon=ICON_BRIGHTNESS_5,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_ILLUMINANCE,
+                UNIT_COUNTS, ICON_BRIGHTNESS_5, 1, DEVICE_CLASS_ILLUMINANCE
             ),
             cv.Optional(CONF_UV_INDEX): sensor.sensor_schema(
-                unit_of_measurement=UNIT_UVI,
-                icon=ICON_BRIGHTNESS_5,
-                accuracy_decimals=5,
-                device_class=DEVICE_CLASS_ILLUMINANCE,
+                UNIT_UVI, ICON_BRIGHTNESS_5, 5, DEVICE_CLASS_ILLUMINANCE
             ),
             cv.Optional(CONF_UV): sensor.sensor_schema(
-                unit_of_measurement=UNIT_COUNTS,
-                icon=ICON_BRIGHTNESS_5,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_ILLUMINANCE,
+                UNIT_COUNTS, ICON_BRIGHTNESS_5, 1, DEVICE_CLASS_ILLUMINANCE
             ),
             cv.Optional(CONF_GAIN, default="X3"): cv.enum(GAIN_OPTIONS),
             cv.Optional(CONF_RESOLUTION, default=18): cv.enum(RES_OPTIONS),

esphome/components/max31855/sensor.py

@@ -2,6 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, spi
 from esphome.const import (
+    CONF_ID,
     CONF_REFERENCE_TEMPERATURE,
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
@@ -15,13 +16,13 @@ MAX31855Sensor = max31855_ns.class_(
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        MAX31855Sensor,
         unit_of_measurement=UNIT_CELSIUS,
         accuracy_decimals=1,
         device_class=DEVICE_CLASS_TEMPERATURE,
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(MAX31855Sensor),
             cv.Optional(CONF_REFERENCE_TEMPERATURE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_CELSIUS,
                 accuracy_decimals=2,
@@ -36,9 +37,10 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
+    await sensor.register_sensor(var, config)
     if CONF_REFERENCE_TEMPERATURE in config:
         tc_ref = await sensor.new_sensor(config[CONF_REFERENCE_TEMPERATURE])
         cg.add(var.set_reference_sensor(tc_ref))

esphome/components/max31856/sensor.py

@@ -2,6 +2,7 @@ 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,
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
@@ -21,7 +22,6 @@ FILTER = {
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        MAX31856Sensor,
         unit_of_measurement=UNIT_CELSIUS,
         accuracy_decimals=1,
         device_class=DEVICE_CLASS_TEMPERATURE,
@@ -29,6 +29,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(MAX31856Sensor),
             cv.Optional(CONF_MAINS_FILTER, default="60HZ"): cv.enum(
                 FILTER, upper=True, space=""
             ),
@@ -40,7 +41,8 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
+    await sensor.register_sensor(var, config)
     cg.add(var.set_filter(config[CONF_MAINS_FILTER]))

esphome/components/max31865/sensor.py

@@ -2,6 +2,7 @@ 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,
@@ -24,7 +25,6 @@ FILTER = {
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        MAX31865Sensor,
         unit_of_measurement=UNIT_CELSIUS,
         accuracy_decimals=2,
         device_class=DEVICE_CLASS_TEMPERATURE,
@@ -32,6 +32,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(MAX31865Sensor),
             cv.Required(CONF_REFERENCE_RESISTANCE): cv.All(
                 cv.resistance, cv.Range(min=100, max=10000)
             ),
@@ -50,9 +51,10 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
+    await 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]))

esphome/components/max44009/max44009.cpp

@@ -1,144 +0,0 @@
-#include "max44009.h"
-
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace max44009 {
-
-static const char *const TAG = "max44009.sensor";
-
-// REGISTERS
-static const uint8_t MAX44009_REGISTER_CONFIGURATION = 0x02;
-static const uint8_t MAX44009_LUX_READING_HIGH = 0x03;
-static const uint8_t MAX44009_LUX_READING_LOW = 0x04;
-// CONFIGURATION MASKS
-static const uint8_t MAX44009_CFG_CONTINUOUS = 0x80;
-// ERROR CODES
-static const uint8_t MAX44009_OK = 0;
-static const uint8_t MAX44009_ERROR_WIRE_REQUEST = -10;
-static const uint8_t MAX44009_ERROR_OVERFLOW = -20;
-static const uint8_t MAX44009_ERROR_HIGH_BYTE = -30;
-static const uint8_t MAX44009_ERROR_LOW_BYTE = -31;
-
-void MAX44009Sensor::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up MAX44009...");
-  bool state_ok = false;
-  if (this->mode_ == MAX44009Mode::MAX44009_MODE_LOW_POWER) {
-    state_ok = this->set_low_power_mode();
-  } else if (this->mode_ == MAX44009Mode::MAX44009_MODE_CONTINUOUS) {
-    state_ok = this->set_continuous_mode();
-  } else {
-    /*
-     * Mode AUTO: Set mode depending on update interval
-     * - On low power mode, the IC measures lux intensity only once every 800ms
-     * regardless of integration time
-     * - On continuous mode, the IC continuously measures lux intensity
-     */
-    if (this->get_update_interval() < 800) {
-      state_ok = this->set_continuous_mode();
-    } else {
-      state_ok = this->set_low_power_mode();
-    }
-  }
-  if (!state_ok)
-    this->mark_failed();
-}
-
-void MAX44009Sensor::dump_config() {
-  ESP_LOGCONFIG(TAG, "MAX44009:");
-  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with MAX44009 failed!");
-  }
-}
-
-float MAX44009Sensor::get_setup_priority() const { return setup_priority::DATA; }
-
-void MAX44009Sensor::update() {
-  // update sensor illuminance value
-  float lux = this->read_illuminance_();
-  if (this->error_ != MAX44009_OK) {
-    this->status_set_warning();
-    this->publish_state(NAN);
-  } else {
-    this->status_clear_warning();
-    this->publish_state(lux);
-  }
-}
-
-float MAX44009Sensor::read_illuminance_() {
-  uint8_t datahigh = this->read_(MAX44009_LUX_READING_HIGH);
-  if (error_ != MAX44009_OK) {
-    this->error_ = MAX44009_ERROR_HIGH_BYTE;
-    return this->error_;
-  }
-  uint8_t datalow = this->read_(MAX44009_LUX_READING_LOW);
-  if (error_ != MAX44009_OK) {
-    this->error_ = MAX44009_ERROR_LOW_BYTE;
-    return this->error_;
-  }
-  uint8_t exponent = datahigh >> 4;
-  if (exponent == 0x0F) {
-    this->error_ = MAX44009_ERROR_OVERFLOW;
-    return this->error_;
-  }
-
-  return this->convert_to_lux_(datahigh, datalow);
-}
-
-float MAX44009Sensor::convert_to_lux_(uint8_t data_high, uint8_t data_low) {
-  uint8_t exponent = data_high >> 4;
-  uint32_t mantissa = ((data_high & 0x0F) << 4) + (data_low & 0x0F);
-  return ((0x0001 << exponent) * 0.045) * mantissa;
-}
-
-bool MAX44009Sensor::set_continuous_mode() {
-  uint8_t config = this->read_(MAX44009_REGISTER_CONFIGURATION);
-  if (this->error_ == MAX44009_OK) {
-    config |= MAX44009_CFG_CONTINUOUS;
-    this->write_(MAX44009_REGISTER_CONFIGURATION, config);
-    this->status_clear_warning();
-    ESP_LOGV(TAG, "set to continuous mode");
-    return true;
-  } else {
-    this->status_set_warning();
-    return false;
-  }
-}
-
-bool MAX44009Sensor::set_low_power_mode() {
-  uint8_t config = this->read_(MAX44009_REGISTER_CONFIGURATION);
-  if (this->error_ == MAX44009_OK) {
-    config &= ~MAX44009_CFG_CONTINUOUS;
-    this->write_(MAX44009_REGISTER_CONFIGURATION, config);
-    this->status_clear_warning();
-    ESP_LOGV(TAG, "set to low power mode");
-    return true;
-  } else {
-    this->status_set_warning();
-    return false;
-  }
-}
-
-uint8_t MAX44009Sensor::read_(uint8_t reg) {
-  uint8_t data = 0;
-  if (!this->read_byte(reg, &data)) {
-    this->error_ = MAX44009_ERROR_WIRE_REQUEST;
-  } else {
-    this->error_ = MAX44009_OK;
-  }
-  return data;
-}
-
-void MAX44009Sensor::write_(uint8_t reg, uint8_t value) {
-  if (!this->write_byte(reg, value)) {
-    this->error_ = MAX44009_ERROR_WIRE_REQUEST;
-  } else {
-    this->error_ = MAX44009_OK;
-  }
-}
-
-void MAX44009Sensor::set_mode(MAX44009Mode mode) { this->mode_ = mode; }
-
-}  // namespace max44009
-}  // namespace esphome

esphome/components/max44009/max44009.h

@@ -1,37 +0,0 @@
-#pragma once
-
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/core/component.h"
-
-namespace esphome {
-namespace max44009 {
-
-enum MAX44009Mode { MAX44009_MODE_AUTO, MAX44009_MODE_LOW_POWER, MAX44009_MODE_CONTINUOUS };
-
-/// This class implements support for the MAX44009 Illuminance i2c sensor.
-class MAX44009Sensor : public sensor::Sensor, public PollingComponent, public i2c::I2CDevice {
- public:
-  MAX44009Sensor() {}
-
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void update() override;
-  void set_mode(MAX44009Mode mode);
-  bool set_continuous_mode();
-  bool set_low_power_mode();
-
- protected:
-  /// Read the illuminance value
-  float read_illuminance_();
-  float convert_to_lux_(uint8_t data_high, uint8_t data_low);
-  uint8_t read_(uint8_t reg);
-  void write_(uint8_t reg, uint8_t value);
-
-  int error_;
-  MAX44009Mode mode_;
-};
-
-}  // namespace max44009
-}  // namespace esphome

esphome/components/max44009/sensor.py

@@ -1,53 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, i2c
-from esphome.const import (
-    CONF_ID,
-    CONF_MODE,
-    DEVICE_CLASS_ILLUMINANCE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_LUX,
-)
-
-CODEOWNERS = ["@berfenger"]
-DEPENDENCIES = ["i2c"]
-
-max44009_ns = cg.esphome_ns.namespace("max44009")
-MAX44009Sensor = max44009_ns.class_(
-    "MAX44009Sensor", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
-)
-
-MAX44009Mode = max44009_ns.enum("MAX44009Mode")
-MODE_OPTIONS = {
-    "auto": MAX44009Mode.MAX44009_MODE_AUTO,
-    "low_power": MAX44009Mode.MAX44009_MODE_LOW_POWER,
-    "continuous": MAX44009Mode.MAX44009_MODE_CONTINUOUS,
-}
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(
-        unit_of_measurement=UNIT_LUX,
-        accuracy_decimals=3,
-        device_class=DEVICE_CLASS_ILLUMINANCE,
-        state_class=STATE_CLASS_MEASUREMENT,
-    )
-    .extend(
-        {
-            cv.GenerateID(): cv.declare_id(MAX44009Sensor),
-            cv.Optional(CONF_MODE, default="low_power"): cv.enum(
-                MODE_OPTIONS, lower=True
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x4A))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-    await sensor.register_sensor(var, config)
-
-    cg.add(var.set_mode(config[CONF_MODE]))

esphome/components/max6675/sensor.py

@@ -2,6 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor, spi
 from esphome.const import (
+    CONF_ID,
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
@@ -14,18 +15,23 @@ MAX6675Sensor = max6675_ns.class_(
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        MAX6675Sensor,
         unit_of_measurement=UNIT_CELSIUS,
         accuracy_decimals=1,
         device_class=DEVICE_CLASS_TEMPERATURE,
         state_class=STATE_CLASS_MEASUREMENT,
     )
+    .extend(
+        {
+            cv.GenerateID(): cv.declare_id(MAX6675Sensor),
+        }
+    )
     .extend(cv.polling_component_schema("60s"))
     .extend(spi.spi_device_schema())
 )
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await spi.register_spi_device(var, config)
+    await sensor.register_sensor(var, config)

esphome/components/mcp4728/__init__.py

@@ -1,29 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c
-from esphome.const import CONF_ID
-
-CODEOWNERS = ["@berfenger"]
-DEPENDENCIES = ["i2c"]
-MULTI_CONF = True
-CONF_STORE_IN_EEPROM = "store_in_eeprom"
-
-mcp4728_ns = cg.esphome_ns.namespace("mcp4728")
-MCP4728Component = mcp4728_ns.class_("MCP4728Component", cg.Component, i2c.I2CDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(MCP4728Component),
-            cv.Optional(CONF_STORE_IN_EEPROM, default=False): cv.boolean,
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-    .extend(i2c.i2c_device_schema(0x60))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID], config[CONF_STORE_IN_EEPROM])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)

esphome/components/mcp4728/mcp4728_output.cpp

@@ -1,121 +0,0 @@
-#include "mcp4728_output.h"
-
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace mcp4728 {
-
-static const char *const TAG = "mcp4728";
-
-void MCP4728Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up MCP4728 (0x%02X)...", this->address_);
-  auto err = this->write(nullptr, 0);
-  if (err != i2c::ERROR_OK) {
-    this->mark_failed();
-    return;
-  }
-}
-
-void MCP4728Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "MCP4728:");
-  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with MCP4728 failed!");
-  }
-}
-
-void MCP4728Component::loop() {
-  if (this->update_) {
-    this->update_ = false;
-    if (this->store_in_eeprom_) {
-      if (!this->seq_write_()) {
-        this->status_set_error();
-      } else {
-        this->status_clear_error();
-      }
-    } else {
-      if (!this->multi_write_()) {
-        this->status_set_error();
-      } else {
-        this->status_clear_error();
-      }
-    }
-  }
-}
-
-void MCP4728Component::set_channel_value_(MCP4728ChannelIdx channel, uint16_t value) {
-  uint8_t cn = 0;
-  if (channel == MCP4728_CHANNEL_A) {
-    cn = 'A';
-  } else if (channel == MCP4728_CHANNEL_B) {
-    cn = 'B';
-  } else if (channel == MCP4728_CHANNEL_C) {
-    cn = 'C';
-  } else {
-    cn = 'D';
-  }
-  ESP_LOGV(TAG, "Setting MCP4728 channel %c to %d!", cn, value);
-  reg_[channel].data = value;
-  this->update_ = true;
-}
-
-bool MCP4728Component::multi_write_() {
-  i2c::ErrorCode err[4];
-  for (uint8_t i = 0; i < 4; ++i) {
-    uint8_t wd[3];
-    wd[0] = ((uint8_t) CMD::MULTI_WRITE | (i << 1)) & 0xFE;
-    wd[1] = ((uint8_t) reg_[i].vref << 7) | ((uint8_t) reg_[i].pd << 5) | ((uint8_t) reg_[i].gain << 4) |
-            (reg_[i].data >> 8);
-    wd[2] = reg_[i].data & 0xFF;
-    err[i] = this->write(wd, sizeof(wd));
-  }
-  bool ok = true;
-  for (auto &e : err) {
-    if (e != i2c::ERROR_OK) {
-      ok = false;
-      break;
-    }
-  }
-  return ok;
-}
-
-bool MCP4728Component::seq_write_() {
-  uint8_t wd[9];
-  wd[0] = (uint8_t) CMD::SEQ_WRITE;
-  for (uint8_t i = 0; i < 4; i++) {
-    wd[i * 2 + 1] = ((uint8_t) reg_[i].vref << 7) | ((uint8_t) reg_[i].pd << 5) | ((uint8_t) reg_[i].gain << 4) |
-                    (reg_[i].data >> 8);
-    wd[i * 2 + 2] = reg_[i].data & 0xFF;
-  }
-  auto err = this->write(wd, sizeof(wd));
-  return err == i2c::ERROR_OK;
-}
-
-void MCP4728Component::select_vref_(MCP4728ChannelIdx channel, MCP4728Vref vref) {
-  reg_[channel].vref = vref;
-
-  this->update_ = true;
-}
-
-void MCP4728Component::select_power_down_(MCP4728ChannelIdx channel, MCP4728PwrDown pd) {
-  reg_[channel].pd = pd;
-
-  this->update_ = true;
-}
-
-void MCP4728Component::select_gain_(MCP4728ChannelIdx channel, MCP4728Gain gain) {
-  reg_[channel].gain = gain;
-
-  this->update_ = true;
-}
-
-void MCP4728Channel::write_state(float state) {
-  const uint16_t max_duty = 4095;
-  const float duty_rounded = roundf(state * max_duty);
-  auto duty = static_cast<uint16_t>(duty_rounded);
-  this->parent_->set_channel_value_(this->channel_, duty);
-}
-
-}  // namespace mcp4728
-}  // namespace esphome

esphome/components/mcp4728/mcp4728_output.h

@@ -1,91 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/output/float_output.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace mcp4728 {
-
-enum class CMD {
-  FAST_WRITE = 0x00,
-  MULTI_WRITE = 0x40,
-  SINGLE_WRITE = 0x58,
-  SEQ_WRITE = 0x50,
-  SELECT_VREF = 0x80,
-  SELECT_GAIN = 0xC0,
-  SELECT_POWER_DOWN = 0xA0
-};
-
-enum MCP4728Vref { MCP4728_VREF_VDD = 0, MCP4728_VREF_INTERNAL_2_8V = 1 };
-
-enum MCP4728PwrDown {
-  MCP4728_PD_NORMAL = 0,
-  MCP4728_PD_GND_1KOHM = 1,
-  MCP4728_PD_GND_100KOHM = 2,
-  MCP4728_PD_GND_500KOHM = 3
-};
-
-enum MCP4728Gain { MCP4728_GAIN_X1 = 0, MCP4728_GAIN_X2 = 1 };
-
-enum MCP4728ChannelIdx { MCP4728_CHANNEL_A = 0, MCP4728_CHANNEL_B = 1, MCP4728_CHANNEL_C = 2, MCP4728_CHANNEL_D = 3 };
-
-struct DACInputData {
-  MCP4728Vref vref;
-  MCP4728PwrDown pd;
-  MCP4728Gain gain;
-  uint16_t data;
-};
-
-class MCP4728Channel;
-
-/// MCP4728 float output component.
-class MCP4728Component : public Component, public i2c::I2CDevice {
- public:
-  MCP4728Component(bool store_in_eeprom) : store_in_eeprom_(store_in_eeprom) {}
-
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override { return setup_priority::HARDWARE; }
-  void loop() override;
-
- protected:
-  friend MCP4728Channel;
-  void set_channel_value_(MCP4728ChannelIdx channel, uint16_t value);
-  bool multi_write_();
-  bool seq_write_();
-  void select_vref_(MCP4728ChannelIdx channel, MCP4728Vref vref);
-  void select_power_down_(MCP4728ChannelIdx channel, MCP4728PwrDown pd);
-  void select_gain_(MCP4728ChannelIdx channel, MCP4728Gain gain);
-
- private:
-  DACInputData reg_[4];
-  bool store_in_eeprom_ = false;
-  bool update_ = false;
-};
-
-class MCP4728Channel : public output::FloatOutput {
- public:
-  MCP4728Channel(MCP4728Component *parent, MCP4728ChannelIdx channel, MCP4728Vref vref, MCP4728Gain gain,
-                 MCP4728PwrDown pwrdown)
-      : parent_(parent), channel_(channel), vref_(vref), gain_(gain), pwrdown_(pwrdown) {
-    // update VREF
-    parent->select_vref_(channel, vref_);
-    // update PD
-    parent->select_power_down_(channel, pwrdown_);
-    // update GAIN
-    parent->select_gain_(channel, gain_);
-  }
-
- protected:
-  void write_state(float state) override;
-
-  MCP4728Component *parent_;
-  MCP4728ChannelIdx channel_;
-  MCP4728Vref vref_;
-  MCP4728Gain gain_;
-  MCP4728PwrDown pwrdown_;
-};
-
-}  // namespace mcp4728
-}  // namespace esphome

esphome/components/mcp4728/output.py

@@ -1,63 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import output
-from esphome.const import CONF_CHANNEL, CONF_ID, CONF_GAIN
-from . import MCP4728Component, mcp4728_ns
-
-DEPENDENCIES = ["mcp4728"]
-
-MCP4728Channel = mcp4728_ns.class_("MCP4728Channel", output.FloatOutput)
-CONF_MCP4728_ID = "mcp4728_id"
-CONF_VREF = "vref"
-CONF_POWER_DOWN = "power_down"
-
-MCP4728Vref = mcp4728_ns.enum("MCP4728Vref")
-VREF_OPTIONS = {
-    "vdd": MCP4728Vref.MCP4728_VREF_VDD,
-    "internal": MCP4728Vref.MCP4728_VREF_INTERNAL_2_8V,
-}
-
-MCP4728Gain = mcp4728_ns.enum("MCP4728Gain")
-GAIN_OPTIONS = {"X1": MCP4728Gain.MCP4728_GAIN_X1, "X2": MCP4728Gain.MCP4728_GAIN_X2}
-
-MCP4728PwrDown = mcp4728_ns.enum("MCP4728PwrDown")
-PWRDOWN_OPTIONS = {
-    "normal": MCP4728PwrDown.MCP4728_PD_NORMAL,
-    "gnd_1k": MCP4728PwrDown.MCP4728_PD_GND_1KOHM,
-    "gnd_100k": MCP4728PwrDown.MCP4728_PD_GND_100KOHM,
-    "gnd_500k": MCP4728PwrDown.MCP4728_PD_GND_500KOHM,
-}
-
-MCP4728ChannelIdx = mcp4728_ns.enum("MCP4728ChannelIdx")
-CHANNEL_OPTIONS = {
-    "A": MCP4728ChannelIdx.MCP4728_CHANNEL_A,
-    "B": MCP4728ChannelIdx.MCP4728_CHANNEL_B,
-    "C": MCP4728ChannelIdx.MCP4728_CHANNEL_C,
-    "D": MCP4728ChannelIdx.MCP4728_CHANNEL_D,
-}
-
-CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
-    {
-        cv.Required(CONF_ID): cv.declare_id(MCP4728Channel),
-        cv.GenerateID(CONF_MCP4728_ID): cv.use_id(MCP4728Component),
-        cv.Required(CONF_CHANNEL): cv.enum(CHANNEL_OPTIONS, upper=True),
-        cv.Optional(CONF_VREF, default="vdd"): cv.enum(VREF_OPTIONS, upper=False),
-        cv.Optional(CONF_POWER_DOWN, default="normal"): cv.enum(
-            PWRDOWN_OPTIONS, upper=False
-        ),
-        cv.Optional(CONF_GAIN, default="X1"): cv.enum(GAIN_OPTIONS, upper=True),
-    }
-)
-
-
-async def to_code(config):
-    paren = await cg.get_variable(config[CONF_MCP4728_ID])
-    var = cg.new_Pvariable(
-        config[CONF_ID],
-        paren,
-        config[CONF_CHANNEL],
-        config[CONF_VREF],
-        config[CONF_GAIN],
-        config[CONF_POWER_DOWN],
-    )
-    await output.register_output(var, config)

esphome/components/mcp9808/sensor.py

@@ -2,6 +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,
     DEVICE_CLASS_TEMPERATURE,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
@@ -17,18 +18,23 @@ MCP9808Sensor = mcp9808_ns.class_(
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        MCP9808Sensor,
         unit_of_measurement=UNIT_CELSIUS,
         accuracy_decimals=1,
         device_class=DEVICE_CLASS_TEMPERATURE,
         state_class=STATE_CLASS_MEASUREMENT,
     )
+    .extend(
+        {
+            cv.GenerateID(): cv.declare_id(MCP9808Sensor),
+        }
+    )
     .extend(cv.polling_component_schema("60s"))
     .extend(i2c.i2c_device_schema(0x18))
 )
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
+    await sensor.register_sensor(var, config)

esphome/components/modbus_controller/binary_sensor/__init__.py

@@ -29,11 +29,11 @@ ModbusBinarySensor = modbus_controller_ns.class_(
 )
 
 CONFIG_SCHEMA = cv.All(
-    binary_sensor.binary_sensor_schema(ModbusBinarySensor)
-    .extend(cv.COMPONENT_SCHEMA)
+    binary_sensor.BINARY_SENSOR_SCHEMA.extend(cv.COMPONENT_SCHEMA)
     .extend(ModbusItemBaseSchema)
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(ModbusBinarySensor),
             cv.Optional(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
         }
     ),

esphome/components/mopeka_ble/__init__.py

@@ -1,23 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import esp32_ble_tracker
-from esphome.const import CONF_ID
-
-CODEOWNERS = ["@spbrogan"]
-DEPENDENCIES = ["esp32_ble_tracker"]
-
-mopeka_ble_ns = cg.esphome_ns.namespace("mopeka_ble")
-MopekaListener = mopeka_ble_ns.class_(
-    "MopekaListener", esp32_ble_tracker.ESPBTDeviceListener
-)
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(MopekaListener),
-    }
-).extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await esp32_ble_tracker.register_ble_device(var, config)

esphome/components/mopeka_ble/mopeka_ble.cpp

@@ -1,50 +0,0 @@
-#include "mopeka_ble.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace mopeka_ble {
-
-static const char *const TAG = "mopeka_ble";
-static const uint8_t MANUFACTURER_DATA_LENGTH = 10;
-static const uint16_t MANUFACTURER_ID = 0x0059;
-
-/**
- * Parse all incoming BLE payloads to see if it is a Mopeka BLE advertisement.
- * Currently this supports the following products:
- *
- *   Mopeka Pro Check.
- *    If the sync button is pressed, report the MAC so a user can add this as a sensor.
- */
-
-bool MopekaListener::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
-  const auto &manu_datas = device.get_manufacturer_datas();
-
-  if (manu_datas.size() != 1) {
-    return false;
-  }
-
-  const auto &manu_data = manu_datas[0];
-
-  if (manu_data.data.size() != MANUFACTURER_DATA_LENGTH) {
-    return false;
-  }
-
-  if (manu_data.uuid != esp32_ble_tracker::ESPBTUUID::from_uint16(MANUFACTURER_ID)) {
-    return false;
-  }
-
-  if (this->parse_sync_button_(manu_data.data)) {
-    // button pressed
-    ESP_LOGI(TAG, "SENSOR FOUND: %s", device.address_str().c_str());
-  }
-  return false;
-}
-
-bool MopekaListener::parse_sync_button_(const std::vector<uint8_t> &message) { return (message[2] & 0x80) != 0; }
-
-}  // namespace mopeka_ble
-}  // namespace esphome
-
-#endif

esphome/components/mopeka_ble/mopeka_ble.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace mopeka_ble {
-
-class MopekaListener : public esp32_ble_tracker::ESPBTDeviceListener {
- public:
-  bool parse_device(const esp32_ble_tracker::ESPBTDevice &device) override;
-
- protected:
-  bool parse_sync_button_(const std::vector<uint8_t> &message);
-};
-
-}  // namespace mopeka_ble
-}  // namespace esphome
-
-#endif

esphome/components/mopeka_pro_check/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@spbrogan"]

esphome/components/mopeka_pro_check/mopeka_pro_check.cpp

@@ -1,136 +0,0 @@
-#include "mopeka_pro_check.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace mopeka_pro_check {
-
-static const char *const TAG = "mopeka_pro_check";
-static const uint8_t MANUFACTURER_DATA_LENGTH = 10;
-static const uint16_t MANUFACTURER_ID = 0x0059;
-static const double MOPEKA_LPG_COEF[] = {0.573045, -0.002822, -0.00000535};  // Magic numbers provided by Mopeka
-
-void MopekaProCheck::dump_config() {
-  ESP_LOGCONFIG(TAG, "Mopeka Pro Check");
-  LOG_SENSOR("  ", "Level", this->level_);
-  LOG_SENSOR("  ", "Temperature", this->temperature_);
-  LOG_SENSOR("  ", "Battery Level", this->battery_level_);
-  LOG_SENSOR("  ", "Reading Distance", this->distance_);
-}
-
-/**
- * Main parse function that gets called for all ble advertisements.
- * Check if advertisement is for our sensor and if so decode it and
- * update the sensor state data.
- */
-bool MopekaProCheck::parse_device(const esp32_ble_tracker::ESPBTDevice &device) {
-  if (device.address_uint64() != this->address_) {
-    return false;
-  }
-
-  ESP_LOGVV(TAG, "parse_device(): MAC address %s found.", device.address_str().c_str());
-
-  const auto &manu_datas = device.get_manufacturer_datas();
-
-  if (manu_datas.size() != 1) {
-    ESP_LOGE(TAG, "Unexpected manu_datas size (%d)", manu_datas.size());
-    return false;
-  }
-
-  const auto &manu_data = manu_datas[0];
-
-  ESP_LOGVV(TAG, "Manufacturer data:");
-  for (const uint8_t byte : manu_data.data) {
-    ESP_LOGVV(TAG, "0x%02x", byte);
-  }
-
-  if (manu_data.data.size() != MANUFACTURER_DATA_LENGTH) {
-    ESP_LOGE(TAG, "Unexpected manu_data size (%d)", manu_data.data.size());
-    return false;
-  }
-
-  // Now parse the data - See Datasheet for definition
-
-  if (static_cast<SensorType>(manu_data.data[0]) != STANDARD_BOTTOM_UP) {
-    ESP_LOGE(TAG, "Unsupported Sensor Type (0x%X)", manu_data.data[0]);
-    return false;
-  }
-
-  // Get battery level first
-  if (this->battery_level_ != nullptr) {
-    uint8_t level = this->parse_battery_level_(manu_data.data);
-    this->battery_level_->publish_state(level);
-  }
-
-  // Get distance and level if either are sensors
-  if ((this->distance_ != nullptr) || (this->level_ != nullptr)) {
-    uint32_t distance_value = this->parse_distance_(manu_data.data);
-    SensorReadQuality quality_value = this->parse_read_quality_(manu_data.data);
-    ESP_LOGD(TAG, "Distance Sensor: Quality (0x%X) Distance (%dmm)", quality_value, distance_value);
-    if (quality_value < QUALITY_HIGH) {
-      ESP_LOGW(TAG, "Poor read quality.");
-    }
-    if (quality_value < QUALITY_MED) {
-      // if really bad reading set to 0
-      ESP_LOGW(TAG, "Setting distance to 0");
-      distance_value = 0;
-    }
-
-    // update distance sensor
-    if (this->distance_ != nullptr) {
-      this->distance_->publish_state(distance_value);
-    }
-
-    // update level sensor
-    if (this->level_ != nullptr) {
-      uint8_t tank_level = 0;
-      if (distance_value >= this->full_mm_) {
-        tank_level = 100;  // cap at 100%
-      } else if (distance_value > this->empty_mm_) {
-        tank_level = ((100.0f / (this->full_mm_ - this->empty_mm_)) * (distance_value - this->empty_mm_));
-      }
-      this->level_->publish_state(tank_level);
-    }
-  }
-
-  // Get temperature of sensor
-  if (this->temperature_ != nullptr) {
-    uint8_t temp_in_c = this->parse_temperature_(manu_data.data);
-    this->temperature_->publish_state(temp_in_c);
-  }
-
-  return true;
-}
-
-uint8_t MopekaProCheck::parse_battery_level_(const std::vector<uint8_t> &message) {
-  float v = (float) ((message[1] & 0x7F) / 32.0f);
-  // convert voltage and scale for CR2032
-  float percent = (v - 2.2f) / 0.65f * 100.0f;
-  if (percent < 0.0f) {
-    return 0;
-  }
-  if (percent > 100.0f) {
-    return 100;
-  }
-  return (uint8_t) percent;
-}
-
-uint32_t MopekaProCheck::parse_distance_(const std::vector<uint8_t> &message) {
-  uint16_t raw = (message[4] * 256) + message[3];
-  double raw_level = raw & 0x3FFF;
-  double raw_t = (message[2] & 0x7F);
-
-  return (uint32_t)(raw_level * (MOPEKA_LPG_COEF[0] + MOPEKA_LPG_COEF[1] * raw_t + MOPEKA_LPG_COEF[2] * raw_t * raw_t));
-}
-
-uint8_t MopekaProCheck::parse_temperature_(const std::vector<uint8_t> &message) { return (message[2] & 0x7F) - 40; }
-
-SensorReadQuality MopekaProCheck::parse_read_quality_(const std::vector<uint8_t> &message) {
-  return static_cast<SensorReadQuality>(message[4] >> 6);
-}
-
-}  // namespace mopeka_pro_check
-}  // namespace esphome
-
-#endif

esphome/components/mopeka_pro_check/mopeka_pro_check.h

@@ -1,58 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
-
-#ifdef USE_ESP32
-
-namespace esphome {
-namespace mopeka_pro_check {
-
-enum SensorType {
-  STANDARD_BOTTOM_UP = 0x03,
-  TOP_DOWN_AIR_ABOVE = 0x04,
-  BOTTOM_UP_WATER = 0x05
-  // all other values are reserved
-};
-
-// Sensor read quality.  If sensor is poorly placed or tank level
-// gets too low the read quality will show and the distanace
-// measurement may be inaccurate.
-enum SensorReadQuality { QUALITY_HIGH = 0x3, QUALITY_MED = 0x2, QUALITY_LOW = 0x1, QUALITY_NONE = 0x0 };
-
-class MopekaProCheck : 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_level(sensor::Sensor *level) { level_ = level; };
-  void set_temperature(sensor::Sensor *temperature) { temperature_ = temperature; };
-  void set_battery_level(sensor::Sensor *bat) { battery_level_ = bat; };
-  void set_distance(sensor::Sensor *distance) { distance_ = distance; };
-  void set_tank_full(float full) { full_mm_ = full; };
-  void set_tank_empty(float empty) { empty_mm_ = empty; };
-
- protected:
-  uint64_t address_;
-  sensor::Sensor *level_{nullptr};
-  sensor::Sensor *temperature_{nullptr};
-  sensor::Sensor *distance_{nullptr};
-  sensor::Sensor *battery_level_{nullptr};
-
-  uint32_t full_mm_;
-  uint32_t empty_mm_;
-
-  uint8_t parse_battery_level_(const std::vector<uint8_t> &message);
-  uint32_t parse_distance_(const std::vector<uint8_t> &message);
-  uint8_t parse_temperature_(const std::vector<uint8_t> &message);
-  SensorReadQuality parse_read_quality_(const std::vector<uint8_t> &message);
-};
-
-}  // namespace mopeka_pro_check
-}  // namespace esphome
-
-#endif

esphome/components/mopeka_pro_check/sensor.py

@@ -1,131 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, esp32_ble_tracker
-from esphome.const import (
-    CONF_DISTANCE,
-    CONF_MAC_ADDRESS,
-    CONF_ID,
-    ICON_THERMOMETER,
-    ICON_RULER,
-    UNIT_PERCENT,
-    CONF_LEVEL,
-    CONF_TEMPERATURE,
-    DEVICE_CLASS_TEMPERATURE,
-    UNIT_CELSIUS,
-    STATE_CLASS_MEASUREMENT,
-    CONF_BATTERY_LEVEL,
-    DEVICE_CLASS_BATTERY,
-)
-
-CONF_TANK_TYPE = "tank_type"
-CONF_CUSTOM_DISTANCE_FULL = "custom_distance_full"
-CONF_CUSTOM_DISTANCE_EMPTY = "custom_distance_empty"
-
-ICON_PROPANE_TANK = "mdi:propane-tank"
-
-TANK_TYPE_CUSTOM = "CUSTOM"
-
-UNIT_MILLIMETER = "mm"
-
-
-def small_distance(value):
-    """small_distance is stored in mm"""
-    meters = cv.distance(value)
-    return meters * 1000
-
-
-#
-# Map of standard tank types to their
-# empty and full distance values.
-# Format is - tank name: (empty distance in mm, full distance in mm)
-#
-CONF_SUPPORTED_TANKS_MAP = {
-    TANK_TYPE_CUSTOM: (0, 100),
-    "20LB_V": (38, 254),  # empty/full readings for 20lb US tank
-    "30LB_V": (38, 381),
-    "40LB_V": (38, 508),
-}
-
-CODEOWNERS = ["@spbrogan"]
-DEPENDENCIES = ["esp32_ble_tracker"]
-
-mopeka_pro_check_ns = cg.esphome_ns.namespace("mopeka_pro_check")
-MopekaProCheck = mopeka_pro_check_ns.class_(
-    "MopekaProCheck", esp32_ble_tracker.ESPBTDeviceListener, cg.Component
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(MopekaProCheck),
-            cv.Required(CONF_MAC_ADDRESS): cv.mac_address,
-            cv.Optional(CONF_CUSTOM_DISTANCE_FULL): small_distance,
-            cv.Optional(CONF_CUSTOM_DISTANCE_EMPTY): small_distance,
-            cv.Required(CONF_TANK_TYPE): cv.enum(CONF_SUPPORTED_TANKS_MAP, upper=True),
-            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                icon=ICON_THERMOMETER,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_TEMPERATURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_LEVEL): sensor.sensor_schema(
-                unit_of_measurement=UNIT_PERCENT,
-                icon=ICON_PROPANE_TANK,
-                accuracy_decimals=0,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_DISTANCE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_MILLIMETER,
-                icon=ICON_RULER,
-                accuracy_decimals=0,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_BATTERY_LEVEL): sensor.sensor_schema(
-                unit_of_measurement=UNIT_PERCENT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_BATTERY,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-        }
-    )
-    .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
-    .extend(cv.COMPONENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await esp32_ble_tracker.register_ble_device(var, config)
-
-    cg.add(var.set_address(config[CONF_MAC_ADDRESS].as_hex))
-
-    if config[CONF_TANK_TYPE] == TANK_TYPE_CUSTOM:
-        # Support custom tank min/max
-        if CONF_CUSTOM_DISTANCE_EMPTY in config:
-            cg.add(var.set_tank_empty(config[CONF_CUSTOM_DISTANCE_EMPTY]))
-        else:
-            cg.add(var.set_tank_empty(CONF_SUPPORTED_TANKS_MAP[TANK_TYPE_CUSTOM][0]))
-        if CONF_CUSTOM_DISTANCE_FULL in config:
-            cg.add(var.set_tank_full(config[CONF_CUSTOM_DISTANCE_FULL]))
-        else:
-            cg.add(var.set_tank_full(CONF_SUPPORTED_TANKS_MAP[TANK_TYPE_CUSTOM][1]))
-    else:
-        # Set the Tank empty and full based on map - User is requesting standard tank
-        t = config[CONF_TANK_TYPE]
-        cg.add(var.set_tank_empty(CONF_SUPPORTED_TANKS_MAP[t][0]))
-        cg.add(var.set_tank_full(CONF_SUPPORTED_TANKS_MAP[t][1]))
-
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature(sens))
-    if CONF_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_LEVEL])
-        cg.add(var.set_level(sens))
-    if CONF_DISTANCE in config:
-        sens = await sensor.new_sensor(config[CONF_DISTANCE])
-        cg.add(var.set_distance(sens))
-    if CONF_BATTERY_LEVEL in config:
-        sens = await sensor.new_sensor(config[CONF_BATTERY_LEVEL])
-        cg.add(var.set_battery_level(sens))

esphome/components/mpr121/binary_sensor.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-from esphome.const import CONF_CHANNEL
+from esphome.const import CONF_CHANNEL, CONF_ID
 from . import (
     mpr121_ns,
     MPR121Component,
@@ -13,8 +13,9 @@ from . import (
 DEPENDENCIES = ["mpr121"]
 MPR121Channel = mpr121_ns.class_("MPR121Channel", binary_sensor.BinarySensor)
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(MPR121Channel).extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
+        cv.GenerateID(): cv.declare_id(MPR121Channel),
         cv.GenerateID(CONF_MPR121_ID): cv.use_id(MPR121Component),
         cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=11),
         cv.Optional(CONF_TOUCH_THRESHOLD): cv.int_range(min=0x05, max=0x30),
@@ -24,7 +25,8 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(MPR121Channel).extend(
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
+    await binary_sensor.register_binary_sensor(var, config)
     hub = await cg.get_variable(config[CONF_MPR121_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
 

esphome/components/mpu6886/__init__.py

@@ -1 +0,0 @@
-"""Support for MPC-6886."""

esphome/components/mpu6886/mpu6886.cpp

@@ -1,153 +0,0 @@
-#include "mpu6886.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace mpu6886 {
-
-static const char *const TAG = "mpu6886";
-
-const uint8_t MPU6886_REGISTER_WHO_AM_I = 0x75;
-const uint8_t MPU6886_REGISTER_POWER_MANAGEMENT_1 = 0x6B;
-const uint8_t MPU6886_REGISTER_GYRO_CONFIG = 0x1B;
-const uint8_t MPU6886_REGISTER_ACCEL_CONFIG = 0x1C;
-const uint8_t MPU6886_REGISTER_ACCEL_XOUT_H = 0x3B;
-const uint8_t MPU6886_CLOCK_SOURCE_X_GYRO = 0b001;
-const uint8_t MPU6886_SCALE_2000_DPS = 0b11;
-const uint8_t MPU6886_WHO_AM_I_IDENTIFIER = 0x19;
-const float MPU6886_SCALE_DPS_PER_DIGIT_2000 = 0.060975f;
-const uint8_t MPU6886_RANGE_2G = 0b00;
-const float MPU6886_RANGE_PER_DIGIT_2G = 0.000061f;
-const uint8_t MPU6886_BIT_SLEEP_ENABLED = 6;
-const uint8_t MPU6886_BIT_TEMPERATURE_DISABLED = 3;
-const float GRAVITY_EARTH = 9.80665f;
-// See https://github.com/m5stack/M5-Schematic/blob/master/datasheet/MPU-6886-000193%2Bv1.1_GHIC.PDF.pdf
-// p. 43
-const float TEMPERATURE_SENSITIVITY = 326.8;
-const float TEMPERATURE_OFFSET = 25.0;
-
-void MPU6886Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up MPU6886...");
-  uint8_t who_am_i;
-  if (!this->read_byte(MPU6886_REGISTER_WHO_AM_I, &who_am_i) || who_am_i != MPU6886_WHO_AM_I_IDENTIFIER) {
-    this->mark_failed();
-    return;
-  }
-
-  ESP_LOGV(TAG, "  Setting up Power Management...");
-  // Setup power management
-  uint8_t power_management;
-  if (!this->read_byte(MPU6886_REGISTER_POWER_MANAGEMENT_1, &power_management)) {
-    this->mark_failed();
-    return;
-  }
-  ESP_LOGV(TAG, "  Input power_management: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(power_management));
-  // Set clock source - X-Gyro
-  power_management &= 0b11111000;
-  power_management |= MPU6886_CLOCK_SOURCE_X_GYRO;
-  // Disable sleep
-  power_management &= ~(1 << MPU6886_BIT_SLEEP_ENABLED);
-  // Enable temperature
-  power_management &= ~(1 << MPU6886_BIT_TEMPERATURE_DISABLED);
-  ESP_LOGV(TAG, "  Output power_management: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(power_management));
-  if (!this->write_byte(MPU6886_REGISTER_POWER_MANAGEMENT_1, power_management)) {
-    this->mark_failed();
-    return;
-  }
-
-  ESP_LOGV(TAG, "  Setting up Gyroscope Config...");
-  // Set scale - 2000DPS
-  uint8_t gyro_config;
-  if (!this->read_byte(MPU6886_REGISTER_GYRO_CONFIG, &gyro_config)) {
-    this->mark_failed();
-    return;
-  }
-  ESP_LOGV(TAG, "  Input gyroscope_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(gyro_config));
-  gyro_config &= 0b11100111;
-  gyro_config |= MPU6886_SCALE_2000_DPS << 3;
-  ESP_LOGV(TAG, "  Output gyro_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(gyro_config));
-  if (!this->write_byte(MPU6886_REGISTER_GYRO_CONFIG, gyro_config)) {
-    this->mark_failed();
-    return;
-  }
-
-  ESP_LOGV(TAG, "  Setting up Accelerometer Config...");
-  // Set range - 2G
-  uint8_t accel_config;
-  if (!this->read_byte(MPU6886_REGISTER_ACCEL_CONFIG, &accel_config)) {
-    this->mark_failed();
-    return;
-  }
-  ESP_LOGV(TAG, "    Input accelerometer_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(accel_config));
-  accel_config &= 0b11100111;
-  accel_config |= (MPU6886_RANGE_2G << 3);
-  ESP_LOGV(TAG, "    Output accel_config: 0b" BYTE_TO_BINARY_PATTERN, BYTE_TO_BINARY(accel_config));
-  if (!this->write_byte(MPU6886_REGISTER_GYRO_CONFIG, gyro_config)) {
-    this->mark_failed();
-    return;
-  }
-}
-
-void MPU6886Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "MPU6886:");
-  LOG_I2C_DEVICE(this);
-  if (this->is_failed()) {
-    ESP_LOGE(TAG, "Communication with MPU6886 failed!");
-  }
-  LOG_UPDATE_INTERVAL(this);
-  LOG_SENSOR("  ", "Acceleration X", this->accel_x_sensor_);
-  LOG_SENSOR("  ", "Acceleration Y", this->accel_y_sensor_);
-  LOG_SENSOR("  ", "Acceleration Z", this->accel_z_sensor_);
-  LOG_SENSOR("  ", "Gyro X", this->gyro_x_sensor_);
-  LOG_SENSOR("  ", "Gyro Y", this->gyro_y_sensor_);
-  LOG_SENSOR("  ", "Gyro Z", this->gyro_z_sensor_);
-  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
-}
-
-void MPU6886Component::update() {
-  ESP_LOGV(TAG, "    Updating MPU6886...");
-  uint16_t raw_data[7];
-  if (!this->read_bytes_16(MPU6886_REGISTER_ACCEL_XOUT_H, raw_data, 7)) {
-    this->status_set_warning();
-    return;
-  }
-  auto *data = reinterpret_cast<int16_t *>(raw_data);
-
-  float accel_x = data[0] * MPU6886_RANGE_PER_DIGIT_2G * GRAVITY_EARTH;
-  float accel_y = data[1] * MPU6886_RANGE_PER_DIGIT_2G * GRAVITY_EARTH;
-  float accel_z = data[2] * MPU6886_RANGE_PER_DIGIT_2G * GRAVITY_EARTH;
-
-  float temperature = data[3] / TEMPERATURE_SENSITIVITY + TEMPERATURE_OFFSET;
-
-  float gyro_x = data[4] * MPU6886_SCALE_DPS_PER_DIGIT_2000;
-  float gyro_y = data[5] * MPU6886_SCALE_DPS_PER_DIGIT_2000;
-  float gyro_z = data[6] * MPU6886_SCALE_DPS_PER_DIGIT_2000;
-
-  ESP_LOGD(TAG,
-           "Got accel={x=%.3f m/s², y=%.3f m/s², z=%.3f m/s²}, "
-           "gyro={x=%.3f °/s, y=%.3f °/s, z=%.3f °/s}, temp=%.3f°C",
-           accel_x, accel_y, accel_z, gyro_x, gyro_y, gyro_z, temperature);
-
-  if (this->accel_x_sensor_ != nullptr)
-    this->accel_x_sensor_->publish_state(accel_x);
-  if (this->accel_y_sensor_ != nullptr)
-    this->accel_y_sensor_->publish_state(accel_y);
-  if (this->accel_z_sensor_ != nullptr)
-    this->accel_z_sensor_->publish_state(accel_z);
-
-  if (this->temperature_sensor_ != nullptr)
-    this->temperature_sensor_->publish_state(temperature);
-
-  if (this->gyro_x_sensor_ != nullptr)
-    this->gyro_x_sensor_->publish_state(gyro_x);
-  if (this->gyro_y_sensor_ != nullptr)
-    this->gyro_y_sensor_->publish_state(gyro_y);
-  if (this->gyro_z_sensor_ != nullptr)
-    this->gyro_z_sensor_->publish_state(gyro_z);
-
-  this->status_clear_warning();
-}
-
-float MPU6886Component::get_setup_priority() const { return setup_priority::DATA; }
-
-}  // namespace mpu6886
-}  // namespace esphome

esphome/components/mpu6886/mpu6886.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace mpu6886 {
-
-class MPU6886Component : public PollingComponent, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void dump_config() override;
-
-  void update() override;
-
-  float get_setup_priority() const override;
-
-  void set_accel_x_sensor(sensor::Sensor *accel_x_sensor) { accel_x_sensor_ = accel_x_sensor; }
-  void set_accel_y_sensor(sensor::Sensor *accel_y_sensor) { accel_y_sensor_ = accel_y_sensor; }
-  void set_accel_z_sensor(sensor::Sensor *accel_z_sensor) { accel_z_sensor_ = accel_z_sensor; }
-  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
-  void set_gyro_x_sensor(sensor::Sensor *gyro_x_sensor) { gyro_x_sensor_ = gyro_x_sensor; }
-  void set_gyro_y_sensor(sensor::Sensor *gyro_y_sensor) { gyro_y_sensor_ = gyro_y_sensor; }
-  void set_gyro_z_sensor(sensor::Sensor *gyro_z_sensor) { gyro_z_sensor_ = gyro_z_sensor; }
-
- protected:
-  sensor::Sensor *accel_x_sensor_{nullptr};
-  sensor::Sensor *accel_y_sensor_{nullptr};
-  sensor::Sensor *accel_z_sensor_{nullptr};
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *gyro_x_sensor_{nullptr};
-  sensor::Sensor *gyro_y_sensor_{nullptr};
-  sensor::Sensor *gyro_z_sensor_{nullptr};
-};
-;
-
-}  // namespace mpu6886
-}  // namespace esphome

esphome/components/mpu6886/sensor.py

@@ -1,85 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import i2c, sensor
-from esphome.const import (
-    CONF_ID,
-    CONF_TEMPERATURE,
-    DEVICE_CLASS_TEMPERATURE,
-    ICON_BRIEFCASE_DOWNLOAD,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_METER_PER_SECOND_SQUARED,
-    ICON_SCREEN_ROTATION,
-    UNIT_DEGREE_PER_SECOND,
-    UNIT_CELSIUS,
-)
-
-CODEOWNERS = ["@fabaff"]
-DEPENDENCIES = ["i2c"]
-
-CONF_ACCEL_X = "accel_x"
-CONF_ACCEL_Y = "accel_y"
-CONF_ACCEL_Z = "accel_z"
-CONF_GYRO_X = "gyro_x"
-CONF_GYRO_Y = "gyro_y"
-CONF_GYRO_Z = "gyro_z"
-
-mpu6886_ns = cg.esphome_ns.namespace("mpu6886")
-MPU6886Component = mpu6886_ns.class_(
-    "MPU6886Component", cg.PollingComponent, i2c.I2CDevice
-)
-
-accel_schema = sensor.sensor_schema(
-    unit_of_measurement=UNIT_METER_PER_SECOND_SQUARED,
-    icon=ICON_BRIEFCASE_DOWNLOAD,
-    accuracy_decimals=2,
-    state_class=STATE_CLASS_MEASUREMENT,
-)
-gyro_schema = sensor.sensor_schema(
-    unit_of_measurement=UNIT_DEGREE_PER_SECOND,
-    icon=ICON_SCREEN_ROTATION,
-    accuracy_decimals=2,
-    state_class=STATE_CLASS_MEASUREMENT,
-)
-temperature_schema = sensor.sensor_schema(
-    unit_of_measurement=UNIT_CELSIUS,
-    accuracy_decimals=1,
-    device_class=DEVICE_CLASS_TEMPERATURE,
-    state_class=STATE_CLASS_MEASUREMENT,
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(MPU6886Component),
-            cv.Optional(CONF_ACCEL_X): accel_schema,
-            cv.Optional(CONF_ACCEL_Y): accel_schema,
-            cv.Optional(CONF_ACCEL_Z): accel_schema,
-            cv.Optional(CONF_GYRO_X): gyro_schema,
-            cv.Optional(CONF_GYRO_Y): gyro_schema,
-            cv.Optional(CONF_GYRO_Z): gyro_schema,
-            cv.Optional(CONF_TEMPERATURE): temperature_schema,
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x68))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-
-    for d in ["x", "y", "z"]:
-        accel_key = f"accel_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_accel_{d}_sensor")(sens))
-        accel_key = f"gyro_{d}"
-        if accel_key in config:
-            sens = await sensor.new_sensor(config[accel_key])
-            cg.add(getattr(var, f"set_gyro_{d}_sensor")(sens))
-
-    if CONF_TEMPERATURE in config:
-        sens = await sensor.new_sensor(config[CONF_TEMPERATURE])
-        cg.add(var.set_temperature_sensor(sens))

esphome/components/mqtt/mqtt_client.cpp

@@ -1,4 +1,5 @@
 #include "mqtt_client.h"
+#define USE_MQTT
 
 #ifdef USE_MQTT
 

esphome/components/mqtt_subscribe/sensor/__init__.py

@@ -2,8 +2,10 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import mqtt, sensor
 from esphome.const import (
+    CONF_ID,
     CONF_QOS,
     CONF_TOPIC,
+    STATE_CLASS_NONE,
 )
 from .. import mqtt_subscribe_ns
 
@@ -16,11 +18,12 @@ MQTTSubscribeSensor = mqtt_subscribe_ns.class_(
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        MQTTSubscribeSensor,
         accuracy_decimals=1,
+        state_class=STATE_CLASS_NONE,
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(MQTTSubscribeSensor),
             cv.GenerateID(CONF_MQTT_PARENT_ID): cv.use_id(mqtt.MQTTClientComponent),
             cv.Required(CONF_TOPIC): cv.subscribe_topic,
             cv.Optional(CONF_QOS, default=0): cv.mqtt_qos,
@@ -31,8 +34,9 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     parent = await cg.get_variable(config[CONF_MQTT_PARENT_ID])
     cg.add(var.set_parent(parent))

esphome/components/nextion/binary_sensor/__init__.py

@@ -20,9 +20,9 @@ NextionBinarySensor = nextion_ns.class_(
 )
 
 CONFIG_SCHEMA = cv.All(
-    binary_sensor.binary_sensor_schema(NextionBinarySensor)
-    .extend(
+    binary_sensor.BINARY_SENSOR_SCHEMA.extend(
         {
+            cv.GenerateID(): cv.declare_id(NextionBinarySensor),
             cv.Optional(CONF_PAGE_ID): cv.uint8_t,
             cv.Optional(CONF_COMPONENT_ID): cv.uint8_t,
         }

esphome/components/nextion/sensor/__init__.py

@@ -44,11 +44,11 @@ def _validate(config):
 
 CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
-        NextionSensor,
         accuracy_decimals=2,
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(NextionSensor),
             cv.Optional(CONF_PRECISION, default=0): cv.int_range(min=0, max=8),
             cv.Optional(CONF_WAVE_CHANNEL_ID): CheckWaveID,
             cv.Optional(CONF_COMPONENT_ID): cv.uint8_t,

esphome/components/nextion/text_sensor/__init__.py

@@ -17,7 +17,7 @@ NextionTextSensor = nextion_ns.class_(
 )
 
 CONFIG_SCHEMA = (
-    text_sensor.text_sensor_schema(NextionTextSensor)
+    text_sensor.text_sensor_schema(klass=NextionTextSensor)
     .extend(CONFIG_TEXT_COMPONENT_SCHEMA)
     .extend(cv.polling_component_schema("never"))
 )

esphome/components/ntc/sensor.py

@@ -5,6 +5,7 @@ import esphome.codegen as cg
 from esphome.components import sensor
 from esphome.const import (
     CONF_CALIBRATION,
+    CONF_ID,
     CONF_REFERENCE_RESISTANCE,
     CONF_REFERENCE_TEMPERATURE,
     CONF_SENSOR,
@@ -116,7 +117,6 @@ def process_calibration(value):
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        NTC,
         unit_of_measurement=UNIT_CELSIUS,
         accuracy_decimals=1,
         device_class=DEVICE_CLASS_TEMPERATURE,
@@ -124,6 +124,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(NTC),
             cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
             cv.Required(CONF_CALIBRATION): process_calibration,
         }
@@ -133,8 +134,9 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     sens = await cg.get_variable(config[CONF_SENSOR])
     cg.add(var.set_sensor(sens))

esphome/components/pid/sensor/__init__.py

@@ -2,6 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import sensor
 from esphome.const import (
+    CONF_ID,
     STATE_CLASS_MEASUREMENT,
     UNIT_PERCENT,
     ICON_GAUGE,
@@ -28,7 +29,6 @@ PID_CLIMATE_SENSOR_TYPES = {
 CONF_CLIMATE_ID = "climate_id"
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        PIDClimateSensor,
         unit_of_measurement=UNIT_PERCENT,
         icon=ICON_GAUGE,
         accuracy_decimals=1,
@@ -36,6 +36,7 @@ CONFIG_SCHEMA = (
     )
     .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),
         }
@@ -46,7 +47,8 @@ CONFIG_SCHEMA = (
 
 async def to_code(config):
     parent = await cg.get_variable(config[CONF_CLIMATE_ID])
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
+    await sensor.register_sensor(var, config)
     await cg.register_component(var, config)
 
     cg.add(var.set_parent(parent))

esphome/components/pipsolar/binary_sensor/__init__.py

@@ -1,7 +1,9 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-
+from esphome.const import (
+    CONF_ID,
+)
 from .. import PIPSOLAR_COMPONENT_SCHEMA, CONF_PIPSOLAR_ID
 
 DEPENDENCIES = ["uart"]
@@ -128,7 +130,7 @@ TYPES = [
 ]
 
 CONFIG_SCHEMA = PIPSOLAR_COMPONENT_SCHEMA.extend(
-    {cv.Optional(type): binary_sensor.binary_sensor_schema() for type in TYPES}
+    {cv.Optional(type): binary_sensor.BINARY_SENSOR_SCHEMA for type in TYPES}
 )
 
 
@@ -137,5 +139,6 @@ async def to_code(config):
     for type in TYPES:
         if type in config:
             conf = config[type]
-            var = await binary_sensor.new_binary_sensor(conf)
-            cg.add(getattr(paren, f"set_{type}")(var))
+            sens = cg.new_Pvariable(conf[CONF_ID])
+            await binary_sensor.register_binary_sensor(sens, conf)
+            cg.add(getattr(paren, f"set_{type}")(sens))

esphome/components/pipsolar/sensor/__init__.py

@@ -3,15 +3,18 @@ import esphome.config_validation as cv
 from esphome.components import sensor
 from esphome.const import (
     DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_VOLTAGE,
     ICON_CURRENT_AC,
+    ICON_EMPTY,
     UNIT_AMPERE,
     UNIT_CELSIUS,
     UNIT_HERTZ,
     UNIT_PERCENT,
     UNIT_VOLT,
+    UNIT_EMPTY,
     UNIT_VOLT_AMPS,
     UNIT_WATT,
     CONF_BUS_VOLTAGE,
@@ -71,196 +74,134 @@ CONF_PV_CHARGING_POWER = "pv_charging_power"
 
 TYPES = {
     CONF_GRID_RATING_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_GRID_RATING_CURRENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_AMPERE,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_CURRENT,
+        UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT
     ),
     CONF_AC_OUTPUT_RATING_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_AC_OUTPUT_RATING_FREQUENCY: sensor.sensor_schema(
-        unit_of_measurement=UNIT_HERTZ,
-        icon=ICON_CURRENT_AC,
-        accuracy_decimals=1,
+        UNIT_HERTZ, ICON_CURRENT_AC, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_AC_OUTPUT_RATING_CURRENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_AMPERE,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_CURRENT,
+        UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT
     ),
     CONF_AC_OUTPUT_RATING_APPARENT_POWER: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT_AMPS,
-        accuracy_decimals=1,
+        UNIT_VOLT_AMPS, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_AC_OUTPUT_RATING_ACTIVE_POWER: sensor.sensor_schema(
-        unit_of_measurement=UNIT_WATT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_POWER,
+        UNIT_WATT, ICON_EMPTY, 1, DEVICE_CLASS_POWER
     ),
     CONF_BATTERY_RATING_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_BATTERY_RECHARGE_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_BATTERY_UNDER_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_BATTERY_BULK_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_BATTERY_FLOAT_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_BATTERY_TYPE: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_CURRENT_MAX_AC_CHARGING_CURRENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_AMPERE,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_CURRENT,
+        UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT
     ),
     CONF_CURRENT_MAX_CHARGING_CURRENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_AMPERE,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_CURRENT,
+        UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT
     ),
     CONF_INPUT_VOLTAGE_RANGE: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_OUTPUT_SOURCE_PRIORITY: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_CHARGER_SOURCE_PRIORITY: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_PARALLEL_MAX_NUM: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_MACHINE_TYPE: sensor.sensor_schema(
-        accuracy_decimals=1,
-    ),
-    CONF_TOPOLOGY: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
+    CONF_TOPOLOGY: sensor.sensor_schema(UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY),
     CONF_OUTPUT_MODE: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_BATTERY_REDISCHARGE_VOLTAGE: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_PV_OK_CONDITION_FOR_PARALLEL: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_PV_POWER_BALANCE: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_GRID_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_GRID_FREQUENCY: sensor.sensor_schema(
-        unit_of_measurement=UNIT_HERTZ,
-        icon=ICON_CURRENT_AC,
-        accuracy_decimals=1,
+        UNIT_HERTZ, ICON_CURRENT_AC, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_AC_OUTPUT_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_AC_OUTPUT_FREQUENCY: sensor.sensor_schema(
-        unit_of_measurement=UNIT_HERTZ,
-        icon=ICON_CURRENT_AC,
-        accuracy_decimals=1,
+        UNIT_HERTZ, ICON_CURRENT_AC, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_AC_OUTPUT_APPARENT_POWER: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT_AMPS,
-        accuracy_decimals=1,
+        UNIT_VOLT_AMPS, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_AC_OUTPUT_ACTIVE_POWER: sensor.sensor_schema(
-        unit_of_measurement=UNIT_WATT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_POWER,
+        UNIT_WATT, ICON_EMPTY, 1, DEVICE_CLASS_POWER
     ),
     CONF_OUTPUT_LOAD_PERCENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_PERCENT,
-        accuracy_decimals=1,
+        UNIT_PERCENT, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_BUS_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_BATTERY_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_BATTERY_CHARGING_CURRENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_AMPERE,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_CURRENT,
+        UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT
     ),
     CONF_BATTERY_CAPACITY_PERCENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_PERCENT,
-        accuracy_decimals=1,
+        UNIT_PERCENT, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_INVERTER_HEAT_SINK_TEMPERATURE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_CELSIUS,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_TEMPERATURE,
+        UNIT_CELSIUS, ICON_EMPTY, 1, DEVICE_CLASS_TEMPERATURE
     ),
     CONF_PV_INPUT_CURRENT_FOR_BATTERY: sensor.sensor_schema(
-        unit_of_measurement=UNIT_AMPERE,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_CURRENT,
+        UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT
     ),
     CONF_PV_INPUT_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_BATTERY_VOLTAGE_SCC: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_BATTERY_DISCHARGE_CURRENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_AMPERE,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_CURRENT,
+        UNIT_AMPERE, ICON_EMPTY, 1, DEVICE_CLASS_CURRENT
     ),
     CONF_BATTERY_VOLTAGE_OFFSET_FOR_FANS_ON: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE
     ),
     CONF_EEPROM_VERSION: sensor.sensor_schema(
-        accuracy_decimals=1,
+        UNIT_EMPTY, ICON_EMPTY, 1, DEVICE_CLASS_EMPTY
     ),
     CONF_PV_CHARGING_POWER: sensor.sensor_schema(
-        unit_of_measurement=UNIT_WATT,
-        accuracy_decimals=1,
-        device_class=DEVICE_CLASS_POWER,
+        UNIT_WATT, ICON_EMPTY, 1, DEVICE_CLASS_POWER
     ),
 }
 

esphome/components/pm1006/sensor.py

@@ -16,9 +16,7 @@ CODEOWNERS = ["@habbie"]
 DEPENDENCIES = ["uart"]
 
 pm1006_ns = cg.esphome_ns.namespace("pm1006")
-PM1006Component = pm1006_ns.class_(
-    "PM1006Component", uart.UARTDevice, cg.PollingComponent
-)
+PM1006Component = pm1006_ns.class_("PM1006Component", uart.UARTDevice, cg.Component)
 
 
 CONFIG_SCHEMA = cv.All(

esphome/components/pmsx003/sensor.py

@@ -22,6 +22,7 @@ from esphome.const import (
     DEVICE_CLASS_PM1,
     DEVICE_CLASS_PM10,
     DEVICE_CLASS_PM25,
+    DEVICE_CLASS_EMPTY,
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_TEMPERATURE,
     ICON_CHEMICAL_WEAPON,
@@ -74,22 +75,22 @@ CONFIG_SCHEMA = (
             cv.GenerateID(): cv.declare_id(PMSX003Component),
             cv.Required(CONF_TYPE): cv.enum(PMSX003_TYPES, upper=True),
             cv.Optional(CONF_PM_1_0_STD): sensor.sensor_schema(
-                unit_of_measurement=UNIT_MICROGRAMS_PER_CUBIC_METER,
-                icon=ICON_CHEMICAL_WEAPON,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_PM1,
+                UNIT_MICROGRAMS_PER_CUBIC_METER,
+                ICON_CHEMICAL_WEAPON,
+                0,
+                DEVICE_CLASS_PM1,
             ),
             cv.Optional(CONF_PM_2_5_STD): sensor.sensor_schema(
-                unit_of_measurement=UNIT_MICROGRAMS_PER_CUBIC_METER,
-                icon=ICON_CHEMICAL_WEAPON,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_PM25,
+                UNIT_MICROGRAMS_PER_CUBIC_METER,
+                ICON_CHEMICAL_WEAPON,
+                0,
+                DEVICE_CLASS_PM25,
             ),
             cv.Optional(CONF_PM_10_0_STD): sensor.sensor_schema(
-                unit_of_measurement=UNIT_MICROGRAMS_PER_CUBIC_METER,
-                icon=ICON_CHEMICAL_WEAPON,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_PM10,
+                UNIT_MICROGRAMS_PER_CUBIC_METER,
+                ICON_CHEMICAL_WEAPON,
+                0,
+                DEVICE_CLASS_PM10,
             ),
             cv.Optional(CONF_PM_1_0): sensor.sensor_schema(
                 unit_of_measurement=UNIT_MICROGRAMS_PER_CUBIC_METER,
@@ -110,34 +111,40 @@ CONFIG_SCHEMA = (
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
             cv.Optional(CONF_PM_0_3UM): sensor.sensor_schema(
-                unit_of_measurement=UNIT_COUNT_DECILITRE,
-                icon=ICON_CHEMICAL_WEAPON,
-                accuracy_decimals=0,
+                UNIT_COUNT_DECILITRE,
+                ICON_CHEMICAL_WEAPON,
+                0,
+                DEVICE_CLASS_EMPTY,
             ),
             cv.Optional(CONF_PM_0_5UM): sensor.sensor_schema(
-                unit_of_measurement=UNIT_COUNT_DECILITRE,
-                icon=ICON_CHEMICAL_WEAPON,
-                accuracy_decimals=0,
+                UNIT_COUNT_DECILITRE,
+                ICON_CHEMICAL_WEAPON,
+                0,
+                DEVICE_CLASS_EMPTY,
             ),
             cv.Optional(CONF_PM_1_0UM): sensor.sensor_schema(
-                unit_of_measurement=UNIT_COUNT_DECILITRE,
-                icon=ICON_CHEMICAL_WEAPON,
-                accuracy_decimals=0,
+                UNIT_COUNT_DECILITRE,
+                ICON_CHEMICAL_WEAPON,
+                0,
+                DEVICE_CLASS_EMPTY,
             ),
             cv.Optional(CONF_PM_2_5UM): sensor.sensor_schema(
-                unit_of_measurement=UNIT_COUNT_DECILITRE,
-                icon=ICON_CHEMICAL_WEAPON,
-                accuracy_decimals=0,
+                UNIT_COUNT_DECILITRE,
+                ICON_CHEMICAL_WEAPON,
+                0,
+                DEVICE_CLASS_EMPTY,
             ),
             cv.Optional(CONF_PM_5_0UM): sensor.sensor_schema(
-                unit_of_measurement=UNIT_COUNT_DECILITRE,
-                icon=ICON_CHEMICAL_WEAPON,
-                accuracy_decimals=0,
+                UNIT_COUNT_DECILITRE,
+                ICON_CHEMICAL_WEAPON,
+                0,
+                DEVICE_CLASS_EMPTY,
             ),
             cv.Optional(CONF_PM_10_0UM): sensor.sensor_schema(
-                unit_of_measurement=UNIT_COUNT_DECILITRE,
-                icon=ICON_CHEMICAL_WEAPON,
-                accuracy_decimals=0,
+                UNIT_COUNT_DECILITRE,
+                ICON_CHEMICAL_WEAPON,
+                0,
+                DEVICE_CLASS_EMPTY,
             ),
             cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
                 unit_of_measurement=UNIT_CELSIUS,

esphome/components/pn532/binary_sensor.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-from esphome.const import CONF_UID
+from esphome.const import CONF_UID, CONF_ID
 from esphome.core import HexInt
 from . import pn532_ns, PN532, CONF_PN532_ID
 
@@ -31,8 +31,9 @@ def validate_uid(value):
 
 PN532BinarySensor = pn532_ns.class_("PN532BinarySensor", binary_sensor.BinarySensor)
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(PN532BinarySensor).extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
+        cv.GenerateID(): cv.declare_id(PN532BinarySensor),
         cv.GenerateID(CONF_PN532_ID): cv.use_id(PN532),
         cv.Required(CONF_UID): validate_uid,
     }
@@ -40,7 +41,8 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(PN532BinarySensor).extend(
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
+    await binary_sensor.register_binary_sensor(var, config)
 
     hub = await cg.get_variable(config[CONF_PN532_ID])
     cg.add(hub.register_tag(var))

esphome/components/pulse_counter/sensor.py

@@ -5,6 +5,7 @@ from esphome.components import sensor
 from esphome.const import (
     CONF_COUNT_MODE,
     CONF_FALLING_EDGE,
+    CONF_ID,
     CONF_INTERNAL_FILTER,
     CONF_PIN,
     CONF_RISING_EDGE,
@@ -65,7 +66,6 @@ def validate_count_mode(value):
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        PulseCounterSensor,
         unit_of_measurement=UNIT_PULSES_PER_MINUTE,
         icon=ICON_PULSE,
         accuracy_decimals=2,
@@ -73,6 +73,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(PulseCounterSensor),
             cv.Required(CONF_PIN): validate_pulse_counter_pin,
             cv.Optional(
                 CONF_COUNT_MODE,
@@ -103,8 +104,9 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))

esphome/components/pulse_meter/pulse_meter_sensor.cpp

@@ -12,53 +12,18 @@ void PulseMeterSensor::setup() {
   this->pin_->attach_interrupt(PulseMeterSensor::gpio_intr, this, gpio::INTERRUPT_ANY_EDGE);
 
   this->last_detected_edge_us_ = 0;
-  this->last_valid_low_edge_us_ = 0;
-  this->last_valid_high_edge_us_ = 0;
-  this->sensor_is_high_ = this->isr_pin_.digital_read();
+  this->last_valid_edge_us_ = 0;
 }
 
 void PulseMeterSensor::loop() {
   const uint32_t now = micros();
 
-  // Check to see if we should filter this edge out
-  if (this->filter_mode_ == FILTER_EDGE) {
-    if ((this->last_detected_edge_us_ - this->last_valid_high_edge_us_) >= this->filter_us_) {
-      // Don't measure the first valid pulse (we need at least two pulses to measure the width)
-      if (this->last_valid_high_edge_us_ != 0) {
-        this->pulse_width_us_ = (this->last_detected_edge_us_ - this->last_valid_high_edge_us_);
-      }
-      this->total_pulses_++;
-      this->last_valid_high_edge_us_ = this->last_detected_edge_us_;
-    }
-  } else {
-    // Make sure the signal has been stable long enough
-    if ((now - this->last_detected_edge_us_) >= this->filter_us_) {
-      // Only consider HIGH pulses and "new" edges if sensor state is LOW
-      if (!this->sensor_is_high_ && this->isr_pin_.digital_read() &&
-          (this->last_detected_edge_us_ != this->last_valid_high_edge_us_)) {
-        // Don't measure the first valid pulse (we need at least two pulses to measure the width)
-        if (this->last_valid_high_edge_us_ != 0) {
-          this->pulse_width_us_ = (this->last_detected_edge_us_ - this->last_valid_high_edge_us_);
-        }
-        this->sensor_is_high_ = true;
-        this->total_pulses_++;
-        this->last_valid_high_edge_us_ = this->last_detected_edge_us_;
-      }
-      // Only consider LOW pulses and "new" edges if sensor state is HIGH
-      else if (this->sensor_is_high_ && !this->isr_pin_.digital_read() &&
-               (this->last_detected_edge_us_ != this->last_valid_low_edge_us_)) {
-        this->sensor_is_high_ = false;
-        this->last_valid_low_edge_us_ = this->last_detected_edge_us_;
-      }
-    }
-  }
-
   // If we've exceeded our timeout interval without receiving any pulses, assume 0 pulses/min until
   // we get at least two valid pulses.
-  const uint32_t time_since_valid_edge_us = now - this->last_valid_high_edge_us_;
-  if ((this->last_valid_high_edge_us_ != 0) && (time_since_valid_edge_us > this->timeout_us_) &&
-      (this->pulse_width_us_ != 0)) {
+  const uint32_t time_since_valid_edge_us = now - this->last_valid_edge_us_;
+  if ((this->last_valid_edge_us_ != 0) && (time_since_valid_edge_us > this->timeout_us_)) {
     ESP_LOGD(TAG, "No pulse detected for %us, assuming 0 pulses/min", time_since_valid_edge_us / 1000000);
+    this->last_valid_edge_us_ = 0;
     this->pulse_width_us_ = 0;
   }
 
@@ -87,11 +52,7 @@ void PulseMeterSensor::set_total_pulses(uint32_t pulses) { this->total_pulses_ =
 void PulseMeterSensor::dump_config() {
   LOG_SENSOR("", "Pulse Meter", this);
   LOG_PIN("  Pin: ", this->pin_);
-  if (this->filter_mode_ == FILTER_EDGE) {
-    ESP_LOGCONFIG(TAG, "  Filtering rising edges less than %u µs apart", this->filter_us_);
-  } else {
-    ESP_LOGCONFIG(TAG, "  Filtering pulses shorter than %u µs", this->filter_us_);
-  }
+  ESP_LOGCONFIG(TAG, "  Filtering pulses shorter than %u µs", this->filter_us_);
   ESP_LOGCONFIG(TAG, "  Assuming 0 pulses/min after not receiving a pulse for %us", this->timeout_us_ / 1000000);
 }
 
@@ -101,14 +62,23 @@ void IRAM_ATTR PulseMeterSensor::gpio_intr(PulseMeterSensor *sensor) {
   // Get the current time before we do anything else so the measurements are consistent
   const uint32_t now = micros();
 
-  // We only look at rising edges in EDGE mode, and all edges in PULSE mode
-  if (sensor->filter_mode_ == FILTER_EDGE) {
-    if (sensor->isr_pin_.digital_read()) {
-      sensor->last_detected_edge_us_ = now;
-    }
-  } else {
-    sensor->last_detected_edge_us_ = now;
+  // We only look at rising edges
+  if (!sensor->isr_pin_.digital_read()) {
+    return;
   }
+
+  // Check to see if we should filter this edge out
+  if ((now - sensor->last_detected_edge_us_) >= sensor->filter_us_) {
+    // Don't measure the first valid pulse (we need at least two pulses to measure the width)
+    if (sensor->last_valid_edge_us_ != 0) {
+      sensor->pulse_width_us_ = (now - sensor->last_valid_edge_us_);
+    }
+
+    sensor->total_pulses_++;
+    sensor->last_valid_edge_us_ = now;
+  }
+
+  sensor->last_detected_edge_us_ = now;
 }
 
 }  // namespace pulse_meter

esphome/components/pulse_meter/pulse_meter_sensor.h

@@ -10,14 +10,8 @@ namespace pulse_meter {
 
 class PulseMeterSensor : public sensor::Sensor, public Component {
  public:
-  enum InternalFilterMode {
-    FILTER_EDGE = 0,
-    FILTER_PULSE,
-  };
-
   void set_pin(InternalGPIOPin *pin) { this->pin_ = pin; }
   void set_filter_us(uint32_t filter) { this->filter_us_ = filter; }
-  void set_filter_mode(InternalFilterMode mode) { this->filter_mode_ = mode; }
   void set_timeout_us(uint32_t timeout) { this->timeout_us_ = timeout; }
   void set_total_sensor(sensor::Sensor *sensor) { this->total_sensor_ = sensor; }
 
@@ -36,17 +30,14 @@ class PulseMeterSensor : public sensor::Sensor, public Component {
   uint32_t filter_us_ = 0;
   uint32_t timeout_us_ = 1000000UL * 60UL * 5UL;
   sensor::Sensor *total_sensor_ = nullptr;
-  InternalFilterMode filter_mode_{FILTER_EDGE};
 
   Deduplicator<uint32_t> pulse_width_dedupe_;
   Deduplicator<uint32_t> total_dedupe_;
 
   volatile uint32_t last_detected_edge_us_ = 0;
-  volatile uint32_t last_valid_low_edge_us_ = 0;
-  volatile uint32_t last_valid_high_edge_us_ = 0;
+  volatile uint32_t last_valid_edge_us_ = 0;
   volatile uint32_t pulse_width_us_ = 0;
   volatile uint32_t total_pulses_ = 0;
-  volatile bool sensor_is_high_ = false;
 };
 
 }  // namespace pulse_meter

esphome/components/pulse_meter/sensor.py

@@ -5,7 +5,6 @@ from esphome.components import sensor
 from esphome.const import (
     CONF_ID,
     CONF_INTERNAL_FILTER,
-    CONF_INTERNAL_FILTER_MODE,
     CONF_PIN,
     CONF_NUMBER,
     CONF_TIMEOUT,
@@ -19,21 +18,14 @@ from esphome.const import (
 )
 from esphome.core import CORE
 
-CODEOWNERS = ["@stevebaxter", "@cstaahl"]
+CODEOWNERS = ["@stevebaxter"]
 
 pulse_meter_ns = cg.esphome_ns.namespace("pulse_meter")
 
-
 PulseMeterSensor = pulse_meter_ns.class_(
     "PulseMeterSensor", sensor.Sensor, cg.Component
 )
 
-PulseMeterInternalFilterMode = PulseMeterSensor.enum("InternalFilterMode")
-FILTER_MODES = {
-    "EDGE": PulseMeterInternalFilterMode.FILTER_EDGE,
-    "PULSE": PulseMeterInternalFilterMode.FILTER_PULSE,
-}
-
 SetTotalPulsesAction = pulse_meter_ns.class_("SetTotalPulsesAction", automation.Action)
 
 
@@ -58,13 +50,13 @@ def validate_pulse_meter_pin(value):
 
 
 CONFIG_SCHEMA = sensor.sensor_schema(
-    PulseMeterSensor,
     unit_of_measurement=UNIT_PULSES_PER_MINUTE,
     icon=ICON_PULSE,
     accuracy_decimals=2,
     state_class=STATE_CLASS_MEASUREMENT,
 ).extend(
     {
+        cv.GenerateID(): cv.declare_id(PulseMeterSensor),
         cv.Required(CONF_PIN): validate_pulse_meter_pin,
         cv.Optional(CONF_INTERNAL_FILTER, default="13us"): validate_internal_filter,
         cv.Optional(CONF_TIMEOUT, default="5min"): validate_timeout,
@@ -74,22 +66,19 @@ CONFIG_SCHEMA = sensor.sensor_schema(
             accuracy_decimals=0,
             state_class=STATE_CLASS_TOTAL_INCREASING,
         ),
-        cv.Optional(CONF_INTERNAL_FILTER_MODE, default="EDGE"): cv.enum(
-            FILTER_MODES, upper=True
-        ),
     }
 )
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))
     cg.add(var.set_filter_us(config[CONF_INTERNAL_FILTER]))
     cg.add(var.set_timeout_us(config[CONF_TIMEOUT]))
-    cg.add(var.set_filter_mode(config[CONF_INTERNAL_FILTER_MODE]))
 
     if CONF_TOTAL in config:
         sens = await sensor.new_sensor(config[CONF_TOTAL])

esphome/components/pulse_width/sensor.py

@@ -3,6 +3,7 @@ import esphome.config_validation as cv
 from esphome import pins
 from esphome.components import sensor
 from esphome.const import (
+    CONF_ID,
     CONF_PIN,
     STATE_CLASS_MEASUREMENT,
     UNIT_SECOND,
@@ -17,7 +18,6 @@ PulseWidthSensor = pulse_width_ns.class_(
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        PulseWidthSensor,
         unit_of_measurement=UNIT_SECOND,
         icon=ICON_TIMER,
         accuracy_decimals=3,
@@ -25,6 +25,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(PulseWidthSensor),
             cv.Required(CONF_PIN): cv.All(pins.internal_gpio_input_pin_schema),
         }
     )
@@ -33,8 +34,9 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     pin = await cg.gpio_pin_expression(config[CONF_PIN])
     cg.add(var.set_pin(pin))

esphome/components/qmc5883l/sensor.py

@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_RANGE,
     ICON_MAGNET,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_NONE,
     UNIT_MICROTESLA,
     UNIT_DEGREES,
     ICON_SCREEN_ROTATION,
@@ -78,6 +79,7 @@ heading_schema = sensor.sensor_schema(
     unit_of_measurement=UNIT_DEGREES,
     icon=ICON_SCREEN_ROTATION,
     accuracy_decimals=1,
+    state_class=STATE_CLASS_NONE,
 )
 
 CONFIG_SCHEMA = (

esphome/components/rc522/binary_sensor.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor
-from esphome.const import CONF_UID
+from esphome.const import CONF_UID, CONF_ID
 from esphome.core import HexInt
 from . import rc522_ns, RC522, CONF_RC522_ID
 
@@ -31,8 +31,9 @@ def validate_uid(value):
 
 RC522BinarySensor = rc522_ns.class_("RC522BinarySensor", binary_sensor.BinarySensor)
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(RC522BinarySensor).extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
+        cv.GenerateID(): cv.declare_id(RC522BinarySensor),
         cv.GenerateID(CONF_RC522_ID): cv.use_id(RC522),
         cv.Required(CONF_UID): validate_uid,
     }
@@ -40,7 +41,8 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(RC522BinarySensor).extend(
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
+    await binary_sensor.register_binary_sensor(var, config)
 
     hub = await cg.get_variable(config[CONF_RC522_ID])
     cg.add(hub.register_tag(var))

esphome/components/rdm6300/binary_sensor.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor, rdm6300
-from esphome.const import CONF_UID
+from esphome.const import CONF_UID, CONF_ID
 from . import rdm6300_ns
 
 DEPENDENCIES = ["rdm6300"]
@@ -11,8 +11,9 @@ RDM6300BinarySensor = rdm6300_ns.class_(
     "RDM6300BinarySensor", binary_sensor.BinarySensor
 )
 
-CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(RDM6300BinarySensor).extend(
+CONFIG_SCHEMA = binary_sensor.BINARY_SENSOR_SCHEMA.extend(
     {
+        cv.GenerateID(): cv.declare_id(RDM6300BinarySensor),
         cv.GenerateID(CONF_RDM6300_ID): cv.use_id(rdm6300.RDM6300Component),
         cv.Required(CONF_UID): cv.uint32_t,
     }
@@ -20,7 +21,8 @@ CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(RDM6300BinarySensor).extend(
 
 
 async def to_code(config):
-    var = await binary_sensor.new_binary_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
+    await binary_sensor.register_binary_sensor(var, config)
 
     hub = await cg.get_variable(config[CONF_RDM6300_ID])
     cg.add(hub.register_card(var))

esphome/components/remote_base/__init__.py

@@ -27,8 +27,6 @@ from esphome.const import (
     CONF_CARRIER_FREQUENCY,
     CONF_RC_CODE_1,
     CONF_RC_CODE_2,
-    CONF_MAGNITUDE,
-    CONF_WAND_ID,
     CONF_LEVEL,
 )
 from esphome.core import coroutine
@@ -167,7 +165,7 @@ def declare_protocol(name):
 
 
 BINARY_SENSOR_REGISTRY = Registry(
-    binary_sensor.binary_sensor_schema().extend(
+    binary_sensor.BINARY_SENSOR_SCHEMA.extend(
         {
             cv.GenerateID(CONF_RECEIVER_ID): cv.use_id(RemoteReceiverBase),
         }
@@ -393,54 +391,6 @@ async def lg_action(var, config, args):
     cg.add(var.set_nbits(template_))
 
 
-# MagiQuest
-(
-    MagiQuestData,
-    MagiQuestBinarySensor,
-    MagiQuestTrigger,
-    MagiQuestAction,
-    MagiQuestDumper,
-) = declare_protocol("MagiQuest")
-
-MAGIQUEST_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_WAND_ID): cv.hex_uint32_t,
-        cv.Optional(CONF_MAGNITUDE, default=0xFFFF): cv.hex_uint16_t,
-    }
-)
-
-
-@register_binary_sensor("magiquest", MagiQuestBinarySensor, MAGIQUEST_SCHEMA)
-def magiquest_binary_sensor(var, config):
-    cg.add(
-        var.set_data(
-            cg.StructInitializer(
-                MagiQuestData,
-                ("magnitude", config[CONF_MAGNITUDE]),
-                ("wand_id", config[CONF_WAND_ID]),
-            )
-        )
-    )
-
-
-@register_trigger("magiquest", MagiQuestTrigger, MagiQuestData)
-def magiquest_trigger(var, config):
-    pass
-
-
-@register_dumper("magiquest", MagiQuestDumper)
-def magiquest_dumper(var, config):
-    pass
-
-
-@register_action("magiquest", MagiQuestAction, MAGIQUEST_SCHEMA)
-async def magiquest_action(var, config, args):
-    template_ = await cg.templatable(config[CONF_WAND_ID], args, cg.uint32)
-    cg.add(var.set_wand_id(template_))
-    template_ = await cg.templatable(config[CONF_MAGNITUDE], args, cg.uint16)
-    cg.add(var.set_magnitude(template_))
-
-
 # NEC
 NECData, NECBinarySensor, NECTrigger, NECAction, NECDumper = declare_protocol("NEC")
 NEC_SCHEMA = cv.Schema(
@@ -897,7 +847,7 @@ async def rc_switch_raw_action(var, config, args):
         config[CONF_PROTOCOL], args, RCSwitchBase, to_exp=build_rc_switch_protocol
     )
     cg.add(var.set_protocol(proto))
-    cg.add(var.set_code(await cg.templatable(config[CONF_CODE], args, cg.std_string)))
+    cg.add(var.set_code((await cg.templatable(config[CONF_CODE], args, cg.std_string))))
 
 
 @register_binary_sensor(
@@ -918,11 +868,13 @@ async def rc_switch_type_a_action(var, config, args):
         config[CONF_PROTOCOL], args, RCSwitchBase, to_exp=build_rc_switch_protocol
     )
     cg.add(var.set_protocol(proto))
-    cg.add(var.set_group(await cg.templatable(config[CONF_GROUP], args, cg.std_string)))
     cg.add(
-        var.set_device(await cg.templatable(config[CONF_DEVICE], args, cg.std_string))
+        var.set_group((await cg.templatable(config[CONF_GROUP], args, cg.std_string)))
     )
-    cg.add(var.set_state(await cg.templatable(config[CONF_STATE], args, bool)))
+    cg.add(
+        var.set_device((await cg.templatable(config[CONF_DEVICE], args, cg.std_string)))
+    )
+    cg.add(var.set_state((await cg.templatable(config[CONF_STATE], args, bool))))
 
 
 @register_binary_sensor(
@@ -945,9 +897,13 @@ async def rc_switch_type_b_action(var, config, args):
         config[CONF_PROTOCOL], args, RCSwitchBase, to_exp=build_rc_switch_protocol
     )
     cg.add(var.set_protocol(proto))
-    cg.add(var.set_address(await cg.templatable(config[CONF_ADDRESS], args, cg.uint8)))
-    cg.add(var.set_channel(await cg.templatable(config[CONF_CHANNEL], args, cg.uint8)))
-    cg.add(var.set_state(await cg.templatable(config[CONF_STATE], args, bool)))
+    cg.add(
+        var.set_address((await cg.templatable(config[CONF_ADDRESS], args, cg.uint8)))
+    )
+    cg.add(
+        var.set_channel((await cg.templatable(config[CONF_CHANNEL], args, cg.uint8)))
+    )
+    cg.add(var.set_state((await cg.templatable(config[CONF_STATE], args, bool))))
 
 
 @register_binary_sensor(
@@ -976,11 +932,11 @@ async def rc_switch_type_c_action(var, config, args):
     )
     cg.add(var.set_protocol(proto))
     cg.add(
-        var.set_family(await cg.templatable(config[CONF_FAMILY], args, cg.std_string))
+        var.set_family((await cg.templatable(config[CONF_FAMILY], args, cg.std_string)))
     )
-    cg.add(var.set_group(await cg.templatable(config[CONF_GROUP], args, cg.uint8)))
-    cg.add(var.set_device(await cg.templatable(config[CONF_DEVICE], args, cg.uint8)))
-    cg.add(var.set_state(await cg.templatable(config[CONF_STATE], args, bool)))
+    cg.add(var.set_group((await cg.templatable(config[CONF_GROUP], args, cg.uint8))))
+    cg.add(var.set_device((await cg.templatable(config[CONF_DEVICE], args, cg.uint8))))
+    cg.add(var.set_state((await cg.templatable(config[CONF_STATE], args, bool))))
 
 
 @register_binary_sensor(
@@ -1003,9 +959,11 @@ async def rc_switch_type_d_action(var, config, args):
         config[CONF_PROTOCOL], args, RCSwitchBase, to_exp=build_rc_switch_protocol
     )
     cg.add(var.set_protocol(proto))
-    cg.add(var.set_group(await cg.templatable(config[CONF_GROUP], args, cg.std_string)))
-    cg.add(var.set_device(await cg.templatable(config[CONF_DEVICE], args, cg.uint8)))
-    cg.add(var.set_state(await cg.templatable(config[CONF_STATE], args, bool)))
+    cg.add(
+        var.set_group((await cg.templatable(config[CONF_GROUP], args, cg.std_string)))
+    )
+    cg.add(var.set_device((await cg.templatable(config[CONF_DEVICE], args, cg.uint8))))
+    cg.add(var.set_state((await cg.templatable(config[CONF_STATE], args, bool))))
 
 
 @register_trigger("rc_switch", RCSwitchTrigger, RCSwitchData)

esphome/components/remote_base/magiquest_protocol.cpp

@@ -1,83 +0,0 @@
-#include "magiquest_protocol.h"
-#include "esphome/core/log.h"
-
-/* Based on protocol analysis from
- * https://arduino-irremote.github.io/Arduino-IRremote/ir__MagiQuest_8cpp_source.html
- */
-
-namespace esphome {
-namespace remote_base {
-
-static const char *const TAG = "remote.magiquest";
-
-static const uint32_t MAGIQUEST_UNIT = 288;  // us
-static const uint32_t MAGIQUEST_ONE_MARK = 2 * MAGIQUEST_UNIT;
-static const uint32_t MAGIQUEST_ONE_SPACE = 2 * MAGIQUEST_UNIT;
-static const uint32_t MAGIQUEST_ZERO_MARK = MAGIQUEST_UNIT;
-static const uint32_t MAGIQUEST_ZERO_SPACE = 3 * MAGIQUEST_UNIT;
-
-void MagiQuestProtocol::encode(RemoteTransmitData *dst, const MagiQuestData &data) {
-  dst->reserve(101);  // 2 start bits, 48 data bits, 1 stop bit
-  dst->set_carrier_frequency(38000);
-
-  // 2 start bits
-  dst->item(MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE);
-  dst->item(MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE);
-  for (uint32_t mask = 1 << 31; mask; mask >>= 1) {
-    if (data.wand_id & mask) {
-      dst->item(MAGIQUEST_ONE_MARK, MAGIQUEST_ONE_SPACE);
-    } else {
-      dst->item(MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE);
-    }
-  }
-
-  for (uint16_t mask = 1 << 15; mask; mask >>= 1) {
-    if (data.magnitude & mask) {
-      dst->item(MAGIQUEST_ONE_MARK, MAGIQUEST_ONE_SPACE);
-    } else {
-      dst->item(MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE);
-    }
-  }
-
-  dst->mark(MAGIQUEST_UNIT);
-}
-optional<MagiQuestData> MagiQuestProtocol::decode(RemoteReceiveData src) {
-  MagiQuestData data{
-      .magnitude = 0,
-      .wand_id = 0,
-  };
-  // Two start bits
-  if (!src.expect_item(MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE) ||
-      !src.expect_item(MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE)) {
-    return {};
-  }
-
-  for (uint32_t mask = 1 << 31; mask; mask >>= 1) {
-    if (src.expect_item(MAGIQUEST_ONE_MARK, MAGIQUEST_ONE_SPACE)) {
-      data.wand_id |= mask;
-    } else if (src.expect_item(MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE)) {
-      data.wand_id &= ~mask;
-    } else {
-      return {};
-    }
-  }
-
-  for (uint16_t mask = 1 << 15; mask; mask >>= 1) {
-    if (src.expect_item(MAGIQUEST_ONE_MARK, MAGIQUEST_ONE_SPACE)) {
-      data.magnitude |= mask;
-    } else if (src.expect_item(MAGIQUEST_ZERO_MARK, MAGIQUEST_ZERO_SPACE)) {
-      data.magnitude &= ~mask;
-    } else {
-      return {};
-    }
-  }
-
-  src.expect_mark(MAGIQUEST_UNIT);
-  return data;
-}
-void MagiQuestProtocol::dump(const MagiQuestData &data) {
-  ESP_LOGD(TAG, "Received MagiQuest: wand_id=0x%08X, magnitude=0x%04X", data.wand_id, data.magnitude);
-}
-
-}  // namespace remote_base
-}  // namespace esphome

esphome/components/remote_base/magiquest_protocol.h

@@ -1,50 +0,0 @@
-#pragma once
-
-#include "remote_base.h"
-
-/* Based on protocol analysis from
- * https://arduino-irremote.github.io/Arduino-IRremote/ir__MagiQuest_8cpp_source.html
- */
-
-namespace esphome {
-namespace remote_base {
-
-struct MagiQuestData {
-  uint16_t magnitude;
-  uint32_t wand_id;
-
-  bool operator==(const MagiQuestData &rhs) const {
-    // Treat 0xffff as a special, wildcard magnitude
-    // In testing, the wand never produces this value, and this allows us to match
-    // on just the wand_id if wanted.
-    if (rhs.wand_id != this->wand_id) {
-      return false;
-    }
-    return (this->wand_id == 0xffff || rhs.wand_id == 0xffff || this->wand_id == rhs.wand_id);
-  }
-};
-
-class MagiQuestProtocol : public RemoteProtocol<MagiQuestData> {
- public:
-  void encode(RemoteTransmitData *dst, const MagiQuestData &data) override;
-  optional<MagiQuestData> decode(RemoteReceiveData src) override;
-  void dump(const MagiQuestData &data) override;
-};
-
-DECLARE_REMOTE_PROTOCOL(MagiQuest)
-
-template<typename... Ts> class MagiQuestAction : public RemoteTransmitterActionBase<Ts...> {
- public:
-  TEMPLATABLE_VALUE(uint16_t, magnitude)
-  TEMPLATABLE_VALUE(uint32_t, wand_id)
-
-  void encode(RemoteTransmitData *dst, Ts... x) override {
-    MagiQuestData data{};
-    data.magnitude = this->magnitude_.value(x...);
-    data.wand_id = this->wand_id_.value(x...);
-    MagiQuestProtocol().encode(dst, data);
-  }
-};
-
-}  // namespace remote_base
-}  // namespace esphome

esphome/components/resistance/sensor.py

@@ -6,6 +6,7 @@ from esphome.const import (
     STATE_CLASS_MEASUREMENT,
     UNIT_OHM,
     ICON_FLASH,
+    CONF_ID,
 )
 
 resistance_ns = cg.esphome_ns.namespace("resistance")
@@ -23,7 +24,6 @@ CONFIGURATIONS = {
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        ResistanceSensor,
         unit_of_measurement=UNIT_OHM,
         icon=ICON_FLASH,
         accuracy_decimals=1,
@@ -31,6 +31,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(ResistanceSensor),
             cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
             cv.Required(CONF_CONFIGURATION): cv.enum(CONFIGURATIONS, upper=True),
             cv.Required(CONF_RESISTOR): cv.resistance,
@@ -42,8 +43,9 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
+    await sensor.register_sensor(var, config)
 
     sens = await cg.get_variable(config[CONF_SENSOR])
     cg.add(var.set_sensor(sens))

esphome/components/rotary_encoder/sensor.py

@@ -7,6 +7,7 @@ from esphome.const import (
     CONF_RESOLUTION,
     CONF_MIN_VALUE,
     CONF_MAX_VALUE,
+    STATE_CLASS_NONE,
     UNIT_STEPS,
     ICON_ROTATE_RIGHT,
     CONF_VALUE,
@@ -64,13 +65,14 @@ def validate_min_max_value(config):
 
 CONFIG_SCHEMA = cv.All(
     sensor.sensor_schema(
-        RotaryEncoderSensor,
         unit_of_measurement=UNIT_STEPS,
         icon=ICON_ROTATE_RIGHT,
         accuracy_decimals=0,
+        state_class=STATE_CLASS_NONE,
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(RotaryEncoderSensor),
             cv.Required(CONF_PIN_A): cv.All(pins.internal_gpio_input_pin_schema),
             cv.Required(CONF_PIN_B): cv.All(pins.internal_gpio_input_pin_schema),
             cv.Optional(CONF_PIN_RESET): pins.internal_gpio_output_pin_schema,
@@ -103,9 +105,9 @@ CONFIG_SCHEMA = cv.All(
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
-
+    await sensor.register_sensor(var, config)
     pin_a = await cg.gpio_pin_expression(config[CONF_PIN_A])
     cg.add(var.set_pin_a(pin_a))
     pin_b = await cg.gpio_pin_expression(config[CONF_PIN_B])

esphome/components/ruuvitag/sensor.py

@@ -21,6 +21,7 @@ from esphome.const import (
     DEVICE_CLASS_VOLTAGE,
     ENTITY_CATEGORY_DIAGNOSTIC,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_NONE,
     UNIT_CELSIUS,
     UNIT_PERCENT,
     UNIT_VOLT,
@@ -107,11 +108,13 @@ CONFIG_SCHEMA = (
             cv.Optional(CONF_MOVEMENT_COUNTER): sensor.sensor_schema(
                 icon=ICON_GAUGE,
                 accuracy_decimals=0,
+                state_class=STATE_CLASS_NONE,
                 entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
             ),
             cv.Optional(CONF_MEASUREMENT_SEQUENCE_NUMBER): sensor.sensor_schema(
                 icon=ICON_GAUGE,
                 accuracy_decimals=0,
+                state_class=STATE_CLASS_NONE,
                 entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
             ),
         }

esphome/components/sdp3x/sensor.py

@@ -2,6 +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,
     DEVICE_CLASS_PRESSURE,
     STATE_CLASS_MEASUREMENT,
     UNIT_HECTOPASCAL,
@@ -23,7 +24,6 @@ CONF_MEASUREMENT_MODE = "measurement_mode"
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        SDP3XComponent,
         unit_of_measurement=UNIT_HECTOPASCAL,
         accuracy_decimals=3,
         device_class=DEVICE_CLASS_PRESSURE,
@@ -31,6 +31,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(SDP3XComponent),
             cv.Optional(
                 CONF_MEASUREMENT_MODE, default="differential_pressure"
             ): cv.enum(MEASUREMENT_MODE),
@@ -42,7 +43,8 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
+    await sensor.register_sensor(var, config)
     cg.add(var.set_measurement_mode(config[CONF_MEASUREMENT_MODE]))

esphome/components/sensor/__init__.py

@@ -58,7 +58,6 @@ from esphome.const import (
     DEVICE_CLASS_VOLTAGE,
 )
 from esphome.core import CORE, coroutine_with_priority
-from esphome.cpp_generator import MockObjClass
 from esphome.cpp_helpers import setup_entity
 from esphome.util import Registry
 
@@ -224,8 +223,6 @@ _UNDEF = object()
 
 
 def sensor_schema(
-    class_: MockObjClass = _UNDEF,
-    *,
     unit_of_measurement: str = _UNDEF,
     icon: str = _UNDEF,
     accuracy_decimals: int = _UNDEF,
@@ -234,8 +231,6 @@ def sensor_schema(
     entity_category: str = _UNDEF,
 ) -> cv.Schema:
     schema = SENSOR_SCHEMA
-    if class_ is not _UNDEF:
-        schema = schema.extend({cv.GenerateID(): cv.declare_id(class_)})
     if unit_of_measurement is not _UNDEF:
         schema = schema.extend(
             {
@@ -408,30 +403,18 @@ async def sliding_window_moving_average_filter_to_code(config, filter_id):
     )
 
 
-EXPONENTIAL_AVERAGE_SCHEMA = cv.All(
+@FILTER_REGISTRY.register(
+    "exponential_moving_average",
+    ExponentialMovingAverageFilter,
     cv.Schema(
         {
             cv.Optional(CONF_ALPHA, default=0.1): cv.positive_float,
             cv.Optional(CONF_SEND_EVERY, default=15): cv.positive_not_null_int,
-            cv.Optional(CONF_SEND_FIRST_AT, default=1): cv.positive_not_null_int,
         }
     ),
-    validate_send_first_at,
-)
-
-
-@FILTER_REGISTRY.register(
-    "exponential_moving_average",
-    ExponentialMovingAverageFilter,
-    EXPONENTIAL_AVERAGE_SCHEMA,
 )
 async def exponential_moving_average_filter_to_code(config, filter_id):
-    return cg.new_Pvariable(
-        filter_id,
-        config[CONF_ALPHA],
-        config[CONF_SEND_EVERY],
-        config[CONF_SEND_FIRST_AT],
-    )
+    return cg.new_Pvariable(filter_id, config[CONF_ALPHA], config[CONF_SEND_EVERY])
 
 
 @FILTER_REGISTRY.register(

esphome/components/sensor/filter.cpp

@@ -200,8 +200,8 @@ optional<float> SlidingWindowMovingAverageFilter::new_value(float value) {
 }
 
 // ExponentialMovingAverageFilter
-ExponentialMovingAverageFilter::ExponentialMovingAverageFilter(float alpha, size_t send_every, size_t send_first_at)
-    : send_every_(send_every), send_at_(send_every - send_first_at), alpha_(alpha) {}
+ExponentialMovingAverageFilter::ExponentialMovingAverageFilter(float alpha, size_t send_every)
+    : send_every_(send_every), send_at_(send_every - 1), alpha_(alpha) {}
 optional<float> ExponentialMovingAverageFilter::new_value(float value) {
   if (!std::isnan(value)) {
     if (this->first_value_) {

esphome/components/sensor/filter.h

@@ -194,7 +194,7 @@ class SlidingWindowMovingAverageFilter : public Filter {
  */
 class ExponentialMovingAverageFilter : public Filter {
  public:
-  ExponentialMovingAverageFilter(float alpha, size_t send_every, size_t send_first_at);
+  ExponentialMovingAverageFilter(float alpha, size_t send_every);
 
   optional<float> new_value(float value) override;
 

esphome/components/sgp40/sensor.py

@@ -2,6 +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,
     DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     STATE_CLASS_MEASUREMENT,
@@ -24,7 +25,6 @@ CONF_VOC_BASELINE = "voc_baseline"
 
 CONFIG_SCHEMA = (
     sensor.sensor_schema(
-        SGP40Component,
         icon=ICON_RADIATOR,
         accuracy_decimals=0,
         device_class=DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
@@ -32,6 +32,7 @@ CONFIG_SCHEMA = (
     )
     .extend(
         {
+            cv.GenerateID(): cv.declare_id(SGP40Component),
             cv.Optional(CONF_STORE_BASELINE, default=True): cv.boolean,
             cv.Optional(CONF_VOC_BASELINE): cv.hex_uint16_t,
             cv.Optional(CONF_COMPENSATION): cv.Schema(
@@ -48,9 +49,10 @@ CONFIG_SCHEMA = (
 
 
 async def to_code(config):
-    var = await sensor.new_sensor(config)
+    var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
+    await sensor.register_sensor(var, config)
 
     if CONF_COMPENSATION in config:
         compensation_config = config[CONF_COMPENSATION]

esphome/components/sim800l/__init__.py

@@ -1,10 +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
 from esphome.components import uart
 
 DEPENDENCIES = ["uart"]
@@ -23,7 +20,6 @@ Sim800LReceivedMessageTrigger = sim800l_ns.class_(
 Sim800LSendSmsAction = sim800l_ns.class_("Sim800LSendSmsAction", automation.Action)
 Sim800LDialAction = sim800l_ns.class_("Sim800LDialAction", automation.Action)
 
-CONF_SIM800L_ID = "sim800l_id"
 CONF_ON_SMS_RECEIVED = "on_sms_received"
 CONF_RECIPIENT = "recipient"
 CONF_MESSAGE = "message"

esphome/components/sim800l/binary_sensor.py

@@ -1,28 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import binary_sensor
-from esphome.const import (
-    DEVICE_CLASS_CONNECTIVITY,
-    ENTITY_CATEGORY_DIAGNOSTIC,
-)
-from . import CONF_SIM800L_ID, Sim800LComponent
-
-DEPENDENCIES = ["sim800l"]
-
-CONF_REGISTERED = "registered"
-
-CONFIG_SCHEMA = {
-    cv.GenerateID(CONF_SIM800L_ID): cv.use_id(Sim800LComponent),
-    cv.Optional(CONF_REGISTERED): binary_sensor.binary_sensor_schema(
-        device_class=DEVICE_CLASS_CONNECTIVITY,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-    ),
-}
-
-
-async def to_code(config):
-    sim800l_component = await cg.get_variable(config[CONF_SIM800L_ID])
-
-    if CONF_REGISTERED in config:
-        sens = await binary_sensor.new_binary_sensor(config[CONF_REGISTERED])
-        cg.add(sim800l_component.set_registered_binary_sensor(sens))

esphome/components/sim800l/sensor.py

@@ -1,33 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor
-from esphome.const import (
-    DEVICE_CLASS_SIGNAL_STRENGTH,
-    ENTITY_CATEGORY_DIAGNOSTIC,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_DECIBEL_MILLIWATT,
-)
-from . import CONF_SIM800L_ID, Sim800LComponent
-
-DEPENDENCIES = ["sim800l"]
-
-CONF_RSSI = "rssi"
-
-CONFIG_SCHEMA = {
-    cv.GenerateID(CONF_SIM800L_ID): cv.use_id(Sim800LComponent),
-    cv.Optional(CONF_RSSI): sensor.sensor_schema(
-        unit_of_measurement=UNIT_DECIBEL_MILLIWATT,
-        accuracy_decimals=0,
-        device_class=DEVICE_CLASS_SIGNAL_STRENGTH,
-        state_class=STATE_CLASS_MEASUREMENT,
-        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
-    ),
-}
-
-
-async def to_code(config):
-    sim800l_component = await cg.get_variable(config[CONF_SIM800L_ID])
-
-    if CONF_RSSI in config:
-        sens = await sensor.new_sensor(config[CONF_RSSI])
-        cg.add(sim800l_component.set_rssi_sensor(sens))

esphome/components/sim800l/sim800l.cpp

@@ -117,7 +117,7 @@ void Sim800LComponent::parse_cmd_(std::string message) {
           this->state_ = STATE_CREG;
         }
       }
-      set_registered_(registered);
+      this->registered_ = registered;
       break;
     }
     case STATE_CSQ:
@@ -128,17 +128,8 @@ void Sim800LComponent::parse_cmd_(std::string message) {
       if (message.compare(0, 5, "+CSQ:") == 0) {
         size_t comma = message.find(',', 6);
         if (comma != 6) {
-          int rssi = parse_number<int>(message.substr(6, comma - 6)).value_or(0);
-
-#ifdef USE_SENSOR
-          if (this->rssi_sensor_ != nullptr) {
-            this->rssi_sensor_->publish_state(rssi);
-          } else {
-            ESP_LOGD(TAG, "RSSI: %d", rssi);
-          }
-#else
-          ESP_LOGD(TAG, "RSSI: %d", rssi);
-#endif
+          this->rssi_ = parse_number<int>(message.substr(6, comma - 6)).value_or(0);
+          ESP_LOGD(TAG, "RSSI: %d", this->rssi_);
         }
       }
       this->expect_ack_ = true;
@@ -210,7 +201,7 @@ void Sim800LComponent::parse_cmd_(std::string message) {
         this->write(26);
         this->state_ = STATE_SENDINGSMS3;
       } else {
-        set_registered_(false);
+        this->registered_ = false;
         this->state_ = STATE_INIT;
         this->send_cmd_("AT+CMEE=2");
         this->write(26);
@@ -235,7 +226,7 @@ void Sim800LComponent::parse_cmd_(std::string message) {
         this->state_ = STATE_INIT;
         this->dial_pending_ = false;
       } else {
-        this->set_registered_(false);
+        this->registered_ = false;
         this->state_ = STATE_INIT;
         this->send_cmd_("AT+CMEE=2");
         this->write(26);
@@ -286,12 +277,7 @@ void Sim800LComponent::send_sms(const std::string &recipient, const std::string
 }
 void Sim800LComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "SIM800L:");
-#ifdef USE_BINARY_SENSOR
-  LOG_BINARY_SENSOR("  ", "Registered", this->registered_binary_sensor_);
-#endif
-#ifdef USE_SENSOR
-  LOG_SENSOR("  ", "Rssi", this->rssi_sensor_);
-#endif
+  ESP_LOGCONFIG(TAG, "  RSSI: %d dB", this->rssi_);
 }
 void Sim800LComponent::dial(const std::string &recipient) {
   ESP_LOGD(TAG, "Dialing %s", recipient.c_str());
@@ -300,13 +286,5 @@ void Sim800LComponent::dial(const std::string &recipient) {
   this->update();
 }
 
-void Sim800LComponent::set_registered_(bool registered) {
-  this->registered_ = registered;
-#ifdef USE_BINARY_SENSOR
-  if (this->registered_binary_sensor_ != nullptr)
-    this->registered_binary_sensor_->publish_state(registered);
-#endif
-}
-
 }  // namespace sim800l
 }  // namespace esphome

esphome/components/sim800l/sim800l.h

@@ -2,14 +2,7 @@
 
 #include <utility>
 
-#include "esphome/core/defines.h"
 #include "esphome/core/component.h"
-#ifdef USE_BINARY_SENSOR
-#include "esphome/components/binary_sensor/binary_sensor.h"
-#endif
-#ifdef USE_SENSOR
-#include "esphome/components/sensor/sensor.h"
-#endif
 #include "esphome/components/uart/uart.h"
 #include "esphome/core/automation.h"
 
@@ -49,14 +42,6 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
   void update() override;
   void loop() override;
   void dump_config() override;
-#ifdef USE_BINARY_SENSOR
-  void set_registered_binary_sensor(binary_sensor::BinarySensor *registered_binary_sensor) {
-    registered_binary_sensor_ = registered_binary_sensor;
-  }
-#endif
-#ifdef USE_SENSOR
-  void set_rssi_sensor(sensor::Sensor *rssi_sensor) { rssi_sensor_ = rssi_sensor; }
-#endif
   void add_on_sms_received_callback(std::function<void(std::string, std::string)> callback) {
     this->callback_.add(std::move(callback));
   }
@@ -66,15 +51,7 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
  protected:
   void send_cmd_(const std::string &message);
   void parse_cmd_(std::string message);
-  void set_registered_(bool registered);
 
-#ifdef USE_BINARY_SENSOR
-  binary_sensor::BinarySensor *registered_binary_sensor_{nullptr};
-#endif
-
-#ifdef USE_SENSOR
-  sensor::Sensor *rssi_sensor_{nullptr};
-#endif
   std::string sender_;
   char read_buffer_[SIM800L_READ_BUFFER_LENGTH];
   size_t read_pos_{0};
@@ -83,6 +60,7 @@ class Sim800LComponent : public uart::UARTDevice, public PollingComponent {
   bool expect_ack_{false};
   sim800l::State state_{STATE_IDLE};
   bool registered_{false};
+  int rssi_{0};
 
   std::string recipient_;
   std::string outgoing_message_;