Skip to content

Commit 9d744aa

Browse files
authored
Merge pull request #6 from sparkfun/bl2
Add new Artemis bootloader
2 parents d63ca26 + 2486c81 commit 9d744aa

File tree

18 files changed

+810
-463
lines changed

18 files changed

+810
-463
lines changed

boards.txt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
artemis.name=SparkFun Artemis Module
2424
artemis.build.variant=SparkFun_Artemis
2525
artemis.build.board=SFE_ARTEMIS
26-
artemis.upload.tool=artemis_bin2board
26+
artemis.upload.tool=artemis_uart
2727
artemis.upload.maximum_size=960000
2828
artemis.build.arch=APOLLO3
2929
artemis.build.mcu=cortex-m4
@@ -43,7 +43,7 @@ artemis.upload.baud=115200
4343
amap3blackboard.name=SparkFun BlackBoard Artemis
4444
amap3blackboard.build.variant=SparkFun_BlackBoard_Artemis
4545
amap3blackboard.build.board=AM_AP3_SFE_BB_ARTEMIS
46-
amap3blackboard.upload.tool=artemis_bin2board
46+
amap3blackboard.upload.tool=artemis_uart
4747
amap3blackboard.upload.maximum_size=960000
4848
amap3blackboard.build.arch=APOLLO3
4949
amap3blackboard.build.mcu=cortex-m4
@@ -60,30 +60,10 @@ amap3blackboard.upload.baud=115200
6060

6161
###############################################################
6262

63-
amap3blackboardBL.name=SparkFun BlackBoard Artemis 80k Offset
64-
amap3blackboardBL.build.variant=SparkFun_BlackBoard_Artemis_BL
65-
amap3blackboardBL.build.board=AM_AP3_SFE_BB_ARTEMIS_BL
66-
amap3blackboardBL.upload.tool=artemis_bin2board
67-
amap3blackboardBL.upload.maximum_size=960000
68-
amap3blackboardBL.build.arch=APOLLO3
69-
amap3blackboardBL.build.mcu=cortex-m4
70-
amap3blackboardBL.build.f_cpu=48000000L
71-
amap3blackboardBL.build.core=arduino
72-
amap3blackboardBL.build.defs=
73-
amap3blackboardBL.build.includes=-I{build.variant.path}/config
74-
amap3blackboardBL.build.libs=
75-
amap3blackboardBL.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3
76-
amap3blackboardBL.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
77-
amap3blackboardBL.upload.maximum_size=960000
78-
edge.upload.use_menu_baud=0
79-
amap3blackboardBL.upload.baud=115200
80-
81-
###############################################################
82-
8363
amap3nano.name=SparkFun BlackBoard Artemis Nano
8464
amap3nano.build.variant=SparkFun_BlackBoard_Artemis_Nano
8565
amap3nano.build.board=AM_AP3_SFE_BB_ARTEMIS_NANO
86-
amap3nano.upload.tool=artemis_bin2board
66+
amap3nano.upload.tool=artemis_uart
8767
amap3nano.upload.maximum_size=960000
8868
amap3nano.build.arch=APOLLO3
8969
amap3nano.build.mcu=cortex-m4
@@ -103,7 +83,7 @@ amap3nano.upload.baud=115200
10383
amap3mega.name=SparkFun BlackBoard Artemis Mega
10484
amap3mega.build.variant=SparkFun_BlackBoard_Artemis_Mega
10585
amap3mega.build.board=AM_AP3_SFE_BB_ARTEMIS_MEGA
106-
amap3mega.upload.tool=artemis_bin2board
86+
amap3mega.upload.tool=artemis_uart
10787
amap3mega.upload.maximum_size=960000
10888
amap3mega.build.arch=APOLLO3
10989
amap3mega.build.mcu=cortex-m4
@@ -139,10 +119,29 @@ edge.upload.baud=921600
139119

140120
###############################################################
141121

122+
amap3SBL.name=Abmiq SBL
123+
amap3SBL.build.variant=SparkFun_Ambiq_SBL
124+
amap3SBL.build.board=SFE_AMB_SBL
125+
amap3SBL.upload.tool=artemis_bin2board
126+
amap3SBL.upload.maximum_size=960000
127+
amap3SBL.build.arch=APOLLO3
128+
amap3SBL.build.mcu=cortex-m4
129+
amap3SBL.build.f_cpu=48000000L
130+
amap3SBL.build.core=arduino
131+
amap3SBL.build.defs=
132+
amap3SBL.build.includes=-I{build.variant.path}/config
133+
amap3SBL.build.libs=
134+
amap3SBL.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3
135+
amap3SBL.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
136+
amap3SBL.upload.use_menu_baud=0
137+
amap3SBL.upload.baud=115200
138+
139+
###############################################################
140+
142141
# edgeV2.name=SparkFun Edge V2
143142
# edgeV2.build.variant=SparkFun_Edge_V2
144143
# edgeV2.build.board=SFE_EDGE_V2
145-
# edgeV2.upload.tool=artemis_bin2board
144+
# edgeV2.upload.tool=artemis_uart
146145
# edgeV2.upload.maximum_size=960000
147146
# edgeV2.build.arch=APOLLO3
148147
# edgeV2.build.mcu=cortex-m4
@@ -158,3 +157,4 @@ edge.upload.baud=921600
158157
# edgeV2.upload.baud=115200
159158

160159
# ###############################################################
160+

cores/arduino/ard_sup/Arduino.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ extern "C"
3939
// Include Apollo headers
4040
#include "am_mcu_apollo.h"
4141
#include "am_util.h"
42-
// #include "am_bsp.h"
42+
// #include "am_bsp.h"
43+
44+
#include <math.h> //Gets us pow()
4345

4446
#ifdef ARDUINO_REDEFINE_OVERFLOW
4547
#warning "restoring OVERFLOW from value in ARDUINO_REDEFINE_OVERFLOW"
@@ -70,6 +72,8 @@ extern "C"
7072
#define RAD_TO_DEG 57.295779513082320876798154814105
7173
#define EULER 2.718281828459045235360287471352
7274

75+
typedef bool boolean;
76+
7377
enum BitOrder
7478
{
7579
LSBFIRST = 0,

0 commit comments

Comments
 (0)