mirror of
https://github.com/esphome/esphome.git
synced 2025-10-12 14:53:49 +01:00
Merge remote-tracking branch 'upstream/dev' into common_bus_grouping
This commit is contained in:
@@ -14,10 +14,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 {
|
||||||
|
|
||||||
|
@@ -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 +0,0 @@
|
|||||||
<<: !include common.yaml
|
|
@@ -1 +0,0 @@
|
|||||||
<<: !include common.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
|
|
@@ -1,5 +0,0 @@
|
|||||||
<<: !include common.yaml
|
|
||||||
|
|
||||||
esp32_ble_tracker:
|
|
||||||
max_connections: 3
|
|
||||||
software_coexistence: false
|
|
Reference in New Issue
Block a user