Skip to content

Commit

Permalink
Merge branch 'release/v10.3.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Dec 27, 2023
2 parents eca4fe9 + 824bd67 commit a96bf18
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion builder/frameworks/arduino
Submodule arduino updated 2 files
+3 −1 adafruit.py
+1 −1 mbed-core
7 changes: 4 additions & 3 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-nordicnrf52.git"
},
"version": "10.2.0",
"version": "10.3.0",
"frameworks": {
"arduino": {
"package": "framework-arduinonordicnrf5",
Expand All @@ -39,6 +39,7 @@
"owner": "platformio",
"version": ">=1.60301.0,<1.80000.0",
"optionalVersions": [
"~1.70201.0",
"~1.80201.0",
"~1.90201.0"
]
Expand All @@ -53,7 +54,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.10500.0"
"version": "~1.10600.0"
},
"framework-arduinonordicnrf5": {
"type": "framework",
Expand All @@ -65,7 +66,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~4.0.6"
"version": "~4.0.10"
},
"framework-cmsis": {
"type": "framework",
Expand Down
2 changes: 1 addition & 1 deletion platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def configure_default_packages(self, variables, targets):
self.packages["tool-gperf"]["optional"] = False

if board in ("nano33ble", "nicla_sense_me"):
self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.80201.0"
self.packages["toolchain-gccarmnoneeabi"]["version"] = "~1.70201.0"
self.frameworks["arduino"]["package"] = "framework-arduino-mbed"
self.frameworks["arduino"][
"script"
Expand Down

0 comments on commit a96bf18

Please sign in to comment.