Merge branch 'codspeed-benchmarks' into scheduler-process-to-add-fast-path

esphome/components/bme68x_bsec2/__init__.py

@@ -186,8 +186,8 @@ async def to_code_base(config):
         cg.add_library("SPI", None)
     cg.add_library(
         "BME68x Sensor library",
-        "1.3.40408",
-        "https://github.com/boschsensortec/Bosch-BME68x-Library",
+        None,
+        "https://github.com/boschsensortec/Bosch-BME68x-Library#v1.3.40408",
     )
     cg.add_library(
         "BSEC2 Software Library",

esphome/components/ethernet/ethernet_component.h

@@ -85,7 +85,7 @@ enum eth_duplex_t { ETH_DUPLEX_HALF, ETH_DUPLEX_FULL };
 enum eth_speed_t { ETH_SPEED_10M, ETH_SPEED_100M };
 #endif
 
-class EthernetComponent : public Component {
+class EthernetComponent final : public Component {
  public:
   EthernetComponent();
   void setup() override;

script/clang-tidy

@@ -231,6 +231,9 @@ def main():
 
     cwd = os.getcwd()
     files = [os.path.relpath(path, cwd) for path in git_ls_files(["*.cpp"])]
+    # Exclude benchmark files — they require google benchmark headers not
+    # available in the ESP32 toolchain and use different naming conventions.
+    files = [f for f in files if not f.startswith("tests/benchmarks/")]
 
     # Print initial file count if it's large
     if len(files) > 50:

script/merge_component_configs.py

@@ -384,7 +384,7 @@ def merge_component_configs(
     # Write merged config
     output_file.parent.mkdir(parents=True, exist_ok=True)
     yaml_content = yaml_util.dump(merged_config_data)
-    output_file.write_text(yaml_content)
+    output_file.write_text(yaml_content, encoding="utf-8")
 
     print(f"Successfully merged {len(component_names)} components into {output_file}")
 

tests/components/microphone/common.yaml

@@ -6,7 +6,7 @@ i2s_audio:
 microphone:
   - platform: i2s_audio
     id: mic_id_external
-    i2s_din_pin: ${i2s_din_pin}
+    i2s_din_pin: ${i2s_din_pin1}
     adc_type: external
     pdm: false
     mclk_multiple: 384
@@ -15,7 +15,15 @@ microphone:
       - if:
           condition:
             - microphone.is_muted:
+                id: mic_id_external
           then:
             - microphone.unmute:
+                id: mic_id_external
           else:
             - microphone.mute:
+                id: mic_id_external
+  - platform: i2s_audio
+    id: mic_id_pdm
+    i2s_din_pin: ${i2s_din_pin2}
+    adc_type: external
+    pdm: true

tests/components/microphone/test.esp32-idf.yaml

@@ -2,21 +2,7 @@ substitutions:
   i2s_bclk_pin: GPIO15
   i2s_lrclk_pin: GPIO4
   i2s_mclk_pin: GPIO5
-  i2s_din_pin: GPIO33
+  i2s_din_pin1: GPIO33
+  i2s_din_pin2: GPIO34
 
-i2s_audio:
-  i2s_bclk_pin: ${i2s_bclk_pin}
-  i2s_lrclk_pin: ${i2s_lrclk_pin}
-  i2s_mclk_pin: ${i2s_mclk_pin}
-  use_legacy: true
-
-microphone:
-  - platform: i2s_audio
-    id: mic_id_external
-    i2s_din_pin: ${i2s_din_pin}
-    adc_type: external
-    pdm: false
-  - platform: i2s_audio
-    id: mic_id_adc
-    adc_pin: 32
-    adc_type: internal
+<<: !include common.yaml