sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-11 22:33:49 +01:00
Code Issues Releases Wiki Activity

Merge branch 'esp32_remove_esp32_ard_apis' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-10-09 10:33:01 -10:00
parent df71198a24 8853593a7b
commit d837a001db
9 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
esphome/components/esp32_ble/ble.cpp
View File

@@ -15,10 +15,6 @@
#include <freertos/task.h> #include <freertos/task.h>
#include <nvs_flash.h> #include <nvs_flash.h>
#ifdef USE_ARDUINO
#include <esp32-hal-bt.h>
#endif
namespace esphome::esp32_ble { namespace esphome::esp32_ble {
static const char *const TAG = "esp32_ble"; static const char *const TAG = "esp32_ble";
@@ -140,12 +136,6 @@ void ESP32BLE::advertising_init_() {
bool ESP32BLE::ble_setup_() { bool ESP32BLE::ble_setup_() {
esp_err_t err; esp_err_t err;
#ifdef USE_ARDUINO
if (!btStart()) {
ESP_LOGE(TAG, "btStart failed: %d", esp_bt_controller_get_status());
return false;
}
#else
if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) { if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_ENABLED) {
// start bt controller // start bt controller
if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) { if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) {
@@ -170,7 +160,6 @@ bool ESP32BLE::ble_setup_() {
return false; return false;
} }
} }
#endif
esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT); esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
@@ -262,12 +251,6 @@ bool ESP32BLE::ble_dismantle_() {
return false; return false;
} }
#ifdef USE_ARDUINO
if (!btStop()) {
ESP_LOGE(TAG, "btStop failed: %d", esp_bt_controller_get_status());
return false;
}
#else
if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_IDLE) { if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_IDLE) {
// stop bt controller // stop bt controller
if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED) { if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED) {
@@ -291,7 +274,6 @@ bool ESP32BLE::ble_dismantle_() {
return false; return false;
} }
} }
#endif
return true; return true;
} }

4
esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp
View File

@@ -15,10 +15,6 @@
#include "esphome/core/hal.h" #include "esphome/core/hal.h"
#include "esphome/core/helpers.h" #include "esphome/core/helpers.h"
#ifdef USE_ARDUINO
#include <esp32-hal-bt.h>
#endif
namespace esphome { namespace esphome {
namespace esp32_ble_beacon { namespace esp32_ble_beacon {

4
esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
View File

@@ -25,10 +25,6 @@
#include <esp_coexist.h> #include <esp_coexist.h>
#endif #endif
#ifdef USE_ARDUINO
#include <esp32-hal-bt.h>
#endif
#define MBEDTLS_AES_ALT #define MBEDTLS_AES_ALT
#include <aes_alt.h> #include <aes_alt.h>

1
tests/components/esp32_ble/test.esp32-ard.yaml
View File

@@ -1 +0,0 @@
<<: !include common.yaml

1
tests/components/esp32_ble/test.esp32-c3-ard.yaml
View File

@@ -1 +0,0 @@
<<: !include common.yaml

1
tests/components/esp32_ble_beacon/test.esp32-ard.yaml
View File

@@ -1 +0,0 @@
<<: !include common.yaml

1
tests/components/esp32_ble_beacon/test.esp32-c3-ard.yaml
View File

@@ -1 +0,0 @@
<<: !include common.yaml

5
tests/components/esp32_ble_tracker/test.esp32-ard.yaml
View File

@@ -1,5 +0,0 @@
<<: !include common.yaml
esp32_ble_tracker:
software_coexistence: true
max_connections: 3

5
tests/components/esp32_ble_tracker/test.esp32-c3-ard.yaml
View File

@@ -1,5 +0,0 @@
<<: !include common.yaml
esp32_ble_tracker:
max_connections: 3
software_coexistence: false