Merge branch 'esp-idf-v5.1-libs' into BTser_fix

Author: PilnyTomas

cores/esp32/MD5Builder.cpp

@@ -78,6 +78,7 @@ bool MD5Builder::addStream(Stream & stream, const size_t maxLen)
         // read data and check if we got something
         int numBytesRead = stream.readBytes(buf, readBytes);
         if(numBytesRead< 1) {
+            free(buf);
             return false;
         }
 

cores/esp32/esp32-hal-misc.c

@@ -249,6 +249,14 @@ extern bool btInUse();
 
 void initArduino()
 {
+    //init proper ref tick value for PLL (uncomment if REF_TICK is different than 1MHz)
+    //ESP_REG(APB_CTRL_PLL_TICK_CONF_REG) = APB_CLK_FREQ / REF_CLK_FREQ - 1;
+#ifdef F_CPU
+    setCpuFrequencyMhz(F_CPU/1000000);
+#endif
+#if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM
+    psramInit();
+#endif
 #ifdef CONFIG_APP_ROLLBACK_ENABLE
     if(!verifyRollbackLater()){
         const esp_partition_t *running = esp_ota_get_running_partition();
@@ -264,14 +272,6 @@ void initArduino()
             }
         }
     }
-#endif
-    //init proper ref tick value for PLL (uncomment if REF_TICK is different than 1MHz)
-    //ESP_REG(APB_CTRL_PLL_TICK_CONF_REG) = APB_CLK_FREQ / REF_CLK_FREQ - 1;
-#ifdef F_CPU
-    setCpuFrequencyMhz(F_CPU/1000000);
-#endif
-#if CONFIG_SPIRAM_SUPPORT || CONFIG_SPIRAM
-    psramInit();
 #endif
     esp_log_level_set("*", CONFIG_LOG_DEFAULT_LEVEL);
     esp_err_t err = nvs_flash_init();

libraries/WiFiProv/examples/WiFiProv/WiFiProv.ino

@@ -62,24 +62,21 @@ void setup() {
   Serial.begin(115200);
   WiFi.onEvent(SysProvEvent);
 
-#if CONFIG_IDF_TARGET_ESP32 && CONFIG_BLUEDROID_ENABLED && not USE_SOFT_AP
+// BLE Provisioning using the ESP SoftAP Prov works fine for any BLE SoC, incuding ESP32, ESP32S3 and ESP32C3.
+#if CONFIG_BLUEDROID_ENABLED && !defined(USE_SOFT_AP)
     Serial.println("Begin Provisioning using BLE");
     // Sample uuid that user can pass during provisioning using BLE
     uint8_t uuid[16] = {0xb4, 0xdf, 0x5a, 0x1c, 0x3f, 0x6b, 0xf4, 0xbf,
                         0xea, 0x4a, 0x82, 0x03, 0x04, 0x90, 0x1a, 0x02 };
     WiFiProv.beginProvision(WIFI_PROV_SCHEME_BLE, WIFI_PROV_SCHEME_HANDLER_FREE_BTDM, WIFI_PROV_SECURITY_1, pop, service_name, service_key, uuid, reset_provisioned);
+    log_d("ble qr");
+    WiFiProv.printQR(service_name, pop, "ble");
 #else
     Serial.println("Begin Provisioning using Soft AP");
     WiFiProv.beginProvision(WIFI_PROV_SCHEME_SOFTAP, WIFI_PROV_SCHEME_HANDLER_NONE, WIFI_PROV_SECURITY_1, pop, service_name, service_key);
-#endif
-
-  #if CONFIG_BLUEDROID_ENABLED && not USE_SOFT_AP
-    log_d("ble qr");
-    WiFiProv.printQR(service_name, pop, "ble");
-  #else
     log_d("wifi qr");
     WiFiProv.printQR(service_name, pop, "softap");
-  #endif
+#endif
 }
 
 void loop() {

tools/platformio-build.py

@@ -169,6 +169,10 @@ def add_tinyuf2_extra_image():
 # Target: Build Core Library
 #
 
+# Set -DARDUINO_CORE_BUILD only for the core library
+corelib_env = env.Clone()
+corelib_env.Append(CPPDEFINES=["ARDUINO_CORE_BUILD"])
+
 libs = []
 
 variants_dir = join(FRAMEWORK_DIR, "variants")
@@ -178,13 +182,14 @@ def add_tinyuf2_extra_image():
 
 if "build.variant" in board_config:
     env.Append(CPPPATH=[join(variants_dir, board_config.get("build.variant"))])
-    env.BuildSources(
+    corelib_env.Append(CPPPATH=[join(variants_dir, board_config.get("build.variant"))])
+    corelib_env.BuildSources(
         join("$BUILD_DIR", "FrameworkArduinoVariant"),
         join(variants_dir, board_config.get("build.variant")),
     )
 
 libs.append(
-    env.BuildLibrary(
+    corelib_env.BuildLibrary(
         join("$BUILD_DIR", "FrameworkArduino"),
         join(FRAMEWORK_DIR, "cores", board_config.get("build.core")),
     )