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

esphome/components/image/__init__.py

@@ -6,7 +6,6 @@ import hashlib
 import io
 from pathlib import Path
 import re
-import requests
 from magic import Magic
 
 from esphome import core
@@ -15,7 +14,6 @@ from esphome import external_files
 import esphome.config_validation as cv
 import esphome.codegen as cg
 from esphome.const import (
-    __version__,
     CONF_DITHER,
     CONF_FILE,
     CONF_ICON,
@@ -75,31 +73,6 @@ def compute_local_image_path(value: dict) -> Path:
     return base_dir / key
 
 
-def download_content(url: str, path: Path) -> None:
-    if not external_files.has_remote_file_changed(url, path):
-        _LOGGER.debug("Remote file has not changed %s", url)
-        return
-
-    _LOGGER.debug(
-        "Remote file has changed, downloading from %s to %s",
-        url,
-        path,
-    )
-
-    try:
-        req = requests.get(
-            url,
-            timeout=IMAGE_DOWNLOAD_TIMEOUT,
-            headers={"User-agent": f"ESPHome/{__version__} (https://esphome.io)"},
-        )
-        req.raise_for_status()
-    except requests.exceptions.RequestException as e:
-        raise cv.Invalid(f"Could not download from {url}: {e}")
-
-    path.parent.mkdir(parents=True, exist_ok=True)
-    path.write_bytes(req.content)
-
-
 def download_mdi(value):
     validate_cairosvg_installed(value)
 
@@ -108,7 +81,7 @@ def download_mdi(value):
 
     url = f"https://raw.githubusercontent.com/Templarian/MaterialDesign/master/svg/{mdi_id}.svg"
 
-    download_content(url, path)
+    external_files.download_content(url, path, IMAGE_DOWNLOAD_TIMEOUT)
 
     return value
 
@@ -117,7 +90,7 @@ def download_image(value):
     url = value[CONF_URL]
     path = compute_local_image_path(value)
 
-    download_content(url, path)
+    external_files.download_content(url, path, IMAGE_DOWNLOAD_TIMEOUT)
 
     return value
 

esphome/components/improv_serial/improv_serial_component.cpp

@@ -57,7 +57,7 @@ optional<uint8_t> ImprovSerialComponent::read_byte_() {
         }
       }
       break;
-#if defined(CONFIG_ESP_CONSOLE_USB_CDC) && (defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
+#if defined(USE_LOGGER_USB_CDC) && defined(CONFIG_ESP_CONSOLE_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()) {
@@ -68,15 +68,15 @@ optional<uint8_t> ImprovSerialComponent::read_byte_() {
         byte = data;
       }
       break;
-#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
-#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3)
+#endif  // USE_LOGGER_USB_CDC
+#ifdef USE_LOGGER_USB_SERIAL_JTAG
     case logger::UART_SELECTION_USB_SERIAL_JTAG: {
       if (usb_serial_jtag_read_bytes((char *) &data, 1, 0)) {
         byte = data;
       }
       break;
     }
-#endif  // USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C6 || USE_ESP32_VARIANT_ESP32S3
+#endif  // USE_LOGGER_USB_SERIAL_JTAG
     default:
       break;
   }
@@ -99,19 +99,20 @@ 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(CONFIG_ESP_CONSOLE_USB_CDC) && (defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
+#if defined(USE_LOGGER_USB_CDC) && defined(CONFIG_ESP_CONSOLE_USB_CDC)
     case logger::UART_SELECTION_USB_CDC: {
       const char *msg = (char *) data.data();
       esp_usb_console_write_buf(msg, data.size());
       break;
     }
-#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
-#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3)
+#endif  // USE_LOGGER_USB_CDC
+#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_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32S3
+#endif  // USE_LOGGER_USB_SERIAL_JTAG
     default:
       break;
   }

esphome/components/ltr390/ltr390.cpp

@@ -19,6 +19,7 @@ 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};
@@ -74,7 +75,7 @@ void LTR390Component::read_als_() {
   uint32_t als = *val;
 
   if (this->light_sensor_ != nullptr) {
-    float lux = ((0.6 * als) / (GAINVALUES[this->gain_] * RESOLUTIONVALUE[this->res_])) * this->wfac_;
+    float lux = ((0.6 * als) / (GAINVALUES[this->gain_als_] * RESOLUTIONVALUE[this->res_als_])) * this->wfac_;
     this->light_sensor_->publish_state(lux);
   }
 
@@ -90,7 +91,7 @@ void LTR390Component::read_uvs_() {
   uint32_t uv = *val;
 
   if (this->uvi_sensor_ != nullptr) {
-    this->uvi_sensor_->publish_state((uv / this->sensitivity_) * this->wfac_);
+    this->uvi_sensor_->publish_state((uv / this->sensitivity_uv_) * this->wfac_);
   }
 
   if (this->uv_sensor_ != nullptr) {
@@ -107,24 +108,38 @@ 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(((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;
-                      }
-                    });
+  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;
+    }
+  });
 }
 
 void LTR390Component::setup() {
@@ -151,16 +166,10 @@ 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 = GAINVALUES[this->gain_] / GAIN_MAX;
-  float intg_scale = (RESOLUTIONVALUE[this->res_] * 100) / INTG_MAX;
-  this->sensitivity_ = SENSITIVITY_MAX * gain_scale * intg_scale;
+  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;
 
   // Set sensor read state
   this->reading_ = false;
@@ -176,7 +185,13 @@ void LTR390Component::setup() {
   }
 }
 
-void LTR390Component::dump_config() { LOG_I2C_DEVICE(this); }
+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::update() {
   if (!this->reading_ && !mode_funcs_.empty()) {

esphome/components/ltr390/ltr390.h

@@ -49,8 +49,10 @@ class LTR390Component : public PollingComponent, public i2c::I2CDevice {
   void dump_config() override;
   void update() override;
 
-  void set_gain_value(LTR390GAIN gain) { this->gain_ = gain; }
-  void set_res_value(LTR390RESOLUTION res) { this->res_ = res; }
+  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_wfac_value(float wfac) { this->wfac_ = wfac; }
 
   void set_light_sensor(sensor::Sensor *light_sensor) { this->light_sensor_ = light_sensor; }
@@ -71,9 +73,11 @@ 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_;
-  LTR390RESOLUTION res_;
-  float sensitivity_;
+  LTR390GAIN gain_als_;
+  LTR390GAIN gain_uv_;
+  LTR390RESOLUTION res_als_;
+  LTR390RESOLUTION res_uv_;
+  float sensitivity_uv_;
   float wfac_;
 
   sensor::Sensor *light_sensor_{nullptr};

esphome/components/ltr390/sensor.py

@@ -13,7 +13,7 @@ from esphome.const import (
     UNIT_LUX,
 )
 
-CODEOWNERS = ["@sjtrny"]
+CODEOWNERS = ["@sjtrny", "@latonita"]
 DEPENDENCIES = ["i2c"]
 
 ltr390_ns = cg.esphome_ns.namespace("ltr390")
@@ -76,8 +76,24 @@ CONFIG_SCHEMA = cv.All(
                 accuracy_decimals=1,
                 device_class=DEVICE_CLASS_EMPTY,
             ),
-            cv.Optional(CONF_GAIN, default="X18"): cv.enum(GAIN_OPTIONS),
-            cv.Optional(CONF_RESOLUTION, default=20): cv.enum(RES_OPTIONS),
+            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_WINDOW_CORRECTION_FACTOR, default=1.0): cv.float_range(
                 min=1.0
             ),
@@ -101,11 +117,25 @@ 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/mdns/__init__.py

@@ -74,6 +74,9 @@ def mdns_service(
 
 @coroutine_with_priority(55.0)
 async def to_code(config):
+    if config[CONF_DISABLED] is True:
+        return
+
     if CORE.using_arduino:
         if CORE.is_esp32:
             cg.add_library("ESPmDNS", None)
@@ -92,9 +95,6 @@ async def to_code(config):
             path="components/mdns",
         )
 
-    if config[CONF_DISABLED]:
-        return
-
     cg.add_define("USE_MDNS")
 
     var = cg.new_Pvariable(config[CONF_ID])

esphome/components/mdns/mdns_component.cpp

@@ -1,5 +1,6 @@
-#include "mdns_component.h"
 #include "esphome/core/defines.h"
+#ifdef USE_MDNS
+#include "mdns_component.h"
 #include "esphome/core/version.h"
 #include "esphome/core/application.h"
 #include "esphome/core/log.h"
@@ -125,3 +126,4 @@ void MDNSComponent::dump_config() {
 
 }  // namespace mdns
 }  // namespace esphome
+#endif

esphome/components/mdns/mdns_component.h

@@ -1,5 +1,6 @@
 #pragma once
-
+#include "esphome/core/defines.h"
+#ifdef USE_MDNS
 #include <string>
 #include <vector>
 #include "esphome/core/component.h"
@@ -46,3 +47,4 @@ class MDNSComponent : public Component {
 
 }  // namespace mdns
 }  // namespace esphome
+#endif

esphome/components/mdns/mdns_esp32.cpp

@@ -1,4 +1,5 @@
-#ifdef USE_ESP32
+#include "esphome/core/defines.h"
+#if defined(USE_ESP32) && defined(USE_MDNS)
 
 #include <mdns.h>
 #include <cstring>

esphome/components/mdns/mdns_esp8266.cpp

@@ -1,4 +1,5 @@
-#if defined(USE_ESP8266) && defined(USE_ARDUINO)
+#include "esphome/core/defines.h"
+#if defined(USE_ESP8266) && defined(USE_ARDUINO) && defined(USE_MDNS)
 
 #include <ESP8266mDNS.h>
 #include "esphome/components/network/ip_address.h"

esphome/components/mdns/mdns_host.cpp

@@ -1,4 +1,5 @@
-#ifdef USE_HOST
+#include "esphome/core/defines.h"
+#if defined(USE_HOST) && defined(USE_MDNS)
 
 #include "esphome/components/network/ip_address.h"
 #include "esphome/components/network/util.h"

esphome/components/mdns/mdns_libretiny.cpp

@@ -1,4 +1,5 @@
-#ifdef USE_LIBRETINY
+#include "esphome/core/defines.h"
+#if defined(USE_LIBRETINY) && defined(USE_MDNS)
 
 #include "esphome/components/network/ip_address.h"
 #include "esphome/components/network/util.h"

esphome/components/mdns/mdns_rp2040.cpp

@@ -1,4 +1,5 @@
-#ifdef USE_RP2040
+#include "esphome/core/defines.h"
+#if defined(USE_RP2040) && defined(USE_MDNS)
 
 #include "esphome/components/network/ip_address.h"
 #include "esphome/components/network/util.h"