Skip to content

Commit e8d3e15

Browse files
committed
Merge branch 'release/v1.4.0'
2 parents bd9b6b9 + 52e296e commit e8d3e15

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

builder/frameworks/arduino.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050

5151
env.Append(
5252
CPPDEFINES=[
53-
"ARDUINO=10600",
54-
"TEENSYDUINO=%s" % FRAMEWORK_VERSION.split(".")[1]
53+
("ARDUINO", 10610),
54+
("TEENSYDUINO", FRAMEWORK_VERSION.split(".")[1])
5555
],
5656

5757
CPPPATH=[

builder/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
],
4141

4242
CPPDEFINES=[
43-
"F_CPU=$BOARD_F_CPU",
43+
("F_CPU", "$BOARD_F_CPU"),
4444
"LAYOUT_US_ENGLISH"
4545
],
4646

platform.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
"homepage": "http://platformio.org/platforms/teensy",
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-teensy.git"
1514
},
16-
"version": "1.3.0",
15+
"version": "1.4.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",
@@ -48,7 +47,7 @@
4847
"framework-mbed": {
4948
"type": "framework",
5049
"optional": true,
51-
"version": "~3.127.0"
50+
"version": "~3.126.0"
5251
},
5352
"tool-teensy": {
5453
"type": "uploader",

0 commit comments

Comments
 (0)