Skip to content

Commit 5eaa385

Browse files
Wenn0101Wenn0101
authored
Merge pull request #328 from sparkfun/release-candidate
Release v2.0.4 into master
2 parents 834c578 + 84ed968 commit 5eaa385

File tree

36 files changed

+79
-64
lines changed

36 files changed

+79
-64
lines changed

‎boards.txt‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ sfe_artemis.menu.svl_baud.460800=460800
4141
sfe_artemis.menu.svl_baud.230400=230400
4242
sfe_artemis.menu.svl_baud.115200=115200
4343
sfe_artemis.menu.svl_baud.57600=57600
44-
sfe_artemis.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
45-
sfe_artemis.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
44+
sfe_artemis.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
45+
sfe_artemis.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
4646

4747
sfe_artemis.menu.svl_baud.57600.upload.svl_baud=57600
4848
sfe_artemis.menu.svl_baud.115200.upload.svl_baud=115200
@@ -77,8 +77,8 @@ sfe_artemis_atp.menu.svl_baud.460800=460800
7777
sfe_artemis_atp.menu.svl_baud.230400=230400
7878
sfe_artemis_atp.menu.svl_baud.115200=115200
7979
sfe_artemis_atp.menu.svl_baud.57600=57600
80-
sfe_artemis_atp.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
81-
sfe_artemis_atp.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
80+
sfe_artemis_atp.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
81+
sfe_artemis_atp.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
8282

8383
sfe_artemis_atp.menu.svl_baud.57600.upload.svl_baud=57600
8484
sfe_artemis_atp.menu.svl_baud.115200.upload.svl_baud=115200
@@ -113,8 +113,8 @@ sfe_artemis_nano.menu.svl_baud.460800=460800
113113
sfe_artemis_nano.menu.svl_baud.230400=230400
114114
sfe_artemis_nano.menu.svl_baud.115200=115200
115115
sfe_artemis_nano.menu.svl_baud.57600=57600
116-
sfe_artemis_nano.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
117-
sfe_artemis_nano.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
116+
sfe_artemis_nano.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
117+
sfe_artemis_nano.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
118118

119119
sfe_artemis_nano.menu.svl_baud.57600.upload.svl_baud=57600
120120
sfe_artemis_nano.menu.svl_baud.115200.upload.svl_baud=115200
@@ -149,8 +149,8 @@ sfe_artemis_thing_plus.menu.svl_baud.460800=460800
149149
sfe_artemis_thing_plus.menu.svl_baud.230400=230400
150150
sfe_artemis_thing_plus.menu.svl_baud.115200=115200
151151
sfe_artemis_thing_plus.menu.svl_baud.57600=57600
152-
sfe_artemis_thing_plus.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
153-
sfe_artemis_thing_plus.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
152+
sfe_artemis_thing_plus.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
153+
sfe_artemis_thing_plus.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
154154

155155
sfe_artemis_thing_plus.menu.svl_baud.57600.upload.svl_baud=57600
156156
sfe_artemis_thing_plus.menu.svl_baud.115200.upload.svl_baud=115200
@@ -226,8 +226,8 @@ sfe_edge2.menu.svl_baud.460800=460800
226226
sfe_edge2.menu.svl_baud.230400=230400
227227
sfe_edge2.menu.svl_baud.115200=115200
228228
sfe_edge2.menu.svl_baud.57600=57600
229-
sfe_edge2.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
230-
sfe_edge2.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
229+
sfe_edge2.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
230+
sfe_edge2.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
231231

232232
sfe_edge2.menu.svl_baud.57600.upload.svl_baud=57600
233233
sfe_edge2.menu.svl_baud.115200.upload.svl_baud=115200
@@ -245,7 +245,7 @@ sfe_edge2.menu.loader.option_svl.build.ldscript={runtime.platform.path}/tools/up
245245

246246
###############################################################
247247

248-
sfe_artemis_mm_pb.name=Artemis Micro Mod Processor
248+
sfe_artemis_mm_pb.name=Artemis MicroMod Processor
249249
sfe_artemis_mm_pb.build.core=arduino
250250
sfe_artemis_mm_pb.build.variant=SFE_ARTEMIS_MM_PB
251251
sfe_artemis_mm_pb.build.arch=APOLLO3
@@ -262,8 +262,8 @@ sfe_artemis_mm_pb.menu.svl_baud.460800=460800
262262
sfe_artemis_mm_pb.menu.svl_baud.230400=230400
263263
sfe_artemis_mm_pb.menu.svl_baud.115200=115200
264264
sfe_artemis_mm_pb.menu.svl_baud.57600=57600
265-
sfe_artemis_mm_pb.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
266-
sfe_artemis_mm_pb.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
265+
sfe_artemis_mm_pb.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
266+
sfe_artemis_mm_pb.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
267267

268268
sfe_artemis_mm_pb.menu.svl_baud.57600.upload.svl_baud=57600
269269
sfe_artemis_mm_pb.menu.svl_baud.115200.upload.svl_baud=115200
@@ -298,8 +298,9 @@ sfe_artemis_module.menu.svl_baud.460800=460800
298298
sfe_artemis_module.menu.svl_baud.230400=230400
299299
sfe_artemis_module.menu.svl_baud.115200=115200
300300
sfe_artemis_module.menu.svl_baud.57600=57600
301-
sfe_artemis_module.menu.loader.option_asb=Ambiq Secure Bootloader (Recommended)
302-
sfe_artemis_module.menu.loader.option_svl=SparkFun Variable Loader (Out of Order)
301+
sfe_artemis_module.menu.loader.option_svl=SparkFun Variable Loader (Recommended)
302+
sfe_artemis_module.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
303+
303304

304305
sfe_artemis_module.menu.svl_baud.57600.upload.svl_baud=57600
305306
sfe_artemis_module.menu.svl_baud.115200.upload.svl_baud=115200

‎cores/arduino/sdk/core-implement/CommonAnalog.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ int analogReadVSS( void ){
150150
void indexAnalogWrite(pin_size_t index, int val){
151151
// todo: replace with mbed "PwmOut" functionality
152152

153-
pin_size_t pinNumber = pinNumberByIndex(index);
153+
pin_size_t pinNumber = pinNameByIndex(index);
154154
if(pinNumber == (pin_size_t)NC){ return; }
155155
ap3_gpio_pad_t pad = pinNumber;
156156

‎cores/mbed-os‎

Submodule mbed-os updated 129 files

‎libraries/EEPROM/examples/Example2_Structures/Example2_Structures.ino‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
#include "EEPROM.h"
77

8-
#define SERIAL Serial
9-
108
#define EEPROM_PREFS_IDX (0)
119
#define EEPROM_VALID_CODE (0xAB)
1210
#define DEFAULT_VER_MAJOR (0)
@@ -23,44 +21,46 @@ typedef struct {
2321
preferences_t prefs;
2422

2523
void setup() {
26-
SERIAL.begin(115200);
27-
SERIAL.println("EEPROM Example2_Structures");
24+
Serial.begin(115200);
25+
Serial.println("EEPROM Example2_Structures");
26+
EEPROM.init();
2827

2928
// use EEPROM.get(int index, T type) to retrieve
3029
// an arbitrary type from flash memory
30+
prefs.valid = 0x00;
3131
EEPROM.get(EEPROM_PREFS_IDX, prefs);
3232

3333
if(prefs.valid != EEPROM_VALID_CODE){
34-
SERIAL.println("EEPROM was invalid");
34+
Serial.println("EEPROM was invalid");
3535

3636
// use EEPROM to store the default structure
3737
preferences_t default_prefs;
38-
EEPROM.put(EEPROM_VALID_IDX, default_prefs);
38+
EEPROM.put(EEPROM_PREFS_IDX, default_prefs);
3939

40-
SERIAL.println("EEPROM initialized");
40+
Serial.println("EEPROM initialized");
4141
}
4242

4343
// verify that the prefs are valid
4444
EEPROM.get(EEPROM_PREFS_IDX, prefs);
4545
if(prefs.valid != EEPROM_VALID_CODE){
46-
SERIAL.println("ERROR");
46+
Serial.println("ERROR");
4747
while(1){};
4848
}
4949

50-
SERIAL.println("EEPROM is valid");
50+
Serial.println("EEPROM is valid");
5151

52-
SERIAL.printf("version: %d.%d.%d\n", refs.major, prefs.minor, prefs.patch);
52+
Serial.printf("version: %d.%d.%d\n", prefs.ver_major, prefs.ver_minor, prefs.ver_patch);
5353

54-
SERIAL.printf("\nany characters received over SERIAL will increment the patch version and be stored after power-down\n");
54+
Serial.printf("\nany characters received over SERIAL will increment the patch version and be stored after power-down\n");
5555
}
5656

5757
void loop() {
58-
if(SERRIAL.available()){
59-
while(SERIAL.available()){
60-
SERIAL.read();
61-
prefs.patch++;
58+
if(Serial.available()){
59+
while(Serial.available()){
60+
Serial.read();
61+
prefs.ver_patch++;
6262
}
6363
EEPROM.put(EEPROM_PREFS_IDX, prefs);
64-
SERIAL.printf("version: %d.%d.%d\n", refs.major, prefs.minor, prefs.patch);
64+
Serial.printf("version: %d.%d.%d\n", prefs.ver_major, prefs.ver_minor, prefs.ver_patch);
6565
}
6666
}

‎libraries/EEPROM/src/EEPROM.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ EEPROMClass EEPROM;
1414
#define EEPROM_ADDRESS(A) ((A/AM_HAL_FLASH_PAGE_SIZE) * AM_HAL_FLASH_PAGE_SIZE)
1515
#define EEPROM_SIZE(S) (((S+(AM_HAL_FLASH_PAGE_SIZE-1))/AM_HAL_FLASH_PAGE_SIZE) * AM_HAL_FLASH_PAGE_SIZE)
1616

17-
EEPROMClass::EEPROMClass(uint32_t address, uint32_t size)
17+
EEPROMClass::EEPROMClass(uint32_t address, uint32_t size) :
1818
FlashIAPBlockDevice(EEPROM_ADDRESS(address), EEPROM_SIZE(size))
1919
{
2020

2121
}
2222

2323
EEPROMClass::EEPROMClass(void) :
24-
EEPROM(DEFAULT_ADDRESS, DEFAULT_SIZE)
24+
FlashIAPBlockDevice(DEFAULT_ADDRESS, DEFAULT_SIZE)
2525
{
2626

2727
}

‎libraries/EEPROM/src/EEPROM.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
#define _APOLLO3_LIBRARIES_EEPROM_H_
88

99
#include "Arduino.h"
10+
#include "FlashIAPBlockDevice.h"
1011

1112
#define EEPROM_DEFAULT_SRAM_USAGE (1024)
1213

1314
typedef struct _eeprom_config_t {
1415
mbed::bd_size_t sram_bytes = EEPROM_DEFAULT_SRAM_USAGE;
1516
} eeprom_config_t;
1617

17-
class EEPROMClass : protected FlashIAPBlockDevice {
18+
class EEPROMClass : public FlashIAPBlockDevice {
1819
private:
1920
eeprom_config_t _cfg;
2021

@@ -35,17 +36,17 @@ class EEPROMClass : protected FlashIAPBlockDevice {
3536
}
3637
uint8_t read(int idx){
3738
uint8_t val = 0x00;
38-
read(&val, idx, 1);
39+
read(idx, &val, 1);
3940
return val;
4041
}
4142
void write(int idx, uint8_t* data, uint32_t size){
4243
mbed::bd_size_t scratch_size = (_cfg.sram_bytes+3)/4;
4344
uint32_t scratch[scratch_size];
4445
FlashIAPBlockDevice::read((uint8_t*)scratch, 0, _cfg.sram_bytes); // keep all of flash in sram in case we need to erase
45-
if(memcmp((void*)(((uint8_t*)scratch) + idx), data, size)){ // compare desired data (data) to existing information in flash (scratch)
46+
if(memcmp((void*)(((uint8_t*)scratch) + idx), data, size)){ // compare desired data (data) to existing information in flash (scratch)
4647
erase();
48+
memcpy(scratch, data, size);
4749
int result = FlashIAPBlockDevice::program((uint8_t*)scratch, 0, 4*scratch_size);
48-
printf("updating flash. result: %d\n", result);
4950
return;
5051
}
5152
printf("contents already match\n");
@@ -66,7 +67,7 @@ class EEPROMClass : protected FlashIAPBlockDevice {
6667
}
6768

6869
template <typename T> T &get(int idx, T &t){
69-
read((uint8_t*)&t, idx, sizeof(T)/sizeof(uint8_t));
70+
read(idx,(uint8_t*)&t, sizeof(T)/sizeof(uint8_t));
7071
return t;
7172
}
7273

‎platform.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ defines.cxx={defines.all} @{build.variant.path}/mbed/.cxx-symbols
2121
defines.ld={defines.all} @{build.variant.path}/mbed/.ld-symbols
2222

2323
# includes
24-
includes.core={includes} "-I{cores.path}/arduino" "-I{cores.path}/arduino/mbed-bridge" "-I{cores.path}/arduino/mbed-bridge/core-api"
24+
includes.core={includes} "-I{cores.path}/arduino" "-I{cores.path}/arduino/mbed-bridge" "-I{cores.path}/arduino/mbed-bridge/core-api"
2525
includes.mbed=@{build.variant.path}/mbed/.includes
2626
includes.variant={build.includes}
27-
includes.extra=
27+
includes.extra="-I{cores.path}/mbed-os/drivers/"
2828
includes.all={includes.core} {includes.mbed} {includes.variant} {includes.extra}
2929

3030
# libraries

‎tools/config/blocklist.json‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,20 @@
1212
},
1313
"cxx": {
1414
"flags": [
15-
"-MMD"
15+
"-Wvla",
16+
"-Wall",
17+
"-Wextra",
18+
"-Wno-missing-field-initializers",
19+
"-Wno-unused-parameter"
20+
]
21+
},
22+
"c": {
23+
"flags": [
24+
"-Wvla",
25+
"-Wall",
26+
"-Wextra",
27+
"-Wno-missing-field-initializers",
28+
"-Wno-unused-parameter"
1629
]
1730
}
1831
}

‎variants/SFE_ARTEMIS/mbed/.c-flags‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-c -std=gnu11 -DMBED_MINIMAL_PRINTF -DMBED_TRAP_ERRORS_ENABLED=1 -MMD -Os -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -fdata-sections -ffunction-sections -fmessage-length=0 -fno-exceptions -fomit-frame-pointer -funsigned-char -g -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -mthumb
1+
-c -std=gnu11 -DMBED_MINIMAL_PRINTF -DMBED_TRAP_ERRORS_ENABLED=1 -MMD -Os -fdata-sections -ffunction-sections -fmessage-length=0 -fno-exceptions -fomit-frame-pointer -funsigned-char -g -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -mthumb

‎variants/SFE_ARTEMIS/mbed/.cxx-flags‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-Wvla -c -fno-rtti -std=gnu++14 -DMBED_MINIMAL_PRINTF -DMBED_TRAP_ERRORS_ENABLED=1 -Os -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -fdata-sections -ffunction-sections -fmessage-length=0 -fno-exceptions -fomit-frame-pointer -funsigned-char -g -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -mthumb
1+
-c -fno-rtti -std=gnu++14 -DMBED_MINIMAL_PRINTF -DMBED_TRAP_ERRORS_ENABLED=1 -MMD -Os -fdata-sections -ffunction-sections -fmessage-length=0 -fno-exceptions -fomit-frame-pointer -funsigned-char -g -mcpu=cortex-m4 -mfloat-abi=softfp -mfpu=fpv4-sp-d16 -mthumb

0 commit comments

Comments
 (0)