Merge branch 'dev' into homeassistant_cover

.github/actions/build-image/action.yaml

@@ -46,7 +46,7 @@ runs:
 
     - name: Build and push to ghcr by digest
       id: build-ghcr
-      uses: docker/build-push-action@v6.5.0
+      uses: docker/build-push-action@v6.7.0
       with:
         context: .
         file: ./docker/Dockerfile
@@ -69,7 +69,7 @@ runs:
 
     - name: Build and push to dockerhub by digest
       id: build-dockerhub
-      uses: docker/build-push-action@v6.5.0
+      uses: docker/build-push-action@v6.7.0
       with:
         context: .
         file: ./docker/Dockerfile

.github/workflows/ci.yml

@@ -9,6 +9,7 @@ on:
     paths:
       - "**"
       - "!.github/workflows/*.yml"
+      - "!.github/actions/build-image/*"
       - ".github/workflows/ci.yml"
       - "!.yamllint"
       - "!.github/dependabot.yml"
@@ -396,7 +397,7 @@ jobs:
         file: ${{ fromJson(needs.list-components.outputs.components) }}
     steps:
       - name: Install dependencies
-        run: sudo apt-get install libsodium-dev libsdl2-dev
+        run: sudo apt-get install libsdl2-dev
 
       - name: Check out code from GitHub
         uses: actions/checkout@v4.1.7
@@ -450,7 +451,7 @@ jobs:
         run: echo ${{ matrix.components }}
 
       - name: Install dependencies
-        run: sudo apt-get install libsodium-dev libsdl2-dev
+        run: sudo apt-get install libsdl2-dev
 
       - name: Check out code from GitHub
         uses: actions/checkout@v4.1.7

CODEOWNERS

@@ -46,6 +46,7 @@ esphome/components/async_tcp/* @OttoWinter
 esphome/components/at581x/* @X-Ryl669
 esphome/components/atc_mithermometer/* @ahpohl
 esphome/components/atm90e26/* @danieltwagner
+esphome/components/atm90e32/* @circuitsetup @descipher
 esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
@@ -65,6 +66,8 @@ esphome/components/bluetooth_proxy/* @jesserockz
 esphome/components/bme280_base/* @esphome/core
 esphome/components/bme280_spi/* @apbodrov
 esphome/components/bme680_bsec/* @trvrnrth
+esphome/components/bme68x_bsec2/* @kbx81 @neffs
+esphome/components/bme68x_bsec2_i2c/* @kbx81 @neffs
 esphome/components/bmi160/* @flaviut
 esphome/components/bmp3xx/* @latonita
 esphome/components/bmp3xx_base/* @latonita @martgras
@@ -166,7 +169,10 @@ esphome/components/he60r/* @clydebarrow
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/hm3301/* @freekode
-esphome/components/homeassistant/* @OttoWinter
+esphome/components/hmac_md5/* @dwmw2
+esphome/components/homeassistant/* @OttoWinter @esphome/core
+esphome/components/homeassistant/number/* @landonr
+esphome/components/homeassistant/switch/* @Links2004
 esphome/components/honeywell_hih_i2c/* @Benichou34
 esphome/components/honeywellabp/* @RubyBailey
 esphome/components/honeywellabp2_i2c/* @jpfaff
@@ -451,6 +457,7 @@ esphome/components/wl_134/* @hobbypunk90
 esphome/components/x9c/* @EtienneMD
 esphome/components/xgzp68xx/* @gcormier
 esphome/components/xiaomi_hhccjcy10/* @fariouche
+esphome/components/xiaomi_lywsd02mmc/* @juanluss31
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs

esphome/components/airthings_wave_plus/airthings_wave_plus.cpp

@@ -14,8 +14,6 @@ void AirthingsWavePlus::read_sensors(uint8_t *raw_value, uint16_t value_len) {
     ESP_LOGD(TAG, "version = %d", value->version);
 
     if (value->version == 1) {
-      ESP_LOGD(TAG, "ambient light = %d", value->ambientLight);
-
       if (this->humidity_sensor_ != nullptr) {
         this->humidity_sensor_->publish_state(value->humidity / 2.0f);
       }
@@ -43,6 +41,10 @@ void AirthingsWavePlus::read_sensors(uint8_t *raw_value, uint16_t value_len) {
       if ((this->tvoc_sensor_ != nullptr) && this->is_valid_voc_value_(value->voc)) {
         this->tvoc_sensor_->publish_state(value->voc);
       }
+
+      if (this->illuminance_sensor_ != nullptr) {
+        this->illuminance_sensor_->publish_state(value->ambientLight);
+      }
     } else {
       ESP_LOGE(TAG, "Invalid payload version (%d != 1, newer version or not a Wave Plus?)", value->version);
     }
@@ -68,6 +70,7 @@ void AirthingsWavePlus::dump_config() {
   LOG_SENSOR("  ", "Radon", this->radon_sensor_);
   LOG_SENSOR("  ", "Radon Long Term", this->radon_long_term_sensor_);
   LOG_SENSOR("  ", "CO2", this->co2_sensor_);
+  LOG_SENSOR("  ", "Illuminance", this->illuminance_sensor_);
 }
 
 AirthingsWavePlus::AirthingsWavePlus() {

esphome/components/airthings_wave_plus/airthings_wave_plus.h

@@ -22,6 +22,7 @@ class AirthingsWavePlus : public airthings_wave_base::AirthingsWaveBase {
   void set_radon(sensor::Sensor *radon) { radon_sensor_ = radon; }
   void set_radon_long_term(sensor::Sensor *radon_long_term) { radon_long_term_sensor_ = radon_long_term; }
   void set_co2(sensor::Sensor *co2) { co2_sensor_ = co2; }
+  void set_illuminance(sensor::Sensor *illuminance) { illuminance_sensor_ = illuminance; }
 
  protected:
   bool is_valid_radon_value_(uint16_t radon);
@@ -32,6 +33,7 @@ class AirthingsWavePlus : public airthings_wave_base::AirthingsWaveBase {
   sensor::Sensor *radon_sensor_{nullptr};
   sensor::Sensor *radon_long_term_sensor_{nullptr};
   sensor::Sensor *co2_sensor_{nullptr};
+  sensor::Sensor *illuminance_sensor_{nullptr};
 
   struct WavePlusReadings {
     uint8_t version;

esphome/components/airthings_wave_plus/sensor.py

@@ -12,6 +12,9 @@ from esphome.const import (
     CONF_CO2,
     UNIT_BECQUEREL_PER_CUBIC_METER,
     UNIT_PARTS_PER_MILLION,
+    CONF_ILLUMINANCE,
+    UNIT_LUX,
+    DEVICE_CLASS_ILLUMINANCE,
 )
 
 DEPENDENCIES = airthings_wave_base.DEPENDENCIES
@@ -45,6 +48,12 @@ CONFIG_SCHEMA = airthings_wave_base.BASE_SCHEMA.extend(
             device_class=DEVICE_CLASS_CARBON_DIOXIDE,
             state_class=STATE_CLASS_MEASUREMENT,
         ),
+        cv.Optional(CONF_ILLUMINANCE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_LUX,
+            accuracy_decimals=0,
+            device_class=DEVICE_CLASS_ILLUMINANCE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
     }
 )
 
@@ -62,3 +71,6 @@ async def to_code(config):
     if config_co2 := config.get(CONF_CO2):
         sens = await sensor.new_sensor(config_co2)
         cg.add(var.set_co2(sens))
+    if config_illuminance := config.get(CONF_ILLUMINANCE):
+        sens = await sensor.new_sensor(config_illuminance)
+        cg.add(var.set_illuminance(sens))

esphome/components/api/__init__.py

@@ -155,7 +155,7 @@ async def to_code(config):
         decoded = base64.b64decode(encryption_config[CONF_KEY])
         cg.add(var.set_noise_psk(list(decoded)))
         cg.add_define("USE_API_NOISE")
-        cg.add_library("esphome/noise-c", "0.1.4")
+        cg.add_library("esphome/noise-c", "0.1.6")
     else:
         cg.add_define("USE_API_PLAINTEXT")
 

esphome/components/api/api.proto

@@ -686,6 +686,7 @@ message SubscribeHomeAssistantStateResponse {
   option (source) = SOURCE_SERVER;
   string entity_id = 1;
   string attribute = 2;
+  bool once = 3;
 }
 
 message HomeAssistantStateResponse {

esphome/components/api/api_connection.cpp

@@ -1335,8 +1335,11 @@ void APIConnection::update_command(const UpdateCommandRequest &msg) {
     case enums::UPDATE_COMMAND_CHECK:
       update->check();
       break;
+    case enums::UPDATE_COMMAND_NONE:
+      ESP_LOGE(TAG, "UPDATE_COMMAND_NONE not handled. Check client is sending the correct command");
+      break;
     default:
-      ESP_LOGW(TAG, "Unknown update command: %d", msg.command);
+      ESP_LOGW(TAG, "Unknown update command: %" PRIu32, msg.command);
       break;
   }
 }

esphome/components/api/api_pb2.cpp

@@ -3109,6 +3109,16 @@ void SubscribeHomeAssistantStatesRequest::dump_to(std::string &out) const {
   out.append("SubscribeHomeAssistantStatesRequest {}");
 }
 #endif
+bool SubscribeHomeAssistantStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 3: {
+      this->once = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
 bool SubscribeHomeAssistantStateResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
   switch (field_id) {
     case 1: {
@@ -3126,6 +3136,7 @@ bool SubscribeHomeAssistantStateResponse::decode_length(uint32_t field_id, Proto
 void SubscribeHomeAssistantStateResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(1, this->entity_id);
   buffer.encode_string(2, this->attribute);
+  buffer.encode_bool(3, this->once);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void SubscribeHomeAssistantStateResponse::dump_to(std::string &out) const {
@@ -3138,6 +3149,10 @@ void SubscribeHomeAssistantStateResponse::dump_to(std::string &out) const {
   out.append("  attribute: ");
   out.append("'").append(this->attribute).append("'");
   out.append("\n");
+
+  out.append("  once: ");
+  out.append(YESNO(this->once));
+  out.append("\n");
   out.append("}");
 }
 #endif

esphome/components/api/api_pb2.h

@@ -836,6 +836,7 @@ class SubscribeHomeAssistantStateResponse : public ProtoMessage {
  public:
   std::string entity_id{};
   std::string attribute{};
+  bool once{false};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
@@ -843,6 +844,7 @@ class SubscribeHomeAssistantStateResponse : public ProtoMessage {
 
  protected:
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
 class HomeAssistantStateResponse : public ProtoMessage {
  public:

esphome/components/api/api_server.cpp

@@ -359,8 +359,18 @@ void APIServer::subscribe_home_assistant_state(std::string entity_id, optional<s
       .entity_id = std::move(entity_id),
       .attribute = std::move(attribute),
       .callback = std::move(f),
+      .once = false,
   });
 }
+void APIServer::get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
+                                         std::function<void(std::string)> f) {
+  this->state_subs_.push_back(HomeAssistantStateSubscription{
+      .entity_id = std::move(entity_id),
+      .attribute = std::move(attribute),
+      .callback = std::move(f),
+      .once = true,
+  });
+};
 const std::vector<APIServer::HomeAssistantStateSubscription> &APIServer::get_state_subs() const {
   return this->state_subs_;
 }

esphome/components/api/api_server.h

@@ -112,10 +112,13 @@ class APIServer : public Component, public Controller {
     std::string entity_id;
     optional<std::string> attribute;
     std::function<void(std::string)> callback;
+    bool once;
   };
 
   void subscribe_home_assistant_state(std::string entity_id, optional<std::string> attribute,
                                       std::function<void(std::string)> f);
+  void get_home_assistant_state(std::string entity_id, optional<std::string> attribute,
+                                std::function<void(std::string)> f);
   const std::vector<HomeAssistantStateSubscription> &get_state_subs() const;
   const std::vector<UserServiceDescriptor *> &get_user_services() const { return this->user_services_; }
 

esphome/components/atm90e32/__init__.py

@@ -0,0 +1,7 @@
+import esphome.codegen as cg
+
+CODEOWNERS = ["@circuitsetup", "@descipher"]
+
+atm90e32_ns = cg.esphome_ns.namespace("atm90e32")
+
+CONF_ATM90E32_ID = "atm90e32_id"

esphome/components/atm90e32/atm90e32.cpp

@@ -132,10 +132,77 @@ void ATM90E32Component::update() {
   this->status_clear_warning();
 }
 
+void ATM90E32Component::restore_calibrations_() {
+  if (enable_offset_calibration_) {
+    this->pref_.load(&this->offset_phase_);
+  }
+};
+
+void ATM90E32Component::run_offset_calibrations() {
+  // Run the calibrations and
+  // Setup voltage and current calibration offsets for PHASE A
+  this->offset_phase_[PHASEA].voltage_offset_ = calibrate_voltage_offset_phase(PHASEA);
+  this->phase_[PHASEA].voltage_offset_ = this->offset_phase_[PHASEA].voltage_offset_;
+  this->write16_(ATM90E32_REGISTER_UOFFSETA, this->phase_[PHASEA].voltage_offset_);  // C Voltage offset
+  this->offset_phase_[PHASEA].current_offset_ = calibrate_current_offset_phase(PHASEA);
+  this->phase_[PHASEA].current_offset_ = this->offset_phase_[PHASEA].current_offset_;
+  this->write16_(ATM90E32_REGISTER_IOFFSETA, this->phase_[PHASEA].current_offset_);  // C Current offset
+  // Setup voltage and current calibration offsets for PHASE B
+  this->offset_phase_[PHASEB].voltage_offset_ = calibrate_voltage_offset_phase(PHASEB);
+  this->phase_[PHASEB].voltage_offset_ = this->offset_phase_[PHASEB].voltage_offset_;
+  this->write16_(ATM90E32_REGISTER_UOFFSETB, this->phase_[PHASEB].voltage_offset_);  // C Voltage offset
+  this->offset_phase_[PHASEB].current_offset_ = calibrate_current_offset_phase(PHASEB);
+  this->phase_[PHASEB].current_offset_ = this->offset_phase_[PHASEB].current_offset_;
+  this->write16_(ATM90E32_REGISTER_IOFFSETB, this->phase_[PHASEB].current_offset_);  // C Current offset
+  // Setup voltage and current calibration offsets for PHASE C
+  this->offset_phase_[PHASEC].voltage_offset_ = calibrate_voltage_offset_phase(PHASEC);
+  this->phase_[PHASEC].voltage_offset_ = this->offset_phase_[PHASEC].voltage_offset_;
+  this->write16_(ATM90E32_REGISTER_UOFFSETC, this->phase_[PHASEC].voltage_offset_);  // C Voltage offset
+  this->offset_phase_[PHASEC].current_offset_ = calibrate_current_offset_phase(PHASEC);
+  this->phase_[PHASEC].current_offset_ = this->offset_phase_[PHASEC].current_offset_;
+  this->write16_(ATM90E32_REGISTER_IOFFSETC, this->phase_[PHASEC].current_offset_);  // C Current offset
+  this->pref_.save(&this->offset_phase_);
+  ESP_LOGI(TAG, "PhaseA Vo=%5d PhaseB Vo=%5d PhaseC Vo=%5d", this->offset_phase_[PHASEA].voltage_offset_,
+           this->offset_phase_[PHASEB].voltage_offset_, this->offset_phase_[PHASEC].voltage_offset_);
+  ESP_LOGI(TAG, "PhaseA Io=%5d PhaseB Io=%5d PhaseC Io=%5d", this->offset_phase_[PHASEA].current_offset_,
+           this->offset_phase_[PHASEB].current_offset_, this->offset_phase_[PHASEC].current_offset_);
+}
+
+void ATM90E32Component::clear_offset_calibrations() {
+  // Clear the calibrations and
+  this->offset_phase_[PHASEA].voltage_offset_ = 0;
+  this->phase_[PHASEA].voltage_offset_ = this->offset_phase_[PHASEA].voltage_offset_;
+  this->write16_(ATM90E32_REGISTER_UOFFSETA, this->phase_[PHASEA].voltage_offset_);  // C Voltage offset
+  this->offset_phase_[PHASEA].current_offset_ = 0;
+  this->phase_[PHASEA].current_offset_ = this->offset_phase_[PHASEA].current_offset_;
+  this->write16_(ATM90E32_REGISTER_IOFFSETA, this->phase_[PHASEA].current_offset_);  // C Current offset
+  this->offset_phase_[PHASEB].voltage_offset_ = 0;
+  this->phase_[PHASEB].voltage_offset_ = this->offset_phase_[PHASEB].voltage_offset_;
+  this->write16_(ATM90E32_REGISTER_UOFFSETB, this->phase_[PHASEB].voltage_offset_);  // C Voltage offset
+  this->offset_phase_[PHASEB].current_offset_ = 0;
+  this->phase_[PHASEB].current_offset_ = this->offset_phase_[PHASEB].current_offset_;
+  this->write16_(ATM90E32_REGISTER_IOFFSETB, this->phase_[PHASEB].current_offset_);  // C Current offset
+  this->offset_phase_[PHASEC].voltage_offset_ = 0;
+  this->phase_[PHASEC].voltage_offset_ = this->offset_phase_[PHASEC].voltage_offset_;
+  this->write16_(ATM90E32_REGISTER_UOFFSETC, this->phase_[PHASEC].voltage_offset_);  // C Voltage offset
+  this->offset_phase_[PHASEC].current_offset_ = 0;
+  this->phase_[PHASEC].current_offset_ = this->offset_phase_[PHASEC].current_offset_;
+  this->write16_(ATM90E32_REGISTER_IOFFSETC, this->phase_[PHASEC].current_offset_);  // C Current offset
+  this->pref_.save(&this->offset_phase_);
+  ESP_LOGI(TAG, "PhaseA Vo=%5d PhaseB Vo=%5d PhaseC Vo=%5d", this->offset_phase_[PHASEA].voltage_offset_,
+           this->offset_phase_[PHASEB].voltage_offset_, this->offset_phase_[PHASEC].voltage_offset_);
+  ESP_LOGI(TAG, "PhaseA Io=%5d PhaseB Io=%5d PhaseC Io=%5d", this->offset_phase_[PHASEA].current_offset_,
+           this->offset_phase_[PHASEB].current_offset_, this->offset_phase_[PHASEC].current_offset_);
+}
+
 void ATM90E32Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up ATM90E32 Component...");
   this->spi_setup();
-
+  if (this->enable_offset_calibration_) {
+    uint32_t hash = fnv1_hash(App.get_friendly_name());
+    this->pref_ = global_preferences->make_preference<Calibration[3]>(hash, true);
+    this->restore_calibrations_();
+  }
   uint16_t mmode0 = 0x87;  // 3P4W 50Hz
   if (line_freq_ == 60) {
     mmode0 |= 1 << 12;  // sets 12th bit to 1, 60Hz
@@ -167,27 +234,12 @@ void ATM90E32Component::setup() {
   this->write16_(ATM90E32_REGISTER_SSTARTTH, 0x1D4C);       // All Reactive Startup Power Threshold - 50%
   this->write16_(ATM90E32_REGISTER_PPHASETH, 0x02EE);       // Each Phase Active Phase Threshold - 0.002A/0.00032 = 750
   this->write16_(ATM90E32_REGISTER_QPHASETH, 0x02EE);       // Each phase Reactive Phase Threshold - 10%
-  // Setup voltage and current calibration offsets for PHASE A
-  this->phase_[PHASEA].voltage_offset_ = calibrate_voltage_offset_phase(PHASEA);
-  this->write16_(ATM90E32_REGISTER_UOFFSETA, this->phase_[PHASEA].voltage_offset_);  // A Voltage offset
-  this->phase_[PHASEA].current_offset_ = calibrate_current_offset_phase(PHASEA);
-  this->write16_(ATM90E32_REGISTER_IOFFSETA, this->phase_[PHASEA].current_offset_);  // A Current offset
   // Setup voltage and current gain for PHASE A
   this->write16_(ATM90E32_REGISTER_UGAINA, this->phase_[PHASEA].voltage_gain_);  // A Voltage rms gain
   this->write16_(ATM90E32_REGISTER_IGAINA, this->phase_[PHASEA].ct_gain_);       // A line current gain
-  // Setup voltage and current calibration offsets for PHASE B
-  this->phase_[PHASEB].voltage_offset_ = calibrate_voltage_offset_phase(PHASEB);
-  this->write16_(ATM90E32_REGISTER_UOFFSETB, this->phase_[PHASEB].voltage_offset_);  // B Voltage offset
-  this->phase_[PHASEB].current_offset_ = calibrate_current_offset_phase(PHASEB);
-  this->write16_(ATM90E32_REGISTER_IOFFSETB, this->phase_[PHASEB].current_offset_);  // B Current offset
   // Setup voltage and current gain for PHASE B
   this->write16_(ATM90E32_REGISTER_UGAINB, this->phase_[PHASEB].voltage_gain_);  // B Voltage rms gain
   this->write16_(ATM90E32_REGISTER_IGAINB, this->phase_[PHASEB].ct_gain_);       // B line current gain
-  // Setup voltage and current calibration offsets for PHASE C
-  this->phase_[PHASEC].voltage_offset_ = calibrate_voltage_offset_phase(PHASEC);
-  this->write16_(ATM90E32_REGISTER_UOFFSETC, this->phase_[PHASEC].voltage_offset_);  // C Voltage offset
-  this->phase_[PHASEC].current_offset_ = calibrate_current_offset_phase(PHASEC);
-  this->write16_(ATM90E32_REGISTER_IOFFSETC, this->phase_[PHASEC].current_offset_);  // C Current offset
   // Setup voltage and current gain for PHASE C
   this->write16_(ATM90E32_REGISTER_UGAINC, this->phase_[PHASEC].voltage_gain_);  // C Voltage rms gain
   this->write16_(ATM90E32_REGISTER_IGAINC, this->phase_[PHASEC].ct_gain_);       // C line current gain

esphome/components/atm90e32/atm90e32.h

@@ -1,9 +1,12 @@
 #pragma once
 
-#include "esphome/core/component.h"
+#include "atm90e32_reg.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/spi/spi.h"
-#include "atm90e32_reg.h"
+#include "esphome/core/application.h"
+#include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/preferences.h"
 
 namespace esphome {
 namespace atm90e32 {
@@ -20,7 +23,6 @@ class ATM90E32Component : public PollingComponent,
   void dump_config() override;
   float get_setup_priority() const override;
   void update() override;
-
   void set_voltage_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].voltage_sensor_ = obj; }
   void set_current_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].current_sensor_ = obj; }
   void set_power_sensor(int phase, sensor::Sensor *obj) { this->phase_[phase].power_sensor_ = obj; }
@@ -48,9 +50,11 @@ class ATM90E32Component : public PollingComponent,
   void set_line_freq(int freq) { line_freq_ = freq; }
   void set_current_phases(int phases) { current_phases_ = phases; }
   void set_pga_gain(uint16_t gain) { pga_gain_ = gain; }
+  void run_offset_calibrations();
+  void clear_offset_calibrations();
+  void set_enable_offset_calibration(bool flag) { enable_offset_calibration_ = flag; }
   uint16_t calibrate_voltage_offset_phase(uint8_t /*phase*/);
   uint16_t calibrate_current_offset_phase(uint8_t /*phase*/);
-
   int32_t last_periodic_millis = millis();
 
  protected:
@@ -83,10 +87,11 @@ class ATM90E32Component : public PollingComponent,
   float get_chip_temperature_();
   bool get_publish_interval_flag_() { return publish_interval_flag_; };
   void set_publish_interval_flag_(bool flag) { publish_interval_flag_ = flag; };
+  void restore_calibrations_();
 
   struct ATM90E32Phase {
-    uint16_t voltage_gain_{7305};
+    uint16_t voltage_gain_{0};
-    uint16_t ct_gain_{27961};
+    uint16_t ct_gain_{0};
     uint16_t voltage_offset_{0};
     uint16_t current_offset_{0};
     float voltage_{0};
@@ -114,13 +119,21 @@ class ATM90E32Component : public PollingComponent,
     uint32_t cumulative_reverse_active_energy_{0};
   } phase_[3];
 
+  struct Calibration {
+    uint16_t voltage_offset_{0};
+    uint16_t current_offset_{0};
+  } offset_phase_[3];
+
+  ESPPreferenceObject pref_;
+
   sensor::Sensor *freq_sensor_{nullptr};
   sensor::Sensor *chip_temperature_sensor_{nullptr};
   uint16_t pga_gain_{0x15};
   int line_freq_{60};
   int current_phases_{3};
-  bool publish_interval_flag_{true};
+  bool publish_interval_flag_{false};
   bool peak_current_signed_{false};
+  bool enable_offset_calibration_{false};
 };
 
 }  // namespace atm90e32

esphome/components/atm90e32/atm90e32_reg.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cinttypes>
+
 namespace esphome {
 namespace atm90e32 {
 

esphome/components/atm90e32/button/__init__.py

@@ -0,0 +1,43 @@
+import esphome.codegen as cg
+from esphome.components import button
+import esphome.config_validation as cv
+from esphome.const import CONF_ID, ENTITY_CATEGORY_CONFIG, ICON_CHIP, ICON_SCALE
+
+from .. import atm90e32_ns
+from ..sensor import ATM90E32Component
+
+CONF_RUN_OFFSET_CALIBRATION = "run_offset_calibration"
+CONF_CLEAR_OFFSET_CALIBRATION = "clear_offset_calibration"
+
+ATM90E32CalibrationButton = atm90e32_ns.class_(
+    "ATM90E32CalibrationButton",
+    button.Button,
+)
+ATM90E32ClearCalibrationButton = atm90e32_ns.class_(
+    "ATM90E32ClearCalibrationButton",
+    button.Button,
+)
+
+CONFIG_SCHEMA = {
+    cv.GenerateID(CONF_ID): cv.use_id(ATM90E32Component),
+    cv.Optional(CONF_RUN_OFFSET_CALIBRATION): button.button_schema(
+        ATM90E32CalibrationButton,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        icon=ICON_SCALE,
+    ),
+    cv.Optional(CONF_CLEAR_OFFSET_CALIBRATION): button.button_schema(
+        ATM90E32ClearCalibrationButton,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        icon=ICON_CHIP,
+    ),
+}
+
+
+async def to_code(config):
+    parent = await cg.get_variable(config[CONF_ID])
+    if run_offset := config.get(CONF_RUN_OFFSET_CALIBRATION):
+        b = await button.new_button(run_offset)
+        await cg.register_parented(b, parent)
+    if clear_offset := config.get(CONF_CLEAR_OFFSET_CALIBRATION):
+        b = await button.new_button(clear_offset)
+        await cg.register_parented(b, parent)

esphome/components/atm90e32/button/atm90e32_button.cpp

@@ -0,0 +1,20 @@
+#include "atm90e32_button.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace atm90e32 {
+
+static const char *const TAG = "atm90e32.button";
+
+void ATM90E32CalibrationButton::press_action() {
+  ESP_LOGI(TAG, "Running offset calibrations, Note: CTs and ACVs must be 0 during this process...");
+  this->parent_->run_offset_calibrations();
+}
+
+void ATM90E32ClearCalibrationButton::press_action() {
+  ESP_LOGI(TAG, "Offset calibrations cleared.");
+  this->parent_->clear_offset_calibrations();
+}
+
+}  // namespace atm90e32
+}  // namespace esphome

esphome/components/atm90e32/button/atm90e32_button.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/atm90e32/atm90e32.h"
+#include "esphome/components/button/button.h"
+
+namespace esphome {
+namespace atm90e32 {
+
+class ATM90E32CalibrationButton : public button::Button, public Parented<ATM90E32Component> {
+ public:
+  ATM90E32CalibrationButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+class ATM90E32ClearCalibrationButton : public button::Button, public Parented<ATM90E32Component> {
+ public:
+  ATM90E32ClearCalibrationButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+}  // namespace atm90e32
+}  // namespace esphome

esphome/components/atm90e32/sensor.py

@@ -1,21 +1,21 @@
 import esphome.codegen as cg
-import esphome.config_validation as cv
 from esphome.components import sensor, spi
+import esphome.config_validation as cv
 from esphome.const import (
-    CONF_ID,
+    CONF_APPARENT_POWER,
-    CONF_REACTIVE_POWER,
-    CONF_VOLTAGE,
     CONF_CURRENT,
+    CONF_FORWARD_ACTIVE_ENERGY,
+    CONF_FREQUENCY,
+    CONF_ID,
     CONF_PHASE_A,
+    CONF_PHASE_ANGLE,
     CONF_PHASE_B,
     CONF_PHASE_C,
-    CONF_PHASE_ANGLE,
     CONF_POWER,
     CONF_POWER_FACTOR,
-    CONF_APPARENT_POWER,
+    CONF_REACTIVE_POWER,
-    CONF_FREQUENCY,
-    CONF_FORWARD_ACTIVE_ENERGY,
     CONF_REVERSE_ACTIVE_ENERGY,
+    CONF_VOLTAGE,
     DEVICE_CLASS_CURRENT,
     DEVICE_CLASS_ENERGY,
     DEVICE_CLASS_POWER,
@@ -23,13 +23,13 @@ from esphome.const import (
     DEVICE_CLASS_TEMPERATURE,
     DEVICE_CLASS_VOLTAGE,
     ENTITY_CATEGORY_DIAGNOSTIC,
-    ICON_LIGHTBULB,
     ICON_CURRENT_AC,
+    ICON_LIGHTBULB,
     STATE_CLASS_MEASUREMENT,
     STATE_CLASS_TOTAL_INCREASING,
     UNIT_AMPERE,
-    UNIT_DEGREES,
     UNIT_CELSIUS,
+    UNIT_DEGREES,
     UNIT_HERTZ,
     UNIT_VOLT,
     UNIT_VOLT_AMPS_REACTIVE,
@@ -37,6 +37,8 @@ from esphome.const import (
     UNIT_WATT_HOURS,
 )
 
+from . import atm90e32_ns
+
 CONF_LINE_FREQUENCY = "line_frequency"
 CONF_CHIP_TEMPERATURE = "chip_temperature"
 CONF_GAIN_PGA = "gain_pga"
@@ -46,6 +48,7 @@ CONF_GAIN_CT = "gain_ct"
 CONF_HARMONIC_POWER = "harmonic_power"
 CONF_PEAK_CURRENT = "peak_current"
 CONF_PEAK_CURRENT_SIGNED = "peak_current_signed"
+CONF_ENABLE_OFFSET_CALIBRATION = "enable_offset_calibration"
 UNIT_DEG = "degrees"
 LINE_FREQS = {
     "50HZ": 50,
@@ -61,7 +64,6 @@ PGA_GAINS = {
     "4X": 0x2A,
 }
 
-atm90e32_ns = cg.esphome_ns.namespace("atm90e32")
 ATM90E32Component = atm90e32_ns.class_(
     "ATM90E32Component", cg.PollingComponent, spi.SPIDevice
 )
@@ -164,6 +166,7 @@ CONFIG_SCHEMA = (
             ),
             cv.Optional(CONF_GAIN_PGA, default="2X"): cv.enum(PGA_GAINS, upper=True),
             cv.Optional(CONF_PEAK_CURRENT_SIGNED, default=False): cv.boolean,
+            cv.Optional(CONF_ENABLE_OFFSET_CALIBRATION, default=False): cv.boolean,
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -227,3 +230,4 @@ async def to_code(config):
     cg.add(var.set_current_phases(config[CONF_CURRENT_PHASES]))
     cg.add(var.set_pga_gain(config[CONF_GAIN_PGA]))
     cg.add(var.set_peak_current_signed(config[CONF_PEAK_CURRENT_SIGNED]))
+    cg.add(var.set_enable_offset_calibration(config[CONF_ENABLE_OFFSET_CALIBRATION]))

esphome/components/bedjet/bedjet_codec.h

@@ -90,7 +90,7 @@ struct BedjetStatusPacket {
     int unused_6 : 1;       // 0x4
     bool is_dual_zone : 1;  /// Is part of a Dual Zone configuration
     int unused_7 : 1;       // 0x1
-  } dual_zone_flags;
+  } dual_zone_flags;        // NOLINT(clang-diagnostic-unaligned-access)
 
   uint8_t unused_4 : 8;  // Unknown 23-24 = 0x1310
   uint8_t unused_5 : 8;  // Unknown 23-24 = 0x1310

esphome/components/binary/light/binary_light_output.h

@@ -18,11 +18,12 @@ class BinaryLightOutput : public light::LightOutput {
   void write_state(light::LightState *state) override {
     bool binary;
     state->current_values_as_binary(&binary);
-    if (binary)
+    if (binary) {
       this->output_->turn_on();
-    else
+    } else {
       this->output_->turn_off();
     }
+  }
 
  protected:
   output::BinaryOutput *output_;

esphome/components/bme68x_bsec2/__init__.py

@@ -0,0 +1,196 @@
+import hashlib
+from pathlib import Path
+
+from esphome import core, external_files
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_ID,
+    CONF_MODEL,
+    CONF_RAW_DATA_ID,
+    CONF_SAMPLE_RATE,
+    CONF_TEMPERATURE_OFFSET,
+)
+
+CODEOWNERS = ["@neffs", "@kbx81"]
+
+DOMAIN = "bme68x_bsec2"
+
+BSEC2_LIBRARY_VERSION = "v1.7.2502"
+
+CONF_ALGORITHM_OUTPUT = "algorithm_output"
+CONF_BME68X_BSEC2_ID = "bme68x_bsec2_id"
+CONF_IAQ_MODE = "iaq_mode"
+CONF_OPERATING_AGE = "operating_age"
+CONF_STATE_SAVE_INTERVAL = "state_save_interval"
+CONF_SUPPLY_VOLTAGE = "supply_voltage"
+
+bme68x_bsec2_ns = cg.esphome_ns.namespace("bme68x_bsec2")
+BME68xBSEC2Component = bme68x_bsec2_ns.class_("BME68xBSEC2Component", cg.Component)
+
+
+MODEL_OPTIONS = ["bme680", "bme688"]
+
+AlgorithmOutput = bme68x_bsec2_ns.enum("AlgorithmOutput")
+ALGORITHM_OUTPUT_OPTIONS = {
+    "classification": AlgorithmOutput.ALGORITHM_OUTPUT_CLASSIFICATION,
+    "regression": AlgorithmOutput.ALGORITHM_OUTPUT_REGRESSION,
+}
+
+OperatingAge = bme68x_bsec2_ns.enum("OperatingAge")
+OPERATING_AGE_OPTIONS = {
+    "4d": OperatingAge.OPERATING_AGE_4D,
+    "28d": OperatingAge.OPERATING_AGE_28D,
+}
+
+SampleRate = bme68x_bsec2_ns.enum("SampleRate")
+SAMPLE_RATE_OPTIONS = {
+    "LP": SampleRate.SAMPLE_RATE_LP,
+    "ULP": SampleRate.SAMPLE_RATE_ULP,
+}
+
+Voltage = bme68x_bsec2_ns.enum("Voltage")
+VOLTAGE_OPTIONS = {
+    "1.8V": Voltage.VOLTAGE_1_8V,
+    "3.3V": Voltage.VOLTAGE_3_3V,
+}
+
+ALGORITHM_OUTPUT_FILE_NAME = {
+    "classification": "sel",
+    "regression": "reg",
+}
+
+SAMPLE_RATE_FILE_NAME = {
+    "LP": "3s",
+    "ULP": "300s",
+}
+
+VOLTAGE_FILE_NAME = {
+    "1.8V": "18v",
+    "3.3V": "33v",
+}
+
+
+def _compute_local_file_path(url: str) -> Path:
+    h = hashlib.new("sha256")
+    h.update(url.encode())
+    key = h.hexdigest()[:8]
+    base_dir = external_files.compute_local_file_dir(DOMAIN)
+    return base_dir / key
+
+
+def _compute_url(config: dict) -> str:
+    model = config.get(CONF_MODEL)
+    operating_age = config.get(CONF_OPERATING_AGE)
+    sample_rate = SAMPLE_RATE_FILE_NAME[config.get(CONF_SAMPLE_RATE)]
+    volts = VOLTAGE_FILE_NAME[config.get(CONF_SUPPLY_VOLTAGE)]
+    if model == "bme688":
+        algo = ALGORITHM_OUTPUT_FILE_NAME[
+            config.get(CONF_ALGORITHM_OUTPUT, "classification")
+        ]
+        filename = "bsec_selectivity"
+    else:
+        algo = "iaq"
+        filename = "bsec_iaq"
+    return f"https://raw.githubusercontent.com/boschsensortec/Bosch-BSEC2-Library/{BSEC2_LIBRARY_VERSION}/src/config/{model}/{model}_{algo}_{volts}_{sample_rate}_{operating_age}/{filename}.txt"
+
+
+def download_bme68x_blob(config):
+    url = _compute_url(config)
+    path = _compute_local_file_path(url)
+    external_files.download_content(url, path)
+
+    return config
+
+
+def validate_bme68x(config):
+    if CONF_ALGORITHM_OUTPUT not in config:
+        return config
+
+    if config[CONF_MODEL] != "bme688":
+        raise cv.Invalid(f"{CONF_ALGORITHM_OUTPUT} is only valid for BME688")
+
+    if config[CONF_ALGORITHM_OUTPUT] == "regression" and (
+        config[CONF_OPERATING_AGE] != "4d"
+        or config[CONF_SAMPLE_RATE] != "ULP"
+        or config[CONF_SUPPLY_VOLTAGE] != "1.8V"
+    ):
+        raise cv.Invalid(
+            f" To use '{CONF_ALGORITHM_OUTPUT}: regression', {CONF_OPERATING_AGE} must be '4d', {CONF_SAMPLE_RATE} must be 'ULP' and {CONF_SUPPLY_VOLTAGE} must be '1.8V'"
+        )
+    return config
+
+
+CONFIG_SCHEMA_BASE = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(BME68xBSEC2Component),
+            cv.GenerateID(CONF_RAW_DATA_ID): cv.declare_id(cg.uint8),
+            cv.Required(CONF_MODEL): cv.one_of(*MODEL_OPTIONS, lower=True),
+            cv.Optional(CONF_ALGORITHM_OUTPUT): cv.enum(
+                ALGORITHM_OUTPUT_OPTIONS, lower=True
+            ),
+            cv.Optional(CONF_OPERATING_AGE, default="28d"): cv.enum(
+                OPERATING_AGE_OPTIONS, lower=True
+            ),
+            cv.Optional(CONF_SAMPLE_RATE, default="LP"): cv.enum(
+                SAMPLE_RATE_OPTIONS, upper=True
+            ),
+            cv.Optional(CONF_SUPPLY_VOLTAGE, default="3.3V"): cv.enum(
+                VOLTAGE_OPTIONS, upper=True
+            ),
+            cv.Optional(CONF_TEMPERATURE_OFFSET, default=0): cv.temperature,
+            cv.Optional(
+                CONF_STATE_SAVE_INTERVAL, default="6hours"
+            ): cv.positive_time_period_minutes,
+        },
+    )
+    .add_extra(cv.only_with_arduino)
+    .add_extra(validate_bme68x)
+    .add_extra(download_bme68x_blob)
+)
+
+
+async def to_code_base(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    if algo_output := config.get(CONF_ALGORITHM_OUTPUT):
+        cg.add(var.set_algorithm_output(algo_output))
+    cg.add(var.set_operating_age(config[CONF_OPERATING_AGE]))
+    cg.add(var.set_sample_rate(config[CONF_SAMPLE_RATE]))
+    cg.add(var.set_voltage(config[CONF_SUPPLY_VOLTAGE]))
+    cg.add(var.set_temperature_offset(config[CONF_TEMPERATURE_OFFSET]))
+    cg.add(
+        var.set_state_save_interval(config[CONF_STATE_SAVE_INTERVAL].total_milliseconds)
+    )
+
+    path = _compute_local_file_path(_compute_url(config))
+
+    try:
+        with open(path, encoding="utf-8") as f:
+            bsec2_iaq_config = f.read()
+    except Exception as e:
+        raise core.EsphomeError(f"Could not open binary configuration file {path}: {e}")
+
+    # Convert retrieved BSEC2 config to an array of ints
+    rhs = [int(x) for x in bsec2_iaq_config.split(",")]
+    # Create an array which will reside in program memory and configure the sensor instance to use it
+    bsec2_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
+    cg.add(var.set_bsec2_configuration(bsec2_arr, len(rhs)))
+
+    # Although this component does not use SPI, the BSEC2 library requires the SPI library
+    cg.add_library("SPI", None)
+    cg.add_library(
+        "BME68x Sensor library",
+        "1.1.40407",
+    )
+    cg.add_library(
+        "BSEC2 Software Library",
+        None,
+        f"https://github.com/boschsensortec/Bosch-BSEC2-Library.git#{BSEC2_LIBRARY_VERSION}",
+    )
+
+    cg.add_define("USE_BSEC2")
+
+    return var

esphome/components/bme68x_bsec2/bme68x_bsec2.cpp

@@ -0,0 +1,523 @@
+#include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+#ifdef USE_BSEC2
+#include "bme68x_bsec2.h"
+
+#include <string>
+
+namespace esphome {
+namespace bme68x_bsec2 {
+
+#define BME68X_BSEC2_ALGORITHM_OUTPUT_LOG(a) (a == ALGORITHM_OUTPUT_CLASSIFICATION ? "Classification" : "Regression")
+#define BME68X_BSEC2_OPERATING_AGE_LOG(o) (o == OPERATING_AGE_4D ? "4 days" : "28 days")
+#define BME68X_BSEC2_SAMPLE_RATE_LOG(r) (r == SAMPLE_RATE_DEFAULT ? "Default" : (r == SAMPLE_RATE_ULP ? "ULP" : "LP"))
+#define BME68X_BSEC2_VOLTAGE_LOG(v) (v == VOLTAGE_3_3V ? "3.3V" : "1.8V")
+
+static const char *const TAG = "bme68x_bsec2.sensor";
+
+static const std::string IAQ_ACCURACY_STATES[4] = {"Stabilizing", "Uncertain", "Calibrating", "Calibrated"};
+
+void BME68xBSEC2Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up BME68X via BSEC2...");
+
+  this->bsec_status_ = bsec_init_m(&this->bsec_instance_);
+  if (this->bsec_status_ != BSEC_OK) {
+    this->mark_failed();
+    ESP_LOGE(TAG, "bsec_init_m failed: status %d", this->bsec_status_);
+    return;
+  }
+
+  bsec_get_version_m(&this->bsec_instance_, &this->version_);
+
+  this->bme68x_status_ = bme68x_init(&this->bme68x_);
+  if (this->bme68x_status_ != BME68X_OK) {
+    this->mark_failed();
+    ESP_LOGE(TAG, "bme68x_init failed: status %d", this->bme68x_status_);
+    return;
+  }
+  if (this->bsec2_configuration_ != nullptr && this->bsec2_configuration_length_) {
+    this->set_config_(this->bsec2_configuration_, this->bsec2_configuration_length_);
+    if (this->bsec_status_ != BSEC_OK) {
+      this->mark_failed();
+      ESP_LOGE(TAG, "bsec_set_configuration_m failed: status %d", this->bsec_status_);
+      return;
+    }
+  }
+
+  this->update_subscription_();
+  if (this->bsec_status_ != BSEC_OK) {
+    this->mark_failed();
+    ESP_LOGE(TAG, "bsec_update_subscription_m failed: status %d", this->bsec_status_);
+    return;
+  }
+
+  this->load_state_();
+}
+
+void BME68xBSEC2Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "BME68X via BSEC2:");
+
+  ESP_LOGCONFIG(TAG, "  BSEC2 version: %d.%d.%d.%d", this->version_.major, this->version_.minor,
+                this->version_.major_bugfix, this->version_.minor_bugfix);
+
+  ESP_LOGCONFIG(TAG, "  BSEC2 configuration blob:");
+  ESP_LOGCONFIG(TAG, "    Configured: %s", YESNO(this->bsec2_blob_configured_));
+  if (this->bsec2_configuration_ != nullptr && this->bsec2_configuration_length_) {
+    ESP_LOGCONFIG(TAG, "    Size: %" PRIu32, this->bsec2_configuration_length_);
+  }
+
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication failed (BSEC2 status: %d, BME68X status: %d)", this->bsec_status_,
+             this->bme68x_status_);
+  }
+
+  if (this->algorithm_output_ != ALGORITHM_OUTPUT_IAQ) {
+    ESP_LOGCONFIG(TAG, "  Algorithm output: %s", BME68X_BSEC2_ALGORITHM_OUTPUT_LOG(this->algorithm_output_));
+  }
+  ESP_LOGCONFIG(TAG, "  Operating age: %s", BME68X_BSEC2_OPERATING_AGE_LOG(this->operating_age_));
+  ESP_LOGCONFIG(TAG, "  Sample rate: %s", BME68X_BSEC2_SAMPLE_RATE_LOG(this->sample_rate_));
+  ESP_LOGCONFIG(TAG, "  Voltage: %s", BME68X_BSEC2_VOLTAGE_LOG(this->voltage_));
+  ESP_LOGCONFIG(TAG, "  State save interval: %ims", this->state_save_interval_ms_);
+  ESP_LOGCONFIG(TAG, "  Temperature offset: %.2f", this->temperature_offset_);
+
+#ifdef USE_SENSOR
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+  ESP_LOGCONFIG(TAG, "    Sample rate: %s", BME68X_BSEC2_SAMPLE_RATE_LOG(this->temperature_sample_rate_));
+  LOG_SENSOR("  ", "Pressure", this->pressure_sensor_);
+  ESP_LOGCONFIG(TAG, "    Sample rate: %s", BME68X_BSEC2_SAMPLE_RATE_LOG(this->pressure_sample_rate_));
+  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
+  ESP_LOGCONFIG(TAG, "    Sample rate: %s", BME68X_BSEC2_SAMPLE_RATE_LOG(this->humidity_sample_rate_));
+  LOG_SENSOR("  ", "Gas resistance", this->gas_resistance_sensor_);
+  LOG_SENSOR("  ", "CO2 equivalent", this->co2_equivalent_sensor_);
+  LOG_SENSOR("  ", "Breath VOC equivalent", this->breath_voc_equivalent_sensor_);
+  LOG_SENSOR("  ", "IAQ", this->iaq_sensor_);
+  LOG_SENSOR("  ", "IAQ static", this->iaq_static_sensor_);
+  LOG_SENSOR("  ", "Numeric IAQ accuracy", this->iaq_accuracy_sensor_);
+#endif
+#ifdef USE_TEXT_SENSOR
+  LOG_TEXT_SENSOR("  ", "IAQ accuracy", this->iaq_accuracy_text_sensor_);
+#endif
+}
+
+float BME68xBSEC2Component::get_setup_priority() const { return setup_priority::DATA; }
+
+void BME68xBSEC2Component::loop() {
+  this->run_();
+
+  if (this->bsec_status_ < BSEC_OK || this->bme68x_status_ < BME68X_OK) {
+    this->status_set_error();
+  } else {
+    this->status_clear_error();
+  }
+  if (this->bsec_status_ > BSEC_OK || this->bme68x_status_ > BME68X_OK) {
+    this->status_set_warning();
+  } else {
+    this->status_clear_warning();
+  }
+  // Process a single action from the queue. These are primarily sensor state publishes
+  // that in totality take too long to send in a single call.
+  if (this->queue_.size()) {
+    auto action = std::move(this->queue_.front());
+    this->queue_.pop();
+    action();
+  }
+}
+
+void BME68xBSEC2Component::set_config_(const uint8_t *config, uint32_t len) {
+  if (len > BSEC_MAX_PROPERTY_BLOB_SIZE) {
+    ESP_LOGE(TAG, "Configuration is larger than BSEC_MAX_PROPERTY_BLOB_SIZE");
+    this->mark_failed();
+    return;
+  }
+  uint8_t work_buffer[BSEC_MAX_PROPERTY_BLOB_SIZE];
+  this->bsec_status_ = bsec_set_configuration_m(&this->bsec_instance_, config, len, work_buffer, sizeof(work_buffer));
+  if (this->bsec_status_ == BSEC_OK) {
+    this->bsec2_blob_configured_ = true;
+  }
+}
+
+float BME68xBSEC2Component::calc_sensor_sample_rate_(SampleRate sample_rate) {
+  if (sample_rate == SAMPLE_RATE_DEFAULT) {
+    sample_rate = this->sample_rate_;
+  }
+  return sample_rate == SAMPLE_RATE_ULP ? BSEC_SAMPLE_RATE_ULP : BSEC_SAMPLE_RATE_LP;
+}
+
+void BME68xBSEC2Component::update_subscription_() {
+  bsec_sensor_configuration_t virtual_sensors[BSEC_NUMBER_OUTPUTS];
+  uint8_t num_virtual_sensors = 0;
+#ifdef USE_SENSOR
+  if (this->iaq_sensor_) {
+    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_IAQ;
+    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
+    num_virtual_sensors++;
+  }
+
+  if (this->iaq_static_sensor_) {
+    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_STATIC_IAQ;
+    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
+    num_virtual_sensors++;
+  }
+
+  if (this->co2_equivalent_sensor_) {
+    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_CO2_EQUIVALENT;
+    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
+    num_virtual_sensors++;
+  }
+
+  if (this->breath_voc_equivalent_sensor_) {
+    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_BREATH_VOC_EQUIVALENT;
+    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
+    num_virtual_sensors++;
+  }
+
+  if (this->pressure_sensor_) {
+    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_RAW_PRESSURE;
+    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(this->pressure_sample_rate_);
+    num_virtual_sensors++;
+  }
+
+  if (this->gas_resistance_sensor_) {
+    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_RAW_GAS;
+    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(SAMPLE_RATE_DEFAULT);
+    num_virtual_sensors++;
+  }
+
+  if (this->temperature_sensor_) {
+    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE;
+    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(this->temperature_sample_rate_);
+    num_virtual_sensors++;
+  }
+
+  if (this->humidity_sensor_) {
+    virtual_sensors[num_virtual_sensors].sensor_id = BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY;
+    virtual_sensors[num_virtual_sensors].sample_rate = this->calc_sensor_sample_rate_(this->humidity_sample_rate_);
+    num_virtual_sensors++;
+  }
+#endif
+  bsec_sensor_configuration_t sensor_settings[BSEC_MAX_PHYSICAL_SENSOR];
+  uint8_t num_sensor_settings = BSEC_MAX_PHYSICAL_SENSOR;
+  this->bsec_status_ = bsec_update_subscription_m(&this->bsec_instance_, virtual_sensors, num_virtual_sensors,
+                                                  sensor_settings, &num_sensor_settings);
+}
+
+void BME68xBSEC2Component::run_() {
+  int64_t curr_time_ns = this->get_time_ns_();
+  if (curr_time_ns < this->next_call_ns_) {
+    return;
+  }
+  this->op_mode_ = this->bsec_settings_.op_mode;
+  uint8_t status;
+
+  ESP_LOGV(TAG, "Performing sensor run");
+
+  struct bme68x_conf bme68x_conf;
+  this->bsec_status_ = bsec_sensor_control_m(&this->bsec_instance_, curr_time_ns, &this->bsec_settings_);
+  if (this->bsec_status_ < BSEC_OK) {
+    ESP_LOGW(TAG, "Failed to fetch sensor control settings (BSEC2 error code %d)", this->bsec_status_);
+    return;
+  }
+  this->next_call_ns_ = this->bsec_settings_.next_call;
+
+  if (this->bsec_settings_.trigger_measurement) {
+    bme68x_get_conf(&bme68x_conf, &this->bme68x_);
+
+    bme68x_conf.os_hum = this->bsec_settings_.humidity_oversampling;
+    bme68x_conf.os_temp = this->bsec_settings_.temperature_oversampling;
+    bme68x_conf.os_pres = this->bsec_settings_.pressure_oversampling;
+    bme68x_set_conf(&bme68x_conf, &this->bme68x_);
+
+    switch (this->bsec_settings_.op_mode) {
+      case BME68X_FORCED_MODE:
+        this->bme68x_heatr_conf_.enable = BME68X_ENABLE;
+        this->bme68x_heatr_conf_.heatr_temp = this->bsec_settings_.heater_temperature;
+        this->bme68x_heatr_conf_.heatr_dur = this->bsec_settings_.heater_duration;
+
+        status = bme68x_set_op_mode(this->bsec_settings_.op_mode, &this->bme68x_);
+        status = bme68x_set_heatr_conf(BME68X_FORCED_MODE, &this->bme68x_heatr_conf_, &this->bme68x_);
+        status = bme68x_set_op_mode(BME68X_FORCED_MODE, &this->bme68x_);
+        this->op_mode_ = BME68X_FORCED_MODE;
+        this->sleep_mode_ = false;
+        ESP_LOGV(TAG, "Using forced mode");
+
+        break;
+      case BME68X_PARALLEL_MODE:
+        if (this->op_mode_ != this->bsec_settings_.op_mode) {
+          this->bme68x_heatr_conf_.enable = BME68X_ENABLE;
+          this->bme68x_heatr_conf_.heatr_temp_prof = this->bsec_settings_.heater_temperature_profile;
+          this->bme68x_heatr_conf_.heatr_dur_prof = this->bsec_settings_.heater_duration_profile;
+          this->bme68x_heatr_conf_.profile_len = this->bsec_settings_.heater_profile_len;
+          this->bme68x_heatr_conf_.shared_heatr_dur =
+              BSEC_TOTAL_HEAT_DUR -
+              (bme68x_get_meas_dur(BME68X_PARALLEL_MODE, &bme68x_conf, &this->bme68x_) / INT64_C(1000));
+
+          status = bme68x_set_heatr_conf(BME68X_PARALLEL_MODE, &this->bme68x_heatr_conf_, &this->bme68x_);
+
+          status = bme68x_set_op_mode(BME68X_PARALLEL_MODE, &this->bme68x_);
+          this->op_mode_ = BME68X_PARALLEL_MODE;
+          this->sleep_mode_ = false;
+          ESP_LOGV(TAG, "Using parallel mode");
+        }
+        break;
+      case BME68X_SLEEP_MODE:
+        if (!this->sleep_mode_) {
+          bme68x_set_op_mode(BME68X_SLEEP_MODE, &this->bme68x_);
+          this->sleep_mode_ = true;
+          ESP_LOGV(TAG, "Using sleep mode");
+        }
+        break;
+    }
+
+    uint32_t meas_dur = 0;
+    meas_dur = bme68x_get_meas_dur(this->op_mode_, &bme68x_conf, &this->bme68x_);
+    ESP_LOGV(TAG, "Queueing read in %uus", meas_dur);
+    this->set_timeout("read", meas_dur / 1000, [this, curr_time_ns]() { this->read_(curr_time_ns); });
+  } else {
+    ESP_LOGV(TAG, "Measurement not required");
+    this->read_(curr_time_ns);
+  }
+}
+
+void BME68xBSEC2Component::read_(int64_t trigger_time_ns) {
+  ESP_LOGV(TAG, "Reading data");
+
+  if (this->bsec_settings_.trigger_measurement) {
+    uint8_t current_op_mode;
+    this->bme68x_status_ = bme68x_get_op_mode(&current_op_mode, &this->bme68x_);
+
+    if (current_op_mode == BME68X_SLEEP_MODE) {
+      ESP_LOGV(TAG, "Still in sleep mode, doing nothing");
+      return;
+    }
+  }
+
+  if (!this->bsec_settings_.process_data) {
+    ESP_LOGV(TAG, "Data processing not required");
+    return;
+  }
+
+  struct bme68x_data data[3];
+  uint8_t nFields = 0;
+  this->bme68x_status_ = bme68x_get_data(this->op_mode_, &data[0], &nFields, &this->bme68x_);
+
+  if (this->bme68x_status_ != BME68X_OK) {
+    ESP_LOGW(TAG, "Failed to get sensor data (BME68X error code %d)", this->bme68x_status_);
+    return;
+  }
+  if (nFields < 1) {
+    ESP_LOGD(TAG, "BME68X did not provide new data");
+    return;
+  }
+
+  for (uint8_t i = 0; i < nFields; i++) {
+    bsec_input_t inputs[BSEC_MAX_PHYSICAL_SENSOR];  // Temperature, Pressure, Humidity & Gas Resistance
+    uint8_t num_inputs = 0;
+
+    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_TEMPERATURE)) {
+      inputs[num_inputs].sensor_id = BSEC_INPUT_TEMPERATURE;
+      inputs[num_inputs].signal = data[i].temperature;
+      inputs[num_inputs].time_stamp = trigger_time_ns;
+      num_inputs++;
+    }
+    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_HEATSOURCE)) {
+      inputs[num_inputs].sensor_id = BSEC_INPUT_HEATSOURCE;
+      inputs[num_inputs].signal = this->temperature_offset_;
+      inputs[num_inputs].time_stamp = trigger_time_ns;
+      num_inputs++;
+    }
+    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_HUMIDITY)) {
+      inputs[num_inputs].sensor_id = BSEC_INPUT_HUMIDITY;
+      inputs[num_inputs].signal = data[i].humidity;
+      inputs[num_inputs].time_stamp = trigger_time_ns;
+      num_inputs++;
+    }
+    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_PRESSURE)) {
+      inputs[num_inputs].sensor_id = BSEC_INPUT_PRESSURE;
+      inputs[num_inputs].signal = data[i].pressure;
+      inputs[num_inputs].time_stamp = trigger_time_ns;
+      num_inputs++;
+    }
+    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_GASRESISTOR)) {
+      if (data[i].status & BME68X_GASM_VALID_MSK) {
+        inputs[num_inputs].sensor_id = BSEC_INPUT_GASRESISTOR;
+        inputs[num_inputs].signal = data[i].gas_resistance;
+        inputs[num_inputs].time_stamp = trigger_time_ns;
+        num_inputs++;
+      } else {
+        ESP_LOGD(TAG, "BME68X did not report gas data");
+      }
+    }
+    if (BSEC_CHECK_INPUT(this->bsec_settings_.process_data, BSEC_INPUT_PROFILE_PART) &&
+        (data[i].status & BME68X_GASM_VALID_MSK)) {
+      inputs[num_inputs].sensor_id = BSEC_INPUT_PROFILE_PART;
+      inputs[num_inputs].signal = (this->op_mode_ == BME68X_FORCED_MODE) ? 0 : data[i].gas_index;
+      inputs[num_inputs].time_stamp = trigger_time_ns;
+      num_inputs++;
+    }
+
+    if (num_inputs < 1) {
+      ESP_LOGD(TAG, "No signal inputs available for BSEC2");
+      return;
+    }
+
+    bsec_output_t outputs[BSEC_NUMBER_OUTPUTS];
+    uint8_t num_outputs = BSEC_NUMBER_OUTPUTS;
+    this->bsec_status_ = bsec_do_steps_m(&this->bsec_instance_, inputs, num_inputs, outputs, &num_outputs);
+    if (this->bsec_status_ != BSEC_OK) {
+      ESP_LOGW(TAG, "BSEC2 failed to process signals (BSEC2 error code %d)", this->bsec_status_);
+      return;
+    }
+    if (num_outputs < 1) {
+      ESP_LOGD(TAG, "No signal outputs provided by BSEC2");
+      return;
+    }
+
+    this->publish_(outputs, num_outputs);
+  }
+}
+
+void BME68xBSEC2Component::publish_(const bsec_output_t *outputs, uint8_t num_outputs) {
+  ESP_LOGV(TAG, "Publishing sensor states");
+  bool update_accuracy = false;
+  uint8_t max_accuracy = 0;
+  for (uint8_t i = 0; i < num_outputs; i++) {
+    float signal = outputs[i].signal;
+    switch (outputs[i].sensor_id) {
+      case BSEC_OUTPUT_IAQ:
+        max_accuracy = std::max(outputs[i].accuracy, max_accuracy);
+        update_accuracy = true;
+#ifdef USE_SENSOR
+        this->queue_push_([this, signal]() { this->publish_sensor_(this->iaq_sensor_, signal); });
+#endif
+        break;
+      case BSEC_OUTPUT_STATIC_IAQ:
+        max_accuracy = std::max(outputs[i].accuracy, max_accuracy);
+        update_accuracy = true;
+#ifdef USE_SENSOR
+        this->queue_push_([this, signal]() { this->publish_sensor_(this->iaq_static_sensor_, signal); });
+#endif
+        break;
+      case BSEC_OUTPUT_CO2_EQUIVALENT:
+#ifdef USE_SENSOR
+        this->queue_push_([this, signal]() { this->publish_sensor_(this->co2_equivalent_sensor_, signal); });
+#endif
+        break;
+      case BSEC_OUTPUT_BREATH_VOC_EQUIVALENT:
+#ifdef USE_SENSOR
+        this->queue_push_([this, signal]() { this->publish_sensor_(this->breath_voc_equivalent_sensor_, signal); });
+#endif
+        break;
+      case BSEC_OUTPUT_RAW_PRESSURE:
+#ifdef USE_SENSOR
+        this->queue_push_([this, signal]() { this->publish_sensor_(this->pressure_sensor_, signal / 100.0f); });
+#endif
+        break;
+      case BSEC_OUTPUT_RAW_GAS:
+#ifdef USE_SENSOR
+        this->queue_push_([this, signal]() { this->publish_sensor_(this->gas_resistance_sensor_, signal); });
+#endif
+        break;
+      case BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_TEMPERATURE:
+#ifdef USE_SENSOR
+        this->queue_push_([this, signal]() { this->publish_sensor_(this->temperature_sensor_, signal); });
+#endif
+        break;
+      case BSEC_OUTPUT_SENSOR_HEAT_COMPENSATED_HUMIDITY:
+#ifdef USE_SENSOR
+        this->queue_push_([this, signal]() { this->publish_sensor_(this->humidity_sensor_, signal); });
+#endif
+        break;
+    }
+  }
+  if (update_accuracy) {
+#ifdef USE_SENSOR
+    this->queue_push_(
+        [this, max_accuracy]() { this->publish_sensor_(this->iaq_accuracy_sensor_, max_accuracy, true); });
+#endif
+#ifdef USE_TEXT_SENSOR
+    this->queue_push_([this, max_accuracy]() {
+      this->publish_sensor_(this->iaq_accuracy_text_sensor_, IAQ_ACCURACY_STATES[max_accuracy]);
+    });
+#endif
+    // Queue up an opportunity to save state
+    this->queue_push_([this, max_accuracy]() { this->save_state_(max_accuracy); });
+  }
+}
+
+int64_t BME68xBSEC2Component::get_time_ns_() {
+  int64_t time_ms = millis();
+  if (this->last_time_ms_ > time_ms) {
+    this->millis_overflow_counter_++;
+  }
+  this->last_time_ms_ = time_ms;
+
+  return (time_ms + ((int64_t) this->millis_overflow_counter_ << 32)) * INT64_C(1000000);
+}
+
+#ifdef USE_SENSOR
+void BME68xBSEC2Component::publish_sensor_(sensor::Sensor *sensor, float value, bool change_only) {
+  if (!sensor || (change_only && sensor->has_state() && sensor->state == value)) {
+    return;
+  }
+  sensor->publish_state(value);
+}
+#endif
+
+#ifdef USE_TEXT_SENSOR
+void BME68xBSEC2Component::publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value) {
+  if (!sensor || (sensor->has_state() && sensor->state == value)) {
+    return;
+  }
+  sensor->publish_state(value);
+}
+#endif
+
+void BME68xBSEC2Component::load_state_() {
+  uint32_t hash = this->get_hash();
+  this->bsec_state_ = global_preferences->make_preference<uint8_t[BSEC_MAX_STATE_BLOB_SIZE]>(hash, true);
+
+  uint8_t state[BSEC_MAX_STATE_BLOB_SIZE];
+  if (this->bsec_state_.load(&state)) {
+    ESP_LOGV(TAG, "Loading state");
+    uint8_t work_buffer[BSEC_MAX_WORKBUFFER_SIZE];
+    this->bsec_status_ =
+        bsec_set_state_m(&this->bsec_instance_, state, BSEC_MAX_STATE_BLOB_SIZE, work_buffer, sizeof(work_buffer));
+    if (this->bsec_status_ != BSEC_OK) {
+      ESP_LOGW(TAG, "Failed to load state (BSEC2 error code %d)", this->bsec_status_);
+    }
+    ESP_LOGI(TAG, "Loaded state");
+  }
+}
+
+void BME68xBSEC2Component::save_state_(uint8_t accuracy) {
+  if (accuracy < 3 || (millis() - this->last_state_save_ms_ < this->state_save_interval_ms_)) {
+    return;
+  }
+
+  ESP_LOGV(TAG, "Saving state");
+
+  uint8_t state[BSEC_MAX_STATE_BLOB_SIZE];
+  uint8_t work_buffer[BSEC_MAX_STATE_BLOB_SIZE];
+  uint32_t num_serialized_state = BSEC_MAX_STATE_BLOB_SIZE;
+
+  this->bsec_status_ = bsec_get_state_m(&this->bsec_instance_, 0, state, BSEC_MAX_STATE_BLOB_SIZE, work_buffer,
+                                        BSEC_MAX_STATE_BLOB_SIZE, &num_serialized_state);
+  if (this->bsec_status_ != BSEC_OK) {
+    ESP_LOGW(TAG, "Failed fetch state for save (BSEC2 error code %d)", this->bsec_status_);
+    return;
+  }
+
+  if (!this->bsec_state_.save(&state)) {
+    ESP_LOGW(TAG, "Failed to save state");
+    return;
+  }
+  this->last_state_save_ms_ = millis();
+
+  ESP_LOGI(TAG, "Saved state");
+}
+
+}  // namespace bme68x_bsec2
+}  // namespace esphome
+#endif

esphome/components/bme68x_bsec2/bme68x_bsec2.h

@@ -0,0 +1,163 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/preferences.h"
+
+#ifdef USE_BSEC2
+
+#ifdef USE_SENSOR
+#include "esphome/components/sensor/sensor.h"
+#endif
+
+#ifdef USE_TEXT_SENSOR
+#include "esphome/components/text_sensor/text_sensor.h"
+#endif
+
+#include <cinttypes>
+#include <queue>
+
+#include <bsec2.h>
+
+namespace esphome {
+namespace bme68x_bsec2 {
+
+enum AlgorithmOutput {
+  ALGORITHM_OUTPUT_IAQ,
+  ALGORITHM_OUTPUT_CLASSIFICATION,
+  ALGORITHM_OUTPUT_REGRESSION,
+};
+
+enum OperatingAge {
+  OPERATING_AGE_4D,
+  OPERATING_AGE_28D,
+};
+
+enum SampleRate {
+  SAMPLE_RATE_LP = 0,
+  SAMPLE_RATE_ULP = 1,
+  SAMPLE_RATE_DEFAULT = 2,
+};
+
+enum Voltage {
+  VOLTAGE_1_8V,
+  VOLTAGE_3_3V,
+};
+
+class BME68xBSEC2Component : public Component {
+ public:
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+  void loop() override;
+
+  void set_algorithm_output(AlgorithmOutput algorithm_output) { this->algorithm_output_ = algorithm_output; }
+  void set_operating_age(OperatingAge operating_age) { this->operating_age_ = operating_age; }
+  void set_temperature_offset(float offset) { this->temperature_offset_ = offset; }
+  void set_voltage(Voltage voltage) { this->voltage_ = voltage; }
+
+  void set_sample_rate(SampleRate sample_rate) { this->sample_rate_ = sample_rate; }
+  void set_temperature_sample_rate(SampleRate sample_rate) { this->temperature_sample_rate_ = sample_rate; }
+  void set_pressure_sample_rate(SampleRate sample_rate) { this->pressure_sample_rate_ = sample_rate; }
+  void set_humidity_sample_rate(SampleRate sample_rate) { this->humidity_sample_rate_ = sample_rate; }
+
+  void set_bsec2_configuration(const uint8_t *data, const uint32_t len) {
+    this->bsec2_configuration_ = data;
+    this->bsec2_configuration_length_ = len;
+  }
+
+  void set_state_save_interval(uint32_t interval) { this->state_save_interval_ms_ = interval; }
+
+#ifdef USE_SENSOR
+  void set_temperature_sensor(sensor::Sensor *sensor) { this->temperature_sensor_ = sensor; }
+  void set_pressure_sensor(sensor::Sensor *sensor) { this->pressure_sensor_ = sensor; }
+  void set_humidity_sensor(sensor::Sensor *sensor) { this->humidity_sensor_ = sensor; }
+  void set_gas_resistance_sensor(sensor::Sensor *sensor) { this->gas_resistance_sensor_ = sensor; }
+  void set_iaq_sensor(sensor::Sensor *sensor) { this->iaq_sensor_ = sensor; }
+  void set_iaq_static_sensor(sensor::Sensor *sensor) { this->iaq_static_sensor_ = sensor; }
+  void set_iaq_accuracy_sensor(sensor::Sensor *sensor) { this->iaq_accuracy_sensor_ = sensor; }
+  void set_co2_equivalent_sensor(sensor::Sensor *sensor) { this->co2_equivalent_sensor_ = sensor; }
+  void set_breath_voc_equivalent_sensor(sensor::Sensor *sensor) { this->breath_voc_equivalent_sensor_ = sensor; }
+#endif
+#ifdef USE_TEXT_SENSOR
+  void set_iaq_accuracy_text_sensor(text_sensor::TextSensor *sensor) { this->iaq_accuracy_text_sensor_ = sensor; }
+#endif
+  virtual uint32_t get_hash() = 0;
+
+ protected:
+  void set_config_(const uint8_t *config, u_int32_t len);
+  float calc_sensor_sample_rate_(SampleRate sample_rate);
+  void update_subscription_();
+
+  void run_();
+  void read_(int64_t trigger_time_ns);
+  void publish_(const bsec_output_t *outputs, uint8_t num_outputs);
+  int64_t get_time_ns_();
+
+#ifdef USE_SENSOR
+  void publish_sensor_(sensor::Sensor *sensor, float value, bool change_only = false);
+#endif
+#ifdef USE_TEXT_SENSOR
+  void publish_sensor_(text_sensor::TextSensor *sensor, const std::string &value);
+#endif
+
+  void load_state_();
+  void save_state_(uint8_t accuracy);
+
+  void queue_push_(std::function<void()> &&f) { this->queue_.push(std::move(f)); }
+
+  struct bme68x_dev bme68x_;
+  bsec_bme_settings_t bsec_settings_;
+  bsec_version_t version_;
+  uint8_t bsec_instance_[BSEC_INSTANCE_SIZE];
+
+  struct bme68x_heatr_conf bme68x_heatr_conf_;
+  uint8_t op_mode_;  // operating mode of sensor
+  bool sleep_mode_;
+  bsec_library_return_t bsec_status_{BSEC_OK};
+  int8_t bme68x_status_{BME68X_OK};
+
+  int64_t last_time_ms_{0};
+  uint32_t millis_overflow_counter_{0};
+  int64_t next_call_ns_{0};
+
+  std::queue<std::function<void()>> queue_;
+
+  uint8_t const *bsec2_configuration_{nullptr};
+  uint32_t bsec2_configuration_length_{0};
+  bool bsec2_blob_configured_{false};
+
+  ESPPreferenceObject bsec_state_;
+  uint32_t state_save_interval_ms_{21600000};  // 6 hours - 4 times a day
+  uint32_t last_state_save_ms_ = 0;
+
+  float temperature_offset_{0};
+
+  AlgorithmOutput algorithm_output_{ALGORITHM_OUTPUT_IAQ};
+  OperatingAge operating_age_{OPERATING_AGE_28D};
+  Voltage voltage_{VOLTAGE_3_3V};
+
+  SampleRate sample_rate_{SAMPLE_RATE_LP};  // Core/gas sample rate
+  SampleRate temperature_sample_rate_{SAMPLE_RATE_DEFAULT};
+  SampleRate pressure_sample_rate_{SAMPLE_RATE_DEFAULT};
+  SampleRate humidity_sample_rate_{SAMPLE_RATE_DEFAULT};
+
+#ifdef USE_SENSOR
+  sensor::Sensor *temperature_sensor_{nullptr};
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *gas_resistance_sensor_{nullptr};
+  sensor::Sensor *iaq_sensor_{nullptr};
+  sensor::Sensor *iaq_static_sensor_{nullptr};
+  sensor::Sensor *iaq_accuracy_sensor_{nullptr};
+  sensor::Sensor *co2_equivalent_sensor_{nullptr};
+  sensor::Sensor *breath_voc_equivalent_sensor_{nullptr};
+#endif
+#ifdef USE_TEXT_SENSOR
+  text_sensor::TextSensor *iaq_accuracy_text_sensor_{nullptr};
+#endif
+};
+
+}  // namespace bme68x_bsec2
+}  // namespace esphome
+#endif

esphome/components/bme68x_bsec2/sensor.py

@@ -0,0 +1,130 @@
+import esphome.codegen as cg
+from esphome.components import sensor
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_GAS_RESISTANCE,
+    CONF_HUMIDITY,
+    CONF_IAQ_ACCURACY,
+    CONF_PRESSURE,
+    CONF_SAMPLE_RATE,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    ICON_GAS_CYLINDER,
+    ICON_GAUGE,
+    ICON_THERMOMETER,
+    ICON_WATER_PERCENT,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_HECTOPASCAL,
+    UNIT_OHM,
+    UNIT_PARTS_PER_MILLION,
+    UNIT_PERCENT,
+)
+
+from . import CONF_BME68X_BSEC2_ID, SAMPLE_RATE_OPTIONS, BME68xBSEC2Component
+
+DEPENDENCIES = ["bme68x_bsec2"]
+
+CONF_BREATH_VOC_EQUIVALENT = "breath_voc_equivalent"
+CONF_CO2_EQUIVALENT = "co2_equivalent"
+CONF_IAQ = "iaq"
+CONF_IAQ_STATIC = "iaq_static"
+ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"
+ICON_TEST_TUBE = "mdi:test-tube"
+UNIT_IAQ = "IAQ"
+
+TYPES = [
+    CONF_TEMPERATURE,
+    CONF_PRESSURE,
+    CONF_HUMIDITY,
+    CONF_GAS_RESISTANCE,
+    CONF_IAQ,
+    CONF_IAQ_STATIC,
+    CONF_IAQ_ACCURACY,
+    CONF_CO2_EQUIVALENT,
+    CONF_BREATH_VOC_EQUIVALENT,
+]
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_BME68X_BSEC2_ID): cv.use_id(BME68xBSEC2Component),
+        cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_CELSIUS,
+            icon=ICON_THERMOMETER,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_TEMPERATURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ).extend(
+            {cv.Optional(CONF_SAMPLE_RATE): cv.enum(SAMPLE_RATE_OPTIONS, upper=True)}
+        ),
+        cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_HECTOPASCAL,
+            icon=ICON_GAUGE,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ).extend(
+            {cv.Optional(CONF_SAMPLE_RATE): cv.enum(SAMPLE_RATE_OPTIONS, upper=True)}
+        ),
+        cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
+            unit_of_measurement=UNIT_PERCENT,
+            icon=ICON_WATER_PERCENT,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_HUMIDITY,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ).extend(
+            {cv.Optional(CONF_SAMPLE_RATE): cv.enum(SAMPLE_RATE_OPTIONS, upper=True)}
+        ),
+        cv.Optional(CONF_GAS_RESISTANCE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_OHM,
+            icon=ICON_GAS_CYLINDER,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_IAQ): sensor.sensor_schema(
+            unit_of_measurement=UNIT_IAQ,
+            icon=ICON_GAUGE,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_IAQ_STATIC): sensor.sensor_schema(
+            unit_of_measurement=UNIT_IAQ,
+            icon=ICON_GAUGE,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_IAQ_ACCURACY): sensor.sensor_schema(
+            icon=ICON_ACCURACY,
+            accuracy_decimals=0,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_CO2_EQUIVALENT): sensor.sensor_schema(
+            unit_of_measurement=UNIT_PARTS_PER_MILLION,
+            icon=ICON_TEST_TUBE,
+            accuracy_decimals=1,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_BREATH_VOC_EQUIVALENT): sensor.sensor_schema(
+            unit_of_measurement=UNIT_PARTS_PER_MILLION,
+            icon=ICON_TEST_TUBE,
+            accuracy_decimals=1,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+    }
+)
+
+
+async def setup_conf(config, key, hub):
+    if conf := config.get(key):
+        sens = await sensor.new_sensor(conf)
+        cg.add(getattr(hub, f"set_{key}_sensor")(sens))
+        if sample_rate := conf.get(CONF_SAMPLE_RATE):
+            cg.add(getattr(hub, f"set_{key}_sample_rate")(sample_rate))
+
+
+async def to_code(config):
+    hub = await cg.get_variable(config[CONF_BME68X_BSEC2_ID])
+    for key in TYPES:
+        await setup_conf(config, key, hub)

esphome/components/bme68x_bsec2/text_sensor.py

@@ -0,0 +1,33 @@
+import esphome.codegen as cg
+from esphome.components import text_sensor
+import esphome.config_validation as cv
+from esphome.const import CONF_IAQ_ACCURACY
+
+from . import CONF_BME68X_BSEC2_ID, BME68xBSEC2Component
+
+DEPENDENCIES = ["bme68x_bsec2"]
+
+ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"
+
+TYPES = [CONF_IAQ_ACCURACY]
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_BME68X_BSEC2_ID): cv.use_id(BME68xBSEC2Component),
+        cv.Optional(CONF_IAQ_ACCURACY): text_sensor.text_sensor_schema(
+            icon=ICON_ACCURACY
+        ),
+    }
+)
+
+
+async def setup_conf(config, key, hub):
+    if conf := config.get(key):
+        sens = await text_sensor.new_text_sensor(conf)
+        cg.add(getattr(hub, f"set_{key}_text_sensor")(sens))
+
+
+async def to_code(config):
+    hub = await cg.get_variable(config[CONF_BME68X_BSEC2_ID])
+    for key in TYPES:
+        await setup_conf(config, key, hub)

esphome/components/bme68x_bsec2_i2c/__init__.py

@@ -0,0 +1,28 @@
+import esphome.codegen as cg
+from esphome.components import i2c
+from esphome.components.bme68x_bsec2 import (
+    CONFIG_SCHEMA_BASE,
+    BME68xBSEC2Component,
+    to_code_base,
+)
+import esphome.config_validation as cv
+
+CODEOWNERS = ["@neffs", "@kbx81"]
+
+AUTO_LOAD = ["bme68x_bsec2"]
+DEPENDENCIES = ["i2c"]
+
+bme68x_bsec2_i2c_ns = cg.esphome_ns.namespace("bme68x_bsec2_i2c")
+BME68xBSEC2I2CComponent = bme68x_bsec2_i2c_ns.class_(
+    "BME68xBSEC2I2CComponent", BME68xBSEC2Component, i2c.I2CDevice
+)
+
+
+CONFIG_SCHEMA = CONFIG_SCHEMA_BASE.extend(
+    cv.Schema({cv.GenerateID(): cv.declare_id(BME68xBSEC2I2CComponent)})
+).extend(i2c.i2c_device_schema(0x76))
+
+
+async def to_code(config):
+    var = await to_code_base(config)
+    await i2c.register_i2c_device(var, config)

esphome/components/bme68x_bsec2_i2c/bme68x_bsec2_i2c.cpp

@@ -0,0 +1,53 @@
+#include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+#ifdef USE_BSEC2
+#include "bme68x_bsec2_i2c.h"
+#include "esphome/components/i2c/i2c.h"
+
+#include <cinttypes>
+
+namespace esphome {
+namespace bme68x_bsec2_i2c {
+
+static const char *const TAG = "bme68x_bsec2_i2c.sensor";
+
+void BME68xBSEC2I2CComponent::setup() {
+  // must set up our bme68x_dev instance before calling setup()
+  this->bme68x_.intf_ptr = (void *) this;
+  this->bme68x_.intf = BME68X_I2C_INTF;
+  this->bme68x_.read = BME68xBSEC2I2CComponent::read_bytes_wrapper;
+  this->bme68x_.write = BME68xBSEC2I2CComponent::write_bytes_wrapper;
+  this->bme68x_.delay_us = BME68xBSEC2I2CComponent::delay_us;
+  this->bme68x_.amb_temp = 25;
+
+  BME68xBSEC2Component::setup();
+}
+
+void BME68xBSEC2I2CComponent::dump_config() {
+  LOG_I2C_DEVICE(this);
+  BME68xBSEC2Component::dump_config();
+}
+
+uint32_t BME68xBSEC2I2CComponent::get_hash() { return fnv1_hash("bme68x_bsec_state_" + to_string(this->address_)); }
+
+int8_t BME68xBSEC2I2CComponent::read_bytes_wrapper(uint8_t a_register, uint8_t *data, uint32_t len, void *intfPtr) {
+  ESP_LOGVV(TAG, "read_bytes_wrapper: reg = %u", a_register);
+  return static_cast<BME68xBSEC2I2CComponent *>(intfPtr)->read_bytes(a_register, data, len) ? 0 : -1;
+}
+
+int8_t BME68xBSEC2I2CComponent::write_bytes_wrapper(uint8_t a_register, const uint8_t *data, uint32_t len,
+                                                    void *intfPtr) {
+  ESP_LOGVV(TAG, "write_bytes_wrapper: reg = %u", a_register);
+  return static_cast<BME68xBSEC2I2CComponent *>(intfPtr)->write_bytes(a_register, data, len) ? 0 : -1;
+}
+
+void BME68xBSEC2I2CComponent::delay_us(uint32_t period, void *intfPtr) {
+  ESP_LOGVV(TAG, "Delaying for %" PRIu32 "us", period);
+  delayMicroseconds(period);
+}
+
+}  // namespace bme68x_bsec2_i2c
+}  // namespace esphome
+#endif

esphome/components/bme68x_bsec2_i2c/bme68x_bsec2_i2c.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/preferences.h"
+
+#ifdef USE_BSEC2
+
+#include "esphome/components/bme68x_bsec2/bme68x_bsec2.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace bme68x_bsec2_i2c {
+
+class BME68xBSEC2I2CComponent : public bme68x_bsec2::BME68xBSEC2Component, public i2c::I2CDevice {
+  void setup() override;
+  void dump_config() override;
+
+  uint32_t get_hash() override;
+
+  static int8_t read_bytes_wrapper(uint8_t a_register, uint8_t *data, uint32_t len, void *intfPtr);
+  static int8_t write_bytes_wrapper(uint8_t a_register, const uint8_t *data, uint32_t len, void *intfPtr);
+  static void delay_us(uint32_t period, void *intfPtr);
+};
+
+}  // namespace bme68x_bsec2_i2c
+}  // namespace esphome
+#endif

esphome/components/captive_portal/captive_portal.cpp

@@ -1,4 +1,5 @@
 #include "captive_portal.h"
+#ifdef USE_CAPTIVE_PORTAL
 #include "esphome/core/log.h"
 #include "esphome/core/application.h"
 #include "esphome/components/wifi/wifi_component.h"
@@ -91,3 +92,4 @@ CaptivePortal *global_captive_portal = nullptr;  // NOLINT(cppcoreguidelines-avo
 
 }  // namespace captive_portal
 }  // namespace esphome
+#endif

esphome/components/captive_portal/captive_portal.h

@@ -1,5 +1,6 @@
 #pragma once
-
+#include "esphome/core/defines.h"
+#ifdef USE_CAPTIVE_PORTAL
 #include <memory>
 #ifdef USE_ARDUINO
 #include <DNSServer.h>
@@ -71,3 +72,4 @@ extern CaptivePortal *global_captive_portal;  // NOLINT(cppcoreguidelines-avoid-
 
 }  // namespace captive_portal
 }  // namespace esphome
+#endif

esphome/components/demo/demo_sensor.h

@@ -16,12 +16,13 @@ class DemoSensor : public sensor::Sensor, public PollingComponent {
       float base = std::isnan(this->state) ? 0.0f : this->state;
       this->publish_state(base + val * 10);
     } else {
-      if (val < 0.1)
+      if (val < 0.1) {
         this->publish_state(NAN);
-      else
+      } else {
         this->publish_state(val * 100);
       }
     }
+  }
 };
 
 }  // namespace demo

esphome/components/display/display.cpp

@@ -675,5 +675,36 @@ void DisplayPage::set_prev(DisplayPage *prev) { this->prev_ = prev; }
 void DisplayPage::set_next(DisplayPage *next) { this->next_ = next; }
 const display_writer_t &DisplayPage::get_writer() const { return this->writer_; }
 
+const LogString *text_align_to_string(TextAlign textalign) {
+  switch (textalign) {
+    case TextAlign::TOP_LEFT:
+      return LOG_STR("TOP_LEFT");
+    case TextAlign::TOP_CENTER:
+      return LOG_STR("TOP_CENTER");
+    case TextAlign::TOP_RIGHT:
+      return LOG_STR("TOP_RIGHT");
+    case TextAlign::CENTER_LEFT:
+      return LOG_STR("CENTER_LEFT");
+    case TextAlign::CENTER:
+      return LOG_STR("CENTER");
+    case TextAlign::CENTER_RIGHT:
+      return LOG_STR("CENTER_RIGHT");
+    case TextAlign::BASELINE_LEFT:
+      return LOG_STR("BASELINE_LEFT");
+    case TextAlign::BASELINE_CENTER:
+      return LOG_STR("BASELINE_CENTER");
+    case TextAlign::BASELINE_RIGHT:
+      return LOG_STR("BASELINE_RIGHT");
+    case TextAlign::BOTTOM_LEFT:
+      return LOG_STR("BOTTOM_LEFT");
+    case TextAlign::BOTTOM_CENTER:
+      return LOG_STR("BOTTOM_CENTER");
+    case TextAlign::BOTTOM_RIGHT:
+      return LOG_STR("BOTTOM_RIGHT");
+    default:
+      return LOG_STR("UNKNOWN");
+  }
+}
+
 }  // namespace display
 }  // namespace esphome

esphome/components/display/display.h

@@ -8,6 +8,7 @@
 #include "esphome/core/color.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/time.h"
+#include "esphome/core/log.h"
 #include "display_color_utils.h"
 
 #ifdef USE_GRAPH
@@ -737,5 +738,7 @@ class DisplayOnPageChangeTrigger : public Trigger<DisplayPage *, DisplayPage *>
   DisplayPage *to_{nullptr};
 };
 
+const LogString *text_align_to_string(TextAlign textalign);
+
 }  // namespace display
 }  // namespace esphome

esphome/components/e131/e131.cpp

@@ -1,4 +1,5 @@
 #include "e131.h"
+#ifdef USE_NETWORK
 #include "e131_addressable_light_effect.h"
 #include "esphome/core/log.h"
 
@@ -118,3 +119,4 @@ bool E131Component::process_(int universe, const E131Packet &packet) {
 
 }  // namespace e131
 }  // namespace esphome
+#endif

esphome/components/e131/e131.h

@@ -1,5 +1,6 @@
 #pragma once
-
+#include "esphome/core/defines.h"
+#ifdef USE_NETWORK
 #include "esphome/components/socket/socket.h"
 #include "esphome/core/component.h"
 
@@ -53,3 +54,4 @@ class E131Component : public esphome::Component {
 
 }  // namespace e131
 }  // namespace esphome
+#endif

esphome/components/e131/e131_addressable_light_effect.cpp

@@ -1,5 +1,6 @@
 #include "e131_addressable_light_effect.h"
 #include "e131.h"
+#ifdef USE_NETWORK
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -90,3 +91,4 @@ bool E131AddressableLightEffect::process_(int universe, const E131Packet &packet
 
 }  // namespace e131
 }  // namespace esphome
+#endif

esphome/components/e131/e131_addressable_light_effect.h

@@ -2,7 +2,7 @@
 
 #include "esphome/core/component.h"
 #include "esphome/components/light/addressable_light_effect.h"
-
+#ifdef USE_NETWORK
 namespace esphome {
 namespace e131 {
 
@@ -42,3 +42,4 @@ class E131AddressableLightEffect : public light::AddressableLightEffect {
 
 }  // namespace e131
 }  // namespace esphome
+#endif

esphome/components/e131/e131_packet.cpp

@@ -1,5 +1,6 @@
 #include <cstring>
 #include "e131.h"
+#ifdef USE_NETWORK
 #include "esphome/components/network/ip_address.h"
 #include "esphome/core/log.h"
 #include "esphome/core/util.h"
@@ -137,3 +138,4 @@ bool E131Component::packet_(const std::vector<uint8_t> &data, int &universe, E13
 
 }  // namespace e131
 }  // namespace esphome
+#endif

esphome/components/esp32/__init__.py

@@ -172,6 +172,19 @@ def add_idf_component(
             KEY_COMPONENTS: components,
             KEY_SUBMODULES: submodules,
         }
+    else:
+        component_config = CORE.data[KEY_ESP32][KEY_COMPONENTS][name]
+        if components is not None:
+            component_config[KEY_COMPONENTS] = list(
+                set(component_config[KEY_COMPONENTS] + components)
+            )
+        if submodules is not None:
+            if component_config[KEY_SUBMODULES] is None:
+                component_config[KEY_SUBMODULES] = submodules
+            else:
+                component_config[KEY_SUBMODULES] = list(
+                    set(component_config[KEY_SUBMODULES] + submodules)
+                )
 
 
 def add_extra_script(stage: str, filename: str, path: str):

esphome/components/esphome/ota/ota_esphome.cpp

@@ -1,5 +1,5 @@
 #include "ota_esphome.h"
-
+#ifdef USE_OTA
 #include "esphome/components/md5/md5.h"
 #include "esphome/components/network/util.h"
 #include "esphome/components/ota/ota_backend.h"
@@ -410,3 +410,4 @@ float ESPHomeOTAComponent::get_setup_priority() const { return setup_priority::A
 uint16_t ESPHomeOTAComponent::get_port() const { return this->port_; }
 void ESPHomeOTAComponent::set_port(uint16_t port) { this->port_ = port; }
 }  // namespace esphome
+#endif

esphome/components/esphome/ota/ota_esphome.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "esphome/core/defines.h"
+#ifdef USE_OTA
 #include "esphome/core/helpers.h"
 #include "esphome/core/preferences.h"
 #include "esphome/components/ota/ota_backend.h"
@@ -41,3 +42,4 @@ class ESPHomeOTAComponent : public ota::OTAComponent {
 };
 
 }  // namespace esphome
+#endif

esphome/components/fingerprint_grow/fingerprint_grow.cpp

@@ -307,7 +307,7 @@ void FingerprintGrowComponent::delete_fingerprint(uint16_t finger_id) {
 
 void FingerprintGrowComponent::delete_all_fingerprints() {
   ESP_LOGI(TAG, "Deleting all stored fingerprints");
-  this->data_ = {EMPTY};
+  this->data_ = {DELETE_ALL};
   switch (this->send_command_()) {
     case OK:
       ESP_LOGI(TAG, "Deleted all fingerprints");

esphome/components/fingerprint_grow/fingerprint_grow.h

@@ -36,7 +36,7 @@ enum GrowCommand {
   LOAD = 0x07,
   UPLOAD = 0x08,
   DELETE = 0x0C,
-  EMPTY = 0x0D,
+  DELETE_ALL = 0x0D,  // aka EMPTY
   READ_SYS_PARAM = 0x0F,
   SET_PASSWORD = 0x12,
   VERIFY_PASSWORD = 0x13,

esphome/components/haier/haier_base.h

@@ -80,8 +80,8 @@ class HaierClimateBase : public esphome::Component,
   const char *phase_to_string_(ProtocolPhases phase);
   virtual void set_handlers() = 0;
   virtual void process_phase(std::chrono::steady_clock::time_point now) = 0;
-  virtual haier_protocol::HaierMessage get_control_message() = 0;
+  virtual haier_protocol::HaierMessage get_control_message() = 0;          // NOLINT(readability-identifier-naming)
-  virtual haier_protocol::HaierMessage get_power_message(bool state) = 0;
+  virtual haier_protocol::HaierMessage get_power_message(bool state) = 0;  // NOLINT(readability-identifier-naming)
   virtual void initialization(){};
   virtual bool prepare_pending_action();
   virtual void process_protocol_reset();

esphome/components/hmac_md5/__init__.py

@@ -0,0 +1,2 @@
+AUTO_LOAD = ["md5"]
+CODEOWNERS = ["@dwmw2"]

esphome/components/hmac_md5/hmac_md5.cpp

@@ -0,0 +1,56 @@
+#include <cstdio>
+#include <cstring>
+#include "hmac_md5.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace hmac_md5 {
+void HmacMD5::init(const uint8_t *key, size_t len) {
+  uint8_t ipad[64], opad[64];
+
+  memset(ipad, 0, sizeof(ipad));
+  if (len > 64) {
+    md5::MD5Digest keymd5;
+    keymd5.init();
+    keymd5.add(key, len);
+    keymd5.calculate();
+    keymd5.get_bytes(ipad);
+  } else {
+    memcpy(ipad, key, len);
+  }
+  memcpy(opad, ipad, sizeof(opad));
+
+  for (int i = 0; i < 64; i++) {
+    ipad[i] ^= 0x36;
+    opad[i] ^= 0x5c;
+  }
+
+  this->ihash_.init();
+  this->ihash_.add(ipad, sizeof(ipad));
+
+  this->ohash_.init();
+  this->ohash_.add(opad, sizeof(opad));
+}
+
+void HmacMD5::add(const uint8_t *data, size_t len) { this->ihash_.add(data, len); }
+
+void HmacMD5::calculate() {
+  uint8_t ibytes[16];
+
+  this->ihash_.calculate();
+  this->ihash_.get_bytes(ibytes);
+
+  this->ohash_.add(ibytes, sizeof(ibytes));
+  this->ohash_.calculate();
+}
+
+void HmacMD5::get_bytes(uint8_t *output) { this->ohash_.get_bytes(output); }
+
+void HmacMD5::get_hex(char *output) { this->ohash_.get_hex(output); }
+
+bool HmacMD5::equals_bytes(const uint8_t *expected) { return this->ohash_.equals_bytes(expected); }
+
+bool HmacMD5::equals_hex(const char *expected) { return this->ohash_.equals_hex(expected); }
+
+}  // namespace hmac_md5
+}  // namespace esphome

esphome/components/hmac_md5/hmac_md5.h

@@ -0,0 +1,48 @@
+#pragma once
+
+#include "esphome/core/defines.h"
+#include "esphome/components/md5/md5.h"
+
+#include <string>
+
+namespace esphome {
+namespace hmac_md5 {
+
+class HmacMD5 {
+ public:
+  HmacMD5() = default;
+  ~HmacMD5() = default;
+
+  /// Initialize a new MD5 digest computation.
+  void init(const uint8_t *key, size_t len);
+  void init(const char *key, size_t len) { this->init((const uint8_t *) key, len); }
+  void init(const std::string &key) { this->init(key.c_str(), key.length()); }
+
+  /// Add bytes of data for the digest.
+  void add(const uint8_t *data, size_t len);
+  void add(const char *data, size_t len) { this->add((const uint8_t *) data, len); }
+
+  /// Compute the digest, based on the provided data.
+  void calculate();
+
+  /// Retrieve the HMAC-MD5 digest as bytes.
+  /// The output must be able to hold 16 bytes or more.
+  void get_bytes(uint8_t *output);
+
+  /// Retrieve the HMAC-MD5 digest as hex characters.
+  /// The output must be able to hold 32 bytes or more.
+  void get_hex(char *output);
+
+  /// Compare the digest against a provided byte-encoded digest (16 bytes).
+  bool equals_bytes(const uint8_t *expected);
+
+  /// Compare the digest against a provided hex-encoded digest (32 bytes).
+  bool equals_hex(const char *expected);
+
+ protected:
+  md5::MD5Digest ihash_;
+  md5::MD5Digest ohash_;
+};
+
+}  // namespace hmac_md5
+}  // namespace esphome

esphome/components/homeassistant/__init__.py

@@ -2,7 +2,7 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ATTRIBUTE, CONF_ENTITY_ID, CONF_INTERNAL
 
-CODEOWNERS = ["@OttoWinter"]
+CODEOWNERS = ["@OttoWinter", "@esphome/core"]
 homeassistant_ns = cg.esphome_ns.namespace("homeassistant")
 
 HOME_ASSISTANT_IMPORT_SCHEMA = cv.Schema(
@@ -13,6 +13,13 @@ HOME_ASSISTANT_IMPORT_SCHEMA = cv.Schema(
     }
 )
 
+HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_ENTITY_ID): cv.entity_id,
+        cv.Optional(CONF_INTERNAL, default=True): cv.boolean,
+    }
+)
+
 
 def setup_home_assistant_entity(var, config):
     cg.add(var.set_entity_id(config[CONF_ENTITY_ID]))

esphome/components/homeassistant/number/__init__.py

@@ -0,0 +1,33 @@
+import esphome.codegen as cg
+from esphome.components import number
+import esphome.config_validation as cv
+
+from .. import (
+    HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA,
+    homeassistant_ns,
+    setup_home_assistant_entity,
+)
+
+CODEOWNERS = ["@landonr"]
+DEPENDENCIES = ["api"]
+
+HomeassistantNumber = homeassistant_ns.class_(
+    "HomeassistantNumber", number.Number, cg.Component
+)
+
+CONFIG_SCHEMA = (
+    number.number_schema(HomeassistantNumber)
+    .extend(HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA)
+    .extend(cv.COMPONENT_SCHEMA)
+)
+
+
+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)
+    setup_home_assistant_entity(var, config)

esphome/components/homeassistant/number/homeassistant_number.cpp

@@ -0,0 +1,100 @@
+#include "homeassistant_number.h"
+
+#include "esphome/components/api/api_pb2.h"
+#include "esphome/components/api/api_server.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace homeassistant {
+
+static const char *const TAG = "homeassistant.number";
+
+void HomeassistantNumber::state_changed_(const std::string &state) {
+  auto number_value = parse_number<float>(state);
+  if (!number_value.has_value()) {
+    ESP_LOGW(TAG, "'%s': Can't convert '%s' to number!", this->entity_id_.c_str(), state.c_str());
+    this->publish_state(NAN);
+    return;
+  }
+  if (this->state == number_value.value()) {
+    return;
+  }
+  ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_.c_str(), state.c_str());
+  this->publish_state(number_value.value());
+}
+
+void HomeassistantNumber::min_retrieved_(const std::string &min) {
+  auto min_value = parse_number<float>(min);
+  if (!min_value.has_value()) {
+    ESP_LOGE(TAG, "'%s': Can't convert 'min' value '%s' to number!", this->entity_id_.c_str(), min.c_str());
+  }
+  ESP_LOGD(TAG, "'%s': Min retrieved: %s", get_name().c_str(), min.c_str());
+  this->traits.set_min_value(min_value.value());
+}
+
+void HomeassistantNumber::max_retrieved_(const std::string &max) {
+  auto max_value = parse_number<float>(max);
+  if (!max_value.has_value()) {
+    ESP_LOGE(TAG, "'%s': Can't convert 'max' value '%s' to number!", this->entity_id_.c_str(), max.c_str());
+  }
+  ESP_LOGD(TAG, "'%s': Max retrieved: %s", get_name().c_str(), max.c_str());
+  this->traits.set_max_value(max_value.value());
+}
+
+void HomeassistantNumber::step_retrieved_(const std::string &step) {
+  auto step_value = parse_number<float>(step);
+  if (!step_value.has_value()) {
+    ESP_LOGE(TAG, "'%s': Can't convert 'step' value '%s' to number!", this->entity_id_.c_str(), step.c_str());
+  }
+  ESP_LOGD(TAG, "'%s': Step Retrieved %s", get_name().c_str(), step.c_str());
+  this->traits.set_step(step_value.value());
+}
+
+void HomeassistantNumber::setup() {
+  api::global_api_server->subscribe_home_assistant_state(
+      this->entity_id_, nullopt, std::bind(&HomeassistantNumber::state_changed_, this, std::placeholders::_1));
+
+  api::global_api_server->get_home_assistant_state(
+      this->entity_id_, optional<std::string>("min"),
+      std::bind(&HomeassistantNumber::min_retrieved_, this, std::placeholders::_1));
+  api::global_api_server->get_home_assistant_state(
+      this->entity_id_, optional<std::string>("max"),
+      std::bind(&HomeassistantNumber::max_retrieved_, this, std::placeholders::_1));
+  api::global_api_server->get_home_assistant_state(
+      this->entity_id_, optional<std::string>("step"),
+      std::bind(&HomeassistantNumber::step_retrieved_, this, std::placeholders::_1));
+}
+
+void HomeassistantNumber::dump_config() {
+  LOG_NUMBER("", "Homeassistant Number", this);
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
+}
+
+float HomeassistantNumber::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }
+
+void HomeassistantNumber::control(float value) {
+  if (!api::global_api_server->is_connected()) {
+    ESP_LOGE(TAG, "No clients connected to API server");
+    return;
+  }
+
+  this->publish_state(value);
+
+  api::HomeassistantServiceResponse resp;
+  resp.service = "number.set_value";
+
+  api::HomeassistantServiceMap entity_id;
+  entity_id.key = "entity_id";
+  entity_id.value = this->entity_id_;
+  resp.data.push_back(entity_id);
+
+  api::HomeassistantServiceMap entity_value;
+  entity_value.key = "value";
+  entity_value.value = to_string(value);
+  resp.data.push_back(entity_value);
+
+  api::global_api_server->send_homeassistant_service_call(resp);
+}
+
+}  // namespace homeassistant
+}  // namespace esphome

esphome/components/homeassistant/number/homeassistant_number.h

@@ -0,0 +1,31 @@
+#pragma once
+
+#include <map>
+#include <string>
+
+#include "esphome/components/number/number.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace homeassistant {
+
+class HomeassistantNumber : public number::Number, public Component {
+ public:
+  void set_entity_id(const std::string &entity_id) { this->entity_id_ = entity_id; }
+
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+
+ protected:
+  void state_changed_(const std::string &state);
+  void min_retrieved_(const std::string &min);
+  void max_retrieved_(const std::string &max);
+  void step_retrieved_(const std::string &step);
+
+  void control(float value) override;
+
+  std::string entity_id_;
+};
+}  // namespace homeassistant
+}  // namespace esphome

esphome/components/homeassistant/switch/__init__.py

@@ -0,0 +1,30 @@
+import esphome.codegen as cg
+from esphome.components import switch
+import esphome.config_validation as cv
+from esphome.const import CONF_ID
+
+from .. import (
+    HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA,
+    homeassistant_ns,
+    setup_home_assistant_entity,
+)
+
+CODEOWNERS = ["@Links2004"]
+DEPENDENCIES = ["api"]
+
+HomeassistantSwitch = homeassistant_ns.class_(
+    "HomeassistantSwitch", switch.Switch, cg.Component
+)
+
+CONFIG_SCHEMA = (
+    switch.switch_schema(HomeassistantSwitch)
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(HOME_ASSISTANT_IMPORT_CONTROL_SCHEMA)
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await switch.register_switch(var, config)
+    setup_home_assistant_entity(var, config)

esphome/components/homeassistant/switch/homeassistant_switch.cpp

@@ -0,0 +1,59 @@
+#include "homeassistant_switch.h"
+#include "esphome/components/api/api_server.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace homeassistant {
+
+static const char *const TAG = "homeassistant.switch";
+
+using namespace esphome::switch_;
+
+void HomeassistantSwitch::setup() {
+  api::global_api_server->subscribe_home_assistant_state(this->entity_id_, nullopt, [this](const std::string &state) {
+    auto val = parse_on_off(state.c_str());
+    switch (val) {
+      case PARSE_NONE:
+      case PARSE_TOGGLE:
+        ESP_LOGW(TAG, "Can't convert '%s' to binary state!", state.c_str());
+        break;
+      case PARSE_ON:
+      case PARSE_OFF:
+        bool new_state = val == PARSE_ON;
+        ESP_LOGD(TAG, "'%s': Got state %s", this->entity_id_.c_str(), ONOFF(new_state));
+        this->publish_state(new_state);
+        break;
+    }
+  });
+}
+
+void HomeassistantSwitch::dump_config() {
+  LOG_SWITCH("", "Homeassistant Switch", this);
+  ESP_LOGCONFIG(TAG, "  Entity ID: '%s'", this->entity_id_.c_str());
+}
+
+float HomeassistantSwitch::get_setup_priority() const { return setup_priority::AFTER_CONNECTION; }
+
+void HomeassistantSwitch::write_state(bool state) {
+  if (!api::global_api_server->is_connected()) {
+    ESP_LOGE(TAG, "No clients connected to API server");
+    return;
+  }
+
+  api::HomeassistantServiceResponse resp;
+  if (state) {
+    resp.service = "switch.turn_on";
+  } else {
+    resp.service = "switch.turn_off";
+  }
+
+  api::HomeassistantServiceMap entity_id_kv;
+  entity_id_kv.key = "entity_id";
+  entity_id_kv.value = this->entity_id_;
+  resp.data.push_back(entity_id_kv);
+
+  api::global_api_server->send_homeassistant_service_call(resp);
+}
+
+}  // namespace homeassistant
+}  // namespace esphome

esphome/components/homeassistant/switch/homeassistant_switch.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "esphome/components/switch/switch.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace homeassistant {
+
+class HomeassistantSwitch : public switch_::Switch, public Component {
+ public:
+  void set_entity_id(const std::string &entity_id) { this->entity_id_ = entity_id; }
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override;
+
+ protected:
+  void write_state(bool state) override;
+  std::string entity_id_;
+};
+
+}  // namespace homeassistant
+}  // namespace esphome

esphome/components/host/__init__.py

@@ -1,15 +1,14 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
 from esphome.const import (
+    CONF_MAC_ADDRESS,
     KEY_CORE,
     KEY_FRAMEWORK_VERSION,
     KEY_TARGET_FRAMEWORK,
     KEY_TARGET_PLATFORM,
     PLATFORM_HOST,
-    CONF_MAC_ADDRESS,
 )
 from esphome.core import CORE
-from esphome.helpers import IS_MACOS
-import esphome.config_validation as cv
-import esphome.codegen as cg
 
 from .const import KEY_HOST
 
@@ -42,8 +41,5 @@ async def to_code(config):
     cg.add_build_flag("-DUSE_HOST")
     cg.add_define("USE_ESPHOME_HOST_MAC_ADDRESS", config[CONF_MAC_ADDRESS].parts)
     cg.add_build_flag("-std=c++17")
-    cg.add_build_flag("-lsodium")
-    if IS_MACOS:
-        cg.add_build_flag("-L/opt/homebrew/lib")
     cg.add_define("ESPHOME_BOARD", "host")
     cg.add_platformio_option("platform", "platformio/native")

esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp

@@ -180,7 +180,11 @@ void I2SAudioSpeaker::player_task(void *params) {
   }
 }
 
-void I2SAudioSpeaker::stop() {
+void I2SAudioSpeaker::stop() { this->stop_(false); }
+
+void I2SAudioSpeaker::finish() { this->stop_(true); }
+
+void I2SAudioSpeaker::stop_(bool wait_on_empty) {
   if (this->is_failed())
     return;
   if (this->state_ == speaker::STATE_STOPPED)
@@ -192,7 +196,11 @@ void I2SAudioSpeaker::stop() {
   this->state_ = speaker::STATE_STOPPING;
   DataEvent data;
   data.stop = true;
+  if (wait_on_empty) {
+    xQueueSend(this->buffer_queue_, &data, portMAX_DELAY);
+  } else {
     xQueueSendToFront(this->buffer_queue_, &data, portMAX_DELAY);
+  }
 }
 
 void I2SAudioSpeaker::watch_() {

esphome/components/i2s_audio/speaker/i2s_audio_speaker.h

@@ -53,6 +53,7 @@ class I2SAudioSpeaker : public Component, public speaker::Speaker, public I2SAud
 
   void start() override;
   void stop() override;
+  void finish() override;
 
   size_t play(const uint8_t *data, size_t length) override;
 
@@ -60,6 +61,7 @@ class I2SAudioSpeaker : public Component, public speaker::Speaker, public I2SAud
 
  protected:
   void start_();
+  void stop_(bool wait_on_empty);
   void watch_();
 
   static void player_task(void *params);

esphome/components/improv_serial/__init__.py

@@ -1,12 +1,10 @@
+import esphome.codegen as cg
 from esphome.components import improv_base
 from esphome.components.esp32 import get_esp32_variant
-from esphome.components.esp32.const import (
+from esphome.components.esp32.const import VARIANT_ESP32S3
-    VARIANT_ESP32S3,
-)
 from esphome.components.logger import USB_CDC
-from esphome.const import CONF_BAUD_RATE, CONF_HARDWARE_UART, CONF_ID, CONF_LOGGER
-import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome.const import CONF_BAUD_RATE, CONF_HARDWARE_UART, CONF_ID, CONF_LOGGER
 from esphome.core import CORE
 import esphome.final_validate as fv
 
@@ -19,11 +17,7 @@ improv_serial_ns = cg.esphome_ns.namespace("improv_serial")
 ImprovSerialComponent = improv_serial_ns.class_("ImprovSerialComponent", cg.Component)
 
 CONFIG_SCHEMA = (
-    cv.Schema(
+    cv.Schema({cv.GenerateID(): cv.declare_id(ImprovSerialComponent)})
-        {
-            cv.GenerateID(): cv.declare_id(ImprovSerialComponent),
-        }
-    )
     .extend(improv_base.IMPROV_SCHEMA)
     .extend(cv.COMPONENT_SCHEMA)
 )

esphome/components/improv_serial/improv_serial_component.cpp

@@ -1,5 +1,5 @@
 #include "improv_serial_component.h"
-
+#ifdef USE_WIFI
 #include "esphome/core/application.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
@@ -170,7 +170,11 @@ std::vector<uint8_t> ImprovSerialComponent::build_rpc_settings_response_(improv:
 }
 
 std::vector<uint8_t> ImprovSerialComponent::build_version_info_() {
+#ifdef ESPHOME_PROJECT_NAME
+  std::vector<std::string> infos = {ESPHOME_PROJECT_NAME, ESPHOME_PROJECT_VERSION, ESPHOME_VARIANT, App.get_name()};
+#else
   std::vector<std::string> infos = {"ESPHome", ESPHOME_VERSION, ESPHOME_VARIANT, App.get_name()};
+#endif
   std::vector<uint8_t> data = improv::build_rpc_response(improv::GET_DEVICE_INFO, infos, false);
   return data;
 };
@@ -309,3 +313,4 @@ ImprovSerialComponent *global_improv_serial_component =  // NOLINT(cppcoreguidel
 
 }  // namespace improv_serial
 }  // namespace esphome
+#endif

esphome/components/improv_serial/improv_serial_component.h

@@ -5,7 +5,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
-
+#ifdef USE_WIFI
 #include <improv.h>
 #include <vector>
 
@@ -78,3 +78,4 @@ extern ImprovSerialComponent
 
 }  // namespace improv_serial
 }  // namespace esphome
+#endif

esphome/components/light/addressable_light_effect.h

@@ -114,10 +114,11 @@ class AddressableColorWipeEffect : public AddressableLightEffect {
     if (now - this->last_add_ < this->add_led_interval_)
       return;
     this->last_add_ = now;
-    if (this->reverse_)
+    if (this->reverse_) {
       it.shift_left(1);
-    else
+    } else {
       it.shift_right(1);
+    }
     const AddressableColorWipeEffectColor &color = this->colors_[this->at_color_];
     Color esp_color = Color(color.r, color.g, color.b, color.w);
     if (color.gradient) {
@@ -127,10 +128,11 @@ class AddressableColorWipeEffect : public AddressableLightEffect {
       uint8_t gradient = 255 * ((float) this->leds_added_ / color.num_leds);
       esp_color = esp_color.gradient(next_esp_color, gradient);
     }
-    if (this->reverse_)
+    if (this->reverse_) {
       it[-1] = esp_color;
-    else
+    } else {
       it[0] = esp_color;
+    }
     if (++this->leds_added_ >= color.num_leds) {
       this->leds_added_ = 0;
       this->at_color_ = (this->at_color_ + 1) % this->colors_.size();
@@ -207,10 +209,11 @@ class AddressableTwinkleEffect : public AddressableLightEffect {
         const uint8_t sine = half_sin8(view.get_effect_data());
         view = current_color * sine;
         const uint8_t new_pos = view.get_effect_data() + pos_add;
-        if (new_pos < view.get_effect_data())
+        if (new_pos < view.get_effect_data()) {
           view.set_effect_data(0);
-        else
+        } else {
           view.set_effect_data(new_pos);
+        }
       } else {
         view = Color::BLACK;
       }
@@ -254,10 +257,11 @@ class AddressableRandomTwinkleEffect : public AddressableLightEffect {
           view = Color(((color >> 2) & 1) * sine, ((color >> 1) & 1) * sine, ((color >> 0) & 1) * sine);
         }
         const uint8_t new_x = x + pos_add;
-        if (new_x > 0b11111)
+        if (new_x > 0b11111) {
           view.set_effect_data(0);
-        else
+        } else {
           view.set_effect_data((new_x << 3) | color);
+        }
       } else {
         view = Color(0, 0, 0, 0);
       }

esphome/components/light/automation.h

@@ -7,6 +7,8 @@
 namespace esphome {
 namespace light {
 
+enum class LimitMode { CLAMP, DO_NOTHING };
+
 template<typename... Ts> class ToggleAction : public Action<Ts...> {
  public:
   explicit ToggleAction(LightState *state) : state_(state) {}
@@ -77,7 +79,10 @@ template<typename... Ts> class DimRelativeAction : public Action<Ts...> {
     float rel = this->relative_brightness_.value(x...);
     float cur;
     this->parent_->remote_values.as_brightness(&cur);
-    float new_brightness = clamp(cur + rel, 0.0f, 1.0f);
+    if ((limit_mode_ == LimitMode::DO_NOTHING) && ((cur < min_brightness_) || (cur > max_brightness_))) {
+      return;
+    }
+    float new_brightness = clamp(cur + rel, min_brightness_, max_brightness_);
     call.set_state(new_brightness != 0.0f);
     call.set_brightness(new_brightness);
 
@@ -85,8 +90,18 @@ template<typename... Ts> class DimRelativeAction : public Action<Ts...> {
     call.perform();
   }
 
+  void set_min_max_brightness(float min, float max) {
+    this->min_brightness_ = min;
+    this->max_brightness_ = max;
+  }
+
+  void set_limit_mode(LimitMode limit_mode) { this->limit_mode_ = limit_mode; }
+
  protected:
   LightState *parent_;
+  float min_brightness_{0.0};
+  float max_brightness_{1.0};
+  LimitMode limit_mode_{LimitMode::CLAMP};
 };
 
 template<typename... Ts> class LightIsOnCondition : public Condition<Ts...> {

esphome/components/light/automation.py

@@ -19,10 +19,15 @@ from esphome.const import (
     CONF_WARM_WHITE,
     CONF_RANGE_FROM,
     CONF_RANGE_TO,
+    CONF_BRIGHTNESS_LIMITS,
+    CONF_LIMIT_MODE,
+    CONF_MIN_BRIGHTNESS,
+    CONF_MAX_BRIGHTNESS,
 )
 from .types import (
     ColorMode,
     COLOR_MODES,
+    LIMIT_MODES,
     DimRelativeAction,
     ToggleAction,
     LightState,
@@ -167,6 +172,15 @@ LIGHT_DIM_RELATIVE_ACTION_SCHEMA = cv.Schema(
         cv.Optional(CONF_TRANSITION_LENGTH): cv.templatable(
             cv.positive_time_period_milliseconds
         ),
+        cv.Optional(CONF_BRIGHTNESS_LIMITS): cv.Schema(
+            {
+                cv.Optional(CONF_MIN_BRIGHTNESS, default="0%"): cv.percentage,
+                cv.Optional(CONF_MAX_BRIGHTNESS, default="100%"): cv.percentage,
+                cv.Optional(CONF_LIMIT_MODE, default="CLAMP"): cv.enum(
+                    LIMIT_MODES, upper=True, space="_"
+                ),
+            }
+        ),
     }
 )
 
@@ -182,6 +196,13 @@ async def light_dim_relative_to_code(config, action_id, template_arg, args):
     if CONF_TRANSITION_LENGTH in config:
         templ = await cg.templatable(config[CONF_TRANSITION_LENGTH], args, cg.uint32)
         cg.add(var.set_transition_length(templ))
+    if conf := config.get(CONF_BRIGHTNESS_LIMITS):
+        cg.add(
+            var.set_min_max_brightness(
+                conf[CONF_MIN_BRIGHTNESS], conf[CONF_MAX_BRIGHTNESS]
+            )
+        )
+        cg.add(var.set_limit_mode(conf[CONF_LIMIT_MODE]))
     return var
 
 

esphome/components/light/base_light_effects.h

@@ -25,7 +25,7 @@ class PulseLightEffect : public LightEffect {
       return;
     }
     auto call = this->state_->turn_on();
-    float out = this->on_ ? this->max_brightness : this->min_brightness;
+    float out = this->on_ ? this->max_brightness_ : this->min_brightness_;
     call.set_brightness_if_supported(out);
     call.set_transition_length_if_supported(this->on_ ? this->transition_on_length_ : this->transition_off_length_);
     this->on_ = !this->on_;
@@ -43,8 +43,8 @@ class PulseLightEffect : public LightEffect {
   void set_update_interval(uint32_t update_interval) { this->update_interval_ = update_interval; }
 
   void set_min_max_brightness(float min, float max) {
-    this->min_brightness = min;
+    this->min_brightness_ = min;
-    this->max_brightness = max;
+    this->max_brightness_ = max;
   }
 
  protected:
@@ -53,8 +53,8 @@ class PulseLightEffect : public LightEffect {
   uint32_t transition_on_length_{};
   uint32_t transition_off_length_{};
   uint32_t update_interval_{};
-  float min_brightness{0.0};
+  float min_brightness_{0.0};
-  float max_brightness{1.0};
+  float max_brightness_{1.0};
 };
 
 /// Random effect. Sets random colors every 10 seconds and slowly transitions between them.

esphome/components/light/esp_color_correction.h

@@ -41,29 +41,29 @@ class ESPColorCorrection {
     if (this->max_brightness_.red == 0 || this->local_brightness_ == 0)
       return 0;
     uint16_t uncorrected = this->gamma_reverse_table_[red] * 255UL;
-    uint8_t res = ((uncorrected / this->max_brightness_.red) * 255UL) / this->local_brightness_;
+    uint16_t res = ((uncorrected / this->max_brightness_.red) * 255UL) / this->local_brightness_;
-    return res;
+    return (uint8_t) std::min(res, uint16_t(255));
   }
   inline uint8_t color_uncorrect_green(uint8_t green) const ESPHOME_ALWAYS_INLINE {
     if (this->max_brightness_.green == 0 || this->local_brightness_ == 0)
       return 0;
     uint16_t uncorrected = this->gamma_reverse_table_[green] * 255UL;
-    uint8_t res = ((uncorrected / this->max_brightness_.green) * 255UL) / this->local_brightness_;
+    uint16_t res = ((uncorrected / this->max_brightness_.green) * 255UL) / this->local_brightness_;
-    return res;
+    return (uint8_t) std::min(res, uint16_t(255));
   }
   inline uint8_t color_uncorrect_blue(uint8_t blue) const ESPHOME_ALWAYS_INLINE {
     if (this->max_brightness_.blue == 0 || this->local_brightness_ == 0)
       return 0;
     uint16_t uncorrected = this->gamma_reverse_table_[blue] * 255UL;
-    uint8_t res = ((uncorrected / this->max_brightness_.blue) * 255UL) / this->local_brightness_;
+    uint16_t res = ((uncorrected / this->max_brightness_.blue) * 255UL) / this->local_brightness_;
-    return res;
+    return (uint8_t) std::min(res, uint16_t(255));
   }
   inline uint8_t color_uncorrect_white(uint8_t white) const ESPHOME_ALWAYS_INLINE {
     if (this->max_brightness_.white == 0 || this->local_brightness_ == 0)
       return 0;
     uint16_t uncorrected = this->gamma_reverse_table_[white] * 255UL;
-    uint8_t res = ((uncorrected / this->max_brightness_.white) * 255UL) / this->local_brightness_;
+    uint16_t res = ((uncorrected / this->max_brightness_.white) * 255UL) / this->local_brightness_;
-    return res;
+    return (uint8_t) std::min(res, uint16_t(255));
   }
 
  protected:

esphome/components/light/types.py

@@ -26,6 +26,13 @@ COLOR_MODES = {
     "RGB_COLD_WARM_WHITE": ColorMode.RGB_COLD_WARM_WHITE,
 }
 
+# Limit modes
+LimitMode = light_ns.enum("LimitMode", is_class=True)
+LIMIT_MODES = {
+    "CLAMP": LimitMode.CLAMP,
+    "DO_NOTHING": LimitMode.DO_NOTHING,
+}
+
 # Actions
 ToggleAction = light_ns.class_("ToggleAction", automation.Action)
 LightControlAction = light_ns.class_("LightControlAction", automation.Action)

esphome/components/lvgl/__init__.py

@@ -23,7 +23,7 @@ from esphome.helpers import write_file_if_changed
 from . import defines as df, helpers, lv_validation as lvalid
 from .automation import disp_update, update_to_code
 from .defines import CONF_SKIP
-from .encoders import ENCODERS_CONFIG, encoders_to_code
+from .encoders import ENCODERS_CONFIG, encoders_to_code, initial_focus_to_code
 from .lv_validation import lv_bool, lv_images_used
 from .lvcode import LvContext, LvglComponent
 from .schemas import (
@@ -47,6 +47,7 @@ from .types import (
     IdleTrigger,
     ObjUpdateAction,
     lv_font_t,
+    lv_group_t,
     lv_style_t,
     lvgl_ns,
 )
@@ -271,6 +272,7 @@ async def to_code(config):
             templ = await cg.templatable(conf[CONF_TIMEOUT], [], cg.uint32)
             idle_trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], lv_component, templ)
             await build_automation(idle_trigger, [], conf)
+        await initial_focus_to_code(config)
 
     for comp in helpers.lvgl_components_required:
         CORE.add_define(f"USE_LVGL_{comp.upper()}")
@@ -335,8 +337,9 @@ CONFIG_SCHEMA = (
             cv.Optional(df.CONF_THEME): cv.Schema(
                 {cv.Optional(name): obj_schema(w) for name, w in WIDGET_TYPES.items()}
             ),
-            cv.GenerateID(df.CONF_TOUCHSCREENS): touchscreen_schema,
+            cv.Optional(df.CONF_TOUCHSCREENS, default=None): touchscreen_schema,
-            cv.GenerateID(df.CONF_ENCODERS): ENCODERS_CONFIG,
+            cv.Optional(df.CONF_ENCODERS, default=None): ENCODERS_CONFIG,
+            cv.GenerateID(df.CONF_DEFAULT_GROUP): cv.declare_id(lv_group_t),
         }
     )
     .extend(DISP_BG_SCHEMA)

esphome/components/lvgl/automation.py

@@ -17,6 +17,7 @@ from .defines import (
 from .lv_validation import lv_bool, lv_color, lv_image
 from .lvcode import (
     LVGL_COMP_ARG,
+    UPDATE_EVENT,
     LambdaContext,
     LocalVariable,
     LvConditional,
@@ -30,7 +31,6 @@ from .lvcode import (
 )
 from .schemas import DISP_BG_SCHEMA, LIST_ACTION_SCHEMA, LVGL_SCHEMA
 from .types import (
-    LV_EVENT,
     LV_STATE,
     LvglAction,
     LvglCondition,
@@ -64,7 +64,7 @@ async def update_to_code(config, action_id, template_arg, args):
             widget.type.w_type.value_property is not None
             and widget.type.w_type.value_property in config
         ):
-            lv.event_send(widget.obj, LV_EVENT.VALUE_CHANGED, nullptr)
+            lv.event_send(widget.obj, UPDATE_EVENT, nullptr)
 
     widgets = await get_widgets(config[CONF_ID])
     return await action_to_code(widgets, do_update, action_id, template_arg, args)

esphome/components/lvgl/defines.py

@@ -6,8 +6,8 @@ Constants already defined in esphome.const are not duplicated here and must be i
 
 from esphome import codegen as cg, config_validation as cv
 from esphome.const import CONF_ITEMS
-from esphome.core import ID, Lambda
+from esphome.core import Lambda
-from esphome.cpp_generator import MockObj
+from esphome.cpp_generator import LambdaExpression, MockObj
 from esphome.cpp_types import uint32
 from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
 
@@ -22,19 +22,22 @@ def literal(arg):
     return arg
 
 
+def call_lambda(lamb: LambdaExpression):
+    expr = lamb.content.strip()
+    if expr.startswith("return") and expr.endswith(";"):
+        return expr[7:][:-1]
+    return f"{lamb}()"
+
+
 class LValidator:
     """
     A validator for a particular type used in LVGL. Usable in configs as a validator, also
     has `process()` to convert a value during code generation
     """
 
-    def __init__(
+    def __init__(self, validator, rtype, retmapper=None, requires=None):
-        self, validator, rtype, idtype=None, idexpr=None, retmapper=None, requires=None
-    ):
         self.validator = validator
         self.rtype = rtype
-        self.idtype = idtype
-        self.idexpr = idexpr
         self.retmapper = retmapper
         self.requires = requires
 
@@ -43,8 +46,6 @@ class LValidator:
             value = requires_component(self.requires)(value)
         if isinstance(value, cv.Lambda):
             return cv.returning_lambda(value)
-        if self.idtype is not None and isinstance(value, ID):
-            return cv.use_id(self.idtype)(value)
         return self.validator(value)
 
     async def process(self, value, args=()):
@@ -52,10 +53,10 @@ class LValidator:
             return None
         if isinstance(value, Lambda):
             return cg.RawExpression(
-                f"{await cg.process_lambda(value, args, return_type=self.rtype)}()"
+                call_lambda(
+                    await cg.process_lambda(value, args, return_type=self.rtype)
+                )
             )
-        if self.idtype is not None and isinstance(value, ID):
-            return cg.RawExpression(f"{value}->{self.idexpr}")
         if self.retmapper is not None:
             return self.retmapper(value)
         return cg.safe_exp(value)
@@ -89,7 +90,7 @@ class LvConstant(LValidator):
             cv.ensure_list(self.one_of), uint32, retmapper=self.mapper
         )
 
-    def mapper(self, value, args=()):
+    def mapper(self, value):
         if not isinstance(value, list):
             value = [value]
         return literal(
@@ -103,7 +104,7 @@ class LvConstant(LValidator):
 
     def extend(self, *choices):
         """
-        Extend an LVCconstant with additional choices.
+        Extend an LVconstant with additional choices.
         :param choices: The extra choices
         :return: A new LVConstant instance
         """
@@ -386,6 +387,7 @@ CONF_COLOR_DEPTH = "color_depth"
 CONF_CONTROL = "control"
 CONF_DEFAULT = "default"
 CONF_DEFAULT_FONT = "default_font"
+CONF_DEFAULT_GROUP = "default_group"
 CONF_DIR = "dir"
 CONF_DISPLAYS = "displays"
 CONF_ENCODERS = "encoders"
@@ -412,6 +414,7 @@ CONF_GRID_ROW_ALIGN = "grid_row_align"
 CONF_GRID_ROWS = "grid_rows"
 CONF_HEADER_MODE = "header_mode"
 CONF_HOME = "home"
+CONF_INITIAL_FOCUS = "initial_focus"
 CONF_KEY_CODE = "key_code"
 CONF_LAYOUT = "layout"
 CONF_LEFT_BUTTON = "left_button"
@@ -429,6 +432,8 @@ CONF_ONE_LINE = "one_line"
 CONF_ON_SELECT = "on_select"
 CONF_ONE_CHECKED = "one_checked"
 CONF_NEXT = "next"
+CONF_PAD_ROW = "pad_row"
+CONF_PAD_COLUMN = "pad_column"
 CONF_PAGE = "page"
 CONF_PAGE_WRAP = "page_wrap"
 CONF_PASSWORD_MODE = "password_mode"
@@ -460,6 +465,7 @@ CONF_SKIP = "skip"
 CONF_SYMBOL = "symbol"
 CONF_TAB_ID = "tab_id"
 CONF_TABS = "tabs"
+CONF_TIME_FORMAT = "time_format"
 CONF_TILE = "tile"
 CONF_TILE_ID = "tile_id"
 CONF_TILES = "tiles"
@@ -468,6 +474,7 @@ CONF_TOP_LAYER = "top_layer"
 CONF_TOUCHSCREENS = "touchscreens"
 CONF_TRANSPARENCY_KEY = "transparency_key"
 CONF_THEME = "theme"
+CONF_UPDATE_ON_RELEASE = "update_on_release"
 CONF_VISIBLE_ROW_COUNT = "visible_row_count"
 CONF_WIDGET = "widget"
 CONF_WIDGETS = "widgets"

esphome/components/lvgl/encoders.py

@@ -5,8 +5,10 @@ import esphome.config_validation as cv
 from esphome.const import CONF_GROUP, CONF_ID, CONF_SENSOR
 
 from .defines import (
+    CONF_DEFAULT_GROUP,
     CONF_ENCODERS,
     CONF_ENTER_BUTTON,
+    CONF_INITIAL_FOCUS,
     CONF_LEFT_BUTTON,
     CONF_LONG_PRESS_REPEAT_TIME,
     CONF_LONG_PRESS_TIME,
@@ -38,7 +40,10 @@ ENCODERS_CONFIG = cv.ensure_list(
 
 
 async def encoders_to_code(var, config):
-    for enc_conf in config.get(CONF_ENCODERS, ()):
+    default_group = lv_Pvariable(lv_group_t, config[CONF_DEFAULT_GROUP])
+    lv_assign(default_group, lv_expr.group_create())
+    lv.group_set_default(default_group)
+    for enc_conf in config[CONF_ENCODERS]:
         lvgl_components_required.add("KEY_LISTENER")
         lpt = enc_conf[CONF_LONG_PRESS_TIME].total_milliseconds
         lprt = enc_conf[CONF_LONG_PRESS_REPEAT_TIME].total_milliseconds
@@ -60,6 +65,13 @@ async def encoders_to_code(var, config):
         if group := enc_conf.get(CONF_GROUP):
             group = lv_Pvariable(lv_group_t, group)
             lv_assign(group, lv_expr.group_create())
-            lv.indev_set_group(lv_expr.indev_drv_register(listener.get_drv()), group)
         else:
-            lv.indev_drv_register(listener.get_drv())
+            group = default_group
+        lv.indev_set_group(lv_expr.indev_drv_register(listener.get_drv()), group)
+
+
+async def initial_focus_to_code(config):
+    for enc_conf in config[CONF_ENCODERS]:
+        if default_focus := enc_conf.get(CONF_INITIAL_FOCUS):
+            obj = await cg.get_variable(default_focus)
+            lv.group_focus_obj(obj)

esphome/components/lvgl/light/lvgl_light.h

@@ -38,7 +38,7 @@ class LVLight : public light::LightOutput {
   void set_value_(lv_color_t value) {
     lv_led_set_color(this->obj_, value);
     lv_led_on(this->obj_);
-    lv_event_send(this->obj_, lv_custom_event, nullptr);
+    lv_event_send(this->obj_, lv_api_event, nullptr);
   }
   lv_obj_t *obj_{};
   optional<lv_color_t> initial_value_{};

esphome/components/lvgl/lv_validation.py

@@ -1,17 +1,14 @@
 from typing import Union
 
 import esphome.codegen as cg
-from esphome.components.binary_sensor import BinarySensor
 from esphome.components.color import ColorStruct
 from esphome.components.font import Font
 from esphome.components.image import Image_
-from esphome.components.sensor import Sensor
-from esphome.components.text_sensor import TextSensor
 import esphome.config_validation as cv
-from esphome.const import CONF_ARGS, CONF_COLOR, CONF_FORMAT, CONF_VALUE
+from esphome.const import CONF_ARGS, CONF_COLOR, CONF_FORMAT, CONF_TIME, CONF_VALUE
-from esphome.core import HexInt
+from esphome.core import HexInt, Lambda
 from esphome.cpp_generator import MockObj
-from esphome.cpp_types import uint32
+from esphome.cpp_types import ESPTime, uint32
 from esphome.helpers import cpp_string_escape
 from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
 
@@ -19,9 +16,11 @@ from . import types as ty
 from .defines import (
     CONF_END_VALUE,
     CONF_START_VALUE,
+    CONF_TIME_FORMAT,
     LV_FONTS,
     LValidator,
     LvConstant,
+    call_lambda,
     literal,
 )
 from .helpers import (
@@ -110,13 +109,13 @@ def angle(value):
 def size_validator(value):
     """A size in one axis - one of "size_content", a number (pixels) or a percentage"""
     if value == SCHEMA_EXTRACT:
-        return ["size_content", "pixels", "..%"]
+        return ["SIZE_CONTENT", "number of pixels", "percentage"]
     if isinstance(value, str) and value.lower().endswith("px"):
         value = cv.int_(value[:-2])
     if isinstance(value, str) and not value.endswith("%"):
         if value.upper() == "SIZE_CONTENT":
             return "LV_SIZE_CONTENT"
-        raise cv.Invalid("must be 'size_content', a pixel position or a percentage")
+        raise cv.Invalid("must be 'size_content', a percentage or an integer (pixels)")
     if isinstance(value, int):
         return cv.int_(value)
     # Will throw an exception if not a percentage.
@@ -125,6 +124,15 @@ def size_validator(value):
 
 size = LValidator(size_validator, uint32, retmapper=literal)
 
+
+def pixels_validator(value):
+    if isinstance(value, str) and value.lower().endswith("px"):
+        return cv.int_(value[:-2])
+    return cv.int_(value)
+
+
+pixels = LValidator(pixels_validator, uint32, retmapper=literal)
+
 radius_consts = LvConstant("LV_RADIUS_", "CIRCLE")
 
 
@@ -167,9 +175,7 @@ lv_image = LValidator(
     retmapper=lambda x: lv_expr.img_from(MockObj(x)),
     requires="image",
 )
-lv_bool = LValidator(
+lv_bool = LValidator(cv.boolean, cg.bool_, retmapper=literal)
-    cv.boolean, cg.bool_, BinarySensor, "get_state()", retmapper=literal
-)
 
 
 def lv_pct(value: Union[int, float]):
@@ -185,42 +191,60 @@ def lvms_validator_(value):
 
 
 lv_milliseconds = LValidator(
-    lvms_validator_,
+    lvms_validator_, cg.int32, retmapper=lambda x: x.total_milliseconds
-    cg.int32,
-    retmapper=lambda x: x.total_milliseconds,
 )
 
 
 class TextValidator(LValidator):
     def __init__(self):
-        super().__init__(
+        super().__init__(cv.string, cg.std_string, lambda s: cg.safe_exp(f"{s}"))
-            cv.string,
-            cg.const_char_ptr,
-            TextSensor,
-            "get_state().c_str()",
-            lambda s: cg.safe_exp(f"{s}"),
-        )
 
     def __call__(self, value):
-        if isinstance(value, dict):
+        if isinstance(value, dict) and CONF_FORMAT in value:
             return value
         return super().__call__(value)
 
     async def process(self, value, args=()):
         if isinstance(value, dict):
+            if format_str := value.get(CONF_FORMAT):
                 args = [str(x) for x in value[CONF_ARGS]]
                 arg_expr = cg.RawExpression(",".join(args))
-            format_str = cpp_string_escape(value[CONF_FORMAT])
+                format_str = cpp_string_escape(format_str)
                 return literal(f"str_sprintf({format_str}, {arg_expr}).c_str()")
+            if time_format := value.get(CONF_TIME_FORMAT):
+                source = value[CONF_TIME]
+                if isinstance(source, Lambda):
+                    time_format = cpp_string_escape(time_format)
+                    return cg.RawExpression(
+                        call_lambda(
+                            await cg.process_lambda(source, args, return_type=ESPTime)
+                        )
+                        + f".strftime({time_format}).c_str()"
+                    )
+                # must be an ID
+                source = await cg.get_variable(source)
+                return source.now().strftime(time_format).c_str()
+        if isinstance(value, Lambda):
+            value = call_lambda(
+                await cg.process_lambda(value, args, return_type=self.rtype)
+            )
+
+            # Was the lambda call reduced to a string?
+            if value.endswith("c_str()") or (
+                value.endswith('"') and value.startswith('"')
+            ):
+                pass
+            else:
+                # Either a std::string or a lambda call returning that. We need const char*
+                value = f"({value}).c_str()"
+            return cg.RawExpression(value)
         return await super().process(value, args)
 
 
 lv_text = TextValidator()
-lv_float = LValidator(cv.float_, cg.float_, Sensor, "get_state()")
+lv_float = LValidator(cv.float_, cg.float_)
-lv_int = LValidator(cv.int_, cg.int_, Sensor, "get_state()")
+lv_int = LValidator(cv.int_, cg.int_)
-lv_brightness = LValidator(
+lv_brightness = LValidator(cv.percentage, cg.float_, retmapper=lambda x: int(x * 255))
-    cv.percentage, cg.float_, Sensor, "get_state()", retmapper=lambda x: int(x * 255)
-)
 
 
 def is_lv_font(font):

esphome/components/lvgl/lvcode.py

@@ -29,7 +29,11 @@ LvglComponent = lvgl_ns.class_("LvglComponent", cg.PollingComponent)
 LVGL_COMP_ARG = [(LvglComponent.operator("ptr"), LVGL_COMP)]
 lv_event_t_ptr = cg.global_ns.namespace("lv_event_t").operator("ptr")
 EVENT_ARG = [(lv_event_t_ptr, "ev")]
-CUSTOM_EVENT = literal("lvgl::lv_custom_event")
+# Two custom events; API_EVENT is fired when an entity is updated remotely by an API interaction;
+# UPDATE_EVENT is fired when an entity is programmatically updated locally.
+# VALUE_CHANGED is the event generated by LVGL when an entity's value changes through user interaction.
+API_EVENT = literal("lvgl::lv_api_event")
+UPDATE_EVENT = literal("lvgl::lv_update_event")
 
 
 def get_line_marks(value) -> list:

esphome/components/lvgl/lvgl_esphome.cpp

@@ -27,7 +27,8 @@ static void rounder_cb(lv_disp_drv_t *disp_drv, lv_area_t *area) {
     area->y2++;
 }
 
-lv_event_code_t lv_custom_event;  // NOLINT
+lv_event_code_t lv_api_event;     // NOLINT
+lv_event_code_t lv_update_event;  // NOLINT
 void LvglComponent::dump_config() { ESP_LOGCONFIG(TAG, "LVGL:"); }
 void LvglComponent::set_paused(bool paused, bool show_snow) {
   this->paused_ = paused;
@@ -40,15 +41,18 @@ void LvglComponent::set_paused(bool paused, bool show_snow) {
 }
 void LvglComponent::add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event) {
   lv_obj_add_event_cb(obj, callback, event, this);
-  if (event == LV_EVENT_VALUE_CHANGED) {
-    lv_obj_add_event_cb(obj, callback, lv_custom_event, this);
-  }
 }
 void LvglComponent::add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1,
                                  lv_event_code_t event2) {
   this->add_event_cb(obj, callback, event1);
   this->add_event_cb(obj, callback, event2);
 }
+void LvglComponent::add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1,
+                                 lv_event_code_t event2, lv_event_code_t event3) {
+  this->add_event_cb(obj, callback, event1);
+  this->add_event_cb(obj, callback, event2);
+  this->add_event_cb(obj, callback, event3);
+}
 void LvglComponent::add_page(LvPageType *page) {
   this->pages_.push_back(page);
   page->setup(this->pages_.size() - 1);
@@ -228,7 +232,8 @@ void LvglComponent::setup() {
   lv_log_register_print_cb(log_cb);
 #endif
   lv_init();
-  lv_custom_event = static_cast<lv_event_code_t>(lv_event_register_id());
+  lv_update_event = static_cast<lv_event_code_t>(lv_event_register_id());
+  lv_api_event = static_cast<lv_event_code_t>(lv_event_register_id());
   auto *display = this->displays_[0];
   size_t buffer_pixels = display->get_width() * display->get_height() / this->buffer_frac_;
   auto buf_bytes = buffer_pixels * LV_COLOR_DEPTH / 8;

esphome/components/lvgl/lvgl_esphome.h

@@ -38,7 +38,8 @@
 namespace esphome {
 namespace lvgl {
 
-extern lv_event_code_t lv_custom_event;  // NOLINT
+extern lv_event_code_t lv_api_event;     // NOLINT
+extern lv_event_code_t lv_update_event;  // NOLINT
 #ifdef USE_LVGL_COLOR
 inline lv_color_t lv_color_from(Color color) { return lv_color_make(color.red, color.green, color.blue); }
 #endif  // USE_LVGL_COLOR
@@ -133,6 +134,8 @@ class LvglComponent : public PollingComponent {
   void set_paused(bool paused, bool show_snow);
   void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event);
   void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2);
+  void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2,
+                    lv_event_code_t event3);
   bool is_paused() const { return this->paused_; }
   void add_page(LvPageType *page);
   void show_page(size_t index, lv_scr_load_anim_t anim, uint32_t time);

esphome/components/lvgl/number/__init__.py

@@ -3,9 +3,17 @@ from esphome.components import number
 import esphome.config_validation as cv
 from esphome.cpp_generator import MockObj
 
-from ..defines import CONF_ANIMATED, CONF_LVGL_ID, CONF_WIDGET
+from ..defines import CONF_ANIMATED, CONF_LVGL_ID, CONF_UPDATE_ON_RELEASE, CONF_WIDGET
 from ..lv_validation import animated
-from ..lvcode import CUSTOM_EVENT, EVENT_ARG, LambdaContext, LvContext, lv, lv_add
+from ..lvcode import (
+    API_EVENT,
+    EVENT_ARG,
+    UPDATE_EVENT,
+    LambdaContext,
+    LvContext,
+    lv,
+    lv_add,
+)
 from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, LvNumber, lvgl_ns
 from ..widgets import get_widgets
@@ -19,6 +27,7 @@ CONFIG_SCHEMA = (
         {
             cv.Required(CONF_WIDGET): cv.use_id(LvNumber),
             cv.Optional(CONF_ANIMATED, default=True): animated,
+            cv.Optional(CONF_UPDATE_ON_RELEASE, default=False): cv.boolean,
         }
     )
 )
@@ -39,14 +48,19 @@ async def to_code(config):
         await widget.set_property(
             "value", MockObj("v") * MockObj(widget.get_scale()), config[CONF_ANIMATED]
         )
-        lv.event_send(widget.obj, CUSTOM_EVENT, cg.nullptr)
+        lv.event_send(widget.obj, API_EVENT, cg.nullptr)
     async with LambdaContext(EVENT_ARG) as event:
         event.add(var.publish_state(widget.get_value()))
+    event_code = (
+        LV_EVENT.VALUE_CHANGED
+        if not config[CONF_UPDATE_ON_RELEASE]
+        else LV_EVENT.RELEASED
+    )
     async with LvContext(paren):
         lv_add(var.set_control_lambda(await control.get_lambda()))
         lv_add(
             paren.add_event_cb(
-                widget.obj, await event.get_lambda(), LV_EVENT.VALUE_CHANGED
+                widget.obj, await event.get_lambda(), UPDATE_EVENT, event_code
             )
         )
         lv_add(var.publish_state(widget.get_value()))

esphome/components/lvgl/number/lvgl_number.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 #include "esphome/components/number/number.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
@@ -11,7 +13,7 @@ namespace lvgl {
 class LVGLNumber : public number::Number {
  public:
   void set_control_lambda(std::function<void(float)> control_lambda) {
-    this->control_lambda_ = control_lambda;
+    this->control_lambda_ = std::move(control_lambda);
     if (this->initial_state_.has_value()) {
       this->control_lambda_(this->initial_state_.value());
       this->initial_state_.reset();
@@ -20,11 +22,12 @@ class LVGLNumber : public number::Number {
 
  protected:
   void control(float value) override {
-    if (this->control_lambda_ != nullptr)
+    if (this->control_lambda_ != nullptr) {
       this->control_lambda_(value);
-    else
+    } else {
       this->initial_state_ = value;
     }
+  }
   std::function<void(float)> control_lambda_{};
   optional<float> initial_state_{};
 };

esphome/components/lvgl/schemas.py

@@ -1,5 +1,6 @@
 from esphome import config_validation as cv
 from esphome.automation import Trigger, validate_automation
+from esphome.components.time import RealTimeClock
 from esphome.const import (
     CONF_ARGS,
     CONF_FORMAT,
@@ -8,17 +9,27 @@ from esphome.const import (
     CONF_ON_VALUE,
     CONF_STATE,
     CONF_TEXT,
+    CONF_TIME,
     CONF_TRIGGER_ID,
     CONF_TYPE,
 )
 from esphome.core import TimePeriod
 from esphome.schema_extractors import SCHEMA_EXTRACT
 
-from . import defines as df, lv_validation as lvalid, types as ty
+from . import defines as df, lv_validation as lvalid
+from .defines import CONF_TIME_FORMAT
 from .helpers import add_lv_use, requires_component, validate_printf
 from .lv_validation import lv_color, lv_font, lv_image
 from .lvcode import LvglComponent
-from .types import WidgetType, lv_group_t
+from .types import (
+    LVEncoderListener,
+    LvType,
+    WidgetType,
+    lv_group_t,
+    lv_obj_t,
+    lv_pseudo_button_t,
+    lv_style_t,
+)
 
 # this will be populated later, in __init__.py to avoid circular imports.
 WIDGET_TYPES: dict = {}
@@ -38,7 +49,13 @@ TEXT_SCHEMA = cv.Schema(
                 ),
                 validate_printf,
             ),
-            lvalid.lv_text,
+            cv.Schema(
+                {
+                    cv.Required(CONF_TIME_FORMAT): cv.string,
+                    cv.GenerateID(CONF_TIME): cv.templatable(cv.use_id(RealTimeClock)),
+                }
+            ),
+            cv.templatable(cv.string),
         )
     }
 )
@@ -46,7 +63,7 @@ TEXT_SCHEMA = cv.Schema(
 LIST_ACTION_SCHEMA = cv.ensure_list(
     cv.maybe_simple_value(
         {
-            cv.Required(CONF_ID): cv.use_id(ty.lv_pseudo_button_t),
+            cv.Required(CONF_ID): cv.use_id(lv_pseudo_button_t),
         },
         key=CONF_ID,
     )
@@ -59,9 +76,10 @@ PRESS_TIME = cv.All(
 ENCODER_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.All(
-            cv.declare_id(ty.LVEncoderListener), requires_component("binary_sensor")
+            cv.declare_id(LVEncoderListener), requires_component("binary_sensor")
         ),
         cv.Optional(CONF_GROUP): cv.declare_id(lv_group_t),
+        cv.Optional(df.CONF_INITIAL_FOCUS): cv.use_id(lv_obj_t),
         cv.Optional(df.CONF_LONG_PRESS_TIME, default="400ms"): PRESS_TIME,
         cv.Optional(df.CONF_LONG_PRESS_REPEAT_TIME, default="100ms"): PRESS_TIME,
     }
@@ -94,6 +112,7 @@ STYLE_PROPS = {
     ).several_of,
     "border_width": cv.positive_int,
     "clip_corner": lvalid.lv_bool,
+    "color_filter_opa": lvalid.opacity,
     "height": lvalid.size,
     "image_recolor": lvalid.lv_color,
     "image_recolor_opa": lvalid.opacity,
@@ -106,15 +125,13 @@ STYLE_PROPS = {
     "opa_layered": lvalid.opacity,
     "outline_color": lvalid.lv_color,
     "outline_opa": lvalid.opacity,
-    "outline_pad": lvalid.size,
+    "outline_pad": lvalid.pixels,
-    "outline_width": lvalid.size,
+    "outline_width": lvalid.pixels,
-    "pad_all": lvalid.size,
+    "pad_all": lvalid.pixels,
-    "pad_bottom": lvalid.size,
+    "pad_bottom": lvalid.pixels,
-    "pad_column": lvalid.size,
+    "pad_left": lvalid.pixels,
-    "pad_left": lvalid.size,
+    "pad_right": lvalid.pixels,
-    "pad_right": lvalid.size,
+    "pad_top": lvalid.pixels,
-    "pad_row": lvalid.size,
-    "pad_top": lvalid.size,
     "shadow_color": lvalid.lv_color,
     "shadow_ofs_x": cv.int_,
     "shadow_ofs_y": cv.int_,
@@ -161,7 +178,7 @@ STYLE_REMAP = {
 # Complete object style schema
 STYLE_SCHEMA = cv.Schema({cv.Optional(k): v for k, v in STYLE_PROPS.items()}).extend(
     {
-        cv.Optional(df.CONF_STYLES): cv.ensure_list(cv.use_id(ty.lv_style_t)),
+        cv.Optional(df.CONF_STYLES): cv.ensure_list(cv.use_id(lv_style_t)),
         cv.Optional(df.CONF_SCROLLBAR_MODE): df.LvConstant(
             "LV_SCROLLBAR_MODE_", "OFF", "ON", "ACTIVE", "AUTO"
         ).one_of,
@@ -193,12 +210,12 @@ def part_schema(widget_type: WidgetType):
     )
 
 
-def automation_schema(typ: ty.LvType):
+def automation_schema(typ: LvType):
     if typ.has_on_value:
         events = df.LV_EVENT_TRIGGERS + (CONF_ON_VALUE,)
     else:
         events = df.LV_EVENT_TRIGGERS
-    if isinstance(typ, ty.LvType):
+    if isinstance(typ, LvType):
         template = Trigger.template(typ.get_arg_type())
     else:
         template = Trigger.template()
@@ -261,7 +278,7 @@ LAYOUT_SCHEMAS = {}
 ALIGN_TO_SCHEMA = {
     cv.Optional(df.CONF_ALIGN_TO): cv.Schema(
         {
-            cv.Required(CONF_ID): cv.use_id(ty.lv_obj_t),
+            cv.Required(CONF_ID): cv.use_id(lv_obj_t),
             cv.Required(df.CONF_ALIGN): df.ALIGN_ALIGNMENTS.one_of,
             cv.Optional(df.CONF_X, default=0): lvalid.pixels_or_percent,
             cv.Optional(df.CONF_Y, default=0): lvalid.pixels_or_percent,
@@ -294,6 +311,8 @@ LAYOUT_SCHEMA = {
                 cv.Required(df.CONF_GRID_COLUMNS): [grid_spec],
                 cv.Optional(df.CONF_GRID_COLUMN_ALIGN): grid_alignments,
                 cv.Optional(df.CONF_GRID_ROW_ALIGN): grid_alignments,
+                cv.Optional(df.CONF_PAD_ROW): lvalid.pixels,
+                cv.Optional(df.CONF_PAD_COLUMN): lvalid.pixels,
             },
             df.TYPE_FLEX: {
                 cv.Optional(
@@ -302,6 +321,8 @@ LAYOUT_SCHEMA = {
                 cv.Optional(df.CONF_FLEX_ALIGN_MAIN, default="start"): flex_alignments,
                 cv.Optional(df.CONF_FLEX_ALIGN_CROSS, default="start"): flex_alignments,
                 cv.Optional(df.CONF_FLEX_ALIGN_TRACK, default="start"): flex_alignments,
+                cv.Optional(df.CONF_PAD_ROW): lvalid.pixels,
+                cv.Optional(df.CONF_PAD_COLUMN): lvalid.pixels,
             },
         },
         lower=True,
@@ -328,7 +349,6 @@ DISP_BG_SCHEMA = cv.Schema(
     }
 )
 
-
 # A style schema that can include text
 STYLED_TEXT_SCHEMA = cv.maybe_simple_value(
     STYLE_SCHEMA.extend(TEXT_SCHEMA), key=CONF_TEXT

esphome/components/lvgl/select/__init__.py

@@ -4,7 +4,15 @@ import esphome.config_validation as cv
 from esphome.const import CONF_OPTIONS
 
 from ..defines import CONF_ANIMATED, CONF_LVGL_ID, CONF_WIDGET
-from ..lvcode import CUSTOM_EVENT, EVENT_ARG, LambdaContext, LvContext, lv, lv_add
+from ..lvcode import (
+    API_EVENT,
+    EVENT_ARG,
+    UPDATE_EVENT,
+    LambdaContext,
+    LvContext,
+    lv,
+    lv_add,
+)
 from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, LvSelect, lvgl_ns
 from ..widgets import get_widgets
@@ -33,7 +41,7 @@ async def to_code(config):
         pub_ctx.add(selector.publish_index(widget.get_value()))
     async with LambdaContext([(cg.uint16, "v")]) as control:
         await widget.set_property("selected", "v", animated=config[CONF_ANIMATED])
-        lv.event_send(widget.obj, CUSTOM_EVENT, cg.nullptr)
+        lv.event_send(widget.obj, API_EVENT, cg.nullptr)
     async with LvContext(paren) as ctx:
         lv_add(selector.set_control_lambda(await control.get_lambda()))
         ctx.add(
@@ -41,6 +49,7 @@ async def to_code(config):
                 widget.obj,
                 await pub_ctx.get_lambda(),
                 LV_EVENT.VALUE_CHANGED,
+                UPDATE_EVENT,
             )
         )
         lv_add(selector.publish_index(widget.get_value()))

esphome/components/lvgl/select/lvgl_select.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 #include "esphome/components/select/select.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
@@ -28,7 +30,7 @@ static std::vector<std::string> split_string(const std::string &str) {
 class LVGLSelect : public select::Select {
  public:
   void set_control_lambda(std::function<void(size_t)> lambda) {
-    this->control_lambda_ = lambda;
+    this->control_lambda_ = std::move(lambda);
     if (this->initial_state_.has_value()) {
       this->control(this->initial_state_.value());
       this->initial_state_.reset();

esphome/components/lvgl/sensor/__init__.py

@@ -3,7 +3,15 @@ from esphome.components.sensor import Sensor, new_sensor, sensor_schema
 import esphome.config_validation as cv
 
 from ..defines import CONF_LVGL_ID, CONF_WIDGET
-from ..lvcode import EVENT_ARG, LVGL_COMP_ARG, LambdaContext, LvContext, lv_add
+from ..lvcode import (
+    API_EVENT,
+    EVENT_ARG,
+    LVGL_COMP_ARG,
+    UPDATE_EVENT,
+    LambdaContext,
+    LvContext,
+    lv_add,
+)
 from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, LvNumber
 from ..widgets import Widget, get_widgets
@@ -30,6 +38,10 @@ async def to_code(config):
     async with LvContext(paren, LVGL_COMP_ARG):
         lv_add(
             paren.add_event_cb(
-                widget.obj, await lamb.get_lambda(), LV_EVENT.VALUE_CHANGED
+                widget.obj,
+                await lamb.get_lambda(),
+                LV_EVENT.VALUE_CHANGED,
+                API_EVENT,
+                UPDATE_EVENT,
             )
         )

esphome/components/lvgl/switch/__init__.py

@@ -5,8 +5,9 @@ from esphome.cpp_generator import MockObj
 
 from ..defines import CONF_LVGL_ID, CONF_WIDGET
 from ..lvcode import (
-    CUSTOM_EVENT,
+    API_EVENT,
     EVENT_ARG,
+    UPDATE_EVENT,
     LambdaContext,
     LvConditional,
     LvContext,
@@ -41,7 +42,7 @@ async def to_code(config):
             widget.add_state(LV_STATE.CHECKED)
             cond.else_()
             widget.clear_state(LV_STATE.CHECKED)
-        lv.event_send(widget.obj, CUSTOM_EVENT, cg.nullptr)
+        lv.event_send(widget.obj, API_EVENT, cg.nullptr)
     async with LvContext(paren) as ctx:
         lv_add(switch.set_control_lambda(await control.get_lambda()))
         ctx.add(
@@ -49,6 +50,7 @@ async def to_code(config):
                 widget.obj,
                 await checked_ctx.get_lambda(),
                 LV_EVENT.VALUE_CHANGED,
+                UPDATE_EVENT,
             )
         )
         lv_add(switch.publish_state(widget.get_value()))

esphome/components/lvgl/switch/lvgl_switch.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 #include "esphome/components/switch/switch.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
@@ -11,7 +13,7 @@ namespace lvgl {
 class LVGLSwitch : public switch_::Switch {
  public:
   void set_control_lambda(std::function<void(bool)> state_lambda) {
-    this->state_lambda_ = state_lambda;
+    this->state_lambda_ = std::move(state_lambda);
     if (this->initial_state_.has_value()) {
       this->state_lambda_(this->initial_state_.value());
       this->initial_state_.reset();
@@ -20,11 +22,12 @@ class LVGLSwitch : public switch_::Switch {
 
  protected:
   void write_state(bool value) override {
-    if (this->state_lambda_ != nullptr)
+    if (this->state_lambda_ != nullptr) {
       this->state_lambda_(value);
-    else
+    } else {
       this->initial_state_ = value;
     }
+  }
   std::function<void(bool)> state_lambda_{};
   optional<bool> initial_state_{};
 };

esphome/components/lvgl/text/__init__.py

@@ -4,7 +4,15 @@ from esphome.components.text import new_text
 import esphome.config_validation as cv
 
 from ..defines import CONF_LVGL_ID, CONF_WIDGET
-from ..lvcode import CUSTOM_EVENT, EVENT_ARG, LambdaContext, LvContext, lv, lv_add
+from ..lvcode import (
+    API_EVENT,
+    EVENT_ARG,
+    UPDATE_EVENT,
+    LambdaContext,
+    LvContext,
+    lv,
+    lv_add,
+)
 from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, LvText, lvgl_ns
 from ..widgets import get_widgets
@@ -26,14 +34,17 @@ async def to_code(config):
     widget = widget[0]
     async with LambdaContext([(cg.std_string, "text_value")]) as control:
         await widget.set_property("text", "text_value.c_str())")
-        lv.event_send(widget.obj, CUSTOM_EVENT, None)
+        lv.event_send(widget.obj, API_EVENT, None)
     async with LambdaContext(EVENT_ARG) as lamb:
         lv_add(textvar.publish_state(widget.get_value()))
     async with LvContext(paren):
         widget.var.set_control_lambda(await control.get_lambda())
         lv_add(
             paren.add_event_cb(
-                widget.obj, await lamb.get_lambda(), LV_EVENT.VALUE_CHANGED
+                widget.obj,
+                await lamb.get_lambda(),
+                LV_EVENT.VALUE_CHANGED,
+                UPDATE_EVENT,
             )
         )
         lv_add(textvar.publish_state(widget.get_value()))

esphome/components/lvgl/text/lvgl_text.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 #include "esphome/components/text/text.h"
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
@@ -11,7 +13,7 @@ namespace lvgl {
 class LVGLText : public text::Text {
  public:
   void set_control_lambda(std::function<void(const std::string)> control_lambda) {
-    this->control_lambda_ = control_lambda;
+    this->control_lambda_ = std::move(control_lambda);
     if (this->initial_state_.has_value()) {
       this->control_lambda_(this->initial_state_.value());
       this->initial_state_.reset();
@@ -20,11 +22,12 @@ class LVGLText : public text::Text {
 
  protected:
   void control(const std::string &value) override {
-    if (this->control_lambda_ != nullptr)
+    if (this->control_lambda_ != nullptr) {
       this->control_lambda_(value);
-    else
+    } else {
       this->initial_state_ = value;
     }
+  }
   std::function<void(const std::string)> control_lambda_{};
   optional<std::string> initial_state_{};
 };

esphome/components/lvgl/text_sensor/__init__.py

@@ -7,7 +7,7 @@ from esphome.components.text_sensor import (
 import esphome.config_validation as cv
 
 from ..defines import CONF_LVGL_ID, CONF_WIDGET
-from ..lvcode import EVENT_ARG, LambdaContext, LvContext
+from ..lvcode import API_EVENT, EVENT_ARG, UPDATE_EVENT, LambdaContext, LvContext
 from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, LvText
 from ..widgets import get_widgets
@@ -36,5 +36,7 @@ async def to_code(config):
                 widget.obj,
                 await pressed_ctx.get_lambda(),
                 LV_EVENT.VALUE_CHANGED,
+                API_EVENT,
+                UPDATE_EVENT,
             )
         )

esphome/components/lvgl/touchscreens.py

@@ -34,7 +34,7 @@ def touchscreen_schema(config):
 
 
 async def touchscreens_to_code(var, config):
-    for tconf in config.get(CONF_TOUCHSCREENS, ()):
+    for tconf in config[CONF_TOUCHSCREENS]:
         lvgl_components_required.add(CONF_TOUCHSCREEN)
         touchscreen = await cg.get_variable(tconf[CONF_TOUCHSCREEN_ID])
         lpt = tconf[CONF_LONG_PRESS_TIME].total_milliseconds

esphome/components/lvgl/trigger.py

@@ -11,7 +11,15 @@ from .defines import (
     LV_EVENT_TRIGGERS,
     literal,
 )
-from .lvcode import EVENT_ARG, LambdaContext, LvConditional, lv, lv_add
+from .lvcode import (
+    API_EVENT,
+    EVENT_ARG,
+    UPDATE_EVENT,
+    LambdaContext,
+    LvConditional,
+    lv,
+    lv_add,
+)
 from .types import LV_EVENT
 from .widgets import widget_map
 
@@ -34,9 +42,16 @@ async def generate_triggers(lv_component):
                 conf = conf[0]
                 w.add_flag("LV_OBJ_FLAG_CLICKABLE")
                 event = literal("LV_EVENT_" + LV_EVENT_MAP[event[3:].upper()])
-                await add_trigger(conf, event, lv_component, w)
+                await add_trigger(conf, lv_component, w, event)
             for conf in w.config.get(CONF_ON_VALUE, ()):
-                await add_trigger(conf, LV_EVENT.VALUE_CHANGED, lv_component, w)
+                await add_trigger(
+                    conf,
+                    lv_component,
+                    w,
+                    LV_EVENT.VALUE_CHANGED,
+                    API_EVENT,
+                    UPDATE_EVENT,
+                )
 
             # Generate align to directives while we're here
             if align_to := w.config.get(CONF_ALIGN_TO):
@@ -47,7 +62,7 @@ async def generate_triggers(lv_component):
                 lv.obj_align_to(w.obj, target, align, x, y)
 
 
-async def add_trigger(conf, event, lv_component, w):
+async def add_trigger(conf, lv_component, w, *events):
     tid = conf[CONF_TRIGGER_ID]
     trigger = cg.new_Pvariable(tid)
     args = w.get_args()
@@ -56,4 +71,4 @@ async def add_trigger(conf, event, lv_component, w):
     async with LambdaContext(EVENT_ARG, where=tid) as context:
         with LvConditional(w.is_selected()):
             lv_add(trigger.trigger(value))
-    lv_add(lv_component.add_event_cb(w.obj, await context.get_lambda(), event))
+    lv_add(lv_component.add_event_cb(w.obj, await context.get_lambda(), *events))

esphome/components/lvgl/widgets/__init__.py

@@ -20,6 +20,8 @@ from ..defines import (
     CONF_GRID_ROWS,
     CONF_LAYOUT,
     CONF_MAIN,
+    CONF_PAD_COLUMN,
+    CONF_PAD_ROW,
     CONF_SCROLLBAR_MODE,
     CONF_STYLES,
     CONF_WIDGETS,
@@ -29,6 +31,7 @@ from ..defines import (
     TYPE_FLEX,
     TYPE_GRID,
     LValidator,
+    call_lambda,
     join_enums,
     literal,
 )
@@ -273,6 +276,10 @@ async def set_obj_properties(w: Widget, config):
         layout_type: str = layout[CONF_TYPE]
         add_lv_use(layout_type)
         lv_obj.set_layout(w.obj, literal(f"LV_LAYOUT_{layout_type.upper()}"))
+        if (pad_row := layout.get(CONF_PAD_ROW)) is not None:
+            w.set_style(CONF_PAD_ROW, pad_row, 0)
+        if (pad_column := layout.get(CONF_PAD_COLUMN)) is not None:
+            w.set_style(CONF_PAD_COLUMN, pad_column, 0)
         if layout_type == TYPE_GRID:
             wid = config[CONF_ID]
             rows = [str(x) for x in layout[CONF_GRID_ROWS]]
@@ -316,8 +323,13 @@ async def set_obj_properties(w: Widget, config):
     flag_clr = set()
     flag_set = set()
     props = parts[CONF_MAIN][CONF_DEFAULT]
+    lambs = {}
+    flag_set = set()
+    flag_clr = set()
     for prop, value in {k: v for k, v in props.items() if k in OBJ_FLAGS}.items():
-        if value:
+        if isinstance(value, cv.Lambda):
+            lambs[prop] = value
+        elif value:
             flag_set.add(prop)
         else:
             flag_clr.add(prop)
@@ -327,6 +339,13 @@ async def set_obj_properties(w: Widget, config):
     if flag_clr:
         clrs = join_enums(flag_clr, "LV_OBJ_FLAG_")
         w.clear_flag(clrs)
+    for key, value in lambs.items():
+        lamb = await cg.process_lambda(value, [], return_type=cg.bool_)
+        flag = f"LV_OBJ_FLAG_{key.upper()}"
+        with LvConditional(call_lambda(lamb)) as cond:
+            w.add_flag(flag)
+            cond.else_()
+            w.clear_flag(flag)
 
     if states := config.get(CONF_STATE):
         adds = set()
@@ -348,7 +367,7 @@ async def set_obj_properties(w: Widget, config):
         for key, value in lambs.items():
             lamb = await cg.process_lambda(value, [], return_type=cg.bool_)
             state = f"LV_STATE_{key.upper()}"
-            with LvConditional(f"{lamb}()") as cond:
+            with LvConditional(call_lambda(lamb)) as cond:
                 w.add_state(state)
                 cond.else_()
                 w.clear_state(state)

esphome/components/media_player/automation.h

@@ -7,30 +7,24 @@ namespace esphome {
 
 namespace media_player {
 
-#define MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(ACTION_CLASS, ACTION_COMMAND) \
+template<MediaPlayerCommand Command, typename... Ts>
-  template<typename... Ts> class ACTION_CLASS : public Action<Ts...>, public Parented<MediaPlayer> { \
+class MediaPlayerCommandAction : public Action<Ts...>, public Parented<MediaPlayer> {
-    void play(Ts... x) override { \
+ public:
-      this->parent_->make_call().set_command(MediaPlayerCommand::MEDIA_PLAYER_COMMAND_##ACTION_COMMAND).perform(); \
+  void play(Ts... x) override { this->parent_->make_call().set_command(Command).perform(); }
-    } \
+};
-  };
 
-#define MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(TRIGGER_CLASS, TRIGGER_STATE) \
+template<typename... Ts>
-  class TRIGGER_CLASS : public Trigger<> { \
+using PlayAction = MediaPlayerCommandAction<MediaPlayerCommand::MEDIA_PLAYER_COMMAND_PLAY, Ts...>;
-   public: \
+template<typename... Ts>
-    explicit TRIGGER_CLASS(MediaPlayer *player) { \
+using PauseAction = MediaPlayerCommandAction<MediaPlayerCommand::MEDIA_PLAYER_COMMAND_PAUSE, Ts...>;
-      player->add_on_state_callback([this, player]() { \
+template<typename... Ts>
-        if (player->state == MediaPlayerState::MEDIA_PLAYER_STATE_##TRIGGER_STATE) \
+using StopAction = MediaPlayerCommandAction<MediaPlayerCommand::MEDIA_PLAYER_COMMAND_STOP, Ts...>;
-          this->trigger(); \
+template<typename... Ts>
-      }); \
+using ToggleAction = MediaPlayerCommandAction<MediaPlayerCommand::MEDIA_PLAYER_COMMAND_TOGGLE, Ts...>;
-    } \
+template<typename... Ts>
-  };
+using VolumeUpAction = MediaPlayerCommandAction<MediaPlayerCommand::MEDIA_PLAYER_COMMAND_VOLUME_UP, Ts...>;
-
+template<typename... Ts>
-MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(PlayAction, PLAY)
+using VolumeDownAction = MediaPlayerCommandAction<MediaPlayerCommand::MEDIA_PLAYER_COMMAND_VOLUME_DOWN, Ts...>;
-MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(PauseAction, PAUSE)
-MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(StopAction, STOP)
-MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(ToggleAction, TOGGLE)
-MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(VolumeUpAction, VOLUME_UP)
-MEDIA_PLAYER_SIMPLE_COMMAND_ACTION(VolumeDownAction, VOLUME_DOWN)
 
 template<typename... Ts> class PlayMediaAction : public Action<Ts...>, public Parented<MediaPlayer> {
   TEMPLATABLE_VALUE(std::string, media_url)
@@ -49,10 +43,20 @@ class StateTrigger : public Trigger<> {
   }
 };
 
-MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(IdleTrigger, IDLE)
+template<MediaPlayerState State> class MediaPlayerStateTrigger : public Trigger<> {
-MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(PlayTrigger, PLAYING)
+ public:
-MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(PauseTrigger, PAUSED)
+  explicit MediaPlayerStateTrigger(MediaPlayer *player) {
-MEDIA_PLAYER_SIMPLE_STATE_TRIGGER(AnnouncementTrigger, ANNOUNCING)
+    player->add_on_state_callback([this, player]() {
+      if (player->state == State)
+        this->trigger();
+    });
+  }
+};
+
+using IdleTrigger = MediaPlayerStateTrigger<MediaPlayerState::MEDIA_PLAYER_STATE_IDLE>;
+using PlayTrigger = MediaPlayerStateTrigger<MediaPlayerState::MEDIA_PLAYER_STATE_PLAYING>;
+using PauseTrigger = MediaPlayerStateTrigger<MediaPlayerState::MEDIA_PLAYER_STATE_PAUSED>;
+using AnnouncementTrigger = MediaPlayerStateTrigger<MediaPlayerState::MEDIA_PLAYER_STATE_ANNOUNCING>;
 
 template<typename... Ts> class IsIdleCondition : public Condition<Ts...>, public Parented<MediaPlayer> {
  public:

esphome/components/micro_wake_word/__init__.py

@@ -1,39 +1,34 @@
-import logging
-
-import json
 import hashlib
-from urllib.parse import urljoin
+import json
+import logging
 from pathlib import Path
+from urllib.parse import urljoin
+
 import requests
 
-import esphome.config_validation as cv
+from esphome import automation, external_files, git
-import esphome.codegen as cg
-
-from esphome.core import CORE, HexInt
-
-from esphome.components import esp32, microphone
-from esphome import automation, git, external_files
 from esphome.automation import register_action, register_condition
-
+import esphome.codegen as cg
-
+from esphome.components import esp32, microphone
+import esphome.config_validation as cv
 from esphome.const import (
-    __version__,
+    CONF_FILE,
     CONF_ID,
     CONF_MICROPHONE,
     CONF_MODEL,
-    CONF_URL,
+    CONF_PASSWORD,
-    CONF_FILE,
     CONF_PATH,
+    CONF_RAW_DATA_ID,
     CONF_REF,
     CONF_REFRESH,
     CONF_TYPE,
+    CONF_URL,
     CONF_USERNAME,
-    CONF_PASSWORD,
-    CONF_RAW_DATA_ID,
     TYPE_GIT,
     TYPE_LOCAL,
+    __version__,
 )
-
+from esphome.core import CORE, HexInt
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -174,12 +169,12 @@ def _convert_manifest_v1_to_v2(v1_manifest):
         CONF_SLIDING_WINDOW_AVERAGE_SIZE
     ]
     del v2_manifest[KEY_MICRO][CONF_SLIDING_WINDOW_AVERAGE_SIZE]
-    v2_manifest[KEY_MICRO][
+
-        CONF_TENSOR_ARENA_SIZE
+    # Original Inception-based V1 manifest models require a minimum of 45672 bytes
-    ] = 45672  # Original Inception-based V1 manifest models require a minimum of 45672 bytes
+    v2_manifest[KEY_MICRO][CONF_TENSOR_ARENA_SIZE] = 45672
-    v2_manifest[KEY_MICRO][
+
-        CONF_FEATURE_STEP_SIZE
+    # Original Inception-based V1 manifest models use a 20 ms feature step size
-    ] = 20  # Original Inception-based V1 manifest models use a 20 ms feature step size
+    v2_manifest[KEY_MICRO][CONF_FEATURE_STEP_SIZE] = 20
 
     return v2_manifest
 
@@ -502,7 +497,7 @@ async def to_code(config):
             )
 
     cg.add(var.set_features_step_size(manifest[KEY_MICRO][CONF_FEATURE_STEP_SIZE]))
-    cg.add_library("kahrendt/ESPMicroSpeechFeatures", "1.0.0")
+    cg.add_library("kahrendt/ESPMicroSpeechFeatures", "1.1.0")
 
 
 MICRO_WAKE_WORD_ACTION_SCHEMA = cv.Schema({cv.GenerateID(): cv.use_id(MicroWakeWord)})

esphome/components/microphone/microphone.h

@@ -1,6 +1,9 @@
 #pragma once
 
-#include "esphome/core/entity_base.h"
+#include <cstddef>
+#include <cstdint>
+#include <functional>
+#include <vector>
 #include "esphome/core/helpers.h"
 
 namespace esphome {

esphome/components/mqtt/mqtt_backend.h

@@ -1,5 +1,6 @@
 #pragma once
-
+#include "esphome/core/defines.h"
+#ifdef USE_MQTT
 #include <string>
 #include <map>
 #include "esphome/components/network/ip_address.h"
@@ -67,3 +68,4 @@ class MQTTBackend {
 
 }  // namespace mqtt
 }  // namespace esphome
+#endif

esphome/components/mqtt/mqtt_backend_esp32.cpp

@@ -1,7 +1,9 @@
+#include "mqtt_backend_esp32.h"
+
+#ifdef USE_MQTT
 #ifdef USE_ESP32
 
 #include <string>
-#include "mqtt_backend_esp32.h"
 #include "esphome/core/log.h"
 #include "esphome/core/helpers.h"
 
@@ -189,3 +191,4 @@ void MQTTBackendESP32::mqtt_event_handler(void *handler_args, esp_event_base_t b
 }  // namespace mqtt
 }  // namespace esphome
 #endif  // USE_ESP32
+#endif

esphome/components/mqtt/mqtt_backend_esp32.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "mqtt_backend.h"
+#ifdef USE_MQTT
 #ifdef USE_ESP32
 
 #include <string>
@@ -7,7 +9,6 @@
 #include <mqtt_client.h>
 #include "esphome/components/network/ip_address.h"
 #include "esphome/core/helpers.h"
-#include "mqtt_backend.h"
 
 namespace esphome {
 namespace mqtt {
@@ -174,3 +175,4 @@ class MQTTBackendESP32 final : public MQTTBackend {
 }  // namespace esphome
 
 #endif
+#endif

esphome/components/mqtt/mqtt_backend_esp8266.h

@@ -1,8 +1,9 @@
 #pragma once
+#include "mqtt_backend.h"
 
+#ifdef USE_MQTT
 #ifdef USE_ESP8266
 
-#include "mqtt_backend.h"
 #include <AsyncMqttClient.h>
 
 namespace esphome {
@@ -70,3 +71,4 @@ class MQTTBackendESP8266 final : public MQTTBackend {
 }  // namespace esphome
 
 #endif  // defined(USE_ESP8266)
+#endif

esphome/components/mqtt/mqtt_backend_libretiny.h

@@ -1,8 +1,9 @@
 #pragma once
+#include "mqtt_backend.h"
 
+#ifdef USE_MQTT
 #ifdef USE_LIBRETINY
 
-#include "mqtt_backend.h"
 #include <AsyncMqttClient.h>
 
 namespace esphome {
@@ -70,3 +71,4 @@ class MQTTBackendLibreTiny final : public MQTTBackend {
 }  // namespace esphome
 
 #endif  // defined(USE_LIBRETINY)
+#endif