Skip to content

Commit ecb1763

Browse files
committed
Merge branch 'release/v0.2.0'
2 parents 5218edd + 08c56fd commit ecb1763

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

builder/frameworks/arduino.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
env.Prepend(
3636
CPPDEFINES=[
37-
"ARDUINO=10600",
37+
("ARDUINO", 10610),
3838
"ARDUINO_ARCH_ESP32"
3939
],
4040

builder/frameworks/espidf.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,11 @@
2020
https://github.com/espressif/esp-idf
2121
"""
2222

23-
import sys
24-
from os import listdir, makedirs
23+
from os import listdir
2524
from os.path import isdir, join
2625

2726
from SCons.Script import DefaultEnvironment
2827

29-
from platformio.util import exec_command
3028

3129
env = DefaultEnvironment()
3230
platform = env.PioPlatform()
@@ -41,7 +39,7 @@ def build_espidf_bootloader():
4139
envsafe = env.Clone()
4240
framework_dir = env.subst("$ESPIDF_DIR")
4341
envsafe.Replace(
44-
CPPDEFINES=["ESP_PLATFORM", "BOOTLOADER_BUILD=1"],
42+
CPPDEFINES=["ESP_PLATFORM", ("BOOTLOADER_BUILD", 1)],
4543

4644
LIBPATH=[
4745
join(framework_dir, "components", "esp32", "ld"),

builder/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ def _get_board_f_flash(env):
6767
CPPDEFINES=[
6868
"ESP32",
6969
"ESP_PLATFORM",
70-
"F_CPU=$BOARD_F_CPU",
70+
("F_CPU", "$BOARD_F_CPU"),
7171
"HAVE_CONFIG_H",
72-
"MBEDTLS_CONFIG_FILE=\\\"mbedtls/esp_config.h\\\""
72+
("MBEDTLS_CONFIG_FILE", '\\"mbedtls/esp_config.h\\"')
7373
],
7474

7575
LINKFLAGS=[

platform.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
"homepage": "http://platformio.org/platforms/espressif32",
77
"license": "Apache-2.0",
88
"engines": {
9-
"platformio": "^3.0.0",
10-
"scons": ">=2.3.0,<2.6.0"
9+
"platformio": "^3.0.0"
1110
},
1211
"repository": {
1312
"type": "git",
1413
"url": "https://github.com/platformio/platform-espressif32.git"
1514
},
16-
"version": "0.1.2",
15+
"version": "0.2.0",
1716
"packageRepositories": [
1817
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1918
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",

0 commit comments

Comments
 (0)