Skip to content

Commit ff8bc2a

Browse files
committed
Merge branch 'release/v1.3.0'
2 parents 08b80e7 + b15ae8b commit ff8bc2a

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

builder/frameworks/arduino.py

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

3838
env.Append(
3939
CPPDEFINES=[
40-
"ARDUINO=%s" % FRAMEWORK_VERSION.split(".")[1],
40+
("ARDUINO", int(FRAMEWORK_VERSION.split(".")[1])),
4141
"ARDUINO_ARCH_PIC32"
4242
],
4343

builder/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
CXXFLAGS=["-fno-exceptions"],
5555

5656
CPPDEFINES=[
57-
"F_CPU=$BOARD_F_CPU",
58-
"MPIDEVER=16777998",
59-
"MPIDE=150"
57+
("F_CPU", "$BOARD_F_CPU"),
58+
("MPIDEVER", "16777998"),
59+
("MPIDE", "150")
6060
],
6161

6262
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/microchippic32",
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-microchippic32.git"
1514
},
16-
"version": "1.2.0",
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)