Merge branch 'master' of https://github.com/arduino/ArduinoCore-samd

Conflicts:
	boards.txt
	platform.txt
	variants/arduino_zero/variant.h

Author: ladyada

CHANGELOG

@@ -1,7 +1,22 @@
-SAMD CORE 1.6.5
+SAMD CORE 1.6.6
 
+* Fixed digitalPinToInterrupt() macro, now it works as documented.
+* Added analogInputToDigitalPin macro
+* Fixed NUM_DIGITAL_PINS for Zero Board.
+* On-board RX-TX LEDs now blinks when there is activity on the native USB port
+* Fixed platform.txt, the core now compiles again with Arduino IDE <=1.6.5. Thanks @per1234
+* Fixed Wire.write(0x00) "ambiguos method" error
+* String class now supports iterators. Thanks @Chris--A
+* Remove enabling bootloader protection when burning bootloader. This enables WDT, so sketches do not work.
+
+SAMD CORE 1.6.5 2016.04.02
+
+* Added Arduino/Genuino MKR1000 board
 * Set NVMCTRL.MANW bit to 1 (default is 0). This prevents accidental writes on program memory.
 * Bootloader: Fixed wrong UART speed (regression)
+* Fixed incorrect return value from Wire.available() when the receive buffer is not fully read.
+* Added DAC0 definition in Arduino/Genuino Zero variant file.
+* Enabled bootloader protection after "Burn bootloader".
 
 SAMD CORE 1.6.4 2016.02.19
 

VARIANT_COMPLIANCE_CHANGELOG

@@ -0,0 +1,8 @@
+SAMD CORE 1.6.6
+
+* 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

boards.txt

@@ -42,30 +42,29 @@ adafruit_feather_m0.build.pid=0x800B
 adafruit_feather_m0.bootloader.tool=openocd
 adafruit_feather_m0.bootloader.file=feather/samd21_sam_ba.bin
 
-
-adafruit_metro_m0.name=Adafruit Metro M0 (Native USB Port)
-adafruit_metro_m0.vid.0=0x239A
-adafruit_metro_m0.pid.0=0x8013
-adafruit_metro_m0.vid.1=0x239A
-adafruit_metro_m0.pid.1=0x0013
-adafruit_metro_m0.upload.tool=bossac
-adafruit_metro_m0.upload.protocol=sam-ba
-adafruit_metro_m0.upload.maximum_size=262144
-adafruit_metro_m0.upload.use_1200bps_touch=true
-adafruit_metro_m0.upload.wait_for_upload_port=true
-adafruit_metro_m0.upload.native_usb=true
-adafruit_metro_m0.build.mcu=cortex-m0plus
-adafruit_metro_m0.build.f_cpu=48000000L
-adafruit_metro_m0.build.usb_product="Metro M0"
-adafruit_metro_m0.build.usb_manufacturer="Adafruit"
-adafruit_metro_m0.build.board=SAMD_ZERO
-adafruit_metro_m0.build.core=arduino
-adafruit_metro_m0.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
-adafruit_metro_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
-adafruit_metro_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
-adafruit_metro_m0.build.variant=arduino_zero
-adafruit_metro_m0.build.variant_system_lib=
-adafruit_metro_m0.build.vid=0x239A
-adafruit_metro_m0.build.pid=0x8013
-adafruit_metro_m0.bootloader.tool=openocd
-adafruit_metro_m0.bootloader.file=metro/samd21_sam_ba.bin
+#adafruit_metro_m0.name=Adafruit Metro M0 (Native USB Port)
+#adafruit_metro_m0.vid.0=0x239A
+#adafruit_metro_m0.pid.0=0x8013
+#adafruit_metro_m0.vid.1=0x239A
+#adafruit_metro_m0.pid.1=0x0013
+#adafruit_metro_m0.upload.tool=bossac
+#adafruit_metro_m0.upload.protocol=sam-ba
+#adafruit_metro_m0.upload.maximum_size=262144
+#adafruit_metro_m0.upload.use_1200bps_touch=true
+#adafruit_metro_m0.upload.wait_for_upload_port=true
+#adafruit_metro_m0.upload.native_usb=true
+#adafruit_metro_m0.build.mcu=cortex-m0plus
+#adafruit_metro_m0.build.f_cpu=48000000L
+#adafruit_metro_m0.build.usb_product="Metro M0"
+#adafruit_metro_m0.build.usb_manufacturer="Adafruit"
+#adafruit_metro_m0.build.board=SAMD_ZERO
+#adafruit_metro_m0.build.core=arduino
+#adafruit_metro_m0.build.extra_flags=-D__SAMD21G18A__ {build.usb_flags}
+#adafruit_metro_m0.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
+#adafruit_metro_m0.build.openocdscript=openocd_scripts/arduino_zero.cfg
+#adafruit_metro_m0.build.variant=arduino_zero
+#adafruit_metro_m0.build.variant_system_lib=
+#adafruit_metro_m0.build.vid=0x239A
+#adafruit_metro_m0.build.pid=0x8013
+#adafruit_metro_m0.bootloader.tool=openocd
+#adafruit_metro_m0.bootloader.file=metro/samd21_sam_ba.bin

bootloaders/zero/README.md

@@ -9,6 +9,10 @@ Multi-plaform GCC is provided by ARM here: https://launchpad.net/gcc-arm-embedde
 
 Atmel Studio contains both make and ARM GCC toolchain. You don't need to install them in this specific use case.
 
+For all builds and platforms you will need to have the Arduino IDE installed and the board support
+package for "Arduino SAMD Boards (32-bits ARM Cortex-M0+)". You can install the latter
+from the former's "Boards Manager" UI.
+
 ### Windows
 
 * Native command line

bootloaders/zero/samd21_sam_ba.bin

@@ -114,6 +114,11 @@ void loop( void ) ;
 
 #define bit(b) (1UL << (b))
 
+#if (ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10606)
+// Interrupts
+#define digitalPinToInterrupt(P)   ( P )
+#endif
+
 // USB Device
 #include "USB/USBDesc.h"
 #include "USB/USBCore.h"

cores/arduino/Arduino.h

@@ -28,6 +28,14 @@
 
 USBDevice_SAMD21G18x usbd;
 
+/** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
+#define TX_RX_LED_PULSE_MS 100
+#ifdef PIN_LED_TXL
+static volatile uint8_t txLEDPulse; /**< Milliseconds remaining for data Tx LED pulse */
+#endif
+#ifdef PIN_LED_RXL
+static volatile uint8_t rxLEDPulse; /**< Milliseconds remaining for data Rx LED pulse */
+#endif
 static char isRemoteWakeUpEnabled = 0;
 static char isEndpointHalt = 0;
 
@@ -90,18 +98,18 @@ bool USBDeviceClass::sendStringDescriptor(const uint8_t *string, uint8_t maxlen)
 	if (maxlen < 2)
 		return false;
 
-	uint16_t buff[maxlen/2];
-	int l = 1;
+	uint8_t buffer[maxlen];
+	buffer[0] = strlen((const char*)string) * 2 + 2;
+	buffer[1] = 0x03;
 
-	maxlen -= 2;
-	while (*string && maxlen>0)
-	{
-		buff[l++] = (uint8_t)(*string++);
-		maxlen -= 2;
+	uint8_t i;
+	for (i = 2; i < maxlen && *string; i++) {
+		buffer[i++] = *string++;
+		if (i == maxlen) break;
+		buffer[i] = 0;
 	}
-	buff[0] = (3<<8) | (l*2);
 
-	return USBDevice.sendControl((uint8_t*)buff, l*2);
+	return USBDevice.sendControl(buffer, i);
 }
 
 bool _dry_run = false;
@@ -273,6 +281,18 @@ void USBDeviceClass::handleEndpoint(uint8_t ep)
 
 void USBDeviceClass::init()
 {
+#ifdef PIN_LED_TXL
+	txLEDPulse = 0;
+	pinMode(PIN_LED_TXL, OUTPUT);
+	digitalWrite(PIN_LED_TXL, HIGH);
+#endif
+
+#ifdef PIN_LED_RXL
+	rxLEDPulse = 0;
+	pinMode(PIN_LED_RXL, OUTPUT);
+	digitalWrite(PIN_LED_RXL, HIGH);
+#endif
+
 	// Enable USB clock
 	PM->APBBMASK.reg |= PM_APBBMASK_USB;
 
@@ -522,6 +542,11 @@ uint32_t USBDeviceClass::recv(uint32_t ep, void *_data, uint32_t len)
 	if (available(ep) < len)
 		len = available(ep);
 
+#ifdef PIN_LED_RXL
+	digitalWrite(PIN_LED_RXL, LOW);
+	rxLEDPulse = TX_RX_LED_PULSE_MS;
+#endif
+
 	armRecv(ep);
 
 	usbd.epBank0DisableTransferComplete(ep);
@@ -620,6 +645,11 @@ uint32_t USBDeviceClass::send(uint32_t ep, const void *data, uint32_t len)
 	}
 #endif
 
+#ifdef PIN_LED_TXL
+	digitalWrite(PIN_LED_TXL, LOW);
+	txLEDPulse = TX_RX_LED_PULSE_MS;
+#endif
+
 	// Flash area
 	while (len != 0)
 	{
@@ -826,6 +856,17 @@ void USBDeviceClass::ISRHandler()
 	if (usbd.isStartOfFrameInterrupt())
 	{
 		usbd.ackStartOfFrameInterrupt();
+
+		// check whether the one-shot period has elapsed.  if so, turn off the LED
+#ifdef PIN_LED_TXL
+		if (txLEDPulse && !(--txLEDPulse))
+			digitalWrite(PIN_LED_TXL, HIGH);
+#endif
+
+#ifdef PIN_LED_RXL
+		if (rxLEDPulse && !(--rxLEDPulse))
+			digitalWrite(PIN_LED_RXL, HIGH);
+#endif
 	}
 
 	// Endpoint 0 Received Setup interrupt

cores/arduino/USB/USBCore.cpp

@@ -57,7 +57,11 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
   uint32_t config;
   uint32_t pos;
 
+#if ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10606
+  EExt_Interrupts in = g_APinDescription[pin].ulExtInt;
+#else
   EExt_Interrupts in = digitalPinToInterrupt(pin);
+#endif
   if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
     return;
 
@@ -116,7 +120,11 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
  */
 void detachInterrupt(uint32_t pin)
 {
+#if (ARDUINO_SAMD_VARIANT_COMPLIANCE >= 10606)
+  EExt_Interrupts in = g_APinDescription[pin].ulExtInt;
+#else
   EExt_Interrupts in = digitalPinToInterrupt(pin);
+#endif 
   if (in == NOT_AN_INTERRUPT || in == EXTERNAL_INT_NMI)
     return;
 

cores/arduino/WInterrupts.c

@@ -81,7 +81,7 @@ class String
 	inline unsigned int length(void) const {return len;}
 
 	// creates a copy of the assigned value.  if the value is null or
-	// invalid, or if the memory allocation fails, the string will be 
+	// invalid, or if the memory allocation fails, the string will be
 	// marked as invalid ("if (s)" will be false).
 	String & operator = (const String &rhs);
 	String & operator = (const char *cstr);
@@ -92,10 +92,10 @@ class String
 	#endif
 
 	// concatenate (works w/ built-in types)
-	
+
 	// returns true on success, false on failure (in which case, the string
-	// is left unchanged).  if the argument is null or invalid, the 
-	// concatenation is considered unsucessful.  
+	// is left unchanged).  if the argument is null or invalid, the
+	// concatenation is considered unsucessful.
 	unsigned char concat(const String &str);
 	unsigned char concat(const char *cstr);
 	unsigned char concat(char c);
@@ -107,7 +107,7 @@ class String
 	unsigned char concat(float num);
 	unsigned char concat(double num);
 	unsigned char concat(const __FlashStringHelper * str);
-	
+
 	// if there's not enough memory for the concatenated value, the string
 	// will be left unchanged (but this isn't signalled in any way)
 	String & operator += (const String &rhs)	{concat(rhs); return (*this);}
@@ -161,6 +161,8 @@ class String
 	void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
 		{getBytes((unsigned char *)buf, bufsize, index);}
 	const char * c_str() const { return buffer; }
+	const char* begin() { return c_str(); }
+	const char* end() { return c_str() + length(); }
 
 	// search
 	int indexOf( char ch ) const;

cores/arduino/WString.h

@@ -44,8 +44,8 @@ typedef int16_t prog_int16_t;
 typedef uint16_t prog_uint16_t;
 typedef int32_t prog_int32_t;
 typedef uint32_t prog_uint32_t;
-typedef int32_t prog_int64_t;
-typedef uint32_t prog_uint64_t;
+typedef int64_t prog_int64_t;
+typedef uint64_t prog_uint64_t;
 
 typedef const void* int_farptr_t;
 typedef const void* uint_farptr_t;