Skip to content

v2.0.0 #259

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 11 commits into from
Sep 9, 2020
Merged

v2.0.0 #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6e3355c
Default boards to ASB uploader
Aug 30, 2020
7dbb396
Update mbed-os
Sep 2, 2020
581ae9f
Update mbed-os
Sep 2, 2020
512e67b
update preprocessor #defines
Sep 3, 2020
7bf1e36
prevent double-initialization of I2C IOM modules
Sep 4, 2020
d497ede
Update mbed-os
Sep 8, 2020
51ece4e
Merge pull request #257 from sparkfun/v2-release-prep
Sep 8, 2020
c7bd1da
generated variants mbed resources
Sep 8, 2020
687350b
update Serial exmaple
Sep 9, 2020
f8e8bb9
Merge pull request #258 from sparkfun/v2-release-prep
Sep 9, 2020
810d434
generated variants mbed resources
Sep 9, 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
12 changes: 6 additions & 6 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,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_svl=SparkFun Variable Loader (Recommended)
sfe_artemis.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
sfe_artemis.menu.loader.option_svl=SparkFun Variable Loader (Recommended)

sfe_artemis.menu.svl_baud.57600.upload.svl_baud=57600
sfe_artemis.menu.svl_baud.115200.upload.svl_baud=115200
Expand Down Expand Up @@ -68,8 +68,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_svl=SparkFun Variable Loader (Recommended)
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.svl_baud.57600.upload.svl_baud=57600
sfe_artemis_atp.menu.svl_baud.115200.upload.svl_baud=115200
Expand Down Expand Up @@ -101,8 +101,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_svl=SparkFun Variable Loader (Recommended)
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.svl_baud.57600.upload.svl_baud=57600
sfe_artemis_nano.menu.svl_baud.115200.upload.svl_baud=115200
Expand Down Expand Up @@ -134,8 +134,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_svl=SparkFun Variable Loader (Recommended)
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.svl_baud.57600.upload.svl_baud=57600
sfe_artemis_thing_plus.menu.svl_baud.115200.upload.svl_baud=115200
Expand Down Expand Up @@ -205,8 +205,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_svl=SparkFun Variable Loader (Recommended)
sfe_edge2.menu.loader.option_asb=Ambiq Secure Bootloader (Advanced)
sfe_edge2.menu.loader.option_svl=SparkFun Variable Loader (Recommended)

sfe_edge2.menu.svl_baud.57600.upload.svl_baud=57600
sfe_edge2.menu.svl_baud.115200.upload.svl_baud=115200
Expand Down Expand Up @@ -238,8 +238,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_svl=SparkFun Variable Loader (Recommended)
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.svl_baud.57600.upload.svl_baud=57600
sfe_artemis_module.menu.svl_baud.115200.upload.svl_baud=115200
Expand Down
2 changes: 1 addition & 1 deletion cores/mbed-os
Open in desktop
Submodule mbed-os updated 7 files
+5 −1 features/FEATURE_BLE/targets/TARGET_Ambiq_Micro/TARGET_Apollo3/AP3CordioHCITransportDriver.cpp
+2 −1 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device/flash_api.c
+13 −1 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device/lp_ticker.c
+51 −112 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/device/serial_api.c
+91 −1 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk/mcu/apollo3/hal/am_hal_uart.c
+5 −1 targets/TARGET_Ambiq_Micro/TARGET_Apollo3/sdk/mcu/apollo3/hal/am_hal_uart.h
+1 −1 targets/targets.json
26 changes: 1 addition & 25 deletions libraries/Apollo3/examples/Serial/Serial.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,11 @@
| | 47
*/

// uncomment to define SERIAL1_TX and SERIAL1_RX as custom pin numbers in case they
// are not defined by default (look up the correct pad <--> pin mapping for your board
#define SERIAL1_TX 35
#define SERIAL1_RX 13

// uncomment to use these names if defined for your board
// (these are also the pins used for Serial1, which is
// available on applicable boards)
#define HAS_SERIAL1
UART mySerial(SERIAL1_TX, SERIAL1_RX);

#define BAUD 115200 // any number, common choices: 9600, 115200, 230400, 921600
#define CONFIG SERIAL_8N1 // a config value from HardwareSerial.h (defaults to SERIAL_8N1)

void setup() {
Serial.begin(BAUD); // set the baud rate with the begin() method
Serial.begin(BAUD); // set the baud rate with the begin() method
Serial.println("\n\nApollo3 - Serial");

// the Apollo3 core supports printf on Serial
Expand All @@ -74,23 +63,10 @@ void setup() {
}

Serial.println("\nEcho... (type characters into the Serial Monitor to see them echo back)\n");


#ifdef HAS_SERIAL1
mySerial.begin(BAUD, CONFIG); // specify the config setting as the secnd argument
mySerial.println("\n\nApollo3 - mySerial");
mySerial.println("\nEcho... (type characters into the Serial Monitor to see them echo back)\n");
#endif
}

void loop() {
while(Serial.available()){
Serial.write(Serial.read());
}

#ifdef HAS_SERIAL1
while(mySerial.available()){
mySerial.write(mySerial.read());
}
#endif
}
8 changes: 6 additions & 2 deletions libraries/Wire/src/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@
arduino::MbedI2C::MbedI2C(int sda, int scl) : _sda(sda), _scl(scl), usedTxBuffer(0) {}

void arduino::MbedI2C::begin() {
master = new mbed::I2C((PinName)_sda, (PinName)_scl);
if(!master){
master = new mbed::I2C((PinName)_sda, (PinName)_scl);
}
}

void arduino::MbedI2C::begin(uint8_t slaveAddr) {
#ifdef DEVICE_I2CSLAVE
slave = new mbed::I2CSlave((PinName)_sda, (PinName)_scl);
if(!slave){
slave = new mbed::I2CSlave((PinName)_sda, (PinName)_scl);
}
slave->address(slaveAddr << 1);
slave_th.start(mbed::callback(this, &arduino::MbedI2C::receiveThd));
#endif
Expand Down
2 changes: 1 addition & 1 deletion platform.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ defines.mbed=-DMBED_NO_GLOBAL_USING_DIRECTIVE
defines.variant={build.defines}
defines.extra=
defines.all={defines.variant} {defines.arduino} {defines.mbed} {defines.extra} -DCORDIO_ZERO_COPY_HCI
defines.preproc={defines.mbed.cxx}
defines.preproc={defines.all}
defines.asm={defines.all} @{build.variant.path}/mbed/.asm-symbols
defines.c={defines.all} @{build.variant.path}/mbed/.c-symbols
defines.cxx={defines.all} @{build.variant.path}/mbed/.cxx-symbols
Expand Down
2 changes: 1 addition & 1 deletion variants/SFE_ARTEMIS/mbed/.asm-symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -DCORDIO_ZERO_COPY_HCI -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM
2 changes: 1 addition & 1 deletion variants/SFE_ARTEMIS/mbed/.c-symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1
2 changes: 1 addition & 1 deletion variants/SFE_ARTEMIS/mbed/.cxx-symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1
-DAM_PACKAGE_BGA -DARM_MATH_CM4 -DCOMPONENT_FLASHIAP=1 -DCORDIO_ZERO_COPY_HCI -DDEVICE_FLASH=1 -DDEVICE_I2C=1 -DDEVICE_INTERRUPTIN=1 -DDEVICE_LPTICKER=1 -DDEVICE_MPU=1 -DDEVICE_SERIAL=1 -DDEVICE_SPI=1 -DDEVICE_STDIO_MESSAGES=1 -DDEVICE_USTICKER=1 -DFEATURE_BLE=1 -DTARGET_AMA3B1KK -DTARGET_Ambiq_Micro -DTARGET_Apollo3 -DTARGET_CORDIO -DTARGET_CORTEX -DTARGET_CORTEX_M -DTARGET_FAMILY_Apollo3 -DTARGET_LIKE_CORTEX_M4 -DTARGET_LIKE_MBED -DTARGET_M4 -DTARGET_NAME=SFE_ARTEMIS -DTARGET_RELEASE -DTARGET_RTOS_M4_M7 -DTARGET_SFE_ARTEMIS -DTOOLCHAIN_GCC -DTOOLCHAIN_GCC_ARM -D__CMSIS_RTOS -D__CORTEX_M4 -D__FPU_PRESENT=1 -D__MBED_CMSIS_RTOS_CM -D__MBED__=1
Loading