Skip to content

candidate 2.0.1 #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 16, 2020
Merged

candidate 2.0.1 #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f1e55c5
add build.core proerty to boards
Sep 14, 2020
8a3c655
remove command line includes from c units
Sep 15, 2020
02487d0
recommend the ASB and list SVL as out of order
Sep 16, 2020
4a1fedd
Merge pull request #264 from sparkfun/fix-c-includes
Sep 16, 2020
595ebce
Merge pull request #263 from sparkfun/fix-1.8.13-support
Sep 16, 2020
0f541ac
Merge pull request #265 from sparkfun/fix-uploader-recommendations
Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ menu.asb_baud=Ambiq Secure Bootloader Baud Rate
###############################################################

sfe_artemis_dk.name=Artemis Dev Kit
sfe_artemis_dk.build.core=arduino
sfe_artemis_dk.build.variant=SFE_ARTEMIS_DK
sfe_artemis_dk.build.arch=APOLLO3
sfe_artemis_dk.build.board=APOLLO3_SFE_ARTEMIS_DK
Expand All @@ -22,6 +23,7 @@ sfe_artemis_dk.build.ldscript={runtime.platform.path}/tools/uploaders/asb/0xC000
###############################################################

sfe_artemis.name=RedBoard Artemis
sfe_artemis.build.core=arduino
sfe_artemis.build.variant=SFE_ARTEMIS
sfe_artemis.build.arch=APOLLO3
sfe_artemis.build.board=APOLLO3_SFE_ARTEMIS
Expand All @@ -35,8 +37,8 @@ sfe_artemis.menu.svl_baud.460800=460800
sfe_artemis.menu.svl_baud.230400=230400
sfe_artemis.menu.svl_baud.115200=115200
sfe_artemis.menu.svl_baud.57600=57600
sfe_artemis.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
sfe_artemis.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
sfe_artemis.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
sfe_artemis.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)

sfe_artemis.menu.svl_baud.57600.upload.svl_baud=57600
sfe_artemis.menu.svl_baud.115200.upload.svl_baud=115200
Expand All @@ -55,6 +57,7 @@ sfe_artemis.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/
###############################################################

sfe_artemis_atp.name=RedBoard Artemis ATP
sfe_artemis_atp.build.core=arduino
sfe_artemis_atp.build.variant=SFE_ARTEMIS_ATP
sfe_artemis_atp.build.arch=APOLLO3
sfe_artemis_atp.build.board=APOLLO3_SFE_ARTEMIS_ATP
Expand All @@ -68,8 +71,8 @@ sfe_artemis_atp.menu.svl_baud.460800=460800
sfe_artemis_atp.menu.svl_baud.230400=230400
sfe_artemis_atp.menu.svl_baud.115200=115200
sfe_artemis_atp.menu.svl_baud.57600=57600
sfe_artemis_atp.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
sfe_artemis_atp.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
sfe_artemis_atp.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
sfe_artemis_atp.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)

sfe_artemis_atp.menu.svl_baud.57600.upload.svl_baud=57600
sfe_artemis_atp.menu.svl_baud.115200.upload.svl_baud=115200
Expand All @@ -88,6 +91,7 @@ sfe_artemis_atp.menu.loader.option_svl.build.ldscript={runtime.platform.path}/to
###############################################################

sfe_artemis_nano.name=RedBoard Artemis Nano
sfe_artemis_nano.build.core=arduino
sfe_artemis_nano.build.variant=SFE_ARTEMIS_NANO
sfe_artemis_nano.build.arch=APOLLO3
sfe_artemis_nano.build.board=APOLLO3_SFE_ARTEMIS_NANO
Expand All @@ -101,8 +105,8 @@ sfe_artemis_nano.menu.svl_baud.460800=460800
sfe_artemis_nano.menu.svl_baud.230400=230400
sfe_artemis_nano.menu.svl_baud.115200=115200
sfe_artemis_nano.menu.svl_baud.57600=57600
sfe_artemis_nano.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
sfe_artemis_nano.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
sfe_artemis_nano.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
sfe_artemis_nano.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)

sfe_artemis_nano.menu.svl_baud.57600.upload.svl_baud=57600
sfe_artemis_nano.menu.svl_baud.115200.upload.svl_baud=115200
Expand All @@ -121,6 +125,7 @@ sfe_artemis_nano.menu.loader.option_svl.build.ldscript={runtime.platform.path}/t
###############################################################

sfe_artemis_thing_plus.name=Artemis Thing Plus
sfe_artemis_thing_plus.build.core=arduino
sfe_artemis_thing_plus.build.variant=SFE_ARTEMIS_THING_PLUS
sfe_artemis_thing_plus.build.arch=APOLLO3
sfe_artemis_thing_plus.build.board=APOLLO3_SFE_ARTEMIS_THING_PLUS
Expand All @@ -134,8 +139,8 @@ sfe_artemis_thing_plus.menu.svl_baud.460800=460800
sfe_artemis_thing_plus.menu.svl_baud.230400=230400
sfe_artemis_thing_plus.menu.svl_baud.115200=115200
sfe_artemis_thing_plus.menu.svl_baud.57600=57600
sfe_artemis_thing_plus.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
sfe_artemis_thing_plus.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
sfe_artemis_thing_plus.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
sfe_artemis_thing_plus.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)

sfe_artemis_thing_plus.menu.svl_baud.57600.upload.svl_baud=57600
sfe_artemis_thing_plus.menu.svl_baud.115200.upload.svl_baud=115200
Expand All @@ -154,6 +159,7 @@ sfe_artemis_thing_plus.menu.loader.option_svl.build.ldscript={runtime.platform.p
###############################################################

sfe_edge.name=Edge
sfe_edge.build.core=arduino
sfe_edge.build.variant=SFE_EDGE
sfe_edge.build.arch=APOLLO3
sfe_edge.build.board=APOLLO3_SFE_EDGE
Expand Down Expand Up @@ -192,6 +198,7 @@ sfe_edge.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/upl
###############################################################

sfe_edge2.name=Edge2
sfe_edge2.build.core=arduino
sfe_edge2.build.variant=SFE_EDGE2
sfe_edge2.build.arch=APOLLO3
sfe_edge2.build.board=APOLLO3_SFE_EDGE2
Expand All @@ -205,8 +212,8 @@ sfe_edge2.menu.svl_baud.460800=460800
sfe_edge2.menu.svl_baud.230400=230400
sfe_edge2.menu.svl_baud.115200=115200
sfe_edge2.menu.svl_baud.57600=57600
sfe_edge2.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
sfe_edge2.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
sfe_edge2.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
sfe_edge2.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)

sfe_edge2.menu.svl_baud.57600.upload.svl_baud=57600
sfe_edge2.menu.svl_baud.115200.upload.svl_baud=115200
Expand All @@ -225,6 +232,7 @@ sfe_edge2.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/up
###############################################################

sfe_artemis_module.name=Artemis Module
sfe_artemis_module.build.core=arduino
sfe_artemis_module.build.variant=SFE_ARTEMIS_MODULE
sfe_artemis_module.build.arch=APOLLO3
sfe_artemis_module.build.board=APOLLO3_SFE_ARTEMIS_MODULE
Expand All @@ -238,8 +246,8 @@ sfe_artemis_module.menu.svl_baud.460800=460800
sfe_artemis_module.menu.svl_baud.230400=230400
sfe_artemis_module.menu.svl_baud.115200=115200
sfe_artemis_module.menu.svl_baud.57600=57600
sfe_artemis_module.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
sfe_artemis_module.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
sfe_artemis_module.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
sfe_artemis_module.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)

sfe_artemis_module.menu.svl_baud.57600.upload.svl_baud=57600
sfe_artemis_module.menu.svl_baud.115200.upload.svl_baud=115200
Expand Down
6 changes: 3 additions & 3 deletions platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defines.cxx={defines.all} @{build.variant.path}/mbed/.cxx-symbols
defines.ld={defines.all} @{build.variant.path}/mbed/.ld-symbols

# includes
includes.core={includes} "-I{cores.path}/arduino" "-I{cores.path}/arduino/mbed-bridge" "-I{cores.path}/arduino/mbed-bridge/core-api" -include {cores.path}/arduino/sdk/ArduinoSDK.h
includes.core={includes} "-I{cores.path}/arduino" "-I{cores.path}/arduino/mbed-bridge" "-I{cores.path}/arduino/mbed-bridge/core-api"
includes.mbed=@{build.variant.path}/mbed/.includes
includes.variant={build.includes}
includes.extra=
Expand All @@ -44,8 +44,8 @@ compiler.warning_flags.all={compiler.warning_flags.default} -Wextra
# flags
compiler.preproc.flags={compiler.cxx.flags} -w -x c++ -E -CC {compiler.preproc.extra_flags}
compiler.asm.flags=-include {build.variant.path}/mbed/mbed_config.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.asm-flags {compiler.asm.extra_flags}
compiler.c.flags=-include {build.variant.path}/mbed/mbed_config.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.c-flags {compiler.c.extra_flags}
compiler.cxx.flags=-include {build.variant.path}/mbed/mbed_config.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.cxx-flags {compiler.cxx.extra_flags}
compiler.c.flags=-iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.c-flags {compiler.c.extra_flags}
compiler.cxx.flags=-include {build.variant.path}/mbed/mbed_config.h -include {cores.path}/arduino/sdk/ArduinoSDK.h -iprefix{runtime.platform.path}/cores/ @{build.variant.path}/mbed/.cxx-flags {compiler.cxx.extra_flags}
compiler.ld.flags=@{build.variant.path}/mbed/.ld-flags {compiler.ld.extra_flags} --specs=nano.specs -lsupc++ -lstdc++ -lm
compiler.ar.flags=rcsP {compiler.ar.extra_flags} {compiler.ar.extra_flags}
compiler.axf2bin.flags={compiler.axf2bin.extra_flags} {compiler.axf2bin.extra_flags} -O binary
Expand Down