Skip to content

Commit 567976f

Browse files
committed
Merge branch 'release/v1.3.0'
2 parents 57f24f3 + fc1b95a commit 567976f

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

builder/frameworks/arduino.py

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

3737
env.Prepend(
3838
CPPDEFINES=[
39-
"ARDUINO=%s" % FRAMEWORK_VERSION.split(".")[1],
39+
("ARDUINO", int(FRAMEWORK_VERSION.split(".")[1])),
4040
"LWIP_OPEN_SRC"
4141
],
4242
CPPPATH=[

builder/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def _get_board_f_flash(env):
8888
],
8989

9090
CPPDEFINES=[
91-
"F_CPU=$BOARD_F_CPU",
91+
("F_CPU", "$BOARD_F_CPU"),
9292
"__ets__",
9393
"ICACHE_FLASH"
9494
],

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/espressif8266",
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-espressif8266.git"
1514
},
16-
"version": "1.2.1",
15+
"version": "1.3.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)