Skip to content

Commit

Permalink
Merge branch 'release/v8.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
valeros committed Jun 30, 2022
2 parents 0ebb3bc + 91504f2 commit 06f6c44
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
10 changes: 9 additions & 1 deletion builder/frameworks/_bare.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@
build_mcu = env.get("BOARD_MCU", board.get("build.mcu", ""))

env.Append(
ASPPFLAGS=["-x", "assembler-with-cpp"],
ASFLAGS=[
"-mthumb",
],
ASPPFLAGS=[
"-x", "assembler-with-cpp",
],

CFLAGS=[
"-std=gnu11"
Expand Down Expand Up @@ -67,6 +72,9 @@

if "BOARD" in env:
env.Append(
ASFLAGS=[
"-mcpu=%s" % board.get("build.cpu")
],
CCFLAGS=[
"-mcpu=%s" % board.get("build.cpu")
],
Expand Down
6 changes: 3 additions & 3 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.0.0",
"version": "8.1.0",
"frameworks": {
"arduino": {
"package": "framework-arduino-sam",
Expand Down Expand Up @@ -53,13 +53,13 @@
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.8.11"
"version": "~1.8.13"
},
"framework-arduino-samd-adafruit": {
"type": "framework",
"optional": true,
"owner": "platformio",
"version": "~1.7.2"
"version": "~1.7.10"
},
"framework-arduino-samd-seeed": {
"type": "framework",
Expand Down

0 comments on commit 06f6c44

Please sign in to comment.