Merge remote-tracking branch 'upstream/dev' into integration

esphome/__main__.py

@@ -416,9 +416,7 @@ def upload_program(
             exit_code = upload_using_esptool(config, host, file, args.upload_speed)
         elif CORE.target_platform == PLATFORM_RP2040 or CORE.is_libretiny:
             exit_code = upload_using_platformio(config, host)
-        else:
+        # else: Unknown target platform, exit_code remains 1
-            # Unknown target platform
-            pass
 
         return exit_code, host if exit_code == 0 else None
 
@@ -561,7 +559,7 @@ def command_upload(args: ArgsProtocol, config: ConfigType) -> int | None:
         purpose="uploading",
     )
 
-    exit_code, successful_device = upload_program(config, args, devices)
+    exit_code, _ = upload_program(config, args, devices)
     if exit_code == 0:
         _LOGGER.info("Successfully uploaded program.")
     else:

esphome/components/i2s_audio/__init__.py

@@ -4,6 +4,9 @@ from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant
 from esphome.components.esp32.const import (
     VARIANT_ESP32,
     VARIANT_ESP32C3,
+    VARIANT_ESP32C5,
+    VARIANT_ESP32C6,
+    VARIANT_ESP32H2,
     VARIANT_ESP32P4,
     VARIANT_ESP32S2,
     VARIANT_ESP32S3,
@@ -62,12 +65,15 @@ I2S_ROLE_OPTIONS = {
     CONF_SECONDARY: i2s_role_t.I2S_ROLE_SLAVE,  # NOLINT
 }
 
-# https://github.com/espressif/esp-idf/blob/master/components/soc/{variant}/include/soc/soc_caps.h
+# https://github.com/espressif/esp-idf/blob/master/components/soc/{variant}/include/soc/soc_caps.h (SOC_I2S_NUM)
 I2S_PORTS = {
     VARIANT_ESP32: 2,
     VARIANT_ESP32S2: 1,
     VARIANT_ESP32S3: 2,
     VARIANT_ESP32C3: 1,
+    VARIANT_ESP32C5: 1,
+    VARIANT_ESP32C6: 1,
+    VARIANT_ESP32H2: 1,
     VARIANT_ESP32P4: 3,
 }
 

esphome/components/light/light_state.h

@@ -12,6 +12,7 @@
 #include "light_transformer.h"
 
 #include <vector>
+#include <strings.h>
 
 namespace esphome {
 namespace light {

tests/components/light/test.nrf52-adafruit.yaml

@@ -0,0 +1,19 @@
+esphome:
+  on_boot:
+    then:
+      - light.toggle: test_binary_light
+
+output:
+  - platform: gpio
+    id: test_binary
+    pin: 0
+
+light:
+  - platform: binary
+    id: test_binary_light
+    name: Binary Light
+    output: test_binary
+    effects:
+      - strobe:
+    on_state:
+      - logger.log: Binary light state changed

tests/components/light/test.nrf52-mcumgr.yaml

@@ -0,0 +1,19 @@
+esphome:
+  on_boot:
+    then:
+      - light.toggle: test_binary_light
+
+output:
+  - platform: gpio
+    id: test_binary
+    pin: 0
+
+light:
+  - platform: binary
+    id: test_binary_light
+    name: Binary Light
+    output: test_binary
+    effects:
+      - strobe:
+    on_state:
+      - logger.log: Binary light state changed