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

2025-10-12 14:53:49 +01:00 · 2025-10-09 11:42:38 -10:00
parent e36f01cda6 a74fcbc8b6
commit 9553781d74
6 changed files with 0 additions and 23 deletions
--- a/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
+++ b/esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
@@ -14,10 +14,6 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"

-#ifdef USE_ARDUINO
-#include <esp32-hal-bt.h>
-#endif
-
 namespace esphome {
 namespace esp32_ble_beacon {

--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -25,10 +25,6 @@
 #include <esp_coexist.h>
 #endif

-#ifdef USE_ARDUINO
-#include <esp32-hal-bt.h>
-#endif
-
 #define MBEDTLS_AES_ALT
 #include <aes_alt.h>

--- a/tests/components/esp32_ble_beacon/test.esp32-ard.yaml
+++ b/tests/components/esp32_ble_beacon/test.esp32-ard.yaml
@@ -1 +0,0 @@
-<<: !include common.yaml
--- a/tests/components/esp32_ble_beacon/test.esp32-c3-ard.yaml
+++ b/tests/components/esp32_ble_beacon/test.esp32-c3-ard.yaml
@@ -1 +0,0 @@
-<<: !include common.yaml
--- a/tests/components/esp32_ble_tracker/test.esp32-ard.yaml
+++ b/tests/components/esp32_ble_tracker/test.esp32-ard.yaml
@@ -1,8 +0,0 @@
-packages:
-  ble: !include ../../test_build_components/common/ble/esp32-ard.yaml
-
-<<: !include common.yaml
-
-esp32_ble_tracker:
-  software_coexistence: true
-  max_connections: 3
--- a/tests/components/esp32_ble_tracker/test.esp32-c3-ard.yaml
+++ b/tests/components/esp32_ble_tracker/test.esp32-c3-ard.yaml
@@ -1,5 +0,0 @@
-<<: !include common.yaml
-
-esp32_ble_tracker:
-  max_connections: 3
-  software_coexistence: false