Skip to content

Commit

Permalink
Merge branch 'release/v8.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Jun 30, 2023
2 parents 4c944f1 + 524dd48 commit 0939a26
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion boards/seeed_wio_terminal.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"-D__SAMD51__",
"-D__FPU_PRESENT",
"-DARM_MATH_CM4",
"-DSEEED_GROVE_UI_WIRELESS",
"-DVARIANT_QSPI_BAUD_DEFAULT=50000000",
"-DTXRXLED_ENABLE",
"-DROLE=0"
Expand Down
2 changes: 1 addition & 1 deletion examples/arduino-blink/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ platform = atmelsam
framework = arduino
board = sodaq_autonomo

[env:sparkfun samd21 mini usb]
[env:sparkfun_samd21_mini_usb]
platform = atmelsam
framework = arduino
board = sparkfun_samd21_mini_usb
Expand Down
10 changes: 5 additions & 5 deletions platform.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"type": "git",
"url": "https://github.com/platformio/platform-atmelsam.git"
},
"version": "8.1.0",
"version": "8.2.0",
"frameworks": {
"arduino": {
"package": "framework-arduino-sam",
Expand Down Expand Up @@ -59,13 +59,13 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.7.10"
"version": "~1.7.13"
},
"framework-arduino-samd-seeed": {
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.8.1"
"version": "~1.8.4"
},
"framework-arduino-samd-moteino": {
"type": "framework",
Expand All @@ -83,7 +83,7 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.8.6"
"version": "~1.8.9"
},
"framework-arduino-samd-sparkfun": {
"type": "framework",
Expand Down Expand Up @@ -151,7 +151,7 @@
"type": "uploader",
"optional": true,
"owner": "platformio",
"version": "~2.1100.0"
"version": "~3.1200.0"
},
"tool-jlink": {
"type": "uploader",
Expand Down
2 changes: 1 addition & 1 deletion platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def _add_default_debug_tools(self, board):
openocd_cmds.append("set CPUTAPID 0x2ba01477")
server_args = [
"-s",
"$PACKAGE_DIR/scripts",
"$PACKAGE_DIR/openocd/scripts",
"-f",
"interface/%s.cfg" % ("cmsis-dap" if link == "atmel-ice" else link),
"-c",
Expand Down

0 comments on commit 0939a26

Please sign in to comment.