Merge branch 'release/v3.2.1'

platformio · May 31, 2021 · a0025d8 · a0025d8
2 parents aa58603 + 2d6a567
commit a0025d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
@@ -1102,6 +1102,8 @@ def generate_mbedtls_bundle(sdk_config):
 if env.subst("$PROJECT_SRC_DIR") != os.path.join(env.subst("$PROJECT_DIR"), "main"):
     extra_components.append(env.subst("$PROJECT_SRC_DIR"))
     if "arduino" in env.subst("$PIOFRAMEWORK"):
+        print("Warning! Arduino framework as an ESP-IDF component doesn't handle "
+              "the `variant` field! The default `esp32` variant will be used.")
         extra_components.append(ARDUINO_FRAMEWORK_DIR)
 
 print("Reading CMake configuration...")

diff --git a/examples/espidf-arduino-blink/platformio.ini b/examples/espidf-arduino-blink/platformio.ini
@@ -10,12 +10,12 @@
 [env]
 platform = espressif32
 framework = arduino, espidf
-build_flags = 
+build_flags =
     -D CONFIG_BLINK_GPIO=2
 monitor_speed = 115200
 platform_packages =
   ; use a special branch
-  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0 
+  framework-arduinoespressif32 @ https://github.com/marcovannoord/arduino-esp32.git#idf-release/v4.0
 
 [env:esp32dev]
 board = esp32dev

diff --git a/examples/espidf-arduino-wifiscan/platformio.ini b/examples/espidf-arduino-wifiscan/platformio.ini
@@ -13,7 +13,7 @@ framework = arduino, espidf
 monitor_speed = 115200
 platform_packages =
   ; use a special branch
-  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0
+  framework-arduinoespressif32 @ https://github.com/marcovannoord/arduino-esp32.git#idf-release/v4.0
 
 [env:esp32dev]
 board = esp32dev

diff --git a/platform.json b/platform.json
@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif32.git"
   },
-  "version": "3.2.0",
+  "version": "3.2.1",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinoespressif32",
@@ -87,7 +87,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.40200.0",
+      "version": "~3.40201.0",
       "optionalVersions": ["~3.40001.0"]
     },
     "framework-simba": {