Skip to content

Add new Artemis bootloader #6

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 10 commits into from
Jun 17, 2019
Merged

Add new Artemis bootloader #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6715f1c
Uart loader now handles no response timeouts gracefully
Jun 15, 2019
28c68be
Remove bootloader. Moved to other repo.
Jun 15, 2019
01c5d4e
Add variant for Ambiq SBL
Jun 15, 2019
6d25520
Chance linker on variants to use the ABL
Jun 15, 2019
809ffa7
Boards now use uart loader (ABL) tool instead of SBL. Added Ambiq SBL…
Jun 15, 2019
c233e12
Change BL to use 127 as annouce character to avoid printing
Jun 15, 2019
32424ba
Add math.h to get pow. Add type for boolean.
Jun 15, 2019
70416ca
Whitespace change to SPI.cpp
Jun 15, 2019
15f3121
Add typecast to get past error.
Jun 15, 2019
2486c81
Add setClock highlighting
Jun 15, 2019
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
50 changes: 25 additions & 25 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
artemis.name=SparkFun Artemis Module
artemis.build.variant=SparkFun_Artemis
artemis.build.board=SFE_ARTEMIS
artemis.upload.tool=artemis_bin2board
artemis.upload.tool=artemis_uart
artemis.upload.maximum_size=960000
artemis.build.arch=APOLLO3
artemis.build.mcu=cortex-m4
Expand All @@ -43,7 +43,7 @@ artemis.upload.baud=115200
amap3blackboard.name=SparkFun BlackBoard Artemis
amap3blackboard.build.variant=SparkFun_BlackBoard_Artemis
amap3blackboard.build.board=AM_AP3_SFE_BB_ARTEMIS
amap3blackboard.upload.tool=artemis_bin2board
amap3blackboard.upload.tool=artemis_uart
amap3blackboard.upload.maximum_size=960000
amap3blackboard.build.arch=APOLLO3
amap3blackboard.build.mcu=cortex-m4
Expand All @@ -60,30 +60,10 @@ amap3blackboard.upload.baud=115200

###############################################################

amap3blackboardBL.name=SparkFun BlackBoard Artemis 80k Offset
amap3blackboardBL.build.variant=SparkFun_BlackBoard_Artemis_BL
amap3blackboardBL.build.board=AM_AP3_SFE_BB_ARTEMIS_BL
amap3blackboardBL.upload.tool=artemis_bin2board
amap3blackboardBL.upload.maximum_size=960000
amap3blackboardBL.build.arch=APOLLO3
amap3blackboardBL.build.mcu=cortex-m4
amap3blackboardBL.build.f_cpu=48000000L
amap3blackboardBL.build.core=arduino
amap3blackboardBL.build.defs=
amap3blackboardBL.build.includes=-I{build.variant.path}/config
amap3blackboardBL.build.libs=
amap3blackboardBL.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3
amap3blackboardBL.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
amap3blackboardBL.upload.maximum_size=960000
edge.upload.use_menu_baud=0
amap3blackboardBL.upload.baud=115200

###############################################################

amap3nano.name=SparkFun BlackBoard Artemis Nano
amap3nano.build.variant=SparkFun_BlackBoard_Artemis_Nano
amap3nano.build.board=AM_AP3_SFE_BB_ARTEMIS_NANO
amap3nano.upload.tool=artemis_bin2board
amap3nano.upload.tool=artemis_uart
amap3nano.upload.maximum_size=960000
amap3nano.build.arch=APOLLO3
amap3nano.build.mcu=cortex-m4
Expand All @@ -103,7 +83,7 @@ amap3nano.upload.baud=115200
amap3mega.name=SparkFun BlackBoard Artemis Mega
amap3mega.build.variant=SparkFun_BlackBoard_Artemis_Mega
amap3mega.build.board=AM_AP3_SFE_BB_ARTEMIS_MEGA
amap3mega.upload.tool=artemis_bin2board
amap3mega.upload.tool=artemis_uart
amap3mega.upload.maximum_size=960000
amap3mega.build.arch=APOLLO3
amap3mega.build.mcu=cortex-m4
Expand Down Expand Up @@ -139,10 +119,29 @@ edge.upload.baud=921600

###############################################################

amap3SBL.name=Abmiq SBL
amap3SBL.build.variant=SparkFun_Ambiq_SBL
amap3SBL.build.board=SFE_AMB_SBL
amap3SBL.upload.tool=artemis_bin2board
amap3SBL.upload.maximum_size=960000
amap3SBL.build.arch=APOLLO3
amap3SBL.build.mcu=cortex-m4
amap3SBL.build.f_cpu=48000000L
amap3SBL.build.core=arduino
amap3SBL.build.defs=
amap3SBL.build.includes=-I{build.variant.path}/config
amap3SBL.build.libs=
amap3SBL.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3
amap3SBL.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
amap3SBL.upload.use_menu_baud=0
amap3SBL.upload.baud=115200

###############################################################

# edgeV2.name=SparkFun Edge V2
# edgeV2.build.variant=SparkFun_Edge_V2
# edgeV2.build.board=SFE_EDGE_V2
# edgeV2.upload.tool=artemis_bin2board
# edgeV2.upload.tool=artemis_uart
# edgeV2.upload.maximum_size=960000
# edgeV2.build.arch=APOLLO3
# edgeV2.build.mcu=cortex-m4
Expand All @@ -158,3 +157,4 @@ edge.upload.baud=921600
# edgeV2.upload.baud=115200

# ###############################################################

6 changes: 5 additions & 1 deletion cores/arduino/ard_sup/Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ extern "C"
// Include Apollo headers
#include "am_mcu_apollo.h"
#include "am_util.h"
// #include "am_bsp.h"
// #include "am_bsp.h"

#include <math.h> //Gets us pow()

#ifdef ARDUINO_REDEFINE_OVERFLOW
#warning "restoring OVERFLOW from value in ARDUINO_REDEFINE_OVERFLOW"
Expand Down Expand Up @@ -70,6 +72,8 @@ extern "C"
#define RAD_TO_DEG 57.295779513082320876798154814105
#define EULER 2.718281828459045235360287471352

typedef bool boolean;

enum BitOrder
{
LSBFIRST = 0,
Expand Down
Loading