Merge pull request #259 from sparkfun/release-candidate

Author: Owen

Diff for: boards.txt

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Diff for: cores/mbed-os

@@ -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
@@ -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
 }

Diff for: libraries/Apollo3/examples/Serial/Serial.ino

@@ -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

Diff for: libraries/Wire/src/Wire.cpp

@@ -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

Diff for: platform.txt

@@ -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 

Diff for: variants/SFE_ARTEMIS/mbed/.asm-symbols

@@ -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 

Diff for: variants/SFE_ARTEMIS/mbed/.c-symbols

@@ -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