Skip to content

Commit a0025d8

Browse files
committed
Merge branch 'release/v3.2.1'
2 parents aa58603 + 2d6a567 commit a0025d8

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

builder/frameworks/espidf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,6 +1102,8 @@ def generate_mbedtls_bundle(sdk_config):
11021102
if env.subst("$PROJECT_SRC_DIR") != os.path.join(env.subst("$PROJECT_DIR"), "main"):
11031103
extra_components.append(env.subst("$PROJECT_SRC_DIR"))
11041104
if "arduino" in env.subst("$PIOFRAMEWORK"):
1105+
print("Warning! Arduino framework as an ESP-IDF component doesn't handle "
1106+
"the `variant` field! The default `esp32` variant will be used.")
11051107
extra_components.append(ARDUINO_FRAMEWORK_DIR)
11061108

11071109
print("Reading CMake configuration...")

examples/espidf-arduino-blink/platformio.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
[env]
1111
platform = espressif32
1212
framework = arduino, espidf
13-
build_flags =
13+
build_flags =
1414
-D CONFIG_BLINK_GPIO=2
1515
monitor_speed = 115200
1616
platform_packages =
1717
; use a special branch
18-
framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0
18+
framework-arduinoespressif32 @ https://github.com/marcovannoord/arduino-esp32.git#idf-release/v4.0
1919

2020
[env:esp32dev]
2121
board = esp32dev

examples/espidf-arduino-wifiscan/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ framework = arduino, espidf
1313
monitor_speed = 115200
1414
platform_packages =
1515
; use a special branch
16-
framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#idf-release/v4.0
16+
framework-arduinoespressif32 @ https://github.com/marcovannoord/arduino-esp32.git#idf-release/v4.0
1717

1818
[env:esp32dev]
1919
board = esp32dev

platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"type": "git",
1919
"url": "https://github.com/platformio/platform-espressif32.git"
2020
},
21-
"version": "3.2.0",
21+
"version": "3.2.1",
2222
"frameworks": {
2323
"arduino": {
2424
"package": "framework-arduinoespressif32",
@@ -87,7 +87,7 @@
8787
"type": "framework",
8888
"optional": true,
8989
"owner": "platformio",
90-
"version": "~3.40200.0",
90+
"version": "~3.40201.0",
9191
"optionalVersions": ["~3.40001.0"]
9292
},
9393
"framework-simba": {

0 commit comments

Comments
 (0)