feedc0de/arduino-esp32
1
0
Fork 0
forked from espressif/arduino-esp32
Code Pull Requests Activity

RE: Change check for BT_ENABLE to really be a check for BLUEDROID_ENABLED (#4497)

Browse Source 
* Change check for CONFIG_BT_ENABLE to really be a check for CONFIG_BLUEDROID_ENABLED

Which is really what should have been tested.  This allows use of
the Arduino layer with the newer Nimble stack for those that don't want
to use Bluedroid.

In support of https://github.com/meshtastic/Meshtastic-device/issues/266

* Change check for CONFIG_BT_ENABLE to really be a check for CONFIG_BLUEDROID_ENABLED

Which is really what should have been tested.  This allows use of
the Arduino layer with the newer Nimble stack for those that don't want
to use Bluedroid.

In support of https://github.com/meshtastic/Meshtastic-device/issues/266

* wifi prov changes

* merge fixes

Co-authored-by: geeksville <kevinh@geeksville.com>
This commit is contained in:
Me No Dev
2020-11-06 14:00:06 +02:00
committed by GitHub
parent 8767419289
commit 591c43880a
48 changed files with 95 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/WiFi/src/WiFiProv.cpp
View File

@ -28,7 +28,7 @@
#include <esp32-hal.h>
#include <nvs_flash.h>
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
#include "wifi_provisioning/scheme_ble.h"
#endif
#include <wifi_provisioning/scheme_softap.h>
@ -86,20 +86,20 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
static char service_name_temp[32];
wifi_prov_mgr_config_t config;
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
if(prov_scheme == WIFI_PROV_SCHEME_BLE) {
config.scheme = wifi_prov_scheme_ble;
} else {
#endif
config.scheme = wifi_prov_scheme_softap;
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
}
if(scheme_handler == WIFI_PROV_SCHEME_HANDLER_NONE){
#endif
wifi_prov_event_handler_t scheme_event_handler = WIFI_PROV_EVENT_HANDLER_NONE;
memcpy(&config.scheme_event_handler, &scheme_event_handler, sizeof(wifi_prov_event_handler_t));
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
} else if(scheme_handler == WIFI_PROV_SCHEME_HANDLER_FREE_BTDM){
wifi_prov_event_handler_t scheme_event_handler = WIFI_PROV_SCHEME_BLE_EVENT_HANDLER_FREE_BTDM;
memcpy(&config.scheme_event_handler, &scheme_event_handler, sizeof(wifi_prov_event_handler_t));
@ -126,7 +126,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
return;
}
if(provisioned == false) {
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
if(prov_scheme == WIFI_PROV_SCHEME_BLE) {
service_key = NULL;
if(uuid == NULL) {
@ -141,7 +141,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
service_name = (const char *)service_name_temp;
}
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
if(prov_scheme == WIFI_PROV_SCHEME_BLE) {
log_i("Starting AP using BLE. service_name : %s, pop : %s",service_name,pop);
} else {
@ -151,7 +151,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
} else {
log_i("Starting provisioning AP using SOFTAP. service_name : %s, password : %s, pop : %s",service_name,service_key,pop);
}
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
}
#endif

5
libraries/WiFi/src/WiFiProv.h
View File

@ -19,11 +19,10 @@
#include "WiFi.h"
#include "wifi_provisioning/manager.h"
//Select the scheme using which you want to provision
typedef enum {
WIFI_PROV_SCHEME_SOFTAP,
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
WIFI_PROV_SCHEME_BLE,
#endif
WIFI_PROV_SCHEME_MAX
@ -31,7 +30,7 @@ typedef enum {
typedef enum {
WIFI_PROV_SCHEME_HANDLER_NONE,
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
WIFI_PROV_SCHEME_HANDLER_FREE_BTDM,
WIFI_PROV_SCHEME_HANDLER_FREE_BLE,
WIFI_PROV_SCHEME_HANDLER_FREE_BT,