Merge branch 'master' into add-adafruit-metro-s3
This commit is contained in:
commit
cc6565ef3c
2 changed files with 10 additions and 0 deletions
|
|
@ -16,8 +16,12 @@
|
|||
|
||||
#ifdef CONFIG_BT_ENABLED
|
||||
|
||||
#if CONFIG_IDF_TARGET_ESP32
|
||||
bool btInUse(){ return true; }
|
||||
#else
|
||||
// user may want to change it to free resources
|
||||
__attribute__((weak)) bool btInUse(){ return true; }
|
||||
#endif
|
||||
|
||||
#include "esp_bt.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -209,9 +209,15 @@ bool verifyRollbackLater() { return false; }
|
|||
#endif
|
||||
|
||||
#ifdef CONFIG_BT_ENABLED
|
||||
#if CONFIG_IDF_TARGET_ESP32
|
||||
//overwritten in esp32-hal-bt.c
|
||||
bool btInUse() __attribute__((weak));
|
||||
bool btInUse(){ return false; }
|
||||
#else
|
||||
//from esp32-hal-bt.c
|
||||
extern bool btInUse();
|
||||
#endif
|
||||
#endif
|
||||
|
||||
void initArduino()
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in a new issue