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

Author: ladyada

CHANGELOG

@@ -1,5 +1,34 @@
 SAMD CORE ?.?.?? ????.??.??
 
+SAMD CORE 1.6.20 2018.11.28
+
+* Replaced boolean type with bool in examples. Thanks @per1234
+* Added c++ linker command to allow to include libstdc++ when linking. Thanks @helmut64
+* CPX driver fixes. Thanks @dhalbert
+* I2S: Changed library to use 8 MHz oscillator source if 48MHz divider does not fit in 8 bits
+* UART: Added frame error handling
+* USB: Fixed memory leak on reconnects
+* SDU: Added support for Arduino M0. Thanks @jandrassy
+* Added arduinoOTA upload keys for Arduino M0. Thanks @jandrassy
+* USB: Fixed USB Host failures and fixed memory overwrite in USBHost. Thanks @gdsports
+* USB: Added method to return USB error code. Thanks @MarkFischer
+* CDC: Clear line state on end()
+* USB: Added USB device end() method
+* Removed requirement that the DAC is on A0. Thanks @GabrielNotman
+* Added alternate ports 44, 45 to make the SWCLK and SWDIO pins available on the Zero. Thanks @helmut64
+* Added defines for MKR pin layout
+* Fixed freeze in tone()
+* Added MKR NB 1500 variant and bootloader
+* Increased the default serial buffer size to 256
+
+SAMD CORE 1.6.19 2018.07.11
+
+* Fixed bootloader tools for .org boards
+* M0: Updated pin definitions for D6, D7 and D13 to match Zero
+* SPI: Fixed interrupt mask to block. Thanks @ggajoch
+* Added MKR WiFi 1010 variant and bootloader
+* Updated Windows Drivers to 1.4.0 and re-signed Adafruit_Circuit_Playground_Express.inf
+
 SAMD CORE 1.6.18 2018.03.05
 
 * Wire: Added support for general call (broadcast)

bootloaders/mkrnb1500/samd21_sam_ba_arduino_mkrnb1500.bin

@@ -20,6 +20,35 @@
 #ifndef _BOARD_DEFINITIONS_H_
 #define _BOARD_DEFINITIONS_H_
 
+#if defined(BOARD_ID_arduino_zero)
+  #include "board_definitions_arduino_zero.h"
+#elif defined(BOARD_ID_genuino_zero)
+  #include "board_definitions_genuino_zero.h"
+#elif defined(BOARD_ID_arduino_mkr1000)
+  #include "board_definitions_arduino_mkr1000.h"
+#elif defined(BOARD_ID_genuino_mkr1000)
+  #include "board_definitions_genuino_mkr1000.h"
+#elif defined(BOARD_ID_arduino_mkrzero)
+  #include "board_definitions_arduino_mkrzero.h"
+#elif defined(BOARD_ID_arduino_mkrfox1200)
+  #include "board_definitions_arduino_mkrfox1200.h"
+#elif defined(BOARD_ID_arduino_mkrgsm1400)
+  #include "board_definitions_arduino_mkrgsm1400.h"
+#elif defined(BOARD_ID_arduino_mkrwan1300)
+  #include "board_definitions_arduino_mkrwan1300.h"
+#elif defined(BOARD_ID_arduino_mkrwifi1010)
+  #include "board_definitions_arduino_mkrwifi1010.h"
+#elif defined(BOARD_ID_arduino_mkrnb1500)
+  #include "board_definitions_arduino_mkrnb1500.h"
+#else
+  #error You must define a BOARD_ID and add the corresponding definitions in board_definitions.h
+#endif
+
+// Common definitions
+// ------------------
+
+#define BOOT_PIN_MASK (1U << (BOOT_LOAD_PIN & 0x1f))
+
 /*
  * If BOOT_DOUBLE_TAP_ADDRESS is defined the bootloader is started by
  * quickly tapping two times on the reset button.

bootloaders/mkrnb1500/samd21_sam_ba_arduino_mkrnb1500.hex

@@ -0,0 +1,86 @@
+/*
+  Copyright (c) 2016 Arduino LLC.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#ifndef _BOARD_DEFINITIONS_H_
+#define _BOARD_DEFINITIONS_H_
+
+/*
+ * USB device definitions
+ */
+#define STRING_PRODUCT "Arduino MKR NB 1500"
+#define USB_VID_HIGH   0x23
+#define USB_VID_LOW    0x41
+#define USB_PID_HIGH   0x00
+#define USB_PID_LOW    0x55
+
+/*
+ * If BOOT_DOUBLE_TAP_ADDRESS is defined the bootloader is started by
+ * quickly tapping two times on the reset button.
+ * BOOT_DOUBLE_TAP_ADDRESS must point to a free SRAM cell that must not
+ * be touched from the loaded application.
+ */
+#define BOOT_DOUBLE_TAP_ADDRESS           (0x20007FFCul)
+#define BOOT_DOUBLE_TAP_DATA              (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
+
+/*
+ * If BOOT_LOAD_PIN is defined the bootloader is started if the selected
+ * pin is tied LOW.
+ */
+//#define BOOT_LOAD_PIN                     PIN_PA21
+//#define BOOT_LOAD_PIN                     PIN_PA15
+
+#define BOOT_USART_MODULE                 SERCOM5
+#define BOOT_USART_BUS_CLOCK_INDEX        PM_APBCMASK_SERCOM5
+#define BOOT_USART_PER_CLOCK_INDEX        GCLK_CLKCTRL_ID_SERCOM5_CORE_Val
+#define BOOT_USART_PAD_SETTINGS           UART_RX_PAD3_TX_PAD2
+#define BOOT_USART_PAD3                   PINMUX_PB23D_SERCOM5_PAD3
+#define BOOT_USART_PAD2                   PINMUX_PB22D_SERCOM5_PAD2
+#define BOOT_USART_PAD1                   PINMUX_UNUSED
+#define BOOT_USART_PAD0                   PINMUX_UNUSED
+
+/* Master clock frequency */
+#define CPU_FREQUENCY                     (48000000ul)
+#define VARIANT_MCK                       CPU_FREQUENCY
+
+/* Frequency of the board main oscillator */
+#define VARIANT_MAINOSC                   (32768ul)
+
+/* Calibration values for DFLL48 pll */
+#define NVM_SW_CALIB_DFLL48M_COARSE_VAL   (58)
+#define NVM_SW_CALIB_DFLL48M_FINE_VAL     (64)
+
+/*
+ * LEDs definitions
+ */
+// PA20 (digital pin 6)
+#define BOARD_LED_PORT                    (0)
+#define BOARD_LED_PIN                     (20)
+
+#define CONFIGURE_PMIC                    1
+#define PMIC_PIN_SCL                      12
+#define PMIC_PIN_SDA                      11
+#define PMIC_SERCOM                       SERCOM0                      
+
+// No RX/TX led
+//#define BOARD_LEDRX_PORT
+//#define BOARD_LEDRX_PIN
+
+//#define BOARD_LEDTX_PORT
+//#define BOARD_LEDTX_PIN
+
+#endif // _BOARD_DEFINITIONS_H_

bootloaders/zero/board_definitions.h

@@ -25,5 +25,8 @@ mv -v samd21_sam_ba_arduino_mkrwan1300.* ../mkrwan1300/
 BOARD_ID=arduino_mkrwifi1010 NAME=samd21_sam_ba_arduino_mkrwifi1010 make clean all
 mv -v samd21_sam_ba_arduino_mkrwifi1010.* ../mkrwifi1010/
 
+BOARD_ID=arduino_mkrnb1500 NAME=samd21_sam_ba_arduino_mkrnb1500 make clean all
+mv -v samd21_sam_ba_arduino_mkrnb1500.* ../mkrnb1500/
+
 echo Done building bootloaders!
 

bootloaders/zero/board_definitions_arduino_mkrnb1500.h

@@ -27,7 +27,10 @@
 // using a ring buffer (I think), in which head is the index of the location
 // to which to write the next incoming character and tail is the index of the
 // location from which to read.
-#define SERIAL_BUFFER_SIZE 164
+
+#ifndef SERIAL_BUFFER_SIZE
+#define SERIAL_BUFFER_SIZE 256
+#endif
 
 template <int N>
 class RingBufferN

bootloaders/zero/build_all_bootloaders.sh

@@ -136,7 +136,7 @@ void tone (uint32_t outputPin, uint32_t frequency, uint32_t duration)
     default: break;
   }
 
-  toggleCount = (duration > 0 ? frequency * duration * 2 / 1000UL : -1);
+  toggleCount = (duration > 0 ? frequency * duration * 2 / 1000UL : -1LL);
 
   resetTC(TONE_TC);
 

cores/arduino/RingBuffer.h

@@ -150,6 +150,7 @@ void Serial_::begin(uint32_t /* baud_count */, uint8_t /* config */)
 
 void Serial_::end(void)
 {
+	memset((void*)&_usbLineInfo, 0, sizeof(_usbLineInfo));
 }
 
 int Serial_::available(void)

cores/arduino/Tone.cpp

@@ -237,7 +237,7 @@ class DoubleBufferedEPOutHandler : public EPHandler {
 		release();
 	}
 
-	~DoubleBufferedEPOutHandler() {
+	virtual ~DoubleBufferedEPOutHandler() {
 		free((void*)data0);
 		free((void*)data1);
 	}