Rewrite PMSX003 to be less repetitive

.github/ISSUE_TEMPLATE/config.yml

@@ -9,3 +9,4 @@ contact_links:
   - name: Frequently Asked Question
     url: https://esphome.io/guides/faq.html
     about: Please view the FAQ for common questions and what to include in a bug report.
+    

.github/PULL_REQUEST_TEMPLATE.md

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

CODEOWNERS

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

CONTRIBUTING.md

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

docker/ha-addon-rootfs/etc/cont-init.d/10-requirements.sh

@@ -7,12 +7,12 @@
 # Check SSL requirements, if enabled
 if bashio::config.true 'ssl'; then
     if ! bashio::config.has_value 'certfile'; then
-        bashio::log.fatal 'SSL is enabled, but no certfile was specified.'
+        bashio::fatal 'SSL is enabled, but no certfile was specified.'
         bashio::exit.nok
     fi
 
     if ! bashio::config.has_value 'keyfile'; then
-        bashio::log.fatal 'SSL is enabled, but no keyfile was specified'
+        bashio::fatal 'SSL is enabled, but no keyfile was specified'
         bashio::exit.nok
     fi
 

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/api/api_connection.cpp

@@ -23,7 +23,7 @@ static const char *const TAG = "api.connection";
 static const int ESP32_CAMERA_STOP_STREAM = 5000;
 
 APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *parent)
-    : parent_(parent), initial_state_iterator_(this), list_entities_iterator_(this) {
+    : parent_(parent), initial_state_iterator_(parent, this), list_entities_iterator_(parent, this) {
   this->proto_write_buffer_.reserve(64);
 
 #if defined(USE_API_PLAINTEXT)
@@ -105,7 +105,6 @@ void APIConnection::loop() {
       ESP_LOGW(TAG, "%s didn't respond to ping request in time. Disconnecting...", this->client_info_.c_str());
     }
   } else if (now - this->last_traffic_ > keepalive) {
-    ESP_LOGVV(TAG, "Sending keepalive PING...");
     this->sent_ping_ = true;
     this->send_ping_request(PingRequest());
   }
@@ -909,7 +908,7 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
     }
     return false;
   }
-  // Do not set last_traffic_ on send
+  this->last_traffic_ = millis();
   return true;
 }
 void APIConnection::on_unauthenticated_access() {

esphome/components/api/api_server.h

@@ -7,6 +7,7 @@
 #include "esphome/components/socket/socket.h"
 #include "api_pb2.h"
 #include "api_pb2_service.h"
+#include "util.h"
 #include "list_entities.h"
 #include "subscribe_state.h"
 #include "user_services.h"

esphome/components/api/list_entities.cpp

@@ -40,7 +40,8 @@ bool ListEntitiesIterator::on_lock(lock::Lock *a_lock) { return this->client_->s
 #endif
 
 bool ListEntitiesIterator::on_end() { return this->client_->send_list_info_done(); }
-ListEntitiesIterator::ListEntitiesIterator(APIConnection *client) : client_(client) {}
+ListEntitiesIterator::ListEntitiesIterator(APIServer *server, APIConnection *client)
+    : ComponentIterator(server), client_(client) {}
 bool ListEntitiesIterator::on_service(UserServiceDescriptor *service) {
   auto resp = service->encode_list_service_response();
   return this->client_->send_list_entities_services_response(resp);

esphome/components/api/list_entities.h

@@ -1,8 +1,8 @@
 #pragma once
 
 #include "esphome/core/component.h"
-#include "esphome/core/component_iterator.h"
 #include "esphome/core/defines.h"
+#include "util.h"
 
 namespace esphome {
 namespace api {
@@ -11,7 +11,7 @@ class APIConnection;
 
 class ListEntitiesIterator : public ComponentIterator {
  public:
-  ListEntitiesIterator(APIConnection *client);
+  ListEntitiesIterator(APIServer *server, APIConnection *client);
 #ifdef USE_BINARY_SENSOR
   bool on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) override;
 #endif
@@ -60,3 +60,5 @@ class ListEntitiesIterator : public ComponentIterator {
 
 }  // namespace api
 }  // namespace esphome
+
+#include "api_server.h"

esphome/components/api/proto.cpp

@@ -1,4 +1,5 @@
 #include "proto.h"
+#include "util.h"
 #include "esphome/core/log.h"
 
 namespace esphome {

esphome/components/api/subscribe_state.cpp

@@ -50,7 +50,8 @@ bool InitialStateIterator::on_select(select::Select *select) {
 #ifdef USE_LOCK
 bool InitialStateIterator::on_lock(lock::Lock *a_lock) { return this->client_->send_lock_state(a_lock, a_lock->state); }
 #endif
-InitialStateIterator::InitialStateIterator(APIConnection *client) : client_(client) {}
+InitialStateIterator::InitialStateIterator(APIServer *server, APIConnection *client)
+    : ComponentIterator(server), client_(client) {}
 
 }  // namespace api
 }  // namespace esphome

esphome/components/api/subscribe_state.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include "esphome/core/component.h"
-#include "esphome/core/component_iterator.h"
 #include "esphome/core/controller.h"
 #include "esphome/core/defines.h"
+#include "util.h"
 
 namespace esphome {
 namespace api {
@@ -12,7 +12,7 @@ class APIConnection;
 
 class InitialStateIterator : public ComponentIterator {
  public:
-  InitialStateIterator(APIConnection *client);
+  InitialStateIterator(APIServer *server, APIConnection *client);
 #ifdef USE_BINARY_SENSOR
   bool on_binary_sensor(binary_sensor::BinarySensor *binary_sensor) override;
 #endif
@@ -55,3 +55,5 @@ class InitialStateIterator : public ComponentIterator {
 
 }  // namespace api
 }  // namespace esphome
+
+#include "api_server.h"

esphome/components/api/util.cpp

@@ -1,18 +1,16 @@
-#include "component_iterator.h"
-
+#include "util.h"
+#include "api_server.h"
+#include "user_services.h"
+#include "esphome/core/log.h"
 #include "esphome/core/application.h"
 
-#ifdef USE_API
-#include "esphome/components/api/api_server.h"
-#include "esphome/components/api/user_services.h"
-#endif
-
 namespace esphome {
+namespace api {
 
-void ComponentIterator::begin(bool include_internal) {
+ComponentIterator::ComponentIterator(APIServer *server) : server_(server) {}
+void ComponentIterator::begin() {
   this->state_ = IteratorState::BEGIN;
   this->at_ = 0;
-  this->include_internal_ = include_internal;
 }
 void ComponentIterator::advance() {
   bool advance_platform = false;
@@ -34,7 +32,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *binary_sensor = App.get_binary_sensors()[this->at_];
-        if (binary_sensor->is_internal() && !this->include_internal_) {
+        if (binary_sensor->is_internal()) {
           success = true;
           break;
         } else {
@@ -49,7 +47,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *cover = App.get_covers()[this->at_];
-        if (cover->is_internal() && !this->include_internal_) {
+        if (cover->is_internal()) {
           success = true;
           break;
         } else {
@@ -64,7 +62,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *fan = App.get_fans()[this->at_];
-        if (fan->is_internal() && !this->include_internal_) {
+        if (fan->is_internal()) {
           success = true;
           break;
         } else {
@@ -79,7 +77,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *light = App.get_lights()[this->at_];
-        if (light->is_internal() && !this->include_internal_) {
+        if (light->is_internal()) {
           success = true;
           break;
         } else {
@@ -94,7 +92,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *sensor = App.get_sensors()[this->at_];
-        if (sensor->is_internal() && !this->include_internal_) {
+        if (sensor->is_internal()) {
           success = true;
           break;
         } else {
@@ -109,7 +107,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *a_switch = App.get_switches()[this->at_];
-        if (a_switch->is_internal() && !this->include_internal_) {
+        if (a_switch->is_internal()) {
           success = true;
           break;
         } else {
@@ -124,7 +122,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *button = App.get_buttons()[this->at_];
-        if (button->is_internal() && !this->include_internal_) {
+        if (button->is_internal()) {
           success = true;
           break;
         } else {
@@ -139,7 +137,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *text_sensor = App.get_text_sensors()[this->at_];
-        if (text_sensor->is_internal() && !this->include_internal_) {
+        if (text_sensor->is_internal()) {
           success = true;
           break;
         } else {
@@ -148,22 +146,20 @@ void ComponentIterator::advance() {
       }
       break;
 #endif
-#ifdef USE_API
     case IteratorState ::SERVICE:
-      if (this->at_ >= api::global_api_server->get_user_services().size()) {
+      if (this->at_ >= this->server_->get_user_services().size()) {
         advance_platform = true;
       } else {
-        auto *service = api::global_api_server->get_user_services()[this->at_];
+        auto *service = this->server_->get_user_services()[this->at_];
         success = this->on_service(service);
       }
       break;
-#endif
 #ifdef USE_ESP32_CAMERA
     case IteratorState::CAMERA:
       if (esp32_camera::global_esp32_camera == nullptr) {
         advance_platform = true;
       } else {
-        if (esp32_camera::global_esp32_camera->is_internal() && !this->include_internal_) {
+        if (esp32_camera::global_esp32_camera->is_internal()) {
           advance_platform = success = true;
           break;
         } else {
@@ -178,7 +174,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *climate = App.get_climates()[this->at_];
-        if (climate->is_internal() && !this->include_internal_) {
+        if (climate->is_internal()) {
           success = true;
           break;
         } else {
@@ -193,7 +189,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *number = App.get_numbers()[this->at_];
-        if (number->is_internal() && !this->include_internal_) {
+        if (number->is_internal()) {
           success = true;
           break;
         } else {
@@ -208,7 +204,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *select = App.get_selects()[this->at_];
-        if (select->is_internal() && !this->include_internal_) {
+        if (select->is_internal()) {
           success = true;
           break;
         } else {
@@ -223,7 +219,7 @@ void ComponentIterator::advance() {
         advance_platform = true;
       } else {
         auto *a_lock = App.get_locks()[this->at_];
-        if (a_lock->is_internal() && !this->include_internal_) {
+        if (a_lock->is_internal()) {
           success = true;
           break;
         } else {
@@ -248,10 +244,10 @@ void ComponentIterator::advance() {
 }
 bool ComponentIterator::on_end() { return true; }
 bool ComponentIterator::on_begin() { return true; }
-#ifdef USE_API
-bool ComponentIterator::on_service(api::UserServiceDescriptor *service) { return true; }
-#endif
+bool ComponentIterator::on_service(UserServiceDescriptor *service) { return true; }
 #ifdef USE_ESP32_CAMERA
 bool ComponentIterator::on_camera(esp32_camera::ESP32Camera *camera) { return true; }
 #endif
+
+}  // namespace api
 }  // namespace esphome

esphome/components/api/util.h

@@ -1,24 +1,23 @@
 #pragma once
 
+#include "esphome/core/helpers.h"
 #include "esphome/core/component.h"
 #include "esphome/core/controller.h"
-#include "esphome/core/helpers.h"
-
 #ifdef USE_ESP32_CAMERA
 #include "esphome/components/esp32_camera/esp32_camera.h"
 #endif
 
 namespace esphome {
-
-#ifdef USE_API
 namespace api {
+
+class APIServer;
 class UserServiceDescriptor;
-}  // namespace api
-#endif
 
 class ComponentIterator {
  public:
-  void begin(bool include_internal = false);
+  ComponentIterator(APIServer *server);
+
+  void begin();
   void advance();
   virtual bool on_begin();
 #ifdef USE_BINARY_SENSOR
@@ -45,9 +44,7 @@ class ComponentIterator {
 #ifdef USE_TEXT_SENSOR
   virtual bool on_text_sensor(text_sensor::TextSensor *text_sensor) = 0;
 #endif
-#ifdef USE_API
-  virtual bool on_service(api::UserServiceDescriptor *service);
-#endif
+  virtual bool on_service(UserServiceDescriptor *service);
 #ifdef USE_ESP32_CAMERA
   virtual bool on_camera(esp32_camera::ESP32Camera *camera);
 #endif
@@ -93,9 +90,7 @@ class ComponentIterator {
 #ifdef USE_TEXT_SENSOR
     TEXT_SENSOR,
 #endif
-#ifdef USE_API
     SERVICE,
-#endif
 #ifdef USE_ESP32_CAMERA
     CAMERA,
 #endif
@@ -114,7 +109,9 @@ class ComponentIterator {
     MAX,
   } state_{IteratorState::NONE};
   size_t at_{0};
-  bool include_internal_{false};
+
+  APIServer *server_;
 };
 
+}  // namespace api
 }  // namespace esphome

esphome/components/bh1750/bh1750.cpp

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

esphome/components/bh1750/bh1750.h

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

esphome/components/bh1750/sensor.py

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

esphome/components/ble_client/text_sensor/__init__.py

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

esphome/components/ble_client/text_sensor/automation.h

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

esphome/components/ble_client/text_sensor/ble_text_sensor.cpp

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

esphome/components/ble_client/text_sensor/ble_text_sensor.h

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

esphome/components/button/button.cpp

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

esphome/components/button/button.h

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

esphome/components/climate/climate.cpp

@@ -1,5 +1,4 @@
 #include "climate.h"
-#include "esphome/core/macros.h"
 
 namespace esphome {
 namespace climate {
@@ -327,17 +326,14 @@ optional<ClimateDeviceRestoreState> Climate::restore_state_() {
   return recovered;
 }
 void Climate::save_state_() {
-#if (defined(USE_ESP_IDF) || (defined(USE_ESP8266) && USE_ARDUINO_VERSION_CODE >= VERSION_CODE(3, 0, 0))) && \
-    !defined(CLANG_TIDY)
+#if defined(USE_ESP_IDF) && !defined(CLANG_TIDY)
 #pragma GCC diagnostic ignored "-Wclass-memaccess"
-#define TEMP_IGNORE_MEMACCESS
 #endif
   ClimateDeviceRestoreState state{};
   // initialize as zero to prevent random data on stack triggering erase
   memset(&state, 0, sizeof(ClimateDeviceRestoreState));
-#ifdef TEMP_IGNORE_MEMACCESS
+#if USE_ESP_IDF && !defined(CLANG_TIDY)
 #pragma GCC diagnostic pop
-#undef TEMP_IGNORE_MEMACCESS
 #endif
 
   state.mode = this->mode;

esphome/components/climate/climate_traits.h

@@ -141,7 +141,7 @@ class ClimateTraits {
   }
   bool supports_swing_mode(ClimateSwingMode swing_mode) const { return supported_swing_modes_.count(swing_mode); }
   bool get_supports_swing_modes() const { return !supported_swing_modes_.empty(); }
-  std::set<ClimateSwingMode> get_supported_swing_modes() const { return supported_swing_modes_; }
+  std::set<ClimateSwingMode> get_supported_swing_modes() { return supported_swing_modes_; }
 
   float get_visual_min_temperature() const { return visual_min_temperature_; }
   void set_visual_min_temperature(float visual_min_temperature) { visual_min_temperature_ = visual_min_temperature; }

esphome/components/copy/__init__.py

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

esphome/components/copy/binary_sensor/__init__.py

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

esphome/components/copy/binary_sensor/copy_binary_sensor.cpp

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

esphome/components/copy/binary_sensor/copy_binary_sensor.h

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

esphome/components/copy/button/__init__.py

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

esphome/components/copy/button/copy_button.cpp

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

esphome/components/copy/button/copy_button.h

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

esphome/components/copy/cover/__init__.py

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

esphome/components/copy/cover/copy_cover.cpp

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

esphome/components/copy/cover/copy_cover.h

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

esphome/components/copy/fan/__init__.py

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

esphome/components/copy/fan/copy_fan.cpp

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

esphome/components/copy/fan/copy_fan.h

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

esphome/components/copy/lock/__init__.py

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

esphome/components/copy/lock/copy_lock.cpp

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

esphome/components/copy/lock/copy_lock.h

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

esphome/components/copy/number/__init__.py

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

esphome/components/copy/number/copy_number.cpp

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

esphome/components/copy/number/copy_number.h

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

esphome/components/copy/select/__init__.py

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

esphome/components/copy/select/copy_select.cpp

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

esphome/components/copy/select/copy_select.h

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

esphome/components/copy/sensor/__init__.py

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

esphome/components/copy/sensor/copy_sensor.cpp

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

esphome/components/copy/sensor/copy_sensor.h

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

esphome/components/copy/switch/__init__.py

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

esphome/components/copy/switch/copy_switch.cpp

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

esphome/components/copy/switch/copy_switch.h

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

esphome/components/copy/text_sensor/__init__.py

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

esphome/components/copy/text_sensor/copy_text_sensor.cpp

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

esphome/components/copy/text_sensor/copy_text_sensor.h

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

esphome/components/dallas/dallas_component.cpp

@@ -111,9 +111,6 @@ void DallasComponent::update() {
   if (!result) {
     ESP_LOGE(TAG, "Requesting conversion failed");
     this->status_set_warning();
-    for (auto *sensor : this->sensors_) {
-      sensor->publish_state(NAN);
-    }
     return;
   }
 

esphome/components/dallas/esp_one_wire.cpp

@@ -142,6 +142,7 @@ void IRAM_ATTR ESPOneWire::select(uint64_t address) {
 void IRAM_ATTR ESPOneWire::reset_search() {
   this->last_discrepancy_ = 0;
   this->last_device_flag_ = false;
+  this->last_family_discrepancy_ = 0;
   this->rom_number_ = 0;
 }
 uint64_t IRAM_ATTR ESPOneWire::search() {
@@ -194,6 +195,9 @@ uint64_t IRAM_ATTR ESPOneWire::search() {
 
         if (!branch) {
           last_zero = id_bit_number;
+          if (last_zero < 9) {
+            this->last_discrepancy_ = last_zero;
+          }
         }
       }
 

esphome/components/dallas/esp_one_wire.h

@@ -60,6 +60,7 @@ class ESPOneWire {
 
   ISRInternalGPIOPin pin_;
   uint8_t last_discrepancy_{0};
+  uint8_t last_family_discrepancy_{0};
   bool last_device_flag_{false};
   uint64_t rom_number_{0};
 };

esphome/components/deep_sleep/__init__.py

@@ -11,39 +11,9 @@ from esphome.const import (
     CONF_WAKEUP_PIN,
 )
 
-from esphome.components.esp32 import get_esp32_variant
-from esphome.components.esp32.const import (
-    VARIANT_ESP32,
-    VARIANT_ESP32C3,
-)
-
-WAKEUP_PINS = {
-    VARIANT_ESP32: [
-        0,
-        2,
-        4,
-        12,
-        13,
-        14,
-        15,
-        25,
-        26,
-        27,
-        32,
-        33,
-        34,
-        35,
-        36,
-        37,
-        38,
-        39,
-    ],
-    VARIANT_ESP32C3: [0, 1, 2, 3, 4, 5],
-}
-
 
 def validate_pin_number(value):
-    valid_pins = WAKEUP_PINS.get(get_esp32_variant(), WAKEUP_PINS[VARIANT_ESP32])
+    valid_pins = [0, 2, 4, 12, 13, 14, 15, 25, 26, 27, 32, 33, 34, 35, 36, 37, 38, 39]
     if value[CONF_NUMBER] not in valid_pins:
         raise cv.Invalid(
             f"Only pins {', '.join(str(x) for x in valid_pins)} support wakeup"
@@ -51,14 +21,6 @@ def validate_pin_number(value):
     return value
 
 
-def validate_config(config):
-    if get_esp32_variant() == VARIANT_ESP32C3 and CONF_ESP32_EXT1_WAKEUP in config:
-        raise cv.Invalid("ESP32-C3 does not support wakeup from touch.")
-    if get_esp32_variant() == VARIANT_ESP32C3 and CONF_TOUCH_WAKEUP in config:
-        raise cv.Invalid("ESP32-C3 does not support wakeup from ext1")
-    return config
-
-
 deep_sleep_ns = cg.esphome_ns.namespace("deep_sleep")
 DeepSleepComponent = deep_sleep_ns.class_("DeepSleepComponent", cg.Component)
 EnterDeepSleepAction = deep_sleep_ns.class_("EnterDeepSleepAction", automation.Action)

esphome/components/deep_sleep/deep_sleep_component.cpp

@@ -104,7 +104,7 @@ void DeepSleepComponent::begin_sleep(bool manual) {
 
   App.run_safe_shutdown_hooks();
 
-#if defined(USE_ESP32) && !defined(USE_ESP32_VARIANT_ESP32C3)
+#ifdef USE_ESP32
   if (this->sleep_duration_.has_value())
     esp_sleep_enable_timer_wakeup(*this->sleep_duration_);
   if (this->wakeup_pin_ != nullptr) {
@@ -126,18 +126,6 @@ void DeepSleepComponent::begin_sleep(bool manual) {
   esp_deep_sleep_start();
 #endif
 
-#ifdef USE_ESP32_VARIANT_ESP32C3
-  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()) {
-      level = !level;
-    }
-    esp_deep_sleep_enable_gpio_wakeup(gpio_num_t(this->wakeup_pin_->get_pin()), level);
-  }
-#endif
-
 #ifdef USE_ESP8266
   ESP.deepSleep(*this->sleep_duration_);  // NOLINT(readability-static-accessed-through-instance)
 #endif

esphome/components/deep_sleep/deep_sleep_component.h

@@ -57,16 +57,13 @@ class DeepSleepComponent : public Component {
  public:
   /// Set the duration in ms the component should sleep once it's in deep sleep mode.
   void set_sleep_duration(uint32_t time_ms);
-#if defined(USE_ESP32)
+#ifdef USE_ESP32
   /** Set the pin to wake up to on the ESP32 once it's in deep sleep mode.
    * Use the inverted property to set the wakeup level.
    */
   void set_wakeup_pin(InternalGPIOPin *pin) { this->wakeup_pin_ = pin; }
 
   void set_wakeup_pin_mode(WakeupPinMode wakeup_pin_mode);
-#endif
-
-#if defined(USE_ESP32) && !defined(USE_ESP32_VARIANT_ESP32C3)
 
   void set_ext1_wakeup(Ext1Wakeup ext1_wakeup);
 

esphome/components/esp32/__init__.py

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

esphome/components/esp32/post_build.py.script

@@ -1,10 +1,6 @@
 # Source https://github.com/letscontrolit/ESPEasy/pull/3845#issuecomment-1005864664
 
-import os
-if os.environ.get("ESPHOME_USE_SUBPROCESS") is None:
-    import esptool
-else:
-    import subprocess
+import esptool
 from SCons.Script import ARGUMENTS
 
 # pylint: disable=E0602
@@ -46,11 +42,8 @@ def esp32_create_combined_bin(source, target, env):
         print()
         print(f"Using esptool.py arguments: {' '.join(cmd)}")
         print()
+    esptool.main(cmd)
 
-    if os.environ.get("ESPHOME_USE_SUBPROCESS") is None:
-        esptool.main(cmd)
-    else:
-        subprocess.run(["esptool.py", *cmd])
 
 # pylint: disable=E0602
 env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)  # noqa

esphome/components/fujitsu_general/fujitsu_general.h

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

esphome/components/honeywellabp/__init__.py

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

esphome/components/honeywellabp/honeywellabp.cpp

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

esphome/components/honeywellabp/honeywellabp.h

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

esphome/components/honeywellabp/sensor.py

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

esphome/components/ili9341/ili9341_init.h

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

esphome/components/json/json_util.cpp

@@ -16,24 +16,16 @@ static const char *const TAG = "json";
 static std::vector<char> global_json_build_buffer;  // NOLINT
 
 std::string build_json(const json_build_t &f) {
-  // Here we are allocating up to 5kb of memory,
-  // with the heap size minus 2kb to be safe if less than 5kb
+  // Here we are allocating as much heap memory as available minus 2kb to be safe
   // as we can not have a true dynamic sized document.
   // The excess memory is freed below with `shrinkToFit()`
 #ifdef USE_ESP8266
-  const size_t free_heap = ESP.getMaxFreeBlockSize();  // NOLINT(readability-static-accessed-through-instance)
+  const size_t free_heap = ESP.getMaxFreeBlockSize() - 2048;  // NOLINT(readability-static-accessed-through-instance)
 #elif defined(USE_ESP32)
-  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL);
+  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT) - 2048;
 #endif
 
-  const size_t request_size = std::min(free_heap - 2048, (size_t) 5120);
-
-  DynamicJsonDocument json_document(request_size);
-  if (json_document.memoryPool().buffer() == nullptr) {
-    ESP_LOGE(TAG, "Could not allocate memory for JSON document! Requested %u bytes, largest free heap block: %u bytes",
-             request_size, free_heap);
-    return "{}";
-  }
+  DynamicJsonDocument json_document(free_heap);
   JsonObject root = json_document.to<JsonObject>();
   f(root);
   json_document.shrinkToFit();
@@ -44,45 +36,27 @@ std::string build_json(const json_build_t &f) {
 }
 
 void parse_json(const std::string &data, const json_parse_t &f) {
-  // Here we are allocating 1.5 times the data size,
-  // with the heap size minus 2kb to be safe if less than that
+  // Here we are allocating as much heap memory as available minus 2kb to be safe
   // as we can not have a true dynamic sized document.
   // The excess memory is freed below with `shrinkToFit()`
 #ifdef USE_ESP8266
-  const size_t free_heap = ESP.getMaxFreeBlockSize();  // NOLINT(readability-static-accessed-through-instance)
+  const size_t free_heap = ESP.getMaxFreeBlockSize() - 2048;  // NOLINT(readability-static-accessed-through-instance)
 #elif defined(USE_ESP32)
-  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL);
+  const size_t free_heap = heap_caps_get_largest_free_block(MALLOC_CAP_DEFAULT) - 2048;
 #endif
-  bool pass = false;
-  size_t request_size = std::min(free_heap - 2048, (size_t)(data.size() * 1.5));
-  do {
-    DynamicJsonDocument json_document(request_size);
-    if (json_document.memoryPool().buffer() == nullptr) {
-      ESP_LOGE(TAG, "Could not allocate memory for JSON document! Requested %u bytes, free heap: %u", request_size,
-               free_heap);
-      return;
-    }
-    DeserializationError err = deserializeJson(json_document, data);
-    json_document.shrinkToFit();
 
-    JsonObject root = json_document.as<JsonObject>();
+  DynamicJsonDocument json_document(free_heap);
+  DeserializationError err = deserializeJson(json_document, data);
+  json_document.shrinkToFit();
 
-    if (err == DeserializationError::Ok) {
-      pass = true;
-      f(root);
-    } else if (err == DeserializationError::NoMemory) {
-      if (request_size * 2 >= free_heap) {
-        ESP_LOGE(TAG, "Can not allocate more memory for deserialization. Consider making source string smaller");
-        return;
-      }
-      ESP_LOGV(TAG, "Increasing memory allocation.");
-      request_size *= 2;
-      continue;
-    } else {
-      ESP_LOGE(TAG, "JSON parse error: %s", err.c_str());
-      return;
-    }
-  } while (!pass);
+  JsonObject root = json_document.as<JsonObject>();
+
+  if (err) {
+    ESP_LOGW(TAG, "Parsing JSON failed.");
+    return;
+  }
+
+  f(root);
 }
 
 }  // namespace json

esphome/components/light/__init__.py

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

esphome/components/light/light_state.cpp

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

esphome/components/light/light_state.h

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

esphome/components/lilygo_t5_47/touchscreen/lilygo_t5_47_touchscreen.cpp

@@ -113,27 +113,8 @@ void LilygoT547Touchscreen::loop() {
       if (tp.state == 0x06)
         tp.state = 0x07;
 
-      uint16_t y = (uint16_t)((buffer[i * 5 + 1 + offset] << 4) | ((buffer[i * 5 + 3 + offset] >> 4) & 0x0F));
-      uint16_t x = (uint16_t)((buffer[i * 5 + 2 + offset] << 4) | (buffer[i * 5 + 3 + offset] & 0x0F));
-
-      switch (this->rotation_) {
-        case ROTATE_0_DEGREES:
-          tp.y = this->display_height_ - y;
-          tp.x = x;
-          break;
-        case ROTATE_90_DEGREES:
-          tp.x = this->display_height_ - y;
-          tp.y = this->display_width_ - x;
-          break;
-        case ROTATE_180_DEGREES:
-          tp.y = y;
-          tp.x = this->display_width_ - x;
-          break;
-        case ROTATE_270_DEGREES:
-          tp.x = y;
-          tp.y = x;
-          break;
-      }
+      tp.y = (uint16_t)((buffer[i * 5 + 1 + offset] << 4) | ((buffer[i * 5 + 3 + offset] >> 4) & 0x0F));
+      tp.x = (uint16_t)((buffer[i * 5 + 2 + offset] << 4) | (buffer[i * 5 + 3 + offset] & 0x0F));
 
       this->defer([this, tp]() { this->send_touch_(tp); });
     }
@@ -141,28 +122,8 @@ void LilygoT547Touchscreen::loop() {
     TouchPoint tp;
     tp.id = (buffer[0] >> 4) & 0x0F;
     tp.state = 0x06;
-
-    uint16_t y = (uint16_t)((buffer[0 * 5 + 1] << 4) | ((buffer[0 * 5 + 3] >> 4) & 0x0F));
-    uint16_t x = (uint16_t)((buffer[0 * 5 + 2] << 4) | (buffer[0 * 5 + 3] & 0x0F));
-
-    switch (this->rotation_) {
-      case ROTATE_0_DEGREES:
-        tp.y = this->display_height_ - y;
-        tp.x = x;
-        break;
-      case ROTATE_90_DEGREES:
-        tp.x = this->display_height_ - y;
-        tp.y = this->display_width_ - x;
-        break;
-      case ROTATE_180_DEGREES:
-        tp.y = y;
-        tp.x = this->display_width_ - x;
-        break;
-      case ROTATE_270_DEGREES:
-        tp.x = y;
-        tp.y = x;
-        break;
-    }
+    tp.y = (uint16_t)((buffer[0 * 5 + 1] << 4) | ((buffer[0 * 5 + 3] >> 4) & 0x0F));
+    tp.x = (uint16_t)((buffer[0 * 5 + 2] << 4) | (buffer[0 * 5 + 3] & 0x0F));
 
     this->defer([this, tp]() { this->send_touch_(tp); });
   }

esphome/components/max44009/max44009.cpp

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

esphome/components/max44009/max44009.h

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

esphome/components/max44009/sensor.py

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

esphome/components/mcp4728/__init__.py

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

esphome/components/mcp4728/mcp4728_output.cpp

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

esphome/components/mcp4728/mcp4728_output.h

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

esphome/components/mcp4728/output.py

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

esphome/components/modbus_controller/number/__init__.py

@@ -11,7 +11,6 @@ from esphome.const import (
 )
 
 from .. import (
-    MODBUS_WRITE_REGISTER_TYPE,
     add_modbus_base_properties,
     modbus_controller_ns,
     modbus_calc_properties,
@@ -25,7 +24,6 @@ from ..const import (
     CONF_CUSTOM_COMMAND,
     CONF_FORCE_NEW_RANGE,
     CONF_MODBUS_CONTROLLER_ID,
-    CONF_REGISTER_TYPE,
     CONF_SKIP_UPDATES,
     CONF_USE_WRITE_MULTIPLE,
     CONF_VALUE_TYPE,
@@ -63,9 +61,6 @@ CONFIG_SCHEMA = cv.All(
     number.NUMBER_SCHEMA.extend(ModbusItemBaseSchema).extend(
         {
             cv.GenerateID(): cv.declare_id(ModbusNumber),
-            cv.Optional(CONF_REGISTER_TYPE, default="holding"): cv.enum(
-                MODBUS_WRITE_REGISTER_TYPE
-            ),
             cv.Optional(CONF_VALUE_TYPE, default="U_WORD"): cv.enum(SENSOR_VALUE_TYPE),
             cv.Optional(CONF_WRITE_LAMBDA): cv.returning_lambda,
             # 24 bits are the maximum value for fp32 before precison is lost
@@ -86,7 +81,6 @@ async def to_code(config):
     byte_offset, reg_count = modbus_calc_properties(config)
     var = cg.new_Pvariable(
         config[CONF_ID],
-        config[CONF_REGISTER_TYPE],
         config[CONF_ADDRESS],
         byte_offset,
         config[CONF_BITMASK],

esphome/components/modbus_controller/number/modbus_number.h

@@ -11,9 +11,9 @@ using value_to_data_t = std::function<float>(float);
 
 class ModbusNumber : public number::Number, public Component, public SensorItem {
  public:
-  ModbusNumber(ModbusRegisterType register_type, uint16_t start_address, uint8_t offset, uint32_t bitmask,
-               SensorValueType value_type, int register_count, uint8_t skip_updates, bool force_new_range) {
-    this->register_type = register_type;
+  ModbusNumber(uint16_t start_address, uint8_t offset, uint32_t bitmask, SensorValueType value_type, int register_count,
+               uint8_t skip_updates, bool force_new_range) {
+    this->register_type = ModbusRegisterType::HOLDING;
     this->start_address = start_address;
     this->offset = offset;
     this->bitmask = bitmask;

esphome/components/modbus_controller/select/__init__.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import select
-from esphome.const import CONF_ADDRESS, CONF_ID, CONF_LAMBDA, CONF_OPTIMISTIC
+from esphome.const import CONF_ADDRESS, CONF_ID, CONF_LAMBDA
 from esphome.jsonschema import jschema_composite
 
 from .. import (
@@ -79,7 +79,6 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_FORCE_NEW_RANGE, default=False): cv.boolean,
             cv.Required(CONF_OPTIONSMAP): ensure_option_map(),
             cv.Optional(CONF_USE_WRITE_MULTIPLE, default=False): cv.boolean,
-            cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
             cv.Optional(CONF_LAMBDA): cv.returning_lambda,
             cv.Optional(CONF_WRITE_LAMBDA): cv.returning_lambda,
         },
@@ -113,7 +112,6 @@ async def to_code(config):
     cg.add(parent.add_sensor_item(var))
     cg.add(var.set_parent(parent))
     cg.add(var.set_use_write_mutiple(config[CONF_USE_WRITE_MULTIPLE]))
-    cg.add(var.set_optimistic(config[CONF_OPTIMISTIC]))
 
     if CONF_LAMBDA in config:
         template_ = await cg.process_lambda(

esphome/components/modbus_controller/select/modbus_select.cpp

@@ -80,9 +80,6 @@ void ModbusSelect::control(const std::string &value) {
   }
 
   parent_->queue_command(write_cmd);
-
-  if (this->optimistic_)
-    this->publish_state(value);
 }
 
 }  // namespace modbus_controller

esphome/components/modbus_controller/select/modbus_select.h

@@ -32,7 +32,6 @@ class ModbusSelect : public Component, public select::Select, public SensorItem
 
   void set_parent(ModbusController *const parent) { this->parent_ = parent; }
   void set_use_write_mutiple(bool use_write_multiple) { this->use_write_multiple_ = use_write_multiple; }
-  void set_optimistic(bool optimistic) { this->optimistic_ = optimistic; }
   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; }
 
@@ -44,7 +43,6 @@ class ModbusSelect : public Component, public select::Select, public SensorItem
   std::vector<int64_t> mapping_;
   ModbusController *parent_;
   bool use_write_multiple_{false};
-  bool optimistic_{false};
   optional<transform_func_t> transform_func_;
   optional<write_transform_func_t> write_transform_func_;
 };

esphome/components/mopeka_ble/__init__.py

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

esphome/components/mopeka_ble/mopeka_ble.cpp

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

esphome/components/mopeka_ble/mopeka_ble.h

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

esphome/components/mopeka_pro_check/__init__.py

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

esphome/components/mopeka_pro_check/mopeka_pro_check.cpp

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

esphome/components/mopeka_pro_check/mopeka_pro_check.h

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

esphome/components/mopeka_pro_check/sensor.py

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

esphome/components/mpu6886/__init__.py

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

esphome/components/mpu6886/mpu6886.cpp

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

esphome/components/mpu6886/mpu6886.h

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

esphome/components/mpu6886/sensor.py

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