Skip to content

Commit

Permalink
Merge branch 'rtos-fix' into 'master'
Browse files Browse the repository at this point in the history
fix for FreeRTOS_samd build

See merge request smartme.io/arancino/ide/smartmeio-arancino-platform!3
  • Loading branch information
Arturo Rinaldi committed Jan 14, 2021
2 parents c887441 + f7229ac commit 95feae8
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 7 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#### v 1.2.1 - 2021.01.14

* Dropping `build.memory_wrapping_flags` entry which is not anymore supported by FreeRTOS_samd library

#### v 1.2.0 - 2020.10.13

* Based on official Arduino samd core v1.8.9.
Expand Down
4 changes: 0 additions & 4 deletions boards.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ arancino_mignon.menu.UploadTool.bossac.upload.tool=bossac

arancino_mignon.menu.freertos.no=No
arancino_mignon.menu.freertos.yes=Yes
arancino_mignon.menu.freertos.no.build.memory_wrapping_flags=
arancino_mignon.menu.freertos.no.build.arancino_extra_flags=
arancino_mignon.menu.freertos.yes.build.memory_wrapping_flags=-Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=calloc -Wl,--wrap=realloc
arancino_mignon.menu.freertos.yes.build.arancino_extra_flags=-DUSEFREERTOS

arancino_mignon.upload.protocol=sam-ba
Expand Down Expand Up @@ -67,9 +65,7 @@ arancino.pid.0=0xECDA

arancino.menu.freertos.no=No
arancino.menu.freertos.yes=Yes
arancino.menu.freertos.no.build.memory_wrapping_flags=
arancino.menu.freertos.no.build.arancino_extra_flags=
arancino.menu.freertos.yes.build.memory_wrapping_flags=-Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=calloc -Wl,--wrap=realloc
arancino.menu.freertos.yes.build.arancino_extra_flags=-DUSEFREERTOS

arancino.upload.tool=ArancinoOTA
Expand Down
18 changes: 18 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "framework-arduino-samd-arancino",
"version": "1.2.1",
"description": "The official SmartME Wiring-based Framework for Microchip SAM D microcontrollers",
"keywords": [
"framework",
"arancino",
"smartme",
"microchip",
"samd"
],
"homepage": "https://arancino.cc/docs/",
"license": "LGPL-2.1-or-later",
"repository": {
"type": "git",
"url": "https://git.smartme.io/smartme.io/arancino/ide/smartmeio-arancino-platform"
}
}
6 changes: 3 additions & 3 deletions platform.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ build.usb_manufacturer="Unknown"
# ----------------

## Compile c files
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
recipe.c.o.pattern="{compiler.path}{compiler.c.cmd}" {compiler.c.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {build.arancino_extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"

## Compile c++ files
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
recipe.cpp.o.pattern="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {build.arancino_extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"

## Compile S files
recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"
recipe.S.o.pattern="{compiler.path}{compiler.S.cmd}" {compiler.S.flags} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.S.extra_flags} {build.extra_flags} {build.arancino_extra_flags} {compiler.arm.cmsis.c.flags} {includes} "{source_file}" -o "{object_file}"

## Create archives
# archive_file_path is needed for backwards compatibility with IDE 1.6.5 or older, IDE 1.6.6 or newer overrides this value
Expand Down

0 comments on commit 95feae8

Please sign in to comment.