esphome 2024.7.0__py3-none-any.whl → 2024.7.0b1__py3-none-any.whl

esphome/components/aht10/aht10.cpp

@@ -93,9 +93,8 @@ void AHT10Component::restart_read_() {
 
 void AHT10Component::read_data_() {
   uint8_t data[6];
-  if (this->read_count_ > 1) {
+  if (this->read_count_ > 1)
     ESP_LOGD(TAG, "Read attempt %d at %ums", this->read_count_, (unsigned) (millis() - this->start_time_));
-  }
   if (this->read(data, 6) != i2c::ERROR_OK) {
     this->status_set_warning("AHT10 read failed, retrying soon");
     this->restart_read_();
@@ -120,9 +119,8 @@ void AHT10Component::read_data_() {
       return;
     }
   }
-  if (this->read_count_ > 1) {
+  if (this->read_count_ > 1)
     ESP_LOGD(TAG, "Success at %ums", (unsigned) (millis() - this->start_time_));
-  }
   uint32_t raw_temperature = ((data[3] & 0x0F) << 16) | (data[4] << 8) | data[5];
   uint32_t raw_humidity = ((data[1] << 16) | (data[2] << 8) | data[3]) >> 4;
 

esphome/components/climate/climate.cpp

@@ -574,25 +574,21 @@ void Climate::dump_traits_(const char *tag) {
   ESP_LOGCONFIG(tag, "      - Max temperature: %.1f", traits.get_visual_max_temperature());
   ESP_LOGCONFIG(tag, "      - Temperature step:");
   ESP_LOGCONFIG(tag, "          Target: %.1f", traits.get_visual_target_temperature_step());
+  ESP_LOGCONFIG(tag, "          Current: %.1f", traits.get_visual_current_temperature_step());
+  ESP_LOGCONFIG(tag, "      - Min humidity: %.0f", traits.get_visual_min_humidity());
+  ESP_LOGCONFIG(tag, "      - Max humidity: %.0f", traits.get_visual_max_humidity());
   if (traits.get_supports_current_temperature()) {
-    ESP_LOGCONFIG(tag, "          Current: %.1f", traits.get_visual_current_temperature_step());
+    ESP_LOGCONFIG(tag, "  [x] Supports current temperature");
   }
-  if (traits.get_supports_target_humidity() || traits.get_supports_current_humidity()) {
-    ESP_LOGCONFIG(tag, "      - Min humidity: %.0f", traits.get_visual_min_humidity());
-    ESP_LOGCONFIG(tag, "      - Max humidity: %.0f", traits.get_visual_max_humidity());
+  if (traits.get_supports_current_humidity()) {
+    ESP_LOGCONFIG(tag, "  [x] Supports current humidity");
   }
   if (traits.get_supports_two_point_target_temperature()) {
     ESP_LOGCONFIG(tag, "  [x] Supports two-point target temperature");
   }
-  if (traits.get_supports_current_temperature()) {
-    ESP_LOGCONFIG(tag, "  [x] Supports current temperature");
-  }
   if (traits.get_supports_target_humidity()) {
     ESP_LOGCONFIG(tag, "  [x] Supports target humidity");
   }
-  if (traits.get_supports_current_humidity()) {
-    ESP_LOGCONFIG(tag, "  [x] Supports current humidity");
-  }
   if (traits.get_supports_action()) {
     ESP_LOGCONFIG(tag, "  [x] Supports action");
   }

esphome/components/climate/climate_traits.h

@@ -73,7 +73,7 @@ class ClimateTraits {
   ESPDEPRECATED("This method is deprecated, use set_supported_modes() instead", "v1.20")
   void set_supports_dry_mode(bool supports_dry_mode) { set_mode_support_(CLIMATE_MODE_DRY, supports_dry_mode); }
   bool supports_mode(ClimateMode mode) const { return supported_modes_.count(mode); }
-  const std::set<ClimateMode> &get_supported_modes() const { return supported_modes_; }
+  std::set<ClimateMode> get_supported_modes() const { return supported_modes_; }
 
   void set_supports_action(bool supports_action) { supports_action_ = supports_action; }
   bool get_supports_action() const { return supports_action_; }
@@ -101,7 +101,7 @@ class ClimateTraits {
   void set_supports_fan_mode_diffuse(bool supported) { set_fan_mode_support_(CLIMATE_FAN_DIFFUSE, supported); }
   bool supports_fan_mode(ClimateFanMode fan_mode) const { return supported_fan_modes_.count(fan_mode); }
   bool get_supports_fan_modes() const { return !supported_fan_modes_.empty() || !supported_custom_fan_modes_.empty(); }
-  const std::set<ClimateFanMode> &get_supported_fan_modes() const { return supported_fan_modes_; }
+  std::set<ClimateFanMode> get_supported_fan_modes() const { return supported_fan_modes_; }
 
   void set_supported_custom_fan_modes(std::set<std::string> supported_custom_fan_modes) {
     supported_custom_fan_modes_ = std::move(supported_custom_fan_modes);
@@ -140,7 +140,7 @@ class ClimateTraits {
   }
   bool supports_swing_mode(ClimateSwingMode swing_mode) const { return supported_swing_modes_.count(swing_mode); }
   bool get_supports_swing_modes() const { return !supported_swing_modes_.empty(); }
-  const std::set<ClimateSwingMode> &get_supported_swing_modes() const { return supported_swing_modes_; }
+  std::set<ClimateSwingMode> get_supported_swing_modes() const { return supported_swing_modes_; }
 
   float get_visual_min_temperature() const { return visual_min_temperature_; }
   void set_visual_min_temperature(float visual_min_temperature) { visual_min_temperature_ = visual_min_temperature; }

esphome/components/esp32_can/canbus.py

@@ -11,7 +11,6 @@ from esphome.components.esp32.const import (
     VARIANT_ESP32S2,
     VARIANT_ESP32S3,
     VARIANT_ESP32C3,
-    VARIANT_ESP32C6,
     VARIANT_ESP32H2,
 )
 
@@ -48,7 +47,6 @@ CAN_SPEEDS_ESP32_S2 = {
 
 CAN_SPEEDS_ESP32_S3 = {**CAN_SPEEDS_ESP32_S2}
 CAN_SPEEDS_ESP32_C3 = {**CAN_SPEEDS_ESP32_S2}
-CAN_SPEEDS_ESP32_C6 = {**CAN_SPEEDS_ESP32_S2}
 CAN_SPEEDS_ESP32_H2 = {**CAN_SPEEDS_ESP32_S2}
 
 CAN_SPEEDS = {
@@ -56,7 +54,6 @@ CAN_SPEEDS = {
     VARIANT_ESP32S2: CAN_SPEEDS_ESP32_S2,
     VARIANT_ESP32S3: CAN_SPEEDS_ESP32_S3,
     VARIANT_ESP32C3: CAN_SPEEDS_ESP32_C3,
-    VARIANT_ESP32C6: CAN_SPEEDS_ESP32_C6,
     VARIANT_ESP32H2: CAN_SPEEDS_ESP32_H2,
 }
 

esphome/components/ethernet/ethernet_component.cpp

@@ -394,7 +394,7 @@ void EthernetComponent::got_ip_event_handler(void *arg, esp_event_base_t event_b
   const esp_netif_ip_info_t *ip_info = &event->ip_info;
   ESP_LOGV(TAG, "[Ethernet event] ETH Got IP " IPSTR, IP2STR(&ip_info->ip));
   global_eth_component->got_ipv4_address_ = true;
-#if USE_NETWORK_IPV6 && (USE_NETWORK_MIN_IPV6_ADDR_COUNT > 0)
+#if USE_NETWORK_IPV6
   global_eth_component->connected_ = global_eth_component->ipv6_count_ >= USE_NETWORK_MIN_IPV6_ADDR_COUNT;
 #else
   global_eth_component->connected_ = true;
@@ -407,12 +407,8 @@ void EthernetComponent::got_ip6_event_handler(void *arg, esp_event_base_t event_
   ip_event_got_ip6_t *event = (ip_event_got_ip6_t *) event_data;
   ESP_LOGV(TAG, "[Ethernet event] ETH Got IPv6: " IPV6STR, IPV62STR(event->ip6_info.ip));
   global_eth_component->ipv6_count_ += 1;
-#if (USE_NETWORK_MIN_IPV6_ADDR_COUNT > 0)
   global_eth_component->connected_ =
       global_eth_component->got_ipv4_address_ && (global_eth_component->ipv6_count_ >= USE_NETWORK_MIN_IPV6_ADDR_COUNT);
-#else
-  global_eth_component->connected_ = global_eth_component->got_ipv4_address_;
-#endif
 }
 #endif /* USE_NETWORK_IPV6 */
 

esphome/components/gree/climate.py

@@ -16,7 +16,6 @@ MODELS = {
     "yan": Model.GREE_YAN,
     "yaa": Model.GREE_YAA,
     "yac": Model.GREE_YAC,
-    "yac1fb9": Model.GREE_YAC1FB9,
 }
 
 CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(

esphome/components/gree/gree.cpp

@@ -24,7 +24,7 @@ void GreeClimate::transmit_state() {
     remote_state[4] |= (this->horizontal_swing_() << 4);
   }
 
-  if (this->model_ == GREE_YAA || this->model_ == GREE_YAC || this->model_ == GREE_YAC1FB9) {
+  if (this->model_ == GREE_YAA || this->model_ == GREE_YAC) {
     remote_state[2] = 0x20;  // bits 0..3 always 0000, bits 4..7 TURBO,LIGHT,HEALTH,X-FAN
     remote_state[3] = 0x50;  // bits 4..7 always 0101
     remote_state[6] = 0x20;  // YAA1FB, FAA1FB1, YB1F2 bits 4..7 always 0010
@@ -53,11 +53,7 @@ void GreeClimate::transmit_state() {
   data->set_carrier_frequency(GREE_IR_FREQUENCY);
 
   data->mark(GREE_HEADER_MARK);
-  if (this->model_ == GREE_YAC1FB9) {
-    data->space(GREE_YAC1FB9_HEADER_SPACE);
-  } else {
-    data->space(GREE_HEADER_SPACE);
-  }
+  data->space(GREE_HEADER_SPACE);
 
   for (int i = 0; i < 4; i++) {
     for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
@@ -75,11 +71,7 @@ void GreeClimate::transmit_state() {
   data->space(GREE_ZERO_SPACE);
 
   data->mark(GREE_BIT_MARK);
-  if (this->model_ == GREE_YAC1FB9) {
-    data->space(GREE_YAC1FB9_MESSAGE_SPACE);
-  } else {
-    data->space(GREE_MESSAGE_SPACE);
-  }
+  data->space(GREE_MESSAGE_SPACE);
 
   for (int i = 4; i < 8; i++) {
     for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask

esphome/components/gree/gree.h

@@ -41,10 +41,6 @@ const uint32_t GREE_YAC_HEADER_MARK = 6000;
 const uint32_t GREE_YAC_HEADER_SPACE = 3000;
 const uint32_t GREE_YAC_BIT_MARK = 650;
 
-// Timing specific to YAC1FB9
-const uint32_t GREE_YAC1FB9_HEADER_SPACE = 4500;
-const uint32_t GREE_YAC1FB9_MESSAGE_SPACE = 19980;
-
 // State Frame size
 const uint8_t GREE_STATE_FRAME_SIZE = 8;
 
@@ -71,7 +67,7 @@ const uint8_t GREE_HDIR_MRIGHT = 0x05;
 const uint8_t GREE_HDIR_RIGHT = 0x06;
 
 // Model codes
-enum Model { GREE_GENERIC, GREE_YAN, GREE_YAA, GREE_YAC, GREE_YAC1FB9 };
+enum Model { GREE_GENERIC, GREE_YAN, GREE_YAA, GREE_YAC };
 
 class GreeClimate : public climate_ir::ClimateIR {
  public:

esphome/components/heatpumpir/climate.py

@@ -8,6 +8,7 @@ from esphome.const import (
     CONF_PROTOCOL,
     CONF_VISUAL,
 )
+from esphome.core import CORE
 
 CODEOWNERS = ["@rob-deutsch"]
 
@@ -66,11 +67,6 @@ PROTOCOLS = {
     "carrier_qlima_2": Protocol.PROTOCOL_QLIMA_2,
     "samsung_aqv12msan": Protocol.PROTOCOL_SAMSUNG_AQV12MSAN,
     "zhjg01": Protocol.PROTOCOL_ZHJG01,
-    "airway": Protocol.PROTOCOL_AIRWAY,
-    "bgh_aud": Protocol.PROTOCOL_BGH_AUD,
-    "panasonic_altdke": Protocol.PROTOCOL_PANASONIC_ALTDKE,
-    "vaillantvai8": Protocol.PROTOCOL_VAILLANTVAI8,
-    "r51m": Protocol.PROTOCOL_R51M,
 }
 
 CONF_HORIZONTAL_DEFAULT = "horizontal_default"
@@ -126,4 +122,7 @@ def to_code(config):
     cg.add(var.set_max_temperature(config[CONF_MAX_TEMPERATURE]))
     cg.add(var.set_min_temperature(config[CONF_MIN_TEMPERATURE]))
 
-    cg.add_library("tonia/HeatpumpIR", "1.0.27")
+    cg.add_library("tonia/HeatpumpIR", "1.0.26")
+
+    if CORE.is_esp8266 or CORE.is_esp32:
+        cg.add_library("crankyoldgit/IRremoteESP8266", "2.8.6")

esphome/components/heatpumpir/heatpumpir.cpp

@@ -61,11 +61,6 @@ const std::map<Protocol, std::function<HeatpumpIR *()>> PROTOCOL_CONSTRUCTOR_MAP
     {PROTOCOL_QLIMA_2, []() { return new Qlima2HeatpumpIR(); }},                             // NOLINT
     {PROTOCOL_SAMSUNG_AQV12MSAN, []() { return new SamsungAQV12MSANHeatpumpIR(); }},         // NOLINT
     {PROTOCOL_ZHJG01, []() { return new ZHJG01HeatpumpIR(); }},                              // NOLINT
-    {PROTOCOL_AIRWAY, []() { return new AIRWAYHeatpumpIR(); }},                              // NOLINT
-    {PROTOCOL_BGH_AUD, []() { return new BGHHeatpumpIR(); }},                                // NOLINT
-    {PROTOCOL_PANASONIC_ALTDKE, []() { return new PanasonicAltDKEHeatpumpIR(); }},           // NOLINT
-    {PROTOCOL_VAILLANTVAI8, []() { return new VaillantHeatpumpIR(); }},                      // NOLINT
-    {PROTOCOL_R51M, []() { return new R51MHeatpumpIR(); }},                                  // NOLINT
 };
 
 void HeatpumpIRClimate::setup() {

esphome/components/heatpumpir/heatpumpir.h

@@ -61,11 +61,6 @@ enum Protocol {
   PROTOCOL_QLIMA_2,
   PROTOCOL_SAMSUNG_AQV12MSAN,
   PROTOCOL_ZHJG01,
-  PROTOCOL_AIRWAY,
-  PROTOCOL_BGH_AUD,
-  PROTOCOL_PANASONIC_ALTDKE,
-  PROTOCOL_VAILLANTVAI8,
-  PROTOCOL_R51M,
 };
 
 // Simple enum to represent horizontal directios

esphome/components/http_request/http_request_arduino.cpp

@@ -32,13 +32,6 @@ std::shared_ptr<HttpContainer> HttpRequestArduino::start(std::string url, std::s
 
   watchdog::WatchdogManager wdm(this->get_watchdog_timeout());
 
-  if (this->follow_redirects_) {
-    container->client_.setFollowRedirects(HTTPC_FORCE_FOLLOW_REDIRECTS);
-    container->client_.setRedirectLimit(this->redirect_limit_);
-  } else {
-    container->client_.setFollowRedirects(HTTPC_DISABLE_FOLLOW_REDIRECTS);
-  }
-
 #if defined(USE_ESP8266)
   std::unique_ptr<WiFiClient> stream_ptr;
 #ifdef USE_HTTP_REQUEST_ESP8266_HTTPS
@@ -66,6 +59,8 @@ std::shared_ptr<HttpContainer> HttpRequestArduino::start(std::string url, std::s
                   "in your YAML, or use HTTPS");
   }
 #endif  // USE_ARDUINO_VERSION_CODE
+
+  container->client_.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
   bool status = container->client_.begin(*stream_ptr, url.c_str());
 
 #elif defined(USE_RP2040)

esphome/components/i2s_audio/__init__.py

@@ -25,10 +25,6 @@ CONF_I2S_LRCLK_PIN = "i2s_lrclk_pin"
 CONF_I2S_AUDIO = "i2s_audio"
 CONF_I2S_AUDIO_ID = "i2s_audio_id"
 
-CONF_I2S_MODE = "i2s_mode"
-CONF_PRIMARY = "primary"
-CONF_SECONDARY = "secondary"
-
 i2s_audio_ns = cg.esphome_ns.namespace("i2s_audio")
 I2SAudioComponent = i2s_audio_ns.class_("I2SAudioComponent", cg.Component)
 I2SAudioIn = i2s_audio_ns.class_("I2SAudioIn", cg.Parented.template(I2SAudioComponent))
@@ -36,12 +32,6 @@ I2SAudioOut = i2s_audio_ns.class_(
     "I2SAudioOut", cg.Parented.template(I2SAudioComponent)
 )
 
-i2s_mode_t = cg.global_ns.enum("i2s_mode_t")
-I2S_MODE_OPTIONS = {
-    CONF_PRIMARY: i2s_mode_t.I2S_MODE_MASTER,  # NOLINT
-    CONF_SECONDARY: i2s_mode_t.I2S_MODE_SLAVE,  # NOLINT
-}
-
 # https://github.com/espressif/esp-idf/blob/master/components/soc/{variant}/include/soc/soc_caps.h
 I2S_PORTS = {
     VARIANT_ESP32: 2,

esphome/components/i2s_audio/microphone/__init__.py

@@ -7,9 +7,6 @@ from esphome.components import microphone, esp32
 from esphome.components.adc import ESP32_VARIANT_ADC1_PIN_TO_CHANNEL, validate_adc_pin
 
 from .. import (
-    CONF_I2S_MODE,
-    CONF_PRIMARY,
-    I2S_MODE_OPTIONS,
     i2s_audio_ns,
     I2SAudioComponent,
     I2SAudioIn,
@@ -71,9 +68,6 @@ BASE_SCHEMA = microphone.MICROPHONE_SCHEMA.extend(
             _validate_bits, cv.enum(BITS_PER_SAMPLE)
         ),
         cv.Optional(CONF_USE_APLL, default=False): cv.boolean,
-        cv.Optional(CONF_I2S_MODE, default=CONF_PRIMARY): cv.enum(
-            I2S_MODE_OPTIONS, lower=True
-        ),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -113,7 +107,6 @@ async def to_code(config):
         cg.add(var.set_din_pin(config[CONF_I2S_DIN_PIN]))
         cg.add(var.set_pdm(config[CONF_PDM]))
 
-    cg.add(var.set_i2s_mode(config[CONF_I2S_MODE]))
     cg.add(var.set_channel(config[CONF_CHANNEL]))
     cg.add(var.set_sample_rate(config[CONF_SAMPLE_RATE]))
     cg.add(var.set_bits_per_sample(config[CONF_BITS_PER_SAMPLE]))

esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp

@@ -46,7 +46,7 @@ void I2SAudioMicrophone::start_() {
     return;  // Waiting for another i2s to return lock
   }
   i2s_driver_config_t config = {
-      .mode = (i2s_mode_t) (this->i2s_mode_ | I2S_MODE_RX),
+      .mode = (i2s_mode_t) (I2S_MODE_MASTER | I2S_MODE_RX),
       .sample_rate = this->sample_rate_,
       .bits_per_sample = this->bits_per_sample_,
       .channel_format = this->channel_,
@@ -174,7 +174,8 @@ size_t I2SAudioMicrophone::read(int16_t *buf, size_t len) {
     size_t samples_read = bytes_read / sizeof(int32_t);
     samples.resize(samples_read);
     for (size_t i = 0; i < samples_read; i++) {
-      samples[i] = reinterpret_cast<int32_t *>(buf)[i] >> 16;
+      int32_t temp = reinterpret_cast<int32_t *>(buf)[i] >> 14;
+      samples[i] = clamp<int16_t>(temp, INT16_MIN, INT16_MAX);
     }
     memcpy(buf, samples.data(), samples_read * sizeof(int16_t));
     return samples_read * sizeof(int16_t);

esphome/components/i2s_audio/microphone/i2s_audio_microphone.h

@@ -30,8 +30,6 @@ class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, pub
   }
 #endif
 
-  void set_i2s_mode(i2s_mode_t mode) { this->i2s_mode_ = mode; }
-
   void set_channel(i2s_channel_fmt_t channel) { this->channel_ = channel; }
   void set_sample_rate(uint32_t sample_rate) { this->sample_rate_ = sample_rate; }
   void set_bits_per_sample(i2s_bits_per_sample_t bits_per_sample) { this->bits_per_sample_ = bits_per_sample; }
@@ -48,7 +46,6 @@ class I2SAudioMicrophone : public I2SAudioIn, public microphone::Microphone, pub
   bool adc_{false};
 #endif
   bool pdm_{false};
-  i2s_mode_t i2s_mode_{};
   i2s_channel_fmt_t channel_;
   uint32_t sample_rate_;
   i2s_bits_per_sample_t bits_per_sample_;

esphome/components/improv_serial/improv_serial_component.cpp

@@ -57,7 +57,7 @@ optional<uint8_t> ImprovSerialComponent::read_byte_() {
         }
       }
       break;
-#if defined(USE_LOGGER_USB_CDC) && defined(CONFIG_ESP_CONSOLE_USB_CDC)
+#ifdef USE_LOGGER_USB_CDC
     case logger::UART_SELECTION_USB_CDC:
 #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
       if (esp_usb_console_available_for_read()) {
@@ -99,7 +99,7 @@ void ImprovSerialComponent::write_data_(std::vector<uint8_t> &data) {
 #endif  // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32S2 && !USE_ESP32_VARIANT_ESP32S3
       uart_write_bytes(this->uart_num_, data.data(), data.size());
       break;
-#if defined(USE_LOGGER_USB_CDC) && defined(CONFIG_ESP_CONSOLE_USB_CDC)
+#ifdef USE_LOGGER_USB_CDC
     case logger::UART_SELECTION_USB_CDC: {
       const char *msg = (char *) data.data();
       esp_usb_console_write_buf(msg, data.size());
@@ -109,7 +109,6 @@ void ImprovSerialComponent::write_data_(std::vector<uint8_t> &data) {
 #ifdef USE_LOGGER_USB_SERIAL_JTAG
     case logger::UART_SELECTION_USB_SERIAL_JTAG:
       usb_serial_jtag_write_bytes((char *) data.data(), data.size(), 20 / portTICK_PERIOD_MS);
-      delay(10);
       usb_serial_jtag_ll_txfifo_flush();  // fixes for issue in IDF 4.4.7
       break;
 #endif  // USE_LOGGER_USB_SERIAL_JTAG

esphome/components/ltr390/ltr390.cpp

@@ -19,7 +19,6 @@ static const uint8_t LTR390_MAIN_STATUS = 0x07;
 
 static const float GAINVALUES[5] = {1.0, 3.0, 6.0, 9.0, 18.0};
 static const float RESOLUTIONVALUE[6] = {4.0, 2.0, 1.0, 0.5, 0.25, 0.125};
-static const uint8_t RESOLUTION_BITS[6] = {20, 19, 18, 17, 16, 13};
 
 // Request fastest measurement rate - will be slowed by device if conversion rate is slower.
 static const float RESOLUTION_SETTING[6] = {0x00, 0x10, 0x20, 0x30, 0x40, 0x50};
@@ -75,7 +74,7 @@ void LTR390Component::read_als_() {
   uint32_t als = *val;
 
   if (this->light_sensor_ != nullptr) {
-    float lux = ((0.6 * als) / (GAINVALUES[this->gain_als_] * RESOLUTIONVALUE[this->res_als_])) * this->wfac_;
+    float lux = ((0.6 * als) / (GAINVALUES[this->gain_] * RESOLUTIONVALUE[this->res_])) * this->wfac_;
     this->light_sensor_->publish_state(lux);
   }
 
@@ -91,7 +90,7 @@ void LTR390Component::read_uvs_() {
   uint32_t uv = *val;
 
   if (this->uvi_sensor_ != nullptr) {
-    this->uvi_sensor_->publish_state((uv / this->sensitivity_uv_) * this->wfac_);
+    this->uvi_sensor_->publish_state((uv / this->sensitivity_) * this->wfac_);
   }
 
   if (this->uv_sensor_ != nullptr) {
@@ -108,38 +107,24 @@ void LTR390Component::read_mode_(int mode_index) {
   ctrl[LTR390_CTRL_EN] = true;
   this->reg(LTR390_MAIN_CTRL) = ctrl.to_ulong();
 
-  uint32_t int_time{0};
-  // Set gain, resolution and measurement rate
-  switch (mode) {
-    case LTR390_MODE_ALS:
-      this->reg(LTR390_GAIN) = this->gain_als_;
-      this->reg(LTR390_MEAS_RATE) = RESOLUTION_SETTING[this->res_als_];
-      int_time = ((uint32_t) RESOLUTIONVALUE[this->res_als_]) * 100;
-      break;
-    case LTR390_MODE_UVS:
-      this->reg(LTR390_GAIN) = this->gain_uv_;
-      this->reg(LTR390_MEAS_RATE) = RESOLUTION_SETTING[this->res_uv_];
-      int_time = ((uint32_t) RESOLUTIONVALUE[this->res_uv_]) * 100;
-      break;
-  }
-
   // After the sensor integration time do the following
-  this->set_timeout(int_time + LTR390_WAKEUP_TIME + LTR390_SETTLE_TIME, [this, mode_index]() {
-    // Read from the sensor
-    std::get<1>(this->mode_funcs_[mode_index])();
-
-    // If there are more modes to read then begin the next
-    // otherwise stop
-    if (mode_index + 1 < (int) this->mode_funcs_.size()) {
-      this->read_mode_(mode_index + 1);
-    } else {
-      // put sensor in standby
-      std::bitset<8> ctrl = this->reg(LTR390_MAIN_CTRL).get();
-      ctrl[LTR390_CTRL_EN] = false;
-      this->reg(LTR390_MAIN_CTRL) = ctrl.to_ulong();
-      this->reading_ = false;
-    }
-  });
+  this->set_timeout(((uint32_t) RESOLUTIONVALUE[this->res_]) * 100 + LTR390_WAKEUP_TIME + LTR390_SETTLE_TIME,
+                    [this, mode_index]() {
+                      // Read from the sensor
+                      std::get<1>(this->mode_funcs_[mode_index])();
+
+                      // If there are more modes to read then begin the next
+                      // otherwise stop
+                      if (mode_index + 1 < (int) this->mode_funcs_.size()) {
+                        this->read_mode_(mode_index + 1);
+                      } else {
+                        // put sensor in standby
+                        std::bitset<8> ctrl = this->reg(LTR390_MAIN_CTRL).get();
+                        ctrl[LTR390_CTRL_EN] = false;
+                        this->reg(LTR390_MAIN_CTRL) = ctrl.to_ulong();
+                        this->reading_ = false;
+                      }
+                    });
 }
 
 void LTR390Component::setup() {
@@ -166,10 +151,16 @@ void LTR390Component::setup() {
     return;
   }
 
+  // Set gain
+  this->reg(LTR390_GAIN) = gain_;
+
+  // Set resolution and measurement rate
+  this->reg(LTR390_MEAS_RATE) = RESOLUTION_SETTING[this->res_];
+
   // Set sensitivity by linearly scaling against known value in the datasheet
-  float gain_scale_uv = GAINVALUES[this->gain_uv_] / GAIN_MAX;
-  float intg_scale_uv = (RESOLUTIONVALUE[this->res_uv_] * 100) / INTG_MAX;
-  this->sensitivity_uv_ = SENSITIVITY_MAX * gain_scale_uv * intg_scale_uv;
+  float gain_scale = GAINVALUES[this->gain_] / GAIN_MAX;
+  float intg_scale = (RESOLUTIONVALUE[this->res_] * 100) / INTG_MAX;
+  this->sensitivity_ = SENSITIVITY_MAX * gain_scale * intg_scale;
 
   // Set sensor read state
   this->reading_ = false;
@@ -185,13 +176,7 @@ void LTR390Component::setup() {
   }
 }
 
-void LTR390Component::dump_config() {
-  LOG_I2C_DEVICE(this);
-  ESP_LOGCONFIG(TAG, "  ALS Gain: X%.0f", GAINVALUES[this->gain_als_]);
-  ESP_LOGCONFIG(TAG, "  ALS Resolution: %u-bit", RESOLUTION_BITS[this->res_als_]);
-  ESP_LOGCONFIG(TAG, "  UV Gain: X%.0f", GAINVALUES[this->gain_uv_]);
-  ESP_LOGCONFIG(TAG, "  UV Resolution: %u-bit", RESOLUTION_BITS[this->res_uv_]);
-}
+void LTR390Component::dump_config() { LOG_I2C_DEVICE(this); }
 
 void LTR390Component::update() {
   if (!this->reading_ && !mode_funcs_.empty()) {

esphome/components/ltr390/ltr390.h

@@ -49,10 +49,8 @@ class LTR390Component : public PollingComponent, public i2c::I2CDevice {
   void dump_config() override;
   void update() override;
 
-  void set_als_gain_value(LTR390GAIN gain) { this->gain_als_ = gain; }
-  void set_uv_gain_value(LTR390GAIN gain) { this->gain_uv_ = gain; }
-  void set_als_res_value(LTR390RESOLUTION res) { this->res_als_ = res; }
-  void set_uv_res_value(LTR390RESOLUTION res) { this->res_uv_ = res; }
+  void set_gain_value(LTR390GAIN gain) { this->gain_ = gain; }
+  void set_res_value(LTR390RESOLUTION res) { this->res_ = res; }
   void set_wfac_value(float wfac) { this->wfac_ = wfac; }
 
   void set_light_sensor(sensor::Sensor *light_sensor) { this->light_sensor_ = light_sensor; }
@@ -73,11 +71,9 @@ class LTR390Component : public PollingComponent, public i2c::I2CDevice {
   // a list of modes and corresponding read functions
   std::vector<std::tuple<LTR390MODE, std::function<void()>>> mode_funcs_;
 
-  LTR390GAIN gain_als_;
-  LTR390GAIN gain_uv_;
-  LTR390RESOLUTION res_als_;
-  LTR390RESOLUTION res_uv_;
-  float sensitivity_uv_;
+  LTR390GAIN gain_;
+  LTR390RESOLUTION res_;
+  float sensitivity_;
   float wfac_;
 
   sensor::Sensor *light_sensor_{nullptr};

esphome/components/ltr390/sensor.py

@@ -13,7 +13,7 @@ from esphome.const import (
     UNIT_LUX,
 )
 
-CODEOWNERS = ["@sjtrny", "@latonita"]
+CODEOWNERS = ["@sjtrny"]
 DEPENDENCIES = ["i2c"]
 
 ltr390_ns = cg.esphome_ns.namespace("ltr390")
@@ -76,24 +76,8 @@ CONFIG_SCHEMA = cv.All(
                 accuracy_decimals=1,
                 device_class=DEVICE_CLASS_EMPTY,
             ),
-            cv.Optional(CONF_GAIN, default="X18"): cv.Any(
-                cv.enum(GAIN_OPTIONS),
-                cv.Schema(
-                    {
-                        cv.Required(CONF_AMBIENT_LIGHT): cv.enum(GAIN_OPTIONS),
-                        cv.Required(CONF_UV): cv.enum(GAIN_OPTIONS),
-                    }
-                ),
-            ),
-            cv.Optional(CONF_RESOLUTION, default=20): cv.Any(
-                cv.enum(RES_OPTIONS),
-                cv.Schema(
-                    {
-                        cv.Required(CONF_AMBIENT_LIGHT): cv.enum(RES_OPTIONS),
-                        cv.Required(CONF_UV): cv.enum(RES_OPTIONS),
-                    }
-                ),
-            ),
+            cv.Optional(CONF_GAIN, default="X18"): cv.enum(GAIN_OPTIONS),
+            cv.Optional(CONF_RESOLUTION, default=20): cv.enum(RES_OPTIONS),
             cv.Optional(CONF_WINDOW_CORRECTION_FACTOR, default=1.0): cv.float_range(
                 min=1.0
             ),
@@ -117,25 +101,11 @@ async def to_code(config):
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
+    cg.add(var.set_gain_value(config[CONF_GAIN]))
+    cg.add(var.set_res_value(config[CONF_RESOLUTION]))
     cg.add(var.set_wfac_value(config[CONF_WINDOW_CORRECTION_FACTOR]))
 
     for key, funcName in TYPES.items():
         if key in config:
             sens = await sensor.new_sensor(config[key])
             cg.add(getattr(var, funcName)(sens))
-
-    gain_value = config[CONF_GAIN]
-    if isinstance(gain_value, dict):
-        cg.add(var.set_als_gain_value(gain_value[CONF_AMBIENT_LIGHT]))
-        cg.add(var.set_uv_gain_value(gain_value[CONF_UV]))
-    else:
-        cg.add(var.set_als_gain_value(gain_value))
-        cg.add(var.set_uv_gain_value(gain_value))
-
-    res_value = config[CONF_RESOLUTION]
-    if isinstance(res_value, dict):
-        cg.add(var.set_als_res_value(res_value[CONF_AMBIENT_LIGHT]))
-        cg.add(var.set_uv_res_value(res_value[CONF_UV]))
-    else:
-        cg.add(var.set_als_res_value(res_value))
-        cg.add(var.set_uv_res_value(res_value))

esphome/components/micro_wake_word/__init__.py

@@ -357,9 +357,7 @@ CONFIG_SCHEMA = cv.All(
         {
             cv.GenerateID(): cv.declare_id(MicroWakeWord),
             cv.GenerateID(CONF_MICROPHONE): cv.use_id(microphone.Microphone),
-            cv.Required(CONF_MODELS): cv.ensure_list(
-                cv.maybe_simple_value(MODEL_SCHEMA, key=CONF_MODEL)
-            ),
+            cv.Required(CONF_MODELS): cv.ensure_list(MODEL_SCHEMA),
             cv.Optional(CONF_ON_WAKE_WORD_DETECTED): automation.validate_automation(
                 single=True
             ),

esphome/components/mitsubishi/mitsubishi.cpp

@@ -52,7 +52,6 @@ const uint8_t MITSUBISHI_BYTE16 = 0X00;
 
 climate::ClimateTraits MitsubishiClimate::traits() {
   auto traits = climate::ClimateTraits();
-  traits.set_supports_current_temperature(this->sensor_ != nullptr);
   traits.set_supports_action(false);
   traits.set_visual_min_temperature(MITSUBISHI_TEMP_MIN);
   traits.set_visual_max_temperature(MITSUBISHI_TEMP_MAX);