espressif/arduino-esp32
1
0
Fork 1
mirror of https://github.com/0xFEEDC0DE64/arduino-esp32.git synced 2025-07-30 18:57:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

esp-idf fixes

Browse Source
This commit is contained in:
0xFEEDC0DE64
2020-12-16 19:01:29 +01:00
parent 7d3f49940f
commit dcf9895955
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -52,7 +52,8 @@ set(LIBRARY_SRCS
libraries/FS/src/vfs_api.cpp libraries/FS/src/vfs_api.cpp
libraries/HTTPClient/src/HTTPClient.cpp libraries/HTTPClient/src/HTTPClient.cpp
libraries/HTTPUpdate/src/HTTPUpdate.cpp libraries/HTTPUpdate/src/HTTPUpdate.cpp
libraries/LITTLEFS/src/LITTLEFS.cpp # Removed due https://github.com/espressif/arduino-esp32/issues/4629
#libraries/LITTLEFS/src/LITTLEFS.cpp
libraries/NetBIOS/src/NetBIOS.cpp libraries/NetBIOS/src/NetBIOS.cpp
libraries/Preferences/src/Preferences.cpp libraries/Preferences/src/Preferences.cpp
libraries/SD_MMC/src/SD_MMC.cpp libraries/SD_MMC/src/SD_MMC.cpp
@ -132,7 +133,8 @@ set(includedirs
libraries/FS/src libraries/FS/src
libraries/HTTPClient/src libraries/HTTPClient/src
libraries/HTTPUpdate/src libraries/HTTPUpdate/src
libraries/LITTLEFS/src # Removed due https://github.com/espressif/arduino-esp32/issues/4629
#libraries/LITTLEFS/src
libraries/NetBIOS/src libraries/NetBIOS/src
libraries/Preferences/src libraries/Preferences/src
libraries/SD_MMC/src libraries/SD_MMC/src

6
libraries/WiFiProv/src/WiFiProv.cpp
View File

@ -56,14 +56,18 @@ static void get_device_service_name(prov_scheme_t prov_scheme, char *service_nam
return; return;
} }
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
if(prov_scheme == WIFI_PROV_SCHEME_BLE) { if(prov_scheme == WIFI_PROV_SCHEME_BLE) {
snprintf(service_name, max, "%s%02X%02X%02X",SERV_NAME_PREFIX_PROV, eth_mac[3], eth_mac[4], eth_mac[5]); snprintf(service_name, max, "%s%02X%02X%02X",SERV_NAME_PREFIX_PROV, eth_mac[3], eth_mac[4], eth_mac[5]);
} else { } else {
#endif
#endif #endif
snprintf(service_name, max, "%s%02X%02X%02X",SERV_NAME_PREFIX_PROV, eth_mac[3], eth_mac[4], eth_mac[5]); snprintf(service_name, max, "%s%02X%02X%02X",SERV_NAME_PREFIX_PROV, eth_mac[3], eth_mac[4], eth_mac[5]);
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
#if CONFIG_BLUEDROID_ENABLED
} }
#endif #endif
#endif
} }
static esp_err_t custom_prov_data_handler(uint32_t session_id, const uint8_t *inbuf, ssize_t inlen, uint8_t **outbuf, ssize_t *outlen, void *priv_data){ static esp_err_t custom_prov_data_handler(uint32_t session_id, const uint8_t *inbuf, ssize_t inlen, uint8_t **outbuf, ssize_t *outlen, void *priv_data){
@ -122,6 +126,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
return; return;
} }
if(provisioned == false) { if(provisioned == false) {
#if CONFIG_BLUEDROID_ENABLED
#if CONFIG_BLUEDROID_ENABLED #if CONFIG_BLUEDROID_ENABLED
if(prov_scheme == WIFI_PROV_SCHEME_BLE) { if(prov_scheme == WIFI_PROV_SCHEME_BLE) {
service_key = NULL; service_key = NULL;
@ -130,6 +135,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
} }
wifi_prov_scheme_ble_set_service_uuid(uuid); wifi_prov_scheme_ble_set_service_uuid(uuid);
} }
#endif
#endif #endif
if(service_name == NULL) { if(service_name == NULL) {