Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	boards.txt
	cores/arduino/USB/USBCore.cpp
	platform.txt
	variants/arduino_zero/variant.cpp

Author: ladyada

CHANGELOG

@@ -1,4 +1,40 @@
-SAMD CORE
+SAMD CORE ?.?.?? ????.??.??
+
+* Fixed type conflict of utoa function. Thanks @kbumsik
+
+SAMD CORE 1.6.11 2016.12.23
+
+* Temporarily disabled support for Arduino Tian until an upload issue is fixed
+
+SAMD CORE 1.6.10 2016.12.23
+
+* Added .org boards
+* Fixed MKRZero `build.board` property
+* linker: .data section is now aligned to 16 bytes address
+* Added support for CRYSTALLESS configurations (thanks @ladyada)
+* Added Circuits Playground board
+* Added method to automatically retrieve sketch start via linker variable
+  (see https://github.com/arduino/ArduinoCore-samd/pull/185)
+* Fixed USBDevice.epBank1EnableTransferComplete method
+* Adapted bootloader source code to CMSIS 4.5
+
+SAMD CORE 1.6.9 2016.12.12
+
+* MKR1000: Enabled PWM on pin 11, it is shared with pin A4
+* SPI: Optimized SPI.transfer(...)
+* Added linker flags for the ARM Math library
+* Added new I2S library
+* Bootloader: Check sketch vectors before waiting for double tap
+* Upgraded CMSIS version to 4.5.0, and use new CMSIS-Atmel package
+* Added Arduino MKRZero board.
+
+SAMD CORE 1.6.8 2016.10.12
+
+* Fixed regression on analogWrite. Thanks @bose-mdellisanti!
+* Fixed regression on SerialUSB.available()
+* C++ global constructors (if any) are now run after hardware initalization.
+
+SAMD CORE 1.6.7 2016.09.28
 
 * Fixed Serial.flush() blocking before any writes. Thanks @hangmoh
 * Added snprintf_P to avr/pgmspace.h stub. Thanks @jantje
@@ -12,6 +48,13 @@ SAMD CORE
 * Added getTimeout() method to Stream.
 * Fixed glitch in PWM generation that may happen when calling analogWrite()
 * PWM frequency is now 732.4Hz (before it was 187500.0Hz)
+* Fixed PWM/analogwrite() not working on pin 13 on the Zero
+* Improved reliability of SerialUSB under heavy load (this should solve
+  all issues with MKR1000/WiFi101 firmware updater on MacOSX)
+* Improved SerialUSB.read() performance
+* Added String::toDouble()
+* Bootloader: LED now pulses and USB TX/RX blink on transfer (like Leonardo)
+* Bootloader: enabled USB string descriptors
 
 SAMD CORE 1.6.6 2016.05.19
 

README.md

@@ -1,7 +1,7 @@
 # Arduino Core for SAMD21 CPU
 
-This repository containts the source code and configuration files of the Arduino Core
-for Atmel's SAMD21 processor (used on the Arduino Zero board).
+This repository contains the source code and configuration files of the Arduino Core
+for Atmel's SAMD21 processor (used on the Arduino/Genuino Zero, MKR1000 and MKRZero boards).
 
 In particular, this adds support for the Adafruit SAMD Boards such as the Feather M0
 

VARIANT_COMPLIANCE_CHANGELOG

@@ -1,8 +1,13 @@
+SAMD CORE 1.6.10
+
+* The linker script must define `__text_start__` symbol at the beginning of .text section.
+  This symbol is used to automatically determine the bootloader size.
+
 SAMD CORE 1.6.6
 
-* digitalPinToInterrupt #define moved to Arduino.h, variant.h must no longer define it
+* `digitalPinToInterrupt` #define moved to Arduino.h, variant.h must no longer define it.
 
 SAMD CORE 1.6.3
 
-* Timer for pin PWM selected based on value of PIN_ATTR_TIMER_ALT or PIN_ATTR_TIMER,
-  prior to this "pin type" (ulPinType) was used
+* Timer for pin PWM selected based on value of `PIN_ATTR_TIMER_ALT` or `PIN_ATTR_TIMER`.
+  Prior to this "pin type" (ulPinType) was used.

boards.txt

@@ -95,3 +95,33 @@ adafruit_feather_m0.bootloader.file=feather/samd21_sam_ba.bin
 #adafruit_metro_m0.build.pid=0x8013
 #adafruit_metro_m0.bootloader.tool=openocd
 #adafruit_metro_m0.bootloader.file=metro/samd21_sam_ba.bin
+
+#
+# Adafruit Circuit Playground M0
+# ------------------------------
+adafruit_circuitplayground_m0.name=Adafruit Circuit Playground Express
+adafruit_circuitplayground_m0.vid.0=0x239A
+adafruit_circuitplayground_m0.pid.0=0x8018
+adafruit_circuitplayground_m0.vid.1=0x239A
+adafruit_circuitplayground_m0.pid.1=0x0018
+adafruit_circuitplayground_m0.upload.tool=bossac
+adafruit_circuitplayground_m0.upload.protocol=sam-ba
+adafruit_circuitplayground_m0.upload.maximum_size=262144
+adafruit_circuitplayground_m0.upload.use_1200bps_touch=true
+adafruit_circuitplayground_m0.upload.wait_for_upload_port=true
+adafruit_circuitplayground_m0.upload.native_usb=true
+adafruit_circuitplayground_m0.build.mcu=cortex-m0plus
+adafruit_circuitplayground_m0.build.f_cpu=48000000L
+adafruit_circuitplayground_m0.build.usb_product="Circuit Playground Express"
+adafruit_circuitplayground_m0.build.usb_manufacturer="Adafruit"
+adafruit_circuitplayground_m0.build.board=SAMD_CIRCUITPLAYGROUND_EXPRESS
+adafruit_circuitplayground_m0.build.core=arduino
+adafruit_circuitplayground_m0.build.extra_flags=-DCRYSTALLESS -DARDUINO_SAMD_ZERO -D__SAMD21G18A__ {build.usb_flags}
+adafruit_circuitplayground_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+adafruit_circuitplayground_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+adafruit_circuitplayground_m0.build.variant=circuitplay
+adafruit_circuitplayground_m0.build.variant_system_lib=
+adafruit_circuitplayground_m0.build.vid=0x239A
+adafruit_circuitplayground_m0.build.pid=0x8018
+adafruit_circuitplayground_m0.bootloader.tool=openocd
+adafruit_circuitplayground_m0.bootloader.file=circuitplay/circuitplay_m0_samd21g18_sam_ba.bin