Merge pull request #7034 from esphome/bump-2024.6.5

2024.6.5

esphome/components/bme680_bsec/__init__.py

@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import i2c, esp32
-from esphome.const import CONF_ID, CONF_TEMPERATURE_OFFSET
+from esphome.const import CONF_ID, CONF_SAMPLE_RATE, CONF_TEMPERATURE_OFFSET
 
 CODEOWNERS = ["@trvrnrth"]
 DEPENDENCIES = ["i2c"]
@@ -11,7 +11,6 @@ MULTI_CONF = True
 CONF_BME680_BSEC_ID = "bme680_bsec_id"
 CONF_IAQ_MODE = "iaq_mode"
 CONF_SUPPLY_VOLTAGE = "supply_voltage"
-CONF_SAMPLE_RATE = "sample_rate"
 CONF_STATE_SAVE_INTERVAL = "state_save_interval"
 
 bme680_bsec_ns = cg.esphome_ns.namespace("bme680_bsec")

esphome/components/bme680_bsec/sensor.py

@@ -4,33 +4,33 @@ from esphome.components import sensor
 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_CARBON_DIOXIDE,
     DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-    DEVICE_CLASS_ATMOSPHERIC_PRESSURE,
     DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+    ICON_GAS_CYLINDER,
+    ICON_GAUGE,
     STATE_CLASS_MEASUREMENT,
     UNIT_CELSIUS,
     UNIT_HECTOPASCAL,
     UNIT_OHM,
     UNIT_PARTS_PER_MILLION,
     UNIT_PERCENT,
-    ICON_GAS_CYLINDER,
-    ICON_GAUGE,
 )
 from . import (
     BME680BSECComponent,
     CONF_BME680_BSEC_ID,
-    CONF_SAMPLE_RATE,
     SAMPLE_RATE_OPTIONS,
 )
 
 DEPENDENCIES = ["bme680_bsec"]
 
 CONF_IAQ = "iaq"
-CONF_IAQ_ACCURACY = "iaq_accuracy"
 CONF_CO2_EQUIVALENT = "co2_equivalent"
 CONF_BREATH_VOC_EQUIVALENT = "breath_voc_equivalent"
 UNIT_IAQ = "IAQ"

esphome/components/bme680_bsec/text_sensor.py

@@ -1,11 +1,11 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import text_sensor
+from esphome.const import CONF_IAQ_ACCURACY
 from . import BME680BSECComponent, CONF_BME680_BSEC_ID
 
 DEPENDENCIES = ["bme680_bsec"]
 
-CONF_IAQ_ACCURACY = "iaq_accuracy"
 ICON_ACCURACY = "mdi:checkbox-marked-circle-outline"
 
 TYPES = [CONF_IAQ_ACCURACY]

esphome/components/esphome/ota/__init__.py

@@ -1,7 +1,10 @@
+import logging
+
 import esphome.codegen as cg
 import esphome.config_validation as cv
 import esphome.final_validate as fv
 from esphome.components.ota import BASE_OTA_SCHEMA, ota_to_code, OTAComponent
+from esphome.config_helpers import merge_config
 from esphome.const import (
     CONF_ESPHOME,
     CONF_ID,
@@ -16,6 +19,8 @@ from esphome.const import (
 )
 from esphome.core import coroutine_with_priority
 
+_LOGGER = logging.getLogger(__name__)
+
 
 CODEOWNERS = ["@esphome/core"]
 AUTO_LOAD = ["md5", "socket"]
@@ -26,16 +31,62 @@ ESPHomeOTAComponent = esphome.class_("ESPHomeOTAComponent", OTAComponent)
 
 
 def ota_esphome_final_validate(config):
-    fconf = fv.full_config.get()[CONF_OTA]
-    used_ports = []
-    for ota_conf in fconf:
+    full_conf = fv.full_config.get()
+    full_ota_conf = full_conf[CONF_OTA]
+    new_ota_conf = []
+    merged_ota_esphome_configs_by_port = {}
+    ports_with_merged_configs = []
+    for ota_conf in full_ota_conf:
         if ota_conf.get(CONF_PLATFORM) == CONF_ESPHOME:
-            if (plat_port := ota_conf.get(CONF_PORT)) not in used_ports:
-                used_ports.append(plat_port)
+            if (
+                conf_port := ota_conf.get(CONF_PORT)
+            ) not in merged_ota_esphome_configs_by_port:
+                merged_ota_esphome_configs_by_port[conf_port] = ota_conf
             else:
-                raise cv.Invalid(
-                    f"Only one instance of the {CONF_ESPHOME} {CONF_OTA} {CONF_PLATFORM} is allowed per port. Note that this error may result from OTA specified in packages"
+                if merged_ota_esphome_configs_by_port[conf_port][
+                    CONF_VERSION
+                ] != ota_conf.get(CONF_VERSION):
+                    raise cv.Invalid(
+                        f"Found multiple configurations but {CONF_VERSION} is inconsistent"
+                    )
+                if (
+                    merged_ota_esphome_configs_by_port[conf_port][CONF_ID].is_manual
+                    and ota_conf.get(CONF_ID).is_manual
+                ):
+                    raise cv.Invalid(
+                        f"Found multiple configurations but {CONF_ID} is inconsistent"
+                    )
+                if (
+                    CONF_PASSWORD in merged_ota_esphome_configs_by_port[conf_port]
+                    and CONF_PASSWORD in ota_conf
+                    and merged_ota_esphome_configs_by_port[conf_port][CONF_PASSWORD]
+                    != ota_conf.get(CONF_PASSWORD)
+                ):
+                    raise cv.Invalid(
+                        f"Found multiple configurations but {CONF_PASSWORD} is inconsistent"
+                    )
+
+                ports_with_merged_configs.append(conf_port)
+                merged_ota_esphome_configs_by_port[conf_port] = merge_config(
+                    merged_ota_esphome_configs_by_port[conf_port], ota_conf
                 )
+        else:
+            new_ota_conf.append(ota_conf)
+
+    for port_conf in merged_ota_esphome_configs_by_port.values():
+        new_ota_conf.append(port_conf)
+
+    full_conf[CONF_OTA] = new_ota_conf
+    fv.full_config.set(full_conf)
+
+    if len(ports_with_merged_configs) > 0:
+        _LOGGER.warning(
+            "Found and merged multiple configurations for %s %s %s port(s) %s",
+            CONF_OTA,
+            CONF_PLATFORM,
+            CONF_ESPHOME,
+            ports_with_merged_configs,
+        )
 
 
 CONFIG_SCHEMA = (

esphome/components/i2s_audio/microphone/__init__.py

@@ -2,7 +2,7 @@ import esphome.config_validation as cv
 import esphome.codegen as cg
 
 from esphome import pins
-from esphome.const import CONF_CHANNEL, CONF_ID, CONF_NUMBER
+from esphome.const import CONF_CHANNEL, CONF_ID, CONF_NUMBER, CONF_SAMPLE_RATE
 from esphome.components import microphone, esp32
 from esphome.components.adc import ESP32_VARIANT_ADC1_PIN_TO_CHANNEL, validate_adc_pin
 
@@ -20,7 +20,6 @@ DEPENDENCIES = ["i2s_audio"]
 CONF_ADC_PIN = "adc_pin"
 CONF_ADC_TYPE = "adc_type"
 CONF_PDM = "pdm"
-CONF_SAMPLE_RATE = "sample_rate"
 CONF_BITS_PER_SAMPLE = "bits_per_sample"
 CONF_USE_APLL = "use_apll"
 

esphome/components/ledc/ledc_output.cpp

@@ -115,12 +115,15 @@ void LEDCOutput::write_state(float state) {
   const uint32_t max_duty = (uint32_t(1) << this->bit_depth_) - 1;
   const float duty_rounded = roundf(state * max_duty);
   auto duty = static_cast<uint32_t>(duty_rounded);
-
 #ifdef USE_ARDUINO
   ESP_LOGV(TAG, "Setting duty: %u on channel %u", duty, this->channel_);
   ledcWrite(this->channel_, duty);
 #endif
 #ifdef USE_ESP_IDF
+  // ensure that 100% on is not 99.975% on
+  if ((duty == max_duty) && (max_duty != 1)) {
+    duty = max_duty + 1;
+  }
   auto speed_mode = get_speed_mode(channel_);
   auto chan_num = static_cast<ledc_channel_t>(channel_ % 8);
   int hpoint = ledc_angle_to_htop(this->phase_angle_, this->bit_depth_);

esphome/components/mpr121/binary_sensor/__init__.py

@@ -27,7 +27,7 @@ async def to_code(config):
     var = await binary_sensor.new_binary_sensor(config)
     hub = await cg.get_variable(config[CONF_MPR121_ID])
     cg.add(var.set_channel(config[CONF_CHANNEL]))
-    cg.register_parented(var, hub)
+    await cg.register_parented(var, hub)
 
     if CONF_TOUCH_THRESHOLD in config:
         cg.add(var.set_touch_threshold(config[CONF_TOUCH_THRESHOLD]))

esphome/components/wifi/__init__.py

@@ -114,7 +114,7 @@ EAP_AUTH_SCHEMA = cv.All(
             cv.Optional(CONF_USERNAME): cv.string_strict,
             cv.Optional(CONF_PASSWORD): cv.string_strict,
             cv.Optional(CONF_CERTIFICATE_AUTHORITY): wpa2_eap.validate_certificate,
-            cv.Optional(CONF_TTLS_PHASE_2): cv.All(
+            cv.SplitDefault(CONF_TTLS_PHASE_2, esp32_idf="mschapv2"): cv.All(
                 cv.enum(TTLS_PHASE_2), cv.only_with_esp_idf
             ),
             cv.Inclusive(
@@ -350,7 +350,7 @@ def eap_auth(config):
         ("ca_cert", ca_cert),
         ("client_cert", client_cert),
         ("client_key", key),
-        ("ttls_phase_2", config.get(CONF_TTLS_PHASE_2, TTLS_PHASE_2["mschapv2"])),
+        ("ttls_phase_2", config.get(CONF_TTLS_PHASE_2)),
     )
 
 

esphome/const.py

@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2024.6.3"
+__version__ = "2024.6.5"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (
@@ -355,6 +355,7 @@ CONF_HUMIDITY_SENSOR = "humidity_sensor"
 CONF_HYSTERESIS = "hysteresis"
 CONF_I2C = "i2c"
 CONF_I2C_ID = "i2c_id"
+CONF_IAQ_ACCURACY = "iaq_accuracy"
 CONF_IBEACON_MAJOR = "ibeacon_major"
 CONF_IBEACON_MINOR = "ibeacon_minor"
 CONF_IBEACON_UUID = "ibeacon_uuid"
@@ -719,6 +720,7 @@ CONF_RX_BUFFER_SIZE = "rx_buffer_size"
 CONF_RX_ONLY = "rx_only"
 CONF_RX_PIN = "rx_pin"
 CONF_SAFE_MODE = "safe_mode"
+CONF_SAMPLE_RATE = "sample_rate"
 CONF_SAMSUNG = "samsung"
 CONF_SATELLITES = "satellites"
 CONF_SCAN = "scan"

tests/components/wifi/test-eap.esp32-ard.yaml

@@ -0,0 +1,7 @@
+wifi:
+  networks:
+    - ssid: MySSID
+      eap:
+        username: username
+        password: password
+        identity: identity