From dcf98959559be9bed982af4423848900f9fb4a3a Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Wed, 16 Dec 2020 19:01:29 +0100
Subject: [PATCH] esp-idf fixes

---
 CMakeLists.txt                      | 6 ++++--
 libraries/WiFiProv/src/WiFiProv.cpp | 6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cbdf1e3..2fa1c772 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,8 @@ set(LIBRARY_SRCS
   libraries/FS/src/vfs_api.cpp
   libraries/HTTPClient/src/HTTPClient.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/Preferences/src/Preferences.cpp
   libraries/SD_MMC/src/SD_MMC.cpp
@@ -132,7 +133,8 @@ set(includedirs
   libraries/FS/src
   libraries/HTTPClient/src
   libraries/HTTPUpdate/src
-  libraries/LITTLEFS/src
+  # Removed due https://github.com/espressif/arduino-esp32/issues/4629
+  #libraries/LITTLEFS/src
   libraries/NetBIOS/src
   libraries/Preferences/src
   libraries/SD_MMC/src
diff --git a/libraries/WiFiProv/src/WiFiProv.cpp b/libraries/WiFiProv/src/WiFiProv.cpp
index e60f0f3c..62045689 100644
--- a/libraries/WiFiProv/src/WiFiProv.cpp
+++ b/libraries/WiFiProv/src/WiFiProv.cpp
@@ -56,14 +56,18 @@ static void get_device_service_name(prov_scheme_t prov_scheme, char *service_nam
     	return;
     }
 #if CONFIG_IDF_TARGET_ESP32
+#if CONFIG_BLUEDROID_ENABLED
     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]);
     } else {
+#endif
 #endif
          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_BLUEDROID_ENABLED
     }
 #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){
@@ -122,6 +126,7 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
     	return;
     }
     if(provisioned == false) {
+#if CONFIG_BLUEDROID_ENABLED
 #if CONFIG_BLUEDROID_ENABLED
         if(prov_scheme == WIFI_PROV_SCHEME_BLE) {
             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);
         }
+#endif
 #endif
 
         if(service_name == NULL) {