Merge pull request #258 from sparkfun/v2-release-prep

Author: Owen

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

@@ -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: variants/SFE_ARTEMIS/mbed/.asm-symbols

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