Upgrade to latest zeroconf release

.clang-tidy

@@ -5,8 +5,11 @@ Checks: >-
   -altera-*,
   -android-*,
   -boost-*,
+  -bugprone-branch-clone,
+  -bugprone-easily-swappable-parameters,
   -bugprone-narrowing-conversions,
   -bugprone-signed-char-misuse,
+  -bugprone-too-small-loop-variable,
   -cert-dcl50-cpp,
   -cert-err58-cpp,
   -cert-oop57-cpp,
@@ -16,10 +19,12 @@ Checks: >-
   -clang-diagnostic-delete-abstract-non-virtual-dtor,
   -clang-diagnostic-delete-non-abstract-non-virtual-dtor,
   -clang-diagnostic-shadow-field,
+  -clang-diagnostic-sign-compare,
+  -clang-diagnostic-unused-variable,
   -clang-diagnostic-unused-const-variable,
-  -clang-diagnostic-unused-parameter,
   -concurrency-*,
   -cppcoreguidelines-avoid-c-arrays,
+  -cppcoreguidelines-avoid-goto,
   -cppcoreguidelines-avoid-magic-numbers,
   -cppcoreguidelines-init-variables,
   -cppcoreguidelines-macro-usage,
@@ -36,6 +41,7 @@ Checks: >-
   -cppcoreguidelines-pro-type-union-access,
   -cppcoreguidelines-pro-type-vararg,
   -cppcoreguidelines-special-member-functions,
+  -fuchsia-default-arguments,
   -fuchsia-multiple-inheritance,
   -fuchsia-overloaded-operator,
   -fuchsia-statically-constructed-objects,
@@ -45,7 +51,6 @@ Checks: >-
   -google-explicit-constructor,
   -google-readability-braces-around-statements,
   -google-readability-casting,
-  -google-readability-namespace-comments,
   -google-readability-todo,
   -google-runtime-references,
   -hicpp-*,
@@ -92,11 +97,9 @@ CheckOptions:
     value:           '1'
   - key:             google-readability-function-size.StatementThreshold
     value:           '800'
-  - key:             google-runtime-int.TypeSuffix
-    value:           '_t'
-  - key:             llvm-namespace-comment.ShortNamespaceLines
+  - key:             google-readability-namespace-comments.ShortNamespaceLines
     value:           '10'
-  - key:             llvm-namespace-comment.SpacesBeforeComments
+  - key:             google-readability-namespace-comments.SpacesBeforeComments
     value:           '2'
   - key:             modernize-loop-convert.MaxCopySize
     value:           '16'

.github/workflows/ci.yml

@@ -1,3 +1,5 @@
+# THESE JOBS ARE COPIED IN release.yml and release-dev.yml
+# PLEASE ALSO UPDATE THOSE FILES WHEN CHANGING LINES HERE
 name: CI
 
 on:
@@ -9,10 +11,6 @@ on:
 permissions:
   contents: read
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   ci:
     name: ${{ matrix.name }}
@@ -36,7 +34,7 @@ jobs:
           - id: test
             file: tests/test3.yaml
             name: Test tests/test3.yaml
-            pio_cache_key: test3
+            pio_cache_key: test1
           - id: test
             file: tests/test4.yaml
             name: Test tests/test4.yaml
@@ -51,26 +49,26 @@ jobs:
             name: Run script/clang-format
           - id: clang-tidy
             name: Run script/clang-tidy for ESP8266
-            options: --environment esp8266-arduino-tidy --grep USE_ESP8266
+            options: --environment esp8266-tidy --grep USE_ESP8266
             pio_cache_key: tidyesp8266
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 1/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 1
+            name: Run script/clang-tidy for ESP32 1/4
+            options: --environment esp32-tidy --split-num 4 --split-at 1
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 2/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 2
+            name: Run script/clang-tidy for ESP32 2/4
+            options: --environment esp32-tidy --split-num 4 --split-at 2
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 3/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 3
+            name: Run script/clang-tidy for ESP32 3/4
+            options: --environment esp32-tidy --split-num 4 --split-at 3
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 Arduino 4/4
-            options: --environment esp32-arduino-tidy --split-num 4 --split-at 4
+            name: Run script/clang-tidy for ESP32 4/4
+            options: --environment esp32-tidy --split-num 4 --split-at 4
             pio_cache_key: tidyesp32
           - id: clang-tidy
-            name: Run script/clang-tidy for ESP32 IDF
+            name: Run script/clang-tidy for ESP32 esp-idf
             options: --environment esp32-idf-tidy --grep USE_ESP_IDF
             pio_cache_key: tidyesp32-idf
 
@@ -82,23 +80,18 @@ jobs:
         with:
           python-version: '3.7'
 
-      - name: Cache virtualenv
+      - name: Cache pip modules
         uses: actions/cache@v2
         with:
-          path: .venv
-          key: venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements*.txt') }}
+          path: ~/.cache/pip
+          key: pip-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements*.txt') }}
           restore-keys: |
-            venv-${{ steps.python.outputs.python-version }}-
+            pip-${{ steps.python.outputs.python-version }}-
 
-      - name: Set up virtualenv
+      - name: Set up python environment
         run: |
-          python -m venv .venv
-          source .venv/bin/activate
-          pip install -U pip
-          pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
-          pip install -e .
-          echo "$GITHUB_WORKSPACE/.venv/bin" >> $GITHUB_PATH
-          echo "VIRTUAL_ENV=$GITHUB_WORKSPACE/.venv" >> $GITHUB_ENV
+          pip3 install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
+          pip3 install -e .
 
       # Use per check platformio cache because checks use different parts
       - name: Cache platformio

.github/workflows/matchers/ci-custom.json

@@ -4,7 +4,7 @@
             "owner": "ci-custom",
             "pattern": [
                 {
-                    "regexp": "^(.*):(\\d+):(\\d+):\\s+lint:\\s+(.*)$",
+                    "regexp": "^ERROR (.*):(\\d+):(\\d+) - (.*)$",
                     "file": 1,
                     "line": 2,
                     "column": 3,

.github/workflows/matchers/gcc.json

@@ -5,7 +5,7 @@
       "severity": "error",
       "pattern": [
         {
-          "regexp": "^src/(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+          "regexp": "^(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
           "file": 1,
           "line": 2,
           "column": 3,

.github/workflows/matchers/lint-python.json

@@ -1,22 +1,11 @@
 {
   "problemMatcher": [
-    {
-      "owner": "black",
-      "severity": "error",
-      "pattern": [
-        {
-          "regexp": "^(.*): (Please format this file with the black formatter)",
-          "file": 1,
-          "message": 2
-        }
-      ]
-    },
     {
       "owner": "flake8",
       "severity": "error",
       "pattern": [
           {
-          "regexp": "^(.*):(\\d+): ([EFCDNW]\\d{3}.*)$",
+          "regexp": "^(.*):(\\d+) - ([EFCDNW]\\d{3}.*)$",
           "file": 1,
           "line": 2,
           "message": 3
@@ -28,7 +17,7 @@
       "severity": "error",
       "pattern": [
         {
-          "regexp": "^(.*):(\\d+): (\\[[EFCRW]\\d{4}\\(.*\\),.*\\].*)$",
+          "regexp": "^(.*):(\\d+) - (\\[[EFCRW]\\d{4}\\(.*\\),.*\\].*)$",
           "file": 1,
           "line": 2,
           "message": 3

.gitpod.yml

@@ -3,4 +3,4 @@ ports:
   onOpen: open-preview
 tasks:
 - before: pyenv local $(pyenv version | grep '^3\.' | cut -d ' ' -f 1) && script/setup
-  command: python -m esphome dashboard config
+  command: python -m esphome config dashboard

CODEOWNERS

@@ -28,16 +28,12 @@ esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
-esphome/components/bl0940/* @tobias-
 esphome/components/ble_client/* @buxtronix
 esphome/components/bme680_bsec/* @trvrnrth
-esphome/components/bmp3xx/* @martgras
-esphome/components/button/* @esphome/core
 esphome/components/canbus/* @danielschramm @mvturnho
 esphome/components/cap1188/* @MrEditor97
 esphome/components/captive_portal/* @OttoWinter
 esphome/components/ccs811/* @habbie
-esphome/components/cd74hc4067/* @asoehlke
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
 esphome/components/color_temperature/* @jesserockz
@@ -56,10 +52,8 @@ esphome/components/ds1307/* @badbadc0ffee
 esphome/components/dsmr/* @glmnet @zuidwijk
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @jesserockz
-esphome/components/esp32_ble_controller/* @jesserockz
 esphome/components/esp32_ble_server/* @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
-esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_improv/* @jesserockz
 esphome/components/esp8266/* @esphome/core
 esphome/components/exposure_notifications/* @OttoWinter
@@ -70,7 +64,6 @@ esphome/components/globals/* @esphome/core
 esphome/components/gpio/* @esphome/core
 esphome/components/gps/* @coogle
 esphome/components/graph/* @synco
-esphome/components/growatt_solar/* @leeuwte
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
@@ -80,13 +73,11 @@ esphome/components/homeassistant/* @OttoWinter
 esphome/components/hrxl_maxsonar_wr/* @netmikey
 esphome/components/i2c/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
-esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
 esphome/components/inkplate6/* @jesserockz
 esphome/components/integration/* @OttoWinter
 esphome/components/interval/* @esphome/core
 esphome/components/json/* @OttoWinter
-esphome/components/kalman_combinator/* @Cat-Ion
 esphome/components/ledc/* @OttoWinter
 esphome/components/light/* @esphome/core
 esphome/components/logger/* @esphome/core
@@ -100,13 +91,10 @@ esphome/components/mcp23x08_base/* @jesserockz
 esphome/components/mcp23x17_base/* @jesserockz
 esphome/components/mcp23xxx_base/* @jesserockz
 esphome/components/mcp2515/* @danielschramm @mvturnho
-esphome/components/mcp3204/* @rsumner
-esphome/components/mcp47a1/* @jesserockz
 esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/midea/* @dudanov
-esphome/components/midea_ir/* @dudanov
 esphome/components/mitsubishi/* @RubyBailey
 esphome/components/modbus_controller/* @martgras
 esphome/components/modbus_controller/binary_sensor/* @martgras
@@ -134,7 +122,6 @@ esphome/components/pn532_i2c/* @OttoWinter @jesserockz
 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/* @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
 esphome/components/rc522/* @glmnet
@@ -144,7 +131,7 @@ esphome/components/restart/* @esphome/core
 esphome/components/rf_bridge/* @jesserockz
 esphome/components/rgbct/* @jesserockz
 esphome/components/rtttl/* @glmnet
-esphome/components/safe_mode/* @jsuanet @paulmonigatti
+esphome/components/safe_mode/* @paulmonigatti
 esphome/components/scd4x/* @sjtrny
 esphome/components/script/* @esphome/core
 esphome/components/sdm_meter/* @jesserockz @polyfaces
@@ -154,7 +141,7 @@ esphome/components/select/* @esphome/core
 esphome/components/sensor/* @esphome/core
 esphome/components/sgp40/* @SenexCrenshaw
 esphome/components/sht4x/* @sjtrny
-esphome/components/shutdown/* @esphome/core @jsuanet
+esphome/components/shutdown/* @esphome/core
 esphome/components/sim800l/* @glmnet
 esphome/components/sm2135/* @BoukeHaarsma23
 esphome/components/socket/* @esphome/core
@@ -191,10 +178,8 @@ esphome/components/toshiba/* @kbx81
 esphome/components/tsl2591/* @wjcarpenter
 esphome/components/tuya/binary_sensor/* @jesserockz
 esphome/components/tuya/climate/* @jesserockz
-esphome/components/tuya/number/* @frankiboy1
 esphome/components/tuya/sensor/* @jesserockz
 esphome/components/tuya/switch/* @jesserockz
-esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
 esphome/components/ultrasonic/* @OttoWinter
 esphome/components/version/* @esphome/core

docker/Dockerfile

@@ -5,12 +5,12 @@
 # One of "docker", "hassio"
 ARG BASEIMGTYPE=docker
 
-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
-FROM debian:bullseye-20211220-slim AS base-docker-amd64
-FROM debian:bullseye-20211220-slim AS base-docker-arm64
-FROM debian:bullseye-20211220-slim AS base-docker-armv7
+FROM ghcr.io/hassio-addons/debian-base/amd64:5.1.1 AS base-hassio-amd64
+FROM ghcr.io/hassio-addons/debian-base/aarch64:5.1.1 AS base-hassio-arm64
+FROM ghcr.io/hassio-addons/debian-base/armv7:5.1.1 AS base-hassio-armv7
+FROM debian:bullseye-20211011-slim AS base-docker-amd64
+FROM debian:bullseye-20211011-slim AS base-docker-arm64
+FROM debian:bullseye-20211011-slim AS base-docker-armv7
 
 # Use TARGETARCH/TARGETVARIANT defined by docker
 # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope
@@ -27,7 +27,7 @@ RUN \
         python3-cryptography=3.3.2-1 \
         iputils-ping=3:20210202-1 \
         git=1:2.30.2-1 \
-        curl=7.74.0-1.3+deb11u1 \
+        curl=7.74.0-1.3+b1 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
@@ -42,8 +42,8 @@ ENV \
 RUN \
     # Ubuntu python3-pip is missing wheel
     pip3 install --no-cache-dir \
-        wheel==0.37.1 \
-        platformio==5.2.4 \
+        wheel==0.36.2 \
+        platformio==5.2.2 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
     && platformio settings set check_libraries_interval 1000000 \
@@ -64,7 +64,7 @@ RUN \
 
 # Copy esphome and install
 COPY . /esphome
-RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
+RUN pip3 install --no-cache-dir -e /esphome
 
 # Settings for dashboard
 ENV USERNAME="" PASSWORD=""
@@ -112,7 +112,7 @@ RUN \
 
 # Copy esphome and install
 COPY . /esphome
-RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
+RUN pip3 install --no-cache-dir -e /esphome
 
 # Labels
 LABEL \

docker/build.py

@@ -32,7 +32,6 @@ parser.add_argument("--dry-run", action="store_true", help="Don't run any comman
 subparsers = parser.add_subparsers(help="Action to perform", dest="command", required=True)
 build_parser = subparsers.add_parser("build", help="Build the image")
 build_parser.add_argument("--push", help="Also push the images", action="store_true")
-build_parser.add_argument("--load", help="Load the docker image locally", action="store_true")
 manifest_parser = subparsers.add_parser("manifest", help="Create a manifest from already pushed images")
 
 
@@ -133,8 +132,6 @@ def main():
             cmd += ["--tag", img]
         if args.push:
             cmd += ["--push", "--cache-to", f"type=registry,ref={cache_img},mode=max"]
-        if args.load:
-            cmd += ["--load"]
 
         run_command(*cmd, ".")
     elif args.command == "manifest":

esphome/__main__.py

@@ -145,8 +145,6 @@ def wrap_to_code(name, comp):
         if comp.config_schema is not None:
             conf_str = yaml_util.dump(conf)
             conf_str = conf_str.replace("//", "")
-            # remove tailing \ to avoid multi-line comment warning
-            conf_str = conf_str.replace("\\\n", "\n")
             cg.add(cg.LineComment(indent(conf_str)))
         await coro(conf)
 

esphome/codegen.py

@@ -75,7 +75,8 @@ from esphome.cpp_types import (  # noqa
     optional,
     arduino_json_ns,
     JsonObject,
-    JsonObjectConst,
+    JsonObjectRef,
+    JsonObjectConstRef,
     Controller,
     GPIOPin,
     InternalGPIOPin,

esphome/components/adalight/adalight_light_effect.cpp

@@ -25,7 +25,7 @@ void AdalightLightEffect::stop() {
   AddressableLightEffect::stop();
 }
 
-unsigned int AdalightLightEffect::get_frame_size_(int led_count) const {
+int AdalightLightEffect::get_frame_size_(int led_count) const {
   // 3 bytes: Ada
   // 2 bytes: LED count
   // 1 byte: checksum

esphome/components/adalight/adalight_light_effect.h

@@ -25,7 +25,7 @@ class AdalightLightEffect : public light::AddressableLightEffect, public uart::U
     CONSUMED,
   };
 
-  unsigned int get_frame_size_(int led_count) const;
+  int get_frame_size_(int led_count) const;
   void reset_frame_(light::AddressableLight &it);
   void blank_all_leds_(light::AddressableLight &it);
   Frame parse_frame_(light::AddressableLight &it);

esphome/components/adc/adc_sensor.cpp

@@ -91,7 +91,7 @@ void ADCSensor::dump_config() {
 float ADCSensor::get_setup_priority() const { return setup_priority::DATA; }
 void ADCSensor::update() {
   float value_v = this->sample();
-  ESP_LOGV(TAG, "'%s': Got voltage=%.4fV", this->get_name().c_str(), value_v);
+  ESP_LOGD(TAG, "'%s': Got voltage=%.4fV", this->get_name().c_str(), value_v);
   this->publish_state(value_v);
 }
 

esphome/components/aht10/aht10.cpp

@@ -110,12 +110,12 @@ void AHT10Component::update() {
   uint32_t raw_temperature = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
   uint32_t raw_humidity = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
 
-  float temperature = ((200.0f * (float) raw_temperature) / 1048576.0f) - 50.0f;
+  float temperature = ((200.0 * (float) raw_temperature) / 1048576.0) - 50.0;
   float humidity;
   if (raw_humidity == 0) {  // unrealistic value
     humidity = NAN;
   } else {
-    humidity = (float) raw_humidity * 100.0f / 1048576.0f;
+    humidity = (float) raw_humidity * 100.0 / 1048576.0;
   }
 
   if (this->temperature_sensor_ != nullptr) {

esphome/components/am2320/am2320.cpp

@@ -38,9 +38,9 @@ void AM2320Component::update() {
     return;
   }
 
-  float temperature = (((data[4] & 0x7F) << 8) + data[5]) / 10.0f;
+  float temperature = (((data[4] & 0x7F) << 8) + data[5]) / 10.0;
   temperature = (data[4] & 0x80) ? -temperature : temperature;
-  float humidity = ((data[2] << 8) + data[3]) / 10.0f;
+  float humidity = ((data[2] << 8) + data[3]) / 10.0;
 
   ESP_LOGD(TAG, "Got temperature=%.1f°C humidity=%.1f%%", temperature, humidity);
   if (this->temperature_sensor_ != nullptr)

esphome/components/anova/anova.h

@@ -30,7 +30,7 @@ class Anova : public climate::Climate, public esphome::ble_client::BLEClientNode
   climate::ClimateTraits traits() override {
     auto traits = climate::ClimateTraits();
     traits.set_supports_current_temperature(true);
-    traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::ClimateMode::CLIMATE_MODE_HEAT});
+    traits.set_supports_heat_mode(true);
     traits.set_visual_min_temperature(25.0);
     traits.set_visual_max_temperature(100.0);
     traits.set_visual_temperature_step(0.1);

esphome/components/anova/anova_base.cpp

@@ -73,46 +73,51 @@ AnovaPacket *AnovaCodec::get_stop_request() {
 }
 
 void AnovaCodec::decode(const uint8_t *data, uint16_t length) {
-  char buf[32];
-  memset(buf, 0, sizeof(buf));
-  strncpy(buf, (char *) data, std::min<uint16_t>(length, sizeof(buf) - 1));
+  memset(this->buf_, 0, 32);
+  strncpy(this->buf_, (char *) data, length);
   this->has_target_temp_ = this->has_current_temp_ = this->has_unit_ = this->has_running_ = false;
   switch (this->current_query_) {
     case READ_DEVICE_STATUS: {
-      if (!strncmp(buf, "stopped", 7)) {
+      if (!strncmp(this->buf_, "stopped", 7)) {
         this->has_running_ = true;
         this->running_ = false;
       }
-      if (!strncmp(buf, "running", 7)) {
+      if (!strncmp(this->buf_, "running", 7)) {
         this->has_running_ = true;
         this->running_ = true;
       }
       break;
     }
     case START: {
-      if (!strncmp(buf, "start", 5)) {
+      if (!strncmp(this->buf_, "start", 5)) {
         this->has_running_ = true;
         this->running_ = true;
       }
       break;
     }
     case STOP: {
-      if (!strncmp(buf, "stop", 4)) {
+      if (!strncmp(this->buf_, "stop", 4)) {
         this->has_running_ = true;
         this->running_ = false;
       }
       break;
     }
-    case READ_TARGET_TEMPERATURE:
+    case READ_TARGET_TEMPERATURE: {
+      this->target_temp_ = parse_number<float>(this->buf_, sizeof(this->buf_)).value_or(0.0f);
+      if (this->fahrenheit_)
+        this->target_temp_ = ftoc(this->target_temp_);
+      this->has_target_temp_ = true;
+      break;
+    }
     case SET_TARGET_TEMPERATURE: {
-      this->target_temp_ = parse_number<float>(str_until(buf, '\r')).value_or(0.0f);
+      this->target_temp_ = parse_number<float>(this->buf_, sizeof(this->buf_)).value_or(0.0f);
       if (this->fahrenheit_)
         this->target_temp_ = ftoc(this->target_temp_);
       this->has_target_temp_ = true;
       break;
     }
     case READ_CURRENT_TEMPERATURE: {
-      this->current_temp_ = parse_number<float>(str_until(buf, '\r')).value_or(0.0f);
+      this->current_temp_ = parse_number<float>(this->buf_, sizeof(this->buf_)).value_or(0.0f);
       if (this->fahrenheit_)
         this->current_temp_ = ftoc(this->current_temp_);
       this->has_current_temp_ = true;
@@ -120,8 +125,8 @@ void AnovaCodec::decode(const uint8_t *data, uint16_t length) {
     }
     case SET_UNIT:
     case READ_UNIT: {
-      this->unit_ = buf[0];
-      this->fahrenheit_ = buf[0] == 'f';
+      this->unit_ = this->buf_[0];
+      this->fahrenheit_ = this->buf_[0] == 'f';
       this->has_unit_ = true;
       break;
     }

esphome/components/anova/anova_base.h

@@ -70,6 +70,7 @@ class AnovaCodec {
   bool has_current_temp_;
   bool has_unit_;
   bool has_running_;
+  char buf_[32];
   bool fahrenheit_;
 
   CurrentQuery current_query_;

esphome/components/api/api.proto

@@ -40,7 +40,6 @@ service APIConnection {
   rpc climate_command (ClimateCommandRequest) returns (void) {}
   rpc number_command (NumberCommandRequest) returns (void) {}
   rpc select_command (SelectCommandRequest) returns (void) {}
-  rpc button_command (ButtonCommandRequest) returns (void) {}
 }
 
 
@@ -869,11 +868,6 @@ message ClimateCommandRequest {
 }
 
 // ==================== NUMBER ====================
-enum NumberMode {
-  NUMBER_MODE_AUTO = 0;
-  NUMBER_MODE_BOX = 1;
-  NUMBER_MODE_SLIDER = 2;
-}
 message ListEntitiesNumberResponse {
   option (id) = 49;
   option (source) = SOURCE_SERVER;
@@ -890,8 +884,6 @@ message ListEntitiesNumberResponse {
   float step = 8;
   bool disabled_by_default = 9;
   EntityCategory entity_category = 10;
-  string unit_of_measurement = 11;
-  NumberMode mode = 12;
 }
 message NumberStateResponse {
   option (id) = 50;
@@ -952,28 +944,3 @@ message SelectCommandRequest {
   fixed32 key = 1;
   string state = 2;
 }
-
-// ==================== BUTTON ====================
-message ListEntitiesButtonResponse {
-  option (id) = 61;
-  option (source) = SOURCE_SERVER;
-  option (ifdef) = "USE_BUTTON";
-
-  string object_id = 1;
-  fixed32 key = 2;
-  string name = 3;
-  string unique_id = 4;
-
-  string icon = 5;
-  bool disabled_by_default = 6;
-  EntityCategory entity_category = 7;
-  string device_class = 8;
-}
-message ButtonCommandRequest {
-  option (id) = 62;
-  option (source) = SOURCE_CLIENT;
-  option (ifdef) = "USE_BUTTON";
-  option (no_delay) = true;
-
-  fixed32 key = 1;
-}

esphome/components/api/api_connection.cpp

@@ -20,7 +20,6 @@ namespace esphome {
 namespace api {
 
 static const char *const TAG = "api.connection";
-static const int ESP32_CAMERA_STOP_STREAM = 5000;
 
 APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *parent)
     : parent_(parent), initial_state_iterator_(parent, this), list_entities_iterator_(parent, this) {
@@ -133,7 +132,7 @@ void APIConnection::loop() {
 
   if (state_subs_at_ != -1) {
     const auto &subs = this->parent_->get_state_subs();
-    if (state_subs_at_ >= (int) subs.size()) {
+    if (state_subs_at_ >= subs.size()) {
       state_subs_at_ = -1;
     } else {
       auto &it = subs[state_subs_at_];
@@ -620,8 +619,6 @@ bool APIConnection::send_number_info(number::Number *number) {
   msg.icon = number->get_icon();
   msg.disabled_by_default = number->is_disabled_by_default();
   msg.entity_category = static_cast<enums::EntityCategory>(number->get_entity_category());
-  msg.unit_of_measurement = number->traits.get_unit_of_measurement();
-  msg.mode = static_cast<enums::NumberMode>(number->traits.get_mode());
 
   msg.min_value = number->traits.get_min_value();
   msg.max_value = number->traits.get_max_value();
@@ -677,37 +674,13 @@ void APIConnection::select_command(const SelectCommandRequest &msg) {
 }
 #endif
 
-#ifdef USE_BUTTON
-bool APIConnection::send_button_info(button::Button *button) {
-  ListEntitiesButtonResponse msg;
-  msg.key = button->get_object_id_hash();
-  msg.object_id = button->get_object_id();
-  msg.name = button->get_name();
-  msg.unique_id = get_default_unique_id("button", button);
-  msg.icon = button->get_icon();
-  msg.disabled_by_default = button->is_disabled_by_default();
-  msg.entity_category = static_cast<enums::EntityCategory>(button->get_entity_category());
-  msg.device_class = button->get_device_class();
-  return this->send_list_entities_button_response(msg);
-}
-void APIConnection::button_command(const ButtonCommandRequest &msg) {
-  button::Button *button = App.get_button_by_key(msg.key);
-  if (button == nullptr)
-    return;
-
-  button->press();
-}
-#endif
-
 #ifdef USE_ESP32_CAMERA
 void APIConnection::send_camera_state(std::shared_ptr<esp32_camera::CameraImage> image) {
   if (!this->state_subscription_)
     return;
   if (this->image_reader_.available())
     return;
-  if (image->was_requested_by(esphome::esp32_camera::API_REQUESTER) ||
-      image->was_requested_by(esphome::esp32_camera::IDLE))
-    this->image_reader_.set_image(std::move(image));
+  this->image_reader_.set_image(std::move(image));
 }
 bool APIConnection::send_camera_info(esp32_camera::ESP32Camera *camera) {
   ListEntitiesCameraResponse msg;
@@ -725,14 +698,9 @@ void APIConnection::camera_image(const CameraImageRequest &msg) {
     return;
 
   if (msg.single)
-    esp32_camera::global_esp32_camera->request_image(esphome::esp32_camera::API_REQUESTER);
-  if (msg.stream) {
-    esp32_camera::global_esp32_camera->start_stream(esphome::esp32_camera::API_REQUESTER);
-
-    App.scheduler.set_timeout(this->parent_, "api_esp32_camera_stop_stream", ESP32_CAMERA_STOP_STREAM, []() {
-      esp32_camera::global_esp32_camera->stop_stream(esphome::esp32_camera::API_REQUESTER);
-    });
-  }
+    esp32_camera::global_esp32_camera->request_image();
+  if (msg.stream)
+    esp32_camera::global_esp32_camera->request_stream();
 }
 #endif
 

esphome/components/api/api_connection.h

@@ -73,10 +73,6 @@ class APIConnection : public APIServerConnection {
   bool send_select_state(select::Select *select, std::string state);
   bool send_select_info(select::Select *select);
   void select_command(const SelectCommandRequest &msg) override;
-#endif
-#ifdef USE_BUTTON
-  bool send_button_info(button::Button *button);
-  void button_command(const ButtonCommandRequest &msg) override;
 #endif
   bool send_log_message(int level, const char *tag, const char *line);
   void send_homeassistant_service_call(const HomeassistantServiceResponse &call) {

esphome/components/api/api_frame_helper.cpp

@@ -1,7 +1,6 @@
 #include "api_frame_helper.h"
 
 #include "esphome/core/log.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "proto.h"
 #include <cstring>
@@ -175,6 +174,9 @@ APIError APINoiseFrameHelper::loop() {
  * errno API_ERROR_HANDSHAKE_PACKET_LEN: Packet too big for this phase.
  */
 APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
+  int err;
+  APIError aerr;
+
   if (frame == nullptr) {
     HELPER_LOG("Bad argument for try_read_frame_");
     return APIError::BAD_ARG;
@@ -198,7 +200,7 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
       return APIError::CONNECTION_CLOSED;
     }
     rx_header_buf_len_ += received;
-    if ((size_t) received != to_read) {
+    if (received != to_read) {
       // not a full read
       return APIError::WOULD_BLOCK;
     }
@@ -245,7 +247,7 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
       return APIError::CONNECTION_CLOSED;
     }
     rx_buf_len_ += received;
-    if ((size_t) received != to_read) {
+    if (received != to_read) {
       // not all read
       return APIError::WOULD_BLOCK;
     }
@@ -253,7 +255,7 @@ APIError APINoiseFrameHelper::try_read_frame_(ParsedFrame *frame) {
 
   // uncomment for even more debugging
 #ifdef HELPER_LOG_PACKETS
-  ESP_LOGVV(TAG, "Received frame: %s", format_hex_pretty(rx_buf_).c_str());
+  ESP_LOGVV(TAG, "Received frame: %s", hexencode(rx_buf_).c_str());
 #endif
   frame->msg = std::move(rx_buf_);
   // consume msg
@@ -542,13 +544,13 @@ APIError APINoiseFrameHelper::try_send_tx_buf_() {
 APIError APINoiseFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
   if (iovcnt == 0)
     return APIError::OK;
+  int err;
   APIError aerr;
 
   size_t total_write_len = 0;
   for (int i = 0; i < iovcnt; i++) {
 #ifdef HELPER_LOG_PACKETS
-    ESP_LOGVV(TAG, "Sending raw: %s",
-              format_hex_pretty(reinterpret_cast<uint8_t *>(iov[i].iov_base), iov[i].iov_len).c_str());
+    ESP_LOGVV(TAG, "Sending raw: %s", hexencode(reinterpret_cast<uint8_t *>(iov[i].iov_base), iov[i].iov_len).c_str());
 #endif
     total_write_len += iov[i].iov_len;
   }
@@ -582,7 +584,7 @@ APIError APINoiseFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
     state_ = State::FAILED;
     HELPER_LOG("Socket write failed with errno %d", errno);
     return APIError::SOCKET_WRITE_FAILED;
-  } else if ((size_t) sent != total_write_len) {
+  } else if (sent != total_write_len) {
     // partially sent, add end to tx_buf
     size_t to_consume = sent;
     for (int i = 0; i < iovcnt; i++) {
@@ -722,12 +724,7 @@ APIError APINoiseFrameHelper::shutdown(int how) {
 }
 extern "C" {
 // declare how noise generates random bytes (here with a good HWRNG based on the RF system)
-void noise_rand_bytes(void *output, size_t len) {
-  if (!esphome::random_bytes(reinterpret_cast<uint8_t *>(output), len)) {
-    ESP_LOGE(TAG, "Failed to acquire random bytes, rebooting!");
-    arch_restart();
-  }
-}
+void noise_rand_bytes(void *output, size_t len) { esphome::fill_random(reinterpret_cast<uint8_t *>(output), len); }
 }
 #endif  // USE_API_NOISE
 
@@ -781,6 +778,9 @@ APIError APIPlaintextFrameHelper::loop() {
  * error API_ERROR_BAD_INDICATOR: Bad indicator byte at start of frame.
  */
 APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
+  int err;
+  APIError aerr;
+
   if (frame == nullptr) {
     HELPER_LOG("Bad argument for try_read_frame_");
     return APIError::BAD_ARG;
@@ -854,7 +854,7 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
       return APIError::CONNECTION_CLOSED;
     }
     rx_buf_len_ += received;
-    if ((size_t) received != to_read) {
+    if (received != to_read) {
       // not all read
       return APIError::WOULD_BLOCK;
     }
@@ -862,7 +862,7 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
 
   // uncomment for even more debugging
 #ifdef HELPER_LOG_PACKETS
-  ESP_LOGVV(TAG, "Received frame: %s", format_hex_pretty(rx_buf_).c_str());
+  ESP_LOGVV(TAG, "Received frame: %s", hexencode(rx_buf_).c_str());
 #endif
   frame->msg = std::move(rx_buf_);
   // consume msg
@@ -874,6 +874,7 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
 }
 
 APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
+  int err;
   APIError aerr;
 
   if (state_ != State::DATA) {
@@ -893,6 +894,9 @@ APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
 }
 bool APIPlaintextFrameHelper::can_write_without_blocking() { return state_ == State::DATA && tx_buf_.empty(); }
 APIError APIPlaintextFrameHelper::write_packet(uint16_t type, const uint8_t *payload, size_t payload_len) {
+  int err;
+  APIError aerr;
+
   if (state_ != State::DATA) {
     return APIError::BAD_STATE;
   }
@@ -936,13 +940,13 @@ APIError APIPlaintextFrameHelper::try_send_tx_buf_() {
 APIError APIPlaintextFrameHelper::write_raw_(const struct iovec *iov, int iovcnt) {
   if (iovcnt == 0)
     return APIError::OK;
+  int err;
   APIError aerr;
 
   size_t total_write_len = 0;
   for (int i = 0; i < iovcnt; i++) {
 #ifdef HELPER_LOG_PACKETS
-    ESP_LOGVV(TAG, "Sending raw: %s",
-              format_hex_pretty(reinterpret_cast<uint8_t *>(iov[i].iov_base), iov[i].iov_len).c_str());
+    ESP_LOGVV(TAG, "Sending raw: %s", hexencode(reinterpret_cast<uint8_t *>(iov[i].iov_base), iov[i].iov_len).c_str());
 #endif
     total_write_len += iov[i].iov_len;
   }
@@ -976,7 +980,7 @@ APIError APIPlaintextFrameHelper::write_raw_(const struct iovec *iov, int iovcnt
     state_ = State::FAILED;
     HELPER_LOG("Socket write failed with errno %d", errno);
     return APIError::SOCKET_WRITE_FAILED;
-  } else if ((size_t) sent != total_write_len) {
+  } else if (sent != total_write_len) {
     // partially sent, add end to tx_buf
     size_t to_consume = sent;
     for (int i = 0; i < iovcnt; i++) {

esphome/components/api/api_pb2.cpp

@@ -266,18 +266,6 @@ template<> const char *proto_enum_to_string<enums::ClimatePreset>(enums::Climate
       return "UNKNOWN";
   }
 }
-template<> const char *proto_enum_to_string<enums::NumberMode>(enums::NumberMode value) {
-  switch (value) {
-    case enums::NUMBER_MODE_AUTO:
-      return "NUMBER_MODE_AUTO";
-    case enums::NUMBER_MODE_BOX:
-      return "NUMBER_MODE_BOX";
-    case enums::NUMBER_MODE_SLIDER:
-      return "NUMBER_MODE_SLIDER";
-    default:
-      return "UNKNOWN";
-  }
-}
 bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
     case 1: {
@@ -291,7 +279,7 @@ bool HelloRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value)
 void HelloRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_string(1, this->client_info); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HelloRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HelloRequest {\n");
   out.append("  client_info: ");
   out.append("'").append(this->client_info).append("'");
@@ -330,7 +318,7 @@ void HelloResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HelloResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HelloResponse {\n");
   out.append("  api_version_major: ");
   sprintf(buffer, "%u", this->api_version_major);
@@ -361,7 +349,7 @@ bool ConnectRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value
 void ConnectRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_string(1, this->password); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ConnectRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ConnectRequest {\n");
   out.append("  password: ");
   out.append("'").append(this->password).append("'");
@@ -382,7 +370,7 @@ bool ConnectResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
 void ConnectResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_bool(1, this->invalid_password); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ConnectResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ConnectResponse {\n");
   out.append("  invalid_password: ");
   out.append(YESNO(this->invalid_password));
@@ -476,7 +464,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("DeviceInfoResponse {\n");
   out.append("  uses_password: ");
   out.append(YESNO(this->uses_password));
@@ -600,7 +588,7 @@ void ListEntitiesBinarySensorResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesBinarySensorResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesBinarySensorResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -672,7 +660,7 @@ void BinarySensorStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void BinarySensorStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("BinarySensorStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -766,7 +754,7 @@ void ListEntitiesCoverResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesCoverResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesCoverResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -856,7 +844,7 @@ void CoverStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CoverStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("CoverStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -939,7 +927,7 @@ void CoverCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CoverCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("CoverCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1055,7 +1043,7 @@ void ListEntitiesFanResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesFanResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesFanResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -1151,7 +1139,7 @@ void FanStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void FanStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("FanStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1252,7 +1240,7 @@ void FanCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void FanCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("FanCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1403,7 +1391,7 @@ void ListEntitiesLightResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesLightResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesLightResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -1561,7 +1549,7 @@ void LightStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void LightStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("LightStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1784,7 +1772,7 @@ void LightCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void LightCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("LightCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -1995,7 +1983,7 @@ void ListEntitiesSensorResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesSensorResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesSensorResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -2084,7 +2072,7 @@ void SensorStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SensorStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SensorStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -2164,7 +2152,7 @@ void ListEntitiesSwitchResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesSwitchResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesSwitchResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -2227,7 +2215,7 @@ void SwitchStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SwitchStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SwitchStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -2266,7 +2254,7 @@ void SwitchCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SwitchCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SwitchCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -2336,7 +2324,7 @@ void ListEntitiesTextSensorResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesTextSensorResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesTextSensorResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -2406,7 +2394,7 @@ void TextSensorStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void TextSensorStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("TextSensorStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -2443,7 +2431,7 @@ void SubscribeLogsRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeLogsRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SubscribeLogsRequest {\n");
   out.append("  level: ");
   out.append(proto_enum_to_string<enums::LogLevel>(this->level));
@@ -2486,7 +2474,7 @@ void SubscribeLogsResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeLogsResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SubscribeLogsResponse {\n");
   out.append("  level: ");
   out.append(proto_enum_to_string<enums::LogLevel>(this->level));
@@ -2528,7 +2516,7 @@ void HomeassistantServiceMap::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HomeassistantServiceMap::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HomeassistantServiceMap {\n");
   out.append("  key: ");
   out.append("'").append(this->key).append("'");
@@ -2587,7 +2575,7 @@ void HomeassistantServiceResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HomeassistantServiceResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HomeassistantServiceResponse {\n");
   out.append("  service: ");
   out.append("'").append(this->service).append("'");
@@ -2643,7 +2631,7 @@ void SubscribeHomeAssistantStateResponse::encode(ProtoWriteBuffer buffer) const
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeHomeAssistantStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SubscribeHomeAssistantStateResponse {\n");
   out.append("  entity_id: ");
   out.append("'").append(this->entity_id).append("'");
@@ -2680,7 +2668,7 @@ void HomeAssistantStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void HomeAssistantStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("HomeAssistantStateResponse {\n");
   out.append("  entity_id: ");
   out.append("'").append(this->entity_id).append("'");
@@ -2713,7 +2701,7 @@ bool GetTimeResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
 void GetTimeResponse::encode(ProtoWriteBuffer buffer) const { buffer.encode_fixed32(1, this->epoch_seconds); }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void GetTimeResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("GetTimeResponse {\n");
   out.append("  epoch_seconds: ");
   sprintf(buffer, "%u", this->epoch_seconds);
@@ -2748,7 +2736,7 @@ void ListEntitiesServicesArgument::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesServicesArgument::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesServicesArgument {\n");
   out.append("  name: ");
   out.append("'").append(this->name).append("'");
@@ -2793,7 +2781,7 @@ void ListEntitiesServicesResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesServicesResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesServicesResponse {\n");
   out.append("  name: ");
   out.append("'").append(this->name).append("'");
@@ -2887,7 +2875,7 @@ void ExecuteServiceArgument::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ExecuteServiceArgument::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ExecuteServiceArgument {\n");
   out.append("  bool_: ");
   out.append(YESNO(this->bool_));
@@ -2968,7 +2956,7 @@ void ExecuteServiceRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ExecuteServiceRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ExecuteServiceRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3040,7 +3028,7 @@ void ListEntitiesCameraResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesCameraResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesCameraResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -3110,7 +3098,7 @@ void CameraImageResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CameraImageResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("CameraImageResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3147,7 +3135,7 @@ void CameraImageRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void CameraImageRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("CameraImageRequest {\n");
   out.append("  single: ");
   out.append(YESNO(this->single));
@@ -3293,7 +3281,7 @@ void ListEntitiesClimateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesClimateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesClimateResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -3480,7 +3468,7 @@ void ClimateStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ClimateStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ClimateStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3668,7 +3656,7 @@ void ClimateCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ClimateCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ClimateCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3770,10 +3758,6 @@ bool ListEntitiesNumberResponse::decode_varint(uint32_t field_id, ProtoVarInt va
       this->entity_category = value.as_enum<enums::EntityCategory>();
       return true;
     }
-    case 12: {
-      this->mode = value.as_enum<enums::NumberMode>();
-      return true;
-    }
     default:
       return false;
   }
@@ -3796,10 +3780,6 @@ bool ListEntitiesNumberResponse::decode_length(uint32_t field_id, ProtoLengthDel
       this->icon = value.as_string();
       return true;
     }
-    case 11: {
-      this->unit_of_measurement = value.as_string();
-      return true;
-    }
     default:
       return false;
   }
@@ -3837,12 +3817,10 @@ void ListEntitiesNumberResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_float(8, this->step);
   buffer.encode_bool(9, this->disabled_by_default);
   buffer.encode_enum<enums::EntityCategory>(10, this->entity_category);
-  buffer.encode_string(11, this->unit_of_measurement);
-  buffer.encode_enum<enums::NumberMode>(12, this->mode);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesNumberResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesNumberResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -3887,14 +3865,6 @@ void ListEntitiesNumberResponse::dump_to(std::string &out) const {
   out.append("  entity_category: ");
   out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
   out.append("\n");
-
-  out.append("  unit_of_measurement: ");
-  out.append("'").append(this->unit_of_measurement).append("'");
-  out.append("\n");
-
-  out.append("  mode: ");
-  out.append(proto_enum_to_string<enums::NumberMode>(this->mode));
-  out.append("\n");
   out.append("}");
 }
 #endif
@@ -3929,7 +3899,7 @@ void NumberStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void NumberStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("NumberStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -3967,7 +3937,7 @@ void NumberCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void NumberCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("NumberCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -4045,7 +4015,7 @@ void ListEntitiesSelectResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void ListEntitiesSelectResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("ListEntitiesSelectResponse {\n");
   out.append("  object_id: ");
   out.append("'").append(this->object_id).append("'");
@@ -4121,7 +4091,7 @@ void SelectStateResponse::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SelectStateResponse::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SelectStateResponse {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -4164,7 +4134,7 @@ void SelectCommandRequest::encode(ProtoWriteBuffer buffer) const {
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SelectCommandRequest::dump_to(std::string &out) const {
-  __attribute__((unused)) char buffer[64];
+  char buffer[64];
   out.append("SelectCommandRequest {\n");
   out.append("  key: ");
   sprintf(buffer, "%u", this->key);
@@ -4177,127 +4147,6 @@ void SelectCommandRequest::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
-bool ListEntitiesButtonResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
-  switch (field_id) {
-    case 6: {
-      this->disabled_by_default = value.as_bool();
-      return true;
-    }
-    case 7: {
-      this->entity_category = value.as_enum<enums::EntityCategory>();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesButtonResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
-  switch (field_id) {
-    case 1: {
-      this->object_id = value.as_string();
-      return true;
-    }
-    case 3: {
-      this->name = value.as_string();
-      return true;
-    }
-    case 4: {
-      this->unique_id = value.as_string();
-      return true;
-    }
-    case 5: {
-      this->icon = value.as_string();
-      return true;
-    }
-    case 8: {
-      this->device_class = value.as_string();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-bool ListEntitiesButtonResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 2: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void ListEntitiesButtonResponse::encode(ProtoWriteBuffer buffer) const {
-  buffer.encode_string(1, this->object_id);
-  buffer.encode_fixed32(2, this->key);
-  buffer.encode_string(3, this->name);
-  buffer.encode_string(4, this->unique_id);
-  buffer.encode_string(5, this->icon);
-  buffer.encode_bool(6, this->disabled_by_default);
-  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
-  buffer.encode_string(8, this->device_class);
-}
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void ListEntitiesButtonResponse::dump_to(std::string &out) const {
-  char buffer[64];
-  out.append("ListEntitiesButtonResponse {\n");
-  out.append("  object_id: ");
-  out.append("'").append(this->object_id).append("'");
-  out.append("\n");
-
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-
-  out.append("  name: ");
-  out.append("'").append(this->name).append("'");
-  out.append("\n");
-
-  out.append("  unique_id: ");
-  out.append("'").append(this->unique_id).append("'");
-  out.append("\n");
-
-  out.append("  icon: ");
-  out.append("'").append(this->icon).append("'");
-  out.append("\n");
-
-  out.append("  disabled_by_default: ");
-  out.append(YESNO(this->disabled_by_default));
-  out.append("\n");
-
-  out.append("  entity_category: ");
-  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
-  out.append("\n");
-
-  out.append("  device_class: ");
-  out.append("'").append(this->device_class).append("'");
-  out.append("\n");
-  out.append("}");
-}
-#endif
-bool ButtonCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
-  switch (field_id) {
-    case 1: {
-      this->key = value.as_fixed32();
-      return true;
-    }
-    default:
-      return false;
-  }
-}
-void ButtonCommandRequest::encode(ProtoWriteBuffer buffer) const { buffer.encode_fixed32(1, this->key); }
-#ifdef HAS_PROTO_MESSAGE_DUMP
-void ButtonCommandRequest::dump_to(std::string &out) const {
-  char buffer[64];
-  out.append("ButtonCommandRequest {\n");
-  out.append("  key: ");
-  sprintf(buffer, "%u", this->key);
-  out.append(buffer);
-  out.append("\n");
-  out.append("}");
-}
-#endif
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2.h

@@ -123,11 +123,6 @@ enum ClimatePreset : uint32_t {
   CLIMATE_PRESET_SLEEP = 6,
   CLIMATE_PRESET_ACTIVITY = 7,
 };
-enum NumberMode : uint32_t {
-  NUMBER_MODE_AUTO = 0,
-  NUMBER_MODE_BOX = 1,
-  NUMBER_MODE_SLIDER = 2,
-};
 
 }  // namespace enums
 
@@ -962,8 +957,6 @@ class ListEntitiesNumberResponse : public ProtoMessage {
   float step{0.0f};
   bool disabled_by_default{false};
   enums::EntityCategory entity_category{};
-  std::string unit_of_measurement{};
-  enums::NumberMode mode{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -1048,37 +1041,6 @@ class SelectCommandRequest : public ProtoMessage {
   bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
 };
-class ListEntitiesButtonResponse : public ProtoMessage {
- public:
-  std::string object_id{};
-  uint32_t key{0};
-  std::string name{};
-  std::string unique_id{};
-  std::string icon{};
-  bool disabled_by_default{false};
-  enums::EntityCategory entity_category{};
-  std::string device_class{};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
-  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
-};
-class ButtonCommandRequest : public ProtoMessage {
- public:
-  uint32_t key{0};
-  void encode(ProtoWriteBuffer buffer) const override;
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  void dump_to(std::string &out) const override;
-#endif
-
- protected:
-  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
-};
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2_service.cpp

@@ -282,16 +282,6 @@ bool APIServerConnectionBase::send_select_state_response(const SelectStateRespon
 #endif
 #ifdef USE_SELECT
 #endif
-#ifdef USE_BUTTON
-bool APIServerConnectionBase::send_list_entities_button_response(const ListEntitiesButtonResponse &msg) {
-#ifdef HAS_PROTO_MESSAGE_DUMP
-  ESP_LOGVV(TAG, "send_list_entities_button_response: %s", msg.dump().c_str());
-#endif
-  return this->send_message_<ListEntitiesButtonResponse>(msg, 61);
-}
-#endif
-#ifdef USE_BUTTON
-#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -523,17 +513,6 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_select_command_request: %s", msg.dump().c_str());
 #endif
       this->on_select_command_request(msg);
-#endif
-      break;
-    }
-    case 62: {
-#ifdef USE_BUTTON
-      ButtonCommandRequest msg;
-      msg.decode(msg_data, msg_size);
-#ifdef HAS_PROTO_MESSAGE_DUMP
-      ESP_LOGVV(TAG, "on_button_command_request: %s", msg.dump().c_str());
-#endif
-      this->on_button_command_request(msg);
 #endif
       break;
     }
@@ -758,19 +737,6 @@ void APIServerConnection::on_select_command_request(const SelectCommandRequest &
   this->select_command(msg);
 }
 #endif
-#ifdef USE_BUTTON
-void APIServerConnection::on_button_command_request(const ButtonCommandRequest &msg) {
-  if (!this->is_connection_setup()) {
-    this->on_no_setup_connection();
-    return;
-  }
-  if (!this->is_authenticated()) {
-    this->on_unauthenticated_access();
-    return;
-  }
-  this->button_command(msg);
-}
-#endif
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/api_pb2_service.h

@@ -129,12 +129,6 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_SELECT
   virtual void on_select_command_request(const SelectCommandRequest &value){};
-#endif
-#ifdef USE_BUTTON
-  bool send_list_entities_button_response(const ListEntitiesButtonResponse &msg);
-#endif
-#ifdef USE_BUTTON
-  virtual void on_button_command_request(const ButtonCommandRequest &value){};
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -177,9 +171,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #endif
 #ifdef USE_SELECT
   virtual void select_command(const SelectCommandRequest &msg) = 0;
-#endif
-#ifdef USE_BUTTON
-  virtual void button_command(const ButtonCommandRequest &msg) = 0;
 #endif
  protected:
   void on_hello_request(const HelloRequest &msg) override;
@@ -218,9 +209,6 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_SELECT
   void on_select_command_request(const SelectCommandRequest &msg) override;
 #endif
-#ifdef USE_BUTTON
-  void on_button_command_request(const ButtonCommandRequest &msg) override;
-#endif
 };
 
 }  // namespace api

esphome/components/api/homeassistant_service.h

@@ -12,10 +12,10 @@ template<typename... X> class TemplatableStringValue : public TemplatableValue<s
  public:
   TemplatableStringValue() : TemplatableValue<std::string, X...>() {}
 
-  template<typename F, enable_if_t<!is_invocable<F, X...>::value, int> = 0>
+  template<typename F, enable_if_t<!is_callable<F, X...>::value, int> = 0>
   TemplatableStringValue(F value) : TemplatableValue<std::string, X...>(value) {}
 
-  template<typename F, enable_if_t<is_invocable<F, X...>::value, int> = 0>
+  template<typename F, enable_if_t<is_callable<F, X...>::value, int> = 0>
   TemplatableStringValue(F f)
       : TemplatableValue<std::string, X...>([f](X... x) -> std::string { return to_string(f(x...)); }) {}
 };

esphome/components/api/list_entities.cpp

@@ -27,9 +27,6 @@ bool ListEntitiesIterator::on_sensor(sensor::Sensor *sensor) { return this->clie
 #ifdef USE_SWITCH
 bool ListEntitiesIterator::on_switch(switch_::Switch *a_switch) { return this->client_->send_switch_info(a_switch); }
 #endif
-#ifdef USE_BUTTON
-bool ListEntitiesIterator::on_button(button::Button *button) { return this->client_->send_button_info(button); }
-#endif
 #ifdef USE_TEXT_SENSOR
 bool ListEntitiesIterator::on_text_sensor(text_sensor::TextSensor *text_sensor) {
   return this->client_->send_text_sensor_info(text_sensor);

esphome/components/api/list_entities.h

@@ -30,9 +30,6 @@ class ListEntitiesIterator : public ComponentIterator {
 #ifdef USE_SWITCH
   bool on_switch(switch_::Switch *a_switch) override;
 #endif
-#ifdef USE_BUTTON
-  bool on_button(button::Button *button) override;
-#endif
 #ifdef USE_TEXT_SENSOR
   bool on_text_sensor(text_sensor::TextSensor *text_sensor) override;
 #endif

esphome/components/api/subscribe_state.h

@@ -31,9 +31,6 @@ class InitialStateIterator : public ComponentIterator {
 #ifdef USE_SWITCH
   bool on_switch(switch_::Switch *a_switch) override;
 #endif
-#ifdef USE_BUTTON
-  bool on_button(button::Button *button) override { return true; };
-#endif
 #ifdef USE_TEXT_SENSOR
   bool on_text_sensor(text_sensor::TextSensor *text_sensor) override;
 #endif

esphome/components/api/util.cpp

@@ -116,21 +116,6 @@ void ComponentIterator::advance() {
       }
       break;
 #endif
-#ifdef USE_BUTTON
-    case IteratorState::BUTTON:
-      if (this->at_ >= App.get_buttons().size()) {
-        advance_platform = true;
-      } else {
-        auto *button = App.get_buttons()[this->at_];
-        if (button->is_internal()) {
-          success = true;
-          break;
-        } else {
-          success = this->on_button(button);
-        }
-      }
-      break;
-#endif
 #ifdef USE_TEXT_SENSOR
     case IteratorState::TEXT_SENSOR:
       if (this->at_ >= App.get_text_sensors().size()) {

esphome/components/api/util.h

@@ -38,9 +38,6 @@ class ComponentIterator {
 #ifdef USE_SWITCH
   virtual bool on_switch(switch_::Switch *a_switch) = 0;
 #endif
-#ifdef USE_BUTTON
-  virtual bool on_button(button::Button *button) = 0;
-#endif
 #ifdef USE_TEXT_SENSOR
   virtual bool on_text_sensor(text_sensor::TextSensor *text_sensor) = 0;
 #endif
@@ -81,9 +78,6 @@ class ComponentIterator {
 #ifdef USE_SWITCH
     SWITCH,
 #endif
-#ifdef USE_BUTTON
-    BUTTON,
-#endif
 #ifdef USE_TEXT_SENSOR
     TEXT_SENSOR,
 #endif

esphome/components/atc_mithermometer/atc_mithermometer.cpp

@@ -45,8 +45,6 @@ bool ATCMiThermometer::parse_device(const esp32_ble_tracker::ESPBTDevice &device
       this->battery_voltage_->publish_state(*res->battery_voltage);
     success = true;
   }
-  if (this->signal_strength_ != nullptr)
-    this->signal_strength_->publish_state(device.get_rssi());
 
   return success;
 }

esphome/components/atc_mithermometer/atc_mithermometer.h

@@ -28,7 +28,6 @@ class ATCMiThermometer : public Component, public esp32_ble_tracker::ESPBTDevice
   void set_humidity(sensor::Sensor *humidity) { humidity_ = humidity; }
   void set_battery_level(sensor::Sensor *battery_level) { battery_level_ = battery_level; }
   void set_battery_voltage(sensor::Sensor *battery_voltage) { battery_voltage_ = battery_voltage; }
-  void set_signal_strength(sensor::Sensor *signal_strength) { signal_strength_ = signal_strength; }
 
  protected:
   uint64_t address_;
@@ -36,7 +35,6 @@ class ATCMiThermometer : public Component, public esp32_ble_tracker::ESPBTDevice
   sensor::Sensor *humidity_{nullptr};
   sensor::Sensor *battery_level_{nullptr};
   sensor::Sensor *battery_voltage_{nullptr};
-  sensor::Sensor *signal_strength_{nullptr};
 
   optional<ParseResult> parse_header_(const esp32_ble_tracker::ServiceData &service_data);
   bool parse_message_(const std::vector<uint8_t> &message, ParseResult &result);

esphome/components/atc_mithermometer/sensor.py

@@ -6,18 +6,15 @@ from esphome.const import (
     CONF_BATTERY_VOLTAGE,
     CONF_MAC_ADDRESS,
     CONF_HUMIDITY,
-    CONF_SIGNAL_STRENGTH,
     CONF_TEMPERATURE,
     CONF_ID,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_SIGNAL_STRENGTH,
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_VOLTAGE,
     ENTITY_CATEGORY_DIAGNOSTIC,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
-    UNIT_DECIBEL_MILLIWATT,
     UNIT_PERCENT,
     UNIT_VOLT,
 )
@@ -62,13 +59,6 @@ CONFIG_SCHEMA = (
                 state_class=STATE_CLASS_MEASUREMENT,
                 entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
             ),
-            cv.Optional(CONF_SIGNAL_STRENGTH): 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,
-            ),
         }
     )
     .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
@@ -95,6 +85,3 @@ async def to_code(config):
     if CONF_BATTERY_VOLTAGE in config:
         sens = await sensor.new_sensor(config[CONF_BATTERY_VOLTAGE])
         cg.add(var.set_battery_voltage(sens))
-    if CONF_SIGNAL_STRENGTH in config:
-        sens = await sensor.new_sensor(config[CONF_SIGNAL_STRENGTH])
-        cg.add(var.set_signal_strength(sens))

esphome/components/bang_bang/bang_bang_climate.cpp

@@ -80,23 +80,21 @@ void BangBangClimate::compute_state_() {
 
   climate::ClimateAction target_action;
   if (too_cold) {
-    // too cold -> enable heating if possible and enabled, else idle
-    if (this->supports_heat_ &&
-        (this->mode == climate::CLIMATE_MODE_HEAT_COOL || this->mode == climate::CLIMATE_MODE_HEAT))
+    // too cold -> enable heating if possible, else idle
+    if (this->supports_heat_)
       target_action = climate::CLIMATE_ACTION_HEATING;
     else
       target_action = climate::CLIMATE_ACTION_IDLE;
   } else if (too_hot) {
-    // too hot -> enable cooling if possible and enabled, else idle
-    if (this->supports_cool_ &&
-        (this->mode == climate::CLIMATE_MODE_HEAT_COOL || this->mode == climate::CLIMATE_MODE_COOL))
+    // too hot -> enable cooling if possible, else idle
+    if (this->supports_cool_)
       target_action = climate::CLIMATE_ACTION_COOLING;
     else
       target_action = climate::CLIMATE_ACTION_IDLE;
   } else {
     // neither too hot nor too cold -> in range
-    if (this->supports_cool_ && this->supports_heat_ && this->mode == climate::CLIMATE_MODE_HEAT_COOL) {
-      // if supports both ends and both cooling and heating enabled, go to idle action
+    if (this->supports_cool_ && this->supports_heat_) {
+      // if supports both ends, go to idle action
       target_action = climate::CLIMATE_ACTION_IDLE;
     } else {
       // else use current mode and don't change (hysteresis)

esphome/components/binary_sensor/binary_sensor.cpp

@@ -48,10 +48,7 @@ void BinarySensor::set_device_class(const std::string &device_class) { this->dev
 std::string BinarySensor::get_device_class() {
   if (this->device_class_.has_value())
     return *this->device_class_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   return this->device_class();
-#pragma GCC diagnostic pop
 }
 void BinarySensor::add_filter(Filter *filter) {
   filter->parent_ = this;

esphome/components/binary_sensor/binary_sensor.h

@@ -74,10 +74,7 @@ class BinarySensor : public EntityBase {
 
   // ========== OVERRIDE METHODS ==========
   // (You'll only need this when creating your own custom binary sensor)
-  /** Override this to set the default device class.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
+  /// Get the default device class for this sensor, or empty string for no default.
   virtual std::string device_class();
 
  protected:

esphome/components/bl0940/__init__.py

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

esphome/components/bl0940/bl0940.cpp

@@ -1,137 +0,0 @@
-#include "bl0940.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace bl0940 {
-
-static const char *const TAG = "bl0940";
-
-static const uint8_t BL0940_READ_COMMAND = 0x50;  // 0x58 according to documentation
-static const uint8_t BL0940_FULL_PACKET = 0xAA;
-static const uint8_t BL0940_PACKET_HEADER = 0x55;  // 0x58 according to documentation
-
-static const uint8_t BL0940_WRITE_COMMAND = 0xA0;  // 0xA8 according to documentation
-static const uint8_t BL0940_REG_I_FAST_RMS_CTRL = 0x10;
-static const uint8_t BL0940_REG_MODE = 0x18;
-static const uint8_t BL0940_REG_SOFT_RESET = 0x19;
-static const uint8_t BL0940_REG_USR_WRPROT = 0x1A;
-static const uint8_t BL0940_REG_TPS_CTRL = 0x1B;
-
-const uint8_t BL0940_INIT[5][6] = {
-    // Reset to default
-    {BL0940_WRITE_COMMAND, BL0940_REG_SOFT_RESET, 0x5A, 0x5A, 0x5A, 0x38},
-    // Enable User Operation Write
-    {BL0940_WRITE_COMMAND, BL0940_REG_USR_WRPROT, 0x55, 0x00, 0x00, 0xF0},
-    // 0x0100 = CF_UNABLE energy pulse, AC_FREQ_SEL 50Hz, RMS_UPDATE_SEL 800mS
-    {BL0940_WRITE_COMMAND, BL0940_REG_MODE, 0x00, 0x10, 0x00, 0x37},
-    // 0x47FF = Over-current and leakage alarm on, Automatic temperature measurement, Interval 100mS
-    {BL0940_WRITE_COMMAND, BL0940_REG_TPS_CTRL, 0xFF, 0x47, 0x00, 0xFE},
-    // 0x181C = Half cycle, Fast RMS threshold 6172
-    {BL0940_WRITE_COMMAND, BL0940_REG_I_FAST_RMS_CTRL, 0x1C, 0x18, 0x00, 0x1B}};
-
-void BL0940::loop() {
-  DataPacket buffer;
-  if (!this->available()) {
-    return;
-  }
-  if (read_array((uint8_t *) &buffer, sizeof(buffer))) {
-    if (validate_checksum(&buffer)) {
-      received_package_(&buffer);
-    }
-  } else {
-    ESP_LOGW(TAG, "Junk on wire. Throwing away partial message");
-    while (read() >= 0)
-      ;
-  }
-}
-
-bool BL0940::validate_checksum(const DataPacket *data) {
-  uint8_t checksum = BL0940_READ_COMMAND;
-  // Whole package but checksum
-  for (uint32_t i = 0; i < sizeof(data->raw) - 1; i++) {
-    checksum += data->raw[i];
-  }
-  checksum ^= 0xFF;
-  if (checksum != data->checksum) {
-    ESP_LOGW(TAG, "BL0940 invalid checksum! 0x%02X != 0x%02X", checksum, data->checksum);
-  }
-  return checksum == data->checksum;
-}
-
-void BL0940::update() {
-  this->flush();
-  this->write_byte(BL0940_READ_COMMAND);
-  this->write_byte(BL0940_FULL_PACKET);
-}
-
-void BL0940::setup() {
-  for (auto i : BL0940_INIT) {
-    this->write_array(i, 6);
-    delay(1);
-  }
-  this->flush();
-}
-
-float BL0940::update_temp_(sensor::Sensor *sensor, ube16_t temperature) const {
-  auto tb = (float) (temperature.h << 8 | temperature.l);
-  float converted_temp = ((float) 170 / 448) * (tb / 2 - 32) - 45;
-  if (sensor != nullptr) {
-    if (sensor->has_state() && std::abs(converted_temp - sensor->get_state()) > max_temperature_diff_) {
-      ESP_LOGD("bl0940", "Invalid temperature change. Sensor: '%s', Old temperature: %f, New temperature: %f",
-               sensor->get_name().c_str(), sensor->get_state(), converted_temp);
-      return 0.0f;
-    }
-    sensor->publish_state(converted_temp);
-  }
-  return converted_temp;
-}
-
-void BL0940::received_package_(const DataPacket *data) const {
-  // Bad header
-  if (data->frame_header != BL0940_PACKET_HEADER) {
-    ESP_LOGI("bl0940", "Invalid data. Header mismatch: %d", data->frame_header);
-    return;
-  }
-
-  float v_rms = (float) to_uint32_t(data->v_rms) / voltage_reference_;
-  float i_rms = (float) to_uint32_t(data->i_rms) / current_reference_;
-  float watt = (float) to_int32_t(data->watt) / power_reference_;
-  uint32_t cf_cnt = to_uint32_t(data->cf_cnt);
-  float total_energy_consumption = (float) cf_cnt / energy_reference_;
-
-  float tps1 = update_temp_(internal_temperature_sensor_, data->tps1);
-  float tps2 = update_temp_(external_temperature_sensor_, data->tps2);
-
-  if (voltage_sensor_ != nullptr) {
-    voltage_sensor_->publish_state(v_rms);
-  }
-  if (current_sensor_ != nullptr) {
-    current_sensor_->publish_state(i_rms);
-  }
-  if (power_sensor_ != nullptr) {
-    power_sensor_->publish_state(watt);
-  }
-  if (energy_sensor_ != nullptr) {
-    energy_sensor_->publish_state(total_energy_consumption);
-  }
-
-  ESP_LOGV("bl0940", "BL0940: U %fV, I %fA, P %fW, Cnt %d, ∫P %fkWh, T1 %f°C, T2 %f°C", v_rms, i_rms, watt, cf_cnt,
-           total_energy_consumption, tps1, tps2);
-}
-
-void BL0940::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
-  ESP_LOGCONFIG(TAG, "BL0940:");
-  LOG_SENSOR("", "Voltage", this->voltage_sensor_);
-  LOG_SENSOR("", "Current", this->current_sensor_);
-  LOG_SENSOR("", "Power", this->power_sensor_);
-  LOG_SENSOR("", "Energy", this->energy_sensor_);
-  LOG_SENSOR("", "Internal temperature", this->internal_temperature_sensor_);
-  LOG_SENSOR("", "External temperature", this->external_temperature_sensor_);
-}
-
-uint32_t BL0940::to_uint32_t(ube24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-int32_t BL0940::to_int32_t(sbe24_t input) { return input.h << 16 | input.m << 8 | input.l; }
-
-}  // namespace bl0940
-}  // namespace esphome

esphome/components/bl0940/bl0940.h

@@ -1,109 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/uart/uart.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace bl0940 {
-
-static const float BL0940_PREF = 1430;
-static const float BL0940_UREF = 33000;
-static const float BL0940_IREF = 275000;  // 2750 from tasmota. Seems to generate values 100 times too high
-
-// Measured to 297J  per click according to power consumption of 5 minutes
-// Converted to kWh (3.6MJ per kwH). Used to be 256 * 1638.4
-static const float BL0940_EREF = 3.6e6 / 297;
-
-struct ube24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t m;
-  uint8_t h;
-} __attribute__((packed));
-
-struct ube16_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t h;
-} __attribute__((packed));
-
-struct sbe24_t {  // NOLINT(readability-identifier-naming,altera-struct-pack-align)
-  uint8_t l;
-  uint8_t m;
-  int8_t h;
-} __attribute__((packed));
-
-// Caveat: All these values are big endian (low - middle - high)
-
-union DataPacket {  // NOLINT(altera-struct-pack-align)
-  uint8_t raw[35];
-  struct {
-    uint8_t frame_header;  // value of 0x58 according to docs. 0x55 according to Tasmota real world tests. Reality wins.
-    ube24_t i_fast_rms;    // 0x00
-    ube24_t i_rms;         // 0x04
-    ube24_t RESERVED0;     // reserved
-    ube24_t v_rms;         // 0x06
-    ube24_t RESERVED1;     // reserved
-    sbe24_t watt;          // 0x08
-    ube24_t RESERVED2;     // reserved
-    ube24_t cf_cnt;        // 0x0A
-    ube24_t RESERVED3;     // reserved
-    ube16_t tps1;          // 0x0c
-    uint8_t RESERVED4;     // value of 0x00
-    ube16_t tps2;          // 0x0c
-    uint8_t RESERVED5;     // value of 0x00
-    uint8_t checksum;      // checksum
-  };
-} __attribute__((packed));
-
-class BL0940 : public PollingComponent, public uart::UARTDevice {
- public:
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
-  void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
-  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
-  void set_internal_temperature_sensor(sensor::Sensor *internal_temperature_sensor) {
-    internal_temperature_sensor_ = internal_temperature_sensor;
-  }
-  void set_external_temperature_sensor(sensor::Sensor *external_temperature_sensor) {
-    external_temperature_sensor_ = external_temperature_sensor;
-  }
-
-  void loop() override;
-
-  void update() override;
-  void setup() override;
-  void dump_config() override;
-
- protected:
-  sensor::Sensor *voltage_sensor_;
-  sensor::Sensor *current_sensor_;
-  // NB This may be negative as the circuits is seemingly able to measure
-  // power in both directions
-  sensor::Sensor *power_sensor_;
-  sensor::Sensor *energy_sensor_;
-  sensor::Sensor *internal_temperature_sensor_;
-  sensor::Sensor *external_temperature_sensor_;
-
-  // Max difference between two measurements of the temperature. Used to avoid noise.
-  float max_temperature_diff_{0};
-  // Divide by this to turn into Watt
-  float power_reference_ = BL0940_PREF;
-  // Divide by this to turn into Volt
-  float voltage_reference_ = BL0940_UREF;
-  // Divide by this to turn into Ampere
-  float current_reference_ = BL0940_IREF;
-  // Divide by this to turn into kWh
-  float energy_reference_ = BL0940_EREF;
-
-  float update_temp_(sensor::Sensor *sensor, ube16_t packed_temperature) const;
-
-  static uint32_t to_uint32_t(ube24_t input);
-
-  static int32_t to_int32_t(sbe24_t input);
-
-  static bool validate_checksum(const DataPacket *data);
-
-  void received_package_(const DataPacket *data) const;
-};
-}  // namespace bl0940
-}  // namespace esphome

esphome/components/bl0940/sensor.py

@@ -1,106 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, uart
-from esphome.const import (
-    CONF_CURRENT,
-    CONF_ENERGY,
-    CONF_ID,
-    CONF_POWER,
-    CONF_VOLTAGE,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    DEVICE_CLASS_TEMPERATURE,
-    ICON_EMPTY,
-    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_NONE,
-    UNIT_AMPERE,
-    UNIT_CELSIUS,
-    UNIT_KILOWATT_HOURS,
-    UNIT_VOLT,
-    UNIT_WATT,
-)
-
-DEPENDENCIES = ["uart"]
-
-CONF_INTERNAL_TEMPERATURE = "internal_temperature"
-CONF_EXTERNAL_TEMPERATURE = "external_temperature"
-
-bl0940_ns = cg.esphome_ns.namespace("bl0940")
-BL0940 = bl0940_ns.class_("BL0940", cg.PollingComponent, uart.UARTDevice)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BL0940),
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                UNIT_VOLT, ICON_EMPTY, 1, DEVICE_CLASS_VOLTAGE, STATE_CLASS_MEASUREMENT
-            ),
-            cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                UNIT_AMPERE,
-                ICON_EMPTY,
-                2,
-                DEVICE_CLASS_CURRENT,
-                STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_POWER): sensor.sensor_schema(
-                UNIT_WATT, ICON_EMPTY, 0, DEVICE_CLASS_POWER, STATE_CLASS_MEASUREMENT
-            ),
-            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
-                UNIT_KILOWATT_HOURS,
-                ICON_EMPTY,
-                0,
-                DEVICE_CLASS_ENERGY,
-                STATE_CLASS_NONE,
-            ),
-            cv.Optional(CONF_INTERNAL_TEMPERATURE): sensor.sensor_schema(
-                UNIT_CELSIUS,
-                ICON_EMPTY,
-                0,
-                DEVICE_CLASS_TEMPERATURE,
-                STATE_CLASS_NONE,
-            ),
-            cv.Optional(CONF_EXTERNAL_TEMPERATURE): sensor.sensor_schema(
-                UNIT_CELSIUS,
-                ICON_EMPTY,
-                0,
-                DEVICE_CLASS_TEMPERATURE,
-                STATE_CLASS_NONE,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(uart.UART_DEVICE_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)
-
-    if CONF_VOLTAGE in config:
-        conf = config[CONF_VOLTAGE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_voltage_sensor(sens))
-    if CONF_CURRENT in config:
-        conf = config[CONF_CURRENT]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_current_sensor(sens))
-    if CONF_POWER in config:
-        conf = config[CONF_POWER]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_power_sensor(sens))
-    if CONF_ENERGY in config:
-        conf = config[CONF_ENERGY]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor(sens))
-    if CONF_INTERNAL_TEMPERATURE in config:
-        conf = config[CONF_INTERNAL_TEMPERATURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_internal_temperature_sensor(sens))
-    if CONF_EXTERNAL_TEMPERATURE in config:
-        conf = config[CONF_EXTERNAL_TEMPERATURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_external_temperature_sensor(sens))

esphome/components/bme280/bme280.cpp

@@ -33,7 +33,6 @@ static const uint8_t BME280_REGISTER_CONTROLHUMID = 0xF2;
 static const uint8_t BME280_REGISTER_STATUS = 0xF3;
 static const uint8_t BME280_REGISTER_CONTROL = 0xF4;
 static const uint8_t BME280_REGISTER_CONFIG = 0xF5;
-static const uint8_t BME280_REGISTER_MEASUREMENTS = 0xF7;
 static const uint8_t BME280_REGISTER_PRESSUREDATA = 0xF7;
 static const uint8_t BME280_REGISTER_TEMPDATA = 0xFA;
 static const uint8_t BME280_REGISTER_HUMIDDATA = 0xFD;
@@ -179,29 +178,23 @@ void BME280Component::update() {
     return;
   }
 
-  float meas_time = 1.5f;
+  float meas_time = 1.5;
   meas_time += 2.3f * oversampling_to_time(this->temperature_oversampling_);
   meas_time += 2.3f * oversampling_to_time(this->pressure_oversampling_) + 0.575f;
   meas_time += 2.3f * oversampling_to_time(this->humidity_oversampling_) + 0.575f;
 
   this->set_timeout("data", uint32_t(ceilf(meas_time)), [this]() {
-    uint8_t data[8];
-    if (!this->read_bytes(BME280_REGISTER_MEASUREMENTS, data, 8)) {
-      ESP_LOGW(TAG, "Error reading registers.");
-      this->status_set_warning();
-      return;
-    }
     int32_t t_fine = 0;
-    float temperature = this->read_temperature_(data, &t_fine);
+    float temperature = this->read_temperature_(&t_fine);
     if (std::isnan(temperature)) {
       ESP_LOGW(TAG, "Invalid temperature, cannot read pressure & humidity values.");
       this->status_set_warning();
       return;
     }
-    float pressure = this->read_pressure_(data, t_fine);
-    float humidity = this->read_humidity_(data, t_fine);
+    float pressure = this->read_pressure_(t_fine);
+    float humidity = this->read_humidity_(t_fine);
 
-    ESP_LOGV(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%%", temperature, pressure, humidity);
+    ESP_LOGD(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%%", temperature, pressure, humidity);
     if (this->temperature_sensor_ != nullptr)
       this->temperature_sensor_->publish_state(temperature);
     if (this->pressure_sensor_ != nullptr)
@@ -211,8 +204,11 @@ void BME280Component::update() {
     this->status_clear_warning();
   });
 }
-float BME280Component::read_temperature_(const uint8_t *data, int32_t *t_fine) {
-  int32_t adc = ((data[3] & 0xFF) << 16) | ((data[4] & 0xFF) << 8) | (data[5] & 0xFF);
+float BME280Component::read_temperature_(int32_t *t_fine) {
+  uint8_t data[3];
+  if (!this->read_bytes(BME280_REGISTER_TEMPDATA, data, 3))
+    return NAN;
+  int32_t adc = ((data[0] & 0xFF) << 16) | ((data[1] & 0xFF) << 8) | (data[2] & 0xFF);
   adc >>= 4;
   if (adc == 0x80000)
     // temperature was disabled
@@ -230,7 +226,10 @@ float BME280Component::read_temperature_(const uint8_t *data, int32_t *t_fine) {
   return temperature / 100.0f;
 }
 
-float BME280Component::read_pressure_(const uint8_t *data, int32_t t_fine) {
+float BME280Component::read_pressure_(int32_t t_fine) {
+  uint8_t data[3];
+  if (!this->read_bytes(BME280_REGISTER_PRESSUREDATA, data, 3))
+    return NAN;
   int32_t adc = ((data[0] & 0xFF) << 16) | ((data[1] & 0xFF) << 8) | (data[2] & 0xFF);
   adc >>= 4;
   if (adc == 0x80000)
@@ -266,9 +265,9 @@ float BME280Component::read_pressure_(const uint8_t *data, int32_t t_fine) {
   return (p / 256.0f) / 100.0f;
 }
 
-float BME280Component::read_humidity_(const uint8_t *data, int32_t t_fine) {
-  uint16_t raw_adc = ((data[6] & 0xFF) << 8) | (data[7] & 0xFF);
-  if (raw_adc == 0x8000)
+float BME280Component::read_humidity_(int32_t t_fine) {
+  uint16_t raw_adc;
+  if (!this->read_byte_16(BME280_REGISTER_HUMIDDATA, &raw_adc) || raw_adc == 0x8000)
     return NAN;
 
   int32_t adc = raw_adc;

esphome/components/bme280/bme280.h

@@ -82,11 +82,11 @@ class BME280Component : public PollingComponent, public i2c::I2CDevice {
 
  protected:
   /// Read the temperature value and store the calculated ambient temperature in t_fine.
-  float read_temperature_(const uint8_t *data, int32_t *t_fine);
+  float read_temperature_(int32_t *t_fine);
   /// Read the pressure value in hPa using the provided t_fine value.
-  float read_pressure_(const uint8_t *data, int32_t t_fine);
+  float read_pressure_(int32_t t_fine);
   /// Read the humidity value in % using the provided t_fine value.
-  float read_humidity_(const uint8_t *data, int32_t t_fine);
+  float read_humidity_(int32_t t_fine);
   uint8_t read_u8_(uint8_t a_register);
   uint16_t read_u16_le_(uint8_t a_register);
   int16_t read_s16_le_(uint8_t a_register);

esphome/components/bmp3xx/bmp3xx.cpp

@@ -1,388 +0,0 @@
-/*
-  based on BMP388_DEV by Martin Lindupp
-  under MIT License (MIT)
-  Copyright (C) Martin Lindupp 2020
-  http://github.com/MartinL1/BMP388_DEV
-*/
-
-#include "bmp3xx.h"
-#include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace bmp3xx {
-
-static const char *const TAG = "bmp3xx.sensor";
-
-static const LogString *chip_type_to_str(uint8_t chip_type) {
-  switch (chip_type) {
-    case BMP388_ID:
-      return LOG_STR("BMP 388");
-    case BMP390_ID:
-      return LOG_STR("BMP 390");
-    default:
-      return LOG_STR("Unknown Chip Type");
-  }
-}
-
-static const LogString *oversampling_to_str(Oversampling oversampling) {
-  switch (oversampling) {
-    case Oversampling::OVERSAMPLING_NONE:
-      return LOG_STR("None");
-    case Oversampling::OVERSAMPLING_X2:
-      return LOG_STR("2x");
-    case Oversampling::OVERSAMPLING_X4:
-      return LOG_STR("4x");
-    case Oversampling::OVERSAMPLING_X8:
-      return LOG_STR("8x");
-    case Oversampling::OVERSAMPLING_X16:
-      return LOG_STR("16x");
-    case Oversampling::OVERSAMPLING_X32:
-      return LOG_STR("32x");
-    default:
-      return LOG_STR("");
-  }
-}
-
-static const LogString *iir_filter_to_str(IIRFilter filter) {
-  switch (filter) {
-    case IIRFilter::IIR_FILTER_OFF:
-      return LOG_STR("OFF");
-    case IIRFilter::IIR_FILTER_2:
-      return LOG_STR("2x");
-    case IIRFilter::IIR_FILTER_4:
-      return LOG_STR("4x");
-    case IIRFilter::IIR_FILTER_8:
-      return LOG_STR("8x");
-    case IIRFilter::IIR_FILTER_16:
-      return LOG_STR("16x");
-    case IIRFilter::IIR_FILTER_32:
-      return LOG_STR("32x");
-    case IIRFilter::IIR_FILTER_64:
-      return LOG_STR("64x");
-    case IIRFilter::IIR_FILTER_128:
-      return LOG_STR("128x");
-    default:
-      return LOG_STR("");
-  }
-}
-
-void BMP3XXComponent::setup() {
-  this->error_code_ = NONE;
-  ESP_LOGCONFIG(TAG, "Setting up BMP3XX...");
-  // Call the Device base class "initialise" function
-  if (!reset()) {
-    ESP_LOGE(TAG, "Failed to reset BMP3XX...");
-    this->error_code_ = ERROR_SENSOR_RESET;
-    this->mark_failed();
-  }
-
-  if (!read_byte(BMP388_CHIP_ID, &this->chip_id_.reg)) {
-    ESP_LOGE(TAG, "Can't read chip id");
-    this->error_code_ = ERROR_COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-  ESP_LOGCONFIG(TAG, "Chip %s Id 0x%X", LOG_STR_ARG(chip_type_to_str(this->chip_id_.reg)), this->chip_id_.reg);
-
-  if (chip_id_.reg != BMP388_ID && chip_id_.reg != BMP390_ID) {
-    ESP_LOGE(TAG, "Unknown chip id - is this really a BMP388 or BMP390?");
-    this->error_code_ = ERROR_WRONG_CHIP_ID;
-    this->mark_failed();
-    return;
-  }
-  // set sensor in sleep mode
-  stop_conversion();
-  // Read the calibration parameters into the params structure
-  if (!read_bytes(BMP388_TRIM_PARAMS, (uint8_t *) &compensation_params_, sizeof(compensation_params_))) {
-    ESP_LOGE(TAG, "Can't read calibration data");
-    this->error_code_ = ERROR_COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-  compensation_float_params_.param_T1 =
-      (float) compensation_params_.param_T1 / powf(2.0f, -8.0f);  // Calculate the floating point trim parameters
-  compensation_float_params_.param_T2 = (float) compensation_params_.param_T2 / powf(2.0f, 30.0f);
-  compensation_float_params_.param_T3 = (float) compensation_params_.param_T3 / powf(2.0f, 48.0f);
-  compensation_float_params_.param_P1 = ((float) compensation_params_.param_P1 - powf(2.0f, 14.0f)) / powf(2.0f, 20.0f);
-  compensation_float_params_.param_P2 = ((float) compensation_params_.param_P2 - powf(2.0f, 14.0f)) / powf(2.0f, 29.0f);
-  compensation_float_params_.param_P3 = (float) compensation_params_.param_P3 / powf(2.0f, 32.0f);
-  compensation_float_params_.param_P4 = (float) compensation_params_.param_P4 / powf(2.0f, 37.0f);
-  compensation_float_params_.param_P5 = (float) compensation_params_.param_P5 / powf(2.0f, -3.0f);
-  compensation_float_params_.param_P6 = (float) compensation_params_.param_P6 / powf(2.0f, 6.0f);
-  compensation_float_params_.param_P7 = (float) compensation_params_.param_P7 / powf(2.0f, 8.0f);
-  compensation_float_params_.param_P8 = (float) compensation_params_.param_P8 / powf(2.0f, 15.0f);
-  compensation_float_params_.param_P9 = (float) compensation_params_.param_P9 / powf(2.0f, 48.0f);
-  compensation_float_params_.param_P10 = (float) compensation_params_.param_P10 / powf(2.0f, 48.0f);
-  compensation_float_params_.param_P11 = (float) compensation_params_.param_P11 / powf(2.0f, 65.0f);
-
-  // Initialise the BMP388 IIR filter register
-  if (!set_iir_filter(this->iir_filter_)) {
-    ESP_LOGE(TAG, "Failed to set IIR filter");
-    this->error_code_ = ERROR_COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-
-  // Set power control registers
-  pwr_ctrl_.bit.press_en = 1;
-  pwr_ctrl_.bit.temp_en = 1;
-  // Disable pressure if no sensor defined
-  // keep temperature enabled since it's needed for compensation
-  if (this->pressure_sensor_ == nullptr) {
-    pwr_ctrl_.bit.press_en = 0;
-    this->pressure_oversampling_ = OVERSAMPLING_NONE;
-  }
-  // just disable oeversampling for temp if not used
-  if (this->temperature_sensor_ == nullptr) {
-    this->temperature_oversampling_ = OVERSAMPLING_NONE;
-  }
-  // Initialise the BMP388 oversampling register
-  if (!set_oversampling_register(this->pressure_oversampling_, this->temperature_oversampling_)) {
-    ESP_LOGE(TAG, "Failed to set oversampling register");
-    this->error_code_ = ERROR_COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-}
-
-void BMP3XXComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "BMP3XX:");
-  ESP_LOGCONFIG(TAG, "  Type: %s (0x%X)", LOG_STR_ARG(chip_type_to_str(this->chip_id_.reg)), this->chip_id_.reg);
-  LOG_I2C_DEVICE(this);
-  switch (this->error_code_) {
-    case NONE:
-      break;
-    case ERROR_COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Communication with BMP3XX failed!");
-      break;
-    case ERROR_WRONG_CHIP_ID:
-      ESP_LOGE(
-          TAG,
-          "BMP3XX has wrong chip ID (reported id: 0x%X) - please check if you are really using a BMP 388 or BMP 390",
-          this->chip_id_.reg);
-      break;
-    case ERROR_SENSOR_RESET:
-      ESP_LOGE(TAG, "BMP3XX failed to reset");
-      break;
-    default:
-      ESP_LOGE(TAG, "BMP3XX error code %d", (int) this->error_code_);
-      break;
-  }
-  ESP_LOGCONFIG(TAG, "  IIR Filter: %s", LOG_STR_ARG(iir_filter_to_str(this->iir_filter_)));
-  LOG_UPDATE_INTERVAL(this);
-  if (this->temperature_sensor_) {
-    LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
-    ESP_LOGCONFIG(TAG, "    Oversampling: %s", LOG_STR_ARG(oversampling_to_str(this->temperature_oversampling_)));
-  }
-  if (this->pressure_sensor_) {
-    LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
-    ESP_LOGCONFIG(TAG, "    Oversampling: %s", LOG_STR_ARG(oversampling_to_str(this->pressure_oversampling_)));
-  }
-}
-float BMP3XXComponent::get_setup_priority() const { return setup_priority::DATA; }
-
-inline uint8_t oversampling_to_time(Oversampling over_sampling) { return (1 << uint8_t(over_sampling)); }
-
-void BMP3XXComponent::update() {
-  // Enable sensor
-  ESP_LOGV(TAG, "Sending conversion request...");
-  float meas_time = 1.0f;
-  // Ref: https://www.bosch-sensortec.com/media/boschsensortec/downloads/datasheets/bst-bmp390-ds002.pdf 3.9.2
-  meas_time += 2.02f * oversampling_to_time(this->temperature_oversampling_) + 0.163f;
-  meas_time += 2.02f * oversampling_to_time(this->pressure_oversampling_) + 0.392f;
-  meas_time += 0.234f;
-  if (!set_mode(FORCED_MODE)) {
-    ESP_LOGE(TAG, "Failed start forced mode");
-    this->mark_failed();
-    return;
-  }
-
-  ESP_LOGVV(TAG, "measurement time %d", uint32_t(ceilf(meas_time)));
-  this->set_timeout("data", uint32_t(ceilf(meas_time)), [this]() {
-    float temperature = 0.0f;
-    float pressure = 0.0f;
-    if (this->pressure_sensor_ != nullptr) {
-      if (!get_measurements(temperature, pressure)) {
-        ESP_LOGW(TAG, "Failed to read pressure and temperature - skipping update");
-        this->status_set_warning();
-        return;
-      }
-      ESP_LOGD(TAG, "Got temperature=%.1f°C pressure=%.1fhPa", temperature, pressure);
-    } else {
-      if (!get_temperature(temperature)) {
-        ESP_LOGW(TAG, "Failed to read temperature - skipping update");
-        this->status_set_warning();
-        return;
-      }
-      ESP_LOGD(TAG, "Got temperature=%.1f°C", temperature);
-    }
-
-    if (this->temperature_sensor_ != nullptr)
-      this->temperature_sensor_->publish_state(temperature);
-    if (this->pressure_sensor_ != nullptr)
-      this->pressure_sensor_->publish_state(pressure);
-    this->status_clear_warning();
-    set_mode(SLEEP_MODE);
-  });
-}
-
-// Reset the BMP3XX
-uint8_t BMP3XXComponent::reset() {
-  write_byte(BMP388_CMD, RESET_CODE);  // Write the reset code to the command register
-  // Wait for 10ms
-  delay(10);
-  this->read_byte(BMP388_EVENT, &event_.reg);  // Read the BMP388's event register
-  return event_.bit.por_detected;              // Return if device reset is complete
-}
-
-// Start a one shot measurement in FORCED_MODE
-bool BMP3XXComponent::start_forced_conversion() {
-  // Only set FORCED_MODE if we're already in SLEEP_MODE
-  if (pwr_ctrl_.bit.mode == SLEEP_MODE) {
-    return set_mode(FORCED_MODE);
-  }
-  return true;
-}
-
-// Stop the conversion and return to SLEEP_MODE
-bool BMP3XXComponent::stop_conversion() { return set_mode(SLEEP_MODE); }
-
-// Set the pressure oversampling rate
-bool BMP3XXComponent::set_pressure_oversampling(Oversampling oversampling) {
-  osr_.bit.osr_p = oversampling;
-  return this->write_byte(BMP388_OSR, osr_.reg);
-}
-
-// Set the temperature oversampling rate
-bool BMP3XXComponent::set_temperature_oversampling(Oversampling oversampling) {
-  osr_.bit.osr_t = oversampling;
-  return this->write_byte(BMP388_OSR, osr_.reg);
-}
-
-// Set the IIR filter setting
-bool BMP3XXComponent::set_iir_filter(IIRFilter iir_filter) {
-  config_.bit.iir_filter = iir_filter;
-  return this->write_byte(BMP388_CONFIG, config_.reg);
-}
-
-// Get temperature
-bool BMP3XXComponent::get_temperature(float &temperature) {
-  // Check if a measurement is ready
-  if (!data_ready()) {
-    return false;
-  }
-  uint8_t data[3];
-  // Read the temperature
-  if (!this->read_bytes(BMP388_DATA_3, &data[0], 3)) {
-    ESP_LOGE(TAG, "Failed to read temperature");
-    return false;
-  }
-  // Copy the temperature data into the adc variables
-  int32_t adc_temp = (int32_t) data[2] << 16 | (int32_t) data[1] << 8 | (int32_t) data[0];
-  // Temperature compensation (function from BMP388 datasheet)
-  temperature = bmp388_compensate_temperature_((float) adc_temp);
-  return true;
-}
-
-// Get the pressure
-bool BMP3XXComponent::get_pressure(float &pressure) {
-  float temperature;
-  return get_measurements(temperature, pressure);
-}
-
-// Get temperature and pressure
-bool BMP3XXComponent::get_measurements(float &temperature, float &pressure) {
-  // Check if a measurement is ready
-  if (!data_ready()) {
-    ESP_LOGD(TAG, "BMP3XX Get measurement - data not ready skipping update");
-    return false;
-  }
-
-  uint8_t data[6];
-  // Read the temperature and pressure data
-  if (!this->read_bytes(BMP388_DATA_0, &data[0], 6)) {
-    ESP_LOGE(TAG, "Failed to read measurements");
-    return false;
-  }
-  // Copy the temperature and pressure data into the adc variables
-  int32_t adc_pres = (int32_t) data[2] << 16 | (int32_t) data[1] << 8 | (int32_t) data[0];
-  int32_t adc_temp = (int32_t) data[5] << 16 | (int32_t) data[4] << 8 | (int32_t) data[3];
-
-  // Temperature compensation (function from BMP388 datasheet)
-  temperature = bmp388_compensate_temperature_((float) adc_temp);
-  // Pressure compensation (function from BMP388 datasheet)
-  pressure = bmp388_compensate_pressure_((float) adc_pres, temperature);
-  // Calculate the pressure in millibar/hPa
-  pressure /= 100.0f;
-  return true;
-}
-
-// Set the BMP388's mode in the power control register
-bool BMP3XXComponent::set_mode(OperationMode mode) {
-  pwr_ctrl_.bit.mode = mode;
-  return this->write_byte(BMP388_PWR_CTRL, pwr_ctrl_.reg);
-}
-
-// Set the BMP388 oversampling register
-bool BMP3XXComponent::set_oversampling_register(Oversampling pressure_oversampling,
-                                                Oversampling temperature_oversampling) {
-  osr_.reg = temperature_oversampling << 3 | pressure_oversampling;
-  return this->write_byte(BMP388_OSR, osr_.reg);
-}
-
-// Check if measurement data is ready
-bool BMP3XXComponent::data_ready() {
-  // If we're in SLEEP_MODE return immediately
-  if (pwr_ctrl_.bit.mode == SLEEP_MODE) {
-    ESP_LOGD(TAG, "Not ready - sensor is in sleep mode");
-    return false;
-  }
-  // Read the interrupt status register
-  uint8_t status;
-  if (!this->read_byte(BMP388_INT_STATUS, &status)) {
-    ESP_LOGE(TAG, "Failed to read status register");
-    return false;
-  }
-  int_status_.reg = status;
-  ESP_LOGVV(TAG, "data ready status %d", status);
-  // If we're in FORCED_MODE switch back to SLEEP_MODE
-  if (int_status_.bit.drdy) {
-    if (pwr_ctrl_.bit.mode == FORCED_MODE) {
-      pwr_ctrl_.bit.mode = SLEEP_MODE;
-    }
-    return true;  // The measurement is ready
-  }
-  return false;  // The measurement is still pending
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// Bosch BMP3XXComponent (Private) Member Functions
-////////////////////////////////////////////////////////////////////////////////
-
-float BMP3XXComponent::bmp388_compensate_temperature_(float uncomp_temp) {
-  float partial_data1 = uncomp_temp - compensation_float_params_.param_T1;
-  float partial_data2 = partial_data1 * compensation_float_params_.param_T2;
-  return partial_data2 + partial_data1 * partial_data1 * compensation_float_params_.param_T3;
-}
-
-float BMP3XXComponent::bmp388_compensate_pressure_(float uncomp_press, float t_lin) {
-  float partial_data1 = compensation_float_params_.param_P6 * t_lin;
-  float partial_data2 = compensation_float_params_.param_P7 * t_lin * t_lin;
-  float partial_data3 = compensation_float_params_.param_P8 * t_lin * t_lin * t_lin;
-  float partial_out1 = compensation_float_params_.param_P5 + partial_data1 + partial_data2 + partial_data3;
-  partial_data1 = compensation_float_params_.param_P2 * t_lin;
-  partial_data2 = compensation_float_params_.param_P3 * t_lin * t_lin;
-  partial_data3 = compensation_float_params_.param_P4 * t_lin * t_lin * t_lin;
-  float partial_out2 =
-      uncomp_press * (compensation_float_params_.param_P1 + partial_data1 + partial_data2 + partial_data3);
-  partial_data1 = uncomp_press * uncomp_press;
-  partial_data2 = compensation_float_params_.param_P9 + compensation_float_params_.param_P10 * t_lin;
-  partial_data3 = partial_data1 * partial_data2;
-  float partial_data4 =
-      partial_data3 + uncomp_press * uncomp_press * uncomp_press * compensation_float_params_.param_P11;
-  return partial_out1 + partial_out2 + partial_data4;
-}
-
-}  // namespace bmp3xx
-}  // namespace esphome

esphome/components/bmp3xx/bmp3xx.h

@@ -1,237 +0,0 @@
-/*
-  based on BMP388_DEV by Martin Lindupp
-  under MIT License (MIT)
-  Copyright (C) Martin Lindupp 2020
-  http://github.com/MartinL1/BMP388_DEV
-*/
-
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-
-namespace esphome {
-namespace bmp3xx {
-
-static const uint8_t BMP388_ID = 0x50;   // The BMP388 device ID
-static const uint8_t BMP390_ID = 0x60;   // The BMP390 device ID
-static const uint8_t RESET_CODE = 0xB6;  // The BMP388 reset code
-
-/// BMP388_DEV Registers
-enum {
-  BMP388_CHIP_ID = 0x00,       // Chip ID register sub-address
-  BMP388_ERR_REG = 0x02,       // Error register sub-address
-  BMP388_STATUS = 0x03,        // Status register sub-address
-  BMP388_DATA_0 = 0x04,        // Pressure eXtended Least Significant Byte (XLSB) register sub-address
-  BMP388_DATA_1 = 0x05,        // Pressure Least Significant Byte (LSB) register sub-address
-  BMP388_DATA_2 = 0x06,        // Pressure Most Significant Byte (MSB) register sub-address
-  BMP388_DATA_3 = 0x07,        // Temperature eXtended Least Significant Byte (XLSB) register sub-address
-  BMP388_DATA_4 = 0x08,        // Temperature Least Significant Byte (LSB) register sub-address
-  BMP388_DATA_5 = 0x09,        // Temperature Most Significant Byte (MSB) register sub-address
-  BMP388_SENSORTIME_0 = 0x0C,  // Sensor time register 0 sub-address
-  BMP388_SENSORTIME_1 = 0x0D,  // Sensor time register 1 sub-address
-  BMP388_SENSORTIME_2 = 0x0E,  // Sensor time register 2 sub-address
-  BMP388_EVENT = 0x10,         // Event register sub-address
-  BMP388_INT_STATUS = 0x11,    // Interrupt Status register sub-address
-  BMP388_INT_CTRL = 0x19,      // Interrupt Control register sub-address
-  BMP388_IF_CONFIG = 0x1A,     // Interface Configuration register sub-address
-  BMP388_PWR_CTRL = 0x1B,      // Power Control register sub-address
-  BMP388_OSR = 0x1C,           // Oversampling register sub-address
-  BMP388_ODR = 0x1D,           // Output Data Rate register sub-address
-  BMP388_CONFIG = 0x1F,        // Configuration register sub-address
-  BMP388_TRIM_PARAMS = 0x31,   // Trim parameter registers' base sub-address
-  BMP388_CMD = 0x7E            // Command register sub-address
-};
-
-/// Device mode bitfield in the control and measurement register
-enum OperationMode { SLEEP_MODE = 0x00, FORCED_MODE = 0x01, NORMAL_MODE = 0x03 };
-
-/// Oversampling bit fields in the control and measurement register
-enum Oversampling {
-  OVERSAMPLING_NONE = 0x00,
-  OVERSAMPLING_X2 = 0x01,
-  OVERSAMPLING_X4 = 0x02,
-  OVERSAMPLING_X8 = 0x03,
-  OVERSAMPLING_X16 = 0x04,
-  OVERSAMPLING_X32 = 0x05
-};
-
-/// Infinite Impulse Response (IIR) filter bit field in the configuration register
-enum IIRFilter {
-  IIR_FILTER_OFF = 0x00,
-  IIR_FILTER_2 = 0x01,
-  IIR_FILTER_4 = 0x02,
-  IIR_FILTER_8 = 0x03,
-  IIR_FILTER_16 = 0x04,
-  IIR_FILTER_32 = 0x05,
-  IIR_FILTER_64 = 0x06,
-  IIR_FILTER_128 = 0x07
-};
-
-/// This class implements support for the BMP3XX Temperature+Pressure i2c sensor.
-class BMP3XXComponent : public PollingComponent, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void update() override;
-
-  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { temperature_sensor_ = temperature_sensor; }
-  void set_pressure_sensor(sensor::Sensor *pressure_sensor) { pressure_sensor_ = pressure_sensor; }
-
-  /// Set the oversampling value for the temperature sensor. Default is 16x.
-  void set_temperature_oversampling_config(Oversampling temperature_oversampling) {
-    this->temperature_oversampling_ = temperature_oversampling;
-  }
-  /// Set the oversampling value for the pressure sensor. Default is 16x.
-  void set_pressure_oversampling_config(Oversampling pressure_oversampling) {
-    this->pressure_oversampling_ = pressure_oversampling;
-  }
-  /// Set the IIR Filter used to increase accuracy, defaults to no IIR Filter.
-  void set_iir_filter_config(IIRFilter iir_filter) { this->iir_filter_ = iir_filter; }
-
-  /// Soft reset the sensor
-  uint8_t reset();
-  /// Start continuous measurement in NORMAL_MODE
-  bool start_normal_conversion();
-  /// Start a one shot measurement in FORCED_MODE
-  bool start_forced_conversion();
-  /// Stop the conversion and return to SLEEP_MODE
-  bool stop_conversion();
-  /// Set the pressure oversampling: OFF, X1, X2, X4, X8, X16, X32
-  bool set_pressure_oversampling(Oversampling pressure_oversampling);
-  /// Set the temperature oversampling: OFF, X1, X2, X4, X8, X16, X32
-  bool set_temperature_oversampling(Oversampling temperature_oversampling);
-  /// Set the IIR filter setting: OFF, 2, 3, 8, 16, 32
-  bool set_iir_filter(IIRFilter iir_filter);
-  /// Get a temperature measurement
-  bool get_temperature(float &temperature);
-  /// Get a pressure measurement
-  bool get_pressure(float &pressure);
-  /// Get a temperature and pressure measurement
-  bool get_measurements(float &temperature, float &pressure);
-  /// Get a temperature and pressure measurement
-  bool get_measurement();
-  /// Set the barometer mode
-  bool set_mode(OperationMode mode);
-  /// Set the BMP388 oversampling register
-  bool set_oversampling_register(Oversampling pressure_oversampling, Oversampling temperature_oversampling);
-  /// Checks if a measurement is ready
-  bool data_ready();
-
- protected:
-  Oversampling temperature_oversampling_{OVERSAMPLING_X16};
-  Oversampling pressure_oversampling_{OVERSAMPLING_X16};
-  IIRFilter iir_filter_{IIR_FILTER_OFF};
-  OperationMode operation_mode_{FORCED_MODE};
-  sensor::Sensor *temperature_sensor_;
-  sensor::Sensor *pressure_sensor_;
-  enum ErrorCode {
-    NONE = 0,
-    ERROR_COMMUNICATION_FAILED,
-    ERROR_WRONG_CHIP_ID,
-    ERROR_SENSOR_STATUS,
-    ERROR_SENSOR_RESET,
-  } error_code_{NONE};
-
-  struct {  // The BMP388 compensation trim parameters (coefficients)
-    uint16_t param_T1;
-    uint16_t param_T2;
-    int8_t param_T3;
-    int16_t param_P1;
-    int16_t param_P2;
-    int8_t param_P3;
-    int8_t param_P4;
-    uint16_t param_P5;
-    uint16_t param_P6;
-    int8_t param_P7;
-    int8_t param_P8;
-    int16_t param_P9;
-    int8_t param_P10;
-    int8_t param_P11;
-  } __attribute__((packed)) compensation_params_;
-
-  struct FloatParams {  // The BMP388 float point compensation trim parameters
-    float param_T1;
-    float param_T2;
-    float param_T3;
-    float param_P1;
-    float param_P2;
-    float param_P3;
-    float param_P4;
-    float param_P5;
-    float param_P6;
-    float param_P7;
-    float param_P8;
-    float param_P9;
-    float param_P10;
-    float param_P11;
-  } compensation_float_params_;
-
-  union {  // Copy of the BMP388's chip id register
-    struct {
-      uint8_t chip_id_nvm : 4;
-      uint8_t chip_id_fixed : 4;
-    } bit;
-    uint8_t reg;
-  } chip_id_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's event register
-    struct {
-      uint8_t por_detected : 1;
-    } bit;
-    uint8_t reg;
-  } event_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's interrupt status register
-    struct {
-      uint8_t fwm_int : 1;
-      uint8_t ffull_int : 1;
-      uint8_t : 1;
-      uint8_t drdy : 1;
-    } bit;
-    uint8_t reg;
-  } int_status_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's power control register
-    struct {
-      uint8_t press_en : 1;
-      uint8_t temp_en : 1;
-      uint8_t : 2;
-      uint8_t mode : 2;
-    } bit;
-    uint8_t reg;
-  } pwr_ctrl_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's oversampling register
-    struct {
-      uint8_t osr_p : 3;
-      uint8_t osr_t : 3;
-    } bit;
-    uint8_t reg;
-  } osr_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's output data rate register
-    struct {
-      uint8_t odr_sel : 5;
-    } bit;
-    uint8_t reg;
-  } odr_ = {.reg = 0};
-
-  union {  // Copy of the BMP388's configuration register
-    struct {
-      uint8_t : 1;
-      uint8_t iir_filter : 3;
-    } bit;
-    uint8_t reg;
-  } config_ = {.reg = 0};
-
-  // Bosch temperature compensation function
-  float bmp388_compensate_temperature_(float uncomp_temp);
-  // Bosch pressure compensation function
-  float bmp388_compensate_pressure_(float uncomp_press, float t_lin);
-};
-
-}  // namespace bmp3xx
-}  // namespace esphome

esphome/components/bmp3xx/sensor.py

@@ -1,100 +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_IIR_FILTER,
-    CONF_OVERSAMPLING,
-    CONF_PRESSURE,
-    CONF_TEMPERATURE,
-    DEVICE_CLASS_PRESSURE,
-    DEVICE_CLASS_TEMPERATURE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-    UNIT_HECTOPASCAL,
-)
-
-CODEOWNERS = ["@martgras"]
-DEPENDENCIES = ["i2c"]
-
-bmp3xx_ns = cg.esphome_ns.namespace("bmp3xx")
-Oversampling = bmp3xx_ns.enum("Oversampling")
-OVERSAMPLING_OPTIONS = {
-    "NONE": Oversampling.OVERSAMPLING_NONE,
-    "2X": Oversampling.OVERSAMPLING_X2,
-    "4X": Oversampling.OVERSAMPLING_X4,
-    "8X": Oversampling.OVERSAMPLING_X8,
-    "16X": Oversampling.OVERSAMPLING_X16,
-    "32x": Oversampling.OVERSAMPLING_X32,
-}
-
-IIRFilter = bmp3xx_ns.enum("IIRFilter")
-IIR_FILTER_OPTIONS = {
-    "OFF": IIRFilter.IIR_FILTER_OFF,
-    "2X": IIRFilter.IIR_FILTER_2,
-    "4X": IIRFilter.IIR_FILTER_4,
-    "8X": IIRFilter.IIR_FILTER_8,
-    "16X": IIRFilter.IIR_FILTER_16,
-    "32X": IIRFilter.IIR_FILTER_32,
-    "64X": IIRFilter.IIR_FILTER_64,
-    "128X": IIRFilter.IIR_FILTER_128,
-}
-
-BMP3XXComponent = bmp3xx_ns.class_(
-    "BMP3XXComponent", cg.PollingComponent, i2c.I2CDevice
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BMP3XXComponent),
-            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.Optional(CONF_OVERSAMPLING, default="2X"): cv.enum(
-                        OVERSAMPLING_OPTIONS, upper=True
-                    ),
-                }
-            ),
-            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HECTOPASCAL,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_PRESSURE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ).extend(
-                {
-                    cv.Optional(CONF_OVERSAMPLING, default="16X"): cv.enum(
-                        OVERSAMPLING_OPTIONS, upper=True
-                    ),
-                }
-            ),
-            cv.Optional(CONF_IIR_FILTER, default="OFF"): cv.enum(
-                IIR_FILTER_OPTIONS, upper=True
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x77))
-)
-
-
-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)
-    cg.add(var.set_iir_filter_config(config[CONF_IIR_FILTER]))
-    if CONF_TEMPERATURE in config:
-        conf = config[CONF_TEMPERATURE]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_temperature_sensor(sens))
-        cg.add(var.set_temperature_oversampling_config(conf[CONF_OVERSAMPLING]))
-
-    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_pressure_oversampling_config(conf[CONF_OVERSAMPLING]))

esphome/components/button/__init__.py

@@ -1,127 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome import automation
-from esphome.automation import maybe_simple_id
-from esphome.components import mqtt
-from esphome.const import (
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_ID,
-    CONF_ON_PRESS,
-    CONF_TRIGGER_ID,
-    CONF_MQTT_ID,
-    DEVICE_CLASS_RESTART,
-    DEVICE_CLASS_UPDATE,
-)
-from esphome.core import CORE, coroutine_with_priority
-from esphome.cpp_helpers import setup_entity
-
-CODEOWNERS = ["@esphome/core"]
-IS_PLATFORM_COMPONENT = True
-
-DEVICE_CLASSES = [
-    DEVICE_CLASS_RESTART,
-    DEVICE_CLASS_UPDATE,
-]
-
-button_ns = cg.esphome_ns.namespace("button")
-Button = button_ns.class_("Button", cg.EntityBase)
-ButtonPtr = Button.operator("ptr")
-
-PressAction = button_ns.class_("PressAction", automation.Action)
-
-ButtonPressTrigger = button_ns.class_(
-    "ButtonPressTrigger", automation.Trigger.template()
-)
-
-validate_device_class = cv.one_of(*DEVICE_CLASSES, lower=True, space="_")
-
-
-BUTTON_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).extend(
-    {
-        cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTButtonComponent),
-        cv.Optional(CONF_DEVICE_CLASS): validate_device_class,
-        cv.Optional(CONF_ON_PRESS): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ButtonPressTrigger),
-            }
-        ),
-    }
-)
-
-_UNDEF = object()
-
-
-def button_schema(
-    icon: str = _UNDEF,
-    entity_category: str = _UNDEF,
-    device_class: str = _UNDEF,
-) -> cv.Schema:
-    schema = BUTTON_SCHEMA
-    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_button_core_(var, config):
-    await setup_entity(var, config)
-
-    for conf in config.get(CONF_ON_PRESS, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [], conf)
-
-    if CONF_DEVICE_CLASS in config:
-        cg.add(var.set_device_class(config[CONF_DEVICE_CLASS]))
-
-    if CONF_MQTT_ID in config:
-        mqtt_ = cg.new_Pvariable(config[CONF_MQTT_ID], var)
-        await mqtt.register_mqtt_component(mqtt_, config)
-
-
-async def register_button(var, config):
-    if not CORE.has_id(config[CONF_ID]):
-        var = cg.Pvariable(config[CONF_ID], var)
-    cg.add(cg.App.register_button(var))
-    await setup_button_core_(var, config)
-
-
-async def new_button(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await register_button(var, config)
-    return var
-
-
-BUTTON_PRESS_SCHEMA = maybe_simple_id(
-    {
-        cv.Required(CONF_ID): cv.use_id(Button),
-    }
-)
-
-
-@automation.register_action("button.press", PressAction, BUTTON_PRESS_SCHEMA)
-async def button_press_to_code(config, action_id, template_arg, args):
-    paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(action_id, template_arg, paren)
-
-
-@coroutine_with_priority(100.0)
-async def to_code(config):
-    cg.add_global(button_ns.using)
-    cg.add_define("USE_BUTTON")

esphome/components/button/automation.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "esphome/components/button/button.h"
-#include "esphome/core/automation.h"
-#include "esphome/core/component.h"
-
-namespace esphome {
-namespace button {
-
-template<typename... Ts> class PressAction : public Action<Ts...> {
- public:
-  explicit PressAction(Button *button) : button_(button) {}
-
-  void play(Ts... x) override { this->button_->press(); }
-
- protected:
-  Button *button_;
-};
-
-class ButtonPressTrigger : public Trigger<> {
- public:
-  ButtonPressTrigger(Button *button) {
-    button->add_on_press_callback([this]() { this->trigger(); });
-  }
-};
-
-}  // namespace button
-}  // namespace esphome

esphome/components/button/button.cpp

@@ -1,28 +0,0 @@
-#include "button.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace button {
-
-static const char *const TAG = "button";
-
-Button::Button(const std::string &name) : EntityBase(name) {}
-Button::Button() : Button("") {}
-
-void Button::press() {
-  ESP_LOGD(TAG, "'%s' Pressed.", this->get_name().c_str());
-  this->press_action();
-  this->press_callback_.call();
-}
-void Button::add_on_press_callback(std::function<void()> &&callback) { this->press_callback_.add(std::move(callback)); }
-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() {
-  if (this->device_class_.has_value())
-    return *this->device_class_;
-  return "";
-}
-
-}  // namespace button
-}  // namespace esphome

esphome/components/button/button.h

@@ -1,57 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/entity_base.h"
-#include "esphome/core/helpers.h"
-
-namespace esphome {
-namespace button {
-
-#define LOG_BUTTON(prefix, type, obj) \
-  if ((obj) != nullptr) { \
-    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, LOG_STR_LITERAL(type), (obj)->get_name().c_str()); \
-    if (!(obj)->get_icon().empty()) { \
-      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
-    } \
-  }
-
-/** Base class for all buttons.
- *
- * A button is just a momentary switch that does not have a state, only a trigger.
- */
-class Button : public EntityBase {
- public:
-  explicit Button();
-  explicit Button(const std::string &name);
-
-  /** Press this button. This is called by the front-end.
-   *
-   * For implementing buttons, please override press_action.
-   */
-  void press();
-
-  /** Set callback for state changes.
-   *
-   * @param callback The void() callback.
-   */
-  void add_on_press_callback(std::function<void()> &&callback);
-
-  /// Set the Home Assistant device class (see button::device_class).
-  void set_device_class(const std::string &device_class);
-
-  /// Get the device class for this button.
-  std::string get_device_class();
-
- protected:
-  /** You should implement this virtual method if you want to create your own button.
-   */
-  virtual void press_action(){};
-
-  uint32_t hash_base() override;
-
-  CallbackManager<void()> press_callback_{};
-  optional<std::string> device_class_{};
-};
-
-}  // namespace button
-}  // namespace esphome

esphome/components/captive_portal/captive_portal.cpp

@@ -85,7 +85,14 @@ void CaptivePortal::start() {
   this->dns_server_->start(53, "*", (uint32_t) ip);
 
   this->base_->get_server()->onNotFound([this](AsyncWebServerRequest *req) {
-    if (!this->active_ || req->host().c_str() == wifi::global_wifi_component->wifi_soft_ap_ip().str()) {
+    bool not_found = false;
+    if (!this->active_) {
+      not_found = true;
+    } else if (req->host().c_str() == wifi::global_wifi_component->wifi_soft_ap_ip().str()) {
+      not_found = true;
+    }
+
+    if (not_found) {
       req->send(404, "text/html", "File not found");
       return;
     }

esphome/components/cd74hc4067/__init__.py

@@ -1,53 +0,0 @@
-import esphome.codegen as cg
-from esphome import pins
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_DELAY,
-    CONF_ID,
-)
-
-CODEOWNERS = ["@asoehlke"]
-AUTO_LOAD = ["sensor", "voltage_sampler"]
-
-cd74hc4067_ns = cg.esphome_ns.namespace("cd74hc4067")
-
-CD74HC4067Component = cd74hc4067_ns.class_(
-    "CD74HC4067Component", cg.Component, cg.PollingComponent
-)
-
-CONF_PIN_S0 = "pin_s0"
-CONF_PIN_S1 = "pin_s1"
-CONF_PIN_S2 = "pin_s2"
-CONF_PIN_S3 = "pin_s3"
-
-DEFAULT_DELAY = "2ms"
-
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(CD74HC4067Component),
-        cv.Required(CONF_PIN_S0): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S1): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S2): pins.internal_gpio_output_pin_schema,
-        cv.Required(CONF_PIN_S3): pins.internal_gpio_output_pin_schema,
-        cv.Optional(
-            CONF_DELAY, default=DEFAULT_DELAY
-        ): cv.positive_time_period_milliseconds,
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    pin_s0 = await cg.gpio_pin_expression(config[CONF_PIN_S0])
-    cg.add(var.set_pin_s0(pin_s0))
-    pin_s1 = await cg.gpio_pin_expression(config[CONF_PIN_S1])
-    cg.add(var.set_pin_s1(pin_s1))
-    pin_s2 = await cg.gpio_pin_expression(config[CONF_PIN_S2])
-    cg.add(var.set_pin_s2(pin_s2))
-    pin_s3 = await cg.gpio_pin_expression(config[CONF_PIN_S3])
-    cg.add(var.set_pin_s3(pin_s3))
-
-    cg.add(var.set_switch_delay(config[CONF_DELAY]))

esphome/components/cd74hc4067/cd74hc4067.cpp

@@ -1,86 +0,0 @@
-#include "cd74hc4067.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace cd74hc4067 {
-
-static const char *const TAG = "cd74hc4067";
-
-float CD74HC4067Component::get_setup_priority() const { return setup_priority::DATA; }
-
-void CD74HC4067Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up CD74HC4067...");
-
-  this->pin_s0_->setup();
-  this->pin_s1_->setup();
-  this->pin_s2_->setup();
-  this->pin_s3_->setup();
-
-  // set other pin, so that activate_pin will really switch
-  this->active_pin_ = 1;
-  this->activate_pin(0);
-}
-
-void CD74HC4067Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "CD74HC4067 Multiplexer:");
-  LOG_PIN("  S0 Pin: ", this->pin_s0_);
-  LOG_PIN("  S1 Pin: ", this->pin_s1_);
-  LOG_PIN("  S2 Pin: ", this->pin_s2_);
-  LOG_PIN("  S3 Pin: ", this->pin_s3_);
-  ESP_LOGCONFIG(TAG, "switch delay: %d", this->switch_delay_);
-}
-
-void CD74HC4067Component::activate_pin(uint8_t pin) {
-  if (this->active_pin_ != pin) {
-    ESP_LOGD(TAG, "switch to input %d", pin);
-
-    static int mux_channel[16][4] = {
-        {0, 0, 0, 0},  // channel 0
-        {1, 0, 0, 0},  // channel 1
-        {0, 1, 0, 0},  // channel 2
-        {1, 1, 0, 0},  // channel 3
-        {0, 0, 1, 0},  // channel 4
-        {1, 0, 1, 0},  // channel 5
-        {0, 1, 1, 0},  // channel 6
-        {1, 1, 1, 0},  // channel 7
-        {0, 0, 0, 1},  // channel 8
-        {1, 0, 0, 1},  // channel 9
-        {0, 1, 0, 1},  // channel 10
-        {1, 1, 0, 1},  // channel 11
-        {0, 0, 1, 1},  // channel 12
-        {1, 0, 1, 1},  // channel 13
-        {0, 1, 1, 1},  // channel 14
-        {1, 1, 1, 1}   // channel 15
-    };
-    this->pin_s0_->digital_write(mux_channel[pin][0]);
-    this->pin_s1_->digital_write(mux_channel[pin][1]);
-    this->pin_s2_->digital_write(mux_channel[pin][2]);
-    this->pin_s3_->digital_write(mux_channel[pin][3]);
-    // small delay is needed to let the multiplexer switch
-    delay(this->switch_delay_);
-    this->active_pin_ = pin;
-  }
-}
-
-CD74HC4067Sensor::CD74HC4067Sensor(CD74HC4067Component *parent) : parent_(parent) {}
-
-void CD74HC4067Sensor::update() {
-  float value_v = this->sample();
-  this->publish_state(value_v);
-}
-
-float CD74HC4067Sensor::get_setup_priority() const { return this->parent_->get_setup_priority() - 1.0f; }
-
-float CD74HC4067Sensor::sample() {
-  this->parent_->activate_pin(this->pin_);
-  return this->source_->sample();
-}
-
-void CD74HC4067Sensor::dump_config() {
-  LOG_SENSOR(TAG, "CD74HC4067 Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Pin: %u", this->pin_);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-}  // namespace cd74hc4067
-}  // namespace esphome

esphome/components/cd74hc4067/cd74hc4067.h

@@ -1,65 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/voltage_sampler/voltage_sampler.h"
-
-namespace esphome {
-namespace cd74hc4067 {
-
-class CD74HC4067Component : public Component {
- public:
-  /// Set up the internal sensor array.
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-
-  /// setting pin active by setting the right combination of the four multiplexer input pins
-  void activate_pin(uint8_t pin);
-
-  /// set the pin connected to multiplexer control pin 0
-  void set_pin_s0(InternalGPIOPin *pin) { this->pin_s0_ = pin; }
-  /// set the pin connected to multiplexer control pin 1
-  void set_pin_s1(InternalGPIOPin *pin) { this->pin_s1_ = pin; }
-  /// set the pin connected to multiplexer control pin 2
-  void set_pin_s2(InternalGPIOPin *pin) { this->pin_s2_ = pin; }
-  /// set the pin connected to multiplexer control pin 3
-  void set_pin_s3(InternalGPIOPin *pin) { this->pin_s3_ = pin; }
-
-  /// set the delay needed after an input switch
-  void set_switch_delay(uint32_t switch_delay) { this->switch_delay_ = switch_delay; }
-
- private:
-  InternalGPIOPin *pin_s0_;
-  InternalGPIOPin *pin_s1_;
-  InternalGPIOPin *pin_s2_;
-  InternalGPIOPin *pin_s3_;
-  /// the currently active pin
-  uint8_t active_pin_;
-  uint32_t switch_delay_;
-};
-
-class CD74HC4067Sensor : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
- public:
-  CD74HC4067Sensor(CD74HC4067Component *parent);
-
-  void update() override;
-
-  void dump_config() override;
-  /// `HARDWARE_LATE` setup priority.
-  float get_setup_priority() const override;
-  void set_pin(uint8_t pin) { this->pin_ = pin; }
-  void set_source(voltage_sampler::VoltageSampler *source) { this->source_ = source; }
-
-  float sample() override;
-
- protected:
-  CD74HC4067Component *parent_;
-  /// The sampling source to read values from.
-  voltage_sampler::VoltageSampler *source_;
-
-  uint8_t pin_;
-};
-}  // namespace cd74hc4067
-}  // namespace esphome

esphome/components/cd74hc4067/sensor.py

@@ -1,55 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, voltage_sampler
-from esphome.const import (
-    CONF_ID,
-    CONF_SENSOR,
-    CONF_NUMBER,
-    ICON_FLASH,
-    UNIT_VOLT,
-    STATE_CLASS_MEASUREMENT,
-    DEVICE_CLASS_VOLTAGE,
-)
-from . import cd74hc4067_ns, CD74HC4067Component
-
-DEPENDENCIES = ["cd74hc4067"]
-
-CD74HC4067Sensor = cd74hc4067_ns.class_(
-    "CD74HC4067Sensor",
-    sensor.Sensor,
-    cg.PollingComponent,
-    voltage_sampler.VoltageSampler,
-)
-
-CONF_CD74HC4067_ID = "cd74hc4067_id"
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=3,
-        device_class=DEVICE_CLASS_VOLTAGE,
-        state_class=STATE_CLASS_MEASUREMENT,
-        icon=ICON_FLASH,
-    )
-    .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),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-)
-
-
-async def to_code(config):
-    parent = await cg.get_variable(config[CONF_CD74HC4067_ID])
-
-    var = cg.new_Pvariable(config[CONF_ID], parent)
-    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])
-    cg.add(var.set_source(sens))

esphome/components/climate/__init__.py

@@ -213,7 +213,7 @@ async def setup_climate_core_(var, config):
         if CONF_MODE_COMMAND_TOPIC in config:
             cg.add(mqtt_.set_custom_mode_command_topic(config[CONF_MODE_COMMAND_TOPIC]))
         if CONF_MODE_STATE_TOPIC in config:
-            cg.add(mqtt_.set_custom_mode_state_topic(config[CONF_MODE_STATE_TOPIC]))
+            cg.add(mqtt_.set_custom_state_topic(config[CONF_MODE_STATE_TOPIC]))
 
         if CONF_SWING_MODE_COMMAND_TOPIC in config:
             cg.add(

esphome/components/climate_ir/climate_ir.cpp

@@ -10,22 +10,21 @@ climate::ClimateTraits ClimateIR::traits() {
   auto traits = climate::ClimateTraits();
   traits.set_supports_current_temperature(this->sensor_ != nullptr);
   traits.set_supported_modes({climate::CLIMATE_MODE_OFF, climate::CLIMATE_MODE_HEAT_COOL});
-  if (this->supports_cool_)
+  if (supports_cool_)
     traits.add_supported_mode(climate::CLIMATE_MODE_COOL);
-  if (this->supports_heat_)
+  if (supports_heat_)
     traits.add_supported_mode(climate::CLIMATE_MODE_HEAT);
-  if (this->supports_dry_)
+  if (supports_dry_)
     traits.add_supported_mode(climate::CLIMATE_MODE_DRY);
-  if (this->supports_fan_only_)
+  if (supports_fan_only_)
     traits.add_supported_mode(climate::CLIMATE_MODE_FAN_ONLY);
 
   traits.set_supports_two_point_target_temperature(false);
   traits.set_visual_min_temperature(this->minimum_temperature_);
   traits.set_visual_max_temperature(this->maximum_temperature_);
   traits.set_visual_temperature_step(this->temperature_step_);
-  traits.set_supported_fan_modes(this->fan_modes_);
-  traits.set_supported_swing_modes(this->swing_modes_);
-  traits.set_supported_presets(this->presets_);
+  traits.set_supported_fan_modes(fan_modes_);
+  traits.set_supported_swing_modes(swing_modes_);
   return traits;
 }
 
@@ -51,7 +50,6 @@ void ClimateIR::setup() {
         roundf(clamp(this->current_temperature, this->minimum_temperature_, this->maximum_temperature_));
     this->fan_mode = climate::CLIMATE_FAN_AUTO;
     this->swing_mode = climate::CLIMATE_SWING_OFF;
-    this->preset = climate::CLIMATE_PRESET_NONE;
   }
   // Never send nan to HA
   if (std::isnan(this->target_temperature))
@@ -67,8 +65,6 @@ void ClimateIR::control(const climate::ClimateCall &call) {
     this->fan_mode = *call.get_fan_mode();
   if (call.get_swing_mode().has_value())
     this->swing_mode = *call.get_swing_mode();
-  if (call.get_preset().has_value())
-    this->preset = *call.get_preset();
   this->transmit_state();
   this->publish_state();
 }

esphome/components/climate_ir/climate_ir.h

@@ -22,7 +22,7 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
  public:
   ClimateIR(float minimum_temperature, float maximum_temperature, float temperature_step = 1.0f,
             bool supports_dry = false, bool supports_fan_only = false, std::set<climate::ClimateFanMode> fan_modes = {},
-            std::set<climate::ClimateSwingMode> swing_modes = {}, std::set<climate::ClimatePreset> presets = {}) {
+            std::set<climate::ClimateSwingMode> swing_modes = {}) {
     this->minimum_temperature_ = minimum_temperature;
     this->maximum_temperature_ = maximum_temperature;
     this->temperature_step_ = temperature_step;
@@ -30,7 +30,6 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
     this->supports_fan_only_ = supports_fan_only;
     this->fan_modes_ = std::move(fan_modes);
     this->swing_modes_ = std::move(swing_modes);
-    this->presets_ = std::move(presets);
   }
 
   void setup() override;
@@ -62,7 +61,6 @@ class ClimateIR : public climate::Climate, public Component, public remote_base:
   bool supports_fan_only_{false};
   std::set<climate::ClimateFanMode> fan_modes_ = {};
   std::set<climate::ClimateSwingMode> swing_modes_ = {};
-  std::set<climate::ClimatePreset> presets_ = {};
 
   remote_transmitter::RemoteTransmitterComponent *transmitter_;
   sensor::Sensor *sensor_{nullptr};

esphome/components/coolix/coolix.cpp

@@ -1,5 +1,4 @@
 #include "coolix.h"
-#include "esphome/components/remote_base/coolix_protocol.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -7,29 +6,29 @@ namespace coolix {
 
 static const char *const TAG = "coolix.climate";
 
-static const uint32_t COOLIX_OFF = 0xB27BE0;
-static const uint32_t COOLIX_SWING = 0xB26BE0;
-static const uint32_t COOLIX_LED = 0xB5F5A5;
-static const uint32_t COOLIX_SILENCE_FP = 0xB5F5B6;
+const uint32_t COOLIX_OFF = 0xB27BE0;
+const uint32_t COOLIX_SWING = 0xB26BE0;
+const uint32_t COOLIX_LED = 0xB5F5A5;
+const uint32_t COOLIX_SILENCE_FP = 0xB5F5B6;
 
 // On, 25C, Mode: Auto, Fan: Auto, Zone Follow: Off, Sensor Temp: Ignore.
-static const uint8_t COOLIX_COOL = 0b0000;
-static const uint8_t COOLIX_DRY_FAN = 0b0100;
-static const uint8_t COOLIX_AUTO = 0b1000;
-static const uint8_t COOLIX_HEAT = 0b1100;
-static const uint32_t COOLIX_MODE_MASK = 0b1100;
-static const uint32_t COOLIX_FAN_MASK = 0xF000;
-static const uint32_t COOLIX_FAN_MODE_AUTO_DRY = 0x1000;
-static const uint32_t COOLIX_FAN_AUTO = 0xB000;
-static const uint32_t COOLIX_FAN_MIN = 0x9000;
-static const uint32_t COOLIX_FAN_MED = 0x5000;
-static const uint32_t COOLIX_FAN_MAX = 0x3000;
+const uint8_t COOLIX_COOL = 0b0000;
+const uint8_t COOLIX_DRY_FAN = 0b0100;
+const uint8_t COOLIX_AUTO = 0b1000;
+const uint8_t COOLIX_HEAT = 0b1100;
+const uint32_t COOLIX_MODE_MASK = 0b1100;
+const uint32_t COOLIX_FAN_MASK = 0xF000;
+const uint32_t COOLIX_FAN_MODE_AUTO_DRY = 0x1000;
+const uint32_t COOLIX_FAN_AUTO = 0xB000;
+const uint32_t COOLIX_FAN_MIN = 0x9000;
+const uint32_t COOLIX_FAN_MED = 0x5000;
+const uint32_t COOLIX_FAN_MAX = 0x3000;
 
 // Temperature
-static const uint8_t COOLIX_TEMP_RANGE = COOLIX_TEMP_MAX - COOLIX_TEMP_MIN + 1;
-static const uint8_t COOLIX_FAN_TEMP_CODE = 0b11100000;  // Part of Fan Mode.
-static const uint32_t COOLIX_TEMP_MASK = 0b11110000;
-static const uint8_t COOLIX_TEMP_MAP[COOLIX_TEMP_RANGE] = {
+const uint8_t COOLIX_TEMP_RANGE = COOLIX_TEMP_MAX - COOLIX_TEMP_MIN + 1;
+const uint8_t COOLIX_FAN_TEMP_CODE = 0b11100000;  // Part of Fan Mode.
+const uint32_t COOLIX_TEMP_MASK = 0b11110000;
+const uint8_t COOLIX_TEMP_MAP[COOLIX_TEMP_RANGE] = {
     0b00000000,  // 17C
     0b00010000,  // 18c
     0b00110000,  // 19C
@@ -46,6 +45,17 @@ static const uint8_t COOLIX_TEMP_MAP[COOLIX_TEMP_RANGE] = {
     0b10110000   // 30C
 };
 
+// Constants
+static const uint32_t BIT_MARK_US = 660;
+static const uint32_t HEADER_MARK_US = 560 * 8;
+static const uint32_t HEADER_SPACE_US = 560 * 8;
+static const uint32_t BIT_ONE_SPACE_US = 1500;
+static const uint32_t BIT_ZERO_SPACE_US = 450;
+static const uint32_t FOOTER_MARK_US = BIT_MARK_US;
+static const uint32_t FOOTER_SPACE_US = HEADER_SPACE_US;
+
+const uint16_t COOLIX_BITS = 24;
+
 void CoolixClimate::transmit_state() {
   uint32_t remote_state = 0xB20F00;
 
@@ -101,60 +111,119 @@ void CoolixClimate::transmit_state() {
       }
     }
   }
-  ESP_LOGV(TAG, "Sending coolix code: 0x%06X", remote_state);
+  ESP_LOGV(TAG, "Sending coolix code: 0x%02X", remote_state);
 
   auto transmit = this->transmitter_->transmit();
   auto data = transmit.get_data();
-  remote_base::CoolixProtocol().encode(data, remote_state);
+
+  data->set_carrier_frequency(38000);
+  uint16_t repeat = 1;
+  for (uint16_t r = 0; r <= repeat; r++) {
+    // Header
+    data->mark(HEADER_MARK_US);
+    data->space(HEADER_SPACE_US);
+    // Data
+    //   Break data into bytes, starting at the Most Significant
+    //   Byte. Each byte then being sent normal, then followed inverted.
+    for (uint16_t i = 8; i <= COOLIX_BITS; i += 8) {
+      // Grab a bytes worth of data.
+      uint8_t byte = (remote_state >> (COOLIX_BITS - i)) & 0xFF;
+      // Normal
+      for (uint64_t mask = 1ULL << 7; mask; mask >>= 1) {
+        data->mark(BIT_MARK_US);
+        data->space((byte & mask) ? BIT_ONE_SPACE_US : BIT_ZERO_SPACE_US);
+      }
+      // Inverted
+      for (uint64_t mask = 1ULL << 7; mask; mask >>= 1) {
+        data->mark(BIT_MARK_US);
+        data->space(!(byte & mask) ? BIT_ONE_SPACE_US : BIT_ZERO_SPACE_US);
+      }
+    }
+    // Footer
+    data->mark(BIT_MARK_US);
+    data->space(FOOTER_SPACE_US);  // Pause before repeating
+  }
+
   transmit.perform();
 }
 
-bool CoolixClimate::on_coolix(climate::Climate *parent, remote_base::RemoteReceiveData data) {
-  auto decoded = remote_base::CoolixProtocol().decode(data);
-  if (!decoded.has_value())
-    return false;
+bool CoolixClimate::on_receive(remote_base::RemoteReceiveData data) {
   // Decoded remote state y 3 bytes long code.
-  uint32_t remote_state = *decoded;
-  ESP_LOGV(TAG, "Decoded 0x%06X", remote_state);
-  if ((remote_state & 0xFF0000) != 0xB20000)
+  uint32_t remote_state = 0;
+  // The protocol sends the data twice, read here
+  uint32_t loop_read;
+  for (uint16_t loop = 1; loop <= 2; loop++) {
+    if (!data.expect_item(HEADER_MARK_US, HEADER_SPACE_US))
+      return false;
+    loop_read = 0;
+    for (uint8_t a_byte = 0; a_byte < 3; a_byte++) {
+      uint8_t byte = 0;
+      for (int8_t a_bit = 7; a_bit >= 0; a_bit--) {
+        if (data.expect_item(BIT_MARK_US, BIT_ONE_SPACE_US))
+          byte |= 1 << a_bit;
+        else if (!data.expect_item(BIT_MARK_US, BIT_ZERO_SPACE_US))
+          return false;
+      }
+      // Need to see this segment inverted
+      for (int8_t a_bit = 7; a_bit >= 0; a_bit--) {
+        bool bit = byte & (1 << a_bit);
+        if (!data.expect_item(BIT_MARK_US, bit ? BIT_ZERO_SPACE_US : BIT_ONE_SPACE_US))
+          return false;
+      }
+      // Receiving MSB first: reorder bytes
+      loop_read |= byte << ((2 - a_byte) * 8);
+    }
+    // Footer Mark
+    if (!data.expect_mark(BIT_MARK_US))
+      return false;
+    if (loop == 1) {
+      // Back up state on first loop
+      remote_state = loop_read;
+      if (!data.expect_space(FOOTER_SPACE_US))
+        return false;
+    }
+  }
+
+  ESP_LOGV(TAG, "Decoded 0x%02X", remote_state);
+  if (remote_state != loop_read || (remote_state & 0xFF0000) != 0xB20000)
     return false;
 
   if (remote_state == COOLIX_OFF) {
-    parent->mode = climate::CLIMATE_MODE_OFF;
+    this->mode = climate::CLIMATE_MODE_OFF;
   } else if (remote_state == COOLIX_SWING) {
-    parent->swing_mode =
-        parent->swing_mode == climate::CLIMATE_SWING_OFF ? climate::CLIMATE_SWING_VERTICAL : climate::CLIMATE_SWING_OFF;
+    this->swing_mode =
+        this->swing_mode == climate::CLIMATE_SWING_OFF ? climate::CLIMATE_SWING_VERTICAL : climate::CLIMATE_SWING_OFF;
   } else {
     if ((remote_state & COOLIX_MODE_MASK) == COOLIX_HEAT)
-      parent->mode = climate::CLIMATE_MODE_HEAT;
+      this->mode = climate::CLIMATE_MODE_HEAT;
     else if ((remote_state & COOLIX_MODE_MASK) == COOLIX_AUTO)
-      parent->mode = climate::CLIMATE_MODE_HEAT_COOL;
+      this->mode = climate::CLIMATE_MODE_HEAT_COOL;
     else if ((remote_state & COOLIX_MODE_MASK) == COOLIX_DRY_FAN) {
       if ((remote_state & COOLIX_FAN_MASK) == COOLIX_FAN_MODE_AUTO_DRY)
-        parent->mode = climate::CLIMATE_MODE_DRY;
+        this->mode = climate::CLIMATE_MODE_DRY;
       else
-        parent->mode = climate::CLIMATE_MODE_FAN_ONLY;
+        this->mode = climate::CLIMATE_MODE_FAN_ONLY;
     } else
-      parent->mode = climate::CLIMATE_MODE_COOL;
+      this->mode = climate::CLIMATE_MODE_COOL;
 
     // Fan Speed
-    if ((remote_state & COOLIX_FAN_AUTO) == COOLIX_FAN_AUTO || parent->mode == climate::CLIMATE_MODE_HEAT_COOL ||
-        parent->mode == climate::CLIMATE_MODE_DRY)
-      parent->fan_mode = climate::CLIMATE_FAN_AUTO;
+    if ((remote_state & COOLIX_FAN_AUTO) == COOLIX_FAN_AUTO || this->mode == climate::CLIMATE_MODE_HEAT_COOL ||
+        this->mode == climate::CLIMATE_MODE_DRY)
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
     else if ((remote_state & COOLIX_FAN_MIN) == COOLIX_FAN_MIN)
-      parent->fan_mode = climate::CLIMATE_FAN_LOW;
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
     else if ((remote_state & COOLIX_FAN_MED) == COOLIX_FAN_MED)
-      parent->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
     else if ((remote_state & COOLIX_FAN_MAX) == COOLIX_FAN_MAX)
-      parent->fan_mode = climate::CLIMATE_FAN_HIGH;
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
 
     // Temperature
     uint8_t temperature_code = remote_state & COOLIX_TEMP_MASK;
     for (uint8_t i = 0; i < COOLIX_TEMP_RANGE; i++)
       if (COOLIX_TEMP_MAP[i] == temperature_code)
-        parent->target_temperature = i + COOLIX_TEMP_MIN;
+        this->target_temperature = i + COOLIX_TEMP_MIN;
   }
-  parent->publish_state();
+  this->publish_state();
 
   return true;
 }

esphome/components/coolix/coolix.h

@@ -26,15 +26,11 @@ class CoolixClimate : public climate_ir::ClimateIR {
     climate_ir::ClimateIR::control(call);
   }
 
-  /// This static method can be used in other climate components that accept the Coolix protocol. See midea_ir for
-  /// example.
-  static bool on_coolix(climate::Climate *parent, remote_base::RemoteReceiveData data);
-
  protected:
   /// Transmit via IR the state of this climate controller.
   void transmit_state() override;
   /// Handle received IR Buffer
-  bool on_receive(remote_base::RemoteReceiveData data) override { return CoolixClimate::on_coolix(this, data); }
+  bool on_receive(remote_base::RemoteReceiveData data) override;
 
   bool send_swing_cmd_{false};
 };

esphome/components/cover/cover.cpp

@@ -210,10 +210,7 @@ Cover::Cover() : Cover("") {}
 std::string Cover::get_device_class() {
   if (this->device_class_override_.has_value())
     return *this->device_class_override_;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
   return this->device_class();
-#pragma GCC diagnostic pop
 }
 bool Cover::is_fully_open() const { return this->position == COVER_OPEN; }
 bool Cover::is_fully_closed() const { return this->position == COVER_CLOSED; }

esphome/components/cover/cover.h

@@ -169,11 +169,6 @@ class Cover : public EntityBase {
   friend CoverCall;
 
   virtual void control(const CoverCall &call) = 0;
-
-  /** Override this to set the default device class.
-   *
-   * @deprecated This method is deprecated, set the property during config validation instead. (2022.1)
-   */
   virtual std::string device_class();
 
   optional<CoverRestoreState> restore_state_();

esphome/components/cs5460a/cs5460a.cpp

@@ -102,6 +102,8 @@ void CS5460AComponent::hw_init_() {
 
 /* Doesn't reset the register values etc., just restarts the "computation cycle" */
 void CS5460AComponent::restart_() {
+  int cnt;
+
   this->enable();
   /* Stop running conversion, wake up if needed */
   this->write_byte(CMD_POWER_UP);

esphome/components/cse7766/cse7766.cpp

@@ -90,7 +90,6 @@ void CSE7766Component::parse_data_() {
   uint32_t power_cycle = this->get_24_bit_uint_(17);
 
   uint8_t adj = this->raw_data_[20];
-  uint32_t cf_pulses = (this->raw_data_[21] << 8) + this->raw_data_[22];
 
   bool power_ok = true;
   bool voltage_ok = true;
@@ -128,18 +127,6 @@ void CSE7766Component::parse_data_() {
     power = power_calib / float(power_cycle);
     this->power_acc_ += power;
     this->power_counts_ += 1;
-
-    uint32_t difference;
-    if (this->cf_pulses_last_ == 0)
-      this->cf_pulses_last_ = cf_pulses;
-
-    if (cf_pulses < this->cf_pulses_last_) {
-      difference = cf_pulses + (0x10000 - this->cf_pulses_last_);
-    } else {
-      difference = cf_pulses - this->cf_pulses_last_;
-    }
-    this->cf_pulses_last_ = cf_pulses;
-    this->energy_total_ += difference * float(power_calib) / 1000000.0 / 3600.0;
   }
 
   if ((adj & 0x20) == 0x20 && current_ok && voltage_ok && power != 0.0) {
@@ -149,9 +136,9 @@ void CSE7766Component::parse_data_() {
   }
 }
 void CSE7766Component::update() {
-  float voltage = this->voltage_counts_ > 0 ? this->voltage_acc_ / this->voltage_counts_ : 0.0f;
-  float current = this->current_counts_ > 0 ? this->current_acc_ / this->current_counts_ : 0.0f;
-  float power = this->power_counts_ > 0 ? this->power_acc_ / this->power_counts_ : 0.0f;
+  float voltage = this->voltage_counts_ > 0 ? this->voltage_acc_ / this->voltage_counts_ : 0.0;
+  float current = this->current_counts_ > 0 ? this->current_acc_ / this->current_counts_ : 0.0;
+  float power = this->power_counts_ > 0 ? this->power_acc_ / this->power_counts_ : 0.0;
 
   ESP_LOGV(TAG, "Got voltage_acc=%.2f current_acc=%.2f power_acc=%.2f", this->voltage_acc_, this->current_acc_,
            this->power_acc_);
@@ -165,8 +152,6 @@ void CSE7766Component::update() {
     this->current_sensor_->publish_state(current);
   if (this->power_sensor_ != nullptr)
     this->power_sensor_->publish_state(power);
-  if (this->energy_sensor_ != nullptr)
-    this->energy_sensor_->publish_state(this->energy_total_);
 
   this->voltage_acc_ = 0.0f;
   this->current_acc_ = 0.0f;
@@ -187,7 +172,6 @@ void CSE7766Component::dump_config() {
   LOG_SENSOR("  ", "Voltage", this->voltage_sensor_);
   LOG_SENSOR("  ", "Current", this->current_sensor_);
   LOG_SENSOR("  ", "Power", this->power_sensor_);
-  LOG_SENSOR("  ", "Energy", this->energy_sensor_);
   this->check_uart_settings(4800);
 }
 

esphome/components/cse7766/cse7766.h

@@ -12,7 +12,6 @@ class CSE7766Component : public PollingComponent, public uart::UARTDevice {
   void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
   void set_current_sensor(sensor::Sensor *current_sensor) { current_sensor_ = current_sensor; }
   void set_power_sensor(sensor::Sensor *power_sensor) { power_sensor_ = power_sensor; }
-  void set_energy_sensor(sensor::Sensor *energy_sensor) { energy_sensor_ = energy_sensor; }
 
   void loop() override;
   float get_setup_priority() const override;
@@ -30,12 +29,9 @@ class CSE7766Component : public PollingComponent, public uart::UARTDevice {
   sensor::Sensor *voltage_sensor_{nullptr};
   sensor::Sensor *current_sensor_{nullptr};
   sensor::Sensor *power_sensor_{nullptr};
-  sensor::Sensor *energy_sensor_{nullptr};
   float voltage_acc_{0.0f};
   float current_acc_{0.0f};
   float power_acc_{0.0f};
-  float energy_total_{0.0f};
-  uint32_t cf_pulses_last_{0};
   uint32_t voltage_counts_{0};
   uint32_t current_counts_{0};
   uint32_t power_counts_{0};

esphome/components/cse7766/sensor.py

@@ -3,20 +3,16 @@ import esphome.config_validation as cv
 from esphome.components import sensor, uart
 from esphome.const import (
     CONF_CURRENT,
-    CONF_ENERGY,
     CONF_ID,
     CONF_POWER,
     CONF_VOLTAGE,
     DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_POWER,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
     UNIT_VOLT,
     UNIT_AMPERE,
     UNIT_WATT,
-    UNIT_WATT_HOURS,
 )
 
 DEPENDENCIES = ["uart"]
@@ -48,12 +44,6 @@ CONFIG_SCHEMA = (
                 device_class=DEVICE_CLASS_POWER,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
-            cv.Optional(CONF_ENERGY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT_HOURS,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -81,7 +71,3 @@ async def to_code(config):
         conf = config[CONF_POWER]
         sens = await sensor.new_sensor(conf)
         cg.add(var.set_power_sensor(sens))
-    if CONF_ENERGY in config:
-        conf = config[CONF_ENERGY]
-        sens = await sensor.new_sensor(conf)
-        cg.add(var.set_energy_sensor(sens))

esphome/components/daikin/daikin.cpp

@@ -231,7 +231,7 @@ bool DaikinClimate::on_receive(remote_base::RemoteReceiveData data) {
       // frame header
       if (byte != 0x27)
         return false;
-    } else if (pos == 3) {  // NOLINT(bugprone-branch-clone)
+    } else if (pos == 3) {
       // frame header
       if (byte != 0x00)
         return false;

esphome/components/dallas/dallas_component.cpp

@@ -38,9 +38,10 @@ void DallasComponent::setup() {
   raw_sensors = this->one_wire_->search_vec();
 
   for (auto &address : raw_sensors) {
+    std::string s = uint64_to_string(address);
     auto *address8 = reinterpret_cast<uint8_t *>(&address);
     if (crc8(address8, 7) != address8[7]) {
-      ESP_LOGW(TAG, "Dallas device 0x%s has invalid CRC.", format_hex(address).c_str());
+      ESP_LOGW(TAG, "Dallas device 0x%s has invalid CRC.", s.c_str());
       continue;
     }
     if (address8[0] != DALLAS_MODEL_DS18S20 && address8[0] != DALLAS_MODEL_DS1822 &&
@@ -76,7 +77,8 @@ void DallasComponent::dump_config() {
   } else {
     ESP_LOGD(TAG, "  Found sensors:");
     for (auto &address : this->found_sensors_) {
-      ESP_LOGD(TAG, "    0x%s", format_hex(address).c_str());
+      std::string s = uint64_to_string(address);
+      ESP_LOGD(TAG, "    0x%s", s.c_str());
     }
   }
 
@@ -145,7 +147,7 @@ void DallasTemperatureSensor::set_index(uint8_t index) { this->index_ = index; }
 uint8_t *DallasTemperatureSensor::get_address8() { return reinterpret_cast<uint8_t *>(&this->address_); }
 const std::string &DallasTemperatureSensor::get_address_name() {
   if (this->address_name_.empty()) {
-    this->address_name_ = std::string("0x") + format_hex(this->address_);
+    this->address_name_ = std::string("0x") + uint64_to_string(this->address_);
   }
 
   return this->address_name_;
@@ -235,7 +237,7 @@ float DallasTemperatureSensor::get_temp_c() {
 
   return temp / 128.0f;
 }
-std::string DallasTemperatureSensor::unique_id() { return "dallas-" + str_upper_case(format_hex(this->address_)); }
+std::string DallasTemperatureSensor::unique_id() { return "dallas-" + uint64_to_string(this->address_); }
 
 }  // namespace dallas
 }  // namespace esphome

esphome/components/dashboard_import/__init__.py

@@ -3,7 +3,6 @@ from pathlib import Path
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components.packages import validate_source_shorthand
-from esphome.wizard import wizard_file
 from esphome.yaml_util import dump
 
 
@@ -30,11 +29,12 @@ CONFIG_SCHEMA = cv.Schema(
     }
 )
 
-WIFI_CONFIG = """
+WIFI_MESSAGE = """
 
-wifi:
-  ssid: !secret wifi_ssid
-  password: !secret wifi_password
+# Do not forget to add your own wifi configuration before installing this configuration
+# wifi:
+#   ssid: !secret wifi_ssid
+#   password: !secret wifi_password
 """
 
 
@@ -49,24 +49,12 @@ def import_config(path: str, name: str, project_name: str, import_url: str) -> N
     if p.exists():
         raise FileExistsError
 
-    if project_name == "esphome.web":
-        p.write_text(
-            wizard_file(
-                name=name,
-                platform="ESP32" if "esp32" in import_url else "ESP8266",
-                board="esp32dev" if "esp32" in import_url else "esp01_1m",
-                ssid="!secret wifi_ssid",
-                psk="!secret wifi_password",
-            ),
-            encoding="utf8",
-        )
-    else:
-        config = {
-            "substitutions": {"name": name},
-            "packages": {project_name: import_url},
-            "esphome": {"name_add_mac_suffix": False},
-        }
-        p.write_text(
-            dump(config) + WIFI_CONFIG,
-            encoding="utf8",
-        )
+    config = {
+        "substitutions": {"name": name},
+        "packages": {project_name: import_url},
+        "esphome": {"name_add_mac_suffix": False},
+    }
+    p.write_text(
+        dump(config) + WIFI_MESSAGE,
+        encoding="utf8",
+    )

esphome/components/debug/debug_component.cpp

@@ -101,7 +101,7 @@ void DebugComponent::dump_config() {
     info.features &= ~CHIP_FEATURE_BT;
   }
   if (info.features)
-    features += "Other:" + format_hex(info.features);
+    features += "Other:" + uint64_to_string(info.features);
   ESP_LOGD(TAG, "Chip: Model=%s, Features=%s Cores=%u, Revision=%u", model, features.c_str(), info.cores,
            info.revision);
 

esphome/components/deep_sleep/__init__.py

@@ -41,30 +41,15 @@ EXT1_WAKEUP_MODES = {
     "ALL_LOW": esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ALL_LOW,
     "ANY_HIGH": esp_sleep_ext1_wakeup_mode_t.ESP_EXT1_WAKEUP_ANY_HIGH,
 }
-WakeupCauseToRunDuration = deep_sleep_ns.struct("WakeupCauseToRunDuration")
 
 CONF_WAKEUP_PIN_MODE = "wakeup_pin_mode"
 CONF_ESP32_EXT1_WAKEUP = "esp32_ext1_wakeup"
 CONF_TOUCH_WAKEUP = "touch_wakeup"
-CONF_DEFAULT = "default"
-CONF_GPIO_WAKEUP_REASON = "gpio_wakeup_reason"
-CONF_TOUCH_WAKEUP_REASON = "touch_wakeup_reason"
-
-WAKEUP_CAUSES_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_DEFAULT): cv.positive_time_period_milliseconds,
-        cv.Optional(CONF_TOUCH_WAKEUP_REASON): cv.positive_time_period_milliseconds,
-        cv.Optional(CONF_GPIO_WAKEUP_REASON): cv.positive_time_period_milliseconds,
-    }
-)
 
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(DeepSleepComponent),
-        cv.Optional(CONF_RUN_DURATION): cv.Any(
-            cv.All(cv.only_on_esp32, WAKEUP_CAUSES_SCHEMA),
-            cv.positive_time_period_milliseconds,
-        ),
+        cv.Optional(CONF_RUN_DURATION): cv.positive_time_period_milliseconds,
         cv.Optional(CONF_SLEEP_DURATION): cv.positive_time_period_milliseconds,
         cv.Optional(CONF_WAKEUP_PIN): cv.All(
             cv.only_on_esp32, pins.internal_gpio_input_pin_schema, validate_pin_number
@@ -100,28 +85,7 @@ async def to_code(config):
     if CONF_WAKEUP_PIN_MODE in config:
         cg.add(var.set_wakeup_pin_mode(config[CONF_WAKEUP_PIN_MODE]))
     if CONF_RUN_DURATION in config:
-        run_duration_config = config[CONF_RUN_DURATION]
-        if not isinstance(run_duration_config, dict):
-            cg.add(var.set_run_duration(config[CONF_RUN_DURATION]))
-        else:
-            default_run_duration = run_duration_config[CONF_DEFAULT]
-            wakeup_cause_to_run_duration = cg.StructInitializer(
-                WakeupCauseToRunDuration,
-                ("default_cause", default_run_duration),
-                (
-                    "touch_cause",
-                    run_duration_config.get(
-                        CONF_TOUCH_WAKEUP_REASON, default_run_duration
-                    ),
-                ),
-                (
-                    "gpio_cause",
-                    run_duration_config.get(
-                        CONF_GPIO_WAKEUP_REASON, default_run_duration
-                    ),
-                ),
-            )
-            cg.add(var.set_run_duration(wakeup_cause_to_run_duration))
+        cg.add(var.set_run_duration(config[CONF_RUN_DURATION]))
 
     if CONF_ESP32_EXT1_WAKEUP in config:
         conf = config[CONF_ESP32_EXT1_WAKEUP]

esphome/components/deep_sleep/deep_sleep_component.cpp

@@ -13,35 +13,12 @@ static const char *const TAG = "deep_sleep";
 
 bool global_has_deep_sleep = false;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
-optional<uint32_t> DeepSleepComponent::get_run_duration_() const {
-#ifdef USE_ESP32
-  if (this->wakeup_cause_to_run_duration_.has_value()) {
-    esp_sleep_wakeup_cause_t wakeup_cause = esp_sleep_get_wakeup_cause();
-    switch (wakeup_cause) {
-      case ESP_SLEEP_WAKEUP_EXT0:
-      case ESP_SLEEP_WAKEUP_EXT1:
-        return this->wakeup_cause_to_run_duration_->gpio_cause;
-      case ESP_SLEEP_WAKEUP_TOUCHPAD:
-        return this->wakeup_cause_to_run_duration_->touch_cause;
-      default:
-        return this->wakeup_cause_to_run_duration_->default_cause;
-    }
-  }
-#endif
-  return this->run_duration_;
-}
-
 void DeepSleepComponent::setup() {
   ESP_LOGCONFIG(TAG, "Setting up Deep Sleep...");
   global_has_deep_sleep = true;
 
-  const optional<uint32_t> run_duration = get_run_duration_();
-  if (run_duration.has_value()) {
-    ESP_LOGI(TAG, "Scheduling Deep Sleep to start in %u ms", *run_duration);
-    this->set_timeout(*run_duration, [this]() { this->begin_sleep(); });
-  } else {
-    ESP_LOGD(TAG, "Not scheduling Deep Sleep, as no run duration is configured.");
-  }
+  if (this->run_duration_.has_value())
+    this->set_timeout(*this->run_duration_, [this]() { this->begin_sleep(); });
 }
 void DeepSleepComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "Setting up Deep Sleep...");
@@ -56,11 +33,6 @@ void DeepSleepComponent::dump_config() {
   if (wakeup_pin_ != nullptr) {
     LOG_PIN("  Wakeup Pin: ", this->wakeup_pin_);
   }
-  if (this->wakeup_cause_to_run_duration_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Default Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->default_cause);
-    ESP_LOGCONFIG(TAG, "  Touch Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->touch_cause);
-    ESP_LOGCONFIG(TAG, "  GPIO Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->gpio_cause);
-  }
 #endif
 }
 void DeepSleepComponent::loop() {
@@ -77,9 +49,6 @@ void DeepSleepComponent::set_wakeup_pin_mode(WakeupPinMode wakeup_pin_mode) {
 }
 void DeepSleepComponent::set_ext1_wakeup(Ext1Wakeup ext1_wakeup) { this->ext1_wakeup_ = ext1_wakeup; }
 void DeepSleepComponent::set_touch_wakeup(bool touch_wakeup) { this->touch_wakeup_ = touch_wakeup; }
-void DeepSleepComponent::set_run_duration(WakeupCauseToRunDuration wakeup_cause_to_run_duration) {
-  wakeup_cause_to_run_duration_ = wakeup_cause_to_run_duration;
-}
 #endif
 void DeepSleepComponent::set_run_duration(uint32_t time_ms) { this->run_duration_ = time_ms; }
 void DeepSleepComponent::begin_sleep(bool manual) {
@@ -108,8 +77,8 @@ void DeepSleepComponent::begin_sleep(bool manual) {
   if (this->sleep_duration_.has_value())
     esp_sleep_enable_timer_wakeup(*this->sleep_duration_);
   if (this->wakeup_pin_ != nullptr) {
-    bool level = !this->wakeup_pin_->is_inverted();
-    if (this->wakeup_pin_mode_ == WAKEUP_PIN_MODE_INVERT_WAKEUP && this->wakeup_pin_->digital_read()) {
+    bool level = this->wakeup_pin_->is_inverted();
+    if (this->wakeup_pin_mode_ == WAKEUP_PIN_MODE_INVERT_WAKEUP && !this->wakeup_pin_->digital_read()) {
       level = !level;
     }
     esp_sleep_enable_ext0_wakeup(gpio_num_t(this->wakeup_pin_->get_pin()), level);

esphome/components/deep_sleep/deep_sleep_component.h

@@ -32,15 +32,6 @@ struct Ext1Wakeup {
   esp_sleep_ext1_wakeup_mode_t wakeup_mode;
 };
 
-struct WakeupCauseToRunDuration {
-  // Run duration if woken up by timer or any other reason besides those below.
-  uint32_t default_cause;
-  // Run duration if woken up by touch pads.
-  uint32_t touch_cause;
-  // Run duration if woken up by GPIO pins.
-  uint32_t gpio_cause;
-};
-
 #endif
 
 template<typename... Ts> class EnterDeepSleepAction;
@@ -68,11 +59,6 @@ class DeepSleepComponent : public Component {
   void set_ext1_wakeup(Ext1Wakeup ext1_wakeup);
 
   void set_touch_wakeup(bool touch_wakeup);
-
-  // Set the duration in ms for how long the code should run before entering
-  // deep sleep mode, according to the cause the ESP32 has woken.
-  void set_run_duration(WakeupCauseToRunDuration wakeup_cause_to_run_duration);
-
 #endif
   /// Set a duration in ms for how long the code should run before entering deep sleep mode.
   void set_run_duration(uint32_t time_ms);
@@ -89,17 +75,12 @@ class DeepSleepComponent : public Component {
   void prevent_deep_sleep();
 
  protected:
-  // Returns nullopt if no run duration is set. Otherwise, returns the run
-  // duration before entering deep sleep.
-  optional<uint32_t> get_run_duration_() const;
-
   optional<uint64_t> sleep_duration_;
 #ifdef USE_ESP32
   InternalGPIOPin *wakeup_pin_;
   WakeupPinMode wakeup_pin_mode_{WAKEUP_PIN_MODE_IGNORE};
   optional<Ext1Wakeup> ext1_wakeup_;
   optional<bool> touch_wakeup_;
-  optional<WakeupCauseToRunDuration> wakeup_cause_to_run_duration_;
 #endif
   optional<uint32_t> run_duration_;
   bool next_enter_deep_sleep_{false};

esphome/components/dht/sensor.py

@@ -33,7 +33,7 @@ DHT = dht_ns.class_("DHT", cg.PollingComponent)
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(DHT),
-        cv.Required(CONF_PIN): pins.internal_gpio_input_pin_schema,
+        cv.Required(CONF_PIN): pins.gpio_input_pin_schema,
         cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
             unit_of_measurement=UNIT_CELSIUS,
             accuracy_decimals=1,

esphome/components/display/display_buffer.cpp

@@ -5,7 +5,6 @@
 #include "esphome/core/color.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
 
 namespace esphome {
 namespace display {
@@ -16,8 +15,7 @@ const Color COLOR_OFF(0, 0, 0, 0);
 const Color COLOR_ON(255, 255, 255, 255);
 
 void DisplayBuffer::init_internal_(uint32_t buffer_length) {
-  ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
-  this->buffer_ = allocator.allocate(buffer_length);
+  this->buffer_ = new (std::nothrow) uint8_t[buffer_length];  // NOLINT
   if (this->buffer_ == nullptr) {
     ESP_LOGE(TAG, "Could not allocate buffer for display!");
     return;
@@ -498,7 +496,7 @@ bool Animation::get_pixel(int x, int y) const {
     return false;
   const uint32_t width_8 = ((this->width_ + 7u) / 8u) * 8u;
   const uint32_t frame_index = this->height_ * width_8 * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= this->width_ * this->height_ * this->animation_frame_count_)
     return false;
   const uint32_t pos = x + y * width_8 + frame_index;
   return progmem_read_byte(this->data_start_ + (pos / 8u)) & (0x80 >> (pos % 8u));
@@ -507,7 +505,7 @@ Color Animation::get_color_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return Color::BLACK;
   const uint32_t frame_index = this->width_ * this->height_ * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= this->width_ * this->height_ * this->animation_frame_count_)
     return Color::BLACK;
   const uint32_t pos = (x + y * this->width_ + frame_index) * 3;
   const uint32_t color32 = (progmem_read_byte(this->data_start_ + pos + 2) << 0) |
@@ -519,7 +517,7 @@ Color Animation::get_grayscale_pixel(int x, int y) const {
   if (x < 0 || x >= this->width_ || y < 0 || y >= this->height_)
     return Color::BLACK;
   const uint32_t frame_index = this->width_ * this->height_ * this->current_frame_;
-  if (frame_index >= (uint32_t)(this->width_ * this->height_ * this->animation_frame_count_))
+  if (frame_index >= this->width_ * this->height_ * this->animation_frame_count_)
     return Color::BLACK;
   const uint32_t pos = (x + y * this->width_ + frame_index);
   const uint8_t gray = progmem_read_byte(this->data_start_ + pos);

esphome/components/display/display_color_utils.h

@@ -42,7 +42,7 @@ class ColorUtil {
                        ? esp_scale(((colorcode >> third_bits) & ((1 << second_bits) - 1)), ((1 << second_bits) - 1))
                        : esp_scale(((colorcode >> 8) & 0xFF), ((1 << second_bits) - 1));
 
-    third_color = (right_bit_aligned ? esp_scale(((colorcode >> 0) & ((1 << third_bits) - 1)), ((1 << third_bits) - 1))
+    third_color = (right_bit_aligned ? esp_scale(((colorcode >> 0) & 0xFF), ((1 << third_bits) - 1))
                                      : esp_scale(((colorcode >> 0) & 0xFF), (1 << third_bits) - 1));
 
     Color color_return;

esphome/components/dsmr/__init__.py

@@ -5,7 +5,6 @@ from esphome.components import uart
 from esphome.const import (
     CONF_ID,
     CONF_UART_ID,
-    CONF_RECEIVE_TIMEOUT,
 )
 
 CODEOWNERS = ["@glmnet", "@zuidwijk"]
@@ -53,12 +52,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_GAS_MBUS_ID, default=1): cv.int_,
             cv.Optional(CONF_MAX_TELEGRAM_LENGTH, default=1500): cv.int_,
             cv.Optional(CONF_REQUEST_PIN): pins.gpio_output_pin_schema,
-            cv.Optional(
-                CONF_REQUEST_INTERVAL, default="0ms"
-            ): cv.positive_time_period_milliseconds,
-            cv.Optional(
-                CONF_RECEIVE_TIMEOUT, default="200ms"
-            ): cv.positive_time_period_milliseconds,
+            cv.Optional(CONF_REQUEST_INTERVAL): cv.positive_time_period_milliseconds,
         }
     ).extend(uart.UART_DEVICE_SCHEMA),
     cv.only_with_arduino,
@@ -76,8 +70,10 @@ async def to_code(config):
     if CONF_REQUEST_PIN in config:
         request_pin = await cg.gpio_pin_expression(config[CONF_REQUEST_PIN])
         cg.add(var.set_request_pin(request_pin))
-    cg.add(var.set_request_interval(config[CONF_REQUEST_INTERVAL].total_milliseconds))
-    cg.add(var.set_receive_timeout(config[CONF_RECEIVE_TIMEOUT].total_milliseconds))
+    if CONF_REQUEST_INTERVAL in config:
+        cg.add(
+            var.set_request_interval(config[CONF_REQUEST_INTERVAL].total_milliseconds)
+        )
 
     cg.add_define("DSMR_GAS_MBUS_ID", config[CONF_GAS_MBUS_ID])
 

esphome/components/dsmr/dsmr.cpp

@@ -24,7 +24,7 @@ void Dsmr::loop() {
     if (this->decryption_key_.empty()) {
       this->receive_telegram_();
     } else {
-      this->receive_encrypted_telegram_();
+      this->receive_encrypted_();
     }
   }
 }
@@ -57,42 +57,14 @@ bool Dsmr::request_interval_reached_() {
   return millis() - this->last_request_time_ > this->request_interval_;
 }
 
-bool Dsmr::receive_timeout_reached_() { return millis() - this->last_read_time_ > this->receive_timeout_; }
-
 bool Dsmr::available_within_timeout_() {
-  // Data are available for reading on the UART bus?
-  // Then we can start reading right away.
-  if (this->available()) {
-    this->last_read_time_ = millis();
-    return true;
-  }
-  // When we're not in the process of reading a telegram, then there is
-  // no need to actively wait for new data to come in.
-  if (!header_found_) {
-    return false;
-  }
-  // A telegram is being read. The smart meter might not deliver a telegram
-  // in one go, but instead send it in chunks with small pauses in between.
-  // When the UART RX buffer cannot hold a full telegram, then make sure
-  // that the UART read buffer does not overflow while other components
-  // perform their work in their loop. Do this by not returning control to
-  // the main loop, until the read timeout is reached.
-  if (this->parent_->get_rx_buffer_size() < this->max_telegram_len_) {
-    while (!this->receive_timeout_reached_()) {
-      delay(5);
-      if (this->available()) {
-        this->last_read_time_ = millis();
-        return true;
-      }
+  uint8_t tries = READ_TIMEOUT_MS / 5;
+  while (tries--) {
+    delay(5);
+    if (this->available()) {
+      return true;
     }
   }
-  // No new data has come in during the read timeout? Then stop reading the
-  // telegram and start waiting for the next one to arrive.
-  if (this->receive_timeout_reached_()) {
-    ESP_LOGW(TAG, "Timeout while reading data for telegram");
-    this->reset_telegram_();
-  }
-
   return false;
 }
 
@@ -124,31 +96,30 @@ void Dsmr::stop_requesting_data_() {
   }
 }
 
-void Dsmr::reset_telegram_() {
-  this->header_found_ = false;
-  this->footer_found_ = false;
-  this->bytes_read_ = 0;
-  this->crypt_bytes_read_ = 0;
-  this->crypt_telegram_len_ = 0;
-  this->last_read_time_ = 0;
-}
-
 void Dsmr::receive_telegram_() {
-  while (this->available_within_timeout_()) {
+  while (true) {
+    if (!this->available()) {
+      if (!this->header_found_ || !this->available_within_timeout_()) {
+        return;
+      }
+    }
+
     const char c = this->read();
 
     // Find a new telegram header, i.e. forward slash.
     if (c == '/') {
       ESP_LOGV(TAG, "Header of telegram found");
-      this->reset_telegram_();
       this->header_found_ = true;
+      this->footer_found_ = false;
+      this->telegram_len_ = 0;
     }
     if (!this->header_found_)
       continue;
 
     // Check for buffer overflow.
-    if (this->bytes_read_ >= this->max_telegram_len_) {
-      this->reset_telegram_();
+    if (this->telegram_len_ >= this->max_telegram_len_) {
+      this->header_found_ = false;
+      this->footer_found_ = false;
       ESP_LOGE(TAG, "Error: telegram larger than buffer (%d bytes)", this->max_telegram_len_);
       return;
     }
@@ -158,9 +129,9 @@ void Dsmr::receive_telegram_() {
     // proper parsing, remove these new line characters.
     if (c == '(') {
       while (true) {
-        auto previous_char = this->telegram_[this->bytes_read_ - 1];
+        auto previous_char = this->telegram_[this->telegram_len_ - 1];
         if (previous_char == '\n' || previous_char == '\r') {
-          this->bytes_read_--;
+          this->telegram_len_--;
         } else {
           break;
         }
@@ -168,8 +139,8 @@ void Dsmr::receive_telegram_() {
     }
 
     // Store the byte in the buffer.
-    this->telegram_[this->bytes_read_] = c;
-    this->bytes_read_++;
+    this->telegram_[this->telegram_len_] = c;
+    this->telegram_len_++;
 
     // Check for a footer, i.e. exlamation mark, followed by a hex checksum.
     if (c == '!') {
@@ -181,14 +152,28 @@ void Dsmr::receive_telegram_() {
     if (this->footer_found_ && c == '\n') {
       // Parse the telegram and publish sensor values.
       this->parse_telegram();
-      this->reset_telegram_();
+
+      this->header_found_ = false;
       return;
     }
   }
 }
 
-void Dsmr::receive_encrypted_telegram_() {
-  while (this->available_within_timeout_()) {
+void Dsmr::receive_encrypted_() {
+  this->encrypted_telegram_len_ = 0;
+  size_t packet_size = 0;
+
+  while (true) {
+    if (!this->available()) {
+      if (!this->header_found_) {
+        return;
+      }
+      if (!this->available_within_timeout_()) {
+        ESP_LOGW(TAG, "Timeout while reading data for encrypted telegram");
+        return;
+      }
+    }
+
     const char c = this->read();
 
     // Find a new telegram start byte.
@@ -197,58 +182,50 @@ void Dsmr::receive_encrypted_telegram_() {
         continue;
       }
       ESP_LOGV(TAG, "Start byte 0xDB of encrypted telegram found");
-      this->reset_telegram_();
       this->header_found_ = true;
     }
 
     // Check for buffer overflow.
-    if (this->crypt_bytes_read_ >= this->max_telegram_len_) {
-      this->reset_telegram_();
+    if (this->encrypted_telegram_len_ >= this->max_telegram_len_) {
+      this->header_found_ = false;
       ESP_LOGE(TAG, "Error: encrypted telegram larger than buffer (%d bytes)", this->max_telegram_len_);
       return;
     }
 
-    // Store the byte in the buffer.
-    this->crypt_telegram_[this->crypt_bytes_read_] = c;
-    this->crypt_bytes_read_++;
+    this->encrypted_telegram_[this->encrypted_telegram_len_++] = c;
 
-    // Read the length of the incoming encrypted telegram.
-    if (this->crypt_telegram_len_ == 0 && this->crypt_bytes_read_ > 20) {
+    if (packet_size == 0 && this->encrypted_telegram_len_ > 20) {
       // Complete header + data bytes
-      this->crypt_telegram_len_ = 13 + (this->crypt_telegram_[11] << 8 | this->crypt_telegram_[12]);
-      ESP_LOGV(TAG, "Encrypted telegram length: %d bytes", this->crypt_telegram_len_);
+      packet_size = 13 + (this->encrypted_telegram_[11] << 8 | this->encrypted_telegram_[12]);
+      ESP_LOGV(TAG, "Encrypted telegram size: %d bytes", packet_size);
     }
+    if (this->encrypted_telegram_len_ == packet_size && packet_size > 0) {
+      ESP_LOGV(TAG, "End of encrypted telegram found");
+      GCM<AES128> *gcmaes128{new GCM<AES128>()};
+      gcmaes128->setKey(this->decryption_key_.data(), gcmaes128->keySize());
+      // the iv is 8 bytes of the system title + 4 bytes frame counter
+      // system title is at byte 2 and frame counter at byte 15
+      for (int i = 10; i < 14; i++)
+        this->encrypted_telegram_[i] = this->encrypted_telegram_[i + 4];
+      constexpr uint16_t iv_size{12};
+      gcmaes128->setIV(&this->encrypted_telegram_[2], iv_size);
+      gcmaes128->decrypt(reinterpret_cast<uint8_t *>(this->telegram_),
+                         // the ciphertext start at byte 18
+                         &this->encrypted_telegram_[18],
+                         // cipher size
+                         this->encrypted_telegram_len_ - 17);
+      delete gcmaes128;  // NOLINT(cppcoreguidelines-owning-memory)
 
-    // Check for the end of the encrypted telegram.
-    if (this->crypt_telegram_len_ == 0 || this->crypt_bytes_read_ != this->crypt_telegram_len_) {
-      continue;
+      this->telegram_len_ = strnlen(this->telegram_, this->max_telegram_len_);
+      ESP_LOGV(TAG, "Decrypted telegram size: %d bytes", this->telegram_len_);
+      ESP_LOGVV(TAG, "Decrypted telegram: %s", this->telegram_);
+
+      this->parse_telegram();
+
+      this->header_found_ = false;
+      this->telegram_len_ = 0;
+      return;
     }
-    ESP_LOGV(TAG, "End of encrypted telegram found");
-
-    // Decrypt the encrypted telegram.
-    GCM<AES128> *gcmaes128{new GCM<AES128>()};
-    gcmaes128->setKey(this->decryption_key_.data(), gcmaes128->keySize());
-    // the iv is 8 bytes of the system title + 4 bytes frame counter
-    // system title is at byte 2 and frame counter at byte 15
-    for (int i = 10; i < 14; i++)
-      this->crypt_telegram_[i] = this->crypt_telegram_[i + 4];
-    constexpr uint16_t iv_size{12};
-    gcmaes128->setIV(&this->crypt_telegram_[2], iv_size);
-    gcmaes128->decrypt(reinterpret_cast<uint8_t *>(this->telegram_),
-                       // the ciphertext start at byte 18
-                       &this->crypt_telegram_[18],
-                       // cipher size
-                       this->crypt_bytes_read_ - 17);
-    delete gcmaes128;  // NOLINT(cppcoreguidelines-owning-memory)
-
-    this->bytes_read_ = strnlen(this->telegram_, this->max_telegram_len_);
-    ESP_LOGV(TAG, "Decrypted telegram size: %d bytes", this->bytes_read_);
-    ESP_LOGVV(TAG, "Decrypted telegram: %s", this->telegram_);
-
-    // Parse the decrypted telegram and publish sensor values.
-    this->parse_telegram();
-    this->reset_telegram_();
-    return;
   }
 }
 
@@ -257,11 +234,11 @@ bool Dsmr::parse_telegram() {
   ESP_LOGV(TAG, "Trying to parse telegram");
   this->stop_requesting_data_();
   ::dsmr::ParseResult<void> res =
-      ::dsmr::P1Parser::parse(&data, this->telegram_, this->bytes_read_, false,
+      ::dsmr::P1Parser::parse(&data, this->telegram_, this->telegram_len_, false,
                               this->crc_check_);  // Parse telegram according to data definition. Ignore unknown values.
   if (res.err) {
     // Parsing error, show it
-    auto err_str = res.fullError(this->telegram_, this->telegram_ + this->bytes_read_);
+    auto err_str = res.fullError(this->telegram_, this->telegram_ + this->telegram_len_);
     ESP_LOGE(TAG, "%s", err_str.c_str());
     return false;
   } else {
@@ -274,7 +251,7 @@ bool Dsmr::parse_telegram() {
 void Dsmr::dump_config() {
   ESP_LOGCONFIG(TAG, "DSMR:");
   ESP_LOGCONFIG(TAG, "  Max telegram length: %d", this->max_telegram_len_);
-  ESP_LOGCONFIG(TAG, "  Receive timeout: %.1fs", this->receive_timeout_ / 1e3f);
+
   if (this->request_pin_ != nullptr) {
     LOG_PIN("  Request Pin: ", this->request_pin_);
   }
@@ -293,9 +270,9 @@ void Dsmr::set_decryption_key(const std::string &decryption_key) {
   if (decryption_key.length() == 0) {
     ESP_LOGI(TAG, "Disabling decryption");
     this->decryption_key_.clear();
-    if (this->crypt_telegram_ != nullptr) {
-      delete[] this->crypt_telegram_;
-      this->crypt_telegram_ = nullptr;
+    if (this->encrypted_telegram_ != nullptr) {
+      delete[] this->encrypted_telegram_;
+      this->encrypted_telegram_ = nullptr;
     }
     return;
   }
@@ -316,11 +293,13 @@ void Dsmr::set_decryption_key(const std::string &decryption_key) {
     this->decryption_key_.push_back(std::strtoul(temp, nullptr, 16));
   }
 
-  if (this->crypt_telegram_ == nullptr) {
-    this->crypt_telegram_ = new uint8_t[this->max_telegram_len_];  // NOLINT
+  if (this->encrypted_telegram_ == nullptr) {
+    this->encrypted_telegram_ = new uint8_t[this->max_telegram_len_];  // NOLINT
   }
 }
 
+void Dsmr::set_max_telegram_length(size_t length) { max_telegram_len_ = length; }
+
 }  // namespace dsmr
 }  // namespace esphome
 

esphome/components/dsmr/dsmr.h

@@ -16,6 +16,8 @@
 namespace esphome {
 namespace dsmr {
 
+static constexpr uint32_t READ_TIMEOUT_MS = 200;
+
 using namespace ::dsmr::fields;
 
 // DSMR_**_LIST generated by ESPHome and written in esphome/core/defines
@@ -69,10 +71,11 @@ class Dsmr : public Component, public uart::UARTDevice {
   void dump_config() override;
 
   void set_decryption_key(const std::string &decryption_key);
-  void set_max_telegram_length(size_t length) { this->max_telegram_len_ = length; }
+
+  void set_max_telegram_length(size_t length);
+
   void set_request_pin(GPIOPin *request_pin) { this->request_pin_ = request_pin; }
   void set_request_interval(uint32_t interval) { this->request_interval_ = interval; }
-  void set_receive_timeout(uint32_t timeout) { this->receive_timeout_ = timeout; }
 
 // Sensor setters
 #define DSMR_SET_SENSOR(s) \
@@ -85,8 +88,7 @@ class Dsmr : public Component, public uart::UARTDevice {
 
  protected:
   void receive_telegram_();
-  void receive_encrypted_telegram_();
-  void reset_telegram_();
+  void receive_encrypted_();
 
   /// Wait for UART data to become available within the read timeout.
   ///
@@ -99,26 +101,24 @@ class Dsmr : public Component, public uart::UARTDevice {
   /// lost in the process.
   bool available_within_timeout_();
 
-  // Request telegram
-  uint32_t request_interval_;
-  bool request_interval_reached_();
+  // Data request
   GPIOPin *request_pin_{nullptr};
+  uint32_t request_interval_{0};
   uint32_t last_request_time_{0};
   bool requesting_data_{false};
   bool ready_to_request_data_();
+  bool request_interval_reached_();
   void start_requesting_data_();
   void stop_requesting_data_();
 
-  // Read telegram
-  uint32_t receive_timeout_;
-  bool receive_timeout_reached_();
+  // Telegram buffer
   size_t max_telegram_len_;
   char *telegram_{nullptr};
-  size_t bytes_read_{0};
-  uint8_t *crypt_telegram_{nullptr};
-  size_t crypt_telegram_len_{0};
-  size_t crypt_bytes_read_{0};
-  uint32_t last_read_time_{0};
+  int telegram_len_{0};
+  uint8_t *encrypted_telegram_{nullptr};
+  int encrypted_telegram_len_{0};
+
+  // Serial parser
   bool header_found_{false};
   bool footer_found_{false};
 

esphome/components/duty_cycle/duty_cycle_sensor.cpp

@@ -23,24 +23,22 @@ void DutyCycleSensor::dump_config() {
 }
 void DutyCycleSensor::update() {
   const uint32_t now = micros();
-  const uint32_t last_interrupt = this->store_.last_interrupt;  // Read the measurement taken by the interrupt
-  uint32_t on_time = this->store_.on_time;
-
-  this->store_.on_time = 0;  // Start new measurement, exactly aligned with the micros() reading
-  this->store_.last_interrupt = now;
-
   if (this->last_update_ != 0) {
     const bool level = this->store_.last_level;
+    const uint32_t last_interrupt = this->store_.last_interrupt;
+    uint32_t on_time = this->store_.on_time;
 
     if (level)
       on_time += now - last_interrupt;
 
     const float total_time = float(now - this->last_update_);
 
-    const float value = (on_time * 100.0f) / total_time;
+    const float value = (on_time / total_time) * 100.0f;
     ESP_LOGD(TAG, "'%s' Got duty cycle=%.1f%%", this->get_name().c_str(), value);
     this->publish_state(value);
   }
+  this->store_.on_time = 0;
+  this->store_.last_interrupt = now;
   this->last_update_ = now;
 }
 

esphome/components/esp32/__init__.py

@@ -2,9 +2,8 @@ from dataclasses import dataclass
 from typing import Union
 from pathlib import Path
 import logging
-import os
 
-from esphome.helpers import copy_file_if_changed, write_file_if_changed
+from esphome.helpers import write_file_if_changed
 from esphome.const import (
     CONF_BOARD,
     CONF_FRAMEWORK,
@@ -296,8 +295,6 @@ async def to_code(config):
     conf = config[CONF_FRAMEWORK]
     cg.add_platformio_option("platform", conf[CONF_PLATFORM_VERSION])
 
-    cg.add_platformio_option("extra_scripts", ["post:post_build.py"])
-
     if conf[CONF_TYPE] == FRAMEWORK_ESP_IDF:
         cg.add_platformio_option("framework", "espidf")
         cg.add_build_flag("-DUSE_ESP_IDF")
@@ -314,16 +311,9 @@ async def to_code(config):
         )
         add_idf_sdkconfig_option("CONFIG_COMPILER_OPTIMIZATION_DEFAULT", False)
         add_idf_sdkconfig_option("CONFIG_COMPILER_OPTIMIZATION_SIZE", True)
-
         # Increase freertos tick speed from 100Hz to 1kHz so that delay() resolution is 1ms
         add_idf_sdkconfig_option("CONFIG_FREERTOS_HZ", 1000)
 
-        # Setup watchdog
-        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT", True)
-        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_PANIC", True)
-        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0", False)
-        add_idf_sdkconfig_option("CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1", False)
-
         cg.add_platformio_option("board_build.partitions", "partitions.csv")
 
         for name, value in conf[CONF_SDKCONFIG_OPTIONS].items():
@@ -415,10 +405,3 @@ def copy_files():
             CORE.relative_build_path("partitions.csv"),
             IDF_PARTITIONS_CSV,
         )
-
-    dir = os.path.dirname(__file__)
-    post_build_file = os.path.join(dir, "post_build.py.script")
-    copy_file_if_changed(
-        post_build_file,
-        CORE.relative_build_path("post_build.py"),
-    )

esphome/components/esp32/boards.py

@@ -261,37 +261,6 @@ ESP32_BOARD_PINS = {
         "SS": 33,
         "TX": 17,
     },
-    "featheresp32-s2": {
-        "SDA": 3,
-        "SCL": 4,
-        "SS": 42,
-        "MOSI": 35,
-        "SCK": 36,
-        "MISO": 37,
-        "A0": 18,
-        "A1": 17,
-        "A10": 27,
-        "A11": 12,
-        "A12": 13,
-        "A13": 35,
-        "A2": 16,
-        "A3": 15,
-        "A4": 14,
-        "A5": 8,
-        "LED": 13,
-        "TX": 39,
-        "RX": 38,
-        "T5": 5,
-        "T8": 8,
-        "T9": 9,
-        "T10": 10,
-        "T11": 11,
-        "T12": 12,
-        "T13": 13,
-        "T14": 14,
-        "DAC1": 17,
-        "DAC2": 18,
-    },
     "firebeetle32": {"LED": 2},
     "fm-devkit": {
         "D0": 34,

esphome/components/esp32/core.cpp

@@ -6,17 +6,12 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include <esp_idf_version.h>
-#include <esp_task_wdt.h>
 #include <soc/rtc.h>
 
 #if ESP_IDF_VERSION_MAJOR >= 4
 #include <hal/cpu_hal.h>
 #endif
 
-#ifdef USE_ARDUINO
-#include <esp32-hal.h>
-#endif
-
 void setup();
 void loop();
 
@@ -34,24 +29,24 @@ void arch_restart() {
     yield();
   }
 }
+void IRAM_ATTR HOT arch_feed_wdt() {
+#ifdef USE_ARDUINO
+#if CONFIG_ARDUINO_RUNNING_CORE == 0
+#ifdef CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0
+  // ESP32 uses "Task Watchdog" which is hooked to the FreeRTOS idle task.
+  // To cause the Watchdog to be triggered we need to put the current task
+  // to sleep to get the idle task scheduled.
+  delay(1);
+#endif
+#endif
+#endif  // USE_ARDUINO
 
-void arch_init() {
-  // Enable the task watchdog only on the loop task (from which we're currently running)
-#if defined(USE_ESP_IDF)
-  esp_task_wdt_add(nullptr);
-  // Idle task watchdog is disabled on ESP-IDF
-#elif defined(USE_ARDUINO)
-  enableLoopWDT();
-  // Disable idle task watchdog on the core we're using (Arduino pins the task to a core)
-#if defined(CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0) && CONFIG_ARDUINO_RUNNING_CORE == 0
-  disableCore0WDT();
-#endif
-#if defined(CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1) && CONFIG_ARDUINO_RUNNING_CORE == 1
-  disableCore1WDT();
-#endif
+#ifdef USE_ESP_IDF
+#ifdef CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0
+  delay(1);
 #endif
+#endif  // USE_ESP_IDF
 }
-void IRAM_ATTR HOT arch_feed_wdt() { esp_task_wdt_reset(); }
 
 uint8_t progmem_read_byte(const uint8_t *addr) { return *addr; }
 uint32_t arch_get_cpu_cycle_count() {

esphome/components/esp32/gpio_esp32.py

@@ -18,7 +18,7 @@ _ESP_SDIO_PINS = {
     11: "Flash Command",
 }
 
-_ESP32_STRAPPING_PINS = {0, 2, 4, 12, 15}
+_ESP32_STRAPPING_PINS = {0, 2, 4, 15}
 _LOGGER = logging.getLogger(__name__)
 
 

esphome/components/esp32/post_build.py.script

@@ -1,43 +0,0 @@
-# Source https://github.com/letscontrolit/ESPEasy/pull/3845#issuecomment-1005864664
-
-import esptool
-
-# pylint: disable=E0602
-Import("env")  # noqa
-
-
-def esp32_create_combined_bin(source, target, env):
-    print("Generating combined binary for serial flashing")
-    app_offset = 0x10000
-
-    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}-factory.bin")
-    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
-    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
-    chip = env.get("BOARD_MCU")
-    flash_size = env.BoardConfig().get("upload.flash_size")
-    cmd = [
-        "--chip",
-        chip,
-        "merge_bin",
-        "-o",
-        new_file_name,
-        "--flash_size",
-        flash_size,
-    ]
-    print("    Offset | File")
-    for section in sections:
-        sect_adr, sect_file = section.split(" ", 1)
-        print(f" -  {sect_adr} | {sect_file}")
-        cmd += [sect_adr, sect_file]
-
-    print(f" - {hex(app_offset)} | {firmware_name}")
-    cmd += [hex(app_offset), firmware_name]
-
-    print()
-    print(f"Using esptool.py arguments: {' '.join(cmd)}")
-    print()
-    esptool.main(cmd)
-
-
-# pylint: disable=E0602
-env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)  # noqa

esphome/components/esp32/preferences.cpp

@@ -76,7 +76,6 @@ class ESP32Preferences : public ESPPreferences {
   uint32_t current_offset = 0;
 
   void open() {
-    nvs_flash_init();
     esp_err_t err = nvs_open("esphome", NVS_READWRITE, &nvs_handle);
     if (err == 0)
       return;

esphome/components/esp32_ble_controller/__init__.py

@@ -1,60 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import esp32_ble_server, logger
-from esphome.const import (
-    CONF_BLE_SERVER_ID,
-    CONF_ID,
-    CONF_LEVEL,
-    CONF_LOGGER,
-    ESP_PLATFORM_ESP32,
-)
-
-AUTO_LOAD = ["esp32_ble_server"]
-ESP_PLATFORMS = [ESP_PLATFORM_ESP32]
-CODEOWNERS = ["@jesserockz"]
-CONFLICTS_WITH = ["esp32_ble_tracker", "esp32_ble_beacon"]
-
-CONF_LOG_LEVEL = "log_level"
-
-esp32_ble_controller_ns = cg.esphome_ns.namespace("esp32_ble_controller")
-BLEController = esp32_ble_controller_ns.class_(
-    "BLEController",
-    cg.Component,
-    cg.Controller,
-    esp32_ble_server.BLEServiceComponent,
-)
-
-
-def validate(config, item_config):
-    global_level = config[CONF_LOGGER][CONF_LEVEL]
-    level = item_config.get(CONF_LOG_LEVEL, "DEBUG")
-    if logger.LOG_LEVEL_SEVERITY.index(level) > logger.LOG_LEVEL_SEVERITY.index(
-        global_level
-    ):
-        raise ValueError(
-            "The esp32_ble_controller log level {} must be less severe than the "
-            "global log level {}.".format(level, global_level)
-        )
-
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(BLEController),
-        cv.GenerateID(CONF_BLE_SERVER_ID): cv.use_id(esp32_ble_server.BLEServer),
-        cv.Optional(CONF_LOG_LEVEL): cv.All(
-            cv.requires_component("logger"),
-            logger.is_log_level,
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-
-    ble_server = await cg.get_variable(config[CONF_BLE_SERVER_ID])
-    cg.add(ble_server.register_service_component(var))
-
-    if CONF_LOG_LEVEL in config:
-        cg.add(var.set_log_level(logger.LOG_LEVELS[config[CONF_LOG_LEVEL]]))

esphome/components/esp32_ble_controller/ble_controller.cpp

@@ -1,387 +0,0 @@
-#include "ble_controller.h"
-
-#include "esphome/core/application.h"
-#include "esphome/components/esp32_ble_server/ble_2901.h"
-#include "esphome/components/esp32_ble_server/ble_2902.h"
-
-#ifdef USE_LOGGER
-#include "esphome/components/logger/logger.h"
-#endif
-
-#ifdef ARDUINO_ARCH_ESP32
-
-namespace esphome {
-namespace esp32_ble_controller {
-
-static const char *const ESPHOME_SERVICE_UUID = "03774663-d394-496e-8dcd-000000000000";
-static const char *const LOGGER_CHARACTERISTIC_UUID = "03774663-d394-496e-8dcd-000000000001";
-
-static const char *const BINARY_SENSOR_SERVICE_UUID = "03774663-d394-496e-8dcd-000100000000";
-static const char *const COVER_SERVICE_UUID = "03774663-d394-496e-8dcd-000200000000";
-static const char *const FAN_SERVICE_UUID = "03774663-d394-496e-8dcd-000300000000";
-static const char *const LIGHT_SERVICE_UUID = "03774663-d394-496e-8dcd-000400000000";
-static const char *const SENSOR_SERVICE_UUID = "03774663-d394-496e-8dcd-000500000000";
-static const char *const SWITCH_SERVICE_UUID = "03774663-d394-496e-8dcd-000600000000";
-static const char *const TEXT_SENSOR_SERVICE_UUID = "03774663-d394-496e-8dcd-000700000000";
-static const char *const CLIMATE_SERVICE_UUID = "03774663-d394-496e-8dcd-000800000000";
-
-static const char *const TAG = "esp32_ble_controller";
-
-void BLEController::setup() {
-  ESP_LOGD(TAG, "Setting up BLE controller");
-  this->esphome_service_ = global_ble_server->create_service(ESPHOME_SERVICE_UUID);
-
-#ifdef USE_LOGGER
-  {
-    this->logger_characteristic_ = this->esphome_service_->create_characteristic(
-        LOGGER_CHARACTERISTIC_UUID, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY);
-
-    BLEDescriptor *logger_name = new BLE2901("Logger");
-    this->logger_characteristic_->add_descriptor(logger_name);
-
-    BLEDescriptor *descriptor_2902 = new BLE2902();
-    this->logger_characteristic_->add_descriptor(descriptor_2902);
-  }
-#endif
-
-#ifdef USE_BINARY_SENSOR
-  {
-    auto binary_sensors = App.get_binary_sensors();
-    if (!binary_sensors.empty()) {
-      this->binary_sensor_service_ = global_ble_server->create_service(BINARY_SENSOR_SERVICE_UUID);
-      for (auto *obj : binary_sensors) {
-        std::string uuid = std::string(BINARY_SENSOR_SERVICE_UUID).substr(0, 28);
-        uuid += uint32_to_string(obj->get_object_id_hash());
-        BLECharacteristic *characteristic = this->binary_sensor_service_->create_characteristic(
-            uuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY);
-
-        BLEDescriptor *name = new BLE2901(obj->get_name());
-        characteristic->add_descriptor(name);
-
-        BLEDescriptor *descriptor = new BLE2902();
-        characteristic->add_descriptor(descriptor);
-
-        this->characteristics_.insert(
-            std::pair<uint32_t, BLECharacteristic *>(obj->get_object_id_hash(), characteristic));
-      }
-    }
-  }
-#endif
-#ifdef USE_COVER
-  if (!App.get_covers().empty()) {
-    this->cover_service_ = global_ble_server->create_service(COVER_SERVICE_UUID);
-  }
-#endif
-#ifdef USE_FAN
-  if (!App.get_fans().empty()) {
-    this->fan_service_ = global_ble_server->create_service(FAN_SERVICE_UUID);
-  }
-#endif
-#ifdef USE_LIGHT
-  if (!App.get_lights().empty()) {
-    this->light_service_ = global_ble_server->create_service(LIGHT_SERVICE_UUID);
-  }
-#endif
-#ifdef USE_SENSOR
-  {
-    auto sensors = App.get_sensors();
-    if (!sensors.empty()) {
-      this->sensor_service_ = global_ble_server->create_service(SENSOR_SERVICE_UUID);
-      for (auto *obj : sensors) {
-        std::string uuid = std::string(SENSOR_SERVICE_UUID).substr(0, 28);
-        uuid += uint32_to_string(obj->get_object_id_hash());
-        BLECharacteristic *characteristic = this->sensor_service_->create_characteristic(
-            uuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY);
-
-        BLEDescriptor *name = new BLE2901(obj->get_name());
-        characteristic->add_descriptor(name);
-
-        BLEDescriptor *descriptor = new BLE2902();
-        characteristic->add_descriptor(descriptor);
-
-        this->characteristics_.insert(
-            std::pair<uint32_t, BLECharacteristic *>(obj->get_object_id_hash(), characteristic));
-      }
-    }
-  }
-#endif
-#ifdef USE_SWITCH
-  {
-    auto switches = App.get_switches();
-    if (!switches.empty()) {
-      this->switch_service_ = global_ble_server->create_service(SWITCH_SERVICE_UUID);
-      for (auto *obj : switches) {
-        std::string uuid = std::string(SWITCH_SERVICE_UUID).substr(0, 28);
-        uuid += uint32_to_string(obj->get_object_id_hash());
-        BLECharacteristic *characteristic = this->switch_service_->create_characteristic(
-            uuid,
-            BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY | BLECharacteristic::PROPERTY_WRITE);
-
-        BLEDescriptor *name = new BLE2901(obj->get_name());
-        characteristic->add_descriptor(name);
-
-        BLEDescriptor *descriptor = new BLE2902();
-        characteristic->add_descriptor(descriptor);
-
-        this->characteristics_.insert(
-            std::pair<uint32_t, BLECharacteristic *>(obj->get_object_id_hash(), characteristic));
-
-        characteristic->on_write([obj](std::vector<uint8_t> data) {
-          if (data[0])
-            obj->turn_on();
-          else
-            obj->turn_off();
-        });
-      }
-    }
-  }
-#endif
-#ifdef USE_TEXT_SENSOR
-  {
-    auto text_sensors = App.get_text_sensors();
-    if (!text_sensors.empty()) {
-      this->text_sensor_service_ = global_ble_server->create_service(TEXT_SENSOR_SERVICE_UUID);
-      for (auto *obj : text_sensors) {
-        std::string uuid = std::string(TEXT_SENSOR_SERVICE_UUID).substr(0, 28);
-        uuid += uint32_to_string(obj->get_object_id_hash());
-        BLECharacteristic *characteristic = this->text_sensor_service_->create_characteristic(
-            uuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY);
-
-        BLEDescriptor *name = new BLE2901(obj->get_name());
-        characteristic->add_descriptor(name);
-
-        BLEDescriptor *descriptor = new BLE2902();
-        characteristic->add_descriptor(descriptor);
-
-        this->characteristics_.insert(
-            std::pair<uint32_t, BLECharacteristic *>(obj->get_object_id_hash(), characteristic));
-      }
-    }
-  }
-#endif
-#ifdef USE_CLIMATE
-  if (!App.get_climates().empty()) {
-    this->cover_service_ = global_ble_server->create_service(COVER_SERVICE_UUID);
-  }
-#endif
-  this->state_ = CREATING;
-  this->setup_controller();
-}
-
-void BLEController::loop() {
-  switch (this->state_) {
-    case CREATING: {
-      bool all_created = true;
-      all_created &= this->esphome_service_->is_created();
-#ifdef USE_BINARY_SENSOR
-      all_created &= this->binary_sensor_service_ == nullptr || this->binary_sensor_service_->is_created();
-#endif
-#ifdef USE_COVER
-      all_created &= this->cover_service_ == nullptr || this->cover_service_->is_created();
-#endif
-#ifdef USE_FAN
-      all_created &= this->fan_service_ == nullptr || this->fan_service_->is_created();
-#endif
-#ifdef USE_LIGHT
-      all_created &= this->light_service_ == nullptr || this->light_service_->is_created();
-#endif
-#ifdef USE_SENSOR
-      all_created &= this->sensor_service_ == nullptr || this->sensor_service_->is_created();
-#endif
-#ifdef USE_SWITCH
-      all_created &= this->switch_service_ == nullptr || this->switch_service_->is_created();
-#endif
-#ifdef USE_TEXT_SENSOR
-      all_created &= this->text_sensor_service_ == nullptr || this->text_sensor_service_->is_created();
-#endif
-#ifdef USE_CLIMATE
-      all_created &= this->climate_service_ == nullptr || this->climate_service_->is_created();
-#endif
-      if (all_created) {
-        ESP_LOGI(TAG, "All services created");
-        this->state_ = STARTING;
-      }
-      break;
-    }
-    case STARTING: {
-      bool all_running = true;
-
-      all_running &= this->esphome_service_->is_running();
-
-#ifdef USE_BINARY_SENSOR
-      all_running &= this->binary_sensor_service_ == nullptr || this->binary_sensor_service_->is_running();
-#endif
-#ifdef USE_COVER
-      all_running &= this->cover_service_ == nullptr || this->cover_service_->is_running();
-#endif
-#ifdef USE_FAN
-      all_running &= this->fan_service_ == nullptr || this->fan_service_->is_running();
-#endif
-#ifdef USE_LIGHT
-      all_running &= this->light_service_ == nullptr || this->light_service_->is_running();
-#endif
-#ifdef USE_SENSOR
-      all_running &= this->sensor_service_ == nullptr || this->sensor_service_->is_running();
-#endif
-#ifdef USE_SWITCH
-      all_running &= this->switch_service_ == nullptr || this->switch_service_->is_running();
-#endif
-#ifdef USE_TEXT_SENSOR
-      all_running &= this->text_sensor_service_ == nullptr || this->text_sensor_service_->is_running();
-#endif
-#ifdef USE_CLIMATE
-      all_running &= this->climate_service_ == nullptr || this->climate_service_->is_running();
-#endif
-      if (all_running) {
-        ESP_LOGD(TAG, "BLE Controller started");
-        this->state_ = RUNNING;
-#ifdef USE_LOGGER
-        logger::global_logger->add_on_log_callback([this](int level, const char *tag, const char *message) {
-          if (level > this->log_level_)
-            return;
-          std::string log;
-          log += "[";
-          log += tag;
-          log += "] ";
-          log += message;
-          this->logger_characteristic_->set_value(log);
-          this->logger_characteristic_->notify();
-        });
-#endif
-      } else {
-        this->esphome_service_->start();
-#ifdef USE_BINARY_SENSOR
-        this->binary_sensor_service_->start();
-#endif
-#ifdef USE_COVER
-        this->cover_service_->start();
-#endif
-#ifdef USE_FAN
-        this->fan_service_->start();
-#endif
-#ifdef USE_LIGHT
-        this->light_service_->start();
-#endif
-#ifdef USE_SENSOR
-        this->sensor_service_->start();
-#endif
-#ifdef USE_SWITCH
-        this->switch_service_->start();
-#endif
-#ifdef USE_TEXT_SENSOR
-        this->text_sensor_service_->start();
-#endif
-#ifdef USE_CLIMATE
-        this->climate_service_->start();
-#endif
-      }
-      break;
-    }
-
-    case RUNNING:
-    case INIT:
-      break;
-    default:
-      break;
-  }
-}
-
-void BLEController::start() {
-  if (this->state_ == RUNNING)
-    return;
-  this->state_ = STARTING;
-}
-void BLEController::stop() {
-  this->esphome_service_->stop();
-#ifdef USE_BINARY_SENSOR
-  this->binary_sensor_service_->stop();
-#endif
-#ifdef USE_COVER
-  this->cover_service_->stop();
-#endif
-#ifdef USE_FAN
-  this->fan_service_->stop();
-#endif
-#ifdef USE_LIGHT
-  this->light_service_->stop();
-#endif
-#ifdef USE_SENSOR
-  this->sensor_service_->stop();
-#endif
-#ifdef USE_SWITCH
-  this->switch_service_->stop();
-#endif
-#ifdef USE_TEXT_SENSOR
-  this->text_sensor_service_->stop();
-#endif
-#ifdef USE_CLIMATE
-  this->climate_service_->stop();
-#endif
-}
-float BLEController::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH; }
-
-#ifdef USE_BINARY_SENSOR
-void BLEController::on_binary_sensor_update(binary_sensor::BinarySensor *obj, bool state) {
-  if (obj->is_internal())
-    return;
-  auto *characteristic = this->characteristics_[obj->get_object_id_hash()];
-  characteristic->set_value(state);
-  characteristic->notify();
-}
-#endif
-#ifdef USE_COVER
-void BLEController::on_cover_update(cover::Cover *obj) {
-  if (obj->is_internal())
-    return;
-}
-#endif
-#ifdef USE_FAN
-void BLEController::on_fan_update(fan::FanState *obj) {
-  if (obj->is_internal())
-    return;
-}
-#endif
-#ifdef USE_LIGHT
-void BLEController::on_light_update(light::LightState *obj) {
-  if (obj->is_internal())
-    return;
-}
-#endif
-#ifdef USE_SENSOR
-void BLEController::on_sensor_update(sensor::Sensor *obj, float state) {
-  if (obj->is_internal())
-    return;
-  auto *characteristic = this->characteristics_[obj->get_object_id_hash()];
-  characteristic->set_value(state);
-  characteristic->notify();
-}
-#endif
-#ifdef USE_SWITCH
-void BLEController::on_switch_update(switch_::Switch *obj, bool state) {
-  if (obj->is_internal())
-    return;
-  auto *characteristic = this->characteristics_[obj->get_object_id_hash()];
-  characteristic->set_value(state);
-  characteristic->notify();
-}
-#endif
-#ifdef USE_TEXT_SENSOR
-void BLEController::on_text_sensor_update(text_sensor::TextSensor *obj, const std::string &state) {
-  if (obj->is_internal())
-    return;
-  auto *characteristic = this->characteristics_[obj->get_object_id_hash()];
-  characteristic->set_value(state);
-  characteristic->notify();
-}
-#endif
-#ifdef USE_CLIMATE
-void BLEController::on_climate_update(climate::Climate *obj) {
-  if (obj->is_internal())
-    return;
-}
-#endif
-
-}  // namespace esp32_ble_controller
-}  // namespace esphome
-
-#endif

esphome/components/esp32_ble_controller/ble_controller.h

@@ -1,106 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/controller.h"
-#include "esphome/components/esp32_ble_server/ble_2901.h"
-#include "esphome/components/esp32_ble_server/ble_2902.h"
-#include "esphome/components/esp32_ble_server/ble_characteristic.h"
-#include "esphome/components/esp32_ble_server/ble_server.h"
-#include <map>
-
-#ifdef USE_LOGGER
-#include "esphome/core/log.h"
-#endif
-
-#ifdef ARDUINO_ARCH_ESP32
-
-namespace esphome {
-namespace esp32_ble_controller {
-
-using namespace esp32_ble_server;
-
-class BLEController : public Component, public Controller, public esp32_ble_server::BLEServiceComponent {
- public:
-  void loop() override;
-  void setup() override;
-  void start() override;
-  void stop() override;
-
-  float get_setup_priority() const override;
-
-#ifdef USE_LOGGER
-  void set_log_level(int level) { this->log_level_ = level; }
-#endif
-
-#ifdef USE_BINARY_SENSOR
-  void on_binary_sensor_update(binary_sensor::BinarySensor *obj, bool state) override;
-#endif
-#ifdef USE_COVER
-  void on_cover_update(cover::Cover *obj) override;
-#endif
-#ifdef USE_FAN
-  void on_fan_update(fan::FanState *obj) override;
-#endif
-#ifdef USE_LIGHT
-  void on_light_update(light::LightState *obj) override;
-#endif
-#ifdef USE_SENSOR
-  void on_sensor_update(sensor::Sensor *obj, float state) override;
-#endif
-#ifdef USE_SWITCH
-  void on_switch_update(switch_::Switch *obj, bool state) override;
-#endif
-#ifdef USE_TEXT_SENSOR
-  void on_text_sensor_update(text_sensor::TextSensor *obj, const std::string &state) override;
-#endif
-#ifdef USE_CLIMATE
-  void on_climate_update(climate::Climate *obj) override;
-#endif
-
- protected:
-  enum State : uint8_t {
-    FAILED = 0x00,
-    INIT,
-    CREATING,
-    STARTING,
-    RUNNING,
-  } state_{INIT};
-
-  std::map<uint32_t, BLECharacteristic *> characteristics_;
-
-  BLEService *esphome_service_;
-#ifdef USE_LOGGER
-  BLECharacteristic *logger_characteristic_;
-  int log_level_{ESPHOME_LOG_LEVEL_DEBUG};
-#endif
-
-#ifdef USE_BINARY_SENSOR
-  BLEService *binary_sensor_service_;
-#endif
-#ifdef USE_COVER
-  BLEService *cover_service_;
-#endif
-#ifdef USE_FAN
-  BLEService *fan_service_;
-#endif
-#ifdef USE_LIGHT
-  BLEService *light_service_;
-#endif
-#ifdef USE_SENSOR
-  BLEService *sensor_service_;
-#endif
-#ifdef USE_SWITCH
-  BLEService *switch_service_;
-#endif
-#ifdef USE_TEXT_SENSOR
-  BLEService *text_sensor_service_;
-#endif
-#ifdef USE_CLIMATE
-  BLEService *climate_service_;
-#endif
-};
-
-}  // namespace esp32_ble_controller
-}  // namespace esphome
-
-#endif

esphome/components/esp32_ble_server/ble_server.cpp

@@ -61,11 +61,14 @@ void BLEServer::loop() {
       break;
     }
     case STARTING_SERVICE: {
+      if (!this->device_information_service_->is_created()) {
+        break;
+      }
       if (this->device_information_service_->is_running()) {
         this->state_ = RUNNING;
         this->can_proceed_ = true;
         ESP_LOGD(TAG, "BLE server setup successfully");
-      } else if (this->device_information_service_->is_created() && !this->device_information_service_->is_starting()) {
+      } else if (!this->device_information_service_->is_starting()) {
         this->device_information_service_->start();
       }
       break;

esphome/components/esp32_ble_server/ble_service.cpp

@@ -72,14 +72,9 @@ bool BLEService::do_create_characteristics_() {
 }
 
 void BLEService::start() {
-  if (this->running_state_ == RUNNING)
-    return;
-
   if (this->do_create_characteristics_())
     return;
 
-  ESP_LOGD(TAG, "Starting BLE service %s", this->uuid_.to_string().c_str());
-
   esp_err_t err = esp_ble_gatts_start_service(this->handle_);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "esp_ble_gatts_start_service failed: %d", err);
@@ -117,14 +112,12 @@ void BLEService::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t g
       if (this->uuid_ == ESPBTUUID::from_uuid(param->create.service_id.id.uuid) &&
           this->inst_id_ == param->create.service_id.id.inst_id) {
         this->handle_ = param->create.service_handle;
-        ESP_LOGI(TAG, "Service %s created", this->uuid_.to_string().c_str());
         this->init_state_ = CREATED;
       }
       break;
     }
     case ESP_GATTS_START_EVT: {
       if (param->start.service_handle == this->handle_) {
-        ESP_LOGI(TAG, "Service %s started", this->uuid_.to_string().c_str());
         this->running_state_ = RUNNING;
       }
       break;

esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp

@@ -483,7 +483,6 @@ optional<ESPBLEiBeacon> ESPBLEiBeacon::from_manufacturer_data(const ServiceData
 }
 
 void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {
-  this->scan_result_ = param;
   for (uint8_t i = 0; i < ESP_BD_ADDR_LEN; i++)
     this->address_[i] = param.bda[i];
   this->address_type_ = param.ble_addr_type;
@@ -525,7 +524,7 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
     ESP_LOGVV(TAG, "  Service UUID: %s", uuid.to_string().c_str());
   }
   for (auto &data : this->manufacturer_datas_) {
-    ESP_LOGVV(TAG, "  Manufacturer data: %s", format_hex_pretty(data.data).c_str());
+    ESP_LOGVV(TAG, "  Manufacturer data: %s", hexencode(data.data).c_str());
     if (this->get_ibeacon().has_value()) {
       auto ibeacon = this->get_ibeacon().value();
       ESP_LOGVV(TAG, "    iBeacon data:");
@@ -538,10 +537,10 @@ void ESPBTDevice::parse_scan_rst(const esp_ble_gap_cb_param_t::ble_scan_result_e
   for (auto &data : this->service_datas_) {
     ESP_LOGVV(TAG, "  Service data:");
     ESP_LOGVV(TAG, "    UUID: %s", data.uuid.to_string().c_str());
-    ESP_LOGVV(TAG, "    Data: %s", format_hex_pretty(data.data).c_str());
+    ESP_LOGVV(TAG, "    Data: %s", hexencode(data.data).c_str());
   }
 
-  ESP_LOGVV(TAG, "Adv data: %s", format_hex_pretty(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
+  ESP_LOGVV(TAG, "Adv data: %s", hexencode(param.ble_adv, param.adv_data_len + param.scan_rsp_len).c_str());
 #endif
 }
 void ESPBTDevice::parse_adv_(const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &param) {

esphome/components/esp32_ble_tracker/esp32_ble_tracker.h

@@ -97,8 +97,6 @@ class ESPBTDevice {
 
   const std::vector<ServiceData> &get_service_datas() const { return service_datas_; }
 
-  const esp_ble_gap_cb_param_t::ble_scan_result_evt_param &get_scan_result() const { return scan_result_; }
-
   optional<ESPBLEiBeacon> get_ibeacon() const {
     for (auto &it : this->manufacturer_datas_) {
       auto res = ESPBLEiBeacon::from_manufacturer_data(it);
@@ -123,7 +121,6 @@ class ESPBTDevice {
   std::vector<ESPBTUUID> service_uuids_;
   std::vector<ServiceData> manufacturer_datas_{};
   std::vector<ServiceData> service_datas_{};
-  esp_ble_gap_cb_param_t::ble_scan_result_evt_param scan_result_{};
 };
 
 class ESP32BLETracker;

esphome/components/esp32_camera/__init__.py

@@ -19,8 +19,6 @@ from esphome.cpp_helpers import setup_entity
 
 DEPENDENCIES = ["esp32"]
 
-AUTO_LOAD = ["psram"]
-
 esp32_camera_ns = cg.esphome_ns.namespace("esp32_camera")
 ESP32Camera = esp32_camera_ns.class_("ESP32Camera", cg.PollingComponent, cg.EntityBase)
 ESP32CameraFrameSize = esp32_camera_ns.enum("ESP32CameraFrameSize")
@@ -59,9 +57,6 @@ CONF_IDLE_FRAMERATE = "idle_framerate"
 CONF_JPEG_QUALITY = "jpeg_quality"
 CONF_VERTICAL_FLIP = "vertical_flip"
 CONF_HORIZONTAL_MIRROR = "horizontal_mirror"
-CONF_AEC2 = "aec2"
-CONF_AE_LEVEL = "ae_level"
-CONF_AEC_VALUE = "aec_value"
 CONF_SATURATION = "saturation"
 CONF_TEST_PATTERN = "test_pattern"
 
@@ -107,9 +102,6 @@ CONFIG_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
         cv.Optional(CONF_SATURATION, default=0): camera_range_param,
         cv.Optional(CONF_VERTICAL_FLIP, default=True): cv.boolean,
         cv.Optional(CONF_HORIZONTAL_MIRROR, default=True): cv.boolean,
-        cv.Optional(CONF_AEC2, default=False): cv.boolean,
-        cv.Optional(CONF_AE_LEVEL, default=0): camera_range_param,
-        cv.Optional(CONF_AEC_VALUE, default=300): cv.int_range(min=0, max=1200),
         cv.Optional(CONF_TEST_PATTERN, default=False): cv.boolean,
     }
 ).extend(cv.COMPONENT_SCHEMA)
@@ -124,9 +116,6 @@ SETTERS = {
     CONF_JPEG_QUALITY: "set_jpeg_quality",
     CONF_VERTICAL_FLIP: "set_vertical_flip",
     CONF_HORIZONTAL_MIRROR: "set_horizontal_mirror",
-    CONF_AEC2: "set_aec2",
-    CONF_AE_LEVEL: "set_ae_level",
-    CONF_AEC_VALUE: "set_aec_value",
     CONF_CONTRAST: "set_contrast",
     CONF_BRIGHTNESS: "set_brightness",
     CONF_SATURATION: "set_saturation",
@@ -155,7 +144,9 @@ async def to_code(config):
     cg.add(var.set_frame_size(config[CONF_RESOLUTION]))
 
     cg.add_define("USE_ESP32_CAMERA")
+    cg.add_build_flag("-DBOARD_HAS_PSRAM")
 
     if CORE.using_esp_idf:
         cg.add_library("espressif/esp32-camera", "1.0.0")
         add_idf_sdkconfig_option("CONFIG_RTCIO_SUPPORT_RTC_GPIO_DESC", True)
+        add_idf_sdkconfig_option("CONFIG_ESP32_SPIRAM_SUPPORT", True)

esphome/components/esp32_camera/esp32_camera.cpp

@@ -26,9 +26,6 @@ void ESP32Camera::setup() {
   sensor_t *s = esp_camera_sensor_get();
   s->set_vflip(s, this->vertical_flip_);
   s->set_hmirror(s, this->horizontal_mirror_);
-  s->set_aec2(s, this->aec2_);            // 0 = disable , 1 = enable
-  s->set_ae_level(s, this->ae_level_);    // -2 to 2
-  s->set_aec_value(s, this->aec_value_);  // 0 to 1200
   s->set_contrast(s, this->contrast_);
   s->set_brightness(s, this->brightness_);
   s->set_saturation(s, this->saturation_);
@@ -49,6 +46,9 @@ void ESP32Camera::dump_config() {
   ESP_LOGCONFIG(TAG, "ESP32 Camera:");
   ESP_LOGCONFIG(TAG, "  Name: %s", this->name_.c_str());
   ESP_LOGCONFIG(TAG, "  Internal: %s", YESNO(this->internal_));
+#ifdef USE_ARDUINO
+  ESP_LOGCONFIG(TAG, "  Board Has PSRAM: %s", YESNO(psramFound()));
+#endif  // USE_ARDUINO
   ESP_LOGCONFIG(TAG, "  Data Pins: D0:%d D1:%d D2:%d D3:%d D4:%d D5:%d D6:%d D7:%d", conf.pin_d0, conf.pin_d1,
                 conf.pin_d2, conf.pin_d3, conf.pin_d4, conf.pin_d5, conf.pin_d6, conf.pin_d7);
   ESP_LOGCONFIG(TAG, "  VSYNC Pin: %d", conf.pin_vsync);
@@ -111,9 +111,9 @@ void ESP32Camera::dump_config() {
   // ESP_LOGCONFIG(TAG, "  Auto White Balance: %u", st.awb);
   // ESP_LOGCONFIG(TAG, "  Auto White Balance Gain: %u", st.awb_gain);
   // ESP_LOGCONFIG(TAG, "  Auto Exposure Control: %u", st.aec);
-  ESP_LOGCONFIG(TAG, "  Auto Exposure Control 2: %u", st.aec2);
-  ESP_LOGCONFIG(TAG, "  Auto Exposure Level: %d", st.ae_level);
-  ESP_LOGCONFIG(TAG, "  Auto Exposure Value: %u", st.aec_value);
+  // ESP_LOGCONFIG(TAG, "  Auto Exposure Control 2: %u", st.aec2);
+  // ESP_LOGCONFIG(TAG, "  Auto Exposure Level: %d", st.ae_level);
+  // ESP_LOGCONFIG(TAG, "  Auto Exposure Value: %u", st.aec_value);
   // ESP_LOGCONFIG(TAG, "  AGC: %u", st.agc);
   // ESP_LOGCONFIG(TAG, "  AGC Gain: %u", st.agc_gain);
   // ESP_LOGCONFIG(TAG, "  Gain Ceiling: %u", st.gainceiling);
@@ -133,13 +133,6 @@ void ESP32Camera::loop() {
     this->current_image_.reset();
   }
 
-  // request idle image every idle_update_interval
-  const uint32_t now = millis();
-  if (this->idle_update_interval_ != 0 && now - this->last_idle_request_ > this->idle_update_interval_) {
-    this->last_idle_request_ = now;
-    this->request_image(IDLE);
-  }
-
   // Check if we should fetch a new image
   if (!this->has_requested_image_())
     return;
@@ -147,6 +140,7 @@ void ESP32Camera::loop() {
     // image is still in use
     return;
   }
+  const uint32_t now = millis();
   if (now - this->last_update_ <= this->max_update_interval_)
     return;
 
@@ -163,12 +157,12 @@ void ESP32Camera::loop() {
     xQueueSend(this->framebuffer_return_queue_, &fb, portMAX_DELAY);
     return;
   }
-  this->current_image_ = std::make_shared<CameraImage>(fb, this->single_requesters_ | this->stream_requesters_);
+  this->current_image_ = std::make_shared<CameraImage>(fb);
 
   ESP_LOGD(TAG, "Got Image: len=%u", fb->len);
   this->new_image_callback_.call(this->current_image_);
   this->last_update_ = now;
-  this->single_requesters_ = 0;
+  this->single_requester_ = false;
 }
 void ESP32Camera::framebuffer_task(void *pv) {
   while (true) {
@@ -256,18 +250,29 @@ void ESP32Camera::add_image_callback(std::function<void(std::shared_ptr<CameraIm
 }
 void ESP32Camera::set_vertical_flip(bool vertical_flip) { this->vertical_flip_ = vertical_flip; }
 void ESP32Camera::set_horizontal_mirror(bool horizontal_mirror) { this->horizontal_mirror_ = horizontal_mirror; }
-void ESP32Camera::set_aec2(bool aec2) { this->aec2_ = aec2; }
-void ESP32Camera::set_ae_level(int ae_level) { this->ae_level_ = ae_level; }
-void ESP32Camera::set_aec_value(uint32_t aec_value) { this->aec_value_ = aec_value; }
 void ESP32Camera::set_contrast(int contrast) { this->contrast_ = contrast; }
 void ESP32Camera::set_brightness(int brightness) { this->brightness_ = brightness; }
 void ESP32Camera::set_saturation(int saturation) { this->saturation_ = saturation; }
 float ESP32Camera::get_setup_priority() const { return setup_priority::DATA; }
 uint32_t ESP32Camera::hash_base() { return 3010542557UL; }
-void ESP32Camera::request_image(CameraRequester requester) { this->single_requesters_ |= 1 << requester; }
-void ESP32Camera::start_stream(CameraRequester requester) { this->stream_requesters_ |= 1 << requester; }
-void ESP32Camera::stop_stream(CameraRequester requester) { this->stream_requesters_ &= ~(1 << requester); }
-bool ESP32Camera::has_requested_image_() const { return this->single_requesters_ || this->stream_requesters_; }
+void ESP32Camera::request_image() { this->single_requester_ = true; }
+void ESP32Camera::request_stream() { this->last_stream_request_ = millis(); }
+bool ESP32Camera::has_requested_image_() const {
+  if (this->single_requester_)
+    // single request
+    return true;
+
+  uint32_t now = millis();
+  if (now - this->last_stream_request_ < 5000)
+    // stream request
+    return true;
+
+  if (this->idle_update_interval_ != 0 && now - this->last_update_ > this->idle_update_interval_)
+    // idle update
+    return true;
+
+  return false;
+}
 bool ESP32Camera::can_return_image_() const { return this->current_image_.use_count() == 1; }
 void ESP32Camera::set_max_update_interval(uint32_t max_update_interval) {
   this->max_update_interval_ = max_update_interval;
@@ -296,10 +301,7 @@ uint8_t *CameraImageReader::peek_data_buffer() { return this->image_->get_data_b
 camera_fb_t *CameraImage::get_raw_buffer() { return this->buffer_; }
 uint8_t *CameraImage::get_data_buffer() { return this->buffer_->buf; }
 size_t CameraImage::get_data_length() { return this->buffer_->len; }
-bool CameraImage::was_requested_by(CameraRequester requester) const {
-  return (this->requesters_ & (1 << requester)) != 0;
-}
-CameraImage::CameraImage(camera_fb_t *buffer, uint8_t requesters) : buffer_(buffer), requesters_(requesters) {}
+CameraImage::CameraImage(camera_fb_t *buffer) : buffer_(buffer) {}
 
 }  // namespace esp32_camera
 }  // namespace esphome

esphome/components/esp32_camera/esp32_camera.h

@@ -14,19 +14,15 @@ namespace esp32_camera {
 
 class ESP32Camera;
 
-enum CameraRequester { IDLE, API_REQUESTER, WEB_REQUESTER };
-
 class CameraImage {
  public:
-  CameraImage(camera_fb_t *buffer, uint8_t requester);
+  CameraImage(camera_fb_t *buffer);
   camera_fb_t *get_raw_buffer();
   uint8_t *get_data_buffer();
   size_t get_data_length();
-  bool was_requested_by(CameraRequester requester) const;
 
  protected:
   camera_fb_t *buffer_;
-  uint8_t requesters_;
 };
 
 class CameraImageReader {
@@ -71,9 +67,6 @@ class ESP32Camera : public Component, public EntityBase {
   void set_power_down_pin(uint8_t pin);
   void set_vertical_flip(bool vertical_flip);
   void set_horizontal_mirror(bool horizontal_mirror);
-  void set_aec2(bool aec2);
-  void set_ae_level(int ae_level);
-  void set_aec_value(uint32_t aec_value);
   void set_contrast(int contrast);
   void set_brightness(int brightness);
   void set_saturation(int saturation);
@@ -85,9 +78,8 @@ class ESP32Camera : public Component, public EntityBase {
   void dump_config() override;
   void add_image_callback(std::function<void(std::shared_ptr<CameraImage>)> &&f);
   float get_setup_priority() const override;
-  void start_stream(CameraRequester requester);
-  void stop_stream(CameraRequester requester);
-  void request_image(CameraRequester requester);
+  void request_stream();
+  void request_image();
 
  protected:
   uint32_t hash_base() override;
@@ -99,9 +91,6 @@ class ESP32Camera : public Component, public EntityBase {
   camera_config_t config_{};
   bool vertical_flip_{true};
   bool horizontal_mirror_{true};
-  bool aec2_{false};
-  int ae_level_{0};
-  uint32_t aec_value_{300};
   int contrast_{0};
   int brightness_{0};
   int saturation_{0};
@@ -109,14 +98,13 @@ class ESP32Camera : public Component, public EntityBase {
 
   esp_err_t init_error_{ESP_OK};
   std::shared_ptr<CameraImage> current_image_;
-  uint8_t single_requesters_{0};
-  uint8_t stream_requesters_{0};
+  uint32_t last_stream_request_{0};
+  bool single_requester_{false};
   QueueHandle_t framebuffer_get_queue_;
   QueueHandle_t framebuffer_return_queue_;
   CallbackManager<void(std::shared_ptr<CameraImage>)> new_image_callback_;
   uint32_t max_update_interval_{1000};
   uint32_t idle_update_interval_{15000};
-  uint32_t last_idle_request_{0};
   uint32_t last_update_{0};
 };
 

esphome/components/esp32_camera_web_server/camera_web_server.cpp

@@ -14,7 +14,7 @@
 namespace esphome {
 namespace esp32_camera_web_server {
 
-static const int IMAGE_REQUEST_TIMEOUT = 5000;
+static const int IMAGE_REQUEST_TIMEOUT = 2000;
 static const char *const TAG = "esp32_camera_web_server";
 
 #define PART_BOUNDARY "123456789000000000000987654321"
@@ -68,7 +68,7 @@ void CameraWebServer::setup() {
   httpd_register_uri_handler(this->httpd_, &uri);
 
   esp32_camera::global_esp32_camera->add_image_callback([this](std::shared_ptr<esp32_camera::CameraImage> image) {
-    if (this->running_ && image->was_requested_by(esp32_camera::WEB_REQUESTER)) {
+    if (this->running_) {
       this->image_ = std::move(image);
       xSemaphoreGive(this->semaphore_);
     }
@@ -169,9 +169,11 @@ esp_err_t CameraWebServer::streaming_handler_(struct httpd_req *req) {
   uint32_t last_frame = millis();
   uint32_t frames = 0;
 
-  esp32_camera::global_esp32_camera->start_stream(esphome::esp32_camera::WEB_REQUESTER);
-
   while (res == ESP_OK && this->running_) {
+    if (esp32_camera::global_esp32_camera != nullptr) {
+      esp32_camera::global_esp32_camera->request_stream();
+    }
+
     auto image = this->wait_for_image_();
 
     if (!image) {
@@ -202,8 +204,6 @@ esp_err_t CameraWebServer::streaming_handler_(struct httpd_req *req) {
     res = httpd_send_all(req, STREAM_ERROR, strlen(STREAM_ERROR));
   }
 
-  esp32_camera::global_esp32_camera->stop_stream(esphome::esp32_camera::WEB_REQUESTER);
-
   ESP_LOGI(TAG, "STREAM: closed. Frames: %u", frames);
 
   return res;
@@ -212,7 +212,9 @@ esp_err_t CameraWebServer::streaming_handler_(struct httpd_req *req) {
 esp_err_t CameraWebServer::snapshot_handler_(struct httpd_req *req) {
   esp_err_t res = ESP_OK;
 
-  esp32_camera::global_esp32_camera->request_image(esphome::esp32_camera::WEB_REQUESTER);
+  if (esp32_camera::global_esp32_camera != nullptr) {
+    esp32_camera::global_esp32_camera->request_image();
+  }
 
   auto image = this->wait_for_image_();
 
@@ -231,6 +233,9 @@ esp_err_t CameraWebServer::snapshot_handler_(struct httpd_req *req) {
 
   httpd_resp_set_hdr(req, "Content-Disposition", "inline; filename=capture.jpg");
 
+  if (res == ESP_OK) {
+    res = httpd_resp_set_hdr(req, CONTENT_LENGTH, esphome::to_string(image->get_data_length()).c_str());
+  }
   if (res == ESP_OK) {
     res = httpd_resp_send(req, (const char *) image->get_data_buffer(), image->get_data_length());
   }

esphome/components/esp32_can/canbus.py

@@ -1,39 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome import pins
-from esphome.components import canbus
-from esphome.const import CONF_ID, CONF_RX_PIN, CONF_TX_PIN
-from esphome.components.canbus import CanbusComponent, CanSpeed, CONF_BIT_RATE
-
-CODEOWNERS = ["@Sympatron"]
-DEPENDENCIES = ["esp32"]
-
-esp32_can_ns = cg.esphome_ns.namespace("esp32_can")
-esp32_can = esp32_can_ns.class_("ESP32Can", CanbusComponent)
-
-# Currently the driver only supports a subset of the bit rates defined in canbus
-CAN_SPEEDS = {
-    "50KBPS": CanSpeed.CAN_50KBPS,
-    "100KBPS": CanSpeed.CAN_100KBPS,
-    "125KBPS": CanSpeed.CAN_125KBPS,
-    "250KBPS": CanSpeed.CAN_250KBPS,
-    "500KBPS": CanSpeed.CAN_500KBPS,
-    "1000KBPS": CanSpeed.CAN_1000KBPS,
-}
-
-CONFIG_SCHEMA = canbus.CANBUS_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(esp32_can),
-        cv.Optional(CONF_BIT_RATE, default="125KBPS"): cv.enum(CAN_SPEEDS, upper=True),
-        cv.Required(CONF_RX_PIN): pins.internal_gpio_input_pin_number,
-        cv.Required(CONF_TX_PIN): pins.internal_gpio_output_pin_number,
-    }
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await canbus.register_canbus(var, config)
-
-    cg.add(var.set_rx(config[CONF_RX_PIN]))
-    cg.add(var.set_tx(config[CONF_TX_PIN]))

esphome/components/esp32_can/esp32_can.cpp

@@ -1,123 +0,0 @@
-#ifdef USE_ESP32
-#include "esp32_can.h"
-#include "esphome/core/log.h"
-
-#include <driver/can.h>
-
-// WORKAROUND, because CAN_IO_UNUSED is just defined as (-1) in this version
-// of the framework which does not work with -fpermissive
-#undef CAN_IO_UNUSED
-#define CAN_IO_UNUSED ((gpio_num_t) -1)
-
-namespace esphome {
-namespace esp32_can {
-
-static const char *const TAG = "esp32_can";
-
-static bool get_bitrate(canbus::CanSpeed bitrate, can_timing_config_t *t_config) {
-  switch (bitrate) {
-    case canbus::CAN_50KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_50KBITS();
-      return true;
-    case canbus::CAN_100KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_100KBITS();
-      return true;
-    case canbus::CAN_125KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_125KBITS();
-      return true;
-    case canbus::CAN_250KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_250KBITS();
-      return true;
-    case canbus::CAN_500KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_500KBITS();
-      return true;
-    case canbus::CAN_1000KBPS:
-      *t_config = (can_timing_config_t) CAN_TIMING_CONFIG_1MBITS();
-      return true;
-    default:
-      return false;
-  }
-}
-
-bool ESP32Can::setup_internal() {
-  can_general_config_t g_config =
-      CAN_GENERAL_CONFIG_DEFAULT((gpio_num_t) this->tx_, (gpio_num_t) this->rx_, CAN_MODE_NORMAL);
-  can_filter_config_t f_config = CAN_FILTER_CONFIG_ACCEPT_ALL();
-  can_timing_config_t t_config;
-
-  if (!get_bitrate(this->bit_rate_, &t_config)) {
-    // invalid bit rate
-    this->mark_failed();
-    return false;
-  }
-
-  // Install CAN driver
-  if (can_driver_install(&g_config, &t_config, &f_config) != ESP_OK) {
-    // Failed to install driver
-    this->mark_failed();
-    return false;
-  }
-
-  // Start CAN driver
-  if (can_start() != ESP_OK) {
-    // Failed to start driver
-    this->mark_failed();
-    return false;
-  }
-  return true;
-}
-
-canbus::Error ESP32Can::send_message(struct canbus::CanFrame *frame) {
-  if (frame->can_data_length_code > canbus::CAN_MAX_DATA_LENGTH) {
-    return canbus::ERROR_FAILTX;
-  }
-
-  uint32_t flags = CAN_MSG_FLAG_NONE;
-  if (frame->use_extended_id) {
-    flags |= CAN_MSG_FLAG_EXTD;
-  }
-  if (frame->remote_transmission_request) {
-    flags |= CAN_MSG_FLAG_RTR;
-  }
-
-  can_message_t message = {
-      .flags = flags,
-      .identifier = frame->can_id,
-      .data_length_code = frame->can_data_length_code,
-  };
-  if (!frame->remote_transmission_request) {
-    memcpy(message.data, frame->data, frame->can_data_length_code);
-  }
-
-  if (can_transmit(&message, pdMS_TO_TICKS(1000)) == ESP_OK) {
-    return canbus::ERROR_OK;
-  } else {
-    return canbus::ERROR_ALLTXBUSY;
-  }
-}
-
-canbus::Error ESP32Can::read_message(struct canbus::CanFrame *frame) {
-  can_message_t message;
-
-  if (can_receive(&message, 0) != ESP_OK) {
-    return canbus::ERROR_NOMSG;
-  }
-
-  frame->can_id = message.identifier;
-  frame->use_extended_id = message.flags & CAN_MSG_FLAG_EXTD;
-  frame->remote_transmission_request = message.flags & CAN_MSG_FLAG_RTR;
-  frame->can_data_length_code = message.data_length_code;
-
-  if (!frame->remote_transmission_request) {
-    size_t dlc =
-        message.data_length_code < canbus::CAN_MAX_DATA_LENGTH ? message.data_length_code : canbus::CAN_MAX_DATA_LENGTH;
-    memcpy(frame->data, message.data, dlc);
-  }
-
-  return canbus::ERROR_OK;
-}
-
-}  // namespace esp32_can
-}  // namespace esphome
-
-#endif

esphome/components/esp32_can/esp32_can.h

@@ -1,29 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP32
-
-#include "esphome/components/canbus/canbus.h"
-#include "esphome/core/component.h"
-
-namespace esphome {
-namespace esp32_can {
-
-class ESP32Can : public canbus::Canbus {
- public:
-  void set_rx(int rx) { rx_ = rx; }
-  void set_tx(int tx) { tx_ = tx; }
-  ESP32Can(){};
-
- protected:
-  bool setup_internal() override;
-  canbus::Error send_message(struct canbus::CanFrame *frame) override;
-  canbus::Error read_message(struct canbus::CanFrame *frame) override;
-
-  int rx_{-1};
-  int tx_{-1};
-};
-
-}  // namespace esp32_can
-}  // namespace esphome
-
-#endif

esphome/components/esp32_improv/__init__.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import binary_sensor, output, esp32_ble_server
-from esphome.const import CONF_BLE_SERVER_ID, CONF_ID
+from esphome.const import CONF_ID
 
 
 AUTO_LOAD = ["binary_sensor", "output", "esp32_ble_server"]
@@ -11,6 +11,7 @@ DEPENDENCIES = ["wifi", "esp32"]
 
 CONF_AUTHORIZED_DURATION = "authorized_duration"
 CONF_AUTHORIZER = "authorizer"
+CONF_BLE_SERVER_ID = "ble_server_id"
 CONF_IDENTIFY_DURATION = "identify_duration"
 CONF_STATUS_INDICATOR = "status_indicator"
 CONF_WIFI_TIMEOUT = "wifi_timeout"

esphome/components/esp32_improv/esp32_improv_component.cpp

@@ -219,7 +219,7 @@ void ESP32ImprovComponent::dump_config() {
 void ESP32ImprovComponent::process_incoming_data_() {
   uint8_t length = this->incoming_data_[1];
 
-  ESP_LOGD(TAG, "Processing bytes - %s", format_hex_pretty(this->incoming_data_).c_str());
+  ESP_LOGD(TAG, "Processing bytes - %s", hexencode(this->incoming_data_).c_str());
   if (this->incoming_data_.size() - 3 == length) {
     this->set_error_(improv::ERROR_NONE);
     improv::ImprovCommand command = improv::parse_improv_data(this->incoming_data_);

esphome/components/esp8266/__init__.py

@@ -1,5 +1,4 @@
 import logging
-import os
 
 from esphome.const import (
     CONF_BOARD,
@@ -15,7 +14,6 @@ from esphome.const import (
 from esphome.core import CORE, coroutine_with_priority
 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, esp8266_ns
 from .boards import ESP8266_FLASH_SIZES, ESP8266_LD_SCRIPTS
@@ -160,8 +158,6 @@ async def to_code(config):
     cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
     cg.add_define("ESPHOME_VARIANT", "ESP8266")
 
-    cg.add_platformio_option("extra_scripts", ["post:post_build.py"])
-
     conf = config[CONF_FRAMEWORK]
     cg.add_platformio_option("framework", "arduino")
     cg.add_build_flag("-DUSE_ARDUINO")
@@ -214,14 +210,3 @@ async def to_code(config):
 
         if ld_script is not None:
             cg.add_platformio_option("board_build.ldscript", ld_script)
-
-
-# Called by writer.py
-def copy_files():
-
-    dir = os.path.dirname(__file__)
-    post_build_file = os.path.join(dir, "post_build.py.script")
-    copy_file_if_changed(
-        post_build_file,
-        CORE.relative_build_path("post_build.py"),
-    )

esphome/components/esp8266/core.cpp

@@ -20,7 +20,6 @@ void arch_restart() {
     yield();
   }
 }
-void arch_init() {}
 void IRAM_ATTR HOT arch_feed_wdt() {
   ESP.wdtFeed();  // NOLINT(readability-static-accessed-through-instance)
 }
@@ -28,7 +27,7 @@ void IRAM_ATTR HOT arch_feed_wdt() {
 uint8_t progmem_read_byte(const uint8_t *addr) {
   return pgm_read_byte(addr);  // NOLINT
 }
-uint32_t IRAM_ATTR HOT arch_get_cpu_cycle_count() {
+uint32_t arch_get_cpu_cycle_count() {
   return ESP.getCycleCount();  // NOLINT(readability-static-accessed-through-instance)
 }
 uint32_t arch_get_cpu_freq_hz() { return F_CPU; }

esphome/components/esp8266/gpio.cpp

@@ -9,7 +9,7 @@ namespace esp8266 {
 static const char *const TAG = "esp8266";
 
 static int IRAM_ATTR flags_to_mode(gpio::Flags flags, uint8_t pin) {
-  if (flags == gpio::FLAG_INPUT) {  // NOLINT(bugprone-branch-clone)
+  if (flags == gpio::FLAG_INPUT) {
     return INPUT;
   } else if (flags == gpio::FLAG_OUTPUT) {
     return OUTPUT;

esphome/components/esp8266/post_build.py.script

@@ -1,15 +0,0 @@
-import shutil
-
-# pylint: disable=E0602
-Import("env")  # noqa
-
-
-def esp8266_copy_factory_bin(source, target, env):
-    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
-    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}-factory.bin")
-
-    shutil.copyfile(firmware_name, new_file_name)
-
-
-# pylint: disable=E0602
-env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp8266_copy_factory_bin)  # noqa

esphome/components/esp8266/preferences.cpp

@@ -55,7 +55,7 @@ static inline bool esp_rtc_user_mem_write(uint32_t index, uint32_t value) {
 
 extern "C" uint32_t _SPIFFS_end;  // NOLINT
 
-static uint32_t get_esp8266_flash_sector() {
+static const uint32_t get_esp8266_flash_sector() {
   union {
     uint32_t *ptr;
     uint32_t uint;
@@ -63,7 +63,7 @@ static uint32_t get_esp8266_flash_sector() {
   data.ptr = &_SPIFFS_end;
   return (data.uint - 0x40200000) / SPI_FLASH_SEC_SIZE;
 }
-static uint32_t get_esp8266_flash_address() { return get_esp8266_flash_sector() * SPI_FLASH_SEC_SIZE; }
+static const uint32_t get_esp8266_flash_address() { return get_esp8266_flash_sector() * SPI_FLASH_SEC_SIZE; }
 
 template<class It> uint32_t calculate_crc(It first, It last, uint32_t type) {
   uint32_t crc = type;

esphome/components/ethernet/ethernet_component.cpp

@@ -184,9 +184,7 @@ void EthernetComponent::start_connect_() {
   }
 
   err = tcpip_adapter_dhcpc_stop(TCPIP_ADAPTER_IF_ETH);
-  if (err != ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPPED) {
-    ESPHL_ERROR_CHECK(err, "DHCPC stop error");
-  }
+  ESPHL_ERROR_CHECK(err, "DHCPC stop error");
   err = tcpip_adapter_set_ip_info(TCPIP_ADAPTER_IF_ETH, &info);
   ESPHL_ERROR_CHECK(err, "DHCPC set IP info error");
 

esphome/components/external_components/__init__.py

@@ -12,8 +12,6 @@ from esphome.const import (
     CONF_TYPE,
     CONF_EXTERNAL_COMPONENTS,
     CONF_PATH,
-    CONF_USERNAME,
-    CONF_PASSWORD,
 )
 from esphome.core import CORE
 from esphome import git, loader
@@ -29,8 +27,6 @@ TYPE_LOCAL = "local"
 GIT_SCHEMA = {
     cv.Required(CONF_URL): cv.url,
     cv.Optional(CONF_REF): cv.git_ref,
-    cv.Optional(CONF_USERNAME): cv.string,
-    cv.Optional(CONF_PASSWORD): cv.string,
 }
 LOCAL_SCHEMA = {
     cv.Required(CONF_PATH): cv.directory,
@@ -103,8 +99,6 @@ def _process_git_config(config: dict, refresh) -> str:
         ref=config.get(CONF_REF),
         refresh=refresh,
         domain=DOMAIN,
-        username=config.get(CONF_USERNAME),
-        password=config.get(CONF_PASSWORD),
     )
 
     if (repo_dir / "esphome" / "components").is_dir():

esphome/components/ezo/ezo.cpp

@@ -32,7 +32,7 @@ void EZOSensor::update() {
 }
 
 void EZOSensor::loop() {
-  uint8_t buf[21];
+  uint8_t buf[20];
   if (!(this->state_ & EZO_STATE_WAIT)) {
     if (this->state_ & EZO_STATE_SEND_TEMP) {
       int len = sprintf((char *) buf, "T,%0.3f", this->tempcomp_);
@@ -74,12 +74,7 @@ void EZOSensor::loop() {
   if (buf[0] != 1)
     return;
 
-  // some sensors return multiple comma-separated values, terminate string after first one
-  for (size_t i = 1; i < sizeof(buf) - 1; i++)
-    if (buf[i] == ',')
-      buf[i] = '\0';
-
-  float val = parse_number<float>((char *) &buf[1]).value_or(0);
+  float val = parse_number<float>((char *) &buf[1], sizeof(buf) - 1).value_or(0);
   this->publish_state(val);
 }
 

esphome/components/graph/graph.cpp

@@ -86,7 +86,7 @@ void Graph::draw(DisplayBuffer *buff, uint16_t x_offset, uint16_t y_offset, Colo
     // Look back in trace data to best-fit into local range
     float mx = NAN;
     float mn = NAN;
-    for (uint32_t i = 0; i < this->width_; i++) {
+    for (int16_t i = 0; i < this->width_; i++) {
       for (auto *trace : traces_) {
         float v = trace->get_tracedata()->get_value(i);
         if (!std::isnan(v)) {
@@ -132,7 +132,7 @@ void Graph::draw(DisplayBuffer *buff, uint16_t x_offset, uint16_t y_offset, Colo
   if (!std::isnan(this->gridspacing_y_)) {
     for (int y = yn; y <= ym; y++) {
       int16_t py = (int16_t) roundf((this->height_ - 1) * (1.0 - (float) (y - yn) / (ym - yn)));
-      for (uint32_t x = 0; x < this->width_; x += 2) {
+      for (int x = 0; x < this->width_; x += 2) {
         buff->draw_pixel_at(x_offset + x, y_offset + py, color);
       }
     }
@@ -147,7 +147,7 @@ void Graph::draw(DisplayBuffer *buff, uint16_t x_offset, uint16_t y_offset, Colo
       ESP_LOGW(TAG, "Graphing reducing x-scale to prevent too many gridlines");
     }
     for (int i = 0; i <= n; i++) {
-      for (uint32_t y = 0; y < this->height_; y += 2) {
+      for (int y = 0; y < this->height_; y += 2) {
         buff->draw_pixel_at(x_offset + i * (this->width_ - 1) / n, y_offset + y, color);
       }
     }
@@ -158,14 +158,14 @@ void Graph::draw(DisplayBuffer *buff, uint16_t x_offset, uint16_t y_offset, Colo
   for (auto *trace : traces_) {
     Color c = trace->get_line_color();
     uint16_t thick = trace->get_line_thickness();
-    for (uint32_t i = 0; i < this->width_; i++) {
+    for (int16_t i = 0; i < this->width_; i++) {
       float v = (trace->get_tracedata()->get_value(i) - ymin) / yrange;
       if (!std::isnan(v) && (thick > 0)) {
         int16_t x = this->width_ - 1 - i;
         uint8_t b = (i % (thick * LineType::PATTERN_LENGTH)) / thick;
         if (((uint8_t) trace->get_line_type() & (1 << b)) == (1 << b)) {
           int16_t y = (int16_t) roundf((this->height_ - 1) * (1.0 - v)) - thick / 2;
-          for (uint16_t t = 0; t < thick; t++) {
+          for (int16_t t = 0; t < thick; t++) {
             buff->draw_pixel_at(x_offset + x, y_offset + y + t, c);
           }
         }
@@ -179,8 +179,8 @@ void GraphLegend::init(Graph *g) {
   parent_ = g;
 
   // Determine maximum expected text and value width / height
-  int txtw = 0, txth = 0;
-  int valw = 0, valh = 0;
+  int txtw = 0, txtos = 0, txtbl = 0, txth = 0;
+  int valw = 0, valos = 0, valbl = 0, valh = 0;
   int lt = 0;
   for (auto *trace : g->traces_) {
     std::string txtstr = trace->get_name();
@@ -320,7 +320,7 @@ void Graph::draw_legend(display::DisplayBuffer *buff, uint16_t x_offset, uint16_
 
     if (legend_->lines_) {
       uint16_t thick = trace->get_line_thickness();
-      for (int i = 0; i < legend_->x0_ * 4 / 3; i++) {
+      for (int16_t i = 0; i < legend_->x0_ * 4 / 3; i++) {
         uint8_t b = (i % (thick * LineType::PATTERN_LENGTH)) / thick;
         if (((uint8_t) trace->get_line_type() & (1 << b)) == (1 << b)) {
           buff->vertical_line(x - legend_->x0_ * 2 / 3 + i, y + legend_->yl_ - thick / 2, thick,

esphome/components/growatt_solar/growatt_solar.cpp

@@ -1,69 +0,0 @@
-#include "growatt_solar.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace growatt_solar {
-
-static const char *const TAG = "growatt_solar";
-
-static const uint8_t MODBUS_CMD_READ_IN_REGISTERS = 0x04;
-static const uint8_t MODBUS_REGISTER_COUNT = 33;
-
-void GrowattSolar::update() { this->send(MODBUS_CMD_READ_IN_REGISTERS, 0, MODBUS_REGISTER_COUNT); }
-
-void GrowattSolar::on_modbus_data(const std::vector<uint8_t> &data) {
-  auto publish_1_reg_sensor_state = [&](sensor::Sensor *sensor, size_t i, float unit) -> void {
-    if (sensor == nullptr)
-      return;
-    float value = encode_uint16(data[i * 2], data[i * 2 + 1]) * unit;
-    sensor->publish_state(value);
-  };
-
-  auto publish_2_reg_sensor_state = [&](sensor::Sensor *sensor, size_t reg1, size_t reg2, float unit) -> void {
-    float value = ((encode_uint16(data[reg1 * 2], data[reg1 * 2 + 1]) << 16) +
-                   encode_uint16(data[reg2 * 2], data[reg2 * 2 + 1])) *
-                  unit;
-    if (sensor != nullptr)
-      sensor->publish_state(value);
-  };
-
-  publish_1_reg_sensor_state(this->inverter_status_, 0, 1);
-
-  publish_2_reg_sensor_state(this->pv_active_power_sensor_, 1, 2, ONE_DEC_UNIT);
-
-  publish_1_reg_sensor_state(this->pvs_[0].voltage_sensor_, 3, ONE_DEC_UNIT);
-  publish_1_reg_sensor_state(this->pvs_[0].current_sensor_, 4, ONE_DEC_UNIT);
-  publish_2_reg_sensor_state(this->pvs_[0].active_power_sensor_, 5, 6, ONE_DEC_UNIT);
-
-  publish_1_reg_sensor_state(this->pvs_[1].voltage_sensor_, 7, ONE_DEC_UNIT);
-  publish_1_reg_sensor_state(this->pvs_[1].current_sensor_, 8, ONE_DEC_UNIT);
-  publish_2_reg_sensor_state(this->pvs_[1].active_power_sensor_, 9, 10, ONE_DEC_UNIT);
-
-  publish_2_reg_sensor_state(this->grid_active_power_sensor_, 11, 12, ONE_DEC_UNIT);
-  publish_1_reg_sensor_state(this->grid_frequency_sensor_, 13, TWO_DEC_UNIT);
-
-  publish_1_reg_sensor_state(this->phases_[0].voltage_sensor_, 14, ONE_DEC_UNIT);
-  publish_1_reg_sensor_state(this->phases_[0].current_sensor_, 15, ONE_DEC_UNIT);
-  publish_2_reg_sensor_state(this->phases_[0].active_power_sensor_, 16, 17, ONE_DEC_UNIT);
-
-  publish_1_reg_sensor_state(this->phases_[1].voltage_sensor_, 18, ONE_DEC_UNIT);
-  publish_1_reg_sensor_state(this->phases_[1].current_sensor_, 19, ONE_DEC_UNIT);
-  publish_2_reg_sensor_state(this->phases_[1].active_power_sensor_, 20, 21, ONE_DEC_UNIT);
-
-  publish_1_reg_sensor_state(this->phases_[2].voltage_sensor_, 22, ONE_DEC_UNIT);
-  publish_1_reg_sensor_state(this->phases_[2].current_sensor_, 23, ONE_DEC_UNIT);
-  publish_2_reg_sensor_state(this->phases_[2].active_power_sensor_, 24, 25, ONE_DEC_UNIT);
-
-  publish_2_reg_sensor_state(this->today_production_, 26, 27, ONE_DEC_UNIT);
-  publish_2_reg_sensor_state(this->total_energy_production_, 28, 29, ONE_DEC_UNIT);
-
-  publish_1_reg_sensor_state(this->inverter_module_temp_, 32, ONE_DEC_UNIT);
-}
-
-void GrowattSolar::dump_config() {
-  ESP_LOGCONFIG(TAG, "GROWATT Solar:");
-  ESP_LOGCONFIG(TAG, "  Address: 0x%02X", this->address_);
-}
-
-}  // namespace growatt_solar
-}  // namespace esphome

esphome/components/growatt_solar/growatt_solar.h

@@ -1,73 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/modbus/modbus.h"
-
-namespace esphome {
-namespace growatt_solar {
-
-static const float TWO_DEC_UNIT = 0.01;
-static const float ONE_DEC_UNIT = 0.1;
-
-class GrowattSolar : public PollingComponent, public modbus::ModbusDevice {
- public:
-  void update() override;
-  void on_modbus_data(const std::vector<uint8_t> &data) override;
-  void dump_config() override;
-
-  void set_inverter_status_sensor(sensor::Sensor *sensor) { this->inverter_status_ = sensor; }
-
-  void set_grid_frequency_sensor(sensor::Sensor *sensor) { this->grid_frequency_sensor_ = sensor; }
-  void set_grid_active_power_sensor(sensor::Sensor *sensor) { this->grid_active_power_sensor_ = sensor; }
-  void set_pv_active_power_sensor(sensor::Sensor *sensor) { this->pv_active_power_sensor_ = sensor; }
-
-  void set_today_production_sensor(sensor::Sensor *sensor) { this->today_production_ = sensor; }
-  void set_total_energy_production_sensor(sensor::Sensor *sensor) { this->total_energy_production_ = sensor; }
-  void set_inverter_module_temp_sensor(sensor::Sensor *sensor) { this->inverter_module_temp_ = sensor; }
-
-  void set_voltage_sensor(uint8_t phase, sensor::Sensor *voltage_sensor) {
-    this->phases_[phase].voltage_sensor_ = voltage_sensor;
-  }
-  void set_current_sensor(uint8_t phase, sensor::Sensor *current_sensor) {
-    this->phases_[phase].current_sensor_ = current_sensor;
-  }
-  void set_active_power_sensor(uint8_t phase, sensor::Sensor *active_power_sensor) {
-    this->phases_[phase].active_power_sensor_ = active_power_sensor;
-  }
-  void set_voltage_sensor_pv(uint8_t pv, sensor::Sensor *voltage_sensor) {
-    this->pvs_[pv].voltage_sensor_ = voltage_sensor;
-  }
-  void set_current_sensor_pv(uint8_t pv, sensor::Sensor *current_sensor) {
-    this->pvs_[pv].current_sensor_ = current_sensor;
-  }
-  void set_active_power_sensor_pv(uint8_t pv, sensor::Sensor *active_power_sensor) {
-    this->pvs_[pv].active_power_sensor_ = active_power_sensor;
-  }
-
- protected:
-  struct GrowattPhase {
-    sensor::Sensor *voltage_sensor_{nullptr};
-    sensor::Sensor *current_sensor_{nullptr};
-    sensor::Sensor *active_power_sensor_{nullptr};
-  } phases_[3];
-  struct GrowattPV {
-    sensor::Sensor *voltage_sensor_{nullptr};
-    sensor::Sensor *current_sensor_{nullptr};
-    sensor::Sensor *active_power_sensor_{nullptr};
-  } pvs_[2];
-
-  sensor::Sensor *inverter_status_{nullptr};
-
-  sensor::Sensor *grid_frequency_sensor_{nullptr};
-  sensor::Sensor *grid_active_power_sensor_{nullptr};
-
-  sensor::Sensor *pv_active_power_sensor_{nullptr};
-
-  sensor::Sensor *today_production_{nullptr};
-  sensor::Sensor *total_energy_production_{nullptr};
-  sensor::Sensor *inverter_module_temp_{nullptr};
-};
-
-}  // namespace growatt_solar
-}  // namespace esphome

esphome/components/growatt_solar/sensor.py

@@ -1,201 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, modbus
-from esphome.const import (
-    CONF_ACTIVE_POWER,
-    CONF_CURRENT,
-    CONF_FREQUENCY,
-    CONF_ID,
-    CONF_VOLTAGE,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    ICON_CURRENT_AC,
-    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
-    UNIT_AMPERE,
-    UNIT_CELSIUS,
-    UNIT_HERTZ,
-    UNIT_VOLT,
-    UNIT_WATT,
-)
-
-CONF_PHASE_A = "phase_a"
-CONF_PHASE_B = "phase_b"
-CONF_PHASE_C = "phase_c"
-
-CONF_ENERGY_PRODUCTION_DAY = "energy_production_day"
-CONF_TOTAL_ENERGY_PRODUCTION = "total_energy_production"
-CONF_TOTAL_GENERATION_TIME = "total_generation_time"
-CONF_TODAY_GENERATION_TIME = "today_generation_time"
-CONF_PV1 = "pv1"
-CONF_PV2 = "pv2"
-UNIT_KILOWATT_HOURS = "kWh"
-UNIT_HOURS = "h"
-UNIT_KOHM = "kΩ"
-UNIT_MILLIAMPERE = "mA"
-
-CONF_INVERTER_STATUS = "inverter_status"
-CONF_PV_ACTIVE_POWER = "pv_active_power"
-CONF_INVERTER_MODULE_TEMP = "inverter_module_temp"
-
-
-AUTO_LOAD = ["modbus"]
-CODEOWNERS = ["@leeuwte"]
-
-growatt_solar_ns = cg.esphome_ns.namespace("growatt_solar")
-GrowattSolar = growatt_solar_ns.class_(
-    "GrowattSolar", cg.PollingComponent, modbus.ModbusDevice
-)
-
-PHASE_SENSORS = {
-    CONF_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=2,
-        device_class=DEVICE_CLASS_VOLTAGE,
-    ),
-    CONF_CURRENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_AMPERE,
-        accuracy_decimals=2,
-        device_class=DEVICE_CLASS_CURRENT,
-        state_class=STATE_CLASS_MEASUREMENT,
-    ),
-    CONF_ACTIVE_POWER: sensor.sensor_schema(
-        unit_of_measurement=UNIT_WATT,
-        accuracy_decimals=0,
-        device_class=DEVICE_CLASS_POWER,
-        state_class=STATE_CLASS_MEASUREMENT,
-    ),
-}
-PV_SENSORS = {
-    CONF_VOLTAGE: sensor.sensor_schema(
-        unit_of_measurement=UNIT_VOLT,
-        accuracy_decimals=2,
-        device_class=DEVICE_CLASS_VOLTAGE,
-    ),
-    CONF_CURRENT: sensor.sensor_schema(
-        unit_of_measurement=UNIT_AMPERE,
-        accuracy_decimals=2,
-        device_class=DEVICE_CLASS_CURRENT,
-        state_class=STATE_CLASS_MEASUREMENT,
-    ),
-    CONF_ACTIVE_POWER: sensor.sensor_schema(
-        unit_of_measurement=UNIT_WATT,
-        accuracy_decimals=0,
-        device_class=DEVICE_CLASS_POWER,
-        state_class=STATE_CLASS_MEASUREMENT,
-    ),
-}
-
-PHASE_SCHEMA = cv.Schema(
-    {cv.Optional(sensor): schema for sensor, schema in PHASE_SENSORS.items()}
-)
-PV_SCHEMA = cv.Schema(
-    {cv.Optional(sensor): schema for sensor, schema in PV_SENSORS.items()}
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(GrowattSolar),
-            cv.Optional(CONF_PHASE_A): PHASE_SCHEMA,
-            cv.Optional(CONF_PHASE_B): PHASE_SCHEMA,
-            cv.Optional(CONF_PHASE_C): PHASE_SCHEMA,
-            cv.Optional(CONF_PV1): PV_SCHEMA,
-            cv.Optional(CONF_PV2): PV_SCHEMA,
-            cv.Optional(CONF_INVERTER_STATUS): sensor.sensor_schema(),
-            cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HERTZ,
-                icon=ICON_CURRENT_AC,
-                accuracy_decimals=2,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ACTIVE_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_PV_ACTIVE_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ENERGY_PRODUCTION_DAY): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
-            cv.Optional(CONF_TOTAL_ENERGY_PRODUCTION): sensor.sensor_schema(
-                unit_of_measurement=UNIT_KILOWATT_HOURS,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
-            cv.Optional(CONF_INVERTER_MODULE_TEMP): sensor.sensor_schema(
-                unit_of_measurement=UNIT_CELSIUS,
-                accuracy_decimals=1,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("10s"))
-    .extend(modbus.modbus_device_schema(0x01))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await modbus.register_modbus_device(var, config)
-
-    if CONF_INVERTER_STATUS in config:
-        sens = await sensor.new_sensor(config[CONF_INVERTER_STATUS])
-        cg.add(var.set_inverter_status_sensor(sens))
-
-    if CONF_FREQUENCY in config:
-        sens = await sensor.new_sensor(config[CONF_FREQUENCY])
-        cg.add(var.set_grid_frequency_sensor(sens))
-
-    if CONF_ACTIVE_POWER in config:
-        sens = await sensor.new_sensor(config[CONF_ACTIVE_POWER])
-        cg.add(var.set_grid_active_power_sensor(sens))
-
-    if CONF_PV_ACTIVE_POWER in config:
-        sens = await sensor.new_sensor(config[CONF_PV_ACTIVE_POWER])
-        cg.add(var.set_pv_active_power_sensor(sens))
-
-    if CONF_ENERGY_PRODUCTION_DAY in config:
-        sens = await sensor.new_sensor(config[CONF_ENERGY_PRODUCTION_DAY])
-        cg.add(var.set_today_production_sensor(sens))
-
-    if CONF_TOTAL_ENERGY_PRODUCTION in config:
-        sens = await sensor.new_sensor(config[CONF_TOTAL_ENERGY_PRODUCTION])
-        cg.add(var.set_total_energy_production_sensor(sens))
-
-    if CONF_INVERTER_MODULE_TEMP in config:
-        sens = await sensor.new_sensor(config[CONF_INVERTER_MODULE_TEMP])
-        cg.add(var.set_inverter_module_temp_sensor(sens))
-
-    for i, phase in enumerate([CONF_PHASE_A, CONF_PHASE_B, CONF_PHASE_C]):
-        if phase not in config:
-            continue
-
-        phase_config = config[phase]
-        for sensor_type in PHASE_SENSORS:
-            if sensor_type in phase_config:
-                sens = await sensor.new_sensor(phase_config[sensor_type])
-                cg.add(getattr(var, f"set_{sensor_type}_sensor")(i, sens))
-
-    for i, pv in enumerate([CONF_PV1, CONF_PV2]):
-        if pv not in config:
-            continue
-
-        pv_config = config[pv]
-        for sensor_type in pv_config:
-            if sensor_type in pv_config:
-                sens = await sensor.new_sensor(pv_config[sensor_type])
-                cg.add(getattr(var, f"set_{sensor_type}_sensor_pv")(i, sens))

esphome/components/hdc1080/hdc1080.cpp

@@ -21,9 +21,7 @@ void HDC1080Component::setup() {
   };
 
   if (!this->write_bytes(HDC1080_CMD_CONFIGURATION, data, 2)) {
-    // as instruction is same as powerup defaults (for now), interpret as warning if this fails
-    ESP_LOGW(TAG, "HDC1080 initial config instruction error");
-    this->status_set_warning();
+    this->mark_failed();
     return;
   }
 }

esphome/components/heatpumpir/climate.py

@@ -109,8 +109,8 @@ def to_code(config):
     cg.add(var.set_protocol(config[CONF_PROTOCOL]))
     cg.add(var.set_horizontal_default(config[CONF_HORIZONTAL_DEFAULT]))
     cg.add(var.set_vertical_default(config[CONF_VERTICAL_DEFAULT]))
-    cg.add(var.set_max_temperature(config[CONF_MAX_TEMPERATURE]))
-    cg.add(var.set_min_temperature(config[CONF_MIN_TEMPERATURE]))
+    cg.add(var.set_max_temperature(config[CONF_MIN_TEMPERATURE]))
+    cg.add(var.set_min_temperature(config[CONF_MAX_TEMPERATURE]))
 
     # PIO isn't updating releases, so referencing the release tag directly. See:
     # https://github.com/ToniA/arduino-heatpumpir/commit/0948c619d86407a4e50e8db2f3c193e0576c86fd

esphome/components/hitachi_ac344/hitachi_ac344.cpp

@@ -299,7 +299,9 @@ bool HitachiClimate::parse_swing_(const uint8_t remote_state[]) {
       GETBITS8(remote_state[HITACHI_AC344_SWINGH_BYTE], HITACHI_AC344_SWINGH_OFFSET, HITACHI_AC344_SWINGH_SIZE);
   ESP_LOGV(TAG, "SwingH: %02X %02X", remote_state[HITACHI_AC344_SWINGH_BYTE], swing_modeh);
 
-  if ((swing_modeh & 0x3) == 0x3) {
+  if ((swing_modeh & 0x7) == 0x0) {
+    this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;
+  } else if ((swing_modeh & 0x3) == 0x3) {
     this->swing_mode = climate::CLIMATE_SWING_OFF;
   } else {
     this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;

esphome/components/hitachi_ac424/hitachi_ac424.cpp

@@ -300,7 +300,9 @@ bool HitachiClimate::parse_swing_(const uint8_t remote_state[]) {
                                                HITACHI_AC424_SWINGH_SIZE);
   ESP_LOGV(TAG, "SwingH: %02X %02X", remote_state[HITACHI_AC424_SWINGH_BYTE], swing_modeh);
 
-  if ((swing_modeh & 0x3) == 0x3) {
+  if ((swing_modeh & 0x7) == 0x0) {
+    this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;
+  } else if ((swing_modeh & 0x3) == 0x3) {
     this->swing_mode = climate::CLIMATE_SWING_OFF;
   } else {
     this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;

esphome/components/http_request/__init__.py

@@ -172,7 +172,7 @@ async def http_request_action_to_code(config, action_id, template_arg, args):
     if CONF_JSON in config:
         json_ = config[CONF_JSON]
         if isinstance(json_, Lambda):
-            args_ = args + [(cg.JsonObject, "root")]
+            args_ = args + [(cg.JsonObjectRef, "root")]
             lambda_ = await cg.process_lambda(json_, args_, return_type=cg.void)
             cg.add(var.set_json(lambda_))
         else:

esphome/components/http_request/http_request.cpp

@@ -115,11 +115,8 @@ void HttpRequestComponent::close() {
 }
 
 const char *HttpRequestComponent::get_string() {
-  // 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();
+  static const String STR = this->client_.getString();
+  return STR.c_str();
 }
 
 }  // namespace http_request

esphome/components/http_request/http_request.h

@@ -78,7 +78,7 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
 
   void add_json(const char *key, TemplatableValue<std::string, Ts...> value) { this->json_.insert({key, value}); }
 
-  void set_json(std::function<void(Ts..., JsonObject)> json_func) { this->json_func_ = json_func; }
+  void set_json(std::function<void(Ts..., JsonObject &)> json_func) { this->json_func_ = json_func; }
 
   void register_response_trigger(HttpRequestResponseTrigger *trigger) { this->response_triggers_.push_back(trigger); }
 
@@ -118,17 +118,17 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
   }
 
  protected:
-  void encode_json_(Ts... x, JsonObject root) {
+  void encode_json_(Ts... x, JsonObject &root) {
     for (const auto &item : this->json_) {
       auto val = item.second;
       root[item.first] = val.value(x...);
     }
   }
-  void encode_json_func_(Ts... x, JsonObject root) { this->json_func_(x..., root); }
+  void encode_json_func_(Ts... x, JsonObject &root) { this->json_func_(x..., root); }
   HttpRequestComponent *parent_;
   std::map<const char *, TemplatableValue<const char *, Ts...>> headers_{};
   std::map<const char *, TemplatableValue<std::string, Ts...>> json_{};
-  std::function<void(Ts..., JsonObject)> json_func_{nullptr};
+  std::function<void(Ts..., JsonObject &)> json_func_{nullptr};
   std::vector<HttpRequestResponseTrigger *> response_triggers_;
 };
 

esphome/components/i2c/i2c_bus.h

@@ -1,8 +1,6 @@
 #pragma once
 #include <cstdint>
 #include <cstddef>
-#include <utility>
-#include <vector>
 
 namespace esphome {
 namespace i2c {
@@ -42,20 +40,6 @@ class I2CBus {
     return writev(address, &buf, 1);
   }
   virtual ErrorCode writev(uint8_t address, WriteBuffer *buffers, size_t cnt) = 0;
-
- protected:
-  void i2c_scan_() {
-    for (uint8_t address = 8; address < 120; address++) {
-      auto err = writev(address, nullptr, 0);
-      if (err == ERROR_OK) {
-        scan_results_.emplace_back(address, true);
-      } else if (err == ERROR_UNKNOWN) {
-        scan_results_.emplace_back(address, false);
-      }
-    }
-  }
-  std::vector<std::pair<uint8_t, bool>> scan_results_;
-  bool scan_{false};
 };
 
 }  // namespace i2c

esphome/components/i2c/i2c_bus_arduino.cpp

@@ -2,7 +2,6 @@
 
 #include "i2c_bus_arduino.h"
 #include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
 #include <Arduino.h>
 #include <cstring>
 
@@ -25,13 +24,9 @@ void ArduinoI2CBus::setup() {
   wire_ = &Wire;  // NOLINT(cppcoreguidelines-prefer-member-initializer)
 #endif
 
-  wire_->begin(static_cast<int>(sda_pin_), static_cast<int>(scl_pin_));
+  wire_->begin(sda_pin_, scl_pin_);
   wire_->setClock(frequency_);
   initialized_ = true;
-  if (this->scan_) {
-    ESP_LOGV(TAG, "Scanning i2c bus for active devices...");
-    this->i2c_scan_();
-  }
 }
 void ArduinoI2CBus::dump_config() {
   ESP_LOGCONFIG(TAG, "I2C Bus:");
@@ -50,20 +45,22 @@ void ArduinoI2CBus::dump_config() {
       break;
   }
   if (this->scan_) {
-    ESP_LOGI(TAG, "Results from i2c bus scan:");
-    if (scan_results_.empty()) {
-      ESP_LOGI(TAG, "Found no i2c devices!");
-    } else {
-      for (const auto &s : scan_results_) {
-        if (s.second)
-          ESP_LOGI(TAG, "Found i2c device at address 0x%02X", s.first);
-        else
-          ESP_LOGE(TAG, "Unknown error at address 0x%02X", s.first);
+    ESP_LOGI(TAG, "Scanning i2c bus for active devices...");
+    uint8_t found = 0;
+    for (uint8_t address = 8; address < 120; address++) {
+      auto err = writev(address, nullptr, 0);
+      if (err == ERROR_OK) {
+        ESP_LOGI(TAG, "Found i2c device at address 0x%02X", address);
+        found++;
+      } else if (err == ERROR_UNKNOWN) {
+        ESP_LOGI(TAG, "Unknown error at address 0x%02X", address);
       }
     }
+    if (found == 0) {
+      ESP_LOGI(TAG, "Found no i2c devices!");
+    }
   }
 }
-
 ErrorCode ArduinoI2CBus::readv(uint8_t address, ReadBuffer *buffers, size_t cnt) {
   // logging is only enabled with vv level, if warnings are shown the caller
   // should log them

esphome/components/i2c/i2c_bus_arduino.h

@@ -34,6 +34,7 @@ class ArduinoI2CBus : public I2CBus, public Component {
 
  protected:
   TwoWire *wire_;
+  bool scan_;
   uint8_t sda_pin_;
   uint8_t scl_pin_;
   uint32_t frequency_;

esphome/components/i2c/i2c_bus_esp_idf.cpp

@@ -3,7 +3,6 @@
 #include "i2c_bus_esp_idf.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
 #include <cstring>
 
 namespace esphome {
@@ -38,10 +37,6 @@ void IDFI2CBus::setup() {
     return;
   }
   initialized_ = true;
-  if (this->scan_) {
-    ESP_LOGV(TAG, "Scanning i2c bus for active devices...");
-    this->i2c_scan_();
-  }
 }
 void IDFI2CBus::dump_config() {
   ESP_LOGCONFIG(TAG, "I2C Bus:");
@@ -60,20 +55,23 @@ void IDFI2CBus::dump_config() {
       break;
   }
   if (this->scan_) {
-    ESP_LOGI(TAG, "Results from i2c bus scan:");
-    if (scan_results_.empty()) {
-      ESP_LOGI(TAG, "Found no i2c devices!");
-    } else {
-      for (const auto &s : scan_results_) {
-        if (s.second)
-          ESP_LOGI(TAG, "Found i2c device at address 0x%02X", s.first);
-        else
-          ESP_LOGE(TAG, "Unknown error at address 0x%02X", s.first);
+    ESP_LOGI(TAG, "Scanning i2c bus for active devices...");
+    uint8_t found = 0;
+    for (uint8_t address = 8; address < 120; address++) {
+      auto err = writev(address, nullptr, 0);
+
+      if (err == ERROR_OK) {
+        ESP_LOGI(TAG, "Found i2c device at address 0x%02X", address);
+        found++;
+      } else if (err == ERROR_UNKNOWN) {
+        ESP_LOGI(TAG, "Unknown error at address 0x%02X", address);
       }
     }
+    if (found == 0) {
+      ESP_LOGI(TAG, "Found no i2c devices!");
+    }
   }
 }
-
 ErrorCode IDFI2CBus::readv(uint8_t address, ReadBuffer *buffers, size_t cnt) {
   // logging is only enabled with vv level, if warnings are shown the caller
   // should log them

esphome/components/i2c/i2c_bus_esp_idf.h

@@ -36,6 +36,7 @@ class IDFI2CBus : public I2CBus, public Component {
 
  protected:
   i2c_port_t port_;
+  bool scan_;
   uint8_t sda_pin_;
   bool sda_pullup_enabled_;
   uint8_t scl_pin_;

esphome/components/ili9341/ili9341_display.cpp

@@ -86,8 +86,8 @@ void ILI9341Display::update() {
 
 void ILI9341Display::display_() {
   // we will only update the changed window to the display
-  uint16_t w = this->x_high_ - this->x_low_ + 1;
-  uint16_t h = this->y_high_ - this->y_low_ + 1;
+  int w = this->x_high_ - this->x_low_ + 1;
+  int h = this->y_high_ - this->y_low_ + 1;
 
   set_addr_window_(this->x_low_, this->y_low_, w, h);
   this->start_data_();

esphome/components/improv_serial/improv_serial_component.cpp

@@ -145,7 +145,7 @@ bool ImprovSerialComponent::parse_improv_serial_byte_(uint8_t byte) {
 
   if (at == 8 + data_len + 1) {
     uint8_t checksum = 0x00;
-    for (size_t i = 0; i < at; i++)
+    for (uint8_t i = 0; i < at; i++)
       checksum += raw[i];
 
     if (checksum != byte) {

esphome/components/ina260/ina260.cpp

@@ -1,128 +0,0 @@
-#include "ina260.h"
-#include "esphome/core/log.h"
-#include "esphome/core/hal.h"
-
-namespace esphome {
-namespace ina260 {
-
-static const char *const TAG = "ina260";
-
-// | A0   | A1   | Address |
-// | GND  | GND  | 0x40    |
-// | GND  | V_S+ | 0x41    |
-// | GND  | SDA  | 0x42    |
-// | GND  | SCL  | 0x43    |
-// | V_S+ | GND  | 0x44    |
-// | V_S+ | V_S+ | 0x45    |
-// | V_S+ | SDA  | 0x46    |
-// | V_S+ | SCL  | 0x47    |
-// | SDA  | GND  | 0x48    |
-// | SDA  | V_S+ | 0x49    |
-// | SDA  | SDA  | 0x4A    |
-// | SDA  | SCL  | 0x4B    |
-// | SCL  | GND  | 0x4C    |
-// | SCL  | V_S+ | 0x4D    |
-// | SCL  | SDA  | 0x4E    |
-// | SCL  | SCL  | 0x4F    |
-
-static const uint8_t INA260_REGISTER_CONFIG = 0x00;
-static const uint8_t INA260_REGISTER_CURRENT = 0x01;
-static const uint8_t INA260_REGISTER_BUS_VOLTAGE = 0x02;
-static const uint8_t INA260_REGISTER_POWER = 0x03;
-static const uint8_t INA260_REGISTER_MASK_ENABLE = 0x06;
-static const uint8_t INA260_REGISTER_ALERT_LIMIT = 0x07;
-static const uint8_t INA260_REGISTER_MANUFACTURE_ID = 0xFE;
-static const uint8_t INA260_REGISTER_DEVICE_ID = 0xFF;
-
-void INA260Component::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up INA260...");
-
-  // Reset device on setup
-  if (!this->write_byte_16(INA260_REGISTER_CONFIG, 0x8000)) {
-    this->error_code_ = DEVICE_RESET_FAILED;
-    this->mark_failed();
-    return;
-  }
-
-  delay(2);
-
-  this->read_byte_16(INA260_REGISTER_MANUFACTURE_ID, &this->manufacture_id_);
-  this->read_byte_16(INA260_REGISTER_DEVICE_ID, &this->device_id_);
-
-  if (this->manufacture_id_ != (uint16_t) 0x5449 || this->device_id_ != (uint16_t) 0x2270) {
-    this->error_code_ = COMMUNICATION_FAILED;
-    this->mark_failed();
-    return;
-  }
-
-  if (!this->write_byte_16(INA260_REGISTER_CONFIG, (uint16_t) 0b0000001100000111)) {
-    this->error_code_ = FAILED_TO_UPDATE_CONFIGURATION;
-    this->mark_failed();
-    return;
-  }
-}
-
-void INA260Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "INA260:");
-  LOG_I2C_DEVICE(this);
-  LOG_UPDATE_INTERVAL(this);
-
-  ESP_LOGCONFIG(TAG, "  Manufacture ID: 0x%x", this->manufacture_id_);
-  ESP_LOGCONFIG(TAG, "  Device ID: 0x%x", this->device_id_);
-
-  LOG_SENSOR("  ", "Bus Voltage", this->bus_voltage_sensor_);
-  LOG_SENSOR("  ", "Current", this->current_sensor_);
-  LOG_SENSOR("  ", "Power", this->power_sensor_);
-
-  switch (this->error_code_) {
-    case COMMUNICATION_FAILED:
-      ESP_LOGE(TAG, "Connected device does not match a known INA260 sensor");
-      break;
-    case DEVICE_RESET_FAILED:
-      ESP_LOGE(TAG, "Device reset failed - Is the device connected?");
-      break;
-    case FAILED_TO_UPDATE_CONFIGURATION:
-      ESP_LOGE(TAG, "Failed to update device configuration");
-      break;
-    case NONE:
-    default:
-      break;
-  }
-}
-
-void INA260Component::update() {
-  if (this->bus_voltage_sensor_ != nullptr) {
-    uint16_t raw_bus_voltage;
-    if (!this->read_byte_16(INA260_REGISTER_BUS_VOLTAGE, &raw_bus_voltage)) {
-      this->status_set_warning();
-      return;
-    }
-    float bus_voltage_v = int16_t(raw_bus_voltage) * 0.00125f;
-    this->bus_voltage_sensor_->publish_state(bus_voltage_v);
-  }
-
-  if (this->current_sensor_ != nullptr) {
-    uint16_t raw_current;
-    if (!this->read_byte_16(INA260_REGISTER_CURRENT, &raw_current)) {
-      this->status_set_warning();
-      return;
-    }
-    float current_a = int16_t(raw_current) * 0.00125f;
-    this->current_sensor_->publish_state(current_a);
-  }
-
-  if (this->power_sensor_ != nullptr) {
-    uint16_t raw_power;
-    if (!this->read_byte_16(INA260_REGISTER_POWER, &raw_power)) {
-      this->status_set_warning();
-      return;
-    }
-    float power_w = ((int16_t(raw_power) * 10.0f) / 1000.0f);
-    this->power_sensor_->publish_state(power_w);
-  }
-
-  this->status_clear_warning();
-}
-
-}  // namespace ina260
-}  // namespace esphome

esphome/components/ina260/ina260.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 ina260 {
-
-class INA260Component : public PollingComponent, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void dump_config() override;
-  void update() override;
-
-  float get_setup_priority() const override { return setup_priority::DATA; }
-
-  void set_bus_voltage_sensor(sensor::Sensor *bus_voltage_sensor) { this->bus_voltage_sensor_ = bus_voltage_sensor; }
-  void set_current_sensor(sensor::Sensor *current_sensor) { this->current_sensor_ = current_sensor; }
-  void set_power_sensor(sensor::Sensor *power_sensor) { this->power_sensor_ = power_sensor; }
-
- protected:
-  uint16_t manufacture_id_{0};
-  uint16_t device_id_{0};
-
-  sensor::Sensor *bus_voltage_sensor_{nullptr};
-  sensor::Sensor *current_sensor_{nullptr};
-  sensor::Sensor *power_sensor_{nullptr};
-
-  enum ErrorCode {
-    NONE,
-    COMMUNICATION_FAILED,
-    DEVICE_RESET_FAILED,
-    FAILED_TO_UPDATE_CONFIGURATION,
-  } error_code_{NONE};
-};
-
-}  // namespace ina260
-}  // namespace esphome

esphome/components/ina260/sensor.py

@@ -1,71 +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_BUS_VOLTAGE,
-    CONF_CURRENT,
-    CONF_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_POWER,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_VOLT,
-    UNIT_AMPERE,
-    UNIT_WATT,
-)
-
-DEPENDENCIES = ["i2c"]
-CODEOWNERS = ["@MrEditor97"]
-
-ina260_ns = cg.esphome_ns.namespace("ina260")
-INA260Component = ina260_ns.class_(
-    "INA260Component", cg.PollingComponent, i2c.I2CDevice
-)
-
-CONFIG_SCHEMA = cv.All(
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(INA260Component),
-            cv.Optional(CONF_BUS_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=3,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_POWER): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x40))
-)
-
-
-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)
-
-    if CONF_BUS_VOLTAGE in config:
-        sens = await sensor.new_sensor(config[CONF_BUS_VOLTAGE])
-        cg.add(var.set_bus_voltage_sensor(sens))
-
-    if CONF_CURRENT in config:
-        sens = await sensor.new_sensor(config[CONF_CURRENT])
-        cg.add(var.set_current_sensor(sens))
-
-    if CONF_POWER in config:
-        sens = await sensor.new_sensor(config[CONF_POWER])
-        cg.add(var.set_power_sensor(sens))

esphome/components/inkplate6/display.py

@@ -6,13 +6,11 @@ from esphome.const import (
     CONF_FULL_UPDATE_EVERY,
     CONF_ID,
     CONF_LAMBDA,
-    CONF_MODEL,
     CONF_PAGES,
     CONF_WAKEUP_PIN,
 )
 
 DEPENDENCIES = ["i2c", "esp32"]
-AUTO_LOAD = ["psram"]
 
 CONF_DISPLAY_DATA_0_PIN = "display_data_0_pin"
 CONF_DISPLAY_DATA_1_PIN = "display_data_1_pin"
@@ -42,13 +40,6 @@ Inkplate6 = inkplate6_ns.class_(
     "Inkplate6", cg.PollingComponent, i2c.I2CDevice, display.DisplayBuffer
 )
 
-InkplateModel = inkplate6_ns.enum("InkplateModel")
-
-MODELS = {
-    "inkplate_6": InkplateModel.INKPLATE_6,
-    "inkplate_10": InkplateModel.INKPLATE_10,
-}
-
 CONFIG_SCHEMA = cv.All(
     display.FULL_DISPLAY_SCHEMA.extend(
         {
@@ -56,9 +47,6 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_GREYSCALE, default=False): cv.boolean,
             cv.Optional(CONF_PARTIAL_UPDATING, default=True): cv.boolean,
             cv.Optional(CONF_FULL_UPDATE_EVERY, default=10): cv.uint32_t,
-            cv.Optional(CONF_MODEL, default="inkplate_6"): cv.enum(
-                MODELS, lower=True, space="_"
-            ),
             # Control pins
             cv.Required(CONF_CKV_PIN): pins.gpio_output_pin_schema,
             cv.Required(CONF_GMOD_PIN): pins.gpio_output_pin_schema,
@@ -122,8 +110,6 @@ async def to_code(config):
     cg.add(var.set_partial_updating(config[CONF_PARTIAL_UPDATING]))
     cg.add(var.set_full_update_every(config[CONF_FULL_UPDATE_EVERY]))
 
-    cg.add(var.set_model(config[CONF_MODEL]))
-
     ckv = await cg.gpio_pin_expression(config[CONF_CKV_PIN])
     cg.add(var.set_ckv_pin(ckv))
 
@@ -180,3 +166,5 @@ async def to_code(config):
 
     display_data_7 = await cg.gpio_pin_expression(config[CONF_DISPLAY_DATA_7_PIN])
     cg.add(var.set_display_data_7_pin(display_data_7))
+
+    cg.add_build_flag("-DBOARD_HAS_PSRAM")

esphome/components/inkplate6/inkplate.cpp

@@ -42,32 +42,32 @@ void Inkplate6::setup() {
   this->display();
 }
 void Inkplate6::initialize_() {
-  ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);
   uint32_t buffer_size = this->get_buffer_length_();
-  if (buffer_size == 0)
-    return;
 
-  if (this->partial_buffer_ != nullptr)
-    allocator.deallocate(this->partial_buffer_, buffer_size);
-  if (this->partial_buffer_2_ != nullptr)
-    allocator.deallocate(this->partial_buffer_2_, buffer_size * 2);
-  if (this->buffer_ != nullptr)
-    allocator.deallocate(this->buffer_, buffer_size);
+  if (this->partial_buffer_ != nullptr) {
+    free(this->partial_buffer_);  // NOLINT
+  }
+  if (this->partial_buffer_2_ != nullptr) {
+    free(this->partial_buffer_2_);  // NOLINT
+  }
+  if (this->buffer_ != nullptr) {
+    free(this->buffer_);  // NOLINT
+  }
 
-  this->buffer_ = allocator.allocate(buffer_size);
+  this->buffer_ = (uint8_t *) ps_malloc(buffer_size);
   if (this->buffer_ == nullptr) {
     ESP_LOGE(TAG, "Could not allocate buffer for display!");
     this->mark_failed();
     return;
   }
   if (!this->greyscale_) {
-    this->partial_buffer_ = allocator.allocate(buffer_size);
+    this->partial_buffer_ = (uint8_t *) ps_malloc(buffer_size);
     if (this->partial_buffer_ == nullptr) {
       ESP_LOGE(TAG, "Could not allocate partial buffer for display!");
       this->mark_failed();
       return;
     }
-    this->partial_buffer_2_ = allocator.allocate(buffer_size * 2);
+    this->partial_buffer_2_ = (uint8_t *) ps_malloc(buffer_size * 2);
     if (this->partial_buffer_2_ == nullptr) {
       ESP_LOGE(TAG, "Could not allocate partial buffer 2 for display!");
       this->mark_failed();

esphome/components/inkplate6/inkplate.h

@@ -10,11 +10,6 @@
 namespace esphome {
 namespace inkplate6 {
 
-enum InkplateModel : uint8_t {
-  INKPLATE_6 = 0,
-  INKPLATE_10 = 1,
-};
-
 class Inkplate6 : public PollingComponent, public display::DisplayBuffer, public i2c::I2CDevice {
  public:
   const uint8_t LUT2[16] = {0b10101010, 0b10101001, 0b10100110, 0b10100101, 0b10011010, 0b10011001,
@@ -48,8 +43,6 @@ class Inkplate6 : public PollingComponent, public display::DisplayBuffer, public
   void set_partial_updating(bool partial_updating) { this->partial_updating_ = partial_updating; }
   void set_full_update_every(uint32_t full_update_every) { this->full_update_every_ = full_update_every; }
 
-  void set_model(InkplateModel model) { this->model_ = model; }
-
   void set_display_data_0_pin(InternalGPIOPin *data) { this->display_data_0_pin_ = data; }
   void set_display_data_1_pin(InternalGPIOPin *data) { this->display_data_1_pin_ = data; }
   void set_display_data_2_pin(InternalGPIOPin *data) { this->display_data_2_pin_ = data; }
@@ -108,21 +101,9 @@ class Inkplate6 : public PollingComponent, public display::DisplayBuffer, public
   void pins_z_state_();
   void pins_as_outputs_();
 
-  int get_width_internal() override {
-    if (this->model_ == INKPLATE_6)
-      return 800;
-    else if (this->model_ == INKPLATE_10)
-      return 1200;
-    return 0;
-  }
+  int get_width_internal() override { return 800; }
 
-  int get_height_internal() override {
-    if (this->model_ == INKPLATE_6)
-      return 600;
-    else if (this->model_ == INKPLATE_10)
-      return 825;
-    return 0;
-  }
+  int get_height_internal() override { return 600; }
 
   size_t get_buffer_length_();
 
@@ -152,8 +133,6 @@ class Inkplate6 : public PollingComponent, public display::DisplayBuffer, public
   bool greyscale_;
   bool partial_updating_;
 
-  InkplateModel model_;
-
   InternalGPIOPin *display_data_0_pin_;
   InternalGPIOPin *display_data_1_pin_;
   InternalGPIOPin *display_data_2_pin_;

esphome/components/integration/integration_sensor.cpp

@@ -23,6 +23,31 @@ void IntegrationSensor::setup() {
   this->sensor_->add_on_state_callback([this](float state) { this->process_sensor_value_(state); });
 }
 void IntegrationSensor::dump_config() { LOG_SENSOR("", "Integration Sensor", this); }
+std::string IntegrationSensor::unit_of_measurement() {
+  std::string suffix;
+  switch (this->time_) {
+    case INTEGRATION_SENSOR_TIME_MILLISECOND:
+      suffix = "ms";
+      break;
+    case INTEGRATION_SENSOR_TIME_SECOND:
+      suffix = "s";
+      break;
+    case INTEGRATION_SENSOR_TIME_MINUTE:
+      suffix = "min";
+      break;
+    case INTEGRATION_SENSOR_TIME_HOUR:
+      suffix = "h";
+      break;
+    case INTEGRATION_SENSOR_TIME_DAY:
+      suffix = "d";
+      break;
+  }
+  std::string base = this->sensor_->get_unit_of_measurement();
+  if (str_endswith(base, "/" + suffix)) {
+    return base.substr(0, base.size() - suffix.size() - 1);
+  }
+  return base + suffix;
+}
 void IntegrationSensor::process_sensor_value_(float value) {
   const uint32_t now = millis();
   const double old_value = this->last_value_;

esphome/components/integration/integration_sensor.h

@@ -63,6 +63,8 @@ class IntegrationSensor : public sensor::Sensor, public Component {
     this->last_save_ = now;
     this->rtc_.save(&result_f);
   }
+  std::string unit_of_measurement() override;
+  int8_t accuracy_decimals() override { return this->sensor_->get_accuracy_decimals() + 2; }
 
   sensor::Sensor *sensor_;
   IntegrationSensorTime time_;

esphome/components/integration/sensor.py

@@ -2,14 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import automation
 from esphome.components import sensor
-from esphome.const import (
-    CONF_ICON,
-    CONF_ID,
-    CONF_SENSOR,
-    CONF_RESTORE,
-    CONF_UNIT_OF_MEASUREMENT,
-    CONF_ACCURACY_DECIMALS,
-)
+from esphome.const import CONF_ICON, CONF_ID, CONF_SENSOR, CONF_RESTORE
 from esphome.core.entity_helpers import inherit_property_from
 
 integration_ns = cg.esphome_ns.namespace("integration")
@@ -37,18 +30,6 @@ CONF_TIME_UNIT = "time_unit"
 CONF_INTEGRATION_METHOD = "integration_method"
 CONF_MIN_SAVE_INTERVAL = "min_save_interval"
 
-
-def inherit_unit_of_measurement(uom, config):
-    suffix = config[CONF_TIME_UNIT]
-    if uom.endswith("/" + suffix):
-        return uom[0 : -len("/" + suffix)]
-    return uom + suffix
-
-
-def inherit_accuracy_decimals(decimals, config):
-    return decimals + 2
-
-
 CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
     {
         cv.GenerateID(): cv.declare_id(IntegrationSensor),
@@ -70,19 +51,11 @@ FINAL_VALIDATE_SCHEMA = cv.All(
         {
             cv.Required(CONF_ID): cv.use_id(IntegrationSensor),
             cv.Optional(CONF_ICON): cv.icon,
-            cv.Optional(CONF_UNIT_OF_MEASUREMENT): sensor.validate_unit_of_measurement,
-            cv.Optional(CONF_ACCURACY_DECIMALS): sensor.validate_accuracy_decimals,
             cv.Required(CONF_SENSOR): cv.use_id(sensor.Sensor),
         },
         extra=cv.ALLOW_EXTRA,
     ),
     inherit_property_from(CONF_ICON, CONF_SENSOR),
-    inherit_property_from(
-        CONF_UNIT_OF_MEASUREMENT, CONF_SENSOR, transform=inherit_unit_of_measurement
-    ),
-    inherit_property_from(
-        CONF_ACCURACY_DECIMALS, CONF_SENSOR, transform=inherit_accuracy_decimals
-    ),
 )
 
 

esphome/components/json/__init__.py

@@ -7,11 +7,12 @@ json_ns = cg.esphome_ns.namespace("json")
 
 CONFIG_SCHEMA = cv.All(
     cv.Schema({}),
+    cv.only_with_arduino,
 )
 
 
 @coroutine_with_priority(1.0)
 async def to_code(config):
-    cg.add_library("bblanchon/ArduinoJson", "6.18.5")
+    cg.add_library("ottowinter/ArduinoJson-esphomelib", "5.13.3")
     cg.add_define("USE_JSON")
     cg.add_global(json_ns.using)

esphome/components/json/json_util.cpp

@@ -1,13 +1,8 @@
+#ifdef USE_ARDUINO
+
 #include "json_util.h"
 #include "esphome/core/log.h"
 
-#ifdef USE_ESP8266
-#include <Esp.h>
-#endif
-#ifdef USE_ESP32
-#include <esp_heap_caps.h>
-#endif
-
 namespace esphome {
 namespace json {
 
@@ -15,49 +10,110 @@ static const char *const TAG = "json";
 
 static std::vector<char> global_json_build_buffer;  // NOLINT
 
-std::string build_json(const json_build_t &f) {
-  // Here we are allocating as much heap memory as available minus 2kb to be safe
-  // as we can not have a true dynamic sized document.
-  // The excess memory is freed below with `shrinkToFit()`
-#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_DEFAULT) - 2048;
-#endif
+const char *build_json(const json_build_t &f, size_t *length) {
+  global_json_buffer.clear();
+  JsonObject &root = global_json_buffer.createObject();
 
-  DynamicJsonDocument json_document(free_heap);
-  JsonObject root = json_document.to<JsonObject>();
   f(root);
-  json_document.shrinkToFit();
 
-  std::string output;
-  serializeJson(json_document, output);
-  return output;
+  // The Json buffer size gives us a good estimate for the required size.
+  // Usually, it's a bit larger than the actual required string size
+  //             | JSON Buffer Size | String Size |
+  // Discovery   | 388              | 351         |
+  // Discovery   | 372              | 356         |
+  // Discovery   | 336              | 311         |
+  // Discovery   | 408              | 393         |
+  global_json_build_buffer.reserve(global_json_buffer.size() + 1);
+  size_t bytes_written = root.printTo(global_json_build_buffer.data(), global_json_build_buffer.capacity());
+
+  if (bytes_written >= global_json_build_buffer.capacity() - 1) {
+    global_json_build_buffer.reserve(root.measureLength() + 1);
+    bytes_written = root.printTo(global_json_build_buffer.data(), global_json_build_buffer.capacity());
+  }
+
+  *length = bytes_written;
+  return global_json_build_buffer.data();
 }
-
 void parse_json(const std::string &data, const json_parse_t &f) {
-  // Here we are allocating as much heap memory as available minus 2kb to be safe
-  // as we can not have a true dynamic sized document.
-  // The excess memory is freed below with `shrinkToFit()`
-#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_DEFAULT) - 2048;
-#endif
+  global_json_buffer.clear();
+  JsonObject &root = global_json_buffer.parseObject(data);
 
-  DynamicJsonDocument json_document(free_heap);
-  DeserializationError err = deserializeJson(json_document, data);
-  json_document.shrinkToFit();
-
-  JsonObject root = json_document.as<JsonObject>();
-
-  if (err) {
+  if (!root.success()) {
     ESP_LOGW(TAG, "Parsing JSON failed.");
     return;
   }
 
   f(root);
 }
+std::string build_json(const json_build_t &f) {
+  size_t len;
+  const char *c_str = build_json(f, &len);
+  return std::string(c_str, len);
+}
+
+VectorJsonBuffer::String::String(VectorJsonBuffer *parent) : parent_(parent), start_(parent->size_) {}
+void VectorJsonBuffer::String::append(char c) const {
+  char *last = static_cast<char *>(this->parent_->do_alloc(1));
+  *last = c;
+}
+const char *VectorJsonBuffer::String::c_str() const {
+  this->append('\0');
+  return &this->parent_->buffer_[this->start_];
+}
+void VectorJsonBuffer::clear() {
+  for (char *block : this->free_blocks_)
+    free(block);  // NOLINT
+
+  this->size_ = 0;
+  this->free_blocks_.clear();
+}
+VectorJsonBuffer::String VectorJsonBuffer::startString() { return {this}; }  // NOLINT
+void *VectorJsonBuffer::alloc(size_t bytes) {
+  // Make sure memory addresses are aligned
+  uint32_t new_size = round_size_up(this->size_);
+  this->resize(new_size);
+  return this->do_alloc(bytes);
+}
+void *VectorJsonBuffer::do_alloc(size_t bytes) {  // NOLINT
+  const uint32_t begin = this->size_;
+  this->resize(begin + bytes);
+  return &this->buffer_[begin];
+}
+void VectorJsonBuffer::resize(size_t size) {  // NOLINT
+  if (size <= this->size_) {
+    this->size_ = size;
+    return;
+  }
+
+  this->reserve(size);
+  this->size_ = size;
+}
+void VectorJsonBuffer::reserve(size_t size) {  // NOLINT
+  if (size <= this->capacity_)
+    return;
+
+  uint32_t target_capacity = this->capacity_;
+  if (this->capacity_ == 0) {
+    // lazily initialize with a reasonable size
+    target_capacity = JSON_OBJECT_SIZE(16);
+  }
+  while (target_capacity < size)
+    target_capacity *= 2;
+
+  char *old_buffer = this->buffer_;
+  this->buffer_ = new char[target_capacity];  // NOLINT
+  if (old_buffer != nullptr && this->capacity_ != 0) {
+    this->free_blocks_.push_back(old_buffer);
+    memcpy(this->buffer_, old_buffer, this->capacity_);
+  }
+  this->capacity_ = target_capacity;
+}
+
+size_t VectorJsonBuffer::size() const { return this->size_; }
+
+VectorJsonBuffer global_json_buffer;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
 }  // namespace json
 }  // namespace esphome
+
+#endif  // USE_ARDUINO

esphome/components/json/json_util.h

@@ -1,28 +1,68 @@
 #pragma once
 
+#ifdef USE_ARDUINO
+
 #include <vector>
 
 #include "esphome/core/helpers.h"
-
-#undef ARDUINOJSON_ENABLE_STD_STRING
-#define ARDUINOJSON_ENABLE_STD_STRING 1  // NOLINT
-
 #include <ArduinoJson.h>
 
 namespace esphome {
 namespace json {
 
 /// Callback function typedef for parsing JsonObjects.
-using json_parse_t = std::function<void(JsonObject)>;
+using json_parse_t = std::function<void(JsonObject &)>;
 
 /// Callback function typedef for building JsonObjects.
-using json_build_t = std::function<void(JsonObject)>;
+using json_build_t = std::function<void(JsonObject &)>;
 
 /// Build a JSON string with the provided json build function.
+const char *build_json(const json_build_t &f, size_t *length);
+
 std::string build_json(const json_build_t &f);
 
 /// Parse a JSON string and run the provided json parse function if it's valid.
 void parse_json(const std::string &data, const json_parse_t &f);
 
+class VectorJsonBuffer : public ArduinoJson::Internals::JsonBufferBase<VectorJsonBuffer> {
+ public:
+  class String {
+   public:
+    String(VectorJsonBuffer *parent);
+
+    void append(char c) const;
+
+    const char *c_str() const;
+
+   protected:
+    VectorJsonBuffer *parent_;
+    uint32_t start_;
+  };
+
+  void *alloc(size_t bytes) override;
+
+  size_t size() const;
+
+  void clear();
+
+  String startString();  // NOLINT
+
+ protected:
+  void *do_alloc(size_t bytes);  // NOLINT
+
+  void resize(size_t size);  // NOLINT
+
+  void reserve(size_t size);  // NOLINT
+
+  char *buffer_{nullptr};
+  size_t size_{0};
+  size_t capacity_{0};
+  std::vector<char *> free_blocks_;
+};
+
+extern VectorJsonBuffer global_json_buffer;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
 }  // namespace json
 }  // namespace esphome
+
+#endif  // USE_ARDUINO

esphome/components/kalman_combinator/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@Cat-Ion"]

esphome/components/kalman_combinator/kalman_combinator.cpp

@@ -1,82 +0,0 @@
-#include "kalman_combinator.h"
-#include "esphome/core/hal.h"
-#include <cmath>
-#include <functional>
-
-namespace esphome {
-namespace kalman_combinator {
-
-void KalmanCombinatorComponent::dump_config() {
-  ESP_LOGCONFIG("kalman_combinator", "Kalman Combinator:");
-  ESP_LOGCONFIG("kalman_combinator", "  Update variance: %f per ms", this->update_variance_value_);
-  ESP_LOGCONFIG("kalman_combinator", "  Sensors:");
-  for (const auto &sensor : this->sensors_) {
-    auto &entity = *sensor.first;
-    ESP_LOGCONFIG("kalman_combinator", "    - %s", entity.get_name().c_str());
-  }
-}
-
-void KalmanCombinatorComponent::setup() {
-  for (const auto &sensor : this->sensors_) {
-    const auto stddev = sensor.second;
-    sensor.first->add_on_state_callback([this, stddev](float x) -> void { this->correct_(x, stddev(x)); });
-  }
-}
-
-void KalmanCombinatorComponent::add_source(Sensor *sensor, std::function<float(float)> const &stddev) {
-  this->sensors_.emplace_back(sensor, stddev);
-}
-
-void KalmanCombinatorComponent::add_source(Sensor *sensor, float stddev) {
-  this->add_source(sensor, std::function<float(float)>{[stddev](float) -> float { return stddev; }});
-}
-
-void KalmanCombinatorComponent::update_variance_() {
-  uint32_t now = millis();
-
-  // Variance increases by update_variance_ each millisecond
-  auto dt = now - this->last_update_;
-  auto dv = this->update_variance_value_ * dt;
-  this->variance_ += dv;
-  this->last_update_ = now;
-}
-
-void KalmanCombinatorComponent::correct_(float value, float stddev) {
-  if (std::isnan(value) || std::isinf(stddev)) {
-    return;
-  }
-
-  if (std::isnan(this->state_) || std::isinf(this->variance_)) {
-    this->state_ = value;
-    this->variance_ = stddev * stddev;
-    if (this->std_dev_sensor_ != nullptr) {
-      this->std_dev_sensor_->publish_state(stddev);
-    }
-    return;
-  }
-
-  this->update_variance_();
-
-  // Combine two gaussian distributions mu1+-var1, mu2+-var2 to a new one around mu
-  // Use the value with the smaller variance as mu1 to prevent precision errors
-  const bool this_first = this->variance_ < (stddev * stddev);
-  const float mu1 = this_first ? this->state_ : value;
-  const float mu2 = this_first ? value : this->state_;
-
-  const float var1 = this_first ? this->variance_ : stddev * stddev;
-  const float var2 = this_first ? stddev * stddev : this->variance_;
-
-  const float mu = mu1 + var1 * (mu2 - mu1) / (var1 + var2);
-  const float var = var1 - (var1 * var1) / (var1 + var2);
-
-  // Update and publish state
-  this->state_ = mu;
-  this->variance_ = var;
-
-  this->publish_state(mu);
-  if (this->std_dev_sensor_ != nullptr) {
-    this->std_dev_sensor_->publish_state(std::sqrt(var));
-  }
-}
-}  // namespace kalman_combinator
-}  // namespace esphome

esphome/components/kalman_combinator/kalman_combinator.h

@@ -1,46 +0,0 @@
-#pragma once
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include <cmath>
-#include <vector>
-
-namespace esphome {
-namespace kalman_combinator {
-
-class KalmanCombinatorComponent : public Component, public sensor::Sensor {
- public:
-  KalmanCombinatorComponent() = default;
-
-  float get_setup_priority() const override { return esphome::setup_priority::DATA; }
-
-  void dump_config() override;
-  void setup() override;
-
-  void add_source(Sensor *sensor, std::function<float(float)> const &stddev);
-  void add_source(Sensor *sensor, float stddev);
-  void set_process_std_dev(float process_std_dev) {
-    this->update_variance_value_ = process_std_dev * process_std_dev * 0.001f;
-  }
-  void set_std_dev_sensor(Sensor *sensor) { this->std_dev_sensor_ = sensor; }
-
- private:
-  void update_variance_();
-  void correct_(float value, float stddev);
-
-  // Source sensors and their error functions
-  std::vector<std::pair<Sensor *, std::function<float(float)>>> sensors_;
-
-  // Optional sensor for publishing the current error
-  sensor::Sensor *std_dev_sensor_{nullptr};
-
-  // Tick of the last update
-  uint32_t last_update_{0};
-  // Change of the variance, per ms
-  float update_variance_value_{0.f};
-
-  // Best guess for the state and its variance
-  float state_{NAN};
-  float variance_{INFINITY};
-};
-}  // namespace kalman_combinator
-}  // namespace esphome

esphome/components/kalman_combinator/sensor.py

@@ -1,87 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor
-from esphome.const import (
-    CONF_ID,
-    CONF_SOURCE,
-    CONF_ACCURACY_DECIMALS,
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_UNIT_OF_MEASUREMENT,
-)
-from esphome.core.entity_helpers import inherit_property_from
-
-kalman_combinator_ns = cg.esphome_ns.namespace("kalman_combinator")
-KalmanCombinatorComponent = kalman_combinator_ns.class_(
-    "KalmanCombinatorComponent", cg.Component, sensor.Sensor
-)
-
-CONF_ERROR = "error"
-CONF_SOURCES = "sources"
-CONF_PROCESS_STD_DEV = "process_std_dev"
-CONF_STD_DEV = "std_dev"
-
-
-CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(cv.COMPONENT_SCHEMA).extend(
-    {
-        cv.GenerateID(): cv.declare_id(KalmanCombinatorComponent),
-        cv.Required(CONF_PROCESS_STD_DEV): cv.positive_float,
-        cv.Required(CONF_SOURCES): cv.ensure_list(
-            cv.Schema(
-                {
-                    cv.Required(CONF_SOURCE): cv.use_id(sensor.Sensor),
-                    cv.Required(CONF_ERROR): cv.templatable(cv.positive_float),
-                }
-            ),
-        ),
-        cv.Optional(CONF_STD_DEV): sensor.SENSOR_SCHEMA,
-    }
-)
-
-# Inherit some sensor values from the first source, for both the state and the error value
-properties_to_inherit = [
-    CONF_ACCURACY_DECIMALS,
-    CONF_DEVICE_CLASS,
-    CONF_ENTITY_CATEGORY,
-    CONF_ICON,
-    CONF_UNIT_OF_MEASUREMENT,
-    # CONF_STATE_CLASS could also be inherited, but might lead to unexpected behaviour with "total_increasing"
-]
-inherit_schema_for_state = [
-    inherit_property_from(property, [CONF_SOURCES, 0, CONF_SOURCE])
-    for property in properties_to_inherit
-]
-inherit_schema_for_std_dev = [
-    inherit_property_from([CONF_STD_DEV, property], [CONF_SOURCES, 0, CONF_SOURCE])
-    for property in properties_to_inherit
-]
-
-FINAL_VALIDATE_SCHEMA = cv.All(
-    CONFIG_SCHEMA.extend(
-        {cv.Required(CONF_ID): cv.use_id(KalmanCombinatorComponent)},
-        extra=cv.ALLOW_EXTRA,
-    ),
-    *inherit_schema_for_state,
-    *inherit_schema_for_std_dev,
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await sensor.register_sensor(var, config)
-
-    cg.add(var.set_process_std_dev(config[CONF_PROCESS_STD_DEV]))
-    for source_conf in config[CONF_SOURCES]:
-        source = await cg.get_variable(source_conf[CONF_SOURCE])
-        error = await cg.templatable(
-            source_conf[CONF_ERROR],
-            [(float, "x")],
-            cg.float_,
-        )
-        cg.add(var.add_source(source, error))
-
-    if CONF_STD_DEV in config:
-        sens = await sensor.new_sensor(config[CONF_STD_DEV])
-        cg.add(var.set_std_dev_sensor(sens))

esphome/components/lcd_gpio/gpio_lcd_display.cpp

@@ -17,7 +17,7 @@ void GPIOLCDDisplay::setup() {
   this->enable_pin_->setup();  // OUTPUT
   this->enable_pin_->digital_write(false);
 
-  for (uint8_t i = 0; i < (uint8_t)(this->is_four_bit_mode() ? 4u : 8u); i++) {
+  for (uint8_t i = 0; i < (this->is_four_bit_mode() ? 4 : 8); i++) {
     this->data_pins_[i]->setup();  // OUTPUT
     this->data_pins_[i]->digital_write(false);
   }

esphome/components/light/__init__.py

@@ -14,7 +14,6 @@ from esphome.const import (
     CONF_RESTORE_MODE,
     CONF_ON_TURN_OFF,
     CONF_ON_TURN_ON,
-    CONF_ON_STATE,
     CONF_TRIGGER_ID,
     CONF_COLD_WHITE_COLOR_TEMPERATURE,
     CONF_WARM_WHITE_COLOR_TEMPERATURE,
@@ -38,7 +37,6 @@ from .types import (  # noqa
     AddressableLight,
     LightTurnOnTrigger,
     LightTurnOffTrigger,
-    LightStateTrigger,
 )
 
 CODEOWNERS = ["@esphome/core"]
@@ -71,11 +69,6 @@ LIGHT_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA).ex
                 cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(LightTurnOffTrigger),
             }
         ),
-        cv.Optional(CONF_ON_STATE): auto.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(LightStateTrigger),
-            }
-        ),
     }
 )
 
@@ -158,9 +151,6 @@ async def setup_light_core_(light_var, output_var, config):
     for conf in config.get(CONF_ON_TURN_OFF, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], light_var)
         await auto.build_automation(trigger, [], conf)
-    for conf in config.get(CONF_ON_STATE, []):
-        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], light_var)
-        await auto.build_automation(trigger, [], conf)
 
     if CONF_COLOR_CORRECT in config:
         cg.add(output_var.set_correction(*config[CONF_COLOR_CORRECT]))

esphome/components/light/addressable_light_effect.h

@@ -167,7 +167,7 @@ class AddressableScanEffect : public AddressableLightEffect {
     this->last_move_ = now;
 
     it.all() = Color::BLACK;
-    for (uint32_t i = 0; i < this->scan_width_; i++) {
+    for (auto i = 0; i < this->scan_width_; i++) {
       it[this->at_led_ + i] = current_color;
     }
 
@@ -178,7 +178,7 @@ class AddressableScanEffect : public AddressableLightEffect {
   uint32_t move_interval_{};
   uint32_t scan_width_{1};
   uint32_t last_move_{0};
-  uint32_t at_led_{0};
+  int at_led_{0};
   bool direction_{true};
 };
 
@@ -331,10 +331,9 @@ class AddressableFlickerEffect : public AddressableLightEffect {
       return;
 
     this->last_update_ = now;
-    uint32_t rng_state = random_uint32();
+    fast_random_set_seed(random_uint32());
     for (auto var : it) {
-      rng_state = (rng_state * 0x9E3779B9) + 0x9E37;
-      const uint8_t flicker = (rng_state & 0xFF) % intensity;
+      const uint8_t flicker = fast_random_8() % intensity;
       // scale down by random factor
       var = var.get() * (255 - flicker);
 

esphome/components/light/automation.h

@@ -141,13 +141,6 @@ class LightTurnOffTrigger : public Trigger<> {
   }
 };
 
-class LightStateTrigger : public Trigger<> {
- public:
-  LightStateTrigger(LightState *a_light) {
-    a_light->add_new_remote_values_callback([this]() { this->trigger(); });
-  }
-};
-
 // This is slightly ugly, but we can't log in headers, and can't make this a static method on AddressableSet
 // due to the template. It's just a temporary warning anyway.
 void addressableset_warn_about_scale(const char *field);

esphome/components/light/light_call.cpp

@@ -98,7 +98,7 @@ void LightCall::perform() {
     // EFFECT
     auto effect = this->effect_;
     const char *effect_s;
-    if (effect == 0u)
+    if (effect == 0)
       effect_s = "None";
     else
       effect_s = this->parent_->effects_[*this->effect_ - 1]->get_name().c_str();

esphome/components/light/light_json_schema.cpp

@@ -8,7 +8,7 @@ namespace light {
 
 // See https://www.home-assistant.io/integrations/light.mqtt/#json-schema for documentation on the schema
 
-void LightJSONSchema::dump_json(LightState &state, JsonObject root) {
+void LightJSONSchema::dump_json(LightState &state, JsonObject &root) {
   if (state.supports_effects())
     root["effect"] = state.get_effect_name();
 
@@ -52,7 +52,7 @@ void LightJSONSchema::dump_json(LightState &state, JsonObject root) {
   if (values.get_color_mode() & ColorCapability::BRIGHTNESS)
     root["brightness"] = uint8_t(values.get_brightness() * 255);
 
-  JsonObject color = root.createNestedObject("color");
+  JsonObject &color = root.createNestedObject("color");
   if (values.get_color_mode() & ColorCapability::RGB) {
     color["r"] = uint8_t(values.get_color_brightness() * values.get_red() * 255);
     color["g"] = uint8_t(values.get_color_brightness() * values.get_green() * 255);
@@ -72,7 +72,7 @@ void LightJSONSchema::dump_json(LightState &state, JsonObject root) {
   }
 }
 
-void LightJSONSchema::parse_color_json(LightState &state, LightCall &call, JsonObject root) {
+void LightJSONSchema::parse_color_json(LightState &state, LightCall &call, JsonObject &root) {
   if (root.containsKey("state")) {
     auto val = parse_on_off(root["state"]);
     switch (val) {
@@ -95,7 +95,7 @@ void LightJSONSchema::parse_color_json(LightState &state, LightCall &call, JsonO
   }
 
   if (root.containsKey("color")) {
-    JsonObject color = root["color"];
+    JsonObject &color = root["color"];
     // HA also encodes brightness information in the r, g, b values, so extract that and set it as color brightness.
     float max_rgb = 0.0f;
     if (color.containsKey("r")) {
@@ -140,7 +140,7 @@ void LightJSONSchema::parse_color_json(LightState &state, LightCall &call, JsonO
   }
 }
 
-void LightJSONSchema::parse_json(LightState &state, LightCall &call, JsonObject root) {
+void LightJSONSchema::parse_json(LightState &state, LightCall &call, JsonObject &root) {
   LightJSONSchema::parse_color_json(state, call, root);
 
   if (root.containsKey("flash")) {

esphome/components/light/light_json_schema.h

@@ -14,12 +14,12 @@ namespace light {
 class LightJSONSchema {
  public:
   /// Dump the state of a light as JSON.
-  static void dump_json(LightState &state, JsonObject root);
+  static void dump_json(LightState &state, JsonObject &root);
   /// Parse the JSON state of a light to a LightCall.
-  static void parse_json(LightState &state, LightCall &call, JsonObject root);
+  static void parse_json(LightState &state, LightCall &call, JsonObject &root);
 
  protected:
-  static void parse_color_json(LightState &state, LightCall &call, JsonObject root);
+  static void parse_color_json(LightState &state, LightCall &call, JsonObject &root);
 };
 
 }  // namespace light

esphome/components/light/types.py

@@ -41,7 +41,6 @@ LightTurnOnTrigger = light_ns.class_(
 LightTurnOffTrigger = light_ns.class_(
     "LightTurnOffTrigger", automation.Trigger.template()
 )
-LightStateTrigger = light_ns.class_("LightStateTrigger", automation.Trigger.template())
 
 # Effects
 LightEffect = light_ns.class_("LightEffect")

esphome/components/ltr390/ltr390.cpp

@@ -97,7 +97,7 @@ void LTR390Component::read_mode_(int mode_index) {
 
     // If there are more modes to read then begin the next
     // otherwise stop
-    if (mode_index + 1 < (int) this->mode_funcs_.size()) {
+    if (mode_index + 1 < this->mode_funcs_.size()) {
       this->read_mode_(mode_index + 1);
     } else {
       this->reading_ = false;

esphome/components/max31865/max31865.cpp

@@ -203,16 +203,16 @@ float MAX31865Sensor::calc_temperature_(float rtd_ratio) {
     rtd_resistance *= 100;
   }
   float rpoly = rtd_resistance;
-  float neg_temp = -242.02f;
-  neg_temp += 2.2228f * rpoly;
+  float neg_temp = -242.02;
+  neg_temp += 2.2228 * rpoly;
   rpoly *= rtd_resistance;  // square
-  neg_temp += 2.5859e-3f * rpoly;
+  neg_temp += 2.5859e-3 * rpoly;
   rpoly *= rtd_resistance;  // ^3
-  neg_temp -= 4.8260e-6f * rpoly;
+  neg_temp -= 4.8260e-6 * rpoly;
   rpoly *= rtd_resistance;  // ^4
-  neg_temp -= 2.8183e-8f * rpoly;
+  neg_temp -= 2.8183e-8 * rpoly;
   rpoly *= rtd_resistance;  // ^5
-  neg_temp += 1.5243e-10f * rpoly;
+  neg_temp += 1.5243e-10 * rpoly;
   return neg_temp;
 }
 

esphome/components/max7219digit/max7219digit.cpp

@@ -76,7 +76,7 @@ void MAX7219Component::loop() {
     this->stepsleft_ = 0;
 
   // Return if there is no need to scroll or scroll is off
-  if (!this->scroll_ || (this->max_displaybuffer_[0].size() <= (size_t) get_width_internal())) {
+  if (!this->scroll_ || (this->max_displaybuffer_[0].size() <= get_width_internal())) {
     this->display();
     return;
   }
@@ -88,7 +88,7 @@ void MAX7219Component::loop() {
 
   // Dwell time at end of string in case of stop at end
   if (this->scroll_mode_ == ScrollMode::STOP) {
-    if (this->stepsleft_ >= this->max_displaybuffer_[0].size() - (size_t) get_width_internal() + 1) {
+    if (this->stepsleft_ >= this->max_displaybuffer_[0].size() - get_width_internal() + 1) {
       if (now - this->last_scroll_ >= this->scroll_dwell_) {
         this->stepsleft_ = 0;
         this->last_scroll_ = now;
@@ -155,7 +155,7 @@ int MAX7219Component::get_height_internal() {
 int MAX7219Component::get_width_internal() { return this->num_chips_ / this->num_chip_lines_ * 8; }
 
 void HOT MAX7219Component::draw_absolute_pixel_internal(int x, int y, Color color) {
-  if (x + 1 > (int) this->max_displaybuffer_[0].size()) {  // Extend the display buffer in case required
+  if (x + 1 > this->max_displaybuffer_[0].size()) {  // Extend the display buffer in case required
     for (int chip_line = 0; chip_line < this->num_chip_lines_; chip_line++) {
       this->max_displaybuffer_[chip_line].resize(x + 1, this->bckgrnd_);
     }

esphome/components/mcp23s08/mcp23s08.cpp

@@ -35,6 +35,7 @@ void MCP23S08::dump_config() {
 }
 
 bool MCP23S08::read_reg(uint8_t reg, uint8_t *value) {
+  uint8_t data;
   this->enable();
   this->transfer_byte(this->device_opcode_ | 1);
   this->transfer_byte(reg);

esphome/components/mcp23x17_base/mcp23x17_base.cpp

@@ -24,7 +24,6 @@ void MCP23X17Base::pin_mode(uint8_t pin, gpio::Flags flags) {
   uint8_t gppu = pin < 8 ? mcp23x17_base::MCP23X17_GPPUA : mcp23x17_base::MCP23X17_GPPUB;
   if (flags == gpio::FLAG_INPUT) {
     this->update_reg(pin, true, iodir);
-    this->update_reg(pin, false, gppu);
   } else if (flags == (gpio::FLAG_INPUT | gpio::FLAG_PULLUP)) {
     this->update_reg(pin, true, iodir);
     this->update_reg(pin, true, gppu);

esphome/components/mcp2515/mcp2515.cpp

@@ -127,6 +127,9 @@ canbus::Error MCP2515::set_mode_(const CanctrlReqopMode mode) {
 }
 
 canbus::Error MCP2515::set_clk_out_(const CanClkOut divisor) {
+  canbus::Error res;
+  uint8_t cfg3;
+
   if (divisor == CLKOUT_DISABLE) {
     /* Turn off CLKEN */
     modify_register_(MCP_CANCTRL, CANCTRL_CLKEN, 0x00);

esphome/components/mcp3204/__init__.py

@@ -1,27 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import spi
-from esphome.const import CONF_ID
-
-DEPENDENCIES = ["spi"]
-MULTI_CONF = True
-CODEOWNERS = ["@rsumner"]
-
-mcp3204_ns = cg.esphome_ns.namespace("mcp3204")
-MCP3204 = mcp3204_ns.class_("MCP3204", cg.Component, spi.SPIDevice)
-
-CONF_REFERENCE_VOLTAGE = "reference_voltage"
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(MCP3204),
-        cv.Optional(CONF_REFERENCE_VOLTAGE, default="3.3V"): cv.voltage,
-    }
-).extend(spi.spi_device_schema(cs_pin_required=True))
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    cg.add(var.set_reference_voltage(config[CONF_REFERENCE_VOLTAGE]))
-    await cg.register_component(var, config)
-    await spi.register_spi_device(var, config)

esphome/components/mcp3204/mcp3204.cpp

@@ -1,35 +0,0 @@
-#include "mcp3204.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace mcp3204 {
-
-static const char *const TAG = "mcp3204";
-
-float MCP3204::get_setup_priority() const { return setup_priority::HARDWARE; }
-
-void MCP3204::setup() {
-  ESP_LOGCONFIG(TAG, "Setting up mcp3204");
-  this->spi_setup();
-}
-
-void MCP3204::dump_config() {
-  ESP_LOGCONFIG(TAG, "MCP3204:");
-  LOG_PIN("  CS Pin:", this->cs_);
-  ESP_LOGCONFIG(TAG, "  Reference Voltage: %.2fV", this->reference_voltage_);
-}
-
-float MCP3204::read_data(uint8_t pin) {
-  uint8_t adc_primary_config = 0b00000110 & 0b00000111;
-  uint8_t adc_secondary_config = pin << 6;
-  this->enable();
-  this->transfer_byte(adc_primary_config);
-  uint8_t adc_primary_byte = this->transfer_byte(adc_secondary_config);
-  uint8_t adc_secondary_byte = this->transfer_byte(0x00);
-  this->disable();
-  uint16_t digital_value = (adc_primary_byte << 8 | adc_secondary_byte) & 0b111111111111;
-  return float(digital_value) / 4096.000 * this->reference_voltage_;
-}
-
-}  // namespace mcp3204
-}  // namespace esphome

esphome/components/mcp3204/mcp3204.h

@@ -1,28 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/spi/spi.h"
-
-namespace esphome {
-namespace mcp3204 {
-
-class MCP3204 : public Component,
-                public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW, spi::CLOCK_PHASE_LEADING,
-                                      spi::DATA_RATE_1MHZ> {
- public:
-  MCP3204() = default;
-
-  void set_reference_voltage(float reference_voltage) { this->reference_voltage_ = reference_voltage; }
-
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  float read_data(uint8_t pin);
-
- protected:
-  float reference_voltage_;
-};
-
-}  // namespace mcp3204
-}  // namespace esphome

esphome/components/mcp3204/sensor/__init__.py

@@ -1,32 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import sensor, voltage_sampler
-from esphome.const import CONF_ID, CONF_NUMBER
-from .. import mcp3204_ns, MCP3204
-
-AUTO_LOAD = ["voltage_sampler"]
-
-DEPENDENCIES = ["mcp3204"]
-
-MCP3204Sensor = mcp3204_ns.class_(
-    "MCP3204Sensor", sensor.Sensor, cg.PollingComponent, voltage_sampler.VoltageSampler
-)
-CONF_MCP3204_ID = "mcp3204_id"
-
-CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(MCP3204Sensor),
-        cv.GenerateID(CONF_MCP3204_ID): cv.use_id(MCP3204),
-        cv.Required(CONF_NUMBER): cv.int_range(min=0, max=3),
-    }
-).extend(cv.polling_component_schema("60s"))
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(
-        config[CONF_ID],
-        config[CONF_NUMBER],
-    )
-    await cg.register_parented(var, config[CONF_MCP3204_ID])
-    await cg.register_component(var, config)
-    await sensor.register_sensor(var, config)

esphome/components/mcp3204/sensor/mcp3204_sensor.cpp

@@ -1,23 +0,0 @@
-#include "mcp3204_sensor.h"
-
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace mcp3204 {
-
-static const char *const TAG = "mcp3204.sensor";
-
-MCP3204Sensor::MCP3204Sensor(uint8_t pin) : pin_(pin) {}
-
-float MCP3204Sensor::get_setup_priority() const { return setup_priority::DATA; }
-
-void MCP3204Sensor::dump_config() {
-  LOG_SENSOR("", "MCP3204 Sensor", this);
-  ESP_LOGCONFIG(TAG, "  Pin: %u", this->pin_);
-  LOG_UPDATE_INTERVAL(this);
-}
-float MCP3204Sensor::sample() { return this->parent_->read_data(this->pin_); }
-void MCP3204Sensor::update() { this->publish_state(this->sample()); }
-
-}  // namespace mcp3204
-}  // namespace esphome

esphome/components/mcp3204/sensor/mcp3204_sensor.h

@@ -1,30 +0,0 @@
-#pragma once
-
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/voltage_sampler/voltage_sampler.h"
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-
-#include "../mcp3204.h"
-
-namespace esphome {
-namespace mcp3204 {
-
-class MCP3204Sensor : public PollingComponent,
-                      public Parented<MCP3204>,
-                      public sensor::Sensor,
-                      public voltage_sampler::VoltageSampler {
- public:
-  MCP3204Sensor(uint8_t pin);
-
-  void update() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  float sample() override;
-
- protected:
-  uint8_t pin_;
-};
-
-}  // namespace mcp3204
-}  // namespace esphome

esphome/components/mcp47a1/mcp47a1.cpp

@@ -1,21 +0,0 @@
-#include "mcp47a1.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace mcp47a1 {
-
-static const char *const TAG = "mcp47a1";
-
-void MCP47A1::dump_config() {
-  ESP_LOGCONFIG(TAG, "MCP47A1 Output:");
-  LOG_I2C_DEVICE(this);
-}
-
-void MCP47A1::write_state(float state) {
-  const uint8_t value = remap(state, 0.0f, 1.0f, 63, 0);
-  this->write_byte(0, value);
-}
-
-}  // namespace mcp47a1
-}  // namespace esphome

esphome/components/mcp47a1/mcp47a1.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/components/output/float_output.h"
-#include "esphome/core/component.h"
-
-namespace esphome {
-namespace mcp47a1 {
-
-class MCP47A1 : public Component, public output::FloatOutput, public i2c::I2CDevice {
- public:
-  void dump_config() override;
-  void write_state(float state) override;
-};
-
-}  // namespace mcp47a1
-}  // namespace esphome

esphome/components/mcp47a1/output.py

@@ -1,27 +0,0 @@
-import esphome.config_validation as cv
-import esphome.codegen as cg
-from esphome.components import output, i2c
-from esphome.const import CONF_ID
-
-CODEOWNERS = ["@jesserockz"]
-DEPENDENCIES = ["i2c"]
-
-mcp47a1_ns = cg.esphome_ns.namespace("mcp47a1")
-MCP47A1 = mcp47a1_ns.class_("MCP47A1", output.FloatOutput, cg.Component, i2c.I2CDevice)
-
-CONFIG_SCHEMA = (
-    output.FLOAT_OUTPUT_SCHEMA.extend(
-        {
-            cv.Required(CONF_ID): cv.declare_id(MCP47A1),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-    .extend(i2c.i2c_device_schema(0x2E))
-)
-
-
-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 output.register_output(var, config)

esphome/components/md5/md5.cpp

@@ -23,7 +23,7 @@ void MD5Digest::get_hex(char *output) {
   }
 }
 
-bool MD5Digest::equals_bytes(const uint8_t *expected) {
+bool MD5Digest::equals_bytes(const char *expected) {
   for (size_t i = 0; i < 16; i++) {
     if (expected[i] != this->digest_[i]) {
       return false;
@@ -33,10 +33,18 @@ bool MD5Digest::equals_bytes(const uint8_t *expected) {
 }
 
 bool MD5Digest::equals_hex(const char *expected) {
-  uint8_t parsed[16];
-  if (!parse_hex(expected, parsed, 16))
-    return false;
-  return equals_bytes(parsed);
+  for (size_t i = 0; i < 16; i++) {
+    auto high = parse_hex(expected[i * 2]);
+    auto low = parse_hex(expected[i * 2 + 1]);
+    if (!high.has_value() || !low.has_value()) {
+      return false;
+    }
+    auto value = (*high << 4) | *low;
+    if (value != this->digest_[i]) {
+      return false;
+    }
+  }
+  return true;
 }
 
 }  // namespace md5

esphome/components/md5/md5.h

@@ -44,7 +44,7 @@ class MD5Digest {
   void get_hex(char *output);
 
   /// Compare the digest against a provided byte-encoded digest (16 bytes).
-  bool equals_bytes(const uint8_t *expected);
+  bool equals_bytes(const char *expected);
 
   /// Compare the digest against a provided hex-encoded digest (32 bytes).
   bool equals_hex(const char *expected);

esphome/components/midea/ir_transmitter.h

@@ -23,12 +23,12 @@ class IrFollowMeData : public IrData {
   }
 
   /* TEMPERATURE */
-  uint8_t temp() const { return this->get_value_(4) - 1; }
-  void set_temp(uint8_t val) { this->set_value_(4, std::min(MAX_TEMP, val) + 1); }
+  uint8_t temp() const { return this->data_[4] - 1; }
+  void set_temp(uint8_t val) { this->data_[4] = std::min(MAX_TEMP, val) + 1; }
 
   /* BEEPER */
-  bool beeper() const { return this->get_value_(3, 128); }
-  void set_beeper(bool val) { this->set_mask_(3, val, 128); }
+  bool beeper() const { return this->data_[3] & 128; }
+  void set_beeper(bool val) { this->set_value_(3, 1, 7, val); }
 
  protected:
   static const uint8_t MAX_TEMP = 37;

esphome/components/midea_ir/climate.py

@@ -1,25 +0,0 @@
-import esphome.codegen as cg
-import esphome.config_validation as cv
-from esphome.components import climate_ir
-from esphome.const import CONF_ID
-
-AUTO_LOAD = ["climate_ir", "coolix"]
-CODEOWNERS = ["@dudanov"]
-
-midea_ir_ns = cg.esphome_ns.namespace("midea_ir")
-MideaIR = midea_ir_ns.class_("MideaIR", climate_ir.ClimateIR)
-
-CONF_USE_FAHRENHEIT = "use_fahrenheit"
-
-CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
-    {
-        cv.GenerateID(): cv.declare_id(MideaIR),
-        cv.Optional(CONF_USE_FAHRENHEIT, default=False): cv.boolean,
-    }
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await climate_ir.register_climate_ir(var, config)
-    cg.add(var.set_fahrenheit(config[CONF_USE_FAHRENHEIT]))

esphome/components/midea_ir/midea_data.h

@@ -1,92 +0,0 @@
-#pragma once
-
-#include "esphome/components/remote_base/midea_protocol.h"
-#include "esphome/components/climate/climate_mode.h"
-
-namespace esphome {
-namespace midea_ir {
-
-using climate::ClimateMode;
-using climate::ClimateFanMode;
-using remote_base::MideaData;
-
-class ControlData : public MideaData {
- public:
-  // Default constructor (power: ON, mode: AUTO, fan: AUTO, temp: 25C)
-  ControlData() : MideaData({MIDEA_TYPE_CONTROL, 0x82, 0x48, 0xFF, 0xFF}) {}
-  // Copy from Base
-  ControlData(const MideaData &data) : MideaData(data) {}
-
-  void set_temp(float temp);
-  float get_temp() const;
-
-  void set_mode(ClimateMode mode);
-  ClimateMode get_mode() const;
-
-  void set_fan_mode(ClimateFanMode mode);
-  ClimateFanMode get_fan_mode() const;
-
-  void set_sleep_preset(bool value) { this->set_mask_(1, value, 64); }
-  bool get_sleep_preset() const { return this->get_value_(1, 64); }
-
-  void set_fahrenheit(bool value) { this->set_mask_(2, value, 32); }
-  bool get_fahrenheit() const { return this->get_value_(2, 32); }
-
-  void fix();
-
- protected:
-  enum Mode : uint8_t {
-    MODE_COOL,
-    MODE_DRY,
-    MODE_AUTO,
-    MODE_HEAT,
-    MODE_FAN_ONLY,
-  };
-  enum FanMode : uint8_t {
-    FAN_AUTO,
-    FAN_LOW,
-    FAN_MEDIUM,
-    FAN_HIGH,
-  };
-  void set_fan_mode_(FanMode mode) { this->set_value_(1, mode, 3, 3); }
-  FanMode get_fan_mode_() const { return static_cast<FanMode>(this->get_value_(1, 3, 3)); }
-  void set_mode_(Mode mode) { this->set_value_(1, mode, 7); }
-  Mode get_mode_() const { return static_cast<Mode>(this->get_value_(1, 7)); }
-  void set_power_(bool value) { this->set_mask_(1, value, 128); }
-  bool get_power_() const { return this->get_value_(1, 128); }
-};
-
-class FollowMeData : public MideaData {
- public:
-  // Default constructor (temp: 30C, beeper: off)
-  FollowMeData() : MideaData({MIDEA_TYPE_FOLLOW_ME, 0x82, 0x48, 0x7F, 0x1F}) {}
-  // Copy from Base
-  FollowMeData(const MideaData &data) : MideaData(data) {}
-  // Direct from temperature and beeper values
-  FollowMeData(uint8_t temp, bool beeper = false) : FollowMeData() {
-    this->set_temp(temp);
-    this->set_beeper(beeper);
-  }
-
-  /* TEMPERATURE */
-  uint8_t temp() const { return this->get_value_(4) - 1; }
-  void set_temp(uint8_t val) { this->set_value_(4, std::min(MAX_TEMP, val) + 1); }
-
-  /* BEEPER */
-  bool beeper() const { return this->get_value_(3, 128); }
-  void set_beeper(bool value) { this->set_mask_(3, value, 128); }
-
- protected:
-  static const uint8_t MAX_TEMP = 37;
-};
-
-class SpecialData : public MideaData {
- public:
-  SpecialData(uint8_t code) : MideaData({MIDEA_TYPE_SPECIAL, code, 0xFF, 0xFF, 0xFF}) {}
-  static const uint8_t VSWING_STEP = 1;
-  static const uint8_t VSWING_TOGGLE = 2;
-  static const uint8_t TURBO_TOGGLE = 9;
-};
-
-}  // namespace midea_ir
-}  // namespace esphome

esphome/components/midea_ir/midea_ir.cpp

@@ -1,201 +0,0 @@
-#include "midea_ir.h"
-#include "midea_data.h"
-#include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
-#include "esphome/components/coolix/coolix.h"
-
-namespace esphome {
-namespace midea_ir {
-
-static const char *const TAG = "midea_ir.climate";
-
-void ControlData::set_temp(float temp) {
-  uint8_t min;
-  if (this->get_fahrenheit()) {
-    min = MIDEA_TEMPF_MIN;
-    temp = esphome::clamp<float>(celsius_to_fahrenheit(temp), MIDEA_TEMPF_MIN, MIDEA_TEMPF_MAX);
-  } else {
-    min = MIDEA_TEMPC_MIN;
-    temp = esphome::clamp<float>(temp, MIDEA_TEMPC_MIN, MIDEA_TEMPC_MAX);
-  }
-  this->set_value_(2, lroundf(temp) - min, 31);
-}
-
-float ControlData::get_temp() const {
-  const uint8_t temp = this->get_value_(2, 31);
-  if (this->get_fahrenheit())
-    return fahrenheit_to_celsius(static_cast<float>(temp + MIDEA_TEMPF_MIN));
-  return static_cast<float>(temp + MIDEA_TEMPC_MIN);
-}
-
-void ControlData::fix() {
-  // In FAN_AUTO, modes COOL, HEAT and FAN_ONLY bit #5 in byte #1 must be set
-  const uint8_t value = this->get_value_(1, 31);
-  if (value == 0 || value == 3 || value == 4)
-    this->set_mask_(1, true, 32);
-  // In FAN_ONLY mode we need to set all temperature bits
-  if (this->get_mode_() == MODE_FAN_ONLY)
-    this->set_mask_(2, true, 31);
-}
-
-void ControlData::set_mode(ClimateMode mode) {
-  switch (mode) {
-    case ClimateMode::CLIMATE_MODE_OFF:
-      this->set_power_(false);
-      return;
-    case ClimateMode::CLIMATE_MODE_COOL:
-      this->set_mode_(MODE_COOL);
-      break;
-    case ClimateMode::CLIMATE_MODE_DRY:
-      this->set_mode_(MODE_DRY);
-      break;
-    case ClimateMode::CLIMATE_MODE_FAN_ONLY:
-      this->set_mode_(MODE_FAN_ONLY);
-      break;
-    case ClimateMode::CLIMATE_MODE_HEAT:
-      this->set_mode_(MODE_HEAT);
-      break;
-    default:
-      this->set_mode_(MODE_AUTO);
-      break;
-  }
-  this->set_power_(true);
-}
-
-ClimateMode ControlData::get_mode() const {
-  if (!this->get_power_())
-    return ClimateMode::CLIMATE_MODE_OFF;
-  switch (this->get_mode_()) {
-    case MODE_COOL:
-      return ClimateMode::CLIMATE_MODE_COOL;
-    case MODE_DRY:
-      return ClimateMode::CLIMATE_MODE_DRY;
-    case MODE_FAN_ONLY:
-      return ClimateMode::CLIMATE_MODE_FAN_ONLY;
-    case MODE_HEAT:
-      return ClimateMode::CLIMATE_MODE_HEAT;
-    default:
-      return ClimateMode::CLIMATE_MODE_HEAT_COOL;
-  }
-}
-
-void ControlData::set_fan_mode(ClimateFanMode mode) {
-  switch (mode) {
-    case ClimateFanMode::CLIMATE_FAN_LOW:
-      this->set_fan_mode_(FAN_LOW);
-      break;
-    case ClimateFanMode::CLIMATE_FAN_MEDIUM:
-      this->set_fan_mode_(FAN_MEDIUM);
-      break;
-    case ClimateFanMode::CLIMATE_FAN_HIGH:
-      this->set_fan_mode_(FAN_HIGH);
-      break;
-    default:
-      this->set_fan_mode_(FAN_AUTO);
-      break;
-  }
-}
-
-ClimateFanMode ControlData::get_fan_mode() const {
-  switch (this->get_fan_mode_()) {
-    case FAN_LOW:
-      return ClimateFanMode::CLIMATE_FAN_LOW;
-    case FAN_MEDIUM:
-      return ClimateFanMode::CLIMATE_FAN_MEDIUM;
-    case FAN_HIGH:
-      return ClimateFanMode::CLIMATE_FAN_HIGH;
-    default:
-      return ClimateFanMode::CLIMATE_FAN_AUTO;
-  }
-}
-
-void MideaIR::control(const climate::ClimateCall &call) {
-  // swing and preset resets after unit powered off
-  if (call.get_mode() == climate::CLIMATE_MODE_OFF) {
-    this->swing_mode = climate::CLIMATE_SWING_OFF;
-    this->preset = climate::CLIMATE_PRESET_NONE;
-  } else if (call.get_swing_mode().has_value() && ((*call.get_swing_mode() == climate::CLIMATE_SWING_OFF &&
-                                                    this->swing_mode == climate::CLIMATE_SWING_VERTICAL) ||
-                                                   (*call.get_swing_mode() == climate::CLIMATE_SWING_VERTICAL &&
-                                                    this->swing_mode == climate::CLIMATE_SWING_OFF))) {
-    this->swing_ = true;
-  } else if (call.get_preset().has_value() &&
-             ((*call.get_preset() == climate::CLIMATE_PRESET_NONE && this->preset == climate::CLIMATE_PRESET_BOOST) ||
-              (*call.get_preset() == climate::CLIMATE_PRESET_BOOST && this->preset == climate::CLIMATE_PRESET_NONE))) {
-    this->boost_ = true;
-  }
-  climate_ir::ClimateIR::control(call);
-}
-
-void MideaIR::transmit_(MideaData &data) {
-  data.finalize();
-  auto transmit = this->transmitter_->transmit();
-  remote_base::MideaProtocol().encode(transmit.get_data(), data);
-  transmit.perform();
-}
-
-void MideaIR::transmit_state() {
-  if (this->swing_) {
-    SpecialData data(SpecialData::VSWING_TOGGLE);
-    this->transmit_(data);
-    this->swing_ = false;
-    return;
-  }
-  if (this->boost_) {
-    SpecialData data(SpecialData::TURBO_TOGGLE);
-    this->transmit_(data);
-    this->boost_ = false;
-    return;
-  }
-  ControlData data;
-  data.set_fahrenheit(this->fahrenheit_);
-  data.set_temp(this->target_temperature);
-  data.set_mode(this->mode);
-  data.set_fan_mode(this->fan_mode.value_or(ClimateFanMode::CLIMATE_FAN_AUTO));
-  data.set_sleep_preset(this->preset == climate::CLIMATE_PRESET_SLEEP);
-  data.fix();
-  this->transmit_(data);
-}
-
-bool MideaIR::on_receive(remote_base::RemoteReceiveData data) {
-  auto midea = remote_base::MideaProtocol().decode(data);
-  if (midea.has_value())
-    return this->on_midea_(*midea);
-  return coolix::CoolixClimate::on_coolix(this, data);
-}
-
-bool MideaIR::on_midea_(const MideaData &data) {
-  ESP_LOGV(TAG, "Decoded Midea IR data: %s", data.to_string().c_str());
-  if (data.type() == MideaData::MIDEA_TYPE_CONTROL) {
-    const ControlData status = data;
-    if (status.get_mode() != climate::CLIMATE_MODE_FAN_ONLY)
-      this->target_temperature = status.get_temp();
-    this->mode = status.get_mode();
-    this->fan_mode = status.get_fan_mode();
-    if (status.get_sleep_preset())
-      this->preset = climate::CLIMATE_PRESET_SLEEP;
-    else if (this->preset == climate::CLIMATE_PRESET_SLEEP)
-      this->preset = climate::CLIMATE_PRESET_NONE;
-    this->publish_state();
-    return true;
-  }
-  if (data.type() == MideaData::MIDEA_TYPE_SPECIAL) {
-    switch (data[1]) {
-      case SpecialData::VSWING_TOGGLE:
-        this->swing_mode = this->swing_mode == climate::CLIMATE_SWING_VERTICAL ? climate::CLIMATE_SWING_OFF
-                                                                               : climate::CLIMATE_SWING_VERTICAL;
-        break;
-      case SpecialData::TURBO_TOGGLE:
-        this->preset = this->preset == climate::CLIMATE_PRESET_BOOST ? climate::CLIMATE_PRESET_NONE
-                                                                     : climate::CLIMATE_PRESET_BOOST;
-        break;
-    }
-    this->publish_state();
-    return true;
-  }
-
-  return false;
-}
-
-}  // namespace midea_ir
-}  // namespace esphome

esphome/components/midea_ir/midea_ir.h

@@ -1,47 +0,0 @@
-#pragma once
-
-#include "esphome/components/climate_ir/climate_ir.h"
-#include "midea_data.h"
-
-namespace esphome {
-namespace midea_ir {
-
-// Temperature
-const uint8_t MIDEA_TEMPC_MIN = 17;  // Celsius
-const uint8_t MIDEA_TEMPC_MAX = 30;  // Celsius
-const uint8_t MIDEA_TEMPF_MIN = 62;  // Fahrenheit
-const uint8_t MIDEA_TEMPF_MAX = 86;  // Fahrenheit
-
-class MideaIR : public climate_ir::ClimateIR {
- public:
-  MideaIR()
-      : climate_ir::ClimateIR(
-            MIDEA_TEMPC_MIN, MIDEA_TEMPC_MAX, 1.0f, true, true,
-            {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
-             climate::CLIMATE_FAN_HIGH},
-            {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL},
-            {climate::CLIMATE_PRESET_NONE, climate::CLIMATE_PRESET_SLEEP, climate::CLIMATE_PRESET_BOOST}) {}
-
-  /// Override control to change settings of the climate device.
-  void control(const climate::ClimateCall &call) override;
-
-  /// Set use of Fahrenheit units
-  void set_fahrenheit(bool value) {
-    this->fahrenheit_ = value;
-    this->temperature_step_ = value ? 0.5f : 1.0f;
-  }
-
- protected:
-  /// Transmit via IR the state of this climate controller.
-  void transmit_state() override;
-  void transmit_(MideaData &data);
-  /// Handle received IR Buffer
-  bool on_receive(remote_base::RemoteReceiveData data) override;
-  bool on_midea_(const MideaData &data);
-  bool fahrenheit_{false};
-  bool swing_{false};
-  bool boost_{false};
-};
-
-}  // namespace midea_ir
-}  // namespace esphome

esphome/components/modbus/modbus.cpp

@@ -69,7 +69,7 @@ bool Modbus::parse_modbus_byte_(uint8_t byte) {
   uint8_t data_len = raw[2];
   uint8_t data_offset = 3;
   // the response for write command mirrors the requests and data startes at offset 2 instead of 3 for read commands
-  if (function_code == 0x5 || function_code == 0x06 || function_code == 0xF || function_code == 0x10) {
+  if (function_code == 0x5 || function_code == 0x06 || function_code == 0x10) {
     data_offset = 2;
     data_len = 4;
   }
@@ -181,7 +181,7 @@ void Modbus::send(uint8_t address, uint8_t function_code, uint16_t start_address
     this->flow_control_pin_->digital_write(false);
   waiting_for_response = address;
   last_send_ = millis();
-  ESP_LOGV(TAG, "Modbus write: %s", format_hex_pretty(data).c_str());
+  ESP_LOGV(TAG, "Modbus write: %s", hexencode(data).c_str());
 }
 
 // Helper function for lambdas
@@ -202,7 +202,7 @@ void Modbus::send_raw(const std::vector<uint8_t> &payload) {
   if (this->flow_control_pin_ != nullptr)
     this->flow_control_pin_->digital_write(false);
   waiting_for_response = payload[0];
-  ESP_LOGV(TAG, "Modbus write raw: %s", format_hex_pretty(payload).c_str());
+  ESP_LOGV(TAG, "Modbus write raw: %s", hexencode(payload).c_str());
   last_send_ = millis();
 }
 

esphome/components/modbus_controller/__init__.py

@@ -1,21 +1,10 @@
-import binascii
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import modbus
-from esphome.const import CONF_ADDRESS, CONF_ID, CONF_NAME, CONF_LAMBDA, CONF_OFFSET
+from esphome.const import CONF_ID, CONF_ADDRESS
 from esphome.cpp_helpers import logging
 from .const import (
-    CONF_BITMASK,
-    CONF_BYTE_OFFSET,
     CONF_COMMAND_THROTTLE,
-    CONF_CUSTOM_COMMAND,
-    CONF_FORCE_NEW_RANGE,
-    CONF_MODBUS_CONTROLLER_ID,
-    CONF_REGISTER_COUNT,
-    CONF_REGISTER_TYPE,
-    CONF_RESPONSE_SIZE,
-    CONF_SKIP_UPDATES,
-    CONF_VALUE_TYPE,
 )
 
 CODEOWNERS = ["@martgras"]
@@ -47,16 +36,10 @@ MODBUS_FUNCTION_CODE = {
 
 ModbusRegisterType_ns = modbus_controller_ns.namespace("ModbusRegisterType")
 ModbusRegisterType = ModbusRegisterType_ns.enum("ModbusRegisterType")
-
-MODBUS_WRITE_REGISTER_TYPE = {
-    "custom": ModbusRegisterType.CUSTOM,
-    "coil": ModbusRegisterType.COIL,
-    "holding": ModbusRegisterType.HOLDING,
-}
-
 MODBUS_REGISTER_TYPE = {
-    **MODBUS_WRITE_REGISTER_TYPE,
+    "coil": ModbusRegisterType.COIL,
     "discrete_input": ModbusRegisterType.DISCRETE_INPUT,
+    "holding": ModbusRegisterType.HOLDING,
     "read": ModbusRegisterType.READ,
 }
 
@@ -112,100 +95,6 @@ CONFIG_SCHEMA = cv.All(
 )
 
 
-ModbusItemBaseSchema = cv.Schema(
-    {
-        cv.GenerateID(CONF_MODBUS_CONTROLLER_ID): cv.use_id(ModbusController),
-        cv.Optional(CONF_ADDRESS): cv.positive_int,
-        cv.Optional(CONF_CUSTOM_COMMAND): cv.ensure_list(cv.hex_uint8_t),
-        cv.Exclusive(
-            CONF_OFFSET,
-            "offset",
-            f"{CONF_OFFSET} and {CONF_BYTE_OFFSET} can't be used together",
-        ): cv.positive_int,
-        cv.Exclusive(
-            CONF_BYTE_OFFSET,
-            "offset",
-            f"{CONF_OFFSET} and {CONF_BYTE_OFFSET} can't be used together",
-        ): cv.positive_int,
-        cv.Optional(CONF_BITMASK, default=0xFFFFFFFF): cv.hex_uint32_t,
-        cv.Optional(CONF_SKIP_UPDATES, default=0): cv.positive_int,
-        cv.Optional(CONF_FORCE_NEW_RANGE, default=False): cv.boolean,
-        cv.Optional(CONF_LAMBDA): cv.returning_lambda,
-        cv.Optional(CONF_RESPONSE_SIZE, default=0): cv.positive_int,
-    },
-)
-
-
-def validate_modbus_register(config):
-    if CONF_CUSTOM_COMMAND not in config and CONF_ADDRESS not in config:
-        raise cv.Invalid(
-            f" {CONF_ADDRESS} is a required property if '{CONF_CUSTOM_COMMAND}:' isn't used"
-        )
-    if CONF_CUSTOM_COMMAND in config and CONF_REGISTER_TYPE in config:
-        raise cv.Invalid(
-            f"can't use '{CONF_REGISTER_TYPE}:' together with '{CONF_CUSTOM_COMMAND}:'",
-        )
-
-    if CONF_CUSTOM_COMMAND not in config and CONF_REGISTER_TYPE not in config:
-        raise cv.Invalid(
-            f" {CONF_REGISTER_TYPE} is a required property if '{CONF_CUSTOM_COMMAND}:' isn't used"
-        )
-    return config
-
-
-def modbus_calc_properties(config):
-    byte_offset = 0
-    reg_count = 0
-    if CONF_OFFSET in config:
-        byte_offset = config[CONF_OFFSET]
-    # A CONF_BYTE_OFFSET setting overrides CONF_OFFSET
-    if CONF_BYTE_OFFSET in config:
-        byte_offset = config[CONF_BYTE_OFFSET]
-    if CONF_REGISTER_COUNT in config:
-        reg_count = config[CONF_REGISTER_COUNT]
-    if CONF_VALUE_TYPE in config:
-        value_type = config[CONF_VALUE_TYPE]
-        if reg_count == 0:
-            reg_count = TYPE_REGISTER_MAP[value_type]
-    if CONF_CUSTOM_COMMAND in config:
-        if CONF_ADDRESS not in config:
-            # generate a unique modbus address using the hash of the name
-            # CONF_NAME set even if only CONF_ID is used.
-            # a modbus register address is required to add the item to sensormap
-            value = config[CONF_NAME]
-            if isinstance(value, str):
-                value = value.encode()
-            config[CONF_ADDRESS] = binascii.crc_hqx(value, 0)
-        config[CONF_REGISTER_TYPE] = ModbusRegisterType.CUSTOM
-        config[CONF_FORCE_NEW_RANGE] = True
-    return byte_offset, reg_count
-
-
-async def add_modbus_base_properties(
-    var, config, sensor_type, lamdba_param_type=cg.float_, lamdba_return_type=float
-):
-    if CONF_CUSTOM_COMMAND in config:
-        cg.add(var.set_custom_data(config[CONF_CUSTOM_COMMAND]))
-
-    if config[CONF_RESPONSE_SIZE] > 0:
-        cg.add(var.set_register_size(config[CONF_RESPONSE_SIZE]))
-
-    if CONF_LAMBDA in config:
-        template_ = await cg.process_lambda(
-            config[CONF_LAMBDA],
-            [
-                (sensor_type.operator("ptr"), "item"),
-                (lamdba_param_type, "x"),
-                (
-                    cg.std_vector.template(cg.uint8).operator("const").operator("ref"),
-                    "data",
-                ),
-            ],
-            return_type=cg.optional.template(lamdba_return_type),
-        )
-        cg.add(var.set_template(template_))
-
-
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID], config[CONF_COMMAND_THROTTLE])
     cg.add(var.set_command_throttle(config[CONF_COMMAND_THROTTLE]))
@@ -230,3 +119,11 @@ def function_code_to_register(function_code):
         "write_multiple_registers": ModbusRegisterType.HOLDING,
     }
     return FUNCTION_CODE_TYPE_MAP[function_code]
+
+
+def find_by_value(dict, find_value):
+    for (key, value) in MODBUS_REGISTER_TYPE.items():
+        print(find_value, value)
+        if find_value == value:
+            return key
+    return "not found"

esphome/components/modbus_controller/binary_sensor/__init__.py

@@ -2,18 +2,16 @@ from esphome.components import binary_sensor
 import esphome.config_validation as cv
 import esphome.codegen as cg
 
-from esphome.const import CONF_ADDRESS, CONF_ID
+from esphome.const import CONF_ADDRESS, CONF_ID, CONF_LAMBDA, CONF_OFFSET
 from .. import (
-    add_modbus_base_properties,
-    modbus_controller_ns,
-    modbus_calc_properties,
-    validate_modbus_register,
-    ModbusItemBaseSchema,
     SensorItem,
+    modbus_controller_ns,
+    ModbusController,
     MODBUS_REGISTER_TYPE,
 )
 from ..const import (
     CONF_BITMASK,
+    CONF_BYTE_OFFSET,
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
     CONF_REGISTER_TYPE,
@@ -29,20 +27,30 @@ ModbusBinarySensor = modbus_controller_ns.class_(
 )
 
 CONFIG_SCHEMA = cv.All(
-    binary_sensor.BINARY_SENSOR_SCHEMA.extend(cv.COMPONENT_SCHEMA)
-    .extend(ModbusItemBaseSchema)
-    .extend(
+    binary_sensor.BINARY_SENSOR_SCHEMA.extend(
         {
             cv.GenerateID(): cv.declare_id(ModbusBinarySensor),
-            cv.Optional(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
+            cv.GenerateID(CONF_MODBUS_CONTROLLER_ID): cv.use_id(ModbusController),
+            cv.Required(CONF_ADDRESS): cv.positive_int,
+            cv.Required(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
+            cv.Optional(CONF_OFFSET, default=0): cv.positive_int,
+            cv.Optional(CONF_BYTE_OFFSET): cv.positive_int,
+            cv.Optional(CONF_BITMASK, default=0x1): cv.hex_uint32_t,
+            cv.Optional(CONF_SKIP_UPDATES, default=0): cv.positive_int,
+            cv.Optional(CONF_FORCE_NEW_RANGE, default=False): cv.boolean,
+            cv.Optional(CONF_LAMBDA): cv.returning_lambda,
         }
-    ),
-    validate_modbus_register,
+    ).extend(cv.COMPONENT_SCHEMA),
 )
 
 
 async def to_code(config):
-    byte_offset, _ = modbus_calc_properties(config)
+    byte_offset = 0
+    if CONF_OFFSET in config:
+        byte_offset = config[CONF_OFFSET]
+    # A CONF_BYTE_OFFSET setting overrides CONF_OFFSET
+    if CONF_BYTE_OFFSET in config:
+        byte_offset = config[CONF_BYTE_OFFSET]
     var = cg.new_Pvariable(
         config[CONF_ID],
         config[CONF_REGISTER_TYPE],
@@ -57,4 +65,17 @@ async def to_code(config):
 
     paren = await cg.get_variable(config[CONF_MODBUS_CONTROLLER_ID])
     cg.add(paren.add_sensor_item(var))
-    await add_modbus_base_properties(var, config, ModbusBinarySensor, bool, bool)
+    if CONF_LAMBDA in config:
+        template_ = await cg.process_lambda(
+            config[CONF_LAMBDA],
+            [
+                (ModbusBinarySensor.operator("ptr"), "item"),
+                (cg.float_, "x"),
+                (
+                    cg.std_vector.template(cg.uint8).operator("const").operator("ref"),
+                    "data",
+                ),
+            ],
+            return_type=cg.optional.template(bool),
+        )
+        cg.add(var.set_template(template_))

esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.cpp

@@ -13,6 +13,8 @@ void ModbusBinarySensor::parse_and_publish(const std::vector<uint8_t> &data) {
 
   switch (this->register_type) {
     case ModbusRegisterType::DISCRETE_INPUT:
+      value = coil_from_vector(this->offset, data);
+      break;
     case ModbusRegisterType::COIL:
       // offset for coil is the actual number of the coil not the byte offset
       value = coil_from_vector(this->offset, data);

esphome/components/modbus_controller/binary_sensor/modbus_binarysensor.h

@@ -31,11 +31,12 @@ class ModbusBinarySensor : public Component, public binary_sensor::BinarySensor,
 
   void dump_config() override;
 
-  using transform_func_t = std::function<optional<bool>(ModbusBinarySensor *, bool, const std::vector<uint8_t> &)>;
+  using transform_func_t =
+      optional<std::function<optional<bool>(ModbusBinarySensor *, bool, const std::vector<uint8_t> &)>>;
   void set_template(transform_func_t &&f) { this->transform_func_ = f; }
 
  protected:
-  optional<transform_func_t> transform_func_{nullopt};
+  transform_func_t transform_func_{nullopt};
 };
 
 }  // namespace modbus_controller

esphome/components/modbus_controller/const.py

@@ -1,7 +1,6 @@
 CONF_BITMASK = "bitmask"
 CONF_BYTE_OFFSET = "byte_offset"
 CONF_COMMAND_THROTTLE = "command_throttle"
-CONF_CUSTOM_COMMAND = "custom_command"
 CONF_FORCE_NEW_RANGE = "force_new_range"
 CONF_MODBUS_CONTROLLER_ID = "modbus_controller_id"
 CONF_MODBUS_FUNCTIONCODE = "modbus_functioncode"
@@ -10,6 +9,5 @@ CONF_REGISTER_COUNT = "register_count"
 CONF_REGISTER_TYPE = "register_type"
 CONF_RESPONSE_SIZE = "response_size"
 CONF_SKIP_UPDATES = "skip_updates"
-CONF_USE_WRITE_MULTIPLE = "use_write_multiple"
 CONF_VALUE_TYPE = "value_type"
 CONF_WRITE_LAMBDA = "write_lambda"

esphome/components/modbus_controller/modbus_controller.cpp

@@ -24,22 +24,12 @@ bool ModbusController::send_next_command_() {
   if ((last_send > this->command_throttle_) && !waiting_for_response() && !command_queue_.empty()) {
     auto &command = command_queue_.front();
 
-    // remove from queue if command was sent too often
-    if (command->send_countdown < 1) {
-      ESP_LOGD(
-          TAG,
-          "Modbus command to device=%d register=0x%02X countdown=%d no response received - removed from send queue",
-          this->address_, command->register_address, command->send_countdown);
+    ESP_LOGV(TAG, "Sending next modbus command to device %d register 0x%02X count %d", this->address_,
+             command->register_address, command->register_count);
+    command->send();
+    this->last_command_timestamp_ = millis();
+    if (!command->on_data_func) {  // No handler remove from queue directly after sending
       command_queue_.pop_front();
-    } else {
-      ESP_LOGV(TAG, "Sending next modbus command to device %d register 0x%02X count %d", this->address_,
-               command->register_address, command->register_count);
-      command->send();
-      this->last_command_timestamp_ = millis();
-      // remove from queue if no handler is defined
-      if (!command->on_data_func) {
-        command_queue_.pop_front();
-      }
     }
   }
   return (!command_queue_.empty());
@@ -79,28 +69,30 @@ void ModbusController::on_modbus_error(uint8_t function_code, uint8_t exception_
   }
 }
 
-SensorSet ModbusController::find_sensors_(ModbusRegisterType register_type, uint16_t start_address) const {
-  auto reg_it = find_if(begin(register_ranges_), end(register_ranges_), [=](RegisterRange const &r) {
-    return (r.start_address == start_address && r.register_type == register_type);
-  });
-
-  if (reg_it == register_ranges_.end()) {
-    ESP_LOGE(TAG, "No matching range for sensor found - start_address : 0x%X", start_address);
-  } else {
-    return reg_it->sensors;
-  }
-
-  // not found
-  return {};
-}
 void ModbusController::on_register_data(ModbusRegisterType register_type, uint16_t start_address,
                                         const std::vector<uint8_t> &data) {
   ESP_LOGV(TAG, "data for register address : 0x%X : ", start_address);
 
+  auto vec_it = find_if(begin(register_ranges_), end(register_ranges_), [=](RegisterRange const &r) {
+    return (r.start_address == start_address && r.register_type == register_type);
+  });
+
+  if (vec_it == register_ranges_.end()) {
+    ESP_LOGE(TAG, "Handle incoming data : No matching range for sensor found - start_address :  0x%X", start_address);
+    return;
+  }
+  auto map_it = sensormap_.find(vec_it->first_sensorkey);
+  if (map_it == sensormap_.end()) {
+    ESP_LOGE(TAG, "Handle incoming data : No sensor found in at start_address :  0x%X (0x%llX)", start_address,
+             vec_it->first_sensorkey);
+    return;
+  }
   // loop through all sensors with the same start address
-  auto sensors = find_sensors_(register_type, start_address);
-  for (auto sensor : sensors) {
-    sensor->parse_and_publish(data);
+  while (map_it != sensormap_.end() && map_it->second->start_address == start_address) {
+    if (map_it->second->register_type == register_type) {
+      map_it->second->parse_and_publish(data);
+    }
+    map_it++;
   }
 }
 
@@ -109,7 +101,7 @@ void ModbusController::queue_command(const ModbusCommandItem &command) {
   // not very effective but the queue is never really large
   for (auto &item : command_queue_) {
     if (item->register_address == command.register_address && item->register_count == command.register_count &&
-        item->register_type == command.register_type && item->function_code == command.function_code) {
+        item->register_type == command.register_type) {
       ESP_LOGW(TAG, "Duplicate modbus command found");
       // update the payload of the queued command
       // replaces a previous command
@@ -124,24 +116,9 @@ void ModbusController::update_range_(RegisterRange &r) {
   ESP_LOGV(TAG, "Range : %X Size: %x (%d) skip: %d", r.start_address, r.register_count, (int) r.register_type,
            r.skip_updates_counter);
   if (r.skip_updates_counter == 0) {
-    // if a custom command is used the user supplied custom_data is only available in the SensorItem.
-    if (r.register_type == ModbusRegisterType::CUSTOM) {
-      auto sensors = this->find_sensors_(r.register_type, r.start_address);
-      if (!sensors.empty()) {
-        auto sensor = sensors.cbegin();
-        auto command_item = ModbusCommandItem::create_custom_command(
-            this, (*sensor)->custom_data,
-            [this](ModbusRegisterType register_type, uint16_t start_address, const std::vector<uint8_t> &data) {
-              this->on_register_data(ModbusRegisterType::CUSTOM, start_address, data);
-            });
-        command_item.register_address = (*sensor)->start_address;
-        command_item.register_count = (*sensor)->register_count;
-        command_item.function_code = ModbusFunctionCode::CUSTOM;
-        queue_command(command_item);
-      }
-    } else {
-      queue_command(ModbusCommandItem::create_read_command(this, r.register_type, r.start_address, r.register_count));
-    }
+    ModbusCommandItem command_item =
+        ModbusCommandItem::create_read_command(this, r.register_type, r.start_address, r.register_count);
+    queue_command(command_item);
     r.skip_updates_counter = r.skip_updates;  // reset counter to config value
   } else {
     r.skip_updates_counter--;
@@ -164,110 +141,102 @@ void ModbusController::update() {
   }
 }
 
-// walk through the sensors and determine the register ranges to read
+// walk through the sensors and determine the registerranges to read
 size_t ModbusController::create_register_ranges_() {
   register_ranges_.clear();
-  if (sensorset_.empty()) {
-    ESP_LOGW(TAG, "No sensors registered");
+  uint8_t n = 0;
+  if (sensormap_.empty()) {
     return 0;
   }
 
-  // iterator is sorted see SensorItemsComparator for details
-  auto ix = sensorset_.begin();
-  RegisterRange r = {};
-  uint8_t buffer_offset = 0;
-  SensorItem *prev = nullptr;
-  while (ix != sensorset_.end()) {
-    SensorItem *curr = *ix;
+  auto ix = sensormap_.begin();
+  auto prev = ix;
+  int total_register_count = 0;
+  uint16_t current_start_address = ix->second->start_address;
+  uint8_t buffer_offset = ix->second->offset;
+  uint8_t skip_updates = ix->second->skip_updates;
+  auto first_sensorkey = ix->second->getkey();
+  total_register_count = 0;
+  while (ix != sensormap_.end()) {
+    ESP_LOGV(TAG, "Register: 0x%X %d %d  0x%llx (%d) buffer_offset = %d (0x%X) skip=%u", ix->second->start_address,
+             ix->second->register_count, ix->second->offset, ix->second->getkey(), total_register_count, buffer_offset,
+             buffer_offset, ix->second->skip_updates);
+    // if this is a sequential address based on number of registers and address of previous sensor
+    // convert to an offset to the previous sensor (address 0x101 becomes address 0x100 offset 2 bytes)
+    if (!ix->second->force_new_range && total_register_count >= 0 &&
+        prev->second->register_type == ix->second->register_type &&
+        prev->second->start_address + total_register_count == ix->second->start_address &&
+        prev->second->start_address < ix->second->start_address) {
+      ix->second->start_address = prev->second->start_address;
+      ix->second->offset += prev->second->offset + prev->second->get_register_size();
 
-    ESP_LOGV(TAG, "Register: 0x%X %d %d %d offset=%u skip=%u addr=%p", curr->start_address, curr->register_count,
-             curr->offset, curr->get_register_size(), curr->offset, curr->skip_updates, curr);
-
-    if (r.register_count == 0) {
-      // this is the first register in range
-      r.start_address = curr->start_address;
-      r.register_count = curr->register_count;
-      r.register_type = curr->register_type;
-      r.sensors.insert(curr);
-      r.skip_updates = curr->skip_updates;
-      r.skip_updates_counter = 0;
-      buffer_offset = curr->get_register_size();
-
-      ESP_LOGV(TAG, "Started new range");
-    } else {
-      // this is not the first register in range so it might be possible
-      // to reuse the last register or extend the current range
-      if (!curr->force_new_range && r.register_type == curr->register_type &&
-          curr->register_type != ModbusRegisterType::CUSTOM) {
-        if (curr->start_address == (r.start_address + r.register_count - prev->register_count) &&
-            curr->register_count == prev->register_count && curr->get_register_size() == prev->get_register_size()) {
-          // this register can re-use the data from the previous register
-
-          // remove this sensore because start_address is changed (sort-order)
-          ix = sensorset_.erase(ix);
-
-          curr->start_address = r.start_address;
-          curr->offset += prev->offset;
-
-          sensorset_.insert(curr);
-          // move iterator backwards because it will be incremented later
-          ix--;
-
-          ESP_LOGV(TAG, "Re-use previous register - change to register: 0x%X %d offset=%u", curr->start_address,
-                   curr->register_count, curr->offset);
-        } else if (curr->start_address == (r.start_address + r.register_count)) {
-          // this register can extend the current range
-
-          // remove this sensore because start_address is changed (sort-order)
-          ix = sensorset_.erase(ix);
-
-          curr->start_address = r.start_address;
-          curr->offset += buffer_offset;
-          buffer_offset += curr->get_register_size();
-          r.register_count += curr->register_count;
-
-          sensorset_.insert(curr);
-          // move iterator backwards because it will be incremented later
-          ix--;
-
-          ESP_LOGV(TAG, "Extend range - change to register: 0x%X %d offset=%u", curr->start_address,
-                   curr->register_count, curr->offset);
-        }
-      }
+      // replace entry in sensormap_
+      auto const value = ix->second;
+      sensormap_.erase(ix);
+      sensormap_.insert({value->getkey(), value});
+      // move iterator back to new element
+      ix = sensormap_.find(value->getkey());  // next(prev, 1);
     }
-
-    if (curr->start_address == r.start_address) {
+    if (current_start_address != ix->second->start_address ||
+        //  ( prev->second->start_address + prev->second->offset != ix->second->start_address) ||
+        ix->second->register_type != prev->second->register_type) {
+      // Difference doesn't match so we have a gap
+      if (n > 0) {
+        RegisterRange r;
+        r.start_address = current_start_address;
+        r.register_count = total_register_count;
+        if (prev->second->register_type == ModbusRegisterType::COIL ||
+            prev->second->register_type == ModbusRegisterType::DISCRETE_INPUT) {
+          r.register_count = prev->second->offset + 1;
+        }
+        r.register_type = prev->second->register_type;
+        r.first_sensorkey = first_sensorkey;
+        r.skip_updates = skip_updates;
+        r.skip_updates_counter = 0;
+        ESP_LOGV(TAG, "Add range 0x%X %d skip:%d", r.start_address, r.register_count, r.skip_updates);
+        register_ranges_.push_back(r);
+      }
+      skip_updates = ix->second->skip_updates;
+      current_start_address = ix->second->start_address;
+      first_sensorkey = ix->second->getkey();
+      total_register_count = ix->second->register_count;
+      buffer_offset = ix->second->offset;
+      n = 1;
+    } else {
+      n++;
+      if (ix->second->offset != prev->second->offset || n == 1) {
+        total_register_count += ix->second->register_count;
+        buffer_offset += ix->second->get_register_size();
+      }
       // use the lowest non zero value for the whole range
       // Because zero is the default value for skip_updates it is excluded from getting the min value.
-      if (curr->skip_updates != 0) {
-        if (r.skip_updates != 0) {
-          r.skip_updates = std::min(r.skip_updates, curr->skip_updates);
+      if (ix->second->skip_updates != 0) {
+        if (skip_updates != 0) {
+          skip_updates = std::min(skip_updates, ix->second->skip_updates);
         } else {
-          r.skip_updates = curr->skip_updates;
+          skip_updates = ix->second->skip_updates;
         }
       }
-
-      // add sensor to this range
-      r.sensors.insert(curr);
-
-      ix++;
-    } else {
-      ESP_LOGV(TAG, "Add range 0x%X %d skip:%d", r.start_address, r.register_count, r.skip_updates);
-      register_ranges_.push_back(r);
-      r = {};
-      buffer_offset = 0;
-      // do not increment the iterator here because the current sensor has to be re-evaluated
     }
-
-    prev = curr;
+    prev = ix++;
   }
-
-  if (r.register_count > 0) {
-    // Add the last range
+  // Add the last range
+  if (n > 0) {
+    RegisterRange r;
+    r.start_address = current_start_address;
+    //    r.register_count = prev->second->offset>>1 + prev->second->get_register_size();
+    r.register_count = total_register_count;
+    if (prev->second->register_type == ModbusRegisterType::COIL ||
+        prev->second->register_type == ModbusRegisterType::DISCRETE_INPUT) {
+      r.register_count = prev->second->offset + 1;
+    }
+    r.register_type = prev->second->register_type;
+    r.first_sensorkey = first_sensorkey;
+    r.skip_updates = skip_updates;
+    r.skip_updates_counter = 0;
     ESP_LOGV(TAG, "Add last range 0x%X %d skip:%d", r.start_address, r.register_count, r.skip_updates);
     register_ranges_.push_back(r);
   }
-
   return register_ranges_.size();
 }
 
@@ -276,15 +245,9 @@ void ModbusController::dump_config() {
   ESP_LOGCONFIG(TAG, "  Address: 0x%02X", this->address_);
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
   ESP_LOGCONFIG(TAG, "sensormap");
-  for (auto &it : sensorset_) {
-    ESP_LOGCONFIG(TAG, " Sensor type=%zu start=0x%X offset=0x%X count=%d size=%d",
-                  static_cast<uint8_t>(it->register_type), it->start_address, it->offset, it->register_count,
-                  it->get_register_size());
-  }
-  ESP_LOGCONFIG(TAG, "ranges");
-  for (auto &it : register_ranges_) {
-    ESP_LOGCONFIG(TAG, "  Range type=%zu start=0x%X count=%d skip_updates=%d", static_cast<uint8_t>(it.register_type),
-                  it.start_address, it.register_count, it.skip_updates);
+  for (auto &it : sensormap_) {
+    ESP_LOGCONFIG("TAG", "  Sensor 0x%llX start=0x%X count=%d size=%d", it.second->getkey(), it.second->start_address,
+                  it.second->register_count, it.second->get_register_size());
   }
 #endif
 }
@@ -308,11 +271,11 @@ void ModbusController::on_write_register_response(ModbusRegisterType register_ty
   ESP_LOGV(TAG, "Command ACK 0x%X %d ", get_data<uint16_t>(data, 0), get_data<int16_t>(data, 1));
 }
 
-void ModbusController::dump_sensors_() {
-  ESP_LOGV(TAG, "sensors");
-  for (auto &it : sensorset_) {
-    ESP_LOGV(TAG, "  Sensor start=0x%X count=%d size=%d offset=%d", it->start_address, it->register_count,
-             it->get_register_size(), it->offset);
+void ModbusController::dump_sensormap_() {
+  ESP_LOGV("modbuscontroller.h", "sensormap");
+  for (auto &it : sensormap_) {
+    ESP_LOGV("modbuscontroller.h", "  Sensor 0x%llX start=0x%X count=%d size=%d", it.second->getkey(),
+             it.second->start_address, it.second->register_count, it.second->get_register_size());
   }
 }
 
@@ -459,7 +422,6 @@ bool ModbusCommandItem::send() {
     modbusdevice->send_raw(this->payload);
   }
   ESP_LOGV(TAG, "Command sent %d 0x%X %d", uint8_t(this->function_code), this->register_address, this->register_count);
-  send_countdown--;
   return true;
 }
 
@@ -587,9 +549,6 @@ float payload_to_float(const std::vector<uint8_t> &data, SensorValueType sensor_
       ESP_LOGD(TAG, "FP32_R = 0x%08X => %f", raw_to_float.raw, raw_to_float.float_value);
       result = raw_to_float.float_value;
     } break;
-    case SensorValueType::RAW:
-      result = NAN;
-      break;
     default:
       break;
   }

esphome/components/modbus_controller/modbus_controller.h

@@ -6,7 +6,7 @@
 #include "esphome/components/modbus/modbus.h"
 
 #include <list>
-#include <set>
+#include <map>
 #include <queue>
 #include <vector>
 
@@ -37,7 +37,7 @@ enum class ModbusFunctionCode {
   READ_FIFO_QUEUE = 0x18,                // not implemented
 };
 
-enum class ModbusRegisterType : uint8_t {
+enum class ModbusRegisterType : int {
   CUSTOM = 0x0,
   COIL = 0x01,
   DISCRETE_INPUT = 0x02,
@@ -62,6 +62,15 @@ enum class SensorValueType : uint8_t {
   FP32_R = 0xD
 };
 
+struct RegisterRange {
+  uint16_t start_address;
+  ModbusRegisterType register_type;
+  uint8_t register_count;
+  uint8_t skip_updates;  // the config value
+  uint64_t first_sensorkey;
+  uint8_t skip_updates_counter;  // the running value
+} __attribute__((packed));
+
 inline ModbusFunctionCode modbus_register_read_function(ModbusRegisterType reg_type) {
   switch (reg_type) {
     case ModbusRegisterType::COIL:
@@ -93,12 +102,26 @@ inline ModbusFunctionCode modbus_register_write_function(ModbusRegisterType reg_
       return ModbusFunctionCode::READ_WRITE_MULTIPLE_REGISTERS;
       break;
     case ModbusRegisterType::READ:
+      return ModbusFunctionCode::CUSTOM;
+      break;
     default:
       return ModbusFunctionCode::CUSTOM;
       break;
   }
 }
 
+/** All sensors are stored in a map
+ * to enable binary sensors for values encoded as bits in the same register the key of each sensor
+ * the key is a 64 bit integer that combines the register properties
+ * sensormap_ is sorted by this key. The key ensures the correct order when creating consequtive ranges
+ * Format:  function_code (8 bit) | start address (16 bit)| offset (8bit)| bitmask (32 bit)
+ */
+inline uint64_t calc_key(ModbusRegisterType register_type, uint16_t start_address, uint8_t offset = 0,
+                         uint32_t bitmask = 0) {
+  return uint64_t((uint16_t(register_type) << 24) + (uint32_t(start_address) << 8) + (offset & 0xFF)) << 32 | bitmask;
+}
+inline uint16_t register_from_key(uint64_t key) { return (key >> 40) & 0xFFFF; }
+
 inline uint8_t c_to_hex(char c) { return (c >= 'A') ? (c >= 'a') ? (c - 'a' + 10) : (c - 'A' + 10) : (c - '0'); }
 
 /** Get a byte from a hex string
@@ -198,7 +221,7 @@ template<typename N> N mask_and_shift_by_rightbit(N data, uint32_t mask) {
   if (result == 0) {
     return result;
   }
-  for (size_t pos = 0; pos < sizeof(N) << 3; pos++) {
+  for (int pos = 0; pos < sizeof(N) << 3; pos++) {
     if ((mask & (1 << pos)) != 0)
       return result >> pos;
   }
@@ -224,77 +247,29 @@ float payload_to_float(const std::vector<uint8_t> &data, SensorValueType sensor_
 
 class ModbusController;
 
-class SensorItem {
- public:
-  virtual void parse_and_publish(const std::vector<uint8_t> &data) = 0;
-
-  void set_custom_data(const std::vector<uint8_t> &data) { custom_data = data; }
-  size_t virtual get_register_size() const {
-    if (register_type == ModbusRegisterType::COIL || register_type == ModbusRegisterType::DISCRETE_INPUT)
-      return 1;
-    else  // if CONF_RESPONSE_BYTES is used override the default
-      return response_bytes > 0 ? response_bytes : register_count * 2;
-  }
-  // Override register size for modbus devices not using 1 register for one dword
-  void set_register_size(uint8_t register_size) { response_bytes = register_size; }
+struct SensorItem {
   ModbusRegisterType register_type;
   SensorValueType sensor_value_type;
   uint16_t start_address;
   uint32_t bitmask;
   uint8_t offset;
   uint8_t register_count;
-  uint8_t response_bytes{0};
   uint8_t skip_updates;
-  std::vector<uint8_t> custom_data{};
   bool force_new_range{false};
-};
 
-// ModbusController::create_register_ranges_ tries to optimize register range
-// for this the sensors must be ordered by register_type, start_address and bitmask
-class SensorItemsComparator {
- public:
-  bool operator()(const SensorItem *lhs, const SensorItem *rhs) const {
-    // first sort according to register type
-    if (lhs->register_type != rhs->register_type) {
-      return lhs->register_type < rhs->register_type;
-    }
+  virtual void parse_and_publish(const std::vector<uint8_t> &data) = 0;
 
-    // ensure that sensor with force_new_range set are before the others
-    if (lhs->force_new_range != rhs->force_new_range) {
-      return lhs->force_new_range > rhs->force_new_range;
-    }
-
-    // sort by start address
-    if (lhs->start_address != rhs->start_address) {
-      return lhs->start_address < rhs->start_address;
-    }
-
-    // sort by offset (ensures update of sensors in ascending order)
-    if (lhs->offset != rhs->offset) {
-      return lhs->offset < rhs->offset;
-    }
-
-    // The pointer to the sensor is used last to ensure that
-    // multiple sensors with the same values can be added with a stable sort order.
-    return lhs < rhs;
+  uint64_t getkey() const { return calc_key(register_type, start_address, offset, bitmask); }
+  size_t virtual get_register_size() const {
+    if (register_type == ModbusRegisterType::COIL || register_type == ModbusRegisterType::DISCRETE_INPUT)
+      return 1;
+    else
+      return register_count * 2;
   }
 };
 
-using SensorSet = std::set<SensorItem *, SensorItemsComparator>;
-
-struct RegisterRange {
-  uint16_t start_address;
-  ModbusRegisterType register_type;
-  uint8_t register_count;
-  uint8_t skip_updates;          // the config value
-  SensorSet sensors;             // all sensors of this range
-  uint8_t skip_updates_counter;  // the running value
-};
-
-class ModbusCommandItem {
- public:
+struct ModbusCommandItem {
   static const size_t MAX_PAYLOAD_BYTES = 240;
-  static const uint8_t MAX_SEND_REPEATS = 5;
   ModbusController *modbusdevice;
   uint16_t register_address;
   uint16_t register_count;
@@ -304,9 +279,7 @@ class ModbusCommandItem {
       on_data_func;
   std::vector<uint8_t> payload = {};
   bool send();
-  // wrong commands (esp. custom commands) can block the send queue
-  // limit the number of repeats
-  uint8_t send_countdown{MAX_SEND_REPEATS};
+
   /// factory methods
   /** Create modbus read command
    *  Function code 02-04
@@ -402,8 +375,8 @@ class ModbusController : public PollingComponent, public modbus::ModbusDevice {
   /// queues a modbus command in the send queue
   void queue_command(const ModbusCommandItem &command);
   /// Registers a sensor with the controller. Called by esphomes code generator
-  void add_sensor_item(SensorItem *item) { sensorset_.insert(item); }
-  /// called when a modbus response was parsed without errors
+  void add_sensor_item(SensorItem *item) { sensormap_[item->getkey()] = item; }
+  /// called when a modbus response was prased without errors
   void on_modbus_data(const std::vector<uint8_t> &data) override;
   /// called when a modbus error response was received
   void on_modbus_error(uint8_t function_code, uint8_t exception_code) override;
@@ -419,8 +392,6 @@ class ModbusController : public PollingComponent, public modbus::ModbusDevice {
  protected:
   /// parse sensormap_ and create range of sequential addresses
   size_t create_register_ranges_();
-  // find register in sensormap. Returns iterator with all registers having the same start address
-  SensorSet find_sensors_(ModbusRegisterType register_type, uint16_t start_address) const;
   /// submit the read command for the address range to the send queue
   void update_range_(RegisterRange &r);
   /// parse incoming modbus data
@@ -430,9 +401,10 @@ class ModbusController : public PollingComponent, public modbus::ModbusDevice {
   /// get the number of queued modbus commands (should be mostly empty)
   size_t get_command_queue_length_() { return command_queue_.size(); }
   /// dump the parsed sensormap for diagnostics
-  void dump_sensors_();
+  void dump_sensormap_();
   /// Collection of all sensors for this component
-  SensorSet sensorset_;
+  /// see calc_key how the key is contructed
+  std::map<uint64_t, SensorItem *> sensormap_;
   /// Continous range of modbus registers
   std::vector<RegisterRange> register_ranges_;
   /// Hold the pending requests to be sent

esphome/components/modbus_controller/number/__init__.py

@@ -4,28 +4,30 @@ from esphome.components import number
 from esphome.const import (
     CONF_ADDRESS,
     CONF_ID,
+    CONF_LAMBDA,
     CONF_MAX_VALUE,
     CONF_MIN_VALUE,
     CONF_MULTIPLY,
+    CONF_OFFSET,
     CONF_STEP,
 )
 
 from .. import (
-    add_modbus_base_properties,
     modbus_controller_ns,
-    modbus_calc_properties,
-    ModbusItemBaseSchema,
-    SensorItem,
+    ModbusController,
     SENSOR_VALUE_TYPE,
+    SensorItem,
+    TYPE_REGISTER_MAP,
 )
 
+
 from ..const import (
     CONF_BITMASK,
-    CONF_CUSTOM_COMMAND,
+    CONF_BYTE_OFFSET,
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
+    CONF_REGISTER_COUNT,
     CONF_SKIP_UPDATES,
-    CONF_USE_WRITE_MULTIPLE,
     CONF_VALUE_TYPE,
     CONF_WRITE_LAMBDA,
 )
@@ -49,38 +51,45 @@ def validate_min_max(config):
     return config
 
 
-def validate_modbus_number(config):
-    if CONF_CUSTOM_COMMAND not in config and CONF_ADDRESS not in config:
-        raise cv.Invalid(
-            f" {CONF_ADDRESS} is a required property if '{CONF_CUSTOM_COMMAND}:' isn't used"
-        )
-    return config
-
-
 CONFIG_SCHEMA = cv.All(
-    number.NUMBER_SCHEMA.extend(ModbusItemBaseSchema)
-    .extend(
+    number.NUMBER_SCHEMA.extend(
         {
             cv.GenerateID(): cv.declare_id(ModbusNumber),
+            cv.GenerateID(CONF_MODBUS_CONTROLLER_ID): cv.use_id(ModbusController),
+            cv.Required(CONF_ADDRESS): cv.positive_int,
+            cv.Optional(CONF_OFFSET, default=0): cv.positive_int,
+            cv.Optional(CONF_BYTE_OFFSET): cv.positive_int,
+            cv.Optional(CONF_BITMASK, default=0xFFFFFFFF): cv.hex_uint32_t,
             cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(SENSOR_VALUE_TYPE),
+            cv.Optional(CONF_REGISTER_COUNT, default=0): cv.positive_int,
+            cv.Optional(CONF_SKIP_UPDATES, default=0): cv.positive_int,
+            cv.Optional(CONF_FORCE_NEW_RANGE, default=False): cv.boolean,
+            cv.Optional(CONF_LAMBDA): cv.returning_lambda,
             cv.Optional(CONF_WRITE_LAMBDA): cv.returning_lambda,
+            cv.GenerateID(): cv.declare_id(ModbusNumber),
             # 24 bits are the maximum value for fp32 before precison is lost
             # 0x00FFFFFF = 16777215
             cv.Optional(CONF_MAX_VALUE, default=16777215.0): cv.float_,
             cv.Optional(CONF_MIN_VALUE, default=-16777215.0): cv.float_,
             cv.Optional(CONF_STEP, default=1): cv.positive_float,
             cv.Optional(CONF_MULTIPLY, default=1.0): cv.float_,
-            cv.Optional(CONF_USE_WRITE_MULTIPLE, default=False): cv.boolean,
         }
-    )
-    .extend(cv.polling_component_schema("60s")),
+    ).extend(cv.polling_component_schema("60s")),
     validate_min_max,
-    validate_modbus_number,
 )
 
 
 async def to_code(config):
-    byte_offset, reg_count = modbus_calc_properties(config)
+    byte_offset = 0
+    if CONF_OFFSET in config:
+        byte_offset = config[CONF_OFFSET]
+    # A CONF_BYTE_OFFSET setting overrides CONF_OFFSET
+    if CONF_BYTE_OFFSET in config:
+        byte_offset = config[CONF_BYTE_OFFSET]
+    value_type = config[CONF_VALUE_TYPE]
+    reg_count = config[CONF_REGISTER_COUNT]
+    if reg_count == 0:
+        reg_count = TYPE_REGISTER_MAP[value_type]
     var = cg.new_Pvariable(
         config[CONF_ID],
         config[CONF_ADDRESS],
@@ -106,8 +115,20 @@ async def to_code(config):
 
     cg.add(var.set_parent(parent))
     cg.add(parent.add_sensor_item(var))
-    await add_modbus_base_properties(var, config, ModbusNumber)
-    cg.add(var.set_use_write_mutiple(config[CONF_USE_WRITE_MULTIPLE]))
+    if CONF_LAMBDA in config:
+        template_ = await cg.process_lambda(
+            config[CONF_LAMBDA],
+            [
+                (ModbusNumber.operator("ptr"), "item"),
+                (cg.float_, "x"),
+                (
+                    cg.std_vector.template(cg.uint8).operator("const").operator("ref"),
+                    "data",
+                ),
+            ],
+            return_type=cg.optional.template(float),
+        )
+        cg.add(var.set_template(template_))
     if CONF_WRITE_LAMBDA in config:
         template_ = await cg.process_lambda(
             config[CONF_WRITE_LAMBDA],

esphome/components/modbus_controller/number/modbus_number.cpp

@@ -8,7 +8,12 @@ namespace modbus_controller {
 static const char *const TAG = "modbus.number";
 
 void ModbusNumber::parse_and_publish(const std::vector<uint8_t> &data) {
-  float result = payload_to_float(data, *this) / multiply_by_;
+  union {
+    float float_value;
+    uint32_t raw;
+  } raw_to_float;
+
+  float result = payload_to_float(data, *this);
 
   // Is there a lambda registered
   // call it with the pre converted value and the raw data array
@@ -26,8 +31,13 @@ void ModbusNumber::parse_and_publish(const std::vector<uint8_t> &data) {
 }
 
 void ModbusNumber::control(float value) {
+  union {
+    float float_value;
+    uint32_t raw;
+  } raw_to_float;
+
   std::vector<uint16_t> data;
-  float write_value = value;
+  auto original_value = value;
   // Is there are lambda configured?
   if (this->write_transform_func_.has_value()) {
     // data is passed by reference
@@ -36,32 +46,28 @@ void ModbusNumber::control(float value) {
     auto val = (*this->write_transform_func_)(this, value, data);
     if (val.has_value()) {
       ESP_LOGV(TAG, "Value overwritten by lambda");
-      write_value = val.value();
+      value = val.value();
     } else {
       ESP_LOGV(TAG, "Communication handled by lambda - exiting control");
       return;
     }
   } else {
-    write_value = multiply_by_ * write_value;
+    value = multiply_by_ * value;
   }
 
   // lambda didn't set payload
   if (data.empty()) {
-    data = float_to_payload(write_value, this->sensor_value_type);
+    data = float_to_payload(value, this->sensor_value_type);
   }
 
   ESP_LOGD(TAG,
            "Updating register: connected Sensor=%s start address=0x%X register count=%d new value=%.02f (val=%.02f)",
-           this->get_name().c_str(), this->start_address, this->register_count, value, write_value);
+           this->get_name().c_str(), this->start_address, this->register_count, value, value);
 
   // Create and send the write command
-  ModbusCommandItem write_cmd;
-  if (this->register_count == 1 && !this->use_write_multiple_) {
-    write_cmd = ModbusCommandItem::create_write_single_command(parent_, this->start_address + this->offset, data[0]);
-  } else {
-    write_cmd = ModbusCommandItem::create_write_multiple_command(parent_, this->start_address + this->offset,
-                                                                 this->register_count, data);
-  }
+  auto write_cmd = ModbusCommandItem::create_write_multiple_command(parent_, this->start_address + this->offset,
+                                                                    this->register_count, data);
+
   // publish new value
   write_cmd.on_data_func = [this, write_cmd, value](ModbusRegisterType register_type, uint16_t start_address,
                                                     const std::vector<uint8_t> &data) {

esphome/components/modbus_controller/number/modbus_number.h

@@ -35,7 +35,6 @@ class ModbusNumber : public number::Number, public Component, public SensorItem
   using write_transform_func_t = std::function<optional<float>(ModbusNumber *, float, std::vector<uint16_t> &)>;
   void set_template(transform_func_t &&f) { this->transform_func_ = f; }
   void set_write_template(write_transform_func_t &&f) { this->write_transform_func_ = f; }
-  void set_use_write_mutiple(bool use_write_multiple) { this->use_write_multiple_ = use_write_multiple; }
 
  protected:
   void control(float value) override;
@@ -43,7 +42,6 @@ class ModbusNumber : public number::Number, public Component, public SensorItem
   optional<write_transform_func_t> write_transform_func_;
   ModbusController *parent_;
   float multiply_by_{1.0};
-  bool use_write_multiple_{false};
 };
 
 }  // namespace modbus_controller

esphome/components/modbus_controller/output/__init__.py

@@ -1,109 +1,85 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import output
+
 from esphome.const import (
     CONF_ADDRESS,
     CONF_ID,
     CONF_MULTIPLY,
+    CONF_OFFSET,
 )
 
 from .. import (
-    modbus_controller_ns,
-    modbus_calc_properties,
-    ModbusItemBaseSchema,
     SensorItem,
-    SENSOR_VALUE_TYPE,
+    modbus_controller_ns,
+    ModbusController,
+    TYPE_REGISTER_MAP,
 )
 
 from ..const import (
+    CONF_BYTE_OFFSET,
     CONF_MODBUS_CONTROLLER_ID,
-    CONF_REGISTER_TYPE,
-    CONF_USE_WRITE_MULTIPLE,
+    CONF_REGISTER_COUNT,
     CONF_VALUE_TYPE,
     CONF_WRITE_LAMBDA,
 )
+from ..sensor import SENSOR_VALUE_TYPE
 
 DEPENDENCIES = ["modbus_controller"]
 CODEOWNERS = ["@martgras"]
 
 
-ModbusFloatOutput = modbus_controller_ns.class_(
-    "ModbusFloatOutput", cg.Component, output.FloatOutput, SensorItem
-)
-ModbusBinaryOutput = modbus_controller_ns.class_(
-    "ModbusBinaryOutput", cg.Component, output.BinaryOutput, SensorItem
+ModbusOutput = modbus_controller_ns.class_(
+    "ModbusOutput", cg.Component, output.FloatOutput, SensorItem
 )
 
-
-CONFIG_SCHEMA = cv.typed_schema(
-    {
-        "coil": output.BINARY_OUTPUT_SCHEMA.extend(ModbusItemBaseSchema).extend(
-            {
-                cv.GenerateID(): cv.declare_id(ModbusBinaryOutput),
-                cv.Optional(CONF_WRITE_LAMBDA): cv.returning_lambda,
-                cv.Optional(CONF_USE_WRITE_MULTIPLE, default=False): cv.boolean,
-            }
-        ),
-        "holding": output.FLOAT_OUTPUT_SCHEMA.extend(ModbusItemBaseSchema).extend(
-            {
-                cv.GenerateID(): cv.declare_id(ModbusFloatOutput),
-                cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(
-                    SENSOR_VALUE_TYPE
-                ),
-                cv.Optional(CONF_WRITE_LAMBDA): cv.returning_lambda,
-                cv.Optional(CONF_MULTIPLY, default=1.0): cv.float_,
-                cv.Optional(CONF_USE_WRITE_MULTIPLE, default=False): cv.boolean,
-            }
-        ),
-    },
-    lower=True,
-    key=CONF_REGISTER_TYPE,
-    default_type="holding",
+CONFIG_SCHEMA = cv.All(
+    output.FLOAT_OUTPUT_SCHEMA.extend(
+        {
+            cv.GenerateID(CONF_MODBUS_CONTROLLER_ID): cv.use_id(ModbusController),
+            cv.GenerateID(): cv.declare_id(ModbusOutput),
+            cv.Required(CONF_ADDRESS): cv.positive_int,
+            cv.Optional(CONF_OFFSET, default=0): cv.positive_int,
+            cv.Optional(CONF_BYTE_OFFSET): cv.positive_int,
+            cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(SENSOR_VALUE_TYPE),
+            cv.Optional(CONF_REGISTER_COUNT, default=0): cv.positive_int,
+            cv.Optional(CONF_WRITE_LAMBDA): cv.returning_lambda,
+            cv.Optional(CONF_MULTIPLY, default=1.0): cv.float_,
+        }
+    ),
 )
 
 
 async def to_code(config):
-    byte_offset, reg_count = modbus_calc_properties(config)
-    # Binary Output
-    if config[CONF_REGISTER_TYPE] == "coil":
-        var = cg.new_Pvariable(
-            config[CONF_ID],
-            config[CONF_ADDRESS],
-            byte_offset,
-        )
-        if CONF_WRITE_LAMBDA in config:
-            template_ = await cg.process_lambda(
-                config[CONF_WRITE_LAMBDA],
-                [
-                    (ModbusBinaryOutput.operator("ptr"), "item"),
-                    (cg.bool_, "x"),
-                    (cg.std_vector.template(cg.uint8).operator("ref"), "payload"),
-                ],
-                return_type=cg.optional.template(bool),
-            )
-    # Float Output
-    else:
-        var = cg.new_Pvariable(
-            config[CONF_ID],
-            config[CONF_ADDRESS],
-            byte_offset,
-            config[CONF_VALUE_TYPE],
-            reg_count,
-        )
-        cg.add(var.set_write_multiply(config[CONF_MULTIPLY]))
-        if CONF_WRITE_LAMBDA in config:
-            template_ = await cg.process_lambda(
-                config[CONF_WRITE_LAMBDA],
-                [
-                    (ModbusFloatOutput.operator("ptr"), "item"),
-                    (cg.float_, "x"),
-                    (cg.std_vector.template(cg.uint16).operator("ref"), "payload"),
-                ],
-                return_type=cg.optional.template(float),
-            )
+    byte_offset = 0
+    if CONF_OFFSET in config:
+        byte_offset = config[CONF_OFFSET]
+    # A CONF_BYTE_OFFSET setting overrides CONF_OFFSET
+    if CONF_BYTE_OFFSET in config:
+        byte_offset = config[CONF_BYTE_OFFSET]
+    value_type = config[CONF_VALUE_TYPE]
+    reg_count = config[CONF_REGISTER_COUNT]
+    if reg_count == 0:
+        reg_count = TYPE_REGISTER_MAP[value_type]
+    var = cg.new_Pvariable(
+        config[CONF_ID],
+        config[CONF_ADDRESS],
+        byte_offset,
+        value_type,
+        reg_count,
+    )
     await output.register_output(var, config)
+    cg.add(var.set_write_multiply(config[CONF_MULTIPLY]))
     parent = await cg.get_variable(config[CONF_MODBUS_CONTROLLER_ID])
-    cg.add(var.set_use_write_mutiple(config[CONF_USE_WRITE_MULTIPLE]))
     cg.add(var.set_parent(parent))
     if CONF_WRITE_LAMBDA in config:
+        template_ = await cg.process_lambda(
+            config[CONF_WRITE_LAMBDA],
+            [
+                (ModbusOutput.operator("ptr"), "item"),
+                (cg.float_, "x"),
+                (cg.std_vector.template(cg.uint16).operator("ref"), "payload"),
+            ],
+            return_type=cg.optional.template(float),
+        )
         cg.add(var.set_write_template(template_))

esphome/components/modbus_controller/output/modbus_output.cpp

@@ -1,17 +1,23 @@
 #include <vector>
 #include "modbus_output.h"
 #include "esphome/core/log.h"
-#include "esphome/core/helpers.h"
 
 namespace esphome {
 namespace modbus_controller {
 
 static const char *const TAG = "modbus_controller.output";
 
+void ModbusOutput::setup() {}
+
 /** Write a value to the device
  *
  */
-void ModbusFloatOutput::write_state(float value) {
+void ModbusOutput::write_state(float value) {
+  union {
+    float float_value;
+    uint32_t raw;
+  } raw_to_float;
+
   std::vector<uint16_t> data;
   auto original_value = value;
   // Is there are lambda configured?
@@ -39,72 +45,16 @@ void ModbusFloatOutput::write_state(float value) {
            this->start_address, this->register_count, value, original_value);
 
   // Create and send the write command
-  ModbusCommandItem write_cmd;
-  if (this->register_count == 1 && !this->use_write_multiple_) {
-    write_cmd = ModbusCommandItem::create_write_single_command(parent_, this->start_address + this->offset, data[0]);
-  } else {
-    write_cmd = ModbusCommandItem::create_write_multiple_command(parent_, this->start_address + this->offset,
-                                                                 this->register_count, data);
-  }
+  auto write_cmd =
+      ModbusCommandItem::create_write_multiple_command(parent_, this->start_address, this->register_count, data);
   parent_->queue_command(write_cmd);
 }
 
-void ModbusFloatOutput::dump_config() {
+void ModbusOutput::dump_config() {
   ESP_LOGCONFIG(TAG, "Modbus Float Output:");
   LOG_FLOAT_OUTPUT(this);
-  ESP_LOGCONFIG(TAG, "  Device start address: 0x%X", this->start_address);
-  ESP_LOGCONFIG(TAG, "  Register count: %d", this->register_count);
-  ESP_LOGCONFIG(TAG, "  Value type: %d", static_cast<int>(this->sensor_value_type));
-}
-
-// ModbusBinaryOutput
-void ModbusBinaryOutput::write_state(bool state) {
-  // This will be called every time the user requests a state change.
-  ModbusCommandItem cmd;
-  std::vector<uint8_t> data;
-
-  // Is there are lambda configured?
-  if (this->write_transform_func_.has_value()) {
-    // data is passed by reference
-    // the lambda can fill the empty vector directly
-    // in that case the return value is ignored
-    auto val = (*this->write_transform_func_)(this, state, data);
-    if (val.has_value()) {
-      ESP_LOGV(TAG, "Value overwritten by lambda");
-      state = val.value();
-    } else {
-      ESP_LOGV(TAG, "Communication handled by lambda - exiting control");
-      return;
-    }
-  }
-  if (!data.empty()) {
-    ESP_LOGV(TAG, "Modbus binary output write raw: %s", format_hex_pretty(data).c_str());
-    cmd = ModbusCommandItem::create_custom_command(
-        this->parent_, data,
-        [this, cmd](ModbusRegisterType register_type, uint16_t start_address, const std::vector<uint8_t> &data) {
-          this->parent_->on_write_register_response(cmd.register_type, this->start_address, data);
-        });
-  } else {
-    ESP_LOGV(TAG, "Write new state: value is %s, type is %d address = %X, offset = %x", ONOFF(state),
-             (int) this->register_type, this->start_address, this->offset);
-
-    // offset for coil and discrete inputs is the coil/register number not bytes
-    if (this->use_write_multiple_) {
-      std::vector<bool> states{state};
-      cmd = ModbusCommandItem::create_write_multiple_coils(parent_, this->start_address + this->offset, states);
-    } else {
-      cmd = ModbusCommandItem::create_write_single_coil(parent_, this->start_address + this->offset, state);
-    }
-  }
-  this->parent_->queue_command(cmd);
-}
-
-void ModbusBinaryOutput::dump_config() {
-  ESP_LOGCONFIG(TAG, "Modbus Binary Output:");
-  LOG_BINARY_OUTPUT(this);
-  ESP_LOGCONFIG(TAG, "  Device start address: 0x%X", this->start_address);
-  ESP_LOGCONFIG(TAG, "  Register count: %d", this->register_count);
-  ESP_LOGCONFIG(TAG, "  Value type: %d", static_cast<int>(this->sensor_value_type));
+  ESP_LOGCONFIG(TAG, "Modbus device start address=0x%X register count=%d value type=%hhu", this->start_address,
+                this->register_count, this->sensor_value_type);
 }
 
 }  // namespace modbus_controller

esphome/components/modbus_controller/output/modbus_output.h

@@ -7,9 +7,11 @@
 namespace esphome {
 namespace modbus_controller {
 
-class ModbusFloatOutput : public output::FloatOutput, public Component, public SensorItem {
+using value_to_data_t = std::function<float>(float);
+
+class ModbusOutput : public output::FloatOutput, public Component, public SensorItem {
  public:
-  ModbusFloatOutput(uint16_t start_address, uint8_t offset, SensorValueType value_type, int register_count)
+  ModbusOutput(uint16_t start_address, uint8_t offset, SensorValueType value_type, int register_count)
       : output::FloatOutput(), Component() {
     this->register_type = ModbusRegisterType::HOLDING;
     this->start_address = start_address;
@@ -21,6 +23,7 @@ class ModbusFloatOutput : public output::FloatOutput, public Component, public S
     this->start_address += offset;
     this->offset = 0;
   }
+  void setup() override;
   void dump_config() override;
 
   void set_parent(ModbusController *parent) { this->parent_ = parent; }
@@ -28,9 +31,8 @@ class ModbusFloatOutput : public output::FloatOutput, public Component, public S
   // Do nothing
   void parse_and_publish(const std::vector<uint8_t> &data) override{};
 
-  using write_transform_func_t = std::function<optional<float>(ModbusFloatOutput *, float, std::vector<uint16_t> &)>;
+  using write_transform_func_t = std::function<optional<float>(ModbusOutput *, float, std::vector<uint16_t> &)>;
   void set_write_template(write_transform_func_t &&f) { this->write_transform_func_ = f; }
-  void set_use_write_mutiple(bool use_write_multiple) { this->use_write_multiple_ = use_write_multiple; }
 
  protected:
   void write_state(float value) override;
@@ -38,37 +40,6 @@ class ModbusFloatOutput : public output::FloatOutput, public Component, public S
 
   ModbusController *parent_;
   float multiply_by_{1.0};
-  bool use_write_multiple_;
-};
-
-class ModbusBinaryOutput : public output::BinaryOutput, public Component, public SensorItem {
- public:
-  ModbusBinaryOutput(uint16_t start_address, uint8_t offset) : output::BinaryOutput(), Component() {
-    this->register_type = ModbusRegisterType::COIL;
-    this->start_address = start_address;
-    this->bitmask = bitmask;
-    this->sensor_value_type = SensorValueType::BIT;
-    this->skip_updates = 0;
-    this->register_count = 1;
-    this->start_address += offset;
-    this->offset = 0;
-  }
-  void dump_config() override;
-
-  void set_parent(ModbusController *parent) { this->parent_ = parent; }
-  // Do nothing
-  void parse_and_publish(const std::vector<uint8_t> &data) override{};
-
-  using write_transform_func_t = std::function<optional<bool>(ModbusBinaryOutput *, bool, std::vector<uint8_t> &)>;
-  void set_write_template(write_transform_func_t &&f) { this->write_transform_func_ = f; }
-  void set_use_write_mutiple(bool use_write_multiple) { this->use_write_multiple_ = use_write_multiple; }
-
- protected:
-  void write_state(bool state) override;
-  optional<write_transform_func_t> write_transform_func_{nullopt};
-
-  ModbusController *parent_;
-  bool use_write_multiple_;
 };
 
 }  // namespace modbus_controller

esphome/components/modbus_controller/sensor/__init__.py

@@ -2,19 +2,18 @@ from esphome.components import sensor
 import esphome.config_validation as cv
 import esphome.codegen as cg
 
-from esphome.const import CONF_ID, CONF_ADDRESS
+from esphome.const import CONF_ID, CONF_ADDRESS, CONF_LAMBDA, CONF_OFFSET
 from .. import (
-    add_modbus_base_properties,
-    modbus_controller_ns,
-    modbus_calc_properties,
-    validate_modbus_register,
-    ModbusItemBaseSchema,
     SensorItem,
+    modbus_controller_ns,
+    ModbusController,
     MODBUS_REGISTER_TYPE,
     SENSOR_VALUE_TYPE,
+    TYPE_REGISTER_MAP,
 )
 from ..const import (
     CONF_BITMASK,
+    CONF_BYTE_OFFSET,
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
     CONF_REGISTER_COUNT,
@@ -32,30 +31,43 @@ ModbusSensor = modbus_controller_ns.class_(
 )
 
 CONFIG_SCHEMA = cv.All(
-    sensor.SENSOR_SCHEMA.extend(cv.COMPONENT_SCHEMA)
-    .extend(ModbusItemBaseSchema)
-    .extend(
+    sensor.SENSOR_SCHEMA.extend(
         {
             cv.GenerateID(): cv.declare_id(ModbusSensor),
-            cv.Optional(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
+            cv.GenerateID(CONF_MODBUS_CONTROLLER_ID): cv.use_id(ModbusController),
+            cv.Required(CONF_ADDRESS): cv.positive_int,
+            cv.Required(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
+            cv.Optional(CONF_OFFSET, default=0): cv.positive_int,
+            cv.Optional(CONF_BYTE_OFFSET): cv.positive_int,
+            cv.Optional(CONF_BITMASK, default=0xFFFFFFFF): cv.hex_uint32_t,
             cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(SENSOR_VALUE_TYPE),
             cv.Optional(CONF_REGISTER_COUNT, default=0): cv.positive_int,
+            cv.Optional(CONF_SKIP_UPDATES, default=0): cv.positive_int,
+            cv.Optional(CONF_FORCE_NEW_RANGE, default=False): cv.boolean,
+            cv.Optional(CONF_LAMBDA): cv.returning_lambda,
         }
-    ),
-    validate_modbus_register,
+    ).extend(cv.COMPONENT_SCHEMA),
 )
 
 
 async def to_code(config):
-    byte_offset, reg_count = modbus_calc_properties(config)
+    byte_offset = 0
+    if CONF_OFFSET in config:
+        byte_offset = config[CONF_OFFSET]
+    # A CONF_BYTE_OFFSET setting overrides CONF_OFFSET
+    if CONF_BYTE_OFFSET in config:
+        byte_offset = config[CONF_BYTE_OFFSET]
     value_type = config[CONF_VALUE_TYPE]
+    reg_count = config[CONF_REGISTER_COUNT]
+    if reg_count == 0:
+        reg_count = TYPE_REGISTER_MAP[value_type]
     var = cg.new_Pvariable(
         config[CONF_ID],
         config[CONF_REGISTER_TYPE],
         config[CONF_ADDRESS],
         byte_offset,
         config[CONF_BITMASK],
-        value_type,
+        config[CONF_VALUE_TYPE],
         reg_count,
         config[CONF_SKIP_UPDATES],
         config[CONF_FORCE_NEW_RANGE],
@@ -65,4 +77,17 @@ async def to_code(config):
 
     paren = await cg.get_variable(config[CONF_MODBUS_CONTROLLER_ID])
     cg.add(paren.add_sensor_item(var))
-    await add_modbus_base_properties(var, config, ModbusSensor)
+    if CONF_LAMBDA in config:
+        template_ = await cg.process_lambda(
+            config[CONF_LAMBDA],
+            [
+                (ModbusSensor.operator("ptr"), "item"),
+                (cg.float_, "x"),
+                (
+                    cg.std_vector.template(cg.uint8).operator("const").operator("ref"),
+                    "data",
+                ),
+            ],
+            return_type=cg.optional.template(float),
+        )
+        cg.add(var.set_template(template_))

esphome/components/modbus_controller/sensor/modbus_sensor.cpp

@@ -10,6 +10,11 @@ static const char *const TAG = "modbus_controller.sensor";
 void ModbusSensor::dump_config() { LOG_SENSOR(TAG, "Modbus Controller Sensor", this); }
 
 void ModbusSensor::parse_and_publish(const std::vector<uint8_t> &data) {
+  union {
+    float float_value;
+    uint32_t raw;
+  } raw_to_float;
+
   float result = payload_to_float(data, *this);
 
   // Is there a lambda registered

esphome/components/modbus_controller/sensor/modbus_sensor.h

@@ -25,7 +25,6 @@ class ModbusSensor : public Component, public sensor::Sensor, public SensorItem
   void parse_and_publish(const std::vector<uint8_t> &data) override;
   void dump_config() override;
   using transform_func_t = std::function<optional<float>(ModbusSensor *, float, const std::vector<uint8_t> &)>;
-
   void set_template(transform_func_t &&f) { this->transform_func_ = f; }
 
  protected:

esphome/components/modbus_controller/switch/__init__.py

@@ -3,24 +3,19 @@ import esphome.config_validation as cv
 import esphome.codegen as cg
 
 
-from esphome.const import CONF_ID, CONF_ADDRESS
+from esphome.const import CONF_ID, CONF_ADDRESS, CONF_LAMBDA, CONF_OFFSET
 from .. import (
-    add_modbus_base_properties,
-    modbus_controller_ns,
-    modbus_calc_properties,
-    validate_modbus_register,
-    ModbusItemBaseSchema,
-    SensorItem,
     MODBUS_REGISTER_TYPE,
+    SensorItem,
+    modbus_controller_ns,
+    ModbusController,
 )
 from ..const import (
     CONF_BITMASK,
+    CONF_BYTE_OFFSET,
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
     CONF_REGISTER_TYPE,
-    CONF_SKIP_UPDATES,
-    CONF_USE_WRITE_MULTIPLE,
-    CONF_WRITE_LAMBDA,
 )
 
 DEPENDENCIES = ["modbus_controller"]
@@ -31,48 +26,56 @@ ModbusSwitch = modbus_controller_ns.class_(
     "ModbusSwitch", cg.Component, switch.Switch, SensorItem
 )
 
+
 CONFIG_SCHEMA = cv.All(
-    switch.SWITCH_SCHEMA.extend(cv.COMPONENT_SCHEMA)
-    .extend(ModbusItemBaseSchema)
-    .extend(
+    switch.SWITCH_SCHEMA.extend(
         {
             cv.GenerateID(): cv.declare_id(ModbusSwitch),
-            cv.Optional(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
-            cv.Optional(CONF_USE_WRITE_MULTIPLE, default=False): cv.boolean,
-            cv.Optional(CONF_WRITE_LAMBDA): cv.returning_lambda,
+            cv.GenerateID(CONF_MODBUS_CONTROLLER_ID): cv.use_id(ModbusController),
+            cv.Required(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
+            cv.Required(CONF_ADDRESS): cv.positive_int,
+            cv.Optional(CONF_OFFSET, default=0): cv.positive_int,
+            cv.Optional(CONF_BYTE_OFFSET): cv.positive_int,
+            cv.Optional(CONF_BITMASK, default=0x1): cv.hex_uint32_t,
+            cv.Optional(CONF_FORCE_NEW_RANGE, default=False): cv.boolean,
+            cv.Optional(CONF_LAMBDA): cv.returning_lambda,
         }
-    ),
-    validate_modbus_register,
+    ).extend(cv.COMPONENT_SCHEMA),
 )
 
 
 async def to_code(config):
-    byte_offset, _ = modbus_calc_properties(config)
+    byte_offset = 0
+    if CONF_OFFSET in config:
+        byte_offset = config[CONF_OFFSET]
+    # A CONF_BYTE_OFFSET setting overrides CONF_OFFSET
+    if CONF_BYTE_OFFSET in config:
+        byte_offset = config[CONF_BYTE_OFFSET]
     var = cg.new_Pvariable(
         config[CONF_ID],
         config[CONF_REGISTER_TYPE],
         config[CONF_ADDRESS],
         byte_offset,
         config[CONF_BITMASK],
-        config[CONF_SKIP_UPDATES],
         config[CONF_FORCE_NEW_RANGE],
     )
     await cg.register_component(var, config)
     await switch.register_switch(var, config)
 
     paren = await cg.get_variable(config[CONF_MODBUS_CONTROLLER_ID])
-    cg.add(var.set_parent(paren))
-    cg.add(var.set_use_write_mutiple(config[CONF_USE_WRITE_MULTIPLE]))
     cg.add(paren.add_sensor_item(var))
-    if CONF_WRITE_LAMBDA in config:
-        template_ = await cg.process_lambda(
-            config[CONF_WRITE_LAMBDA],
+    cg.add(var.set_parent(paren))
+    if CONF_LAMBDA in config:
+        publish_template_ = await cg.process_lambda(
+            config[CONF_LAMBDA],
             [
                 (ModbusSwitch.operator("ptr"), "item"),
-                (cg.bool_, "x"),
-                (cg.std_vector.template(cg.uint8).operator("ref"), "payload"),
+                (bool, "x"),
+                (
+                    cg.std_vector.template(cg.uint8).operator("const").operator("ref"),
+                    "data",
+                ),
             ],
             return_type=cg.optional.template(bool),
         )
-        cg.add(var.set_write_template(template_))
-    await add_modbus_base_properties(var, config, ModbusSwitch, bool, bool)
+        cg.add(var.set_template(publish_template_))