Alter improv_serial log levels

.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
@@ -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

CODEOWNERS

@@ -30,7 +30,6 @@ esphome/components/bang_bang/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
 esphome/components/ble_client/* @buxtronix
 esphome/components/bme680_bsec/* @trvrnrth
-esphome/components/button/* @esphome/core
 esphome/components/canbus/* @danielschramm @mvturnho
 esphome/components/cap1188/* @MrEditor97
 esphome/components/captive_portal/* @OttoWinter
@@ -181,7 +180,6 @@ esphome/components/tuya/binary_sensor/* @jesserockz
 esphome/components/tuya/climate/* @jesserockz
 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

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/animation/__init__.py

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

esphome/components/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

@@ -132,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_];
@@ -619,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();
@@ -676,28 +674,6 @@ 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_)

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

@@ -174,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;
@@ -197,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;
     }
@@ -244,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;
     }
@@ -541,6 +544,7 @@ 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;
@@ -580,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++) {
@@ -774,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;
@@ -847,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;
     }
@@ -867,6 +874,7 @@ APIError APIPlaintextFrameHelper::try_read_frame_(ParsedFrame *frame) {
 }
 
 APIError APIPlaintextFrameHelper::read_packet(ReadPacketBuffer *buffer) {
+  int err;
   APIError aerr;
 
   if (state_ != State::DATA) {
@@ -886,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;
   }
@@ -929,6 +940,7 @@ 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;
@@ -968,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/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/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,27 +178,21 @@ 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_LOGD(TAG, "Got temperature=%.1f°C pressure=%.1fhPa humidity=%.1f%%", temperature, pressure, humidity);
     if (this->temperature_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/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/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/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/dashboard_import/__init__.py

@@ -29,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
 """
 
 
@@ -54,6 +55,6 @@ def import_config(path: str, name: str, project_name: str, import_url: str) -> N
         "esphome": {"name_add_mac_suffix": False},
     }
     p.write_text(
-        dump(config) + WIFI_CONFIG,
+        dump(config) + WIFI_MESSAGE,
         encoding="utf8",
     )

esphome/components/deep_sleep/deep_sleep_component.cpp

@@ -77,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/display/display_buffer.cpp

@@ -496,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));
@@ -505,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) |
@@ -517,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/esp32/__init__.py

@@ -311,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():

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/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/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/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], sizeof(buf) - 2).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/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/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

@@ -111,7 +111,7 @@ std::vector<uint8_t> ImprovSerialComponent::build_version_info_() {
 bool ImprovSerialComponent::parse_improv_serial_byte_(uint8_t byte) {
   size_t at = this->rx_buffer_.size();
   this->rx_buffer_.push_back(byte);
-  ESP_LOGD(TAG, "Improv Serial byte: 0x%02X", byte);
+  ESP_LOGV(TAG, "Improv Serial byte: 0x%02X", byte);
   const uint8_t *raw = &this->rx_buffer_[0];
   if (at == 0)
     return byte == 'I';
@@ -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) {
@@ -176,7 +176,7 @@ bool ImprovSerialComponent::parse_improv_payload_(improv::ImprovCommand &command
       wifi::global_wifi_component->set_sta(sta);
       wifi::global_wifi_component->start_scanning();
       this->set_state_(improv::STATE_PROVISIONING);
-      ESP_LOGD(TAG, "Received Improv wifi settings ssid=%s, password=" LOG_SECRET("%s"), command.ssid.c_str(),
+      ESP_LOGI(TAG, "Received Improv wifi settings ssid=%s, password=" LOG_SECRET("%s"), command.ssid.c_str(),
                command.password.c_str());
 
       auto f = std::bind(&ImprovSerialComponent::on_wifi_connect_timeout_, this);

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/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};
 };
 

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/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/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"]
@@ -48,7 +37,6 @@ MODBUS_FUNCTION_CODE = {
 ModbusRegisterType_ns = modbus_controller_ns.namespace("ModbusRegisterType")
 ModbusRegisterType = ModbusRegisterType_ns.enum("ModbusRegisterType")
 MODBUS_REGISTER_TYPE = {
-    "custom": ModbusRegisterType.CUSTOM,
     "coil": ModbusRegisterType.COIL,
     "discrete_input": ModbusRegisterType.DISCRETE_INPUT,
     "holding": ModbusRegisterType.HOLDING,
@@ -107,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]))
@@ -225,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, cg.float_, 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/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

@@ -28,10 +28,7 @@ bool ModbusController::send_next_command_() {
              command->register_address, command->register_count);
     command->send();
     this->last_command_timestamp_ = millis();
-    // remove from queue if no handler is defined or command was sent too often
-    if (!command->on_data_func || command->send_countdown < 1) {
-      ESP_LOGD(TAG, "Modbus command to device=%d register=0x%02X countdown=%d removed from queue after send",
-               this->address_, command->register_address, command->send_countdown);
+    if (!command->on_data_func) {  // No handler remove from queue directly after sending
       command_queue_.pop_front();
     }
   }
@@ -72,30 +69,24 @@ void ModbusController::on_modbus_error(uint8_t function_code, uint8_t exception_
   }
 }
 
-std::map<uint64_t, SensorItem *>::iterator ModbusController::find_register_(ModbusRegisterType register_type,
-                                                                            uint16_t start_address) {
+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, "No matching range for sensor found - start_address :  0x%X", start_address);
-  } else {
-    auto map_it = sensormap_.find(vec_it->first_sensorkey);
-    if (map_it == sensormap_.end()) {
-      ESP_LOGE(TAG, "No sensor found in at start_address :  0x%X (0x%llX)", start_address, vec_it->first_sensorkey);
-    } else {
-      return sensormap_.find(vec_it->first_sensorkey);
-    }
+    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;
   }
-  // not found
-  return std::end(sensormap_);
-}
-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 map_it = find_register_(register_type, start_address);
   // loop through all sensors with the same start address
   while (map_it != sensormap_.end() && map_it->second->start_address == start_address) {
     if (map_it->second->register_type == register_type) {
@@ -125,23 +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 it = this->find_register_(r.register_type, r.start_address);
-      if (it != sensormap_.end()) {
-        auto command_item = ModbusCommandItem::create_custom_command(
-            this, it->second->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 = it->second->start_address;
-        command_item.register_count = it->second->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--;
@@ -445,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;
 }
 
@@ -573,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

@@ -102,6 +102,8 @@ 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;
@@ -219,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;
   }
@@ -245,36 +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; }
-  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  // 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};
+
+  virtual void parse_and_publish(const std::vector<uint8_t> &data) = 0;
+
+  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;
+  }
 };
 
-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;
@@ -284,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
@@ -399,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
-  std::map<uint64_t, SensorItem *>::iterator find_register_(ModbusRegisterType register_type, uint16_t start_address);
   /// submit the read command for the address range to the send queue
   void update_range_(RegisterRange &r);
   /// parse incoming modbus data

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,6 +8,11 @@ namespace modbus_controller {
 static const char *const TAG = "modbus.number";
 
 void ModbusNumber::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
@@ -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, write_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

@@ -6,22 +6,24 @@ from esphome.const import (
     CONF_ADDRESS,
     CONF_ID,
     CONF_MULTIPLY,
+    CONF_OFFSET,
 )
 
 from .. import (
-    modbus_controller_ns,
-    modbus_calc_properties,
-    validate_modbus_register,
-    ModbusItemBaseSchema,
     SensorItem,
+    modbus_controller_ns,
+    ModbusController,
+    TYPE_REGISTER_MAP,
 )
 
 from ..const import (
+    CONF_BYTE_OFFSET,
     CONF_MODBUS_CONTROLLER_ID,
-    CONF_USE_WRITE_MULTIPLE,
+    CONF_REGISTER_COUNT,
     CONF_VALUE_TYPE,
     CONF_WRITE_LAMBDA,
 )
+from ..sensor import SENSOR_VALUE_TYPE
 
 DEPENDENCIES = ["modbus_controller"]
 CODEOWNERS = ["@martgras"]
@@ -32,31 +34,43 @@ ModbusOutput = modbus_controller_ns.class_(
 )
 
 CONFIG_SCHEMA = cv.All(
-    output.FLOAT_OUTPUT_SCHEMA.extend(ModbusItemBaseSchema).extend(
+    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_,
-            cv.Optional(CONF_USE_WRITE_MULTIPLE, default=False): cv.boolean,
         }
     ),
-    validate_modbus_register,
 )
 
 
 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],
         byte_offset,
-        config[CONF_VALUE_TYPE],
+        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(

esphome/components/modbus_controller/output/modbus_output.cpp

@@ -13,6 +13,11 @@ void ModbusOutput::setup() {}
  *
  */
 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?
@@ -40,14 +45,8 @@ void ModbusOutput::write_state(float value) {
            this->start_address, this->register_count, value, original_value);
 
   // Create and send the write command
-  // 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);
 }
 

esphome/components/modbus_controller/output/modbus_output.h

@@ -33,7 +33,6 @@ class ModbusOutput : public output::FloatOutput, public Component, public Sensor
 
   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;
@@ -41,7 +40,6 @@ class ModbusOutput : public output::FloatOutput, public Component, public Sensor
 
   ModbusController *parent_;
   float multiply_by_{1.0};
-  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,23 +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_USE_WRITE_MULTIPLE,
-    CONF_WRITE_LAMBDA,
 )
 
 DEPENDENCIES = ["modbus_controller"]
@@ -30,23 +26,31 @@ 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],
@@ -59,18 +63,19 @@ async def to_code(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_))

esphome/components/modbus_controller/switch/modbus_switch.cpp

@@ -45,50 +45,22 @@ void ModbusSwitch::parse_and_publish(const std::vector<uint8_t> &data) {
 void ModbusSwitch::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 Switch write raw: %s", hexencode(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_state '%s': new value = %s type = %d address = %X offset = %x", this->get_name().c_str(),
-             ONOFF(state), (int) this->register_type, this->start_address, this->offset);
-    if (this->register_type == ModbusRegisterType::COIL) {
+  ESP_LOGV(TAG, "write_state '%s': new value = %s type = %d address = %X offset = %x", this->get_name().c_str(),
+           ONOFF(state), (int) this->register_type, this->start_address, this->offset);
+  switch (this->register_type) {
+    case ModbusRegisterType::COIL:
       // 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);
-      }
-    } else {
+      cmd = ModbusCommandItem::create_write_single_coil(parent_, this->start_address + this->offset, state);
+      break;
+    case ModbusRegisterType::DISCRETE_INPUT:
+      cmd = ModbusCommandItem::create_write_single_command(parent_, this->start_address + this->offset, state);
+      break;
+
+    default:
       // since offset is in bytes and a register is 16 bits we get the start by adding offset/2
-      if (this->use_write_multiple_) {
-        std::vector<uint16_t> bool_states(1, state ? (0xFFFF & this->bitmask) : 0);
-        cmd = ModbusCommandItem::create_write_multiple_command(parent_, this->start_address + this->offset / 2, 1,
-                                                               bool_states);
-      } else {
-        cmd = ModbusCommandItem::create_write_single_command(parent_, this->start_address + this->offset / 2,
-                                                             state ? 0xFFFF & this->bitmask : 0u);
-      }
-    }
+      cmd = ModbusCommandItem::create_write_single_command(parent_, this->start_address + this->offset / 2,
+                                                           state ? 0xFFFF & this->bitmask : 0);
+      break;
   }
   this->parent_->queue_command(cmd);
   publish_state(state);

esphome/components/modbus_controller/switch/modbus_switch.h

@@ -33,16 +33,11 @@ class ModbusSwitch : public Component, public switch_::Switch, public SensorItem
   void set_parent(ModbusController *parent) { this->parent_ = parent; }
 
   using transform_func_t = std::function<optional<bool>(ModbusSwitch *, bool, const std::vector<uint8_t> &)>;
-  using write_transform_func_t = std::function<optional<bool>(ModbusSwitch *, bool, std::vector<uint8_t> &)>;
   void set_template(transform_func_t &&f) { this->publish_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:
   ModbusController *parent_;
-  bool use_write_multiple_;
   optional<transform_func_t> publish_transform_func_{nullopt};
-  optional<write_transform_func_t> write_transform_func_{nullopt};
 };
 
 }  // namespace modbus_controller

esphome/components/modbus_controller/text_sensor/__init__.py

@@ -3,17 +3,15 @@ import esphome.config_validation as cv
 import esphome.codegen as cg
 
 
-from esphome.const import CONF_ADDRESS, CONF_ID
+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,
 )
 from ..const import (
+    CONF_BYTE_OFFSET,
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
     CONF_REGISTER_COUNT,
@@ -40,23 +38,32 @@ RAW_ENCODING = {
 }
 
 CONFIG_SCHEMA = cv.All(
-    text_sensor.TEXT_SENSOR_SCHEMA.extend(cv.COMPONENT_SCHEMA)
-    .extend(ModbusItemBaseSchema)
-    .extend(
+    text_sensor.TEXT_SENSOR_SCHEMA.extend(
         {
             cv.GenerateID(): cv.declare_id(ModbusTextSensor),
-            cv.Optional(CONF_REGISTER_TYPE): cv.enum(MODBUS_REGISTER_TYPE),
+            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_REGISTER_COUNT, default=0): cv.positive_int,
             cv.Optional(CONF_RESPONSE_SIZE, default=2): cv.positive_int,
             cv.Optional(CONF_RAW_ENCODE, default="NONE"): cv.enum(RAW_ENCODING),
+            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]
     response_size = config[CONF_RESPONSE_SIZE]
     reg_count = config[CONF_REGISTER_COUNT]
     if reg_count == 0:
@@ -78,6 +85,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, ModbusTextSensor, cg.std_string, cg.std_string
-    )
+    if CONF_LAMBDA in config:
+        template_ = await cg.process_lambda(
+            config[CONF_LAMBDA],
+            [
+                (ModbusTextSensor.operator("ptr"), "item"),
+                (cg.std_string.operator("const").operator("ref"), "x"),
+                (
+                    cg.std_vector.template(cg.uint8).operator("const").operator("ref"),
+                    "data",
+                ),
+            ],
+            return_type=cg.optional.template(cg.std_string),
+        )
+        cg.add(var.set_template(template_))

esphome/components/modbus_controller/text_sensor/modbus_textsensor.cpp

@@ -13,7 +13,7 @@ void ModbusTextSensor::dump_config() { LOG_TEXT_SENSOR("", "Modbus Controller Te
 
 void ModbusTextSensor::parse_and_publish(const std::vector<uint8_t> &data) {
   std::ostringstream output;
-  uint8_t max_items = this->response_bytes;
+  uint8_t max_items = this->response_bytes_;
   char buffer[4];
   bool add_comma = false;
   for (auto b : data) {

esphome/components/modbus_controller/text_sensor/modbus_textsensor.h

@@ -17,7 +17,7 @@ class ModbusTextSensor : public Component, public text_sensor::TextSensor, publi
     this->register_type = register_type;
     this->start_address = start_address;
     this->offset = offset;
-    this->response_bytes = response_bytes;
+    this->response_bytes_ = response_bytes;
     this->register_count = register_count;
     this->encode_ = encode;
     this->skip_updates = skip_updates;
@@ -38,6 +38,7 @@ class ModbusTextSensor : public Component, public text_sensor::TextSensor, publi
 
  protected:
   RawEncoding encode_;
+  uint16_t response_bytes_;
 };
 
 }  // namespace modbus_controller

esphome/components/mqtt/__init__.py

@@ -95,7 +95,6 @@ MQTTSwitchComponent = mqtt_ns.class_("MQTTSwitchComponent", MQTTComponent)
 MQTTTextSensor = mqtt_ns.class_("MQTTTextSensor", MQTTComponent)
 MQTTNumberComponent = mqtt_ns.class_("MQTTNumberComponent", MQTTComponent)
 MQTTSelectComponent = mqtt_ns.class_("MQTTSelectComponent", MQTTComponent)
-MQTTButtonComponent = mqtt_ns.class_("MQTTButtonComponent", MQTTComponent)
 
 MQTTDiscoveryUniqueIdGenerator = mqtt_ns.enum("MQTTDiscoveryUniqueIdGenerator")
 MQTT_DISCOVERY_UNIQUE_ID_GENERATOR_OPTIONS = {

esphome/components/mqtt/mqtt_button.cpp

@@ -1,46 +0,0 @@
-#include "mqtt_button.h"
-#include "esphome/core/log.h"
-
-#include "mqtt_const.h"
-
-#ifdef USE_MQTT
-#ifdef USE_BUTTON
-
-namespace esphome {
-namespace mqtt {
-
-static const char *const TAG = "mqtt.button";
-
-using namespace esphome::button;
-
-MQTTButtonComponent::MQTTButtonComponent(button::Button *button) : MQTTComponent(), button_(button) {}
-
-void MQTTButtonComponent::setup() {
-  this->subscribe(this->get_command_topic_(), [this](const std::string &topic, const std::string &payload) {
-    if (payload == "PRESS") {
-      this->button_->press();
-    } else {
-      ESP_LOGW(TAG, "'%s': Received unknown status payload: %s", this->friendly_name().c_str(), payload.c_str());
-      this->status_momentary_warning("state", 5000);
-    }
-  });
-}
-void MQTTButtonComponent::dump_config() {
-  ESP_LOGCONFIG(TAG, "MQTT Button '%s': ", this->button_->get_name().c_str());
-  LOG_MQTT_COMPONENT(true, true);
-}
-
-void MQTTButtonComponent::send_discovery(JsonObject &root, mqtt::SendDiscoveryConfig &config) {
-  config.state_topic = false;
-  if (!this->button_->get_device_class().empty())
-    root[MQTT_DEVICE_CLASS] = this->button_->get_device_class();
-}
-
-std::string MQTTButtonComponent::component_type() const { return "button"; }
-const EntityBase *MQTTButtonComponent::get_entity() const { return this->button_; }
-
-}  // namespace mqtt
-}  // namespace esphome
-
-#endif
-#endif  // USE_MQTT

esphome/components/mqtt/mqtt_button.h

@@ -1,40 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-
-#ifdef USE_MQTT
-#ifdef USE_BUTTON
-
-#include "esphome/components/button/button.h"
-#include "mqtt_component.h"
-
-namespace esphome {
-namespace mqtt {
-
-class MQTTButtonComponent : public mqtt::MQTTComponent {
- public:
-  explicit MQTTButtonComponent(button::Button *button);
-
-  // ========== INTERNAL METHODS ==========
-  // (In most use cases you won't need these)
-  void setup() override;
-  void dump_config() override;
-
-  /// Buttons do not send a state so just return true.
-  bool send_initial_state() override { return true; }
-
-  void send_discovery(JsonObject &root, mqtt::SendDiscoveryConfig &config) override;
-
- protected:
-  /// "button" component type.
-  std::string component_type() const override;
-  const EntityBase *get_entity() const override;
-
-  button::Button *button_;
-};
-
-}  // namespace mqtt
-}  // namespace esphome
-
-#endif
-#endif  // USE_MQTT

esphome/components/mqtt/mqtt_const.h

@@ -514,7 +514,6 @@ constexpr const char *const MQTT_DEVICE_SUGGESTED_AREA = "suggested_area";
 
 // Additional MQTT fields where no abbreviation is defined in HA source
 constexpr const char *const MQTT_ENTITY_CATEGORY = "entity_category";
-constexpr const char *const MQTT_MODE = "mode";
 
 }  // namespace mqtt
 }  // namespace esphome

esphome/components/mqtt/mqtt_number.cpp

@@ -43,18 +43,6 @@ void MQTTNumberComponent::send_discovery(JsonObject &root, mqtt::SendDiscoveryCo
   root[MQTT_MIN] = traits.get_min_value();
   root[MQTT_MAX] = traits.get_max_value();
   root[MQTT_STEP] = traits.get_step();
-  if (!this->number_->traits.get_unit_of_measurement().empty())
-    root[MQTT_UNIT_OF_MEASUREMENT] = this->number_->traits.get_unit_of_measurement();
-  switch (this->number_->traits.get_mode()) {
-    case NUMBER_MODE_AUTO:
-      break;
-    case NUMBER_MODE_BOX:
-      root[MQTT_MODE] = "box";
-      break;
-    case NUMBER_MODE_SLIDER:
-      root[MQTT_MODE] = "slider";
-      break;
-  }
 
   config.command_topic = true;
 }

esphome/components/neopixelbus/_methods.py

@@ -88,8 +88,8 @@ def _esp32_i2s_default_bus():
 
 
 def _validate_esp32_i2s_bus(value):
-    if isinstance(value, str) and value.lower() == BUS_DYNAMIC:
-        value = BUS_DYNAMIC
+    if isinstance(value, str) and value.lower() == CHANNEL_DYNAMIC:
+        value = CHANNEL_DYNAMIC
     else:
         value = cv.int_(value)
     variant_buses = {

esphome/components/nextion/nextion.cpp

@@ -64,7 +64,7 @@ bool Nextion::check_connect_() {
   if (response.empty() || response.find("comok") == std::string::npos) {
 #ifdef NEXTION_PROTOCOL_LOG
     ESP_LOGN(TAG, "Bad connect request %s", response.c_str());
-    for (size_t i = 0; i < response.length(); i++) {
+    for (int i = 0; i < response.length(); i++) {
       ESP_LOGN(TAG, "response %s %d %d %c", response.c_str(), i, response[i], response[i]);
     }
 #endif
@@ -563,10 +563,11 @@ void Nextion::process_nextion_commands_() {
       // FF FF FF - End
       case 0x90: {  // Switched component
         std::string variable_name;
+        uint8_t index = 0;
 
         // Get variable name
-        auto index = to_process.find('\0');
-        if (index == std::string::npos || (to_process_length - index - 1) < 1) {
+        index = to_process.find('\0');
+        if (static_cast<char>(index) == std::string::npos || (to_process_length - index - 1) < 1) {
           ESP_LOGE(TAG, "Bad switch component data received for 0x90 event!");
           ESP_LOGN(TAG, "to_process %s %zu %d", to_process.c_str(), to_process_length, index);
           break;
@@ -590,9 +591,10 @@ void Nextion::process_nextion_commands_() {
       // FF FF FF - End
       case 0x91: {  // Sensor component
         std::string variable_name;
+        uint8_t index = 0;
 
-        auto index = to_process.find('\0');
-        if (index == std::string::npos || (to_process_length - index - 1) != 4) {
+        index = to_process.find('\0');
+        if (static_cast<char>(index) == std::string::npos || (to_process_length - index - 1) != 4) {
           ESP_LOGE(TAG, "Bad sensor component data received for 0x91 event!");
           ESP_LOGN(TAG, "to_process %s %zu %d", to_process.c_str(), to_process_length, index);
           break;
@@ -624,10 +626,11 @@ void Nextion::process_nextion_commands_() {
       case 0x92: {  // Text Sensor Component
         std::string variable_name;
         std::string text_value;
+        uint8_t index = 0;
 
         // Get variable name
-        auto index = to_process.find('\0');
-        if (index == std::string::npos || (to_process_length - index - 1) < 1) {
+        index = to_process.find('\0');
+        if (static_cast<char>(index) == std::string::npos || (to_process_length - index - 1) < 1) {
           ESP_LOGE(TAG, "Bad text sensor component data received for 0x92 event!");
           ESP_LOGN(TAG, "to_process %s %zu %d", to_process.c_str(), to_process_length, index);
           break;
@@ -657,10 +660,11 @@ void Nextion::process_nextion_commands_() {
       // FF FF FF - End
       case 0x93: {  // Binary Sensor component
         std::string variable_name;
+        uint8_t index = 0;
 
         // Get variable name
-        auto index = to_process.find('\0');
-        if (index == std::string::npos || (to_process_length - index - 1) < 1) {
+        index = to_process.find('\0');
+        if (static_cast<char>(index) == std::string::npos || (to_process_length - index - 1) < 1) {
           ESP_LOGE(TAG, "Bad binary sensor component data received for 0x92 event!");
           ESP_LOGN(TAG, "to_process %s %zu %d", to_process.c_str(), to_process_length, index);
           break;
@@ -732,7 +736,7 @@ void Nextion::process_nextion_commands_() {
   uint32_t ms = millis();
 
   if (!this->nextion_queue_.empty() && this->nextion_queue_.front()->queue_time + this->max_q_age_ms_ < ms) {
-    for (size_t i = 0; i < this->nextion_queue_.size(); i++) {
+    for (int i = 0; i < this->nextion_queue_.size(); i++) {
       NextionComponentBase *component = this->nextion_queue_[i]->component;
       if (this->nextion_queue_[i]->queue_time + this->max_q_age_ms_ < ms) {
         if (this->nextion_queue_[i]->queue_time == 0)

esphome/components/nextion/nextion_upload.cpp

@@ -95,7 +95,7 @@ int Nextion::upload_by_chunks_(HTTPClient *http, int range_start) {
   }
   http->end();
   ESP_LOGN(TAG, "this->content_length_ %d sent %d", this->content_length_, sent);
-  for (int i = 0; i < range; i += 4096) {
+  for (uint32_t i = 0; i < range; i += 4096) {
     this->write_array(&this->transfer_buffer_[i], 4096);
     this->content_length_ -= 4096;
     ESP_LOGN(TAG, "this->content_length_ %d range %d range_end %d range_start %d", this->content_length_, range,
@@ -238,7 +238,7 @@ void Nextion::upload_tft() {
   // The Nextion display will, if it's ready to accept data, send a 0x05 byte.
   ESP_LOGD(TAG, "Upgrade response is %s %zu", response.c_str(), response.length());
 
-  for (size_t i = 0; i < response.length(); i++) {
+  for (int i = 0; i < response.length(); i++) {
     ESP_LOGD(TAG, "Available %d : 0x%02X", i, response[i]);
   }